[IMP] account_banking_payment_export: Make journal_ids not required

Now if it's empty, all journals are taken into account
This commit is contained in:
Pedro M. Baeza
2016-02-18 09:40:25 +01:00
parent c533cbd864
commit 34cd712828
4 changed files with 16 additions and 283 deletions

View File

@@ -1,276 +0,0 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * account_banking_payment_export
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-07-02 10:51+0000\n"
"PO-Revision-Date: 2015-07-02 10:51+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
#. module: account_banking_payment_export
#: field:payment.mode,active:0
#: field:payment.mode.type,active:0
msgid "Active"
msgstr ""
#. module: account_banking_payment_export
#: view:payment.manual:account_banking_payment_export.view_payment_manual_form
msgid "Cancel"
msgstr ""
#. module: account_banking_payment_export
#: field:payment.mode.type,code:0
msgid "Code"
msgstr ""
#. module: account_banking_payment_export
#: field:payment.manual,create_uid:0
#: field:payment.mode.type,create_uid:0
msgid "Created by"
msgstr ""
#. module: account_banking_payment_export
#: field:payment.manual,create_date:0
#: field:payment.mode.type,create_date:0
msgid "Created on"
msgstr ""
#. module: account_banking_payment_export
#: selection:payment.mode.type,payment_order_type:0
msgid "Debit"
msgstr ""
#. module: account_banking_payment_export
#: selection:payment.order,payment_order_type:0
msgid "Direct debit"
msgstr ""
#. module: account_banking_payment_export
#: code:addons/account_banking_payment_export/wizard/payment_order_create.py:121
#, python-format
msgid "Entry Lines"
msgstr ""
#. module: account_banking_payment_export
#: code:addons/account_banking_payment_export/models/account_payment.py:68
#, python-format
msgid "Error"
msgstr ""
#. module: account_banking_payment_export
#: field:payment.mode,type:0
msgid "Export type"
msgstr ""
#. module: account_banking_payment_export
#: field:payment.manual,id:0
#: field:payment.mode.type,id:0
msgid "ID"
msgstr ""
#. module: account_banking_payment_export
#: model:ir.model,name:account_banking_payment_export.model_account_invoice
msgid "Invoice"
msgstr ""
#. module: account_banking_payment_export
#: view:account.move.line:account_banking_payment_export.payment_order_populate_view_move_line_tree
msgid "Journal Entry"
msgstr ""
#. module: account_banking_payment_export
#: view:account.move.line:account_banking_payment_export.payment_order_populate_view_move_line_tree
#: model:ir.model,name:account_banking_payment_export.model_account_move_line
msgid "Journal Items"
msgstr ""
#. module: account_banking_payment_export
#: field:payment.manual,write_uid:0
#: field:payment.mode.type,write_uid:0
msgid "Last Updated by"
msgstr ""
#. module: account_banking_payment_export
#: field:payment.manual,write_date:0
#: field:payment.mode.type,write_date:0
msgid "Last Updated on"
msgstr ""
#. module: account_banking_payment_export
#: view:payment.manual:account_banking_payment_export.view_payment_manual_form
msgid "Manual payment"
msgstr ""
#. module: account_banking_payment_export
#: field:payment.mode.type,name:0
msgid "Name"
msgstr ""
#. module: account_banking_payment_export
#: view:payment.mode:account_banking_payment_export.view_payment_mode_form_inherit
#: field:payment.mode,note:0
msgid "Note"
msgstr ""
#. module: account_banking_payment_export
#: field:payment.mode.type,payment_order_type:0
msgid "Order type"
msgstr ""
#. module: account_banking_payment_export
#: selection:payment.mode.type,payment_order_type:0
#: selection:payment.order,payment_order_type:0
msgid "Payment"
msgstr ""
#. module: account_banking_payment_export
#: model:ir.actions.act_window,name:account_banking_payment_export.action_payment_mode_type
#: model:ir.ui.menu,name:account_banking_payment_export.menu_payment_mode_type
msgid "Payment Export Types"
msgstr ""
#. module: account_banking_payment_export
#: model:ir.model,name:account_banking_payment_export.model_payment_mode
msgid "Payment Mode"
msgstr ""
#. module: account_banking_payment_export
#: model:ir.model,name:account_banking_payment_export.model_payment_mode_type
msgid "Payment Mode Type"
msgstr ""
#. module: account_banking_payment_export
#: model:ir.model,name:account_banking_payment_export.model_payment_order
msgid "Payment Order"
msgstr ""
#. module: account_banking_payment_export
#: code:addons/account_banking_payment_export/models/account_payment.py:53
#, python-format
msgid "Payment Order Export"
msgstr ""
#. module: account_banking_payment_export
#: code:addons/account_banking_payment_export/wizard/payment_order_create.py:213
#, python-format
msgid "Payment Orders"
msgstr ""
#. module: account_banking_payment_export
#: view:payment.mode.type:account_banking_payment_export.view_payment_mode_type_form
#: help:payment.mode.type,name:0
msgid "Payment Type"
msgstr ""
#. module: account_banking_payment_export
#: view:payment.mode.type:account_banking_payment_export.view_payment_mode_type_tree
msgid "Payment Types"
msgstr ""
#. module: account_banking_payment_export
#: field:payment.order,payment_order_type:0
msgid "Payment order type"
msgstr ""
#. module: account_banking_payment_export
#: field:payment.mode.type,ir_model_id:0
msgid "Payment wizard"
msgstr ""
#. module: account_banking_payment_export
#: view:payment.manual:account_banking_payment_export.view_payment_manual_form
msgid "Please execute payment order manually, and click OK when succesfully sent."
msgstr ""
#. module: account_banking_payment_export
#: field:payment.order.create,populate_results:0
msgid "Populate results directly"
msgstr ""
#. module: account_banking_payment_export
#: help:payment.mode,type:0
msgid "Select the Export Payment Type for the Payment Mode."
msgstr ""
#. module: account_banking_payment_export
#: help:payment.mode.type,ir_model_id:0
msgid "Select the Payment Wizard for payments of this type. Leave empty for manual processing"
msgstr ""
#. module: account_banking_payment_export
#: field:payment.mode,purchase_ok:0
msgid "Selectable on purchase operations"
msgstr ""
#. module: account_banking_payment_export
#: field:payment.mode,sale_ok:0
msgid "Selectable on sale operations"
msgstr ""
#. module: account_banking_payment_export
#: model:ir.model,name:account_banking_payment_export.model_payment_manual
msgid "Send payment order(s) manually"
msgstr ""
#. module: account_banking_payment_export
#: help:payment.mode.type,code:0
msgid "Specify the Code for Payment Type"
msgstr ""
#. module: account_banking_payment_export
#: code:addons/account_banking_payment_export/models/account_invoice.py:34
#, python-format
msgid "Structured Reference"
msgstr ""
#. module: account_banking_payment_export
#: view:payment.mode.type:account_banking_payment_export.view_payment_mode_type_form
#: field:payment.mode.type,suitable_bank_types:0
msgid "Suitable bank types"
msgstr ""
#. module: account_banking_payment_export
#: help:payment.mode.type,payment_order_type:0
msgid "This field determines if this type applies to customers (Debit) or suppliers (Payment)"
msgstr ""
#. module: account_banking_payment_export
#: view:account.move.line:account_banking_payment_export.payment_order_populate_view_move_line_tree
msgid "Total Credit"
msgstr ""
#. module: account_banking_payment_export
#: view:account.move.line:account_banking_payment_export.payment_order_populate_view_move_line_tree
msgid "Total Debit"
msgstr ""
#. module: account_banking_payment_export
#: code:addons/account_banking_payment_export/models/account_payment.py:69
#, python-format
msgid "You can only combine payment orders of the same type"
msgstr ""
#. module: account_banking_payment_export
#: view:payment.order:account_banking_payment_export.view_banking_payment_order_form_1
msgid "launch_wizard"
msgstr ""
#. module: account_banking_payment_export
#: view:payment.order:account_banking_payment_export.view_banking_payment_order_form_1
msgid "{\n"
" 'invisible': [('state', '!=', 'draft')]}"
msgstr ""
#. module: account_banking_payment_export
#: view:payment.order.create:account_banking_payment_export.view_create_payment_order_lines
msgid "{'display_credit': context.get('display_credit', False),'display_debit': context.get('display_debit', False),'journal_type': 'sale', 'tree_view_ref' : 'account_banking_payment_export.payment_order_populate_view_move_line_tree'}"
msgstr ""

