Merge lp:~openbig/bigconsulting/toleance_field into lp:bigconsulting

[gpa(OpenERP)]

Added tolreance field in the payment term and remove the one2many payment term lines from the discount lines.

Unmerged revisions

=== modified file 'account_invoice_cash_discount/account_invoice_cash_discount.py'
--- account_invoice_cash_discount/account_invoice_cash_discount.py	2010-07-28 12:20:14 +0000
+++ account_invoice_cash_discount/account_invoice_cash_discount.py	2010-07-16 14:43:55 +0000
@@ -23,6 +23,7 @@
 from osv import fields, osv
 from tools import config
 import time
+from tools.translate import _
 
 class account_payment_term(osv.osv):
     _name = "account.payment.term"
@@ -44,8 +45,8 @@
         'payment_id': fields.many2one('account.payment.term','Associated Payment Term'),
         'credit_account_id': fields.many2one('account.account', 'Credit Account'),
         'debit_account_id': fields.many2one('account.account', 'Debit Account'),
-        'payment_term_ids': fields.one2many('account.payment.term.line', 'cash_account_discount_id', 'Payment Term Lines'),
-        'day_tolerance': fields.integer('Days Tolerance', digits=(16,6),required=True),
+#        'payment_term_ids': fields.one2many('account.payment.term.line', 'cash_account_discount_id', 'Payment Term Lines'),
+#        'day_tolerance': fields.integer('Days Tolerance', digits=(16,6),required=True),
         'sup_discount_account_id': fields.many2one('account.account', 'Supplier Discount Account',required=True),
     }
 account_cash_discount()
@@ -53,7 +54,8 @@
 class account_payment_term_line(osv.osv):
     _inherit = "account.payment.term.line"
     _columns = {
-        'cash_account_discount_id': fields.many2one('account.cash.discount', 'Discount Lines',),
+#        'cash_account_discount_id': fields.many2one('account.cash.discount', 'Discount Lines',),
+        'day_tolerance': fields.integer('Days Tolerance', digits=(16,6),required=True),
         'payment_id': fields.many2one('account.payment.term', 'Payment Term', required=False, select=True),
         'compl_cash_discount':fields.boolean('Use Complete Cash Discount'),
     }
@@ -92,34 +94,29 @@
         
         discount = 0.0
         amount = 0.0
-        payment_line_found = False    
+        tol_days = 0.0
+        payment_line_found = False
+          
         if payment_term:
             payment_term_lines = self.pool.get('account.payment.term').browse(cr, uid, payment_term, context=context)
