From 27dc3f030a4f3e1c82ed2db52bfd426a2baf309f Mon Sep 17 00:00:00 2001 From: "uco (Open ERP)" Date: Mon, 27 Sep 2010 17:48:54 +0530 Subject: [PATCH 1/4] [IMP] account,auction,purchase: Warnings corrected. bzr revid: uco@tinyerp.com-20100927121854-213rc5ubnfnonet3 --- .../account/project/report/analytic_balance.py | 4 +--- addons/auction/auction.py | 1 - addons/purchase/test/procurement_buy.yml | 16 +++++++++------- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/addons/account/project/report/analytic_balance.py b/addons/account/project/report/analytic_balance.py index 780c519c1d4..58849479445 100644 --- a/addons/account/project/report/analytic_balance.py +++ b/addons/account/project/report/analytic_balance.py @@ -19,7 +19,6 @@ # ############################################################################## -import pooler import time from report import report_sxw @@ -43,7 +42,6 @@ class account_analytic_balance(report_sxw.rml_parse): self.acc_sum_list = []# maintains a list of all ids def get_children(self, ids): - ids2 = [] read_data = self.pool.get('account.analytic.account').read(self.cr, self.uid, ids,['child_ids','code','complete_name','balance']) for data in read_data: if (data['id'] not in self.acc_ids): @@ -54,7 +52,7 @@ class account_analytic_balance(report_sxw.rml_parse): self.acc_ids.append(data['id']) self.read_data.append(data) if data['child_ids']: - res = self.get_children(data['child_ids']) + self.get_children(data['child_ids']) return True diff --git a/addons/auction/auction.py b/addons/auction/auction.py index a1fb726339e..a024528bc89 100644 --- a/addons/auction/auction.py +++ b/addons/auction/auction.py @@ -655,7 +655,6 @@ class auction_lots(osv.osv): if lot.bord_vnd_id.id in invoices: inv_id = invoices[lot.bord_vnd_id.id] else: - res = partner_obj.address_get(cr, uid, [lot.bord_vnd_id.partner_id.id], ['contact', 'invoice']) inv = { 'name': 'Auction:' +lot.name, 'journal_id': lot.auction_id.journal_seller_id.id, diff --git a/addons/purchase/test/procurement_buy.yml b/addons/purchase/test/procurement_buy.yml index 99fe1a2eb4d..883e47c3843 100644 --- a/addons/purchase/test/procurement_buy.yml +++ b/addons/purchase/test/procurement_buy.yml @@ -50,7 +50,9 @@ - I run the scheduler. - - !workflow {model: procurement.order, action: button_check, ref: procurement_order_testcase0} + !function {model: procurement.order, name: run_scheduler}: + - model: procurement.order + search: "[]" - I check that purchase order is generated. - @@ -81,11 +83,11 @@ !python {model: stock.picking }: | import time procurement_obj = self.pool.get('procurement.order') - proc_ids = procurement_obj.browse(cr, uid, [ref('procurement_order_testcase0')])[0] - picking_id = self.search(cr, uid, [('origin', '=', proc_ids.purchase_id.name)]) - if picking_id: - pick=self.browse(cr,uid,picking_id[0]) - move =pick.move_lines[0] + proc_ids = procurement_obj.browse(cr, uid, [ref('procurement_order_testcase0')])[0] + picking_ids = self.search(cr, uid, [('origin', '=', proc_ids.purchase_id.name),('type','=','in')]) + for picking_id in picking_ids: + pick=self.browse(cr, uid, picking_id) + move = pick.move_lines[0] partial_datas = { 'partner_id':pick.address_id.partner_id.id, 'address_id': pick.address_id.id, @@ -96,7 +98,7 @@ 'product_qty': move.product_qty, 'product_uom': move.product_uom.id, } - self.do_partial(cr, uid, picking_id,partial_datas) + self.do_partial(cr, uid, [pick.id], partial_datas) - I confirm the Reservation. - From 9f88bde3ce7b031a0902d8dad009d8246f3af984 Mon Sep 17 00:00:00 2001 From: "uco (Open ERP)" Date: Mon, 27 Sep 2010 18:03:38 +0530 Subject: [PATCH 2/4] [FIX] point_of_sale: Close cashbox report error corrected. bzr revid: uco@tinyerp.com-20100927123338-c8bmbapxiv30e3a5 --- .../report/all_closed_cashbox_of_the_day.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py index 8ec13ede5f5..e4e5e4502a0 100644 --- a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py +++ b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py @@ -91,13 +91,13 @@ class all_closed_cashbox_of_the_day(report_sxw.rml_parse): return False def _get_partner(self,statement): res = {} - sql =""" select rp.name from account_bank_statement_line as absl,res_partner as rp - where absl.partner_id = rp.id - and absl.pos_statement_id = %d"""%(statement['pos_statement_id']) - self.cr.execute(sql) - res = self.cr.dictfetchall() - if res : - return res[0]['name'] + if statement['pos_statement_id']: + sql =""" select rp.name from account_bank_statement_line as absl,res_partner as rp + where absl.partner_id = rp.id + and absl.pos_statement_id = %d"""%(statement['pos_statement_id']) + self.cr.execute(sql) + res = self.cr.dictfetchall() or {} + return res and res[0]['name'] else : return 0.00 From 65e05b920a9b3b1e3dee7d32b153788f36682647 Mon Sep 17 00:00:00 2001 From: "uco (Open ERP)" Date: Mon, 27 Sep 2010 18:08:20 +0530 Subject: [PATCH 3/4] [IMP] auction: Removed unused variable suggested by buildbot. bzr revid: uco@tinyerp.com-20100927123820-i7vg9ng178g3k6p8 --- addons/auction/auction.py | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/auction/auction.py b/addons/auction/auction.py index a024528bc89..834e7e9b150 100644 --- a/addons/auction/auction.py +++ b/addons/auction/auction.py @@ -646,7 +646,6 @@ class auction_lots(osv.osv): if not context: context={} inv_ref=self.pool.get('account.invoice') - partner_obj = self.pool.get('res.partner') inv_line_obj = self.pool.get('account.invoice.line') wf_service = netsvc.LocalService('workflow') for lot in self.browse(cr, uid, ids, context): From a464eee9baf3d705e46377e1f5bab74ba96086f7 Mon Sep 17 00:00:00 2001 From: "uco (Open ERP)" Date: Mon, 27 Sep 2010 18:30:34 +0530 Subject: [PATCH 4/4] [IMP] purchase: yaml logic improved. bzr revid: uco@tinyerp.com-20100927130034-muoj2nnvohgaja75 --- addons/purchase/test/procurement_buy.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/addons/purchase/test/procurement_buy.yml b/addons/purchase/test/procurement_buy.yml index 883e47c3843..4f28ccfafcf 100644 --- a/addons/purchase/test/procurement_buy.yml +++ b/addons/purchase/test/procurement_buy.yml @@ -84,13 +84,13 @@ import time procurement_obj = self.pool.get('procurement.order') proc_ids = procurement_obj.browse(cr, uid, [ref('procurement_order_testcase0')])[0] - picking_ids = self.search(cr, uid, [('origin', '=', proc_ids.purchase_id.name),('type','=','in')]) - for picking_id in picking_ids: - pick=self.browse(cr, uid, picking_id) - move = pick.move_lines[0] + picking_ids = self.search(cr, uid, [('purchase_id', '=', proc_ids.purchase_id.id),('type','=','in')]) + pickings = self.browse(cr, uid, picking_ids) + for picking in pickings: + move = picking.move_lines[0] partial_datas = { - 'partner_id':pick.address_id.partner_id.id, - 'address_id': pick.address_id.id, + 'partner_id': picking.address_id.partner_id.id, + 'address_id': picking.address_id.id, 'delivery_date' : time.strftime('%Y-%m-%d') } partial_datas['move%s'%(move.id)]= { @@ -98,7 +98,7 @@ 'product_qty': move.product_qty, 'product_uom': move.product_uom.id, } - self.do_partial(cr, uid, [pick.id], partial_datas) + self.do_partial(cr, uid, [picking.id], partial_datas) - I confirm the Reservation. -