Update l10n-switzerland-flectra with changes form l10n-switzerland

->ebill_paynet,ebill_paynet_customer_free_ref,l10n_ch_invoice_reports
This commit is contained in:
Renzo Meister 2022-01-20 17:23:39 +01:00
parent 22ee40100d
commit 054b3e8e86
10 changed files with 46 additions and 24 deletions

View File

@ -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)
<!-- /!\ do not modify above this line -->
# Flectra Community / l10n-switzerland-flectra
# l10n-switzerland

View File

@ -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 <info@jamotion.ch>
* Jamotion <info@jamotion.ch>
* Thierry Ducrest <thierry.ducrest@camptocamp.com>
* `Trobz <https://trobz.com>`_:
* Dung Tran <dungtd@trobz.com>
* Dung Tran <dungtd@trobz.com>
Other credits
~~~~~~~~~~~~~
The migration of this module from 13.0 to 14.0 as financially supported by Camptocamp
The migration of this module from 13.0 to 14.0 as financially supported by Camptocamp

View File

@ -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",

View File

@ -44,11 +44,11 @@
</ORDER>
{%- 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' %}
<DELIVERY-NOTE>
<REFERENCE-DATE>
<Reference-No>{{ picking.carrier_tracking_ref|truncate(35, True, "") }}</Reference-No>
<Reference-No>{{ picking.name }}</Reference-No>
{%- if picking.date_done %}
<Date Format="CCYYMMDD">{{ format_date(picking.date_done) }}</Date>
{%- endif %}

View File

@ -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

View File

@ -42,7 +42,7 @@
</ORDER>
<DELIVERY-NOTE>
<REFERENCE-DATE>
<Reference-No>track_me_if_you_can</Reference-No>
<Reference-No>Picking Name</Reference-No>
<!-- <Date Format="CCYYMMDD">20190620</Date> -->
</REFERENCE-DATE>
</DELIVERY-NOTE>

View File

@ -42,7 +42,7 @@
</ORDER>
<DELIVERY-NOTE>
<REFERENCE-DATE>
<Reference-No>track_me_if_you_can</Reference-No>
<Reference-No>Picking Name</Reference-No>
<!-- <Date Format="CCYYMMDD">20190620</Date> -->
</REFERENCE-DATE>
</DELIVERY-NOTE>

View File

@ -42,7 +42,7 @@
</ORDER>
<DELIVERY-NOTE>
<REFERENCE-DATE>
<Reference-No>track_me_if_you_can</Reference-No>
<Reference-No>Picking Name</Reference-No>
<!-- <Date Format="CCYYMMDD">20190620</Date> -->
</REFERENCE-DATE>
</DELIVERY-NOTE>

View File

@ -13,10 +13,12 @@
<field name="print_report_name">'Invoice-ISR-%s' % object.name</field>
<field name="attachment_use" eval="False" />
<field name="attachment" />
<field name="binding_model_id" ref="account.model_account_move" />
<field name="binding_type">report</field>
</record>
<record id="account_move_qr_report" model="ir.actions.report">
<field name="name">Invoice with ISR</field>
<field name="name">Invoice with QR</field>
<field name="model">account.move</field>
<field name="report_type">qweb-pdf</field>
<field name="report_name">l10n_ch_invoice_reports.invoice_qr_report_main</field>
@ -24,6 +26,8 @@
<field name="print_report_name">'Invoice-QR-%s' % object.name</field>
<field name="attachment_use" eval="False" />
<field name="attachment" />
<field name="binding_model_id" ref="account.model_account_move" />
<field name="binding_type">report</field>
</record>
<record id="account_move_qr_isr_report" model="ir.actions.report">
@ -39,5 +43,7 @@
<field name="print_report_name">'Invoice-QR-ISR-%s' % object.name</field>
<field name="attachment_use" eval="False" />
<field name="attachment" />
<field name="binding_model_id" ref="account.model_account_move" />
<field name="binding_type">report</field>
</record>
</flectra>

View File

@ -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