From 6d201c2d5b7616d1bdf85dc8df64c456ed81de71 Mon Sep 17 00:00:00 2001 From: "DBR (OpenERP)" Date: Wed, 16 Nov 2011 16:13:41 +0530 Subject: [PATCH] [IMP]sale: Improve statements and sequence in __openerp__.py file bzr revid: dbr@tinyerp.com-20111116104341-2zkm4rs49rnotkbr --- addons/sale/__openerp__.py | 4 ++-- addons/sale/test/process/cancel_order.yml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py index 04f078e4e62..18f11812aae 100644 --- a/addons/sale/__openerp__.py +++ b/addons/sale/__openerp__.py @@ -88,9 +88,9 @@ Dashboard for Sales Manager that includes: 'test': [ 'test/ui/execute_config.yml', 'test/process/order_policy.yml', - 'test/process/get_picking_details.yml', - 'test/process/cancel_order.yml', 'test/process/run_scheduler.yml', + 'test/process/cancel_order.yml', + 'test/process/get_picking_details.yml', #'test/ui/onchange_events.yml', 'test/ui/sale_make_invoice.yml', 'test/ui/make_advance_invoice.yml', diff --git a/addons/sale/test/process/cancel_order.yml b/addons/sale/test/process/cancel_order.yml index b97b0816550..32625d27965 100644 --- a/addons/sale/test/process/cancel_order.yml +++ b/addons/sale/test/process/cancel_order.yml @@ -1,7 +1,7 @@ - In order to test the cancel sale order. - - I try to cancel Manual sale order. + I try to cancel sale order and It's order policy is Manual. - !python {model: sale.order}: | try: @@ -9,7 +9,7 @@ except Exception,e: pass - - I cancel the invoice of Manual order. + For cancel the sale order I have to cancel the invoice of sale order. - !python {model: sale.order}: | import netsvc @@ -25,7 +25,7 @@ assert order.invoice_ids[0].state == "cancel","order's related invoice should be cancelled" assert order.state == "invoice_except", "order should be in Invoice Exception state after cancel Invoice" - - I cancel the picking of Manual sale order. + Now need to cancel the rekated picking of sale order. - !python {model: sale.order}: | import netsvc @@ -42,7 +42,7 @@ assert order.picking_ids[0].state == "cancel","order's related invoice should be cancelled" assert order.state == "shipping_except", "order should be in Invoice Exception state after cancel Invoice" - - Now I am able to cancel sale order. + Now I am able to cancel this sale order. - !python {model: sale.order}: | self.action_cancel(cr, uid, [ref("order4")])