Commit Graph

9302 Commits

Author SHA1 Message Date
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
ldestailleur
2736a4b382 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-05 00:07:09 +02:00
ldestailleur
a74979bc04 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-05-05 00:04:17 +02:00
Noé Cendrier
7c29f8201b FIX: do not forget extrafields for BOM in export lines (#34020) 2025-05-04 18:42:45 +02:00
ThomasNgr-OpenDSI
149bb14202 NEW Move right from advance to normal for thirdparty information payment page (#33885)d
Co-authored-by: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-26 21:23:08 +02:00
ldestailleur
87e794589c Modulebuilderization 2025-04-26 12:06:45 +02:00
Frédéric FRANCE
ce7269aa07 fix missing translation (#33921)
* fix missing translation

* fix missing translation

* fix missing translation

* fix missing translation

* fix missing translation
2025-04-19 11:46:57 +02:00
stefkpl
9fd9454928 NEW: add phone_mobile to export of thirdparty (#33893)
* fix: add phone_mobile to societe table import

* Update modSociete.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-18 20:14:07 +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
255300a29e test fix phan (#33879)
* test fix phan

* test fix phan

* test fix phan

* test fix phan

* test fix phan
2025-04-16 19:55:44 +02:00
Alexandre SPANGARO
ab0ce1d645 Review of module asset (#33847)
* Fixed Asset - Update translation of the module

* Fix asset create name

* Fix ref field

* Update module Asset

* Fix CI

* Fix CI

* Fix comment
2025-04-15 17:21:45 +02:00
Laurent Destailleur
b0b2442298 Fix #33793 2025-04-14 20:24:21 +02:00
ldestailleur
955a8dab83 Debug v22 2025-04-11 14:20:42 +02:00
ldestailleur
26613998eb Debug v22 2025-04-11 13:57:07 +02:00
Frédéric FRANCE
d0cf13e73c add missing translation (#33782)
* add missing translation

* fix missing translation

* fix missing translation

* fix missing translation
2025-04-09 15:56:34 +02:00
ldestailleur
7d8607cce5 NEW Module external website is deprecated. Replaced with menu editor. 2025-04-08 18:18:05 +02:00
ldestailleur
61982bf42b Fix CI 2025-04-07 14:11:37 +02:00
ldestailleur
33f1a644d5 Fix CI 2025-04-07 11:51:42 +02:00
JC Prieto
f4e43e3566 FIX: Update import_xlsx.modules.php (#33439)
* Update import_xlsx.modules.php

$keyfield must be always 'rowid' because we compare with $lastinsertid

* Update import_csv.modules.php

* Update import_csv.modules.php

I correct edition

* Update import_xlsx.modules.php

I correct edition

* Update import_csv.modules.php

* Update import_csv.modules.php

* Update import_xlsx.modules.php

* Update import_csv.modules.php

* Update import_xlsx.modules.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-06 19:45:35 +02:00
ldestailleur
54534044c7 Debug v22 2025-04-05 16:52:02 +02:00
ldestailleur
2a082d37a5 Introduce position for sub-modules 2025-04-05 16:34:19 +02:00
ldestailleur
91f519b6fb Debug v22 2025-04-05 16:30:22 +02:00
ldestailleur
7b759f439e Depreciate module mod_facture_terre that is duplicate with mars. 2025-04-05 16:10:07 +02:00
ldestailleur
8c74643e5f PERF Optimization to get next ref when there is reset on first month. 2025-04-05 15:29:41 +02:00
ldestailleur
cd5a645acc Fix move default number to neon, argon has critical bug to fix first. 2025-04-05 14:09:47 +02:00
ldestailleur
ef95c311a7 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-03 21:09:46 +02:00
ldestailleur
174d6497b3 Signed-off-by: ldestailleur <eldy@destailleur.fr> 2025-04-03 21:04:35 +02:00
Christophe Battarel
5864af4d4c fix permission def (#33712)
Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2025-04-03 17:13:54 +02:00
atm-irvine
87b254e0fd Fix pdf einstein automatic calculation (#33713)
* fix(pdf-einstein): let automatic calculation for pos

* removed ;
2025-04-03 17:12:28 +02:00
ldestailleur
1aac6e3c34 Clean code by using the ACCOUNTING_MODE var for both modules 2025-04-03 16:41:41 +02:00
Frédéric FRANCE
51624f8a50 deprecate statut (#33691)
* deprecate statut

* Update fichinter.class.php

* clean code

* clean code

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-02 11:27:17 +02:00
MDW
0aea1709f7 Qual: Add comment on return to avoid 'redundant' notice (#33676) 2025-04-01 10:45:10 +02:00
Chosto
ccc25e5970 [MC] Fix illegal table.column PostgreSQL UPDATE syntax (#33673) 2025-04-01 01:08:31 +02:00
Jyhere
e35c59a4d8 GIFF-Accountancy-2025 - Automatic numbering of accounting entries (#33551)
* NEW: ref with configurable numbering models for Bookkeeping

* FIX: bookkeeping tooltip empty ref depending the list

* FIX: bookkeeping ref numbering missing translations and typo

* NEW: free ref num model for bookkeeping

* Update mod_bookkeeping_argon.php

* FIX: ci

* FIX: replace mistake, removed not necessary ternary

* FIX: phan error and prefix check

* FIX: phan error

* FIX: missing ref column in llx_accounting_bookkeeping_tmp.sql

* CHANGE: use default function getDolGlobalInt(,  = 0)
() param instead of ternary

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-31 11:35:18 +02:00
Florian Mortgat
c9ecc5dfad Remove deprecated columns price_ht and remise from llx_contratdet (#33616)
* [breaking change] Remove deprecated columns `price_ht` and `remise` from llx_contratdet and corresponding class properties

* FIX: remove references to deleted field `price_ht` from module
descriptor (exports)
2025-03-29 17:25:00 +01:00
ldestailleur
507262a1a8 Test fix CI 2025-03-25 22:27:52 +01:00
ldestailleur
7b9b32cb9e Debug pgsql DDLInfoTable 2025-03-25 21:32:28 +01:00
ldestailleur
c95f4a8e6a Fix phpunit 2025-03-25 20:22:02 +01:00