Commit Graph

37795 Commits

Author SHA1 Message Date
Mohamed DAOUD
a878934f23 fix originalcontentonly (#30245) 2024-07-03 01:53:37 +02:00
Laurent Destailleur
373e4da329 Debug v20 2024-07-02 23:41:07 +02:00
Laurent Destailleur
25971c3e6f Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-07-02 13:41:32 +02:00
Laurent Destailleur
9ffa8641ef Fix phan 2024-07-02 11:41:08 +02:00
Laurent Destailleur
6ebcf20b6d Fix phan 2024-07-02 11:33:44 +02:00
Laurent Destailleur
e985d24b52 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-02 02:11:39 +02:00
Laurent Destailleur
d6480594af Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-07-02 02:09:25 +02:00
Laurent Destailleur
6259d02042 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-07-02 02:08:10 +02:00
noec764
96a5479e9e FIX: Error mesg show untranslated extrafield name (#30227)
Co-authored-by: Noé <noe@scopen.fr>
2024-07-02 01:56:45 +02:00
Laurent Destailleur
454664c011 Fix protection against dynamic code too large 2024-07-02 01:37:42 +02:00
Laurent Destailleur
cc8f9ed26b Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-01 14:16:56 +02:00
Mohamed DAOUD
37f4c89760 New function to get public files of object (#30226)
* function commit

* Update website.lib.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-07-01 14:16:23 +02:00
Alexandre SPANGARO
f105f9339b Small review of asset module (#30213) 2024-07-01 13:02:08 +02:00
atm-jonathan
f6194ba3e5 New col showuserlogin contact (#30223)
* hook retour completeListOfReferent

* add showuserlogin in burger contact.php

* space pre-commit
2024-07-01 12:57:27 +02:00
Laurent Destailleur
8b9b3f9429 QUAL Use archiveOrBackupFile for MAIN_MAIL_DEBUG_LOG_WITH_DATE 2024-07-01 12:30:36 +02:00
Laurent Destailleur
965e53553a FIX Draft invoices must be excluded from stats and widgets 2024-07-01 03:40:31 +02:00
Laurent Destailleur
5ef4d40d4b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-01 01:22:54 +02:00
Noé Cendrier
4e15085d79 NEW: add trigger for linking and unlinking invoices (#30182)
* NEW: add trigger for linking and unlinking invoices

* Update discount.class.php

* Update discount.class.php

* Update discount.class.php

* trailing spaces

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-07-01 00:21:14 +02:00
Alexandre SPANGARO
96afcaa476 Better comments (#30200)
* Fix language

* Fix language

* Fix language

* Fix language

* Fix language

* Fix language

* Fix language

* CI Missing language key

* Update eventorganization.lang

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-06-30 21:02:50 +02:00
Frédéric FRANCE
4b275dc148 add phpdoc (#30208)
* add phpdoc

* add phpdoc

* add phpdoc

* add phpdoc

* clean phpdoc
2024-06-30 19:39:01 +02:00
Laurent Destailleur
0d4452bad2 Clean code 2024-06-30 15:40:19 +02:00
Laurent Destailleur
4ba6b0d2f0 Clean language 2024-06-30 15:26:31 +02:00
Laurent Destailleur
4dfef24f2f Doc 2024-06-30 15:03:52 +02:00
Laurent Destailleur
29434544e0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-06-30 15:01:42 +02:00
Laurent Destailleur
9f54e7f389 doc 2024-06-30 15:01:29 +02:00
lvessiller-opendsi
a967f94850 FIX force rounding mode 0 for expense report (#30191) 2024-06-30 15:01:19 +02:00
Laurent Destailleur
7ebf1effa0 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-06-30 14:57:55 +02:00
Laurent Destailleur
896bfeb050 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-06-30 14:57:01 +02:00
Laurent Destailleur
a51e71941b Fix syntax error 2024-06-30 14:52:27 +02:00
Laurent Destailleur
bde5687890 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-06-30 11:59:25 +02:00
Laurent Destailleur
675e761297 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/margin/tabs/productMargins.php
	htdocs/margin/tabs/thirdpartyMargins.php
2024-06-30 04:11:04 +02:00
Laurent Destailleur
db61320098 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0
Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/product/price.php
	htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
	htdocs/user/list.php
2024-06-30 04:05:46 +02:00
Laurent Destailleur
b2e288f8ec Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/core/menus/standard/eldy.lib.php
2024-06-30 03:53:16 +02:00
Laurent Destailleur
d7c2e78239 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0
Conflicts:
	htdocs/core/class/html.formmail.class.php
	htdocs/core/tpl/card_presend.tpl.php
2024-06-30 03:50:02 +02:00
Laurent Destailleur
f64e4b4981 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-06-29 20:53:10 +02:00
Laurent Destailleur
d6da8fafc2 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-06-29 20:49:12 +02:00
Laurent Destailleur
d4b49fac4a Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-06-29 20:49:03 +02:00
Laurent Destailleur
00b58c94c3 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-06-29 20:48:39 +02:00
Laurent Destailleur
300fd7c1c4 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2024-06-29 20:45:08 +02:00
Laurent Destailleur
70799e392f Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-06-29 20:44:41 +02:00
Laurent Destailleur
7a3cd723d4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-06-29 20:44:07 +02:00
Laurent Destailleur
deecb7a3ca Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-06-29 20:29:29 +02:00
Laurent Destailleur
f27dc99bf6 Fix test 2024-06-29 20:00:43 +02:00
Frédéric FRANCE
55bc8b7b15 phpdoc (#30180) 2024-06-29 19:36:32 +02:00
Frédéric FRANCE
291b071d96 fix Undefined variable $outlangs (#30197)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-06-29 19:33:36 +02:00
Frédéric FRANCE
c3b0466743 fix Undefined variable $outlangs (#30197)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-06-29 19:32:43 +02:00
lvessiller-opendsi
6cd3d7943d FIX orders to bill menu (#30179)
* FIX orders to bill menu

* only fix url menu

* FIX orders supplier to bill menu
2024-06-29 19:31:08 +02:00
Regis Houssin
fdf5fe0f26 FIX broken pdf preview when multicompany sharing (#30188)
* FIX broken pdf preview when multicompany sharing

* Update html.formmail.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-06-29 19:28:30 +02:00
Laurent Destailleur
bbbcf57756 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-06-29 19:25:59 +02:00
Laurent Destailleur
ca2313bdcc Code comment 2024-06-29 19:24:16 +02:00