Xavier Morel
a2b23a1ca7
[REM] merge conflict file committed
...
bzr revid: xmo@openerp.com-20121129112350-egvxrg8ii71wzdx6
2012-11-29 12:23:50 +01:00
Quentin (OpenERP)
fa7db1d68b
[IMP] crm: optimized the crm lead analysis report to lower the response time. Removed the field email that was the reason of the bad performances besides being a bit useless
...
bzr revid: qdp-launchpad@openerp.com-20121129112229-b4n9cb23b7e10n41
2012-11-29 12:22:29 +01:00
d7504b7f20
[FIX]project_timesheet: Fix KeyError: user_id coming due to not creation unique id from postgres view
...
bzr revid: mma@tinyerp.com-20121129112039-fz7jzsdza48z631c
2012-11-29 16:50:39 +05:30
6ac004d619
[merge]latest trunk
...
bzr revid: dle@openerp.com-20121129110331-nk9jz99s2jiug5hl
2012-11-29 12:03:31 +01:00
dhr
783ff3f7e9
[MERGE]merged with trunk
...
bzr revid: dhr@tinyerp.com-20121129110208-a04hijxd8we83rkx
2012-11-29 16:32:08 +05:30
Tejas Tank
5de572c005
[IMP] Opportunity, Image show only if sales person linked.
...
bzr revid: tta@openerp.com-20121129105543-or20pf7ul2mztmuo
2012-11-29 15:55:43 +05:00
Antony Lesuisse
c4a845b50e
[FIX] auth_signup on token
...
bzr revid: al@openerp.com-20121129104039-0pv8mls0f55pet2l
2012-11-29 11:40:39 +01:00
Xavier Morel
c7772fdd82
[FIX] server-sourced fields_get has no indirection to the model's fields
...
previous searchview-controller wrapper method did. Remove leftover indirection deref
bzr revid: xmo@openerp.com-20121129103841-6qcl4sctekqmrt2q
2012-11-29 11:38:41 +01:00
Quentin (OpenERP)
4d4eec2b14
[MERGE] trunk + commit fixing the perf of account.invoice analysis
...
bzr revid: qdp-launchpad@openerp.com-20121129101334-87xelo837afpvsdr
2012-11-29 11:13:34 +01:00
Quentin (OpenERP)
7a50367e84
[IMP] account: optimized the account invoice analysis report to lower the response time. Removed the fields due_delay and delay_to_pay that were the reasons of the bad performances besides being a bit useless and having wrong values computed
...
bzr revid: qdp-launchpad@openerp.com-20121129101228-6cxv07svxnbabfr0
2012-11-29 11:12:28 +01:00
Xavier Morel
bf29cecca3
[FIX] if an action descriptor is precisely `false`, treat it as an ir_action_close ~/projects/tiny/web/current
...
Can be seen in e.g. Quotations > [More sidebar] > Sale: Mark Unread:
it's a server action which just returns ``False``, the handler
resulted in a noop but also produced an error message in the browser
console ("No type for action false").
Convert ``false`` (identity-tested) into an ir_action_close in
do_action, before actually mucking into the action descriptor.
bzr revid: xmo@openerp.com-20121129101137-g01nd49hnlg2odfs
2012-11-29 11:11:37 +01:00
Christophe Matthieu
968837ac97
[MERGE] form trunk-openchatter-vive-lilo-chm; Improve openchatter and fix
...
bzr revid: chm@openerp.com-20121129100342-gz3hz858ga8ecmre
2012-11-29 11:03:42 +01:00
dusan
c041ffe52b
[MERGE]with partent
...
bzr revid: dusan@ubuntu-20121129095836-2c230j7tamrmofsk
2012-11-29 10:58:36 +01:00
Christophe Matthieu
f0c821ebbc
[MERGE] from trunk-openchatter-vive-lilo-chm
...
bzr revid: chm@openerp.com-20121129095214-pniv6qy0p2ea6efe
2012-11-29 10:52:14 +01:00
Christophe Matthieu
e81ea77fa2
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20121129094553-n30aju91kj40cbg6
2012-11-29 10:45:53 +01:00
Christophe Matthieu
f7933378aa
[IMP] note: remove fancy mode
...
bzr revid: chm@openerp.com-20121129094412-s5g8uffx8j7q4xpg
2012-11-29 10:44:12 +01:00
Xavier Morel
106100eea0
[MERGE] evalpocalypse-related fixes
...
bzr revid: xmo@openerp.com-20121129091202-tibeevirun95o1mi
2012-11-29 10:12:02 +01:00
Xavier Morel
1238164680
[MERGE] evalpocalypse
...
bzr revid: xmo@openerp.com-20121129091149-0k26u2mmjzaa2c1a
2012-11-29 10:11:49 +01:00
Xavier Morel
e00cb36f41
[MERGE] from trunk
...
bzr revid: xmo@openerp.com-20121129091038-0fexjx8o12drjbga
2012-11-29 10:10:38 +01:00
Fabien Meghazi
396f76c95a
[MERGE] Fix field binary image controls padding causing overflow
...
bzr revid: fme@openerp.com-20121129091017-0oefnnl6z4fd5aae
2012-11-29 10:10:17 +01:00
76417f249f
[MERGE] trunk-improve_portal-vta.
...
bzr revid: vta@openerp.com-20121129090801-mheiq7yb3h24onqf
2012-11-29 10:08:01 +01:00
Anand Patel (OpenERP)
52cd233b6a
[IMP]Improved code for project 'create Manager'
...
bzr revid: pan@tinyerp.com-20121129085358-hcwy1bzy31g4zbed
2012-11-29 14:23:58 +05:30
Khushboo Bhatt (Open ERP)
616cbc4b9b
[REM]sale:removed unnecessary header
...
bzr revid: kbh@tinyerp.com-20121129085206-5a1g7x3dhf15ffzv
2012-11-29 14:22:06 +05:30
Xavier Morel
1f26804726
[MERGE] from trunk
...
bzr revid: xmo@openerp.com-20121129084431-1xo5z47cor2zzmr8
2012-11-29 09:44:31 +01:00
Paramjit Singh Sahota
8ad111af91
[IMP]Improved code for Production Status field should show Draft before saving.
...
bzr revid: psa@tinyerp.com-20121129083922-ptdosthtbrilfunj
2012-11-29 14:09:22 +05:30
Paramjit Singh Sahota
b4718f0d63
[IMP] Changed the label Production Order to Manufacturing Order.
...
bzr revid: psa@tinyerp.com-20121129083532-3dxabfq05x8a1jln
2012-11-29 14:05:32 +05:30
Christophe Matthieu
66e13eb9bf
[IMP] web avatar preference: change overflow hidden into padding: 4px 0
...
bzr revid: chm@openerp.com-20121129083314-gbhblm0vi4nw08sb
2012-11-29 09:33:14 +01:00
e9c5233ec1
[FIX] l10n_fr: use abs(v)<epsilon when checking for small value
...
lp bug: https://launchpad.net/bugs/1084424 fixed
bzr revid: alexandre.fayolle@camptocamp.com-20121129081248-v5qw1czyjoagls4o
2012-11-29 09:12:48 +01:00
Atul Patel (OpenERP)
6fbe94a932
[FIX]: Open sale order line in open formview
...
bzr revid: atp@tinyerp.com-20121129073335-7jkb0m4f8wvy7tvh
2012-11-29 13:03:35 +05:30
Paramjit Singh Sahota
1dfef2f2af
[IMP]Improved code for label, make start date and end date invisible and make size of textbox same as others.
...
bzr revid: psa@tinyerp.com-20121129064856-r1bfgsyevcstcw06
2012-11-29 12:18:56 +05:30
Anand Patel (OpenERP)
6eb9e93ba1
[IMP]Improve code for message[mail]
...
bzr revid: pan@tinyerp.com-20121129062415-7kl6kggkf4dbo1rd
2012-11-29 11:54:15 +05:30
Jalpesh Patel (OpenERP)
fef66bb5d5
[Fix]fix problem of number always skip when create new sales 0rder
...
bzr revid: pja@tinyerp.com-20121129055743-yskji2sxhl0w20x4
2012-11-29 11:27:43 +05:30
Randhir Mayatra (OpenERP)
4f0d88eae7
[IMP] improve the code
...
bzr revid: rma@tinyerp.com-20121129053112-fiq8k4w56crv3q4x
2012-11-29 11:01:12 +05:30
Sanjay Gohel (Open ERP)
b575755c78
[MERGE]merge with parent branch
...
bzr revid: sgo@tinyerp.com-20121129052716-uiao498wy8zggdho
2012-11-29 10:57:16 +05:30
Sanjay Gohel (Open ERP)
15182d3320
[MERGE]merge with trunk
...
bzr revid: sgo@tinyerp.com-20121129052542-c3qqz5blh543f4dv
2012-11-29 10:55:42 +05:30
Randhir Mayatra (OpenERP)
822d5f970f
[MERGE] merge with parent
...
bzr revid: rma@tinyerp.com-20121129052542-kt8jqjmhrwrjp5d5
2012-11-29 10:55:42 +05:30
4b464deeee
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121129051532-an3wp6f216pkzxiz
bzr revid: launchpad_translations_on_behalf_of_openerp-20121129052158-2gjacp96ppgmvr5t
2012-11-29 05:21:58 +00:00
098ac4cf11
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121129051337-kimflvqgnkhrw3fh
2012-11-29 05:13:37 +00:00
Atul Patel (OpenERP)
707d973463
[FIX]: Remove note field form po order_lines in report
...
bzr revid: atp@tinyerp.com-20121129044747-czqo776lkt2f1jol
2012-11-29 10:17:47 +05:30
Divyesh Makwana (Open ERP)
5a99f89428
[Merge] Merge with main addons.
...
bzr revid: mdi@tinyerp.com-20121129042714-bnoz2lppywpiygb8
2012-11-29 09:57:14 +05:30
Divyesh Makwana (Open ERP)
591050a943
[Merge] Merge with main server.
...
bzr revid: mdi@tinyerp.com-20121129042711-not0us62x2p681fj
2012-11-29 09:57:11 +05:30
Atul Patel (OpenERP)
fd7e173625
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20121129042339-1hc1i9n7ywp9tmrc
2012-11-29 09:53:39 +05:30
e2435d4f00
fixed a typo that maked javascript error
...
bzr revid: tsabi-20121129011822-fv9v0l72231y0093
2012-11-29 02:18:22 +01:00
92e87f7e6f
Mark strings to be translated.
...
Maybe some missed, but most of them marked.
bzr revid: tsabi-20121129002200-20tppzvh0ap5tfwe
2012-11-29 01:22:00 +01:00
Christophe Simonis
a208447a3d
merge upstream
...
bzr revid: chs@openerp.com-20121128184100-rkr90mrx38fh9q4l
2012-11-28 19:41:00 +01:00
Christophe Simonis
e03f111704
[FIX] module: do not recreate categories when updating modules
...
bzr revid: chs@openerp.com-20121128183701-6d7p1jqu1hdlshcp
2012-11-28 19:37:01 +01:00
Thibault Delavallée
47fda82264
[FIX] expression.parse: fixed indentation error preventing leafs to be correctly replaced in auto_join.
...
bzr revid: tde@openerp.com-20121128181258-cgmm7wqgv657iptb
2012-11-28 19:12:58 +01:00
Fabien Meghazi
a8e2c0d622
[MERGE] Ensure timzone is unset before testing
...
bzr revid: fme@openerp.com-20121128175916-dm9t0b65d19ztesp
2012-11-28 18:59:16 +01:00
Fabien Meghazi
69a09cc2fb
[FIX] Ensure timzone is unset before testing
...
bzr revid: fme@openerp.com-20121128174318-wg0oygtj3eipozp2
2012-11-28 18:43:18 +01:00
Fabien Meghazi
93091dad79
[MERGE] Fix kanban dataset.ids missing when using 'Show more' button
...
bzr revid: fme@openerp.com-20121128171325-3euuu394e7ybpjzu
2012-11-28 18:13:25 +01:00
Xavier Morel