pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
70,704 Commits 1 Branch 0 Tags
724cbb6dee94de43343fa380c33ea9329647a759
Commit Graph
70704 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
tsabi e2435d4f00 fixed a typo that maked javascript error 
bzr revid: tsabi-20121129011822-fv9v0l72231y0093
 2012-11-29 02:18:22 +01:00
tsabi 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
Fabien Meghazi 3196dbd84b [IMP] Preserve dataset ids order 
bzr revid: fme@openerp.com-20121128171024-qpkn9oo48xa9n2j4
 2012-11-28 18:10:24 +01:00
Fabien Meghazi be019ae11f [ADD] Timezone set to 'Europe/Brussels' for admin in demo data 
bzr revid: fme@openerp.com-20121128164858-l7as9cb89qxopdw1
 2012-11-28 17:48:58 +01:00
dle@openerp.com 514952bdd3 [MERGE]Latest trunk 
bzr revid: dle@openerp.com-20121128164105-m3hgq38xw6ikewa5
 2012-11-28 17:41:05 +01:00
Xavier Morel ae16e0e4e5 [FIX] share: typo in function name 
bzr revid: xmo@openerp.com-20121128161934-42ek0r460w0smsi9
 2012-11-28 17:19:34 +01:00
Xavier Morel 8431c69016 [FIX] sidebar activation: put original context before action context in eval sequence 
bzr revid: xmo@openerp.com-20121128161311-u3e3oqhutt043mzq
 2012-11-28 17:13:11 +01:00
Christophe Matthieu 3e0cc5ee13 [IMP] mail: change contrast for messages in thread and parent message 
bzr revid: chm@openerp.com-20121128160649-6mo704133jjhzr6j
 2012-11-28 17:06:49 +01:00
Antony Lesuisse a34f0ef51c [MERGE] trunk-timezone-notification-fme 
if res.users and browser timezone offset differs we display a warning.
openerp-web relies on the browser for datetime manipulations so we need both to be in sync.

bzr revid: al@openerp.com-20121128160344-1iae73w47ocot9ib
 2012-11-28 17:03:44 +01:00
Christophe Matthieu c491c532c0 [FIX] mail: don't display false value as body 
bzr revid: chm@openerp.com-20121128160134-kbjfov5vvuxtcow6
 2012-11-28 17:01:34 +01:00
Antony Lesuisse 299d98ac6e [MERGE] res.users get_context add timezone offset 
bzr revid: al@openerp.com-20121128155922-ff67gskivujvx2qa
 2012-11-28 16:59:22 +01:00
Xavier Morel 83d5c4f94c [IMP] update py.js to correctly tokenize unicode literals 
also various style improvements in the lib

bzr revid: xmo@openerp.com-20121128155448-1tv62wyv3zy2asr5
 2012-11-28 16:54:48 +01:00
Thibault Delavallée 39ef2cc731 [MERGE] Sync with trunk. 
bzr revid: tde@openerp.com-20121128155252-fspz3t9ywt2neww4
 2012-11-28 16:52:52 +01:00
Thibault Delavallée b4e8416486 [MERGE] Sync with trunk. 
bzr revid: tde@openerp.com-20121128155246-33vcdcysd47uk4k5
 2012-11-28 16:52:46 +01:00
Thibault Delavallée 2f16bf4b56 [MERGE] Sync with trunk. 
bzr revid: tde@openerp.com-20121128155236-o3zvpj5aqkmimrn7
 2012-11-28 16:52:36 +01:00
Vo Minh Thu adc4c256f9 [MERGE] wkf_expr: Ignore empty lines and lines with blanks. 
bzr revid: vmt@openerp.com-20121128155153-yigjipqvk06s7wo2
 2012-11-28 16:51:53 +01:00
vta vta@openerp.com 6183134f4d [FIX] Attempt to fix mail bug, why the hell res_model is not in the values?. 
bzr revid: vta@openerp.com-20121128154717-3ashimdrwd0kl24k
 2012-11-28 16:47:17 +01:00
Thibault Delavallée 37e7d2048b [DOC] mail.js: updated the comment of on_message_read_unread. 
bzr revid: tde@openerp.com-20121128153843-4p24erdrkpzmrhnu
 2012-11-28 16:38:43 +01:00
Olivier Dony 080fe746f5 [FIX] db.drop service: PostgreSQL 9.2 renamed pg_stat_activity.procpid to pid 
bzr revid: odo@openerp.com-20121128153423-yducsjb91g8kjcae
 2012-11-28 16:34:23 +01:00
Xavier Morel 628ed49fff [FIX] correctly return deferreds from all action type handlers 
bzr revid: xmo@openerp.com-20121128152524-xrh6zqty0huqb732
 2012-11-28 16:25:24 +01:00
Thibault Delavallée a293a948a6 [IMP] mail: when starring a message, create an unread notification if it does not exist; otherwise, set the notification as unread. 
bzr revid: tde@openerp.com-20121128151939-v24cfx8k2aul8veg
 2012-11-28 16:19:39 +01:00
Vo Minh Thu fc2f4ab8a4 [MERGE] merged trunk. 
bzr revid: vmt@openerp.com-20121128151352-n9r87jn5tff949ka
 2012-11-28 16:13:52 +01:00
