From 86b24b7ffbd8996904232d766b82c2d4ecca9b58 Mon Sep 17 00:00:00 2001 From: lreficent Date: Thu, 16 Mar 2017 11:52:48 +0100 Subject: [PATCH] [MIG] account_move_line_stock_info to v10 --- account_move_line_stock_info/README.rst | 5 +- account_move_line_stock_info/__openerp__.py | 2 +- account_move_line_stock_info/i18n/cs_CZ.po | 42 +++++++++++++++ account_move_line_stock_info/i18n/de.po | 14 ++--- account_move_line_stock_info/i18n/es.po | 15 ++---- account_move_line_stock_info/i18n/fi.po | 11 ++-- account_move_line_stock_info/i18n/fr.po | 15 ++---- account_move_line_stock_info/i18n/hr.po | 19 +++---- account_move_line_stock_info/i18n/it.po | 14 ++--- account_move_line_stock_info/i18n/nl_NL.po | 41 +++++++++++++++ account_move_line_stock_info/i18n/pt_BR.po | 15 ++---- account_move_line_stock_info/i18n/ro.po | 12 ++--- account_move_line_stock_info/i18n/sl.po | 15 ++---- .../models/__init__.py | 1 - .../models/account_move_line.py | 7 +-- .../models/stock_move.py | 11 +++- .../models/stock_quant.py | 18 ------- .../test_account_move_line_stock_move.py | 4 +- .../views/account_move_line_view.xml | 36 ++++++------- .../views/stock_move_view.xml | 52 +++++++++---------- 20 files changed, 186 insertions(+), 163 deletions(-) create mode 100644 account_move_line_stock_info/i18n/cs_CZ.po create mode 100644 account_move_line_stock_info/i18n/nl_NL.po delete mode 100644 account_move_line_stock_info/models/stock_quant.py diff --git a/account_move_line_stock_info/README.rst b/account_move_line_stock_info/README.rst index b0021ad3f..ede6c70b6 100644 --- a/account_move_line_stock_info/README.rst +++ b/account_move_line_stock_info/README.rst @@ -8,7 +8,6 @@ Account Move Line Stock Move This module adds the stock move to the account move lines that it generates. - Usage ===== @@ -21,8 +20,7 @@ Reports > Stock moves'. .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/153/8.0 - + :target: https://runbot.odoo-community.org/runbot/153/10.0 Bug Tracker =========== @@ -40,6 +38,7 @@ Credits Contributors ------------ * Jordi Ballester Alomar +* Lois Rilo Maintainer ---------- diff --git a/account_move_line_stock_info/__openerp__.py b/account_move_line_stock_info/__openerp__.py index ae3e3dc74..7eebb32c4 100644 --- a/account_move_line_stock_info/__openerp__.py +++ b/account_move_line_stock_info/__openerp__.py @@ -3,7 +3,7 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { "name": "Account Move Line Stock Move", - "version": "9.0.1.0.0", + "version": "10.0.1.0.0", "depends": [ "stock_account" ], diff --git a/account_move_line_stock_info/i18n/cs_CZ.po b/account_move_line_stock_info/i18n/cs_CZ.po new file mode 100644 index 000000000..fcf58d693 --- /dev/null +++ b/account_move_line_stock_info/i18n/cs_CZ.po @@ -0,0 +1,42 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_move_line_stock_info +# +# Translators: +# Lukáš Spurný , 2018 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-02-27 11:37+0000\n" +"PO-Revision-Date: 2018-02-27 11:37+0000\n" +"Last-Translator: Lukáš Spurný , 2018\n" +"Language-Team: Czech (Czech Republic) (https://www.transifex.com/oca/teams/23907/cs_CZ/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: cs_CZ\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" + +#. module: account_move_line_stock_info +#: model:ir.model.fields,field_description:account_move_line_stock_info.field_stock_move_account_move_line_ids +#: model:ir.model.fields,field_description:account_move_line_stock_info.field_stock_reservation_account_move_line_ids +msgid "Account move line ids" +msgstr "Identifikátory řádků přesunutí účtu" + +#. module: account_move_line_stock_info +#: model:ir.model,name:account_move_line_stock_info.model_account_move_line +msgid "Journal Item" +msgstr "Položka žurnálu" + +#. module: account_move_line_stock_info +#: model:ir.ui.view,arch_db:account_move_line_stock_info.view_move_form +#: model:ir.ui.view,arch_db:account_move_line_stock_info.view_move_picking_form +msgid "Journal Items" +msgstr "Položky žurnálu" + +#. module: account_move_line_stock_info +#: model:ir.model,name:account_move_line_stock_info.model_stock_move +#: model:ir.model.fields,field_description:account_move_line_stock_info.field_account_move_line_stock_move_id +msgid "Stock Move" +msgstr "Přesunout zásoby" diff --git a/account_move_line_stock_info/i18n/de.po b/account_move_line_stock_info/i18n/de.po index de487495e..ab830fa0a 100644 --- a/account_move_line_stock_info/i18n/de.po +++ b/account_move_line_stock_info/i18n/de.po @@ -4,14 +4,13 @@ # # Translators: # OCA Transbot , 2017 -# Ermin Trevisan , 2017 msgid "" msgstr "" -"Project-Id-Version: Odoo Server 9.0c\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-21 02:12+0000\n" -"PO-Revision-Date: 2017-01-21 02:12+0000\n" -"Last-Translator: Ermin Trevisan , 2017\n" +"POT-Creation-Date: 2017-06-03 01:23+0000\n" +"PO-Revision-Date: 2017-06-03 01:23+0000\n" +"Last-Translator: OCA Transbot , 2017\n" "Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -35,11 +34,6 @@ msgstr "Journalbuchung" msgid "Journal Items" msgstr "Buchungsjournale" -#. module: account_move_line_stock_info -#: model:ir.model,name:account_move_line_stock_info.model_stock_quant -msgid "Quants" -msgstr "Quants" - #. module: account_move_line_stock_info #: model:ir.model,name:account_move_line_stock_info.model_stock_move #: model:ir.model.fields,field_description:account_move_line_stock_info.field_account_move_line_stock_move_id diff --git a/account_move_line_stock_info/i18n/es.po b/account_move_line_stock_info/i18n/es.po index 44f88aa1e..5c08c924b 100644 --- a/account_move_line_stock_info/i18n/es.po +++ b/account_move_line_stock_info/i18n/es.po @@ -4,14 +4,13 @@ # # Translators: # OCA Transbot , 2017 -# Fernando Lara , 2017 msgid "" msgstr "" -"Project-Id-Version: Odoo Server 9.0c\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-18 04:05+0000\n" -"PO-Revision-Date: 2017-02-18 04:05+0000\n" -"Last-Translator: Fernando Lara , 2017\n" +"POT-Creation-Date: 2017-07-28 02:58+0000\n" +"PO-Revision-Date: 2017-07-28 02:58+0000\n" +"Last-Translator: OCA Transbot , 2017\n" "Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,6 +20,7 @@ msgstr "" #. module: account_move_line_stock_info #: model:ir.model.fields,field_description:account_move_line_stock_info.field_stock_move_account_move_line_ids +#: model:ir.model.fields,field_description:account_move_line_stock_info.field_stock_reservation_account_move_line_ids msgid "Account move line ids" msgstr "Mover las ID´s de la cuenta" @@ -35,11 +35,6 @@ msgstr "Apunte contable" msgid "Journal Items" msgstr "Apuntes contables" -#. module: account_move_line_stock_info -#: model:ir.model,name:account_move_line_stock_info.model_stock_quant -msgid "Quants" -msgstr "Quants" - #. module: account_move_line_stock_info #: model:ir.model,name:account_move_line_stock_info.model_stock_move #: model:ir.model.fields,field_description:account_move_line_stock_info.field_account_move_line_stock_move_id diff --git a/account_move_line_stock_info/i18n/fi.po b/account_move_line_stock_info/i18n/fi.po index 7216a4c55..0799a4314 100644 --- a/account_move_line_stock_info/i18n/fi.po +++ b/account_move_line_stock_info/i18n/fi.po @@ -6,10 +6,10 @@ # OCA Transbot , 2017 msgid "" msgstr "" -"Project-Id-Version: Odoo Server 9.0c\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-21 02:12+0000\n" -"PO-Revision-Date: 2017-01-21 02:12+0000\n" +"POT-Creation-Date: 2017-06-03 01:23+0000\n" +"PO-Revision-Date: 2017-06-03 01:23+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Finnish (https://www.transifex.com/oca/teams/23907/fi/)\n" "MIME-Version: 1.0\n" @@ -34,11 +34,6 @@ msgstr "" msgid "Journal Items" msgstr "" -#. module: account_move_line_stock_info -#: model:ir.model,name:account_move_line_stock_info.model_stock_quant -msgid "Quants" -msgstr "Määrät" - #. module: account_move_line_stock_info #: model:ir.model,name:account_move_line_stock_info.model_stock_move #: model:ir.model.fields,field_description:account_move_line_stock_info.field_account_move_line_stock_move_id diff --git a/account_move_line_stock_info/i18n/fr.po b/account_move_line_stock_info/i18n/fr.po index fa1b87ef7..3a7dad526 100644 --- a/account_move_line_stock_info/i18n/fr.po +++ b/account_move_line_stock_info/i18n/fr.po @@ -4,15 +4,13 @@ # # Translators: # OCA Transbot , 2017 -# Sébastien LANGE (SYLEAM) , 2017 -# Christophe CHAUVET , 2017 msgid "" msgstr "" -"Project-Id-Version: Odoo Server 9.0c\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-21 02:12+0000\n" -"PO-Revision-Date: 2017-01-21 02:12+0000\n" -"Last-Translator: Christophe CHAUVET , 2017\n" +"POT-Creation-Date: 2017-06-03 01:23+0000\n" +"PO-Revision-Date: 2017-06-03 01:23+0000\n" +"Last-Translator: OCA Transbot , 2017\n" "Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -36,11 +34,6 @@ msgstr "Écriture comptable" msgid "Journal Items" msgstr "Écritures du journal" -#. module: account_move_line_stock_info -#: model:ir.model,name:account_move_line_stock_info.model_stock_quant -msgid "Quants" -msgstr "Quants" - #. module: account_move_line_stock_info #: model:ir.model,name:account_move_line_stock_info.model_stock_move #: model:ir.model.fields,field_description:account_move_line_stock_info.field_account_move_line_stock_move_id diff --git a/account_move_line_stock_info/i18n/hr.po b/account_move_line_stock_info/i18n/hr.po index ace04722d..6efad0c90 100644 --- a/account_move_line_stock_info/i18n/hr.po +++ b/account_move_line_stock_info/i18n/hr.po @@ -4,13 +4,14 @@ # # Translators: # OCA Transbot , 2017 +# Bole , 2018 msgid "" msgstr "" -"Project-Id-Version: Odoo Server 9.0c\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-21 02:12+0000\n" -"PO-Revision-Date: 2017-01-21 02:12+0000\n" -"Last-Translator: OCA Transbot , 2017\n" +"POT-Creation-Date: 2018-02-27 11:37+0000\n" +"PO-Revision-Date: 2018-02-27 11:37+0000\n" +"Last-Translator: Bole , 2018\n" "Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,13 +21,14 @@ msgstr "" #. module: account_move_line_stock_info #: model:ir.model.fields,field_description:account_move_line_stock_info.field_stock_move_account_move_line_ids +#: model:ir.model.fields,field_description:account_move_line_stock_info.field_stock_reservation_account_move_line_ids msgid "Account move line ids" -msgstr "" +msgstr "ID-ovi stavaka temeljnica" #. module: account_move_line_stock_info #: model:ir.model,name:account_move_line_stock_info.model_account_move_line msgid "Journal Item" -msgstr "" +msgstr "Stavka dnevnika" #. module: account_move_line_stock_info #: model:ir.ui.view,arch_db:account_move_line_stock_info.view_move_form @@ -34,11 +36,6 @@ msgstr "" msgid "Journal Items" msgstr "Stavke dnevnika" -#. module: account_move_line_stock_info -#: model:ir.model,name:account_move_line_stock_info.model_stock_quant -msgid "Quants" -msgstr "" - #. module: account_move_line_stock_info #: model:ir.model,name:account_move_line_stock_info.model_stock_move #: model:ir.model.fields,field_description:account_move_line_stock_info.field_account_move_line_stock_move_id diff --git a/account_move_line_stock_info/i18n/it.po b/account_move_line_stock_info/i18n/it.po index 7c122b913..a9f884052 100644 --- a/account_move_line_stock_info/i18n/it.po +++ b/account_move_line_stock_info/i18n/it.po @@ -4,14 +4,13 @@ # # Translators: # OCA Transbot , 2017 -# Paolo Valier , 2017 msgid "" msgstr "" -"Project-Id-Version: Odoo Server 9.0c\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-21 02:12+0000\n" -"PO-Revision-Date: 2017-01-21 02:12+0000\n" -"Last-Translator: Paolo Valier , 2017\n" +"POT-Creation-Date: 2017-06-03 01:23+0000\n" +"PO-Revision-Date: 2017-06-03 01:23+0000\n" +"Last-Translator: OCA Transbot , 2017\n" "Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -35,11 +34,6 @@ msgstr "" msgid "Journal Items" msgstr "Voci sezionale" -#. module: account_move_line_stock_info -#: model:ir.model,name:account_move_line_stock_info.model_stock_quant -msgid "Quants" -msgstr "Quantità" - #. module: account_move_line_stock_info #: model:ir.model,name:account_move_line_stock_info.model_stock_move #: model:ir.model.fields,field_description:account_move_line_stock_info.field_account_move_line_stock_move_id diff --git a/account_move_line_stock_info/i18n/nl_NL.po b/account_move_line_stock_info/i18n/nl_NL.po new file mode 100644 index 000000000..1e7b7bc42 --- /dev/null +++ b/account_move_line_stock_info/i18n/nl_NL.po @@ -0,0 +1,41 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_move_line_stock_info +# +# Translators: +# Peter Hageman , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-06-23 00:57+0000\n" +"PO-Revision-Date: 2017-06-23 00:57+0000\n" +"Last-Translator: Peter Hageman , 2017\n" +"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/teams/23907/nl_NL/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: nl_NL\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: account_move_line_stock_info +#: model:ir.model.fields,field_description:account_move_line_stock_info.field_stock_move_account_move_line_ids +msgid "Account move line ids" +msgstr "" + +#. module: account_move_line_stock_info +#: model:ir.model,name:account_move_line_stock_info.model_account_move_line +msgid "Journal Item" +msgstr "" + +#. module: account_move_line_stock_info +#: model:ir.ui.view,arch_db:account_move_line_stock_info.view_move_form +#: model:ir.ui.view,arch_db:account_move_line_stock_info.view_move_picking_form +msgid "Journal Items" +msgstr "" + +#. module: account_move_line_stock_info +#: model:ir.model,name:account_move_line_stock_info.model_stock_move +#: model:ir.model.fields,field_description:account_move_line_stock_info.field_account_move_line_stock_move_id +msgid "Stock Move" +msgstr "Voorraadmutatie" diff --git a/account_move_line_stock_info/i18n/pt_BR.po b/account_move_line_stock_info/i18n/pt_BR.po index 0401622cb..f1a86d2e5 100644 --- a/account_move_line_stock_info/i18n/pt_BR.po +++ b/account_move_line_stock_info/i18n/pt_BR.po @@ -4,15 +4,13 @@ # # Translators: # OCA Transbot , 2017 -# Claudio Araujo Santos , 2017 -# Magno , 2017 msgid "" msgstr "" -"Project-Id-Version: Odoo Server 9.0c\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-21 02:12+0000\n" -"PO-Revision-Date: 2017-01-21 02:12+0000\n" -"Last-Translator: Magno , 2017\n" +"POT-Creation-Date: 2017-06-03 01:23+0000\n" +"PO-Revision-Date: 2017-06-03 01:23+0000\n" +"Last-Translator: OCA Transbot , 2017\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/teams/23907/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -36,11 +34,6 @@ msgstr "Diário  Item" msgid "Journal Items" msgstr "Itens do Diário" -#. module: account_move_line_stock_info -#: model:ir.model,name:account_move_line_stock_info.model_stock_quant -msgid "Quants" -msgstr "Quants" - #. module: account_move_line_stock_info #: model:ir.model,name:account_move_line_stock_info.model_stock_move #: model:ir.model.fields,field_description:account_move_line_stock_info.field_account_move_line_stock_move_id diff --git a/account_move_line_stock_info/i18n/ro.po b/account_move_line_stock_info/i18n/ro.po index ddd476064..401b38016 100644 --- a/account_move_line_stock_info/i18n/ro.po +++ b/account_move_line_stock_info/i18n/ro.po @@ -3,14 +3,13 @@ # * account_move_line_stock_info # # Translators: -# Dorin Hongu , 2017 # OCA Transbot , 2017 msgid "" msgstr "" -"Project-Id-Version: Odoo Server 9.0c\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-21 02:12+0000\n" -"PO-Revision-Date: 2017-01-21 02:12+0000\n" +"POT-Creation-Date: 2017-06-03 01:23+0000\n" +"PO-Revision-Date: 2017-06-03 01:23+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Romanian (https://www.transifex.com/oca/teams/23907/ro/)\n" "MIME-Version: 1.0\n" @@ -35,11 +34,6 @@ msgstr "" msgid "Journal Items" msgstr "Elementele Jurnalului" -#. module: account_move_line_stock_info -#: model:ir.model,name:account_move_line_stock_info.model_stock_quant -msgid "Quants" -msgstr "Poziții de stoc" - #. module: account_move_line_stock_info #: model:ir.model,name:account_move_line_stock_info.model_stock_move #: model:ir.model.fields,field_description:account_move_line_stock_info.field_account_move_line_stock_move_id diff --git a/account_move_line_stock_info/i18n/sl.po b/account_move_line_stock_info/i18n/sl.po index 36f352d1f..0283b92ec 100644 --- a/account_move_line_stock_info/i18n/sl.po +++ b/account_move_line_stock_info/i18n/sl.po @@ -4,14 +4,13 @@ # # Translators: # OCA Transbot , 2017 -# Matjaž Mozetič , 2017 msgid "" msgstr "" -"Project-Id-Version: Odoo Server 9.0c\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-21 02:12+0000\n" -"PO-Revision-Date: 2017-01-21 02:12+0000\n" -"Last-Translator: Matjaž Mozetič , 2017\n" +"POT-Creation-Date: 2017-07-28 02:58+0000\n" +"PO-Revision-Date: 2017-07-28 02:58+0000\n" +"Last-Translator: OCA Transbot , 2017\n" "Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,6 +20,7 @@ msgstr "" #. module: account_move_line_stock_info #: model:ir.model.fields,field_description:account_move_line_stock_info.field_stock_move_account_move_line_ids +#: model:ir.model.fields,field_description:account_move_line_stock_info.field_stock_reservation_account_move_line_ids msgid "Account move line ids" msgstr "ID-ji postavk kontnih premikov" @@ -35,11 +35,6 @@ msgstr "Dnevniška postavka" msgid "Journal Items" msgstr "Dnevniške postavke" -#. module: account_move_line_stock_info -#: model:ir.model,name:account_move_line_stock_info.model_stock_quant -msgid "Quants" -msgstr "Kvant" - #. module: account_move_line_stock_info #: model:ir.model,name:account_move_line_stock_info.model_stock_move #: model:ir.model.fields,field_description:account_move_line_stock_info.field_account_move_line_stock_move_id diff --git a/account_move_line_stock_info/models/__init__.py b/account_move_line_stock_info/models/__init__.py index 53b24cfec..587da6c6b 100644 --- a/account_move_line_stock_info/models/__init__.py +++ b/account_move_line_stock_info/models/__init__.py @@ -3,5 +3,4 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import account_move_line -from . import stock_quant from . import stock_move diff --git a/account_move_line_stock_info/models/account_move_line.py b/account_move_line_stock_info/models/account_move_line.py index 932fc0aa6..5f742b441 100644 --- a/account_move_line_stock_info/models/account_move_line.py +++ b/account_move_line_stock_info/models/account_move_line.py @@ -2,11 +2,12 @@ # © 2016 Eficent Business and IT Consulting Services S.L. # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from openerp import fields, models +from odoo import fields, models class AccountMoveLine(models.Model): _inherit = 'account.move.line' - stock_move_id = fields.Many2one(comodel_name='stock.move', - string='Stock Move', copy=False) + stock_move_id = fields.Many2one( + comodel_name='stock.move', string='Stock Move', copy=False, + index=True) diff --git a/account_move_line_stock_info/models/stock_move.py b/account_move_line_stock_info/models/stock_move.py index b8de1067c..26fc47bf4 100644 --- a/account_move_line_stock_info/models/stock_move.py +++ b/account_move_line_stock_info/models/stock_move.py @@ -2,7 +2,7 @@ # © 2016 Eficent Business and IT Consulting Services S.L. # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from openerp import fields, models +from odoo import api, fields, models class StockMove(models.Model): @@ -11,3 +11,12 @@ class StockMove(models.Model): account_move_line_ids = fields.One2many( comodel_name='account.move.line', inverse_name='stock_move_id', copy=False) + + @api.model + def _prepare_account_move_line(self, qty, cost, + credit_account_id, debit_account_id): + res = super(StockMove, self)._prepare_account_move_line( + qty, cost, credit_account_id, debit_account_id) + for line in res: + line[2]['stock_move_id'] = self.id + return res diff --git a/account_move_line_stock_info/models/stock_quant.py b/account_move_line_stock_info/models/stock_quant.py deleted file mode 100644 index 0204f0e36..000000000 --- a/account_move_line_stock_info/models/stock_quant.py +++ /dev/null @@ -1,18 +0,0 @@ -# -*- coding: utf-8 -*- -# © 2016 Eficent Business and IT Consulting Services S.L. -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - -from openerp import models, api - - -class StockQuant(models.Model): - _inherit = 'stock.quant' - - @api.model - def _prepare_account_move_line(self, move, qty, cost, - credit_account_id, debit_account_id): - res = super(StockQuant, self)._prepare_account_move_line( - move, qty, cost, credit_account_id, debit_account_id) - for line in res: - line[2]['stock_move_id'] = move.id - return res diff --git a/account_move_line_stock_info/tests/test_account_move_line_stock_move.py b/account_move_line_stock_info/tests/test_account_move_line_stock_move.py index 67244a18c..c7b405aec 100644 --- a/account_move_line_stock_info/tests/test_account_move_line_stock_move.py +++ b/account_move_line_stock_info/tests/test_account_move_line_stock_move.py @@ -2,10 +2,10 @@ # © 2015 Eficent Business and IT Consulting Services S.L. (www.eficent.com) # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). -from openerp.tests import common +from odoo.tests.common import TransactionCase -class TestAccountMoveLineStockInfo(common.TransactionCase): +class TestAccountMoveLineStockInfo(TransactionCase): def setUp(self): super(TestAccountMoveLineStockInfo, self).setUp() diff --git a/account_move_line_stock_info/views/account_move_line_view.xml b/account_move_line_stock_info/views/account_move_line_view.xml index 161fee8c8..beb05b94b 100644 --- a/account_move_line_stock_info/views/account_move_line_view.xml +++ b/account_move_line_stock_info/views/account_move_line_view.xml @@ -1,26 +1,26 @@ - - account.move.line.form - account.move.line - - - - - + + account.move.line.form + account.move.line + + + + - + + - - account.move.line.form2 - account.move.line - - - - - + + account.move.line.form2 + account.move.line + + + + - + + diff --git a/account_move_line_stock_info/views/stock_move_view.xml b/account_move_line_stock_info/views/stock_move_view.xml index f472a4412..9880ba05a 100644 --- a/account_move_line_stock_info/views/stock_move_view.xml +++ b/account_move_line_stock_info/views/stock_move_view.xml @@ -1,35 +1,35 @@ - - stock.move.form - stock.move - - - - - - + + stock.move.form + stock.move + + + + + - - + + + - - stock.move.form - stock.move - - - - - - + + stock.move.form + stock.move + + + + + - - + + +