Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-18 15:31:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
148,415 Commits 36 Branches 190 Tags
70a7554f87bfb8a3ddaf3fba901b86bf3515f036
Commit Graph

12618 Commits

Author SHA1 Message Date
Jon Bendtsen
2aa6e65c6f adding different filename check for when member codes are the advanced kind. Fix #32447 (#33862) 
Co-authored-by: Jon Bendtsen <xcodeauthor@jonb.dk>
 2025-04-16 01:04:33 +02:00
ldestailleur
3d8704ae63 Prepare code for a better implementation of #33857 2025-04-15 20:24:34 +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
ldestailleur
e26744d625 Move code for showEyeForField into a dedicated function. 2025-04-15 13:38:59 +02:00
ldestailleur
dc2a6694c7 Comment 2025-04-14 10:33:03 +02:00
Frédéric FRANCE
2b468e6b0f enhance dol_print_ip (#33819) 
* enhance dol_print_ip

* fix cache

* fix CI
 2025-04-12 16:19:45 +02:00
ldestailleur
26613998eb Debug v22 2025-04-11 13:57:07 +02:00
ldestailleur
e276def96d Revert "add param nocreateEcmFile (#33770)" 
This reverts commit 0bd93fa05a.
 2025-04-10 14:19:49 +02:00
ldestailleur
15c799b324 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-04-10 14:17:56 +02:00
ldestailleur
bad881b2a5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2025-04-10 14:06:45 +02:00
ldestailleur
e15fe43721 Add a key un URL to allow better protection 2025-04-10 11:39:13 +02:00
ldestailleur
74eccf279d Fix regression 2025-04-09 12:08:52 +02:00
ldestailleur
6b11ed0187 Fix CI 2025-04-08 21:50:04 +02:00
atm-jonathan
0bd93fa05a add param nocreateEcmFile (#33770) 
Co-authored-by: x <x@x.x>
 2025-04-08 15:24:28 +02:00
ldestailleur
611cc510d7 Fix CI 2025-04-08 14:12:08 +02:00
ldestailleur
79e7615592 Fix CI 2025-04-08 14:08:58 +02:00
ldestailleur
5cc439da79 Fix CI 2025-04-08 13:51:35 +02:00
ldestailleur
b936fa979c Add constant MAIN_PDF_SHOW_SOURCE_PHONE_MOBILE 2025-04-08 13:28:59 +02:00
ldestailleur
54eb9f21e8 Clean code. Public pages must use the common header 2025-04-08 13:14:37 +02:00
ldestailleur
6a6d7e5b5a Debug v22 2025-04-08 12:02:07 +02:00
Mohamed DAOUD
3a05efdb5b Add try catch (#33755) 2025-04-07 16:34:51 +02:00
ldestailleur
75d0f2ea6c FIX #33547 2025-04-07 15:58:06 +02:00
ldestailleur
2f4f82b013 Fix CI 2025-04-07 13:10:32 +02:00
ldestailleur
d77898ff3d FIX #33742 2025-04-07 12:53:19 +02:00
ldestailleur
7e1ef5ee45 Fix warning 2025-04-07 12:41:13 +02:00
ldestailleur
30da60c955 Fix CI 2025-04-07 12:23:17 +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
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