Olivier Dony 560915cb68 [MERGE] merged latest fixes from 6.0 up to r.4556 ... Rev 4556 = revision-id: jvo@tinyerp.com-20110502133745-s1zyed65h6ojwkvk. bzr revid: odo@openerp.com-20110502184643-d3qzosqdurscd51i		2011-05-02 20:46:43 +02:00
..
i18n	Launchpad automatic translations update.	2011-05-02 06:07:19 +00:00
process	merged with trunk	2010-12-30 15:28:09 +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	fix	2011-01-18 02:55:29 +01:00
__init__.py	merged with trunk	2010-12-30 15:28:09 +05:30
__openerp__.py	[MERGE] Resynchronized with trunk.	2011-03-25 11:24:13 +01:00
board_purchase_view.xml	[FIX] Purchase : Added fields to the list view of purchase.report in order to avoid groupby error(Ref: Case 4683)	2011-03-28 18:03:32 +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
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
purchase.py	[MERGE] merged with main addons branch	2011-03-09 14:14:25 +01:00
purchase_data.xml	merged with trunk	2010-12-30 15:28:09 +05:30
purchase_demo.xml	[MERGE] merged with main addons branch	2011-01-17 09:00:48 +01:00
purchase_report.xml	merged with trunk	2010-12-30 15:28:09 +05:30
purchase_sequence.xml	merged with trunk	2010-12-30 15:28:09 +05:30
purchase_unit_test.xml	merged with trunk	2010-12-30 15:28:09 +05:30
purchase_view.xml	[MERGE] merged fix of lp bug 715477	2011-03-09 17:12:49 +01:00
purchase_workflow.xml	merged with trunk	2010-12-30 15:28:09 +05:30
stock.py	[MERGE] merged bugfix 722961	2011-02-25 15:53:47 +01:00
stock_view.xml	merged with trunk	2010-12-30 15:28:09 +05:30