From f2836bbb5f0a3050e7fd7f29935ff00fa2a46563 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Thu, 22 Dec 2011 12:35:17 +0530 Subject: [PATCH 1/6] [ADD] added carrier_cost_delivery.yml in delivery module bzr revid: tpa@tinyerp.com-20111222070517-tzkg4mvdtt93t6re --- addons/delivery/__openerp__.py | 5 ++++- addons/delivery/test/carrier_cost_delivery.yml | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 addons/delivery/test/carrier_cost_delivery.yml diff --git a/addons/delivery/__openerp__.py b/addons/delivery/__openerp__.py index 40dab751f79..301f98cc5b9 100644 --- a/addons/delivery/__openerp__.py +++ b/addons/delivery/__openerp__.py @@ -44,7 +44,10 @@ When creating invoices from picking, OpenERP is able to add and compute the ship 'partner_view.xml' ], 'demo_xml': ['delivery_demo.xml'], - 'test':['test/delivery_report.yml'], + 'test':[ + 'test/delivery_report.yml', + 'test/carrier_cost_delivery.yml', + ], 'installable': True, 'active': False, 'certificate': '0033981912253', diff --git a/addons/delivery/test/carrier_cost_delivery.yml b/addons/delivery/test/carrier_cost_delivery.yml new file mode 100644 index 00000000000..f6ed9c2395b --- /dev/null +++ b/addons/delivery/test/carrier_cost_delivery.yml @@ -0,0 +1,14 @@ +- + IN order to test carrier cost on delivery, +- + I add delivery cost in sale order. +- + !python {model: delivery.sale.order}: | + new_id = self.create(cr ,uid ,{"carrier_id": ref("delivery_carrier")}) + self.delivery_set(cr, uid, [new_id], {'active_id': ref("sale.order")}) +- + I check Delivery cost is added properly or not. +- + !python {model: sale.order.line}: | + line_ids = self.search(cr, uid, [('order_id','=', ref('sale.order')), ('name','=','The Poste')]) + assert len(line_ids), "Delivery cost is not Added" \ No newline at end of file From 27714f2fd27485600803a167a9a58eb0cfa628f4 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Fri, 23 Dec 2011 12:23:54 +0530 Subject: [PATCH 2/6] [IMP]Improved YML test cases of delivery module bzr revid: tpa@tinyerp.com-20111223065354-avs0gandnbflwd13 --- addons/delivery/delivery_demo.xml | 2 +- .../delivery/test/carrier_cost_delivery.yml | 49 +++++++++++++++++-- 2 files changed, 46 insertions(+), 5 deletions(-) diff --git a/addons/delivery/delivery_demo.xml b/addons/delivery/delivery_demo.xml index 94666efb26c..8ec95f14e40 100644 --- a/addons/delivery/delivery_demo.xml +++ b/addons/delivery/delivery_demo.xml @@ -58,7 +58,7 @@ >= price - + diff --git a/addons/delivery/test/carrier_cost_delivery.yml b/addons/delivery/test/carrier_cost_delivery.yml index f6ed9c2395b..e1e4c3e662c 100644 --- a/addons/delivery/test/carrier_cost_delivery.yml +++ b/addons/delivery/test/carrier_cost_delivery.yml @@ -1,14 +1,55 @@ - - IN order to test carrier cost on delivery, + In order to test Carrier Cost on Delivery, - - I add delivery cost in sale order. + I Create Delivery Method. +- + !record {model: delivery.carrier, id: delivery_carrier}: + use_detailed_pricelist: True +- + I Set Delivery Method in Sale order. +- + !record {model: sale.order, id: sale.order}: + carrier_id: delivery_carrier + partner_order_id: base.res_partner_address_8 +- + I add Delivery Cost in Sale order. - !python {model: delivery.sale.order}: | new_id = self.create(cr ,uid ,{"carrier_id": ref("delivery_carrier")}) - self.delivery_set(cr, uid, [new_id], {'active_id': ref("sale.order")}) + id = self.delivery_set(cr, uid, [new_id], {'active_ids': [ref("sale.order")]}) - I check Delivery cost is added properly or not. - !python {model: sale.order.line}: | line_ids = self.search(cr, uid, [('order_id','=', ref('sale.order')), ('name','=','The Poste')]) - assert len(line_ids), "Delivery cost is not Added" \ No newline at end of file + assert len(line_ids), "Delivery cost is not Added" + + line_data = self.browse(cr ,uid ,line_ids[0] ,context) + assert line_data.price_subtotal == 10, "Added Delivey cost is wrong." +- + I set max limit for Delivery cost of Sale order cost will more than max limet then Delivery cost will 0.0. +- + !record {model: delivery.carrier, id: delivery_carrier}: + free_if_more_than: True + amount: 1000 +- + I Set Delivery Method in Sale order of cost of more than max limit. +- + !record {model: sale.order, id: sale.order2}: + carrier_id: delivery_carrier + partner_order_id: base.res_partner_address_8 +- + I add Delivery Cost in Sale order. +- + !python {model: delivery.sale.order}: | + new_id = self.create(cr ,uid ,{"carrier_id": ref("delivery_carrier")}) + self.delivery_set(cr, uid, [new_id], {'active_ids': [ref("sale.order2")]}) +- + I check Delivery cost is added properly or not. +- + !python {model: sale.order.line}: | + line_ids = self.search(cr, uid, [('order_id','=', ref('sale.order2')), ('name','=','The Poste')]) + assert len(line_ids), "Delivery cost is not Added" + + line_data = self.browse(cr ,uid ,line_ids[0] ,context) + #assert line_data.price_subtotal == 0, "Added Delivey cost is wrong." \ No newline at end of file From 57488fe4cdd1c05add58165991822f82b7deb959 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Tue, 27 Dec 2011 18:37:10 +0530 Subject: [PATCH 3/6] [ADD] aded test_bug907211.yml in sale module bzr revid: tpa@tinyerp.com-20111227130710-68c4b3egf60u6dxq --- addons/sale/__openerp__.py | 1 + addons/sale/test/test_bug907211.yml | 68 +++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 addons/sale/test/test_bug907211.yml diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py index 948352940a0..f455b670c2f 100644 --- a/addons/sale/__openerp__.py +++ b/addons/sale/__openerp__.py @@ -95,6 +95,7 @@ Dashboard for Sales Manager that includes: 'test/cancel_order.yml', 'test/delete_order.yml', 'test/edi_sale_order.yml', + 'test/test_bug907211.yml', ], 'installable': True, 'active': False, diff --git a/addons/sale/test/test_bug907211.yml b/addons/sale/test/test_bug907211.yml new file mode 100644 index 00000000000..dd0678b7aa8 --- /dev/null +++ b/addons/sale/test/test_bug907211.yml @@ -0,0 +1,68 @@ +- + I Create sale order. +- + !record {model: sale.order, id: order_01}: + shop_id: shop + user_id: base.user_root + partner_invoice_id: base.res_partner_address_8 + partner_shipping_id: base.res_partner_address_8 + partner_order_id: base.res_partner_address_8 + order_policy: picking + invoice_quantity: procurement + partner_id: base.res_partner_agrolait + note: 'Invoice after delivery' + payment_term: account.account_payment_term + order_line: + - name: '[PC1] Basic PC' + product_id: product.product_product_pc1 + product_uom: product.product_uom_unit + price_unit: 450.00 + product_uom_qty: 2 + product_uos_qty: 2 + type: make_to_stock + + - name: '[EMPL] Employee' + product_id: product.product_product_employee0 + product_uom: product.uom_hour + price_unit: 200 + product_uom_qty: 3 + product_uos_qty: 3 + type: make_to_stock +- + I confirm the sale order. +- + !workflow {model: sale.order, action: order_confirm, ref: order_01} +- + I send delivery in two shipments, so I am doing a partial delivery order. +- + !python {model: stock.picking}: | + delivery_orders = self.search(cr, uid, [('sale_id','=',ref("order_01"))]) + first_picking = self.browse(cr, uid, delivery_orders[0], context=context) + + if first_picking.force_assign(cr, uid, first_picking): + first_move = first_picking.move_lines[0] + values = {'move%s'%(first_move.id): {'product_qty': 1}} + id = first_picking.do_partial(values, context=context) + + if first_picking.force_assign(cr, uid, first_picking): + first_move = first_picking.move_lines[0] + values = {'move%s'%(first_move.id): {'product_qty': 1}} + id = first_picking.do_partial(values, context=context) +- + I create invoice of both shipment. +- + !python {model: stock.invoice.onshipping}: | + pick_obj = self.pool.get("stock.picking") + + delivery_orders = pick_obj.search(cr, uid, [('sale_id','=',ref("order_01")),('state','=','done'),('invoice_state','=','2binvoiced')]) + new_id = self.create(cr ,uid ,{'group': True,'invoice_date': '2011-12-26','journal_id': '',},{'active_ids': delivery_orders}) + self.open_invoice(cr ,uid ,[new_id],{"active_ids": delivery_orders, "active_id": delivery_orders[0]}) +- + I Check That Invoice is created with proper data or not. +- + !python {model: account.invoice}: | + invoice_ids = self.search(cr ,uid ,[('amount_total','=','2100')] ,context) + invoice = self.browse(cr ,uid ,invoice_ids[0] ,context) + + assert len(invoice.invoice_line) == 4, "Invoice lines are not created properly." + assert invoice.amount_total == 2100, "Invoice total is wrong." \ No newline at end of file From ddc528e7b54df9a33354b1cecd12d0bfbbcb62bc Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Tue, 27 Dec 2011 18:44:33 +0530 Subject: [PATCH 4/6] [IMP] Improved YML string in Delivery module bzr revid: tpa@tinyerp.com-20111227131433-ps9xb2so1apo4jv0 --- addons/delivery/test/carrier_cost_delivery.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/delivery/test/carrier_cost_delivery.yml b/addons/delivery/test/carrier_cost_delivery.yml index e1e4c3e662c..4800d0de011 100644 --- a/addons/delivery/test/carrier_cost_delivery.yml +++ b/addons/delivery/test/carrier_cost_delivery.yml @@ -52,4 +52,4 @@ assert len(line_ids), "Delivery cost is not Added" line_data = self.browse(cr ,uid ,line_ids[0] ,context) - #assert line_data.price_subtotal == 0, "Added Delivey cost is wrong." \ No newline at end of file + #assert line_data.price_subtotal == 0, "Added Delivey cost is wrong." # Due to Bug #908020 \ No newline at end of file From ac5fb95e6de975f6c7c2172cc719e842d2742852 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Wed, 28 Dec 2011 15:43:45 +0530 Subject: [PATCH 5/6] [REM]: Removed unnecessary changes. bzr revid: tpa@tinyerp.com-20111228101345-m3t33xtzpusmxy4p --- addons/account_voucher/account_voucher_view.xml | 2 +- addons/point_of_sale/point_of_sale_view.xml | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml index b791a355a48..cbe35b5fc5f 100644 --- a/addons/account_voucher/account_voucher_view.xml +++ b/addons/account_voucher/account_voucher_view.xml @@ -43,7 +43,7 @@
- + diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml index 54ff0f9e131..ba760baeb09 100644 --- a/addons/point_of_sale/point_of_sale_view.xml +++ b/addons/point_of_sale/point_of_sale_view.xml @@ -768,13 +768,7 @@ - - - Launch PoS - - - + web_icon="images/pos.png" web_icon_hover="images/pos-hover.png" groups="point_of_sale.group_pos_manager,point_of_sale.group_pos_user"/> From 49ab30a502bb20e91ff9d6a30e161ba6dc4aabcc Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Thu, 5 Jan 2012 11:10:19 +0100 Subject: [PATCH 6/6] [DUMMY] delivery: style fixes bzr revid: rco@openerp.com-20120105101019-zyzg9exq3kld66ac --- addons/delivery/__openerp__.py | 8 ++++---- addons/delivery/test/carrier_cost_delivery.yml | 2 +- addons/sale/test/test_bug907211.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/delivery/__openerp__.py b/addons/delivery/__openerp__.py index 301f98cc5b9..1080face15f 100644 --- a/addons/delivery/__openerp__.py +++ b/addons/delivery/__openerp__.py @@ -44,10 +44,10 @@ When creating invoices from picking, OpenERP is able to add and compute the ship 'partner_view.xml' ], 'demo_xml': ['delivery_demo.xml'], - 'test':[ - 'test/delivery_report.yml', - 'test/carrier_cost_delivery.yml', - ], + 'test': [ + 'test/delivery_report.yml', + 'test/carrier_cost_delivery.yml', + ], 'installable': True, 'active': False, 'certificate': '0033981912253', diff --git a/addons/delivery/test/carrier_cost_delivery.yml b/addons/delivery/test/carrier_cost_delivery.yml index 4800d0de011..75ce503dda2 100644 --- a/addons/delivery/test/carrier_cost_delivery.yml +++ b/addons/delivery/test/carrier_cost_delivery.yml @@ -52,4 +52,4 @@ assert len(line_ids), "Delivery cost is not Added" line_data = self.browse(cr ,uid ,line_ids[0] ,context) - #assert line_data.price_subtotal == 0, "Added Delivey cost is wrong." # Due to Bug #908020 \ No newline at end of file + #assert line_data.price_subtotal == 0, "Added Delivey cost is wrong." # Due to Bug #908020 diff --git a/addons/sale/test/test_bug907211.yml b/addons/sale/test/test_bug907211.yml index dd0678b7aa8..37349d7211c 100644 --- a/addons/sale/test/test_bug907211.yml +++ b/addons/sale/test/test_bug907211.yml @@ -65,4 +65,4 @@ invoice = self.browse(cr ,uid ,invoice_ids[0] ,context) assert len(invoice.invoice_line) == 4, "Invoice lines are not created properly." - assert invoice.amount_total == 2100, "Invoice total is wrong." \ No newline at end of file + assert invoice.amount_total == 2100, "Invoice total is wrong."