From 4321bcdf308b52fec44545b1eb9d6060b65701d2 Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 11 Jul 2012 16:05:49 +0530
Subject: [PATCH] [IMP]: sale: Improved xml_id reference names for sale order
 and order lines (work in progress)

bzr revid: rpa@tinyerp.com-20120711103549-67ne83p5jw188k3h
---
 addons/delivery/delivery_demo.xml           |  4 +-
 addons/delivery/test/delivery_cost.yml      |  2 +-
 addons/event_sale/test/confirm.yml          |  6 +--
 addons/multi_company/multi_company_demo.xml | 10 ++--
 addons/project_mrp/project_mrp_demo.xml     |  2 +-
 addons/sale/sale_demo.xml                   | 54 ++++++++++-----------
 addons/sale/test/cancel_order.yml           | 10 ++--
 addons/sale/test/delete_order.yml           |  4 +-
 addons/sale/test/manual_order_policy.yml    | 12 ++---
 addons/sale/test/picking_order_policy.yml   | 22 ++++-----
 addons/sale/test/prepaid_order_policy.yml   |  2 +-
 11 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/addons/delivery/delivery_demo.xml b/addons/delivery/delivery_demo.xml
index dac3d47c778..a16ed46f47d 100644
--- a/addons/delivery/delivery_demo.xml
+++ b/addons/delivery/delivery_demo.xml
@@ -39,10 +39,10 @@
             <field name="partner_id" ref="delivery_partner"/>
             <field name="product_id" ref="delivery_product"/>
         </record>
-        <record id="sale.order" model="sale.order">
+        <record id="sale.sale_order_1" model="sale.order">
             <field name="carrier_id" ref="normal_delivery_carrier"/>
         </record>
-        <record id="sale.order2" model="sale.order">
+        <record id="sale.sale_order_2" model="sale.order">
             <field name="carrier_id" ref="free_delivery_carrier"/>
         </record>
 
diff --git a/addons/delivery/test/delivery_cost.yml b/addons/delivery/test/delivery_cost.yml
index 433acb1d18f..30d89a927b7 100644
--- a/addons/delivery/test/delivery_cost.yml
+++ b/addons/delivery/test/delivery_cost.yml
@@ -42,7 +42,7 @@
   I add free delivery cost in Sale order.
 -
   !python {model: sale.order}: |
-    self.delivery_set(cr, uid, [ref("sale.order2")], context=context)
+    self.delivery_set(cr, uid, [ref("sale.sale_order_2")], context=context)
 -
   I check sale order after added delivery cost.
 -
diff --git a/addons/event_sale/test/confirm.yml b/addons/event_sale/test/confirm.yml
index a58978d8b01..204431ba2e4 100644
--- a/addons/event_sale/test/confirm.yml
+++ b/addons/event_sale/test/confirm.yml
@@ -19,7 +19,7 @@
 -
     I create a sale order
 -
-    !record {model: sale.order, id: order}:
+    !record {model: sale.order, id: order1}:
          partner_id: base.res_partner_2
          note: Invoice after delivery
          payment_term: account.account_payment_term
@@ -30,7 +30,7 @@
          product_id: event_product
          price_unit: 190.50
          product_uom_qty: 8
-         order_id: order
+         order_id: order1
          name: sale order line
          event_id: event
 -
@@ -46,7 +46,7 @@
     I check if a registration is created
 -
     !python {model: event.registration}: |
-        order_id = ref('order')
+        order_id = ref('order1')
         order =  self.pool.get('sale.order').browse(cr, uid,order_id)
         registration_ids = self.search(cr,uid,[('origin','=',order.name)])
         if registration_ids == []:
diff --git a/addons/multi_company/multi_company_demo.xml b/addons/multi_company/multi_company_demo.xml
index e4940930423..f20d27283d2 100644
--- a/addons/multi_company/multi_company_demo.xml
+++ b/addons/multi_company/multi_company_demo.xml
@@ -206,23 +206,23 @@
     Resource: sale.order
     -->
 
-        <record id="sale.order" model="sale.order">
+        <record id="sale.sale_order_1" model="sale.order">
         <field name="company_id" ref="res_company_oerp_be"/>
         </record>
 
-        <record id="sale.order2" model="sale.order">
+        <record id="sale.sale_order_2" model="sale.order">
         <field name="company_id" ref="res_company_oerp_be"/>
         </record>
 
