mtr e2ed1d82cf [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-payroll ... bzr revid: mtr@mtr-20110304045319-yaciu7is1878du4y bzr revid: mtr@mtr-20110304083444-a5rdwf071gfddbw1		2011-03-04 14:04:44 +05:30
..
i18n	[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-payroll	2011-03-04 14:04:44 +05:30
report	[MERGE] merge from trunk addons	2011-01-03 14:38:25 +05:30
security	[REVERT] all: revert incorrect change of default ir.rules for multi-company	2011-02-28 14:57:54 +01:00
test	[MERGE] merged the dev3 branch	2011-01-14 01:11:01 +01:00
wizard	[MERGE] lp:729539	2011-03-11 16:43:35 +01:00
__init__.py	merged with trunk	2010-12-30 15:28:09 +05:30
__openerp__.py	merged with trunk	2010-12-30 15:28:09 +05:30
board_warehouse_view.xml	merged with trunk	2010-12-30 15:28:09 +05:30
partner.py	merged with trunk	2010-12-30 15:28:09 +05:30
partner_view.xml	merged with trunk	2010-12-30 15:28:09 +05:30
product.py	merged with trunk	2010-12-30 15:28:09 +05:30
product_data.xml	merged with trunk	2010-12-30 15:28:09 +05:30
product_view.xml	[MERGE]: Merge with lp:~openerp-dev/openobject-addons/ksa-addons2	2011-01-11 18:27:31 +05:30
stock.py	[MERGE] merged with main addons branch	2011-03-09 14:14:25 +01:00
stock_data.xml	[MERGE] merge from trunk addons	2011-01-03 14:38:25 +05:30
stock_demo.xml	merged with trunk	2010-12-30 15:28:09 +05:30
stock_incoterms.xml	[IMP] add two incoterms from Alexis Delattre	2011-01-17 08:58:57 +01:00
stock_report.xml	merged with trunk	2010-12-30 15:28:09 +05:30
stock_sequence.xml	merged with trunk	2010-12-30 15:28:09 +05:30
stock_view.xml	[MERGE]	2011-01-31 10:25:23 +05:30
stock_workflow.xml	merged with trunk	2010-12-30 15:28:09 +05:30