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

[gpa(OpenERP)]

Improvement for the Ending Balance

=== modified file 'account_invoice_cash_discount/account_invoice_cash_discount.py'
--- account_invoice_cash_discount/account_invoice_cash_discount.py	2010-09-23 15:13:30 +0000
+++ account_invoice_cash_discount/account_invoice_cash_discount.py	2010-09-24 09:43:39 +0000
@@ -645,6 +645,43 @@
 class account_bank_statement(osv.osv):
     _inherit="account.bank.statement"
 
+    def _end_balance(self, cursor, user, ids, name, attr, context=None):
+        res_currency_obj = self.pool.get('res.currency')
+        res_users_obj = self.pool.get('res.users')
+
+        res = {}
+
+        company_currency_id = res_users_obj.browse(cursor, user, user,
+                context=context).company_id.currency_id.id
+        statements = self.browse(cursor, user, ids, context=context)
+        for statement in statements:
+            res[statement.id] = statement.balance_start
+            currency_id = statement.currency.id
+            for line in statement.move_line_ids:
+                if line.debit > 0:
+                    if line.account_id.id == \
+                            statement.journal_id.default_debit_account_id.id:
+                        res[statement.id] += res_currency_obj.compute(cursor,
+                                user, company_currency_id, currency_id,
+                                line.debit, context=context)
+                else:
+                    if line.account_id.id == \
+                            statement.journal_id.default_credit_account_id.id:
+                        res[statement.id] -= res_currency_obj.compute(cursor,
+                                user, company_currency_id, currency_id,
+                                line.credit, context=context)
+            if statement.state == 'draft':
+                for line in statement.line_ids:
+                    res[statement.id] += line.amount - line.cash_discount
+
+        for r in res:
+            res[r] = round(res[r], 2)
+        return res
+
+    _columns = {
+        'balance_end': fields.function(_end_balance, method=True, string='Balance'),
+    }
+    
     def button_confirm(self, cr, uid, ids, context={}):
         done = []
         tax_obj = self.pool.get('account.tax')
@@ -884,7 +921,7 @@
                                 'amount_currency': 0.0,
                                 'currency_id': currency_id,
                             }, context=context)
-                            
+
                             currency_diff2 = account_move_line_obj.create(cr, uid, {
                                 'name': move.name,
                                 'date': move.date,
@@ -920,7 +957,7 @@
                                 'amount_currency': 0.0,
                                 'currency_id': currency_id,
                             }, context=context)
