[tryton-debian-vcs] tryton-modules-account-payment branch debian updated. debian/4.0.1-1-3-g2bb2d01
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Dec 6 15:18:41 UTC 2016
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account-payment.git;a=commitdiff;h=debian/4.0.1-1-3-g2bb2d01
commit 2bb2d01c23fe724d5153c311f31956d2802f2e47
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Dec 6 10:58:06 2016 +0100
Releasing debian version 4.2.0-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 474a637..5e8c81b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-account-payment (4.2.0-1) unstable; urgency=medium
+
+ * Updating to Standards-Version: 3.9.8, no changes needed.
+ * Merging upstream version 4.2.0.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 05 Dec 2016 15:31:07 +0100
+
tryton-modules-account-payment (4.0.1-1) unstable; urgency=medium
* Updating signing-key.asc with the actual upstream maintainer keys.
commit ff6cae15dd1c2a3290030fcf4b873e2280c8a1e6
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Dec 5 09:34:13 2016 +0100
Merging upstream version 4.2.0.
diff --git a/CHANGELOG b/CHANGELOG
index 6b8500c..fecb59c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,9 @@
-Version 4.0.1 - 2016-05-11
+Version 4.2.0 - 2016-11-28
* Bug fixes (see mercurial logs for details)
+* Allow to block payment of line
+* Ask payment journal for each currency
+* Decrease amount to pay of invoice
+* Add group Payment Approval
Version 4.0.0 - 2016-05-02
* Bug fixes (see mercurial logs for details)
diff --git a/INSTALL b/INSTALL
index 1405079..7589230 100644
--- a/INSTALL
+++ b/INSTALL
@@ -26,7 +26,7 @@ site-packages directory on your system.
For advanced options, please refer to the easy_install and/or the distutils
documentation:
- http://peak.telecommunity.com/DevCenter/EasyInstall
+ http://setuptools.readthedocs.io/en/latest/easy_install.html
http://docs.python.org/inst/inst.html
To use without installation, extract the archive into ``trytond/modules`` with
diff --git a/PKG-INFO b/PKG-INFO
index 3b39f9e..0060e83 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_account_payment
-Version: 4.0.1
+Version: 4.2.0
Summary: Tryton module for payment
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/4.0/
+Download-URL: http://downloads.tryton.org/4.2/
Description: trytond_account_payment
=======================
@@ -62,6 +62,7 @@ Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Hungarian
Classifier: Natural Language :: Italian
+Classifier: Natural Language :: Polish
Classifier: Natural Language :: Portuguese (Brazilian)
Classifier: Natural Language :: Russian
Classifier: Natural Language :: Slovenian
diff --git a/__init__.py b/__init__.py
index d7fb65f..a775f17 100644
--- a/__init__.py
+++ b/__init__.py
@@ -3,6 +3,7 @@
from trytond.pool import Pool
from .payment import *
from .account import *
+from .party import PartyReplace
def register():
@@ -12,10 +13,12 @@ def register():
Payment,
MoveLine,
ProcessPaymentStart,
- PayLineStart,
+ PayLineAskJournal,
Configuration,
+ Invoice,
module='account_payment', type_='model')
Pool.register(
ProcessPayment,
PayLine,
+ PartyReplace,
module='account_payment', type_='wizard')
diff --git a/account.py b/account.py
index d30c445..0ec9557 100644
--- a/account.py
+++ b/account.py
@@ -1,5 +1,7 @@
# This file is part of Tryton. The COPYRIGHT file at the top level of
# this repository contains the full copyright notices and license terms.
+from decimal import Decimal
+
from sql import Null
from sql.aggregate import Sum
from sql.conditionals import Case, Coalesce
@@ -8,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']
+__all__ = ['MoveLine', 'PayLine', 'PayLineAskJournal', 'Configuration',
+ 'Invoice']
class MoveLine:
@@ -40,6 +44,7 @@ class MoveLine:
(None, ''),
] + KINDS, 'Payment Kind'), 'get_payment_kind',
searcher='search_payment_kind')
+ payment_blocked = fields.Boolean('Blocked', readonly=True)
@classmethod
def __setup__(cls):
@@ -48,7 +53,14 @@ class MoveLine:
'pay': {
'invisible': ~Eval('payment_kind').in_(dict(KINDS).keys()),
},
+ 'payment_block': {
+ 'invisible': Eval('payment_blocked', False),
+ },
+ 'payment_unblock': {
+ 'invisible': ~Eval('payment_blocked', False),
+ },
})
+ cls._check_modify_exclude.add('payment_blocked')
@classmethod
def get_payment_amount(cls, lines, name):
@@ -105,6 +117,10 @@ class MoveLine:
return [('account.kind',) + tuple(clause[1:])]
@classmethod
+ def default_payment_blocked(cls):
+ return False
+
+ @classmethod
def copy(cls, lines, default=None):
if default is None:
default = {}
@@ -118,34 +134,109 @@ class MoveLine:
def pay(cls, lines):
pass
+ @classmethod
+ @ModelView.button
+ def payment_block(cls, lines):
+ pool = Pool()
+ Payment = pool.get('account.payment')
+
+ cls.write(lines, {
+ 'payment_blocked': True,
+ })
+ draft_payments = [p for l in lines for p in l.payments
+ if p.state == 'draft']
+ if draft_payments:
+ Payment.delete(draft_payments)
-class PayLineStart(ModelView):
+ @classmethod
+ @ModelView.button
+ def payment_unblock(cls, lines):
+ cls.write(lines, {
+ 'payment_blocked': False,
+ })
+
+
+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):
+ @classmethod
+ def __setup__(cls):
+ super(PayLine, cls).__setup__()
+ cls._error_messages.update({
+ 'blocked': 'The Line "%(line)s" is blocked.',
+ })
+
+ 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')
@@ -153,13 +244,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,
)
@@ -170,10 +261,16 @@ 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))
+ if line.payment_blocked:
+ self.raise_user_warning('blocked:%s' % line,
+ 'blocked', {
+ 'line': line.rec_name,
+ })
+ payments.append(self.get_payment(line, journals))
Payment.save(payments)
return action, {
'res_id': [p.id for p in payments],
@@ -189,3 +286,35 @@ class Configuration:
[Eval('context', {}).get('company', -1), None]),
('code', '=', 'account.payment.group'),
], required=True))
+
+
+class Invoice:
+ __metaclass__ = PoolMeta
+ __name__ = 'account.invoice'
+
+ @classmethod
+ def get_amount_to_pay(cls, invoices, name):
+ pool = Pool()
+ Currency = pool.get('currency.currency')
+ Date = pool.get('ir.date')
+
+ today = Date.today()
+
+ amounts = super(Invoice, cls).get_amount_to_pay(invoices, name)
+
+ for invoice in invoices:
+ for line in invoice.lines_to_pay:
+ if line.reconciliation:
+ continue
+ if (name == 'amount_to_pay_today'
+ and line.maturity_date > today):
+ continue
+ payment_amount = Decimal(0)
+ for payment in line.payments:
+ if payment.state != 'failed':
+ with Transaction().set_context(date=payment.date):
+ payment_amount = Currency.compute(
+ payment.currency, payment.amount,
+ invoice.currency)
+ amounts[invoice.id] -= payment_amount
+ return amounts
diff --git a/account.xml b/account.xml
index a1e6809..25434d0 100644
--- a/account.xml
+++ b/account.xml
@@ -17,6 +17,8 @@ this repository contains the full copyright notices and license terms. -->
<field name="domain"
eval="[('account.kind', 'in', ['receivable', 'payable']), ('party', '!=', None), ('reconciliation', '=', None), ('payment_amount', '!=', 0), ('move_state', '=', 'posted')]"
pyson="1"/>
+ <field name="search_value"
+ eval="[('payment_blocked', '=', False)]" pyson="1"/>
</record>
<record model="ir.action.act_window.view" id="act_move_line_form_view1">
<field name="sequence" eval="10"/>
@@ -28,8 +30,9 @@ this repository contains the full copyright notices and license terms. -->
<field name="name">Payable</field>
<field name="sequence" eval="10"/>
<field name="domain"
- eval="[('account.kind', '=', 'payable'), ['OR', ('credit', '>', 0), ('debit', '<', 0)]]"
+ eval="['OR', ('credit', '>', 0), ('debit', '<', 0)]"
pyson="1"/>
+ <field name="count" eval="True"/>
<field name="act_window" ref="act_move_line_form"/>
</record>
<record model="ir.action.act_window.domain"
@@ -37,8 +40,9 @@ this repository contains the full copyright notices and license terms. -->
<field name="name">Receivable</field>
<field name="sequence" eval="20"/>
<field name="domain"
- eval="[('account.kind', '=', 'receivable'), ['OR', ('debit', '>', 0), ('credit', '<', 0)]]"
+ eval="['OR', ('debit', '>', 0), ('credit', '<', 0)]"
pyson="1"/>
+ <field name="count" eval="True"/>
<field name="act_window" ref="act_move_line_form"/>
</record>
@@ -54,10 +58,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">
@@ -65,6 +69,11 @@ this repository contains the full copyright notices and license terms. -->
<field name="wiz_name">account.move.line.pay</field>
<field name="model">account.move.line</field>
</record>
+ <record model="ir.action-res.group"
+ id="act_pay_line-group_payment">
+ <field name="action" ref="act_pay_line"/>
+ <field name="group" ref="group_payment"/>
+ </record>
<record model="ir.model.button" id="move_line_pay_button">
<field name="name">pay</field>
@@ -75,10 +84,24 @@ this repository contains the full copyright notices and license terms. -->
<field name="group" ref="group_payment"/>
</record>
- <record model="ir.property" id="property_payment_group_sequence">
- <field name="field"
- search="[('model.model', '=', 'account.configuration'), ('name', '=', 'payment_group_sequence')]"/>
- <field name="value" eval="'ir.sequence,' + str(ref('sequence_account_payment_group'))"/>
+ <record model="ir.model.button" id="move_line_payment_block_button">
+ <field name="name">payment_block</field>
+ <field name="model" search="[('model', '=', 'account.move.line')]"/>
+ </record>
+ <record model="ir.model.button-res.group"
+ id="move_line_payment_block_button_group_payment">
+ <field name="button" ref="move_line_payment_block_button"/>
+ <field name="group" ref="group_payment"/>
+ </record>
+
+ <record model="ir.model.button" id="move_line_payment_unblock_button">
+ <field name="name">payment_unblock</field>
+ <field name="model" search="[('model', '=', 'account.move.line')]"/>
+ </record>
+ <record model="ir.model.button-res.group"
+ id="move_line_payment_unblock_button_group_payment">
+ <field name="button" ref="move_line_payment_unblock_button"/>
+ <field name="group" ref="group_payment"/>
</record>
<record model="ir.ui.view" id="configuration_view_form">
@@ -87,4 +110,11 @@ this repository contains the full copyright notices and license terms. -->
<field name="name">configuration_form</field>
</record>
</data>
+ <data noupdate="1">
+ <record model="ir.property" id="property_payment_group_sequence">
+ <field name="field"
+ search="[('model.model', '=', 'account.configuration'), ('name', '=', 'payment_group_sequence')]"/>
+ <field name="value" eval="'ir.sequence,' + str(ref('sequence_account_payment_group'))"/>
+ </record>
+ </data>
</tryton>
diff --git a/locale/bg_BG.po b/locale/bg.po
similarity index 91%
rename from locale/bg_BG.po
rename to locale/bg.po
index d66ab1a..b63618a 100644
--- a/locale/bg_BG.po
+++ b/locale/bg.po
@@ -2,6 +2,10 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+msgctxt "error:account.move.line.pay:"
+msgid "The Line \"%(line)s\" is blocked."
+msgstr ""
+
msgctxt "error:account.payment.process:"
msgid "The Payment \"%(payment)s\" overpays the Line \"%(line)s\"."
msgstr ""
@@ -19,6 +23,10 @@ msgctxt "field:account.move.line,payment_amount:"
msgid "Payment Amount"
msgstr "Платена сума"
+msgctxt "field:account.move.line,payment_blocked:"
+msgid "Blocked"
+msgstr ""
+
msgctxt "field:account.move.line,payment_kind:"
msgid "Payment Kind"
msgstr ""
@@ -29,21 +37,31 @@ msgid "Payments"
msgstr "Плащане"
#, fuzzy
-msgctxt "field:account.move.line.pay.start,date:"
-msgid "Date"
-msgstr "Дата"
+msgctxt "field:account.move.line.pay.ask_journal,company:"
+msgid "Company"
+msgstr "Фирма"
+
+#, fuzzy
+msgctxt "field:account.move.line.pay.ask_journal,currency:"
+msgid "Currency"
+msgstr "Управление на валути"
#, fuzzy
-msgctxt "field:account.move.line.pay.start,id:"
+msgctxt "field:account.move.line.pay.ask_journal,id:"
msgid "ID"
msgstr "ID"
#, fuzzy
-msgctxt "field:account.move.line.pay.start,journal:"
+msgctxt "field:account.move.line.pay.ask_journal,journal:"
msgid "Journal"
msgstr "Дневник"
#, fuzzy
+msgctxt "field:account.move.line.pay.ask_journal,journals:"
+msgid "Journals"
+msgstr "Дневник"
+
+#, fuzzy
msgctxt "field:account.payment,amount:"
msgid "Amount"
msgstr "Сума"
@@ -163,9 +181,10 @@ msgctxt "field:account.payment.group,kind:"
msgid "Kind"
msgstr "Вид"
+#, fuzzy
msgctxt "field:account.payment.group,number:"
msgid "Number"
-msgstr ""
+msgstr "Номер"
#, fuzzy
msgctxt "field:account.payment.group,payments:"
@@ -241,7 +260,7 @@ msgctxt "field:account.payment.process.start,id:"
msgid "ID"
msgstr "ID"
-msgctxt "model:account.move.line.pay.start,name:"
+msgctxt "model:account.move.line.pay.ask_journal,name:"
msgid "Pay Line"
msgstr ""
@@ -381,6 +400,10 @@ msgctxt "model:res.group,name:group_payment"
msgid "Payment"
msgstr "Плащане"
+msgctxt "model:res.group,name:group_payment_approval"
+msgid "Payment Approval"
+msgstr ""
+
msgctxt "selection:account.move.line,payment_kind:"
msgid ""
msgstr ""
@@ -451,36 +474,16 @@ msgctxt "view:account.configuration:"
msgid "Payment"
msgstr "Плащане"
-msgctxt "view:account.move.line.pay.start:"
-msgid "Pay Line"
-msgstr ""
-
msgctxt "view:account.move.line:"
-msgid "Account Move Lines"
+msgid "Block"
msgstr ""
msgctxt "view:account.move.line:"
msgid "Pay Lines"
msgstr ""
-msgctxt "view:account.payment.group:"
-msgid "Payment Group"
-msgstr ""
-
-msgctxt "view:account.payment.group:"
-msgid "Payment Groups"
-msgstr ""
-
-msgctxt "view:account.payment.journal:"
-msgid "Payment Journal"
-msgstr ""
-
-msgctxt "view:account.payment.journal:"
-msgid "Payment Journals"
-msgstr ""
-
-msgctxt "view:account.payment.process.start:"
-msgid "Process Payments"
+msgctxt "view:account.move.line:"
+msgid "Unblock"
msgstr ""
msgctxt "view:account.payment.process.start:"
@@ -505,32 +508,24 @@ msgctxt "view:account.payment:"
msgid "Fail"
msgstr ""
-msgctxt "view:account.payment:"
-msgid "Other Info"
-msgstr ""
-
-#, fuzzy
-msgctxt "view:account.payment:"
-msgid "Payment"
-msgstr "Плащане"
-
#, fuzzy
msgctxt "view:account.payment:"
-msgid "Payments"
-msgstr "Плащане"
+msgid "Other Info"
+msgstr "Друга информация"
msgctxt "view:account.payment:"
msgid "Succeed"
msgstr ""
#, fuzzy
-msgctxt "wizard_button:account.move.line.pay,start,end:"
+msgctxt "wizard_button:account.move.line.pay,ask_journal,end:"
msgid "Cancel"
msgstr "Отказване"
-msgctxt "wizard_button:account.move.line.pay,start,pay:"
+#, fuzzy
+msgctxt "wizard_button:account.move.line.pay,ask_journal,start:"
msgid "Pay"
-msgstr ""
+msgstr "Плащане"
#, fuzzy
msgctxt "wizard_button:account.payment.process,start,end:"
diff --git a/locale/ca_ES.po b/locale/ca.po
similarity index 86%
rename from locale/ca_ES.po
rename to locale/ca.po
index 62689de..5de899b 100644
--- a/locale/ca_ES.po
+++ b/locale/ca.po
@@ -2,6 +2,10 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+msgctxt "error:account.move.line.pay:"
+msgid "The Line \"%(line)s\" is blocked."
+msgstr "L'apunt \"%(line)s\" està bloquejat."
+
msgctxt "error:account.payment.process:"
msgid "The Payment \"%(payment)s\" overpays the Line \"%(line)s\"."
msgstr "El pagament \"%(payment)s\" paga amb excés l'apunt \"%(line)s\"."
@@ -18,6 +22,10 @@ msgctxt "field:account.move.line,payment_amount:"
msgid "Payment Amount"
msgstr "Import del pagament"
+msgctxt "field:account.move.line,payment_blocked:"
+msgid "Blocked"
+msgstr "Bloquejat"
+
msgctxt "field:account.move.line,payment_kind:"
msgid "Payment Kind"
msgstr "Classe de pagament"
@@ -26,18 +34,26 @@ msgctxt "field:account.move.line,payments:"
msgid "Payments"
msgstr "Pagaments"
-msgctxt "field:account.move.line.pay.start,date:"
-msgid "Date"
-msgstr "Data"
+msgctxt "field:account.move.line.pay.ask_journal,company:"
+msgid "Company"
+msgstr "Empresa"
-msgctxt "field:account.move.line.pay.start,id:"
+msgctxt "field:account.move.line.pay.ask_journal,currency:"
+msgid "Currency"
+msgstr "Moneda"
+
+msgctxt "field:account.move.line.pay.ask_journal,id:"
msgid "ID"
msgstr "ID"
-msgctxt "field:account.move.line.pay.start,journal:"
+msgctxt "field:account.move.line.pay.ask_journal,journal:"
msgid "Journal"
msgstr "Diari"
+msgctxt "field:account.move.line.pay.ask_journal,journals:"
+msgid "Journals"
+msgstr "Diaris"
+
msgctxt "field:account.payment,amount:"
msgid "Amount"
msgstr "Import"
@@ -48,11 +64,11 @@ msgstr "Empresa"
msgctxt "field:account.payment,create_date:"
msgid "Create Date"
-msgstr "Data creació"
+msgstr "Data de creació"
msgctxt "field:account.payment,create_uid:"
msgid "Create User"
-msgstr "Usuari creació"
+msgstr "Usuari de creació"
msgctxt "field:account.payment,currency:"
msgid "Currency"
@@ -104,11 +120,11 @@ msgstr "Estat"
msgctxt "field:account.payment,write_date:"
msgid "Write Date"
-msgstr "Data modificació"
+msgstr "Data de modificació"
msgctxt "field:account.payment,write_uid:"
msgid "Write User"
-msgstr "Usuari modificació"
+msgstr "Usuari de modificació"
msgctxt "field:account.payment.group,company:"
msgid "Company"
@@ -116,11 +132,11 @@ msgstr "Empresa"
msgctxt "field:account.payment.group,create_date:"
msgid "Create Date"
-msgstr "Data creació"
+msgstr "Data de creació"
msgctxt "field:account.payment.group,create_uid:"
msgid "Create User"
-msgstr "Usuari creació"
+msgstr "Usuari de creació"
msgctxt "field:account.payment.group,id:"
msgid "ID"
@@ -148,11 +164,11 @@ msgstr "Nom"
msgctxt "field:account.payment.group,write_date:"
msgid "Write Date"
-msgstr "Data modificació"
+msgstr "Data de modificació"
msgctxt "field:account.payment.group,write_uid:"
msgid "Write User"
-msgstr "Usuari modificació"
+msgstr "Usuari de modificació"
msgctxt "field:account.payment.journal,company:"
msgid "Company"
@@ -160,11 +176,11 @@ msgstr "Empresa"
msgctxt "field:account.payment.journal,create_date:"
msgid "Create Date"
-msgstr "Data creació"
+msgstr "Data de creació"
msgctxt "field:account.payment.journal,create_uid:"
msgid "Create User"
-msgstr "Usuari creació"
+msgstr "Usuari de creació"
msgctxt "field:account.payment.journal,currency:"
msgid "Currency"
@@ -188,17 +204,17 @@ msgstr "Nom"
msgctxt "field:account.payment.journal,write_date:"
msgid "Write Date"
-msgstr "Data modificació"
+msgstr "Data de modificació"
msgctxt "field:account.payment.journal,write_uid:"
msgid "Write User"
-msgstr "Usuari modificació"
+msgstr "Usuari de modificació"
msgctxt "field:account.payment.process.start,id:"
msgid "ID"
msgstr "ID"
-msgctxt "model:account.move.line.pay.start,name:"
+msgctxt "model:account.move.line.pay.ask_journal,name:"
msgid "Pay Line"
msgstr "Paga efecte"
@@ -324,6 +340,10 @@ msgctxt "model:res.group,name:group_payment"
msgid "Payment"
msgstr "Pagament"
+msgctxt "model:res.group,name:group_payment_approval"
+msgid "Payment Approval"
+msgstr "Aprovació pagament"
+
msgctxt "selection:account.move.line,payment_kind:"
msgid ""
msgstr ""
@@ -384,37 +404,17 @@ msgctxt "view:account.configuration:"
msgid "Payment"
msgstr "Pagament"
-msgctxt "view:account.move.line.pay.start:"
-msgid "Pay Line"
-msgstr "Paga efecte"
-
msgctxt "view:account.move.line:"
-msgid "Account Move Lines"
-msgstr "Apunts comptables"
+msgid "Block"
+msgstr "Bloqueja"
msgctxt "view:account.move.line:"
msgid "Pay Lines"
msgstr "Paga efectes"
-msgctxt "view:account.payment.group:"
-msgid "Payment Group"
-msgstr "Grup de pagaments"
-
-msgctxt "view:account.payment.group:"
-msgid "Payment Groups"
-msgstr "Grups de pagaments"
-
-msgctxt "view:account.payment.journal:"
-msgid "Payment Journal"
-msgstr "Diari de pagament"
-
-msgctxt "view:account.payment.journal:"
-msgid "Payment Journals"
-msgstr "Diaris de pagament"
-
-msgctxt "view:account.payment.process.start:"
-msgid "Process Payments"
-msgstr "Processa pagaments"
+msgctxt "view:account.move.line:"
+msgid "Unblock"
+msgstr "Desbloqueja"
msgctxt "view:account.payment.process.start:"
msgid "Process Payments?"
@@ -441,22 +441,14 @@ msgid "Other Info"
msgstr "Informació addicional"
msgctxt "view:account.payment:"
-msgid "Payment"
-msgstr "Pagament"
-
-msgctxt "view:account.payment:"
-msgid "Payments"
-msgstr "Pagaments"
-
-msgctxt "view:account.payment:"
msgid "Succeed"
msgstr "Amb èxit"
-msgctxt "wizard_button:account.move.line.pay,start,end:"
+msgctxt "wizard_button:account.move.line.pay,ask_journal,end:"
msgid "Cancel"
msgstr "Cancel·la"
-msgctxt "wizard_button:account.move.line.pay,start,pay:"
+msgctxt "wizard_button:account.move.line.pay,ask_journal,start:"
msgid "Pay"
msgstr "Paga"
diff --git a/locale/lt_LT.po b/locale/cs.po
similarity index 90%
rename from locale/lt_LT.po
rename to locale/cs.po
index 3004c9d..7db3762 100644
--- a/locale/lt_LT.po
+++ b/locale/cs.po
@@ -2,6 +2,10 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+msgctxt "error:account.move.line.pay:"
+msgid "The Line \"%(line)s\" is blocked."
+msgstr ""
+
msgctxt "error:account.payment.process:"
msgid "The Payment \"%(payment)s\" overpays the Line \"%(line)s\"."
msgstr ""
@@ -18,6 +22,10 @@ msgctxt "field:account.move.line,payment_amount:"
msgid "Payment Amount"
msgstr ""
+msgctxt "field:account.move.line,payment_blocked:"
+msgid "Blocked"
+msgstr ""
+
msgctxt "field:account.move.line,payment_kind:"
msgid "Payment Kind"
msgstr ""
@@ -26,18 +34,26 @@ msgctxt "field:account.move.line,payments:"
msgid "Payments"
msgstr ""
-msgctxt "field:account.move.line.pay.start,date:"
-msgid "Date"
+msgctxt "field:account.move.line.pay.ask_journal,company:"
+msgid "Company"
msgstr ""
-msgctxt "field:account.move.line.pay.start,id:"
+msgctxt "field:account.move.line.pay.ask_journal,currency:"
+msgid "Currency"
+msgstr ""
+
+msgctxt "field:account.move.line.pay.ask_journal,id:"
msgid "ID"
msgstr ""
-msgctxt "field:account.move.line.pay.start,journal:"
+msgctxt "field:account.move.line.pay.ask_journal,journal:"
msgid "Journal"
msgstr ""
+msgctxt "field:account.move.line.pay.ask_journal,journals:"
+msgid "Journals"
+msgstr ""
+
msgctxt "field:account.payment,amount:"
msgid "Amount"
msgstr ""
@@ -94,9 +110,10 @@ msgctxt "field:account.payment,party:"
msgid "Party"
msgstr ""
+#, fuzzy
msgctxt "field:account.payment,rec_name:"
msgid "Name"
-msgstr ""
+msgstr "Namu"
msgctxt "field:account.payment,state:"
msgid "State"
@@ -142,9 +159,10 @@ msgctxt "field:account.payment.group,payments:"
msgid "Payments"
msgstr ""
+#, fuzzy
msgctxt "field:account.payment.group,rec_name:"
msgid "Name"
-msgstr ""
+msgstr "Namu"
msgctxt "field:account.payment.group,write_date:"
msgid "Write Date"
@@ -174,17 +192,19 @@ msgctxt "field:account.payment.journal,id:"
msgid "ID"
msgstr ""
+#, fuzzy
msgctxt "field:account.payment.journal,name:"
msgid "Name"
-msgstr ""
+msgstr "Namu"
msgctxt "field:account.payment.journal,process_method:"
msgid "Process Method"
msgstr ""
+#, fuzzy
msgctxt "field:account.payment.journal,rec_name:"
msgid "Name"
-msgstr ""
+msgstr "Namu"
msgctxt "field:account.payment.journal,write_date:"
msgid "Write Date"
@@ -198,7 +218,7 @@ msgctxt "field:account.payment.process.start,id:"
msgid "ID"
msgstr ""
-msgctxt "model:account.move.line.pay.start,name:"
+msgctxt "model:account.move.line.pay.ask_journal,name:"
msgid "Pay Line"
msgstr ""
@@ -324,6 +344,10 @@ msgctxt "model:res.group,name:group_payment"
msgid "Payment"
msgstr ""
+msgctxt "model:res.group,name:group_payment_approval"
+msgid "Payment Approval"
+msgstr ""
+
msgctxt "selection:account.move.line,payment_kind:"
msgid ""
msgstr ""
@@ -384,36 +408,16 @@ msgctxt "view:account.configuration:"
msgid "Payment"
msgstr ""
-msgctxt "view:account.move.line.pay.start:"
-msgid "Pay Line"
-msgstr ""
-
msgctxt "view:account.move.line:"
-msgid "Account Move Lines"
+msgid "Block"
msgstr ""
msgctxt "view:account.move.line:"
msgid "Pay Lines"
msgstr ""
-msgctxt "view:account.payment.group:"
-msgid "Payment Group"
-msgstr ""
-
-msgctxt "view:account.payment.group:"
-msgid "Payment Groups"
-msgstr ""
-
-msgctxt "view:account.payment.journal:"
-msgid "Payment Journal"
-msgstr ""
-
-msgctxt "view:account.payment.journal:"
-msgid "Payment Journals"
-msgstr ""
-
-msgctxt "view:account.payment.process.start:"
-msgid "Process Payments"
+msgctxt "view:account.move.line:"
+msgid "Unblock"
msgstr ""
msgctxt "view:account.payment.process.start:"
@@ -441,22 +445,14 @@ msgid "Other Info"
msgstr ""
msgctxt "view:account.payment:"
-msgid "Payment"
-msgstr ""
-
-msgctxt "view:account.payment:"
-msgid "Payments"
-msgstr ""
-
-msgctxt "view:account.payment:"
msgid "Succeed"
msgstr ""
-msgctxt "wizard_button:account.move.line.pay,start,end:"
+msgctxt "wizard_button:account.move.line.pay,ask_journal,end:"
msgid "Cancel"
msgstr ""
-msgctxt "wizard_button:account.move.line.pay,start,pay:"
+msgctxt "wizard_button:account.move.line.pay,ask_journal,start:"
msgid "Pay"
msgstr ""
diff --git a/locale/de_DE.po b/locale/de.po
similarity index 89%
rename from locale/de_DE.po
rename to locale/de.po
index 851e21a..d1f7bac 100644
--- a/locale/de_DE.po
+++ b/locale/de.po
@@ -2,6 +2,10 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+msgctxt "error:account.move.line.pay:"
+msgid "The Line \"%(line)s\" is blocked."
+msgstr "Zeile \"%(line)s\" ist gesperrt."
+
msgctxt "error:account.payment.process:"
msgid "The Payment \"%(payment)s\" overpays the Line \"%(line)s\"."
msgstr "Zahlung \"%(payment)s\" überzahlt die Position \"%(line)s\""
@@ -18,6 +22,10 @@ msgctxt "field:account.move.line,payment_amount:"
msgid "Payment Amount"
msgstr "Betrag"
+msgctxt "field:account.move.line,payment_blocked:"
+msgid "Blocked"
+msgstr "Gesperrt"
+
msgctxt "field:account.move.line,payment_kind:"
msgid "Payment Kind"
msgstr "Zahlungsart"
@@ -26,18 +34,26 @@ msgctxt "field:account.move.line,payments:"
msgid "Payments"
msgstr "Zahlungen"
-msgctxt "field:account.move.line.pay.start,date:"
-msgid "Date"
-msgstr "Datum"
+msgctxt "field:account.move.line.pay.ask_journal,company:"
+msgid "Company"
+msgstr "Unternehmen"
-msgctxt "field:account.move.line.pay.start,id:"
+msgctxt "field:account.move.line.pay.ask_journal,currency:"
+msgid "Currency"
+msgstr "Währung"
+
+msgctxt "field:account.move.line.pay.ask_journal,id:"
msgid "ID"
msgstr "ID"
-msgctxt "field:account.move.line.pay.start,journal:"
+msgctxt "field:account.move.line.pay.ask_journal,journal:"
msgid "Journal"
msgstr "Journal"
+msgctxt "field:account.move.line.pay.ask_journal,journals:"
+msgid "Journals"
+msgstr "Journal"
+
msgctxt "field:account.payment,amount:"
msgid "Amount"
msgstr "Betrag"
@@ -198,9 +214,9 @@ msgctxt "field:account.payment.process.start,id:"
msgid "ID"
msgstr "ID"
-msgctxt "model:account.move.line.pay.start,name:"
+msgctxt "model:account.move.line.pay.ask_journal,name:"
msgid "Pay Line"
-msgstr "Zahlungsposten bezahlen"
+msgstr "Zahlungsposition bezahlen"
msgctxt "model:account.payment,name:"
msgid "Payment"
@@ -324,9 +340,13 @@ msgctxt "model:res.group,name:group_payment"
msgid "Payment"
msgstr "Zahlung"
+msgctxt "model:res.group,name:group_payment_approval"
+msgid "Payment Approval"
+msgstr "Zahlungsbewilligung"
+
msgctxt "selection:account.move.line,payment_kind:"
msgid ""
-msgstr " "
+msgstr ""
msgctxt "selection:account.move.line,payment_kind:"
msgid "Payable"
@@ -384,37 +404,17 @@ msgctxt "view:account.configuration:"
msgid "Payment"
msgstr "Zahlung"
-msgctxt "view:account.move.line.pay.start:"
-msgid "Pay Line"
-msgstr "Zahlungsposten bezahlen"
-
msgctxt "view:account.move.line:"
-msgid "Account Move Lines"
-msgstr "Buchungszeilen"
+msgid "Block"
+msgstr "Sperren"
msgctxt "view:account.move.line:"
msgid "Pay Lines"
msgstr "Zahlungsposten bezahlen"
-msgctxt "view:account.payment.group:"
-msgid "Payment Group"
-msgstr "Zahlungsgruppe"
-
-msgctxt "view:account.payment.group:"
-msgid "Payment Groups"
-msgstr "Zahlungsgruppen"
-
-msgctxt "view:account.payment.journal:"
-msgid "Payment Journal"
-msgstr "Zahlungsjournal"
-
-msgctxt "view:account.payment.journal:"
-msgid "Payment Journals"
-msgstr "Zahlungsjournale"
-
-msgctxt "view:account.payment.process.start:"
-msgid "Process Payments"
-msgstr "Zahlungen ausführen"
+msgctxt "view:account.move.line:"
+msgid "Unblock"
+msgstr "Sperre aufheben"
msgctxt "view:account.payment.process.start:"
msgid "Process Payments?"
@@ -441,22 +441,14 @@ msgid "Other Info"
msgstr "Sonstiges"
msgctxt "view:account.payment:"
-msgid "Payment"
-msgstr "Zahlung"
-
-msgctxt "view:account.payment:"
-msgid "Payments"
-msgstr "Zahlungen"
-
-msgctxt "view:account.payment:"
msgid "Succeed"
msgstr "Erfolgreich"
-msgctxt "wizard_button:account.move.line.pay,start,end:"
+msgctxt "wizard_button:account.move.line.pay,ask_journal,end:"
msgid "Cancel"
msgstr "Abbrechen"
-msgctxt "wizard_button:account.move.line.pay,start,pay:"
+msgctxt "wizard_button:account.move.line.pay,ask_journal,start:"
msgid "Pay"
msgstr "Bezahlen"
diff --git a/locale/es_ES.po b/locale/es.po
similarity index 86%
rename from locale/es_ES.po
rename to locale/es.po
index 0d579d3..373ffa8 100644
--- a/locale/es_ES.po
+++ b/locale/es.po
@@ -2,6 +2,10 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+msgctxt "error:account.move.line.pay:"
+msgid "The Line \"%(line)s\" is blocked."
+msgstr "La línea \"%(line)s\" está bloqueada."
+
msgctxt "error:account.payment.process:"
msgid "The Payment \"%(payment)s\" overpays the Line \"%(line)s\"."
msgstr "El pago \"%(payment)s\" paga en exceso el apunte \"%(line)s\"."
@@ -18,6 +22,10 @@ msgctxt "field:account.move.line,payment_amount:"
msgid "Payment Amount"
msgstr "Importe del pago"
+msgctxt "field:account.move.line,payment_blocked:"
+msgid "Blocked"
+msgstr "Bloqueado"
+
msgctxt "field:account.move.line,payment_kind:"
msgid "Payment Kind"
msgstr "Clase de pago"
@@ -26,18 +34,26 @@ msgctxt "field:account.move.line,payments:"
msgid "Payments"
msgstr "Pagos"
-msgctxt "field:account.move.line.pay.start,date:"
-msgid "Date"
-msgstr "Fecha"
+msgctxt "field:account.move.line.pay.ask_journal,company:"
+msgid "Company"
+msgstr "Empresa"
-msgctxt "field:account.move.line.pay.start,id:"
+msgctxt "field:account.move.line.pay.ask_journal,currency:"
+msgid "Currency"
+msgstr "Moneda"
+
+msgctxt "field:account.move.line.pay.ask_journal,id:"
msgid "ID"
msgstr "ID"
-msgctxt "field:account.move.line.pay.start,journal:"
+msgctxt "field:account.move.line.pay.ask_journal,journal:"
msgid "Journal"
msgstr "Diario"
+msgctxt "field:account.move.line.pay.ask_journal,journals:"
+msgid "Journals"
+msgstr "Diario"
+
msgctxt "field:account.payment,amount:"
msgid "Amount"
msgstr "Importe"
@@ -48,11 +64,11 @@ msgstr "Empresa"
msgctxt "field:account.payment,create_date:"
msgid "Create Date"
-msgstr "Fecha creación"
+msgstr "Fecha de creación"
msgctxt "field:account.payment,create_uid:"
msgid "Create User"
-msgstr "Usuario creación"
+msgstr "Usuario de creación"
msgctxt "field:account.payment,currency:"
msgid "Currency"
@@ -104,11 +120,11 @@ msgstr "Estado"
msgctxt "field:account.payment,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Fecha de modificación"
msgctxt "field:account.payment,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Usuario de modificación"
msgctxt "field:account.payment.group,company:"
msgid "Company"
@@ -116,11 +132,11 @@ msgstr "Empresa"
msgctxt "field:account.payment.group,create_date:"
msgid "Create Date"
-msgstr "Fecha creación"
+msgstr "Fecha de creación"
msgctxt "field:account.payment.group,create_uid:"
msgid "Create User"
-msgstr "Usuario creación"
+msgstr "Usuario de creación"
msgctxt "field:account.payment.group,id:"
msgid "ID"
@@ -148,11 +164,11 @@ msgstr "Nombre"
msgctxt "field:account.payment.group,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Fecha de modificación"
msgctxt "field:account.payment.group,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Usuario de modificación"
msgctxt "field:account.payment.journal,company:"
msgid "Company"
@@ -160,11 +176,11 @@ msgstr "Empresa"
msgctxt "field:account.payment.journal,create_date:"
msgid "Create Date"
-msgstr "Fecha creación"
+msgstr "Fecha de creación"
msgctxt "field:account.payment.journal,create_uid:"
msgid "Create User"
-msgstr "Usuario creación"
+msgstr "Usuario de creación"
msgctxt "field:account.payment.journal,currency:"
msgid "Currency"
@@ -188,17 +204,17 @@ msgstr "Nombre"
msgctxt "field:account.payment.journal,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Fecha de modificación"
msgctxt "field:account.payment.journal,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Usuario de modificación"
msgctxt "field:account.payment.process.start,id:"
msgid "ID"
msgstr "ID"
-msgctxt "model:account.move.line.pay.start,name:"
+msgctxt "model:account.move.line.pay.ask_journal,name:"
msgid "Pay Line"
msgstr "Pagar efecto"
@@ -324,6 +340,10 @@ msgctxt "model:res.group,name:group_payment"
msgid "Payment"
msgstr "Pago"
+msgctxt "model:res.group,name:group_payment_approval"
+msgid "Payment Approval"
+msgstr "Aprobación de pago"
+
msgctxt "selection:account.move.line,payment_kind:"
msgid ""
msgstr ""
@@ -384,37 +404,17 @@ msgctxt "view:account.configuration:"
msgid "Payment"
msgstr "Pago"
-msgctxt "view:account.move.line.pay.start:"
-msgid "Pay Line"
-msgstr "Pagar efecto"
-
msgctxt "view:account.move.line:"
-msgid "Account Move Lines"
-msgstr "Apuntes contables"
+msgid "Block"
+msgstr "Bloquear"
msgctxt "view:account.move.line:"
msgid "Pay Lines"
msgstr "Pagar efectos"
-msgctxt "view:account.payment.group:"
-msgid "Payment Group"
-msgstr "Grupo de pagos"
-
-msgctxt "view:account.payment.group:"
-msgid "Payment Groups"
-msgstr "Grupos de pagos"
-
-msgctxt "view:account.payment.journal:"
-msgid "Payment Journal"
-msgstr "Diario de pago"
-
-msgctxt "view:account.payment.journal:"
-msgid "Payment Journals"
-msgstr "Diarios de pago"
-
-msgctxt "view:account.payment.process.start:"
-msgid "Process Payments"
-msgstr "Procesar pagos"
+msgctxt "view:account.move.line:"
+msgid "Unblock"
+msgstr "Desbloquear"
msgctxt "view:account.payment.process.start:"
msgid "Process Payments?"
@@ -441,22 +441,14 @@ msgid "Other Info"
msgstr "Información adicional"
msgctxt "view:account.payment:"
-msgid "Payment"
-msgstr "Pago"
-
-msgctxt "view:account.payment:"
-msgid "Payments"
-msgstr "Pagos"
-
-msgctxt "view:account.payment:"
msgid "Succeed"
msgstr "Con éxito"
-msgctxt "wizard_button:account.move.line.pay,start,end:"
+msgctxt "wizard_button:account.move.line.pay,ask_journal,end:"
msgid "Cancel"
msgstr "Cancelar"
-msgctxt "wizard_button:account.move.line.pay,start,pay:"
+msgctxt "wizard_button:account.move.line.pay,ask_journal,start:"
msgid "Pay"
msgstr "Pagar"
diff --git a/locale/hu_HU.po b/locale/es_419.po
similarity index 79%
copy from locale/hu_HU.po
copy to locale/es_419.po
index 3004c9d..2eca05e 100644
--- a/locale/hu_HU.po
+++ b/locale/es_419.po
@@ -2,6 +2,10 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+msgctxt "error:account.move.line.pay:"
+msgid "The Line \"%(line)s\" is blocked."
+msgstr ""
+
msgctxt "error:account.payment.process:"
msgid "The Payment \"%(payment)s\" overpays the Line \"%(line)s\"."
msgstr ""
@@ -18,26 +22,39 @@ msgctxt "field:account.move.line,payment_amount:"
msgid "Payment Amount"
msgstr ""
+msgctxt "field:account.move.line,payment_blocked:"
+msgid "Blocked"
+msgstr ""
+
msgctxt "field:account.move.line,payment_kind:"
msgid "Payment Kind"
msgstr ""
+#, fuzzy
msgctxt "field:account.move.line,payments:"
msgid "Payments"
+msgstr "Payments"
+
+msgctxt "field:account.move.line.pay.ask_journal,company:"
+msgid "Company"
msgstr ""
-msgctxt "field:account.move.line.pay.start,date:"
-msgid "Date"
+msgctxt "field:account.move.line.pay.ask_journal,currency:"
+msgid "Currency"
msgstr ""
-msgctxt "field:account.move.line.pay.start,id:"
+msgctxt "field:account.move.line.pay.ask_journal,id:"
msgid "ID"
msgstr ""
-msgctxt "field:account.move.line.pay.start,journal:"
+msgctxt "field:account.move.line.pay.ask_journal,journal:"
msgid "Journal"
msgstr ""
+msgctxt "field:account.move.line.pay.ask_journal,journals:"
+msgid "Journals"
+msgstr ""
+
msgctxt "field:account.payment,amount:"
msgid "Amount"
msgstr ""
@@ -138,9 +155,10 @@ msgctxt "field:account.payment.group,number:"
msgid "Number"
msgstr ""
+#, fuzzy
msgctxt "field:account.payment.group,payments:"
msgid "Payments"
-msgstr ""
+msgstr "Payments"
msgctxt "field:account.payment.group,rec_name:"
msgid "Name"
@@ -198,179 +216,199 @@ msgctxt "field:account.payment.process.start,id:"
msgid "ID"
msgstr ""
-msgctxt "model:account.move.line.pay.start,name:"
+#, fuzzy
+msgctxt "model:account.move.line.pay.ask_journal,name:"
msgid "Pay Line"
-msgstr ""
+msgstr "Pay Lines"
+#, fuzzy
msgctxt "model:account.payment,name:"
msgid "Payment"
-msgstr ""
+msgstr "Payment"
+#, fuzzy
msgctxt "model:account.payment.group,name:"
msgid "Payment Group"
-msgstr ""
+msgstr "Payment Groups"
+#, fuzzy
msgctxt "model:account.payment.journal,name:"
msgid "Payment Journal"
-msgstr ""
+msgstr "Payment Journals"
+#, fuzzy
msgctxt "model:account.payment.process.start,name:"
msgid "Process Payment"
-msgstr ""
+msgstr "Process Payments"
msgctxt "model:ir.action,name:act_move_line_form"
msgid "Lines to Pay"
-msgstr ""
+msgstr "Lines to Pay"
msgctxt "model:ir.action,name:act_pay_line"
msgid "Pay Lines"
-msgstr ""
+msgstr "Pay Lines"
msgctxt "model:ir.action,name:act_payment_form"
msgid "Payments"
-msgstr ""
+msgstr "Payments"
msgctxt "model:ir.action,name:act_payment_form_group_open"
msgid "Payments"
-msgstr ""
+msgstr "Payments"
msgctxt "model:ir.action,name:act_payment_form_line_relate"
msgid "Payments"
-msgstr ""
+msgstr "Payments"
msgctxt "model:ir.action,name:act_payment_group_form"
msgid "Payment Groups"
-msgstr ""
+msgstr "Payment Groups"
msgctxt "model:ir.action,name:act_payment_journal_form"
msgid "Payment Journals"
-msgstr ""
+msgstr "Payment Journals"
msgctxt "model:ir.action,name:act_process_payments"
msgid "Process Payments"
-msgstr ""
+msgstr "Process Payments"
msgctxt ""
"model:ir.action.act_window.domain,name:act_move_line_form_domain_payable"
msgid "Payable"
-msgstr ""
+msgstr "Payable"
msgctxt ""
"model:ir.action.act_window.domain,name:act_move_line_form_domain_receivable"
msgid "Receivable"
-msgstr ""
+msgstr "Receivable"
msgctxt "model:ir.action.act_window.domain,name:act_payment_form_domain_all"
msgid "All"
-msgstr ""
+msgstr "All"
msgctxt ""
"model:ir.action.act_window.domain,name:act_payment_form_domain_approved"
msgid "Approved"
-msgstr ""
+msgstr "Approved"
msgctxt "model:ir.action.act_window.domain,name:act_payment_form_domain_draft"
msgid "Draft"
-msgstr ""
+msgstr "Draft"
msgctxt ""
"model:ir.action.act_window.domain,name:act_payment_form_domain_failed"
msgid "Failed"
-msgstr ""
+msgstr "Failed"
msgctxt ""
"model:ir.action.act_window.domain,name:act_payment_form_domain_processing"
msgid "Processing"
-msgstr ""
+msgstr "Processing"
msgctxt ""
"model:ir.action.act_window.domain,name:act_payment_form_domain_suceeded"
msgid "Succeeded"
-msgstr ""
+msgstr "Succeeded"
msgctxt "model:ir.sequence,name:sequence_account_payment_group"
msgid "Default Account Payment Group"
-msgstr ""
+msgstr "Default Account Payment Group"
msgctxt "model:ir.sequence.type,name:sequence_type_account_payment_group"
msgid "Account Payment Group"
-msgstr ""
+msgstr "Account Payment Group"
msgctxt "model:ir.ui.menu,name:menu_move_line_form"
msgid "Lines to Pay"
-msgstr ""
+msgstr "Lines to Pay"
msgctxt "model:ir.ui.menu,name:menu_payment_configuration"
msgid "Payments"
-msgstr ""
+msgstr "Payments"
msgctxt "model:ir.ui.menu,name:menu_payment_form"
msgid "Payments"
-msgstr ""
+msgstr "Payments"
msgctxt "model:ir.ui.menu,name:menu_payment_group_form"
msgid "Payment Groups"
-msgstr ""
+msgstr "Payment Groups"
msgctxt "model:ir.ui.menu,name:menu_payment_journal_form"
msgid "Payment Journals"
-msgstr ""
+msgstr "Payment Journals"
msgctxt "model:ir.ui.menu,name:menu_payments"
msgid "Payments"
-msgstr ""
+msgstr "Payments"
msgctxt "model:res.group,name:group_payment"
msgid "Payment"
-msgstr ""
+msgstr "Payment"
+
+msgctxt "model:res.group,name:group_payment_approval"
+msgid "Payment Approval"
+msgstr "Payment Approval"
msgctxt "selection:account.move.line,payment_kind:"
msgid ""
msgstr ""
+#, fuzzy
msgctxt "selection:account.move.line,payment_kind:"
msgid "Payable"
-msgstr ""
+msgstr "Payable"
+#, fuzzy
msgctxt "selection:account.move.line,payment_kind:"
msgid "Receivable"
-msgstr ""
+msgstr "Receivable"
+#, fuzzy
msgctxt "selection:account.payment,kind:"
msgid "Payable"
-msgstr ""
+msgstr "Payable"
+#, fuzzy
msgctxt "selection:account.payment,kind:"
msgid "Receivable"
-msgstr ""
+msgstr "Receivable"
+#, fuzzy
msgctxt "selection:account.payment,state:"
msgid "Approved"
-msgstr ""
+msgstr "Approved"
+#, fuzzy
msgctxt "selection:account.payment,state:"
msgid "Draft"
-msgstr ""
+msgstr "Draft"
+#, fuzzy
msgctxt "selection:account.payment,state:"
msgid "Failed"
-msgstr ""
+msgstr "Failed"
+#, fuzzy
msgctxt "selection:account.payment,state:"
msgid "Processing"
-msgstr ""
+msgstr "Processing"
+#, fuzzy
msgctxt "selection:account.payment,state:"
msgid "Succeeded"
-msgstr ""
+msgstr "Succeeded"
+#, fuzzy
msgctxt "selection:account.payment.group,kind:"
msgid "Payable"
-msgstr ""
+msgstr "Payable"
+#, fuzzy
msgctxt "selection:account.payment.group,kind:"
msgid "Receivable"
-msgstr ""
+msgstr "Receivable"
msgctxt "selection:account.payment.journal,process_method:"
msgid "Manual"
@@ -380,57 +418,42 @@ msgctxt "view:account.configuration:"
msgid "Group Sequence"
msgstr ""
+#, fuzzy
msgctxt "view:account.configuration:"
msgid "Payment"
-msgstr ""
-
-msgctxt "view:account.move.line.pay.start:"
-msgid "Pay Line"
-msgstr ""
+msgstr "Payment"
msgctxt "view:account.move.line:"
-msgid "Account Move Lines"
+msgid "Block"
msgstr ""
+#, fuzzy
msgctxt "view:account.move.line:"
msgid "Pay Lines"
-msgstr ""
-
-msgctxt "view:account.payment.group:"
-msgid "Payment Group"
-msgstr ""
-
-msgctxt "view:account.payment.group:"
-msgid "Payment Groups"
-msgstr ""
+msgstr "Pay Lines"
-msgctxt "view:account.payment.journal:"
-msgid "Payment Journal"
-msgstr ""
-
-msgctxt "view:account.payment.journal:"
-msgid "Payment Journals"
-msgstr ""
-
-msgctxt "view:account.payment.process.start:"
-msgid "Process Payments"
+msgctxt "view:account.move.line:"
+msgid "Unblock"
msgstr ""
+#, fuzzy
msgctxt "view:account.payment.process.start:"
msgid "Process Payments?"
-msgstr ""
+msgstr "Process Payments"
+#, fuzzy
msgctxt "view:account.payment:"
msgid "Approve"
-msgstr ""
+msgstr "Approved"
msgctxt "view:account.payment:"
msgid "Description"
msgstr ""
+#, fuzzy
msgctxt "view:account.payment:"
msgid "Draft"
-msgstr ""
+msgstr "Draft"
msgctxt "view:account.payment:"
msgid "Fail"
@@ -440,23 +463,16 @@ msgctxt "view:account.payment:"
msgid "Other Info"
msgstr ""
-msgctxt "view:account.payment:"
-msgid "Payment"
-msgstr ""
-
-msgctxt "view:account.payment:"
-msgid "Payments"
-msgstr ""
-
+#, fuzzy
msgctxt "view:account.payment:"
msgid "Succeed"
-msgstr ""
+msgstr "Succeeded"
-msgctxt "wizard_button:account.move.line.pay,start,end:"
+msgctxt "wizard_button:account.move.line.pay,ask_journal,end:"
msgid "Cancel"
msgstr ""
-msgctxt "wizard_button:account.move.line.pay,start,pay:"
+msgctxt "wizard_button:account.move.line.pay,ask_journal,start:"
msgid "Pay"
msgstr ""
diff --git a/locale/es_AR.po b/locale/es_AR.po
deleted file mode 100644
index a7950c5..0000000
--- a/locale/es_AR.po
+++ /dev/null
@@ -1,469 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "error:account.payment.process:"
-msgid "The Payment \"%(payment)s\" overpays the Line \"%(line)s\"."
-msgstr "El Pago «%(payment)s» excede el pago de la línea «%(line)s»."
-
-msgctxt "error:account.payment:"
-msgid "Payment \"%s\" must be in draft before deletion."
-msgstr "Debe cambiar a borrador el Pago «%s» antes de eliminar."
-
-msgctxt "field:account.configuration,payment_group_sequence:"
-msgid "Payment Group Sequence"
-msgstr "Secuencia de grupo de pago"
-
-msgctxt "field:account.move.line,payment_amount:"
-msgid "Payment Amount"
-msgstr "Importe de pago"
-
-msgctxt "field:account.move.line,payment_kind:"
-msgid "Payment Kind"
-msgstr "Clase de pago"
-
-msgctxt "field:account.move.line,payments:"
-msgid "Payments"
-msgstr "Pagos"
-
-msgctxt "field:account.move.line.pay.start,date:"
-msgid "Date"
-msgstr "Fecha"
-
-msgctxt "field:account.move.line.pay.start,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:account.move.line.pay.start,journal:"
-msgid "Journal"
-msgstr "Diario"
-
-msgctxt "field:account.payment,amount:"
-msgid "Amount"
-msgstr "Importe"
-
-msgctxt "field:account.payment,company:"
-msgid "Company"
-msgstr "Empresa"
-
-msgctxt "field:account.payment,create_date:"
-msgid "Create Date"
-msgstr "Fecha creación"
-
-msgctxt "field:account.payment,create_uid:"
-msgid "Create User"
-msgstr "Usuario creación"
-
-msgctxt "field:account.payment,currency:"
-msgid "Currency"
-msgstr "Moneda"
-
-msgctxt "field:account.payment,currency_digits:"
-msgid "Currency Digits"
-msgstr "Decimales de moneda"
-
-msgctxt "field:account.payment,date:"
-msgid "Date"
-msgstr "Fecha"
-
-msgctxt "field:account.payment,description:"
-msgid "Description"
-msgstr "Descripción"
-
-msgctxt "field:account.payment,group:"
-msgid "Group"
-msgstr "Grupo"
-
-msgctxt "field:account.payment,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:account.payment,journal:"
-msgid "Journal"
-msgstr "Diario"
-
-msgctxt "field:account.payment,kind:"
-msgid "Kind"
-msgstr "Clase"
-
-msgctxt "field:account.payment,line:"
-msgid "Line"
-msgstr "Línea"
-
-msgctxt "field:account.payment,party:"
-msgid "Party"
-msgstr "Entidad"
-
-msgctxt "field:account.payment,rec_name:"
-msgid "Name"
-msgstr "Nombre"
-
-msgctxt "field:account.payment,state:"
-msgid "State"
-msgstr "Estado"
-
-msgctxt "field:account.payment,write_date:"
-msgid "Write Date"
-msgstr "Fecha modificación"
-
-msgctxt "field:account.payment,write_uid:"
-msgid "Write User"
-msgstr "Usuario modificación"
-
-msgctxt "field:account.payment.group,company:"
-msgid "Company"
-msgstr "Empresa"
-
-msgctxt "field:account.payment.group,create_date:"
-msgid "Create Date"
-msgstr "Fecha creación"
-
-msgctxt "field:account.payment.group,create_uid:"
-msgid "Create User"
-msgstr "Usuario creación"
-
-msgctxt "field:account.payment.group,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:account.payment.group,journal:"
-msgid "Journal"
-msgstr "Diario"
-
-msgctxt "field:account.payment.group,kind:"
-msgid "Kind"
-msgstr "Clase"
-
-msgctxt "field:account.payment.group,number:"
-msgid "Number"
-msgstr "Número"
-
-msgctxt "field:account.payment.group,payments:"
-msgid "Payments"
-msgstr "Pagos"
-
-msgctxt "field:account.payment.group,rec_name:"
-msgid "Name"
-msgstr "Nombre"
-
-msgctxt "field:account.payment.group,write_date:"
-msgid "Write Date"
-msgstr "Fecha modificación"
-
-msgctxt "field:account.payment.group,write_uid:"
-msgid "Write User"
-msgstr "Usuario modificación"
-
-msgctxt "field:account.payment.journal,company:"
-msgid "Company"
-msgstr "Empresa"
-
-msgctxt "field:account.payment.journal,create_date:"
-msgid "Create Date"
-msgstr "Fecha creación"
-
-msgctxt "field:account.payment.journal,create_uid:"
-msgid "Create User"
-msgstr "Usuario creación"
-
-msgctxt "field:account.payment.journal,currency:"
-msgid "Currency"
-msgstr "Moneda"
-
-msgctxt "field:account.payment.journal,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:account.payment.journal,name:"
-msgid "Name"
-msgstr "Nombre"
-
-msgctxt "field:account.payment.journal,process_method:"
-msgid "Process Method"
-msgstr "Método de proceso"
-
-msgctxt "field:account.payment.journal,rec_name:"
-msgid "Name"
-msgstr "Nombre"
-
-msgctxt "field:account.payment.journal,write_date:"
-msgid "Write Date"
-msgstr "Fecha modificación"
-
-msgctxt "field:account.payment.journal,write_uid:"
-msgid "Write User"
-msgstr "Usuario modificación"
-
-msgctxt "field:account.payment.process.start,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "model:account.move.line.pay.start,name:"
-msgid "Pay Line"
-msgstr "Línea de pago"
-
-msgctxt "model:account.payment,name:"
-msgid "Payment"
-msgstr "Pago"
-
-msgctxt "model:account.payment.group,name:"
-msgid "Payment Group"
-msgstr "Grupo de pagos"
-
-msgctxt "model:account.payment.journal,name:"
-msgid "Payment Journal"
-msgstr "Diario de pago"
-
-msgctxt "model:account.payment.process.start,name:"
-msgid "Process Payment"
-msgstr "Procesar pago"
-
-msgctxt "model:ir.action,name:act_move_line_form"
-msgid "Lines to Pay"
-msgstr "Líneas a pagar"
-
-msgctxt "model:ir.action,name:act_pay_line"
-msgid "Pay Lines"
-msgstr "Líneas de pago"
-
-msgctxt "model:ir.action,name:act_payment_form"
-msgid "Payments"
-msgstr "Pagos"
-
-msgctxt "model:ir.action,name:act_payment_form_group_open"
-msgid "Payments"
-msgstr "Pagos"
-
-msgctxt "model:ir.action,name:act_payment_form_line_relate"
-msgid "Payments"
-msgstr "Pagos"
-
-msgctxt "model:ir.action,name:act_payment_group_form"
-msgid "Payment Groups"
-msgstr "Grupos de pagos"
-
-msgctxt "model:ir.action,name:act_payment_journal_form"
-msgid "Payment Journals"
-msgstr "Diarios de pago"
-
-msgctxt "model:ir.action,name:act_process_payments"
-msgid "Process Payments"
-msgstr "Procesar pagos"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_move_line_form_domain_payable"
-msgid "Payable"
-msgstr "A pagar"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_move_line_form_domain_receivable"
-msgid "Receivable"
-msgstr "A cobrar"
-
-msgctxt "model:ir.action.act_window.domain,name:act_payment_form_domain_all"
-msgid "All"
-msgstr "Todo"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_payment_form_domain_approved"
-msgid "Approved"
-msgstr "Aprobado"
-
-msgctxt "model:ir.action.act_window.domain,name:act_payment_form_domain_draft"
-msgid "Draft"
-msgstr "Borrador"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_payment_form_domain_failed"
-msgid "Failed"
-msgstr "Fallido"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_payment_form_domain_processing"
-msgid "Processing"
-msgstr "En proceso"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_payment_form_domain_suceeded"
-msgid "Succeeded"
-msgstr "Exitoso"
-
-msgctxt "model:ir.sequence,name:sequence_account_payment_group"
-msgid "Default Account Payment Group"
-msgstr "Cuenta grupo de pagos por defecto"
-
-msgctxt "model:ir.sequence.type,name:sequence_type_account_payment_group"
-msgid "Account Payment Group"
-msgstr "Cuenta grupo de pagos"
-
-msgctxt "model:ir.ui.menu,name:menu_move_line_form"
-msgid "Lines to Pay"
-msgstr "Líneas a pagar"
-
-msgctxt "model:ir.ui.menu,name:menu_payment_configuration"
-msgid "Payments"
-msgstr "Pagos"
-
-msgctxt "model:ir.ui.menu,name:menu_payment_form"
-msgid "Payments"
-msgstr "Pagos"
-
-msgctxt "model:ir.ui.menu,name:menu_payment_group_form"
-msgid "Payment Groups"
-msgstr "Grupos de pagos"
-
-msgctxt "model:ir.ui.menu,name:menu_payment_journal_form"
-msgid "Payment Journals"
-msgstr "Diarios de pago"
-
-msgctxt "model:ir.ui.menu,name:menu_payments"
-msgid "Payments"
-msgstr "Pagos"
-
-msgctxt "model:res.group,name:group_payment"
-msgid "Payment"
-msgstr "Pago"
-
-msgctxt "selection:account.move.line,payment_kind:"
-msgid ""
-msgstr ""
-
-msgctxt "selection:account.move.line,payment_kind:"
-msgid "Payable"
-msgstr "A pagar"
-
-msgctxt "selection:account.move.line,payment_kind:"
-msgid "Receivable"
-msgstr "A cobrar"
-
-msgctxt "selection:account.payment,kind:"
-msgid "Payable"
-msgstr "A pagar"
-
-msgctxt "selection:account.payment,kind:"
-msgid "Receivable"
-msgstr "A cobrar"
-
-msgctxt "selection:account.payment,state:"
-msgid "Approved"
-msgstr "Aprobado"
-
-msgctxt "selection:account.payment,state:"
-msgid "Draft"
-msgstr "Borrador"
-
-msgctxt "selection:account.payment,state:"
-msgid "Failed"
-msgstr "Fallido"
-
-msgctxt "selection:account.payment,state:"
-msgid "Processing"
-msgstr "En proceso"
-
-msgctxt "selection:account.payment,state:"
-msgid "Succeeded"
-msgstr "Exitoso"
-
-msgctxt "selection:account.payment.group,kind:"
-msgid "Payable"
-msgstr "A pagar"
-
-msgctxt "selection:account.payment.group,kind:"
-msgid "Receivable"
-msgstr "A cobrar"
-
-msgctxt "selection:account.payment.journal,process_method:"
-msgid "Manual"
-msgstr "Manual"
-
-msgctxt "view:account.configuration:"
-msgid "Group Sequence"
-msgstr "Secuencia de grupo"
-
-msgctxt "view:account.configuration:"
-msgid "Payment"
-msgstr "Pago"
-
-msgctxt "view:account.move.line.pay.start:"
-msgid "Pay Line"
-msgstr "Línea de pago"
-
-msgctxt "view:account.move.line:"
-msgid "Account Move Lines"
-msgstr "Líneas de asientos contables"
-
-msgctxt "view:account.move.line:"
-msgid "Pay Lines"
-msgstr "Líneas de pago"
-
-msgctxt "view:account.payment.group:"
-msgid "Payment Group"
-msgstr "Grupo de pagos"
-
-msgctxt "view:account.payment.group:"
-msgid "Payment Groups"
-msgstr "Grupos de pagos"
-
-msgctxt "view:account.payment.journal:"
-msgid "Payment Journal"
-msgstr "Diario de pago"
-
-msgctxt "view:account.payment.journal:"
-msgid "Payment Journals"
-msgstr "Diarios de pago"
-
-msgctxt "view:account.payment.process.start:"
-msgid "Process Payments"
-msgstr "Procesar pagos"
-
-msgctxt "view:account.payment.process.start:"
-msgid "Process Payments?"
-msgstr "¿Procesar pagos?"
-
-msgctxt "view:account.payment:"
-msgid "Approve"
-msgstr "Aprobar"
-
-msgctxt "view:account.payment:"
-msgid "Description"
-msgstr "Descripción"
-
-msgctxt "view:account.payment:"
-msgid "Draft"
-msgstr "Borrador"
-
-msgctxt "view:account.payment:"
-msgid "Fail"
-msgstr "Fallo"
-
-msgctxt "view:account.payment:"
-msgid "Other Info"
-msgstr "Información adicional"
-
-msgctxt "view:account.payment:"
-msgid "Payment"
-msgstr "Pago"
-
-msgctxt "view:account.payment:"
-msgid "Payments"
-msgstr "Pagos"
-
-msgctxt "view:account.payment:"
-msgid "Succeed"
-msgstr "Exitoso"
-
-msgctxt "wizard_button:account.move.line.pay,start,end:"
-msgid "Cancel"
-msgstr "Cancelar"
-
-msgctxt "wizard_button:account.move.line.pay,start,pay:"
-msgid "Pay"
-msgstr "Pagar"
-
-msgctxt "wizard_button:account.payment.process,start,end:"
-msgid "Cancel"
-msgstr "Cancelar"
-
-msgctxt "wizard_button:account.payment.process,start,process:"
-msgid "Process"
-msgstr "Procesar"
diff --git a/locale/es_CO.po b/locale/es_CO.po
deleted file mode 100644
index d744320..0000000
--- a/locale/es_CO.po
+++ /dev/null
@@ -1,469 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "error:account.payment.process:"
-msgid "The Payment \"%(payment)s\" overpays the Line \"%(line)s\"."
-msgstr "El Pago \"%(payment)s\" excede el valor a pagar en la Línea \"%(line)s.\""
-
-msgctxt "error:account.payment:"
-msgid "Payment \"%s\" must be in draft before deletion."
-msgstr "El pago \"%s\" debe estar en borrador antes de eliminarse."
-
-msgctxt "field:account.configuration,payment_group_sequence:"
-msgid "Payment Group Sequence"
-msgstr "Secuencia de Grupo de Pago"
-
-msgctxt "field:account.move.line,payment_amount:"
-msgid "Payment Amount"
-msgstr "Valor del Pago"
-
-msgctxt "field:account.move.line,payment_kind:"
-msgid "Payment Kind"
-msgstr "Clase de Pago"
-
-msgctxt "field:account.move.line,payments:"
-msgid "Payments"
-msgstr "Pagos"
-
-msgctxt "field:account.move.line.pay.start,date:"
-msgid "Date"
-msgstr "Fecha"
-
-msgctxt "field:account.move.line.pay.start,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:account.move.line.pay.start,journal:"
-msgid "Journal"
-msgstr "Libro Contable"
-
-msgctxt "field:account.payment,amount:"
-msgid "Amount"
-msgstr "Valor"
-
-msgctxt "field:account.payment,company:"
-msgid "Company"
-msgstr "Compañía"
-
-msgctxt "field:account.payment,create_date:"
-msgid "Create Date"
-msgstr "Fecha de Creación"
-
-msgctxt "field:account.payment,create_uid:"
-msgid "Create User"
-msgstr "Creado por Usuario"
-
-msgctxt "field:account.payment,currency:"
-msgid "Currency"
-msgstr "Monedas"
-
-msgctxt "field:account.payment,currency_digits:"
-msgid "Currency Digits"
-msgstr "Decimales de Moneda"
-
-msgctxt "field:account.payment,date:"
-msgid "Date"
-msgstr "Fecha"
-
-msgctxt "field:account.payment,description:"
-msgid "Description"
-msgstr "Descripción"
-
-msgctxt "field:account.payment,group:"
-msgid "Group"
-msgstr "Grupo"
-
-msgctxt "field:account.payment,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:account.payment,journal:"
-msgid "Journal"
-msgstr "Libro Contable"
-
-msgctxt "field:account.payment,kind:"
-msgid "Kind"
-msgstr "Clase"
-
-msgctxt "field:account.payment,line:"
-msgid "Line"
-msgstr "Línea"
-
-msgctxt "field:account.payment,party:"
-msgid "Party"
-msgstr "Terceros"
-
-msgctxt "field:account.payment,rec_name:"
-msgid "Name"
-msgstr "Nombre"
-
-msgctxt "field:account.payment,state:"
-msgid "State"
-msgstr "Estado"
-
-msgctxt "field:account.payment,write_date:"
-msgid "Write Date"
-msgstr "Fecha de Modificación"
-
-msgctxt "field:account.payment,write_uid:"
-msgid "Write User"
-msgstr "Modificado por Usuario"
-
-msgctxt "field:account.payment.group,company:"
-msgid "Company"
-msgstr "Compañía"
-
-msgctxt "field:account.payment.group,create_date:"
-msgid "Create Date"
-msgstr "Fecha de Creación"
-
-msgctxt "field:account.payment.group,create_uid:"
-msgid "Create User"
-msgstr "Creado por Usuario"
-
-msgctxt "field:account.payment.group,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:account.payment.group,journal:"
-msgid "Journal"
-msgstr "Libro Contable"
-
-msgctxt "field:account.payment.group,kind:"
-msgid "Kind"
-msgstr "Clase"
-
-msgctxt "field:account.payment.group,number:"
-msgid "Number"
-msgstr "Número"
-
-msgctxt "field:account.payment.group,payments:"
-msgid "Payments"
-msgstr "Pagos"
-
-msgctxt "field:account.payment.group,rec_name:"
-msgid "Name"
-msgstr "Nombre"
-
-msgctxt "field:account.payment.group,write_date:"
-msgid "Write Date"
-msgstr "Fecha de Modificación"
-
-msgctxt "field:account.payment.group,write_uid:"
-msgid "Write User"
-msgstr "Modificado por Usuario"
-
-msgctxt "field:account.payment.journal,company:"
-msgid "Company"
-msgstr "Compañía"
-
-msgctxt "field:account.payment.journal,create_date:"
-msgid "Create Date"
-msgstr "Fecha de Creación"
-
-msgctxt "field:account.payment.journal,create_uid:"
-msgid "Create User"
-msgstr "Creado por Usuario"
-
-msgctxt "field:account.payment.journal,currency:"
-msgid "Currency"
-msgstr "Monedas"
-
-msgctxt "field:account.payment.journal,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:account.payment.journal,name:"
-msgid "Name"
-msgstr "Nombre"
-
-msgctxt "field:account.payment.journal,process_method:"
-msgid "Process Method"
-msgstr "Método de Proceso"
-
-msgctxt "field:account.payment.journal,rec_name:"
-msgid "Name"
-msgstr "Nombre"
-
-msgctxt "field:account.payment.journal,write_date:"
-msgid "Write Date"
-msgstr "Fecha de Modificación"
-
-msgctxt "field:account.payment.journal,write_uid:"
-msgid "Write User"
-msgstr "Modificado por Usuario"
-
-msgctxt "field:account.payment.process.start,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "model:account.move.line.pay.start,name:"
-msgid "Pay Line"
-msgstr "Linea de Pago"
-
-msgctxt "model:account.payment,name:"
-msgid "Payment"
-msgstr "Pago"
-
-msgctxt "model:account.payment.group,name:"
-msgid "Payment Group"
-msgstr "Grupo de Pago"
-
-msgctxt "model:account.payment.journal,name:"
-msgid "Payment Journal"
-msgstr "Libro de Pago"
-
-msgctxt "model:account.payment.process.start,name:"
-msgid "Process Payment"
-msgstr "Proceso de Pago"
-
-msgctxt "model:ir.action,name:act_move_line_form"
-msgid "Lines to Pay"
-msgstr "Líneas a Pagar"
-
-msgctxt "model:ir.action,name:act_pay_line"
-msgid "Pay Lines"
-msgstr "Lineas de Pago"
-
-msgctxt "model:ir.action,name:act_payment_form"
-msgid "Payments"
-msgstr "Pagos"
-
-msgctxt "model:ir.action,name:act_payment_form_group_open"
-msgid "Payments"
-msgstr "Pagos"
-
-msgctxt "model:ir.action,name:act_payment_form_line_relate"
-msgid "Payments"
-msgstr "Pagos"
-
-msgctxt "model:ir.action,name:act_payment_group_form"
-msgid "Payment Groups"
-msgstr "Grupos de Pago"
-
-msgctxt "model:ir.action,name:act_payment_journal_form"
-msgid "Payment Journals"
-msgstr "Libro de Pagos"
-
-msgctxt "model:ir.action,name:act_process_payments"
-msgid "Process Payments"
-msgstr "Proceso de Pagos"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_move_line_form_domain_payable"
-msgid "Payable"
-msgstr "Por Pagar"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_move_line_form_domain_receivable"
-msgid "Receivable"
-msgstr "Por Cobrar"
-
-msgctxt "model:ir.action.act_window.domain,name:act_payment_form_domain_all"
-msgid "All"
-msgstr "Todo"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_payment_form_domain_approved"
-msgid "Approved"
-msgstr "Aprobado"
-
-msgctxt "model:ir.action.act_window.domain,name:act_payment_form_domain_draft"
-msgid "Draft"
-msgstr "Borrador"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_payment_form_domain_failed"
-msgid "Failed"
-msgstr "Fallido"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_payment_form_domain_processing"
-msgid "Processing"
-msgstr "En Proceso"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_payment_form_domain_suceeded"
-msgid "Succeeded"
-msgstr "Exitoso"
-
-msgctxt "model:ir.sequence,name:sequence_account_payment_group"
-msgid "Default Account Payment Group"
-msgstr "Grupo de Cuenta de Pago por Defecto"
-
-msgctxt "model:ir.sequence.type,name:sequence_type_account_payment_group"
-msgid "Account Payment Group"
-msgstr "Grupo de Pagos"
-
-msgctxt "model:ir.ui.menu,name:menu_move_line_form"
-msgid "Lines to Pay"
-msgstr "Líneas a Pagar"
-
-msgctxt "model:ir.ui.menu,name:menu_payment_configuration"
-msgid "Payments"
-msgstr "Pagos"
-
-msgctxt "model:ir.ui.menu,name:menu_payment_form"
-msgid "Payments"
-msgstr "Pagos"
-
-msgctxt "model:ir.ui.menu,name:menu_payment_group_form"
-msgid "Payment Groups"
-msgstr "Grupos de Pago"
-
-msgctxt "model:ir.ui.menu,name:menu_payment_journal_form"
-msgid "Payment Journals"
-msgstr "Libro de Pagos"
-
-msgctxt "model:ir.ui.menu,name:menu_payments"
-msgid "Payments"
-msgstr "Pagos"
-
-msgctxt "model:res.group,name:group_payment"
-msgid "Payment"
-msgstr "Pago"
-
-msgctxt "selection:account.move.line,payment_kind:"
-msgid ""
-msgstr " "
-
-msgctxt "selection:account.move.line,payment_kind:"
-msgid "Payable"
-msgstr "Por Pagar"
-
-msgctxt "selection:account.move.line,payment_kind:"
-msgid "Receivable"
-msgstr "Por Cobrar"
-
-msgctxt "selection:account.payment,kind:"
-msgid "Payable"
-msgstr "Por Pagar"
-
-msgctxt "selection:account.payment,kind:"
-msgid "Receivable"
-msgstr "Por Cobrar"
-
-msgctxt "selection:account.payment,state:"
-msgid "Approved"
-msgstr "Aprobado"
-
-msgctxt "selection:account.payment,state:"
-msgid "Draft"
-msgstr "Borrador"
-
-msgctxt "selection:account.payment,state:"
-msgid "Failed"
-msgstr "Fallido"
-
-msgctxt "selection:account.payment,state:"
-msgid "Processing"
-msgstr "En Proceso"
-
-msgctxt "selection:account.payment,state:"
-msgid "Succeeded"
-msgstr "Exitoso"
-
-msgctxt "selection:account.payment.group,kind:"
-msgid "Payable"
-msgstr "Por Pagar"
-
-msgctxt "selection:account.payment.group,kind:"
-msgid "Receivable"
-msgstr "Por Cobrar"
-
-msgctxt "selection:account.payment.journal,process_method:"
-msgid "Manual"
-msgstr "Manual"
-
-msgctxt "view:account.configuration:"
-msgid "Group Sequence"
-msgstr "Secuencia de Grupo"
-
-msgctxt "view:account.configuration:"
-msgid "Payment"
-msgstr "Pago"
-
-msgctxt "view:account.move.line.pay.start:"
-msgid "Pay Line"
-msgstr "Linea de Pago"
-
-msgctxt "view:account.move.line:"
-msgid "Account Move Lines"
-msgstr "Líneas de Asiento"
-
-msgctxt "view:account.move.line:"
-msgid "Pay Lines"
-msgstr "Lineas de Pago"
-
-msgctxt "view:account.payment.group:"
-msgid "Payment Group"
-msgstr "Grupo de Pago"
-
-msgctxt "view:account.payment.group:"
-msgid "Payment Groups"
-msgstr "Grupos de Pago"
-
-msgctxt "view:account.payment.journal:"
-msgid "Payment Journal"
-msgstr "Libro de Pago"
-
-msgctxt "view:account.payment.journal:"
-msgid "Payment Journals"
-msgstr "Libro de Pagos"
-
-msgctxt "view:account.payment.process.start:"
-msgid "Process Payments"
-msgstr "Proceso de Pagos"
-
-msgctxt "view:account.payment.process.start:"
-msgid "Process Payments?"
-msgstr "Proceso de Pagos?"
-
-msgctxt "view:account.payment:"
-msgid "Approve"
-msgstr "Aprobar"
-
-msgctxt "view:account.payment:"
-msgid "Description"
-msgstr "Descripción"
-
-msgctxt "view:account.payment:"
-msgid "Draft"
-msgstr "Borrador"
-
-msgctxt "view:account.payment:"
-msgid "Fail"
-msgstr "Fallo"
-
-msgctxt "view:account.payment:"
-msgid "Other Info"
-msgstr "Info Adicional"
-
-msgctxt "view:account.payment:"
-msgid "Payment"
-msgstr "Pago"
-
-msgctxt "view:account.payment:"
-msgid "Payments"
-msgstr "Pagos"
-
-msgctxt "view:account.payment:"
-msgid "Succeed"
-msgstr "Exitoso"
-
-msgctxt "wizard_button:account.move.line.pay,start,end:"
-msgid "Cancel"
-msgstr "Cancelar"
-
-msgctxt "wizard_button:account.move.line.pay,start,pay:"
-msgid "Pay"
-msgstr "Pagar"
-
-msgctxt "wizard_button:account.payment.process,start,end:"
-msgid "Cancel"
-msgstr "Cancelar"
-
-msgctxt "wizard_button:account.payment.process,start,process:"
-msgid "Process"
-msgstr "Procesar"
diff --git a/locale/es_EC.po b/locale/es_EC.po
deleted file mode 100644
index 42033fd..0000000
--- a/locale/es_EC.po
+++ /dev/null
@@ -1,469 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "error:account.payment.process:"
-msgid "The Payment \"%(payment)s\" overpays the Line \"%(line)s\"."
-msgstr "El pago \"%(payment)s\" excede el pago de la línea \"%(line)s\"."
-
-msgctxt "error:account.payment:"
-msgid "Payment \"%s\" must be in draft before deletion."
-msgstr "El pago \"%s\" debe estar en borrador antes de eliminarse."
-
-msgctxt "field:account.configuration,payment_group_sequence:"
-msgid "Payment Group Sequence"
-msgstr "Secuencia de grupo de pagos"
-
-msgctxt "field:account.move.line,payment_amount:"
-msgid "Payment Amount"
-msgstr "Importe del pago"
-
-msgctxt "field:account.move.line,payment_kind:"
-msgid "Payment Kind"
-msgstr "Clase de pago"
-
-msgctxt "field:account.move.line,payments:"
-msgid "Payments"
-msgstr "Pagos"
-
-msgctxt "field:account.move.line.pay.start,date:"
-msgid "Date"
-msgstr "Fecha"
-
-msgctxt "field:account.move.line.pay.start,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:account.move.line.pay.start,journal:"
-msgid "Journal"
-msgstr "Libro diario"
-
-msgctxt "field:account.payment,amount:"
-msgid "Amount"
-msgstr "Importe"
-
-msgctxt "field:account.payment,company:"
-msgid "Company"
-msgstr "Empresa"
-
-msgctxt "field:account.payment,create_date:"
-msgid "Create Date"
-msgstr "Fecha de creación"
-
-msgctxt "field:account.payment,create_uid:"
-msgid "Create User"
-msgstr "Creado por usuario"
-
-msgctxt "field:account.payment,currency:"
-msgid "Currency"
-msgstr "Moneda"
-
-msgctxt "field:account.payment,currency_digits:"
-msgid "Currency Digits"
-msgstr "Decimales de moneda"
-
-msgctxt "field:account.payment,date:"
-msgid "Date"
-msgstr "Fecha"
-
-msgctxt "field:account.payment,description:"
-msgid "Description"
-msgstr "Descripción"
-
-msgctxt "field:account.payment,group:"
-msgid "Group"
-msgstr "Grupo"
-
-msgctxt "field:account.payment,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:account.payment,journal:"
-msgid "Journal"
-msgstr "Libro diario"
-
-msgctxt "field:account.payment,kind:"
-msgid "Kind"
-msgstr "Clase"
-
-msgctxt "field:account.payment,line:"
-msgid "Line"
-msgstr "Línea"
-
-msgctxt "field:account.payment,party:"
-msgid "Party"
-msgstr "Tercero"
-
-msgctxt "field:account.payment,rec_name:"
-msgid "Name"
-msgstr "Nombre"
-
-msgctxt "field:account.payment,state:"
-msgid "State"
-msgstr "Estado"
-
-msgctxt "field:account.payment,write_date:"
-msgid "Write Date"
-msgstr "Fecha de modificación"
-
-msgctxt "field:account.payment,write_uid:"
-msgid "Write User"
-msgstr "Modificado por usuario"
-
-msgctxt "field:account.payment.group,company:"
-msgid "Company"
-msgstr "Empresa"
-
-msgctxt "field:account.payment.group,create_date:"
-msgid "Create Date"
-msgstr "Fecha de creación"
-
-msgctxt "field:account.payment.group,create_uid:"
-msgid "Create User"
-msgstr "Creado por usuario"
-
-msgctxt "field:account.payment.group,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:account.payment.group,journal:"
-msgid "Journal"
-msgstr "Libro diario"
-
-msgctxt "field:account.payment.group,kind:"
-msgid "Kind"
-msgstr "Clase"
-
-msgctxt "field:account.payment.group,number:"
-msgid "Number"
-msgstr "Número"
-
-msgctxt "field:account.payment.group,payments:"
-msgid "Payments"
-msgstr "Pagos"
-
-msgctxt "field:account.payment.group,rec_name:"
-msgid "Name"
-msgstr "Nombre"
-
-msgctxt "field:account.payment.group,write_date:"
-msgid "Write Date"
-msgstr "Fecha de modificación"
-
-msgctxt "field:account.payment.group,write_uid:"
-msgid "Write User"
-msgstr "Modificado por usuario"
-
-msgctxt "field:account.payment.journal,company:"
-msgid "Company"
-msgstr "Empresa"
-
-msgctxt "field:account.payment.journal,create_date:"
-msgid "Create Date"
-msgstr "Fecha de creación"
-
-msgctxt "field:account.payment.journal,create_uid:"
-msgid "Create User"
-msgstr "Creado por usuario"
-
-msgctxt "field:account.payment.journal,currency:"
-msgid "Currency"
-msgstr "Moneda"
-
-msgctxt "field:account.payment.journal,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:account.payment.journal,name:"
-msgid "Name"
-msgstr "Nombre"
-
-msgctxt "field:account.payment.journal,process_method:"
-msgid "Process Method"
-msgstr "Método de proceso"
-
-msgctxt "field:account.payment.journal,rec_name:"
-msgid "Name"
-msgstr "Nombre"
-
-msgctxt "field:account.payment.journal,write_date:"
-msgid "Write Date"
-msgstr "Fecha de modificación"
-
-msgctxt "field:account.payment.journal,write_uid:"
-msgid "Write User"
-msgstr "Modificado por usuario"
-
-msgctxt "field:account.payment.process.start,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "model:account.move.line.pay.start,name:"
-msgid "Pay Line"
-msgstr "Pagar línea"
-
-msgctxt "model:account.payment,name:"
-msgid "Payment"
-msgstr "Pago"
-
-msgctxt "model:account.payment.group,name:"
-msgid "Payment Group"
-msgstr "Grupo de pagos"
-
-msgctxt "model:account.payment.journal,name:"
-msgid "Payment Journal"
-msgstr "Libro diario de Pago"
-
-msgctxt "model:account.payment.process.start,name:"
-msgid "Process Payment"
-msgstr "Procesar pago"
-
-msgctxt "model:ir.action,name:act_move_line_form"
-msgid "Lines to Pay"
-msgstr "Líneas a pagar"
-
-msgctxt "model:ir.action,name:act_pay_line"
-msgid "Pay Lines"
-msgstr "Pagar líneas"
-
-msgctxt "model:ir.action,name:act_payment_form"
-msgid "Payments"
-msgstr "Pagos"
-
-msgctxt "model:ir.action,name:act_payment_form_group_open"
-msgid "Payments"
-msgstr "Pagos"
-
-msgctxt "model:ir.action,name:act_payment_form_line_relate"
-msgid "Payments"
-msgstr "Pagos"
-
-msgctxt "model:ir.action,name:act_payment_group_form"
-msgid "Payment Groups"
-msgstr "Grupos de pagos"
-
-msgctxt "model:ir.action,name:act_payment_journal_form"
-msgid "Payment Journals"
-msgstr "Libros diarios de pago"
-
-msgctxt "model:ir.action,name:act_process_payments"
-msgid "Process Payments"
-msgstr "Procesar pagos"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_move_line_form_domain_payable"
-msgid "Payable"
-msgstr "Por pagar"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_move_line_form_domain_receivable"
-msgid "Receivable"
-msgstr "Por cobrar"
-
-msgctxt "model:ir.action.act_window.domain,name:act_payment_form_domain_all"
-msgid "All"
-msgstr "Todo"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_payment_form_domain_approved"
-msgid "Approved"
-msgstr "Aprobado"
-
-msgctxt "model:ir.action.act_window.domain,name:act_payment_form_domain_draft"
-msgid "Draft"
-msgstr "Borrador"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_payment_form_domain_failed"
-msgid "Failed"
-msgstr "Fallido"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_payment_form_domain_processing"
-msgid "Processing"
-msgstr "En proceso"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_payment_form_domain_suceeded"
-msgid "Succeeded"
-msgstr "Exitoso"
-
-msgctxt "model:ir.sequence,name:sequence_account_payment_group"
-msgid "Default Account Payment Group"
-msgstr "Grupo de pagos contables por defecto"
-
-msgctxt "model:ir.sequence.type,name:sequence_type_account_payment_group"
-msgid "Account Payment Group"
-msgstr "Grupo de pagos contables"
-
-msgctxt "model:ir.ui.menu,name:menu_move_line_form"
-msgid "Lines to Pay"
-msgstr "Líneas a Pagar"
-
-msgctxt "model:ir.ui.menu,name:menu_payment_configuration"
-msgid "Payments"
-msgstr "Pagos"
-
-msgctxt "model:ir.ui.menu,name:menu_payment_form"
-msgid "Payments"
-msgstr "Pagos"
-
-msgctxt "model:ir.ui.menu,name:menu_payment_group_form"
-msgid "Payment Groups"
-msgstr "Grupos de Pagos"
-
-msgctxt "model:ir.ui.menu,name:menu_payment_journal_form"
-msgid "Payment Journals"
-msgstr "Libros Diarios de Pago"
-
-msgctxt "model:ir.ui.menu,name:menu_payments"
-msgid "Payments"
-msgstr "Pagos"
-
-msgctxt "model:res.group,name:group_payment"
-msgid "Payment"
-msgstr "Pago"
-
-msgctxt "selection:account.move.line,payment_kind:"
-msgid ""
-msgstr ""
-
-msgctxt "selection:account.move.line,payment_kind:"
-msgid "Payable"
-msgstr "Por pagar"
-
-msgctxt "selection:account.move.line,payment_kind:"
-msgid "Receivable"
-msgstr "Por cobrar"
-
-msgctxt "selection:account.payment,kind:"
-msgid "Payable"
-msgstr "Por pagar"
-
-msgctxt "selection:account.payment,kind:"
-msgid "Receivable"
-msgstr "Por cobrar"
-
-msgctxt "selection:account.payment,state:"
-msgid "Approved"
-msgstr "Aprobado"
-
-msgctxt "selection:account.payment,state:"
-msgid "Draft"
-msgstr "Borrador"
-
-msgctxt "selection:account.payment,state:"
-msgid "Failed"
-msgstr "Fallido"
-
-msgctxt "selection:account.payment,state:"
-msgid "Processing"
-msgstr "En proceso"
-
-msgctxt "selection:account.payment,state:"
-msgid "Succeeded"
-msgstr "Exitoso"
-
-msgctxt "selection:account.payment.group,kind:"
-msgid "Payable"
-msgstr "Por pagar"
-
-msgctxt "selection:account.payment.group,kind:"
-msgid "Receivable"
-msgstr "Por cobrar"
-
-msgctxt "selection:account.payment.journal,process_method:"
-msgid "Manual"
-msgstr "Manual"
-
-msgctxt "view:account.configuration:"
-msgid "Group Sequence"
-msgstr "Secuencia de grupo"
-
-msgctxt "view:account.configuration:"
-msgid "Payment"
-msgstr "Pago"
-
-msgctxt "view:account.move.line.pay.start:"
-msgid "Pay Line"
-msgstr "Pagar línea"
-
-msgctxt "view:account.move.line:"
-msgid "Account Move Lines"
-msgstr "Líneas de asiento contable"
-
-msgctxt "view:account.move.line:"
-msgid "Pay Lines"
-msgstr "Pagar líneas"
-
-msgctxt "view:account.payment.group:"
-msgid "Payment Group"
-msgstr "Grupo de pagos"
-
-msgctxt "view:account.payment.group:"
-msgid "Payment Groups"
-msgstr "Grupos de pagos"
-
-msgctxt "view:account.payment.journal:"
-msgid "Payment Journal"
-msgstr "Libro diario de pago"
-
-msgctxt "view:account.payment.journal:"
-msgid "Payment Journals"
-msgstr "Libros diarios de pago"
-
-msgctxt "view:account.payment.process.start:"
-msgid "Process Payments"
-msgstr "Procesar pagos"
-
-msgctxt "view:account.payment.process.start:"
-msgid "Process Payments?"
-msgstr "¿Procesar pagos?"
-
-msgctxt "view:account.payment:"
-msgid "Approve"
-msgstr "Aprobar"
-
-msgctxt "view:account.payment:"
-msgid "Description"
-msgstr "Descripción"
-
-msgctxt "view:account.payment:"
-msgid "Draft"
-msgstr "Borrador"
-
-msgctxt "view:account.payment:"
-msgid "Fail"
-msgstr "Fallo"
-
-msgctxt "view:account.payment:"
-msgid "Other Info"
-msgstr "Información adicional"
-
-msgctxt "view:account.payment:"
-msgid "Payment"
-msgstr "Pago"
-
-msgctxt "view:account.payment:"
-msgid "Payments"
-msgstr "Pagos"
-
-msgctxt "view:account.payment:"
-msgid "Succeed"
-msgstr "Exitoso"
-
-msgctxt "wizard_button:account.move.line.pay,start,end:"
-msgid "Cancel"
-msgstr "Cancelar"
-
-msgctxt "wizard_button:account.move.line.pay,start,pay:"
-msgid "Pay"
-msgstr "Pagar"
-
-msgctxt "wizard_button:account.payment.process,start,end:"
-msgid "Cancel"
-msgstr "Cancelar"
-
-msgctxt "wizard_button:account.payment.process,start,process:"
-msgid "Process"
-msgstr "Procesar"
diff --git a/locale/es_MX.po b/locale/es_MX.po
deleted file mode 100644
index 209f2a0..0000000
--- a/locale/es_MX.po
+++ /dev/null
@@ -1,485 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "error:account.payment.process:"
-msgid "The Payment \"%(payment)s\" overpays the Line \"%(line)s\"."
-msgstr "El pago \"%(payment)s\" paga en exceso el apunte \"%(line)s\"."
-
-msgctxt "error:account.payment:"
-msgid "Payment \"%s\" must be in draft before deletion."
-msgstr "El pago \"%s\" debe estar en estado borrador antes de ser borrado."
-
-msgctxt "field:account.configuration,payment_group_sequence:"
-msgid "Payment Group Sequence"
-msgstr ""
-
-msgctxt "field:account.move.line,payment_amount:"
-msgid "Payment Amount"
-msgstr "Importe del pago"
-
-msgctxt "field:account.move.line,payment_kind:"
-msgid "Payment Kind"
-msgstr "Clase de pago"
-
-msgctxt "field:account.move.line,payments:"
-msgid "Payments"
-msgstr "Pagos"
-
-#, fuzzy
-msgctxt "field:account.move.line.pay.start,date:"
-msgid "Date"
-msgstr "Fecha"
-
-msgctxt "field:account.move.line.pay.start,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:account.move.line.pay.start,journal:"
-msgid "Journal"
-msgstr "Diario"
-
-msgctxt "field:account.payment,amount:"
-msgid "Amount"
-msgstr "Importe"
-
-msgctxt "field:account.payment,company:"
-msgid "Company"
-msgstr "Empresa"
-
-msgctxt "field:account.payment,create_date:"
-msgid "Create Date"
-msgstr "Fecha creación"
-
-msgctxt "field:account.payment,create_uid:"
-msgid "Create User"
-msgstr "Usuario creación"
-
-msgctxt "field:account.payment,currency:"
-msgid "Currency"
-msgstr "Moneda"
-
-msgctxt "field:account.payment,currency_digits:"
-msgid "Currency Digits"
-msgstr "Decimales de la moneda"
-
-msgctxt "field:account.payment,date:"
-msgid "Date"
-msgstr "Fecha"
-
-msgctxt "field:account.payment,description:"
-msgid "Description"
-msgstr "Descripción"
-
-msgctxt "field:account.payment,group:"
-msgid "Group"
-msgstr "Grupo"
-
-msgctxt "field:account.payment,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:account.payment,journal:"
-msgid "Journal"
-msgstr "Diario"
-
-msgctxt "field:account.payment,kind:"
-msgid "Kind"
-msgstr "Tipo"
-
-msgctxt "field:account.payment,line:"
-msgid "Line"
-msgstr "Línea"
-
-msgctxt "field:account.payment,party:"
-msgid "Party"
-msgstr "Entidad"
-
-msgctxt "field:account.payment,rec_name:"
-msgid "Name"
-msgstr "Nombre"
-
-msgctxt "field:account.payment,state:"
-msgid "State"
-msgstr "Estado"
-
-msgctxt "field:account.payment,write_date:"
-msgid "Write Date"
-msgstr "Fecha modificación"
-
-msgctxt "field:account.payment,write_uid:"
-msgid "Write User"
-msgstr "Usuario modificación"
-
-msgctxt "field:account.payment.group,company:"
-msgid "Company"
-msgstr "Empresa"
-
-msgctxt "field:account.payment.group,create_date:"
-msgid "Create Date"
-msgstr "Fecha creación"
-
-msgctxt "field:account.payment.group,create_uid:"
-msgid "Create User"
-msgstr "Usuario creación"
-
-msgctxt "field:account.payment.group,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:account.payment.group,journal:"
-msgid "Journal"
-msgstr "Diario"
-
-msgctxt "field:account.payment.group,kind:"
-msgid "Kind"
-msgstr "Tipo"
-
-msgctxt "field:account.payment.group,number:"
-msgid "Number"
-msgstr ""
-
-msgctxt "field:account.payment.group,payments:"
-msgid "Payments"
-msgstr "Pagos"
-
-msgctxt "field:account.payment.group,rec_name:"
-msgid "Name"
-msgstr "Nombre"
-
-msgctxt "field:account.payment.group,write_date:"
-msgid "Write Date"
-msgstr "Fecha modificación"
-
-msgctxt "field:account.payment.group,write_uid:"
-msgid "Write User"
-msgstr "Usuario modificación"
-
-msgctxt "field:account.payment.journal,company:"
-msgid "Company"
-msgstr "Empresa"
-
-msgctxt "field:account.payment.journal,create_date:"
-msgid "Create Date"
-msgstr "Fecha creación"
-
-msgctxt "field:account.payment.journal,create_uid:"
-msgid "Create User"
-msgstr "Usuario creación"
-
-msgctxt "field:account.payment.journal,currency:"
-msgid "Currency"
-msgstr "Moneda"
-
-msgctxt "field:account.payment.journal,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:account.payment.journal,name:"
-msgid "Name"
-msgstr "Nombre"
-
-msgctxt "field:account.payment.journal,process_method:"
-msgid "Process Method"
-msgstr "Método de proceso"
-
-msgctxt "field:account.payment.journal,rec_name:"
-msgid "Name"
-msgstr "Nombre"
-
-msgctxt "field:account.payment.journal,write_date:"
-msgid "Write Date"
-msgstr "Fecha modificación"
-
-msgctxt "field:account.payment.journal,write_uid:"
-msgid "Write User"
-msgstr "Usuario modificación"
-
-msgctxt "field:account.payment.process.start,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "model:account.move.line.pay.start,name:"
-msgid "Pay Line"
-msgstr "Pagar efecto"
-
-msgctxt "model:account.payment,name:"
-msgid "Payment"
-msgstr "Pago"
-
-msgctxt "model:account.payment.group,name:"
-msgid "Payment Group"
-msgstr "Grupo de pagos"
-
-msgctxt "model:account.payment.journal,name:"
-msgid "Payment Journal"
-msgstr "Diario de pago"
-
-msgctxt "model:account.payment.process.start,name:"
-msgid "Process Payment"
-msgstr "Procesar pago"
-
-msgctxt "model:ir.action,name:act_move_line_form"
-msgid "Lines to Pay"
-msgstr "Efectos a pagar/cobrar"
-
-msgctxt "model:ir.action,name:act_pay_line"
-msgid "Pay Lines"
-msgstr "Pagar efectos"
-
-msgctxt "model:ir.action,name:act_payment_form"
-msgid "Payments"
-msgstr "Pagos"
-
-msgctxt "model:ir.action,name:act_payment_form_group_open"
-msgid "Payments"
-msgstr "Pagos"
-
-msgctxt "model:ir.action,name:act_payment_form_line_relate"
-msgid "Payments"
-msgstr "Pagos"
-
-msgctxt "model:ir.action,name:act_payment_group_form"
-msgid "Payment Groups"
-msgstr "Grupos de pagos"
-
-msgctxt "model:ir.action,name:act_payment_journal_form"
-msgid "Payment Journals"
-msgstr "Diarios de pago"
-
-msgctxt "model:ir.action,name:act_process_payments"
-msgid "Process Payments"
-msgstr "Procesar pagos"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_move_line_form_domain_payable"
-msgid "Payable"
-msgstr "A pagar"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_move_line_form_domain_receivable"
-msgid "Receivable"
-msgstr "A cobrar"
-
-msgctxt "model:ir.action.act_window.domain,name:act_payment_form_domain_all"
-msgid "All"
-msgstr "Todos"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_payment_form_domain_approved"
-msgid "Approved"
-msgstr "Aprobado"
-
-msgctxt "model:ir.action.act_window.domain,name:act_payment_form_domain_draft"
-msgid "Draft"
-msgstr "Borrador"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_payment_form_domain_failed"
-msgid "Failed"
-msgstr "Fallado"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_payment_form_domain_processing"
-msgid "Processing"
-msgstr "En proceso"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_payment_form_domain_suceeded"
-msgid "Succeeded"
-msgstr "Con éxito"
-
-msgctxt "model:ir.sequence,name:sequence_account_payment_group"
-msgid "Default Account Payment Group"
-msgstr "Grupo de pagos predefinido"
-
-msgctxt "model:ir.sequence.type,name:sequence_type_account_payment_group"
-msgid "Account Payment Group"
-msgstr "Grupo de Pagos"
-
-msgctxt "model:ir.ui.menu,name:menu_move_line_form"
-msgid "Lines to Pay"
-msgstr "Efectos a pagar/cobrar"
-
-msgctxt "model:ir.ui.menu,name:menu_payment_configuration"
-msgid "Payments"
-msgstr "Pagos"
-
-msgctxt "model:ir.ui.menu,name:menu_payment_form"
-msgid "Payments"
-msgstr "Pagos"
-
-msgctxt "model:ir.ui.menu,name:menu_payment_group_form"
-msgid "Payment Groups"
-msgstr "Grupos de pagos"
-
-msgctxt "model:ir.ui.menu,name:menu_payment_journal_form"
-msgid "Payment Journals"
-msgstr "Diarios de pago"
-
-msgctxt "model:ir.ui.menu,name:menu_payments"
-msgid "Payments"
-msgstr "Pagos"
-
-msgctxt "model:res.group,name:group_payment"
-msgid "Payment"
-msgstr "Pago"
-
-msgctxt "selection:account.move.line,payment_kind:"
-msgid ""
-msgstr ""
-
-msgctxt "selection:account.move.line,payment_kind:"
-msgid "Payable"
-msgstr "A pagar"
-
-msgctxt "selection:account.move.line,payment_kind:"
-msgid "Receivable"
-msgstr "A cobrar"
-
-msgctxt "selection:account.payment,kind:"
-msgid "Payable"
-msgstr "A pagar"
-
-msgctxt "selection:account.payment,kind:"
-msgid "Receivable"
-msgstr "A cobrar"
-
-msgctxt "selection:account.payment,state:"
-msgid "Approved"
-msgstr "Aprobado"
-
-msgctxt "selection:account.payment,state:"
-msgid "Draft"
-msgstr "Borrador"
-
-msgctxt "selection:account.payment,state:"
-msgid "Failed"
-msgstr "Fallado"
-
-msgctxt "selection:account.payment,state:"
-msgid "Processing"
-msgstr "En proceso"
-
-msgctxt "selection:account.payment,state:"
-msgid "Succeeded"
-msgstr "Con éxito"
-
-msgctxt "selection:account.payment.group,kind:"
-msgid "Payable"
-msgstr "A pagar"
-
-msgctxt "selection:account.payment.group,kind:"
-msgid "Receivable"
-msgstr "A cobrar"
-
-msgctxt "selection:account.payment.journal,process_method:"
-msgid "Manual"
-msgstr "Manual"
-
-msgctxt "view:account.configuration:"
-msgid "Group Sequence"
-msgstr ""
-
-#, fuzzy
-msgctxt "view:account.configuration:"
-msgid "Payment"
-msgstr "Pago"
-
-#, fuzzy
-msgctxt "view:account.move.line.pay.start:"
-msgid "Pay Line"
-msgstr "Pagar efecto"
-
-msgctxt "view:account.move.line:"
-msgid "Account Move Lines"
-msgstr ""
-
-#, fuzzy
-msgctxt "view:account.move.line:"
-msgid "Pay Lines"
-msgstr "Pagar efectos"
-
-#, fuzzy
-msgctxt "view:account.payment.group:"
-msgid "Payment Group"
-msgstr "Grupo de pagos"
-
-#, fuzzy
-msgctxt "view:account.payment.group:"
-msgid "Payment Groups"
-msgstr "Grupos de pagos"
-
-#, fuzzy
-msgctxt "view:account.payment.journal:"
-msgid "Payment Journal"
-msgstr "Diario de pago"
-
-#, fuzzy
-msgctxt "view:account.payment.journal:"
-msgid "Payment Journals"
-msgstr "Diarios de pago"
-
-#, fuzzy
-msgctxt "view:account.payment.process.start:"
-msgid "Process Payments"
-msgstr "Procesar pagos"
-
-#, fuzzy
-msgctxt "view:account.payment.process.start:"
-msgid "Process Payments?"
-msgstr "Procesar pagos"
-
-#, fuzzy
-msgctxt "view:account.payment:"
-msgid "Approve"
-msgstr "Aprobado"
-
-#, fuzzy
-msgctxt "view:account.payment:"
-msgid "Description"
-msgstr "Descripción"
-
-#, fuzzy
-msgctxt "view:account.payment:"
-msgid "Draft"
-msgstr "Borrador"
-
-msgctxt "view:account.payment:"
-msgid "Fail"
-msgstr ""
-
-msgctxt "view:account.payment:"
-msgid "Other Info"
-msgstr ""
-
-#, fuzzy
-msgctxt "view:account.payment:"
-msgid "Payment"
-msgstr "Pago"
-
-#, fuzzy
-msgctxt "view:account.payment:"
-msgid "Payments"
-msgstr "Pagos"
-
-#, fuzzy
-msgctxt "view:account.payment:"
-msgid "Succeed"
-msgstr "Con éxito"
-
-msgctxt "wizard_button:account.move.line.pay,start,end:"
-msgid "Cancel"
-msgstr "Cancelar"
-
-msgctxt "wizard_button:account.move.line.pay,start,pay:"
-msgid "Pay"
-msgstr "Pagar"
-
-msgctxt "wizard_button:account.payment.process,start,end:"
-msgid "Cancel"
-msgstr "Cancelar"
-
-msgctxt "wizard_button:account.payment.process,start,process:"
-msgid "Process"
-msgstr "Procesar"
diff --git a/locale/fr_FR.po b/locale/fr.po
similarity index 89%
rename from locale/fr_FR.po
rename to locale/fr.po
index c8262d8..3f6431f 100644
--- a/locale/fr_FR.po
+++ b/locale/fr.po
@@ -2,6 +2,10 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+msgctxt "error:account.move.line.pay:"
+msgid "The Line \"%(line)s\" is blocked."
+msgstr "La ligne « %(line)s » est bloquée."
+
msgctxt "error:account.payment.process:"
msgid "The Payment \"%(payment)s\" overpays the Line \"%(line)s\"."
msgstr "Le paiement « %(payment)s » surpaye la ligne « %(line)s »."
@@ -18,6 +22,10 @@ msgctxt "field:account.move.line,payment_amount:"
msgid "Payment Amount"
msgstr "Montant du paiement"
+msgctxt "field:account.move.line,payment_blocked:"
+msgid "Blocked"
+msgstr "Bloquée"
+
msgctxt "field:account.move.line,payment_kind:"
msgid "Payment Kind"
msgstr "Genre de paiement"
@@ -26,18 +34,26 @@ msgctxt "field:account.move.line,payments:"
msgid "Payments"
msgstr "Paiements"
-msgctxt "field:account.move.line.pay.start,date:"
-msgid "Date"
-msgstr "Date"
+msgctxt "field:account.move.line.pay.ask_journal,company:"
+msgid "Company"
+msgstr "Société"
-msgctxt "field:account.move.line.pay.start,id:"
+msgctxt "field:account.move.line.pay.ask_journal,currency:"
+msgid "Currency"
+msgstr "Devise"
+
+msgctxt "field:account.move.line.pay.ask_journal,id:"
msgid "ID"
msgstr "ID"
-msgctxt "field:account.move.line.pay.start,journal:"
+msgctxt "field:account.move.line.pay.ask_journal,journal:"
msgid "Journal"
msgstr "Journal"
+msgctxt "field:account.move.line.pay.ask_journal,journals:"
+msgid "Journals"
+msgstr "Journaux"
+
msgctxt "field:account.payment,amount:"
msgid "Amount"
msgstr "Montant"
@@ -198,7 +214,7 @@ msgctxt "field:account.payment.process.start,id:"
msgid "ID"
msgstr "ID"
-msgctxt "model:account.move.line.pay.start,name:"
+msgctxt "model:account.move.line.pay.ask_journal,name:"
msgid "Pay Line"
msgstr "Payer la ligne"
@@ -324,6 +340,10 @@ msgctxt "model:res.group,name:group_payment"
msgid "Payment"
msgstr "Paiement"
+msgctxt "model:res.group,name:group_payment_approval"
+msgid "Payment Approval"
+msgstr "Approbation de paiement"
+
msgctxt "selection:account.move.line,payment_kind:"
msgid ""
msgstr ""
@@ -384,37 +404,17 @@ msgctxt "view:account.configuration:"
msgid "Payment"
msgstr "Paiement"
-msgctxt "view:account.move.line.pay.start:"
-msgid "Pay Line"
-msgstr "Payer la ligne"
-
msgctxt "view:account.move.line:"
-msgid "Account Move Lines"
-msgstr "Lignes de mouvement comptable"
+msgid "Block"
+msgstr "Bloquer"
msgctxt "view:account.move.line:"
msgid "Pay Lines"
msgstr "Payer les lignes"
-msgctxt "view:account.payment.group:"
-msgid "Payment Group"
-msgstr "Groupe de paiements"
-
-msgctxt "view:account.payment.group:"
-msgid "Payment Groups"
-msgstr "Groupes de paiements"
-
-msgctxt "view:account.payment.journal:"
-msgid "Payment Journal"
-msgstr "Journal de paiement"
-
-msgctxt "view:account.payment.journal:"
-msgid "Payment Journals"
-msgstr "Journaux de paiement"
-
-msgctxt "view:account.payment.process.start:"
-msgid "Process Payments"
-msgstr "Traitement des paiements"
+msgctxt "view:account.move.line:"
+msgid "Unblock"
+msgstr "Débloquer"
msgctxt "view:account.payment.process.start:"
msgid "Process Payments?"
@@ -441,22 +441,14 @@ msgid "Other Info"
msgstr "Autre information"
msgctxt "view:account.payment:"
-msgid "Payment"
-msgstr "Paiement"
-
-msgctxt "view:account.payment:"
-msgid "Payments"
-msgstr "Paiements"
-
-msgctxt "view:account.payment:"
msgid "Succeed"
msgstr "Réussir"
-msgctxt "wizard_button:account.move.line.pay,start,end:"
+msgctxt "wizard_button:account.move.line.pay,ask_journal,end:"
msgid "Cancel"
msgstr "Annuler"
-msgctxt "wizard_button:account.move.line.pay,start,pay:"
+msgctxt "wizard_button:account.move.line.pay,ask_journal,start:"
msgid "Pay"
msgstr "Payer"
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index 3004c9d..ab4f897 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -2,6 +2,10 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+msgctxt "error:account.move.line.pay:"
+msgid "The Line \"%(line)s\" is blocked."
+msgstr ""
+
msgctxt "error:account.payment.process:"
msgid "The Payment \"%(payment)s\" overpays the Line \"%(line)s\"."
msgstr ""
@@ -18,6 +22,10 @@ msgctxt "field:account.move.line,payment_amount:"
msgid "Payment Amount"
msgstr ""
+msgctxt "field:account.move.line,payment_blocked:"
+msgid "Blocked"
+msgstr ""
+
msgctxt "field:account.move.line,payment_kind:"
msgid "Payment Kind"
msgstr ""
@@ -26,57 +34,76 @@ msgctxt "field:account.move.line,payments:"
msgid "Payments"
msgstr ""
-msgctxt "field:account.move.line.pay.start,date:"
-msgid "Date"
-msgstr ""
+#, fuzzy
+msgctxt "field:account.move.line.pay.ask_journal,company:"
+msgid "Company"
+msgstr "Társaság"
-msgctxt "field:account.move.line.pay.start,id:"
+#, fuzzy
+msgctxt "field:account.move.line.pay.ask_journal,currency:"
+msgid "Currency"
+msgstr "Pénznem"
+
+#, fuzzy
+msgctxt "field:account.move.line.pay.ask_journal,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
-msgctxt "field:account.move.line.pay.start,journal:"
+msgctxt "field:account.move.line.pay.ask_journal,journal:"
msgid "Journal"
msgstr ""
+msgctxt "field:account.move.line.pay.ask_journal,journals:"
+msgid "Journals"
+msgstr ""
+
msgctxt "field:account.payment,amount:"
msgid "Amount"
msgstr ""
+#, fuzzy
msgctxt "field:account.payment,company:"
msgid "Company"
-msgstr ""
+msgstr "Társaság"
+#, fuzzy
msgctxt "field:account.payment,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Létrehozás détuma"
+#, fuzzy
msgctxt "field:account.payment,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Által létrehozva "
+#, fuzzy
msgctxt "field:account.payment,currency:"
msgid "Currency"
-msgstr ""
+msgstr "Pénznem"
msgctxt "field:account.payment,currency_digits:"
msgid "Currency Digits"
msgstr ""
+#, fuzzy
msgctxt "field:account.payment,date:"
msgid "Date"
-msgstr ""
+msgstr "Dátum"
+#, fuzzy
msgctxt "field:account.payment,description:"
msgid "Description"
-msgstr ""
+msgstr "Leírás"
+#, fuzzy
msgctxt "field:account.payment,group:"
msgid "Group"
-msgstr ""
+msgstr "Csoport"
+#, fuzzy
msgctxt "field:account.payment,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.payment,journal:"
msgid "Journal"
@@ -90,41 +117,50 @@ msgctxt "field:account.payment,line:"
msgid "Line"
msgstr ""
+#, fuzzy
msgctxt "field:account.payment,party:"
msgid "Party"
-msgstr ""
+msgstr "Partner"
+#, fuzzy
msgctxt "field:account.payment,rec_name:"
msgid "Name"
-msgstr ""
+msgstr "Név"
+#, fuzzy
msgctxt "field:account.payment,state:"
msgid "State"
-msgstr ""
+msgstr "Állapot"
+#, fuzzy
msgctxt "field:account.payment,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "utolsó módosítás dátuma"
+#, fuzzy
msgctxt "field:account.payment,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Által módosítva"
+#, fuzzy
msgctxt "field:account.payment.group,company:"
msgid "Company"
-msgstr ""
+msgstr "Társaság"
+#, fuzzy
msgctxt "field:account.payment.group,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Létrehozás détuma"
+#, fuzzy
msgctxt "field:account.payment.group,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Által létrehozva "
+#, fuzzy
msgctxt "field:account.payment.group,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.payment.group,journal:"
msgid "Journal"
@@ -134,71 +170,85 @@ msgctxt "field:account.payment.group,kind:"
msgid "Kind"
msgstr ""
+#, fuzzy
msgctxt "field:account.payment.group,number:"
msgid "Number"
-msgstr ""
+msgstr "Szám"
msgctxt "field:account.payment.group,payments:"
msgid "Payments"
msgstr ""
+#, fuzzy
msgctxt "field:account.payment.group,rec_name:"
msgid "Name"
-msgstr ""
+msgstr "Név"
+#, fuzzy
msgctxt "field:account.payment.group,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "utolsó módosítás dátuma"
+#, fuzzy
msgctxt "field:account.payment.group,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Által módosítva"
+#, fuzzy
msgctxt "field:account.payment.journal,company:"
msgid "Company"
-msgstr ""
+msgstr "Társaság"
+#, fuzzy
msgctxt "field:account.payment.journal,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Létrehozás détuma"
+#, fuzzy
msgctxt "field:account.payment.journal,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Által létrehozva "
+#, fuzzy
msgctxt "field:account.payment.journal,currency:"
msgid "Currency"
-msgstr ""
+msgstr "Pénznem"
+#, fuzzy
msgctxt "field:account.payment.journal,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
+#, fuzzy
msgctxt "field:account.payment.journal,name:"
msgid "Name"
-msgstr ""
+msgstr "Név"
msgctxt "field:account.payment.journal,process_method:"
msgid "Process Method"
msgstr ""
+#, fuzzy
msgctxt "field:account.payment.journal,rec_name:"
msgid "Name"
-msgstr ""
+msgstr "Név"
+#, fuzzy
msgctxt "field:account.payment.journal,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "utolsó módosítás dátuma"
+#, fuzzy
msgctxt "field:account.payment.journal,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Által módosítva"
+#, fuzzy
msgctxt "field:account.payment.process.start,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
-msgctxt "model:account.move.line.pay.start,name:"
+msgctxt "model:account.move.line.pay.ask_journal,name:"
msgid "Pay Line"
msgstr ""
@@ -260,9 +310,10 @@ msgctxt ""
msgid "Receivable"
msgstr ""
+#, fuzzy
msgctxt "model:ir.action.act_window.domain,name:act_payment_form_domain_all"
msgid "All"
-msgstr ""
+msgstr "Összes"
msgctxt ""
"model:ir.action.act_window.domain,name:act_payment_form_domain_approved"
@@ -324,6 +375,10 @@ msgctxt "model:res.group,name:group_payment"
msgid "Payment"
msgstr ""
+msgctxt "model:res.group,name:group_payment_approval"
+msgid "Payment Approval"
+msgstr ""
+
msgctxt "selection:account.move.line,payment_kind:"
msgid ""
msgstr ""
@@ -384,36 +439,16 @@ msgctxt "view:account.configuration:"
msgid "Payment"
msgstr ""
-msgctxt "view:account.move.line.pay.start:"
-msgid "Pay Line"
-msgstr ""
-
msgctxt "view:account.move.line:"
-msgid "Account Move Lines"
+msgid "Block"
msgstr ""
msgctxt "view:account.move.line:"
msgid "Pay Lines"
msgstr ""
-msgctxt "view:account.payment.group:"
-msgid "Payment Group"
-msgstr ""
-
-msgctxt "view:account.payment.group:"
-msgid "Payment Groups"
-msgstr ""
-
-msgctxt "view:account.payment.journal:"
-msgid "Payment Journal"
-msgstr ""
-
-msgctxt "view:account.payment.journal:"
-msgid "Payment Journals"
-msgstr ""
-
-msgctxt "view:account.payment.process.start:"
-msgid "Process Payments"
+msgctxt "view:account.move.line:"
+msgid "Unblock"
msgstr ""
msgctxt "view:account.payment.process.start:"
@@ -424,9 +459,10 @@ msgctxt "view:account.payment:"
msgid "Approve"
msgstr ""
+#, fuzzy
msgctxt "view:account.payment:"
msgid "Description"
-msgstr ""
+msgstr "Leírás"
msgctxt "view:account.payment:"
msgid "Draft"
@@ -441,28 +477,22 @@ msgid "Other Info"
msgstr ""
msgctxt "view:account.payment:"
-msgid "Payment"
-msgstr ""
-
-msgctxt "view:account.payment:"
-msgid "Payments"
-msgstr ""
-
-msgctxt "view:account.payment:"
msgid "Succeed"
msgstr ""
-msgctxt "wizard_button:account.move.line.pay,start,end:"
+#, fuzzy
+msgctxt "wizard_button:account.move.line.pay,ask_journal,end:"
msgid "Cancel"
-msgstr ""
+msgstr "Mégse"
-msgctxt "wizard_button:account.move.line.pay,start,pay:"
+msgctxt "wizard_button:account.move.line.pay,ask_journal,start:"
msgid "Pay"
msgstr ""
+#, fuzzy
msgctxt "wizard_button:account.payment.process,start,end:"
msgid "Cancel"
-msgstr ""
+msgstr "Mégse"
msgctxt "wizard_button:account.payment.process,start,process:"
msgid "Process"
diff --git a/locale/it_IT.po b/locale/it_IT.po
index b6b2d43..ecc387f 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -2,6 +2,10 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+msgctxt "error:account.move.line.pay:"
+msgid "The Line \"%(line)s\" is blocked."
+msgstr "La riga \"%(line)s\" è bloccata."
+
msgctxt "error:account.payment.process:"
msgid "The Payment \"%(payment)s\" overpays the Line \"%(line)s\"."
msgstr "Il pagamento \"%(payment)s\"supera la riga \"%(line)s\"."
@@ -12,12 +16,16 @@ msgstr "Il pagamento \"%s\" dev'essere in stato bozza per essere eliminato."
msgctxt "field:account.configuration,payment_group_sequence:"
msgid "Payment Group Sequence"
-msgstr ""
+msgstr "Sequenza gruppo pagamenti"
msgctxt "field:account.move.line,payment_amount:"
msgid "Payment Amount"
msgstr "Importo pagamento"
+msgctxt "field:account.move.line,payment_blocked:"
+msgid "Blocked"
+msgstr "Bloccato"
+
msgctxt "field:account.move.line,payment_kind:"
msgid "Payment Kind"
msgstr "Tipo pagamento"
@@ -26,19 +34,26 @@ msgctxt "field:account.move.line,payments:"
msgid "Payments"
msgstr "Pagamenti"
-#, fuzzy
-msgctxt "field:account.move.line.pay.start,date:"
-msgid "Date"
-msgstr "Data"
+msgctxt "field:account.move.line.pay.ask_journal,company:"
+msgid "Company"
+msgstr "Azienda"
+
+msgctxt "field:account.move.line.pay.ask_journal,currency:"
+msgid "Currency"
+msgstr "Valuta"
-msgctxt "field:account.move.line.pay.start,id:"
+msgctxt "field:account.move.line.pay.ask_journal,id:"
msgid "ID"
msgstr "ID"
-msgctxt "field:account.move.line.pay.start,journal:"
+msgctxt "field:account.move.line.pay.ask_journal,journal:"
msgid "Journal"
msgstr "Registro"
+msgctxt "field:account.move.line.pay.ask_journal,journals:"
+msgid "Journals"
+msgstr "Registri"
+
msgctxt "field:account.payment,amount:"
msgid "Amount"
msgstr "Importo"
@@ -137,7 +152,7 @@ msgstr "Tipo"
msgctxt "field:account.payment.group,number:"
msgid "Number"
-msgstr ""
+msgstr "Numero"
msgctxt "field:account.payment.group,payments:"
msgid "Payments"
@@ -199,7 +214,7 @@ msgctxt "field:account.payment.process.start,id:"
msgid "ID"
msgstr "ID"
-msgctxt "model:account.move.line.pay.start,name:"
+msgctxt "model:account.move.line.pay.ask_journal,name:"
msgid "Pay Line"
msgstr "Riga pagamento"
@@ -325,6 +340,10 @@ msgctxt "model:res.group,name:group_payment"
msgid "Payment"
msgstr "Pagamento"
+msgctxt "model:res.group,name:group_payment_approval"
+msgid "Payment Approval"
+msgstr "Approvazione Pagamento"
+
msgctxt "selection:account.move.line,payment_kind:"
msgid ""
msgstr ""
@@ -379,100 +398,57 @@ msgstr "Manuale"
msgctxt "view:account.configuration:"
msgid "Group Sequence"
-msgstr ""
+msgstr "Sequenza gruppo"
-#, fuzzy
msgctxt "view:account.configuration:"
msgid "Payment"
msgstr "Pagamento"
-#, fuzzy
-msgctxt "view:account.move.line.pay.start:"
-msgid "Pay Line"
-msgstr "Riga pagamento"
-
msgctxt "view:account.move.line:"
-msgid "Account Move Lines"
-msgstr ""
+msgid "Block"
+msgstr "Blocco"
-#, fuzzy
msgctxt "view:account.move.line:"
msgid "Pay Lines"
msgstr "Righe pagamento"
-#, fuzzy
-msgctxt "view:account.payment.group:"
-msgid "Payment Group"
-msgstr "Gruppo pagamento"
-
-#, fuzzy
-msgctxt "view:account.payment.group:"
-msgid "Payment Groups"
-msgstr "Gruppi pagamento"
-
-#, fuzzy
-msgctxt "view:account.payment.journal:"
-msgid "Payment Journal"
-msgstr "Registro pagamento"
-
-#, fuzzy
-msgctxt "view:account.payment.journal:"
-msgid "Payment Journals"
-msgstr "Registri pagamento"
-
-#, fuzzy
-msgctxt "view:account.payment.process.start:"
-msgid "Process Payments"
-msgstr "Processare i pagamenti "
+msgctxt "view:account.move.line:"
+msgid "Unblock"
+msgstr "Sblocca"
-#, fuzzy
msgctxt "view:account.payment.process.start:"
msgid "Process Payments?"
-msgstr "Processare i pagamenti "
+msgstr "Processare i pagamenti ?"
-#, fuzzy
msgctxt "view:account.payment:"
msgid "Approve"
-msgstr "Approvato"
+msgstr "Approvare"
-#, fuzzy
msgctxt "view:account.payment:"
msgid "Description"
msgstr "Descrizione"
-#, fuzzy
msgctxt "view:account.payment:"
msgid "Draft"
msgstr "Bozza"
msgctxt "view:account.payment:"
msgid "Fail"
-msgstr ""
+msgstr "non riuscito"
msgctxt "view:account.payment:"
msgid "Other Info"
-msgstr ""
-
-#, fuzzy
-msgctxt "view:account.payment:"
-msgid "Payment"
-msgstr "Pagamento"
+msgstr "Altre informazioni"
-#, fuzzy
-msgctxt "view:account.payment:"
-msgid "Payments"
-msgstr "Pagamenti"
-
-#, fuzzy
msgctxt "view:account.payment:"
msgid "Succeed"
msgstr "Riuscito"
-msgctxt "wizard_button:account.move.line.pay,start,end:"
+msgctxt "wizard_button:account.move.line.pay,ask_journal,end:"
msgid "Cancel"
-msgstr "Cancella"
+msgstr "Annulla"
-msgctxt "wizard_button:account.move.line.pay,start,pay:"
+msgctxt "wizard_button:account.move.line.pay,ask_journal,start:"
msgid "Pay"
msgstr "Pagare"
diff --git a/locale/ja_JP.po b/locale/ja_JP.po
index 3004c9d..2eca05e 100644
--- a/locale/ja_JP.po
+++ b/locale/ja_JP.po
@@ -2,6 +2,10 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+msgctxt "error:account.move.line.pay:"
+msgid "The Line \"%(line)s\" is blocked."
+msgstr ""
+
msgctxt "error:account.payment.process:"
msgid "The Payment \"%(payment)s\" overpays the Line \"%(line)s\"."
msgstr ""
@@ -18,26 +22,39 @@ msgctxt "field:account.move.line,payment_amount:"
msgid "Payment Amount"
msgstr ""
+msgctxt "field:account.move.line,payment_blocked:"
+msgid "Blocked"
+msgstr ""
+
msgctxt "field:account.move.line,payment_kind:"
msgid "Payment Kind"
msgstr ""
+#, fuzzy
msgctxt "field:account.move.line,payments:"
msgid "Payments"
+msgstr "Payments"
+
+msgctxt "field:account.move.line.pay.ask_journal,company:"
+msgid "Company"
msgstr ""
-msgctxt "field:account.move.line.pay.start,date:"
-msgid "Date"
+msgctxt "field:account.move.line.pay.ask_journal,currency:"
+msgid "Currency"
msgstr ""
-msgctxt "field:account.move.line.pay.start,id:"
+msgctxt "field:account.move.line.pay.ask_journal,id:"
msgid "ID"
msgstr ""
-msgctxt "field:account.move.line.pay.start,journal:"
+msgctxt "field:account.move.line.pay.ask_journal,journal:"
msgid "Journal"
msgstr ""
+msgctxt "field:account.move.line.pay.ask_journal,journals:"
+msgid "Journals"
+msgstr ""
+
msgctxt "field:account.payment,amount:"
msgid "Amount"
msgstr ""
@@ -138,9 +155,10 @@ msgctxt "field:account.payment.group,number:"
msgid "Number"
msgstr ""
+#, fuzzy
msgctxt "field:account.payment.group,payments:"
msgid "Payments"
-msgstr ""
+msgstr "Payments"
msgctxt "field:account.payment.group,rec_name:"
msgid "Name"
@@ -198,179 +216,199 @@ msgctxt "field:account.payment.process.start,id:"
msgid "ID"
msgstr ""
-msgctxt "model:account.move.line.pay.start,name:"
+#, fuzzy
+msgctxt "model:account.move.line.pay.ask_journal,name:"
msgid "Pay Line"
-msgstr ""
+msgstr "Pay Lines"
+#, fuzzy
msgctxt "model:account.payment,name:"
msgid "Payment"
-msgstr ""
+msgstr "Payment"
+#, fuzzy
msgctxt "model:account.payment.group,name:"
msgid "Payment Group"
-msgstr ""
+msgstr "Payment Groups"
+#, fuzzy
msgctxt "model:account.payment.journal,name:"
msgid "Payment Journal"
-msgstr ""
+msgstr "Payment Journals"
+#, fuzzy
msgctxt "model:account.payment.process.start,name:"
msgid "Process Payment"
-msgstr ""
+msgstr "Process Payments"
msgctxt "model:ir.action,name:act_move_line_form"
msgid "Lines to Pay"
-msgstr ""
+msgstr "Lines to Pay"
msgctxt "model:ir.action,name:act_pay_line"
msgid "Pay Lines"
-msgstr ""
+msgstr "Pay Lines"
msgctxt "model:ir.action,name:act_payment_form"
msgid "Payments"
-msgstr ""
+msgstr "Payments"
msgctxt "model:ir.action,name:act_payment_form_group_open"
msgid "Payments"
-msgstr ""
+msgstr "Payments"
msgctxt "model:ir.action,name:act_payment_form_line_relate"
msgid "Payments"
-msgstr ""
+msgstr "Payments"
msgctxt "model:ir.action,name:act_payment_group_form"
msgid "Payment Groups"
-msgstr ""
+msgstr "Payment Groups"
msgctxt "model:ir.action,name:act_payment_journal_form"
msgid "Payment Journals"
-msgstr ""
+msgstr "Payment Journals"
msgctxt "model:ir.action,name:act_process_payments"
msgid "Process Payments"
-msgstr ""
+msgstr "Process Payments"
msgctxt ""
"model:ir.action.act_window.domain,name:act_move_line_form_domain_payable"
msgid "Payable"
-msgstr ""
+msgstr "Payable"
msgctxt ""
"model:ir.action.act_window.domain,name:act_move_line_form_domain_receivable"
msgid "Receivable"
-msgstr ""
+msgstr "Receivable"
msgctxt "model:ir.action.act_window.domain,name:act_payment_form_domain_all"
msgid "All"
-msgstr ""
+msgstr "All"
msgctxt ""
"model:ir.action.act_window.domain,name:act_payment_form_domain_approved"
msgid "Approved"
-msgstr ""
+msgstr "Approved"
msgctxt "model:ir.action.act_window.domain,name:act_payment_form_domain_draft"
msgid "Draft"
-msgstr ""
+msgstr "Draft"
msgctxt ""
"model:ir.action.act_window.domain,name:act_payment_form_domain_failed"
msgid "Failed"
-msgstr ""
+msgstr "Failed"
msgctxt ""
"model:ir.action.act_window.domain,name:act_payment_form_domain_processing"
msgid "Processing"
-msgstr ""
+msgstr "Processing"
msgctxt ""
"model:ir.action.act_window.domain,name:act_payment_form_domain_suceeded"
msgid "Succeeded"
-msgstr ""
+msgstr "Succeeded"
msgctxt "model:ir.sequence,name:sequence_account_payment_group"
msgid "Default Account Payment Group"
-msgstr ""
+msgstr "Default Account Payment Group"
msgctxt "model:ir.sequence.type,name:sequence_type_account_payment_group"
msgid "Account Payment Group"
-msgstr ""
+msgstr "Account Payment Group"
msgctxt "model:ir.ui.menu,name:menu_move_line_form"
msgid "Lines to Pay"
-msgstr ""
+msgstr "Lines to Pay"
msgctxt "model:ir.ui.menu,name:menu_payment_configuration"
msgid "Payments"
-msgstr ""
+msgstr "Payments"
msgctxt "model:ir.ui.menu,name:menu_payment_form"
msgid "Payments"
-msgstr ""
+msgstr "Payments"
msgctxt "model:ir.ui.menu,name:menu_payment_group_form"
msgid "Payment Groups"
-msgstr ""
+msgstr "Payment Groups"
msgctxt "model:ir.ui.menu,name:menu_payment_journal_form"
msgid "Payment Journals"
-msgstr ""
+msgstr "Payment Journals"
msgctxt "model:ir.ui.menu,name:menu_payments"
msgid "Payments"
-msgstr ""
+msgstr "Payments"
msgctxt "model:res.group,name:group_payment"
msgid "Payment"
-msgstr ""
+msgstr "Payment"
+
+msgctxt "model:res.group,name:group_payment_approval"
+msgid "Payment Approval"
+msgstr "Payment Approval"
msgctxt "selection:account.move.line,payment_kind:"
msgid ""
msgstr ""
+#, fuzzy
msgctxt "selection:account.move.line,payment_kind:"
msgid "Payable"
-msgstr ""
+msgstr "Payable"
+#, fuzzy
msgctxt "selection:account.move.line,payment_kind:"
msgid "Receivable"
-msgstr ""
+msgstr "Receivable"
+#, fuzzy
msgctxt "selection:account.payment,kind:"
msgid "Payable"
-msgstr ""
+msgstr "Payable"
+#, fuzzy
msgctxt "selection:account.payment,kind:"
msgid "Receivable"
-msgstr ""
+msgstr "Receivable"
+#, fuzzy
msgctxt "selection:account.payment,state:"
msgid "Approved"
-msgstr ""
+msgstr "Approved"
+#, fuzzy
msgctxt "selection:account.payment,state:"
msgid "Draft"
-msgstr ""
+msgstr "Draft"
+#, fuzzy
msgctxt "selection:account.payment,state:"
msgid "Failed"
-msgstr ""
+msgstr "Failed"
+#, fuzzy
msgctxt "selection:account.payment,state:"
msgid "Processing"
-msgstr ""
+msgstr "Processing"
+#, fuzzy
msgctxt "selection:account.payment,state:"
msgid "Succeeded"
-msgstr ""
+msgstr "Succeeded"
+#, fuzzy
msgctxt "selection:account.payment.group,kind:"
msgid "Payable"
-msgstr ""
+msgstr "Payable"
+#, fuzzy
msgctxt "selection:account.payment.group,kind:"
msgid "Receivable"
-msgstr ""
+msgstr "Receivable"
msgctxt "selection:account.payment.journal,process_method:"
msgid "Manual"
@@ -380,57 +418,42 @@ msgctxt "view:account.configuration:"
msgid "Group Sequence"
msgstr ""
+#, fuzzy
msgctxt "view:account.configuration:"
msgid "Payment"
-msgstr ""
-
-msgctxt "view:account.move.line.pay.start:"
-msgid "Pay Line"
-msgstr ""
+msgstr "Payment"
msgctxt "view:account.move.line:"
-msgid "Account Move Lines"
+msgid "Block"
msgstr ""
+#, fuzzy
msgctxt "view:account.move.line:"
msgid "Pay Lines"
-msgstr ""
-
-msgctxt "view:account.payment.group:"
-msgid "Payment Group"
-msgstr ""
-
-msgctxt "view:account.payment.group:"
-msgid "Payment Groups"
-msgstr ""
+msgstr "Pay Lines"
-msgctxt "view:account.payment.journal:"
-msgid "Payment Journal"
-msgstr ""
-
-msgctxt "view:account.payment.journal:"
-msgid "Payment Journals"
-msgstr ""
-
-msgctxt "view:account.payment.process.start:"
-msgid "Process Payments"
+msgctxt "view:account.move.line:"
+msgid "Unblock"
msgstr ""
+#, fuzzy
msgctxt "view:account.payment.process.start:"
msgid "Process Payments?"
-msgstr ""
+msgstr "Process Payments"
+#, fuzzy
msgctxt "view:account.payment:"
msgid "Approve"
-msgstr ""
+msgstr "Approved"
msgctxt "view:account.payment:"
msgid "Description"
msgstr ""
+#, fuzzy
msgctxt "view:account.payment:"
msgid "Draft"
-msgstr ""
+msgstr "Draft"
msgctxt "view:account.payment:"
msgid "Fail"
@@ -440,23 +463,16 @@ msgctxt "view:account.payment:"
msgid "Other Info"
msgstr ""
-msgctxt "view:account.payment:"
-msgid "Payment"
-msgstr ""
-
-msgctxt "view:account.payment:"
-msgid "Payments"
-msgstr ""
-
+#, fuzzy
msgctxt "view:account.payment:"
msgid "Succeed"
-msgstr ""
+msgstr "Succeeded"
-msgctxt "wizard_button:account.move.line.pay,start,end:"
+msgctxt "wizard_button:account.move.line.pay,ask_journal,end:"
msgid "Cancel"
msgstr ""
-msgctxt "wizard_button:account.move.line.pay,start,pay:"
+msgctxt "wizard_button:account.move.line.pay,ask_journal,start:"
msgid "Pay"
msgstr ""
diff --git a/locale/lo_LA.po b/locale/lo.po
similarity index 81%
rename from locale/lo_LA.po
rename to locale/lo.po
index e2b4bc7..f85b248 100644
--- a/locale/lo_LA.po
+++ b/locale/lo.po
@@ -2,13 +2,17 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+msgctxt "error:account.move.line.pay:"
+msgid "The Line \"%(line)s\" is blocked."
+msgstr ""
+
msgctxt "error:account.payment.process:"
msgid "The Payment \"%(payment)s\" overpays the Line \"%(line)s\"."
msgstr "ການຊໍາລະເງິນ \"%(payment)s\" ຈ່າຍເກີນ ລາຍການ \"% (line)s\"."
msgctxt "error:account.payment:"
msgid "Payment \"%s\" must be in draft before deletion."
-msgstr "ການຈ່າຍເງິນ \"%s\" ຕ້ອງປັບໃຫ້ເປັນສະບັບຮ່າງກ່ອນຈຶ່ງລຶບໄດ້."
+msgstr "ການຊໍາລະເງິນ \"%s\" ຕ້ອງປັບໃຫ້ເປັນສະບັບຮ່າງກ່ອນຈຶ່ງລຶບໄດ້."
msgctxt "field:account.configuration,payment_group_sequence:"
msgid "Payment Group Sequence"
@@ -18,6 +22,10 @@ msgctxt "field:account.move.line,payment_amount:"
msgid "Payment Amount"
msgstr "ມູນຄ່າການຈ່າຍ"
+msgctxt "field:account.move.line,payment_blocked:"
+msgid "Blocked"
+msgstr ""
+
msgctxt "field:account.move.line,payment_kind:"
msgid "Payment Kind"
msgstr "ຊະນິດການຈ່າຍ"
@@ -26,33 +34,46 @@ msgctxt "field:account.move.line,payments:"
msgid "Payments"
msgstr "ການຊໍາລະເງິນ"
-msgctxt "field:account.move.line.pay.start,date:"
-msgid "Date"
-msgstr "ວັນທີ"
+#, fuzzy
+msgctxt "field:account.move.line.pay.ask_journal,company:"
+msgid "Company"
+msgstr "ສຳນັກງານ/ຫ້ອງການ"
+
+#, fuzzy
+msgctxt "field:account.move.line.pay.ask_journal,currency:"
+msgid "Currency"
+msgstr "ສະກຸນເງິນ"
-msgctxt "field:account.move.line.pay.start,id:"
+#, fuzzy
+msgctxt "field:account.move.line.pay.ask_journal,id:"
msgid "ID"
msgstr "ເລກລຳດັບ"
-msgctxt "field:account.move.line.pay.start,journal:"
+#, fuzzy
+msgctxt "field:account.move.line.pay.ask_journal,journal:"
msgid "Journal"
msgstr "ບັນຊີປະຈໍາວັນ"
+#, fuzzy
+msgctxt "field:account.move.line.pay.ask_journal,journals:"
+msgid "Journals"
+msgstr "ບັນຊີປະຈໍາວັນ"
+
msgctxt "field:account.payment,amount:"
msgid "Amount"
msgstr "ມູນຄ່າ"
msgctxt "field:account.payment,company:"
msgid "Company"
-msgstr "ບໍລິສັດ"
+msgstr "ສຳນັກງານ/ຫ້ອງການ"
msgctxt "field:account.payment,create_date:"
msgid "Create Date"
-msgstr "ສ້າງວັນທີ"
+msgstr "ວັນທີສ້າງ"
msgctxt "field:account.payment,create_uid:"
msgid "Create User"
-msgstr "ສ້າງຜູ້ໃຊ້"
+msgstr "ຜູ້ສ້າງ"
msgctxt "field:account.payment,currency:"
msgid "Currency"
@@ -60,7 +81,7 @@ msgstr "ສະກຸນເງິນ"
msgctxt "field:account.payment,currency_digits:"
msgid "Currency Digits"
-msgstr "ຕົວເລກເສດ"
+msgstr "ເລກເສດສະຸກນເງິນ"
msgctxt "field:account.payment,date:"
msgid "Date"
@@ -104,23 +125,23 @@ msgstr "ສະຖານະ"
msgctxt "field:account.payment,write_date:"
msgid "Write Date"
-msgstr "ຂຽນວັນທີ"
+msgstr "ວັນທີບັນທຶກ"
msgctxt "field:account.payment,write_uid:"
msgid "Write User"
-msgstr "ຂຽນຜູ້ໃຊ້ງານ"
+msgstr "ຜູ້ບັນທຶກ"
msgctxt "field:account.payment.group,company:"
msgid "Company"
-msgstr "ບໍລິສັດ"
+msgstr "ສຳນັກງານ/ຫ້ອງການ"
msgctxt "field:account.payment.group,create_date:"
msgid "Create Date"
-msgstr "ສ້າງວັນທີ"
+msgstr "ວັນທີສ້າງ"
msgctxt "field:account.payment.group,create_uid:"
msgid "Create User"
-msgstr "ສ້າງຜູ້ໃຊ້"
+msgstr "ຜູ້ສ້າງ"
msgctxt "field:account.payment.group,id:"
msgid "ID"
@@ -148,23 +169,23 @@ msgstr "ຊື່"
msgctxt "field:account.payment.group,write_date:"
msgid "Write Date"
-msgstr "ຂຽນວັນທີ"
+msgstr "ວັນທີບັນທຶກ"
msgctxt "field:account.payment.group,write_uid:"
msgid "Write User"
-msgstr "ຂຽນຜູ້ໃຊ້ງານ"
+msgstr "ຜູ້ບັນທຶກ"
msgctxt "field:account.payment.journal,company:"
msgid "Company"
-msgstr "ບໍລິສັດ"
+msgstr "ສຳນັກງານ/ຫ້ອງການ"
msgctxt "field:account.payment.journal,create_date:"
msgid "Create Date"
-msgstr "ສ້າງວັນທີ"
+msgstr "ວັນທີສ້າງ"
msgctxt "field:account.payment.journal,create_uid:"
msgid "Create User"
-msgstr "ສ້າງຜູ້ໃຊ້"
+msgstr "ຜູ້ສ້າງ"
msgctxt "field:account.payment.journal,currency:"
msgid "Currency"
@@ -180,7 +201,7 @@ msgstr "ຊື່"
msgctxt "field:account.payment.journal,process_method:"
msgid "Process Method"
-msgstr "ວິທີການຄຳນວນ"
+msgstr "ວິທີດຳເນີນການ"
msgctxt "field:account.payment.journal,rec_name:"
msgid "Name"
@@ -188,17 +209,18 @@ msgstr "ຊື່"
msgctxt "field:account.payment.journal,write_date:"
msgid "Write Date"
-msgstr "ຂຽນວັນທີ"
+msgstr "ວັນທີບັນທຶກ"
msgctxt "field:account.payment.journal,write_uid:"
msgid "Write User"
-msgstr "ຂຽນຜູ້ໃຊ້ງານ"
+msgstr "ຜູ້ບັນທຶກ"
msgctxt "field:account.payment.process.start,id:"
msgid "ID"
msgstr "ເລກລຳດັບ"
-msgctxt "model:account.move.line.pay.start,name:"
+#, fuzzy
+msgctxt "model:account.move.line.pay.ask_journal,name:"
msgid "Pay Line"
msgstr "ລາຍການຈ່າຍ"
@@ -244,7 +266,7 @@ msgstr "ໝວດການຈ່າຍ"
msgctxt "model:ir.action,name:act_payment_journal_form"
msgid "Payment Journals"
-msgstr "ບັນຊີປະຈໍາວັນ"
+msgstr "ບັນຊີລາຍຈ່າຍປະຈຳວັນ"
msgctxt "model:ir.action,name:act_process_payments"
msgid "Process Payments"
@@ -271,7 +293,7 @@ msgstr "ອະນຸມັດແລ້ວ"
msgctxt "model:ir.action.act_window.domain,name:act_payment_form_domain_draft"
msgid "Draft"
-msgstr "ສະບັບຮ່າງ"
+msgstr "ຮ່າງກຽມ"
msgctxt ""
"model:ir.action.act_window.domain,name:act_payment_form_domain_failed"
@@ -298,7 +320,7 @@ msgstr "ໝວດບັນຊີລາຍຈ່າຍ"
msgctxt "model:ir.ui.menu,name:menu_move_line_form"
msgid "Lines to Pay"
-msgstr "ລາຍການທີ່ຕ້ອງຈ່າຍ"
+msgstr "ລາຍການທີ່ຈະຈ່າຍ"
msgctxt "model:ir.ui.menu,name:menu_payment_configuration"
msgid "Payments"
@@ -324,6 +346,10 @@ msgctxt "model:res.group,name:group_payment"
msgid "Payment"
msgstr "ການຈ່າຍ"
+msgctxt "model:res.group,name:group_payment_approval"
+msgid "Payment Approval"
+msgstr ""
+
msgctxt "selection:account.move.line,payment_kind:"
msgid ""
msgstr ""
@@ -350,7 +376,7 @@ msgstr "ອະນຸມັດແລ້ວ"
msgctxt "selection:account.payment,state:"
msgid "Draft"
-msgstr "ສະບັບຮ່າງ"
+msgstr "ຮ່າງກຽມ"
msgctxt "selection:account.payment,state:"
msgid "Failed"
@@ -384,37 +410,17 @@ msgctxt "view:account.configuration:"
msgid "Payment"
msgstr "ການຈ່າຍ"
-msgctxt "view:account.move.line.pay.start:"
-msgid "Pay Line"
-msgstr "ລາຍການຈ່າຍ"
-
msgctxt "view:account.move.line:"
-msgid "Account Move Lines"
-msgstr "ລາຍການເຄື່ອນໄຫວບັນຊີ"
+msgid "Block"
+msgstr ""
msgctxt "view:account.move.line:"
msgid "Pay Lines"
msgstr "ລາຍການຈ່າຍ"
-msgctxt "view:account.payment.group:"
-msgid "Payment Group"
-msgstr "ໝວດການຈ່າຍ"
-
-msgctxt "view:account.payment.group:"
-msgid "Payment Groups"
-msgstr "ໝວດການຈ່າຍ"
-
-msgctxt "view:account.payment.journal:"
-msgid "Payment Journal"
-msgstr "ບັນຊີລາຍຈ່າຍປະຈຳວັນ"
-
-msgctxt "view:account.payment.journal:"
-msgid "Payment Journals"
-msgstr "ບັນຊີລາຍຈ່າຍປະຈຳວັນ"
-
-msgctxt "view:account.payment.process.start:"
-msgid "Process Payments"
-msgstr "ດຳເນີນການຊໍາລະ"
+msgctxt "view:account.move.line:"
+msgid "Unblock"
+msgstr ""
msgctxt "view:account.payment.process.start:"
msgid "Process Payments?"
@@ -430,7 +436,7 @@ msgstr "ຄຳອະທິບາຍ"
msgctxt "view:account.payment:"
msgid "Draft"
-msgstr "ສະບັບຮ່າງ"
+msgstr "ຮ່າງກຽມ"
msgctxt "view:account.payment:"
msgid "Fail"
@@ -438,25 +444,19 @@ msgstr "ລົ້ມເຫຼວ"
msgctxt "view:account.payment:"
msgid "Other Info"
-msgstr "ຂໍ້ມູນຂ່າວສານອື່ນໆ"
-
-msgctxt "view:account.payment:"
-msgid "Payment"
-msgstr "ການຈ່າຍ"
-
-msgctxt "view:account.payment:"
-msgid "Payments"
-msgstr "ການຊໍາລະເງິນ"
+msgstr "ຂໍ້ມູນອື່ນໆ"
msgctxt "view:account.payment:"
msgid "Succeed"
msgstr "ສຳເລັດແລ້ວ"
-msgctxt "wizard_button:account.move.line.pay,start,end:"
+#, fuzzy
+msgctxt "wizard_button:account.move.line.pay,ask_journal,end:"
msgid "Cancel"
msgstr "ຍົກເລີກ"
-msgctxt "wizard_button:account.move.line.pay,start,pay:"
+#, fuzzy
+msgctxt "wizard_button:account.move.line.pay,ask_journal,start:"
msgid "Pay"
msgstr "ຈ່າຍ"
diff --git a/locale/cs_CZ.po b/locale/lt.po
similarity index 90%
rename from locale/cs_CZ.po
rename to locale/lt.po
index 3004c9d..7db3762 100644
--- a/locale/cs_CZ.po
+++ b/locale/lt.po
@@ -2,6 +2,10 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+msgctxt "error:account.move.line.pay:"
+msgid "The Line \"%(line)s\" is blocked."
+msgstr ""
+
msgctxt "error:account.payment.process:"
msgid "The Payment \"%(payment)s\" overpays the Line \"%(line)s\"."
msgstr ""
@@ -18,6 +22,10 @@ msgctxt "field:account.move.line,payment_amount:"
msgid "Payment Amount"
msgstr ""
+msgctxt "field:account.move.line,payment_blocked:"
+msgid "Blocked"
+msgstr ""
+
msgctxt "field:account.move.line,payment_kind:"
msgid "Payment Kind"
msgstr ""
@@ -26,18 +34,26 @@ msgctxt "field:account.move.line,payments:"
msgid "Payments"
msgstr ""
-msgctxt "field:account.move.line.pay.start,date:"
-msgid "Date"
+msgctxt "field:account.move.line.pay.ask_journal,company:"
+msgid "Company"
msgstr ""
-msgctxt "field:account.move.line.pay.start,id:"
+msgctxt "field:account.move.line.pay.ask_journal,currency:"
+msgid "Currency"
+msgstr ""
+
+msgctxt "field:account.move.line.pay.ask_journal,id:"
msgid "ID"
msgstr ""
-msgctxt "field:account.move.line.pay.start,journal:"
+msgctxt "field:account.move.line.pay.ask_journal,journal:"
msgid "Journal"
msgstr ""
+msgctxt "field:account.move.line.pay.ask_journal,journals:"
+msgid "Journals"
+msgstr ""
+
msgctxt "field:account.payment,amount:"
msgid "Amount"
msgstr ""
@@ -94,9 +110,10 @@ msgctxt "field:account.payment,party:"
msgid "Party"
msgstr ""
+#, fuzzy
msgctxt "field:account.payment,rec_name:"
msgid "Name"
-msgstr ""
+msgstr "Namu"
msgctxt "field:account.payment,state:"
msgid "State"
@@ -142,9 +159,10 @@ msgctxt "field:account.payment.group,payments:"
msgid "Payments"
msgstr ""
+#, fuzzy
msgctxt "field:account.payment.group,rec_name:"
msgid "Name"
-msgstr ""
+msgstr "Namu"
msgctxt "field:account.payment.group,write_date:"
msgid "Write Date"
@@ -174,17 +192,19 @@ msgctxt "field:account.payment.journal,id:"
msgid "ID"
msgstr ""
+#, fuzzy
msgctxt "field:account.payment.journal,name:"
msgid "Name"
-msgstr ""
+msgstr "Namu"
msgctxt "field:account.payment.journal,process_method:"
msgid "Process Method"
msgstr ""
+#, fuzzy
msgctxt "field:account.payment.journal,rec_name:"
msgid "Name"
-msgstr ""
+msgstr "Namu"
msgctxt "field:account.payment.journal,write_date:"
msgid "Write Date"
@@ -198,7 +218,7 @@ msgctxt "field:account.payment.process.start,id:"
msgid "ID"
msgstr ""
-msgctxt "model:account.move.line.pay.start,name:"
+msgctxt "model:account.move.line.pay.ask_journal,name:"
msgid "Pay Line"
msgstr ""
@@ -324,6 +344,10 @@ msgctxt "model:res.group,name:group_payment"
msgid "Payment"
msgstr ""
+msgctxt "model:res.group,name:group_payment_approval"
+msgid "Payment Approval"
+msgstr ""
+
msgctxt "selection:account.move.line,payment_kind:"
msgid ""
msgstr ""
@@ -384,36 +408,16 @@ msgctxt "view:account.configuration:"
msgid "Payment"
msgstr ""
-msgctxt "view:account.move.line.pay.start:"
-msgid "Pay Line"
-msgstr ""
-
msgctxt "view:account.move.line:"
-msgid "Account Move Lines"
+msgid "Block"
msgstr ""
msgctxt "view:account.move.line:"
msgid "Pay Lines"
msgstr ""
-msgctxt "view:account.payment.group:"
-msgid "Payment Group"
-msgstr ""
-
-msgctxt "view:account.payment.group:"
-msgid "Payment Groups"
-msgstr ""
-
-msgctxt "view:account.payment.journal:"
-msgid "Payment Journal"
-msgstr ""
-
-msgctxt "view:account.payment.journal:"
-msgid "Payment Journals"
-msgstr ""
-
-msgctxt "view:account.payment.process.start:"
-msgid "Process Payments"
+msgctxt "view:account.move.line:"
+msgid "Unblock"
msgstr ""
msgctxt "view:account.payment.process.start:"
@@ -441,22 +445,14 @@ msgid "Other Info"
msgstr ""
msgctxt "view:account.payment:"
-msgid "Payment"
-msgstr ""
-
-msgctxt "view:account.payment:"
-msgid "Payments"
-msgstr ""
-
-msgctxt "view:account.payment:"
msgid "Succeed"
msgstr ""
-msgctxt "wizard_button:account.move.line.pay,start,end:"
+msgctxt "wizard_button:account.move.line.pay,ask_journal,end:"
msgid "Cancel"
msgstr ""
-msgctxt "wizard_button:account.move.line.pay,start,pay:"
+msgctxt "wizard_button:account.move.line.pay,ask_journal,start:"
msgid "Pay"
msgstr ""
diff --git a/locale/nl_NL.po b/locale/nl.po
similarity index 86%
rename from locale/nl_NL.po
rename to locale/nl.po
index 53d2e21..4e219e8 100644
--- a/locale/nl_NL.po
+++ b/locale/nl.po
@@ -2,6 +2,10 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+msgctxt "error:account.move.line.pay:"
+msgid "The Line \"%(line)s\" is blocked."
+msgstr ""
+
msgctxt "error:account.payment.process:"
msgid "The Payment \"%(payment)s\" overpays the Line \"%(line)s\"."
msgstr ""
@@ -18,6 +22,10 @@ msgctxt "field:account.move.line,payment_amount:"
msgid "Payment Amount"
msgstr ""
+msgctxt "field:account.move.line,payment_blocked:"
+msgid "Blocked"
+msgstr ""
+
msgctxt "field:account.move.line,payment_kind:"
msgid "Payment Kind"
msgstr ""
@@ -28,20 +36,31 @@ msgid "Payments"
msgstr "Betaling"
#, fuzzy
-msgctxt "field:account.move.line.pay.start,date:"
-msgid "Date"
-msgstr "Vervaldatum"
+msgctxt "field:account.move.line.pay.ask_journal,company:"
+msgid "Company"
+msgstr "Bedrijf"
+
+#, fuzzy
+msgctxt "field:account.move.line.pay.ask_journal,currency:"
+msgid "Currency"
+msgstr "Valuta"
-msgctxt "field:account.move.line.pay.start,id:"
+#, fuzzy
+msgctxt "field:account.move.line.pay.ask_journal,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
#, fuzzy
-msgctxt "field:account.move.line.pay.start,journal:"
+msgctxt "field:account.move.line.pay.ask_journal,journal:"
msgid "Journal"
msgstr "Dagboek"
#, fuzzy
+msgctxt "field:account.move.line.pay.ask_journal,journals:"
+msgid "Journals"
+msgstr "Dagboek"
+
+#, fuzzy
msgctxt "field:account.payment,amount:"
msgid "Amount"
msgstr "Bedrag"
@@ -51,13 +70,15 @@ msgctxt "field:account.payment,company:"
msgid "Company"
msgstr "Bedrijf"
+#, fuzzy
msgctxt "field:account.payment,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Datum"
+#, fuzzy
msgctxt "field:account.payment,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Gebruiker"
#, fuzzy
msgctxt "field:account.payment,currency:"
@@ -84,9 +105,10 @@ msgctxt "field:account.payment,group:"
msgid "Group"
msgstr "Groep"
+#, fuzzy
msgctxt "field:account.payment,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
#, fuzzy
msgctxt "field:account.payment,journal:"
@@ -118,30 +140,35 @@ msgctxt "field:account.payment,state:"
msgid "State"
msgstr "Status"
+#, fuzzy
msgctxt "field:account.payment,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Schrijfdatum"
+#, fuzzy
msgctxt "field:account.payment,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Gebruiker"
#, fuzzy
msgctxt "field:account.payment.group,company:"
msgid "Company"
msgstr "Bedrijf"
+#, fuzzy
msgctxt "field:account.payment.group,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Datum"
+#, fuzzy
msgctxt "field:account.payment.group,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Gebruiker"
+#, fuzzy
msgctxt "field:account.payment.group,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
#, fuzzy
msgctxt "field:account.payment.group,journal:"
@@ -153,9 +180,10 @@ msgctxt "field:account.payment.group,kind:"
msgid "Kind"
msgstr "Soort"
+#, fuzzy
msgctxt "field:account.payment.group,number:"
msgid "Number"
-msgstr ""
+msgstr "Nummer"
#, fuzzy
msgctxt "field:account.payment.group,payments:"
@@ -167,35 +195,40 @@ msgctxt "field:account.payment.group,rec_name:"
msgid "Name"
msgstr "Naam bijlage"
+#, fuzzy
msgctxt "field:account.payment.group,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Schrijfdatum"
+#, fuzzy
msgctxt "field:account.payment.group,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Gebruiker"
#, fuzzy
msgctxt "field:account.payment.journal,company:"
msgid "Company"
msgstr "Bedrijf"
+#, fuzzy
msgctxt "field:account.payment.journal,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Datum"
+#, fuzzy
msgctxt "field:account.payment.journal,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Gebruiker"
#, fuzzy
msgctxt "field:account.payment.journal,currency:"
msgid "Currency"
msgstr "Valuta"
+#, fuzzy
msgctxt "field:account.payment.journal,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
#, fuzzy
msgctxt "field:account.payment.journal,name:"
@@ -211,19 +244,22 @@ msgctxt "field:account.payment.journal,rec_name:"
msgid "Name"
msgstr "Naam bijlage"
+#, fuzzy
msgctxt "field:account.payment.journal,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Schrijfdatum"
+#, fuzzy
msgctxt "field:account.payment.journal,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Gebruiker"
+#, fuzzy
msgctxt "field:account.payment.process.start,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
-msgctxt "model:account.move.line.pay.start,name:"
+msgctxt "model:account.move.line.pay.ask_journal,name:"
msgid "Pay Line"
msgstr ""
@@ -363,6 +399,10 @@ msgctxt "model:res.group,name:group_payment"
msgid "Payment"
msgstr "Betaling"
+msgctxt "model:res.group,name:group_payment_approval"
+msgid "Payment Approval"
+msgstr ""
+
msgctxt "selection:account.move.line,payment_kind:"
msgid ""
msgstr ""
@@ -433,36 +473,16 @@ msgctxt "view:account.configuration:"
msgid "Payment"
msgstr "Betaling"
-msgctxt "view:account.move.line.pay.start:"
-msgid "Pay Line"
-msgstr ""
-
msgctxt "view:account.move.line:"
-msgid "Account Move Lines"
+msgid "Block"
msgstr ""
msgctxt "view:account.move.line:"
msgid "Pay Lines"
msgstr ""
-msgctxt "view:account.payment.group:"
-msgid "Payment Group"
-msgstr ""
-
-msgctxt "view:account.payment.group:"
-msgid "Payment Groups"
-msgstr ""
-
-msgctxt "view:account.payment.journal:"
-msgid "Payment Journal"
-msgstr ""
-
-msgctxt "view:account.payment.journal:"
-msgid "Payment Journals"
-msgstr ""
-
-msgctxt "view:account.payment.process.start:"
-msgid "Process Payments"
+msgctxt "view:account.move.line:"
+msgid "Unblock"
msgstr ""
msgctxt "view:account.payment.process.start:"
@@ -487,32 +507,24 @@ msgctxt "view:account.payment:"
msgid "Fail"
msgstr ""
-msgctxt "view:account.payment:"
-msgid "Other Info"
-msgstr ""
-
#, fuzzy
msgctxt "view:account.payment:"
-msgid "Payment"
-msgstr "Betaling"
-
-#, fuzzy
-msgctxt "view:account.payment:"
-msgid "Payments"
-msgstr "Betaling"
+msgid "Other Info"
+msgstr "Overige informatie"
msgctxt "view:account.payment:"
msgid "Succeed"
msgstr ""
#, fuzzy
-msgctxt "wizard_button:account.move.line.pay,start,end:"
+msgctxt "wizard_button:account.move.line.pay,ask_journal,end:"
msgid "Cancel"
msgstr "Annuleren"
-msgctxt "wizard_button:account.move.line.pay,start,pay:"
+#, fuzzy
+msgctxt "wizard_button:account.move.line.pay,ask_journal,start:"
msgid "Pay"
-msgstr ""
+msgstr "_Betalen"
#, fuzzy
msgctxt "wizard_button:account.payment.process,start,end:"
diff --git a/locale/hu_HU.po b/locale/pl.po
similarity index 79%
copy from locale/hu_HU.po
copy to locale/pl.po
index 3004c9d..2eca05e 100644
--- a/locale/hu_HU.po
+++ b/locale/pl.po
@@ -2,6 +2,10 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+msgctxt "error:account.move.line.pay:"
+msgid "The Line \"%(line)s\" is blocked."
+msgstr ""
+
msgctxt "error:account.payment.process:"
msgid "The Payment \"%(payment)s\" overpays the Line \"%(line)s\"."
msgstr ""
@@ -18,26 +22,39 @@ msgctxt "field:account.move.line,payment_amount:"
msgid "Payment Amount"
msgstr ""
+msgctxt "field:account.move.line,payment_blocked:"
+msgid "Blocked"
+msgstr ""
+
msgctxt "field:account.move.line,payment_kind:"
msgid "Payment Kind"
msgstr ""
+#, fuzzy
msgctxt "field:account.move.line,payments:"
msgid "Payments"
+msgstr "Payments"
+
+msgctxt "field:account.move.line.pay.ask_journal,company:"
+msgid "Company"
msgstr ""
-msgctxt "field:account.move.line.pay.start,date:"
-msgid "Date"
+msgctxt "field:account.move.line.pay.ask_journal,currency:"
+msgid "Currency"
msgstr ""
-msgctxt "field:account.move.line.pay.start,id:"
+msgctxt "field:account.move.line.pay.ask_journal,id:"
msgid "ID"
msgstr ""
-msgctxt "field:account.move.line.pay.start,journal:"
+msgctxt "field:account.move.line.pay.ask_journal,journal:"
msgid "Journal"
msgstr ""
+msgctxt "field:account.move.line.pay.ask_journal,journals:"
+msgid "Journals"
+msgstr ""
+
msgctxt "field:account.payment,amount:"
msgid "Amount"
msgstr ""
@@ -138,9 +155,10 @@ msgctxt "field:account.payment.group,number:"
msgid "Number"
msgstr ""
+#, fuzzy
msgctxt "field:account.payment.group,payments:"
msgid "Payments"
-msgstr ""
+msgstr "Payments"
msgctxt "field:account.payment.group,rec_name:"
msgid "Name"
@@ -198,179 +216,199 @@ msgctxt "field:account.payment.process.start,id:"
msgid "ID"
msgstr ""
-msgctxt "model:account.move.line.pay.start,name:"
+#, fuzzy
+msgctxt "model:account.move.line.pay.ask_journal,name:"
msgid "Pay Line"
-msgstr ""
+msgstr "Pay Lines"
+#, fuzzy
msgctxt "model:account.payment,name:"
msgid "Payment"
-msgstr ""
+msgstr "Payment"
+#, fuzzy
msgctxt "model:account.payment.group,name:"
msgid "Payment Group"
-msgstr ""
+msgstr "Payment Groups"
+#, fuzzy
msgctxt "model:account.payment.journal,name:"
msgid "Payment Journal"
-msgstr ""
+msgstr "Payment Journals"
+#, fuzzy
msgctxt "model:account.payment.process.start,name:"
msgid "Process Payment"
-msgstr ""
+msgstr "Process Payments"
msgctxt "model:ir.action,name:act_move_line_form"
msgid "Lines to Pay"
-msgstr ""
+msgstr "Lines to Pay"
msgctxt "model:ir.action,name:act_pay_line"
msgid "Pay Lines"
-msgstr ""
+msgstr "Pay Lines"
msgctxt "model:ir.action,name:act_payment_form"
msgid "Payments"
-msgstr ""
+msgstr "Payments"
msgctxt "model:ir.action,name:act_payment_form_group_open"
msgid "Payments"
-msgstr ""
+msgstr "Payments"
msgctxt "model:ir.action,name:act_payment_form_line_relate"
msgid "Payments"
-msgstr ""
+msgstr "Payments"
msgctxt "model:ir.action,name:act_payment_group_form"
msgid "Payment Groups"
-msgstr ""
+msgstr "Payment Groups"
msgctxt "model:ir.action,name:act_payment_journal_form"
msgid "Payment Journals"
-msgstr ""
+msgstr "Payment Journals"
msgctxt "model:ir.action,name:act_process_payments"
msgid "Process Payments"
-msgstr ""
+msgstr "Process Payments"
msgctxt ""
"model:ir.action.act_window.domain,name:act_move_line_form_domain_payable"
msgid "Payable"
-msgstr ""
+msgstr "Payable"
msgctxt ""
"model:ir.action.act_window.domain,name:act_move_line_form_domain_receivable"
msgid "Receivable"
-msgstr ""
+msgstr "Receivable"
msgctxt "model:ir.action.act_window.domain,name:act_payment_form_domain_all"
msgid "All"
-msgstr ""
+msgstr "All"
msgctxt ""
"model:ir.action.act_window.domain,name:act_payment_form_domain_approved"
msgid "Approved"
-msgstr ""
+msgstr "Approved"
msgctxt "model:ir.action.act_window.domain,name:act_payment_form_domain_draft"
msgid "Draft"
-msgstr ""
+msgstr "Draft"
msgctxt ""
"model:ir.action.act_window.domain,name:act_payment_form_domain_failed"
msgid "Failed"
-msgstr ""
+msgstr "Failed"
msgctxt ""
"model:ir.action.act_window.domain,name:act_payment_form_domain_processing"
msgid "Processing"
-msgstr ""
+msgstr "Processing"
msgctxt ""
"model:ir.action.act_window.domain,name:act_payment_form_domain_suceeded"
msgid "Succeeded"
-msgstr ""
+msgstr "Succeeded"
msgctxt "model:ir.sequence,name:sequence_account_payment_group"
msgid "Default Account Payment Group"
-msgstr ""
+msgstr "Default Account Payment Group"
msgctxt "model:ir.sequence.type,name:sequence_type_account_payment_group"
msgid "Account Payment Group"
-msgstr ""
+msgstr "Account Payment Group"
msgctxt "model:ir.ui.menu,name:menu_move_line_form"
msgid "Lines to Pay"
-msgstr ""
+msgstr "Lines to Pay"
msgctxt "model:ir.ui.menu,name:menu_payment_configuration"
msgid "Payments"
-msgstr ""
+msgstr "Payments"
msgctxt "model:ir.ui.menu,name:menu_payment_form"
msgid "Payments"
-msgstr ""
+msgstr "Payments"
msgctxt "model:ir.ui.menu,name:menu_payment_group_form"
msgid "Payment Groups"
-msgstr ""
+msgstr "Payment Groups"
msgctxt "model:ir.ui.menu,name:menu_payment_journal_form"
msgid "Payment Journals"
-msgstr ""
+msgstr "Payment Journals"
msgctxt "model:ir.ui.menu,name:menu_payments"
msgid "Payments"
-msgstr ""
+msgstr "Payments"
msgctxt "model:res.group,name:group_payment"
msgid "Payment"
-msgstr ""
+msgstr "Payment"
+
+msgctxt "model:res.group,name:group_payment_approval"
+msgid "Payment Approval"
+msgstr "Payment Approval"
msgctxt "selection:account.move.line,payment_kind:"
msgid ""
msgstr ""
+#, fuzzy
msgctxt "selection:account.move.line,payment_kind:"
msgid "Payable"
-msgstr ""
+msgstr "Payable"
+#, fuzzy
msgctxt "selection:account.move.line,payment_kind:"
msgid "Receivable"
-msgstr ""
+msgstr "Receivable"
+#, fuzzy
msgctxt "selection:account.payment,kind:"
msgid "Payable"
-msgstr ""
+msgstr "Payable"
+#, fuzzy
msgctxt "selection:account.payment,kind:"
msgid "Receivable"
-msgstr ""
+msgstr "Receivable"
+#, fuzzy
msgctxt "selection:account.payment,state:"
msgid "Approved"
-msgstr ""
+msgstr "Approved"
+#, fuzzy
msgctxt "selection:account.payment,state:"
msgid "Draft"
-msgstr ""
+msgstr "Draft"
+#, fuzzy
msgctxt "selection:account.payment,state:"
msgid "Failed"
-msgstr ""
+msgstr "Failed"
+#, fuzzy
msgctxt "selection:account.payment,state:"
msgid "Processing"
-msgstr ""
+msgstr "Processing"
+#, fuzzy
msgctxt "selection:account.payment,state:"
msgid "Succeeded"
-msgstr ""
+msgstr "Succeeded"
+#, fuzzy
msgctxt "selection:account.payment.group,kind:"
msgid "Payable"
-msgstr ""
+msgstr "Payable"
+#, fuzzy
msgctxt "selection:account.payment.group,kind:"
msgid "Receivable"
-msgstr ""
+msgstr "Receivable"
msgctxt "selection:account.payment.journal,process_method:"
msgid "Manual"
@@ -380,57 +418,42 @@ msgctxt "view:account.configuration:"
msgid "Group Sequence"
msgstr ""
+#, fuzzy
msgctxt "view:account.configuration:"
msgid "Payment"
-msgstr ""
-
-msgctxt "view:account.move.line.pay.start:"
-msgid "Pay Line"
-msgstr ""
+msgstr "Payment"
msgctxt "view:account.move.line:"
-msgid "Account Move Lines"
+msgid "Block"
msgstr ""
+#, fuzzy
msgctxt "view:account.move.line:"
msgid "Pay Lines"
-msgstr ""
-
-msgctxt "view:account.payment.group:"
-msgid "Payment Group"
-msgstr ""
-
-msgctxt "view:account.payment.group:"
-msgid "Payment Groups"
-msgstr ""
+msgstr "Pay Lines"
-msgctxt "view:account.payment.journal:"
-msgid "Payment Journal"
-msgstr ""
-
-msgctxt "view:account.payment.journal:"
-msgid "Payment Journals"
-msgstr ""
-
-msgctxt "view:account.payment.process.start:"
-msgid "Process Payments"
+msgctxt "view:account.move.line:"
+msgid "Unblock"
msgstr ""
+#, fuzzy
msgctxt "view:account.payment.process.start:"
msgid "Process Payments?"
-msgstr ""
+msgstr "Process Payments"
+#, fuzzy
msgctxt "view:account.payment:"
msgid "Approve"
-msgstr ""
+msgstr "Approved"
msgctxt "view:account.payment:"
msgid "Description"
msgstr ""
+#, fuzzy
msgctxt "view:account.payment:"
msgid "Draft"
-msgstr ""
+msgstr "Draft"
msgctxt "view:account.payment:"
msgid "Fail"
@@ -440,23 +463,16 @@ msgctxt "view:account.payment:"
msgid "Other Info"
msgstr ""
-msgctxt "view:account.payment:"
-msgid "Payment"
-msgstr ""
-
-msgctxt "view:account.payment:"
-msgid "Payments"
-msgstr ""
-
+#, fuzzy
msgctxt "view:account.payment:"
msgid "Succeed"
-msgstr ""
+msgstr "Succeeded"
-msgctxt "wizard_button:account.move.line.pay,start,end:"
+msgctxt "wizard_button:account.move.line.pay,ask_journal,end:"
msgid "Cancel"
msgstr ""
-msgctxt "wizard_button:account.move.line.pay,start,pay:"
+msgctxt "wizard_button:account.move.line.pay,ask_journal,start:"
msgid "Pay"
msgstr ""
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index aba284f..16ba86c 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -2,6 +2,10 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+msgctxt "error:account.move.line.pay:"
+msgid "The Line \"%(line)s\" is blocked."
+msgstr ""
+
msgctxt "error:account.payment.process:"
msgid "The Payment \"%(payment)s\" overpays the Line \"%(line)s\"."
msgstr "O Pagamento \"%(payment)s\" excede a Linha \"%(line)s\"."
@@ -18,6 +22,10 @@ msgctxt "field:account.move.line,payment_amount:"
msgid "Payment Amount"
msgstr "Montante do Pagamento"
+msgctxt "field:account.move.line,payment_blocked:"
+msgid "Blocked"
+msgstr ""
+
msgctxt "field:account.move.line,payment_kind:"
msgid "Payment Kind"
msgstr "Classe de Pagamento"
@@ -26,18 +34,31 @@ msgctxt "field:account.move.line,payments:"
msgid "Payments"
msgstr "Pagamentos"
-msgctxt "field:account.move.line.pay.start,date:"
-msgid "Date"
-msgstr "Data"
+#, fuzzy
+msgctxt "field:account.move.line.pay.ask_journal,company:"
+msgid "Company"
+msgstr "Empresa"
+
+#, fuzzy
+msgctxt "field:account.move.line.pay.ask_journal,currency:"
+msgid "Currency"
+msgstr "Moeda"
-msgctxt "field:account.move.line.pay.start,id:"
+#, fuzzy
+msgctxt "field:account.move.line.pay.ask_journal,id:"
msgid "ID"
msgstr "ID"
-msgctxt "field:account.move.line.pay.start,journal:"
+#, fuzzy
+msgctxt "field:account.move.line.pay.ask_journal,journal:"
msgid "Journal"
msgstr "Diário"
+#, fuzzy
+msgctxt "field:account.move.line.pay.ask_journal,journals:"
+msgid "Journals"
+msgstr "Diário"
+
msgctxt "field:account.payment,amount:"
msgid "Amount"
msgstr "Montante"
@@ -198,7 +219,8 @@ msgctxt "field:account.payment.process.start,id:"
msgid "ID"
msgstr "ID"
-msgctxt "model:account.move.line.pay.start,name:"
+#, fuzzy
+msgctxt "model:account.move.line.pay.ask_journal,name:"
msgid "Pay Line"
msgstr "Linha de Pagamento"
@@ -324,9 +346,14 @@ msgctxt "model:res.group,name:group_payment"
msgid "Payment"
msgstr "Pagamento"
+msgctxt "model:res.group,name:group_payment_approval"
+msgid "Payment Approval"
+msgstr ""
+
+#, fuzzy
msgctxt "selection:account.move.line,payment_kind:"
msgid ""
-msgstr ""
+msgstr "Português (Brasil)"
msgctxt "selection:account.move.line,payment_kind:"
msgid "Payable"
@@ -384,37 +411,17 @@ msgctxt "view:account.configuration:"
msgid "Payment"
msgstr "Pagamento"
-msgctxt "view:account.move.line.pay.start:"
-msgid "Pay Line"
-msgstr "Por Linha"
-
msgctxt "view:account.move.line:"
-msgid "Account Move Lines"
-msgstr "Linhas de Lançamentos Contábeis"
+msgid "Block"
+msgstr ""
msgctxt "view:account.move.line:"
msgid "Pay Lines"
msgstr "Linhas de Pagamento"
-msgctxt "view:account.payment.group:"
-msgid "Payment Group"
-msgstr "Grupo de Pagamento"
-
-msgctxt "view:account.payment.group:"
-msgid "Payment Groups"
-msgstr "Grupos de Pagamento"
-
-msgctxt "view:account.payment.journal:"
-msgid "Payment Journal"
-msgstr "Diário de Pagamento"
-
-msgctxt "view:account.payment.journal:"
-msgid "Payment Journals"
-msgstr "Diários de Pagamento"
-
-msgctxt "view:account.payment.process.start:"
-msgid "Process Payments"
-msgstr "Processar Pagamentos"
+msgctxt "view:account.move.line:"
+msgid "Unblock"
+msgstr ""
msgctxt "view:account.payment.process.start:"
msgid "Process Payments?"
@@ -441,22 +448,16 @@ msgid "Other Info"
msgstr "Outras informações"
msgctxt "view:account.payment:"
-msgid "Payment"
-msgstr "Pagamento"
-
-msgctxt "view:account.payment:"
-msgid "Payments"
-msgstr "Pagamentos"
-
-msgctxt "view:account.payment:"
msgid "Succeed"
msgstr "Sucesso"
-msgctxt "wizard_button:account.move.line.pay,start,end:"
+#, fuzzy
+msgctxt "wizard_button:account.move.line.pay,ask_journal,end:"
msgid "Cancel"
msgstr "Cancelar"
-msgctxt "wizard_button:account.move.line.pay,start,pay:"
+#, fuzzy
+msgctxt "wizard_button:account.move.line.pay,ask_journal,start:"
msgid "Pay"
msgstr "Pagar"
diff --git a/locale/ru_RU.po b/locale/ru.po
similarity index 91%
rename from locale/ru_RU.po
rename to locale/ru.po
index 3a74b8c..3ee58b8 100644
--- a/locale/ru_RU.po
+++ b/locale/ru.po
@@ -2,6 +2,10 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+msgctxt "error:account.move.line.pay:"
+msgid "The Line \"%(line)s\" is blocked."
+msgstr ""
+
msgctxt "error:account.payment.process:"
msgid "The Payment \"%(payment)s\" overpays the Line \"%(line)s\"."
msgstr ""
@@ -19,6 +23,10 @@ msgctxt "field:account.move.line,payment_amount:"
msgid "Payment Amount"
msgstr "Сумма оплаты"
+msgctxt "field:account.move.line,payment_blocked:"
+msgid "Blocked"
+msgstr ""
+
msgctxt "field:account.move.line,payment_kind:"
msgid "Payment Kind"
msgstr ""
@@ -29,21 +37,31 @@ msgid "Payments"
msgstr "Оплата"
#, fuzzy
-msgctxt "field:account.move.line.pay.start,date:"
-msgid "Date"
-msgstr "Дата"
+msgctxt "field:account.move.line.pay.ask_journal,company:"
+msgid "Company"
+msgstr "Учет.орг."
+
+#, fuzzy
+msgctxt "field:account.move.line.pay.ask_journal,currency:"
+msgid "Currency"
+msgstr "Валюты"
#, fuzzy
-msgctxt "field:account.move.line.pay.start,id:"
+msgctxt "field:account.move.line.pay.ask_journal,id:"
msgid "ID"
msgstr "ID"
#, fuzzy
-msgctxt "field:account.move.line.pay.start,journal:"
+msgctxt "field:account.move.line.pay.ask_journal,journal:"
msgid "Journal"
msgstr "Журнал"
#, fuzzy
+msgctxt "field:account.move.line.pay.ask_journal,journals:"
+msgid "Journals"
+msgstr "Журнал"
+
+#, fuzzy
msgctxt "field:account.payment,amount:"
msgid "Amount"
msgstr "Сумма"
@@ -163,9 +181,10 @@ msgctxt "field:account.payment.group,kind:"
msgid "Kind"
msgstr "Вид"
+#, fuzzy
msgctxt "field:account.payment.group,number:"
msgid "Number"
-msgstr ""
+msgstr "Номер"
#, fuzzy
msgctxt "field:account.payment.group,payments:"
@@ -241,7 +260,7 @@ msgctxt "field:account.payment.process.start,id:"
msgid "ID"
msgstr "ID"
-msgctxt "model:account.move.line.pay.start,name:"
+msgctxt "model:account.move.line.pay.ask_journal,name:"
msgid "Pay Line"
msgstr ""
@@ -382,6 +401,10 @@ msgctxt "model:res.group,name:group_payment"
msgid "Payment"
msgstr "Оплата"
+msgctxt "model:res.group,name:group_payment_approval"
+msgid "Payment Approval"
+msgstr ""
+
msgctxt "selection:account.move.line,payment_kind:"
msgid ""
msgstr ""
@@ -452,36 +475,16 @@ msgctxt "view:account.configuration:"
msgid "Payment"
msgstr "Оплата"
-msgctxt "view:account.move.line.pay.start:"
-msgid "Pay Line"
-msgstr ""
-
msgctxt "view:account.move.line:"
-msgid "Account Move Lines"
+msgid "Block"
msgstr ""
msgctxt "view:account.move.line:"
msgid "Pay Lines"
msgstr ""
-msgctxt "view:account.payment.group:"
-msgid "Payment Group"
-msgstr ""
-
-msgctxt "view:account.payment.group:"
-msgid "Payment Groups"
-msgstr ""
-
-msgctxt "view:account.payment.journal:"
-msgid "Payment Journal"
-msgstr ""
-
-msgctxt "view:account.payment.journal:"
-msgid "Payment Journals"
-msgstr ""
-
-msgctxt "view:account.payment.process.start:"
-msgid "Process Payments"
+msgctxt "view:account.move.line:"
+msgid "Unblock"
msgstr ""
msgctxt "view:account.payment.process.start:"
@@ -506,32 +509,24 @@ msgctxt "view:account.payment:"
msgid "Fail"
msgstr ""
-msgctxt "view:account.payment:"
-msgid "Other Info"
-msgstr ""
-
-#, fuzzy
-msgctxt "view:account.payment:"
-msgid "Payment"
-msgstr "Оплата"
-
#, fuzzy
msgctxt "view:account.payment:"
-msgid "Payments"
-msgstr "Оплата"
+msgid "Other Info"
+msgstr "Другая информация"
msgctxt "view:account.payment:"
msgid "Succeed"
msgstr ""
#, fuzzy
-msgctxt "wizard_button:account.move.line.pay,start,end:"
+msgctxt "wizard_button:account.move.line.pay,ask_journal,end:"
msgid "Cancel"
msgstr "Отменить"
-msgctxt "wizard_button:account.move.line.pay,start,pay:"
+#, fuzzy
+msgctxt "wizard_button:account.move.line.pay,ask_journal,start:"
msgid "Pay"
-msgstr ""
+msgstr "Оплата"
#, fuzzy
msgctxt "wizard_button:account.payment.process,start,end:"
diff --git a/locale/sl_SI.po b/locale/sl.po
similarity index 89%
rename from locale/sl_SI.po
rename to locale/sl.po
index 2e8df6d..bc9972b 100644
--- a/locale/sl_SI.po
+++ b/locale/sl.po
@@ -2,6 +2,10 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+msgctxt "error:account.move.line.pay:"
+msgid "The Line \"%(line)s\" is blocked."
+msgstr ""
+
msgctxt "error:account.payment.process:"
msgid "The Payment \"%(payment)s\" overpays the Line \"%(line)s\"."
msgstr "Plačilo \"%(payment)s\" je preplačalo postavko \"%(line)s\"."
@@ -18,6 +22,10 @@ msgctxt "field:account.move.line,payment_amount:"
msgid "Payment Amount"
msgstr "Znesek plačila"
+msgctxt "field:account.move.line,payment_blocked:"
+msgid "Blocked"
+msgstr "Zamrznjeno"
+
msgctxt "field:account.move.line,payment_kind:"
msgid "Payment Kind"
msgstr "Vrsta plačila"
@@ -26,18 +34,30 @@ msgctxt "field:account.move.line,payments:"
msgid "Payments"
msgstr "Plačila"
-msgctxt "field:account.move.line.pay.start,date:"
-msgid "Date"
-msgstr "Datum"
+#, fuzzy
+msgctxt "field:account.move.line.pay.ask_journal,company:"
+msgid "Company"
+msgstr "Družba"
-msgctxt "field:account.move.line.pay.start,id:"
+#, fuzzy
+msgctxt "field:account.move.line.pay.ask_journal,currency:"
+msgid "Currency"
+msgstr "Valuta"
+
+#, fuzzy
+msgctxt "field:account.move.line.pay.ask_journal,id:"
msgid "ID"
msgstr "ID"
-msgctxt "field:account.move.line.pay.start,journal:"
+#, fuzzy
+msgctxt "field:account.move.line.pay.ask_journal,journal:"
msgid "Journal"
msgstr "Dnevnik"
+msgctxt "field:account.move.line.pay.ask_journal,journals:"
+msgid "Journals"
+msgstr "Dnevniki"
+
msgctxt "field:account.payment,amount:"
msgid "Amount"
msgstr "Znesek"
@@ -198,9 +218,9 @@ msgctxt "field:account.payment.process.start,id:"
msgid "ID"
msgstr "ID"
-msgctxt "model:account.move.line.pay.start,name:"
+msgctxt "model:account.move.line.pay.ask_journal,name:"
msgid "Pay Line"
-msgstr "Plačilo postavke"
+msgstr ""
msgctxt "model:account.payment,name:"
msgid "Payment"
@@ -324,6 +344,10 @@ msgctxt "model:res.group,name:group_payment"
msgid "Payment"
msgstr "Računovodstvo - plačilo"
+msgctxt "model:res.group,name:group_payment_approval"
+msgid "Payment Approval"
+msgstr ""
+
msgctxt "selection:account.move.line,payment_kind:"
msgid ""
msgstr ""
@@ -384,37 +408,17 @@ msgctxt "view:account.configuration:"
msgid "Payment"
msgstr "Plačilo"
-msgctxt "view:account.move.line.pay.start:"
-msgid "Pay Line"
-msgstr "Plačilo postavke"
-
msgctxt "view:account.move.line:"
-msgid "Account Move Lines"
-msgstr "Postavke knjižb"
+msgid "Block"
+msgstr ""
msgctxt "view:account.move.line:"
msgid "Pay Lines"
msgstr "Plačilo postavk"
-msgctxt "view:account.payment.group:"
-msgid "Payment Group"
-msgstr "Plačilna skupina"
-
-msgctxt "view:account.payment.group:"
-msgid "Payment Groups"
-msgstr "Plačilne skupine"
-
-msgctxt "view:account.payment.journal:"
-msgid "Payment Journal"
-msgstr "Dnevnik plačil"
-
-msgctxt "view:account.payment.journal:"
-msgid "Payment Journals"
-msgstr "Dnevniki plačil"
-
-msgctxt "view:account.payment.process.start:"
-msgid "Process Payments"
-msgstr "Obdelava plačil"
+msgctxt "view:account.move.line:"
+msgid "Unblock"
+msgstr ""
msgctxt "view:account.payment.process.start:"
msgid "Process Payments?"
@@ -441,24 +445,17 @@ msgid "Other Info"
msgstr "Drugo"
msgctxt "view:account.payment:"
-msgid "Payment"
-msgstr "Plačilo"
-
-msgctxt "view:account.payment:"
-msgid "Payments"
-msgstr "Plačila"
-
-msgctxt "view:account.payment:"
msgid "Succeed"
msgstr "Uspelo"
-msgctxt "wizard_button:account.move.line.pay,start,end:"
+#, fuzzy
+msgctxt "wizard_button:account.move.line.pay,ask_journal,end:"
msgid "Cancel"
msgstr "Prekliči"
-msgctxt "wizard_button:account.move.line.pay,start,pay:"
+msgctxt "wizard_button:account.move.line.pay,ask_journal,start:"
msgid "Pay"
-msgstr "Plačilo"
+msgstr "Plačaj"
msgctxt "wizard_button:account.payment.process,start,end:"
msgid "Cancel"
diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index 3004c9d..cb52d81 100644
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -2,6 +2,10 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+msgctxt "error:account.move.line.pay:"
+msgid "The Line \"%(line)s\" is blocked."
+msgstr ""
+
msgctxt "error:account.payment.process:"
msgid "The Payment \"%(payment)s\" overpays the Line \"%(line)s\"."
msgstr ""
@@ -18,6 +22,10 @@ msgctxt "field:account.move.line,payment_amount:"
msgid "Payment Amount"
msgstr ""
+msgctxt "field:account.move.line,payment_blocked:"
+msgid "Blocked"
+msgstr ""
+
msgctxt "field:account.move.line,payment_kind:"
msgid "Payment Kind"
msgstr ""
@@ -26,18 +34,27 @@ msgctxt "field:account.move.line,payments:"
msgid "Payments"
msgstr ""
-msgctxt "field:account.move.line.pay.start,date:"
-msgid "Date"
+msgctxt "field:account.move.line.pay.ask_journal,company:"
+msgid "Company"
msgstr ""
-msgctxt "field:account.move.line.pay.start,id:"
-msgid "ID"
+msgctxt "field:account.move.line.pay.ask_journal,currency:"
+msgid "Currency"
msgstr ""
-msgctxt "field:account.move.line.pay.start,journal:"
+#, fuzzy
+msgctxt "field:account.move.line.pay.ask_journal,id:"
+msgid "ID"
+msgstr "编号"
+
+msgctxt "field:account.move.line.pay.ask_journal,journal:"
msgid "Journal"
msgstr ""
+msgctxt "field:account.move.line.pay.ask_journal,journals:"
+msgid "Journals"
+msgstr ""
+
msgctxt "field:account.payment,amount:"
msgid "Amount"
msgstr ""
@@ -46,13 +63,15 @@ msgctxt "field:account.payment,company:"
msgid "Company"
msgstr ""
+#, fuzzy
msgctxt "field:account.payment,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "创建日期:"
+#, fuzzy
msgctxt "field:account.payment,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "添加用户"
msgctxt "field:account.payment,currency:"
msgid "Currency"
@@ -62,21 +81,25 @@ msgctxt "field:account.payment,currency_digits:"
msgid "Currency Digits"
msgstr ""
+#, fuzzy
msgctxt "field:account.payment,date:"
msgid "Date"
-msgstr ""
+msgstr "日期格式"
+#, fuzzy
msgctxt "field:account.payment,description:"
msgid "Description"
-msgstr ""
+msgstr "描述"
+#, fuzzy
msgctxt "field:account.payment,group:"
msgid "Group"
-msgstr ""
+msgstr "用户组"
+#, fuzzy
msgctxt "field:account.payment,id:"
msgid "ID"
-msgstr ""
+msgstr "编号"
msgctxt "field:account.payment,journal:"
msgid "Journal"
@@ -94,37 +117,44 @@ msgctxt "field:account.payment,party:"
msgid "Party"
msgstr ""
+#, fuzzy
msgctxt "field:account.payment,rec_name:"
msgid "Name"
-msgstr ""
+msgstr "纳木"
+#, fuzzy
msgctxt "field:account.payment,state:"
msgid "State"
-msgstr ""
+msgstr "状态"
+#, fuzzy
msgctxt "field:account.payment,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "写入日期"
+#, fuzzy
msgctxt "field:account.payment,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "写入帐号"
msgctxt "field:account.payment.group,company:"
msgid "Company"
msgstr ""
+#, fuzzy
msgctxt "field:account.payment.group,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "创建日期:"
+#, fuzzy
msgctxt "field:account.payment.group,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "添加用户"
+#, fuzzy
msgctxt "field:account.payment.group,id:"
msgid "ID"
-msgstr ""
+msgstr "编号"
msgctxt "field:account.payment.group,journal:"
msgid "Journal"
@@ -142,63 +172,74 @@ msgctxt "field:account.payment.group,payments:"
msgid "Payments"
msgstr ""
+#, fuzzy
msgctxt "field:account.payment.group,rec_name:"
msgid "Name"
-msgstr ""
+msgstr "纳木"
+#, fuzzy
msgctxt "field:account.payment.group,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "写入日期"
+#, fuzzy
msgctxt "field:account.payment.group,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "写入帐号"
msgctxt "field:account.payment.journal,company:"
msgid "Company"
msgstr ""
+#, fuzzy
msgctxt "field:account.payment.journal,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "创建日期:"
+#, fuzzy
msgctxt "field:account.payment.journal,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "添加用户"
msgctxt "field:account.payment.journal,currency:"
msgid "Currency"
msgstr ""
+#, fuzzy
msgctxt "field:account.payment.journal,id:"
msgid "ID"
-msgstr ""
+msgstr "编号"
+#, fuzzy
msgctxt "field:account.payment.journal,name:"
msgid "Name"
-msgstr ""
+msgstr "纳木"
msgctxt "field:account.payment.journal,process_method:"
msgid "Process Method"
msgstr ""
+#, fuzzy
msgctxt "field:account.payment.journal,rec_name:"
msgid "Name"
-msgstr ""
+msgstr "纳木"
+#, fuzzy
msgctxt "field:account.payment.journal,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "写入日期"
+#, fuzzy
msgctxt "field:account.payment.journal,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "写入帐号"
+#, fuzzy
msgctxt "field:account.payment.process.start,id:"
msgid "ID"
-msgstr ""
+msgstr "编号"
-msgctxt "model:account.move.line.pay.start,name:"
+msgctxt "model:account.move.line.pay.ask_journal,name:"
msgid "Pay Line"
msgstr ""
@@ -260,9 +301,10 @@ msgctxt ""
msgid "Receivable"
msgstr ""
+#, fuzzy
msgctxt "model:ir.action.act_window.domain,name:act_payment_form_domain_all"
msgid "All"
-msgstr ""
+msgstr "全部"
msgctxt ""
"model:ir.action.act_window.domain,name:act_payment_form_domain_approved"
@@ -324,6 +366,10 @@ msgctxt "model:res.group,name:group_payment"
msgid "Payment"
msgstr ""
+msgctxt "model:res.group,name:group_payment_approval"
+msgid "Payment Approval"
+msgstr ""
+
msgctxt "selection:account.move.line,payment_kind:"
msgid ""
msgstr ""
@@ -384,36 +430,16 @@ msgctxt "view:account.configuration:"
msgid "Payment"
msgstr ""
-msgctxt "view:account.move.line.pay.start:"
-msgid "Pay Line"
-msgstr ""
-
msgctxt "view:account.move.line:"
-msgid "Account Move Lines"
+msgid "Block"
msgstr ""
msgctxt "view:account.move.line:"
msgid "Pay Lines"
msgstr ""
-msgctxt "view:account.payment.group:"
-msgid "Payment Group"
-msgstr ""
-
-msgctxt "view:account.payment.group:"
-msgid "Payment Groups"
-msgstr ""
-
-msgctxt "view:account.payment.journal:"
-msgid "Payment Journal"
-msgstr ""
-
-msgctxt "view:account.payment.journal:"
-msgid "Payment Journals"
-msgstr ""
-
-msgctxt "view:account.payment.process.start:"
-msgid "Process Payments"
+msgctxt "view:account.move.line:"
+msgid "Unblock"
msgstr ""
msgctxt "view:account.payment.process.start:"
@@ -424,9 +450,10 @@ msgctxt "view:account.payment:"
msgid "Approve"
msgstr ""
+#, fuzzy
msgctxt "view:account.payment:"
msgid "Description"
-msgstr ""
+msgstr "描述"
msgctxt "view:account.payment:"
msgid "Draft"
@@ -441,28 +468,22 @@ msgid "Other Info"
msgstr ""
msgctxt "view:account.payment:"
-msgid "Payment"
-msgstr ""
-
-msgctxt "view:account.payment:"
-msgid "Payments"
-msgstr ""
-
-msgctxt "view:account.payment:"
msgid "Succeed"
msgstr ""
-msgctxt "wizard_button:account.move.line.pay,start,end:"
+#, fuzzy
+msgctxt "wizard_button:account.move.line.pay,ask_journal,end:"
msgid "Cancel"
-msgstr ""
+msgstr "取消"
-msgctxt "wizard_button:account.move.line.pay,start,pay:"
+msgctxt "wizard_button:account.move.line.pay,ask_journal,start:"
msgid "Pay"
msgstr ""
+#, fuzzy
msgctxt "wizard_button:account.payment.process,start,end:"
msgid "Cancel"
-msgstr ""
+msgstr "取消"
msgctxt "wizard_button:account.payment.process,start,process:"
msgid "Process"
diff --git a/party.py b/party.py
new file mode 100644
index 0000000..3757fd8
--- /dev/null
+++ b/party.py
@@ -0,0 +1,16 @@
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
+from trytond.pool import PoolMeta
+
+__all__ = ['PartyReplace']
+
+
+class PartyReplace:
+ __metaclass__ = PoolMeta
+ __name__ = 'party.replace'
+
+ @classmethod
+ def fields_to_replace(cls):
+ return super(PartyReplace, cls).fields_to_replace() + [
+ ('account.payment', 'party'),
+ ]
diff --git a/payment.xml b/payment.xml
index 55dcd6d..7e6c201 100644
--- a/payment.xml
+++ b/payment.xml
@@ -16,6 +16,20 @@ this repository contains the full copyright notices and license terms. -->
<field name="group" ref="group_payment"/>
</record>
+ <record model="res.group" id="group_payment_approval">
+ <field name="name">Payment Approval</field>
+ </record>
+ <record model="res.user-res.group"
+ id="user_admin_group_payment_approval">
+ <field name="user" ref="res.user_admin"/>
+ <field name="group" ref="group_payment_approval"/>
+ </record>
+ <record model="res.user-res.group"
+ id="user_trigger_group_payment_approval">
+ <field name="user" ref="res.user_trigger"/>
+ <field name="group" ref="group_payment_approval"/>
+ </record>
+
<menuitem name="Payments" parent="account.menu_account" sequence="30"
id="menu_payments"/>
<menuitem name="Payments" parent="account.menu_account_configuration"
@@ -201,18 +215,21 @@ this repository contains the full copyright notices and license terms. -->
<field name="name">Draft</field>
<field name="sequence" eval="10"/>
<field name="domain" eval="[('state', '=', 'draft')]" pyson="1"/>
+ <field name="count" eval="True"/>
<field name="act_window" ref="act_payment_form"/>
</record>
<record model="ir.action.act_window.domain" id="act_payment_form_domain_approved">
<field name="name">Approved</field>
<field name="sequence" eval="20"/>
<field name="domain" eval="[('state', '=', 'approved')]" pyson="1"/>
+ <field name="count" eval="True"/>
<field name="act_window" ref="act_payment_form"/>
</record>
<record model="ir.action.act_window.domain" id="act_payment_form_domain_processing">
<field name="name">Processing</field>
<field name="sequence" eval="30"/>
<field name="domain" eval="[('state', '=', 'processing')]" pyson="1"/>
+ <field name="count" eval="True"/>
<field name="act_window" ref="act_payment_form"/>
</record>
<record model="ir.action.act_window.domain" id="act_payment_form_domain_suceeded">
@@ -252,7 +269,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="name">Payments</field>
<field name="res_model">account.payment</field>
<field name="domain"
- eval="[('line', '=', Eval('active_id'))]" pyson="1"/>
+ eval="[('line', 'in', Eval('active_ids', []))]" pyson="1"/>
</record>
<record model="ir.action.act_window.view"
id="act_payment_form_line_relate_view1">
@@ -321,6 +338,14 @@ this repository contains the full copyright notices and license terms. -->
<field name="perm_create" eval="True"/>
<field name="perm_delete" eval="True"/>
</record>
+ <record model="ir.model.access" id="access_payment_payment_approval">
+ <field name="model" search="[('model', '=', 'account.payment')]"/>
+ <field name="group" ref="group_payment_approval"/>
+ <field name="perm_read" eval="True"/>
+ <field name="perm_write" eval="False"/>
+ <field name="perm_create" eval="False"/>
+ <field name="perm_delete" eval="False"/>
+ </record>
<record model="ir.model.button" id="payment_draft_button">
<field name="name">draft</field>
@@ -335,9 +360,9 @@ this repository contains the full copyright notices and license terms. -->
<field name="name">approve</field>
<field name="model" search="[('model', '=', 'account.payment')]"/>
</record>
- <record model="ir.model.button-res.group" id="payment_approve_button_group_payment">
+ <record model="ir.model.button-res.group" id="payment_approve_button_group_payment_approval">
<field name="button" ref="payment_approve_button"/>
- <field name="group" ref="group_payment"/>
+ <field name="group" ref="group_payment_approval"/>
</record>
<record model="ir.model.button" id="payment_succeed_button">
diff --git a/setup.py b/setup.py
index bf0d3ec..965d265 100644
--- a/setup.py
+++ b/setup.py
@@ -54,6 +54,8 @@ for dep in info.get('depends', []):
requires.append(get_require_version('trytond'))
tests_require = [get_require_version('proteus')]
+for dep in ['account_invoice']:
+ tests_require.append(get_require_version('trytond_%s' % dep))
dependency_links = []
if minor_version % 2:
# Add development index for testing with proteus
@@ -96,6 +98,7 @@ setup(name=name,
'Natural Language :: German',
'Natural Language :: Hungarian',
'Natural Language :: Italian',
+ 'Natural Language :: Polish',
'Natural Language :: Portuguese (Brazilian)',
'Natural Language :: Russian',
'Natural Language :: Slovenian',
diff --git a/tests/scenario_account_payment.rst b/tests/scenario_account_payment.rst
index 69d07ef..89b1294 100644
--- a/tests/scenario_account_payment.rst
+++ b/tests/scenario_account_payment.rst
@@ -5,24 +5,16 @@ Payment Scenario
Imports::
>>> import datetime
>>> from decimal import Decimal
- >>> from proteus import config, Model, Wizard
+ >>> from proteus import Model, Wizard
+ >>> from trytond.tests.tools import activate_modules
>>> from trytond.modules.company.tests.tools import create_company, \
... get_company
>>> from trytond.modules.account.tests.tools import create_fiscalyear, \
... create_chart, get_accounts
-Create database::
-
- >>> config = config.set_trytond()
- >>> config.pool.test = True
-
Install account_payment::
- >>> Module = Model.get('ir.module')
- >>> account_payment_module, = Module.find(
- ... [('name', '=', 'account_payment')])
- >>> account_payment_module.click('install')
- >>> Wizard('ir.module.install_upgrade').execute('upgrade')
+ >>> config = activate_modules('account_payment')
Create company::
@@ -74,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
@@ -97,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')
@@ -114,3 +106,27 @@ Partially fail to pay the remaining::
>>> line.reload()
>>> line.payment_amount
Decimal('30.00')
+
+Pay line and block it after::
+
+ >>> move, = move.duplicate()
+ >>> move.click('post')
+ >>> 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('start')
+ >>> len(line.payments)
+ 1
+
+ >>> line.click('payment_block')
+ >>> len(line.payments)
+ 0
+
+Try to pay blocked line::
+
+ >>> pay_line = Wizard('account.move.line.pay', [line])
+ >>> pay_line.form.journal = payment_journal
+ >>> pay_line.execute('start') # doctest: +IGNORE_EXCEPTION_DETAIL
+ Traceback (most recent call last):
+ ...
+ UserWarning: ...
diff --git a/tests/scenario_account_payment_invoice.rst b/tests/scenario_account_payment_invoice.rst
new file mode 100644
index 0000000..f43ca95
--- /dev/null
+++ b/tests/scenario_account_payment_invoice.rst
@@ -0,0 +1,109 @@
+========================
+Invoice Payment Scenario
+========================
+
+Imports::
+ >>> import datetime
+ >>> from decimal import Decimal
+ >>> from proteus import Model, Wizard
+ >>> from trytond.tests.tools import activate_modules
+ >>> from trytond.modules.company.tests.tools import create_company, \
+ ... get_company
+ >>> from trytond.modules.account.tests.tools import create_fiscalyear, \
+ ... create_chart, get_accounts
+ >>> from trytond.modules.account_invoice.tests.tools import \
+ ... set_fiscalyear_invoice_sequences
+
+Install account_payment and account_invoice::
+
+ >>> config = activate_modules(['account_payment', 'account_invoice'])
+
+Create company::
+
+ >>> _ = create_company()
+ >>> company = get_company()
+
+Create fiscal year::
+
+ >>> fiscalyear = set_fiscalyear_invoice_sequences(
+ ... create_fiscalyear(company))
+ >>> fiscalyear.click('create_period')
+
+Create chart of accounts::
+
+ >>> _ = create_chart(company)
+ >>> accounts = get_accounts(company)
+ >>> payable = accounts['payable']
+ >>> receivable = accounts['receivable']
+ >>> revenue = accounts['revenue']
+
+ >>> Journal = Model.get('account.journal')
+ >>> expense, = Journal.find([('code', '=', 'EXP')])
+
+Create payment journal::
+
+ >>> PaymentJournal = Model.get('account.payment.journal')
+ >>> payment_journal = PaymentJournal(name='Manual',
+ ... process_method='manual')
+ >>> payment_journal.save()
+
+Create party::
+
+ >>> Party = Model.get('party.party')
+ >>> party = Party(name='Party')
+ >>> party.save()
+
+Create invoice::
+
+ >>> Invoice = Model.get('account.invoice')
+ >>> invoice = Invoice()
+ >>> invoice.party = party
+ >>> line = invoice.lines.new()
+ >>> line.description = 'Description'
+ >>> line.account = revenue
+ >>> line.quantity = 1
+ >>> line.unit_price = Decimal('100')
+ >>> invoice.click('post')
+ >>> invoice.state
+ u'posted'
+ >>> invoice.amount_to_pay
+ Decimal('100.00')
+ >>> line_to_pay, = invoice.lines_to_pay
+
+Partially pay line::
+
+ >>> Payment = Model.get('account.payment')
+ >>> pay_line = Wizard('account.move.line.pay', [line_to_pay])
+ >>> pay_line.form.journal = payment_journal
+ >>> pay_line.execute('start')
+ >>> payment, = Payment.find()
+ >>> payment.amount = Decimal('20')
+ >>> payment.click('approve')
+
+Check amount to pay::
+
+ >>> invoice.reload()
+ >>> invoice.amount_to_pay
+ Decimal('80.00')
+
+Process the payment::
+
+ >>> process_payment = Wizard('account.payment.process', [payment])
+ >>> process_payment.execute('process')
+
+Check amount to pay::
+
+ >>> invoice.reload()
+ >>> invoice.amount_to_pay
+ Decimal('80.00')
+
+Fail the payment::
+
+ >>> payment.click('fail')
+
+Check amount to pay::
+
+ >>> invoice.reload()
+ >>> invoice.amount_to_pay
+ Decimal('100.00')
+
diff --git a/tests/test_account_payment.py b/tests/test_account_payment.py
index b4fac92..15d0a91 100644
--- a/tests/test_account_payment.py
+++ b/tests/test_account_payment.py
@@ -4,7 +4,7 @@ import unittest
import doctest
import trytond.tests.test_tryton
from trytond.tests.test_tryton import ModuleTestCase
-from trytond.tests.test_tryton import doctest_setup, doctest_teardown
+from trytond.tests.test_tryton import doctest_teardown
from trytond.tests.test_tryton import doctest_checker
@@ -18,7 +18,11 @@ def suite():
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
AccountPaymentTestCase))
suite.addTests(doctest.DocFileSuite('scenario_account_payment.rst',
- setUp=doctest_setup, tearDown=doctest_teardown, encoding='utf-8',
+ tearDown=doctest_teardown, encoding='utf-8',
+ checker=doctest_checker,
+ optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
+ suite.addTests(doctest.DocFileSuite('scenario_account_payment_invoice.rst',
+ tearDown=doctest_teardown, encoding='utf-8',
checker=doctest_checker,
optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
return suite
diff --git a/tryton.cfg b/tryton.cfg
index 4c9679c..d805c2f 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.0.1
+version=4.2.0
depends:
account
company
@@ -7,6 +7,8 @@ depends:
ir
party
res
+extras_depend:
+ account_invoice
xml:
payment.xml
account.xml
diff --git a/trytond_account_payment.egg-info/PKG-INFO b/trytond_account_payment.egg-info/PKG-INFO
index 81f2c79..f6bdae9 100644
--- a/trytond_account_payment.egg-info/PKG-INFO
+++ b/trytond_account_payment.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-account-payment
-Version: 4.0.1
+Version: 4.2.0
Summary: Tryton module for payment
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/4.0/
+Download-URL: http://downloads.tryton.org/4.2/
Description: trytond_account_payment
=======================
@@ -62,6 +62,7 @@ Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Hungarian
Classifier: Natural Language :: Italian
+Classifier: Natural Language :: Polish
Classifier: Natural Language :: Portuguese (Brazilian)
Classifier: Natural Language :: Russian
Classifier: Natural Language :: Slovenian
diff --git a/trytond_account_payment.egg-info/SOURCES.txt b/trytond_account_payment.egg-info/SOURCES.txt
index 8a32ab2..67e5456 100644
--- a/trytond_account_payment.egg-info/SOURCES.txt
+++ b/trytond_account_payment.egg-info/SOURCES.txt
@@ -11,35 +11,35 @@ tryton.cfg
./__init__.py
./account.py
./account.xml
+./party.py
./payment.py
./payment.xml
./tryton.cfg
-./locale/bg_BG.po
-./locale/ca_ES.po
-./locale/cs_CZ.po
-./locale/de_DE.po
-./locale/es_AR.po
-./locale/es_CO.po
-./locale/es_EC.po
-./locale/es_ES.po
-./locale/es_MX.po
-./locale/fr_FR.po
+./locale/bg.po
+./locale/ca.po
+./locale/cs.po
+./locale/de.po
+./locale/es.po
+./locale/es_419.po
+./locale/fr.po
./locale/hu_HU.po
./locale/it_IT.po
./locale/ja_JP.po
-./locale/lo_LA.po
-./locale/lt_LT.po
-./locale/nl_NL.po
+./locale/lo.po
+./locale/lt.po
+./locale/nl.po
+./locale/pl.po
./locale/pt_BR.po
-./locale/ru_RU.po
-./locale/sl_SI.po
+./locale/ru.po
+./locale/sl.po
./locale/zh_CN.po
./tests/__init__.py
./tests/scenario_account_payment.rst
+./tests/scenario_account_payment_invoice.rst
./tests/test_account_payment.py
./view/configuration_form.xml
./view/move_line_list.xml
-./view/move_line_pay_start_form.xml
+./view/move_line_pay_ask_journal_form.xml
./view/payment_form.xml
./view/payment_group_form.xml
./view/payment_group_list.xml
@@ -48,27 +48,26 @@ tryton.cfg
./view/payment_list.xml
./view/payment_process_start_form.xml
doc/index.rst
-locale/bg_BG.po
-locale/ca_ES.po
-locale/cs_CZ.po
-locale/de_DE.po
-locale/es_AR.po
-locale/es_CO.po
-locale/es_EC.po
-locale/es_ES.po
-locale/es_MX.po
-locale/fr_FR.po
+locale/bg.po
+locale/ca.po
+locale/cs.po
+locale/de.po
+locale/es.po
+locale/es_419.po
+locale/fr.po
locale/hu_HU.po
locale/it_IT.po
locale/ja_JP.po
-locale/lo_LA.po
-locale/lt_LT.po
-locale/nl_NL.po
+locale/lo.po
+locale/lt.po
+locale/nl.po
+locale/pl.po
locale/pt_BR.po
-locale/ru_RU.po
-locale/sl_SI.po
+locale/ru.po
+locale/sl.po
locale/zh_CN.po
tests/scenario_account_payment.rst
+tests/scenario_account_payment_invoice.rst
trytond_account_payment.egg-info/PKG-INFO
trytond_account_payment.egg-info/SOURCES.txt
trytond_account_payment.egg-info/dependency_links.txt
@@ -78,7 +77,7 @@ trytond_account_payment.egg-info/requires.txt
trytond_account_payment.egg-info/top_level.txt
view/configuration_form.xml
view/move_line_list.xml
-view/move_line_pay_start_form.xml
+view/move_line_pay_ask_journal_form.xml
view/payment_form.xml
view/payment_group_form.xml
view/payment_group_list.xml
diff --git a/trytond_account_payment.egg-info/requires.txt b/trytond_account_payment.egg-info/requires.txt
index 82d7e8c..665321c 100644
--- a/trytond_account_payment.egg-info/requires.txt
+++ b/trytond_account_payment.egg-info/requires.txt
@@ -1,6 +1,6 @@
python-sql >= 0.4
-trytond_account >= 4.0, < 4.1
-trytond_company >= 4.0, < 4.1
-trytond_currency >= 4.0, < 4.1
-trytond_party >= 4.0, < 4.1
-trytond >= 4.0, < 4.1
+trytond_account >= 4.2, < 4.3
+trytond_company >= 4.2, < 4.3
+trytond_currency >= 4.2, < 4.3
+trytond_party >= 4.2, < 4.3
+trytond >= 4.2, < 4.3
diff --git a/view/move_line_list.xml b/view/move_line_list.xml
index dc17c7f..848d905 100644
--- a/view/move_line_list.xml
+++ b/view/move_line_list.xml
@@ -1,7 +1,7 @@
<?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. -->
-<tree string="Account Move Lines">
+<tree>
<field name="move"/>
<field name="origin"/>
<field name="description"/>
@@ -13,6 +13,9 @@ this repository contains the full copyright notices and license terms. -->
<field name="debit"/>
<field name="credit"/>
<field name="amount_second_currency"/>
+ <field name="payment_blocked" tree_invisible="1"/>
+ <button name="payment_block" string="Block"/>
+ <button name="payment_unblock" string="Unblock"/>
<field name="payment_kind" tree_invisible="1"/>
<button name="pay" string="Pay Lines" tree_invisible="1"/>
</tree>
diff --git a/view/move_line_pay_start_form.xml b/view/move_line_pay_ask_journal_form.xml
similarity index 63%
rename from view/move_line_pay_start_form.xml
rename to view/move_line_pay_ask_journal_form.xml
index 8bcc8d1..fea8aaf 100644
--- a/view/move_line_pay_start_form.xml
+++ b/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 string="Pay Line">
+<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>
diff --git a/view/payment_form.xml b/view/payment_form.xml
index c8f247a..8b81481 100644
--- a/view/payment_form.xml
+++ b/view/payment_form.xml
@@ -1,7 +1,7 @@
<?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 string="Payment">
+<form>
<label name="journal"/>
<field name="journal"/>
<label name="kind"/>
diff --git a/view/payment_group_form.xml b/view/payment_group_form.xml
index daa3824..82e47a0 100644
--- a/view/payment_group_form.xml
+++ b/view/payment_group_form.xml
@@ -1,7 +1,7 @@
<?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 string="Payment Group">
+<form>
<label name="number"/>
<field name="number"/>
<label name="company"/>
diff --git a/view/payment_group_list.xml b/view/payment_group_list.xml
index a0c668c..812c4d0 100644
--- a/view/payment_group_list.xml
+++ b/view/payment_group_list.xml
@@ -1,7 +1,7 @@
<?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. -->
-<tree string="Payment Groups" keyword_open="1">
+<tree keyword_open="1">
<field name="number"/>
<field name="journal"/>
<field name="kind"/>
diff --git a/view/payment_journal_form.xml b/view/payment_journal_form.xml
index 84bfd3a..c5683ae 100644
--- a/view/payment_journal_form.xml
+++ b/view/payment_journal_form.xml
@@ -1,7 +1,7 @@
<?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 string="Payment Journal">
+<form>
<label name="name"/>
<field name="name"/>
<label name="company"/>
diff --git a/view/payment_journal_list.xml b/view/payment_journal_list.xml
index 7b4a1cf..1fa354a 100644
--- a/view/payment_journal_list.xml
+++ b/view/payment_journal_list.xml
@@ -1,7 +1,7 @@
<?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. -->
-<tree string="Payment Journals">
+<tree>
<field name="name"/>
<field name="currency"/>
<field name="process_method"/>
diff --git a/view/payment_list.xml b/view/payment_list.xml
index d2a522f..dcd561d 100644
--- a/view/payment_list.xml
+++ b/view/payment_list.xml
@@ -1,7 +1,7 @@
<?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. -->
-<tree string="Payments">
+<tree>
<field name="journal"/>
<field name="kind"/>
<field name="party"/>
diff --git a/view/payment_process_start_form.xml b/view/payment_process_start_form.xml
index 4f06fc3..d05c001 100644
--- a/view/payment_process_start_form.xml
+++ b/view/payment_process_start_form.xml
@@ -1,7 +1,7 @@
<?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 string="Process Payments" col="2">
+<form col="2">
<image name="tryton-dialog-information" xexpand="0" xfill="0"/>
<label string="Process Payments?" id="process"
yalign="0.0" xalign="0.0" xexpand="1"/>
--
tryton-modules-account-payment
More information about the tryton-debian-vcs
mailing list