225 Commits

Author SHA1 Message Date
Laurent Destailleur
0ca6f7366b Clean code 2026-02-04 16:21:51 +01:00
AWeerWolf
09a840b6c3 #36843 Update card-rec.php (#37062)
The item desc is already added into the line when selecting the Item. No Need to concat it again when clicking the "add" button.
2026-02-04 16:21:11 +01:00
Frédéric FRANCE
73ec501b20 fix french doc (#36897)
* fix french doc

* fix french doc

* fix french doc

* fix french doc

* fix french doc

* fix french doc

* fix french doc

* fix french doc

* fix french doc

* fix french doc

* fix french doc

* fix

* fix

* fix

* fix

* fix french doc

* fix french doc

* fix french doc

* fix french doc

* fix french doc

* fix french doc

* fix french doc

* fix french doc

* Update html.form.class.php

* Update html.form.class.php

* Update index.php

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* Update modules_facture.php

* Update phpstan.neon.dist

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2026-01-30 14:22:56 +01:00
Laurent Destailleur
0b7dfad2cf Code comment 2026-01-26 15:21:50 +01:00
Laurent Destailleur
e350886c15 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-12-04 20:38:22 +01:00
Florian HENRY
a38ffa02ac fix: subtotal feature button availablity according setup 2025-12-04 10:18:01 +01:00
Frédéric FRANCE
e343b4ab1f clean code (#36166)
* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code
2025-11-08 14:01:19 +01:00
Laurent Destailleur
dfbf173b17 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-11-07 19:25:42 +01:00
Regis Houssin
fa10fc0f94 FIX avoid NULL value (#36126) 2025-11-06 13:15:03 +01:00
Laurent Destailleur
3aa920be4a Fix critical regression when casting vat rate 2025-10-19 18:40:26 +02:00
Guido Schratzer
ea2543e9e4 FIX #35766: Update buying price INT Float (#35769)
* FIX #35766: Update buying price INT Float
loose Decimals

.

* Fix: keep fk_product_fournisseur_price as int; treat buying price as float (no truncation) [#35766]

* Updated per feedback: keep fk_product_fournisseur_price as ?int (rowid) and  as float.
Adjusted FactureRec::updateline PHPDoc to ?int  and float|''  (model still normalizes via price2num).
Tested on a recurring line: decimals preserved, FK stored as int, CI green. Minor adjustments before v22 backport

* Delete .hooktest

* Delete dev/tools/pre-commit/README.md

* Delete test/phpunit/phpunit.xml

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-10-18 11:55:58 +02:00
Guido Schratzer
78aefbaa2e FIX #35766: Update buying price INT Float (#35769)
* FIX #35766: Update buying price INT Float
loose Decimals

.

* Fix: keep fk_product_fournisseur_price as int; treat buying price as float (no truncation) [#35766]

* Updated per feedback: keep fk_product_fournisseur_price as ?int (rowid) and  as float.
Adjusted FactureRec::updateline PHPDoc to ?int  and float|''  (model still normalizes via price2num).
Tested on a recurring line: decimals preserved, FK stored as int, CI green. Minor adjustments before v22 backport

* Delete .hooktest

* Delete dev/tools/pre-commit/README.md

* Delete test/phpunit/phpunit.xml

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-10-18 11:54:09 +02:00
Frédéric FRANCE
29b3880e6c add dolBuildUrl (#35664)
* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

* clean baseline

* add dolBuildUrl

* add dolBuildUrl

* add dolBuildUrl

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-10-17 02:31:07 +02:00
ldestailleur
15f34dbbb0 QUAL: Removed deprecated properties user_valid, user->creation,
user_modification replaced with user_ceation_id, user_validation_id and
user_modification_id.
2025-09-21 14:58:38 +02:00
ldestailleur
6ed764bedf Clean code 2025-09-18 11:40:56 +02:00
ldestailleur
3af041a5b2 Standardize code 2025-08-07 13:42:11 +02:00
Yannis Hoareau
1301cd36a1 NEW Subtotal module (#33502)
* Changes to follow mvc logic

* Reworked admin page and form to add lines

* Reworked adding line logic

* Adding options when editing subtotal lines

* Fix translations

* Fixed errors/displays and started pdf

* Color for subtotals pdf lines

* FIX display of subtotal totht

* Added pdf azur for propal

* Fix duplicate translation

* Added subtotal support for facture pdf

* Added subtotal support for commande pdf

* Improve UI/translations

* Restored old pdf

* Info to warn user for unsupported pdf

* Added title lines VAT rate and discount support

This is meant for future feature wich is block mass changing vat rate
and discount percentage

* Working on block apply vat and discount

* Added buttons for block actions

* Handle editing vat and discount for subtotal lines

* Editing vat and discount for subtotal lines bloc working

* Added possibility to move by block

* Updated adding and updating a subtotal line

* Improved vat and discount block update

* Improvement for block vat/discount and line edition

Editing a title line edits the corresponding subtotal line

* Improvement for moving by block

* Bad tile or st line placement managing

* Improved bad title or st line placement managing

* Adding subtotal line improved

Adding a subtotal line adds it right under its corresponding title

* Improved deleting subtotal line

Added possibility to choose if you want to delete the corresponding
subtotal line when deleting a title line

* Preventing too high level titles to be created

* Create and update line errors managing

* Improved bad title or st line placement managing

* Improved st line creation

* improve headers

* fix bad block placement managing

* fix adding st line not working if duplicates titles

* fix translations

* Fix block update

* FIX special chars bug

If special char like " ' " was used in title it could be converted to
special char entity.

* Prepare for pdf options

Pdf options like page break befor title should be shown as a picto if activated on a subtotal line on a document

* Added option managing

* Improved subtotal options and PDF integration

* Code refactor

* Action name/Error managment/PDF refreshing

When adding or updating a subtotal line

* Reformat

* Reworked subtotal options database managment

* Changed access to special code

* Remove unecessary call to php trait

* Changed definition of subtotals special code constant

* Reworked align on PDF

* Removed unecessary function and improved error managment

* Typo fix and removed treated todos

* Post typo changed for to better match subtotals names

* Disabled edit if status is not draft

* Changed way subtotals options are stored

* Added view managing when creating a document form an other

* Improved creating document from an other

Can check subtotals lines with table head checkbox and removed highlight
class for better UI.

* Make include of subtotals tpl more clear

* Manage centered or justified case

If user chose to center or justify, we don't change nothing

* Improved pdf

* Removed unecessary code block

* optimisation

* Code sniffer fix

* Code sniffer fix

* Code sniffer fix

* Code sniffer fix

* Code sniffer fix and added missing translation

* Fix php code sniffer

* Reload page when setup saved on subtotals admin page

* Fix php code sniffer

* pjan fix

* phan fix

* phan fix

* phan fix

* phan fix

* phan fix

* phan fix

* phan fix

* phan fix

* phan fix

* phan fix

* phan fix

* php warning fix

* php warning fix

* php phan fix

* php phan fix

* php phan fix

* Fix bug admin page not loading because of const not defined

* php phan fix

* php phan fix

* FIX subtotals admin page display

* php phan fix

* FIX php phan

* Fix bugs and langs

* Fix bug pdf align

* Replace include by require

* Add headers to avoid refreshing and adding unwanted lines

* Fix phan

* Add GETPOST check for security

* Fix phan

* Fix phan

* Fix phan

* Subtotal option when creating a document from another

* Fix phan

* Add field subtotal options for subtotal lines

* Fix phan

* Fix phan

* Fix phan

* Update to follow mvc

* Fix php phan

* Fix php phan

* Fix phpstan/phan

* Fix phpstan

* Fix phpstan

* Fix phpstan

* Fix phpstan

* Fix phpstan

* Update to switch to extraparams

* Update to switch to extraparams

* Retrieve extraparams from db to objectline

* Modified last things to switch to extraparams

* Cleaning unnecessary code lines

* Fix php-stan

* Section subtotal in extraparams to differentiate if needed for further devs

* Fix phan

* Keep extraparams when creating from another object

* Change default value to false when creating a subtotal line

* Fix clone would not keep extraparams in new object

* Fix dark subtotal line background color

Fix when a subtotal background color is too dark and edit pencil or
delete trash could not be seen

* Fix typo

* Fix typo

* Added subtotals for facturerec

* Fix precommit

* Added extraparams when creating rec from fac and other way

* Fix phan

* Fix objectline null

* Desactivating block vat / discount update for facturerec

* reformating code

* Added expeditions for subtotal

* Save extraparams for shipping lines

* Display of subtotals lines in shipments

* Display when creating facture from shipments

* Improve display of lines and invoice creation from shipments

* Fix error if missing line rang

* Deleted duplicate

* Added deletion of subtotal line in shipping documents

* Not including subtotal lines if there is no product line in between

* Update get subtotal lines in shipment docs to disable

* Delete possibility to edit subtotal lines in shipments

* Handle pdf for shipment

* Handle conf stock or shipment supporting services

* Fix precommit

* Fix duplicate name creating bug

* Fix bug where id could be changed by the line id and would create bug

* Deleted subtotal lines when STOCK_SUPPORTS_SERVICES is enabled and block would only have service lines

* Disable shipments in admin modules

Shimpements subtotals lines are only created from commands

* Fixing phan and stan

* Deleted unused template and phan fix

* Fix phan

* Fix phan

* Fix phan

* FIX: phan

* Fix template bug

If document was not in subtotal scope and would use a template used by
subtotal it would create an error.

* Fix php-stan

* Fix bad display when modules and confs were activated

* Fix php codesniffer

* Excluding subtotal lines when mass updating

* Fix shipments service lines exluded + showing subtotal line with specific configs

* Fix line display with situation invoices + bug block line update

* Added ODT managment

This works with invoices but has not been tested with other documents

* Fix bug when editing VAT/discount by block

* Fix error raised when subtotal line added

Subtotal line had no fk_product and raised the error but we want this
line to have no fk product

* Fix precommit

* Added ODT template for documents that uses subtotals

This template can be usefull to understand how to create an odt template
using subtotals module

* Fix phan

* Fix phan

* fix: buttons showing in bad document status

* clean: unwanted commited files

* add: table examples to use with subtotals on ODT templates

* fix: Unwanted print of value when creating a document from another

* feat: renaming for better understanding

* feat: Improved templates for documents related to subtotals

---------

Co-authored-by: Marc de Lima Lucio <68746600+marc-dll@users.noreply.github.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-10 02:44:31 +02:00
ldestailleur
d9b944d601 Can edit/vieuw the currency on recurring invoice. 2025-04-25 04:07:58 +02:00
ldestailleur
2aa17f9c3f Fix update of foregin rate on recurring invoices 2025-04-25 03:39:04 +02:00
ldestailleur
985e7a80f1 css 2025-04-24 12:49:36 +02:00
ldestailleur
91e0b52630 Fix CI 2025-04-07 16:38:37 +02:00
ldestailleur
6af8298736 Fix related to #33449 2025-04-07 15:46:10 +02:00
ldestailleur
7df240c25b Fix CI 2025-04-07 12:28:05 +02:00
ldestailleur
c7ec63b702 Look and feel v22 2025-04-05 12:55:04 +02:00
ldestailleur
ae59c409f6 Modulebuilderization 2025-03-26 00:56:24 +01:00
ldestailleur
19e63684c7 Look and feel v22: Smaller label with tooltip for customs code. 2025-03-19 11:45:15 +01:00
atm-irvine
d38a985ac3 feat(invoice-rec): new rule_for_lines_dates field - Impl (#33252)
* feat(invoice-rec): new rule_for_lines_dates field - Impl

* fix(html-form-class): added type in phpdoc

* chore: renamed $object to $sourceInvoice for create action

* fix(card-rec): error naming variable $sourceInvoice

* fix phan

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-13 10:37:58 +01:00
ldestailleur
ca9763afc1 Fix type int 2025-03-06 02:15:18 +01:00
MDW
56e354e112 Qual: Fix phan notices (facture/2) 2025-03-05 21:17:58 +01:00
MDW
941c80d108 Qual: Fix phan notices (facture/1) 2025-03-05 21:17:56 +01:00
ldestailleur
34ecda6994 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-25 02:47:26 +01:00
ldestailleur
030d83145f Merge 2025-02-25 02:44:30 +01:00
Frédéric FRANCE
d917d4896e clean code 2025-02-21 09:45:20 +01:00
Laurent Destailleur (aka Eldy)
13ac8170c2 Debug v21 2025-02-06 16:12:04 +01:00
Laurent Destailleur (aka Eldy)
352d156dd7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2024-12-08 17:07:14 +01:00
Laurent Destailleur (aka Eldy)
774a48fa29 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-12-08 16:53:21 +01:00
Laurent Destailleur (aka Eldy)
7beb874f93 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-12-08 16:47:36 +01:00
Laurent Destailleur (aka Eldy)
28213b3129 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-12-08 16:44:08 +01:00
atm-florian
15c19b99c9 FIX 17.0: warnings due to uninitialized variables + delete code that doesn't apply to recurring invoices (AFAIK, there is no recurring credit note feature) 2024-12-05 12:15:20 +01:00
atm-florian
c418a6ff57 FIX 17.0 - missing error handling for FactureRec::fetch in card-rec.php 2024-12-05 12:14:13 +01:00
atm-lena
10e18da5d7 Develop new facture rec field societe rib management (#31698)
* Add field "fk_societe_rib" in llx_facture_rec

* Add field fk_societe_rib FactureRec

* Management of new field "Bank Account Customer" in facture rec

* Empty Value Management

* Change method of hide/show field

* Preselect RIB

* Rename function

* Edit structure formiban

* fix merge conflict

* Clean code

* clean code

* change translations

* default rib preselected in invoice rec create

* fix "=="

* Update card-rec.php

---------

Co-authored-by: atm-lena <lena.papazian@atm-consulting.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-11-11 17:53:35 +01:00
Frédéric FRANCE
661059ca9a fix phpstan (#31763)
* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-11-11 14:33:53 +01:00
Frédéric FRANCE
1adc883b56 add baseline exclude for phpstan (#31632)
* add baseline exclude for phpstan

* update

* update

* update

* update

* update

* merge

* restore one filter

* delete old errors

* fix

* fix

* fix

* $moreforfilter can t be empty

* fix

* enable check

* refresh baseline

* add phpdoc

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-11-04 23:53:20 +01:00
Laurent Destailleur
f5e4ab0220 Rewrite code to prepare refactoring 2024-10-26 15:24:54 +02:00
Frédéric FRANCE
331c5e9f4b fix phpstan (#31547)
* fix phpstan

* fix phpstan

* fix phpstan
2024-10-25 13:24:10 +02:00
lamrani abdelwadoud
edb1d2c1a3 New tab Note for facture_rec (#31404)
* Add tab Note for facture_rec

* fix error

* add tooltip for note

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-10-24 19:52:29 +02:00
MDW
d7b2f95baf Qual: Fix phan notices (#31372)
* fix llx_webhook_target-webhook.sql

* Fix commande/list & facture-rec.class

* Fix bonprelevement

* Qual: Fix prelevement/create notices

* Qual: fix quadridetail notices & update baseline

* Qual: Fix CommonDocGenerator notices

* Qual: Fix commoninvoice and commonobjectline notices (phan/phpstan)

---------

Co-authored-by: Frédéric FRANCE <frederic34@users.noreply.github.com>
2024-10-13 16:45:42 +02:00
Laurent Destailleur
c0a63855f3 QUAL: Edition of currency is shared in a common tpl file 2024-09-26 12:22:03 +02:00
Frédéric FRANCE
d5fe4f998a fix phpstan (#30989)
* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan
2024-09-18 02:45:54 +02:00
Frédéric FRANCE
eb04c5c427 fix phpstan (#30860)
* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan
2024-09-06 13:44:29 +02:00