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

[gpa(OpenERP)]

changes added for milestone2 for manually entries

=== modified file 'account_invoice_cash_discount/account_invoice_cash_discount.py'
--- account_invoice_cash_discount/account_invoice_cash_discount.py	2010-08-03 12:11:28 +0000
+++ account_invoice_cash_discount/account_invoice_cash_discount.py	2010-08-05 07:58:42 +0000
@@ -529,6 +529,7 @@
 
     def button_confirm(self, cr, uid, ids, context={}):
         done = []
+        tax_obj = self.pool.get('account.tax')
         res_currency_obj = self.pool.get('res.currency')
         res_users_obj = self.pool.get('res.users')
         account_move_obj = self.pool.get('account.move')
@@ -579,10 +580,15 @@
                 amount = res_currency_obj.compute(cr, uid, st.currency.id,
                         company_currency_id, move.amount, context=context,
                         account=acc_cur)
-#                if move.reconcile_id and move.reconcile_id.line_new_ids:
-#                    for newline in move.reconcile_id.line_new_ids:
-#                        amount += newline.amount
 
+                st_tax_amount = 0.00
+                st_base_code_id = False
+                
+                if move.tax_id:
+                    tax = tax_obj.compute(cr, uid, [move.tax_id], move.amount, 1.00)[0]
+                    st_tax_amount = tax['amount']
+                    st_base_code_id = tax['base_code_id']
+                        
                 val = {
                     'name': move.name,
                     'date': move.date,
@@ -596,8 +602,10 @@
                     'journal_id': st.journal_id.id,
                     'period_id': st.period_id.id,
                     'currency_id': st.currency.id,
+                    'tax_code_id':st_base_code_id,
+                    'account_tax_id':move.tax_id.id,
+                    'tax_amount':move.amount,
                 }
-
                 amount = res_currency_obj.compute(cr, uid, st.currency.id,
                         company_currency_id, move.amount, context=context,
                         account=acc_cur)
@@ -617,7 +625,8 @@
                                 account=acc_cur)
                     val['amount_currency'] = amount_cur
 
-                torec.append(account_move_line_obj.create(cr, uid, val , context=context))
+                torec.append(account_move_line_obj.create(cr, uid, val, context=context))
+                
                 newline_sum = 0.0
                 if move.reconcile_id and move.reconcile_id.line_new_ids:
                     for newline in move.reconcile_id.line_new_ids:
@@ -723,7 +732,7 @@
                             'amount_currency': amount_currency,
                             'currency_id': currency_id,
                             }, context=context)
-
+                        
                 account_move_line_obj.create(cr, uid, {
                     'name': move.name,
                     'date': move.date,
@@ -731,8 +740,8 @@
                     'move_id': move_id,
                     'partner_id': ((move.partner_id) and move.partner_id.id) or False,
                     'account_id': account_id,
-                    'credit': (((amount-newline_sum) < 0) and -(amount-newline_sum)) or 0.0,
-                    'debit': (((amount-newline_sum) > 0) and (amount-newline_sum)) or 0.0,
+                    'credit': (((amount+st_tax_amount-newline_sum) < 0) and -(amount+st_tax_amount-newline_sum)) or 0.0,
+                    'debit': (((amount+st_tax_amount-newline_sum) > 0) and (amount+st_tax_amount-newline_sum)) or 0.0,
                     'statement_id': st.id,
                     'journal_id': st.journal_id.id,
                     'period_id': st.period_id.id,
@@ -740,10 +749,15 @@
                     '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],
                         context=context):
+                    
                     if line.state <> 'valid':
                         raise osv.except_osv(_('Error !'),
                                 _('Account move line "%s" is not valid') % line.name)
@@ -752,13 +766,11 @@
                     torec += map(lambda x: x.id, move.reconcile_id.line_ids)
                     #try:
                     if abs(move.reconcile_amount-move.amount)<0.0001:
-
                         writeoff_acc_id = False
                         #There should only be one write-off account!
                         for entry in move.reconcile_id.line_new_ids:
                             writeoff_acc_id = entry.account_id.id
                             break
-
                         account_move_line_obj.reconcile(cr, uid, torec, 'statement', writeoff_acc_id=writeoff_acc_id, writeoff_period_id=st.period_id.id, writeoff_journal_id=st.journal_id.id, context=context)
                     else:
                         account_move_line_obj.reconcile_partial(cr, uid, torec, 'statement', context)
@@ -774,6 +786,30 @@
 
 account_bank_statement()
 
+class account_bank_statement_line(osv.osv):
+    _inherit="account.bank.statement.line"
+    
+    def _get_account(self, cr, uid, context={}):
+        account_id = self.pool.get('account.account').search(cr, uid, [('type','!=','view')])[0]
+        if account_id:
+            return account_id
+        else:
+            return False
+        
+    def _get_tax(self, cr, uid, context={}):
+        tax_id = self.pool.get('account.tax').search(cr, uid, [])
+        if tax_id:
+            return tax_id[0]
+        else:
+            return False    
+    _columns = {
+        'tax_id': fields.many2one('account.tax', 'Tax'),
+    }
+    _defaults = {
+        'account_id': _get_account,
+        'tax_id': _get_tax,
+    }
+account_bank_statement_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

=== modified file 'account_invoice_cash_discount/account_invoice_cash_discount_view.xml'
--- account_invoice_cash_discount/account_invoice_cash_discount_view.xml	2010-08-03 12:11:28 +0000
+++ account_invoice_cash_discount/account_invoice_cash_discount_view.xml	2010-08-05 07:58:42 +0000
@@ -162,5 +162,44 @@
             <field name="action_id" ref="action_res_company_wizard"/>
        </record>
 
+       <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>
+            <field eval="1" name="priority"/>
+            <field name="inherit_id" ref="account.view_move_line_tree"/>
+            <field name="arch" type="xml">
+                <field name="account_tax_id" position="after">
+                    <field name="tax_code_id"/>
+                    <field name="tax_amount"/>
+                </field>
+            </field>
+        </record>
+        
+        <record model="ir.ui.view" id="view_bank_statement_form111">
+            <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='ref']" position="after">
+                    <field name="tax_id"/>
+                </xpath>
+            </field>
+        </record>
+        
+        <record model="ir.ui.view" id="view_bank_statement_form222">
+            <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='reconcile_amount']" position="after">
+                    <field name="tax_id"/>
+                </xpath>
+            </field>
+        </record>
+        
+
     </data>
 </openerp>