[MERGE] merged the branch with improvement of the advance payment wizard (in sale module)

bzr revid: qdp-launchpad@openerp.com-20120523175802-cr5ag74ftjh83tct

3 files changed, 90 insertions, 77 deletions

diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml
index 3d8bbae9ad7..d9946c812c7 100644
--- a/addons/sale/sale_demo.xml
+++ b/addons/sale/sale_demo.xml
@@ -268,6 +268,7 @@
             <field name="supply_method">produce</field>
             <field name="uom_id" ref="product.uom_day"/>
             <field name="uom_po_id" ref="product.uom_day"/>
+            <field name="company_id" eval="[]"/>
         </record>
 
     <record id="base.user_demo" model="res.users">
diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index 94cae45519d..f3d9bd65a91 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -20,20 +20,42 @@
 
 from osv import fields, osv
 from tools.translate import _
+import decimal_precision as dp
 
 class sale_advance_payment_inv(osv.osv_memory):
     _name = "sale.advance.payment.inv"
     _description = "Sales Advance Payment Invoice"
+
+    def _default_product_id(self, cr, uid, context=None):
+        try:
+            product_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'sale', 'advance_product_0')
+        except ValueError:
+            #a ValueError is returned if the xml id given is not found in the table ir_model_data
+            return False
+        return product_id[1]
+
     _columns = {
-        'product_id': fields.many2one('product.product', 'Advance Product', required=True,
-            help="Select a product of type service which is called 'Advance Product'. You may have to create it and set it as a default value on this field."),
-        'amount': fields.float('Advance Amount', digits=(16, 2), required=True, help="The amount to be invoiced in advance."),
+        'product_id': fields.many2one('product.product', 'Advance Product', help="Select a product of type service which is called 'Advance Product'. You may have to create it and set it as a default value on this field."),
+        'amount': fields.float('Advance Amount', digits_compute= dp.get_precision('Sale Price'), required=True, help="The amount to be invoiced in advance."),
         'qtty': fields.float('Quantity', digits=(16, 2), required=True),
+        'advance_payment_method':fields.selection([('percentage','Percentage'), ('fixed','Fixed Price')], 'Type', required=True, help="Use Fixed Price if you want to give specific amound in Advance, Use Percentage if you want to give percentage of Total Invoice Amount."),
     }
+
     _defaults = {
-        'qtty': 1.0
+        'qtty': 1.0,
+        'advance_payment_method': 'fixed',
+        'product_id': _default_product_id,
     }
 
