From c1e0521566c9c8b893b424f6b03d2ea65d845f55 Mon Sep 17 00:00:00 2001 From: Amit Dodiya Date: Fri, 8 Mar 2013 18:32:27 +0530 Subject: [PATCH 01/16] [FIX]: account: when we create invoice from portal menu got the error becuase in context we have passed list in type so code cannot handle the list bzr revid: ado@tinyerp.com-20130308130227-bvm08cab4gjkco71 --- addons/account/account_invoice.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py index 17135ed1f76..269a2367c5f 100644 --- a/addons/account/account_invoice.py +++ b/addons/account/account_invoice.py @@ -53,9 +53,12 @@ class account_invoice(osv.osv): company_id = context.get('company_id', user.company_id.id) type2journal = {'out_invoice': 'sale', 'in_invoice': 'purchase', 'out_refund': 'sale_refund', 'in_refund': 'purchase_refund'} journal_obj = self.pool.get('account.journal') - res = journal_obj.search(cr, uid, [('type', '=', type2journal.get(type_inv, 'sale')), - ('company_id', '=', company_id)], - limit=1) + domain = [('company_id', '=', company_id)] + if isinstance(type_inv, list): + domain.append(('type', 'in', [type2journal.get(type) for type in type_inv if type2journal.get(type)])) + else: + domain.append(('type', '=', type2journal.get(type_inv, 'sale'))) + res = journal_obj.search(cr, uid, domain, limit=1) return res and res[0] or False def _get_currency(self, cr, uid, context=None): From f97c97d672b4acd8945f5cd0ae97cc4fe68948f6 Mon Sep 17 00:00:00 2001 From: "Pinakin Nayi (OpenERP)" Date: Wed, 13 Mar 2013 12:30:29 +0530 Subject: [PATCH 02/16] [IMP]account_followup,hr_timesheet_sheet:in analysis report create button is there but no need of it bzr revid: pna@tinyerp.com-20130313070029-9ojiilbnl2tn7f3g --- addons/account_followup/report/account_followup_report.xml | 2 +- addons/hr_timesheet_sheet/report/timesheet_report_view.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account_followup/report/account_followup_report.xml b/addons/account_followup/report/account_followup_report.xml index 6fee6a77ac1..b7c38e89f5e 100644 --- a/addons/account_followup/report/account_followup_report.xml +++ b/addons/account_followup/report/account_followup_report.xml @@ -6,7 +6,7 @@ account_followup.stat.tree account_followup.stat - + diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml index aee07fc23b6..ddc66260cf0 100644 --- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml +++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml @@ -16,7 +16,7 @@ timesheet.report.tree timesheet.report - + From 7daa6807eee4835ab892206d4dcf4b5a80e8061f Mon Sep 17 00:00:00 2001 From: "Somesh Khare (OpenERP)" Date: Fri, 15 Mar 2013 14:35:17 +0530 Subject: [PATCH 03/16] [FIX]account_move_line:due to boolean value for journal_id and period_id error occurred (Case: ref 589954) bzr revid: skh@tinyerp.com-20130315090517-84g17n9ax2iijh0j --- addons/account/account_move_line.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index a96ed889aae..06f597768b3 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -1070,12 +1070,12 @@ class account_move_line(osv.osv): for line in self.browse(cr, uid, ids, context=context): ctx = context.copy() - if ('journal_id' not in ctx): + if not ctx.get('journal_id'): if line.move_id: ctx['journal_id'] = line.move_id.journal_id.id else: ctx['journal_id'] = line.journal_id.id - if ('period_id' not in ctx): + if not ctx.get('period_id'): if line.move_id: ctx['period_id'] = line.move_id.period_id.id else: From 52efab6820cabad5c663c39242c7a77991820863 Mon Sep 17 00:00:00 2001 From: Nehal Panchal Date: Tue, 19 Mar 2013 15:12:36 +0530 Subject: [PATCH 04/16] [FIX] warning : changed the inherited view of product form of warning module bzr revid: nep@tinyerp.com-20130319094236-calq1peyb6onmpuz --- addons/warning/warning_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/warning/warning_view.xml b/addons/warning/warning_view.xml index 1df38771e9c..04a35530bd2 100644 --- a/addons/warning/warning_view.xml +++ b/addons/warning/warning_view.xml @@ -41,7 +41,7 @@ product.warning.form.inherit product.product - + From aa9e1d83aeeb85d93716b2daf945d4b45b7a0fa4 Mon Sep 17 00:00:00 2001 From: Rifakat Date: Wed, 20 Mar 2013 17:22:38 +0530 Subject: [PATCH 05/16] [FIX] hr_timesheet_sheet: analytic items created from timesheet line have amount as blank bzr revid: rha@tinyerp.com-20130320115238-ae1w2p6ae0mytmy8 --- .../hr_timesheet_sheet/static/src/js/timesheet.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/addons/hr_timesheet_sheet/static/src/js/timesheet.js b/addons/hr_timesheet_sheet/static/src/js/timesheet.js index fe7d0c82767..6bd1b26bd8a 100644 --- a/addons/hr_timesheet_sheet/static/src/js/timesheet.js +++ b/addons/hr_timesheet_sheet/static/src/js/timesheet.js @@ -175,8 +175,13 @@ openerp.hr_timesheet_sheet = function(instance) { $(this).val(self.sum_box(account, day_count)); } else { account.days[day_count].lines[0].unit_amount += num - self.sum_box(account, day_count); - self.display_totals(); - self.sync(); + var product = (account.days[day_count].lines[0].product_id instanceof Array) ? account.days[day_count].lines[0].product_id[0] : account.days[day_count].lines[0].product_id + var journal = (account.days[day_count].lines[0].journal_id instanceof Array) ? account.days[day_count].lines[0].journal_id[0] : account.days[day_count].lines[0].journal_id + new instance.web.Model("hr.analytic.timesheet").call("on_change_unit_amount", [[], product, account.days[day_count].lines[0].unit_amount, false, false, journal]).then(function(res) { + account.days[day_count].lines[0]['amount'] = res.value.amount || 0; + self.display_totals(); + self.sync(); + }); } }); } else { @@ -282,10 +287,10 @@ openerp.hr_timesheet_sheet = function(instance) { generate_o2m_value: function() { var self = this; var ops = []; - + _.each(self.accounts, function(account) { var auth_keys = _.extend(_.clone(account.account_defaults), { - name: true, unit_amount: true, date: true, account_id:true, + name: true, amount:true, unit_amount: true, date: true, account_id:true, }); _.each(account.days, function(day) { _.each(day.lines, function(line) { From fcedbce385b68f048c3633d13253e5c565293c34 Mon Sep 17 00:00:00 2001 From: "Ravish (Open ERP)" Date: Tue, 26 Mar 2013 11:09:34 +0530 Subject: [PATCH 06/16] [FIX] Entering an analytic account not posible in journal bzr revid: rmu@tinyerp.com-20130326053934-qg2i8g0ezocogfsl --- addons/account_analytic_plans/account_analytic_plans_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account_analytic_plans/account_analytic_plans_view.xml b/addons/account_analytic_plans/account_analytic_plans_view.xml index 3dcbcda6952..d0de19372dd 100644 --- a/addons/account_analytic_plans/account_analytic_plans_view.xml +++ b/addons/account_analytic_plans/account_analytic_plans_view.xml @@ -10,7 +10,7 @@ - + From 5a4dcc4819bbc0ec66663ab7a8865bf27040fe5a Mon Sep 17 00:00:00 2001 From: "Ravish (Open ERP)" Date: Fri, 5 Apr 2013 10:05:10 +0530 Subject: [PATCH 07/16] analytic journal must follow analytical group bzr revid: rmu@tinyerp.com-20130405043510-cxannthx2gkm35a6 --- addons/account/project/project_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index aa567d2fc79..903316ea347 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -361,7 +361,7 @@ - + From 1782b74c84a49e3de6546fd9f8a64bd7ef95618d Mon Sep 17 00:00:00 2001 From: "Foram Katharotiya (OpenERP)" Date: Tue, 7 May 2013 12:40:41 +0530 Subject: [PATCH 08/16] [IMP] set the field property_product_pricelist_purchase in the group_purchase_pricelist bzr revid: fka@tinyerp.com-20130507071041-ubemw9o7dz384bbu --- addons/purchase/partner_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/purchase/partner_view.xml b/addons/purchase/partner_view.xml index 7b03861759a..25aeb3d8119 100644 --- a/addons/purchase/partner_view.xml +++ b/addons/purchase/partner_view.xml @@ -8,7 +8,7 @@ 36 - + From 67c49b597e13e0a7833b4826c493eea1db15f0e0 Mon Sep 17 00:00:00 2001 From: "Foram Katharotiya (OpenERP)" Date: Thu, 9 May 2013 16:00:45 +0530 Subject: [PATCH 09/16] [IMP] made independant purchase pricelist in supplier bzr revid: fka@tinyerp.com-20130509103045-4r7b8kacuy9zaf1e --- addons/product/partner_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/product/partner_view.xml b/addons/product/partner_view.xml index 5117da6044e..95332cf0f32 100644 --- a/addons/product/partner_view.xml +++ b/addons/product/partner_view.xml @@ -8,8 +8,8 @@ - - + +

Pricelists are managed on