From 054b3e8e86651bd23d5661b85a971676a347924d Mon Sep 17 00:00:00 2001 From: Renzo Meister Date: Thu, 20 Jan 2022 17:23:39 +0100 Subject: [PATCH] Update l10n-switzerland-flectra with changes form l10n-switzerland ->ebill_paynet,ebill_paynet_customer_free_ref,l10n_ch_invoice_reports --- README.md | 7 +---- ebill_paynet/README.rst | 26 +++++++++++++++---- ebill_paynet/__manifest__.py | 6 ++--- ebill_paynet/messages/invoice-2003A.xml | 6 ++--- ebill_paynet/tests/common.py | 2 +- .../tests/examples/invoice_isr_b2b.xml | 2 +- .../tests/examples/invoice_qr_b2b.xml | 2 +- .../tests/examples/invoice_b2b.xml | 2 +- l10n_ch_invoice_reports/data/reports.xml | 8 +++++- .../i18n/l10n_ch_invoice_reports.pot | 9 +++++-- 10 files changed, 46 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 475698f..ecaca52 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,4 @@ -[![Runbot Status](https://runbot.odoo-community.org/runbot/badge/flat/125/14.0.svg)](https://runbot.odoo-community.org/runbot/repo/github-com-oca-l10n-switzerland-125) -[![Build Status](https://travis-ci.com/OCA/l10n-switzerland.svg?branch=14.0)](https://travis-ci.com/OCA/l10n-switzerland) -[![codecov](https://codecov.io/gh/OCA/l10n-switzerland/branch/14.0/graph/badge.svg)](https://codecov.io/gh/OCA/l10n-switzerland) -[![Translation Status](https://translation.odoo-community.org/widgets/l10n-switzerland-14-0/-/svg-badge.svg)](https://translation.odoo-community.org/engage/l10n-switzerland-14-0/?utm_source=widget) - - +# Flectra Community / l10n-switzerland-flectra # l10n-switzerland diff --git a/ebill_paynet/README.rst b/ebill_paynet/README.rst index 0e5b378..98bb30b 100644 --- a/ebill_paynet/README.rst +++ b/ebill_paynet/README.rst @@ -7,7 +7,23 @@ eBill Paynet !! 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%2Fl10n--switzerland-lightgray.png?logo=github + :target: https://github.com/OCA/l10n-switzerland/tree/14.0/ebill_paynet + :alt: OCA/l10n-switzerland +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/l10n-switzerland-14-0/l10n-switzerland-14-0-ebill_paynet + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/125/14.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| This module implements the exchange of electronic invoices with the SIXT Paynet infrastructure used in Switzerland. @@ -86,14 +102,14 @@ Authors * Camptocamp SA Contributors - ------------ +~~~~~~~~~~~~ - * Jamotion +* Jamotion * Thierry Ducrest * `Trobz `_: - * Dung Tran +* Dung Tran Other credits ~~~~~~~~~~~~~ -The migration of this module from 13.0 to 14.0 as financially supported by Camptocamp \ No newline at end of file +The migration of this module from 13.0 to 14.0 as financially supported by Camptocamp diff --git a/ebill_paynet/__manifest__.py b/ebill_paynet/__manifest__.py index 37ad3f9..c79513f 100644 --- a/ebill_paynet/__manifest__.py +++ b/ebill_paynet/__manifest__.py @@ -5,10 +5,10 @@ "name": "eBill Paynet", "summary": """ Paynet platform bridge implementation""", - "version": "2.0.1.0.0", + "version": "2.0.1.0.1", "license": "AGPL-3", - "author": "Camptocamp SA,Odoo Community Association (OCA), 2BIT GmbH", - "website": "https://gitlab.com/flectra-community/flectra", + "author": "Camptocamp SA,Odoo Community Association (OCA)", + "website": "https://gitlab.com/flectra-community/l10n-switzerland-flectra", "depends": [ "account", "account_invoice_export", diff --git a/ebill_paynet/messages/invoice-2003A.xml b/ebill_paynet/messages/invoice-2003A.xml index 1db7285..592bdda 100644 --- a/ebill_paynet/messages/invoice-2003A.xml +++ b/ebill_paynet/messages/invoice-2003A.xml @@ -44,11 +44,11 @@ {%- endif %} {% endfor %} - {% for picking in invoice_lines.sale_line_ids.move_ids.mapped('picking_id') %} - {%- if picking.carrier_tracking_ref and picking.state != 'cancel' %} + {% for picking in invoice_lines.sale_line_ids.move_ids.mapped('picking_id')[:9] %} + {%- if picking.state != 'cancel' %} - {{ picking.carrier_tracking_ref|truncate(35, True, "") }} + {{ picking.name }} {%- if picking.date_done %} {{ format_date(picking.date_done) }} {%- endif %} diff --git a/ebill_paynet/tests/common.py b/ebill_paynet/tests/common.py index 04cfa32..6f21b25 100644 --- a/ebill_paynet/tests/common.py +++ b/ebill_paynet/tests/common.py @@ -163,7 +163,7 @@ class CommonCase(SavepointCase, XmlTestMixin): cls.sale.date_order = "2019-06-01" # Set a delivery tracking number cls.pickings = cls.sale.order_line.move_ids.mapped("picking_id") - cls.pickings[0].carrier_tracking_ref = "track_me_if_you_can" + cls.pickings[0].name = "Picking Name" # Generate the invoice from the sale order cls.invoice = cls.sale._create_invoices() # And add some more lines on the invoice diff --git a/ebill_paynet/tests/examples/invoice_isr_b2b.xml b/ebill_paynet/tests/examples/invoice_isr_b2b.xml index 5602dd9..2288fdd 100644 --- a/ebill_paynet/tests/examples/invoice_isr_b2b.xml +++ b/ebill_paynet/tests/examples/invoice_isr_b2b.xml @@ -42,7 +42,7 @@ - track_me_if_you_can + Picking Name diff --git a/ebill_paynet/tests/examples/invoice_qr_b2b.xml b/ebill_paynet/tests/examples/invoice_qr_b2b.xml index ab23336..603676a 100644 --- a/ebill_paynet/tests/examples/invoice_qr_b2b.xml +++ b/ebill_paynet/tests/examples/invoice_qr_b2b.xml @@ -42,7 +42,7 @@ - track_me_if_you_can + Picking Name diff --git a/ebill_paynet_customer_free_ref/tests/examples/invoice_b2b.xml b/ebill_paynet_customer_free_ref/tests/examples/invoice_b2b.xml index 1ad8780..385a087 100644 --- a/ebill_paynet_customer_free_ref/tests/examples/invoice_b2b.xml +++ b/ebill_paynet_customer_free_ref/tests/examples/invoice_b2b.xml @@ -42,7 +42,7 @@ - track_me_if_you_can + Picking Name diff --git a/l10n_ch_invoice_reports/data/reports.xml b/l10n_ch_invoice_reports/data/reports.xml index 42c1f34..fffc7b6 100644 --- a/l10n_ch_invoice_reports/data/reports.xml +++ b/l10n_ch_invoice_reports/data/reports.xml @@ -13,10 +13,12 @@ 'Invoice-ISR-%s' % object.name + + report - Invoice with ISR + Invoice with QR account.move qweb-pdf l10n_ch_invoice_reports.invoice_qr_report_main @@ -24,6 +26,8 @@ 'Invoice-QR-%s' % object.name + + report @@ -39,5 +43,7 @@ 'Invoice-QR-ISR-%s' % object.name + + report diff --git a/l10n_ch_invoice_reports/i18n/l10n_ch_invoice_reports.pot b/l10n_ch_invoice_reports/i18n/l10n_ch_invoice_reports.pot index a3b7ea4..ab098c9 100644 --- a/l10n_ch_invoice_reports/i18n/l10n_ch_invoice_reports.pot +++ b/l10n_ch_invoice_reports/i18n/l10n_ch_invoice_reports.pot @@ -42,12 +42,17 @@ msgstr "" #: model:ir.actions.report,name:l10n_ch_invoice_reports.account_move_isr_report #: model:ir.actions.report,name:l10n_ch_invoice_reports.account_move_qr_report msgid "Invoice with ISR" -msgstr "" +msgstr "Rechnung mit ESR" + +#. module: l10n_ch_invoice_reports +#: model:ir.actions.report,name:l10n_ch_invoice_reports.account_move_qr_report +msgid "Invoice with QR" +msgstr "Rechnung mit QR" #. module: l10n_ch_invoice_reports #: model:ir.actions.report,name:l10n_ch_invoice_reports.account_move_qr_isr_report msgid "Invoice with QR and ISR" -msgstr "" +msgstr "Rechnung mit QR und ESR" #. module: l10n_ch_invoice_reports #: model:ir.model.fields,field_description:l10n_ch_invoice_reports.field_ir_actions_report____last_update