Commit graph

139066 commits

Author SHA1 Message Date
Laurent Destailleur
2eb5bca23c Fix phan 2024-11-13 11:36:05 +01:00
Laurent Destailleur
9d9d41f187 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-11-13 11:17:46 +01:00
Laurent Destailleur
e78c9d2900 Prepare 20.0.2 2024-11-13 11:15:53 +01:00
Laurent Destailleur
f546b603e9 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-11-13 11:10:25 +01:00
Laurent Destailleur
8f2e041dda Typo 2024-11-13 11:09:32 +01:00
Laurent Destailleur
3264e6d76a Prepare 20.0.2 2024-11-13 11:07:54 +01:00
Laurent Destailleur
62bff1d070 Prepare 19.0.4 2024-11-13 11:02:13 +01:00
Laurent Destailleur
46769d65f3 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-11-13 10:58:10 +01:00
Laurent Destailleur
d5add8aa49 typo 2024-11-13 10:56:56 +01:00
Laurent Destailleur
d3b9a83055 Fix changelog 2024-11-13 10:56:14 +01:00
Laurent Destailleur
6b82d435be Prepare v21 2024-11-13 10:50:26 +01:00
Laurent Destailleur
8496e8a8ed Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-11-13 10:08:21 +01:00
Laurent Destailleur
dd16c087e5 Prepare 20.0.2 2024-11-13 10:07:57 +01:00
Laurent Destailleur
1729df2a75 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-11-13 10:06:24 +01:00
Laurent Destailleur
294912420b Prepare 19.0.4 2024-11-13 10:06:10 +01:00
Laurent Destailleur
50625a69f0
Update README.md 2024-11-13 09:30:23 +01:00
Laurent Destailleur
b1e3830c3b Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-11-13 00:38:58 +01:00
Laurent Destailleur
a186903844 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-11-13 00:38:00 +01:00
Laurent Destailleur
4cd2e572ae Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-11-13 00:30:26 +01:00
Laurent Destailleur
f4b2269e2e Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-11-13 00:26:53 +01:00
Laurent Destailleur
aa138fce46 Look and feel v21 2024-11-13 00:24:45 +01:00
Laurent Destailleur
062c769cc3 Rename MAIN_USE_FULL_TEXT_INDEXATION into MAIN_SAVE_FILE_CONTENT_AS_TEXT 2024-11-13 00:01:18 +01:00
Laurent Destailleur
5283a67cc2 Debug v21 2024-11-12 23:44:36 +01:00
Frédéric FRANCE
2f207dd347
switching on phpstan v2 level 10 (#31764)
* switching on phpstan v2 level 10

* switching on phpstan v2 level 10

* switching on phpstan v2 level 10

* switching on phpstan v2 level 10

* switching on phpstan v2 level 10

* version

* fix phpstan

* fix phpstan

* test

* test

* test

* test

* test

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* add action to refresh phpstan baseline

* add action to refresh phpstan baseline

* add action to refresh phpstan baseline

* add action to refresh phpstan baseline

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* update baseline
2024-11-12 23:18:02 +01:00
uvaldenaire-opendsi
0eee1ad18b
Qual: remove php 8.2 warnings by casting trim() argument to string. (#28162) (#31693)
In create and update methods of societe class, the trim function triggered warnings when the argument passed is null.
Cast string properties to string to avoid php warnings when the property is null.

Co-authored-by: UltraViolet33 <93035200+UltraViolet33@users.noreply.github.com>
2024-11-12 19:45:52 +01:00
Laurent Destailleur
221f8e947a Debug v21 2024-11-12 19:41:21 +01:00
Quentin-Seekness
daafa150a0
Update export.class.php (#31783)
Allow usage of a method param that is not part of the $obj from the sql request. 

The issue I encontered is the usage of order's LibStatut method that required a $mode param that can't be fetched from the sql request obj.

This would be the code for the export declaration : 
		$this->export_special_array[$r] = array(
			'orders.fk_statut'=> [
				'rule' => 'compute',
				'class' => 'Commande',
				'classfile' => '/commande/class/commande.class.php',
				'method' => 'LibStatut',
				'method_params' => ['orders_fk_statut', 'orders_facture', '1'],
			],
		);

We can see that the first two params will come from the $obj, but the third one will be used for it's value (in this case '1').

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-11-12 18:55:56 +01:00
Laurent Destailleur
e63992b779 Fix phan 2024-11-12 17:32:54 +01:00
Laurent Destailleur
21f9d417cd Trans 2024-11-12 17:05:15 +01:00
Laurent Destailleur
5b4744a677 Fix duplicate status after merge from v18 fix 2024-11-12 16:18:19 +01:00
Laurent Destailleur
ffd9bde1cd Disable bugged code and rewrite it in comment to show the way 2024-11-12 15:26:50 +01:00
antonin_tdj
369fb8b898
FIX Supplier orders : delete dispatched lines on supplier order deletion (#25292)
* Add 2 entries for DispatchedLines on Delete

* Delete dispatched lined on order deletion

* add choice on deletion while dispatched lines exists

* fix indent

* fix begin, rollback and commit locations

* fix indent

* Update card.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-11-12 14:56:09 +01:00
Laurent Destailleur
9730a83d9c Fix phpstan missing parenthesis 2024-11-12 14:42:07 +01:00
lvessiller-opendsi
d5e2f89edc
FIX can validate shipment without stock movement (#31780) 2024-11-12 14:25:36 +01:00
Laurent Destailleur
6c7c12b4b4 Rename variables 2024-11-12 14:20:08 +01:00
Andrew Burks
c8e8651c66
NEW [Accounting] Allow grouping taxes with primary line price (#26732)
* Fix expense report journal entries bind to user

WAS: expense report payments did not fill out $tabtb (credit) to associate with their $tabpay (debit). The case would always fall through to 'NotDefined' and require manual adjustment.

NEW: if a user is associated with the expense report, then that user will get an associated credit line ($tabtp) generated.

* allow grouping tax with actual cost for accounting

Provides the ability for taxes paid in expense reports (ER_JOURNAL_GROUP_TAX_WITH_LINES) or purchases (AC_JOURNAL_GROUP_TAX_WITH_LINES) to get grouped with the main expense/purchase line and associated with the accounting account for the item itself. This is in contrast to the default behavior designed around VAT which splits off any taxes paid into a separate accounting account for each type of tax.

* fixed out of date reference

fixed merge error

* fixed linting issues

whitespace around braces and if/else keywords

* Update bankjournal.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-11-12 14:14:36 +01:00
Bahfir Abbes
4b807e2b47
sells do not need to be paid completely to be included in the cash control (#31727)
Co-authored-by: abb <contact@ab1consult.com>
2024-11-12 13:51:13 +01:00
atm-corentin
3bd2aa1921
FIX tpl object line because the was twice marginclass2 on col margin rates but also on mark rates (#31774)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-11-12 13:48:12 +01:00
sonikf
3720b748b1
fix column is_also_delivery_note belongs to llx_facture table (#31779)
* fix remove is_also_delivery_note

* New: Add field is_also_delivery_note
2024-11-12 13:46:45 +01:00
Frédéric FRANCE
98c92337f1
Update security.php (#31777)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-11-12 13:46:13 +01:00
Laurent Destailleur
542b4bd099 Fix phan 2024-11-12 13:45:15 +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
Laurent Destailleur
14d548143b Try to fix phpstan 2024-11-12 13:08:03 +01:00
Laurent Destailleur
a64de4d24d Clean code 2024-11-12 12:57:08 +01:00
Laurent Destailleur
b86a48106b Fix phan 2024-11-12 12:43:50 +01:00
Laurent Destailleur
4c556babaf Clean code 2024-11-12 11:51:14 +01:00
Laurent Destailleur
487f910aa7 Fix bad value 2024-11-12 11:42:09 +01:00
Laurent Destailleur
bd170e0474 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2024-11-12 11:33:31 +01:00
Laurent Destailleur
9dd3357890 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-11-12 10:53:37 +01:00