From 26bb219a74ca586de0f935e544991a9202da311f Mon Sep 17 00:00:00 2001 From: Numerigraphe - Lionel Sausin Date: Wed, 24 Mar 2010 17:12:16 +0100 Subject: [PATCH 1/8] [IMP] wording: "customize" intead of "customise" lp bug: https://launchpad.net/bugs/546138 fixed bzr revid: ls@numerigraphe.fr-20100324161216-uvzz3vrr3s3vth5e --- bin/osv/orm.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/osv/orm.py b/bin/osv/orm.py index 165b9a21137..bcd05438a7b 100644 --- a/bin/osv/orm.py +++ b/bin/osv/orm.py @@ -1222,7 +1222,7 @@ class orm_template(object): for field in fields_def: if field == 'id': - # sometime, the view may containt the (invisible) field 'id' needed for a domain (when 2 objects have cross references) + # sometime, the view may contain the (invisible) field 'id' needed for a domain (when 2 objects have cross references) fields['id'] = {'readonly': True, 'type': 'integer', 'string': 'ID'} elif field in fields: fields[field].update(fields_def[field]) @@ -1232,7 +1232,7 @@ class orm_template(object): model = res[0][1] res.insert(0, ("Can't find field '%s' in the following view parts composing the view of object model '%s':" % (field, model), None)) msg = "\n * ".join([r[0] for r in res]) - msg += "\n\nEither you wrongly customised this view, or some modules bringing those views are not compatible with your current data model" + msg += "\n\nEither you wrongly customized this view, or some modules bringing those views are not compatible with your current data model" netsvc.Logger().notifyChannel('orm', netsvc.LOG_ERROR, msg) raise except_orm('View error', msg) return arch, fields From 25a424a89d32e4485ae1e120c1d8b2ada216800e Mon Sep 17 00:00:00 2001 From: Numerigraphe - Lionel Sausin Date: Wed, 24 Mar 2010 17:32:22 +0100 Subject: [PATCH 2/8] [REF] 'children' instead of 'childs' lp bug: https://launchpad.net/bugs/327259 fixed bzr revid: ls@numerigraphe.fr-20100324163222-dj03gxme8sawtdmz --- bin/addons/base/module/module.py | 4 ++-- bin/osv/orm.py | 10 +++++----- bin/report/print_xml.py | 2 +- bin/report/render/rml2pdf/trml2pdf.py | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/bin/addons/base/module/module.py b/bin/addons/base/module/module.py index 01ea8cc0745..223a9ac1e42 100644 --- a/bin/addons/base/module/module.py +++ b/bin/addons/base/module/module.py @@ -46,8 +46,8 @@ class module_category(osv.osv): result = dict(cr.fetchall()) for id in ids: cr.execute('select id from ir_module_category where parent_id=%s', (id,)) - childs = [c for c, in cr.fetchall()] - result[id] = reduce(lambda x,y:x+y, [result.get(c, 0) for c in childs], result.get(id, 0)) + children = [c for c, in cr.fetchall()] + result[id] = reduce(lambda x,y:x+y, [result.get(c, 0) for c in children], result.get(id, 0)) return result _columns = { diff --git a/bin/osv/orm.py b/bin/osv/orm.py index bcd05438a7b..3d2e3d7a748 100644 --- a/bin/osv/orm.py +++ b/bin/osv/orm.py @@ -1085,7 +1085,7 @@ class orm_template(object): context = {} result = False fields = {} - childs = True + children = True if node.tag == 'field': if node.get('name'): @@ -1100,7 +1100,7 @@ class orm_template(object): if column: relation = column._obj - childs = False + children = False views = {} for f in node: if f.tag in ('form', 'tree', 'graph'): @@ -1159,7 +1159,7 @@ class orm_template(object): if trans: node.set('sum', trans) - if childs: + if children: for f in node: fields.update(self.__view_look_dom(cr, user, f, view_id, context)) @@ -1966,8 +1966,8 @@ class orm(orm_template): where += ' order by '+self._parent_order cr.execute('SELECT id FROM '+self._table+' WHERE '+where) pos2 = pos + 1 - childs = cr.fetchall() - for id in childs: + children = cr.fetchall() + for id in children: pos2 = browse_rec(id[0], pos2) cr.execute('update '+self._table+' set parent_left=%s, parent_right=%s where id=%s', (pos,pos2,root)) return pos2+1 diff --git a/bin/report/print_xml.py b/bin/report/print_xml.py index 2c24d3766f3..a45270447e1 100644 --- a/bin/report/print_xml.py +++ b/bin/report/print_xml.py @@ -253,7 +253,7 @@ class document(object): for el_cld in node: self.parse_node(el_cld, el, v) else: - # if there is no "type" attribute in the node, copy it to the xml data and parse its childs + # if there is no "type" attribute in the node, copy it to the xml data and parse its children if not node.tag == etree.Comment: if node.tag == parent.tag: el = parent diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py index 0574f563c90..02352b44cc7 100644 --- a/bin/report/render/rml2pdf/trml2pdf.py +++ b/bin/report/render/rml2pdf/trml2pdf.py @@ -489,8 +489,8 @@ class _rml_flowable(object): return rc1 def _table(self, node): - childs = utils._child_get(node,self,'tr') - if not childs: + children = utils._child_get(node,self,'tr') + if not children: return None length = 0 colwidths = None @@ -498,7 +498,7 @@ class _rml_flowable(object): data = [] styles = [] posy = 0 - for tr in childs: + for tr in children: paraStyle = None if tr.get('style'): st = copy.deepcopy(self.styles.table_styles[tr.get('style')]) From 5905b3ecf05702494c71992beca0ab1505afcf0d Mon Sep 17 00:00:00 2001 From: Numerigraphe - Lionel Sausin Date: Mon, 25 Oct 2010 10:52:22 +0200 Subject: [PATCH 3/8] [IMP] wording: children intead of childs (again) bzr revid: ls@numerigraphe.fr-20101025085222-pm6ovutgvb0jg3af --- bin/osv/orm.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/osv/orm.py b/bin/osv/orm.py index bffe82dc913..337b14152fd 100644 --- a/bin/osv/orm.py +++ b/bin/osv/orm.py @@ -4151,9 +4151,9 @@ class orm(orm_template): old_record, new_record = self.read(cr, uid, [old_id, new_id], [field_name], context=context) # here we rely on the order of the ids to match the translations # as foreseen in copy_data() - old_childs = sorted(old_record[field_name]) - new_childs = sorted(new_record[field_name]) - for (old_child, new_child) in zip(old_childs, new_childs): + old_children = sorted(old_record[field_name]) + new_children = sorted(new_record[field_name]) + for (old_child, new_child) in zip(old_children, new_children): # recursive copy of translations here target_obj.copy_translations(cr, uid, old_child, new_child, context=context) # and for translatable fields we keep them for copy From d2aa564115bc114cedde57ec101ce843c11115c8 Mon Sep 17 00:00:00 2001 From: "Vir (Open ERP)" Date: Fri, 12 Nov 2010 11:53:46 +0530 Subject: [PATCH 4/8] [ADD] hr, hr_timesheet_sheet, email_template, marketing_campaing : Tooltip added for menus bzr revid: vir@tinyerp.com-20101112062346-spehxiz822n6l1o0 --- addons/email_template/email_template_mailbox_view.xml | 1 + addons/hr/hr_view.xml | 4 ++-- addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml | 2 +- addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml | 1 + addons/marketing_campaign/marketing_campaign_view.xml | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/addons/email_template/email_template_mailbox_view.xml b/addons/email_template/email_template_mailbox_view.xml index 38757ba7d68..8f4d1fc8d60 100644 --- a/addons/email_template/email_template_mailbox_view.xml +++ b/addons/email_template/email_template_mailbox_view.xml @@ -106,6 +106,7 @@ tree,form {'group_by': [], 'search_default_outbox': 1} + An email template is an email document that will be sent as part of a marketing campaign. You can personalize it based on specific customer profile fields so that their names or other partner related information can be automatically inserted in it. diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index e4bdad2c3d1..ce0a7193683 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -150,7 +150,7 @@ {"search_default_department_id": department_id,"search_default_active":eval('True')} - The employee directory contains all data related to your employees : from their photo up to their hourly estimated costs for the timesheets.Employees are managed by departments and can be linked to users to manage their access rights. + Here you can manage your work force by creating employees and assigning them specific properties in the system. Maintain all employee related information and keep track of anything that needs to be recorded for them. The personal information tab will help you maintain their identity data. The Categories tab gives you the opportunity to assign them related employee categories depending on their position and activities within the company. A category can be a seniority level within the company or a department. The Timesheets tab allows to assign them a specific timesheet and analytic journal where they will be able to enter time through the system. In the note tab, you can enter text data that should be recorded for a specific employee. @@ -401,7 +401,7 @@ tree,form {"search_default_Current":1,"search_default_department_id": department_id} - Job Positions are used to define the jobs, the requirements. You can attach a survey to a job position. This survey will be used in the recruitement process to evaluate the applicants for this job position. + JJob Positions is used to define jobs and their requirements. You can attach a survey to a job position. This survey will be used in the recruitment process to evaluate the applicants for this job position. diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml index 644db3a8ce0..08fda12c073 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml @@ -174,7 +174,7 @@ {'search_default_my_timesheet':1, } - Employees can encode their time spent on the different projects. A project is an analytic account and the time spent on a project generate costs on the analytic account. + This view allows you to check timesheet sheets following a specific period. You can also encode time spent on a project that is an analytic account and the time spent on a project generate costs on the analytic account. diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml index 36ea5b6418a..52147d062ac 100644 --- a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml +++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml @@ -91,6 +91,7 @@ form tree,graph {'search_default_month':1,'search_default_group_user_id':1,'group_by_no_leaf':1,'group_by':[]} + This report performs analysis on timesheets created by your human resources in the system. It allows you to have a full overview of entries done by your employees. You can group them by specific selection criteria thanks to the search tool. {'group_by': []} - Campaigns are used to tag the source of the new business opportunities or leads. They are mainly used for reporting on the performance of each marketing campaign. + A marketing campaign is an event or activity that will help you manage and reach your partners with specific messages. A campaign can have many activities that will be triggered based on a specific situation. One possible action could be sending an email template that has previously been created in the system. From 0a25c19e16db044c4b67bb0f9b4dd3bac9417bfe Mon Sep 17 00:00:00 2001 From: "Vir (Open ERP)" Date: Fri, 12 Nov 2010 12:14:18 +0530 Subject: [PATCH 5/8] [ADD] Tooltip added for menus bzr revid: vir@tinyerp.com-20101112064418-5s3k5okwpzvytuya --- bin/addons/base/ir/ir.xml | 4 ++++ bin/addons/base/module/module_view.xml | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml index e3475faf721..1ee2700ae2e 100644 --- a/bin/addons/base/ir/ir.xml +++ b/bin/addons/base/ir/ir.xml @@ -716,6 +716,7 @@ form + Create and manage users that will connect to the system. Users can be deactivated should there be a period of time during which they will/should not connect to the system. You can assign them groups in order to give them specific access to the applications they need to use in the system. @@ -757,6 +758,7 @@ ir.actions.act_window res.groups form + A group is a set of functional areas that will be assigned to the user in order to give them access and rights to specific applications and tasks in the system. You can create custom groups or edit the ones existing by default in order to customize the view of the menu that users will be able to see. Whether they can have a read, write, create and delete access right can be managed from here. @@ -844,6 +846,7 @@ ir.actions.act_window ir.ui.view + Views allows you to personalize each view of OpenERP. You can add new fields, move fields, rename them or delete the ones that you do not need. @@ -1403,6 +1406,7 @@ form + Manage and customize the items available and displayed in your OpenERP system menu. You can delete an item by clicking on the box at the beginning of each line and then delete it through the button that appeared. Items can be assigned to specific groups in order to make them accessible to some users within the system. diff --git a/bin/addons/base/module/module_view.xml b/bin/addons/base/module/module_view.xml index 7a303b9a9ae..2d391cdd8e6 100644 --- a/bin/addons/base/module/module_view.xml +++ b/bin/addons/base/module/module_view.xml @@ -68,7 +68,6 @@ form tree,form [('category_id','=',active_id)] - @@ -169,7 +168,8 @@ form tree,form - + + List all certified modules available to configure your OpenERP. Modules that are installed are flagged as such. You can search for a specific module using the name or the description of the module. You do not need to install modules one by one, you can install many at the same time by clicking on the schedule button in this list. Then, apply the schedule upgrade from Action menu once for all the ones you have scheduled for installation. From 7b05292497e00111550fd69cede56ef7b1c6535e Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 12 Nov 2010 11:41:14 +0100 Subject: [PATCH 6/8] [IMP] simplify summing operation (sum builtin was added in 2.3) bzr revid: xmo@openerp.com-20101112104114-mdooszav0ox220nb --- bin/addons/base/module/module.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/addons/base/module/module.py b/bin/addons/base/module/module.py index 3dcd5b550c9..81985332157 100644 --- a/bin/addons/base/module/module.py +++ b/bin/addons/base/module/module.py @@ -53,7 +53,8 @@ class module_category(osv.osv): result = dict(cr.fetchall()) for id in ids: cr.execute('select id from ir_module_category where parent_id=%s', (id,)) - result[id] = reduce(lambda x,y:x+y, [result.get(c, 0) for (c,) in cr.fetchall()], result.get(id, 0)) + result[id] = sum([result.get(c, 0) for (c,) in cr.fetchall()], + result.get(id, 0)) return result _columns = { From cc0d270bab0d0b7862430c3e527f7edc02d1d587 Mon Sep 17 00:00:00 2001 From: "Vir (Open ERP)" Date: Fri, 12 Nov 2010 16:38:42 +0530 Subject: [PATCH 7/8] [ADD] Tooltip added for menus bzr revid: vir@tinyerp.com-20101112110842-ullxl4irgdcv0xvg --- bin/addons/base/ir/ir.xml | 1 + bin/addons/base/module/wizard/base_import_language_view.xml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml index 1ee2700ae2e..9c8ec022d4a 100644 --- a/bin/addons/base/ir/ir.xml +++ b/bin/addons/base/ir/ir.xml @@ -705,6 +705,7 @@ ir.actions.act_window res.company form + Create and manage the companies that will be managed by OpenERP from here. Shops or subsidiaries can be created and maintained from here. diff --git a/bin/addons/base/module/wizard/base_import_language_view.xml b/bin/addons/base/module/wizard/base_import_language_view.xml index c7cdac663b5..d313afc4080 100644 --- a/bin/addons/base/module/wizard/base_import_language_view.xml +++ b/bin/addons/base/module/wizard/base_import_language_view.xml @@ -22,6 +22,8 @@ +