Thibault Francois 33765897a3 [MERGE][FIX] merge from trunk + fixes conflict ...

bzr revid: tfr@openerp.com-20110224150309-nujh3109r295yc9b

2011-02-24 16:03:09 +01:00

..

i18n

Launchpad automatic translations update.

2011-02-22 04:54:57 +00:00

process

merged with trunk

2010-12-30 15:28:09 +05:30

report

[MERGE] merge from trunk addons

2011-01-04 18:58:53 +05:30

security

[FIX] MRP:warehouse user is now be able to process a stock move

2011-01-17 12:30:28 +05:30

test

[MERGE] merged the dev3 branch

2011-01-14 01:11:01 +01:00

wizard

[MERGE] merge from trunk addons

2011-01-04 18:58:53 +05:30

__init__.py

merged with trunk

2010-12-30 15:28:09 +05:30

__openerp__.py

[MERGE] merge from trunk addons

2011-01-03 14:38:25 +05:30

board_manufacturing_view.xml

merged with trunk

2010-12-30 15:28:09 +05:30

company_view.xml

merged with trunk

2010-12-30 15:28:09 +05:30

company.py

merged with trunk

2010-12-30 15:28:09 +05:30

installer.py

merged with trunk

2010-12-30 15:28:09 +05:30

mrp_data.xml

merged with trunk

2010-12-30 15:28:09 +05:30

mrp_demo.xml

merged with trunk

2010-12-30 15:28:09 +05:30

mrp_installer.xml

merged with trunk

2010-12-30 15:28:09 +05:30

mrp_report.xml

merged with trunk

2010-12-30 15:28:09 +05:30

mrp_view.xml

[MERGE] my-addons

2011-02-14 17:32:31 +01:00

mrp_workflow.xml

merged with trunk

2010-12-30 15:28:09 +05:30

mrp.py

[Fix] Fix buildbot warning

2011-02-02 15:19:47 +05:30

procurement.py

merged with trunk

2010-12-30 15:28:09 +05:30

product.py

[FIX] lp 701017

2011-01-17 09:31:22 +01:00

stock.py

[FIX] mrp, stock: Production orders ignored chained location

2011-01-12 17:44:40 +01:00