2
0
forked from Wavyzz/dolibarr
Commit Graph

431 Commits

Author SHA1 Message Date
ldestailleur
d9a2d5262d Fix CI 2025-05-15 10:23:09 +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
0b8324fc89 FIX #33784 2025-04-12 16:58:50 +02:00
Frédéric FRANCE
1eb27d5bd5 clean code (#33805) 2025-04-09 23:05:17 +02:00
Vaadasch
e469131327 Add hook before each generated invoice by createRecurringInvoices (#33780)
* Add hook before each generated invoice by createRecurringInvoices

* Update new hook to respect parameters constraints

* Add global action

* Move "global $action" at the beginning of the function

* Update facture-rec.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
Co-authored-by: Arnaud Serrut <arnaud.serrut@gmail.com>
2025-04-09 16:00:17 +02:00
ldestailleur
be21aa7c6d FIX CI 2025-04-07 17:00:18 +02:00
ldestailleur
6af8298736 Fix related to #33449 2025-04-07 15:46:10 +02: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
Laurent Destailleur
aad4a2bc7e Merge branch 'develop' into retrieving-extraparams-for-lines 2025-03-06 04:57:15 +01:00
MDW
56e354e112 Qual: Fix phan notices (facture/2) 2025-03-05 21:17:58 +01:00
yannis
3519174adf Added retrieving extraparams for some object lines 2025-03-03 16:57:32 +01:00
Laurent Destailleur (aka Eldy)
732f97d73c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-02-05 00:40:06 +01:00
MDW
4af154c6d5 Qual: Fix phan notices
# Qual: Fix phan notices

Fix phan notices mostly in relation with supplier invoices,
Fix phan notices in relation with formquestion (phpdoc update, casts).
2025-02-03 16:05:57 +01:00
MDW
7150af31dc Fix Phan notices introduced since 30/12/2024 2025-01-27 13:24:29 +01:00
Frédéric FRANCE
e470d98833 Merge branch 'develop' into fix_phpstan_2024_end_of_year 2025-01-02 09:17:21 +01:00
Frédéric France
ee9a5291cd add fix phpstan 2024-12-31 16:25:57 +01:00
MDW
afc9b928af Match LibStatut function signature 2024-12-31 15:26:23 +01:00
Laurent Destailleur
2b41140c77 Fix signature 2024-12-30 22:23:37 +01:00
Frédéric France
0d94d67cc2 fix phpstan 2024-12-25 10:19:53 +01:00
Irvine Fleith
2f93bac9bf FIX : fk_societe_rib 2024-12-17 15:52:39 +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
Irvine Fleith
3aad5fd283 Added new error message for CRON createRecurringInvoice 2024-12-05 09:02:51 +01:00
MDW
ec2a1928ba Qual: Update fields phpdoc to include fields that are defined/used in some cases
# Qual: Update fields phpdoc to include fields that are defined/used in some cases

comment, copytoclipboard, autofocusoncreated are documented and used in some cases for the
$fields definition
2024-12-05 02:36:50 +01:00
HENRY Florian
1f386fb808 fix #32060 (#32061)
* fix #32060

* fix #32060
2024-11-22 13:21:18 +01:00
Laurent Destailleur
6e9bbe42bb Add code to make easier to test PDF generation with n lines of product 2024-11-21 19:40:52 +01:00
Frédéric FRANCE
943d10c60a fix phpstan and CI (#31969)
* fix phpstan

* fix errors and refresh phpstan baseline

* fix errors and refresh phpstan baseline

* fix errors and refresh phpstan baseline

* fix errors and refresh phpstan baseline

* fix errors and refresh phpstan baseline

* fix errors and refresh phpstan baseline

* fix errors and refresh phpstan baseline
2024-11-18 15:10:29 +01:00
Laurent Destailleur
4b384b3753 Doc 2024-11-12 13:28:50 +01:00
Laurent Destailleur
405444879a Debug v21 2024-11-12 13:25:46 +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
MDW
e7539f2e19 Qual: Fix notices in .lib.php files (#31672)
* Qual: Fix notices in .lib.php files

* Update wrapper.php

* Update availabilities_card.php

* Update index.php

* Update document.controller.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-11-04 12:32:13 +01:00
atm-irvine
fd094638dd NEW : Suspend facture rec when nb gen max is reached (#31623) 2024-10-29 20:41:01 +01:00
Laurent Destailleur
c70973c0c8 Merge v20 2024-10-19 14:44:55 +02:00
Laurent Destailleur
17c50368c1 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-10-19 14:32:08 +02:00
Laurent Destailleur
402570e1c5 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-10-19 14:00:10 +02:00
Laurent Destailleur
a0b791a4a6 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-10-19 13:59:35 +02:00
atm-irvine
352bdaf9c4 FIX : Extrafield following between rec invoice and classic invoice (#31445) 2024-10-19 01:33:31 +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
fa3c2fc870 Close #31219 - Better fix 2024-10-03 16:47:38 +02:00
William Mead
15633f50ca Qual isolate FactureLigne class to separate file (#30870)
* Moved invoice line class to separate file. Removed unnecessary requires.

* Fixed requires

* Fixed require
2024-09-06 13:49:44 +02:00
MDW
ca414de526 Qual: Fix $fields related notices with Phan (#30704)
* Qual: Typing hints/ignore directives for phan notices

* Update field typing
2024-08-21 13:23:35 +02:00
MDW
54880f92cd Qual: Fix PhanTypeMismatchProperty and some other phan notices (#30542)
* Qual: Fix PhanTypeMismatchProperty and some other phan notices

* Qual: Phan fixes for BOM

* Phan - fix fields

* fixup! Qual: Phan fixes for BOM

* Fix phpstan double array keys for syslog

* Fix $fields phpdoc

* Fix phan typing issues with intermediate var and ??

* Fix phan typing issue with ?? operator

* Ignore htdocs/install/install.forced.php for git

* Qual: Revert to original code, ignore notice

When changing the method to avoid one notice type, another one
appears.  So simply ignoring this error.

* Qual: Revert to original code, ignore notice

When changing the method to avoid one notice type, another one
appears.  So simply ignoring this error.

* Update baseline

* Qual: Phan fixes for BOM

* fixup! Qual: Phan fixes for BOM

* Fix phpstan double array keys for syslog

* Qual: Revert to original code, ignore notice

When changing the method to avoid one notice type, another one
appears.  So simply ignoring this error.

* Ignore PhanTypeSuspiciousNonTraversableForeach to allow integration

* Fix typing hints (phpstan)

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-08-15 17:05:00 +02:00
MDW
d6948077b2 Qual: Fix spelling/update .pre-commit configuration (versions) (#30546)
* Qual: Update pre-commit configuration

* Qual: Update spelling

* Ignore use of deprecated constant
2024-08-07 01:20:43 +02:00
Laurent Destailleur
73562b8734 FIX Missing trunc to $max 2024-07-13 01:59:15 +02:00
Laurent Destailleur
33edcbdd59 FIX Missing trunc to $max 2024-07-13 01:32:21 +02:00
Mathieu Moulin
abcb1dad4b Define CommonObject relation in CommonObjectLine classes (#29956) 2024-06-10 16:08:39 +02:00
Laurent Destailleur
82908a30eb Clean phan warnings 2024-05-30 13:37:17 +02:00
Laurent Destailleur
16336a66ad Rename french module name into english 2024-05-13 10:45:20 +02:00