From 5455b7af961eb63d16be21549c87752b78cc5dfe Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Fri, 9 Jul 2010 10:49:45 +0530
Subject: [PATCH 1/5] [IMP] sale:-sale.order.line:-company and weight
 fields(readonly),buttons in the same group,create invoice button-do not ask
 for confirmation

bzr revid: mtr@mtr-20100709051945-7fxmjk2jx1wlke1r
---
 addons/sale/sale.py       | 15 +++++++++++----
 addons/sale/sale_view.xml | 12 ++++++------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 2cef2799fae..81eac0ecb9a 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -828,7 +828,7 @@ class sale_order_line(osv.osv):
         'discount': fields.float('Discount (%)', digits=(16, 2), readonly=True, states={'draft':[('readonly',False)]}),
         'number_packages': fields.function(_number_packages, method=True, type='integer', string='Number Packages'),
         'notes': fields.text('Notes'),
-        'th_weight': fields.float('Weight'),
+        'th_weight': fields.float('Weight', readonly=True, states={'draft':[('readonly',False)]}),
         'state': fields.selection([('draft', 'Draft'),('confirmed', 'Confirmed'),('done', 'Done'),('cancel', 'Cancelled'),('exception', 'Exception')], 'State', required=True, readonly=True,
                 help=' * The \'Draft\' state is set automatically when sale order in draft state. \
                     \n* The \'Confirmed\' state is set automatically when sale order in confirm state. \
@@ -837,7 +837,7 @@ class sale_order_line(osv.osv):
                     \n* The \'Cancelled\' state is set automatically when user cancel sale order.'),
         'order_partner_id': fields.related('order_id', 'partner_id', type='many2one', relation='res.partner', string='Customer'),
         'salesman_id':fields.related('order_id', 'user_id', type='many2one', relation='res.users', string='Salesman'),
