Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
130,797 Commits 36 Branches 189 Tags
a2c92f183cc54c35013469638780c28e65df0b51
Commit Graph

10504 Commits

Author SHA1 Message Date
Alexandre SPANGARO
8d203f4fd4 Debug v19 (#26784) 
* Translate comment

* Fix undefined variable

* Fix undefined variable

* Fix undefined variable - better fix

* Add translation of ProfId so that it is not displayed in admin

* Remove manual definition and call getDefaultImageSizes() instead
 2023-11-23 17:45:59 +01:00
Laurent Destailleur
1c7239e6ff Fix type 2023-11-23 17:19:10 +01:00
atm-jonathan
48ba0ec2d0 FIX warning param $lineID getSpecialCode is negatif (#26826) 
* FIX warning param $lineID getSpecialCode is negatif

* retour de PR

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-11-23 17:12:57 +01:00
atm-jonathan
253ebd0a8b FIX warning php8.2 undefined_array_key (#26830) 2023-11-23 17:08:07 +01:00
Frédéric FRANCE
25435eeb1a fix phpdoc (#26829) 
* fix phpdoc

* Update pdf.lib.php
 2023-11-23 17:07:32 +01:00
Frédéric FRANCE
0e4d06c8f4 NEW add tpl for delivery (#26789) 
* add tpl for delivery

* fix tooltip
 2023-11-22 09:32:08 +01:00
Laurent Destailleur
57de870989 FIX Test on permission for holiday tooltips 2023-11-21 16:20:21 +01:00
Laurent Destailleur
c1aefa75a7 FIX delivery note disappear after generation 2023-11-20 21:49:25 +01:00
Laurent Destailleur
eb0eac0dfa FIX delivery note disappear after generation 2023-11-20 21:47:48 +01:00
IC-Nicolas
78259c37ce Duplicate entries (#26759) 2023-11-20 20:17:24 +01:00
Laurent Destailleur
ff38cc4bdd Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-20 20:02:30 +01:00
Laurent Destailleur
cabd0937d0 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-11-20 19:59:34 +01:00
Laurent Destailleur
d1a80920ff Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-11-20 19:53:50 +01:00
Laurent Destailleur
090ecd3611 Debug v19 2023-11-20 12:31:30 +01:00
Laurent Destailleur
1a6d8e304d Fix responsive and css. Rename time spent. 2023-11-20 11:41:02 +01:00
Frédéric FRANCE
cb26b28869 Update functions2.lib.php (#26734) 
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-11-19 01:02:21 +01:00
Regis Houssin
030f7ffde1 FIX avoid php8.2 warnings (#26720) 
* FIX avoid php8.2 warnings

* FIX avoid travis error

* FIX travis error

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-11-19 00:56:46 +01:00
Laurent Destailleur
9d26ccb801 Missing dbversion 2023-11-18 19:03:47 +01:00
Maxime Kohlhaas
ef1916f0db Fix : translated product desc was overwriting desc even if text was added after (#26687) 2023-11-18 14:15:34 +01:00
Laurent Destailleur
1508d2121c Code comment 2023-11-18 02:11:59 +01:00
Laurent Destailleur
1b91a9f83b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-11-18 01:24:59 +01:00
Maxime Kohlhaas
a680d1e34d Fix strpos inversion for expedition and receipt in files.lib (#26701) 2023-11-18 00:42:15 +01:00
Laurent Destailleur
a0bba05b02 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/api_orders.class.php
	htdocs/compta/facture/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/project.lib.php
	htdocs/fourn/class/api_supplier_orders.class.php
	htdocs/fourn/class/fournisseur.facture-rec.class.php
	htdocs/langs/en_US/stocks.lang
 2023-11-17 18:24:53 +01:00
Maxime Kohlhaas
c756aa8ad3 Fix tasklist extrafields (#26672) 
* Fix : value of extrafields not displayed in task list on a project

* Fix : icon to select columns was not displayed
 2023-11-17 16:39:49 +01:00
Laurent Destailleur
ac248dfd90 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-11-17 12:03:56 +01:00
Laurent Destailleur
042d583070 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-11-17 12:03:38 +01:00
Laurent Destailleur
6ea48ac22a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-11-17 12:02:21 +01:00
HENRY Florian
70a5a85eac fix: various getDol, display error on public page (#26652) 
* fix: various getDol, display error on public page

* fix: various getDol, display error on public page
 2023-11-17 11:39:16 +01:00
VESSILLER
1ace52251a Merge branch 'develop' of github.com:Dolibarr/dolibarr into new-webportal-module 2023-11-17 10:40:51 +01:00
Eric
337fa2ac67 add category map to categorie (#26649) 2023-11-17 03:44:15 +01:00
lvessiller-opendsi
f5af28e1fb NEW substitute expiration date (#26628) 2023-11-16 23:36:31 +01:00
Maxime Kohlhaas
de0b733430 Fix : missing getEntity for hrm public holiday (#26627) 2023-11-16 23:27:20 +01:00
moreauftheobald
279343ee56 Ddevelop fix product class (#26632) 
* Add entity management on contact list on thirdparty card

* Correction On procduct class files "Access to an undefined property"
 2023-11-16 23:26:08 +01:00
Laurent Destailleur
c0510fc0f5 Debug v19 2023-11-14 20:59:31 +01:00
sonikf
0fbc5bd423 NEW: Supplier template invoive extrafields (#26570) 
* NEW: Supplier template invoive extrafields

* NEW: Supplier template invoive extrafields

* NEW: Supplier template invoive extrafields
 2023-11-14 14:46:48 +01:00
Regis Houssin
c9d2d77fef NEW add barcode function to check if EAN13 is valid (#26567) 2023-11-14 01:54:04 +01:00
Laurent Destailleur
804ee3b517 Debug v19 and option MAIN_DISALLOW_URL_INTO_DESCRIPTIONS 2023-11-14 01:32:42 +01:00
Laurent Destailleur
ca3f5eaadf Debug v19 2023-11-14 00:56:30 +01:00
Laurent Destailleur
d5139398cd Remove warning we should not have in a common usage. 2023-11-13 19:08:33 +01:00
Laurent Destailleur
061f340f90 Debug v19 2023-11-13 15:20:56 +01:00
Laurent Destailleur
c8c8618e55 Debug v19 2023-11-13 15:17:55 +01:00
Laurent Destailleur
69642e1048 Fix missing the src type and id when uploading a file as a message of 
ticket
 2023-11-13 12:36:38 +01:00
Laurent Destailleur
2d6559d74f Fix warning 2023-11-13 02:42:47 +01:00
Laurent Destailleur
2f340a1a77 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 
Conflicts:
	htdocs/accountancy/journal/expensereportsjournal.php
	htdocs/comm/propal/card.php
 2023-11-12 23:06:31 +01:00
Laurent Destailleur
201ad75360 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 
Conflicts:
	htdocs/accountancy/journal/expensereportsjournal.php
 2023-11-12 23:02:18 +01:00
Laurent Destailleur
bd2285ab91 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-11-12 22:58:37 +01:00
Laurent Destailleur
1dbb3f1f34 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/product/stock/stockatdate.php
 2023-11-12 22:58:23 +01:00
Laurent Destailleur
17ca6f651c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-11-12 22:18:06 +01:00
Laurent Destailleur
b709de584c Debug v19 2023-11-11 15:35:23 +01:00
lamrani abdelwadoud
c4b2555667 Fix massaction checkbox for display it on right side (#26539) 2023-11-10 18:49:20 +01:00