Commit Graph

2697 Commits

Author SHA1 Message Date
Launchpad Translations on behalf of openerp 2315050bab Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121220044654-aygk0cmaxl26bs0f
bzr revid: launchpad_translations_on_behalf_of_openerp-20121220045947-8j22pe4nm62kzq22
2012-12-20 04:59:47 +00:00
Launchpad Translations on behalf of openerp 56248183fc Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121219051749-jfkdv3ohgd61z9pq
bzr revid: launchpad_translations_on_behalf_of_openerp-20121219052238-gjyvmd0dp8pahk2c
2012-12-19 05:22:38 +00:00
Olivier Dony 6f96c7e89e [MERGE] Harmonization of noupdate flag on security XML data, courtesy of Alexis de Lattre (Akretion)
ir.rule records are in noupdate data blocks to let the admin
alter them without fear of them being reset at next update.
Other records such as groups are in normal mode, so they
can be updated whenever necessary

bzr revid: odo@openerp.com-20121219001031-atkrq9zificm5lsp
2012-12-19 01:10:31 +01:00
Olivier Dony 3fe6987ce7 [MERGE] Harmonization of noupdate flag on security XML data, courtesy of Alexis de Lattre (Akretion)
ir.rule records are in noupdate data blocks to let the admin
alter them without fear of them being reset at next update.
Other records such as groups are in normal mode, so they
can be updated whenever necessary

bzr revid: odo@openerp.com-20121218232001-t425t4hi7qbmsip2
2012-12-19 00:20:01 +01:00
Olivier Dony 03b6acd13d [MERGE] Access inherited product fields on the product directly rather than template, courtesy of Alexis de Lattre (Akretion)
It makes the code a little more straightforward and does not hurt.

bzr revid: odo@openerp.com-20121218225015-6r9ydxjlh147m3z1
2012-12-18 23:50:15 +01:00
Olivier Dony fc0c2942ba [MERGE] Another batch of bugfixes from 6.1
bzr revid: odo@openerp.com-20121218175547-7c1uxq4ypbi314gx
2012-12-18 18:55:47 +01:00
Quentin (OpenERP) b8e3477f06 [MERGE] procurement workflow fixes + removal of a unused file hr_payroll_account/hr_payroll_account_workflow.xml
bzr revid: qdp-launchpad@openerp.com-20121218161136-dqcinl0gputptkt3
2012-12-18 17:11:36 +01:00
Raphael Collet 73980eba5f [MERGE] trunk-import-openerp-thu (use strict naming convention when importing openerp stuff)
bzr revid: rco@openerp.com-20121218085914-qzr2upqfxmfbzfsx
2012-12-18 09:59:14 +01:00
Launchpad Translations on behalf of openerp b2bb3eafbd Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121218045907-df0xw1q7dgw696s1
bzr revid: launchpad_translations_on_behalf_of_openerp-20121218050221-ab50rd40d94gd9a0
bzr revid: launchpad_translations_on_behalf_of_openerp-20121218050832-5hvbj7p0bpsw6fp0
2012-12-18 05:08:32 +00:00
Olivier Dony b67f73c327 [MERGE] Sync with trunk
bzr revid: odo@openerp.com-20121218025230-zig415ldtmazgbxt
2012-12-18 03:52:30 +01:00
Olivier Dony 84d7987f33 [MERGE] Bugfixes from 6.1 until revision 6900
rev.6900 = xal@openerp.com-20120720134532-t07xr3lp8ouhn2dv

