From 97feb2d4e61aede411c6dee70cac4bfa60979584 Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Wed, 18 Dec 2019 23:06:01 +0100 Subject: [PATCH 01/20] [ADD] stock_picking_report_delivery_cost: Delivery cost in Stock Picking Report This module shows in the delivery slip and picking operations reports the cost of the delivery method according the rate computed on the fly according same conditions as standard `delivery` module would do. Usage ===== To use this module, you need to: * Go to *Inventory > Operations > Transfers* and pick one not in state *Done* or *Cancelled*. * Click on *Print > Delivery Slip* or *Print > Picking Operations*. * You will see in the report the computed delivery cost. --- stock_picking_report_delivery_cost/README.rst | 87 ++++ .../__init__.py | 2 + .../__manifest__.py | 21 + stock_picking_report_delivery_cost/i18n/es.po | 39 ++ .../stock_picking_report_delivery_cost.pot | 36 ++ .../models/__init__.py | 2 + .../models/stock_picking.py | 28 ++ .../readme/CONTRIBUTORS.rst | 3 + .../readme/DESCRIPTION.rst | 3 + .../readme/USAGE.rst | 6 + .../report/report_deliveryslip.xml | 15 + .../report/report_shipping.xml | 15 + .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/index.html | 435 ++++++++++++++++++ .../tests/__init__.py | 1 + ...test_stock_picking_report_delivery_cost.py | 59 +++ 16 files changed, 752 insertions(+) create mode 100644 stock_picking_report_delivery_cost/README.rst create mode 100644 stock_picking_report_delivery_cost/__init__.py create mode 100644 stock_picking_report_delivery_cost/__manifest__.py create mode 100644 stock_picking_report_delivery_cost/i18n/es.po create mode 100644 stock_picking_report_delivery_cost/i18n/stock_picking_report_delivery_cost.pot create mode 100644 stock_picking_report_delivery_cost/models/__init__.py create mode 100644 stock_picking_report_delivery_cost/models/stock_picking.py create mode 100644 stock_picking_report_delivery_cost/readme/CONTRIBUTORS.rst create mode 100644 stock_picking_report_delivery_cost/readme/DESCRIPTION.rst create mode 100644 stock_picking_report_delivery_cost/readme/USAGE.rst create mode 100644 stock_picking_report_delivery_cost/report/report_deliveryslip.xml create mode 100644 stock_picking_report_delivery_cost/report/report_shipping.xml create mode 100644 stock_picking_report_delivery_cost/static/description/icon.png create mode 100644 stock_picking_report_delivery_cost/static/description/index.html create mode 100644 stock_picking_report_delivery_cost/tests/__init__.py create mode 100644 stock_picking_report_delivery_cost/tests/test_stock_picking_report_delivery_cost.py diff --git a/stock_picking_report_delivery_cost/README.rst b/stock_picking_report_delivery_cost/README.rst new file mode 100644 index 0000000000..5e38cf5a25 --- /dev/null +++ b/stock_picking_report_delivery_cost/README.rst @@ -0,0 +1,87 @@ +================================ +Delivery cost in Picking Reports +================================ + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! 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%2Fdelivery--carrier-lightgray.png?logo=github + :target: https://github.com/OCA/delivery-carrier/tree/11.0/stock_picking_report_delivery_cost + :alt: OCA/delivery-carrier +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/delivery-carrier-11-0/delivery-carrier-11-0-stock_picking_report_delivery_cost + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/99/11.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module shows in the delivery slip and picking operations reports the cost +of the delivery method according the rate computed on the fly according same +conditions as standard `delivery` module would do. + +**Table of contents** + +.. contents:: + :local: + +Usage +===== + +To use this module, you need to: + +#. Go to *Inventory > Operations > Transfers* and pick one not in state *Done* + or *Cancelled*. +#. Click on *Print > Delivery Slip* or *Print > Picking Operations*. +#. You will see in the report the computed delivery cost. + +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 `_: + + * Pedro M. Baeza + +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/delivery-carrier `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/stock_picking_report_delivery_cost/__init__.py b/stock_picking_report_delivery_cost/__init__.py new file mode 100644 index 0000000000..3275ac2adf --- /dev/null +++ b/stock_picking_report_delivery_cost/__init__.py @@ -0,0 +1,2 @@ +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +from . import models diff --git a/stock_picking_report_delivery_cost/__manifest__.py b/stock_picking_report_delivery_cost/__manifest__.py new file mode 100644 index 0000000000..de91fab5f6 --- /dev/null +++ b/stock_picking_report_delivery_cost/__manifest__.py @@ -0,0 +1,21 @@ +# Copyright 2019 Tecnativa - Pedro M. Baeza +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +{ + 'name': 'Delivery cost in Picking Reports', + 'summary': 'Show delivery cost in delivery slip and picking operations ' + ' reports', + 'version': '11.0.1.0.0', + 'category': 'Stock', + 'website': 'https://github.com/OCA/delivery-carrier', + 'author': 'Tecnativa, Odoo Community Association (OCA)', + 'license': 'AGPL-3', + 'installable': True, + 'depends': [ + 'delivery', + ], + 'data': [ + 'report/report_shipping.xml', + 'report/report_deliveryslip.xml', + ], +} diff --git a/stock_picking_report_delivery_cost/i18n/es.po b/stock_picking_report_delivery_cost/i18n/es.po new file mode 100644 index 0000000000..83f9d61fe5 --- /dev/null +++ b/stock_picking_report_delivery_cost/i18n/es.po @@ -0,0 +1,39 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * stock_picking_report_delivery_cost +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-12-18 22:01+0000\n" +"PO-Revision-Date: 2019-12-18 23:02+0100\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"Language: es\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: \n" +"X-Generator: Poedit 2.0.6\n" + +#. module: stock_picking_report_delivery_cost +#: model:ir.ui.view,arch_db:stock_picking_report_delivery_cost.report_delivery_document +#: model:ir.ui.view,arch_db:stock_picking_report_delivery_cost.report_picking +msgid "Delivery cost" +msgstr "Coste de envío" + +#. module: stock_picking_report_delivery_cost +#: model:ir.model.fields,field_description:stock_picking_report_delivery_cost.field_stock_picking_carrier_price_for_report +msgid "Carrier Price For Report" +msgstr "Precio de envío para el informe" + +#. module: stock_picking_report_delivery_cost +#: model:ir.model.fields,field_description:stock_picking_report_delivery_cost.field_stock_picking_currency_id +msgid "Currency" +msgstr "Moneda" + +#. module: stock_picking_report_delivery_cost +#: model:ir.model,name:stock_picking_report_delivery_cost.model_stock_picking +msgid "Transfer" +msgstr "Albarán" diff --git a/stock_picking_report_delivery_cost/i18n/stock_picking_report_delivery_cost.pot b/stock_picking_report_delivery_cost/i18n/stock_picking_report_delivery_cost.pot new file mode 100644 index 0000000000..228c8529f0 --- /dev/null +++ b/stock_picking_report_delivery_cost/i18n/stock_picking_report_delivery_cost.pot @@ -0,0 +1,36 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * stock_picking_report_delivery_cost +# +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: stock_picking_report_delivery_cost +#: model:ir.ui.view,arch_db:stock_picking_report_delivery_cost.report_delivery_document +#: model:ir.ui.view,arch_db:stock_picking_report_delivery_cost.report_picking +msgid "Delivery cost" +msgstr "" + +#. module: stock_picking_report_delivery_cost +#: model:ir.model.fields,field_description:stock_picking_report_delivery_cost.field_stock_picking_carrier_price_for_report +msgid "Carrier Price For Report" +msgstr "" + +#. module: stock_picking_report_delivery_cost +#: model:ir.model.fields,field_description:stock_picking_report_delivery_cost.field_stock_picking_currency_id +msgid "Currency" +msgstr "" + +#. module: stock_picking_report_delivery_cost +#: model:ir.model,name:stock_picking_report_delivery_cost.model_stock_picking +msgid "Transfer" +msgstr "" + diff --git a/stock_picking_report_delivery_cost/models/__init__.py b/stock_picking_report_delivery_cost/models/__init__.py new file mode 100644 index 0000000000..406fd74d73 --- /dev/null +++ b/stock_picking_report_delivery_cost/models/__init__.py @@ -0,0 +1,2 @@ +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +from . import stock_picking diff --git a/stock_picking_report_delivery_cost/models/stock_picking.py b/stock_picking_report_delivery_cost/models/stock_picking.py new file mode 100644 index 0000000000..21c55bb8c5 --- /dev/null +++ b/stock_picking_report_delivery_cost/models/stock_picking.py @@ -0,0 +1,28 @@ +# Copyright 2019 Tecnativa - Pedro M. Baeza +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +from odoo import api, fields, models + + +class StockPicking(models.Model): + _inherit = "stock.picking" + + # Needed for fields.Monetary + currency_id = fields.Many2one( + related="sale_id.currency_id", + readonly=True, + string="Currency", + related_sudo=True, # for avoiding access problems + ) + carrier_price_for_report = fields.Monetary( + compute="_compute_carrier_price_for_report", + ) + + @api.depends('sale_id', 'carrier_price') + def _compute_carrier_price_for_report(self): + for picking in self: + so_lines = picking.sale_id.order_line.filtered('is_delivery') + if so_lines: + picking.carrier_price_for_report = sum( + so_lines.mapped('price_unit')) + else: + picking.carrier_price_for_report = picking.carrier_price diff --git a/stock_picking_report_delivery_cost/readme/CONTRIBUTORS.rst b/stock_picking_report_delivery_cost/readme/CONTRIBUTORS.rst new file mode 100644 index 0000000000..2d4d7a8843 --- /dev/null +++ b/stock_picking_report_delivery_cost/readme/CONTRIBUTORS.rst @@ -0,0 +1,3 @@ +* `Tecnativa `_: + + * Pedro M. Baeza diff --git a/stock_picking_report_delivery_cost/readme/DESCRIPTION.rst b/stock_picking_report_delivery_cost/readme/DESCRIPTION.rst new file mode 100644 index 0000000000..60f0440480 --- /dev/null +++ b/stock_picking_report_delivery_cost/readme/DESCRIPTION.rst @@ -0,0 +1,3 @@ +This module shows in the delivery slip and picking operations reports the cost +of the delivery method according the rate computed on the fly according same +conditions as standard `delivery` module would do. diff --git a/stock_picking_report_delivery_cost/readme/USAGE.rst b/stock_picking_report_delivery_cost/readme/USAGE.rst new file mode 100644 index 0000000000..a5075fa2b2 --- /dev/null +++ b/stock_picking_report_delivery_cost/readme/USAGE.rst @@ -0,0 +1,6 @@ +To use this module, you need to: + +#. Go to *Inventory > Operations > Transfers* and pick one not in state *Done* + or *Cancelled*. +#. Click on *Print > Delivery Slip* or *Print > Picking Operations*. +#. You will see in the report the computed delivery cost. diff --git a/stock_picking_report_delivery_cost/report/report_deliveryslip.xml b/stock_picking_report_delivery_cost/report/report_deliveryslip.xml new file mode 100644 index 0000000000..452406f3a9 --- /dev/null +++ b/stock_picking_report_delivery_cost/report/report_deliveryslip.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/stock_picking_report_delivery_cost/report/report_shipping.xml b/stock_picking_report_delivery_cost/report/report_shipping.xml new file mode 100644 index 0000000000..a25d2ca648 --- /dev/null +++ b/stock_picking_report_delivery_cost/report/report_shipping.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/stock_picking_report_delivery_cost/static/description/icon.png b/stock_picking_report_delivery_cost/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/stock_picking_report_delivery_cost/static/description/index.html b/stock_picking_report_delivery_cost/static/description/index.html new file mode 100644 index 0000000000..24398b63b2 --- /dev/null +++ b/stock_picking_report_delivery_cost/static/description/index.html @@ -0,0 +1,435 @@ + + + + + + +Delivery cost in Picking Reports + + + +
+

