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
Laurent Destailleur
2c3d6fa66a
Reduce limit for list
2024-11-12 10:53:08 +01:00
Laurent Destailleur
7e95ab1513
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2024-11-12 04:04:48 +01:00
Laurent Destailleur
5312bd80b9
Doc
2024-11-12 04:04:31 +01:00
JonathanBtq
71a47c6555
add custom tpl to note ( #31736 )
...
* add custom tpl to note
* Update note.php
---------
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-11-12 04:00:37 +01:00
Laurent Destailleur
4a97adfc62
Add column is_also_delivery_note
2024-11-12 03:52:08 +01:00
sonikf
34b4b07fe2
New: prepare for e-shipment (SQL part) ( #31773 )
...
* Add issue date
* Add field fk_unit
* Add shipment contacts
* New Add is_delivery_note SQL part
* New fields for e-shipment SQL part
* Update llx_facture.sql
* Update 20.0.0-21.0.0.sql
* Update 20.0.0-21.0.0.sql
* Update llx_expedition.sql
---------
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-11-12 03:40:38 +01:00
Frédéric FRANCE
836bb71303
fix customreports.lib.php ( #31771 )
...
* fix customreports.lib.php
* Update commondict.class.php
* Update ctyperesource.class.php
* fix
* CommonDict is not a business class
* Update ctyperesource.class.php
* Update ctyperesource.class.php
---------
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-11-12 03:38:38 +01:00
iLLixM
3b0ccddaea
set payment method information on new membership subscriptions ( #31750 )
...
When creating new membership subscriptions and choosing to create an invoice (for linked thirdparty), existing payment method information of the customer should be used.
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-11-12 03:37:48 +01:00
Laurent Destailleur
c9972f1dd9
Fix phan
2024-11-12 03:32:57 +01:00
Laurent Destailleur
5eca796098
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2024-11-12 03:23:09 +01:00
Laurent Destailleur
353696b3ba
Doc
2024-11-12 03:22:51 +01:00
Laurent Destailleur
f35fd7c1f0
Clean code
2024-11-12 03:17:55 +01:00
UT from dolibit
d395924150
Update /datapolicy/admin/setup.php ( #25709 )
...
* Update /datapolicy/admin/setup.php
* Update setup.php
---------
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-11-12 02:54:18 +01:00
UT from dolibit
e5caa2170e
Update workstation_list.php ( #25707 )
...
* Update workstation_list.php
* Update workstation_list.php
---------
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-11-12 02:43:46 +01:00
Laurent Destailleur
22eec4ba8a
Doc
2024-11-12 02:38:34 +01:00
Laurent Destailleur
66ee2a2cfe
Close #24828
2024-11-12 02:24:25 +01:00
Laurent Destailleur
960413db0f
Close #24389
2024-11-12 01:57:51 +01:00
Laurent Destailleur
07c3690bb7
FIX the style not visible in combo using autocomplete
2024-11-12 01:26:08 +01:00
Florian Hödl
75ce3e8513
[FIX] Update ticket create form to hide contracts from other thirdparties for external users ( #31762 )
...
Co-authored-by: fhoedl <florian@hoedl.co>
2024-11-12 00:36:34 +01:00