View File

@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-02-16 07:40+0000\n"
"PO-Revision-Date: 2016-02-16 07:40+0000\n"
"POT-Creation-Date: 2016-02-18 08:37+0000\n"
"PO-Revision-Date: 2016-02-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -123,7 +123,7 @@ msgid "Entry Information"
msgstr "Información del asiento"
#. module: account_banking_payment_export
#: code:addons/account_banking_payment_export/wizard/payment_order_create.py:148
#: code:addons/account_banking_payment_export/wizard/payment_order_create.py:149
#, python-format
msgid "Entry Lines"
msgstr "Líneas de pago"
@@ -178,6 +178,11 @@ msgstr "Apuntes contables"
msgid "Journals Filter"
msgstr "Filtro de diarios"
#. module: account_banking_payment_export
#: view:payment.order.create:account_banking_payment_export.view_create_payment_order
msgid "Keep empty for using all journals"
msgstr "Dejar vacío para usar todos los diarios"
#. module: account_banking_payment_export
#: field:bank.payment.line,write_uid:0
#: field:payment.manual,write_uid:0
@@ -292,7 +297,7 @@ msgid "Payment Order Export"
msgstr "Exportación de la orden de pago"
#. module: account_banking_payment_export
#: code:addons/account_banking_payment_export/wizard/payment_order_create.py:242
#: code:addons/account_banking_payment_export/wizard/payment_order_create.py:243
#, python-format
msgid "Payment Orders"
msgstr "Órdenes de pago"

View File

@@ -30,7 +30,7 @@ class PaymentOrderCreate(models.TransientModel):
_inherit = 'payment.order.create'
journal_ids = fields.Many2many(
'account.journal', string='Journals Filter', required=True)
'account.journal', string='Journals Filter')
invoice = fields.Boolean(
string='Linked to an Invoice or Refund')
date_type = fields.Selection([
@@ -117,10 +117,11 @@ class PaymentOrderCreate(models.TransientModel):
payment = self.env['payment.order'].browse(
self.env.context['active_id'])
# Search for move line to pay:
journals = self.journal_ids or self.env['account.journal'].search([])
domain = [('move_id.state', '=', 'posted'),
('reconcile_id', '=', False),
('company_id', '=', payment.mode.company_id.id),
('journal_id', 'in', self.journal_ids.ids)]
('journal_id', 'in', journals.ids)]
if self.date_type == 'due':
domain += [
'|',

View File

@@ -13,7 +13,10 @@
<field name="inherit_id" ref="account_payment.view_create_payment_order"/>
<field name="arch" type="xml">
<field name="duedate" position="after">
<field name="journal_ids" widget="many2many_tags"/>
<field name="journal_ids"
widget="many2many_tags"
placeholder="Keep empty for using all journals"
/>
<field name="invoice"/>
<field name="populate_results"/>
</field>