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

[gpa(OpenERP)]

added changes for bank statement

=== modified file 'account_invoice_cash_discount/account_invoice_cash_discount_wizard.xml'
--- account_invoice_cash_discount/account_invoice_cash_discount_wizard.xml	2010-09-13 09:11:53 +0000
+++ account_invoice_cash_discount/account_invoice_cash_discount_wizard.xml	2010-09-16 12:46:47 +0000
@@ -14,5 +14,18 @@
             name="account.move.line.discount.reconcile"
             menu="True" 
             id="account.wizard_reconcile"/>
+        <wizard
+            string="Compute Period Wise Write-off Entry"
+            model="account.move.line"
+            name="account_period_write_calculation"
+            menu="True" 
+            id="wizard_period_writeoff_calculation"/>
+            
+        <menuitem 
+            action="wizard_period_writeoff_calculation" 
+            id="menu_period_writeoff_calculation" 
+            parent="account.menu_finance" 
+            type="wizard"/>
+            
 	</data>
 </openerp>

=== modified file 'account_invoice_cash_discount/wizard/__init__.py'
--- account_invoice_cash_discount/wizard/__init__.py	2010-09-13 09:11:53 +0000
+++ account_invoice_cash_discount/wizard/__init__.py	2010-09-16 12:46:47 +0000
@@ -23,6 +23,7 @@
 import account_pay_invoice
 import invoice_statement_payment
 import wizard_discount_reconcile
+import wizard_write_period_entry_calculation
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

=== modified file 'account_invoice_cash_discount/wizard/invoice_statement_payment.py'
--- account_invoice_cash_discount/wizard/invoice_statement_payment.py	2010-08-06 12:28:07 +0000
+++ account_invoice_cash_discount/wizard/invoice_statement_payment.py	2010-09-16 12:46:47 +0000
@@ -125,29 +125,28 @@
         #     ctx['date'] = line.date_maturity 
         # else:
         ctx['date'] = line_date
-        amount = 0.0
-        if line.amount_currency:
-            amount = currency_obj.compute(cursor, user, line.currency_id.id,
-                statement.currency.id, line.amount_currency, context=ctx)
-        else:
-            if line.debit > 0:
-                amount=line.debit
-            elif line.credit > 0:
-                amount=-line.credit
+        invoice_amount = 0.0
+        
+        if line.debit > 0:
+            invoice_amount = line.debit
+        elif line.credit > 0:
+            invoice_amount = -line.credit
+        
+         
         reconcile_id = statement_reconcile_obj.create(cursor, user, {
             'line_ids': [(6, 0, [line.id])]
             }, context=context)
         
          ######################################### Calculation for discount and taxes######
         if line.invoice.id:
-            
             discount = 0.0
             account = False
             invoice = obj_inv.browse(cursor, user, line.invoice.id, context=context)
             for invoice_line in invoice.invoice_line:
                 line_tax_amount = 0.0
-                invoice_amount = 0.0
                 total_tax_amount = 0.0
+                inv_dis_amount = 0.0
+                cal_invoice_amount = 0.0
                 tax_account_id = False
                 tax_code_id = False
                 tax_base_id = False
@@ -158,10 +157,15 @@
                 invoice_res_amount = invoice.amount_total
                 line_ratio = line_total / invoice_res_amount
                 ###########################