-        <record id="sale.order3" model="sale.order">
+        <record id="sale.sale_order_3" model="sale.order">
         <field name="company_id" ref="res_company_oerp_us"/>
         </record>
 
-        <record id="sale.order4" model="sale.order">
+        <record id="sale.sale_order_4" model="sale.order">
         <field name="company_id" ref="res_company_oerp_us"/>
         </record>
 
-        <record id="sale.order5" model="sale.order">
+        <record id="sale.sale_order_5" model="sale.order">
         <field name="company_id" ref="res_company_oerp_in"/>
         </record>
 
diff --git a/addons/project_mrp/project_mrp_demo.xml b/addons/project_mrp/project_mrp_demo.xml
index 45f2bac3140..7b0ae707f3d 100644
--- a/addons/project_mrp/project_mrp_demo.xml
+++ b/addons/project_mrp/project_mrp_demo.xml
@@ -5,7 +5,7 @@
         <!--Resource: sale.order.line for services type product-->
         
         <record id="line_services" model="sale.order.line">
-            <field name="order_id" ref="sale.order7"/>
+            <field name="order_id" ref="sale.sale_order_7"/>
             <field name="name">Advance</field>
             <field name="product_id" ref="sale.advance_product_0"/>
             <field name="product_uom" ref="product.product_uom_day"/>
diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml
index 3c700cd7056..9ae9ebc693d 100644
--- a/addons/sale/sale_demo.xml
+++ b/addons/sale/sale_demo.xml
@@ -4,7 +4,7 @@
     
         <!--Resource: sale.order-->
         
-        <record id="order" model="sale.order">
+        <record id="sale_order_1" model="sale.order">
             <field name="shop_id" ref="shop"/>
             <field model="product.pricelist" name="pricelist_id" search="[]"/>
             <field name="user_id" ref="base.user_root"/>
@@ -19,7 +19,7 @@
         <!--Resource: sale.order.line-->
         
         <record id="line" model="sale.order.line">
-            <field name="order_id" ref="order"/>
+            <field name="order_id" ref="sale_order_1"/>
             <field name="name">New server config + material</field>
             <field name="product_id" ref="product.product_product_7"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -28,7 +28,7 @@
         </record>
 
         <record id="line1" model="sale.order.line">
-            <field name="order_id" ref="order"/>
+            <field name="order_id" ref="sale_order_1"/>
             <field name="name">[PC1] Basic PC</field>
             <field name="product_id" ref="product.product_product_3"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -38,7 +38,7 @@
             <field name="type">make_to_stock</field>
         </record>
         <record id="line13" model="sale.order.line">
-            <field name="order_id" ref="order"/>
+            <field name="order_id" ref="sale_order_1"/>
             <field name="name">[PC3] Medium PC</field>
             <field name="product_id" ref="product.product_product_5"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -48,7 +48,7 @@
             <field name="delay">1</field>
         </record>
         <record id="line12" model="sale.order.line">
-            <field name="order_id" ref="order"/>
+            <field name="order_id" ref="sale_order_1"/>
             <field name="name">[MB1] Mainboard ASUStek A7N8X</field>
             <field name="product_id" ref="product.product_product_7"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -60,7 +60,7 @@
 
         <!--Resource: sale.order-->
         
-        <record id="order2" model="sale.order">
+        <record id="sale_order_2" model="sale.order">
             <field name="shop_id" ref="shop"/>
             <field model="product.pricelist" name="pricelist_id" search="[]"/>
             <field name="user_id" ref="base.user_demo"/>
@@ -75,7 +75,7 @@
         <!--Resource: sale.order.line-->
         
         <record id="line3" model="sale.order.line">
-            <field name="order_id" ref="order2"/>
+            <field name="order_id" ref="sale_order_2"/>
             <field name="name">[PC2] Computer assembled on demand</field>
             <field name="product_id" ref="product.product_product_4"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -83,7 +83,7 @@
             <field name="type">make_to_order</field>
         </record>
         <record id="line4" model="sale.order.line">
-            <field name="order_id" ref="order2"/>
+            <field name="order_id" ref="sale_order_2"/>
             <field name="name">[MB1] Mainboard ASUStek (purchased on order)</field>
             <field name="product_id" ref="product.product_product_7"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -95,7 +95,7 @@
 
         <!--Resource: sale.order-->
         
-        <record id="order3" model="sale.order">
+        <record id="sale_order_3" model="sale.order">
             <field name="shop_id" ref="shop"/>
             <field model="product.pricelist" name="pricelist_id" search="[]"/>
             <field name="user_id" ref="base.user_demo"/>
