Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
135,900 Commits 36 Branches 189 Tags
37f4c89760e766d0a1a3bbbf9503dba93f83c75c
Commit Graph

135900 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
760021b32f Typo in en_US language (#30212) 2024-07-01 13:00:33 +02:00
Laurent Destailleur
69b3469015 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-07-01 12:53:49 +02:00
Frédéric FRANCE
b2626efd4d fix phan (#30218) 2024-07-01 12:52:05 +02:00
Laurent Destailleur
e6138f8744 Fix br 2024-07-01 03:47:01 +02:00
Laurent Destailleur
d717721709 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-07-01 03:41:06 +02:00
Laurent Destailleur
0bda54186e Remove space 2024-07-01 03:37:55 +02:00
Laurent Destailleur
07c6e36a3a Fix for #30170 2024-07-01 01:22:04 +02:00
Laurent Destailleur
388c78cf63 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-07-01 00:44:30 +02:00
Laurent Destailleur
90918f0687 Fix fatal error 2024-07-01 00:42:46 +02:00
Frédéric FRANCE
977e7a18e2 fix phpstan for 20.0 (#30205) 2024-06-30 19:38:43 +02:00
Christian Humpel
e025c543f7 Fix: Api MRP ProduceAndConsume if MoLine option "disable_stock_change" is true (#30181) 
* Fix: Api MRP ProduceAndConsume if MoLine option "disable_stock_change" is true.

* fix typo
 2024-06-30 15:11:57 +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
c7aec87a6d Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-06-30 12:00:15 +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
Frédéric FRANCE
082e7d4d4b fix syntax error in branch 19.0 (#30201) 
* fix syntax error in branch 19.0

* Update stocktransfer.class.php
 2024-06-30 11:29:03 +02:00
Frédéric FRANCE
5e7f43f9d0 Update eventorganization.lang (#30198) 2024-06-30 11:28:09 +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
49e10cf398 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-06-29 20:27:23 +02:00
Laurent Destailleur
f27dc99bf6 Fix test 2024-06-29 20:00:43 +02:00
Alexandre SPANGARO
bd39e561ab Situation invoice - Fix admin message (#30172) 
* Situation invoice - Fix admin message

* Indent
 2024-06-29 19:37:35 +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
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
Alexandre SPANGARO
2e6af87823 FIX User List - Function is show in wrong column when module HRM enabled (#30186) 2024-06-29 19:30:06 +02:00
noec764
42d9b384d4 FIX: Bad calculation of $nbtotalofrecord (#30183) 
Co-authored-by: Noé <noe@scopen.fr>
 2024-06-29 19:29:14 +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
03bd82f61b Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-06-29 19:21:27 +02:00
HENRY Florian
4f5f7ea209 fix: add missing button to validate survey (#30189) 2024-06-29 19:17:37 +02:00
Laurent Destailleur
0a319c6748 Fix setup of emails 2024-06-29 16:42:42 +02:00
Laurent Destailleur
3cff90a282 Fix setup of email 2024-06-29 16:14:21 +02:00
Laurent Destailleur
c6a6778955 Debug v20 2024-06-29 15:48:14 +02:00
Laurent Destailleur
1fc26b29db Debug v20 2024-06-29 14:17:02 +02:00
Laurent Destailleur
56f4127959 css 2024-06-29 13:56:21 +02:00
Laurent Destailleur
32afd1515f Debug v20 2024-06-29 13:27:36 +02:00
Laurent Destailleur
2f4c84f4b5 Debug v20 2024-06-29 13:23:05 +02:00
Laurent Destailleur
e9487a2c90 FIX barcode auto generated must work with both -1 and 'auto' 2024-06-28 18:48:27 +02:00
Laurent Destailleur
9c5bd56674 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-06-28 18:28:30 +02:00
Laurent Destailleur
a6a6541638 Fix security 2024-06-28 18:26:49 +02:00
Laurent Destailleur
5ddf992838 Clean code 2024-06-28 18:18:57 +02:00
Frédéric FRANCE
409bccb4f0 fix phan api_workstations.class.php (#30169) 
* fix api_workstations.class.php

* Update api_workstations.class.php

* Update api_workstations.class.php

* Update api_workstations.class.php

* Update html.formwebsite.class.php
 2024-06-27 16:39:15 +02:00
Laurent Destailleur
de4ebc34cc Debug v20 FIX emailcollector error mngt and support special char 2024-06-27 13:45:44 +02:00
Laurent Destailleur
0a15655720 Debug v20 2024-06-27 10:41:55 +02:00