[MERGE] sync with latest trunk

bzr revid: odo@openerp.com-20110929110856-tto1jwqaievdr3d4

diff --cc addons/account/__openerp__.py
Simple merge

diff --cc addons/account/company.py
Simple merge

diff --cc addons/account/company_view.xml
Simple merge

diff --cc addons/account/wizard/__init__.py
Simple merge

diff --cc addons/l10n_be_hr_payroll/security/hr.salary.rule.csv
index 0000000,0000000..a8b6906
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/addons/l10n_be_hr_payroll/security/hr.salary.rule.csv
@@@ -1,0 -1,0 +1,3 @@@
++"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
++"access_hr_salary_rule_category","hr.salary.rule.category","model_hr_salary_rule_category","base.group_hr_user",1,1,1,1
++"access_hr_salary_rule","hr.salary.rule","model_hr_salary_rule","base.group_hr_user",1,1,1,1

diff --cc addons/sale/test/data_test.yml
Simple merge

diff --cc addons/stock/__openerp__.py
Simple merge