@@ -105,7 +105,7 @@
             <field name="order_policy">prepaid</field>
         </record>
         <record id="line5" model="sale.order.line">
-            <field name="order_id" ref="order3"/>
+            <field name="order_id" ref="sale_order_3"/>
             <field name="name">[PC1] Basic PC</field>
             <field name="product_id" ref="product.product_product_3"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -115,7 +115,7 @@
             <field name="delay">2</field>
         </record>
         <record id="line6" model="sale.order.line">
-            <field name="order_id" ref="order3"/>
+            <field name="order_id" ref="sale_order_3"/>
             <field name="name">[PC2] Basic+ PC (assembly on order)</field>
             <field name="product_id" ref="product.product_product_4"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -127,7 +127,7 @@
 
         <!--Resource: sale.order-->
         
-        <record id="order4" model="sale.order">
+        <record id="sale_order_4" model="sale.order">
             <field name="shop_id" ref="shop"/>
             <field model="product.pricelist" name="pricelist_id" search="[]"/>
             <field name="user_id" ref="base.user_demo"/>
@@ -136,7 +136,7 @@
             <field name="partner_shipping_id" ref="base.res_partner_address_10"/>
         </record>
         <record id="line7" model="sale.order.line">
-            <field name="order_id" ref="order4"/>
+            <field name="order_id" ref="sale_order_4"/>
             <field name="name">[PC1] Basic PC</field>
             <field name="product_id" ref="product.product_product_3"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -146,7 +146,7 @@
             <field name="delay">8</field>
         </record>
         <record id="line8" model="sale.order.line">
-            <field name="order_id" ref="order4"/>
+            <field name="order_id" ref="sale_order_4"/>
             <field name="name">[PC3] Medium PC</field>
             <field name="product_id" ref="product.product_product_5"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -155,11 +155,11 @@
             <field name="type">make_to_order</field>
             <field name="delay">1</field>
         </record>
-        <workflow action="order_confirm" model="sale.order" ref="order4"/>
+        <workflow action="order_confirm" model="sale.order" ref="sale_order_4"/>
 
         <!--Resource: sale.order-->
         
-        <record id="order5" model="sale.order">
+        <record id="sale_order_5" model="sale.order">
             <field name="shop_id" ref="shop"/>
             <field model="product.pricelist" name="pricelist_id" search="[]"/>
             <field name="user_id" ref="base.user_demo"/>
@@ -168,7 +168,7 @@
             <field name="partner_shipping_id" ref="base.res_partner_address_5"/>
         </record>
         <record id="line9" model="sale.order.line">
-            <field name="order_id" ref="order5"/>
+            <field name="order_id" ref="sale_order_5"/>
             <field name="name">[PC2] Basic+ PC (assembly on order)</field>
             <field name="product_id" ref="product.product_product_4"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -178,7 +178,7 @@
             <field name="delay">15</field>
         </record>
         <record id="line52" model="sale.order.line">
-            <field name="order_id" ref="order5"/>
+            <field name="order_id" ref="sale_order_5"/>
             <field name="name">[CPU1] Processor AMD Athlon XP 1800+</field>
             <field name="product_id" ref="product.product_product_9"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -187,11 +187,11 @@
             <field name="product_uos_qty">3</field>
             <field name="type">make_to_stock</field>
         </record>
-        <workflow action="order_confirm" model="sale.order" ref="order5"/>
+        <workflow action="order_confirm" model="sale.order" ref="sale_order_5"/>
 
         <!--Resource: sale.order-->
 
-        <record id="order6" model="sale.order">
+        <record id="sale_order_6" model="sale.order">
             <field name="shop_id" ref="shop"/>
             <field model="product.pricelist" name="pricelist_id" search="[]"/>
             <field name="user_id" ref="base.user_demo"/>
@@ -200,7 +200,7 @@
             <field name="partner_shipping_id" ref="base.res_partner_address_22"/>
         </record>
         <record id="order6_line0" model="sale.order.line">
-            <field name="order_id" ref="order6"/>
+            <field name="order_id" ref="sale_order_6"/>
             <field name="name">Onsite Senior Intervention</field>
             <field name="product_id" ref="product.product_product_2"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -210,7 +210,7 @@
             <field name="delay">15</field>
         </record>
         <record id="order6_line1" model="sale.order.line">
