Merge lp:~openerp-dev/openobject-addons/6.1-opw-574995-gpa into lp:openobject-addons/6.1

[gpa(OpenERP)]

Hello sir,

The "Pay bill" button on supplier receipt view is still visible after the payment has been completed or reconciled.

Step to reproduce:

1.Goto "Accounting/Suppliers/Purchase Receipt" make an entry on purchase receipt
2.Validate entry
3.Now click on Pay Bill button and pay the receipt

The "Pay bill" button on supplier receipt view is still visible after the payment has been completed or reconciled.
Please view video attached for example.
Thank you

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

The propose patch will fix the issue.

review: Approve

[Naresh(OpenERP) (nch-openerp)]

Hello,

This bug was qualified as Already Fixed on Trunk in a different way (means that it was already fixed and 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

6807. By gpa(OpenERP) on 2012-05-22

[FIX] account_voucher The Pay bill button on supplier receipt view is still visible after the payment has been completed or reconciled. : case 574995

=== 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-22 10:34:24 +0000
@@ -46,8 +46,9 @@
     def _check_paid(self, cr, uid, ids, name, args, context=None):
         res = {}
         for voucher in self.browse(cr, uid, ids, context=context):
-            ok = True
+            ok = False
             for line in voucher.move_ids:
+                ok = True
                 if (line.account_id.type, 'in', ('receivable', 'payable')) and not line.reconcile_id:
                     ok = False
             res[voucher.id] = ok
@@ -1068,7 +1069,7 @@
                 voucher_currency = voucher_brw.currency_id and voucher_brw.currency_id.id or voucher_brw.journal_id.company_id.currency_id.id
                 # We want to set it on the account move line as soon as the original line had a foreign currency
                 if line.move_line_id.currency_id and line.move_line_id.currency_id.id != company_currency:
-                    # we compute the amount in that foreign currency. 
+                    # we compute the amount in that foreign currency.
                     if line.move_line_id.currency_id.id == current_currency:
                         # if the voucher and the voucher line share the same currency, there is no computation to do
                         sign = (move_line['debit'] - move_line['credit']) < 0 and -1 or 1
@@ -1287,7 +1288,7 @@
 
     def _currency_id(self, cr, uid, ids, name, args, context=None):
         '''
-        This function returns the currency id of a voucher line. It's either the currency of the 
+        This function returns the currency id of a voucher line. It's either the currency of the
         associated move line (if any) or the currency of the voucher or the company currency.
         '''
         res = {}