diff --git a/account_payment_purchase_stock/README.rst b/account_payment_purchase_stock/README.rst index b69ad2c42..3d403a3e5 100644 --- a/account_payment_purchase_stock/README.rst +++ b/account_payment_purchase_stock/README.rst @@ -14,13 +14,13 @@ Account Payment Purchase Stock :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fbank--payment-lightgray.png?logo=github - :target: https://github.com/OCA/bank-payment/tree/13.0/account_payment_purchase_stock + :target: https://github.com/OCA/bank-payment/tree/14.0/account_payment_purchase_stock :alt: OCA/bank-payment .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/bank-payment-13-0/bank-payment-13-0-account_payment_purchase_stock + :target: https://translation.odoo-community.org/projects/bank-payment-14-0/bank-payment-14-0-account_payment_purchase_stock :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/173/13.0 + :target: https://runbot.odoo-community.org/runbot/173/14.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -53,7 +53,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -96,6 +96,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -This module is part of the `OCA/bank-payment `_ project on GitHub. +This module is part of the `OCA/bank-payment `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/account_payment_purchase_stock/__manifest__.py b/account_payment_purchase_stock/__manifest__.py index bb38d439d..ec2c977dc 100644 --- a/account_payment_purchase_stock/__manifest__.py +++ b/account_payment_purchase_stock/__manifest__.py @@ -4,7 +4,7 @@ { "name": "Account Payment Purchase Stock", - "version": "13.0.1.0.0", + "version": "14.0.1.0.0", "category": "Banking addons", "license": "AGPL-3", "summary": "Integrate Account Payment Purchase with Stock", diff --git a/account_payment_purchase_stock/i18n/account_payment_purchase_stock.pot b/account_payment_purchase_stock/i18n/account_payment_purchase_stock.pot index 7c9553583..5080dbb3c 100644 --- a/account_payment_purchase_stock/i18n/account_payment_purchase_stock.pot +++ b/account_payment_purchase_stock/i18n/account_payment_purchase_stock.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 13.0\n" +"Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: \n" "Language-Team: \n" @@ -13,6 +13,21 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" +#. module: account_payment_purchase_stock +#: model:ir.model.fields,field_description:account_payment_purchase_stock.field_stock_rule__display_name +msgid "Display Name" +msgstr "" + +#. module: account_payment_purchase_stock +#: model:ir.model.fields,field_description:account_payment_purchase_stock.field_stock_rule__id +msgid "ID" +msgstr "" + +#. module: account_payment_purchase_stock +#: model:ir.model.fields,field_description:account_payment_purchase_stock.field_stock_rule____last_update +msgid "Last Modified on" +msgstr "" + #. module: account_payment_purchase_stock #: model:ir.model,name:account_payment_purchase_stock.model_stock_rule msgid "Stock Rule" diff --git a/account_payment_purchase_stock/i18n/es_AR.po b/account_payment_purchase_stock/i18n/es_AR.po new file mode 100644 index 000000000..71880c389 --- /dev/null +++ b/account_payment_purchase_stock/i18n/es_AR.po @@ -0,0 +1,37 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_purchase_stock +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 14.0\n" +"Report-Msgid-Bugs-To: \n" +"PO-Revision-Date: 2021-04-01 03:48+0000\n" +"Last-Translator: Ignacio Buioli \n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.3.2\n" + +#. module: account_payment_purchase_stock +#: model:ir.model.fields,field_description:account_payment_purchase_stock.field_stock_rule__display_name +msgid "Display Name" +msgstr "Mostrar Nombre" + +#. module: account_payment_purchase_stock +#: model:ir.model.fields,field_description:account_payment_purchase_stock.field_stock_rule__id +msgid "ID" +msgstr "ID" + +#. module: account_payment_purchase_stock +#: model:ir.model.fields,field_description:account_payment_purchase_stock.field_stock_rule____last_update +msgid "Last Modified on" +msgstr "Última modificación en" + +#. module: account_payment_purchase_stock +#: model:ir.model,name:account_payment_purchase_stock.model_stock_rule +msgid "Stock Rule" +msgstr "Regla de Inventario" diff --git a/account_payment_purchase_stock/i18n/fr_FR.po b/account_payment_purchase_stock/i18n/fr_FR.po new file mode 100644 index 000000000..a2f8d0143 --- /dev/null +++ b/account_payment_purchase_stock/i18n/fr_FR.po @@ -0,0 +1,37 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_purchase_stock +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 14.0\n" +"Report-Msgid-Bugs-To: \n" +"PO-Revision-Date: 2021-04-10 14:47+0000\n" +"Last-Translator: Yves Le Doeuff \n" +"Language-Team: none\n" +"Language: fr_FR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n > 1;\n" +"X-Generator: Weblate 4.3.2\n" + +#. module: account_payment_purchase_stock +#: model:ir.model.fields,field_description:account_payment_purchase_stock.field_stock_rule__display_name +msgid "Display Name" +msgstr "Nom affiché" + +#. module: account_payment_purchase_stock +#: model:ir.model.fields,field_description:account_payment_purchase_stock.field_stock_rule__id +msgid "ID" +msgstr "" + +#. module: account_payment_purchase_stock +#: model:ir.model.fields,field_description:account_payment_purchase_stock.field_stock_rule____last_update +msgid "Last Modified on" +msgstr "Dernière modification" + +#. module: account_payment_purchase_stock +#: model:ir.model,name:account_payment_purchase_stock.model_stock_rule +msgid "Stock Rule" +msgstr "Règle de stockage" diff --git a/account_payment_purchase_stock/models/stock_rule.py b/account_payment_purchase_stock/models/stock_rule.py index 17ccc5581..390e44375 100644 --- a/account_payment_purchase_stock/models/stock_rule.py +++ b/account_payment_purchase_stock/models/stock_rule.py @@ -13,8 +13,8 @@ class StockRule(models.Model): values = values[0] partner = values["supplier"].name if partner: - res["payment_mode_id"] = partner.with_context( - force_company=self.company_id.id + res["payment_mode_id"] = partner.with_company( + self.company_id.id ).supplier_payment_mode_id.id res["supplier_partner_bank_id"] = self.env[ "purchase.order" diff --git a/account_payment_purchase_stock/static/description/index.html b/account_payment_purchase_stock/static/description/index.html index 7a1d0a63c..c8f95ed63 100644 --- a/account_payment_purchase_stock/static/description/index.html +++ b/account_payment_purchase_stock/static/description/index.html @@ -367,7 +367,7 @@ ul.auto-toc { !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Beta License: AGPL-3 OCA/bank-payment Translate me on Weblate Try me on Runbot