-            for payment_term_line_id in payment_term_lines.line_ids:
-                payment_use_complete = payment_term_line_id.compl_cash_discount
-            if payment_use_complete:    
-                if payment_term_lines.cash_discount_ids:
-                        dis = 0
-                        for discount_line in payment_term_lines.cash_discount_ids:
-                            if diff_day >= dis and  diff_day <= discount_line.delay:
-                                if resudial_amonut:
-                                    dis1 = 0
-                                    if discount_line.payment_term_ids:
-                                        payment_line_found = True
-                                        for dis_payment_id in discount_line.payment_term_ids:
-                                            if diff_day >= dis1 and diff_day<= dis_payment_id.days:
-                                                if dis_payment_id.value == 'procent':
-                                                    amount = resudial_amonut * dis_payment_id.value_amount
-                                                elif dis_payment_id.value == 'fixed':
-                                                    amount = dis_payment_id.value_amount
-                                                else:
-                                                    amount = resudial_amonut
-                                            dis1 = dis_payment_id.days
-                            dis = discount_line.delay
-            else:
-                amount = resudial_amonut
-               
-        return {'amount':amount,'found':payment_line_found}
+            if payment_term_lines.line_ids:
+                    res = 0.0
+                    dis = 0
+                    for payment_line in payment_term_lines.line_ids:
+                        if diff_day >= dis and  diff_day <= payment_line.days:
+                            if resudial_amonut:
+                                payment_line_found = True
+                                tol_days = payment_line.day_tolerance
+                                if payment_line.value == 'procent':
+                                    res = resudial_amonut * payment_line.value_amount
+                                elif payment_line.value == 'fixed':
+                                    res = payment_line.value_amount
+                                else:
+                                    res = resudial_amonut
+                            amount = res
+                        dis = payment_line.days
+                        
+        return {'amount':amount,'tol_days':tol_days,'found':payment_line_found}
      
     def _get_payment(self, cr, uid, ids, resudial_amonut, payment_term, context=None):
         """
@@ -150,6 +147,9 @@
             to_dt = time.mktime(time.strptime(date1,'%Y-%m-%d'))
             diff_day = (from_dt-to_dt)/(3600*24)
         
+        tolerance = self._get_amount(cr, uid, ids, resudial_amonut, payment_term, context)
+        tolerance_days = tolerance['tol_days']
+        
         discount = 0.0
         if payment_term:
             payment_term_lines = self.pool.get('account.payment.term').browse(cr, uid, payment_term, context=context)
@@ -157,11 +157,11 @@
                     res = 0.0
                     dis = 0
                     for discount_line in payment_term_lines.cash_discount_ids:
-                        if diff_day >= dis and  diff_day <= discount_line.delay:
+                        if diff_day >= dis and  diff_day <= discount_line.delay + tolerance_days:
                             if resudial_amonut:
                                 res = resudial_amonut * discount_line.discount
                             discount = res
-                        dis = discount_line.delay
+                        dis = discount_line.delay + tolerance_days
         return discount
     
     def _get_account(self, cr, uid, ids, resudial_amonut, payment_term, context=None):
@@ -194,19 +194,22 @@
             from_dt = time.mktime(time.strptime(date2,'%Y-%m-%d'))
             to_dt = time.mktime(time.strptime(date1,'%Y-%m-%d'))
             diff_day = (from_dt-to_dt)/(3600*24)    
-
+        
+        tolerance = self._get_amount(cr, uid, ids, resudial_amonut, payment_term, context)
+        tolerance_days = tolerance['tol_days']
+        
         if payment_term:
             payment_term_lines = self.pool.get('account.payment.term').browse(cr, uid, payment_term, context=context)
             if payment_term_lines.cash_discount_ids:
                     res = 0.0
                     dis = 0.0
                     for discount_line in payment_term_lines.cash_discount_ids:
-                        if diff_day >= dis and  diff_day <= discount_line.delay:
+                        if diff_day >= dis and  diff_day <= discount_line.delay + tolerance_days:
                             if invoice.type in ('in_invoice', 'in_refund'):
                                 account_id = discount_line.sup_discount_account_id.id
                             else:    
                                 account_id = discount_line.discount_account_id.id
-                        dis = discount_line.delay    
+                        dis = discount_line.delay + tolerance_days
                     return account_id 
             
     def pay_and_reconcile(self, cr, uid, ids, pay_amount, pay_account_id, period_id, pay_journal_id, writeoff_acc_id, writeoff_period_id, writeoff_journal_id, context=None, name=''):
@@ -290,7 +293,7 @@
         l1['name'] = name
         l2['name'] = name
         lines = [(0, 0, l1), (0, 0, l2)]
-
+        
         ### When we make payment by pay invoice wizard and if found the taxes move then directly take the entry from the wizard  
         if 'tax_move_ids' in context and context['tax_move_ids']:
             move_line = context['tax_move_ids']

=== modified file 'account_invoice_cash_discount/account_invoice_cash_discount_view.xml'
--- account_invoice_cash_discount/account_invoice_cash_discount_view.xml	2010-07-14 14:51:36 +0000
+++ account_invoice_cash_discount/account_invoice_cash_discount_view.xml	2010-07-16 14:43:55 +0000
@@ -14,13 +14,9 @@
                     <field name="name" select="1"/>
                     <field name="delay" select="1"/>
                     <field name="discount" select="1"/>
+                    <separator string="Discount Account for Supplier And Customer Invoice " colspan="4"/>
                     <field name="discount_account_id" />
-                    <field name="day_tolerance"/>
                     <field name="sup_discount_account_id"/>
-                    <group colspan="4">
-                    	<separator string="Related Payment Terms Lines" colspan="4"/>
-                    	<field name="payment_term_ids" widget="one2many_list" nolabel="1"/>
-                    </group>
                 </form>
             </field>
         </record>
@@ -51,7 +47,7 @@
                 </field>
             </field>
         </record>
-
+		
 		<record id="bank_statement_form_view1" model="ir.ui.view">
             <field name="name">account.bank.statement.form</field>
             <field name="model">account.bank.statement</field>
@@ -100,10 +96,10 @@
             <field name="arch" type="xml">
             	<field name="days2" position="after">
 					<field name="compl_cash_discount"/>
-					<label string="" colspan="2"/>
+					<field name="day_tolerance"/>
 				</field>      
             </field>
         </record>
-		
+
     </data>
 </openerp>

=== modified file 'account_invoice_cash_discount/wizard/account_pay_invoice.py'
--- account_invoice_cash_discount/wizard/account_pay_invoice.py	2010-07-28 12:20:14 +0000
+++ account_invoice_cash_discount/wizard/account_pay_invoice.py	2010-07-16 14:43:55 +0000
@@ -153,7 +153,7 @@
         return {'value' : {'cash_amount':discount_amount,'cash_residual_amount':diff_amount}}
     
     def _calculation(self, cr, uid, ids, context=None):
-        
+
         invoice_obj = self.pool.get('account.invoice')
         data =  self.read(cr, uid, ids,context=context)[0]
         invoice = self.pool.get('account.invoice').browse(cr, uid, context['id'], context=context)
@@ -207,13 +207,13 @@
                 line_tax_amount = 0.0
                 
                 #####get the ratio of the line in the total invoice amount 
-                for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, line.price_subtotal, line.quantity, invoice.address_invoice_id.id, line.product_id, invoice.partner_id):
-                        line_tax_amount = tax['amount']
+                for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, line.price_subtotal, line.quantity, invoice.address_invoice_id.id, line.product_id, invoice.partner_id):    
+                    line_tax_amount = tax['amount']
                 line_total = line.price_subtotal + line_tax_amount
                 invoice_res_amount = invoice.amount_total
                 line_ratio = line_total / invoice_res_amount
                 ###########################
-
+                
                 if line.invoice_line_tax_id:
                     for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, data['cash_amount'], line.quantity, invoice.address_invoice_id.id, line.product_id, invoice.partner_id):
                         tax_amount = tax['amount']
@@ -282,17 +282,19 @@
     def _message(self, cr, uid, ids, context=None):
         mod_obj = self.pool.get('ir.model.data')
         data =  self.read(cr, uid, ids,context=context)[0]
-
-        if data['discount_move_ids']:
+        if data.get('discount_move_ids',False):
             context.update({'discount_move_ids':data['discount_move_ids']})
         
-        if data['tax_move_ids']:
+        if data.get('id',False):
+            context.update({'t_ids':ids})
+            
+        if data.get('tax_move_ids',False):
             context.update({'tax_move_ids':data['tax_move_ids']})
-            
-        if data['amount']:
+
+        if data.get('amount',False):
             context.update({'amount':data['amount']})
         
-        if data['cash_amount']:
+        if data.get('cash_amount',False):
             context.update({'cash_amount':data['cash_amount']})
                 
         model_data_ids = mod_obj.search(cr, uid,[('model','=','ir.ui.view'),('name','=','view_account_message')], context=context)
@@ -354,7 +356,6 @@
 #        if found_h:
 
         ####### Here when we do make full payment then to get the previous Discount and Tax Move added in context
-          
         if context.get('discount_move_ids',False):
             context.update({'discount_move_ids':context['discount_move_ids']})
         if context.get('tax_move_ids',False):
@@ -363,10 +364,11 @@
             context.update({'amount':context['amount']})
         if context.get('cash_amount',False):
             context.update({'cash_amount':context['cash_amount']})
-
+        if context.get('t_ids',False):
+            ids = context['t_ids']    
 #            return self.pay_and_reconcile(cr, uid, ids, context=context)
 #        else:
-
+        
         if self.pool.get('res.currency').is_zero(cr, uid, invoice.company_id.currency_id,
                 (amount_paid - inv_amount_company_currency)) or data['cash_residual_amount'] == 0.0:
             return self.pay_and_reconcile(cr, uid, ids, context=context)
@@ -386,7 +388,6 @@
             }
 
     def pay_and_reconcile(self, cr, uid, ids, context=None):
-        
         cur_obj = self.pool.get('res.currency')
         if context is None:
             context = {}
@@ -431,14 +432,14 @@
                 context.update({'amount_currency':data['amount'] + data['cash_amount'],'currency_id':currency_id})
 
         context.update({'account_id':data['account_id'],'date_p':data['date'],'comment':comment or False})        
-        
+
         if context.get('discount_move_ids',False):
             context.update({'discount_move_ids':context['discount_move_ids']})
         else:
             context.update({'discount_move_ids':data['discount_move_ids']})    
-        
+
         if context.get('tax_move_ids',False):
-           context.update({'tax_move_ids':context['tax_move_ids']})
+            context.update({'tax_move_ids':context['tax_move_ids']})
         else:
             context.update({'tax_move_ids':data['tax_move_ids']})