-            <field name="order_id" ref="order6"/>
+            <field name="order_id" ref="sale_order_6"/>
             <field name="name">Onsite Intervention</field>
             <field name="product_id" ref="product.product_product_1"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -219,12 +219,12 @@
             <field name="type">make_to_order</field>
             <field name="delay">15</field>
         </record>
-        <workflow action="order_confirm" model="sale.order" ref="order6"/>
-        <workflow action="manual_invoice" model="sale.order" ref="order6"/>
+        <workflow action="order_confirm" model="sale.order" ref="sale_order_6"/>
+        <workflow action="manual_invoice" model="sale.order" ref="sale_order_6"/>
 
         <!--Resource: sale.order-->
 
-        <record id="order7" model="sale.order">
+        <record id="sale_order_7" model="sale.order">
             <field name="shop_id" ref="shop"/>
             <field model="product.pricelist" name="pricelist_id" search="[]"/>
             <field name="user_id" ref="base.user_demo"/>
@@ -233,7 +233,7 @@
             <field name="partner_shipping_id" ref="base.res_partner_address_22"/>
         </record>
         <record id="order7_line0" model="sale.order.line">
-            <field name="order_id" ref="order7"/>
+            <field name="order_id" ref="sale_order_7"/>
             <field name="name">[MB1] Mainboard ASUStek A7N8X</field>
             <field name="product_id" ref="product.product_product_7"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -243,7 +243,7 @@
             <field name="delay">15</field>
         </record>
         <record id="order7_line1" model="sale.order.line">
-            <field name="order_id" ref="order7"/>
+            <field name="order_id" ref="sale_order_7"/>
             <field name="name">[MB2] Mainboard ASUStek A7V8X-X</field>
             <field name="product_id" ref="product.product_product_6"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
diff --git a/addons/sale/test/cancel_order.yml b/addons/sale/test/cancel_order.yml
index cfdd0c7f079..6b73e8a282e 100644
--- a/addons/sale/test/cancel_order.yml
+++ b/addons/sale/test/cancel_order.yml
@@ -4,7 +4,7 @@
   Now I cancel Quotation.
 -
   !python {model: sale.order}: |
-    self.action_cancel(cr, uid, [ref("order7")])
+    self.action_cancel(cr, uid, [ref("sale_order_7")])
 -
   I check state of Quotation after cancelled.
 -
@@ -14,7 +14,7 @@
   I set cancelled quotation to draft.
 -
   !python {model: sale.order}: |
-    self.action_cancel_draft(cr, uid, [ref("order7")])
+    self.action_cancel_draft(cr, uid, [ref("sale_order_7")])
 -
   I confirm order.
 -
@@ -23,7 +23,7 @@
   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("order7"))])
+    delivery_orders = self.search(cr, uid, [('sale_id','=',ref("sale_order_7"))])
     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]
@@ -34,7 +34,7 @@
 -
   !python {model: stock.picking}: |
     import netsvc
-    delivery_orders = self.search(cr, uid, [('sale_id','=',ref("order7"))])
+    delivery_orders = self.search(cr, uid, [('sale_id','=',ref("sale_order_7"))])
     last_delivery_order_id = delivery_orders[0]
     wf_service = netsvc.LocalService("workflow")
     wf_service.trg_validate(uid, 'stock.picking', last_delivery_order_id, 'button_cancel', cr)
@@ -67,7 +67,7 @@
 -
   !python {model: sale.order}: |
     import netsvc
-    invoice_ids = self.browse(cr, uid, ref("order7")).invoice_ids
+    invoice_ids = self.browse(cr, uid, ref("sale_order_7")).invoice_ids
     wf_service = netsvc.LocalService("workflow")
     first_invoice_id = invoice_ids[0]
     wf_service.trg_validate(uid, 'account.invoice', first_invoice_id.id, 'invoice_cancel', cr)
diff --git a/addons/sale/test/delete_order.yml b/addons/sale/test/delete_order.yml
index 2bbfed9771d..751505237b6 100644
--- a/addons/sale/test/delete_order.yml
+++ b/addons/sale/test/delete_order.yml
@@ -3,12 +3,12 @@
 -
   !python {model: sale.order}: |
     try:
-        self.unlink(cr, uid, [ref("order")])
+        self.unlink(cr, uid, [ref("sale_order_1")])
     except Exception,e:
         pass
 -
   I make duplicate order and delete.
 -
   !python {model: sale.order}: |
