From 9d3411ee548eacacae3363f5b921fe9eee1c5ee9 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Tue, 6 Mar 2012 12:03:02 +0530
Subject: [PATCH] [IMP]remove comments unused code

bzr revid: sgo@tinyerp.com-20120306063302-thlryjejp9idkjq3
---
 addons/sale/__openerp__.py                 |  1 -
 addons/sale/sale.py                        |  2 +-
 addons/sale/sale_demo.xml                  | 36 ---------------
 addons/sale/test/postpaid_order_policy.yml | 54 ----------------------
 4 files changed, 1 insertion(+), 92 deletions(-)
 delete mode 100644 addons/sale/test/postpaid_order_policy.yml

diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index 04a9d1a2ef6..7e0139ba749 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -91,7 +91,6 @@ Dashboard for Sales Manager that includes:
         'test/sale_order_demo.yml',
         'test/picking_order_policy.yml',
         'test/manual_order_policy.yml',
-        #'test/postpaid_order_policy.yml',
         'test/prepaid_order_policy.yml',
         'test/cancel_order.yml',
         'test/delete_order.yml',
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 3274781a9f7..198d1d57935 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -221,7 +221,7 @@ class sale_order(osv.osv):
 
         'incoterm': fields.many2one('stock.incoterms', 'Incoterm', help="Incoterm which stands for 'International Commercial terms' implies its a series of sales terms which are used in the commercial transaction."),
         'picking_policy': fields.selection([('direct', 'Deliver each product when available'), ('one', 'Deliver all products at once')],
-            'Picking Policy', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="""If you don't have enough stock available to deliver all at once, do you accept partial shipments or not?"""),
+            'Picking Ship', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="""If you don't have enough stock available to deliver all at once, do you accept partial shipments or not?"""),
         'order_policy': fields.selection([
             ('prepaid', 'Before Delivery'),
             ('manual', 'On Demand'),
diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml
index 3b5c4c46b3a..990c76a5242 100644
--- a/addons/sale/sale_demo.xml
+++ b/addons/sale/sale_demo.xml
@@ -61,42 +61,6 @@
 
         <!--Resource: sale.order-->
         
-        <!--<record id="order2" 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"/>
-            <field name="partner_id" ref="base.res_partner_2"/>
-            <field name="partner_invoice_id" ref="base.res_partner_address_9"/>
-            <field name="partner_shipping_id" ref="base.res_partner_address_9"/>
-            <field name="partner_order_id" ref="base.res_partner_address_9"/>
-            <field name="invoice_quantity">order</field>
-            <field name="order_policy">postpaid</field>
-            
-        </record>-->
-
-        <!--Resource: sale.order.line-->
-        
-        <!--<record id="line3" model="sale.order.line">
-            <field name="order_id" ref="order2"/>
-            <field name="name">[PC2] Computer assembled on demand</field>
-            <field name="product_id" ref="product.product_product_pc2"/>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="price_unit">540</field>
-            <field name="type">make_to_order</field>
-        </record>
-        <record id="line4" model="sale.order.line">
-            <field name="order_id" ref="order2"/>
-            <field name="name">[MB1] Mainboard ASUStek (purchased on order)</field>
-            <field name="product_id" ref="product.product_product_mb1"/>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="price_unit">88</field>
-            <field name="product_uom_qty">8</field>
-            <field name="product_uos_qty">8</field>
-            <field name="type">make_to_order</field>
-        </record>-->
-
-        <!--Resource: sale.order-->
-        
         <record id="order3" model="sale.order">
             <field name="shop_id" ref="shop"/>
             <field model="product.pricelist" name="pricelist_id" search="[]"/>
diff --git a/addons/sale/test/postpaid_order_policy.yml b/addons/sale/test/postpaid_order_policy.yml
deleted file mode 100644
index eeea02e2305..00000000000
--- a/addons/sale/test/postpaid_order_policy.yml
+++ /dev/null
@@ -1,54 +0,0 @@
--
-  Now I confirm the Quotation with "Invoice on order after delivery" policy.
--
-  !workflow {model: sale.order, action: order_confirm, ref: order2}
--
-  I check that related delivery order after confirmed.
--
-  !python {model: sale.order}: |
-    sale_order = self.browse(cr, uid, ref("order2"))
-    assert sale_order.picking_ids, "Delivery Order should be created."
-    assert len(sale_order.invoice_ids) == False, "Invoice should be not created."
--
-  Now, I dispatch delivery order.
--
-  !python {model: stock.partial.picking}: |
-    order = self.pool.get('sale.order').browse(cr, uid, ref("order2"))
-    for pick in order.picking_ids:
-        data = pick.force_assign()
-        if data == True:
-          partial_id = self.create(cr, uid, {}, context={'active_model': 'stock.picking','active_ids': [pick.id]})
-          self.do_partial(cr, uid, [partial_id])
--
-  I open the invoice.
--
-  !python {model: sale.order}: |
-    import netsvc
-    wf_service = netsvc.LocalService("workflow")
-    order = self.browse(cr, uid, ref("order2"))
-    #assert order.invoice_ids, "Invoice should be created after dispatch delivery order."
-    for invoice in order.invoice_ids:
-      wf_service.trg_validate(uid, 'account.invoice', invoice.id, 'invoice_open', cr)
--
-  I pay the invoice.
--
-  !python {model: account.invoice}: |
-    sale_order = self.pool.get('sale.order')
-    order = sale_order.browse(cr, uid, ref("order2"))
-    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(
-            invoice.amount_total, ref('account.cash'), ref('account.period_8'),
-            journal_ids[0], ref('account.cash'),
-            ref('account.period_8'), journal_ids[0],
-            name='test')
--
-  I check that an order has been invoiced, shipped and closed.
--
-  !python {model: sale.order}: |
-    order = self.browse(cr, uid, ref("order2"))
-    assert order.picked_rate == 100, "Shipment progress is not 100%."
-    #assert order.shipped, "Delivery Order should be dispatch." #TOFIX: procurement is gone in idle state so order never shipped, invoiced. after install mrp, it will be normal.
-    #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.'