diff --git a/account_payment_order/README.rst b/account_payment_order/README.rst index b85a3be49..348adcfe7 100644 --- a/account_payment_order/README.rst +++ b/account_payment_order/README.rst @@ -52,13 +52,13 @@ Configuration > Management > Payment Modes. Usage ===== -You can create a Payment order via the menu Invoicing/Accounting > Payments > Payment Orders and then select the move lines to pay. +You can create a Payment order via the menu Invoicing/Accounting > Vendors > Payment Orders and then select the move lines to pay. -You can create a Debit order via the menu Invoicing/Accounting > Payments > Debit Orders and then select the move lines to debit. +You can create a Debit order via the menu Invoicing/Accounting > Customers > Debit Orders and then select the move lines to debit. -This module also adds a button *Add to Payment Order* on supplier invoices and a button *Add to Debit Order* on customer invoices. +This module also adds an action *Add to Payment Order* on supplier invoices and *Add to Debit Order* on customer invoices. -You can print a Payment order via the menu Invoicing/Accounting > Payments > Payment Orders and then select the payment oder to print. +You can print a Payment order via the menu Invoicing/Accounting > Vendors > Payment Orders and then select the payment oder to print. Bug Tracker =========== @@ -86,7 +86,6 @@ Contributors * Stéphane Bidoul * Alexis de Lattre -* Pedro M. Baeza * Adrien Peiffer * Stefan Rijnhart * Laurent Mignon @@ -98,7 +97,6 @@ Contributors * Angel Moya * Jose María Alzaga * Meyomesse Gilles -* Carlos Dauden * `DynApps `_: * Raf Ven @@ -106,6 +104,11 @@ Contributors * `Jarsa `_: * Alan Ramos +* `Tecnativa `_: + + * Pedro M. Baeza + * Carlos Dauden + * Carlos Roca Maintainers ~~~~~~~~~~~ diff --git a/account_payment_order/i18n/account_payment_order.pot b/account_payment_order/i18n/account_payment_order.pot index fba3445da..7dc10d6dc 100644 --- a/account_payment_order/i18n/account_payment_order.pot +++ b/account_payment_order/i18n/account_payment_order.pot @@ -4,8 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 13.0\n" +"Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-01-05 10:20+0000\n" +"PO-Revision-Date: 2021-01-05 10:20+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -397,11 +399,18 @@ msgstr "" #. module: account_payment_order #: model:ir.model.fields,field_description:account_payment_order.field_account_invoice_payment_line_multi__display_name +#: model:ir.model.fields,field_description:account_payment_order.field_account_journal__display_name +#: model:ir.model.fields,field_description:account_payment_order.field_account_move__display_name +#: model:ir.model.fields,field_description:account_payment_order.field_account_move_line__display_name +#: model:ir.model.fields,field_description:account_payment_order.field_account_payment__display_name #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__display_name #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__display_name +#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_method__display_name +#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_mode__display_name #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__display_name #: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__display_name #: model:ir.model.fields,field_description:account_payment_order.field_report_account_payment_order_print_account_payment_order_main__display_name +#: model:ir.model.fields,field_description:account_payment_order.field_res_bank__display_name msgid "Display Name" msgstr "" @@ -548,11 +557,18 @@ msgstr "" #. module: account_payment_order #: model:ir.model.fields,field_description:account_payment_order.field_account_invoice_payment_line_multi__id +#: model:ir.model.fields,field_description:account_payment_order.field_account_journal__id +#: model:ir.model.fields,field_description:account_payment_order.field_account_move__id +#: model:ir.model.fields,field_description:account_payment_order.field_account_move_line__id +#: model:ir.model.fields,field_description:account_payment_order.field_account_payment__id #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__id #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__id +#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_method__id +#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_mode__id #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__id #: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__id #: model:ir.model.fields,field_description:account_payment_order.field_report_account_payment_order_print_account_payment_order_main__id +#: model:ir.model.fields,field_description:account_payment_order.field_res_bank__id msgid "ID" msgstr "" @@ -601,7 +617,6 @@ msgid "Inbound" msgstr "" #. module: account_payment_order -#: model:ir.model.fields,field_description:account_payment_order.field_account_bank_statement_import_journal_creation__inbound_payment_order_only #: model:ir.model.fields,field_description:account_payment_order.field_account_journal__inbound_payment_order_only msgid "Inbound Payment Order Only" msgstr "" @@ -622,11 +637,15 @@ msgid "Journal" msgstr "" #. module: account_payment_order -#: model:ir.model,name:account_payment_order.model_account_move #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__move_ids msgid "Journal Entries" msgstr "" +#. module: account_payment_order +#: model:ir.model,name:account_payment_order.model_account_move +msgid "Journal Entry" +msgstr "" + #. module: account_payment_order #: model:ir.model,name:account_payment_order.model_account_move_line #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__move_line_id @@ -663,11 +682,18 @@ msgstr "" #. module: account_payment_order #: model:ir.model.fields,field_description:account_payment_order.field_account_invoice_payment_line_multi____last_update +#: model:ir.model.fields,field_description:account_payment_order.field_account_journal____last_update +#: model:ir.model.fields,field_description:account_payment_order.field_account_move____last_update +#: model:ir.model.fields,field_description:account_payment_order.field_account_move_line____last_update +#: model:ir.model.fields,field_description:account_payment_order.field_account_payment____last_update #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line____last_update #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create____last_update +#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_method____last_update +#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_mode____last_update #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order____last_update #: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line____last_update #: model:ir.model.fields,field_description:account_payment_order.field_report_account_payment_order_print_account_payment_order_main____last_update +#: model:ir.model.fields,field_description:account_payment_order.field_res_bank____last_update msgid "Last Modified on" msgstr "" @@ -897,7 +923,6 @@ msgid "Outbound" msgstr "" #. module: account_payment_order -#: model:ir.model.fields,field_description:account_payment_order.field_account_bank_statement_import_journal_creation__outbound_payment_order_only #: model:ir.model.fields,field_description:account_payment_order.field_account_journal__outbound_payment_order_only msgid "Outbound Payment Order Only" msgstr "" @@ -989,7 +1014,9 @@ msgstr "" #. module: account_payment_order #: model:ir.actions.report,name:account_payment_order.action_print_payment_order #: model:ir.model,name:account_payment_order.model_account_payment_order +#: model:ir.model.fields,field_description:account_payment_order.field_account_bank_statement_line__payment_order_id #: model:ir.model.fields,field_description:account_payment_order.field_account_move__payment_order_id +#: model:ir.model.fields,field_description:account_payment_order.field_account_payment__payment_order_id #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__order_id #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__order_id #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_form @@ -998,7 +1025,9 @@ msgid "Payment Order" msgstr "" #. module: account_payment_order +#: model:ir.model.fields,field_description:account_payment_order.field_account_bank_statement_line__payment_order_ok #: model:ir.model.fields,field_description:account_payment_order.field_account_move__payment_order_ok +#: model:ir.model.fields,field_description:account_payment_order.field_account_payment__payment_order_ok msgid "Payment Order Ok" msgstr "" @@ -1052,7 +1081,9 @@ msgid "Post Move" msgstr "" #. module: account_payment_order +#: model:ir.model.fields,field_description:account_payment_order.field_account_bank_statement_line__reference_type #: model:ir.model.fields,field_description:account_payment_order.field_account_move__reference_type +#: model:ir.model.fields,field_description:account_payment_order.field_account_payment__reference_type msgid "Reference Type" msgstr "" diff --git a/account_payment_order/i18n/es.po b/account_payment_order/i18n/es.po index 9503ecf7b..19c833ac3 100644 --- a/account_payment_order/i18n/es.po +++ b/account_payment_order/i18n/es.po @@ -8,16 +8,16 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-05-01 15:18+0000\n" -"PO-Revision-Date: 2018-07-13 09:20+0000\n" -"Last-Translator: Enric Tobella \n" +"POT-Creation-Date: 2021-01-05 10:20+0000\n" +"PO-Revision-Date: 2021-01-05 11:24+0100\n" +"Last-Translator: Carlos \n" "Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 3.0.1\n" +"X-Generator: Poedit 2.0.6\n" #. module: account_payment_order #: code:addons/account_payment_order/models/account_move.py:0 @@ -93,7 +93,7 @@ msgstr "Opciones de asientos contables" #. module: account_payment_order #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_needaction msgid "Action Needed" -msgstr "" +msgstr "Acción requerida" #. module: account_payment_order #: model:ir.model.fields,help:account_payment_order.field_account_payment_line__bank_account_required @@ -144,7 +144,7 @@ msgstr "Permitir apuntes en litigio" #. module: account_payment_order #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__allowed_journal_ids msgid "Allowed journals" -msgstr "" +msgstr "Diarios permitidos" #. module: account_payment_order #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__amount_currency @@ -417,11 +417,18 @@ msgstr "No permitir el adeudo antes de la fecha de vencimiento" #. module: account_payment_order #: model:ir.model.fields,field_description:account_payment_order.field_account_invoice_payment_line_multi__display_name +#: model:ir.model.fields,field_description:account_payment_order.field_account_journal__display_name +#: model:ir.model.fields,field_description:account_payment_order.field_account_move__display_name +#: model:ir.model.fields,field_description:account_payment_order.field_account_move_line__display_name +#: model:ir.model.fields,field_description:account_payment_order.field_account_payment__display_name #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__display_name #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__display_name +#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_method__display_name +#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_mode__display_name #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__display_name #: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__display_name #: model:ir.model.fields,field_description:account_payment_order.field_report_account_payment_order_print_account_payment_order_main__display_name +#: model:ir.model.fields,field_description:account_payment_order.field_res_bank__display_name msgid "Display Name" msgstr "Nombre mostrado" @@ -493,17 +500,17 @@ msgstr "Fecha fija" #. module: account_payment_order #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_follower_ids msgid "Followers" -msgstr "" +msgstr "Seguidores" #. module: account_payment_order #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_channel_ids msgid "Followers (Channels)" -msgstr "" +msgstr "Seguidores (Canales)" #. module: account_payment_order #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_partner_ids msgid "Followers (Partners)" -msgstr "" +msgstr "Seguidores (Empresas)" #. module: account_payment_order #: code:addons/account_payment_order/models/bank_payment_line.py:0 @@ -579,11 +586,18 @@ msgstr "Agrupar transacciones en las órdenes de pago" #. module: account_payment_order #: model:ir.model.fields,field_description:account_payment_order.field_account_invoice_payment_line_multi__id +#: model:ir.model.fields,field_description:account_payment_order.field_account_journal__id +#: model:ir.model.fields,field_description:account_payment_order.field_account_move__id +#: model:ir.model.fields,field_description:account_payment_order.field_account_move_line__id +#: model:ir.model.fields,field_description:account_payment_order.field_account_payment__id #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__id #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__id +#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_method__id +#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_mode__id #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__id #: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__id #: model:ir.model.fields,field_description:account_payment_order.field_report_account_payment_order_print_account_payment_order_main__id +#: model:ir.model.fields,field_description:account_payment_order.field_res_bank__id msgid "ID" msgstr "ID" @@ -591,13 +605,13 @@ msgstr "ID" #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_needaction #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread msgid "If checked, new messages require your attention." -msgstr "" +msgstr "Si está marcado hay nuevos mensajes que requieren su atención." #. module: account_payment_order #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_error #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_sms_error msgid "If checked, some messages have a delivery error." -msgstr "" +msgstr "Si se encuentra marcado, algunos mensajes tienen error de envío." #. module: account_payment_order #: model:ir.model.fields,help:account_payment_order.field_account_payment_mode__group_lines @@ -647,7 +661,6 @@ msgid "Inbound" msgstr "Entrante" #. module: account_payment_order -#: model:ir.model.fields,field_description:account_payment_order.field_account_bank_statement_import_journal_creation__inbound_payment_order_only #: model:ir.model.fields,field_description:account_payment_order.field_account_journal__inbound_payment_order_only #, fuzzy msgid "Inbound Payment Order Only" @@ -661,7 +674,7 @@ msgstr "Referencia de factura" #. module: account_payment_order #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_is_follower msgid "Is Follower" -msgstr "" +msgstr "Es un seguidor" #. module: account_payment_order #: model:ir.model,name:account_payment_order.model_account_journal @@ -670,11 +683,17 @@ msgid "Journal" msgstr "Diario de banco" #. module: account_payment_order -#: model:ir.model,name:account_payment_order.model_account_move #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__move_ids msgid "Journal Entries" msgstr "Asientos contables" +#. module: account_payment_order +#: model:ir.model,name:account_payment_order.model_account_move +#, fuzzy +#| msgid "Journal Entries" +msgid "Journal Entry" +msgstr "Asientos contables" + #. module: account_payment_order #: model:ir.model,name:account_payment_order.model_account_move_line #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__move_line_id @@ -714,11 +733,18 @@ msgstr "Etiqueta del pago que será vista por el beneficiario" #. module: account_payment_order #: model:ir.model.fields,field_description:account_payment_order.field_account_invoice_payment_line_multi____last_update +#: model:ir.model.fields,field_description:account_payment_order.field_account_journal____last_update +#: model:ir.model.fields,field_description:account_payment_order.field_account_move____last_update +#: model:ir.model.fields,field_description:account_payment_order.field_account_move_line____last_update +#: model:ir.model.fields,field_description:account_payment_order.field_account_payment____last_update #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line____last_update #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create____last_update +#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_method____last_update +#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_mode____last_update #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order____last_update #: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line____last_update #: model:ir.model.fields,field_description:account_payment_order.field_report_account_payment_order_print_account_payment_order_main____last_update +#: model:ir.model.fields,field_description:account_payment_order.field_res_bank____last_update msgid "Last Modified on" msgstr "Última modificación en" @@ -760,12 +786,12 @@ msgstr "Adjuntos" #. module: account_payment_order #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_error msgid "Message Delivery error" -msgstr "" +msgstr "Error de Envío de Mensaje" #. module: account_payment_order #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_ids msgid "Messages" -msgstr "" +msgstr "Mensajes" #. module: account_payment_order #: code:addons/account_payment_order/models/account_payment_order.py:0 @@ -868,12 +894,12 @@ msgstr "Número de líneas bancarias" #. module: account_payment_order #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_needaction_counter msgid "Number of messages which requires an action" -msgstr "" +msgstr "Número de mensajes que requieren una acción" #. module: account_payment_order #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_error_counter msgid "Number of messages with delivery error" -msgstr "" +msgstr "Número de mensajes con error de envío" #. module: account_payment_order #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_unread_counter @@ -963,7 +989,6 @@ msgid "Outbound" msgstr "Saliente" #. module: account_payment_order -#: model:ir.model.fields,field_description:account_payment_order.field_account_bank_statement_import_journal_creation__outbound_payment_order_only #: model:ir.model.fields,field_description:account_payment_order.field_account_journal__outbound_payment_order_only #, fuzzy msgid "Outbound Payment Order Only" @@ -1061,7 +1086,9 @@ msgstr "Modos de pago" #. module: account_payment_order #: model:ir.actions.report,name:account_payment_order.action_print_payment_order #: model:ir.model,name:account_payment_order.model_account_payment_order +#: model:ir.model.fields,field_description:account_payment_order.field_account_bank_statement_line__payment_order_id #: model:ir.model.fields,field_description:account_payment_order.field_account_move__payment_order_id +#: model:ir.model.fields,field_description:account_payment_order.field_account_payment__payment_order_id #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__order_id #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__order_id #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_form @@ -1070,7 +1097,9 @@ msgid "Payment Order" msgstr "Orden de pago" #. module: account_payment_order +#: model:ir.model.fields,field_description:account_payment_order.field_account_bank_statement_line__payment_order_ok #: model:ir.model.fields,field_description:account_payment_order.field_account_move__payment_order_ok +#: model:ir.model.fields,field_description:account_payment_order.field_account_payment__payment_order_ok msgid "Payment Order Ok" msgstr "Orden de Pago correcta" @@ -1123,7 +1152,9 @@ msgid "Post Move" msgstr "Publicar movimiento" #. module: account_payment_order +#: model:ir.model.fields,field_description:account_payment_order.field_account_bank_statement_line__reference_type #: model:ir.model.fields,field_description:account_payment_order.field_account_move__reference_type +#: model:ir.model.fields,field_description:account_payment_order.field_account_payment__reference_type #, fuzzy msgid "Reference Type" msgstr "Referencia de pago" @@ -1136,7 +1167,7 @@ msgstr "Líneas de pago relacionadas" #. module: account_payment_order #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_sms_error msgid "SMS Delivery error" -msgstr "" +msgstr "Error de entrega del SMS" #. module: account_payment_order #: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same @@ -1222,7 +1253,7 @@ msgstr "Asientos destino" #. module: account_payment_order #: model:ir.model,name:account_payment_order.model_report_account_payment_order_print_account_payment_order_main msgid "Technical model for printing payment order" -msgstr "" +msgstr "Modelo técnico para imprimir orden de pago" #. module: account_payment_order #: code:addons/account_payment_order/models/account_payment_order.py:0 @@ -1293,6 +1324,8 @@ msgid "" "This option helps enforcing the use of payment orders for some payment " "methods." msgstr "" +"Esta opción ayuda a hacer cumplir el uso de órdenes de pago para algunos " +"métodos de pago." #. module: account_payment_order #: model_terms:ir.ui.view,arch_db:account_payment_order.account_invoice_payment_line_multi_form @@ -1361,12 +1394,12 @@ msgstr "Filtro de tipo de fecha" #. module: account_payment_order #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_unread msgid "Unread Messages" -msgstr "" +msgstr "Mensajes sin leer" #. module: account_payment_order #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_unread_counter msgid "Unread Messages Counter" -msgstr "" +msgstr "Contador de mensajes sin leer" #. module: account_payment_order #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document @@ -1376,12 +1409,12 @@ msgstr "Fecha de Valor" #. module: account_payment_order #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__website_message_ids msgid "Website Messages" -msgstr "" +msgstr "Mensajes del sitio web" #. module: account_payment_order #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__website_message_ids msgid "Website communication history" -msgstr "" +msgstr "Historial de comunicaciones del sitio web" #. module: account_payment_order #: model:ir.model,name:account_payment_order.model_account_payment_line_create diff --git a/account_payment_order/models/account_move.py b/account_payment_order/models/account_move.py index 09a7da04f..cf4c8d608 100644 --- a/account_payment_order/models/account_move.py +++ b/account_payment_order/models/account_move.py @@ -15,6 +15,7 @@ class AccountMove(models.Model): string="Payment Order", copy=False, readonly=True, + check_company=True, ) payment_order_ok = fields.Boolean(compute="_compute_payment_order_ok") # we restore this field from <=v11 for now for preserving behavior diff --git a/account_payment_order/models/account_move_line.py b/account_payment_order/models/account_move_line.py index 11ee45562..dc6e44162 100644 --- a/account_payment_order/models/account_move_line.py +++ b/account_payment_order/models/account_move_line.py @@ -16,14 +16,19 @@ class AccountMoveLine(models.Model): readonly=False, store=True, help="Bank account on which we should pay the supplier", + check_company=True, ) bank_payment_line_id = fields.Many2one( - comodel_name="bank.payment.line", readonly=True, index=True + comodel_name="bank.payment.line", + readonly=True, + index=True, + check_company=True, ) payment_line_ids = fields.One2many( comodel_name="account.payment.line", inverse_name="move_line_id", string="Payment lines", + check_company=True, ) @api.depends("move_id", "move_id.partner_bank_id", "move_id.payment_mode_id") diff --git a/account_payment_order/models/account_payment_line.py b/account_payment_order/models/account_payment_line.py index ccad788ab..82ad22725 100644 --- a/account_payment_order/models/account_payment_line.py +++ b/account_payment_order/models/account_payment_line.py @@ -8,6 +8,7 @@ from odoo.exceptions import UserError class AccountPaymentLine(models.Model): _name = "account.payment.line" _description = "Payment Lines" + _check_company_auto = True name = fields.Char(string="Payment Reference", readonly=True, copy=False) order_id = fields.Many2one( @@ -15,6 +16,7 @@ class AccountPaymentLine(models.Model): string="Payment Order", ondelete="cascade", index=True, + check_company=True, ) company_id = fields.Many2one( related="order_id.company_id", store=True, readonly=True @@ -32,7 +34,10 @@ class AccountPaymentLine(models.Model): related="order_id.state", string="State", readonly=True, store=True ) move_line_id = fields.Many2one( - comodel_name="account.move.line", string="Journal Item", ondelete="restrict" + comodel_name="account.move.line", + string="Journal Item", + ondelete="restrict", + check_company=True, ) ml_maturity_date = fields.Date(related="move_line_id.date_maturity", readonly=True) currency_id = fields.Many2one( @@ -52,12 +57,14 @@ class AccountPaymentLine(models.Model): string="Partner", required=True, domain=[("parent_id", "=", False)], + check_company=True, ) partner_bank_id = fields.Many2one( comodel_name="res.partner.bank", string="Partner Bank Account", required=False, ondelete="restrict", + check_company=True, ) date = fields.Date(string="Payment Date") communication = fields.Char( @@ -71,6 +78,7 @@ class AccountPaymentLine(models.Model): string="Bank Payment Line", readonly=True, index=True, + check_company=True, ) _sql_constraints = [ diff --git a/account_payment_order/models/account_payment_mode.py b/account_payment_order/models/account_payment_mode.py index 9d54afff8..e99c062df 100644 --- a/account_payment_order/models/account_payment_mode.py +++ b/account_payment_order/models/account_payment_mode.py @@ -88,11 +88,13 @@ class AccountPaymentMode(models.Model): help="Pay off lines in 'file uploaded' payment orders with a move on " "this account. You can only select accounts " "that are marked for reconciliation", + check_company=True, ) transfer_journal_id = fields.Many2one( comodel_name="account.journal", help="Journal to write payment entries when confirming " "payment/debit orders of this mode", + check_company=True, ) move_option = fields.Selection( selection=[ diff --git a/account_payment_order/models/account_payment_order.py b/account_payment_order/models/account_payment_order.py index 5402992dc..236fe3049 100644 --- a/account_payment_order/models/account_payment_order.py +++ b/account_payment_order/models/account_payment_order.py @@ -15,6 +15,7 @@ class AccountPaymentOrder(models.Model): _description = "Payment Order" _inherit = ["mail.thread"] _order = "id desc" + _check_company_auto = True name = fields.Char(string="Number", readonly=True, copy=False) payment_mode_id = fields.Many2one( @@ -23,6 +24,7 @@ class AccountPaymentOrder(models.Model): ondelete="restrict", tracking=True, states={"draft": [("readonly", False)]}, + check_company=True, ) payment_type = fields.Selection( selection=[("inbound", "Inbound"), ("outbound", "Outbound")], @@ -57,6 +59,7 @@ class AccountPaymentOrder(models.Model): readonly=True, states={"draft": [("readonly", False)]}, tracking=True, + check_company=True, ) # The journal_id field is only required at confirm step, to # allow auto-creation of payment order from invoice @@ -110,6 +113,7 @@ class AccountPaymentOrder(models.Model): readonly=True, ondelete="restrict", copy=False, + check_company=True, ) payment_line_ids = fields.One2many( comodel_name="account.payment.line", @@ -567,3 +571,20 @@ class AccountPaymentOrder(models.Model): trfmoves = self._prepare_trf_moves() for hashcode, blines in trfmoves.items(): self._create_reconcile_move(hashcode, blines) + + def action_bank_payment_line(self): + self.ensure_one() + action = self.env.ref("account_payment_order.bank_payment_line_action") + action_dict = action.read()[0] + action_dict["domain"] = [("id", "in", self.bank_line_ids.ids)] + return action_dict + + def action_move_journal_line(self): + self.ensure_one() + action = self.env.ref("account.action_move_journal_line") + action_dict = action.read()[0] + action_dict["domain"] = [("id", "in", self.move_ids.ids)] + ctx = self.env.context.copy() + ctx.update({"search_default_misc_filter": 0}) + action_dict["context"] = ctx + return action_dict diff --git a/account_payment_order/models/bank_payment_line.py b/account_payment_order/models/bank_payment_line.py index 3a3a3ea2e..27e0ae324 100644 --- a/account_payment_order/models/bank_payment_line.py +++ b/account_payment_order/models/bank_payment_line.py @@ -9,6 +9,7 @@ from odoo.exceptions import UserError class BankPaymentLine(models.Model): _name = "bank.payment.line" _description = "Bank Payment Lines" + _check_company_auto = True name = fields.Char(string="Bank Payment Line Ref", required=True, readonly=True) order_id = fields.Many2one( @@ -16,6 +17,7 @@ class BankPaymentLine(models.Model): ondelete="cascade", index=True, readonly=True, + check_company=True, ) payment_type = fields.Selection( related="order_id.payment_type", readonly=True, store=True @@ -32,6 +34,7 @@ class BankPaymentLine(models.Model): related="payment_line_ids.partner_id", readonly=True, store=True, + check_company=True, ) # store=True for groupby # Function Float fields are sometimes badly displayed in tree view, # see bug report https://github.com/odoo/odoo/issues/8632 @@ -61,6 +64,7 @@ class BankPaymentLine(models.Model): string="Bank Account", readonly=True, related="payment_line_ids.partner_bank_id", + check_company=True, ) date = fields.Date(related="payment_line_ids.date", readonly=True) communication_type = fields.Selection( diff --git a/account_payment_order/readme/CONTRIBUTORS.rst b/account_payment_order/readme/CONTRIBUTORS.rst index 4b2f30622..eb9d15318 100644 --- a/account_payment_order/readme/CONTRIBUTORS.rst +++ b/account_payment_order/readme/CONTRIBUTORS.rst @@ -1,6 +1,5 @@ * Stéphane Bidoul * Alexis de Lattre -* Pedro M. Baeza * Adrien Peiffer * Stefan Rijnhart * Laurent Mignon @@ -12,7 +11,6 @@ * Angel Moya * Jose María Alzaga * Meyomesse Gilles -* Carlos Dauden * `DynApps `_: * Raf Ven @@ -20,3 +18,8 @@ * `Jarsa `_: * Alan Ramos +* `Tecnativa `_: + + * Pedro M. Baeza + * Carlos Dauden + * Carlos Roca diff --git a/account_payment_order/readme/USAGE.rst b/account_payment_order/readme/USAGE.rst index 4794709a1..ec551e4cc 100644 --- a/account_payment_order/readme/USAGE.rst +++ b/account_payment_order/readme/USAGE.rst @@ -1,7 +1,7 @@ -You can create a Payment order via the menu Invoicing/Accounting > Payments > Payment Orders and then select the move lines to pay. +You can create a Payment order via the menu Invoicing/Accounting > Vendors > Payment Orders and then select the move lines to pay. -You can create a Debit order via the menu Invoicing/Accounting > Payments > Debit Orders and then select the move lines to debit. +You can create a Debit order via the menu Invoicing/Accounting > Customers > Debit Orders and then select the move lines to debit. -This module also adds a button *Add to Payment Order* on supplier invoices and a button *Add to Debit Order* on customer invoices. +This module also adds an action *Add to Payment Order* on supplier invoices and *Add to Debit Order* on customer invoices. -You can print a Payment order via the menu Invoicing/Accounting > Payments > Payment Orders and then select the payment oder to print. +You can print a Payment order via the menu Invoicing/Accounting > Vendors > Payment Orders and then select the payment oder to print. diff --git a/account_payment_order/report/print_account_payment_order.xml b/account_payment_order/report/print_account_payment_order.xml index 00793f9ec..993882e7f 100644 --- a/account_payment_order/report/print_account_payment_order.xml +++ b/account_payment_order/report/print_account_payment_order.xml @@ -4,7 +4,7 @@ - ayment Order + Payment Order account.payment.order qweb-pdf - + Account Payment Order