Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
143,484 Commits 36 Branches 189 Tags
a90f0863de1a619a67ca19c20ed4484f94ece834
Commit Graph

14986 Commits

Author SHA1 Message Date
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
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
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
2f4c84f4b5 Debug v20 2024-06-29 13:23:05 +02:00
Laurent Destailleur
b574fe4c81 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-06-28 18:50:34 +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
1104b95137 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-06-27 13:47:27 +02:00
Laurent Destailleur
902065406b Debug v20 2024-06-27 09:20:04 +02:00
Laurent Destailleur
cfaadbaa7c Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-06-26 21:50:14 +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
lamrani abdelwadoud
6f40e309f1 Fix display all news of all website (#30146) 
* Fix display all news of all website

* fix type of variable

* Update page-sample-news.html

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-06-26 17:12:31 +02:00
Lucas Marcouiller
2cf322184e Fix php 8.3 warnings (#30160) 
* Fix php 8.3 warnings

* fix deprecation

---------

Co-authored-by: Hystepik <lmarcouiller@nltechno.com>
 2024-06-26 17:04:05 +02:00
Laurent Destailleur
22b50b2172 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-06-26 13:26:37 +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
Laurent Destailleur
db5ade973c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2024-06-25 11:18:31 +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
2e938fe9ef Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-06-24 12:44:28 +02:00
lvessiller-opendsi
34a98e369b FIX rounding update price for expense report lines (#30051) 
* FIX rounding update price for expense report lines

* fix phan ci error

* fix vat amount diff on rouding mode 1
 2024-06-24 02:26:37 +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
Laurent Destailleur
e8c5115068 Debug v20 2024-06-23 23:35:00 +02:00
Laurent Destailleur
86341f110c Debug v20 2024-06-23 21:31:44 +02:00
Christian Humpel
dafbefdc74 NEW: Hook do actions or check input after changing a extrafield in commonobject.class.php (#30128) 
* Integration Textbausteine weiter...

* fix typo.
 2024-06-23 18:00:44 +02:00
Zephyriony
ce2631db14 FIX #30132 (#30134) 
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-06-23 17:59:19 +02:00
Laurent Destailleur
adb354f97a Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-06-23 14:00:12 +02:00
boudet jean pascal
da4f526f77 test status contact (#30098) 
* test status contact

* Update notify.class.php

Signed-off-by: Laurent Destailleur <eldy@destailleur.fr>

---------

Signed-off-by: Laurent Destailleur <eldy@destailleur.fr>
Co-authored-by: jpb <jean-pascal.boudet@atm-consulting>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-06-22 16:07:46 +02:00
Alexandre SPANGARO
82d144c057 Situation invoice #29897 - CommonObject (#30118) 2024-06-22 15:57:38 +02:00
Laurent Destailleur
9bc84fdd4e Debug v20 2024-06-22 15:20:11 +02:00
Laurent Destailleur
9788caa298 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-06-22 13:01:21 +02:00
Laurent Destailleur
e60982b5ce Code comment 2024-06-21 13:18:50 +02:00
Frédéric FRANCE
7233e91b19 fix phpstan Property CommonDocGenerator::$extrafieldsCache (ExtraFields) in empty() is not falsy (#30089) 2024-06-19 19:21:45 +02:00
Laurent Destailleur
a618bf2ae6 Debug v20 2024-06-18 09:54:11 +02:00
Laurent Destailleur
9adb439c03 Look and feel v20 2024-06-17 14:13:25 +02:00
Laurent Destailleur
4af3e82922 Fix warnings 2024-06-17 14:06:21 +02:00
Laurent Destailleur
5037067cdc Fix hooks cache was broken by the sorting on priotity 2024-06-17 10:14:39 +02:00
Laurent Destailleur
bd2bad2ea5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-06-16 13:17:21 +02:00
Frédéric FRANCE
4372f329b8 phpstan ignore unused method in evalmath.class.php (#30048) 2024-06-16 12:56:42 +02:00
Laurent Destailleur
4532866f0f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-06-16 12:12:03 +02:00
Laurent Destailleur
d9ac7581fa Fix look and feel v20 2024-06-16 12:11:47 +02:00
Frédéric FRANCE
f25c1ffde4 ignore phpstan level 4 (#30046) 2024-06-16 11:10:26 +02:00
Laurent Destailleur
1c2c3c36ad Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-06-16 01:33:58 +02:00
Laurent Destailleur
534606ed96 Prepare 20.0 2024-06-16 01:33:35 +02:00
Laurent Destailleur
99f0888ed0 Fix #30021 2024-06-15 15:52:21 +02:00
Laurent Destailleur
e4db878042 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-06-15 14:53:53 +02:00