From e3b0664ff80c7fc81fd4646d7e981a1d493238b7 Mon Sep 17 00:00:00 2001 From: "Jitendra Prajapati (OpenERP)" Date: Fri, 13 Dec 2013 17:30:52 +0530 Subject: [PATCH 1/7] [IMP]Set Delivery Method field default value in res.partner bzr revid: prajapatijitendra7969@gmail.com-20131213120052-wck2hrsqxk3cstv0 --- addons/delivery/delivery_demo.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/addons/delivery/delivery_demo.xml b/addons/delivery/delivery_demo.xml index d085017c31d..c88379a5539 100644 --- a/addons/delivery/delivery_demo.xml +++ b/addons/delivery/delivery_demo.xml @@ -91,5 +91,11 @@ + + + property_delivery_carrier + + + From 3163c94da8cda278f8edf382b5509dbb697ef44a Mon Sep 17 00:00:00 2001 From: "Jitendra Prajapati (OpenERP)" Date: Fri, 13 Dec 2013 17:53:00 +0530 Subject: [PATCH 2/7] [IMP]remove the set default in quotation bzr revid: prajapatijitendra7969@gmail.com-20131213122300-jy541ebqh1m8v5ts --- addons/delivery/delivery_demo.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/addons/delivery/delivery_demo.xml b/addons/delivery/delivery_demo.xml index c88379a5539..e750d514b39 100644 --- a/addons/delivery/delivery_demo.xml +++ b/addons/delivery/delivery_demo.xml @@ -50,12 +50,6 @@ - - - - - - From 5def46a073aaeef7c29f791da2153cc6ee6be844 Mon Sep 17 00:00:00 2001 From: "Jitendra Prajapati (OpenERP)" Date: Fri, 13 Dec 2013 18:58:43 +0530 Subject: [PATCH 3/7] [FIX]runbot: delivery_cost.yml bzr revid: prajapatijitendra7969@gmail.com-20131213132843-v5fk59afkslhnv8c --- addons/delivery/test/delivery_cost.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/addons/delivery/test/delivery_cost.yml b/addons/delivery/test/delivery_cost.yml index c84f81fa6e1..476c5f7b1e2 100644 --- a/addons/delivery/test/delivery_cost.yml +++ b/addons/delivery/test/delivery_cost.yml @@ -4,6 +4,7 @@ I add delivery cost in Sale order. - !python {model: sale.order}: | + self.write(cr, uid, ref("sale.sale_order_6"), {'carrier_id': ref('normal_delivery_carrier')}) self.delivery_set(cr, uid, [ref("sale.sale_order_6")], context=context) - I check sale order after added delivery cost. @@ -35,6 +36,7 @@ import openerp.report from openerp import tools sale = self.pool.get('sale.order') + sale.write(cr, uid, ref("sale.sale_order_6"), {'carrier_id': ref('normal_delivery_carrier')}) sale_order = sale.browse(cr, uid, ref("sale.sale_order_6")) ship_ids = [x.id for x in sale_order.picking_ids] data, format = openerp.report.render_report(cr, uid, ship_ids, 'sale.shipping', {}, {}) @@ -44,6 +46,7 @@ I add free delivery cost in Sale order. - !python {model: sale.order}: | + self.write(cr, uid, ref("sale.sale_order_2"), {'carrier_id': ref('free_delivery_carrier')}) self.delivery_set(cr, uid, [ref("sale.sale_order_2")], context=context) - I check sale order after added delivery cost. From 325ab27f27dc38d6911a5b2eb0791e02a7532e5f Mon Sep 17 00:00:00 2001 From: "Jitendra Prajapati (OpenERP)" Date: Mon, 16 Dec 2013 12:40:35 +0530 Subject: [PATCH 4/7] [IMP]improve delivery_cost.yml: create sales order bzr revid: prajapatijitendra7969@gmail.com-20131216071035-vbtvolw7l6xfw9wk --- addons/delivery/test/delivery_cost.yml | 60 +++++++++++++++++++++----- 1 file changed, 50 insertions(+), 10 deletions(-) diff --git a/addons/delivery/test/delivery_cost.yml b/addons/delivery/test/delivery_cost.yml index 476c5f7b1e2..e7a3eba8426 100644 --- a/addons/delivery/test/delivery_cost.yml +++ b/addons/delivery/test/delivery_cost.yml @@ -1,29 +1,47 @@ - In order to test Carrier Cost, +- + create sales order +- + !record {model: sale.order, id: sale_6}: + partner_id: base.res_partner_18 + partner_invoice_id: base.res_partner_18 + partner_shipping_id: base.res_partner_18 + pricelist_id: product.list0 + order_policy: 'picking' + order_line: + - name: 'PC Assamble + 2GB RAM' + product_id: product.product_product_4 + product_uom_qty: 1 + product_uos_qty: 1 + product_uom: product.product_uom_unit + price_unit: 750.00 + carrier_id: normal_delivery_carrier - I add delivery cost in Sale order. + - !python {model: sale.order}: | - self.write(cr, uid, ref("sale.sale_order_6"), {'carrier_id': ref('normal_delivery_carrier')}) - self.delivery_set(cr, uid, [ref("sale.sale_order_6")], context=context) + self.delivery_set(cr, uid, [ref("sale_6")], context=context) + - I check sale order after added delivery cost. - !python {model: sale.order.line}: | - line_ids = self.search(cr, uid, [('order_id','=', ref('sale.sale_order_6')), ('product_id','=', ref('product_product_delivery'))]) + line_ids = self.search(cr, uid, [('order_id','=', ref('sale_6')), ('product_id','=', ref('product_product_delivery'))]) 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, "Delivey cost is not correspond." - I confirm the sale order. - - !workflow {model: sale.order, action: order_confirm, ref: sale.sale_order_6} + !workflow {model: sale.order, action: order_confirm, ref: sale_6} - I create Invoice from shipment. - !python {model: stock.invoice.onshipping}: | sale = self.pool.get('sale.order') - sale_order = sale.browse(cr, uid, ref("sale.sale_order_6")) + sale_order = sale.browse(cr, uid, ref("sale_6")) ship_ids = [x.id for x in sale_order.picking_ids] wiz_id = self.create(cr, uid, {'journal_id': ref('account.sales_journal')}, {'active_ids': ship_ids, 'active_model': 'stock.picking'}) @@ -36,23 +54,45 @@ import openerp.report from openerp import tools sale = self.pool.get('sale.order') - sale.write(cr, uid, ref("sale.sale_order_6"), {'carrier_id': ref('normal_delivery_carrier')}) - sale_order = sale.browse(cr, uid, ref("sale.sale_order_6")) + sale_order = sale.browse(cr, uid, ref("sale_6")) ship_ids = [x.id for x in sale_order.picking_ids] data, format = openerp.report.render_report(cr, uid, ship_ids, 'sale.shipping', {}, {}) if tools.config['test_report_directory']: file(os.path.join(tools.config['test_report_directory'], 'delivery-shipping'+format), 'wb+').write(data) +- + create one more sale order +- + !record {model: sale.order, id: sale_2}: + partner_id: base.res_partner_7 + partner_invoice_id: base.res_partner_address_13 + partner_shipping_id: base.res_partner_address_13 + pricelist_id: product.list0 + order_policy: 'manual' + order_line: + - name: 'Service on demand' + product_id: product.product_product_consultant + product_uom_qty: 24 + product_uos_qty: 24 + product_uom: product.product_uom_hour + price_unit: 75.00 + order_line: + - name: 'On Site Assistance' + product_id: product.product_product_2 + product_uom_qty: 30 + product_uos_qty: 30 + product_uom: product.product_uom_hour + price_unit: 38.25 + carrier_id: free_delivery_carrier - I add free delivery cost in Sale order. - !python {model: sale.order}: | - self.write(cr, uid, ref("sale.sale_order_2"), {'carrier_id': ref('free_delivery_carrier')}) - self.delivery_set(cr, uid, [ref("sale.sale_order_2")], context=context) + self.delivery_set(cr, uid, [ref("sale_2")], context=context) - I check sale order after added delivery cost. - !python {model: sale.order.line}: | - line_ids = self.search(cr, uid, [('order_id','=', ref('sale.sale_order_2')), ('product_id','=', ref('product_product_delivery'))]) + line_ids = self.search(cr, uid, [('order_id','=', ref('sale_2')), ('product_id','=', ref('product_product_delivery'))]) 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, "Delivey cost is not correspond." From f2eb6ef7b7ceece133831143a65e6105971eaaac Mon Sep 17 00:00:00 2001 From: "Jitendra Prajapati (OpenERP)" Date: Mon, 16 Dec 2013 13:11:49 +0530 Subject: [PATCH 5/7] [MISC]typo bzr revid: prajapatijitendra7969@gmail.com-20131216074149-f8zlecw100ws935d --- addons/delivery/test/delivery_cost.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/addons/delivery/test/delivery_cost.yml b/addons/delivery/test/delivery_cost.yml index e7a3eba8426..9d1c352cef9 100644 --- a/addons/delivery/test/delivery_cost.yml +++ b/addons/delivery/test/delivery_cost.yml @@ -1,9 +1,9 @@ - In order to test Carrier Cost, - - create sales order + Create sale order with Normal Delivery Charges - - !record {model: sale.order, id: sale_6}: + !record {model: sale.order, id: sale_normal_delivery_charges}: partner_id: base.res_partner_18 partner_invoice_id: base.res_partner_18 partner_shipping_id: base.res_partner_18 @@ -22,26 +22,26 @@ - !python {model: sale.order}: | - self.delivery_set(cr, uid, [ref("sale_6")], context=context) + self.delivery_set(cr, uid, [ref("sale_normal_delivery_charges")], context=context) - I check sale order after added delivery cost. - !python {model: sale.order.line}: | - line_ids = self.search(cr, uid, [('order_id','=', ref('sale_6')), ('product_id','=', ref('product_product_delivery'))]) + line_ids = self.search(cr, uid, [('order_id','=', ref('sale_normal_delivery_charges')), ('product_id','=', ref('product_product_delivery'))]) 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, "Delivey cost is not correspond." - I confirm the sale order. - - !workflow {model: sale.order, action: order_confirm, ref: sale_6} + !workflow {model: sale.order, action: order_confirm, ref: sale_normal_delivery_charges} - I create Invoice from shipment. - !python {model: stock.invoice.onshipping}: | sale = self.pool.get('sale.order') - sale_order = sale.browse(cr, uid, ref("sale_6")) + sale_order = sale.browse(cr, uid, ref("sale_normal_delivery_charges")) ship_ids = [x.id for x in sale_order.picking_ids] wiz_id = self.create(cr, uid, {'journal_id': ref('account.sales_journal')}, {'active_ids': ship_ids, 'active_model': 'stock.picking'}) @@ -54,15 +54,15 @@ import openerp.report from openerp import tools sale = self.pool.get('sale.order') - sale_order = sale.browse(cr, uid, ref("sale_6")) + sale_order = sale.browse(cr, uid, ref("sale_normal_delivery_charges")) ship_ids = [x.id for x in sale_order.picking_ids] data, format = openerp.report.render_report(cr, uid, ship_ids, 'sale.shipping', {}, {}) if tools.config['test_report_directory']: file(os.path.join(tools.config['test_report_directory'], 'delivery-shipping'+format), 'wb+').write(data) - - create one more sale order + Create one more sale order with Free Delivery Charges - - !record {model: sale.order, id: sale_2}: + !record {model: sale.order, id: sale_free_delivery_charges}: partner_id: base.res_partner_7 partner_invoice_id: base.res_partner_address_13 partner_shipping_id: base.res_partner_address_13 @@ -87,12 +87,12 @@ I add free delivery cost in Sale order. - !python {model: sale.order}: | - self.delivery_set(cr, uid, [ref("sale_2")], context=context) + self.delivery_set(cr, uid, [ref("sale_free_delivery_charges")], context=context) - I check sale order after added delivery cost. - !python {model: sale.order.line}: | - line_ids = self.search(cr, uid, [('order_id','=', ref('sale_2')), ('product_id','=', ref('product_product_delivery'))]) + line_ids = self.search(cr, uid, [('order_id','=', ref('sale_free_delivery_charges')), ('product_id','=', ref('product_product_delivery'))]) 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, "Delivey cost is not correspond." From 1f3d9f056c878803e6ac371214cf48adb835a5e2 Mon Sep 17 00:00:00 2001 From: "Jitendra Prajapati (OpenERP)" Date: Mon, 16 Dec 2013 13:50:36 +0530 Subject: [PATCH 6/7] [IMP]remove the attrs in sale setting bzr revid: prajapatijitendra7969@gmail.com-20131216082036-d834kd7xxmyg0xjv --- addons/sale_stock/res_config_view.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/sale_stock/res_config_view.xml b/addons/sale_stock/res_config_view.xml index e7b32c0866d..887d08028ba 100644 --- a/addons/sale_stock/res_config_view.xml +++ b/addons/sale_stock/res_config_view.xml @@ -30,14 +30,14 @@ - -
+
-
+
From 5d8de88af313168b43a64fda9b6b69d83b71131d Mon Sep 17 00:00:00 2001 From: "Jitendra Prajapati (OpenERP)" Date: Mon, 16 Dec 2013 17:21:11 +0530 Subject: [PATCH 7/7] [IMP]improve code bzr revid: prajapatijitendra7969@gmail.com-20131216115111-s2122jbg5t93ctez --- addons/sale_stock/res_config_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/sale_stock/res_config_view.xml b/addons/sale_stock/res_config_view.xml index 887d08028ba..2577347afb9 100644 --- a/addons/sale_stock/res_config_view.xml +++ b/addons/sale_stock/res_config_view.xml @@ -33,7 +33,7 @@