-                amount = obj_inv._get_amount(cursor, user, [invoice.id] ,invoice.residual, invoice.payment_term.id, context=context)
-                invoice_amount = amount['amount']
-                discount = obj_inv._get_payment(cursor, user, [invoice.id]  , invoice_amount, invoice.payment_term.id, context=context)
-                account = obj_inv._get_account(cursor, user, [invoice.id] , invoice.residual, invoice.payment_term.id, context=context)
+                if line.amount_currency:
+                    inv_dis_amount = currency_obj.compute(cursor, user, line.currency_id.id, statement.currency.id, line.amount_currency, context=ctx)
+                elif (line.invoice and line.invoice.currency_id.id <> statement.currency.id):
+                    inv_dis_amount = currency_obj.compute(cursor, user, line.invoice.currency_id.id,statement.currency.id, invoice_amount, context=ctx)
+                
+                amount = obj_inv._get_amount(cursor, user, [invoice.id] , inv_dis_amount, invoice.payment_term.id, context=context)
+                cal_invoice_amount = amount['amount']
+                discount = obj_inv._get_payment(cursor, user, [invoice.id], cal_invoice_amount, invoice.payment_term.id, context=context)
+                account = obj_inv._get_account(cursor, user, [invoice.id], cal_invoice_amount, invoice.payment_term.id, context=context)
                 
                  ### discount for the invoice line
                 discount_pay = discount * line_ratio
@@ -183,7 +187,7 @@
                             tax_code_id = tax_value.tax_code_id.id
                             tax_base_id = tax_value.base_code_id.id
 
-                        if tax_real_amt>0:
+                        if tax_real_amt:
                             statement_reconcile_line_obj.create(cursor, user, {
                                 'name': line.name,
                                 'amount': tax_real_amt,
@@ -191,7 +195,8 @@
                                 'line_id': reconcile_id,
                                 'tax_code_id':tax_code_id
                                 }, context=context)
