diff --git a/account_move_line_stock_info/README.rst b/account_move_line_stock_info/README.rst index ede6c70b6..8abbbe427 100644 --- a/account_move_line_stock_info/README.rst +++ b/account_move_line_stock_info/README.rst @@ -1,5 +1,5 @@ -.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg - :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html +.. image:: https://img.shields.io/badge/license-AGPL--3-blue.png + :target: https://www.gnu.org/licenses/agpl :alt: License: AGPL-3 ============================ @@ -12,31 +12,36 @@ Usage ===== * The stock manager can check the journal items by accessing to 'Inventory > -Reports > Stock moves'. + Reports > Stock moves'. * A user belonging to the group 'Accounting & Finance/Adviser' can review the - details of a move that is associated to a journal item through - 'Invoicing > Adviser > Journal Entries (or Journal items)'. + details of a move that is associated to a journal item through + 'Invoicing > Adviser > Journal Entries (or Journal items)'. .. 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/10.0 + :target: https://runbot.odoo-community.org/runbot/153/11.0 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. +`_. In case of trouble, please +check there if your issue has already been reported. If you spotted it first, +help us smash it by providing detailed and welcomed feedback. Credits ======= +Images +------ + +* Odoo Community Association: `Icon `_. + Contributors ------------ + * Jordi Ballester Alomar * Lois Rilo diff --git a/account_move_line_stock_info/__init__.py b/account_move_line_stock_info/__init__.py index bc55e07c7..83e553ac4 100644 --- a/account_move_line_stock_info/__init__.py +++ b/account_move_line_stock_info/__init__.py @@ -1,5 +1,3 @@ -# -*- 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 . import models diff --git a/account_move_line_stock_info/__openerp__.py b/account_move_line_stock_info/__manifest__.py similarity index 91% rename from account_move_line_stock_info/__openerp__.py rename to account_move_line_stock_info/__manifest__.py index 7eebb32c4..79c8daded 100644 --- a/account_move_line_stock_info/__openerp__.py +++ b/account_move_line_stock_info/__manifest__.py @@ -1,9 +1,8 @@ -# -*- 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). { "name": "Account Move Line Stock Move", - "version": "10.0.1.0.0", + "version": "11.0.1.0.0", "depends": [ "stock_account" ], diff --git a/account_move_line_stock_info/models/__init__.py b/account_move_line_stock_info/models/__init__.py index 587da6c6b..58072e841 100644 --- a/account_move_line_stock_info/models/__init__.py +++ b/account_move_line_stock_info/models/__init__.py @@ -1,5 +1,3 @@ -# -*- 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 . import account_move_line 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 5f742b441..fdfe01075 100644 --- a/account_move_line_stock_info/models/account_move_line.py +++ b/account_move_line_stock_info/models/account_move_line.py @@ -1,4 +1,3 @@ -# -*- 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). diff --git a/account_move_line_stock_info/models/stock_move.py b/account_move_line_stock_info/models/stock_move.py index 26fc47bf4..6d49cd7e0 100644 --- a/account_move_line_stock_info/models/stock_move.py +++ b/account_move_line_stock_info/models/stock_move.py @@ -1,4 +1,3 @@ -# -*- 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). diff --git a/account_move_line_stock_info/readme/CONTRIBUTORS.rst b/account_move_line_stock_info/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..daeadd46d --- /dev/null +++ b/account_move_line_stock_info/readme/CONTRIBUTORS.rst @@ -0,0 +1,2 @@ +* Jordi Ballester Alomar +* Lois Rilo diff --git a/account_move_line_stock_info/readme/DESCRIPTION.rst b/account_move_line_stock_info/readme/DESCRIPTION.rst new file mode 100644 index 000000000..5659bfe5c --- /dev/null +++ b/account_move_line_stock_info/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +This module adds the stock move to the account move lines that it generates. diff --git a/account_move_line_stock_info/readme/USAGE.rst b/account_move_line_stock_info/readme/USAGE.rst new file mode 100644 index 000000000..41bc231b1 --- /dev/null +++ b/account_move_line_stock_info/readme/USAGE.rst @@ -0,0 +1,6 @@ +* The stock manager can check the journal items by accessing to 'Inventory > + Reports > Stock moves'. + +* A user belonging to the group 'Accounting & Finance/Adviser' can review the + details of a move that is associated to a journal item through + 'Invoicing > Adviser > Journal Entries (or Journal items)'. diff --git a/account_move_line_stock_info/tests/__init__.py b/account_move_line_stock_info/tests/__init__.py index f583070a9..411212a70 100644 --- a/account_move_line_stock_info/tests/__init__.py +++ b/account_move_line_stock_info/tests/__init__.py @@ -1,5 +1,3 @@ -# -*- 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 . import test_account_move_line_stock_move 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 c7b405aec..4626acecf 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 @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # © 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). @@ -78,14 +77,14 @@ class TestAccountMoveLineStockInfo(TransactionCase): 'email': 'test@yourcompany.com', 'company_id': company.id, 'company_ids': [(4, company.id)], - 'groups_id': [(6, 0, group_ids)] + 'groups_id': [(6, 0, group_ids)], }) return user.id - def _create_account_type(self, name, type): + def _create_account_type(self, name, a_type): acc_type = self.acc_type_model.create({ 'name': name, - 'type': type + 'type': a_type, }) return acc_type @@ -94,9 +93,8 @@ class TestAccountMoveLineStockInfo(TransactionCase): account = self.account_model.create({ 'name': name, 'code': code, - 'type': 'other', 'user_type_id': acc_type.id, - 'company_id': company.id + 'company_id': company.id, }) return account @@ -133,7 +131,7 @@ class TestAccountMoveLineStockInfo(TransactionCase): 'product_uom_qty': 3, 'location_id': location.id, 'location_dest_id': location_dest.id, - 'price_unit': 10 + 'price_unit': 10, })] }) return picking @@ -145,6 +143,7 @@ class TestAccountMoveLineStockInfo(TransactionCase): picking_in = self._create_picking( self.picking_type_in, self.location_supplier, self.location_stock) picking_in.action_confirm() + picking_in.move_lines.quantity_done = 1 picking_in.action_done() account_move_line = False @@ -157,6 +156,7 @@ class TestAccountMoveLineStockInfo(TransactionCase): picking_out = self._create_picking( self.picking_type_out, self.location_supplier, self.location_stock) picking_out.action_confirm() + picking_out.move_lines.quantity_done = 1 picking_out.action_done() for move in picking_out.move_lines: 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 beb05b94b..636f5516a 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 @@ -12,15 +12,4 @@ - - 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 9880ba05a..3181d1604 100644 --- a/account_move_line_stock_info/views/stock_move_view.xml +++ b/account_move_line_stock_info/views/stock_move_view.xml @@ -6,7 +6,7 @@ stock.move - + stock.move - +