-        'company_id': fields.related('order_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True),
+        'company_id': fields.related('order_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True, states={'draft':[('readonly',False)]}),
     }
     _order = 'sequence, id'
     _defaults = {
@@ -851,10 +851,17 @@ class sale_order_line(osv.osv):
         'type': 'make_to_stock',
         'product_packaging': False
     }
-
+    
+    def call_make_invoices(self, cr, uid, ids, context):
+        line_make_invoice_obj = self.pool.get("sale.order.line.make.invoice")
+        context.update({'active_ids' : ids,'active_id' : ids})
+        invoice_call = line_make_invoice_obj.make_invoices(cr, uid, ids, context)
+        return True
+    
     def invoice_line_create(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
+       
         def _get_line_qty(line):
             if (line.order_id.invoice_quantity=='order') or not line.procurement_id:
                 if line.product_uos:
@@ -925,7 +932,7 @@ class sale_order_line(osv.osv):
         for sid in sales.keys():
             wf_service.trg_write(uid, 'sale.order', sid, cr)
         return create_ids
-
+        
     def button_cancel(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 14aa80659f9..1bb970433df 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -396,12 +396,12 @@
                             <field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]" nolabel="1"/>
                             <separator colspan="4" string="States"/>
                             <field name="state"/>
-                            <button colspan="1"
-                              name="%(action_view_sale_order_line_make_invoice)d"
-                              string="Make Invoice"
-                              type="action"
-                              icon="terp-document-new" />
-                            <group col="2" colspan="2">
+                            <group col="3" colspan="2">
+                            	<button colspan="1"
+	                              name="call_make_invoices"
+	                              string="Create Invoice"
+	                              type="object"
+	                              icon="terp-document-new" />
                                 <button name="button_done"
                                     states="confirmed,exception"
                                     string="Done" type="object"

From 8f733ccb943a7d279c6818e2828198f20b2343f7 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Fri, 9 Jul 2010 19:27:32 +0530
Subject: [PATCH 2/5] [IMP] sale:-hide the button create invoice and cancel
 button when SO line invoiced,  filtering on 'uninvoiced lines',pikcing policy
 field-readonly when picking created, solved the error in Partial Invoice

bzr revid: mtr@mtr-20100709135732-n6seq6iw39xcf3wd
---
 addons/sale/sale.py                             |  2 +-
 addons/sale/sale_view.xml                       | 11 ++++++++---
 addons/sale/wizard/sale_make_invoice_advance.py |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 81eac0ecb9a..741bcf3a526 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -233,7 +233,7 @@ class sale_order(osv.osv):
 
         'incoterm': fields.selection(_incoterm_get, 'Incoterm', size=3, 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', 'Partial Delivery'), ('one', 'Complete Delivery')],
-            'Picking Policy', required=True, help="""If you don't have enough stock available to deliver all at once, do you accept partial shipments or not?"""),
+            '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?"""),
         'order_policy': fields.selection([
             ('prepaid', 'Payment Before Delivery'),
             ('manual', 'Shipping & Manual Invoice'),
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 1bb970433df..82bf98032ff 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -399,17 +399,21 @@
                             <group col="3" colspan="2">
                             	<button colspan="1"
 	                              name="call_make_invoices"
+	                              states="confirmed"
 	                              string="Create Invoice"
 	                              type="object"
-	                              icon="terp-document-new" />
+	                              icon="terp-document-new"
+	                              attrs="{'invisible': [('invoiced', '=', 1)]}" />
                                 <button name="button_done"
                                     states="confirmed,exception"
                                     string="Done" type="object"
-                                    icon="gtk-jump-to" />
+                                    icon="gtk-jump-to" 
+                                    attrs="{'invisible': [('invoiced', '=', 0)]}"/>
                                 <button name="button_cancel"
                                     states="confirmed,exception"
                                     string="Cancel" type="object"
-                                    icon="gtk-cancel" />
+                                    icon="gtk-cancel"
+                                    attrs="{'invisible': [('invoiced', '=', 1)]}" />
                             </group>
                         </page>
 <!--                        <page string="Properties" groups="base.group_extended">-->
@@ -492,6 +496,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,graph</field>
             <field name="search_view_id" ref="view_sales_order_uninvoiced_line_filter" />
+            <field name="context">{"search_default_uninvoiced":1}</field>
             <field name="filter" eval="True"/>
         </record>
 
diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index 82a5f1c2d16..19c23eca13f 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -64,7 +64,7 @@ class sale_advance_payment_inv(osv.osv_memory):
                         _("You cannot make an advance on a sale order \
                              that is defined as 'Automatic Invoice after delivery'."))
                 val = obj_lines.product_id_change(cr, uid, [], sale_adv_obj.product_id.id,
-                        uom = False, partner_id = sale.partner_id.id, fiscal_position = sale.fiscal_position.id)
+                        uom = False, partner_id = sale.partner_id.id, fposition_id = sale.fiscal_position.id)
                 line_id =obj_lines.create(cr, uid, {
                     'name': val['value']['name'],
                     'account_id': val['value']['account_id'],

From 9c051695eb858bb61f7ef6ce99a4cbfaa703863f Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Mon, 12 Jul 2010 12:19:14 +0530
Subject: [PATCH 3/5] [IMP] sale:-display warning on Cancel button in
 sale.order.line,renamed call_make_invoices method and set the appearance of
 button in sale.ordere.line.

bzr revid: mtr@mtr-20100712064914-j4dg3e3rsci0otl3
---
 addons/sale/sale.py       | 15 ++++++++++-----
 addons/sale/sale_view.xml | 27 ++++++++++++---------------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 741bcf3a526..3c7003e49b0 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -829,12 +829,13 @@ class sale_order_line(osv.osv):
         'number_packages': fields.function(_number_packages, method=True, type='integer', string='Number Packages'),
         'notes': fields.text('Notes'),
         'th_weight': fields.float('Weight', readonly=True, states={'draft':[('readonly',False)]}),
-        'state': fields.selection([('draft', 'Draft'),('confirmed', 'Confirmed'),('done', 'Done'),('cancel', 'Cancelled'),('exception', 'Exception')], 'State', required=True, readonly=True,
+        'state': fields.selection([('draft', 'Draft'),('confirmed', 'Confirmed'),('done', 'Done'),('cancel', 'Cancelled'),('exception', 'Exception'),('invoiced','Invoiced')], 'State', required=True, readonly=True,
                 help=' * The \'Draft\' state is set automatically when sale order in draft state. \
                     \n* The \'Confirmed\' state is set automatically when sale order in confirm state. \
                     \n* The \'Exception\' state is set automatically when sale order is set as exception. \
                     \n* The \'Done\' state is set automatically when sale order is set as done. \
-                    \n* The \'Cancelled\' state is set automatically when user cancel sale order.'),
+                    \n* The \'Cancelled\' state is set automatically when user cancel sale order\
+                    \n* The \'Invoiced\' state is set automatically when user creates sale order line invoice.'),
         'order_partner_id': fields.related('order_id', 'partner_id', type='many2one', relation='res.partner', string='Customer'),
         'salesman_id':fields.related('order_id', 'user_id', type='many2one', relation='res.users', string='Salesman'),
         'company_id': fields.related('order_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True, states={'draft':[('readonly',False)]}),
@@ -852,11 +853,11 @@ class sale_order_line(osv.osv):
         'product_packaging': False
     }
     
-    def call_make_invoices(self, cr, uid, ids, context):
+    def create_sale_order_line_invoice(self, cr, uid, ids, context):
         line_make_invoice_obj = self.pool.get("sale.order.line.make.invoice")
         context.update({'active_ids' : ids,'active_id' : ids})
-        invoice_call = line_make_invoice_obj.make_invoices(cr, uid, ids, context)
-        return True
+        invoice_id = line_make_invoice_obj.make_invoices(cr, uid, ids, context)
+        return self.write(cr, uid, ids, {'state': 'invoiced'})
     
     def invoice_line_create(self, cr, uid, ids, context=None):
         if context is None:
@@ -939,6 +940,10 @@ class sale_order_line(osv.osv):
         for line in self.browse(cr, uid, ids, context=context):
             if line.invoiced:
                 raise osv.except_osv(_('Invalid action !'), _('You cannot cancel a sale order line that has already been invoiced !'))
+            if line.order_id.picking_ids: 
+                raise osv.except_osv(
+                        _('Could not cancel sale order line!'),
+                        _('You must first cancel stock move attached to this sale order line.'))
         message = _('Sale order line') + " '" + line.name + "' "+_("is cancelled")
         self.log(cr, uid, id, message)
         return self.write(cr, uid, ids, {'state': 'cancel'})
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 82bf98032ff..44e75125e31 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -165,10 +165,10 @@
                                                 <field name="state"/>
                                                 <field name="invoiced"/>
                                                 <button colspan="1"
-                                                    name="%(action_view_sale_order_line_make_invoice)d"
+                                                    name="create_sale_order_line_invoice"
                                                     states="confirmed"
-                                                    string="Make Invoice"
-                                                    type="action"
+                                                    string="Create Invoice"
+                                                    type="object"
                                                     icon="terp-document-new" />
                                             </group>
                                         </page>
@@ -398,22 +398,19 @@
                             <field name="state"/>
                             <group col="3" colspan="2">
                             	<button colspan="1"
-	                              name="call_make_invoices"
-	                              states="confirmed"
+	                              name="create_sale_order_line_invoice"
 	                              string="Create Invoice"
 	                              type="object"
 	                              icon="terp-document-new"
-	                              attrs="{'invisible': [('invoiced', '=', 1)]}" />
-                                <button name="button_done"
-                                    states="confirmed,exception"
-                                    string="Done" type="object"
-                                    icon="gtk-jump-to" 
-                                    attrs="{'invisible': [('invoiced', '=', 0)]}"/>
-                                <button name="button_cancel"
-                                    states="confirmed,exception"
+	                              attrs="{'invisible': [('invoiced', '=', 1)]}"/>
+	                            <button name="button_cancel"
+                                    states="draft,confirmed,exception"
                                     string="Cancel" type="object"
-                                    icon="gtk-cancel"
-                                    attrs="{'invisible': [('invoiced', '=', 1)]}" />
+                                    icon="gtk-cancel"/>
+                                <button name="button_done"
+                                    string="Done" type="object"
+                                    states="invoiced,exception"
+									icon="gtk-jump-to"/>
                             </group>
                         </page>
 <!--                        <page string="Properties" groups="base.group_extended">-->

From 478ad61bb1e8b549a15572913d5b6e270bc60d38 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Mon, 12 Jul 2010 18:06:53 +0530
Subject: [PATCH 4/5] [IMP] sale:-set the appearance of button in Lines to
 Invoices and fixed the bug related to subtotal in sale.order.line

bzr revid: mtr@mtr-20100712123653-fbwqxnat2dz77lkp
---
 addons/sale/sale.py       |  3 +--
 addons/sale/sale_view.xml | 11 +++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 3c7003e49b0..89f7b44fc26 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -786,7 +786,7 @@ class sale_order_line(osv.osv):
         context = context or {}
         for line in self.browse(cr, uid, ids, context=context):
             price = line.price_unit * line.product_uom_qty * (1 - (line.discount or 0.0) / 100.0)
-            taxes = tax_obj.compute_all(cr, uid, line.tax_id, price, line.product_uom_qty)
+            taxes = tax_obj.compute_all(cr, uid, line.tax_id, line.price_unit, line.product_uom_qty)
             cur = line.order_id.pricelist_id.currency_id
             res[line.id] = cur_obj.round(cr, uid, cur, taxes['total'])
         return res
@@ -927,7 +927,6 @@ class sale_order_line(osv.osv):
 
                 sales[line.order_id.id] = True
                 create_ids.append(inv_id)
-
         # Trigger workflow events
         wf_service = netsvc.LocalService("workflow")
         for sid in sales.keys():
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 44e75125e31..54474a81633 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -399,18 +399,21 @@
                             <group col="3" colspan="2">
                             	<button colspan="1"
 	                              name="create_sale_order_line_invoice"
+	                              states="confirmed"
 	                              string="Create Invoice"
 	                              type="object"
 	                              icon="terp-document-new"
 	                              attrs="{'invisible': [('invoiced', '=', 1)]}"/>
 	                            <button name="button_cancel"
-                                    states="draft,confirmed,exception"
+                                    states="confirmed,exception"
                                     string="Cancel" type="object"
-                                    icon="gtk-cancel"/>
+                                    icon="gtk-cancel"
+                                    attrs="{'invisible': [('invoiced', '=', 1)]}" />
                                 <button name="button_done"
+                                    states="confirmed,exception"
                                     string="Done" type="object"
-                                    states="invoiced,exception"
-									icon="gtk-jump-to"/>
+									icon="gtk-jump-to"
+									attrs="{'invisible': [('invoiced', '=', 0)]}"/>
                             </group>
                         </page>
 <!--                        <page string="Properties" groups="base.group_extended">-->

From 1c2505ed9512d80c65e060d1c0b678dec1cc845d Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Mon, 12 Jul 2010 18:42:35 +0530
Subject: [PATCH 5/5] [IMP] sale:-removed invoiced state in sale.order.line

bzr revid: mtr@mtr-20100712131235-x6v1e0g3vnz0y9h6
---
 addons/sale/sale.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 989cfd47806..4e2309e13e0 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -829,13 +829,12 @@ class sale_order_line(osv.osv):
         'number_packages': fields.function(_number_packages, method=True, type='integer', string='Number Packages'),
         'notes': fields.text('Notes'),
         'th_weight': fields.float('Weight', readonly=True, states={'draft':[('readonly',False)]}),
-        'state': fields.selection([('draft', 'Draft'),('confirmed', 'Confirmed'),('done', 'Done'),('cancel', 'Cancelled'),('exception', 'Exception'),('invoiced','Invoiced')], 'State', required=True, readonly=True,
+        'state': fields.selection([('draft', 'Draft'),('confirmed', 'Confirmed'),('done', 'Done'),('cancel', 'Cancelled'),('exception', 'Exception')], 'State', required=True, readonly=True,
                 help=' * The \'Draft\' state is set automatically when sale order in draft state. \
                     \n* The \'Confirmed\' state is set automatically when sale order in confirm state. \
                     \n* The \'Exception\' state is set automatically when sale order is set as exception. \
                     \n* The \'Done\' state is set automatically when sale order is set as done. \
-                    \n* The \'Cancelled\' state is set automatically when user cancel sale order\
-                    \n* The \'Invoiced\' state is set automatically when user creates sale order line invoice.'),
+                    \n* The \'Cancelled\' state is set automatically when user cancel sale order.'),
         'order_partner_id': fields.related('order_id', 'partner_id', type='many2one', relation='res.partner', string='Customer'),
         'salesman_id':fields.related('order_id', 'user_id', type='many2one', relation='res.users', string='Salesman'),
         'company_id': fields.related('order_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True, states={'draft':[('readonly',False)]}),
@@ -857,7 +856,7 @@ class sale_order_line(osv.osv):
         line_make_invoice_obj = self.pool.get("sale.order.line.make.invoice")
         context.update({'active_ids' : ids,'active_id' : ids})
         invoice_id = line_make_invoice_obj.make_invoices(cr, uid, ids, context)
-        return self.write(cr, uid, ids, {'state': 'invoiced'})
+        return True
     
     def invoice_line_create(self, cr, uid, ids, context=None):
         if context is None: