Ask payment journal for each currency

issue5888
review26671002

CHANGELOG

@@ -1,3 +1,4 @@
+* Ask payment journal for each currency
 * Decrease amount to pay of invoice
 * Add group Payment Approval
 

__init__.py

@@ -12,7 +12,7 @@ def register():
         Payment,
         MoveLine,
         ProcessPaymentStart,
-        PayLineStart,
+        PayLineAskJournal,
         Configuration,
         Invoice,
         module='account_payment', type_='model')

account.py

@@ -10,12 +10,14 @@ from sql.functions import Abs
 from trytond.pool import Pool, PoolMeta
 from trytond.model import ModelView, fields
 from trytond.pyson import Eval, If, Bool
-from trytond.wizard import Wizard, StateView, StateAction, Button
+from trytond.wizard import (Wizard, StateView, StateAction, StateTransition,
+    Button)
 from trytond.transaction import Transaction
 
 from .payment import KINDS
 
-__all__ = ['MoveLine', 'PayLine', 'PayLineStart', 'Configuration', 'Invoice']
+__all__ = ['MoveLine', 'PayLine', 'PayLineAskJournal', 'Configuration',
+    'Invoice']
 
 
 class MoveLine:
@@ -121,33 +123,80 @@ class MoveLine:
         pass
 
 
-class PayLineStart(ModelView):
+class PayLineAskJournal(ModelView):
     'Pay Line'
-    __name__ = 'account.move.line.pay.start'
+    __name__ = 'account.move.line.pay.ask_journal'
+    company = fields.Many2One('company.company', 'Company', readonly=True)
+    currency = fields.Many2One('currency.currency', 'Currency', readonly=True)
     journal = fields.Many2One('account.payment.journal', 'Journal',
         required=True, domain=[
-            ('company', '=', Eval('context', {}).get('company', -1)),
-            ])
-    date = fields.Date('Date', required=True)
+            ('company', '=', Eval('company', -1)),
+            ('currency', '=', Eval('currency', -1)),
+            ],
+        depends=['company', 'currency'])
 
-    @staticmethod
-    def default_date():
-        pool = Pool()
-        Payment = pool.get('account.payment')
-        return Payment.default_date()
+    journals = fields.One2Many(
+        'account.payment.journal', None, 'Journals', readonly=True)
 
 
 class PayLine(Wizard):
     'Pay Line'
     __name__ = 'account.move.line.pay'
-    start = StateView('account.move.line.pay.start',
-        'account_payment.move_line_pay_start_view_form', [
+    start = StateTransition()
+    ask_journal = StateView('account.move.line.pay.ask_journal',
+        'account_payment.move_line_pay_ask_journal_view_form', [
             Button('Cancel', 'end', 'tryton-cancel'),
-            Button('Pay', 'pay', 'tryton-ok', default=True),
+            Button('Pay', 'start', 'tryton-ok', default=True),
             ])
     pay = StateAction('account_payment.act_payment_form')
 
-    def get_payment(self, line):
+    def _get_journals(self):
+        journals = {}
+        for journal in getattr(self.ask_journal, 'journals', []):
+            journals[self._get_journal_key(journal)] = journal
+        if getattr(self.ask_journal, 'journal', None):
+            journal = self.ask_journal.journal
+            journals[self._get_journal_key(journal)] = journal
+        return journals
+
+    def _get_journal_key(self, record):
+        pool = Pool()
+        Journal = pool.get('account.payment.journal')
+        Line = pool.get('account.move.line')
+        if isinstance(record, Journal):
+            return (record.company, record.currency)
+        elif isinstance(record, Line):
+            company = record.move.company
+            currency = record.second_currency or company.currency
+            return (company, currency)
+
+    def _missing_journal(self):
+        pool = Pool()
+        Line = pool.get('account.move.line')
+
+        lines = Line.browse(Transaction().context['active_ids'])
+        journals = self._get_journals()
+
+        for line in lines:
+            key = self._get_journal_key(line)
+            if key not in journals:
+                return key
+
+    def transition_start(self):
+        if self._missing_journal():
+            return 'ask_journal'
+        else:
+            return 'pay'
+
+    def default_ask_journal(self, fields):
+        values = {}
+        company, currency = self._missing_journal()[:2]
+        values['company'] = company.id
+        values['currency'] = currency.id
+        values['journals'] = [j.id for j in self._get_journals().itervalues()]
+        return values
+
+    def get_payment(self, line, journals):
         pool = Pool()
         Payment = pool.get('account.payment')
 
@@ -155,13 +204,13 @@ class PayLine(Wizard):
             kind = 'receivable'
         else:
             kind = 'payable'
+        journal = journals[self._get_journal_key(line)]
 
         return Payment(
             company=line.move.company,
-            journal=self.start.journal,
+            journal=journal,
             party=line.party,
             kind=kind,
-            date=self.start.date,
             amount=line.payment_amount,
             line=line,
             )
@@ -172,10 +221,11 @@ class PayLine(Wizard):
         Payment = pool.get('account.payment')
 
         lines = Line.browse(Transaction().context['active_ids'])
+        journals = self._get_journals()
 
         payments = []
         for line in lines:
-            payments.append(self.get_payment(line))
+            payments.append(self.get_payment(line, journals))
         Payment.save(payments)
         return action, {
             'res_id': [p.id for p in payments],

account.xml

@@ -56,10 +56,10 @@ this repository contains the full copyright notices and license terms. -->
             <field name="perm_delete" eval="False"/>
         </record>
 
-        <record model="ir.ui.view" id="move_line_pay_start_view_form">
-            <field name="model">account.move.line.pay.start</field>
+        <record model="ir.ui.view" id="move_line_pay_ask_journal_view_form">
+            <field name="model">account.move.line.pay.ask_journal</field>
             <field name="type">form</field>
-            <field name="name">move_line_pay_start_form</field>
+            <field name="name">move_line_pay_ask_journal_form</field>
         </record>
 
         <record model="ir.action.wizard" id="act_pay_line">

tests/scenario_account_payment.rst

@@ -66,7 +66,7 @@ Partially pay line::
     >>> line, = [l for l in move.lines if l.account == payable]
     >>> pay_line = Wizard('account.move.line.pay', [line])
     >>> pay_line.form.journal = payment_journal
-    >>> pay_line.execute('pay')
+    >>> pay_line.execute('start')
     >>> payment, = Payment.find()
     >>> payment.party == supplier
     True
@@ -89,7 +89,7 @@ Partially fail to pay the remaining::
 
     >>> pay_line = Wizard('account.move.line.pay', [line])
     >>> pay_line.form.journal = payment_journal
-    >>> pay_line.execute('pay')
+    >>> pay_line.execute('start')
     >>> payment, = Payment.find([('state', '=', 'draft')])
     >>> payment.amount
     Decimal('30.00')

view/move_line_pay_ask_journal_form.xml

@@ -1,9 +1,10 @@
 <?xml version="1.0"?>
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
-<form>
+<form cursor="journal">
+    <label name="currency"/>
+    <field name="currency"/>
     <label name="journal"/>
     <field name="journal"/>
-    <label name="date"/>
-    <field name="date"/>
+    <field name="journals" colspan="4" invisible="1"/>
 </form>