Merge lp:~unifield-team/unifield-wm/us_234 into lp:unifield-wm

[jftempo]

[lp:~unifield-team/unifield-wm/us_234]

2569. By Stephane Codazzi <email address hidden> on 2015-09-03

Change reconciliation check method

2570. By Stephane Codazzi <email address hidden> on 2015-09-03

Change reconciliation check method

Unmerged revisions

2570. By Stephane Codazzi <email address hidden> on 2015-09-03

Change reconciliation check method

2569. By Stephane Codazzi <email address hidden> on 2015-09-03

Change reconciliation check method

2568. By Stephane Codazzi <email address hidden> on 2015-08-12

US_234: Add invoice down payment expended amout for check register line and po

2567. By Stephane Codazzi <email address hidden> on 2015-07-30

Change Down payment verification and check verification on hardpost

2566. By Stephane Codazzi <email address hidden> on 2015-07-30

Change Down payment verification and check verification on hardpost

=== modified file 'account_reconciliation/account_move_line.py'
--- account_reconciliation/account_move_line.py	2014-10-27 13:40:35 +0000
+++ account_reconciliation/account_move_line.py	2015-09-03 10:20:31 +0000
@@ -89,6 +89,7 @@
         # UTP-752: Add an attribute to reconciliation element if different instance levels
         previous_level = False
         different_level = False
+        already_reconciled = True
         for line in self.browse(cr, uid, ids, context=context):
             # Do level check only if we don't know if more than 1 different level exists between lines
             if not different_level:
@@ -97,8 +98,11 @@
                 if previous_level != line.instance_id.id:
                     different_level = True
             company_currency_id = line.company_id.currency_id
-            if line.reconcile_id:
-                raise osv.except_osv(_('Warning'), _('Already Reconciled!'))
+
+            if not line.reconcile_id:
+                already_reconciled = False
+            # if line.reconcile_id:
+                # raise osv.except_osv(_('Warning'), _('Already Reconciled!'))
             if line.reconcile_partial_id:
                 for line2 in line.reconcile_partial_id.line_partial_ids:
                     if not line2.reconcile_id:
@@ -110,7 +114,8 @@
             else:
                 unmerge.append(line.id)
                 total += (line.debit_currency or 0.0) - (line.credit_currency or 0.0)
-
+        if already_reconciled:
+            raise osv.except_osv(_('Warning'), _('Already Reconciled!'))
         if self.pool.get('res.currency').is_zero(cr, uid, company_currency_id, total):
             res = self.reconcile(cr, uid, merges+unmerge, context=context)
             return res

=== modified file 'register_accounting/account_bank_statement.py'
--- register_accounting/account_bank_statement.py	2015-08-28 16:01:14 +0000
+++ register_accounting/account_bank_statement.py	2015-09-03 10:20:31 +0000
@@ -2289,6 +2289,13 @@
         """
         Write some statement line into some account move lines in posted state.
         """
+
+        wdp_obj = self.pool.get('wizard.down.payment')
+        lines = self.browse(cr, uid, ids, context=context)
+        for line in lines:
+            wdp_obj.check_register_line_and_po(cr, uid, line['id'],
+                                               line['down_payment_id']['id'],
+                                               context=context)
         return self.posting(cr, uid, ids, 'hard', context=context)
 
     def button_temp_posting(self, cr, uid, ids, context=None):

=== modified file 'register_accounting/wizard/down_payment.py'
--- register_accounting/wizard/down_payment.py	2014-02-13 09:41:43 +0000
+++ register_accounting/wizard/down_payment.py	2015-09-03 10:20:31 +0000
@@ -44,7 +44,8 @@
 
     def check_register_line_and_po(self, cr, uid, absl_id, po_id, context=None):
         """
-        Verify that register line amount is not superior to (PO total_amount - all used down payments - open/paid invoices).
+        Verify that register line amount is not superior to
+        (PO total_amount - all used down payments - open/paid invoices).
         Check partner on register line AND PO (should be equal)
         """
         # Some verifications
@@ -66,22 +67,32 @@
         if po.get('partner_id', [False])[0] != absl.partner_id.id:
             raise osv.except_osv(_('Error'), _('Third party from Down payment and Purchase Order are different!'))
         total = po.get('amount_total', 0.0)
-        for dp in po_obj.read(cr, uid, po.get('down_payment_ids', []), ['amount_currency', 'down_payment_amount']):
-            move_ids = [x.id or None for x in absl.move_ids]
-            operator = 'in'
-            if len(move_ids) == 1:
-                operator = '='
-            move_line_ids = self.pool.get('account.move.line').search(cr, uid, [('account_id', '=', absl.account_id.id), 
-                ('move_id', operator, move_ids)])
-            if dp.get('id') not in move_line_ids:
-                total -= (dp.get('amount_currency', 0.0) - dp.get('down_payment_amount', 0.0))
+
+        absl_obj = self.pool.get('account.bank.statement.line')
+        args = [('down_payment_id', '=', po_id)]
+        lines_ids = absl_obj.search(cr, uid, args, context=context)
+        lines_amount = 0
+
+        for line in absl_obj.read(cr, uid, lines_ids, ['id', 'amount'],
+                                  context=context):
+            if absl_id != line['id']:
+                lines_amount += line['amount']
+
         # Cut away open and paid invoice linked to this PO
         invoice_ids = self.pool.get('account.invoice').search(cr, uid, [('purchase_ids', 'in', [po_id]), ('state', 'in', ['paid', 'open'])])
-        for inv in self.pool.get('account.invoice').read(cr, uid, invoice_ids, ['amount_total']):
-            total -= inv.get('amount_total', 0.0)
-        if (-1 * absl.amount) > total:
-            raise osv.except_osv(_('Warning'), 
-                _('Maximum amount should be: %s. Register line amount is higher than (PO - unexpended DPs - open/paid INV).') % (total))
+        for inv in self.pool.get('account.invoice').read(cr, uid, invoice_ids, ['amount_total', 'down_payment_ids']):
+            lines_amount -= inv.get('amount_total', 0.0)
+            dp_ids = inv.get('down_payment_ids', None)
+            for dp in self.pool.get('account.move.line').read(cr, uid, dp_ids, ['down_payment_amount']):
+                lines_amount += dp.get('down_payment_amount', 0.0)
+
+        total_amount = lines_amount + absl.amount
+        if (total + total_amount) < 0:
+            raise osv.except_osv(_('Warning'),
+                                 _('Maximum amount should be: %s. Register' +
+                                   ' line amount is higher than (PO - ' +
+                                   'unexpended DPs - open/paid INV).')
+                                 % (total + lines_amount))
         return True
 
     def button_validate(self, cr, uid, ids, context=None):