Xavier Morel 48b0d70fc2 [FIX] context evaluation in kanban resequencing 
bzr revid: xmo@openerp.com-20121128151044-i58uwcdem2cgyyrv
 2012-11-28 16:10:44 +01:00
Fabien Meghazi 74657199b0 [REM] Removed manual many2many tags from kanban views 
Kanban view supports many2many as m2m tags by default.

bzr revid: fme@openerp.com-20121128151022-sdk33xct0p738bff
 2012-11-28 16:10:22 +01:00
Vo Minh Thu 63de663ece [IMP] wkf_expr: Ignore empty lines and lines with blanks. 
bzr revid: vmt@openerp.com-20121128150637-pikxf9tw2nj0qpuk
 2012-11-28 16:06:37 +01:00
dle@openerp.com 4b73ea9027 [FIX]Ir values actions 
bzr revid: dle@openerp.com-20121128150525-zh27h78v8dd6dkwm
 2012-11-28 16:05:25 +01:00
Fabien Meghazi 01436f27c2 [FIX] Kanban drag'n drop wrong index 
bzr revid: fme@openerp.com-20121128145941-4qvoqp0mb1s09ojl
 2012-11-28 15:59:41 +01:00
Thibault Delavallée 4e2c317c28 [FIX] Accuracy of the various server actions 'mark read' and 'mark unread': updated their name by adding the model name to be more precise when seing them in a list. 
lp bug: https://launchpad.net/bugs/1082199 fixed

bzr revid: tde@openerp.com-20121128145159-d1b2j6swvhdnnl0i
 2012-11-28 15:51:59 +01:00
Christophe Matthieu 6b5bdc7e84 [IMP] mail: add option copose_as_todo, to mark as todo the messages wrote by the composer of the root thread 
bzr revid: chm@openerp.com-20121128145101-7lnw7zfrjp5k8fg3
 2012-11-28 15:51:01 +01:00
Vo Minh Thu 7221faf3ee [MERGE] modules: avoid to have the docutils warnings rendered inline in descriptions. 
bzr revid: vmt@openerp.com-20121128143351-jp1vtqnkr8jyq3hk
 2012-11-28 15:33:51 +01:00
Christophe Simonis 7773d0d431 [FIX] win32/setup.py: forgot \n 
bzr revid: chs@openerp.com-20121128142521-1giiba0fvxhq84mu
 2012-11-28 15:25:21 +01:00
Vo Minh Thu a498d678de [MERGE] merged the all-modules branch. 
This branch cleans a bit the init/update mess being present on both
tools.config and the module graph's nodes.

The passed update_module argument to get_db_and_pool() is a real boolean
(otherwise its value could be changed by assigning to tools.config).

The `force` attribute as been renamed more appropirately `force_demo` on the
add_module() function.

The `-i` command-line option now accepts a `all` argument.

Although tools.config is still used for init/update/demo options, it is cleared
after initialization in an attempt to make sure the server operates exactly in
the same way (after the initialization), whether it is started with -i/-u or
not

bzr revid: vmt@openerp.com-20121128142106-pdkcruhyz0sjltk8
 2012-11-28 15:21:06 +01:00
Vo Minh Thu f12d2903c1 [MERGE] merged trunk. 
bzr revid: vmt@openerp.com-20121128141845-085lqy5c604nd5lu
 2012-11-28 15:18:45 +01:00
Vo Minh Thu 79eee180ea [FIX] The previous merge killed a line. 
bzr revid: vmt@openerp.com-20121128141202-jncwohi169luyz0l
 2012-11-28 15:12:02 +01:00
Xavier Morel 67ad32f797 [FIX] kanban quick-create: don't attempt creation if the field is empty 
bzr revid: xmo@openerp.com-20121128140428-s7w860xq7wlbi966
 2012-11-28 15:04:28 +01:00
Tejas Tank f09b67d560 [IMP] Fixed tag issue rendering. 
bzr revid: tta@openerp.com-20121128140222-y8pijs2rtx3htgv4
 2012-11-28 19:02:22 +05:00
Thibault Delavallée a853b9f2ad [TEST] Added some tests about the _auto_join feature. 
bzr revid: tde@openerp.com-20121128140042-4r58wnzahk0io3lw
 2012-11-28 15:00:42 +01:00
Christophe Simonis 79b2e72f07 merge upstream 
bzr revid: chs@openerp.com-20121123165044-n5l5nqtm678abb2s
bzr revid: chs@openerp.com-20121128135644-iuiynfijiue67uth
 2012-11-28 14:56:44 +01:00
Christophe Simonis 10697d1c1e merge upstream 
bzr revid: chs@openerp.com-20121128135442-nt2dv11726odr2ji
 2012-11-28 14:54:42 +01:00
Vo Minh Thu 3f56350779 [MERGE] merged trunk. 
bzr revid: vmt@openerp.com-20121128135101-ko52od4hpngc9btz
 2012-11-28 14:51:01 +01:00
Xavier Morel 2b75593168 [FIX] don't display password fields in set_default dialogs 
lp bug: https://launchpad.net/bugs/1015092 fixed

bzr revid: xmo@openerp.com-20121128135013-xzanbxv6qoqo28kh
 2012-11-28 14:50:13 +01:00
Xavier Morel ddcce477d7 [FIX] eq/neq of arrays in compute_domain 
bzr revid: xmo@openerp.com-20121128134142-eywfsl3bv56pvoso
 2012-11-28 14:41:42 +01:00