From f5e7d53bcec4e0488656e0be0144b4b9a4ec8930 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Tue, 7 Aug 2012 18:12:02 +0200 Subject: [PATCH 1/8] [IMP] tools.reference_re: support matching model name as well bzr revid: odo@openerp.com-20120807161202-jav73f2kj86pzil4 --- openerp/tools/misc.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/openerp/tools/misc.py b/openerp/tools/misc.py index 3aad91fb7b8..e90fadf0492 100644 --- a/openerp/tools/misc.py +++ b/openerp/tools/misc.py @@ -279,7 +279,11 @@ email_re = re.compile(r""" """, re.VERBOSE) res_re = re.compile(r"\[([0-9]+)\]", re.UNICODE) command_re = re.compile("^Set-([a-z]+) *: *(.+)$", re.I + re.UNICODE) -reference_re = re.compile("<.*-open(?:object|erp)-(\\d+).*@(.*)>", re.UNICODE) + +# Updated in 7.0 to match the model name as well +# Typical form of references is +# group(1) = the record ID ; group(2) = the model (if any) ; group(3) = the domain +reference_re = re.compile("<.*-open(?:object|erp)-(\\d+)(?:-([\w.]+))?.*@(.*)>", re.UNICODE) def html2plaintext(html, body_id=None, encoding='utf-8'): """ From an HTML text, convert the HTML to plain text. From f1ad3cfdee0b9935279a86d11fc43a2c3e371aa3 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Tue, 7 Aug 2012 18:22:16 +0200 Subject: [PATCH 2/8] [IMP] employee view bzr revid: fp@tinyerp.com-20120807162216-b1uemxzhcd9t2eto --- addons/hr/hr.py | 2 +- addons/hr/hr_view.xml | 26 ++++++++++++-------------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/addons/hr/hr.py b/addons/hr/hr.py index 63269aee0b0..db7b0eb18d8 100644 --- a/addons/hr/hr.py +++ b/addons/hr/hr.py @@ -175,7 +175,7 @@ class hr_employee(osv.osv): 'work_location': fields.char('Office Location', size=32), 'notes': fields.text('Notes'), 'parent_id': fields.many2one('hr.employee', 'Manager'), - 'category_ids': fields.many2many('hr.employee.category', 'employee_category_rel', 'emp_id', 'category_id', 'Categories'), + 'category_ids': fields.many2many('hr.employee.category', 'employee_category_rel', 'emp_id', 'category_id', 'Tags'), 'child_ids': fields.one2many('hr.employee', 'parent_id', 'Subordinates'), 'resource_id': fields.many2one('resource.resource', 'Resource', ondelete='cascade', required=True), 'coach_id': fields.many2one('hr.employee', 'Coach'), diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index 5f07df3dea0..39d8657e5e0 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -25,35 +25,33 @@
- - - - - - + + + + + + From 4935ac73954407b8cea6db72360925c71426a16c Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Tue, 7 Aug 2012 19:11:01 +0200 Subject: [PATCH 3/8] [IMP] subtotal visible on SO lines bzr revid: fp@tinyerp.com-20120807171101-4cg1ivz0dksug05t --- addons/account/res_config_view.xml | 2 +- addons/sale/sale_view.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml index d19a5dc5f98..ebcd99a6915 100644 --- a/addons/account/res_config_view.xml +++ b/addons/account/res_config_view.xml @@ -43,7 +43,7 @@ - +