From 4ac7245cd19d0004119156523fc9dc06951af5f0 Mon Sep 17 00:00:00 2001 From: Mustufa Rangwala Date: Tue, 19 Oct 2010 10:25:13 +0530 Subject: [PATCH 1/6] [FIX] hr_holidays: Import problem of templates fixed bzr revid: mra@mra-laptop-20101019045513-m1noz76lay02fpdl --- addons/hr_holidays/i18n/hr_holidays.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr_holidays/i18n/hr_holidays.pot b/addons/hr_holidays/i18n/hr_holidays.pot index 17b58d39daf..ca14a6b76c9 100644 --- a/addons/hr_holidays/i18n/hr_holidays.pot +++ b/addons/hr_holidays/i18n/hr_holidays.pot @@ -715,7 +715,7 @@ msgstr "" #. module: hr_holidays #: help:hr.holidays.status,color_name:0 -msgid "This color will be used in the leaves summary located in Reporting\Leaves by Departement" +msgid "This color will be used in the leaves summary located in Reporting\\Leaves by Departement" msgstr "" #. module: hr_holidays From 7604859423abfdf9e74b502298d57ea590d77636 Mon Sep 17 00:00:00 2001 From: "Vir (Open ERP)" Date: Tue, 19 Oct 2010 12:01:32 +0530 Subject: [PATCH 2/6] [Fix] hr_evaluation : date deadline today problem fixed bzr revid: vir@tinyerp.com-20101019063132-zrh9x6zjoj72e6y7 --- addons/hr_evaluation/hr_evaluation.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py index a8b2a3e2c69..3c5a150691e 100644 --- a/addons/hr_evaluation/hr_evaluation.py +++ b/addons/hr_evaluation/hr_evaluation.py @@ -175,7 +175,7 @@ class hr_evaluation(osv.osv): 'progress' : fields.float("Progress"), } _defaults = { - 'date' : lambda *a: (parser.parse(datetime.date.today().strftime('%Y-%m-%d')) + relativedelta(months =+ 1)).strftime('%Y-%m-%d'), + 'date' : lambda *a: (parser.parse(datetime.now().strftime('%Y-%m-%d')) + relativedelta(months =+ 1)).strftime('%Y-%m-%d'), 'state' : lambda *a: 'draft', } @@ -226,7 +226,7 @@ class hr_evaluation(osv.osv): int_id = hr_eval_inter_obj.create(cr, uid, { 'evaluation_id': evaluation.id, 'survey_id': phase.survey_id.id, - 'date_deadline': (parser.parse(datetime.date.today().strftime('%Y-%m-%d')) + relativedelta(months =+ 1)).strftime('%Y-%m-%d'), + 'date_deadline': (parser.parse(datetime.now().strftime('%Y-%m-%d')) + relativedelta(months =+ 1)).strftime('%Y-%m-%d'), 'user_id': child.user_id.id, 'user_to_review_id': evaluation.employee_id.id }, context=context) From c85cbf6db2cf2ce2dbabf0cb3b1194727278c143 Mon Sep 17 00:00:00 2001 From: "Anup (OpenERP)" Date: Tue, 19 Oct 2010 15:48:33 +0530 Subject: [PATCH 3/6] [FIX] fetchmail : SQL query corrected bzr revid: ach@tinyerp.com-20101019101833-0fez00fq3ygkdklt --- addons/fetchmail/fetchmail.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py index 2147d774762..0f58419d1e1 100644 --- a/addons/fetchmail/fetchmail.py +++ b/addons/fetchmail/fetchmail.py @@ -73,7 +73,7 @@ class email_server(osv.osv): def check_duplicate(self, cr, uid, ids): # RFC *-* Why this limitation? why not in SQL constraint? vals = self.read(cr, uid, ids, ['user', 'password'])[0] - cr.execute("select count(id) from email_server where user='%s' and password='%s'", (vals['user'], vals['password'])) + cr.execute("select count(id) from email_server where user=%s and password=%s", (vals['user'], vals['password'])) res = cr.fetchone() if res: if res[0] > 1: From d657c75980cf4ec3f52b2dae4f1666573497aeaf Mon Sep 17 00:00:00 2001 From: "qdp-launchpad@tinyerp.com" <> Date: Tue, 19 Oct 2010 13:59:20 +0200 Subject: [PATCH 4/6] [FIX] mrp, mrp_operations: fixed gantt view and fixed menuitemms consistancy bzr revid: qdp-launchpad@tinyerp.com-20101019115920-h2th5uuvd89dqmfr --- addons/mrp/mrp_view.xml | 23 +++++++++---------- addons/mrp_operations/mrp_operations_view.xml | 18 +++++++++------ 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index b9d333e7c1b..adc517f1b7c 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -200,16 +200,6 @@ - - Work Centers - ir.actions.act_window - mrp.workcenter - form - - - Work Centers allows you to create and manage manufacturing units consisting of one or several people and/or machines that can be considered as a unit for capacity and planning forecasting. - - @@ -314,7 +304,6 @@ Routings allows you to create and manage the manufacturing operations that should be followed within your work centers in order to produce a product. They are attached to bills of materials that will define the required raw materials. - + + Work Centers + ir.actions.act_window + mrp.workcenter + form + + + Work Centers allows you to create and manage manufacturing units consisting of one or several people and/or machines that can be considered as a unit for capacity and planning forecasting. + + - + diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml index 23a351ed3da..5996fe1f258 100644 --- a/addons/mrp_operations/mrp_operations_view.xml +++ b/addons/mrp_operations/mrp_operations_view.xml @@ -181,9 +181,10 @@ mrp.production.workcenter.line gantt - - + + + @@ -219,22 +220,23 @@ mrp.production.workcenter.line gantt - + - - + + + - Resources + Work Centers ir.actions.act_window mrp.production.workcenter.line form [('production_state','in',('ready','confirmed','in_production'))] - gantt + gantt,tree,form,calendar,graph @@ -279,10 +281,12 @@ id="menu_mrp_production_wc_action_planning" action="mrp_production_wc_action_planning" sequence="2" + icon="STOCK_INDENT" groups="base.group_extended"/> From bad70ac4b23ded8020b82c2b092da1dd7367a8aa Mon Sep 17 00:00:00 2001 From: "qdp-launchpad@tinyerp.com" <> Date: Tue, 19 Oct 2010 14:22:53 +0200 Subject: [PATCH 5/6] [IMP] project_long_term: set proper icon on gantt views bzr revid: qdp-launchpad@tinyerp.com-20101019122253-g27bwkxet5glannr --- addons/project_long_term/project_long_term_view.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index 71e96543232..b0647968e84 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -372,10 +372,12 @@ id="menu_project_phase_list" parent="project.menu_project_management" sequence="2"/> Date: Tue, 19 Oct 2010 18:14:35 +0530 Subject: [PATCH 6/6] [FIX] Account : Corrections on onchange which can return None to client bzr revid: jvo@tinyerp.com-20101019124435-fmwxwn53hri4s93z --- addons/account/account_analytic_line.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py index f3c2b71122f..633cb09d976 100644 --- a/addons/account/account_analytic_line.py +++ b/addons/account/account_analytic_line.py @@ -110,7 +110,7 @@ class account_analytic_line(osv.osv): amount_unit = prod.price_get('list_price', context)[prod_id] if not company_id: - company_id=company_obj._company_default_get(cr, uid, 'account.analytic.line', context) + company_id = company_obj._company_default_get(cr, uid, 'account.analytic.line', context=context) flag = False # Compute based on pricetype product_price_type_ids = product_price_type_obj.search(cr, uid, [('field','=','standard_price')], context) @@ -130,9 +130,9 @@ class account_analytic_line(osv.osv): result = round(amount, prec) if not flag: result *= -1 - return {'value': { - 'amount': result, - 'general_account_id': a, + return {'value': { + 'amount': result, + 'general_account_id': a, } }