Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-06 00:53:00 +01:00
Code Issues Packages Projects Releases Wiki Activity
122,903 Commits 37 Branches 191 Tags
fbcb6da4e7dec929fc4dbdff3dc83fe05e4b96bf
Commit Graph

645 Commits

Author SHA1 Message Date
Laurent Destailleur
8f9ee9eb35 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 
Conflicts:
	htdocs/core/lib/project.lib.php
	htdocs/societe/class/societe.class.php
 2023-07-19 02:03:34 +02:00
Laurent Destailleur
6d64026b93 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-07-19 01:52:19 +02:00
Laurent Destailleur
b55be51b4f Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/core/lib/agenda.lib.php
 2023-07-19 01:50:18 +02:00
Laurent Destailleur
8fb316c5dc Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/product/card.php
 2023-07-19 01:48:02 +02:00
Laurent Destailleur
63f112aea0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/compta/bank/bankentries_list.php
	htdocs/product/card.php
	htdocs/projet/activity/perday.php
 2023-07-19 01:46:22 +02:00
Laurent Destailleur
57fbdded8d Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-07-10 03:25:54 +02:00
Laurent Destailleur
aae4598405 Fix phpcs 2023-07-09 12:55:44 +02:00
jyhere
862dbf7e23 FIX: quickedit code missing on product card 2023-07-07 11:42:54 +02:00
Laurent Destailleur
b5cdb1b88c Debug v18 2023-06-28 15:15:37 +02:00
Laurent Destailleur
ca54766617 Merge pull request #24978 from OPEN-DSI/develop_fix_clone_product 
FIX: Fix error managment of product clone
 2023-06-19 04:10:49 +02:00
Laurent Destailleur
6b94d60d9a Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-06-16 01:36:46 +02:00
Laurent Destailleur
00431c1ece Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-06-16 01:09:56 +02:00
Laurent Destailleur
2fe9e24961 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-06-16 00:56:43 +02:00
Laurent Destailleur
0d46edd121 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-06-16 00:45:37 +02:00
Maxime Kohlhaas
ab49f3d13b Fix #23946 : wrong backtopage from warehouse to product 2023-06-10 17:42:52 +02:00
kkhelifa
8629191a86 FIX: Fix error managment of product clone 2023-06-07 12:28:20 +02:00
Frédéric France
fd4c24e000 use user hasRight 2023-06-05 23:49:13 +02:00
Laurent Destailleur
ebfe632efe Debug v18 2023-06-03 15:33:46 +02:00
hystepik
46012a6520 fix : php 8.1 warnings 2023-05-16 15:36:27 +02:00
Laurent Destailleur
d0a8d0aaaa Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-03-24 13:54:43 +01:00
Frédéric FRANCE
d3bbb29ed6 Fix filter syntax on product card 2023-03-22 09:34:21 +01:00
Laurent Destailleur
da000f816a Fix warning 2023-03-21 19:02:14 +01:00
Frédéric FRANCE
30aa377528 use isModEnabled 2023-03-08 08:50:19 +01:00
Frédéric FRANCE
1692a08322 add pictos 2023-03-03 15:38:01 +01:00
Frédéric FRANCE
8ed361b917 add pictos 2023-03-03 14:36:34 +01:00
Laurent Destailleur
2168578f2e Fix inline css 2023-02-18 14:00:25 +01:00
Frédéric FRANCE
ae48571135 use user->hasRight 2023-02-14 22:56:12 +01:00
Laurent Destailleur
cd2e82f4a5 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-07 00:22:27 +01:00
Laurent Destailleur
95b306ba84 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-02-07 00:19:54 +01:00
Laurent Destailleur
ff4ea81429 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-02-04 16:11:16 +01:00
Mélina JOUM
e10a7de3e0 stickler-ci error 2023-02-02 17:52:07 +01:00
Mélina JOUM
f46d9f1a15 Fix GETPOST 2023-02-02 15:54:24 +01:00
Mélina JOUM
4b61ef946a Fix 2023-02-02 11:44:10 +01:00
Mélina JOUM
afa1fd3e8a Get data back on product update 2023-02-01 16:51:13 +01:00
mgabriel
35b05cfc7b Implements MAIN_SECURITY_ALLOW_UNSECURED_REF_LABELS for product refs and labels. 2023-01-26 11:00:00 +01:00
hystepik
32da192db4 fix : php 8.1 warnings 2023-01-24 14:32:20 +01:00
Laurent Destailleur
8850f56c01 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-12-30 19:29:42 +01:00
Laurent Destailleur
95986647b4 Fix php8 compatibility 2022-12-30 14:56:55 +01:00
Laurent Destailleur
8abde17e95 Fix warning 2022-12-30 12:15:18 +01:00
Laurent Destailleur
8e82bb7148 Clean code 2022-12-30 02:02:34 +01:00
Laurent Destailleur
6824f82cc8 Fix warnings 2022-12-28 13:58:23 +01:00
Laurent Destailleur
208306cb71 Clean code 2022-12-28 12:42:44 +01:00
Laurent Destailleur
50c76110bb Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2022-12-14 11:19:12 +01:00
Laurent Destailleur
62b0447c7b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-14 11:02:23 +01:00
Juanjo Menent
9b3f6cfa5a Fix #23142 2022-12-09 20:38:44 +01:00
Anthony Berton
4ba0283e0b FIX - PHP Warning and use isModEnabled 2022-12-07 09:59:30 +01:00
Laurent Destailleur
013d242943 Merge FCKEDITOR_ENABLE_DETAILS and FCKEDITOR_ENABLE_PRODUCTDESC. 
The 2 options has similar effect, only one in code is required.
 2022-10-25 17:16:14 +02:00
Laurent Destailleur
1f9424a4b3 Clean code/options 2022-10-25 11:34:31 +02:00
Laurent Destailleur
cd9984cd3e Update card.php 2022-10-24 19:19:41 +02:00
stickler-ci
b048d95cc8 Fixing style errors. 2022-10-20 16:09:26 +00:00