Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
146,825 Commits 36 Branches 189 Tags
a3ee1b0c110b146a966fc8928b8344e77a2079cf
Commit Graph

12442 Commits

Author SHA1 Message Date
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
Mohamed DAOUD
4d48415218 Fix error management (#33719) 2025-04-03 20:33:34 +02:00
ldestailleur
ab742e7bd8 NEW Support of monthly or weekly recurring events 2025-04-03 14:58:41 +02:00
ldestailleur
10c0fba6b0 WIP Recurring events 2025-04-03 13:59:46 +02:00
ldestailleur
869bc1a3f5 Fix phan 2025-04-03 12:00:46 +02:00
ldestailleur
b466b7ab5a NEW The link "In accountancy" is now clicable to reach bookkeeping 2025-04-02 18:51:51 +02:00
atm-irvine
822f5dfa88 feat(pdf): new conf to remove break before country in pdf (#33696) 2025-04-02 12:29:47 +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
VIAL-GOUTEYRON Quentin
3ad05c2dde FIX: Incorrect entity used when downloading a document generated in another entity (#33565) 
* FIX : Wrong entity to download document

* MODIFICATION : Remplacement de l'ID d'entité par l'objet dans les fonctions de gestion des fichiers pour une meilleure cohérence.

* Update files.lib.php

* Update files.lib.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2025-04-01 23:13:31 +02:00
omogenot
73eb4e606a NEW : Rounding unit price - line discount before applying quantity - option MAIN_APPLY_DISCOUNT_ON_UNIT_PRICE_THEN_ROUND_BEFORE_MULTIPLICATION_BY_QTY (#33690) 
* Rounding unit price - line discount before applying quantity

On some systems, the line total price is calculated based on the discount applied on the unit price first, giving a new rounded unit price, and then multiplied by the quantity. Whereas the current way Dolibarr acts is to apply the discount on the subtotal (unit price * quantity).
Using an extra OTHER SETUP constant 'MAIN_ROUND_UNIT_PRICE_BEFORE_QTY', we can choose between the two ways.

* Update price.lib.php

* Update price.lib.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2025-04-01 21:36:52 +02:00
Jon Bendtsen
27dc84fe3b NEW Can link member subscription/contribution with proposal, order and invoice (#33647) 
* linking member subscription contribution <-> proposal, order and invoice
This can both be done manually from an existing proposal/order/invoice to a subscription created without creating an invoice. I use this when we sell memberships as part of registration for our membership classes.

The link will also be shown on the invoice that can be created as part of the subscription contribution creation.

These links show up in the json from the API on proposals, orders and invoices. The subscription does not show anything. It is currently unknown if the API can do this link or it will have to be done manually in the GUI.

* Update html.form.class.php

---------

Co-authored-by: Jon Bendtsen <xcodeauthor@jonb.dk>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2025-04-01 21:36:35 +02:00
Frédéric FRANCE
387e3b1da7 shipping can manage its contacts (#33680) 
* shipping can manage its contacts

* shipping can manage its contacts

* fix

* add contacts from origin

* clean code

* apply changes

* apply changes
 2025-04-01 20:47:40 +02:00
ldestailleur
f7d034a71c NEW Option MAIN_SECURITY_MAXFILESIZE_DOWNLOADED become official 2025-04-01 19:56:50 +02:00
ldestailleur
0780695ba4 Try CI fix 2025-04-01 19:29:24 +02:00
ldestailleur
5d51d0679b Share not allowed extension into the method getExecutableContent() 2025-04-01 17:53:33 +02:00
ldestailleur
3edadbd8b8 Add option MAIN_DISALLOW_STRING_OBFUSCATION_IN_DOL_EVAL. Close #33612 2025-04-01 16:23:50 +02:00
ldestailleur
15f2f4f223 Clean code 2025-04-01 15:21:43 +02:00
ldestailleur
b3cbf93c5b Fix warning 2025-04-01 13:40:36 +02:00
ldestailleur
cc8c7b8329 Fix possible remote code execution using dol_concatdesc in dol_eval. To 
allow concat char, you can use
MAIN_ALLOW_UNSECURED_SPECIAL_CHARS_IN_DOL_EVAL='.'
 2025-04-01 13:25:10 +02:00
ldestailleur
bcf0ef0bc0 Test switch in dol_eval function() 2025-04-01 12:31:27 +02:00
ldestailleur
6c8ae0b2a6 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-31 16:28:08 +02:00
ldestailleur
d880c82333 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-31 15:59:46 +02:00
ldestailleur
665814fdf0 Doc 2025-03-31 15:59:28 +02:00
Frédéric FRANCE
eb3032fdce fix missing translation (#33665) 2025-03-31 15:56:57 +02:00
John BOTELLA
d0d4eedc4f Change ux doc link (#33657) 
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2025-03-31 11:59:07 +02:00
ldestailleur
4ba3f0d90e Clean and standardize code for Categories 2025-03-29 15:03:36 +01:00
Christophe Battarel
36bd2c7a5b Manage supplier prices permission (#33636) 
* WIP : manage read_supplier_prices

* WIP : manage read_supplier_prices

---------

Co-authored-by: Christophe Battarel <christophe@altairis.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2025-03-29 00:43:13 +01:00
ldestailleur
4f00b49bab Fix reliability of ip in logs 2025-03-28 21:02:27 +01:00
ldestailleur
3e9ba9f9fc QUAL: Must use img_picto instead of hard coded html 2025-03-27 17:45:04 +01:00
ldestailleur
6a76f55ae3 Clean font awesome picto 2025-03-27 17:33:56 +01:00
ldestailleur
007fad9d98 FIX picto for unknown mime type 2025-03-27 13:40:26 +01:00
ldestailleur
40675ac95f Upgrade to font awesome 5.15 2025-03-27 13:37:19 +01:00
ldestailleur
df9fea28f1 Complete #33605 by adding phpunit tests 2025-03-27 10:39:08 +01:00
ldestailleur
33c7378d2d Add phpunit test 2025-03-26 21:01:46 +01:00
ldestailleur
4ab6fe34fa Introduce getWarningDelay() 2025-03-25 17:42:54 +01:00
ldestailleur
0c09be61a2 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-25 14:01:28 +01:00
ldestailleur
facf32c5a9 Clean code 2025-03-25 13:40:42 +01:00
Jyhere
ad5102e5da FIX: products with a single price by qty may have empty price when adding it in a commercial piece (#33509) 
* FIX: products with a single price by qty may have empty price when adding it in a commercial piece

* FIX: products with a single price by qty may have empty price when adding it in a commercial piece
 2025-03-24 23:34:02 +01:00
ldestailleur
65536f6f70 Fix phpstan warnings 2025-03-24 16:22:14 +01:00
ldestailleur
af7cb49413 Avoid false positive of phpstan 2025-03-24 15:52:59 +01:00
ldestailleur
966aff2095 Reduce nb of result combinations type fot getURLContent 2025-03-24 15:23:13 +01:00
ldestailleur
7201222753 Test of a security fix backport. 2025-03-24 13:58:17 +01:00
ldestailleur
920c84a056 NEW No auto open keyboard on smartphone when opening list of columns 2025-03-24 12:48:38 +01:00
Frédéric FRANCE
487d6476ce fix CI (#33581) 
* fix CI

* clean phpstan baseline
 2025-03-24 01:08:08 +01:00
ldestailleur
c947faeff1 NEW Update of currency supports also apilayer (not only currencylayer) 2025-03-21 14:40:56 +01:00
Laurent Destailleur
7011d01bde NEW Web pages of websites are protected by the WAF 2025-03-21 13:01:23 +01:00
ldestailleur
6ce72f78df Fix CI 2025-03-20 18:51:29 +01:00
ldestailleur
410738085a Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-03-20 13:55:35 +01:00