2
0
forked from Wavyzz/dolibarr
Commit Graph

1844 Commits

Author SHA1 Message Date
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
f2ed714cad NEW: Can edit the module_source and pos_source field. 2025-05-15 00:47:12 +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
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
2456072a84 Clean code 2025-04-18 15:21:07 +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
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
Eric - CAP-REL
a89a917adc PERF: hidden var to limit list of invoices for credit note list (#33839)
* PERF: hidden var to limit list of invoices for credit note list

* Update facture.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-14 20:12:19 +02:00
ldestailleur
8cc5bc3e7e NEW The closing reason of invoice appear on tooltip of invoice status 2025-04-09 19:07:31 +02:00
ldestailleur
4ba1f204fd Fix need refresh to see status updated 2025-04-09 17:41:33 +02:00
ldestailleur
e6fdf698b3 Fix trans 2025-04-09 17:21:59 +02:00
ldestailleur
eb4e5a4685 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-09 15:40:02 +02:00
ldestailleur
c09f7a235c Fix type 2025-04-09 11:56:21 +02:00
atm-irvine
9f89417391 New/group fetch and fetch optionals (#33257)
* feat(facture): group classic fetch and fetch optionals depending on conf

* feat(facture): group new fetch optionals

* feat(facture): group new fetch optionals for lines

* chore: phan fixes

* feat(factureligne): grouped fetch and fetch optionals

* Fix regression in missing $conf

* Update factureligne.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-09 00:10:02 +02:00
ldestailleur
6af8298736 Fix related to #33449 2025-04-07 15:46:10 +02:00
atm-jonathan
d72d69e55c NEW add home box mrp (#33549)
* add box Mo

* tests ok

* comparaison dates

* before Wysy

* after wysy

* Update mo.class.php

* Update mo.class.php

* Update conf.class.php

* retour PR

* add parenthesis

* Update mo_list.php

---------

Co-authored-by: x <x@x.x>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-02 12:22:59 +02:00
ldestailleur
30801214ce Code comment 2025-03-28 12:07:51 +01:00
Frédéric FRANCE
fded6d7855 fix CI branch 21 (#33535) 2025-03-19 15:53:00 +01:00
ldestailleur
a3f3f28362 Fix warnings 2025-03-19 14:42:04 +01:00
ldestailleur
66e14bb708 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-19 14:28:20 +01:00
ldestailleur
5c1f8b58c4 Merge 2025-03-19 14:23:19 +01:00
ldestailleur
bb719f73cf Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-03-19 14:19:01 +01:00
ldestailleur
1ab438d62e Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-03-19 14:17:37 +01:00
ldestailleur
0a4f1ffc06 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2025-03-19 14:09:41 +01:00
atm-lucas
42a1cde41a useless product fetch on invoice create (#33505) 2025-03-19 14:00:03 +01:00
ldestailleur
a0ec0002f6 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-19 13:47:25 +01:00
ldestailleur
e72299126c Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0
Signed-off-by: ldestailleur <eldy@destailleur.fr>
2025-03-18 16:39:04 +01:00
ldestailleur
7465d54335 Fix renaming dire must be at end outside of translation. 2025-03-18 16:36:18 +01:00
Laurent Destailleur
395157d16c Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-17 19:46:08 +01:00
ldestailleur
23244ddc9d Fix getCallerInfoString() return empty when only one function used 2025-03-17 11:33:06 +01:00
ldestailleur
8082c7bd96 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-15 10:57:53 +01:00
ldestailleur
624e87bc51 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-03-14 17:24:52 +01:00
ldestailleur
3c4c5f1c75 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-03-14 12:33:40 +01:00
ldestailleur
681b20f09e Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-03-14 12:32:56 +01:00
Laurent Destailleur
051a902f1f Revert "Revert "Reverse const STOCK_ALLOW_NEGATIVE_TRANSFER to STOCK_DISALLOW…" (#33454)
This reverts commit e943c9c97f.
2025-03-13 23:22:40 +01:00
Laurent Destailleur
e943c9c97f Revert "Reverse const STOCK_ALLOW_NEGATIVE_TRANSFER to STOCK_DISALLOW_NEGATIV…" (#33453)
This reverts commit d93e8e2978.
2025-03-13 23:17:02 +01:00
ThomasNgr-OpenDSI
d93e8e2978 Reverse const STOCK_ALLOW_NEGATIVE_TRANSFER to STOCK_DISALLOW_NEGATIVE_TRANSFER (#33444) 2025-03-13 23:15:04 +01:00
MDW
ef11cdeb45 Qual: Fix phan notices (pdf_* related) (#33445) 2025-03-13 23:05:15 +01:00
HENRY Florian
7a1fa20959 fix: allow positive line in creditnote invoice if FACTURE_ENABLE_NEGATIVE_LINES and INVOICE_KEEP_DISCOUNT_LINES_AS_IN_ORIGIN (#33434)
* fix: allow positive line in creditnote invoice if FACTURE_ENABLE_NEGATIVE_LINES and INVOICE_KEEP_DISCOUNT_LINES_AS_IN_ORIGIN

* fix: allow positive line in creditnote invoice if FACTURE_ENABLE_NEGATIVE_LINES and INVOICE_KEEP_DISCOUNT_LINES_AS_IN_ORIGIN
2025-03-13 11:18:17 +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
MDW
ee9e89efaa Qual: Fix phan notices (facture/3 + filefunc.inc) (#33383)
* Qual: Fix PhanMismatchType

* Finalize rename of $attrV into $value

* Correct getGlobalString into getGlobalInt

* Do not require some fields in the 'title' definition of $cols

* Qual: Fix phan notices (core/lib)

* Qual: Fix phan (contrat)

* Qual: Fix phan notices (facture/3 + filefunc.in)

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-11 01:59:34 +01:00
Laurent Destailleur
aad4a2bc7e Merge branch 'develop' into retrieving-extraparams-for-lines 2025-03-06 04:57:15 +01:00
ldestailleur
d20e730c66 Clean code 2025-03-06 04:56:54 +01:00
Laurent Destailleur
e874529873 Merge pull request #33250 from aspangaro/22_catinvoice
NEW Add invoice tags
2025-03-05 14:29:55 +01:00
MDW
acf6b62822 Fix PhanTypeMismatchArgument in commonobject, commande/card, 2025-03-05 12:15:12 +01:00
Laurent Destailleur
f50a0aa7f8 Merge branch 'develop' into retrieving-extraparams-for-lines 2025-03-04 21:35:01 +01:00