From 7ce717433fe1251bc836e09b99c27e21f0d80f01 Mon Sep 17 00:00:00 2001 From: "mra (Open ERP)" Date: Wed, 25 Nov 2009 14:12:28 +0530 Subject: [PATCH 01/11] [IMP] modify fr translation file for one sentence in french for testing auto translation with LP bzr revid: mra@tinyerp.com-20091125084228-4a3ojbgpc11txobe --- bin/addons/base/i18n/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/addons/base/i18n/fr.po b/bin/addons/base/i18n/fr.po index 5686b4888d1..a2055edcef9 100644 --- a/bin/addons/base/i18n/fr.po +++ b/bin/addons/base/i18n/fr.po @@ -483,7 +483,7 @@ msgstr "Si vous cochez ceci, la seconde fois que l'utilisateur imprime avec la m #: code:addons/osv/orm.py:0 #, python-format msgid "The read method is not implemented on this object !" -msgstr "" +msgstr "La méthode read n'est pas implémentée pour cet objet" #. module: base #: selection:ir.ui.menu,icon:0 From 4642734b3f1ea432e22977280baff3b3e815b98f Mon Sep 17 00:00:00 2001 From: "lp:~uco-openerp" <> Date: Wed, 25 Nov 2009 14:23:46 +0530 Subject: [PATCH 02/11] [IMP] * On the search view of a partner, add the 'Contact' field (address). * Same for the address object, we must be able to filter on the 'Contact Name' bzr revid: hmo@tinyerp.com-20091125085346-5xtdwyb2f8f778nw --- bin/addons/base/res/partner/partner_view.xml | 12 +++++------- bin/addons/base/res/res_security.xml | 4 ---- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml index b19626f7d21..5e27beb97cc 100644 --- a/bin/addons/base/res/partner/partner_view.xml +++ b/bin/addons/base/res/partner/partner_view.xml @@ -53,6 +53,7 @@ search + @@ -320,6 +321,7 @@ + @@ -358,7 +360,7 @@ [('customer','=',1)] - + Suppliers Partners ir.actions.act_window @@ -368,7 +370,7 @@ {'default_customer':0} - + Others Partners ir.actions.act_window @@ -377,7 +379,7 @@ [('supplier','<>',1),('customer','<>',1)] - + New Partner ir.actions.act_window @@ -386,10 +388,6 @@ form,tree - res.payterm diff --git a/bin/addons/base/res/res_security.xml b/bin/addons/base/res/res_security.xml index 5db58070619..8aae3a40ae7 100644 --- a/bin/addons/base/res/res_security.xml +++ b/bin/addons/base/res/res_security.xml @@ -10,9 +10,5 @@ - - - - From d4ada3ba3dd8baa28132f6043796d89b378481e6 Mon Sep 17 00:00:00 2001 From: Sharoon Thomas <> Date: Wed, 25 Nov 2009 16:35:06 +0530 Subject: [PATCH 03/11] [IMP] Ir_act_window has now groups on form view lp bug: https://launchpad.net/bugs/487543 fixed bzr revid: jvo@tinyerp.com-20091125110506-5zjfc0tomtz7796q --- bin/addons/base/ir/ir.xml | 54 ++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 23 deletions(-) diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml index c252cc4ab64..c6c96a91aae 100644 --- a/bin/addons/base/ir/ir.xml +++ b/bin/addons/base/ir/ir.xml @@ -334,29 +334,37 @@ - -
- - - - - - - - - - - - - - - - - - - - - + + + +
+ + + + + + + + + + + + + + + + + + + + + +
+ + + + + From 458e0979cbd05d225d5c8b16dd2afd8ece04f89c Mon Sep 17 00:00:00 2001 From: "Jay (Open ERP)" Date: Wed, 25 Nov 2009 19:25:15 +0530 Subject: [PATCH 04/11] [IMP] Base : Partner address layout improved lp bug: https://launchpad.net/bugs/485232 fixed bzr revid: jvo@tinyerp.com-20091125135515-bfehe4h2f0tloeuz --- bin/addons/base/res/partner/partner_view.xml | 60 +++++++++++--------- 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml index 5e27beb97cc..16c30e267c0 100644 --- a/bin/addons/base/res/partner/partner_view.xml +++ b/bin/addons/base/res/partner/partner_view.xml @@ -94,21 +94,23 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -259,21 +261,23 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + From 7c769cf4bdceb51ff278e2c2c2fd8779b035e356 Mon Sep 17 00:00:00 2001 From: "Jay (Open ERP)" Date: Wed, 25 Nov 2009 19:28:00 +0530 Subject: [PATCH 05/11] [IMP] Base_contact: Layout improvements lp bug: https://launchpad.net/bugs/485232 fixed bzr revid: jvo@tinyerp.com-20091125135800-5v61d3411zypz51p --- addons/base_contact/base_contact_view.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml index 9fb957258be..3667024a39f 100644 --- a/addons/base_contact/base_contact_view.xml +++ b/addons/base_contact/base_contact_view.xml @@ -325,7 +325,8 @@ form - + + @@ -344,7 +345,7 @@ - + From 29b9fd5f25f53e5ea03994de483fff8c7b75b50d Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Wed, 25 Nov 2009 15:30:58 +0100 Subject: [PATCH 06/11] [IMP] _defaults: allow to pass directly the value instead of a lambda bzr revid: chs@tinyerp.com-20091125143058-upa8zaz6gwo27685 --- bin/osv/orm.py | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/bin/osv/orm.py b/bin/osv/orm.py index e417d6371c7..04d493ce95e 100644 --- a/bin/osv/orm.py +++ b/bin/osv/orm.py @@ -1596,7 +1596,11 @@ class orm_memory(orm_template): # get the default values for the inherited fields for f in fields_list: if f in self._defaults: - value[f] = self._defaults[f](self, cr, uid, context) + if callable(self._defaults[f]): + value[f] = self._defaults[f](self, cr, uid, context) + else: + value[f] = self._defaults[f] + fld_def = ((f in self._columns) and self._columns[f]) \ or ((f in self._inherit_fields) and self._inherit_fields[f][2]) \ or False @@ -1897,7 +1901,11 @@ class orm(orm_template): # initialize it if not create and k in self._defaults: - default = self._defaults[k](self, cr, 1, {}) + if callable(self._defaults[k]): + default = self._defaults[k](self, cr, 1, context) + else: + default = self._defaults[k] + ss = self._columns[k]._symbol_set query = 'UPDATE "%s" SET "%s"=%s' % (self._table, k, ss[0]) cr.execute(query, (ss[1](default),)) @@ -1983,7 +1991,11 @@ class orm(orm_template): if f.required and f_pg_notnull == 0: # set the field to the default value if any if k in self._defaults: - default = self._defaults[k](self, cr, 1, {}) + if callable(self._defaults[k]): + default = self._defaults[k](self, cr, 1, context) + else: + default = self._defaults[k] + if (default is not None): ss = self._columns[k]._symbol_set query = 'UPDATE "%s" SET "%s"=%s WHERE "%s" is NULL' % (self._table, k, ss[0], k) @@ -2164,7 +2176,11 @@ class orm(orm_template): # get the default values defined in the object for f in fields_list: if f in self._defaults: - value[f] = self._defaults[f](self, cr, uid, context) + if callable(self._defaults[f]): + value[f] = self._defaults[f](self, cr, uid, context) + else: + value[f] = self._defaults[f] + fld_def = ((f in self._columns) and self._columns[f]) \ or ((f in self._inherit_fields) and self._inherit_fields[f][2]) \ or False @@ -3130,7 +3146,11 @@ class orm(orm_template): default = {} if 'state' not in default: if 'state' in self._defaults: - default['state'] = self._defaults['state'](self, cr, uid, context) + if callable(self._defaults['state']): + default['state'] = self._defaults['state'](self, cr, uid, context) + else: + default['state'] = self._defaults['state'] + data = self.read(cr, uid, [id], context=context)[0] fields = self.fields_get(cr, uid, context=context) trans_data=[] From f2c19896da9cff4a039a15f9bd1c6c095c6f78b3 Mon Sep 17 00:00:00 2001 From: fabian Date: Wed, 25 Nov 2009 17:37:18 +0100 Subject: [PATCH 07/11] [FIX] Bugfix domain_force [IMP] Added customer_id field in view bzr revid: fabian@fabian-openerp-20091125163718-5q7064l71c8hv101 --- bin/addons/base/ir/ir_rule.py | 9 +++++---- bin/addons/base/res/partner/partner_view.xml | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/bin/addons/base/ir/ir_rule.py b/bin/addons/base/ir/ir_rule.py index 5d93287dfff..20ceb737601 100644 --- a/bin/addons/base/ir/ir_rule.py +++ b/bin/addons/base/ir/ir_rule.py @@ -106,14 +106,15 @@ class ir_rule(osv.osv): for rule in self.browse(cr, uid, ids, context): eval_user_data = {'user': self.pool.get('res.users').browse(cr, 1, uid), 'time':time} - if rule.operand.startswith('user.') and rule.operand.count('.') > 1: - #Need to check user.field.field1.field2(if field is False,it will break the chain) - op = rule.operand[5:] - rule.operand = rule.operand[:5+len(op[:op.find('.')])] +' and '+ rule.operand + ' or False' if rule.domain_force: res[rule.id] = eval(rule.domain_force, eval_user_data) else: + if rule.operand.startswith('user.') and rule.operand.count('.') > 1: + #Need to check user.field.field1.field2(if field is False,it will break the chain) + op = rule.operand[5:] + rule.operand = rule.operand[:5+len(op[:op.find('.')])] +' and '+ rule.operand + ' or False' + if rule.operator in ('in', 'child_of'): dom = eval("[('%s', '%s', [%s])]" % (rule.field_id.name, rule.operator, eval(rule.operand,eval_user_data)), eval_user_data) diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml index 16c30e267c0..c03bd94128f 100644 --- a/bin/addons/base/res/partner/partner_view.xml +++ b/bin/addons/base/res/partner/partner_view.xml @@ -298,6 +298,7 @@ + From 67797b4a46b92daebae590f6dde4f8bd47ce70e4 Mon Sep 17 00:00:00 2001 From: fabian Date: Wed, 25 Nov 2009 17:39:58 +0100 Subject: [PATCH 08/11] [IMP] Added multi company rules bzr revid: fabian@fabian-openerp-20091125163958-m6bokw0m6wbvp3s4 --- addons/product/security/product_security.xml | 13 +++++++++++ addons/project/security/project_security.xml | 8 ++----- addons/sale/sale_view.xml | 1 + addons/sale/security/sale_security.xml | 24 +++++++++++++++----- 4 files changed, 34 insertions(+), 12 deletions(-) diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml index 7347c61d1bc..1d255aff2c8 100644 --- a/addons/product/security/product_security.xml +++ b/addons/product/security/product_security.xml @@ -7,6 +7,19 @@ Product / Manager + + + + + + + Product multi-company + + + + + + ['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])] diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml index f9b8af20541..cb5bad3db9c 100644 --- a/addons/project/security/project_security.xml +++ b/addons/project/security/project_security.xml @@ -25,10 +25,8 @@ - - child_of - user.company_id.id + ['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])] @@ -37,9 +35,7 @@ - - child_of - user.company_id.id + ['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])] diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 7be63508be2..c8af35d8f52 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -206,6 +206,7 @@ + diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml index 9778e607ecf..932dd9ff747 100644 --- a/addons/sale/security/sale_security.xml +++ b/addons/sale/security/sale_security.xml @@ -2,18 +2,30 @@ - - Sale / Manager - - - Sale / Salesman - + + Sale / Manager + + + Sale / Salesman + + + Sale Order multi-company + + + + + + + ['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])] + + + From c2cdc7a56a0327ad1ef00e253079ffe1184d9178 Mon Sep 17 00:00:00 2001 From: fabian Date: Wed, 25 Nov 2009 18:17:35 +0100 Subject: [PATCH 09/11] [IMP] Added group to multicompany users bzr revid: fabian@fabian-openerp-20091125171735-scluytlq387s4va7 --- addons/multi_company/multi_company_demo.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/addons/multi_company/multi_company_demo.xml b/addons/multi_company/multi_company_demo.xml index c7d08e9b1fb..2ceb2fe00e9 100644 --- a/addons/multi_company/multi_company_demo.xml +++ b/addons/multi_company/multi_company_demo.xml @@ -58,30 +58,35 @@ OpenERP Editor editor_demo + sales_demo_us OpenERP Salesman US sales_demo_us + sales_demo_be OpenERP Salesman BE sales_demo_be + sales_demo_in OpenERP Salesman IN sales_demo_in + odoo_demo Odoo odoo_demo + From 54e1058afd0a70fd48e94319d581836cc7efcade Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Wed, 25 Nov 2009 18:50:23 +0100 Subject: [PATCH 10/11] [imp] multi-company groups bzr revid: fp@tinyerp.com-20091125175023-hmi1msewn9ehb3f2 --- addons/account/account_invoice_view.xml | 4 +- addons/account/account_view.xml | 76 +-- addons/account/company_view.xml | 64 +-- addons/account/partner_view.xml | 4 +- addons/account/security/account_security.xml | 67 +-- .../account_analytic_default_view.xml | 4 +- .../crossovered_budget_view.xml | 444 +++++++-------- .../security/account_budget_security.xml | 4 +- addons/account_followup/followup_demo.xml | 6 +- addons/account_followup/followup_view.xml | 5 +- addons/account_voucher/voucher_view.xml | 520 +++++++++--------- .../document/security/document_security.xml | 8 +- addons/hr/hr_department_view.xml | 48 +- addons/hr/hr_view.xml | 2 +- .../hr_timesheet_sheet_view.xml | 2 +- addons/membership/demo_data.xml | 324 +++++------ addons/membership/membership_demo.xml | 324 +++++------ addons/multi_company/multi_company_demo.xml | 324 +++++------ addons/multi_company/multi_company_view.xml | 4 +- addons/product/product_view.xml | 22 +- addons/product/security/product_security.xml | 2 +- addons/project/security/project_security.xml | 48 +- addons/sale/security/sale_security.xml | 40 +- addons/stock/security/stock_security.xml | 12 +- 24 files changed, 1178 insertions(+), 1180 deletions(-) diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index d979262cb4a..84fb0684e3c 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -117,7 +117,7 @@ - + @@ -197,7 +197,7 @@ - + diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index cafaa769163..d034b508f46 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -16,7 +16,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -122,7 +122,7 @@ - + @@ -168,7 +168,7 @@ - + @@ -242,7 +242,7 @@ - + @@ -270,7 +270,7 @@ - + @@ -460,7 +460,7 @@ - + @@ -540,7 +540,7 @@
- + @@ -587,7 +587,7 @@ - + @@ -714,8 +714,8 @@ - - + + @@ -795,22 +795,22 @@ - - + + account.move.line.select account.move.line search - - + + - - - - - - + + + + + + @@ -869,7 +869,7 @@ - + @@ -887,8 +887,8 @@ - - + + @@ -933,21 +933,21 @@ - + account.move.select account.move search - - + + - - - - - - + + + + + + @@ -1107,7 +1107,7 @@ - + @@ -1719,7 +1719,7 @@