odoo-addon-ebill-postfinance 16.0.1.0.0.3__py3-none-any.whl → 16.0.1.0.0.6__py3-none-any.whl

odoo/addons/ebill_postfinance/models/ebill_postfinance_invoice_message.py

@@ -200,22 +200,11 @@ class EbillPostfinanceInvoiceMessage(models.Model):
         return date_string.strftime("%Y-%m-%d")
 
     def _get_payload_params(self):
-        bank_account = ""
-        if self.payment_type == "iban":
-            bank_account = sanitize_account_number(
-                self.invoice_id.partner_bank_id.l10n_ch_qr_iban
-                or self.invoice_id.partner_bank_id.acc_number
-            )
-        else:
-            bank_account = self.invoice_id.partner_bank_id.l10n_ch_isr_subscription_chf
-            if bank_account:
-                account_parts = bank_account.split("-")
-                bank_account = (
-                    account_parts[0] + account_parts[1].rjust(6, "0") + account_parts[2]
-                )
-            else:
-                bank_account = ""
-
+        bank_account = sanitize_account_number(
+            self.invoice_id.partner_bank_id.l10n_ch_qr_iban
+            or self.invoice_id.partner_bank_id.acc_number
+            or ""
+        )
         params = {
             "client_pid": self.service_id.biller_id,
             "invoice": self.invoice_id,
@@ -248,39 +237,23 @@ class EbillPostfinanceInvoiceMessage(models.Model):
             )
         params["amount_by_group"] = amount_by_group
         # Get the invoice due date
-        date_due = None
-        if self.invoice_id.invoice_payment_term_id:
-            terms = self.invoice_id.invoice_payment_term_id.compute(
-                self.invoice_id.amount_total
-            )
-            if terms:
-                # Returns all payment and their date like [('2020-12-07', 430.37), ...]
-                # Get the last payment date in the format "202021207"
-                date_due = terms[-1][0].replace("-", "")
-        if not date_due:
-            date_due = self.format_date(
-                self.invoice_id.invoice_date_due or self.invoice_id.invoice_date
-            )
+        date_due = self.format_date(
+            self.invoice_id.invoice_date_due or self.invoice_id.invoice_date
+        )
         params["date_due"] = date_due
         return params
 
     def _get_payload_params_yb(self):
         bank_account = ""
-        if self.payment_type == "iban":
+        # Use the appropriate IBAN for qr invoice or not.
+        if self.invoice_id.l10n_ch_is_qr_valid:
             bank_account = sanitize_account_number(
-                self.invoice_id.partner_bank_id.l10n_ch_qr_iban
-                or self.invoice_id.partner_bank_id.acc_number
+                self.invoice_id.partner_bank_id.l10n_ch_qr_iban or ""
             )
         else:
-            bank_account = self.invoice_id.partner_bank_id.l10n_ch_isr_subscription_chf
-            if bank_account:
-                account_parts = bank_account.split("-")
-                bank_account = (
-                    account_parts[0] + account_parts[1].rjust(6, "0") + account_parts[2]
-                )
-            else:
-                bank_account = ""
-
+            bank_account = sanitize_account_number(
+                self.invoice_id.partner_bank_id.acc_number or ""
+            )
         delivery = (
             self.invoice_id.partner_shipping_id
             if self.invoice_id.partner_shipping_id != self.invoice_id.partner_id
@@ -324,18 +297,9 @@ class EbillPostfinanceInvoiceMessage(models.Model):
                 )
         params["amount_by_group"] = amount_by_group
         # Get the invoice due date
-        date_due = None
-        if self.invoice_id.invoice_payment_term_id:
-            terms = self.invoice_id.invoice_payment_term_id.compute(
-                self.invoice_id.amount_total
-            )
-            if terms:
-                # Get the last payment date
-                date_due = terms[-1][0]
-        if not date_due:
-            date_due = self.format_date_yb(
-                self.invoice_id.invoice_date_due or self.invoice_id.invoice_date
-            )
+        date_due = self.format_date_yb(
+            self.invoice_id.invoice_date_due or self.invoice_id.invoice_date
+        )
         params["date_due"] = date_due
         return params
 

