Commit Graph

9239 Commits

Author SHA1 Message Date
ldestailleur
1c37761545 Debug v22 2025-07-26 13:13:31 +02:00
ldestailleur
935f947c18 Debug v22 2025-07-26 12:43:55 +02:00
ldestailleur
a7e5510245 Debug v22 2025-07-26 12:17:01 +02:00
ldestailleur
e8de1b62d1 Debug v22 2025-07-26 11:38:27 +02:00
ldestailleur
abbb25d6fe Debug v22 - Fix amount before discount in multicurrency mode 2025-07-25 16:47:18 +02:00
ldestailleur
a27ff8b053 Debug v22 2025-07-25 15:41:57 +02:00
ldestailleur
5248d0bba5 Fix default value of currency update 2025-07-25 03:22:53 +02:00
sonikf
92ce005080 fix translation for non latin languages (#34744)
* fix translation for non latin languages

* fix translation for non latin languages

* fix translation for non latin languages
2025-07-15 11:39:42 +02:00
Lucas Marcouiller
659f758d61 Fix table webhook history (#34737)
* Fix name of option for supplier

* Update functions.lib.php (#34718)

Add __MYCOMPANY_URL__ & __MYCOMPANY_PHONEMOBILE__ in getCommonSubstitutionArray

* Fix bad value  fourn paiement process (#34722)

* Fix bad value  fourn paiement process

* best fix

* fix takepos console error (#34709)

* fix console error

* exit early

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* Fix CI

* Clean code

* Fix table wenhook history

---------

Co-authored-by: ldestailleur <eldy@destailleur.fr>
Co-authored-by: Deefaze <6393617+Deefaze@users.noreply.github.com>
Co-authored-by: Francis Appels <francis.appels@yahoo.com>
2025-07-15 06:13:10 +02:00
Laurent Destailleur
00ff8d490a Debug v22 2025-06-30 15:14:09 +02:00
ldestailleur
358daa3ca0 Clean doc and code 2025-06-27 13:39:50 +02:00
Ferran Marcet
267c77ec22 New: Add note private on order export (#34642)
* New: Mail template for contacts

* New: Mail template for contacts

* New: Mail template for contacts

* New: Andorra's Accounting Plan

* New: Add function to make substitutions on Takepos receipt

* New: Add function to make substitutions on Takepos receipt

* New: Add note private on order export

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-27 00:26:42 +02:00
ldestailleur
38aa9cbacc Debug v22 2025-06-25 13:09:56 +02:00
ldestailleur
115afbbb76 Add critical info into unalterable log to help debug
FIX: Must be able to filter on signature.
2025-06-23 14:04:36 +02:00
ldestailleur
14a196b5c6 Debug v22 2025-06-23 00:08:14 +02:00
ldestailleur
040393abe5 Debug v22 2025-06-22 22:50:56 +02:00
ldestailleur
17a0ec87fe Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-06-22 17:25:29 +02:00
ldestailleur
743ca4bb03 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-06-22 17:19:41 +02:00
ldestailleur
5042c0959e Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-06-22 17:16:51 +02:00
Charlène Benke
bec0e9983f create invoice and order categorie table when we enable it (#34450)
* create invoice and order categorie table if not enabled

* Update modFacture.class.php

* Update modCommande.class.php

* Update modCategorie.class.php

* Update modCommande.class.php

* Update modFacture.class.php

* Update modCategorie.class.php

* Update modCommande.class.php

* Update modFacture.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-22 12:13:16 +02:00
Charlène Benke
10c9c41526 COMPANY_ELEPHANT_DATE_START_ENABLE Checkbox not save (#34516)
* COMPANY_ELEPHANT_DATE_START_ENABLE Checkbox not save

* Update mod_codeclient_elephant.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-21 16:50:45 +02:00
ldestailleur
aa56fb6491 Doc 2025-06-21 14:54:53 +02:00
Marc
52c827c2bb FIX #34541 (#34597) 2025-06-21 14:35:20 +02:00
ldestailleur
7ed2cddd4b Fix CI 2025-06-20 16:16:04 +02:00
ldestailleur
446efdc432 Clean dead code 2025-06-20 14:00:29 +02:00
ldestailleur
2a85b73fa2 Add MULTICURRENCY_SHOW_ALSO_MAIN_CURRENCY_ON_PDF for legal requirement
that need both currencies on PDF
2025-06-20 14:00:14 +02:00
ldestailleur
739cbe063b Fix missing 2025-06-19 16:47:12 +02:00
ldestailleur
2cfa986ad5 Doc 2025-06-19 15:58:23 +02:00
ldestailleur
ec8a87a3cb Doc 2025-06-19 15:49:26 +02:00
HENRY Florian
68a33a8759 fix: SubTotal module version for 22 is still experimental (even if actually it's working like a charm on the customer scope) (#34573) 2025-06-19 10:40:06 +02:00
Maxime Kohlhaas
41878921a7 Fix : better display of titles and subtotals on pdf cyan (#34525)
* Fix : better display of titles and subtotals on pdf cyan

* Fix : better display of titles and subtotals on pdf eratosthene and sponge
2025-06-15 02:55:48 +02:00
HENRY Florian
a708780477 fix: phpwarning Vinci (OF) PDF (#34466) 2025-06-13 23:48:28 +02:00
ldestailleur
24efd80bbc Debug v22 2025-06-07 14:31:53 +02:00
ldestailleur
11f9f032d9 Debug v22 2025-06-07 14:15:56 +02:00
Laurent Destailleur
408b42d712 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-04 22:47:41 +02:00
ldestailleur
23e26d51a9 Debug v22 2025-06-04 19:16:26 +02:00
ldestailleur
d713406667 Debug v22 2025-06-04 18:47:10 +02:00
Quentin-Seekness
9396d8a6eb Correct Icon on supplier order export's title (#34332)
Just using the right icon for this export
2025-06-04 13:39:38 +02:00
sonikf
89c1a741a7 backport #b0b2442 to v. 21 also apply fix for invoices (#34325)
* backport #b0b2442 to v. 21

* backport #b0b2442 to v. 21

* fix shipment contact same as in #b0b2442

* fix shipment contact same as in #b0b2442

* fix shipment contact same as in #b0b2442
2025-06-04 11:15:44 +02:00
Frédéric FRANCE
ea6bafde73 clean code (#34196)
* clean code

* fix

* fix

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-27 21:11:10 +02:00
ThomasNgr-OpenDSI
4c3d99612a Fix : require_once functions2.lib.php in mod_bookkeeping_argon.php (#34224) 2025-05-22 20:39:42 +02:00
ldestailleur
1842dd616e Debug refresh of website templates 2025-05-16 11:36:29 +02:00
Jyhere
a3323d5ca9 NEW : accountancy pdf exports (#34056)
* NEW: journal, ledger, balance pdf exports in accountancy lists

* NEW: add coords system to avoid getting vertical lines on title lines
-FIX: totals line bugs

* FIX:  removed, missing translation added

* FIX: precommit errors in accountancy pdfs

* FIX : PHPDoc inverted parameterss

* FIX: wrong string operator

* FIX: yet another cs error

* FIX: phpstan errors

* FIX: phpstan errors

* FIX: multidimensionnalarray phpdoc definition

* FIX: array phpstan error, I hope

* FIX: array def for phpstan

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-14 09:40:32 +02:00
ldestailleur
ae94c71a10 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-05-10 13:25:31 +02:00
ldestailleur
445f089556 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-05-10 12:53:37 +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
Laurent Destailleur
016cc298be Fix CI 2025-05-10 00:54:25 +02:00
Frédéric FRANCE
223f0c2763 fix translation (#34086) 2025-05-09 23:46:07 +02:00
ldestailleur
3bf7cc01fd Code comment 2025-05-09 15:39:07 +02:00
ldestailleur
f0eaae6a1d Debug v22 2025-05-05 17:09:24 +02:00