Development v163rc2 #1272

sudwebdesign · 2025-06-04T22:57:17Z

Pull Request Checklist

My code follows the code formatting guidelines.
I have tested my changes locally.
I selected the appropriate branch for this PR.
I have rebased my changes on top of the selected branch.
I included relevant documentation updates if necessary.
I have an accompanying issue ID for this pull request.

Description

Fix little stylish details in einvoice-users-check-lists table
Add a system to set the legacy_calculation automatically to false when user use e-Invoice.
Update some dependencies

Related Issue(s)

Solve VAT is calculated wrong in RC1 #1270
Solve (maybe) Payment Method not copied from recurring invoice to generated invoice #1271

Motivation and Context

This change simplify e-invoice usage to Correlate the XMLconfig calculation to do the same in Edition.

Now with that, when client use eInvoice, the legacy_calculation is lively set to false

See : #1270 (comment).

Note:
If you need the legacy_calculation=true when client use eInvoice, just add

    'legacy_calculation => false,

See README in application/helpers/XMLconfigs & Dev Note in ipconfig example

Issue Type

Bugfix Payment Method not copied from recurring invoice to generated invoice #1271
Improvement of an existing feature: Automatic legacy_calculation mode when use e-Invoice
New feature

Updating dependencies - Upgrading filp/whoops (2.18.0 => 2.18.1) - Upgrading laravel/pint (v1.20.0 => v1.22.1) - Upgrading phpstan/phpstan (2.1.16 => 2.1.17) - Upgrading rector/rector (2.0.16 => 2.0.17) - Upgrading symfony/deprecation-contracts (v3.5.1 => v3.6.0)

To fix The process "pint" exceeded the timeout of 300 seconds.

Applied rules: * ParamTypeByMethodCallTypeRector

and if XMLconfigs file haven't `'legacy_calculation' => true`

application/modules/invoices/views/modal_copy_invoice.php

application/modules/invoices/views/view.php

sudwebdesign · 2025-06-05T10:01:08Z

application/modules/invoices/controllers/Ajax.php

