From 152c2dc2f1f28e1cc91391d39a6e41521116a2fc Mon Sep 17 00:00:00 2001 From: cubells Date: Fri, 3 Jan 2020 14:57:17 +0100 Subject: [PATCH 01/32] [ADD] purchase_stock_picking_invoice_link: linking purchases, pickings and invoices --- .../README.rst | 89 ++++ .../__init__.py | 1 + .../__manifest__.py | 21 + .../i18n/es.po | 26 ++ .../purchase_stock_picking_invoice_link.pot | 26 ++ .../models/__init__.py | 2 + .../models/account_invoice.py | 46 ++ .../models/stock_move.py | 18 + .../readme/CONTRIBUTORS.rst | 7 + .../readme/DESCRIPTION.rst | 6 + .../readme/USAGE.rst | 5 + .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/index.html | 437 ++++++++++++++++++ .../tests/__init__.py | 1 + ...est_purchase_stock_picking_invoice_link.py | 57 +++ .../views/account_invoice_views.xml | 17 + 16 files changed, 759 insertions(+) create mode 100644 purchase_stock_picking_invoice_link/README.rst create mode 100644 purchase_stock_picking_invoice_link/__init__.py create mode 100644 purchase_stock_picking_invoice_link/__manifest__.py create mode 100644 purchase_stock_picking_invoice_link/i18n/es.po create mode 100644 purchase_stock_picking_invoice_link/i18n/purchase_stock_picking_invoice_link.pot create mode 100644 purchase_stock_picking_invoice_link/models/__init__.py create mode 100644 purchase_stock_picking_invoice_link/models/account_invoice.py create mode 100644 purchase_stock_picking_invoice_link/models/stock_move.py create mode 100644 purchase_stock_picking_invoice_link/readme/CONTRIBUTORS.rst create mode 100644 purchase_stock_picking_invoice_link/readme/DESCRIPTION.rst create mode 100644 purchase_stock_picking_invoice_link/readme/USAGE.rst create mode 100644 purchase_stock_picking_invoice_link/static/description/icon.png create mode 100644 purchase_stock_picking_invoice_link/static/description/index.html create mode 100644 purchase_stock_picking_invoice_link/tests/__init__.py create mode 100644 purchase_stock_picking_invoice_link/tests/test_purchase_stock_picking_invoice_link.py create mode 100644 purchase_stock_picking_invoice_link/views/account_invoice_views.xml diff --git a/purchase_stock_picking_invoice_link/README.rst b/purchase_stock_picking_invoice_link/README.rst new file mode 100644 index 000000000000..11130eb04e34 --- /dev/null +++ b/purchase_stock_picking_invoice_link/README.rst @@ -0,0 +1,89 @@ +=================================== +Purchase Stock Picking Invoice Link +=================================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fstock--logistics--workflow-lightgray.png?logo=github + :target: https://github.com/OCA/stock-logistics-workflow/tree/11.0/purchase_stock_picking_invoice_link + :alt: OCA/stock-logistics-workflow +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/stock-logistics-workflow-11-0/stock-logistics-workflow-11-0-purchase_stock_picking_invoice_link + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/154/11.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module adds a link between purchases, pickings and invoices as well as +on the lines. Invoices are generated from purchase orders. With this module, +you can find back which deliveries an invoice relates to. + +This module improves **stock_picking_invoice_link** module by linking +purchases, pickings and invoices. + +**Table of contents** + +.. contents:: + :local: + +Usage +===== + +* Create a Purchase Order and confirm. +* Deliver its pickings totally or partially. +* Create an invoice of the goods delivered. +* If you open invoice form, you must see a new Pickings tab with information + about them. + +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 `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Tecnativa + +Contributors +~~~~~~~~~~~~ + +* `Tecnativa `_ + + * Vicent Cubells + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +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/stock-logistics-workflow `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/purchase_stock_picking_invoice_link/__init__.py b/purchase_stock_picking_invoice_link/__init__.py new file mode 100644 index 000000000000..0650744f6bc6 --- /dev/null +++ b/purchase_stock_picking_invoice_link/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/purchase_stock_picking_invoice_link/__manifest__.py b/purchase_stock_picking_invoice_link/__manifest__.py new file mode 100644 index 000000000000..1f3a379f7b04 --- /dev/null +++ b/purchase_stock_picking_invoice_link/__manifest__.py @@ -0,0 +1,21 @@ +# Copyright 2019 Vicent Cubells +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html + +{ + 'name': 'Purchase Stock Picking Invoice Link', + 'version': '11.0.1.0.0', + 'category': 'Warehouse Management', + 'summary': 'Adds link between purchases, pickings and invoices', + 'author': 'Tecnativa, ' + 'Odoo Community Association (OCA)', + 'website': 'http://github.com/OCA/stock-logistics-workflow', + 'license': 'AGPL-3', + 'depends': [ + 'stock_picking_invoice_link', + 'purchase', + ], + 'data': [ + 'views/account_invoice_views.xml', + ], + 'installable': True, +} diff --git a/purchase_stock_picking_invoice_link/i18n/es.po b/purchase_stock_picking_invoice_link/i18n/es.po new file mode 100644 index 000000000000..e2e3900402c9 --- /dev/null +++ b/purchase_stock_picking_invoice_link/i18n/es.po @@ -0,0 +1,26 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * purchase_stock_picking_invoice_link +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 11.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-02-07 11:40+0000\n" +"PO-Revision-Date: 2019-02-07 11:40+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: purchase_stock_picking_invoice_link +#: model:ir.model,name:purchase_stock_picking_invoice_link.model_account_invoice +msgid "Invoice" +msgstr "Factura" + +#. module: purchase_stock_picking_invoice_link +#: model:ir.model,name:purchase_stock_picking_invoice_link.model_account_invoice_line +msgid "Invoice Line" +msgstr "Línea de factura" diff --git a/purchase_stock_picking_invoice_link/i18n/purchase_stock_picking_invoice_link.pot b/purchase_stock_picking_invoice_link/i18n/purchase_stock_picking_invoice_link.pot new file mode 100644 index 000000000000..f6977f3c1e2c --- /dev/null +++ b/purchase_stock_picking_invoice_link/i18n/purchase_stock_picking_invoice_link.pot @@ -0,0 +1,26 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * purchase_stock_picking_invoice_link +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 11.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-02-07 11:40+0000\n" +"PO-Revision-Date: 2019-02-07 11:40+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: purchase_stock_picking_invoice_link +#: model:ir.model,name:purchase_stock_picking_invoice_link.model_account_invoice +msgid "Invoice" +msgstr "" + +#. module: purchase_stock_picking_invoice_link +#: model:ir.model,name:purchase_stock_picking_invoice_link.model_account_invoice_line +msgid "Invoice Line" +msgstr "" diff --git a/purchase_stock_picking_invoice_link/models/__init__.py b/purchase_stock_picking_invoice_link/models/__init__.py new file mode 100644 index 000000000000..0eaabea211dc --- /dev/null +++ b/purchase_stock_picking_invoice_link/models/__init__.py @@ -0,0 +1,2 @@ +from . import account_invoice +from . import stock_move diff --git a/purchase_stock_picking_invoice_link/models/account_invoice.py b/purchase_stock_picking_invoice_link/models/account_invoice.py new file mode 100644 index 000000000000..556c0fb35b85 --- /dev/null +++ b/purchase_stock_picking_invoice_link/models/account_invoice.py @@ -0,0 +1,46 @@ +# Copyright 2019 Vicent Cubells +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html + +from odoo import api, models + + +class AccountInvoice(models.Model): + _inherit = "account.invoice" + + @api.multi + def _prepare_invoice_line_from_po_line(self, line): + vals = super()._prepare_invoice_line_from_po_line(line) + moves = self.env['stock.move'].search([ + ('purchase_line_id', '=', line.id), + ]) + if moves: + move_ids = moves._get_moves() + vals['move_line_ids'] = [(6, 0, move_ids.ids)] + pickings = move_ids.mapped('picking_id') + pickings.invoice_ids = [(4, self.id)] + return vals + + @api.model + def create(self, values): + pickings = self.env['stock.picking'] + result = [] + if 'invoice_line_ids' not in values: + return super().create(values) + for item in values.get('invoice_line_ids'): + if not item[2].get('purchase_line_id'): + continue + moves = self.env['stock.move'].search([ + ('purchase_line_id', '=', item[2]['purchase_line_id']), + ]) + if moves: + move_ids = moves._get_moves() + item[2]['move_line_ids'] = [(6, 0, move_ids.ids)] + pickings |= move_ids.mapped('picking_id') + result.append(item) + if result and values.get('invoice_line_ids'): + values['invoice_line_ids'] = result + res = super().create(values) + if res: + for picking in pickings: + picking.invoice_ids = [(4, res.id)] + return res diff --git a/purchase_stock_picking_invoice_link/models/stock_move.py b/purchase_stock_picking_invoice_link/models/stock_move.py new file mode 100644 index 000000000000..8a69360390e7 --- /dev/null +++ b/purchase_stock_picking_invoice_link/models/stock_move.py @@ -0,0 +1,18 @@ +# Copyright 2019 Vicent Cubells +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html + +from odoo import api, models + + +class StockMove(models.Model): + _inherit = "stock.move" + + @api.multi + def _get_moves(self): + return self.filtered( + lambda x: x.state == 'done' and + not x.scrapped and ( + x.location_id.usage == 'supplier' or + (x.location_dest_id.usage == 'customer' and + x.to_refund) + )) diff --git a/purchase_stock_picking_invoice_link/readme/CONTRIBUTORS.rst b/purchase_stock_picking_invoice_link/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000000..53e0f473ae25 --- /dev/null +++ b/purchase_stock_picking_invoice_link/readme/CONTRIBUTORS.rst @@ -0,0 +1,7 @@ +* `Tecnativa `_ + + * Vicent Cubells + +* `Obertix `_ + + * Vicent Cubells diff --git a/purchase_stock_picking_invoice_link/readme/DESCRIPTION.rst b/purchase_stock_picking_invoice_link/readme/DESCRIPTION.rst new file mode 100644 index 000000000000..3c030a0d4495 --- /dev/null +++ b/purchase_stock_picking_invoice_link/readme/DESCRIPTION.rst @@ -0,0 +1,6 @@ +This module adds a link between purchases, pickings and invoices as well as +on the lines. Invoices are generated from purchase orders. With this module, +you can find back which deliveries an invoice relates to. + +This module improves **stock_picking_invoice_link** module by linking +purchases, pickings and invoices. diff --git a/purchase_stock_picking_invoice_link/readme/USAGE.rst b/purchase_stock_picking_invoice_link/readme/USAGE.rst new file mode 100644 index 000000000000..87fde52a5314 --- /dev/null +++ b/purchase_stock_picking_invoice_link/readme/USAGE.rst @@ -0,0 +1,5 @@ +* Create a Purchase Order and confirm. +* Deliver its pickings totally or partially. +* Create an invoice of the goods delivered. +* If you open invoice form, you must see a new Pickings tab with information + about them. diff --git a/purchase_stock_picking_invoice_link/static/description/icon.png b/purchase_stock_picking_invoice_link/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/purchase_stock_picking_invoice_link/static/description/index.html b/purchase_stock_picking_invoice_link/static/description/index.html new file mode 100644 index 000000000000..84cc88847893 --- /dev/null +++ b/purchase_stock_picking_invoice_link/static/description/index.html @@ -0,0 +1,437 @@ + + + + + + +Purchase Stock Picking Invoice Link + + + + + + diff --git a/purchase_stock_picking_invoice_link/tests/__init__.py b/purchase_stock_picking_invoice_link/tests/__init__.py new file mode 100644 index 000000000000..4e7f6fa249bb --- /dev/null +++ b/purchase_stock_picking_invoice_link/tests/__init__.py @@ -0,0 +1 @@ +from . import test_purchase_stock_picking_invoice_link diff --git a/purchase_stock_picking_invoice_link/tests/test_purchase_stock_picking_invoice_link.py b/purchase_stock_picking_invoice_link/tests/test_purchase_stock_picking_invoice_link.py new file mode 100644 index 000000000000..a9b9e489d3df --- /dev/null +++ b/purchase_stock_picking_invoice_link/tests/test_purchase_stock_picking_invoice_link.py @@ -0,0 +1,57 @@ +# Copyright 2019 Vicent Cubells +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html + +from odoo.tests import common +from odoo import fields + + +class TestPurchaseSTockPickingInvoiceLink(common.SavepointCase): + @classmethod + def setUpClass(cls): + super(TestPurchaseSTockPickingInvoiceLink, cls).setUpClass() + + cls.supplier = cls.env['res.partner'].create({ + 'name': 'Supplier for Test', + 'supplier': True, + }) + product = cls.env['product.product'].create({ + 'name': 'Product for Test', + }) + cls.po = cls.env['purchase.order'].create({ + 'partner_id': cls.supplier.id, + 'order_line': [(0, 0, { + 'product_id': product.id, + 'name': product.name, + 'product_qty': 1.0, + 'date_planned': fields.date.today(), + 'product_uom': product.uom_po_id.id, + 'price_unit': 15.0, + })] + }) + + def test_puchase_stock_picking_invoice_link(self): + # Purchase order confirm + self.po.button_confirm() + # Validate shipment + picking = self.po.picking_ids[0] + # Process pickings + picking.action_confirm() + picking.move_lines.quantity_done = 1.0 + picking.button_validate() + # Invoice purchase + self.invoice = self.env['account.invoice'].create({ + 'partner_id': self.supplier.id, + 'purchase_id': self.po.id, + 'account_id': self.supplier.property_account_payable_id.id, + 'type': 'in_invoice', + }) + self.invoice.purchase_order_change() + self.invoice.action_invoice_open() + # Only one invoice line has been created + self.assertEqual(len(self.invoice.invoice_line_ids), 1) + line = self.invoice.invoice_line_ids + # Move lines are set in invoice lines + self.assertEqual(len(line.mapped('move_line_ids')), 1) + self.assertEqual(line.mapped('move_line_ids'), picking.move_lines) + # Invoices are set in pickings + self.assertEqual(picking.invoice_ids, self.invoice) diff --git a/purchase_stock_picking_invoice_link/views/account_invoice_views.xml b/purchase_stock_picking_invoice_link/views/account_invoice_views.xml new file mode 100644 index 000000000000..2e54be3d4a45 --- /dev/null +++ b/purchase_stock_picking_invoice_link/views/account_invoice_views.xml @@ -0,0 +1,17 @@ + + + + + account.invoice.supplier.form + account.invoice + + + + + + + + + + + From 5c97597692584239fcd6ccf66cd9d934a9c96665 Mon Sep 17 00:00:00 2001 From: "Dimitrios T. Tanis" Date: Thu, 19 Nov 2020 13:08:58 +0200 Subject: [PATCH 02/32] [MIG] purchase_stock_picking_invoice_link: : Migration to 12.0 --- .../__manifest__.py | 2 +- .../models/account_invoice.py | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/purchase_stock_picking_invoice_link/__manifest__.py b/purchase_stock_picking_invoice_link/__manifest__.py index 1f3a379f7b04..f1f2a02eaed8 100644 --- a/purchase_stock_picking_invoice_link/__manifest__.py +++ b/purchase_stock_picking_invoice_link/__manifest__.py @@ -3,7 +3,7 @@ { 'name': 'Purchase Stock Picking Invoice Link', - 'version': '11.0.1.0.0', + 'version': '12.0.1.0.0', 'category': 'Warehouse Management', 'summary': 'Adds link between purchases, pickings and invoices', 'author': 'Tecnativa, ' diff --git a/purchase_stock_picking_invoice_link/models/account_invoice.py b/purchase_stock_picking_invoice_link/models/account_invoice.py index 556c0fb35b85..6aa2e54d6a3a 100644 --- a/purchase_stock_picking_invoice_link/models/account_invoice.py +++ b/purchase_stock_picking_invoice_link/models/account_invoice.py @@ -17,16 +17,17 @@ def _prepare_invoice_line_from_po_line(self, line): move_ids = moves._get_moves() vals['move_line_ids'] = [(6, 0, move_ids.ids)] pickings = move_ids.mapped('picking_id') - pickings.invoice_ids = [(4, self.id)] + for picking in pickings: + picking.invoice_ids = [(4, self.id)] return vals @api.model - def create(self, values): + def create(self, vals_list): pickings = self.env['stock.picking'] result = [] - if 'invoice_line_ids' not in values: - return super().create(values) - for item in values.get('invoice_line_ids'): + if 'invoice_line_ids' not in vals_list: + return super().create(vals_list) + for item in vals_list.get('invoice_line_ids'): if not item[2].get('purchase_line_id'): continue moves = self.env['stock.move'].search([ @@ -37,9 +38,9 @@ def create(self, values): item[2]['move_line_ids'] = [(6, 0, move_ids.ids)] pickings |= move_ids.mapped('picking_id') result.append(item) - if result and values.get('invoice_line_ids'): - values['invoice_line_ids'] = result - res = super().create(values) + if result and vals_list.get('invoice_line_ids'): + vals_list['invoice_line_ids'] = result + res = super().create(vals_list) if res: for picking in pickings: picking.invoice_ids = [(4, res.id)] From ace98ec26bdd226a74a1b2b02e224a28a1649f45 Mon Sep 17 00:00:00 2001 From: Ernesto Tejeda Date: Tue, 31 Aug 2021 09:39:11 -0400 Subject: [PATCH 03/32] [IMP] purchase_stock_picking_invoice_link: black, isort, prettier --- .../__manifest__.py | 26 +++----- .../models/account_invoice.py | 30 +++++---- .../models/stock_move.py | 13 ++-- ...est_purchase_stock_picking_invoice_link.py | 61 +++++++++++-------- .../views/account_invoice_views.xml | 14 +++-- 5 files changed, 73 insertions(+), 71 deletions(-) diff --git a/purchase_stock_picking_invoice_link/__manifest__.py b/purchase_stock_picking_invoice_link/__manifest__.py index f1f2a02eaed8..9f6ad40483d8 100644 --- a/purchase_stock_picking_invoice_link/__manifest__.py +++ b/purchase_stock_picking_invoice_link/__manifest__.py @@ -2,20 +2,14 @@ # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html { - 'name': 'Purchase Stock Picking Invoice Link', - 'version': '12.0.1.0.0', - 'category': 'Warehouse Management', - 'summary': 'Adds link between purchases, pickings and invoices', - 'author': 'Tecnativa, ' - 'Odoo Community Association (OCA)', - 'website': 'http://github.com/OCA/stock-logistics-workflow', - 'license': 'AGPL-3', - 'depends': [ - 'stock_picking_invoice_link', - 'purchase', - ], - 'data': [ - 'views/account_invoice_views.xml', - ], - 'installable': True, + "name": "Purchase Stock Picking Invoice Link", + "version": "12.0.1.0.0", + "category": "Warehouse Management", + "summary": "Adds link between purchases, pickings and invoices", + "author": "Tecnativa, " "Odoo Community Association (OCA)", + "website": "http://github.com/OCA/stock-logistics-workflow", + "license": "AGPL-3", + "depends": ["stock_picking_invoice_link", "purchase",], + "data": ["views/account_invoice_views.xml",], + "installable": True, } diff --git a/purchase_stock_picking_invoice_link/models/account_invoice.py b/purchase_stock_picking_invoice_link/models/account_invoice.py index 6aa2e54d6a3a..21ab039ce7c3 100644 --- a/purchase_stock_picking_invoice_link/models/account_invoice.py +++ b/purchase_stock_picking_invoice_link/models/account_invoice.py @@ -10,36 +10,34 @@ class AccountInvoice(models.Model): @api.multi def _prepare_invoice_line_from_po_line(self, line): vals = super()._prepare_invoice_line_from_po_line(line) - moves = self.env['stock.move'].search([ - ('purchase_line_id', '=', line.id), - ]) + moves = self.env["stock.move"].search([("purchase_line_id", "=", line.id),]) if moves: move_ids = moves._get_moves() - vals['move_line_ids'] = [(6, 0, move_ids.ids)] - pickings = move_ids.mapped('picking_id') + vals["move_line_ids"] = [(6, 0, move_ids.ids)] + pickings = move_ids.mapped("picking_id") for picking in pickings: picking.invoice_ids = [(4, self.id)] return vals @api.model def create(self, vals_list): - pickings = self.env['stock.picking'] + pickings = self.env["stock.picking"] result = [] - if 'invoice_line_ids' not in vals_list: + if "invoice_line_ids" not in vals_list: return super().create(vals_list) - for item in vals_list.get('invoice_line_ids'): - if not item[2].get('purchase_line_id'): + for item in vals_list.get("invoice_line_ids"): + if not item[2].get("purchase_line_id"): continue - moves = self.env['stock.move'].search([ - ('purchase_line_id', '=', item[2]['purchase_line_id']), - ]) + moves = self.env["stock.move"].search( + [("purchase_line_id", "=", item[2]["purchase_line_id"]),] + ) if moves: move_ids = moves._get_moves() - item[2]['move_line_ids'] = [(6, 0, move_ids.ids)] - pickings |= move_ids.mapped('picking_id') + item[2]["move_line_ids"] = [(6, 0, move_ids.ids)] + pickings |= move_ids.mapped("picking_id") result.append(item) - if result and vals_list.get('invoice_line_ids'): - vals_list['invoice_line_ids'] = result + if result and vals_list.get("invoice_line_ids"): + vals_list["invoice_line_ids"] = result res = super().create(vals_list) if res: for picking in pickings: diff --git a/purchase_stock_picking_invoice_link/models/stock_move.py b/purchase_stock_picking_invoice_link/models/stock_move.py index 8a69360390e7..0fcc4cff5070 100644 --- a/purchase_stock_picking_invoice_link/models/stock_move.py +++ b/purchase_stock_picking_invoice_link/models/stock_move.py @@ -10,9 +10,10 @@ class StockMove(models.Model): @api.multi def _get_moves(self): return self.filtered( - lambda x: x.state == 'done' and - not x.scrapped and ( - x.location_id.usage == 'supplier' or - (x.location_dest_id.usage == 'customer' and - x.to_refund) - )) + lambda x: x.state == "done" + and not x.scrapped + and ( + x.location_id.usage == "supplier" + or (x.location_dest_id.usage == "customer" and x.to_refund) + ) + ) diff --git a/purchase_stock_picking_invoice_link/tests/test_purchase_stock_picking_invoice_link.py b/purchase_stock_picking_invoice_link/tests/test_purchase_stock_picking_invoice_link.py index a9b9e489d3df..d9182db5681f 100644 --- a/purchase_stock_picking_invoice_link/tests/test_purchase_stock_picking_invoice_link.py +++ b/purchase_stock_picking_invoice_link/tests/test_purchase_stock_picking_invoice_link.py @@ -1,8 +1,8 @@ # Copyright 2019 Vicent Cubells # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html -from odoo.tests import common from odoo import fields +from odoo.tests import common class TestPurchaseSTockPickingInvoiceLink(common.SavepointCase): @@ -10,24 +10,29 @@ class TestPurchaseSTockPickingInvoiceLink(common.SavepointCase): def setUpClass(cls): super(TestPurchaseSTockPickingInvoiceLink, cls).setUpClass() - cls.supplier = cls.env['res.partner'].create({ - 'name': 'Supplier for Test', - 'supplier': True, - }) - product = cls.env['product.product'].create({ - 'name': 'Product for Test', - }) - cls.po = cls.env['purchase.order'].create({ - 'partner_id': cls.supplier.id, - 'order_line': [(0, 0, { - 'product_id': product.id, - 'name': product.name, - 'product_qty': 1.0, - 'date_planned': fields.date.today(), - 'product_uom': product.uom_po_id.id, - 'price_unit': 15.0, - })] - }) + cls.supplier = cls.env["res.partner"].create( + {"name": "Supplier for Test", "supplier": True,} + ) + product = cls.env["product.product"].create({"name": "Product for Test",}) + cls.po = cls.env["purchase.order"].create( + { + "partner_id": cls.supplier.id, + "order_line": [ + ( + 0, + 0, + { + "product_id": product.id, + "name": product.name, + "product_qty": 1.0, + "date_planned": fields.date.today(), + "product_uom": product.uom_po_id.id, + "price_unit": 15.0, + }, + ) + ], + } + ) def test_puchase_stock_picking_invoice_link(self): # Purchase order confirm @@ -39,19 +44,21 @@ def test_puchase_stock_picking_invoice_link(self): picking.move_lines.quantity_done = 1.0 picking.button_validate() # Invoice purchase - self.invoice = self.env['account.invoice'].create({ - 'partner_id': self.supplier.id, - 'purchase_id': self.po.id, - 'account_id': self.supplier.property_account_payable_id.id, - 'type': 'in_invoice', - }) + self.invoice = self.env["account.invoice"].create( + { + "partner_id": self.supplier.id, + "purchase_id": self.po.id, + "account_id": self.supplier.property_account_payable_id.id, + "type": "in_invoice", + } + ) self.invoice.purchase_order_change() self.invoice.action_invoice_open() # Only one invoice line has been created self.assertEqual(len(self.invoice.invoice_line_ids), 1) line = self.invoice.invoice_line_ids # Move lines are set in invoice lines - self.assertEqual(len(line.mapped('move_line_ids')), 1) - self.assertEqual(line.mapped('move_line_ids'), picking.move_lines) + self.assertEqual(len(line.mapped("move_line_ids")), 1) + self.assertEqual(line.mapped("move_line_ids"), picking.move_lines) # Invoices are set in pickings self.assertEqual(picking.invoice_ids, self.invoice) diff --git a/purchase_stock_picking_invoice_link/views/account_invoice_views.xml b/purchase_stock_picking_invoice_link/views/account_invoice_views.xml index 2e54be3d4a45..a5cff8cce3cf 100644 --- a/purchase_stock_picking_invoice_link/views/account_invoice_views.xml +++ b/purchase_stock_picking_invoice_link/views/account_invoice_views.xml @@ -1,17 +1,19 @@ - + - account.invoice.supplier.form account.invoice - + - - + + - From a3c3b313a51783cbc6343bfe9e29aa0cf5fb3fa5 Mon Sep 17 00:00:00 2001 From: David Alonso // Solvos Date: Tue, 2 Mar 2021 18:38:04 +0100 Subject: [PATCH 04/32] [MIG] purchase_stock_picking_invoice_link: Migration to 13.0 --- .../README.rst | 27 ++++-- .../__manifest__.py | 7 +- .../purchase_stock_picking_invoice_link.pot | 16 ++-- .../models/__init__.py | 2 +- .../models/account_invoice.py | 45 ---------- .../models/account_move.py | 24 ++++++ .../models/stock_move.py | 27 ++++-- .../readme/CONTRIBUTORS.rst | 7 +- .../readme/USAGE.rst | 4 +- .../static/description/index.html | 23 +++-- ...est_purchase_stock_picking_invoice_link.py | 84 ++++++++++--------- .../views/account_invoice_views.xml | 19 ----- 12 files changed, 141 insertions(+), 144 deletions(-) delete mode 100644 purchase_stock_picking_invoice_link/models/account_invoice.py create mode 100644 purchase_stock_picking_invoice_link/models/account_move.py delete mode 100644 purchase_stock_picking_invoice_link/views/account_invoice_views.xml diff --git a/purchase_stock_picking_invoice_link/README.rst b/purchase_stock_picking_invoice_link/README.rst index 11130eb04e34..05537c1621ef 100644 --- a/purchase_stock_picking_invoice_link/README.rst +++ b/purchase_stock_picking_invoice_link/README.rst @@ -14,16 +14,16 @@ Purchase Stock Picking Invoice Link :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fstock--logistics--workflow-lightgray.png?logo=github - :target: https://github.com/OCA/stock-logistics-workflow/tree/11.0/purchase_stock_picking_invoice_link + :target: https://github.com/OCA/stock-logistics-workflow/tree/13.0/purchase_stock_picking_invoice_link :alt: OCA/stock-logistics-workflow .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/stock-logistics-workflow-11-0/stock-logistics-workflow-11-0-purchase_stock_picking_invoice_link + :target: https://translation.odoo-community.org/projects/stock-logistics-workflow-13-0/stock-logistics-workflow-13-0-purchase_stock_picking_invoice_link :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/154/11.0 + :target: https://runbot.odoo-community.org/runbot/154/13.0 :alt: Try me on Runbot -|badge1| |badge2| |badge3| |badge4| |badge5| +|badge1| |badge2| |badge3| |badge4| |badge5| This module adds a link between purchases, pickings and invoices as well as on the lines. Invoices are generated from purchase orders. With this module, @@ -43,8 +43,8 @@ Usage * Create a Purchase Order and confirm. * Deliver its pickings totally or partially. * Create an invoice of the goods delivered. -* If you open invoice form, you must see a new Pickings tab with information - about them. +* If you open invoice form, you must see a smart-button labeled *Pickings*. +* Click on this smart-button to see the linked pickings. Bug Tracker =========== @@ -52,7 +52,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. @@ -69,7 +69,16 @@ Contributors * `Tecnativa `_ - * Vicent Cubells + * Vicent Cubells + * Ernesto Tejeda + +* `Obertix `_ + + * Vicent Cubells + +* `Solvos `_ + + * David Alonso Maintainers ~~~~~~~~~~~ @@ -84,6 +93,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/stock-logistics-workflow `_ project on GitHub. +This module is part of the `OCA/stock-logistics-workflow `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/purchase_stock_picking_invoice_link/__manifest__.py b/purchase_stock_picking_invoice_link/__manifest__.py index 9f6ad40483d8..f1d171e9fbbf 100644 --- a/purchase_stock_picking_invoice_link/__manifest__.py +++ b/purchase_stock_picking_invoice_link/__manifest__.py @@ -3,13 +3,12 @@ { "name": "Purchase Stock Picking Invoice Link", - "version": "12.0.1.0.0", + "version": "13.0.1.0.0", "category": "Warehouse Management", "summary": "Adds link between purchases, pickings and invoices", - "author": "Tecnativa, " "Odoo Community Association (OCA)", + "author": "Tecnativa, Odoo Community Association (OCA)", "website": "http://github.com/OCA/stock-logistics-workflow", "license": "AGPL-3", - "depends": ["stock_picking_invoice_link", "purchase",], - "data": ["views/account_invoice_views.xml",], + "depends": ["stock_picking_invoice_link", "purchase"], "installable": True, } diff --git a/purchase_stock_picking_invoice_link/i18n/purchase_stock_picking_invoice_link.pot b/purchase_stock_picking_invoice_link/i18n/purchase_stock_picking_invoice_link.pot index f6977f3c1e2c..73e2d0410b90 100644 --- a/purchase_stock_picking_invoice_link/i18n/purchase_stock_picking_invoice_link.pot +++ b/purchase_stock_picking_invoice_link/i18n/purchase_stock_picking_invoice_link.pot @@ -1,14 +1,12 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * purchase_stock_picking_invoice_link +# * purchase_stock_picking_invoice_link # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 11.0\n" +"Project-Id-Version: Odoo Server 13.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-07 11:40+0000\n" -"PO-Revision-Date: 2019-02-07 11:40+0000\n" -"Last-Translator: <>\n" +"Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -16,11 +14,11 @@ msgstr "" "Plural-Forms: \n" #. module: purchase_stock_picking_invoice_link -#: model:ir.model,name:purchase_stock_picking_invoice_link.model_account_invoice -msgid "Invoice" +#: model:ir.model,name:purchase_stock_picking_invoice_link.model_account_move +msgid "Journal Entries" msgstr "" #. module: purchase_stock_picking_invoice_link -#: model:ir.model,name:purchase_stock_picking_invoice_link.model_account_invoice_line -msgid "Invoice Line" +#: model:ir.model,name:purchase_stock_picking_invoice_link.model_stock_move +msgid "Stock Move" msgstr "" diff --git a/purchase_stock_picking_invoice_link/models/__init__.py b/purchase_stock_picking_invoice_link/models/__init__.py index 0eaabea211dc..7fbfa5e3bfbe 100644 --- a/purchase_stock_picking_invoice_link/models/__init__.py +++ b/purchase_stock_picking_invoice_link/models/__init__.py @@ -1,2 +1,2 @@ -from . import account_invoice +from . import account_move from . import stock_move diff --git a/purchase_stock_picking_invoice_link/models/account_invoice.py b/purchase_stock_picking_invoice_link/models/account_invoice.py deleted file mode 100644 index 21ab039ce7c3..000000000000 --- a/purchase_stock_picking_invoice_link/models/account_invoice.py +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 2019 Vicent Cubells -# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html - -from odoo import api, models - - -class AccountInvoice(models.Model): - _inherit = "account.invoice" - - @api.multi - def _prepare_invoice_line_from_po_line(self, line): - vals = super()._prepare_invoice_line_from_po_line(line) - moves = self.env["stock.move"].search([("purchase_line_id", "=", line.id),]) - if moves: - move_ids = moves._get_moves() - vals["move_line_ids"] = [(6, 0, move_ids.ids)] - pickings = move_ids.mapped("picking_id") - for picking in pickings: - picking.invoice_ids = [(4, self.id)] - return vals - - @api.model - def create(self, vals_list): - pickings = self.env["stock.picking"] - result = [] - if "invoice_line_ids" not in vals_list: - return super().create(vals_list) - for item in vals_list.get("invoice_line_ids"): - if not item[2].get("purchase_line_id"): - continue - moves = self.env["stock.move"].search( - [("purchase_line_id", "=", item[2]["purchase_line_id"]),] - ) - if moves: - move_ids = moves._get_moves() - item[2]["move_line_ids"] = [(6, 0, move_ids.ids)] - pickings |= move_ids.mapped("picking_id") - result.append(item) - if result and vals_list.get("invoice_line_ids"): - vals_list["invoice_line_ids"] = result - res = super().create(vals_list) - if res: - for picking in pickings: - picking.invoice_ids = [(4, res.id)] - return res diff --git a/purchase_stock_picking_invoice_link/models/account_move.py b/purchase_stock_picking_invoice_link/models/account_move.py new file mode 100644 index 000000000000..065018f5c775 --- /dev/null +++ b/purchase_stock_picking_invoice_link/models/account_move.py @@ -0,0 +1,24 @@ +# Copyright 2019 Vicent Cubells +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html + +from odoo import api, models + + +class AccountMove(models.Model): + _inherit = "account.move" + + @api.model + def create(self, vals_list): + res = super().create(vals_list) + for move in res: + for line in move.invoice_line_ids.filtered("purchase_line_id"): + stock_moves = self.env["stock.move"].search( + [ + ("purchase_line_id", "=", line.purchase_line_id.id), + ("to_refund", "=", (move.type == "in_refund")), + ] + ) + if stock_moves: + stock_moves = stock_moves.get_moves_link_invoice() + line.move_line_ids = [(6, 0, stock_moves.ids)] + return res diff --git a/purchase_stock_picking_invoice_link/models/stock_move.py b/purchase_stock_picking_invoice_link/models/stock_move.py index 0fcc4cff5070..4078ba425993 100644 --- a/purchase_stock_picking_invoice_link/models/stock_move.py +++ b/purchase_stock_picking_invoice_link/models/stock_move.py @@ -1,19 +1,34 @@ -# Copyright 2019 Vicent Cubells -# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html +# Copyright 2021 Tecnativa - Ernesto Tejeda +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -from odoo import api, models +from odoo import models class StockMove(models.Model): _inherit = "stock.move" - @api.multi - def _get_moves(self): + def write(self, vals): + res = super().write(vals) + if vals.get("state", "") == "done": + stock_moves = self.get_moves_link_invoice() + for stock_move in stock_moves.filtered("purchase_line_id"): + inv_type = stock_move.to_refund and "in_refund" or "in_invoice" + inv_line = self.env["account.move.line"].search( + [ + ("purchase_line_id", "=", stock_move.purchase_line_id.id), + ("move_id.type", "=", inv_type), + ] + ) + if inv_line: + stock_move.invoice_line_ids = [(4, m.id) for m in inv_line] + return res + + def get_moves_link_invoice(self): return self.filtered( lambda x: x.state == "done" and not x.scrapped and ( x.location_id.usage == "supplier" - or (x.location_dest_id.usage == "customer" and x.to_refund) + or (x.location_dest_id.usage == "supplier" and x.to_refund) ) ) diff --git a/purchase_stock_picking_invoice_link/readme/CONTRIBUTORS.rst b/purchase_stock_picking_invoice_link/readme/CONTRIBUTORS.rst index 53e0f473ae25..5a6e5eef2f34 100644 --- a/purchase_stock_picking_invoice_link/readme/CONTRIBUTORS.rst +++ b/purchase_stock_picking_invoice_link/readme/CONTRIBUTORS.rst @@ -1,7 +1,12 @@ * `Tecnativa `_ - * Vicent Cubells + * Vicent Cubells + * Ernesto Tejeda * `Obertix `_ * Vicent Cubells + +* `Solvos `_ + + * David Alonso diff --git a/purchase_stock_picking_invoice_link/readme/USAGE.rst b/purchase_stock_picking_invoice_link/readme/USAGE.rst index 87fde52a5314..1673366a51b9 100644 --- a/purchase_stock_picking_invoice_link/readme/USAGE.rst +++ b/purchase_stock_picking_invoice_link/readme/USAGE.rst @@ -1,5 +1,5 @@ * Create a Purchase Order and confirm. * Deliver its pickings totally or partially. * Create an invoice of the goods delivered. -* If you open invoice form, you must see a new Pickings tab with information - about them. +* If you open invoice form, you must see a smart-button labeled *Pickings*. +* Click on this smart-button to see the linked pickings. diff --git a/purchase_stock_picking_invoice_link/static/description/index.html b/purchase_stock_picking_invoice_link/static/description/index.html index 84cc88847893..0b6ab6a09bbc 100644 --- a/purchase_stock_picking_invoice_link/static/description/index.html +++ b/purchase_stock_picking_invoice_link/static/description/index.html @@ -3,7 +3,7 @@ - + Purchase Stock Picking Invoice Link