{odoo_addon_ebill_postfinance-16.0.1.0.0.3.dist-info → odoo_addon_ebill_postfinance-16.0.1.0.0.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odoo-addon-ebill_postfinance
-Version: 16.0.1.0.0.3
+Version: 16.0.1.0.0.6
 Summary: Postfinance eBill integration
 Home-page: https://github.com/OCA/l10n-switzerland
 Author: Camptocamp,Odoo Community Association (OCA)
@@ -12,9 +12,9 @@ Classifier: Framework :: Odoo :: 16.0
 Classifier: License :: OSI Approved :: GNU Affero General Public License v3
 Requires-Python: >=3.10
 Requires-Dist: ebilling-postfinance
-Requires-Dist: odoo-addon-account-invoice-export <16.1dev,>=16.0dev
-Requires-Dist: odoo-addon-base-ebill-payment-contract <16.1dev,>=16.0dev
-Requires-Dist: odoo <16.1dev,>=16.0a
+Requires-Dist: odoo-addon-account-invoice-export<16.1dev,>=16.0dev
+Requires-Dist: odoo-addon-base-ebill-payment-contract<16.1dev,>=16.0dev
+Requires-Dist: odoo<16.1dev,>=16.0a
 Requires-Dist: zeep
 
 =================

{odoo_addon_ebill_postfinance-16.0.1.0.0.3.dist-info → odoo_addon_ebill_postfinance-16.0.1.0.0.6.dist-info}/RECORD

@@ -11,7 +11,7 @@ odoo/addons/ebill_postfinance/messages/ybInvoice_V2.0.4.xsd,sha256=5fbM7Miwb59sX
 odoo/addons/ebill_postfinance/models/__init__.py,sha256=2uZGfhJOczB94W5EFvXlky-tXcJeWRF9O1-rtCGvuxA,177
 odoo/addons/ebill_postfinance/models/account_move.py,sha256=JnMnT1Fu8HtgTKTQaMm2_eLu_hv18SF-l6GSTMXlLaM,5208
 odoo/addons/ebill_postfinance/models/ebill_payment_contract.py,sha256=kVunbB_XN6pw0zcf6iCfe-ceuqMpoalw3TIr1UEtST4,2913
-odoo/addons/ebill_postfinance/models/ebill_postfinance_invoice_message.py,sha256=prOJbNW0WJJd-qJNVhsSGgc-VJ8f6W4uTuLIwtSFF5g,15535
+odoo/addons/ebill_postfinance/models/ebill_postfinance_invoice_message.py,sha256=5vjw0Oo8c7fFeO9l3llYGp_K9nSAqmwExSifxmQLLlg,14041
 odoo/addons/ebill_postfinance/models/ebill_postfinance_service.py,sha256=8yn9FqlXv_bA26mvlGRslW4cfKVmHRIKpZDziixeLzE,5404
 odoo/addons/ebill_postfinance/models/sale_order.py,sha256=M2xxj8F5InyBMgJFRJX3ARrXYy70VVcUpdcrd6Ujii8,597
 odoo/addons/ebill_postfinance/readme/CONFIGURE.rst,sha256=2RxGc9in7UFE1DUKz_z5mgXcgkJWmk7l2xsOL86AzKc,728
@@ -38,7 +38,7 @@ odoo/addons/ebill_postfinance/views/ebill_payment_contract.xml,sha256=efZjo1o4-_
 odoo/addons/ebill_postfinance/views/ebill_postfinance_invoice_message.xml,sha256=Mj2TrBjOS2fxaINA_ycsNTqP5Y3KPsWtvGWv2IkxcDM,3269
 odoo/addons/ebill_postfinance/views/ebill_postfinance_service.xml,sha256=KhYEQtbxpo91QohFoGED9dIHPAP6AzLdsP_IFPZU5Vc,5989
 odoo/addons/ebill_postfinance/views/message_template.xml,sha256=gNBva1ehWFgz6W6lrNCmpxZ_maovQJxhHcBpxcohvZo,213
-odoo_addon_ebill_postfinance-16.0.1.0.0.3.dist-info/METADATA,sha256=yVygSai-iBGtfuqs74DUvOELSxOEs-RgfaL9rjRauI4,5409
-odoo_addon_ebill_postfinance-16.0.1.0.0.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-odoo_addon_ebill_postfinance-16.0.1.0.0.3.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
-odoo_addon_ebill_postfinance-16.0.1.0.0.3.dist-info/RECORD,,
+odoo_addon_ebill_postfinance-16.0.1.0.0.6.dist-info/METADATA,sha256=hc8pLM4fz9egT1ZYqP3sxR1RjQC4SsrIlxn6ExKDs7w,5406
+odoo_addon_ebill_postfinance-16.0.1.0.0.6.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+odoo_addon_ebill_postfinance-16.0.1.0.0.6.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
+odoo_addon_ebill_postfinance-16.0.1.0.0.6.dist-info/RECORD,,

{odoo_addon_ebill_postfinance-16.0.1.0.0.3.dist-info → odoo_addon_ebill_postfinance-16.0.1.0.0.6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: bdist_wheel (0.45.1)
 Root-Is-Purelib: true
 Tag: py3-none-any