Merge lp:~openerp-dev/openobject-addons/trunk-bug-827649-bde into lp:openobject-addons

[Bharat Devnani (Open ERP)]

Hello Sir,

I have corrected the tax value in account_voucher when in it was included in the price.

Thanks & Regards,
Devnani Bharat R.

[lp:~openerp-dev/openobject-addons/trunk-bug-827649-bde]

5449. By Bharat Devnani (Open ERP) on 2011-11-01

[REM] Account : removed unnecessary code

5450. By Bharat Devnani (Open ERP) on 2011-11-01

[REM] Account : removed unnecessary code

[Purnendu Singh (OpenERP) (purnendu-singh)]

1) if there isn't any change in account_move_line.py then why it is in your patch!!!!

2) in your patch line 91
    + voucher_brw = self.pool.get('account.voucher').browse(cr,uid,voucher_id,context=context)
    * please make a habit of pooling all required objects at the start of the method
    * browse(cr,uid,voucher_id,context=context)..... we generally using a space between each arguments
3) line 137 to 159 it can be optimize. there are too many variables used!!!! Improve this

review: Needs Fixing

[lp:~openerp-dev/openobject-addons/trunk-bug-827649-bde]

5451. By Bharat Devnani (Open ERP) on 2011-11-10

[IMP] account_voucher : improved the code in account_voucher/account_voucher.py

[Bharat Devnani (Open ERP) (bde-openerp)]

Hello Sir,

I have improved the code in account_voucher/account_voucher.py

Thanks & Regards,
Devnani Bharat R.

review: Needs Resubmitting

[lp:~openerp-dev/openobject-addons/trunk-bug-827649-bde]

5452. By Bharat Devnani (Open ERP) on 2011-11-10

[IMP] account_voucher : pooled the object at start of the method

5453. By Bharat Devnani (Open ERP) on 2011-11-11

[IMP] account_voucher : optimized the code and made the searching next move_line more dynamic

[Fabien (Open ERP) (fp-tinyerp)]

I do not understand why we compute the tax manually ?
The tax object should compute the tax itself.

Unmerged revisions

5453. By Bharat Devnani (Open ERP) on 2011-11-11

[IMP] account_voucher : optimized the code and made the searching next move_line more dynamic

5452. By Bharat Devnani (Open ERP) on 2011-11-10

[IMP] account_voucher : pooled the object at start of the method

5451. By Bharat Devnani (Open ERP) on 2011-11-10

[IMP] account_voucher : improved the code in account_voucher/account_voucher.py

5450. By Bharat Devnani (Open ERP) on 2011-11-01

[REM] Account : removed unnecessary code

5449. By Bharat Devnani (Open ERP) on 2011-11-01

[REM] Account : removed unnecessary code

5448. By Bharat Devnani (Open ERP) on 2011-11-01

[FIX] Account : Supplier voucher - wrong for tax inclusive

5447. By Bharat Devnani (Open ERP) on 2011-10-31

In Progress

=== modified file 'account/account.py'
=== modified file 'account_voucher/account_voucher.py'
--- account_voucher/account_voucher.py	2011-10-27 21:11:24 +0000
+++ account_voucher/account_voucher.py	2011-11-11 06:04:26 +0000
@@ -26,6 +26,7 @@
 from osv import osv, fields
 import decimal_precision as dp
 from tools.translate import _
+import tools
 
 
 class account_voucher(osv.osv):
@@ -518,7 +519,7 @@
             elif currency_id == company_currency:
                 #otherwise treatments is the same but with other field names
                 if line.amount_residual == price:
-                    #if the amount residual is equal the amount voucher, we assign it to that voucher 
+                    #if the amount residual is equal the amount voucher, we assign it to that voucher
                     #line, whatever the other voucher lines
                     move_line_found = line.id
                     break
@@ -696,8 +697,8 @@
         Select the context to use accordingly if it needs to be multicurrency or not.
 
         :param voucher_id: Id of the actual voucher
