Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-03-04 01:25:53 +01:00
Code Issues Packages Projects Releases Wiki Activity
100,828 Commits 39 Branches 192 Tags
2bef8a27c8cb871a46a6cc9b56184e8337151ced
Commit Graph

88987 Commits

Author SHA1 Message Date
Laurent Destailleur
2bef8a27c8 Trans 2021-07-09 12:34:51 +02:00
Laurent Destailleur
823d360202 Fix reposition 2021-07-09 12:15:43 +02:00
Laurent Destailleur
05953d61e4 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-07-08 23:45:50 +02:00
Laurent Destailleur
463fadb776 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/class/html.form.class.php
 2021-07-08 23:45:26 +02:00
Laurent Destailleur
5b6358d938 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-07-08 23:43:19 +02:00
Laurent Destailleur
fb9d16a84a Merge pull request #18109 from altairisfr/lot_sn_masks 
FIX : don't display custom masks if they are not used
 2021-07-08 23:42:48 +02:00
Laurent Destailleur
2314c5dda2 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-07-08 23:41:16 +02:00
Laurent Destailleur
aa9d98a336 Clean code of lib_notification. Now use cache like other js. 2021-07-08 23:20:55 +02:00
Laurent Destailleur
4e69afb253 Merge pull request #18119 from aspangaro/14p4 
Update product/card.php
 2021-07-08 22:26:18 +02:00
Alexandre SPANGARO
f4005cd7a7 Update product/card.php 2021-07-08 22:24:20 +02:00
Laurent Destailleur
a916f668f9 Fix param of include js 2021-07-08 22:16:47 +02:00
Alexandre SPANGARO
be62c2f7f4 FIX Problem of z-index with popup and top menu 2021-07-08 22:11:41 +02:00
Laurent Destailleur
6539961d58 Update card.php 2021-07-08 21:59:20 +02:00
Laurent Destailleur
5c8ac0cb9d Update card.php 2021-07-08 21:59:12 +02:00
Alexandre SPANGARO
d6be380816 FIX Accountancy - constant ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY 2021-07-08 21:58:54 +02:00
Alexandre SPANGARO
cd215cda17 FIX Accountancy - if we define a date start, automatic binding try to solve old binding 2021-07-08 21:49:53 +02:00
Laurent Destailleur
12b1f5b23b Fix sql 2021-07-08 21:05:56 +02:00
Laurent Destailleur
ddc37ef38c Fix missing lang param 2021-07-08 20:58:19 +02:00
Laurent Destailleur
ec4533142a Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-07-08 18:16:02 +02:00
Laurent Destailleur
1209253d57 Sanitize data 2021-07-08 18:12:15 +02:00
Laurent Destailleur
c3bf4f4b7f Merge pull request #18113 from aspangaro/13p10 
Fix: formconfim if type radio must be :checked to get correct value
 2021-07-08 17:35:27 +02:00
Laurent Destailleur
b01468e47a Merge pull request #18115 from ATM-Consulting/FIX_14.0_version_checker 
FIX: in kanban view, Dolibarr says "no updates available" even if upd…
 2021-07-08 17:34:47 +02:00
Laurent Destailleur
a44d646946 Fix to allow html content 2021-07-08 17:31:41 +02:00
Laurent Destailleur
e83df92359 Trans 2021-07-08 17:25:14 +02:00
altairis-noe
9983163e7a a few more getDolGlobalString 2021-07-08 17:21:36 +02:00
Florian Mortgat
38fac48c30 FIX: in kanban view, Dolibarr says "no updates available" even if updates are available 2021-07-08 17:18:47 +02:00
Alexandre SPANGARO
eaa6987e8b Fix: formconfim if type radio must be :checked to get correct value 2021-07-08 17:15:03 +02:00
altairis-noe
66590ba810 getDolGlobalString instead of $conf->global 2021-07-08 17:10:03 +02:00
altairis-noe
68442a2d13 stickler corrections 2021-07-08 16:49:13 +02:00
altairis-noe
cbd8fa3572 better element id 2021-07-08 16:42:54 +02:00
Laurent Destailleur
856d6eab4a Merge pull request #18102 from altairisfr/expe_extra 
FIX display of extrafields on shipping lines
 2021-07-08 16:35:38 +02:00
Laurent Destailleur
b84fc94324 Merge pull request #18104 from fappels/14_fix_php8_warning_part4 
14 fix php8 warning on user page
 2021-07-08 16:31:25 +02:00
Laurent Destailleur
7870336f2a Update card.php 2021-07-08 16:31:01 +02:00
Laurent Destailleur
a521a61f6b Merge pull request #18108 from fappels/14_patch_product_class 
Remove duplicate code in product class
 2021-07-08 16:29:21 +02:00
altairis-noe
4e77a0d16a don't display custom masks if they are not used 2021-07-08 15:55:07 +02:00
Laurent Destailleur
ad11f7b66d Fix type of param 
Fix test of ckeditor for html doc
Fix when MAIN_RESTRICTHTML_ONLY_VALID_HTML is on
 2021-07-08 13:59:04 +02:00
Francis Appels
d6c327ed85 Remove duplicate code 2021-07-08 13:17:07 +02:00
Laurent Destailleur
1380344fdb Fix PHP 8 2021-07-08 12:17:32 +02:00
Laurent Destailleur
16ee47b12c Fix warning. 
Reduce memory need for getmin/max on large graphs.
 2021-07-08 11:13:15 +02:00
Laurent Destailleur
2acbdc2c80 Fix avoid error message 2021-07-07 18:51:00 +02:00
Laurent Destailleur
9308fab7ca Fix css for field pos/position in dictionary. 
Conflicts:
	htdocs/admin/dict.php
 2021-07-07 18:46:11 +02:00
Francis Appels
a942183127 better fix for optioncss 2021-07-07 15:02:00 +02:00
Francis Appels
0e2c57fe65 Fix php 8 warning on user page 2021-07-07 14:50:10 +02:00
Laurent Destailleur
01e272fb8c Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-07-07 14:40:55 +02:00
Laurent Destailleur
2f25079981 Fix CSRF token generation must be fast, can have low entropy. 2021-07-07 14:40:47 +02:00
Laurent Destailleur
d97a95aa2a Fix CSRF token generation must be fast, can have low entropy. 2021-07-07 14:38:52 +02:00
Christophe Battarel
7e174412b7 FIX display of extrafields on shipping lines 2021-07-07 10:30:01 +02:00
Laurent Destailleur
3bc896be57 Debug v14 2021-07-07 02:07:35 +02:00
Laurent Destailleur
48435eb911 Fix navigation links 2021-07-07 01:58:06 +02:00
Laurent Destailleur
ff94c60cc7 Fix GETPOST with restricthtml 2021-07-07 01:45:31 +02:00