Quentin (OpenERP) 559e65c84e [MERGE] merged the dev branch related to the change of read() of osv_memory in order to work by batch (server side change, revno: 3369, revision-id: odo@openerp.com-20110315132628-uhhpf95b9iyin482). It will now return a tuple (id, name) for the m2o instead and thus the osv_memory objects have been changed accordingly ... bzr revid: qdp-launchpad@openerp.com-20110315132726-dpwcxa08a2l12yy6		2011-03-15 14:27:26 +01:00
..
i18n	Launchpad automatic translations update.	2011-03-14 04:46:24 +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	[REVERT] all: revert incorrect change of default ir.rules for multi-company	2011-02-28 14:57:54 +01:00
test	[FIX]: mrp: Fix buildbot warnings	2011-03-10 17:04:02 +05:30
wizard	[MERGE] merged the dev branch related to the change of read() of osv_memory in order to work by batch (server side change, revno: 3369, revision-id: odo@openerp.com-20110315132628-uhhpf95b9iyin482). It will now return a tuple (id, name) for the m2o instead and thus the osv_memory objects have been changed accordingly	2011-03-15 14:27:26 +01:00
__init__.py	merged with trunk	2010-12-30 15:28:09 +05:30
__openerp__.py	[IMP]: Improve minor changes	2011-02-18 15:23:57 +05:30
board_manufacturing_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
company_view.xml	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.py	[MERGE] lp:720282	2011-03-11 16:18:19 +01:00
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] lp:720282	2011-03-11 16:18:19 +01:00
mrp_workflow.xml	merged with trunk	2010-12-30 15:28:09 +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