-        :return: The returned context will be the same as given in parameter if the voucher currency is the same 
-                 than the company currency, otherwise it's a copy of the parameter with an extra key 'date' containing 
+        :return: The returned context will be the same as given in parameter if the voucher currency is the same
+                 than the company currency, otherwise it's a copy of the parameter with an extra key 'date' containing
                  the date of the voucher.
         :rtype: dict
         """
@@ -726,13 +727,19 @@
         voucher_brw = self.pool.get('account.voucher').browse(cr,uid,voucher_id,context)
         debit = credit = 0.0
         # TODO: is there any other alternative then the voucher type ??
-        # ANSWER: We can have payment and receipt "In Advance". 
+        # ANSWER: We can have payment and receipt "In Advance".
         # TODO: Make this logic available.
         # -for sale, purchase we have but for the payment and receipt we do not have as based on the bank/cash journal we can not know its payment or receipt
         if voucher_brw.type in ('purchase', 'payment'):
-            credit = voucher_brw.amount / voucher_brw.payment_rate
+            if voucher_brw.tax_id.price_include:
+                credit = (voucher_brw.amount - voucher_brw.tax_amount) / voucher_brw.payment_rate
+            else :
+                credit = voucher_brw.amount / voucher_brw.payment_rate
         elif voucher_brw.type in ('sale', 'receipt'):
-            debit = voucher_brw.amount / voucher_brw.payment_rate
+            if voucher_brw.tax_id.price_include:
+                debit = (voucher_brw.amount - voucher_brw.tax_amount) / voucher_brw.payment_rate
+            else:
+                debit = voucher_brw.amount  / voucher_brw.payment_rate
         if debit < 0: credit = -debit; debit = 0.0
         if credit < 0: debit = -credit; credit = 0.0
         sign = debit - credit < 0 and -1 or 1
@@ -769,7 +776,7 @@
         elif voucher_brw.journal_id.sequence_id:
             name = seq_obj.next_by_id(cr, uid, voucher_brw.journal_id.sequence_id.id)
         else:
-            raise osv.except_osv(_('Error !'), 
+            raise osv.except_osv(_('Error !'),
                         _('Please define a sequence on the journal !'))
         if not voucher_brw.reference:
             ref = name.replace('/','')
@@ -834,7 +841,7 @@
     def voucher_move_line_create(self, cr, uid, voucher_id, line_total, move_id, company_currency, current_currency, context=None):
         '''
         Create one account move line, on the given account move, per voucher line where amount is not 0.0.
-        It returns Tuple with tot_line what is total of difference between debit and credit and 
+        It returns Tuple with tot_line what is total of difference between debit and credit and
         a list of lists with ids to be reconciled with this format (total_deb_cred,list_of_lists).
 
         :param voucher_id: Voucher id what we are working with
@@ -849,8 +856,9 @@
         currency_obj = self.pool.get('res.currency')
         tot_line = line_total
         rec_lst_ids = []
-
-        voucher_brw = self.pool.get('account.voucher').browse(cr,uid,voucher_id,context)
+        tax_obj = self.pool.get('account.tax')
+        account_voucher_obj = self.pool.get('account.voucher')
+        voucher_brw = account_voucher_obj.browse(cr, uid, voucher_id, context=context)
         for line in voucher_brw.line_ids:
             #create one move line per voucher line where amount is not 0.0
             if not line.amount:
@@ -860,7 +868,10 @@
                 amount = (line.untax_amount or line.amount) / voucher_brw.payment_rate
                 amount_residual = line.move_line_id.amount_residual - amount #residual amount in company currency
             else:
-                amount = (line.untax_amount or line.amount)  / voucher_brw.payment_rate
+                if voucher_brw.tax_id.price_include:
+                    amount = line.amount / voucher_brw.payment_rate
+                else:
+                    amount = (line.untax_amount or line.amount) / voucher_brw.payment_rate
                 amount_residual = 0.0
             move_line = {
                 'journal_id': voucher_brw.journal_id.id,
@@ -874,8 +885,9 @@
                 'quantity': 1,
                 'credit': 0.0,
                 'debit': 0.0,
-                'date': voucher_brw.date
+                'date': voucher_brw.date,
             }
+
             if amount < 0:
                 amount = -amount
                 if line.type == 'dr':
@@ -895,17 +907,37 @@
                     'account_tax_id': voucher_brw.tax_id.id,
                 })
 
+            # Creates 2nd move line
             if move_line.get('account_tax_id', False):
                 tax_data = tax_obj.browse(cr, uid, [move_line['account_tax_id']], context=context)[0]
                 if not (tax_data.base_code_id and tax_data.tax_code_id):
                     raise osv.except_osv(_('No Account Base Code and Account Tax Code!'),_("You have to configure account base code and account tax code on the '%s' tax!") % (tax_data.name))
-
             sign = (move_line['debit'] - move_line['credit']) < 0 and -1 or 1
             move_line['amount_currency'] = company_currency <> current_currency and sign * line.amount or False
-            voucher_line = move_line_obj.create(cr, uid, move_line)
+            voucher_line = move_line_obj.create(cr, uid, move_line, context=context)
+            move_line = move_line_obj.browse(cr, uid, voucher_line, context=context)
+            next_line = tools.ustr(move_line.name) + ' ' + tools.ustr(voucher_brw.tax_id.name)
+            line_search = move_line_obj.search(cr, uid, ['&', ('name','=', next_line), ('id', '>', voucher_line)], context=context)
+            for vals in move_line_obj.browse(cr, uid, line_search, context=context):
+                vals = vals.id
+            if voucher_brw.tax_id.amount:
+                amount = voucher_brw.amount - (voucher_brw.amount * 100) / (100 + (voucher_brw.tax_id.amount * 100))
+
+            if voucher_brw.tax_id.price_include:
+                if (line.type=='dr'):
+                    move_line_obj.write(cr, uid, [vals], {
+                        'tax_amount': amount,
+                        'debit': amount,
+                    })
+
+                if (line.type=='cr'):
+                    move_line_obj.write(cr, uid, [vals], {
+                        'tax_amount': amount,
+                        'credit': amount,
+                    })
+
             rec_ids = [voucher_line, line.move_line_id.id]
-
-            if amount_residual: 
+            if amount_residual:
                 # Change difference entry
                 exch_lines = self._get_exchange_lines(cr, uid, line, move_id, amount_residual, company_currency, current_currency, context=context)
                 new_id = move_line_obj.create(cr, uid, exch_lines[0],context)
@@ -914,7 +946,6 @@
 
             if line.move_line_id.id:
                 rec_lst_ids.append(rec_ids)
-
         return (tot_line, rec_lst_ids)
 
     def writeoff_move_line_get(self, cr, uid, voucher_id, line_total, move_id, name, company_currency, current_currency, context=None):
@@ -1200,7 +1231,6 @@
             bank_st_line_obj.write(cr, uid, [st_line_id], {
                 'move_ids': [(4, v.move_id.id, False)]
             })
-
             return move_line_obj.write(cr, uid, [x.id for x in v.move_ids], {'statement_id': st_line.statement_id.id}, context=context)
         return super(account_bank_statement, self).create_move_from_st_line(cr, uid, st_line.id, company_currency_id, next_number, context=context)