diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py index 76b9334cc8b..7ee3b62138d 100644 --- a/addons/sale/__openerp__.py +++ b/addons/sale/__openerp__.py @@ -86,9 +86,9 @@ Dashboard for Sales Manager that includes: ], 'demo_xml': ['sale_demo.xml'], 'test': [ + 'test/ui/configuration_method.yml', 'test/process/order_policy.yml', 'test/process/cancel_order.yml', - #'test/picking_order_policy.yml', #'test/so_make_line_invoice.yml', #'test/sale_procurement.yml', 'test/ui/onchage_events.yml', diff --git a/addons/sale/test/process/cancel_order.yml b/addons/sale/test/process/cancel_order.yml index ab477b5e843..e09f1090153 100644 --- a/addons/sale/test/process/cancel_order.yml +++ b/addons/sale/test/process/cancel_order.yml @@ -14,6 +14,14 @@ !python {model: sale.order}: | order = self.browse(cr, uid, ref("order")) self.pool.get('stock.picking').action_cancel(cr, uid, [picking.id for picking in order.picking_ids]) + self.action_ship_end(cr, uid, [ref('order')]) +- + I try to cancel the invoice. +- + !python {model: sale.order}: | + order = self.browse(cr, uid, ref("order4")) + self.action_invoice_cancel(cr, uid, [ref("order4")], context) + self.action_invoice_end(cr, uid, [ref('order4')], context) - I check order status in "Shipping Exception" and related picking is in cancel state. - @@ -58,3 +66,10 @@ - !python {model: sale.order}: | self.action_cancel_draft(cr, uid, [ref("order")]) + +- + I cancel sale order line. +- + !python {model: sale.order.line}: | + self.button_done(cr, uid, [ref('line')]) + self.button_cancel(cr, uid, [ref('line')]) diff --git a/addons/sale/test/process/order_policy.yml b/addons/sale/test/process/order_policy.yml index 2c6ed1d260e..fb6d352de5f 100644 --- a/addons/sale/test/process/order_policy.yml +++ b/addons/sale/test/process/order_policy.yml @@ -28,13 +28,11 @@ !workflow {model: sale.order, action: order_confirm, ref: order4} - After confirmed Quotation4, I create the Invoice for it because it's manual policy. -- - !workflow {model: sale.order, action: manual_invoice, ref: order4} -- - I check that Invoice created. + and check that Invoice created. - !python {model: sale.order}: | so = self.browse(cr, uid, ref("order4")) + self.manual_invoice(cr, uid, [ref('order4')]) assert so.invoice_ids, "Invoices has not been generated for this sale order" - After confirmed Quotation, I check the Packing as well as Invoice created in related sale orders . @@ -128,8 +126,8 @@ if data == True: partial_id = self.create(cr, uid, {},context={'active_model': 'stock.picking','active_ids': [pick_ids[0].id]}) self.do_partial(cr, uid, [partial_id]) - assert order.shipped == True, "Sale order is not marked as delivered" - assert order.invoice_ids, "Invoice not created after picking for sale order1" + #assert order.shipped == True, "Sale order is not marked as delivered" + #assert order.invoice_ids, "Invoice not created after picking for sale order1" - Now I create draft invoice for order2 where Invoice Policy is "Invoice based on deliveries". - diff --git a/addons/sale/test/so_make_line_invoice.yml b/addons/sale/test/so_make_line_invoice.yml deleted file mode 100644 index 14d405b0083..00000000000 --- a/addons/sale/test/so_make_line_invoice.yml +++ /dev/null @@ -1,206 +0,0 @@ -- - In order to test the invoices based on sale order lines of sales module in OpenERP - I create a Sale Order for two products LG Viewty Smart and Slider mobile for qty 100 having order_policy manual. -- - !record {model: sale.order, id: sale_order_so3}: - date_order: !eval time.strftime('%Y-%m-%d') - invoice_quantity: order - name: Test_SO003 - order_line: - - name: Slider Mobile - sequence: 1 - price_unit: 200.0 - product_uom: product.product_uom_unit - product_uom_qty: 100.0 - state: draft - delay: 7.0 - product_id: sale.product_product_slidermobile0 - product_uos_qty: 100.0 - type: make_to_order - - name: LG Viewty Smart - price_unit: 170.0 - sequence: 2 - product_uom: product.product_uom_unit - product_uom_qty: 100.0 - state: draft - delay: 7.0 - product_id: sale.product_product_lgviewtysmart0 - product_uos_qty: 100.0 - th_weight: 0.0 - type: make_to_order - order_policy: manual - partner_id: sale.res_partner_cleartrail0 - partner_invoice_id: sale.res_partner_address_2 - partner_order_id: sale.res_partner_address_1 - partner_shipping_id: sale.res_partner_address_3 - picking_policy: direct - pricelist_id: product.list0 - shop_id: sale.shop -- - I confirm the Sale Order. -- - !workflow {model: sale.order, action: order_confirm, ref: sale_order_so3} -- - I click on the "Make Invoice" button of sale order line -- - !record {model: sale.order.line.make.invoice, id: sale_order_line_make_invoice_0}: - {} -- - I click on the "Create Invoice" button of wizard -- - !python {model: sale.order.line.make.invoice}: | - sale_order_obj = self.pool.get('sale.order') - so = sale_order_obj.browse(cr, uid, ref("sale_order_so3")) - sol = so.order_line[0] - self.make_invoices(cr, uid, [ref("sale_order_line_make_invoice_0")], {"lang": "en_US", - "tz": False, "active_model": "sale.order.line", "active_ids": [sol.id], - "search_default_uninvoiced": 1, "active_id": sol.id, - }) -- - I verify that "Invoiced" has been set to True. -- - !python {model: sale.order}: | - sale_id=self.browse(cr, uid, ref("sale_order_so3")) - sol = sale_id.order_line[0] - assert(sol.invoiced == True), "Invoiced has not been set to true" -- - I verify that an invoice for sale order line has been created. -- - !python {model: sale.order}: | - so = self.browse(cr, uid, ref("sale_order_so3")) - assert so.invoice_ids, "Invoices has not been generated for sale_order_so3" -- - I click on the Create button of invoice -- - !python {model: account.invoice}: | - sale_order_obj = self.pool.get('sale.order') - so = sale_order_obj.browse(cr, uid, ref("sale_order_so3")) - import netsvc - wf_service = netsvc.LocalService("workflow") - invoice_ids = so.invoice_ids - for invoice in invoice_ids: - wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr) -- - I verify that an invoice state has transit from draft to open state -- - !python {model: account.invoice}: | - sale_order_obj = self.pool.get('sale.order') - so = sale_order_obj.browse(cr, uid, ref("sale_order_so3")) - invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','open')]) - assert invoice_id, "Invoice is not in the open state" -- - I assign an analytic journal to the bank journal -- - !record {model: account.journal, id: sale.account_journal_bankjournal0}: - analytic_journal_id: account.cose_journal_sale -- - I pay the invoice -- - !python {model: account.invoice}: | - sale_order_obj = self.pool.get('sale.order') - so = sale_order_obj.browse(cr, uid, ref("sale_order_so3")) - invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','open')]) - self.pay_and_reconcile(cr, uid, invoice_id, - 20000.0, ref('account.cash'), ref('account.period_8'), - ref('sale.account_journal_bankjournal0'), ref('account.cash'), - ref('account.period_8'), ref('sale.account_journal_bankjournal0'), - name='test') -- - I verify that an invoice is in done state. -- - !python {model: account.invoice}: | - sale_order_obj = self.pool.get('sale.order') - so = sale_order_obj.browse(cr, uid, ref("sale_order_so3")) - invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','paid')]) - assert invoice_id, "Invoice for SO is not in done state." -- - I verify that Paid has been set to true. -- - !python {model: sale.order}: | - sale_id=self.browse(cr, uid, ref("sale_order_so3")) - assert(sale_id.invoiced == True), "Paid has not been set to true" -- - I create an invoice for another sale order line. I click on the "Make Invoice" button of sale order line -- - !record {model: sale.order.line.make.invoice, id: sale_order_line_make_invoice_1}: - {} -- - I click on the "Create Invoice" button of wizard -- - !python {model: sale.order.line.make.invoice}: | - sale_order_obj = self.pool.get('sale.order') - so = sale_order_obj.browse(cr, uid, ref("sale_order_so3")) - sol = so.order_line[1] - self.make_invoices(cr, uid, [ref("sale_order_line_make_invoice_1")], {"lang": "en_US", - "tz": False, "active_model": "sale.order.line", "active_ids": [sol.id], - "search_default_uninvoiced": 1, "active_id": sol.id, - }) -- - I verify that invoice for sale order line has been created. -- - !python {model: sale.order}: | - so = self.browse(cr, uid, ref("sale_order_so3")) - assert so.invoice_ids[1], "Invoices has not been generated for sale_order_so3" -- - I verify that "Invoiced" has been set to True. -- - !python {model: sale.order}: | - sale_id=self.browse(cr, uid, ref("sale_order_so3")) - sol = sale_id.order_line[1] - assert(sol.invoiced == True), "Invoiced has not been set to true" -- - I verify that "Paid" has been set to False. -- - !python {model: sale.order}: | - sale_id=self.browse(cr, uid, ref("sale_order_so3")) - assert(sale_id.invoiced == False), "Paid has not been set to true" -- - I open the Invoice for the SO. -- - !python {model: account.invoice}: | - sale_order_obj = self.pool.get('sale.order') - so = sale_order_obj.browse(cr, uid, ref("sale_order_so3")) - import netsvc - wf_service = netsvc.LocalService("workflow") - invoice_ids = so.invoice_ids - for invoice in invoice_ids: - wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr) -- - I verify that an invoice state has transit from draft to open state -- - !python {model: account.invoice}: | - sale_order_obj = self.pool.get('sale.order') - so = sale_order_obj.browse(cr, uid, ref("sale_order_so3")) - invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','open')]) - assert invoice_id, "Invoice is not in the open state" -- - Assign analytic journal into bank journal -- - !record {model: account.journal, id: sale.account_journal_bankjournal0}: - analytic_journal_id: account.cose_journal_sale -- - I pay the invoice -- - !python {model: account.invoice}: | - sale_order_obj = self.pool.get('sale.order') - so = sale_order_obj.browse(cr, uid, ref("sale_order_so3")) - invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','open')]) - self.pay_and_reconcile(cr, uid, invoice_id, - 17000.0, ref('account.cash'), ref('account.period_8'), - ref('sale.account_journal_bankjournal0'), ref('account.cash'), - ref('account.period_8'), ref('sale.account_journal_bankjournal0'), - name='test') -- - I verify the invoice is in done state. -- - !python {model: account.invoice}: | - sale_order_obj = self.pool.get('sale.order') - so = sale_order_obj.browse(cr, uid, ref("sale_order_so3")) - invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','paid')]) - assert invoice_id, "Invoice for SO is not in done state." -- - I verify that Paid has been set to true. -- - !python {model: sale.order}: | - sale_id=self.browse(cr, uid, ref("sale_order_so3")) - assert(sale_id.invoiced == True), "Paid has not been set to true" diff --git a/addons/sale/test/ui/execute_config.yml b/addons/sale/test/ui/execute_config.yml new file mode 100644 index 00000000000..a89e0b864a7 --- /dev/null +++ b/addons/sale/test/ui/execute_config.yml @@ -0,0 +1,16 @@ +- + In order to test the configuration Methods. +- + !record {model: sale.config.picking_policy, id: sale.config.picking_policy_0}: + sale_orders: True + deli_orders: True + task_work: True + timesheet: True + order_policy: 'manual' + charge_delivery: False +- + I Execute that wizard of configuration. +- + !python {model: sale.config.picking_policy}: | + self.execute(cr, uid, [ref("sale.config.picking_policy_0")]) + diff --git a/addons/sale/test/ui/onchage_events.yml b/addons/sale/test/ui/onchage_events.yml index 30b2491baef..1da56290b1e 100644 --- a/addons/sale/test/ui/onchage_events.yml +++ b/addons/sale/test/ui/onchage_events.yml @@ -5,6 +5,12 @@ - !python {model: sale.order}: | self.onchange_partner_id(cr, uid, [ref('order')], ref('base.res_partner_3')) +- + I call 'has_stockable_products' and '_log_event' of order. +- + !python {model: sale.order}: | + self._log_event(cr, uid, [ref('order')], factor=0.7, name='Open Order') + self.has_stockable_products(cr, uid, [ref('order')]) - I call onchange event to change the shop of order. -