-                if discount>0:
+
+                if discount:
                     discount = discount * line_ratio
                     statement_reconcile_line_obj.create(cursor, user, {
                         'name': line.name,
@@ -211,7 +216,7 @@
             
         statement_line_obj.create(cursor, user, {
             'name': line.name or '?',
-            'amount': invoice_amount,
+            'amount': cal_invoice_amount,
             'type': type,
             'partner_id': line.partner_id.id,
             'account_id': line.account_id.id,

=== added file 'account_invoice_cash_discount/wizard/wizard_write_period_entry_calculation.py'
--- account_invoice_cash_discount/wizard/wizard_write_period_entry_calculation.py	1970-01-01 00:00:00 +0000
+++ account_invoice_cash_discount/wizard/wizard_write_period_entry_calculation.py	2010-09-16 12:46:47 +0000
@@ -0,0 +1,160 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution	
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import wizard
+import pooler
+import time
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
+from mx import DateTime
+from tools.translate import _
+
+_writeoff_entry_calculation_form = '''<?xml version="1.0"?>
+<form string="Calculation">
+    <separator string="Calculation of period wise Write off Amount" colspan="4"/>
+    <field name="cash_discount_id"/>
+    <field name="tax_id"/>
+    <field name="period_id"/>
+    <field name="journal_id"/>
+</form>'''
+
+_writeoff_entry_calculation_fields = {
+    'cash_discount_id': {'string':'Cash Discount Account', 'type':'many2one', 'relation':'account.account', 'required':True},
+    'tax_id': {'string':'Taxes', 'type':'many2one', 'relation':'account.tax', 'required':True},
+    'period_id': {'string':'Period', 'type':'many2one', 'relation':'account.period', 'required':True},
+    'journal_id': {'string':'Journal', 'type':'many2one', 'relation':'account.journal', 'required':True},
+                                       
+}
+
+def _compute(self, cr, uid, data, context):
+    
+    pool = pooler.get_pool(cr.dbname)
+    payment_term_obj = pool.get('account.payment.term')
+    invoice_obj = pool.get('account.invoice')
+    account_move_line_obj = pool.get('account.move.line')
+    tax_obj = pool.get('account.tax')
+    account_move_obj= pool.get('account.move')
+    
+    period_id = data['form']['period_id']
+    tax_id = data['form']['tax_id']
+    journal_id = data['form']['journal_id']
+    cash_discount_id = data['form']['cash_discount_id']
+    
+    account_move_line_ids = account_move_line_obj.search(cr, uid, [('period_id','=',period_id),('account_id','=',cash_discount_id)])
+    date = time.strftime('%Y-%m-%d')
+
+    discount_lines = []
+    
+    tax_account_id = False 
+    dis_tax_code_id = False
+    discount_code_id = False
+
+    for line in account_move_line_obj.browse(cr, uid, account_move_line_ids, context=context):
+        tax_discount_amt = 0.0
+        tax_discount_data = tax_obj.browse(cr, uid, tax_id, context=context)
+        if tax_discount_data.account_collected_id:
+            tax_account_id = tax_discount_data.account_collected_id.id
+        else:
+            tax_account_id = tax_discount_data.tax_code_id.id
+        
+        discount_code_id = tax_discount_data.base_code_id.id
+        dis_tax_code_id = tax_discount_data.tax_code_id.id
+            
+        if line.debit>0.0:
+            tax_discount_amt = 0.0
+            tax_discount_amt = line.debit * tax_discount_data.amount
+                 
+            discount_lines.append(
+                    (0, 0, {
+                        'name':line.name,
+                        'debit':tax_discount_amt,
+                        'credit':0.0,
+                        'account_id':cash_discount_id,
+                        'date':date,
+                        'partner_id':line.partner_id.id,
+                        'tax_amount':-tax_discount_amt,
+                        'tax_code_id':discount_code_id,
+                    })),
+                    
+            discount_lines.append(
+                    (0, 0, {
+                        'name':line.name,
+                        'debit':0.0,
+                        'credit':tax_discount_amt,
+                        'account_id':tax_account_id,
+                        'date':date,
+                        'partner_id':line.partner_id.id,
+                        'tax_amount':-tax_discount_amt,
+                        'tax_code_id':dis_tax_code_id,
+                    }))
+            
+        elif line.credit>0.0:
+            tax_discount_amt = 0.0
+            tax_discount_amt = line.credit * tax_discount_data.amount
+
+            discount_lines.append(
+                    (0, 0, {
+                        'name':line.name,
+                        'debit':tax_discount_amt,
+                        'credit':0.0,
+                        'account_id':tax_account_id,
+                        'date':date,
+                        'partner_id':line.partner_id.id,
+                        'tax_amount':-tax_discount_amt,
+                        'tax_code_id':dis_tax_code_id,
+                    }))
+            
+            discount_lines.append(
+                    (0, 0, {
+                        'name':line.name,
+                        'debit':0.0,
+                        'credit':tax_discount_amt,
+                        'account_id':cash_discount_id,
+                        'date':date,
+                        'partner_id':line.partner_id.id,
+                        'tax_amount':-tax_discount_amt,
+                        'tax_code_id':discount_code_id,
+                    })),
+
+    account_move_obj.create(cr, uid, 
+            {
+            'period_id': period_id,
+            'journal_id': journal_id,
+            'date':date,
+            'line_id': discount_lines
+            })        
+    return {}
+
+class wiz_period_writeoff_calculation(wizard.interface):
+    states = {
+        'init': {
+            'actions': [],
+            'result': {'type': 'form', 'arch':_writeoff_entry_calculation_form, 'fields':_writeoff_entry_calculation_fields, 'state':[('calculate','Compute'),('end','Cancel')]}
+        },
+        'calculate': {
+            'actions': [],
+            'result': {'type': 'action', 'action': _compute, 'state':'end'}
+        }
+    }
+wiz_period_writeoff_calculation('account_period_write_calculation')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account_payment_discount_extension/account_payment_discount.py'
--- account_payment_discount_extension/account_payment_discount.py	2010-09-16 09:39:50 +0000
+++ account_payment_discount_extension/account_payment_discount.py	2010-09-16 12:46:47 +0000
@@ -102,7 +102,6 @@
             string="Customer Cash Discount Account",
             method=True,
             view_load=True,
-            domain="[('type', '=', 'receivable')]",
             required=True),
         'property_supplier_cash_discount_account': fields.property(
             'account.account',
@@ -111,7 +110,6 @@
             string="Supplier Cash Discount Account",
             method=True,
             view_load=True,
-            domain="[('type', '=', 'payable')]",
             required=True),
       }
 res_partner()