Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
135,936 Commits 36 Branches 189 Tags
65049ee461fcd654664adc20a1f1519fa2bcaec6
Commit Graph

36140 Commits

Author SHA1 Message Date
Laurent Destailleur
e72d22b1ed Debug v20 2024-07-03 18:02:11 +02:00
Laurent Destailleur
8b69f7dd94 Debug v20 2024-07-03 15:59:59 +02:00
Laurent Destailleur
b56d325624 Debug v20 2024-07-03 15:40:22 +02:00
Laurent Destailleur
27a98f0f39 FIX mysql error during dump "/*!999999\- enable the sandbox mode */" 2024-07-03 15:25:48 +02:00
Laurent Destailleur
8b6ef4dfe0 Fix PDF_LOCALTAXx_LABEL_IS_CODE_OR_RATE 2024-07-03 15:25:19 +02:00
Laurent Destailleur
89d102c2b1 Quick hack to allow to hide vat rate 2024-07-03 14:27:57 +02:00
Laurent Destailleur
373e4da329 Debug v20 2024-07-02 23:41:07 +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
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
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
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
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
f27dc99bf6 Fix test 2024-06-29 20:00:43 +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
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
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
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
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
902065406b Debug v20 2024-06-27 09:20:04 +02:00
Laurent Destailleur
769240d5bb Debug v20 2024-06-27 03:26:35 +02:00
Laurent Destailleur
34aea4b5bc Debug v20 2024-06-27 00:49:50 +02:00
Laurent Destailleur
04f64714f1 Debug v20 2024-06-26 21:45:36 +02:00
Laurent Destailleur
d2a2e1a7e7 Fix octopus template must be visible if INVOICE_USE_SITUATIONis 2 only. 2024-06-26 17:39:01 +02:00
Alexandre SPANGARO
0cb82b4035 Situation invoice #29897 - Add specific model Octopus (#30116) 
* Situation invoice #29897 - Add specific model Octopus

* Fix phan

* Comment translation

* Fix phan

* add fix to octopus

* add fix to octopus

* Add fix octopus

* fix phan

fix phan

fix phan

fix phan

* fix phan

fix phan

fix phan

fix phan

* fix phan

* fix phan

* fix phan

* fix phan

* fix phan

* fix phan

* fix phan

* fix phan

* fix phan

* fix phan

* fix phan

* fix phan

* fix phan

* fix phan

* Cancel fix (compatibility php 8.x only)

* Add fix octopus

* Fix phan

* Fix phan

---------

Co-authored-by: Frédéric France <frederic.france@free.fr>
 2024-06-26 17:25:15 +02:00
Anthony Berton
44d4abd6a1 FIX - Online Sign pos on last page (#30158) 
Co-authored-by: Anthony Berton <anthony.berton@bb2a.fr>
 2024-06-26 17:06:08 +02:00
Christian Humpel
64f53fcc67 New: Add REST Api functionality for workstations (#30154) 2024-06-26 17:05:42 +02:00
Laurent Destailleur
bd2a0b9e55 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-06-25 15:13:51 +02:00
Frédéric FRANCE
e57e99fe19 fix warning with pgsql DoliDB.class.php (#30153) 2024-06-25 15:12:03 +02:00
Laurent Destailleur
a2971da463 Debug v20 2024-06-25 13:49:55 +02:00
Laurent Destailleur
7f52f47dfd Fix link for warning 2024-06-25 10:31:13 +02:00
John BOTELLA
322bbd934b fix : 19.0 fix inconsistent link validation (#30141) 
* Dirty fix for inconcistant link psedo langage

* add todo

* Update commonobject.class.php

* Update commonobject.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-06-24 22:53:43 +02:00
Frédéric FRANCE
702cca1502 fix $action is unknown (#30148) 
dafbefdc74
 2024-06-24 22:15:56 +02:00
Laurent Destailleur
57414242bd Debug v20 2024-06-24 15:55:45 +02:00
Laurent Destailleur
10e0f6f2ab Debug v20 - popup of combo go out of screen 2024-06-24 15:08:16 +02:00
Laurent Destailleur
9bd5477fc1 Debug v20 2024-06-24 12:58:44 +02:00
Laurent Destailleur
c54a97e923 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-06-24 01:47:18 +02:00