Commit Graph

15102 Commits

Author SHA1 Message Date
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
Charlène Benke
d91030892d php warning, feature not yet implemented (#34042)
moved on another tabs
2025-05-04 10:43:26 +02:00
Charlène Benke
46c41e437a fields error, thirdparty vs socid (#34043) 2025-05-02 22:43:23 +02:00
Frédéric FRANCE
57aa02f0f4 Fix missing translation (#34014)
* fix missing translation

* fix missing translation

* fix missing translation

* fix missing translation

* fix missing translation

* fix missing translation

* fix missing translation

* fix missing translation

* fix missing translation
2025-04-29 10:53:52 +02:00
ldestailleur
2f893b34f0 Add info of external payment on bank direct debit tab. 2025-04-26 03:35:59 +02:00
ldestailleur
764ce30e19 CSS 2025-04-25 15:52:25 +02:00
ldestailleur
e85db964ca Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-25 14:49:47 +02:00
ldestailleur
f1ff22a516 FIX creating acredit note from the remain to pay was always 0 2025-04-25 14:35:18 +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
ThomasNgr-OpenDSI
92feaeafa7 GIFF : standardize accountancy lists (second part) (#33787)
* Use $arrayfields and add ability to hide columns on accountancy lists

* Add column hooks in accountancy lists

* fix travis
2025-04-25 01:50:17 +02:00
ldestailleur
a9555e55fb Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-24 17:01:46 +02:00
ldestailleur
ed66c5a453 Fix typo 2025-04-24 17:00:25 +02:00
ldestailleur
7df7e73775 Fix css 2025-04-24 16:57:49 +02:00
ldestailleur
6316a8a5f6 Fix css 2025-04-24 16:57:36 +02:00
ldestailleur
83e03fa39b Fix css 2025-04-24 13:44:42 +02:00
ldestailleur
985e7a80f1 css 2025-04-24 12:49:36 +02:00
Laurent Destailleur
a4c97c0651 Fix CI 2025-04-23 23:27:45 +02:00
Laurent Destailleur
5e064f32e2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-04-22 03:57:47 +02:00
Laurent Destailleur
23a4933326 More info for tracking payment bug 2025-04-21 22:59:25 +02:00
ldestailleur
e013e1c1b4 Fix CI 2025-04-21 11:56:36 +02:00
ldestailleur
48bb878df5 Debug v22 2025-04-20 18:35:42 +02:00
ldestailleur
6ed5e7e175 Try some fixes 2025-04-20 13:36:11 +02:00
ldestailleur
2456072a84 Clean code 2025-04-18 15:21:07 +02:00
Frédéric FRANCE
5d777bbf59 clean code (#33882)
* clean code

* clean code

* clean code

* Update mailtemplate.php
2025-04-18 13:38:03 +02:00
lvessiller-opendsi
2179900d34 FIX cannot create a reject line on prelevement line (#33888) 2025-04-18 13:36:53 +02:00
Florian Mortgat
2250e26c3c FIX critical regression: $invoice->array_options() emptied by call to $invoice->fetch_lines() causing data loss (#33891) 2025-04-17 13:27:24 +02:00
lvessiller-opendsi
c85cc3061b NEW shipment kits with dispatcher v2 (#33750)
* NEW shipment kits with dispatcher v2

* Show stock of virtual product on select warehouse when dispatching a shipment

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-16 21:11:58 +02:00
Frédéric FRANCE
de763b4b43 clean code of order (#33880)
* clean code of order

* clean code of order

* clean code of order

* clean code of order
2025-04-16 21:09:45 +02:00
Frédéric FRANCE
6164a9c9cc fix CI (#33866)
* fix CI

* Update facture.class.php
2025-04-16 11:10:38 +02:00
lvessiller-opendsi
4963639d67 NEW input reason for customer invoice (#33599)
* NEW input reason for customer invoice

* Fix CI error

* Fix format fk_input_reason in array of fileds

* Add invoices in translate key of source dictionary
2025-04-16 01:02:26 +02:00
Laurent Destailleur
b38779ec99 Fix CI 2025-04-15 23:35:54 +02:00
Laurent Destailleur
3085c0762f Fix remove print 2025-04-15 02:51:00 +02:00
Laurent Destailleur
b27c3b692e FIX #33843 More complete fix. 2025-04-15 02:42:48 +02:00