Delivery cost in Picking Reports

+ + +

Beta License: AGPL-3 OCA/delivery-carrier Translate me on Weblate Try me on Runbot

+

This module shows in the delivery slip and picking operations reports the cost +of the delivery method according the rate computed on the fly according same +conditions as standard delivery module would do.

+

Table of contents

+ +
+

Usage

+

To use this module, you need to:

+
    +
  1. Go to Inventory > Operations > Transfers and pick one not in state Done +or Cancelled.
    2. +
  2. Click on Print > Delivery Slip or Print > Picking Operations.
    3. +
  3. You will see in the report the computed delivery cost.
    4. +
+
+
+

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/delivery-carrier project on GitHub.

+

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

+
+
+
+ + diff --git a/stock_picking_report_delivery_cost/tests/__init__.py b/stock_picking_report_delivery_cost/tests/__init__.py new file mode 100644 index 0000000000..c2d563823d --- /dev/null +++ b/stock_picking_report_delivery_cost/tests/__init__.py @@ -0,0 +1 @@ +from . import test_stock_picking_report_delivery_cost diff --git a/stock_picking_report_delivery_cost/tests/test_stock_picking_report_delivery_cost.py b/stock_picking_report_delivery_cost/tests/test_stock_picking_report_delivery_cost.py new file mode 100644 index 0000000000..93a7256511 --- /dev/null +++ b/stock_picking_report_delivery_cost/tests/test_stock_picking_report_delivery_cost.py @@ -0,0 +1,59 @@ +# Copyright 2019 Tecnativa - Pedro M. Baeza +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo.tests import common + + +class TestStockPickingReportDeliveryCost(common.SavepointCase): + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.partner = cls.env['res.partner'].create({'name': 'Test contact'}) + cls.product = cls.env['product.product'].create({ + 'name': 'Test product', + 'type': 'consu', + }) + cls.carrier_product = cls.env['product.product'].create({ + 'name': 'Test product', + 'type': 'service', + 'list_price': 5, + 'taxes_id': False, + }) + cls.carrier = cls.env['delivery.carrier'].create({ + 'name': 'Test carrier', + 'delivery_type': 'fixed', + 'product_id': cls.carrier_product.id, + }) + cls.pricelist = cls.env['product.pricelist'].create({ + 'name': 'Test pricelist', + }) + cls.order = cls.env['sale.order'].create({ + 'partner_id': cls.partner.id, + 'carrier_id': cls.carrier.id, + 'pricelist_id': cls.pricelist.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': 300.00, + }), + ], + }) + + def test_carrier_price_for_report_before(self): + self.order.get_delivery_price() + self.order.set_delivery_line() + self.order.action_confirm() + picking = self.order.picking_ids + self.assertAlmostEqual(picking.carrier_price_for_report, 5) + + def test_carrier_price_for_report_after(self): + self.order.action_confirm() + picking = self.order.picking_ids + self.assertAlmostEqual(picking.carrier_price_for_report, 0) + move = picking.move_lines + move.qty_done = move.product_qty + picking.action_done() + self.assertAlmostEqual(picking.carrier_price_for_report, 5) From f23f51d57db89ee725c82e167dd24f820d8ddfea Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Fri, 3 Jan 2020 11:04:34 +0100 Subject: [PATCH 02/20] [MIG] stock_picking_report_delivery_cost: Migration to 12.0 * Standard procedure * Tests adapted [UPD] Update stock_picking_report_delivery_cost.pot --- stock_picking_report_delivery_cost/README.rst | 10 +++++----- stock_picking_report_delivery_cost/__manifest__.py | 2 +- stock_picking_report_delivery_cost/i18n/es.po | 14 +++++++------- .../i18n/stock_picking_report_delivery_cost.pot | 10 +++++----- .../static/description/index.html | 6 +++--- .../test_stock_picking_report_delivery_cost.py | 2 +- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/stock_picking_report_delivery_cost/README.rst b/stock_picking_report_delivery_cost/README.rst index 5e38cf5a25..7dee565fab 100644 --- a/stock_picking_report_delivery_cost/README.rst +++ b/stock_picking_report_delivery_cost/README.rst @@ -14,13 +14,13 @@ Delivery cost in Picking Reports :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fdelivery--carrier-lightgray.png?logo=github - :target: https://github.com/OCA/delivery-carrier/tree/11.0/stock_picking_report_delivery_cost + :target: https://github.com/OCA/delivery-carrier/tree/12.0/stock_picking_report_delivery_cost :alt: OCA/delivery-carrier .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/delivery-carrier-11-0/delivery-carrier-11-0-stock_picking_report_delivery_cost + :target: https://translation.odoo-community.org/projects/delivery-carrier-12-0/delivery-carrier-12-0-stock_picking_report_delivery_cost :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/99/11.0 + :target: https://runbot.odoo-community.org/runbot/99/12.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -50,7 +50,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. @@ -82,6 +82,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/delivery-carrier `_ project on GitHub. +This module is part of the `OCA/delivery-carrier `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/stock_picking_report_delivery_cost/__manifest__.py b/stock_picking_report_delivery_cost/__manifest__.py index de91fab5f6..4a7a945b46 100644 --- a/stock_picking_report_delivery_cost/__manifest__.py +++ b/stock_picking_report_delivery_cost/__manifest__.py @@ -5,7 +5,7 @@ 'name': 'Delivery cost in Picking Reports', 'summary': 'Show delivery cost in delivery slip and picking operations ' ' reports', - 'version': '11.0.1.0.0', + 'version': '12.0.1.0.0', 'category': 'Stock', 'website': 'https://github.com/OCA/delivery-carrier', 'author': 'Tecnativa, Odoo Community Association (OCA)', diff --git a/stock_picking_report_delivery_cost/i18n/es.po b/stock_picking_report_delivery_cost/i18n/es.po index 83f9d61fe5..4fcdf890bd 100644 --- a/stock_picking_report_delivery_cost/i18n/es.po +++ b/stock_picking_report_delivery_cost/i18n/es.po @@ -6,30 +6,30 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 22:01+0000\n" -"PO-Revision-Date: 2019-12-18 23:02+0100\n" +"POT-Creation-Date: 2019-12-18 21:07+0000\n" +"PO-Revision-Date: 2019-12-18 22:09+0100\n" "Last-Translator: <>\n" "Language-Team: \n" -"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: \n" +"Language: es\n" "X-Generator: Poedit 2.0.6\n" #. module: stock_picking_report_delivery_cost -#: model:ir.ui.view,arch_db:stock_picking_report_delivery_cost.report_delivery_document -#: model:ir.ui.view,arch_db:stock_picking_report_delivery_cost.report_picking +#: model_terms:ir.ui.view,arch_db:stock_picking_report_delivery_cost.report_delivery_document +#: model_terms:ir.ui.view,arch_db:stock_picking_report_delivery_cost.report_picking msgid "Delivery cost" msgstr "Coste de envío" #. module: stock_picking_report_delivery_cost -#: model:ir.model.fields,field_description:stock_picking_report_delivery_cost.field_stock_picking_carrier_price_for_report +#: model:ir.model.fields,field_description:stock_picking_report_delivery_cost.field_stock_picking__carrier_price_for_report msgid "Carrier Price For Report" msgstr "Precio de envío para el informe" #. module: stock_picking_report_delivery_cost -#: model:ir.model.fields,field_description:stock_picking_report_delivery_cost.field_stock_picking_currency_id +#: model:ir.model.fields,field_description:stock_picking_report_delivery_cost.field_stock_picking__currency_id msgid "Currency" msgstr "Moneda" diff --git a/stock_picking_report_delivery_cost/i18n/stock_picking_report_delivery_cost.pot b/stock_picking_report_delivery_cost/i18n/stock_picking_report_delivery_cost.pot index 228c8529f0..c17ec6d291 100644 --- a/stock_picking_report_delivery_cost/i18n/stock_picking_report_delivery_cost.pot +++ b/stock_picking_report_delivery_cost/i18n/stock_picking_report_delivery_cost.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,18 +14,18 @@ msgstr "" "Plural-Forms: \n" #. module: stock_picking_report_delivery_cost -#: model:ir.ui.view,arch_db:stock_picking_report_delivery_cost.report_delivery_document -#: model:ir.ui.view,arch_db:stock_picking_report_delivery_cost.report_picking +#: model_terms:ir.ui.view,arch_db:stock_picking_report_delivery_cost.report_delivery_document +#: model_terms:ir.ui.view,arch_db:stock_picking_report_delivery_cost.report_picking msgid "Delivery cost" msgstr "" #. module: stock_picking_report_delivery_cost -#: model:ir.model.fields,field_description:stock_picking_report_delivery_cost.field_stock_picking_carrier_price_for_report +#: model:ir.model.fields,field_description:stock_picking_report_delivery_cost.field_stock_picking__carrier_price_for_report msgid "Carrier Price For Report" msgstr "" #. module: stock_picking_report_delivery_cost -#: model:ir.model.fields,field_description:stock_picking_report_delivery_cost.field_stock_picking_currency_id +#: model:ir.model.fields,field_description:stock_picking_report_delivery_cost.field_stock_picking__currency_id msgid "Currency" msgstr "" diff --git a/stock_picking_report_delivery_cost/static/description/index.html b/stock_picking_report_delivery_cost/static/description/index.html index 24398b63b2..54c21e31df 100644 --- a/stock_picking_report_delivery_cost/static/description/index.html +++ b/stock_picking_report_delivery_cost/static/description/index.html @@ -367,7 +367,7 @@

