niv-openerp
235f8996bf
Implemented read only mode
...
bzr revid: nicolas.vanhoren@openerp.com-20120813154011-hgq3vxxdps5s9w91
2012-08-13 17:40:11 +02:00
Antonin Bourguignon
c06ff002b5
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120813152604-c55hayq9h29ovzdc
2012-08-13 17:26:04 +02:00
Thibault Delavallée
74a2396949
[CLEAN] mail_thread: 1-sign cleaning.
...
bzr revid: tde@openerp.com-20120813152437-vbuie6z4g51th7rz
2012-08-13 17:24:37 +02:00
Thibault Delavallée
cc84d7d168
[FIX] res_partner: do not write on the partner if the dict of update_address is void; this could cause a loop with subscribers.
...
bzr revid: tde@openerp.com-20120813152413-j62vvzxp3ijpfc4n
2012-08-13 17:24:13 +02:00
niv-openerp
8c7b192ab7
Removed useless dependency between fieldtexthtml and fieldtext
...
bzr revid: nicolas.vanhoren@openerp.com-20120813152227-29l173q31tcwc9tq
2012-08-13 17:22:27 +02:00
Antony Lesuisse
2a84ba0160
[IMP] use registry contextmanager
...
bzr revid: al@openerp.com-20120813152045-woeg16q10xkhiqgk
2012-08-13 17:20:45 +02:00
Olivier Dony
6d2ad2e217
[FIX] OPW 576675: base_crypt: avoid causing TransactionRollbackErrors after each registry reload
...
See individual commit message for more info
bzr revid: odo@openerp.com-20120813151648-gvxggkz0dnj3y6ax
2012-08-13 17:16:48 +02:00
Christophe Simonis
661b4e0786
[IMP] auth_signup: use contextmanager to manage the cursor
...
bzr revid: chs@openerp.com-20120813150605-964tpaedgremjnoa
2012-08-13 17:06:05 +02:00
Christophe Simonis
3e251640d2
[IMP] add cursor() contextmanager on registry
...
bzr revid: chs@openerp.com-20120813150501-txkrphi7hyp2tgl1
2012-08-13 17:05:01 +02:00
Antonin Bourguignon
381d97cbf2
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120813145754-wjihljr9iyc2ll08
2012-08-13 16:57:54 +02:00
Stephane Wirtel
36aaaf4a32
[MERGE]
...
bzr revid: stw@openerp.com-20120813145708-botpw2f1shkhv3on
2012-08-13 16:57:08 +02:00
Thibault Delavallée
c008f8973a
[IMP] mail_thread: updated override of many2many (1 and 4 opcodes now supported); fixed write that could go into a loop. Do not subscribe the guy that write on subscribers.
...
bzr revid: tde@openerp.com-20120813145526-tm8cjegtdoymrax7
2012-08-13 16:55:26 +02:00
Olivier Dony
468ce1b127
[FIX] base_crypt: safer initial crypting of user passwords
...
Avoid locking the full users table unless there is
really at least one user record to crypt.
Avoid using a separate cursor that could create a deadlock
or TransactionRollbackError in the main init() transaction.
bzr revid: odo@openerp.com-20120813145200-cc0gfzz04aundxhw
2012-08-13 16:52:00 +02:00
niv-openerp
78f92ec031
Some tuning in text html
...
bzr revid: nicolas.vanhoren@openerp.com-20120813145111-s8uw1x4fc26xe6xl
2012-08-13 16:51:11 +02:00
niv-openerp
8dfa86afd9
removed images
...
bzr revid: nicolas.vanhoren@openerp.com-20120813144401-cll0enjblqkh8ina
2012-08-13 16:44:01 +02:00
Frédéric van der Essen
b6c254942a
[FIX] point_of_sale: images are working now
...
bzr revid: fva@openerp.com-20120813144355-vgojt7llli8u9vye
2012-08-13 16:43:55 +02:00
Thibault Delavallée
d3ed214101
[MERGE] Merged with last server/trunk to avoid issues with default data.
...
bzr revid: tde@openerp.com-20120810104044-97advtdk1yvr3262
bzr revid: tde@openerp.com-20120813115658-bcvr2kxx4qjyhndg
bzr revid: tde@openerp.com-20120813144204-ub5wp428tdnemalx
2012-08-13 16:42:04 +02:00
niv-openerp
10155376c4
Did better stuff
...
bzr revid: nicolas.vanhoren@openerp.com-20120813143755-g9ccs0iubcwvm02i
2012-08-13 16:37:55 +02:00
Fabien Pinckaers
b79db6f0b3
[IMP] useability, hide fields on partners when not used
...
bzr revid: fp@tinyerp.com-20120813143731-8omk52y879rgbjc1
2012-08-13 16:37:31 +02:00
Olivier Dony
fb346a6de3
[FIX] base_crypt: avoid table lock on res_users during simple auth check
...
Performing a full table lock is potentially very slow
due to the number of tables holding foreign keys towards
res_users, so we should avoid doing that for simple
auth check() calls. The point was only to avoid failing
the update of the last login timestamp, which we don't
actually care much about. So we can replace that with a
simple SELECT FOR UPDATE NOWAIT on that specific user
row and and skip the update in case the LOCK was
not granted
bzr revid: odo@openerp.com-20120813143552-3g3z0q9n1iox8a0b
2012-08-13 16:35:52 +02:00
Christophe Simonis
26efdb4b98
merge upstream
...
bzr revid: chs@openerp.com-20120813143423-gkbtqsmwuy1fn9nh
2012-08-13 16:34:23 +02:00
Vo Minh Thu
7a0abed231
[MERGE] merged trunk.
...
bzr revid: vmt@openerp.com-20120813142443-73d6zm10bqhm17mp
2012-08-13 16:24:43 +02:00
niv-openerp
e5fb45a329
First working version of the html sanitizer
...
bzr revid: nicolas.vanhoren@openerp.com-20120813142232-xn7h0ov7mb3pls4o
2012-08-13 16:22:32 +02:00
Thibault Delavallée
138e9c2739
[IMP] tools: image: added a sharpen filter when resizing images. Resized images quality is much better; but demo data are a bit 'aliased'.
...
bzr revid: tde@openerp.com-20120813141321-isaz930h3roov1ui
2012-08-13 16:13:21 +02:00
Fabien Pinckaers
e94136a6d8
[IMP] uncommit hyearchical categories
...
bzr revid: fp@tinyerp.com-20120813141101-sd95pzkc1qsy9lox
2012-08-13 16:11:01 +02:00
Christophe Simonis
6ce8b7cf04
[IMP] this is version 7
...
bzr revid: chs@openerp.com-20120813140402-x67r7rk7tr6718jb
2012-08-13 16:04:02 +02:00
Christophe Simonis
0f1aa3300d
[FIX] do not autocorrect location header in redirects
...
bzr revid: chs@openerp.com-20120813135927-k32eih6tg6y28ivl
2012-08-13 15:59:27 +02:00
Fabien Meghazi
41791f7e2f
[FIX] Fix bug in binary/image controller
...
bzr revid: fme@openerp.com-20120813135653-zvk21ch7dc9rs66w
2012-08-13 15:56:53 +02:00
Xavier Morel
45d5003dd6
[ADD] matching and parsing of CSV, preview production
...
bzr revid: xmo@openerp.com-20120813134219-ijo7d2kwn82qs4tm
2012-08-13 15:42:19 +02:00
Antonin Bourguignon
b8ba2d279b
[IMP] portal's jobs are now a mail group (no more relation with hr_recruitment)
...
bzr revid: abo@openerp.com-20120813133827-ta4zh1s2gbl4a4ib
2012-08-13 15:38:27 +02:00
Stephane Wirtel
c356b0ea47
[MERGE] procurement: Fix a part of the code
...
bzr revid: stw@openerp.com-20120813133528-1n8sykpenpjkgi74
2012-08-13 15:35:28 +02:00
Christophe Simonis
4077ff353b
[FIX] auth_signup: flake8
...
bzr revid: chs@openerp.com-20120813132543-v79g6om8a4ge9zsb
2012-08-13 15:25:43 +02:00
Mayur Maheshwari (OpenERP)
52eb6fd1dd
[FIX]hr_expense :improve voucher if voucher journal have currency convert the expense to that currency
...
bzr revid: mma@tinyerp.com-20120813132347-j6f6uy991wbrogfi
2012-08-13 18:53:47 +05:30
Rucha (Open ERP)
912189bebe
[ADD]: base: Added demo contact images
...
bzr revid: rpa@tinyerp.com-20120813132128-crurlr8meneyrkch
2012-08-13 18:51:28 +05:30
Thibault Delavallée
9a3deaf3da
[IMP] crm: fixed some categ_id remaining.
...
bzr revid: tde@openerp.com-20120813131207-lu1c271q5dh27vlr
2012-08-13 15:12:07 +02:00
Foram Katharotiya (OpenERP)
0e916d1592
[IMP] improve mail_thread
...
bzr revid: fka@tinyerp.com-20120813131040-32v2tcz3eltkx4fn
2012-08-13 18:40:40 +05:30
Christophe Simonis
e543552dbd
[FIX] do not mess up the headers in the DisableCacheMiddleware
...
bzr revid: chs@openerp.com-20120813130955-1fwkyahlceotln5o
2012-08-13 15:09:55 +02:00
Thibault Delavallée
ae6d1fe900
[FIX] crm_lead: categ_id -> now categ_ids.
...
bzr revid: tde@openerp.com-20120813125822-1knqrg2adg90xxpy
2012-08-13 14:58:22 +02:00
Thibault Delavallée
9db0a94280
[IMP] CRM demo data: subtype -> content_subtype. Please check your logs before merging ...
...
bzr revid: tde@openerp.com-20120813125803-sodjl70yrnk3i2v0
2012-08-13 14:58:03 +02:00
niv-openerp
11780a2267
Added some code to sanitize html
...
bzr revid: nicolas.vanhoren@openerp.com-20120813125307-d8cycdvtd7ad0f8e
2012-08-13 14:53:07 +02:00
Thibault Delavallée
ba61f0733a
[IMP] base_calendar: removed email_from from demo data, because this field does not exist; updated used categories, because some were not defined.
...
bzr revid: tde@openerp.com-20120813124704-qa70aa3aevh4s0qv
2012-08-13 14:47:04 +02:00
Frédéric van der Essen
01cb3ebb99
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20120813124439-izug22kl0plts08x
2012-08-13 14:44:39 +02:00
7c3a72300c
[FIX] Fixed login to OpenERP with Google OAuth2. Still fails when redirecting an authenticated user.
...
bzr revid: vta@openerp.com-20120813123333-b4jwsrn106lakbnh
2012-08-13 14:33:33 +02:00
Thibault Delavallée
fd009ce95f
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120813123145-ruli48hzsfiu6g1y
2012-08-13 14:31:45 +02:00
Thibault Delavallée
9558419498
[IMP] base_calendar: removed annoying spaces in debug for tests.
...
bzr revid: tde@openerp.com-20120813123111-i224x123n2a1r8fx
2012-08-13 14:31:11 +02:00
Thibault Delavallée
2a22a88230
[FIX] mail_thread: fixed some forgotten \).
...
bzr revid: tde@openerp.com-20120813123051-5lxzx5011j2skrk8
2012-08-13 14:30:51 +02:00
Thibault Delavallée
f7d274850e
[IMP] [CLEAN] res_partner: image_medium used in view, because image_small was too small; cleaned some print statemetns in res_users.
...
bzr revid: tde@openerp.com-20120813122207-04f91lvor03g1xek
2012-08-13 14:22:07 +02:00
Khushboo Bhatt (Open ERP)
08460d4dcd
[IMP]implemented payslip batch yml
...
bzr revid: kbh@tinyerp.com-20120813122117-qlfgnep0z50ko7ql
2012-08-13 17:51:17 +05:30
Atul Patel (OpenERP)
00a0a52128
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20120813121211-h22wjo6mn9adbrkz
2012-08-13 17:42:11 +05:30
Frédéric van der Essen
4c3e048d40
[MERGE WIP] merging from trunk. Still some issues with the thumbnails
...
bzr revid: fva@openerp.com-20120813120801-gjufnck0f78ddivg
2012-08-13 14:08:01 +02:00
niv-openerp