vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
144370 commits 1 branch 0 tags 1.5 GiB
Commit graph

144370 commits

This branch
This branch
All branches
Author SHA1 Message Date
ldestailleur
91fa444129 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-01 22:42:32 +02:00
ldestailleur
352e35a38b Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-04-01 22:40:07 +02:00
ldestailleur
e1273a410a FIX for #33403 and #33404 2025-04-01 22:37:23 +02:00
ldestailleur
b333f656c9 Replace option with param 2025-04-01 22:32:31 +02:00
kkhelifa-opendsi
0029e14fb6
NEW: Add globale MAIN_DISABLE_PDF_AUTO_DOWNLOAD_AFTER_CONVERT_FROM_ODT for disable the auto download after auto convert odt to pdf (#33511) 2025-04-01 22:30:03 +02:00
Etienne BENDER
d73df8d931
Add hook printObjectLinesList in CommonObject::printObjectLines() (#33641) 
* Add hook printObjectLinesList in CommonObject::printObjectLines()

* Update commonobject.class.php

* Update commonobject.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2025-04-01 22:24:35 +02:00
ldestailleur
ffa7413cda Clean code 2025-04-01 22:14:56 +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
ldestailleur
65fb217432 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-01 21:34:25 +02:00
ldestailleur
a9568c448c Look and feel v22 2025-04-01 21:32:56 +02:00
ldestailleur
8e88532c3e Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-04-01 21:07:20 +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
514e367d94 Rename constant 2025-04-01 20:46:31 +02:00
ldestailleur
21b5eb7b82 Debug migrate using the database flag 2025-04-01 20:45:46 +02:00
ldestailleur
de75d13c7a Use a database flag 2025-04-01 20:36:55 +02:00
atm-GregM
a1c31310a2
Add Massactions Validate/Cancel/RegeneratePDF/MergePDF/EditStartDate/EditeEndDate on Mo List (#33548) 
* Add Massaction Mo List

* add langs en_US

* fix for precommit

* langs

* langs+

* int param

* space

* Update mo_list.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2025-04-01 20:35:34 +02:00
Marc de Lima Lucio
5832f1807c
FIX: invoice export models are incorrect after 20.0 migration (#33688) 
* FIX: shift export models at upgrade

* FIX: 20.0 invoice export model mogrations: place lock in root of data dir
 2025-04-01 20:29:06 +02:00
ldestailleur
e9b880707a Clean code 2025-04-01 20:13:54 +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
f5a61d9dc4 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-01 19:26:49 +02:00
ldestailleur
105347003c Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-04-01 19:24:06 +02:00
Laurent Destailleur (aka Eldy)
62fba4f84d Add missing try catch 2025-04-01 19:23:47 +02:00
ldestailleur
7d0581b046 FIX Add a try catch to avoid fatal error on bad translation string 
format
 2025-04-01 19:05:59 +02:00
ldestailleur
16c76a6505 FIX The payment mode for salary on credit transfer must be credit 
transfer
 2025-04-01 18:50:12 +02:00
ldestailleur
17dfec8ee4 FIX Edit of payment mode from the bank transfer tab of salary 2025-04-01 18:44:45 +02:00
ldestailleur
4e9060b9d9 Fix translation 2025-04-01 18:22:59 +02:00
ldestailleur
493bfdc207 Clean code 2025-04-01 18:12:04 +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
8efa60f4b0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2025-04-01 13:53:52 +02:00
ldestailleur
e00b0f1381 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-01 13:40:52 +02:00
ldestailleur
b3cbf93c5b Fix warning 2025-04-01 13:40:36 +02:00
Frédéric FRANCE
65388c0743
clean code (#33683) 
* clean code

* Update expedition.class.php
 2025-04-01 13:26:54 +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
95befadad9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-01 12:31:42 +02:00
ldestailleur
bcf0ef0bc0 Test switch in dol_eval function() 2025-04-01 12:31:27 +02:00
ldestailleur
5e990ff7de Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-04-01 11:58:46 +02:00
ldestailleur
f34949fe14 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-04-01 11:49:18 +02:00
ldestailleur
2100f3ba43 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-04-01 11:49:07 +02:00
ldestailleur
84674e7bad Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-04-01 11:45:21 +02:00
ldestailleur
4c523cf3e5 Update doc 2025-04-01 11:45:11 +02:00
Marc de Lima Lucio
733fbecd45
FIX: tcpdf: prevent error with 'data:' URLs (backport of https://github.com/tecnickcom/TCPDF/pull/552) (#33682) 2025-04-01 11:40:02 +02:00
Yannis Hoareau
dfd9e63a63
Fix supplier proposal list fatal error (#33679) 
* Removed unnecessary tests

* Fix fatal error class projet not found

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2025-04-01 11:31:07 +02:00
Frédéric FRANCE
15fce79455
remove duplicate code (#33681) 
* remove duplicate code

* Update card.php
 2025-04-01 11:10:54 +02:00
ldestailleur
f824e03b87 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-01 11:09:43 +02:00
ldestailleur
2bff9835d3 Try to fix CI 2025-04-01 11:09:31 +02:00
John BOTELLA
63bf68f846 Fix : php warning (#33664) 
* Fix php warning

* Update html.formsetup.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2025-04-01 10:59:46 +02:00