Delivery cost in Picking Reports

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Beta License: AGPL-3 OCA/delivery-carrier Translate me on Weblate Try me on Runbot

+

Beta License: AGPL-3 OCA/delivery-carrier Translate me on Weblate Try me on Runbot

This module shows in the delivery slip and picking operations reports the cost of the delivery method according the rate computed on the fly according same conditions as standard delivery module would do.

@@ -399,7 +399,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.

@@ -426,7 +426,7 @@

Maintainers

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/delivery-carrier project on GitHub.

+

This module is part of the OCA/delivery-carrier project on GitHub.

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

diff --git a/stock_picking_report_delivery_cost/tests/test_stock_picking_report_delivery_cost.py b/stock_picking_report_delivery_cost/tests/test_stock_picking_report_delivery_cost.py index 93a7256511..dba68e3f76 100644 --- a/stock_picking_report_delivery_cost/tests/test_stock_picking_report_delivery_cost.py +++ b/stock_picking_report_delivery_cost/tests/test_stock_picking_report_delivery_cost.py @@ -53,7 +53,7 @@ def test_carrier_price_for_report_after(self): self.order.action_confirm() picking = self.order.picking_ids self.assertAlmostEqual(picking.carrier_price_for_report, 0) - move = picking.move_lines + move = picking.move_ids_without_package move.qty_done = move.product_qty picking.action_done() self.assertAlmostEqual(picking.carrier_price_for_report, 5) From 5259faac93ddc53dd5d5cace92d896617f1a986f Mon Sep 17 00:00:00 2001 From: OCA Transbot Date: Wed, 22 Jan 2020 08:49:16 +0000 Subject: [PATCH 03/20] Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: delivery-carrier-12.0/delivery-carrier-12.0-stock_picking_report_delivery_cost Translate-URL: https://translation.odoo-community.org/projects/delivery-carrier-12-0/delivery-carrier-12-0-stock_picking_report_delivery_cost/ --- stock_picking_report_delivery_cost/i18n/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stock_picking_report_delivery_cost/i18n/es.po b/stock_picking_report_delivery_cost/i18n/es.po index 4fcdf890bd..f167058e15 100644 --- a/stock_picking_report_delivery_cost/i18n/es.po +++ b/stock_picking_report_delivery_cost/i18n/es.po @@ -10,11 +10,11 @@ msgstr "" "PO-Revision-Date: 2019-12-18 22:09+0100\n" "Last-Translator: <>\n" "Language-Team: \n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: \n" -"Language: es\n" "X-Generator: Poedit 2.0.6\n" #. module: stock_picking_report_delivery_cost From 027ad5affee3d3f281f4da882012f7615dec39ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Mart=C3=ADnez?= Date: Tue, 27 Oct 2020 09:40:25 +0100 Subject: [PATCH 04/20] [IMP] stock_picking_report_delivery_cost: black, isort, prettier --- .../__manifest__.py | 26 +++---- .../models/stock_picking.py | 7 +- .../report/report_deliveryslip.xml | 8 +- .../report/report_shipping.xml | 8 +- ...test_stock_picking_report_delivery_cost.py | 73 ++++++++++--------- 5 files changed, 63 insertions(+), 59 deletions(-) diff --git a/stock_picking_report_delivery_cost/__manifest__.py b/stock_picking_report_delivery_cost/__manifest__.py index 4a7a945b46..6ed9e6ef95 100644 --- a/stock_picking_report_delivery_cost/__manifest__.py +++ b/stock_picking_report_delivery_cost/__manifest__.py @@ -2,20 +2,14 @@ # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). { - 'name': 'Delivery cost in Picking Reports', - 'summary': 'Show delivery cost in delivery slip and picking operations ' - ' reports', - 'version': '12.0.1.0.0', - 'category': 'Stock', - 'website': 'https://github.com/OCA/delivery-carrier', - 'author': 'Tecnativa, Odoo Community Association (OCA)', - 'license': 'AGPL-3', - 'installable': True, - 'depends': [ - 'delivery', - ], - 'data': [ - 'report/report_shipping.xml', - 'report/report_deliveryslip.xml', - ], + "name": "Delivery cost in Picking Reports", + "summary": "Show delivery cost in delivery slip and picking operations " " reports", + "version": "12.0.1.0.0", + "category": "Stock", + "website": "https://github.com/OCA/delivery-carrier", + "author": "Tecnativa, Odoo Community Association (OCA)", + "license": "AGPL-3", + "installable": True, + "depends": ["delivery"], + "data": ["report/report_shipping.xml", "report/report_deliveryslip.xml"], } diff --git a/stock_picking_report_delivery_cost/models/stock_picking.py b/stock_picking_report_delivery_cost/models/stock_picking.py index 21c55bb8c5..abc20a0ba8 100644 --- a/stock_picking_report_delivery_cost/models/stock_picking.py +++ b/stock_picking_report_delivery_cost/models/stock_picking.py @@ -17,12 +17,11 @@ class StockPicking(models.Model): compute="_compute_carrier_price_for_report", ) - @api.depends('sale_id', 'carrier_price') + @api.depends("sale_id", "carrier_price") def _compute_carrier_price_for_report(self): for picking in self: - so_lines = picking.sale_id.order_line.filtered('is_delivery') + so_lines = picking.sale_id.order_line.filtered("is_delivery") if so_lines: - picking.carrier_price_for_report = sum( - so_lines.mapped('price_unit')) + picking.carrier_price_for_report = sum(so_lines.mapped("price_unit")) else: picking.carrier_price_for_report = picking.carrier_price diff --git a/stock_picking_report_delivery_cost/report/report_deliveryslip.xml b/stock_picking_report_delivery_cost/report/report_deliveryslip.xml index 452406f3a9..81a0f8f37b 100644 --- a/stock_picking_report_delivery_cost/report/report_deliveryslip.xml +++ b/stock_picking_report_delivery_cost/report/report_deliveryslip.xml @@ -1,14 +1,16 @@ - + diff --git a/stock_picking_report_delivery_cost/report/report_shipping.xml b/stock_picking_report_delivery_cost/report/report_shipping.xml index a25d2ca648..1b0d0a2b16 100644 --- a/stock_picking_report_delivery_cost/report/report_shipping.xml +++ b/stock_picking_report_delivery_cost/report/report_shipping.xml @@ -1,14 +1,16 @@ - + diff --git a/stock_picking_report_delivery_cost/tests/test_stock_picking_report_delivery_cost.py b/stock_picking_report_delivery_cost/tests/test_stock_picking_report_delivery_cost.py index dba68e3f76..84147c67a8 100644 --- a/stock_picking_report_delivery_cost/tests/test_stock_picking_report_delivery_cost.py +++ b/stock_picking_report_delivery_cost/tests/test_stock_picking_report_delivery_cost.py @@ -8,39 +8,46 @@ class TestStockPickingReportDeliveryCost(common.SavepointCase): @classmethod def setUpClass(cls): super().setUpClass() - cls.partner = cls.env['res.partner'].create({'name': 'Test contact'}) - cls.product = cls.env['product.product'].create({ - 'name': 'Test product', - 'type': 'consu', - }) - cls.carrier_product = cls.env['product.product'].create({ - 'name': 'Test product', - 'type': 'service', - 'list_price': 5, - 'taxes_id': False, - }) - cls.carrier = cls.env['delivery.carrier'].create({ - 'name': 'Test carrier', - 'delivery_type': 'fixed', - 'product_id': cls.carrier_product.id, - }) - cls.pricelist = cls.env['product.pricelist'].create({ - 'name': 'Test pricelist', - }) - cls.order = cls.env['sale.order'].create({ - 'partner_id': cls.partner.id, - 'carrier_id': cls.carrier.id, - 'pricelist_id': cls.pricelist.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': 300.00, - }), - ], - }) + cls.partner = cls.env["res.partner"].create({"name": "Test contact"}) + cls.product = cls.env["product.product"].create( + {"name": "Test product", "type": "consu"} + ) + cls.carrier_product = cls.env["product.product"].create( + { + "name": "Test product", + "type": "service", + "list_price": 5, + "taxes_id": False, + } + ) + cls.carrier = cls.env["delivery.carrier"].create( + { + "name": "Test carrier", + "delivery_type": "fixed", + "product_id": cls.carrier_product.id, + } + ) + cls.pricelist = cls.env["product.pricelist"].create({"name": "Test pricelist"}) + cls.order = cls.env["sale.order"].create( + { + "partner_id": cls.partner.id, + "carrier_id": cls.carrier.id, + "pricelist_id": cls.pricelist.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": 300.00, + }, + ), + ], + } + ) def test_carrier_price_for_report_before(self): self.order.get_delivery_price() From 812dbb753f919f208d45551f2e3c4c1f3df5537e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Mart=C3=ADnez?= Date: Tue, 27 Oct 2020 10:02:40 +0100 Subject: [PATCH 05/20] [MIG] stock_picking_report_delivery_cost: Migration to 13.0 [UPD] Update stock_picking_report_delivery_cost.pot [UPD] README.rst Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: delivery-carrier-13.0/delivery-carrier-13.0-stock_picking_report_delivery_cost Translate-URL: https://translation.odoo-community.org/projects/delivery-carrier-13-0/delivery-carrier-13-0-stock_picking_report_delivery_cost/ --- stock_picking_report_delivery_cost/README.rst | 11 ++++++----- .../__manifest__.py | 2 +- stock_picking_report_delivery_cost/i18n/es.po | 19 +++++++++---------- .../stock_picking_report_delivery_cost.pot | 9 ++++----- .../readme/CONTRIBUTORS.rst | 1 + .../report/report_deliveryslip.xml | 19 ++++++++++--------- .../report/report_shipping.xml | 18 +++++++++--------- .../static/description/index.html | 7 ++++--- ...test_stock_picking_report_delivery_cost.py | 14 +++++++++++--- 9 files changed, 55 insertions(+), 45 deletions(-) diff --git a/stock_picking_report_delivery_cost/README.rst b/stock_picking_report_delivery_cost/README.rst index 7dee565fab..0474bef877 100644 --- a/stock_picking_report_delivery_cost/README.rst +++ b/stock_picking_report_delivery_cost/README.rst @@ -14,13 +14,13 @@ Delivery cost in Picking Reports :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fdelivery--carrier-lightgray.png?logo=github - :target: https://github.com/OCA/delivery-carrier/tree/12.0/stock_picking_report_delivery_cost + :target: https://github.com/OCA/delivery-carrier/tree/13.0/stock_picking_report_delivery_cost :alt: OCA/delivery-carrier .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/delivery-carrier-12-0/delivery-carrier-12-0-stock_picking_report_delivery_cost + :target: https://translation.odoo-community.org/projects/delivery-carrier-13-0/delivery-carrier-13-0-stock_picking_report_delivery_cost :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/99/12.0 + :target: https://runbot.odoo-community.org/runbot/99/13.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -50,7 +50,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. @@ -68,6 +68,7 @@ Contributors * `Tecnativa `_: * Pedro M. Baeza + * Víctor Martínez Maintainers ~~~~~~~~~~~ @@ -82,6 +83,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/delivery-carrier `_ project on GitHub. +This module is part of the `OCA/delivery-carrier `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/stock_picking_report_delivery_cost/__manifest__.py b/stock_picking_report_delivery_cost/__manifest__.py index 6ed9e6ef95..b6934d26d3 100644 --- a/stock_picking_report_delivery_cost/__manifest__.py +++ b/stock_picking_report_delivery_cost/__manifest__.py @@ -4,7 +4,7 @@ { "name": "Delivery cost in Picking Reports", "summary": "Show delivery cost in delivery slip and picking operations " " reports", - "version": "12.0.1.0.0", + "version": "13.0.1.0.0", "category": "Stock", "website": "https://github.com/OCA/delivery-carrier", "author": "Tecnativa, Odoo Community Association (OCA)", diff --git a/stock_picking_report_delivery_cost/i18n/es.po b/stock_picking_report_delivery_cost/i18n/es.po index f167058e15..1a65b5200d 100644 --- a/stock_picking_report_delivery_cost/i18n/es.po +++ b/stock_picking_report_delivery_cost/i18n/es.po @@ -4,29 +4,28 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 12.0\n" +"Project-Id-Version: Odoo Server 13.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 21:07+0000\n" -"PO-Revision-Date: 2019-12-18 22:09+0100\n" -"Last-Translator: <>\n" +"POT-Creation-Date: 2020-10-28 12:52+0000\n" +"PO-Revision-Date: 2020-10-28 12:52+0000\n" +"Last-Translator: \n" "Language-Team: \n" -"Language: es\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" +"Content-Transfer-Encoding: \n" "Plural-Forms: \n" -"X-Generator: Poedit 2.0.6\n" #. module: stock_picking_report_delivery_cost #: model_terms:ir.ui.view,arch_db:stock_picking_report_delivery_cost.report_delivery_document #: model_terms:ir.ui.view,arch_db:stock_picking_report_delivery_cost.report_picking -msgid "Delivery cost" -msgstr "Coste de envío" +msgid "Delivery cost:" +msgstr "Coste de envío:" #. module: stock_picking_report_delivery_cost #: model:ir.model.fields,field_description:stock_picking_report_delivery_cost.field_stock_picking__carrier_price_for_report msgid "Carrier Price For Report" -msgstr "Precio de envío para el informe" +msgstr "Precio del envío para el informe" #. module: stock_picking_report_delivery_cost #: model:ir.model.fields,field_description:stock_picking_report_delivery_cost.field_stock_picking__currency_id diff --git a/stock_picking_report_delivery_cost/i18n/stock_picking_report_delivery_cost.pot b/stock_picking_report_delivery_cost/i18n/stock_picking_report_delivery_cost.pot index c17ec6d291..24fe8ae929 100644 --- a/stock_picking_report_delivery_cost/i18n/stock_picking_report_delivery_cost.pot +++ b/stock_picking_report_delivery_cost/i18n/stock_picking_report_delivery_cost.pot @@ -1,12 +1,12 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * stock_picking_report_delivery_cost +# * stock_picking_report_delivery_cost # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 12.0\n" +"Project-Id-Version: Odoo Server 13.0\n" "Report-Msgid-Bugs-To: \n" -"Last-Translator: <>\n" +"Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -16,7 +16,7 @@ msgstr "" #. module: stock_picking_report_delivery_cost #: model_terms:ir.ui.view,arch_db:stock_picking_report_delivery_cost.report_delivery_document #: model_terms:ir.ui.view,arch_db:stock_picking_report_delivery_cost.report_picking -msgid "Delivery cost" +msgid "Delivery cost:" msgstr "" #. module: stock_picking_report_delivery_cost @@ -33,4 +33,3 @@ msgstr "" #: model:ir.model,name:stock_picking_report_delivery_cost.model_stock_picking msgid "Transfer" msgstr "" - diff --git a/stock_picking_report_delivery_cost/readme/CONTRIBUTORS.rst b/stock_picking_report_delivery_cost/readme/CONTRIBUTORS.rst index 2d4d7a8843..18d463ed53 100644 --- a/stock_picking_report_delivery_cost/readme/CONTRIBUTORS.rst +++ b/stock_picking_report_delivery_cost/readme/CONTRIBUTORS.rst @@ -1,3 +1,4 @@ * `Tecnativa `_: * Pedro M. Baeza + * Víctor Martínez diff --git a/stock_picking_report_delivery_cost/report/report_deliveryslip.xml b/stock_picking_report_delivery_cost/report/report_deliveryslip.xml index 81a0f8f37b..070d1694d0 100644 --- a/stock_picking_report_delivery_cost/report/report_deliveryslip.xml +++ b/stock_picking_report_delivery_cost/report/report_deliveryslip.xml @@ -1,17 +1,18 @@ diff --git a/stock_picking_report_delivery_cost/report/report_shipping.xml b/stock_picking_report_delivery_cost/report/report_shipping.xml index 1b0d0a2b16..5f7f176462 100644 --- a/stock_picking_report_delivery_cost/report/report_shipping.xml +++ b/stock_picking_report_delivery_cost/report/report_shipping.xml @@ -3,15 +3,15 @@ License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). --> diff --git a/stock_picking_report_delivery_cost/static/description/index.html b/stock_picking_report_delivery_cost/static/description/index.html index 54c21e31df..395b369bb1 100644 --- a/stock_picking_report_delivery_cost/static/description/index.html +++ b/stock_picking_report_delivery_cost/static/description/index.html @@ -367,7 +367,7 @@

