Some fixes and improvements

__init__.py

@@ -2,10 +2,12 @@
 # copyright notices and license terms.
 from trytond.pool import Pool
 from .payment import *
+from .statement import *
 
 
 def register():
     Pool.register(
         Journal,
         Payment,
+        StatementMoveLine,
         module='account_payment_processing', type_='model')

payment.py

@@ -1,8 +1,12 @@
 # The COPYRIGHT file at the top level of this repository contains the full
 # copyright notices and license terms.
-from trytond.model import Workflow, fields
+from collections import defaultdict
+from decimal import Decimal
+
+from trytond.model import ModelView, Workflow, fields
 from trytond.pool import Pool, PoolMeta
 from trytond.pyson import Bool, Eval
+from trytond.transaction import Transaction
 
 __all__ = ['Journal', 'Payment']
 
@@ -33,6 +37,7 @@ class Payment:
     def process(cls, payments, group):
         pool = Pool()
         Move = pool.get('account.move')
+        Line = pool.get('account.move.line')
 
         group = super(Payment, cls).process(payments, group)
 
@@ -46,10 +51,24 @@ class Payment:
             cls.write(*sum((([m.origin], {'processing_move': m.id})
                         for m in moves), ()))
             Move.post(moves)
+
+        to_reconcile = defaultdict(list)
+        for payment in payments:
+            if (payment.line
+                    and not payment.line.reconciliation
+                    and payment.processing_move):
+                lines = [l for l in payment.processing_move.lines
+                    if l.account == payment.line.account] + [payment.line]
+                if not sum(l.debit - l.credit for l in lines):
+                    to_reconcile[payment.party].extend(lines)
+        for lines in to_reconcile.itervalues():
+            Line.reconcile(lines)
+
         return group
 
     def create_processing_move(self):
         pool = Pool()
+        Currency = pool.get('currency.currency')
         Move = pool.get('account.move')
         Line = pool.get('account.move.line')
         Period = pool.get('account.period')
@@ -66,6 +85,20 @@ class Payment:
         date = Date.today()
         period = Period.find(self.company.id, date=date)
 
