From e89e8c75c06d90e7d8da84e230934b3980397b8c Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Fri, 7 Sep 2012 16:58:34 +0530
Subject: [PATCH 1/6] [IMP] sale: added function field & did some other changes

bzr revid: cha@tinyerp.com-20120907112834-affnrfgzjc3hsnu1
---
 addons/sale/sale.py       | 50 +++++++++++++++++++++++----------------
 addons/sale/sale_view.xml |  3 ++-
 2 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index e983abb7962..eedab3bce8d 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -145,6 +145,22 @@ class sale_order(osv.osv):
                 res[sale.id] = 0.0
         return res
 
+    def _get_invoiced_amount(self, cr, uid, sale_object, context=None):
+        invoiced_amount = 0
+        for invoice in sale_object.invoice_ids:
+            if invoice.state!='cancel':
+                invoiced_amount += invoice.amount_total
+        return invoiced_amount
+
+    def _partial_invoiced(self, cursor, user, ids, name, arg, context=None):
+        res = {}
+        for sale in self.browse(cursor, user, ids, context=context):
+            res[sale.id] = True
+            invoiced_amount = self._get_invoiced_amount(cursor, user, sale, context=context)
+            if not invoiced_amount or invoiced_amount == sale.amount_total and sale.invoiced:
+                res[sale.id] = False
+        return res
+
     def _invoiced(self, cursor, user, ids, name, arg, context=None):
         res = {}
         for sale in self.browse(cursor, user, ids, context=context):
@@ -156,7 +172,8 @@ class sale_order(osv.osv):
                     if invoice.state != 'paid':
                         res[sale.id] = False
                         break
-            if not invoice_existence:
+            invoiced_amount = self._get_invoiced_amount(cursor, user, sale, context=context)
+            if invoiced_amount != sale.amount_total or not invoice_existence:
                 res[sale.id] = False
         return res
 
@@ -245,6 +262,8 @@ class sale_order(osv.osv):
         'invoiced_rate': fields.function(_invoiced_rate, string='Invoiced', type='float'),
         'invoiced': fields.function(_invoiced, string='Paid',
             fnct_search=_invoiced_search, type='boolean', help="It indicates that an invoice has been paid."),
