Commit graph

127625 commits

Author SHA1 Message Date
Laurent Destailleur
b3da4e1eeb Trans 2024-01-06 14:52:29 +01:00
Laurent Destailleur
e053ce3239 Clean code 2024-01-06 14:51:20 +01:00
Laurent Destailleur
0a79121323 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-01-06 14:34:32 +01:00
Laurent Destailleur
c43cbde60a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2024-01-06 14:34:20 +01:00
Laurent Destailleur
597bac923a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2024-01-06 14:34:11 +01:00
Laurent Destailleur
d89076a87e NEW Add trigger on modify of user bank account 2024-01-06 14:28:04 +01:00
Laurent Destailleur
db30b470ea
Merge pull request #24346 from atm-adrien/FIX_order_for_actrioncomm_type_list
FIX : Position field for events types was not working
2024-01-06 14:20:17 +01:00
Laurent Destailleur
7d9c6139b2
Update commercial.lang 2024-01-06 14:19:23 +01:00
Laurent Destailleur
04891fc842
Merge branch 'develop' into FIX_order_for_actrioncomm_type_list 2024-01-06 14:18:13 +01:00
Laurent Destailleur
1dca4b9901
Merge pull request #27307 from nat-itopie/patch-1
Fix Computed Extrafields on list
2024-01-06 13:44:47 +01:00
Laurent Destailleur
cebd56ee89
Merge pull request #27308 from nat-itopie/develop
Fix Computed Extrafields on Contacts list
2024-01-06 13:44:39 +01:00
Laurent Destailleur
949e0a6f41
Merge pull request #27310 from frederic34/patch-3
add picto in recurring invoice tooltip
2024-01-06 13:40:59 +01:00
Laurent Destailleur
531c24db06
Merge pull request #27311 from frederic34/patch-5
remove dead code
2024-01-06 13:40:44 +01:00
Frédéric FRANCE
236cd74e0c
Update paymentmodes.php 2024-01-06 13:01:18 +01:00
Frédéric FRANCE
656c8d04de
Update paymentmodes.php 2024-01-06 11:35:55 +01:00
Frédéric FRANCE
b1876a9cab
remove dead code
due to test line 1672, other test are always false and code is no more needed
2024-01-06 11:18:21 +01:00
Frédéric FRANCE
4fad299e9f
tooltip recurring invoice 2024-01-06 10:48:43 +01:00
nat
7a2bf5a20b
Fix Computed Extrafields on Member list
FIX empty $object / $objectoffield in core/tpl/extrafields_list_print_fields.tpl.php for computed extrafields to work member list (in addition to #25631, #27307, #27308).
2024-01-06 00:08:56 +01:00
nat
4a8a85452f
Fix Computed Extrafields on Contacts list
FIX empty $object / $objectoffield in core/tpl/extrafields_list_print_fields.tpl.php for computed extrafields to work contacts list
(in addition to #25631 and #27307).
2024-01-05 23:46:12 +01:00
nat
ab06204902
Fix Computed Extrafields on list
Fix empty $object / $objectoffield in core/tpl/extrafields_list_print_fields.tpl.php for computed extrafields to work thirdparties list.
2024-01-05 23:24:37 +01:00
Laurent Destailleur
2c52622348
Merge pull request #27248 from a-schild/25828-odt-fix-wrong-styles
25828 odt fix wrong styles
2024-01-05 20:11:45 +01:00
Laurent Destailleur
3fe97af1ad
Update odf.php
No need of a very high entropy as we already have the microsecond in string.
2024-01-05 20:11:07 +01:00
Laurent Destailleur
4ad69cb635
Update odf.php 2024-01-05 20:08:41 +01:00
Laurent Destailleur
571c63380f
Merge pull request #27272 from altairisfr/vatupdatehook
NEW : add hook AFTER_VAT_UPDATE
2024-01-05 19:02:03 +01:00
Laurent Destailleur
91f1695ba0
Merge pull request #27301 from frederic34/patch-3
fix incorrect case of class
2024-01-05 19:00:28 +01:00
Laurent Destailleur
a9a69618d8
Merge pull request #27303 from frederic34/patch-7
fix error returning from a trigger
2024-01-05 18:59:39 +01:00
Laurent Destailleur
e8fa7aeebb
Merge pull request #27304 from alexandre-janniaux/discount-commonobject/1
QUAL: DiscountAbsolute: inherit CommonObject to implement errorsToString
2024-01-05 18:42:32 +01:00
Laurent Destailleur
30f018ccd8
Merge pull request #27305 from alexandre-janniaux/discounttest-soc/1
FIX: DiscountTest: fix create when no societe exists
2024-01-05 18:41:04 +01:00
Alexandre Janniaux
a0a3339eb9 DiscountTest: fix create when no societe exists
Fix the following error when running without the dataset.

    ✘ Discount create
    ┐
    ├ ERROR:  23503: insert or update on table "llx_societe_remise_except" violates foreign key constraint "fk_soc_remise_fk_soc"                                                                                                                                                                                                                                                                                                                                      
    ├ DETAIL:  Key (fk_soc)=(1) is not present in table "llx_societe".                                                                                                                                                                                                                                                                                                                                                                                                 
    ├ SCHEMA NAME:  public                                                                                                                                                                                                                                                                                                                                                                                                                                             
    ├ TABLE NAME:  llx_societe_remise_except                                                                                                                                                                                                                                                                                                                                                                                                                           
    ├ CONSTRAINT NAME:  fk_soc_remise_fk_soc                                                                                                                                                                                                                                                                                                                                                                                                                           
    ├ LOCATION:  ri_ReportViolation, ri_triggers.c:2596 - sql=INSERT INTO llx_societe_remise_except (entity, datec, fk_soc, discount_type, fk_user, description, amount_ht, amount_tva, amount_ttc, tva_tx, vat_src_code, multicurrency_amount_ht, multicurrency_amount_tva, multicurrency_amount_ttc, fk_facture_source, fk_invoice_supplier_source) VALUES (1, '2024-01-05 14:05:20', 1, 0, 1, 'Specimen discount', 10, 1.96, 11.96, 19.6, '', 0, 0, 0,  null, null),
    ├ Failed asserting that 0 is less than -1.                                                                                                                                                                                                                                                                                                                                                                                                                         
    │
    │ dolibarr/test/phpunit/DiscountTest.php:147
    ┴
2024-01-05 15:05:33 +01:00
Alexandre Janniaux
e3e2dd348d discount: remove now duplicated fields
Now that DiscountAbsolute is a CommonObject, some fields are duplicated
in the definition of the class and already defined in the CommonObject
class.
2024-01-05 14:55:00 +01:00
Alexandre Janniaux
8cfb183152 discount: add errorsToString()
$localobject->errorsToString() is available in most objects using $db or
other systems generating errors because they inherit from CommonObject.
However, DiscountAbsolute didn't inherit from it.

Extending CommonObject allows to implement the usual behaviour for core
objects like referencing the user doing the action.
2024-01-05 14:54:55 +01:00
Frédéric FRANCE
b3e7cdbad9
fix error returning from a trigger 2024-01-05 13:52:58 +01:00
Laurent Destailleur
c41583a3e0 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-01-05 12:20:14 +01:00
Laurent Destailleur
242c403f50 Fix missing SPF info of the noreply email 2024-01-05 12:19:52 +01:00
Frédéric FRANCE
c16f3bbbdf
fix incorrect case of class 2024-01-05 09:43:44 +01:00
Christophe Battarel
8778a917ff
Merge branch 'develop' into vatupdatehook 2024-01-05 08:54:17 +01:00
Laurent Destailleur
61c58714a4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-01-05 04:34:15 +01:00
Laurent Destailleur
4501872f17 Clean code with rector 2 2024-01-05 04:33:58 +01:00
Laurent Destailleur
70aa4a22ca Clean code with rector 2024-01-05 04:18:53 +01:00
Laurent Destailleur
c3fb26086f Enhance rector 2024-01-05 03:52:06 +01:00
Laurent Destailleur
ccaae7ab24 Clean code 2024-01-05 03:41:22 +01:00
Laurent Destailleur
bbf687da0c Fix warning 2024-01-05 03:08:16 +01:00
Laurent Destailleur
30275625ac Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-05 02:46:53 +01:00
Laurent Destailleur
7aecc84fdd css 2024-01-05 02:34:08 +01:00
Laurent Destailleur
4222a3d6da Last action that close the sell (payments) at end in takepos pad 2024-01-05 02:25:31 +01:00
Laurent Destailleur
4797779a4b
Merge pull request #21202 from altairis-melina/search
NEW : TAKEPOS-Clear search results
2024-01-05 02:15:22 +01:00
Laurent Destailleur
97584d11e5
Merge pull request #27100 from altairisfr/shiprank
add rank to shipment lines display
2024-01-05 02:13:10 +01:00
Laurent Destailleur
02183b473d
Merge pull request #27294 from alexandre-janniaux/fichintertest-soc/1
FIX: FichinterTest: create Societe object in test
2024-01-05 02:05:17 +01:00
Laurent Destailleur
29d5f43ac4
Merge pull request #27292 from frederic34/patch-3
Update element.php
2024-01-05 02:03:28 +01:00
Laurent Destailleur
8a35c5a055
Merge pull request #27293 from alexandre-janniaux/fichintertest-qual/1
QUAL: FichinterTest: add errorsToString()
2024-01-05 01:45:19 +01:00