Merge lp:~openerp-dev/openobject-addons/6.1-opw-574543-pso into lp:openobject-addons/6.1

[Priyesh (OpenERP)]

Hello,

Fixed issues:
1. Refund time, Need to Add negative sign, Guideline already improved with tool tip on Paid Amount Field on Voucher Form.
2. Difference amount coming with wrong value.

Kindly review it.

Thanks,
Priyesh

[lp:~openerp-dev/openobject-addons/6.1-opw-574543-pso]

6783. By Xavier ALT on 2012-05-04

[FIX] stock: fix partial picking testing on non-existant 'new' stock.move state

6784. By Launchpad Translations on behalf of openerp on 2012-05-05

Launchpad automatic translations update.

6785. By Antony Lesuisse (OpenERP) on 2012-05-05

[FIX] point_of_sale typo only load pos enabled products

6786. By Antony Lesuisse (OpenERP) on 2012-05-05

[MERGE] 6.1-opw-573508-ado point_of_sale multiple rows for categories

6787. By Launchpad Translations on behalf of openerp on 2012-05-06

Launchpad automatic translations update.

6788. By Launchpad Translations on behalf of openerp on 2012-05-07

Launchpad automatic translations update.

6789. By nel on 2012-05-07

[MERGE]

6790. By Launchpad Translations on behalf of openerp on 2012-05-08

Launchpad automatic translations update.

6791. By Olivier Laurent (Open ERP) on 2012-05-08

[FIX] reverted __openerp__.py: the commented line was already commented before so it was wrongly uncommented

6792. By Launchpad Translations on behalf of openerp on 2012-05-09

Launchpad automatic translations update.

6793. By Launchpad Translations on behalf of openerp on 2012-05-10

Launchpad automatic translations update.

6794. By Launchpad Translations on behalf of openerp on 2012-05-11

Launchpad automatic translations update.

6795. By Launchpad Translations on behalf of openerp on 2012-05-12

Launchpad automatic translations update.

6796. By Launchpad Translations on behalf of openerp on 2012-05-13

Launchpad automatic translations update.

6797. By Launchpad Translations on behalf of openerp on 2012-05-14

Launchpad automatic translations update.

6798. By Launchpad Translations on behalf of openerp on 2012-05-15

Launchpad automatic translations update.

6799. By Launchpad Translations on behalf of openerp on 2012-05-16

Launchpad automatic translations update.

6800. By Olivier Laurent (Open ERP) on 2012-05-16

[FIX] account: reports: drop view before replacing them

6801. By Priyesh (OpenERP) on 2012-05-16

[IMP] account_voucher: Improved write off and accounting entries on refund payment and added tooltip on amount(case:574543)

[Vinay Rana (OpenERP) (vra-openerp)]

As per the refund voucher payment closing part we need to add negative sign with the payment amount for making proper payment entry and reconcile the refund invoice. In this patch the tooltip will guide the end user for adding '-' sign with payment amount.

The writeoff amount calculation also needs to improve in this particular situation so the provided patch will also take care for this.

review: Approve

[Naresh(OpenERP) (nch-openerp)]

Hello,

This bug was qualified as Confirmed on Trunk (means still existing and reproducible). A Merge Proposal for trunk was created to fix it. Here is the link to follow the MP on Launchpad https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-opw-574543-port-mma/+merge/133024 and be informed once it's been merged in trunk: ... If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,
Naresh Soni

Unmerged revisions

6801. By Priyesh (OpenERP) on 2012-05-16

[IMP] account_voucher: Improved write off and accounting entries on refund payment and added tooltip on amount(case:574543)

=== modified file 'account_voucher/account_voucher.py'
--- account_voucher/account_voucher.py	2012-03-30 11:07:16 +0000
+++ account_voucher/account_voucher.py	2012-05-16 10:26:20 +0000
@@ -192,7 +192,7 @@
             debit += l['amount']
         for l in line_cr_ids:
             credit += l['amount']
-        return abs(amount - abs(credit - debit))
+        return abs(abs(amount) - abs(credit - debit))
 
     def onchange_line_ids(self, cr, uid, ids, line_dr_ids, line_cr_ids, amount, voucher_currency, context=None):
         context = context or {}
@@ -221,7 +221,7 @@
             for l in voucher.line_cr_ids:
                 credit += l.amount
             currency = voucher.currency_id or voucher.company_id.currency_id
-            res[voucher.id] =  currency_obj.round(cr, uid, currency, abs(voucher.amount - abs(credit - debit)))
+            res[voucher.id] =  currency_obj.round(cr, uid, currency, abs(abs(voucher.amount) - abs(credit - debit)))
         return res
 
     def _paid_amount_in_company_currency(self, cr, uid, ids, name, args, context=None):
@@ -276,7 +276,7 @@
                         \n* The \'Pro-forma\' when voucher is in Pro-forma state,voucher does not have an voucher number. \
                         \n* The \'Posted\' state is used when user create voucher,a voucher number is generated and voucher entries are created in account \
                         \n* The \'Cancelled\' state is used when user cancel voucher.'),
-        'amount': fields.float('Total', digits_compute=dp.get_precision('Account'), required=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'amount': fields.float('Total', digits_compute=dp.get_precision('Account'), required=True, readonly=True, states={'draft':[('readonly',False)]}, help="During refund payment, add negative amount."),
         'tax_amount':fields.float('Tax Amount', digits_compute=dp.get_precision('Account'), readonly=True, states={'draft':[('readonly',False)]}),
         'reference': fields.char('Ref #', size=64, readonly=True, states={'draft':[('readonly',False)]}, help="Transaction reference number."),
         'number': fields.char('Number', size=32, readonly=True,),
@@ -676,6 +676,7 @@
                         amount = min(amount_unreconciled, abs(total_credit))
                         rs['amount'] = amount
                         total_credit -= amount
+            rs['amount'] = abs(rs['amount'])
 
             if rs['amount_unreconciled'] == rs['amount']:
                 rs['reconcile'] = True
@@ -1453,7 +1454,7 @@
     def _check_amount(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
             if obj.voucher_id:
-                diff = abs(obj.amount) - obj.voucher_id.amount
+                diff = abs(obj.amount) - abs(obj.voucher_id.amount)
                 if not self.pool.get('res.currency').is_zero(cr, uid, obj.statement_id.currency, diff):
                     return False
         return True