+            // Automatic calculation mode
+            if (get_setting('einvoicing')) {
+                // Shift to false (by default). Need true? See Dev Note on ipconfig example
+                $this->config->set_item('legacy_calculation', ! empty($this->input->post('legacy_calculation')));


To shift (if need) the legacy_calculation.

sudwebdesign · 2025-06-05T10:08:22Z

application/helpers/e-invoice_helper.php

        include APPPATH . 'helpers/XMLconfigs/' . $xml_id . '.php';
+        $CI = & get_instance();
+        // Shift calculation mode (false by default). Need true? See Dev Note on ipconfig example
+        $CI->config->set_item('legacy_calculation', ! empty($xml_setting['legacy_calculation']));


Automatic legacy_calculation mode.

If the $xml_setting['legacy_calculation'] is missing in XMLconfigs or is '', null, false, 0 the configuration legacy_calculation shift to false

Only when use e-Invoice

application/helpers/pdf_helper.php

sudwebdesign · 2025-06-05T10:44:49Z

Wait, I forgot about the cron

sudwebdesign · 2025-06-05T11:28:11Z

And some improvements to (maybe) remove all

data-legacy-calculation="<?php echo (int) $legacy_calculation; ?>"

Payment Method not copied from recurring invoice to generated invoice

sudwebdesign · 2025-06-05T13:58:13Z

application/modules/invoices/controllers/Cron.php

            // Create the new invoice
            $db_array = [
                'client_id'                => $invoice->client_id,
+                'payment_method'           => $invoice->payment_method,


Maybe fix #1271

sudwebdesign · 2025-06-05T14:03:22Z

Ready for review by peer.

The const legacy_calculation defined in script (get meta content) The data-legacy-calculation in btn isn't necessary (removed)

sudwebdesign · 2025-06-06T00:00:39Z

All unecessary

data-legacy-calculation="<?php echo (int) $legacy_calculation; ?>"

Removed by [eInvoice] DRY: Use legacy_calculation constant in modal scripts

A final release?

nielsdrost7 · 2025-07-23T05:26:50Z

Prepping the .zip file of RC2. I'm going to merge this PR

Verony-makesIT · 2025-07-25T08:16:04Z

Hello @nielsdrost7, @sudwebdesign,

On June 7th, I made comments and observations about RC1 in #1273.
Apparently, no one feels the need to respond to my comments and/or observations. ;-(
I just reviewed RC2, and the same observations still apply!

I would find it a shame if there were a final release without any changes to the way the current implementation of my e-invoice function works in IP.

I would appreciate it if someone would respond to my comments so I could hear your thoughts on this.

@sudwebdesign

## Version 1.6.3 (final) ### Major Features & E-Invoicing * [[IP-1268](#1268)] **E-invoicing infrastructure update** by @sudwebdesign * [[IP-1272](#1272)] **E-invoicing enhancements** by @sudwebdesign * [[IP-1247](#1247)] Processing e-invoices flow (and some bugfixes) for version 1.6.3 by @nielsdrost7 * [[IP-1282](#1282)] feat: Legacy calculation setup step by @pumpi * [[IP-1281](#1281)] fix: Client overview shows wrong e-Invoicing state by @pumpi ### Changed / Improvements * [[IP-1277](#1277)] Replace node-sass with sass by @onny * [[IP-1261](#1261)] Guest Payment stripe flow & online_payment lang improved by @nielsdrost7 * [[IP-1178](#1178)] Add custom_fields in controllers/Settings by @sudwebdesign * [[IP-1206](#1206)] Add report: Invoices per client by @mheiduk * [[IP-1228](#1228)] Improve number_helper & standardize_amount (fix european format) by @sudwebdesign * [[IP-1229](#1229)] Remove unattended standardize_amount in payments view form by @sudwebdesign * [[IP-1241](#1241)] Add pagination to invoice and quote templates by @onny * [[IP-1219](#1219)] Sort invoices by date instead of id by @MrKrisKrisu * [[IP-1222](#1222)] Sort quotes by date instead of id by @sudwebdesign ### Fixed * [[IP-1179](#1179)] Fix #fullpage-loader (Spinner) never showed after save by @sudwebdesign * [[IP-1174](#1174)] Removed '.pdf' from Invoices.php downloads to fix issue by @HeapReaper * [[IP-1175](#1175)] Check invoice balance before rendering QR code in web view by @idressos * [[IP-1183](#1183)] Fix summary client delete button go to 404 (link2form) by @sudwebdesign * [[IP-1185](#1185)] Fix styling in clients table header by @tstoeter * [[IP-1186](#1186)] Style2class for amounts & balances (th & tr) by @sudwebdesign * [[IP-1197](#1197)] Send email show blank page (php>=8.2) by @sudwebdesign * [[IP-1199](#1199)] Add invoice_status case in template_helper by @sudwebdesign * [[IP-1201](#1201)] Fix SMTP password wrong after saving settings by @sudwebdesign * [[IP-1204](#1204)] Update template_helper.php to fix email template with custom single choice field by @LOK-Soft * [[IP-1251](#1251)] fix: amount of the credit transfer cannot be smaller than 0.01 Euro by @mheiduk * [[IP-1278](#1278)] Fix: Styling issues by @pumpi * [[IP-1283](#1283)] fix: Client detail view exception by **Full Changelog**: v1.6.2...v1.6.3

@sudwebdesign

### What's Changed (since v1.6.2) #### Major Features & E-Invoicing * [[IP-1268](#1268)] **E-invoicing infrastructure update** by @sudwebdesign * [[IP-1272](#1272)] **E-invoicing enhancements** by @sudwebdesign * [[IP-1247](#1247)] Processing e-invoices flow (and some bugfixes) for version 1.6.3 by @nielsdrost7 * [[IP-1282](#1282)] feat: Legacy calculation setup step by @pumpi * [[IP-1281](#1281)] fix: Client overview shows wrong e-Invoicing state by @pumpi #### Changed / Improvements * [[IP-1277](#1277)] Replace node-sass with sass by @onny * [[IP-1261](#1261)] Guest Payment stripe flow & online_payment lang improved by @nielsdrost7 * [[IP-1178](#1178)] Add custom_fields in controllers/Settings by @sudwebdesign * [[IP-1206](#1206)] Add report: Invoices per client by @mheiduk * [[IP-1228](#1228)] Improve number_helper & standardize_amount (fix european format) by @sudwebdesign * [[IP-1229](#1229)] Remove unattended standardize_amount in payments view form by @sudwebdesign * [[IP-1241](#1241)] Add pagination to invoice and quote templates by @onny * [[IP-1219](#1219)] Sort invoices by date instead of id by @MrKrisKrisu * [[IP-1222](#1222)] Sort quotes by date instead of id by @sudwebdesign #### Fixed * [[IP-1179](#1179)] Fix #fullpage-loader (Spinner) never showed after save by @sudwebdesign * [[IP-1174](#1174)] Removed '.pdf' from Invoices.php downloads to fix issue by @HeapReaper * [[IP-1175](#1175)] Check invoice balance before rendering QR code in web view by @idressos * [[IP-1183](#1183)] Fix summary client delete button go to 404 (link2form) by @sudwebdesign * [[IP-1185](#1185)] Fix styling in clients table header by @tstoeter * [[IP-1186](#1186)] Style2class for amounts & balances (th & tr) by @sudwebdesign * [[IP-1197](#1197)] Send email show blank page (php>=8.2) by @sudwebdesign * [[IP-1199](#1199)] Add invoice_status case in template_helper by @sudwebdesign * [[IP-1201](#1201)] Fix SMTP password wrong after saving settings by @sudwebdesign * [[IP-1204](#1204)] Update template_helper.php to fix email template with custom single choice field by @LOK-Soft * [[IP-1251](#1251)] fix: amount of the credit transfer cannot be smaller than 0.01 Euro by @mheiduk * [[IP-1278](#1278)] Fix: Styling issues by @pumpi * [[IP-1283](#1283)] fix: Client detail view exception by **Full Changelog**: v1.6.2...v1.6.3

sudwebdesign added 5 commits June 4, 2025 21:34

Composer\\Config::disableProcessTimeout (scripts)

8d92522

To fix The process "pint" exceeded the timeout of 300 seconds.

lint by composer run check (1 file rectified)

6dc5666

Applied rules: * ParamTypeByMethodCallTypeRector

[einvoice] Fix bad wrap in users-check-lists (client view)

62aa123

[eInvoice] Shift legacy_calculation to false When client use e-Invoice

76a0c5f

and if XMLconfigs file haven't `'legacy_calculation' => true`

nielsdrost7 reviewed Jun 5, 2025

View reviewed changes

application/modules/invoices/views/modal_copy_invoice.php Outdated Show resolved Hide resolved

sudwebdesign self-assigned this Jun 5, 2025

sudwebdesign commented Jun 5, 2025

View reviewed changes

application/modules/invoices/views/view.php Outdated Show resolved Hide resolved

sudwebdesign commented Jun 5, 2025

View reviewed changes

application/helpers/pdf_helper.php Outdated Show resolved Hide resolved

sudwebdesign commented Jun 5, 2025

View reviewed changes

application/helpers/pdf_helper.php Outdated Show resolved Hide resolved

sudwebdesign added 2 commits June 5, 2025 15:50

[eInvoice] Add Automatic calculation mode in Cron & adjustments

000bb9e

Fix #1271 : Add payment_method on Cron

5cbf908

Payment Method not copied from recurring invoice to generated invoice

sudwebdesign commented Jun 5, 2025

View reviewed changes

sudwebdesign added this to the 1.6.3 (bugfix) milestone Jun 5, 2025

sudwebdesign added 2 commits June 6, 2025 01:27

[eInvoice] DRY: Use legacy_calculation constant in modal scripts

8ff6a42

The const legacy_calculation defined in script (get meta content) The data-legacy-calculation in btn isn't necessary (removed)

Fix: Quote header col classes to do the same as Invoice (view)

cb03820

nielsdrost7 mentioned this pull request Jun 27, 2025

Chrissie: Zugferd-V2 #1131

Draft

nielsdrost7 merged commit 6d7cf33 into development Jul 23, 2025
1 check passed

Development v163rc2 #1272

Development v163rc2 #1272

Uh oh!

Conversation

sudwebdesign commented Jun 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pull Request Checklist

Description

Related Issue(s)

Motivation and Context

Issue Type

Uh oh!

Uh oh!

Uh oh!

sudwebdesign Jun 5, 2025

Choose a reason for hiding this comment

Uh oh!

sudwebdesign Jun 5, 2025

Choose a reason for hiding this comment

Uh oh!

sudwebdesign Jun 5, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

sudwebdesign commented Jun 5, 2025

Uh oh!

sudwebdesign commented Jun 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

sudwebdesign Jun 5, 2025

Choose a reason for hiding this comment

Uh oh!

sudwebdesign commented Jun 5, 2025

Uh oh!

sudwebdesign commented Jun 6, 2025

Uh oh!

nielsdrost7 commented Jul 23, 2025

Uh oh!

Uh oh!

Verony-makesIT commented Jul 25, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

sudwebdesign commented Jun 4, 2025 •

edited

Loading

sudwebdesign commented Jun 5, 2025 •

edited

Loading