Commit Graph

15637 Commits

Author SHA1 Message Date
ldestailleur
175b79db3f Fix CI 2025-06-11 18:07:33 +02:00
ldestailleur
7ad71279a7 Fix CI 2025-06-11 17:33:07 +02:00
ldestailleur
9e26f5a98e Debug v22 2025-06-11 12:45:15 +02:00
ldestailleur
5df59e1e3f Debug v22 2025-06-10 17:29:16 +02:00
Laurent Destailleur
221c27c091 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-09 18:15:59 +02:00
Laurent Destailleur
326c75dc51 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-06-09 17:58:54 +02:00
Laurent Destailleur
473ddbc53a Merge remote-tracking branch 'origin/19.0' into 20.0 2025-06-09 17:42:02 +02:00
Laurent Destailleur
c444fe3c1f Merge remote-tracking branch 'origin/18.0' into 19.0 2025-06-09 17:25:03 +02:00
Marc de Lima Lucio
f137074a98 FIX: cash control report: php warning (#34358) 2025-06-05 18:30:06 +02:00
ldestailleur
02b9dfed38 Fix CI 2025-06-04 16:06:11 +02:00
Charlène Benke
9577731b3a qual/fix : rewriting query generating error in certains case (#34305)
* Update facturestats.class.php

* Update expeditionstats.class.php

* Update fichinterstats.class.php

* Update expeditionstats.class.php

* Update facturestats.class.php
2025-06-04 14:36:53 +02:00
HENRY Florian
8853bfd51a fix: ref_client GETPOST facture/card.php should be alpha (#34311)
* fix: ref_client GETPOST facture/card.php should be alpha

* Update card.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-04 14:09:03 +02:00
Mohamed DAOUD
f190a5925e FIX #34047 __AMOUNT_REMAIN_FORMATTED__ variable shows full invoice amount (#34314)
* fix AMOUNT_REMAIN_FORMATTED

* Update card.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-04 14:06:45 +02:00
ldestailleur
5ecda910af Fix CI 2025-06-04 10:53:04 +02:00
ldestailleur
d7976f28ba Debug v22 2025-06-02 15:42:44 +02:00
ldestailleur
36b00c5951 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-02 14:59:18 +02:00
ldestailleur
14c2db425d Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-06-02 14:53:12 +02:00
ldestailleur
ca11136092 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-06-02 14:37:54 +02:00
ldestailleur
11d357b79e Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-06-02 14:31:05 +02:00
Laurent Destailleur
c35965030c Debug v22 2025-05-28 01:16:02 +02:00
John BOTELLA
50ff9b0d11 NEW : Toggle Display of customer Invoices and Credit Notes on Payment Page (#34190)
* NEW : Toggle Display of customer Invoices and Credit Notes on Payment Page

* NEW : Toggle Display of customer Invoices and Credit Notes on Payment Page
2025-05-27 22:29:53 +02:00
splohmer
6c1616c98d Handling of selected customer invoice to create a credit note if not in the list restricted by secret parameter (#34291)
* fix for LIST_OF_QUALIFIED_INVOCIES_LIMIT_DEFINED: handling if selected invoice is not in restricted list

* Update facture.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-27 21:04:13 +02:00
Francis Appels
cd72d947b1 FIX: add payment to bank (#34263) 2025-05-27 19:28:05 +02:00
HENRY Florian
4e95aab6b5 fix: On Clone Invoice, ref_customer is not clean (#34296) 2025-05-27 15:58:28 +02:00
ldestailleur
094a05b9a5 Debug v22 2025-05-27 14:48:25 +02:00
HENRY Florian
51e4ce05c9 FIX: mandatory extrafelds on lines are not checked (#34228)
* FIX: mandatory extrafelds on lines are not checked

* FIX: mandatory extrafelds on lines are not checked
2025-05-22 17:40:41 +02:00
Laurent Destailleur
0f4bf91fcd Fix default value of dol_move 2025-05-19 09:45:31 +02:00
ldestailleur
5493a8e949 Fix CI 2025-05-16 10:21:19 +02:00
ldestailleur
aab2587eef Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-15 10:33:47 +02:00
ldestailleur
d9a2d5262d Fix CI 2025-05-15 10:23:09 +02:00
Laurent Destailleur
2f959048ae Rename var 2025-05-15 01:07:34 +02:00
Laurent Destailleur
f2ed714cad NEW: Can edit the module_source and pos_source field. 2025-05-15 00:47:12 +02:00
Laurent Destailleur
d35e62959d Fix responsive 2025-05-14 22:09:36 +02:00
ldestailleur
8e334cd6a4 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-13 13:34:49 +02:00
ldestailleur
20f7898bec Fix test of minimum price 2025-05-13 10:49:36 +02:00
Lenin Rivas
ad10c2581d FIX price_min_ttc (#34120)
* FIX price_min_ttc

* FIX price_min_ttc

* FIX price_min_ttc

* FIX price_min_ttc
2025-05-13 10:36:16 +02:00
Alexandre SPANGARO
b116a7ab08 FIX Various payment - List - Can't see payment with subledger account (#34101)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-12 19:46:05 +02:00
ldestailleur
a831929184 Look and feel v22 2025-05-10 14:06:51 +02:00
ldestailleur
a674676ded Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-10 13:33:53 +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
e4305ad221 Fix CI 2025-05-09 23:54:44 +02:00
ldestailleur
912fe653b9 Look and feel v21 2025-05-07 13:57:40 +02:00
ldestailleur
e536d2e550 Fix missing property in tooltip 2025-05-07 13:11:09 +02:00
Frédéric FRANCE
f48d3d6e41 fix unexisting picto (#34076)
* fix unexisting picto

* fix unexisting picto
2025-05-07 11:18:37 +02:00
atm-irvine
dea5209fef fix: removed useless redefined var in cabyprodserv (#34068) 2025-05-07 03:29:54 +02:00
ldestailleur
370365f083 Clean code 2025-05-05 21:19:28 +02:00
Frédéric FRANCE
76f5a8ac90 fix translation account (#34060)
* fix translation account

* fix translation account
2025-05-05 20:13:03 +02:00
ldestailleur
5760ecc38b Complementary message in actionmsgmore should work on all cases. 2025-05-05 04:07:23 +02:00
Charlène Benke
704910b4b3 NEW Add internal contact of proposal, order and invoice on api call (#34009)
* add internal contact of elements

* Update api_orders.class.php

* Update api_invoices.class.php

* Update api_proposals.class.php

* Update api_orders.class.php

* Fix CI

* Update api_orders.class.php

* Update api_invoices.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-05-05 02:07:24 +02:00
Frédéric FRANCE
b95b074922 fix missing translations (#34025)
* fix missing translations

* fix missing translations

* fix missing translations

* fix missing translations
2025-05-04 11:25:18 +02:00