Delivery cost in Picking Reports

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Beta License: AGPL-3 OCA/delivery-carrier Translate me on Weblate Try me on Runbot

+

Beta License: AGPL-3 OCA/delivery-carrier Translate me on Weblate Try me on Runbot

This module shows in the delivery slip and picking operations reports the cost of the delivery method according the rate computed on the fly according same conditions as standard delivery module would do.

@@ -399,7 +399,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.

@@ -415,6 +415,7 @@

Contributors

  • Tecnativa:
    • Pedro M. Baeza
      • +
    • Víctor Martínez
@@ -426,7 +427,7 @@

Maintainers

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/delivery-carrier project on GitHub.

+

This module is part of the OCA/delivery-carrier project on GitHub.

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

diff --git a/stock_picking_report_delivery_cost/tests/test_stock_picking_report_delivery_cost.py b/stock_picking_report_delivery_cost/tests/test_stock_picking_report_delivery_cost.py index 84147c67a8..915f5269ae 100644 --- a/stock_picking_report_delivery_cost/tests/test_stock_picking_report_delivery_cost.py +++ b/stock_picking_report_delivery_cost/tests/test_stock_picking_report_delivery_cost.py @@ -1,7 +1,7 @@ # Copyright 2019 Tecnativa - Pedro M. Baeza # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -from odoo.tests import common +from odoo.tests import Form, common class TestStockPickingReportDeliveryCost(common.SavepointCase): @@ -50,8 +50,16 @@ def setUpClass(cls): ) def test_carrier_price_for_report_before(self): - self.order.get_delivery_price() - self.order.set_delivery_line() + delivery_wizard = Form( + self.env["choose.delivery.carrier"].with_context( + { + "default_order_id": self.order.id, + "default_carrier_id": self.carrier.id, + } + ) + ) + choose_delivery_carrier = delivery_wizard.save() + choose_delivery_carrier.button_confirm() self.order.action_confirm() picking = self.order.picking_ids self.assertAlmostEqual(picking.carrier_price_for_report, 5) From f916da30d457281276ad734af2339db275105dcf Mon Sep 17 00:00:00 2001 From: pilarvargas-tecnativa Date: Mon, 9 Jan 2023 16:21:26 +0100 Subject: [PATCH 06/20] [MIG] stock_picking_report_delivery_cost: Migration to version 15.0 TT39015 [UPD] Update stock_picking_report_delivery_cost.pot [UPD] README.rst [UPD] README.rst --- stock_picking_report_delivery_cost/README.rst | 24 ++++++----- .../__manifest__.py | 2 +- .../stock_picking_report_delivery_cost.pot | 2 +- .../readme/CONTRIBUTORS.rst | 1 + .../static/description/index.html | 43 ++++++++++--------- ...test_stock_picking_report_delivery_cost.py | 12 +++--- 6 files changed, 45 insertions(+), 39 deletions(-) diff --git a/stock_picking_report_delivery_cost/README.rst b/stock_picking_report_delivery_cost/README.rst index 0474bef877..3271fad601 100644 --- a/stock_picking_report_delivery_cost/README.rst +++ b/stock_picking_report_delivery_cost/README.rst @@ -2,10 +2,13 @@ Delivery cost in Picking Reports ================================ -.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:59fedc1f1c6240c6e86bb3738d20591a30f46f3b0c132310606c7a861a78678e + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png :target: https://odoo-community.org/page/development-status @@ -14,16 +17,16 @@ Delivery cost in Picking Reports :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fdelivery--carrier-lightgray.png?logo=github - :target: https://github.com/OCA/delivery-carrier/tree/13.0/stock_picking_report_delivery_cost + :target: https://github.com/OCA/delivery-carrier/tree/15.0/stock_picking_report_delivery_cost :alt: OCA/delivery-carrier .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/delivery-carrier-13-0/delivery-carrier-13-0-stock_picking_report_delivery_cost + :target: https://translation.odoo-community.org/projects/delivery-carrier-15-0/delivery-carrier-15-0-stock_picking_report_delivery_cost :alt: Translate me on Weblate -.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/99/13.0 - :alt: Try me on Runbot +.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png + :target: https://runboat.odoo-community.org/builds?repo=OCA/delivery-carrier&target_branch=15.0 + :alt: Try me on Runboat -|badge1| |badge2| |badge3| |badge4| |badge5| +|badge1| |badge2| |badge3| |badge4| |badge5| This module shows in the delivery slip and picking operations reports the cost of the delivery method according the rate computed on the fly according same @@ -49,8 +52,8 @@ 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 `_. +If you spotted it first, help us to smash it by providing a detailed and welcomed +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -69,6 +72,7 @@ Contributors * Pedro M. Baeza * Víctor Martínez + * Pilar Vargas Maintainers ~~~~~~~~~~~ @@ -83,6 +87,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/delivery-carrier `_ project on GitHub. +This module is part of the `OCA/delivery-carrier `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/stock_picking_report_delivery_cost/__manifest__.py b/stock_picking_report_delivery_cost/__manifest__.py index b6934d26d3..4a3bd30f78 100644 --- a/stock_picking_report_delivery_cost/__manifest__.py +++ b/stock_picking_report_delivery_cost/__manifest__.py @@ -4,7 +4,7 @@ { "name": "Delivery cost in Picking Reports", "summary": "Show delivery cost in delivery slip and picking operations " " reports", - "version": "13.0.1.0.0", + "version": "15.0.1.0.0", "category": "Stock", "website": "https://github.com/OCA/delivery-carrier", "author": "Tecnativa, Odoo Community Association (OCA)", diff --git a/stock_picking_report_delivery_cost/i18n/stock_picking_report_delivery_cost.pot b/stock_picking_report_delivery_cost/i18n/stock_picking_report_delivery_cost.pot index 24fe8ae929..ea2a225347 100644 --- a/stock_picking_report_delivery_cost/i18n/stock_picking_report_delivery_cost.pot +++ b/stock_picking_report_delivery_cost/i18n/stock_picking_report_delivery_cost.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 13.0\n" +"Project-Id-Version: Odoo Server 15.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: \n" "Language-Team: \n" diff --git a/stock_picking_report_delivery_cost/readme/CONTRIBUTORS.rst b/stock_picking_report_delivery_cost/readme/CONTRIBUTORS.rst index 18d463ed53..f3bb09f2bc 100644 --- a/stock_picking_report_delivery_cost/readme/CONTRIBUTORS.rst +++ b/stock_picking_report_delivery_cost/readme/CONTRIBUTORS.rst @@ -2,3 +2,4 @@ * Pedro M. Baeza * Víctor Martínez + * Pilar Vargas diff --git a/stock_picking_report_delivery_cost/static/description/index.html b/stock_picking_report_delivery_cost/static/description/index.html index 395b369bb1..23b8e45873 100644 --- a/stock_picking_report_delivery_cost/static/description/index.html +++ b/stock_picking_report_delivery_cost/static/description/index.html @@ -1,20 +1,20 @@ - + - + Delivery cost in Picking Reports