bzr revid: odo@openerp.com-20121218021123-9ligpn7bkr9zo4n7
2012-12-18 03:11:23 +01:00
Cecile Tonglet a3939acfa5 [FIX] replace from/import decimal_precision by from/import openerp.addons.decimal_precision
bzr revid: cto@openerp.com-20121217152303-8e3b1x30rlw9cb0d
2012-12-17 16:23:03 +01:00
Cecile Tonglet 15fe515601 [MERGE] From trunk
bzr revid: cto@openerp.com-20121217144306-tkodwpox30cuvb28
2012-12-17 15:43:06 +01:00
Quentin (OpenERP) 6c98483d6f [FIX] mrp, mrp_jit, procurement: fix of the procurement order workflow
bzr revid: qdp-launchpad@openerp.com-20121217144136-hen0i0op21f4z1y1
2012-12-17 15:41:36 +01:00
Quentin (OpenERP) 73a9e83274 [IMP] mrp, project_mrp: removed dependancy of mrp in project_mrp
bzr revid: qdp-launchpad@openerp.com-20121217134326-akrijtur8tg0frl1
2012-12-17 14:43:26 +01:00
Quentin (OpenERP) 4dd9751d5e [IMP] mrp, procurement: procurement workflow documented
bzr revid: qdp-launchpad@openerp.com-20121217103104-vrlm8z02ha6cpa13
2012-12-17 11:31:04 +01:00
Quentin (OpenERP) dbe8f186c5 [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20121217082621-oacsdtydauyvadya
2012-12-17 09:26:21 +01:00
Launchpad Translations on behalf of openerp bfb52002b6 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121216044909-hd4l9dxtqvx85a3h
2012-12-16 04:49:09 +00:00
Launchpad Translations on behalf of openerp 809c92fdef Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121214053618-1gz9xun2cb10afle
bzr revid: launchpad_translations_on_behalf_of_openerp-20121215050358-th0pl9jeams3pwkr
bzr revid: launchpad_translations_on_behalf_of_openerp-20121215050620-y27swfcuh62k8u32
bzr revid: launchpad_translations_on_behalf_of_openerp-20121215051723-6cnx1julk94gkm66
2012-12-15 05:17:23 +00:00
Quentin (OpenERP) 65eb409d7d [FIX] mrp, project_mrp: fixed the refences to procurement workflow
bzr revid: qdp-launchpad@openerp.com-20121214153402-ckufkt6003hy7mv1
2012-12-14 16:34:02 +01:00
Quentin (OpenERP) a26b04c921 [FIX] procurement, mrp, project_mrp: refactored the worflow in order to fix the case where mrp wasn't installed and we configured a product as mto with type=='produce'
bzr revid: qdp-launchpad@openerp.com-20121214145833-32q17yb2gw5rlhed
2012-12-14 15:58:33 +01:00
Launchpad Translations on behalf of openerp cc8025387b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121214053905-mac64ijay9566opr
bzr revid: launchpad_translations_on_behalf_of_openerp-20121214054902-12ndwftreb4g1964
2012-12-14 05:49:02 +00:00
Launchpad Translations on behalf of openerp d6ea61789f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121213044507-t1hpxi43gks88w2e
bzr revid: launchpad_translations_on_behalf_of_openerp-20121213050131-3r9t674ehhnkneky
2012-12-13 05:01:31 +00:00
Quentin (OpenERP) d2d65234ed [MERGE] mrp usability
bzr revid: qdp-launchpad@openerp.com-20121212111001-4ozzlwc46kue2982
2012-12-12 12:10:01 +01:00
Launchpad Translations on behalf of openerp 2e7f68e09f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121212043903-maiyd94p4ifgdqew
bzr revid: launchpad_translations_on_behalf_of_openerp-20121212044145-k216g0bcavdlf2o3
bzr revid: launchpad_translations_on_behalf_of_openerp-20121212045414-tgg69aaw4dz72b0p
2012-12-12 04:54:14 +00:00
Launchpad Translations on behalf of openerp cc69fe1b25 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121211044948-8q9vf1f9ftrzq4wm
bzr revid: launchpad_translations_on_behalf_of_openerp-20121211050318-3noic2ymt0j497rw
2012-12-11 05:03:18 +00:00
Vo Minh Thu 6072fd11af [MERGE] merged trunk.
bzr revid: vmt@openerp.com-20121210111654-0pm3pupnqqeip52n
2012-12-10 12:16:54 +01:00
Arnaud Pineux 9bf9f741b8 [MERGE] with trunk
bzr revid: api@openerp.com-20121210105144-uy0hk00s52rpj7r5
2012-12-10 11:51:44 +01:00
Arnaud Pineux 7414ce209f [FIX] Workflow clean uninstallation
bzr revid: api@openerp.com-20121210091841-42xxklcqfktl4le7
2012-12-10 10:18:41 +01:00
Paramjit Singh Sahota ad14f6fad6 [MERGE] Merged lp:openobject-addons.
bzr revid: psa@tinyerp.com-20121210053145-btedzk00puvcry12
2012-12-10 11:01:45 +05:30
Launchpad Translations on behalf of openerp 7f1d5daf2f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121210043931-72a32pz7q282df45
bzr revid: launchpad_translations_on_behalf_of_openerp-20121210044428-d9bzm1dnqc26voci
2012-12-10 04:44:28 +00:00
Fabien Pinckaers f3fc080ef7 [MERGE] module desc + stock
bzr revid: fp@tinyerp.com-20121209105527-4ot27zsv5vqr38ls
2012-12-09 11:55:27 +01:00
Fabien Pinckaers cce5289809 [IMP] button in MO
bzr revid: fp@tinyerp.com-20121208162724-hd9mdh64ncqn0lah
2012-12-08 17:27:24 +01:00
Fabien Pinckaers fae0f2e539 [MERGE] fix account asset, event, purchase
bzr revid: fp@tinyerp.com-20121208103338-5cm3knhiaijvgks4
2012-12-08 11:33:38 +01:00
Arnaud Pineux ef0b59cb85 [FIX] WORKFLOW: avoid overwriting transitions for clean uninstallation
bzr revid: api@openerp.com-20121207115304-3uhsbnhv8i3g4qdx
2012-12-07 12:53:04 +01:00
Vo Minh Thu e7f4891d46 [IMP] use the openerp namespace.
bzr revid: vmt@openerp.com-20121206145632-0h1coh5aaem65wsy
2012-12-06 15:56:32 +01:00
Paramjit Singh Sahota bac4fc1b5f [MERGE] Merged lp:openobject-addons
bzr revid: psa@tinyerp.com-20121205101625-4gluhqayskqg5m05
2012-12-05 15:46:25 +05:30
Launchpad Translations on behalf of openerp 683f31e51b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121204055506-fin73s7n3o52fmuy
bzr revid: launchpad_translations_on_behalf_of_openerp-20121204055956-fsd4tp3felpk8pm5
2012-12-04 05:59:56 +00:00
Olivier Dony 308e4f1073 [I18N] Removed duplicated terms for inherited [_sql]_constraints -> 400 terms removed
bzr revid: odo@openerp.com-20121203162755-p71dnn0k0t2b98yp
2012-12-03 17:27:55 +01:00
Olivier Dony 5483897ad0 [I18N] Update translation templates for latest changes
bzr revid: odo@openerp.com-20121203155934-zmut8afc7hh82b02
2012-12-03 16:59:34 +01:00
Paramjit Singh Sahota 4290c54aa7 [MERGE] Merged lp:openobject-addons.
bzr revid: psa@tinyerp.com-20121203051142-3kqunad7eob21ujn
2012-12-03 10:41:42 +05:30
Atul Patel (OpenERP) 9fa4677b2c [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20121201091113-dw0bnk3jzfr7r61z
2012-12-01 14:41:13 +05:30
Fabien Pinckaers 33048d7c79 [IMP] merge addons23
bzr revid: fp@openerp.com-20121130100516-r0gspmovo8ebdqi0
2012-11-30 11:05:16 +01:00
Rucha (Open ERP) ca668a8acb [MERGE]: Merged with latest trunk-addons
bzr revid: rpa@tinyerp.com-20121130055252-9lu0qeabe2zcndcj
2012-11-30 11:22:52 +05:30
Launchpad Translations on behalf of openerp f12df4e8ea Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121130050827-124dy1fyx1f113n9
bzr revid: launchpad_translations_on_behalf_of_openerp-20121130051820-ru59ffbuvhm96b8l
2012-11-30 05:18:20 +00:00
Paramjit Singh Sahota cb5dc2acd4 [MERGE] Merged lp:openobject-addons
bzr revid: psa@tinyerp.com-20121130045729-5p316wpdlfd8zcud
2012-11-30 10:27:29 +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
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
Launchpad Translations on behalf of openerp 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
Divyesh Makwana (Open ERP) c56c35f9b0 [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20121128042311-283p5q84yyum4nkb
2012-11-28 09:53:11 +05:30