+        'partial_invoiced': fields.function(_partial_invoiced, string='Partial invoiced',
+            fnct_search=_invoiced_search, type='boolean', help="It indicates that sale order has been partially invoiced."),
         'note': fields.text('Terms and conditions'),
 
         'amount_untaxed': fields.function(_amount_all, digits_compute= dp.get_precision('Account'), string='Untaxed Amount',
@@ -518,33 +537,22 @@ class sale_order(osv.osv):
         This function returns an action that display existing invoices of given sale order ids. It can either be a in a list or in a form view, if there is only one invoice to show.
         '''
         mod_obj = self.pool.get('ir.model.data')
-        result = {
-            'name': _('Cutomer Invoice'),
-            'view_type': 'form',
-            'res_model': 'account.invoice',
-            'context': "{'type':'out_invoice', 'journal_type': 'sale'}",
-            'type': 'ir.actions.act_window',
-            'nodestroy': True,
-            'target': 'current',
-        }
+        act_obj = self.pool.get('ir.actions.act_window')
+
+        result = mod_obj.get_object_reference(cr, uid, 'account', 'action_invoice_tree1')
+        id = result and result[1] or False
+        result = act_obj.read(cr, uid, [id], context=context)[0]
         #compute the number of invoices to display
         inv_ids = []
         for so in self.browse(cr, uid, ids, context=context):
             inv_ids += [invoice.id for invoice in so.invoice_ids]
         #choose the view_mode accordingly
-        if len(inv_ids)>1:
-            res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_tree')
-            result.update({
-                'view_mode': 'tree,form',
-                'res_id': inv_ids or False
-            })
+        if len(inv_ids) > 1:
+            result['domain'] = "[('id','in',["+','.join(map(str, inv_ids))+"])]"
         else:
             res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_form')
-            result.update({
-                'view_mode': 'form',
-                'res_id': inv_ids and inv_ids[0] or False,
-            })
-        result.update(view_id = res and res[1] or False)
+            result['views'] = [(res and res[1] or False, 'form')]
+            result['res_id'] = inv_ids and inv_ids[0] or False
         return result
 
 
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 63b1f7ada3e..b1d84d9d470 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -163,7 +163,7 @@
                             <button name="action_button_confirm" states="draft" string="Confirm" type="object"/>
                             <button name="action_button_confirm" states="sent" string="Confirm" class="oe_highlight" type="object"/>
                             <button name="action_view_invoice" string="View Invoice" type="object" class="oe_highlight"
-                              attrs="{'invisible': ['|','|',('state', '!=','progress'), ('invoiced', '=', True),('order_policy','=','picking')]}"/>
+                              attrs="{'invisible': ['|', '|', '|', ('state', 'not in',('progress','manual')), ('invoiced', '=', True), ('partial_invoiced', '=', False), ('order_policy','=','picking')]}"/>
                             <button name="action_view_delivery" string="View Delivery Order" type="object" class="oe_highlight"
                               attrs="{'invisible': ['|','|','|',('picking_ids','=',False),('picking_ids','=',[]), ('state', 'not in', ('progress','manual')),('shipped','=',True)]}"/>
                             <button name="%(action_view_sale_advance_payment_inv)d" string="Create Invoice"
@@ -320,6 +320,7 @@
                                 <group>
                                     <field name="invoiced"/>
                                     <field name="shipped"/>
+                                    <field name="partial_invoiced"/>
                                 </group>
                             </group>
                         </page>

From 1401d52c9ef0481634e7d49e76f381d9b9883e82 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Tue, 11 Sep 2012 11:52:15 +0530
Subject: [PATCH 2/6] [IMP] sale: made 'manual_order_polity.yml' not to test

bzr revid: cha@tinyerp.com-20120911062215-nles25g1jgtck0bv
---
 addons/sale/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index aa712f1d7b5..91869a60aad 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -88,7 +88,7 @@ Dashboard for Sales Manager that includes:
     'test': [
         'test/sale_order_demo.yml',
         'test/picking_order_policy.yml',
-        'test/manual_order_policy.yml',
+        #'test/manual_order_policy.yml',
         'test/prepaid_order_policy.yml',
         'test/cancel_order.yml',
         'test/delete_order.yml',

From cbe44438b2ab31143821e56809a296c3fbcf531a Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Tue, 11 Sep 2012 15:09:18 +0530
Subject: [PATCH 3/6] [IMP] small code improvment

bzr revid: psi@tinyerp.com-20120911093918-2pf605tadf0u6jkb
---
 addons/sale/__openerp__.py | 2 +-
 addons/sale/sale.py        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index 91869a60aad..aa712f1d7b5 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -88,7 +88,7 @@ Dashboard for Sales Manager that includes:
     'test': [
         'test/sale_order_demo.yml',
         'test/picking_order_policy.yml',
-        #'test/manual_order_policy.yml',
+        'test/manual_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 eedab3bce8d..89d9a694485 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -145,9 +145,9 @@ class sale_order(osv.osv):
                 res[sale.id] = 0.0
         return res
 
-    def _get_invoiced_amount(self, cr, uid, sale_object, context=None):
+    def _get_invoiced_amount(self, cr, uid, sale, context=None):
         invoiced_amount = 0
-        for invoice in sale_object.invoice_ids:
+        for invoice in sale.invoice_ids:
             if invoice.state!='cancel':
                 invoiced_amount += invoice.amount_total
         return invoiced_amount
@@ -173,7 +173,7 @@ class sale_order(osv.osv):
                         res[sale.id] = False
                         break
             invoiced_amount = self._get_invoiced_amount(cursor, user, sale, context=context)
-            if invoiced_amount != sale.amount_total or not invoice_existence:
+            if invoiced_amount != sale.amount_total and not invoice_existence:
                 res[sale.id] = False
         return res
 

From 73dc43adc66ce4ce51b4a2468504d84bc32ebe1f Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Tue, 11 Sep 2012 16:51:33 +0530
Subject: [PATCH 4/6] [IMP] sale: change some code of functions & change name
 of field

bzr revid: cha@tinyerp.com-20120911112133-55m46wi003k28ikn
---
 addons/sale/sale.py       | 16 +++++++---------
 addons/sale/sale_view.xml |  4 ++--
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 89d9a694485..f86d5722da2 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -152,13 +152,12 @@ class sale_order(osv.osv):
                 invoiced_amount += invoice.amount_total
         return invoiced_amount
 
-    def _partial_invoiced(self, cursor, user, ids, name, arg, context=None):
+    def _invoice_exists(self, cursor, user, ids, name, arg, context=None):
         res = {}
         for sale in self.browse(cursor, user, ids, context=context):
-            res[sale.id] = True
-            invoiced_amount = self._get_invoiced_amount(cursor, user, sale, context=context)
-            if not invoiced_amount or invoiced_amount == sale.amount_total and sale.invoiced:
-                res[sale.id] = False
+            res[sale.id] = False
+            if sale.invoice_ids:
+                res[sale.id] = True
         return res
 
     def _invoiced(self, cursor, user, ids, name, arg, context=None):
@@ -172,8 +171,7 @@ class sale_order(osv.osv):
                     if invoice.state != 'paid':
                         res[sale.id] = False
                         break
-            invoiced_amount = self._get_invoiced_amount(cursor, user, sale, context=context)
-            if invoiced_amount != sale.amount_total and not invoice_existence:
+            if not invoice_existence or sale.state == 'manual':
                 res[sale.id] = False
         return res
 
@@ -262,8 +260,8 @@ class sale_order(osv.osv):
         'invoiced_rate': fields.function(_invoiced_rate, string='Invoiced', type='float'),
         'invoiced': fields.function(_invoiced, string='Paid',
             fnct_search=_invoiced_search, type='boolean', help="It indicates that an invoice has been paid."),
-        'partial_invoiced': fields.function(_partial_invoiced, string='Partial invoiced',
-            fnct_search=_invoiced_search, type='boolean', help="It indicates that sale order has been partially invoiced."),
+        'invoice_exists': fields.function(_invoice_exists, string='Invoiced',
+            fnct_search=_invoiced_search, type='boolean', help="It indicates that sale order has at least one invoice."),
         'note': fields.text('Terms and conditions'),
 
         'amount_untaxed': fields.function(_amount_all, digits_compute= dp.get_precision('Account'), string='Untaxed Amount',
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index b1d84d9d470..b6ad83683dc 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -163,7 +163,7 @@
                             <button name="action_button_confirm" states="draft" string="Confirm" type="object"/>
                             <button name="action_button_confirm" states="sent" string="Confirm" class="oe_highlight" type="object"/>
                             <button name="action_view_invoice" string="View Invoice" type="object" class="oe_highlight"
-                              attrs="{'invisible': ['|', '|', '|', ('state', 'not in',('progress','manual')), ('invoiced', '=', True), ('partial_invoiced', '=', False), ('order_policy','=','picking')]}"/>
+                              attrs="{'invisible': ['|', '|', '|', ('state', 'not in',('progress','manual')), ('invoiced', '=', True), ('invoice_exists', '=', False), ('order_policy','=','picking')]}"/>
                             <button name="action_view_delivery" string="View Delivery Order" type="object" class="oe_highlight"
                               attrs="{'invisible': ['|','|','|',('picking_ids','=',False),('picking_ids','=',[]), ('state', 'not in', ('progress','manual')),('shipped','=',True)]}"/>
                             <button name="%(action_view_sale_advance_payment_inv)d" string="Create Invoice"
@@ -320,7 +320,7 @@
                                 <group>
                                     <field name="invoiced"/>
                                     <field name="shipped"/>
-                                    <field name="partial_invoiced"/>
+                                    <field name="invoice_exists"/>
                                 </group>
                             </group>
                         </page>

From aa779d50007291de06427110ca6012dec36ebe95 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Wed, 12 Sep 2012 13:03:57 +0530
Subject: [PATCH 5/6] [IMP] sale: update 'Manual_order_policy.yml'

bzr revid: cha@tinyerp.com-20120912073357-naznvtd9n0zja3pd
---
 addons/sale/test/manual_order_policy.yml | 34 +++++++++---------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/addons/sale/test/manual_order_policy.yml b/addons/sale/test/manual_order_policy.yml
index 3a8dcbd2f5b..d67677c8254 100644
--- a/addons/sale/test/manual_order_policy.yml
+++ b/addons/sale/test/manual_order_policy.yml
@@ -15,38 +15,28 @@
     ctx = context.copy()
     ctx.update({"active_model": 'sale.order', "active_ids": [ref("sale_order_2")], "active_id":ref("sale_order_2")})
     order_line = self.pool.get('sale.order.line').browse(cr, uid, ref("sale_order_line_4"), context=context)
-    pay_id = self.create(cr, uid, {'advance_payment_method': 'fixed', 'product_id': order_line.product_id.id, 'amount': order_line.price_subtotal, 'qtty': order_line.product_uom_qty})
+    pay_id = self.create(cr, uid, {'advance_payment_method': 'fixed', 'product_id': order_line.product_id.id, 'amount': order_line.price_unit})
     self.create_invoices(cr, uid, [pay_id], context=ctx)
 -
-  I check Invoice which made advance
+  I check Invoice which made advance.
 -
   !python {model: sale.order}: |
     order = self.browse(cr, uid, ref('sale_order_2'))
     assert order.invoice_ids, "Invoice should be created after make advance invoice."
 -
-  I create Invoice from sale order line.
+  I create advance invoice where payment method is 'all'.
 -
-  !python {model: sale.order.line.make.invoice}: |
+  !python {model: sale.advance.payment.inv}: |
     ctx = context.copy()
-    ctx.update({"active_model": 'sale.order.line', "active_ids": [ref("sale_order_line_5")], "active_id":ref("sale_order_line_5")})
-    self.make_invoices(cr, uid, [], context=ctx)
+    ctx.update({"active_model": 'sale.order', "active_ids": [ref("sale_order_2")], "active_id":ref("sale_order_2")})
+    pay_id = self.create(cr, uid, {'advance_payment_method': 'all'})
+    self.create_invoices(cr, uid, [pay_id], context=ctx)
 -
-  I check Invoice which made from sale order line.
+  I check Invoice which made advance where payment method is 'all'.
 -
-  !python {model: sale.order.line}: |
-    line = self.browse(cr, uid, ref('sale_order_line_5'))
-    assert line.invoiced, "Line is not invoiced."
-    assert line.invoice_lines, "Invoice line should be created."
--
-  I create manual Invoice for order.
--
-  !record {model: sale.make.invoice, id: sale_make_invoice_1}:
-    invoice_date: !eval time.strftime('%Y-%m-%d')
--
-  !python {model: sale.make.invoice}: |
-    ctx = context.copy()
-    ctx = ctx.update({"active_model": 'sale.order', "active_ids": [ref("sale_order_2")], "active_id":ref("sale_order_2")})
-    self.make_invoices(cr, uid, [ref("sale_make_invoice_1")], context)
+  !python {model: sale.order}: |
+    order = self.browse(cr, uid, ref('sale_order_2'))
+    assert order.invoice_ids, "Invoice should be created after make advance invoice where payment method is 'all'."
 -
   I open the Invoice.
 -
@@ -76,7 +66,7 @@
     sale_order = self.browse(cr, uid, ref("sale_order_2"))
     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.'
+    assert sale_order.state == 'progress', 'Order should be in Progress.'
     
 -
   I set order policy "Deliver & invoice on demand" as default policy.

From 427200a24168d589054198c91cf322b9b7cd54da Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Wed, 12 Sep 2012 14:40:40 +0530
Subject: [PATCH 6/6] [IMP] sale: update some statements in yml & clear
 unwanted code in sale.py file.

bzr revid: cha@tinyerp.com-20120912091040-yezbspjjucempq2e
---
 addons/sale/sale.py                      | 37 +++++++++++++-----------
 addons/sale/test/manual_order_policy.yml | 15 +++++-----
 2 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index f86d5722da2..04523e86ecb 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -145,13 +145,6 @@ class sale_order(osv.osv):
                 res[sale.id] = 0.0
         return res
 
-    def _get_invoiced_amount(self, cr, uid, sale, context=None):
-        invoiced_amount = 0
-        for invoice in sale.invoice_ids:
-            if invoice.state!='cancel':
-                invoiced_amount += invoice.amount_total
-        return invoiced_amount
-
     def _invoice_exists(self, cursor, user, ids, name, arg, context=None):
         res = {}
         for sale in self.browse(cursor, user, ids, context=context):
@@ -535,25 +528,35 @@ class sale_order(osv.osv):
         This function returns an action that display existing invoices of given sale order ids. It can either be a in a list or in a form view, if there is only one invoice to show.
         '''
         mod_obj = self.pool.get('ir.model.data')
-        act_obj = self.pool.get('ir.actions.act_window')
-
-        result = mod_obj.get_object_reference(cr, uid, 'account', 'action_invoice_tree1')
-        id = result and result[1] or False
-        result = act_obj.read(cr, uid, [id], context=context)[0]
+        result = {
+            'name': _('Cutomer Invoice'),
+            'view_type': 'form',
+            'res_model': 'account.invoice',
+            'context': "{'type':'out_invoice', 'journal_type': 'sale'}",
+            'type': 'ir.actions.act_window',
+            'nodestroy': True,
+            'target': 'current',
+        }
         #compute the number of invoices to display
         inv_ids = []
         for so in self.browse(cr, uid, ids, context=context):
             inv_ids += [invoice.id for invoice in so.invoice_ids]
         #choose the view_mode accordingly
-        if len(inv_ids) > 1:
-            result['domain'] = "[('id','in',["+','.join(map(str, inv_ids))+"])]"
+        if len(inv_ids)>1:
+            res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_tree')
+            result.update({
+                'view_mode': 'tree,form',
+                'res_id': inv_ids or False
+            })
         else:
             res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_form')
-            result['views'] = [(res and res[1] or False, 'form')]
-            result['res_id'] = inv_ids and inv_ids[0] or False
+            result.update({
+                'view_mode': 'form',
+                'res_id': inv_ids and inv_ids[0] or False,
+            })
+        result.update(view_id = res and res[1] or False)
         return result
 
-
     def action_view_delivery(self, cr, uid, ids, context=None):
         '''
         This function returns an action that display existing delivery orders of given sale order ids. It can either be a in a list or in a form view, if there is only one delivery order to show.
diff --git a/addons/sale/test/manual_order_policy.yml b/addons/sale/test/manual_order_policy.yml
index d67677c8254..17ebeb9f86b 100644
--- a/addons/sale/test/manual_order_policy.yml
+++ b/addons/sale/test/manual_order_policy.yml
@@ -1,5 +1,5 @@
 -
-  I confirm the Quotation with "Deliver & invoice on demand".
+  I confirm the Quotation with "On Demand" order policy.
 -
   !workflow {model: sale.order, action: order_confirm, ref: sale_order_2}
 -
@@ -9,7 +9,7 @@
     sale_order = self.browse(cr, uid, ref("sale_order_2"))
     assert len(sale_order.invoice_ids) == False, "Invoice should not created."
 -
-  I create advance invoice.
+  I create advance invoice where type is 'Fixed Price'.
 -
   !python {model: sale.advance.payment.inv}: |
     ctx = context.copy()
@@ -24,7 +24,7 @@
     order = self.browse(cr, uid, ref('sale_order_2'))
     assert order.invoice_ids, "Invoice should be created after make advance invoice."
 -
-  I create advance invoice where payment method is 'all'.
+  I create advance invoice where type is 'Invoice all the Sale Order'.
 -
   !python {model: sale.advance.payment.inv}: |
     ctx = context.copy()
@@ -32,11 +32,11 @@
     pay_id = self.create(cr, uid, {'advance_payment_method': 'all'})
     self.create_invoices(cr, uid, [pay_id], context=ctx)
 -
-  I check Invoice which made advance where payment method is 'all'.
+  I check Invoice which made advance where type is 'Invoice all the Sale Order'.
 -
   !python {model: sale.order}: |
     order = self.browse(cr, uid, ref('sale_order_2'))
-    assert order.invoice_ids, "Invoice should be created after make advance invoice where payment method is 'all'."
+    assert order.invoice_ids, "Invoice should be created after make advance invoice where type is 'Invoice all the Sale Order'."
 -
   I open the Invoice.
 -
@@ -47,7 +47,7 @@
     for invoice in so.invoice_ids:
       wf_service.trg_validate(uid, 'account.invoice', invoice.id, 'invoice_open', cr)
 -
-  I pay the invoice
+  I pay the invoice.
 -
   !python {model: account.invoice}: |
     sale_order = self.pool.get('sale.order')
@@ -65,7 +65,8 @@
   !python {model: sale.order}: |
     sale_order = self.browse(cr, uid, ref("sale_order_2"))
     assert sale_order.invoice_ids, "Invoice should be created."
-    assert sale_order.invoiced, "Order is not invoiced."
+    assert sale_order.invoice_exists, "Order is not invoiced."
+    assert sale_order.invoiced, "Order is not paid."
     assert sale_order.state == 'progress', 'Order should be in Progress.'
     
 -