+    def onchange_advance_payment_method(self, cr, uid, ids, advance_payment_method, product_id, context=None):
+        if advance_payment_method == 'percentage':
+            return {'value': {'amount':0, 'product_id':False }}
+        if not product_id:
+            return {'value': {'amount': 0}}
+        product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
+        return {'value': {'amount': product.list_price}}
+
+
     def create_invoices(self, cr, uid, ids, context=None):
         """
              To create invoices.
@@ -66,21 +88,55 @@ class sale_advance_payment_inv(osv.osv_memory):
                 val = obj_lines.product_id_change(cr, uid, [], sale_adv_obj.product_id.id,
                         uom = False, partner_id = sale.partner_id.id, fposition_id = sale.fiscal_position.id)
                 res = val['value']
+
+                if not sale_adv_obj.product_id.id :
+                    prop = self.pool.get('ir.property').get(cr, uid,
+                                         'property_account_income_categ', 'product.category',
+                                         context=context)
+                    account_id = prop and prop.id or False
+                    account_id = self.pool.get('account.fiscal.position').map_account(cr, uid, sale.fiscal_position.id or False, account_id)
+                    if not account_id:
+                        raise osv.except_osv(_('Configuration Error !'),
+                                _('There is no income account defined as global property.'))
+                    res['account_id'] = account_id
+
                 if not res.get('account_id'):
                     raise osv.except_osv(_('Configuration Error !'),
                                 _('There is no income account defined ' \
                                         'for this product: "%s" (id:%d)') % \
                                         (sale_adv_obj.product_id.name, sale_adv_obj.product_id.id,))
-                
+
+                final_amount = 0
+                if sale_adv_obj.amount <= 0.00:
+                    raise osv.except_osv(_('Data Insufficient !'),
+                        _('Please check the Advance Amount, it should not be 0 or less!'))
+                if sale_adv_obj.advance_payment_method == 'percentage':
+                    final_amount = sale.amount_total * sale_adv_obj.amount / 100
+                    if not res.get('name'):
+                        res['name'] = _("Advance of %s %%") % (sale_adv_obj.amount)
+                else:
+                    final_amount = sale_adv_obj.amount
+                    if not res.get('name'):
+                        #TODO: should find a way to call formatLang() from rml_parse
+                        if sale.pricelist_id.currency_id.position == 'after':
+                            res['name'] = _("Advance of %s %s") % (final_amount, sale.pricelist_id.currency_id.symbol)
+                        else:
+                            res['name'] = _("Advance of %s %s") % (sale.pricelist_id.currency_id.symbol, final_amount)
+
+                if res.get('invoice_line_tax_id'):
+                    res['invoice_line_tax_id'] = [(6, 0, res.get('invoice_line_tax_id'))]
+                else:
+                    res['invoice_line_tax_id'] = False
+
                 line_id = obj_lines.create(cr, uid, {
                     'name': res.get('name'),
                     'account_id': res['account_id'],
-                    'price_unit': sale_adv_obj.amount,
-                    'quantity': sale_adv_obj.qtty,
+                    'price_unit': final_amount,
+                    'quantity': sale_adv_obj.qtty or 1.0,
                     'discount': False,
-                    'uos_id': res.get('uos_id'),
+                    'uos_id': res.get('uos_id', False),
                     'product_id': sale_adv_obj.product_id.id,
-                    'invoice_line_tax_id': [(6, 0, res.get('invoice_line_tax_id'))],
+                    'invoice_line_tax_id': res.get('invoice_line_tax_id'),
                     'account_analytic_id': sale.project_id.id or False,
                     #'note':'',
                 })
@@ -112,49 +168,27 @@ class sale_advance_payment_inv(osv.osv_memory):
         # If not, the advance will be deduced when generating the final invoice
         #
                 if sale.order_policy == 'picking':
-                    self.pool.get('sale.order.line').create(cr, uid, {
+                    vals = {
                         'order_id': sale.id,
                         'name': res.get('name'),
-                        'price_unit': -sale_adv_obj.amount,
-                        'product_uom_qty': sale_adv_obj.qtty,
-                        'product_uos_qty': sale_adv_obj.qtty,
-                        'product_uos': res.get('uos_id'),
-                        'product_uom': res.get('uos_id'),
-                        'product_id': sale_adv_obj.product_id.id,
+                        'price_unit': -final_amount,
+                        'product_uom_qty': sale_adv_obj.qtty or 1.0,
+                        'product_uos_qty': sale_adv_obj.qtty or 1.0,
+                        'product_uos': res.get('uos_id', False),
+                        'product_uom': res.get('uom_id', False),
+                        'product_id': sale_adv_obj.product_id.id or False,
                         'discount': False,
-                        'tax_id': [(6, 0, res.get('invoice_line_tax_id'))],
-                    }, context)
+                        'tax_id': res.get('invoice_line_tax_id'),
+                    }
+                    self.pool.get('sale.order.line').create(cr, uid, vals, context=context)
 
         context.update({'invoice_id':list_inv})
 
-        return {
-            'name': 'Open Invoice',
-            'view_type': 'form',
-            'view_mode': 'form',
-            'res_model': 'sale.open.invoice',
-            'type': 'ir.actions.act_window',
-            'target': 'new',
-            'context': context
-        }
-
-sale_advance_payment_inv()
-
-class sale_open_invoice(osv.osv_memory):
-    _name = "sale.open.invoice"
-    _description = "Sales Open Invoice"
+        if context.get('open_invoices'):
+            return self.open_invoices( cr, uid, ids, context=context)
+        return {'type': 'ir.actions.act_window_close'}
 
-    def open_invoice(self, cr, uid, ids, context=None):
-
-        """
-             To open invoice.
-             @param self: The object pointer.
-             @param cr: A database cursor
-             @param uid: ID of the user currently logged in
-             @param ids: the ID or list of IDs if we want more than one
-             @param context: A standard dictionary
-             @return:
-
-        """
+    def open_invoices(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
         mod_obj = self.pool.get('ir.model.data')
@@ -176,6 +210,6 @@ class sale_open_invoice(osv.osv_memory):
             'type': 'ir.actions.act_window',
          }
 
-sale_open_invoice()
+sale_advance_payment_inv()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/wizard/sale_make_invoice_advance.xml b/addons/sale/wizard/sale_make_invoice_advance.xml
index 2cdcb9b8c99..8ab55c67c17 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.xml
+++ b/addons/sale/wizard/sale_make_invoice_advance.xml
@@ -7,15 +7,19 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Advance Invoice">
-                    <field name="product_id"/>
+                    <field name="advance_payment_method" on_change="onchange_advance_payment_method(advance_payment_method,product_id)"/>
                     <newline />
                     <field name="qtty" invisible="1"/>
-                    <field name="amount"/>
+                    <field name="product_id" on_change="onchange_advance_payment_method(advance_payment_method,product_id)" context="{'search_default_services':1}" attrs="{'invisible': [('advance_payment_method','=','percentage')]}" colspan="2"/>
+                    <field name="amount" colspan="2"/>
                     <newline />
                     <separator string="" colspan="4"/>
-                    <label string=""  colspan="2" />
-                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                    <button name="create_invoices" string="Create Invoice" type="object" icon="gtk-go-forward"/>
+                    <label string="" colspan="6" />
+                    <group colspan="4">
+                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                        <button name="create_invoices" string="Create Invoice" type="object" icon="gtk-go-forward" context="{'open_invoices': False}"/>
+                        <button name="create_invoices" string="Create and view Invoice" type="object" icon="terp-camera_test" context="{'open_invoices': True}" />
+                    </group>
                 </form>
             </field>
         </record>
@@ -28,31 +32,5 @@
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
-
-        <record id="view_sale_open_invoice" model="ir.ui.view">
-            <field name="name">Open Invoice</field>
-            <field name="model">sale.open.invoice</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Invoices">
-                    <label string="You invoice has been successfully created!" />
-                    <newline />
-                    <separator string="" colspan="4"/>
-                    <group colspan="4">
-                        <button special="cancel" string="Close" icon="gtk-cancel"/>
-                        <button name="open_invoice" string="Open Invoice" type="object" icon="gtk-go-forward"/>
-                    </group>
-                 </form>
-            </field>
-        </record>
-
-        <record id="action_view_sale_open_invoice" model="ir.actions.act_window">
-            <field name="name">Open Invoice</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">sale.open.invoice</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
     </data>
 </openerp>