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

[Atik Agewan(OpenERP)]

changes in milestone2 multicurrency

=== modified file 'account_invoice_cash_discount/account_invoice_cash_discount.py'
--- account_invoice_cash_discount/account_invoice_cash_discount.py	2010-07-23 11:30:07 +0000
+++ account_invoice_cash_discount/account_invoice_cash_discount.py	2010-07-27 10:15:58 +0000
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution    
+#    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
@@ -63,7 +63,7 @@
 
 class account_invoice(osv.osv):
     _inherit = "account.invoice"
-    
+
     def _get_amount(self, cr, uid, ids, resudial_amonut, payment_term, context=None):
         """
         This function return the Amount to paid  according to the payment term cash discount payment term lines
@@ -72,16 +72,16 @@
            context = {}
         tax_obj = self.pool.get('account.tax')
         invoice = self.browse(cr, uid, ids[0], context=context)
-        
+
         if invoice.date_invoice:
             date1 = invoice.date_invoice
         else:
             date1 =  time.strftime('%Y-%m-%d')
-                
-        if 'date_p' in context and context['date_p']:    
+
+        if 'date_p' in context and context['date_p']:
             date2 = context['date_p']
         else:
-            date2 =  time.strftime('%Y-%m-%d')   
+            date2 =  time.strftime('%Y-%m-%d')
 
         if date1 >= date2:
             from_dt = time.mktime(time.strptime(date1,'%Y-%m-%d'))
@@ -91,12 +91,12 @@
             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)
-        
+
         discount = 0.0
         amount = 0.0
         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)
             if payment_term_lines.line_ids:
@@ -115,28 +115,28 @@
                                     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):
         """
         This function return the Discount according to the payment term cash discount term
         """
         if context is None:
            context = {}
-           
+
         tax_obj = self.pool.get('account.tax')
         invoice = self.browse(cr, uid, ids[0], context=context)
-        
+
         if invoice.date_invoice:
             date1 = invoice.date_invoice
         else:
             date1 =  time.strftime('%Y-%m-%d')
-                
-        if 'date_p' in context and context['date_p']:    
+
+        if 'date_p' in context and context['date_p']:
             date2 = context['date_p']
         else:
-            date2 =  time.strftime('%Y-%m-%d')   
+            date2 =  time.strftime('%Y-%m-%d')
 
         if date1 >= date2:
             from_dt = time.mktime(time.strptime(date1,'%Y-%m-%d'))
@@ -146,10 +146,10 @@
             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']
-        
+
         discount = 0.0
         if payment_term:
             payment_term_lines = self.pool.get('account.payment.term').browse(cr, uid, payment_term, context=context)
@@ -163,29 +163,29 @@
                             discount = res
                         dis = discount_line.delay + tolerance_days
         return discount
-    
+
     def _get_account(self, cr, uid, ids, resudial_amonut, payment_term, context=None):
         """
         This function return the Account according to the payment term cash discount term
         """
         if context is None:
            context = {}
-        
+
         account_id = False
-           
+
         tax_obj = self.pool.get('account.tax')
         invoice = self.browse(cr, uid, ids[0], context=context)
-        
+
         if invoice.date_invoice:
             date1 = invoice.date_invoice
-        else: 
+        else:
             date1 =  time.strftime('%Y-%m-%d')
-                
-        if 'date_p' in context and context['date_p']:    
+
+        if 'date_p' in context and context['date_p']:
             date2 = context['date_p']
         else:
-            date2 =  time.strftime('%Y-%m-%d')   
-        
+            date2 =  time.strftime('%Y-%m-%d')
+
         if date1 > date2:
             from_dt = time.mktime(time.strptime(date1,'%Y-%m-%d'))
             to_dt = time.mktime(time.strptime(date2,'%Y-%m-%d'))
@@ -193,11 +193,11 @@
         else:
             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)    
-        
+            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:
@@ -207,29 +207,29 @@
                         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:    
+                            else:
                                 account_id = discount_line.discount_account_id.id
                         dis = discount_line.delay + tolerance_days
-                    return account_id 
-            
+                    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=''):
         if context is None:
             context = {}
         #TODO check if we can use different period for payment and the writeoff line
         assert len(ids)==1, "Can only pay one invoice at a time"
         invoice = self.browse(cr, uid, ids[0])
-        
+
         tax_obj = self.pool.get('account.tax')
         invoice_tax_obj = self.pool.get("account.invoice.tax")
         move_line_obj = self.pool.get('account.move.line')
         move_obj = self.pool.get('account.move')
-        
-        amount_discount = 0.0    
+
+        amount_discount = 0.0
         if invoice.payment_term:
             # Return the discount on for the payment term
             amount_discount = self._get_payment(cr, uid, ids, pay_amount, invoice.payment_term.id, context=context)
 
-        
+
         src_account_id = invoice.account_id.id
         # Take the seq as name for move
         types = {'out_invoice': -1, 'in_invoice': 1, 'out_refund': 1, 'in_refund': -1}
@@ -239,7 +239,7 @@
             date=context['date_p']
         else:
             date=time.strftime('%Y-%m-%d')
-            
+
         # Take the amount in currency and the currency of the payment
         if 'amount_currency' in context and context['amount_currency'] and 'currency_id' in context and context['currency_id']:
             amount_currency = context['amount_currency']
@@ -247,18 +247,18 @@
         else:
             amount_currency = False
             currency_id = False
-        
+
         if invoice.type in ('in_invoice', 'in_refund'):
             ref = invoice.reference
         else:
             ref = self._convert_ref(cr, uid, invoice.number)
-        
+
         discount_amount = 0.0
         tax_total_amount = 0.0
-        
+
         if 'cash_amount' in context and context['cash_amount']:
             discount_amount = context['cash_amount']
-            
+
         # Pay attention to the sign for both debit/credit AND amount_currency
         l1 = {
             'debit': direction * (pay_amount)>0 and direction * (pay_amount),
@@ -270,12 +270,12 @@
             'currency_id':currency_id,
             'amount_currency':amount_currency and direction * amount_currency or 0.0,
         }
-        
+
         ### if we change the amount paid and in the disocunt  then it used the changes discount
-            
+
         if amount_discount != discount_amount and discount_amount>0.0:
             amount_discount = discount_amount
-            
+
         l2 = {
             'debit': direction * (pay_amount-amount_discount)<0 and - direction * (pay_amount-amount_discount),
             'credit': direction * (pay_amount-amount_discount)>0 and direction * (pay_amount-amount_discount),
@@ -289,12 +289,12 @@
 
         if not name:
             name = invoice.invoice_line and invoice.invoice_line[0].name or invoice.number
-            
+
         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  
+
+        ### 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']
             for move_line_id in move_line:
@@ -316,7 +316,7 @@
                 move_line_obj.unlink(cr, uid,[move_line_id])
                 move_obj.unlink(cr, uid,[move_line_data.move_id.id])
         else:
-            if amount_discount>0.0:         
+            if amount_discount>0.0:
                 for line in invoice.invoice_line:
                     if line.invoice_line_tax_id:
                         for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, amount_discount, line.quantity, invoice.address_invoice_id.id, line.product_id, invoice.partner_id):
@@ -340,9 +340,9 @@
                             }
                             l3['name'] = name
                             lines.append((0, 0, l3))
-                            
+
         ### When we make payment by pay invoice wizard and if found the discount moves in wizard discount move then directly take the entry from the wizard
-        if 'discount_move_ids' in context and context['discount_move_ids']: 
+        if 'discount_move_ids' in context and context['discount_move_ids']:
             move_line = context['discount_move_ids']
             for move_line_id in move_line:
                 move_line_data = move_line_obj.browse(cr, uid,move_line_id)
@@ -365,7 +365,7 @@
         else:
             if amount_discount>0:
                 if 'account_id' in context and context['account_id']:
-                    account_id = context['account_id']  
+                    account_id = context['account_id']
                 if tax_total_amount>0:
                     amount_discount = (amount_discount - tax_total_amount)
                 else:
@@ -382,15 +382,15 @@
                 }
                 l4['name'] = name
                 lines.append((0, 0, l4))
-        
+
         move = {'ref': ref, 'line_id': lines, 'journal_id': pay_journal_id, 'period_id': period_id, 'date': date}
         move_id = move_obj.create(cr, uid, move, context=context)
-        
+
         line_ids = []
         total = 0.0
         line = self.pool.get('account.move.line')
         cr.execute('select id from account_move_line where move_id in ('+str(move_id)+','+str(invoice.move_id.id)+')')
-        
+
         lines = line.browse(cr, uid, map(lambda x: x[0], cr.fetchall()) )
         for l in lines+invoice.payment_ids:
             if l.account_id.id==src_account_id:
@@ -404,28 +404,323 @@
         # Update the stored value (fields.function), so we write to trigger recompute
         self.pool.get('account.invoice').write(cr, uid, ids, {}, context=context)
         return True
-    
+
 account_invoice()
 
 class account_move_line(osv.osv):
     _name = 'account.move.line'
     _inherit = 'account.move.line'
-    
+
     def _invoice(self, cr, uid, ids, name, arg, context=None):
         res = {}
         if ids:
             return super(account_move_line, self)._invoice(cr, uid, ids, name, arg, context)
         else:
             return res
-        
+
     def _invoice_search(self, cr, uid, obj, name, args, context={}):
         return super(account_move_line, self)._invoice_search(cr, uid, obj, name, args, context=context)
-        
+
     _columns = {
        'invoice': fields.function(_invoice, method=True, string='Invoice',
           type='many2one', relation='account.invoice', fnct_search=_invoice_search),
     }
 account_move_line()
 
+class res_company(osv.osv):
+    _inherit  = "res.company"
+
+    _columns = {
+        'expense_account_id': fields.many2one('account.account', 'Expenses',required=True),
+        'revenue_account_id': fields.many2one('account.account', 'Revenues',required=True),
+    }
+res_company()
+
+class res_company_wizard(osv.osv_memory):
+    _name = 'res.company.wizard'
+    _columns = {
+        'expense_account_id': fields.many2one('account.account', 'Expenses',required=True),
+        'revenue_account_id': fields.many2one('account.account', 'Revenues',required=True),
+    }
+    _defaults = {
+        'expense_account_id': lambda *a: 2,
+        'revenue_account_id': lambda *a: 3,
+    }
+
+    def set_default(self, cr, uid, ids, context=None):
+        company_id =self.pool.get('res.users').browse(cr,uid,[uid],context)[0].company_id
+        for o in self.browse(cr, uid, ids, context=context):
+             self.pool.get('res.company').write(cr, uid, [company_id.id], {'expense_account_id':o.expense_account_id.id,'revenue_account_id':o.revenue_account_id.id})
+        return {
+                'view_type': 'form',
+                "view_mode": 'form',
+                'res_model': 'ir.actions.configuration.wizard',
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+         }
+
+    def action_cancel(self,cr,uid,ids,conect=None):
+        return {
+                'view_type': 'form',
+                "view_mode": 'form',
+                'res_model': 'ir.actions.configuration.wizard',
+                'type': 'ir.actions.act_window',
+                'target':'new',
+        }
+
+res_company_wizard()
+
+class account_bank_statement(osv.osv):
+    _inherit="account.bank.statement"
+
+    def button_confirm(self, cr, uid, ids, context={}):
+        done = []
+        res_currency_obj = self.pool.get('res.currency')
+        res_users_obj = self.pool.get('res.users')
+        account_move_obj = self.pool.get('account.move')
+        account_move_line_obj = self.pool.get('account.move.line')
+        cur_obj = self.pool.get('res.currency')
+        account_bank_statement_line_obj = \
+                self.pool.get('account.bank.statement.line')
+        account_bank_reconcil = self.pool.get('account.bank.statement.reconcile')
+        company_currency_id = res_users_obj.browse(cr, uid, uid,
+                context=context).company_id.currency_id.id
+        for st in self.browse(cr, uid, ids, context):
+            if not st.state=='draft':
+                continue
+            if not (abs(st.balance_end - st.balance_end_real) < 0.0001):
+                raise osv.except_osv(_('Error !'),
+                        _('The statement balance is incorrect !\n') +
+                        _('The expected balance (%.2f) is different than the computed one. (%.2f)') % (st.balance_end_real, st.balance_end))
+            if (not st.journal_id.default_credit_account_id) \
+                    or (not st.journal_id.default_debit_account_id):
+                raise osv.except_osv(_('Configuration Error !'),
+                        _('Please verify that an account is defined in the journal.'))
+
+            for line in st.move_line_ids:
+                if line.state <> 'valid':
+                    raise osv.except_osv(_('Error !'),
+                            _('The account entries lines are not in valid state.'))
+            # for bank.statement.lines
+            # In line we get reconcile_id on bank.ste.rec.
+            # in bank stat.rec we get line_new_ids on bank.stat.rec.line
+            for move in st.line_ids:
+                context.update({'date':move.date})
+                move_id = account_move_obj.create(cr, uid, {
+                    'journal_id': st.journal_id.id,
+                    'period_id': st.period_id.id,
+                    'date': move.date,
+                }, context=context)
+                account_bank_statement_line_obj.write(cr, uid, [move.id], {
+                    'move_ids': [(4,move_id, False)]
+                })
+                if not move.amount:
+                    continue
+                torec = []
+                if move.amount >= 0:
+                    account_id = st.journal_id.default_credit_account_id.id
+                else:
+                    account_id = st.journal_id.default_debit_account_id.id
+                acc_cur = ((move.amount<=0) and st.journal_id.default_debit_account_id) or move.account_id
+                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
+
+                val = {
+                    'name': move.name,
+                    'date': move.date,
+                    'ref': move.ref,
+                    'move_id': move_id,
+                    'partner_id': ((move.partner_id) and move.partner_id.id) or False,
+                    'account_id': (move.account_id) and move.account_id.id,
+                    'credit': ((amount>0) and amount) or 0.0,
+                    'debit': ((amount<0) and -amount) or 0.0,
+                    'statement_id': st.id,
+                    'journal_id': st.journal_id.id,
+                    'period_id': st.period_id.id,
+                    'currency_id': st.currency.id,
+                }
+
+                amount = res_currency_obj.compute(cr, uid, st.currency.id,
+                        company_currency_id, move.amount, context=context,
+                        account=acc_cur)
+                if st.currency.id <> company_currency_id:
+                    amount_cur = res_currency_obj.compute(cr, uid, company_currency_id,
+                                st.currency.id, amount, context=context,
+                                account=acc_cur)
+                    val['amount_currency'] = -amount_cur
+
+                if move.account_id and move.account_id.currency_id and move.account_id.currency_id.id <> company_currency_id:
+                    val['currency_id'] = move.account_id.currency_id.id
+                    if company_currency_id==move.account_id.currency_id.id:
+                        amount_cur = move.amount
+                    else:
+                        amount_cur = res_currency_obj.compute(cr, uid, company_currency_id,
+                                move.account_id.currency_id.id, amount, context=context,
+                                account=acc_cur)
+                    val['amount_currency'] = amount_cur
+
+                torec.append(account_move_line_obj.create(cr, uid, val , context=context))
+
+                if move.reconcile_id and move.reconcile_id.line_new_ids:
+                    for newline in move.reconcile_id.line_new_ids:
+                        account_move_line_obj.create(cr, uid, {
+                            'name': newline.name or move.name,
+                            'date': move.date,
+                            'ref': move.ref,
+                            'move_id': move_id,
+                            'partner_id': ((move.partner_id) and move.partner_id.id) or False,
+                            'account_id': (newline.account_id) and newline.account_id.id,
+                            'debit': newline.amount>0 and newline.amount or 0.0,
+                            'credit': newline.amount<0 and -newline.amount or 0.0,
+                            'statement_id': st.id,
+                            'journal_id': st.journal_id.id,
+                            'period_id': st.period_id.id,
+
+                        }, context=context)
+
+                amount_currency = False
+                currency_id = False
+                partner_acc_id = False
+
+                if st.currency.id <> company_currency_id:
+                    amount_currency = move.amount
+                    expense_acc = res_users_obj.browse(cr, uid, uid, context=context).company_id.expense_account_id
+                    revene_acc = res_users_obj.browse(cr, uid, uid, context=context).company_id.revenue_account_id
+                    currency_id = st.currency.id
+
+                    if move.type=='customer':
+                       partner_acc_id = move.partner_id.property_account_receivable.id
+                    elif move.type=='supplier':
+                        partner_acc_id = move.partner_id.property_account_payable.id
+
+                    for line in move.reconcile_id.line_ids:
+                        balance = 0.0
+                        move_line_data = self.pool.get('account.move.line').browse(cr, uid, line.id, context=context)
+                        context.update({'amount': move_line_data.amount_currency, 'currency_id': move_line_data.currency_id.id})
+                        balance = self.pool.get("account.bank.statement.reconcile").browse(cr, uid, move.reconcile_id.id, context=context).total_balance
+
+                    if balance < 0.00:
+                        account_move_line_obj.create(cr, uid, {
+                            'name': move.name,
+                            'date': move.date,
+                            'ref': move.ref,
+                            'move_id': move_id,
+                            'partner_id': ((move.partner_id) and move.partner_id.id) or False,
+                            'account_id': expense_acc.id,
+                            'credit': abs(balance),
+                            'debit': 0.0,
+                            'statement_id': st.id,
+                            'journal_id': st.journal_id.id,
+                            'period_id': st.period_id.id,
+                            'amount_currency': amount_currency,
+                            'currency_id': currency_id,
+                        }, context=context)
+
+                        account_move_line_obj.create(cr, uid, {
+                            'name': move.name,
+                            'date': move.date,
+                            'ref': move.ref,
+                            'move_id': move_id,
+                            'partner_id': ((move.partner_id) and move.partner_id.id) or False,
+                            'account_id': partner_acc_id,
+                            'credit':  0.0,
+                            'debit': abs(balance),
+                            'statement_id': st.id,
+                            'journal_id': st.journal_id.id,
+                            'period_id': st.period_id.id,
+                            'amount_currency': amount_currency,
+                            'currency_id': currency_id,
+                        }, context=context)
+
+                    elif balance > 0.00:
+                        account_move_line_obj.create(cr, uid, {
+                            'name': move.name,
+                            'date': move.date,
+                            'ref': move.ref,
+                            'move_id': move_id,
+                            'partner_id': ((move.partner_id) and move.partner_id.id) or False,
+                            'account_id':revene_acc.id,
+                            'credit': abs(balance),
+                            'debit':  0.0,
+                            'statement_id': st.id,
+                            'journal_id': st.journal_id.id,
+                            'period_id': st.period_id.id,
+                            'amount_currency': amount_currency,
+                            'currency_id': currency_id,
+                         }, context=context)
+
+                        account_move_line_obj.create(cr, uid, {
+                            'name': move.name,
+                            'date': move.date,
+                            'ref': move.ref,
+                            'move_id': move_id,
+                            'partner_id': ((move.partner_id) and move.partner_id.id) or False,
+                            'account_id': partner_acc_id,
+                            'credit': 0.0,
+                            'debit': abs(balance),
+                            'statement_id': st.id,
+                            'journal_id': st.journal_id.id,
+                            'period_id': st.period_id.id,
+                            'amount_currency': amount_currency,
+                            'currency_id': currency_id,
+                            }, context=context)
+                else:
+                    continue
+
+                account_move_line_obj.create(cr, uid, {
+                    'name': move.name,
+                    'date': move.date,
+                    'ref': move.ref,
+                    'move_id': move_id,
+                    'partner_id': ((move.partner_id) and move.partner_id.id) or False,
+                    'account_id': account_id,
+                    'credit': ((amount < 0) and -amount) or 0.0,
+                    'debit': ((amount > 0) and amount) or 0.0,
+                    'statement_id': st.id,
+                    'journal_id': st.journal_id.id,
+                    'period_id': st.period_id.id,
+                    'amount_currency': amount_currency,
+                    'currency_id': currency_id,
+                    }, context=context)
+
+                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)
+
+                if move.reconcile_id and move.reconcile_id.line_ids:
+                    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)
+                    #except:
+                    #    raise osv.except_osv(_('Error !'), _('Unable to reconcile entry "%s": %.2f') % (move.name, move.amount))
+
+                if st.journal_id.entry_posted:
+                    account_move_obj.write(cr, uid, [move_id], {'state':'posted'})
+            done.append(st.id)
+        self.write(cr, uid, done, {'state':'confirm'}, context=context)
+
+        return True
+
+account_bank_statement()
+
+
 # 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-23 12:13:39 +0000
+++ account_invoice_cash_discount/account_invoice_cash_discount_view.xml	2010-07-27 10:15:58 +0000
@@ -47,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>
@@ -56,10 +56,10 @@
             <field name="arch" type="xml">
             	<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">
             <field name="name">account.bank.statement.reconcile.form</field>
             <field name="model">account.bank.statement.reconcile</field>
@@ -68,10 +68,10 @@
             <field name="arch" type="xml">
             	<field name="total_new" position="replace">
 					<field name="total_new" string="Total Write Off / Cash Discount"/>
-				</field>      
+				</field>
             </field>
         </record>
-        
+
         <record id="bank_statement_reconcile_form_view2" model="ir.ui.view">
             <field name="name">account.bank.statement.reconcile.form</field>
             <field name="model">account.bank.statement.reconcile</field>
@@ -84,10 +84,10 @@
                             <field name="amount"/>
                             <field name="name"/>
                         </tree>
-				</xpath>    
+				</xpath>
             </field>
         </record>
-        
+
         <record id="account_payment_term_line_view1" model="ir.ui.view">
             <field name="name">account.payment.term.line.form</field>
             <field name="model">account.payment.term.line</field>
@@ -97,9 +97,54 @@
             	<field name="days2" position="after">
 					<field name="compl_cash_discount"/>
 					<field name="day_tolerance"/>
-				</field>      
-            </field>
-        </record>
+				</field>
+            </field>
+        </record>
+
+        <record id="view_res_company_inherit_form" model="ir.ui.view">
+            <field name="name">res.company.inherit.form</field>
+            <field name="model">res.company</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_company_form"/>
+            <field name="arch" type="xml">
+                <field name="currency_id" position="after">
+                    <field name="expense_account_id"/>
+                    <field name="revenue_account_id"/>
+                </field>
+            </field>
+        </record>
+
+        <record id="view_res_company_wizard" model="ir.ui.view">
+            <field name="name">Account set in Company</field>
+            <field name="model">res.company.wizard</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Account Configuration">
+                    <field name="expense_account_id"/>
+                    <field name="revenue_account_id"/>
+                    <newline/>
+                    <group col="4" colspan="4">
+                        <button icon="gtk-cancel" name="action_cancel" type="object" special="cancel" string="Cancel"/>
+                        <button icon="gtk-ok" name="set_default" string="Set Default" type="object"/>
+                    </group>
+                </form>
+            </field>
+       </record>
+
+       <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 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>
 
     </data>
 </openerp>