+

Beta License: AGPL-3 OCA/bank-payment Translate me on Weblate Try me on Runbot

This module combines the account_payment_purchase module with purchase_stock.

Table of contents

@@ -401,7 +401,7 @@ ul.auto-toc {

Bugs are tracked on GitHub Issues. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed -feedback.

+feedback.

Do not contact contributors directly about support or help with technical issues.

@@ -438,7 +438,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome

OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use.

-

This module is part of the OCA/bank-payment project on GitHub.

+

This module is part of the OCA/bank-payment project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

diff --git a/account_payment_purchase_stock/tests/test_account_payment_purchase_stock.py b/account_payment_purchase_stock/tests/test_account_payment_purchase_stock.py index a6599ba4a..210415a6c 100644 --- a/account_payment_purchase_stock/tests/test_account_payment_purchase_stock.py +++ b/account_payment_purchase_stock/tests/test_account_payment_purchase_stock.py @@ -19,7 +19,7 @@ class TestAccountPaymentPurchaseStock(TestAccountPaymentPurchase): picking.button_validate() invoice = self.env["account.move"].create( - {"partner_id": self.partner.id, "type": "in_invoice"} + {"partner_id": self.partner.id, "move_type": "in_invoice"} ) with Form(invoice) as inv: inv.purchase_id = self.purchase @@ -40,7 +40,7 @@ class TestAccountPaymentPurchaseStock(TestAccountPaymentPurchase): picking.button_validate() invoice = self.env["account.move"].create( - {"partner_id": self.partner.id, "type": "in_invoice"} + {"partner_id": self.partner.id, "move_type": "in_invoice"} ) invoice.purchase_id = self.purchase invoice._onchange_purchase_auto_complete() @@ -74,11 +74,11 @@ class TestAccountPaymentPurchaseStock(TestAccountPaymentPurchase): picking.button_validate() invoice = self.env["account.move"].create( - {"partner_id": self.partner.id, "type": "in_invoice"} + {"partner_id": self.partner.id, "move_type": "in_invoice"} ) invoice.purchase_id = self.purchase invoice._onchange_purchase_auto_complete() - self.assertEqual(invoice.invoice_partner_bank_id, self.bank) + self.assertEqual(invoice.partner_bank_id, self.bank) purchase2 = self.purchase.copy() purchase2.supplier_partner_bank_id = self.bank2 purchase2.button_confirm()