+        # compatibility with account_bank_statement_payment
+        clearing_percent = getattr(
+            self.journal, 'clearing_percent', Decimal(1)) or Decimal(1)
+        processing_amount = self.amount * clearing_percent
+
+        local_currency = self.journal.currency == self.company.currency
+        if not local_currency:
+            with Transaction().set_context(date=self.date):
+                local_amount = Currency.compute(
+                    self.journal.currency, processing_amount,
+                    self.company.currency)
+        else:
+            local_amount = processing_amount
+
         move = Move(
             journal=self.journal.processing_journal,
             origin=self,
@@ -74,35 +107,113 @@ class Payment:
 
         line = Line()
         if self.kind == 'payable':
-            line.debit, line.credit = self.amount, 0
+            line.debit, line.credit = local_amount, 0
         else:
-            line.debit, line.credit = 0, self.amount
+            line.debit, line.credit = 0, local_amount
         line.account = self.line.account
-        line.amount_second_currency = (-self.line.amount_second_currency
-            if self.line.amount_second_currency else None)
-        line.second_currency = self.line.second_currency
+        if not local_currency:
+            line.amount_second_currency = processing_amount
+            line.second_currency = self.journal.currency
         line.party = (self.line.party
             if self.line.account.party_required else None)
 
         counterpart = Line()
         if self.kind == 'payable':
-            counterpart.debit, counterpart.credit = 0, self.amount
+            counterpart.debit, counterpart.credit = 0, local_amount
         else:
-            counterpart.debit, counterpart.credit = self.amount, 0
+            counterpart.debit, counterpart.credit = local_amount, 0
         counterpart.account = self.journal.processing_account
+        if not local_currency:
+            counterpart.amount_second_currency = -processing_amount
+            counterpart.second_currency = self.journal.currency
         counterpart.party = (self.line.party
             if self.journal.processing_account.party_required else None)
-        counterpart.amount_second_currency = self.line.amount_second_currency
-        counterpart.second_currency = self.line.second_currency
+
         move.lines = (line, counterpart)
         return move
 
+    @classmethod
+    @ModelView.button
+    @Workflow.transition('succeeded')
+    def succeed(cls, payments):
+        pool = Pool()
+        Line = pool.get('account.move.line')
+
+        super(Payment, cls).succeed(payments)
+
+        for payment in payments:
+            if (payment.journal.processing_account
+                    and payment.journal.processing_account.reconcile
+                    and payment.processing_move
+                    and payment.journal.clearing_account
+                    and payment.journal.clearing_account.reconcile
+                    and payment.clearing_move):
+                to_reconcile = defaultdict(list)
+                lines = (payment.processing_move.lines
+                    + payment.clearing_move.lines)
+                for line in lines:
+                    if line.account.reconcile and not line.reconciliation:
+                        key = (
+                            line.account.id,
+                            line.party.id if line.party else None)
+                        to_reconcile[key].append(line)
+                for lines in to_reconcile.itervalues():
+                    if not sum((l.debit - l.credit) for l in lines):
+                        Line.reconcile(lines)
+
     def create_clearing_move(self, date=None):
         move = super(Payment, self).create_clearing_move(date=date)
         if move and self.processing_move:
             for line in move.lines:
-                if line.account == self.journal.clearing_account:
+                if line.account == self.line.account:
                     line.account = self.journal.processing_account
                     line.party = (self.line.party
                         if line.account.party_required else None)
         return move
+
+    @classmethod
+    @ModelView.button
+    @Workflow.transition('failed')
+    def fail(cls, payments):
+        pool = Pool()
+        Move = pool.get('account.move')
+        Line = pool.get('account.move.line')
+        Reconciliation = pool.get('account.move.reconciliation')
+
+        super(Payment, cls).fail(payments)
+
+        to_delete = []
+        to_reconcile = defaultdict(lambda: defaultdict(list))
+        to_unreconcile = []
+        to_post = []
+        for payment in payments:
+            if payment.processing_move:
+                if (payment.processing_move.state == 'posted'
+                        and payment.processing_move.journal.update_posted):
+                    Move.draft([payment.processing_move])
+                if payment.processing_move.state == 'draft':
+                    to_delete.append(payment.processing_move)
+                    for line in payment.processing_move.lines:
+                        if line.reconciliation:
+                            to_unreconcile.append(line.reconciliation)
+                else:
+                    cancel_move = payment.processing_move.cancel()
+                    to_post.append(cancel_move)
+                    for line in (payment.processing_move.lines
+                            + cancel_move.lines):
+                        if line.reconciliation:
+                            to_unreconcile.append(line.reconciliation)
+                        if line.account.reconcile:
+                            to_reconcile[payment.party][line.account].append(
+                                line)
+        if to_unreconcile:
+            Reconciliation.delete(to_unreconcile)
+        if to_delete:
+            Move.delete(to_delete)
+        if to_post:
+            Move.post(to_post)
+        for party in to_reconcile:
+            for lines in to_reconcile[party].itervalues():
+                Line.reconcile(lines)
+
+        cls.write(payments, {'processing_move': None})

statement.py

@@ -0,0 +1,70 @@
+# The COPYRIGHT file at the top level of this repository contains the full
+# copyright notices and license terms.
+from collections import defaultdict
+from decimal import Decimal
+
+from trytond.model import fields
+from trytond.pool import Pool, PoolMeta
+
+__all__ = ['StatementMoveLine']
+
+
+class StatementMoveLine:
+    __name__ = 'account.bank.statement.move.line'
+    __metaclass__ = PoolMeta
+
+    @fields.depends('invoice', 'payment')
+    def on_change_invoice(self):
+        changes = super(StatementMoveLine, self).on_change_invoice()
+        if self.invoice and self.payment and self.payment.processing_move:
+            # compatibility with account_bank_statement_payment
+            clearing_perncent = (
+                getattr(self.payment.journal, 'clearing_percent', Decimal(1))
+                or Decimal(1))
+            if clearing_perncent == Decimal(1):
+                for line in self.payment.processing_move.lines:
+                    if line.account != self.payment.line.account:
+                        changes['account'] = line.account.id
+                        changes['account.rec_name'] = line.account.rec_name
+                        self.account = line.account
+                        break
+        return changes
+
+    @fields.depends('payment', 'party', 'account', 'amount',
+        '_parent_line._parent_statement.journal',
+        methods=['invoice'])
+    def on_change_payment(self):
+        changes = super(StatementMoveLine, self).on_change_payment()
+        if self.payment and not self.invoice and self.payment.processing_move:
+            for line in self.payment.processing_move.lines:
+                if line.account != self.payment.line.account:
+                    changes['account'] = line.account.id
+                    changes['account.rec_name'] = line.account.rec_name
+                    self.account = line.account
+                    break
+        return changes
+
+    def create_move(self):
+        pool = Pool()
+        MoveLine = pool.get('account.move.line')
+
+        move = super(StatementMoveLine, self).create_move()
+
+        if (self.payment and self.payment.state == 'succeeded'
+                and self.payment.processing_move):
+            to_reconcile = defaultdict(list)
+            lines = (move.lines + self.payment.processing_move.lines
+                + (self.payment.line,))
+
+            if self.payment.clearing_move:
+                lines += self.payment.clearing_move.lines
+
+            for line in lines:
+                if line.account.reconcile and not line.reconciliation:
+                    key = (
+                        line.account.id,
+                        line.party.id if line.party else None)
+                    to_reconcile[key].append(line)
+            for lines in to_reconcile.itervalues():
+                if not sum((l.debit - l.credit) for l in lines):
+                    MoveLine.reconcile(lines)

tryton.cfg

@@ -3,5 +3,7 @@ version=3.4.0
 depends:
     account_payment
     account_payment_clearing
+extras_depend:
+    account_bank_statement_payment
 xml:
     payment.xml