-                                
+                           
                             currency_diff2 = account_move_line_obj.create(cr, uid, {
                                 'name': move.name,
                                 'date': move.date,
@@ -939,15 +976,14 @@
                             
                             if move_line_data.invoice.currency_id.id != company_currency_id:
                                 torec.append(currency_diff1)
-                            
+                                
                 new_end_value += amount+st_tax_amount-newline_sum
-                
                 if st.currency.id <> company_currency_id:
                     amount_currency = res_currency_obj.compute(cr, uid, company_currency_id, st.currency.id,
                         (amount+st_tax_amount-newline_sum), context=context,
                         account=acc_cur)
                     currency_id = st.currency.id
-
+                
                 account_move_line_obj.create(cr, uid, {
                     'name': move.name,
                     'date': move.date,
@@ -964,10 +1000,10 @@
                     'currency_id': currency_id,
                     }, context=context)
 
+                
                 account_move_line_obj.write(cr, uid, [x.id for x in
                         account_move_obj.browse(cr, uid, move_id,
                             context=context).line_id], {'statement_id': st.id,})
-                
                 for line in account_move_line_obj.browse(cr, uid, [x.id for x in
                         account_move_obj.browse(cr, uid, move_id,
                             context=context).line_id],
@@ -976,6 +1012,7 @@
                     if line.state <> 'valid':
                         raise osv.except_osv(_('Error !'),
                                 _('Account move line "%s" is not valid') % line.name)
+                        
                 if move.reconcile_id and move.reconcile_id.line_ids:
                     torec += map(lambda x: x.id, move.reconcile_id.line_ids)
                     #try:
@@ -998,7 +1035,13 @@
         #### to write the balace value in the ending balance
         balance_end_value = 0.0
         balance_start_value = self.browse(cr, uid, st.id, context=context).balance_start
+
+        if st.currency.id <> company_currency_id:
+            new_end_value = res_currency_obj.compute(cr, uid, company_currency_id, st.currency.id,
+                        new_end_value, context=context,
+                        account=acc_cur)
         balance_end_value = balance_start_value + new_end_value
+        
         self.write(cr, uid, done, {'state':'confirm','balance_end_real':balance_end_value}, context=context)
 
         return True
@@ -1012,6 +1055,9 @@
         'tax_type': fields.selection([('tax_included','Tax included'),
                                         ('tax_excluded','Tax excluded')],
                                         'Tax method', required=True,),
+        'cash_discount': fields.float('Cash Discount'),
+        'transferred_amount': fields.float('Transferred'),
+
     }
       
     def onchange_account_id(self, cr, uid, ids, account_id, context=None):
@@ -1026,7 +1072,13 @@
            result['tax_id'] = False
 
         return {'value': result}
+
+    def onchange_cash_discount(self, cr, uid, ids, amount, cash_discount, context=None):
+        return {'value': {'transferred_amount': amount - cash_discount}}
     
+    def onchange_transferred_amount(self, cr, uid, ids, amount, transferred_amount, context=None):
+        return {'value': {'cash_discount': amount - transferred_amount}}
+
     def onchange_type(self, cr, uid, ids, type, context=None):
         result={}
         tax_id = self.pool.get('account.tax').search(cr, uid, [])

=== modified file 'account_invoice_cash_discount/account_invoice_cash_discount_view.xml'
--- account_invoice_cash_discount/account_invoice_cash_discount_view.xml	2010-08-11 12:51:31 +0000
+++ account_invoice_cash_discount/account_invoice_cash_discount_view.xml	2010-09-24 09:43:39 +0000
@@ -46,27 +46,27 @@
             </field>
         </record>
 
-		<record id="bank_statement_form_view1" model="ir.ui.view">
+        <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>
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
-            	<xpath expr="//button[@string='Import Invoice']" position="replace">
+                <xpath expr="//button[@string='Import Invoice']" position="replace">
                         <button name="%(wizard_populate_statement_from_inv1)d"  type="action" string="Import Invoice" attrs="{'invisible':[('state','=','confirm')]}"/>
-            	</xpath>
+                </xpath>
             </field>
         </record>
 
-		<record id="bank_statement_reconcile_form_view1" model="ir.ui.view">
+        <record id="bank_statement_reconcile_form_view1" model="ir.ui.view">
             <field name="name">account.bank.statement.reconcile.form</field>
             <field name="model">account.bank.statement.reconcile</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_bank_statement_reconcile"/>
             <field name="arch" type="xml">
-            	<field name="total_new" position="replace">
-					<field name="total_new" string="Total Write Off / Cash Discount"/>
-				</field>
+                <field name="total_new" position="replace">
+                    <field name="total_new" string="Total Write Off / Cash Discount"/>
+                </field>
             </field>
         </record>
         
@@ -92,13 +92,13 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_bank_statement_reconcile"/>
             <field name="arch" type="xml">
-            	<xpath expr="//tree[@string='Write-Off']" position="replace">
-					<tree editable="bottom" string="Write-Off and Cash-Discount">
+                <xpath expr="//tree[@string='Write-Off']" position="replace">
+                    <tree editable="bottom" string="Write-Off and Cash-Discount">
                             <field name="account_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                             <field name="amount"/>
                             <field name="name"/>
                         </tree>
-				</xpath>
+                </xpath>
             </field>
         </record>
 
@@ -108,10 +108,10 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_payment_term_line_form"/>
             <field name="arch" type="xml">
-            	<field name="days2" position="after">
-					<field name="compl_cash_discount"/>
-					<field name="day_tolerance" required="1" />
-				</field>
+                <field name="days2" position="after">
+                    <field name="compl_cash_discount"/>
+                    <field name="day_tolerance" required="1" />
+                </field>
             </field>
         </record>
 
@@ -143,25 +143,25 @@
                     </group>
                 </form>
             </field>
-       </record>
+        </record>
 
-       <record id="action_res_company_wizard" model="ir.actions.act_window">
+        <record id="action_res_company_wizard" model="ir.actions.act_window">
             <field name="name">Account set in Company</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.company.wizard</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
-       </record>
+        </record>
 
-       <record id="config_wizard_res_company_wizard" model="ir.actions.todo">
+        <record id="config_wizard_res_company_wizard" model="ir.actions.todo">
             <field name="name">Account set in Company</field>
             <field name="note">This Configuration step use to set default Account</field>
             <field name="action_id" ref="action_res_company_wizard"/>
-       </record>
-       
-       
-       <record model="ir.ui.view" id="view_bank_statement_reconcile_view122">
+        </record>
+       
+       
+        <record model="ir.ui.view" id="view_bank_statement_reconcile_view122">
             <field name="name">account.bank.statement.reconcile.form</field>
             <field name="model">account.bank.statement.reconcile</field>
             <field name="inherit_id" ref="account.view_bank_statement_reconcile" />
@@ -173,7 +173,7 @@
             </field>
         </record>
 
-       <record id="view_move_line_tree1" model="ir.ui.view">
+        <record id="view_move_line_tree1" model="ir.ui.view">
             <field name="name">account.move.line.tree</field>
             <field name="model">account.move.line</field>
             <field name="type">tree</field>
@@ -194,7 +194,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="account_id" position="replace">
-		            <field name="account_id" on_change="onchange_account_id(account_id)"/>
+                    <field name="account_id" on_change="onchange_account_id(account_id)"/>
                 </field>
             </field>
         </record>
@@ -236,6 +236,32 @@
                 </field>
             </field>
         </record>
+
+        <record model="ir.ui.view" id="view_bank_statement_tax_tree1">
+            <field name="name">account.bank.statement.tree1</field>
+            <field name="model">account.bank.statement</field>
+            <field name="inherit_id" ref="account.view_bank_statement_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='line_ids']/tree/field[@name='amount']" position="after">
+                    <field name="cash_discount" on_change="onchange_cash_discount(amount,cash_discount)"/>
+                    <field name="transferred_amount" on_change="onchange_transferred_amount(amount,transferred_amount)"/>
+                </xpath>
+            </field>
+        </record>
         
+        <record model="ir.ui.view" id="view_bank_statement_tax_form1">
+            <field name="name">account.bank.statement.form1</field>
+            <field name="model">account.bank.statement</field>
+            <field name="inherit_id" ref="account.view_bank_statement_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='line_ids']/form/field[@name='amount']" position="after">
+                    <field name="cash_discount" on_change="onchange_cash_discount(amount,cash_discount)"/>
+                    <field name="transferred_amount" on_change="onchange_transferred_amount(amount,transferred_amount)"/>
+                </xpath>
+            </field>
+        </record>
+       
     </data>
 </openerp>

=== modified file 'account_invoice_cash_discount/wizard/invoice_statement_payment.py'
--- account_invoice_cash_discount/wizard/invoice_statement_payment.py	2010-09-21 12:22:46 +0000
+++ account_invoice_cash_discount/wizard/invoice_statement_payment.py	2010-09-24 09:43:39 +0000
@@ -115,7 +115,9 @@
     obj_inv = pool.get('account.invoice')
     tax_obj = pool.get('account.tax')
     invoice_tax_obj = pool.get("account.invoice.tax")
-    
+
+    discount = 0.0
+
     statement = statement_obj.browse(cursor, user, data['id'], context=context)
     # for each selected move lines
     for line in line_obj.browse(cursor, user, line_ids, context=context):
@@ -230,6 +232,8 @@
             'ref': line.ref,
             'reconcile_id': reconcile_id,
             'date':line_date, #time.strftime('%Y-%m-%d'), #line.date_maturity or,
+            'cash_discount': discount,
+            'transferred_amount': cal_invoice_amount - discount,
             }, context=context)
     return {}