-    id = self.copy(cr, uid, ref('order'))
+    id = self.copy(cr, uid, ref('sale_order_1'))
     self.unlink(cr, uid, [id])
diff --git a/addons/sale/test/manual_order_policy.yml b/addons/sale/test/manual_order_policy.yml
index bb197763486..40fb86f4472 100644
--- a/addons/sale/test/manual_order_policy.yml
+++ b/addons/sale/test/manual_order_policy.yml
@@ -6,7 +6,7 @@
   I check that Invoice should not created.
 -
   !python {model: sale.order}: |
-    sale_order = self.browse(cr, uid, ref("order4"))
+    sale_order = self.browse(cr, uid, ref("sale_order_4"))
     assert len(sale_order.invoice_ids) == False, "Invoice should not created."
     assert sale_order.picking_ids, "Delivery order should be created."
 -
@@ -14,7 +14,7 @@
 -
   !python {model: sale.advance.payment.inv}: |
     ctx = context.copy()
-    ctx.update({"active_model": 'sale.order', "active_ids": [ref("order4")], "active_id":ref("order4")})
+    ctx.update({"active_model": 'sale.order', "active_ids": [ref("sale_order_4")], "active_id":ref("sale_order_4")})
     order_line = self.pool.get('sale.order.line').browse(cr, uid, ref("line7"), context=context)
     pay_id = self.create(cr, uid, {'product_id': order_line.product_id.id, 'amount': order_line.price_subtotal, 'qtty': order_line.product_uom_qty})
     self.create_invoices(cr, uid, [pay_id], context=ctx)
@@ -46,7 +46,7 @@
 -
   !python {model: sale.make.invoice}: |
     ctx = context.copy()
-    ctx = ctx.update({"active_model": 'sale.order', "active_ids": [ref("order4")], "active_id":ref("order4")})
+    ctx = ctx.update({"active_model": 'sale.order', "active_ids": [ref("sale_order_4")], "active_id":ref("sale_order_4")})
     self.make_invoices(cr, uid, [ref("sale_make_invoice_1")], context)
 -
   I open the Invoice.
@@ -54,7 +54,7 @@
   !python {model: sale.order}: |
     import netsvc
     wf_service = netsvc.LocalService("workflow")
-    so = self.browse(cr, uid, ref("order4"))
+    so = self.browse(cr, uid, ref("sale_order_4"))
     for invoice in so.invoice_ids:
       wf_service.trg_validate(uid, 'account.invoice', invoice.id, 'invoice_open', cr)
 -
@@ -62,7 +62,7 @@
 -
   !python {model: account.invoice}: |
     sale_order = self.pool.get('sale.order')
