From f4fea7e73ea05aba12ccbfc34d884c8d5488fe47 Mon Sep 17 00:00:00 2001 From: David Date: Thu, 5 Apr 2018 16:41:15 +0200 Subject: [PATCH 01/47] [MIG] account_invoice_report_grouped_by_picking: Migration to 11.0 --- .../README.rst | 64 +++++++++++++++++ .../__init__.py | 2 + .../__manifest__.py | 21 ++++++ ...ount_invoice_report_grouped_by_picking.pot | 25 +++++++ .../i18n/es.po | 30 ++++++++ .../models/__init__.py | 2 + .../models/account_invoice.py | 26 +++++++ .../security/portal_security.xml | 16 +++++ .../static/description/icon.png | Bin 0 -> 9455 bytes .../tests/__init__.py | 2 + .../test_account_invoice_group_picking.py | 65 ++++++++++++++++++ .../views/report_invoice.xml | 64 +++++++++++++++++ 12 files changed, 317 insertions(+) create mode 100644 account_invoice_report_grouped_by_picking/README.rst create mode 100644 account_invoice_report_grouped_by_picking/__init__.py create mode 100644 account_invoice_report_grouped_by_picking/__manifest__.py create mode 100644 account_invoice_report_grouped_by_picking/i18n/account_invoice_report_grouped_by_picking.pot create mode 100644 account_invoice_report_grouped_by_picking/i18n/es.po create mode 100644 account_invoice_report_grouped_by_picking/models/__init__.py create mode 100644 account_invoice_report_grouped_by_picking/models/account_invoice.py create mode 100644 account_invoice_report_grouped_by_picking/security/portal_security.xml create mode 100644 account_invoice_report_grouped_by_picking/static/description/icon.png create mode 100644 account_invoice_report_grouped_by_picking/tests/__init__.py create mode 100644 account_invoice_report_grouped_by_picking/tests/test_account_invoice_group_picking.py create mode 100644 account_invoice_report_grouped_by_picking/views/report_invoice.xml diff --git a/account_invoice_report_grouped_by_picking/README.rst b/account_invoice_report_grouped_by_picking/README.rst new file mode 100644 index 000000000..f5f076f28 --- /dev/null +++ b/account_invoice_report_grouped_by_picking/README.rst @@ -0,0 +1,64 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 + +============================= +Account Invoice Group Picking +============================= + +This module allows print invoices with picking info. This module groups +invoice lines and shows information related to sales and pickings on every +group. + + +Usage +===== + +#. Create several quotation orders and confirm them. +#. Deliver pickings related to each sale order. +#. Go to *Sales > Invoicing > Sales to invoicing* and invoice these sale + orders. +#. Open invoice newly created and print it. +#. Invoice report will group invoice lines and shows information about sales + and pickings in every group. + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/95/9.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 smash it by providing detailed and welcomed feedback. + +Credits +======= + +Images +------ + +* Odoo Community Association: `Icon `_. + +Contributors +------------ + +* Carlos Dauden +* David Vidal + +Maintainer +---------- + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +This module is maintained by the OCA. + +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. + +To contribute to this module, please visit https://odoo-community.org. diff --git a/account_invoice_report_grouped_by_picking/__init__.py b/account_invoice_report_grouped_by_picking/__init__.py new file mode 100644 index 000000000..a9e337226 --- /dev/null +++ b/account_invoice_report_grouped_by_picking/__init__.py @@ -0,0 +1,2 @@ + +from . import models diff --git a/account_invoice_report_grouped_by_picking/__manifest__.py b/account_invoice_report_grouped_by_picking/__manifest__.py new file mode 100644 index 000000000..c8becd518 --- /dev/null +++ b/account_invoice_report_grouped_by_picking/__manifest__.py @@ -0,0 +1,21 @@ +# Copyright 2017 Carlos Dauden +# Copyright 2018 David Vidal +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +{ + "name": "Account Invoice Grouped by Picking", + "summary": "Print invoice lines grouped by picking", + "version": "11.0.1.0.0", + "category": "Accounting & Finance", + "website": "https://github.com/OCA/account-invoice-reporting", + "author": "Tecnativa, " + "Odoo Community Association (OCA)", + "license": "AGPL-3", + "depends": [ + "stock_picking_invoice_link", + ], + "data": [ + "security/portal_security.xml", + "views/report_invoice.xml", + ], +} diff --git a/account_invoice_report_grouped_by_picking/i18n/account_invoice_report_grouped_by_picking.pot b/account_invoice_report_grouped_by_picking/i18n/account_invoice_report_grouped_by_picking.pot new file mode 100644 index 000000000..bc653021c --- /dev/null +++ b/account_invoice_report_grouped_by_picking/i18n/account_invoice_report_grouped_by_picking.pot @@ -0,0 +1,25 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_invoice_report_grouped_by_picking +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 11.0\n" +"Report-Msgid-Bugs-To: \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: account_invoice_report_grouped_by_picking +#: model:ir.ui.view,arch_db:account_invoice_report_grouped_by_picking.report_invoice_document +msgid "Subtotal: " +msgstr "" + +#. module: account_invoice_report_grouped_by_picking +#: model:ir.model,name:account_invoice_report_grouped_by_picking.model_account_invoice +msgid "Invoice" +msgstr "" + diff --git a/account_invoice_report_grouped_by_picking/i18n/es.po b/account_invoice_report_grouped_by_picking/i18n/es.po new file mode 100644 index 000000000..4e69b9e8d --- /dev/null +++ b/account_invoice_report_grouped_by_picking/i18n/es.po @@ -0,0 +1,30 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_invoice_report_grouped_by_picking +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 11.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-04-05 15:08+0000\n" +"PO-Revision-Date: 2018-04-05 15:08+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: account_invoice_report_grouped_by_picking +#: model:ir.ui.view,arch_db:account_invoice_report_grouped_by_picking.report_invoice_document +msgid "Subtotal: " +msgstr "Subtotal: " + +#. module: account_invoice_report_grouped_by_picking +#: model:ir.model,name:account_invoice_report_grouped_by_picking.model_account_invoice +msgid "Invoice" +msgstr "Factura" + +#~ msgid "Order: %s Picking: %s %s" +#~ msgstr "Pedido: %s Albarán: %s %s" diff --git a/account_invoice_report_grouped_by_picking/models/__init__.py b/account_invoice_report_grouped_by_picking/models/__init__.py new file mode 100644 index 000000000..10b5ef348 --- /dev/null +++ b/account_invoice_report_grouped_by_picking/models/__init__.py @@ -0,0 +1,2 @@ + +from . import account_invoice diff --git a/account_invoice_report_grouped_by_picking/models/account_invoice.py b/account_invoice_report_grouped_by_picking/models/account_invoice.py new file mode 100644 index 000000000..b4b616241 --- /dev/null +++ b/account_invoice_report_grouped_by_picking/models/account_invoice.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 Carlos Dauden +# Copyright 2018 David Vidal +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import api, models + + +class AccountInvoice(models.Model): + _inherit = 'account.invoice' + + @api.model + def _sort_grouped_lines(self, lines_dic): + return sorted(lines_dic, key=lambda x: ( + x['picking'].date, x['picking'].date_done)) + + def lines_grouped_by_picking(self): + self.ensure_one() + # Split lines with no pickings + no_picking = [{'picking': False, 'line': x} for x in + self.invoice_line_ids.filtered( + lambda x: not x.move_line_ids)] + with_picking = [{'picking': x.picking_id, 'line': x.invoice_line_id} + for x in self.mapped('picking_ids.move_lines') if + x.invoice_line_id in self.invoice_line_ids] + return no_picking + self._sort_grouped_lines(with_picking) diff --git a/account_invoice_report_grouped_by_picking/security/portal_security.xml b/account_invoice_report_grouped_by_picking/security/portal_security.xml new file mode 100644 index 000000000..c425f70aa --- /dev/null +++ b/account_invoice_report_grouped_by_picking/security/portal_security.xml @@ -0,0 +1,16 @@ + + + + + + Portal Commercial Pickings + + ['|', ('partner_id.id', 'child_of', user.partner_id.commercial_partner_id.id), ('sale_id.partner_id.id', 'child_of', user.partner_id.commercial_partner_id.id)] + + + + + + + + diff --git a/account_invoice_report_grouped_by_picking/static/description/icon.png b/account_invoice_report_grouped_by_picking/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/account_invoice_report_grouped_by_picking/tests/__init__.py b/account_invoice_report_grouped_by_picking/tests/__init__.py new file mode 100644 index 000000000..eb0f39782 --- /dev/null +++ b/account_invoice_report_grouped_by_picking/tests/__init__.py @@ -0,0 +1,2 @@ + +from . import test_account_invoice_group_picking diff --git a/account_invoice_report_grouped_by_picking/tests/test_account_invoice_group_picking.py b/account_invoice_report_grouped_by_picking/tests/test_account_invoice_group_picking.py new file mode 100644 index 000000000..6d115afc1 --- /dev/null +++ b/account_invoice_report_grouped_by_picking/tests/test_account_invoice_group_picking.py @@ -0,0 +1,65 @@ +# Copyright 2017 Carlos Dauden +# Copyright 2018 David Vidal +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo.tests.common import SavepointCase +from lxml import html + + +class TestAccountInvoiceGroupPicking(SavepointCase): + + @classmethod + def setUpClass(cls): + super(TestAccountInvoiceGroupPicking, cls).setUpClass() + cls.product = cls.env['product.product'].create({ + 'name': 'Product for test', + 'default_code': 'TESTPROD01', + 'invoice_policy': 'delivery', + }) + cls.partner = cls.env['res.partner'].create({ + 'name': 'Partner for test', + }) + cls.sale = cls.env['sale.order'].create({ + 'partner_id': cls.partner.id, + 'order_line': [ + (0, 0, { + 'name': cls.product.name, + 'product_id': cls.product.id, + 'product_uom_qty': 2, + 'product_uom': cls.product.uom_id.id, + 'price_unit': 100.0, + })] + }) + + def test_account_invoice_group_picking(self): + # confirm quotation + self.sale.action_confirm() + # deliver lines2 + self.sale.picking_ids[:1].force_assign() + self.sale.picking_ids[:1].move_line_ids.write({'qty_done': 1}) + self.sale.picking_ids[:1].action_done() + # create another sale + self.sale2 = self.sale.copy() + self.sale2.order_line[:1].product_uom_qty = 4 + self.sale2.order_line[:1].price_unit = 50.0 + # confirm new quotation + self.sale2.action_confirm() + self.sale2.picking_ids[:1].force_assign() + self.sale2.picking_ids[:1].move_line_ids.write({'qty_done': 1}) + self.sale2.picking_ids[:1].action_done() + sales = self.sale | self.sale2 + # invoice sales + inv_id = sales.action_invoice_create() + content = html.document_fromstring( + self.env.ref('account.account_invoices').render_qweb_html( + inv_id)[0] + ) + tbody = content.xpath("//tbody[@class='invoice_tbody']") + tbody = [html.tostring(line, encoding='utf-8').strip() + for line in tbody][0].decode() + # information about sales is printed + self.assertTrue('Order: %s' % self.sale.name in tbody) + self.assertTrue('Order: %s' % self.sale2.name in tbody) + # information about pickings is printed + self.assertTrue(self.sale.invoice_ids.picking_ids[:1].name in tbody) + self.assertTrue(self.sale2.invoice_ids.picking_ids[:1].name in tbody) diff --git a/account_invoice_report_grouped_by_picking/views/report_invoice.xml b/account_invoice_report_grouped_by_picking/views/report_invoice.xml new file mode 100644 index 000000000..a1ce78e52 --- /dev/null +++ b/account_invoice_report_grouped_by_picking/views/report_invoice.xml @@ -0,0 +1,64 @@ + + + + + + From 3e85f37c6aa7f54e53ccca33d42ae3a7a5734611 Mon Sep 17 00:00:00 2001 From: David Date: Wed, 25 Jul 2018 12:47:11 +0200 Subject: [PATCH 02/47] [FIX] account_invoice_report_grouped_by_picking: refunds - When a return was in the original pickings it wasn't reflected in the corresponding invoices correctly. - Now we compute the total quantities of the moves recursively. --- .../models/__init__.py | 2 +- .../models/account_invoice.py | 1 - .../models/stock_move.py | 29 +++++++++++++++++++ .../views/report_invoice.xml | 4 ++- 4 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 account_invoice_report_grouped_by_picking/models/stock_move.py diff --git a/account_invoice_report_grouped_by_picking/models/__init__.py b/account_invoice_report_grouped_by_picking/models/__init__.py index 10b5ef348..0eaabea21 100644 --- a/account_invoice_report_grouped_by_picking/models/__init__.py +++ b/account_invoice_report_grouped_by_picking/models/__init__.py @@ -1,2 +1,2 @@ - from . import account_invoice +from . import stock_move diff --git a/account_invoice_report_grouped_by_picking/models/account_invoice.py b/account_invoice_report_grouped_by_picking/models/account_invoice.py index b4b616241..a720e4237 100644 --- a/account_invoice_report_grouped_by_picking/models/account_invoice.py +++ b/account_invoice_report_grouped_by_picking/models/account_invoice.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2017 Carlos Dauden # Copyright 2018 David Vidal # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). diff --git a/account_invoice_report_grouped_by_picking/models/stock_move.py b/account_invoice_report_grouped_by_picking/models/stock_move.py new file mode 100644 index 000000000..9e018ea6c --- /dev/null +++ b/account_invoice_report_grouped_by_picking/models/stock_move.py @@ -0,0 +1,29 @@ +# Copyright 2018 David Vidal +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +from odoo import api, models + + +class StockMove(models.Model): + _inherit = 'stock.move' + + @api.multi + def _compute_chained_qty_done(self, qty=0, line=False): + """ + Computes the net quantity done for the given move ids recursively. + There's an optional line parameter to be able to filter by invoice line + so we only compute the quantities related to that invoice. + :param int qty: acumulated quantity + :param int line: optional invoice_line object to filter moves by + :return int: the recursive computed quantity + """ + move_ids = self + if line: + move_ids = self.filtered(lambda x: x.invoice_line_id == line) + for move in move_ids: + if move.location_dest_id.usage == 'supplier': + qty -= move.quantity_done + elif move.location_dest_id.usage == 'customer': + qty += move.quantity_done + if move.move_dest_ids: + qty = move.move_dest_ids._compute_chained_qty_done(qty, line) + return qty diff --git a/account_invoice_report_grouped_by_picking/views/report_invoice.xml b/account_invoice_report_grouped_by_picking/views/report_invoice.xml index a1ce78e52..145b6a345 100644 --- a/account_invoice_report_grouped_by_picking/views/report_invoice.xml +++ b/account_invoice_report_grouped_by_picking/views/report_invoice.xml @@ -27,8 +27,10 @@ + + t-value="-line_chained_picking_qty if o.type=='out_refund' else line_chained_picking_qty"/> From 9f3e026c455e86e8ac275dd0d95172691911378b Mon Sep 17 00:00:00 2001 From: David Date: Wed, 25 Jul 2018 14:39:56 +0200 Subject: [PATCH 03/47] [FIX] account_invoice_report_grouped_by_picking: B2C - When B2C prices was set, the orders where not properly grouped. --- .../models/account_invoice.py | 3 +- .../models/stock_move.py | 19 ++---------- .../views/report_invoice.xml | 29 ++++++++++++++++++- 3 files changed, 32 insertions(+), 19 deletions(-) diff --git a/account_invoice_report_grouped_by_picking/models/account_invoice.py b/account_invoice_report_grouped_by_picking/models/account_invoice.py index a720e4237..dad7f7746 100644 --- a/account_invoice_report_grouped_by_picking/models/account_invoice.py +++ b/account_invoice_report_grouped_by_picking/models/account_invoice.py @@ -20,6 +20,5 @@ def lines_grouped_by_picking(self): self.invoice_line_ids.filtered( lambda x: not x.move_line_ids)] with_picking = [{'picking': x.picking_id, 'line': x.invoice_line_id} - for x in self.mapped('picking_ids.move_lines') if - x.invoice_line_id in self.invoice_line_ids] + for x in self.invoice_line_ids.mapped('move_line_ids')] return no_picking + self._sort_grouped_lines(with_picking) diff --git a/account_invoice_report_grouped_by_picking/models/stock_move.py b/account_invoice_report_grouped_by_picking/models/stock_move.py index 9e018ea6c..e7643e96d 100644 --- a/account_invoice_report_grouped_by_picking/models/stock_move.py +++ b/account_invoice_report_grouped_by_picking/models/stock_move.py @@ -7,23 +7,10 @@ class StockMove(models.Model): _inherit = 'stock.move' @api.multi - def _compute_chained_qty_done(self, qty=0, line=False): - """ - Computes the net quantity done for the given move ids recursively. - There's an optional line parameter to be able to filter by invoice line - so we only compute the quantities related to that invoice. - :param int qty: acumulated quantity - :param int line: optional invoice_line object to filter moves by - :return int: the recursive computed quantity - """ - move_ids = self - if line: - move_ids = self.filtered(lambda x: x.invoice_line_id == line) - for move in move_ids: - if move.location_dest_id.usage == 'supplier': + def _compute_chained_qty_done(self, line, qty=0): + for move in self.filtered(lambda x: x.invoice_line_id == line): + if move.location_id.usage == 'customer': qty -= move.quantity_done elif move.location_dest_id.usage == 'customer': qty += move.quantity_done - if move.move_dest_ids: - qty = move.move_dest_ids._compute_chained_qty_done(qty, line) return qty diff --git a/account_invoice_report_grouped_by_picking/views/report_invoice.xml b/account_invoice_report_grouped_by_picking/views/report_invoice.xml index 145b6a345..e12febb4d 100644 --- a/account_invoice_report_grouped_by_picking/views/report_invoice.xml +++ b/account_invoice_report_grouped_by_picking/views/report_invoice.xml @@ -49,7 +49,7 @@ not picking - + @@ -63,4 +63,31 @@ + + From f3afbb535c6ca9f57887092f92824823988e2546 Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Tue, 31 Jul 2018 11:58:52 +0200 Subject: [PATCH 04/47] [FIX] account_invoice_report_grouped_by_picking: New approach for avoiding edge cases * The grouping is fully done on the prepare method * It also computes the quantity applicable * Adapt views to B2C/B2B cleanly --- ...ount_invoice_report_grouped_by_picking.pot | 2 +- .../models/__init__.py | 1 - .../models/account_invoice.py | 42 ++++++++++++--- .../models/stock_move.py | 16 ------ .../views/report_invoice.xml | 54 +++++++------------ 5 files changed, 54 insertions(+), 61 deletions(-) delete mode 100644 account_invoice_report_grouped_by_picking/models/stock_move.py diff --git a/account_invoice_report_grouped_by_picking/i18n/account_invoice_report_grouped_by_picking.pot b/account_invoice_report_grouped_by_picking/i18n/account_invoice_report_grouped_by_picking.pot index bc653021c..276aae631 100644 --- a/account_invoice_report_grouped_by_picking/i18n/account_invoice_report_grouped_by_picking.pot +++ b/account_invoice_report_grouped_by_picking/i18n/account_invoice_report_grouped_by_picking.pot @@ -14,7 +14,7 @@ msgstr "" "Plural-Forms: \n" #. module: account_invoice_report_grouped_by_picking -#: model:ir.ui.view,arch_db:account_invoice_report_grouped_by_picking.report_invoice_document +#: model:ir.ui.view,arch_db:account_invoice_report_grouped_by_picking.report_invoice_layouted msgid "Subtotal: " msgstr "" diff --git a/account_invoice_report_grouped_by_picking/models/__init__.py b/account_invoice_report_grouped_by_picking/models/__init__.py index 0eaabea21..8e072db8f 100644 --- a/account_invoice_report_grouped_by_picking/models/__init__.py +++ b/account_invoice_report_grouped_by_picking/models/__init__.py @@ -1,2 +1 @@ from . import account_invoice -from . import stock_move diff --git a/account_invoice_report_grouped_by_picking/models/account_invoice.py b/account_invoice_report_grouped_by_picking/models/account_invoice.py index dad7f7746..07e7c118e 100644 --- a/account_invoice_report_grouped_by_picking/models/account_invoice.py +++ b/account_invoice_report_grouped_by_picking/models/account_invoice.py @@ -1,8 +1,11 @@ -# Copyright 2017 Carlos Dauden -# Copyright 2018 David Vidal +# Copyright 2017 Tecnativa - Carlos Dauden +# Copyright 2018 Tecnativa - David Vidal +# Copyright 2018 Tecnativa - Pedro M. Baeza # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from odoo import api, models +from odoo.tools import float_is_zero +from collections import OrderedDict class AccountInvoice(models.Model): @@ -14,11 +17,34 @@ def _sort_grouped_lines(self, lines_dic): x['picking'].date, x['picking'].date_done)) def lines_grouped_by_picking(self): + """This prepares a data structure for printing the invoice report + grouped by pickings.""" self.ensure_one() - # Split lines with no pickings - no_picking = [{'picking': False, 'line': x} for x in - self.invoice_line_ids.filtered( - lambda x: not x.move_line_ids)] - with_picking = [{'picking': x.picking_id, 'line': x.invoice_line_id} - for x in self.invoice_line_ids.mapped('move_line_ids')] + picking_dict = OrderedDict() + lines_dict = OrderedDict() + sign = -1.0 if self.type == 'out_refund' else 1.0 + for line in self.invoice_line_ids: + remaining_qty = line.quantity + for move in line.move_line_ids: + key = (move.picking_id, line) + picking_dict.setdefault(key, 0) + qty = 0 + if move.location_id.usage == 'customer': + qty = -move.quantity_done * sign + elif move.location_dest_id.usage == 'customer': + qty = move.quantity_done * sign + picking_dict[key] += qty + remaining_qty -= qty + if (not float_is_zero( + remaining_qty, + precision_rounding=line.product_id.uom_id.rounding)): + lines_dict[line] = remaining_qty + no_picking = [ + {'picking': False, 'line': key, 'quantity': value} + for key, value in lines_dict.items() + ] + with_picking = [ + {'picking': key[0], 'line': key[1], 'quantity': value} + for key, value in picking_dict.items() + ] return no_picking + self._sort_grouped_lines(with_picking) diff --git a/account_invoice_report_grouped_by_picking/models/stock_move.py b/account_invoice_report_grouped_by_picking/models/stock_move.py deleted file mode 100644 index e7643e96d..000000000 --- a/account_invoice_report_grouped_by_picking/models/stock_move.py +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 2018 David Vidal -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from odoo import api, models - - -class StockMove(models.Model): - _inherit = 'stock.move' - - @api.multi - def _compute_chained_qty_done(self, line, qty=0): - for move in self.filtered(lambda x: x.invoice_line_id == line): - if move.location_id.usage == 'customer': - qty -= move.quantity_done - elif move.location_dest_id.usage == 'customer': - qty += move.quantity_done - return qty diff --git a/account_invoice_report_grouped_by_picking/views/report_invoice.xml b/account_invoice_report_grouped_by_picking/views/report_invoice.xml index e12febb4d..4da34f8d2 100644 --- a/account_invoice_report_grouped_by_picking/views/report_invoice.xml +++ b/account_invoice_report_grouped_by_picking/views/report_invoice.xml @@ -10,12 +10,12 @@ lines_grouped lines_group - + + - @@ -24,33 +24,31 @@ - - - - - - - - - not picking + lines_group['quantity'] + - + - + + - not picking - - + + not picking + + + + + - - From ca789605e9ca21a22cf86c71ca477f964d7f7f23 Mon Sep 17 00:00:00 2001 From: cubells Date: Thu, 22 Nov 2018 08:35:12 +0100 Subject: [PATCH 05/47] [IMP] account_invoice_report_grouped_by_picking: add partner reference to report too --- .../__manifest__.py | 2 +- ...ccount_invoice_report_grouped_by_picking.pot | 10 ++++++++++ .../i18n/es.po | 17 ++++++++++++----- .../tests/test_account_invoice_group_picking.py | 4 ++-- .../views/report_invoice.xml | 11 ++++++++++- 5 files changed, 35 insertions(+), 9 deletions(-) diff --git a/account_invoice_report_grouped_by_picking/__manifest__.py b/account_invoice_report_grouped_by_picking/__manifest__.py index c8becd518..26ed631d1 100644 --- a/account_invoice_report_grouped_by_picking/__manifest__.py +++ b/account_invoice_report_grouped_by_picking/__manifest__.py @@ -5,7 +5,7 @@ { "name": "Account Invoice Grouped by Picking", "summary": "Print invoice lines grouped by picking", - "version": "11.0.1.0.0", + "version": "11.0.1.1.0", "category": "Accounting & Finance", "website": "https://github.com/OCA/account-invoice-reporting", "author": "Tecnativa, " diff --git a/account_invoice_report_grouped_by_picking/i18n/account_invoice_report_grouped_by_picking.pot b/account_invoice_report_grouped_by_picking/i18n/account_invoice_report_grouped_by_picking.pot index 276aae631..25e40b0bc 100644 --- a/account_invoice_report_grouped_by_picking/i18n/account_invoice_report_grouped_by_picking.pot +++ b/account_invoice_report_grouped_by_picking/i18n/account_invoice_report_grouped_by_picking.pot @@ -13,6 +13,16 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" +#. module: account_invoice_report_grouped_by_picking +#: model:ir.ui.view,arch_db:account_invoice_report_grouped_by_picking.report_invoice_document +msgid "Order:" +msgstr "" + +#. module: account_invoice_report_grouped_by_picking +#: model:ir.ui.view,arch_db:account_invoice_report_grouped_by_picking.report_invoice_document +msgid "Picking:" +msgstr "" + #. module: account_invoice_report_grouped_by_picking #: model:ir.ui.view,arch_db:account_invoice_report_grouped_by_picking.report_invoice_layouted msgid "Subtotal: " diff --git a/account_invoice_report_grouped_by_picking/i18n/es.po b/account_invoice_report_grouped_by_picking/i18n/es.po index 4e69b9e8d..52b39dc6f 100644 --- a/account_invoice_report_grouped_by_picking/i18n/es.po +++ b/account_invoice_report_grouped_by_picking/i18n/es.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-04-05 15:08+0000\n" -"PO-Revision-Date: 2018-04-05 15:08+0000\n" +"POT-Creation-Date: 2018-11-22 09:16+0000\n" +"PO-Revision-Date: 2018-11-22 09:16+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "Language: \n" @@ -18,6 +18,16 @@ msgstr "" #. module: account_invoice_report_grouped_by_picking #: model:ir.ui.view,arch_db:account_invoice_report_grouped_by_picking.report_invoice_document +msgid "Order:" +msgstr "Pedido:" + +#. module: account_invoice_report_grouped_by_picking +#: model:ir.ui.view,arch_db:account_invoice_report_grouped_by_picking.report_invoice_document +msgid "Picking:" +msgstr "Albarán:" + +#. module: account_invoice_report_grouped_by_picking +#: model:ir.ui.view,arch_db:account_invoice_report_grouped_by_picking.report_invoice_layouted msgid "Subtotal: " msgstr "Subtotal: " @@ -25,6 +35,3 @@ msgstr "Subtotal: " #: model:ir.model,name:account_invoice_report_grouped_by_picking.model_account_invoice msgid "Invoice" msgstr "Factura" - -#~ msgid "Order: %s Picking: %s %s" -#~ msgstr "Pedido: %s Albarán: %s %s" diff --git a/account_invoice_report_grouped_by_picking/tests/test_account_invoice_group_picking.py b/account_invoice_report_grouped_by_picking/tests/test_account_invoice_group_picking.py index 6d115afc1..89164b339 100644 --- a/account_invoice_report_grouped_by_picking/tests/test_account_invoice_group_picking.py +++ b/account_invoice_report_grouped_by_picking/tests/test_account_invoice_group_picking.py @@ -58,8 +58,8 @@ def test_account_invoice_group_picking(self): tbody = [html.tostring(line, encoding='utf-8').strip() for line in tbody][0].decode() # information about sales is printed - self.assertTrue('Order: %s' % self.sale.name in tbody) - self.assertTrue('Order: %s' % self.sale2.name in tbody) + self.assertEqual(tbody.count(self.sale.name), 2) + self.assertEqual(tbody.count(self.sale2.name), 2) # information about pickings is printed self.assertTrue(self.sale.invoice_ids.picking_ids[:1].name in tbody) self.assertTrue(self.sale2.invoice_ids.picking_ids[:1].name in tbody) diff --git a/account_invoice_report_grouped_by_picking/views/report_invoice.xml b/account_invoice_report_grouped_by_picking/views/report_invoice.xml index 4da34f8d2..fc6d36e01 100644 --- a/account_invoice_report_grouped_by_picking/views/report_invoice.xml +++ b/account_invoice_report_grouped_by_picking/views/report_invoice.xml @@ -19,7 +19,16 @@ - + + Order: + + + () + + Picking: + + + From 5bce30e1cb2bc639e2e32afc8bb00f57f19b1295 Mon Sep 17 00:00:00 2001 From: Carlos Dauden Date: Tue, 26 Feb 2019 09:47:21 +0100 Subject: [PATCH 06/47] [11.0][IMP] account_invoice_report_grouped_by_picking: Decimal quantity format --- account_invoice_report_grouped_by_picking/__manifest__.py | 2 +- .../views/report_invoice.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/account_invoice_report_grouped_by_picking/__manifest__.py b/account_invoice_report_grouped_by_picking/__manifest__.py index 26ed631d1..c73901fa4 100644 --- a/account_invoice_report_grouped_by_picking/__manifest__.py +++ b/account_invoice_report_grouped_by_picking/__manifest__.py @@ -5,7 +5,7 @@ { "name": "Account Invoice Grouped by Picking", "summary": "Print invoice lines grouped by picking", - "version": "11.0.1.1.0", + "version": "11.0.1.2.0", "category": "Accounting & Finance", "website": "https://github.com/OCA/account-invoice-reporting", "author": "Tecnativa, " diff --git a/account_invoice_report_grouped_by_picking/views/report_invoice.xml b/account_invoice_report_grouped_by_picking/views/report_invoice.xml index fc6d36e01..242820b15 100644 --- a/account_invoice_report_grouped_by_picking/views/report_invoice.xml +++ b/account_invoice_report_grouped_by_picking/views/report_invoice.xml @@ -36,6 +36,7 @@ lines_group['quantity'] + {'widget': 'float', 'decimal_precision': 'Product Unit of Measure'} From 3c015d0211c7ae86284ca2a70d39dbde55fb3e39 Mon Sep 17 00:00:00 2001 From: Sergio Teruel Albert Date: Tue, 26 Feb 2019 10:14:34 +0100 Subject: [PATCH 07/47] [11.0][FIX] account_invoice_report_grouped_by_picking: Error division by zero when quantity is zero (#101) --- .../views/report_invoice.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/account_invoice_report_grouped_by_picking/views/report_invoice.xml b/account_invoice_report_grouped_by_picking/views/report_invoice.xml index 242820b15..bde3eee91 100644 --- a/account_invoice_report_grouped_by_picking/views/report_invoice.xml +++ b/account_invoice_report_grouped_by_picking/views/report_invoice.xml @@ -41,7 +41,7 @@ - + @@ -73,7 +73,7 @@ - + From f1c744a186cb76cb3a1af881b251c1d313ddd095 Mon Sep 17 00:00:00 2001 From: Carlos Dauden Date: Mon, 4 Mar 2019 18:09:20 +0100 Subject: [PATCH 08/47] [11.0][IMP] account_invoice_report_grouped_by_picking: Over delivery correct price --- .../__manifest__.py | 4 ++-- .../views/report_invoice.xml | 16 +++++++++++----- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/account_invoice_report_grouped_by_picking/__manifest__.py b/account_invoice_report_grouped_by_picking/__manifest__.py index c73901fa4..9f96565a7 100644 --- a/account_invoice_report_grouped_by_picking/__manifest__.py +++ b/account_invoice_report_grouped_by_picking/__manifest__.py @@ -1,11 +1,11 @@ -# Copyright 2017 Carlos Dauden +# Copyright 2017-2019 Carlos Dauden # Copyright 2018 David Vidal # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { "name": "Account Invoice Grouped by Picking", "summary": "Print invoice lines grouped by picking", - "version": "11.0.1.2.0", + "version": "11.0.1.3.0", "category": "Accounting & Finance", "website": "https://github.com/OCA/account-invoice-reporting", "author": "Tecnativa, " diff --git a/account_invoice_report_grouped_by_picking/views/report_invoice.xml b/account_invoice_report_grouped_by_picking/views/report_invoice.xml index bde3eee91..69fc7a2a0 100644 --- a/account_invoice_report_grouped_by_picking/views/report_invoice.xml +++ b/account_invoice_report_grouped_by_picking/views/report_invoice.xml @@ -39,19 +39,22 @@ {'widget': 'float', 'decimal_precision': 'Product Unit of Measure'} - + + + + - not picking + lines_group['quantity'] == l.quantity - not picking + lines_group['quantity'] == l.quantity @@ -71,16 +74,19 @@ - + + + + - not picking + lines_group['quantity'] == l.quantity From 03da16fa631675af44fd8f03632530523bc4272d Mon Sep 17 00:00:00 2001 From: Carlos Dauden Date: Wed, 3 Jul 2019 17:52:59 +0200 Subject: [PATCH 09/47] [FIX] account_invoice_report_grouped_by_picking: Subtotal is computed in B2B when uses B2C --- account_invoice_report_grouped_by_picking/__manifest__.py | 2 +- .../views/report_invoice.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/account_invoice_report_grouped_by_picking/__manifest__.py b/account_invoice_report_grouped_by_picking/__manifest__.py index 9f96565a7..b1ca5c003 100644 --- a/account_invoice_report_grouped_by_picking/__manifest__.py +++ b/account_invoice_report_grouped_by_picking/__manifest__.py @@ -5,7 +5,7 @@ { "name": "Account Invoice Grouped by Picking", "summary": "Print invoice lines grouped by picking", - "version": "11.0.1.3.0", + "version": "11.0.1.4.0", "category": "Accounting & Finance", "website": "https://github.com/OCA/account-invoice-reporting", "author": "Tecnativa, " diff --git a/account_invoice_report_grouped_by_picking/views/report_invoice.xml b/account_invoice_report_grouped_by_picking/views/report_invoice.xml index 69fc7a2a0..264187943 100644 --- a/account_invoice_report_grouped_by_picking/views/report_invoice.xml +++ b/account_invoice_report_grouped_by_picking/views/report_invoice.xml @@ -82,7 +82,7 @@ t-options='{"widget": "monetary", "display_currency": o.currency_id}'/> - + From 440dd55d70084367d96c81d9791a25733ac4a91f Mon Sep 17 00:00:00 2001 From: Ioan Galan Date: Thu, 11 Jul 2019 12:31:54 +0200 Subject: [PATCH 10/47] [12.0][MIG] account_invoice_report_grouped_by_picking: Migration to 12.0 --- .../README.rst | 72 ++- .../__manifest__.py | 2 +- .../i18n/es.po | 16 +- .../readme/CONTRIBUTORS.rst | 3 + .../readme/DESCRIPTION.rst | 3 + .../readme/USAGE.rst | 7 + .../static/description/index.html | 436 ++++++++++++++++++ .../test_account_invoice_group_picking.py | 4 +- .../views/report_invoice.xml | 43 +- 9 files changed, 531 insertions(+), 55 deletions(-) create mode 100644 account_invoice_report_grouped_by_picking/readme/CONTRIBUTORS.rst create mode 100644 account_invoice_report_grouped_by_picking/readme/DESCRIPTION.rst create mode 100644 account_invoice_report_grouped_by_picking/readme/USAGE.rst create mode 100644 account_invoice_report_grouped_by_picking/static/description/index.html diff --git a/account_invoice_report_grouped_by_picking/README.rst b/account_invoice_report_grouped_by_picking/README.rst index f5f076f28..bae4ac42c 100644 --- a/account_invoice_report_grouped_by_picking/README.rst +++ b/account_invoice_report_grouped_by_picking/README.rst @@ -1,15 +1,38 @@ -.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg - :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html - :alt: License: AGPL-3 - -============================= -Account Invoice Group Picking -============================= +================================== +Account Invoice Grouped by Picking +================================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! 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%2Faccount--invoice--reporting-lightgray.png?logo=github + :target: https://github.com/OCA/account-invoice-reporting/tree/12.0/account_invoice_report_grouped_by_picking + :alt: OCA/account-invoice-reporting +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/account-invoice-reporting-12-0/account-invoice-reporting-12-0-account_invoice_report_grouped_by_picking + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/94/12.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| This module allows print invoices with picking info. This module groups invoice lines and shows information related to sales and pickings on every group. +**Table of contents** + +.. contents:: + :local: Usage ===== @@ -22,43 +45,44 @@ Usage #. Invoice report will group invoice lines and shows information about sales and pickings in every group. -.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas - :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/95/9.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 smash it by providing detailed and welcomed feedback. +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 ======= -Images ------- +Authors +~~~~~~~ -* Odoo Community Association: `Icon `_. +* Tecnativa Contributors ------------- +~~~~~~~~~~~~ * Carlos Dauden * David Vidal +* Ioan Galan -Maintainer ----------- +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. .. image:: https://odoo-community.org/logo.png :alt: Odoo Community Association :target: https://odoo-community.org -This module is maintained by the OCA. - 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. -To contribute to this module, please visit https://odoo-community.org. +This module is part of the `OCA/account-invoice-reporting `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/account_invoice_report_grouped_by_picking/__manifest__.py b/account_invoice_report_grouped_by_picking/__manifest__.py index b1ca5c003..17e24e76f 100644 --- a/account_invoice_report_grouped_by_picking/__manifest__.py +++ b/account_invoice_report_grouped_by_picking/__manifest__.py @@ -5,7 +5,7 @@ { "name": "Account Invoice Grouped by Picking", "summary": "Print invoice lines grouped by picking", - "version": "11.0.1.4.0", + "version": "12.0.1.0.0", "category": "Accounting & Finance", "website": "https://github.com/OCA/account-invoice-reporting", "author": "Tecnativa, " diff --git a/account_invoice_report_grouped_by_picking/i18n/es.po b/account_invoice_report_grouped_by_picking/i18n/es.po index 52b39dc6f..238bf20ec 100644 --- a/account_invoice_report_grouped_by_picking/i18n/es.po +++ b/account_invoice_report_grouped_by_picking/i18n/es.po @@ -1,33 +1,32 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * account_invoice_report_grouped_by_picking +# * account_invoice_report_grouped_by_picking # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 11.0\n" +"Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-22 09:16+0000\n" -"PO-Revision-Date: 2018-11-22 09:16+0000\n" +"POT-Creation-Date: 2019-07-11 09:46+0000\n" +"PO-Revision-Date: 2019-07-11 09:46+0000\n" "Last-Translator: <>\n" "Language-Team: \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" #. module: account_invoice_report_grouped_by_picking -#: model:ir.ui.view,arch_db:account_invoice_report_grouped_by_picking.report_invoice_document +#: model_terms:ir.ui.view,arch_db:account_invoice_report_grouped_by_picking.report_invoice_document msgid "Order:" msgstr "Pedido:" #. module: account_invoice_report_grouped_by_picking -#: model:ir.ui.view,arch_db:account_invoice_report_grouped_by_picking.report_invoice_document +#: model_terms:ir.ui.view,arch_db:account_invoice_report_grouped_by_picking.report_invoice_document msgid "Picking:" msgstr "Albarán:" #. module: account_invoice_report_grouped_by_picking -#: model:ir.ui.view,arch_db:account_invoice_report_grouped_by_picking.report_invoice_layouted +#: model_terms:ir.ui.view,arch_db:account_invoice_report_grouped_by_picking.report_invoice_document msgid "Subtotal: " msgstr "Subtotal: " @@ -35,3 +34,4 @@ msgstr "Subtotal: " #: model:ir.model,name:account_invoice_report_grouped_by_picking.model_account_invoice msgid "Invoice" msgstr "Factura" + diff --git a/account_invoice_report_grouped_by_picking/readme/CONTRIBUTORS.rst b/account_invoice_report_grouped_by_picking/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..b1372cdd1 --- /dev/null +++ b/account_invoice_report_grouped_by_picking/readme/CONTRIBUTORS.rst @@ -0,0 +1,3 @@ +* Carlos Dauden +* David Vidal +* Ioan Galan diff --git a/account_invoice_report_grouped_by_picking/readme/DESCRIPTION.rst b/account_invoice_report_grouped_by_picking/readme/DESCRIPTION.rst new file mode 100644 index 000000000..cb4e4ca01 --- /dev/null +++ b/account_invoice_report_grouped_by_picking/readme/DESCRIPTION.rst @@ -0,0 +1,3 @@ +This module allows print invoices with picking info. This module groups +invoice lines and shows information related to sales and pickings on every +group. diff --git a/account_invoice_report_grouped_by_picking/readme/USAGE.rst b/account_invoice_report_grouped_by_picking/readme/USAGE.rst new file mode 100644 index 000000000..794d827ad --- /dev/null +++ b/account_invoice_report_grouped_by_picking/readme/USAGE.rst @@ -0,0 +1,7 @@ +#. Create several quotation orders and confirm them. +#. Deliver pickings related to each sale order. +#. Go to *Sales > Invoicing > Sales to invoicing* and invoice these sale + orders. +#. Open invoice newly created and print it. +#. Invoice report will group invoice lines and shows information about sales + and pickings in every group. diff --git a/account_invoice_report_grouped_by_picking/static/description/index.html b/account_invoice_report_grouped_by_picking/static/description/index.html new file mode 100644 index 000000000..de12913a9 --- /dev/null +++ b/account_invoice_report_grouped_by_picking/static/description/index.html @@ -0,0 +1,436 @@ + + + + + + +Account Invoice Grouped by Picking + + + +
+

