From 61a3238d978ab40e661974dc2b75fbda700f7c70 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Mon, 11 Jun 2012 16:20:38 +0530 Subject: [PATCH 01/42] [FIX]stock: fix the issue of counting of Deliveries in kanban view and improve a action string lp bug: https://launchpad.net/bugs/1011541 fixed bzr revid: mma@tinyerp.com-20120611105038-wrospxpjr2wbna6h --- addons/stock/product.py | 2 +- addons/stock/product_view.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/stock/product.py b/addons/stock/product.py index 62fdbb24ca2..9f9faa1cc24 100644 --- a/addons/stock/product.py +++ b/addons/stock/product.py @@ -44,7 +44,7 @@ class product_product(osv.osv): ], ['product_id'], ['product_id']) for move in moves: product_id = move['product_id'][0] - res[product_id]['reception_count'] = move['product_id_count'] + res[product_id]['delivery_count'] = move['product_id_count'] return res def get_product_accounts(self, cr, uid, product_id, context=None): diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml index 49e0e9c1880..e1840ac7497 100644 --- a/addons/stock/product_view.xml +++ b/addons/stock/product_view.xml @@ -140,7 +140,7 @@ - Receive Products + Deliver Products stock.move ir.actions.act_window form From 344ddfbdd5fcf2ff6f22a76f5aa405e8ebeee185 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Tue, 19 Jun 2012 11:54:26 +0530 Subject: [PATCH 02/42] [FIX]base:fix the issue of KeyError when changes in line of Journal Entry lp bug: https://launchpad.net/bugs/955910 fixed bzr revid: mma@tinyerp.com-20120619062426-x5ykv2thycvpvs4l --- addons/account/account.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/account.py b/addons/account/account.py index f0c16d8586c..a441a262003 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -1363,7 +1363,7 @@ class account_move(osv.osv): balance = 0.0 for line in line_ids: if line[2]: - balance += (line[2]['debit'] or 0.00)- (line[2]['credit'] or 0.00) + balance += (line[2].get('debit',0.00)- (line[2].get('credit',0.00))) return {'value': {'balance': balance}} def write(self, cr, uid, ids, vals, context=None): From c895c53341c21a06d6a00bfb7045b1353d708d3d Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Mon, 3 Sep 2012 15:01:27 +0530 Subject: [PATCH 03/42] [IMP] crm, project, hr_recruitment: made stages accute on view according to state bzr revid: cha@tinyerp.com-20120903093127-vao5eoi61is1pqfx --- addons/crm/crm_lead.py | 2 +- addons/hr_recruitment/hr_recruitment.py | 2 +- addons/hr_recruitment/hr_recruitment_view.xml | 2 +- addons/project/project.py | 2 +- addons/project/project_view.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index 25a47ecbadc..8f857c28556 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -213,7 +213,7 @@ class crm_lead(base_stage, osv.osv): 'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True), 'date_closed': fields.datetime('Closed', readonly=True), 'stage_id': fields.many2one('crm.case.stage', 'Stage', - domain="['&', '|', ('section_ids', '=', section_id), ('case_default', '=', True), '|', ('type', '=', type), ('type', '=', 'both')]"), + domain="['&', '|', ('section_ids', '=', section_id), ('case_default', '=', True), '&', ('fold', '=', False), '|', ('type', '=', type), ('type', '=', 'both')]"), 'user_id': fields.many2one('res.users', 'Salesperson'), 'referred': fields.char('Referred By', size=64), 'date_open': fields.datetime('Opened', readonly=True), diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py index 6b4839b7b2b..2a3fab58730 100644 --- a/addons/hr_recruitment/hr_recruitment.py +++ b/addons/hr_recruitment/hr_recruitment.py @@ -185,7 +185,7 @@ class hr_applicant(base_stage, osv.Model): 'create_date': fields.datetime('Creation Date', readonly=True, select=True), 'write_date': fields.datetime('Update Date', readonly=True), 'stage_id': fields.many2one ('hr.recruitment.stage', 'Stage', - domain="['|', ('department_id', '=', department_id), ('department_id', '=', False)]"), + domain="['&', ('fold', '=', False), '|', ('department_id', '=', department_id), ('department_id', '=', False)]"), 'state': fields.related('stage_id', 'state', type="selection", store=True, selection=AVAILABLE_STATES, string="State", readonly=True, help='The state is set to \'Draft\', when a case is created.\ diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml index d1866f124af..8fd2db3425a 100644 --- a/addons/hr_recruitment/hr_recruitment_view.xml +++ b/addons/hr_recruitment/hr_recruitment_view.xml @@ -107,7 +107,7 @@