-    order = sale_order.browse(cr, uid, ref("order4"))
+    order = sale_order.browse(cr, uid, ref("sale_order_4"))
     journal_ids = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', order.company_id.id)], limit=1)
     for invoice in order.invoice_ids:
         invoice.pay_and_reconcile(
@@ -74,7 +74,7 @@
   I check Invoice after do manual.
 -
   !python {model: sale.order}: |
-    sale_order = self.browse(cr, uid, ref("order4"))
+    sale_order = self.browse(cr, uid, ref("sale_order_4"))
     assert sale_order.invoice_ids, "Invoice should be created."
     assert sale_order.invoiced, "Order is not invoiced."
     assert sale_order.state == 'manual', 'Order should be in Manual.'
diff --git a/addons/sale/test/picking_order_policy.yml b/addons/sale/test/picking_order_policy.yml
index f2e3cd0e24a..295d62e57d5 100644
--- a/addons/sale/test/picking_order_policy.yml
+++ b/addons/sale/test/picking_order_policy.yml
@@ -8,12 +8,12 @@
 -
   I confirm the quotation with "Invoice based on deliveries" policy.
 -
-  !workflow {model: sale.order, action: order_confirm, ref: order}
+  !workflow {model: sale.order, action: order_confirm, ref: sale_order_1}
 -
   I check that invoice should not created before dispatch delivery.
 -
   !python {model: sale.order}: |
-    order = self.pool.get('sale.order').browse(cr, uid, ref("order"))
+    order = self.pool.get('sale.order').browse(cr, uid, ref("sale_order_1"))
     assert order.state == 'progress', 'Order should be in inprogress.'
     assert len(order.invoice_ids) == False, "Invoice should not created."
 -
@@ -23,7 +23,7 @@
     from datetime import datetime, timedelta
     from dateutil.relativedelta import relativedelta
     from tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT
-    order = self.browse(cr, uid, ref("order"))
+    order = self.browse(cr, uid, ref("sale_order_1"))
     for order_line in order.order_line:
         procurement = order_line.procurement_id
         date_planned = datetime.strptime(order.date_order, DEFAULT_SERVER_DATE_FORMAT) + relativedelta(days=order_line.delay or 0.0)
@@ -45,7 +45,7 @@
     from datetime import datetime, timedelta
     from dateutil.relativedelta import relativedelta
     from tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT
-    sale_order = self.browse(cr, uid, ref("order"))
+    sale_order = self.browse(cr, uid, ref("sale_order_1"))
     assert sale_order.picking_ids, "Delivery order is not created."
     for picking in sale_order.picking_ids:
       assert picking.state == "auto" or "confirmed", "Delivery order should be in 'Waitting Availability' state."
@@ -78,7 +78,7 @@
   Now, I dispatch delivery order.
 -
   !python {model: stock.partial.picking}: |
-    order = self.pool.get('sale.order').browse(cr, uid, ref("order"))
+    order = self.pool.get('sale.order').browse(cr, uid, ref("sale_order_1"))
     for pick in order.picking_ids:
         data = pick.force_assign()
         if data == True:
@@ -88,7 +88,7 @@
   I check sale order to verify shipment.
 -
   !python {model: sale.order}: |
-    order = self.pool.get('sale.order').browse(cr, uid, ref("order"))
+    order = self.pool.get('sale.order').browse(cr, uid, ref("sale_order_1"))
     assert order.shipped == True, "Sale order is not Delivered."
     assert order.picked_rate == 100, "Shipment progress is not 100%."
     #assert order.state == 'progress', 'Order should be in inprogress.'
@@ -98,7 +98,7 @@
 -
   !python {model: stock.invoice.onshipping}: |
     sale = self.pool.get('sale.order')
-    sale_order = sale.browse(cr, uid, ref("order"))
+    sale_order = sale.browse(cr, uid, ref("sale_order_1"))
     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'})
@@ -107,7 +107,7 @@
   I check the invoice details after dispatched delivery.
 -
   !python {model: sale.order}: |
-    order = self.browse(cr, uid, ref("order"))
+    order = self.browse(cr, uid, ref("sale_order_1"))
     assert order.invoice_ids, "Invoice is not created."
     ac = order.partner_id.property_account_receivable.id
     journal_ids = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'sale'), ('company_id', '=', order.company_id.id)])
@@ -135,7 +135,7 @@
   !python {model: sale.order}: |
     import netsvc
     wf_service = netsvc.LocalService("workflow")
-    so = self.browse(cr, uid, ref("order"))
+    so = self.browse(cr, uid, ref("sale_order_1"))
     for invoice in so.invoice_ids:
       wf_service.trg_validate(uid, 'account.invoice', invoice.id, 'invoice_open', cr)
 -
@@ -143,7 +143,7 @@
 -
   !python {model: account.invoice}: |
     sale_order = self.pool.get('sale.order')
-    order = sale_order.browse(cr, uid, ref("order"))
+    order = sale_order.browse(cr, uid, ref("sale_order_1"))
     journal_ids = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', order.company_id.id)], limit=1)
     for invoice in order.invoice_ids:
         invoice.pay_and_reconcile(
@@ -155,7 +155,7 @@
   I check the order after paid invoice.
 -
   !python {model: sale.order}: |
-    order = self.browse(cr, uid, ref("order"))
+    order = self.browse(cr, uid, ref("sale_order_1"))
     assert order.invoiced == True, "Sale order is not invoiced."
     assert order.invoiced_rate == 100, "Invoiced progress is not 100%."
     assert order.state == 'done', 'Order should be in closed.'
diff --git a/addons/sale/test/prepaid_order_policy.yml b/addons/sale/test/prepaid_order_policy.yml
index 4f45baa8823..2f8569d9514 100644
--- a/addons/sale/test/prepaid_order_policy.yml
+++ b/addons/sale/test/prepaid_order_policy.yml
@@ -6,6 +6,6 @@
   I check that delivery order should not created before invoice is paid.
 -
   !python {model: sale.order}: |
-    sale_order = self.browse(cr, uid, ref("order3"))
+    sale_order = self.browse(cr, uid, ref("sale_order_3"))
     assert len(sale_order.picking_ids) == False, "Delivery order should not created before invoice."
     assert sale_order.invoice_ids, "Invoice should be created."