Account Invoice Grouped by Picking

+ + +

Beta License: AGPL-3 OCA/account-invoice-reporting Translate me on Weblate Try me on Runbot

+

This module allows print invoices with picking info. This module groups +invoice lines and shows information related to sales and pickings on every +group.

+

Table of contents

+ +
+

Usage

+
    +
  1. Create several quotation orders and confirm them.
    2. +
  2. Deliver pickings related to each sale order.
    3. +
  3. Go to Sales > Invoicing > Sales to invoicing and invoice these sale +orders.
    4. +
  4. Open invoice newly created and print it.
    5. +
  5. Invoice report will group invoice lines and shows information about sales +and pickings in every group.
    6. +
+
+
+

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

+ +
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

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/account-invoice-reporting project on GitHub.

+

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

+
+
+
+ + diff --git a/account_invoice_report_grouped_by_picking/tests/test_account_invoice_group_picking.py b/account_invoice_report_grouped_by_picking/tests/test_account_invoice_group_picking.py index 89164b339..0d5730c31 100644 --- a/account_invoice_report_grouped_by_picking/tests/test_account_invoice_group_picking.py +++ b/account_invoice_report_grouped_by_picking/tests/test_account_invoice_group_picking.py @@ -35,7 +35,7 @@ def test_account_invoice_group_picking(self): # confirm quotation self.sale.action_confirm() # deliver lines2 - self.sale.picking_ids[:1].force_assign() + self.sale.picking_ids[:1].action_confirm() self.sale.picking_ids[:1].move_line_ids.write({'qty_done': 1}) self.sale.picking_ids[:1].action_done() # create another sale @@ -44,7 +44,7 @@ def test_account_invoice_group_picking(self): self.sale2.order_line[:1].price_unit = 50.0 # confirm new quotation self.sale2.action_confirm() - self.sale2.picking_ids[:1].force_assign() + self.sale2.picking_ids[:1].action_confirm() self.sale2.picking_ids[:1].move_line_ids.write({'qty_done': 1}) self.sale2.picking_ids[:1].action_done() sales = self.sale | self.sale2 diff --git a/account_invoice_report_grouped_by_picking/views/report_invoice.xml b/account_invoice_report_grouped_by_picking/views/report_invoice.xml index 264187943..8b6135144 100644 --- a/account_invoice_report_grouped_by_picking/views/report_invoice.xml +++ b/account_invoice_report_grouped_by_picking/views/report_invoice.xml @@ -6,16 +6,18 @@ - + + lines_grouped lines_group - - + + + + - + @@ -33,13 +35,15 @@ - + + lines_group['quantity'] {'widget': 'float', 'decimal_precision': 'Product Unit of Measure'} - - + + + @@ -50,18 +54,17 @@ - + + lines_group['quantity'] == l.quantity - + + lines_group['quantity'] == l.quantity - - - - From e5677c5b81936d6459b90029e2e6cd13adf89702 Mon Sep 17 00:00:00 2001 From: "Ignacio Ibeas - Acysos S.L" Date: Thu, 10 Oct 2019 19:06:24 +0200 Subject: [PATCH 11/47] [FIX] account_invoice_report_grouped_by_picking: fix report bug sections [FIX] account_invoice_report_grouped_by_picking: debug print remove [FIX] account_invoice_report_grouped_by_picking: remove debug variable --- .../account_invoice_report_grouped_by_picking.pot | 8 ++++---- .../i18n/es.po | 4 ++-- .../static/description/index.html | 2 +- .../views/report_invoice.xml | 14 +++++++++----- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/account_invoice_report_grouped_by_picking/i18n/account_invoice_report_grouped_by_picking.pot b/account_invoice_report_grouped_by_picking/i18n/account_invoice_report_grouped_by_picking.pot index 25e40b0bc..1e891a8a0 100644 --- a/account_invoice_report_grouped_by_picking/i18n/account_invoice_report_grouped_by_picking.pot +++ b/account_invoice_report_grouped_by_picking/i18n/account_invoice_report_grouped_by_picking.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 11.0\n" +"Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: <>\n" "Language-Team: \n" @@ -14,17 +14,17 @@ msgstr "" "Plural-Forms: \n" #. module: account_invoice_report_grouped_by_picking -#: model:ir.ui.view,arch_db:account_invoice_report_grouped_by_picking.report_invoice_document +#: model_terms:ir.ui.view,arch_db:account_invoice_report_grouped_by_picking.report_invoice_document msgid "Order:" msgstr "" #. module: account_invoice_report_grouped_by_picking -#: model:ir.ui.view,arch_db:account_invoice_report_grouped_by_picking.report_invoice_document +#: model_terms:ir.ui.view,arch_db:account_invoice_report_grouped_by_picking.report_invoice_document msgid "Picking:" msgstr "" #. module: account_invoice_report_grouped_by_picking -#: model:ir.ui.view,arch_db:account_invoice_report_grouped_by_picking.report_invoice_layouted +#: model_terms:ir.ui.view,arch_db:account_invoice_report_grouped_by_picking.report_invoice_document msgid "Subtotal: " msgstr "" diff --git a/account_invoice_report_grouped_by_picking/i18n/es.po b/account_invoice_report_grouped_by_picking/i18n/es.po index 238bf20ec..be66fa559 100644 --- a/account_invoice_report_grouped_by_picking/i18n/es.po +++ b/account_invoice_report_grouped_by_picking/i18n/es.po @@ -1,6 +1,6 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * account_invoice_report_grouped_by_picking +# * account_invoice_report_grouped_by_picking # msgid "" msgstr "" @@ -10,6 +10,7 @@ msgstr "" "PO-Revision-Date: 2019-07-11 09:46+0000\n" "Last-Translator: <>\n" "Language-Team: \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -34,4 +35,3 @@ msgstr "Subtotal: " #: model:ir.model,name:account_invoice_report_grouped_by_picking.model_account_invoice msgid "Invoice" msgstr "Factura" - diff --git a/account_invoice_report_grouped_by_picking/static/description/index.html b/account_invoice_report_grouped_by_picking/static/description/index.html index de12913a9..6d2780af4 100644 --- a/account_invoice_report_grouped_by_picking/static/description/index.html +++ b/account_invoice_report_grouped_by_picking/static/description/index.html @@ -3,7 +3,7 @@ - + Account Invoice Grouped by Picking