Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
87,108 Commits 35 Branches 179 Tags 1.7 GiB
81fbb80823
Commit Graph

76606 Commits

Author SHA1 Message Date
VESSILLER
81fbb80823 FIX end div for responsive table 2020-06-05 14:20:38 +02:00
VESSILLER
304c44560d NEW add free text on each terminal of cash desk 2020-06-05 10:47:45 +02:00
Laurent Destailleur
bd56210e97 doc 2020-06-03 19:24:26 +02:00
Laurent Destailleur
7f1fea1e09 Add json-ld structure 'qa' 2020-06-03 19:23:36 +02:00
Laurent Destailleur
474860d546 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-03 14:06:35 +02:00
Laurent Destailleur
7b84518e59 Fix webp support 2020-06-03 14:05:18 +02:00
Laurent Destailleur
8023bc2fbb Fix cancel in media filemanager 2020-06-03 12:39:06 +02:00
Laurent Destailleur
51c578840c Fix cancel in media filemanager 2020-06-03 12:39:00 +02:00
Laurent Destailleur
ae3d786593 Fix crop on media file manager 
Conflicts:
	htdocs/core/ajax/ajaxdirpreview.php
	htdocs/core/photos_resize.php
	htdocs/theme/eldy/global.inc.php
 2020-06-03 12:38:42 +02:00
Laurent Destailleur
93320deddc Fix cancel in media filemanager 2020-06-03 12:34:09 +02:00
Laurent Destailleur
66df7fca41 Fix cancel in media filemanager 2020-06-03 11:40:51 +02:00
Laurent Destailleur
8894570054 Fix crop on media file manager 2020-06-03 11:20:59 +02:00
Laurent Destailleur
f92426034f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/website/index.php
 2020-06-03 01:06:27 +02:00
Laurent Destailleur
2965dda815 Typo 2020-06-03 01:02:48 +02:00
Laurent Destailleur
a37a4031e9 FIX Delete of website page need permission. Conflict with mass action. 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/website/index.php
 2020-06-03 01:02:19 +02:00
Laurent Destailleur
d4db1836d1 FIX Delete of website page need permission. Conflict with mass action. 2020-06-03 00:46:09 +02:00
Laurent Destailleur
71cb17b58b css 2020-06-02 20:58:56 +02:00
Laurent Destailleur
3755c7d25b css 2020-06-02 20:58:18 +02:00
Laurent Destailleur
9e6bb6f784 Sanitize params 2020-06-02 20:19:45 +02:00
Laurent Destailleur
a2287b3061 Trans 2020-06-02 20:19:14 +02:00
Laurent Destailleur
054d5c5f4c css 2020-06-02 17:00:08 +02:00
Laurent Destailleur
a9973ad60e Fix language key and css 2020-06-02 15:30:07 +02:00
Laurent Destailleur
658e7a2f87 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-02 13:32:09 +02:00
Laurent Destailleur
9a30d4ca44 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-02 13:32:02 +02:00
Laurent Destailleur
9651b5a7c9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-06-02 13:31:33 +02:00
Laurent Destailleur
3b4fe0d582 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/langs/en_US/main.lang
	htdocs/product/class/html.formproduct.class.php
 2020-06-02 13:31:22 +02:00
Laurent Destailleur
009780b895
Update html.formproduct.class.php 2020-06-02 12:13:55 +02:00
Laurent Destailleur
88a831c05a
Update html.formproduct.class.php 2020-06-02 12:12:07 +02:00
Laurent Destailleur
c6a53d9b3d
Update pdf_blochet.class.php 2020-06-02 12:09:11 +02:00
DEMAREST Maxime (Indelog)
7189e060e0 Fix line heiht overflow for blochet template 
Fixed if by adding dynamic line height calculation. Now line height depend on
bank field content or transmitter field content. You can use long text in this
fields.
 2020-06-02 11:17:37 +02:00
atm-lena
ae9c490134 Merge branch '11.0' of https://github.com/Dolibarr/dolibarr into 11.0_NEW_AddHook_SelectWarehouses 2020-06-02 09:55:56 +02:00
atm-lena
99b4bfc91e Movement of hook "selectwarehouse" 2020-06-02 09:53:30 +02:00
Laurent Destailleur
cd4c161ca7
Merge pull request #14005 from bafbes/abb110214 
Fix:To get translated, the key need to be one single word
 2020-06-01 21:09:53 +02:00
Laurent Destailleur
9a6b2f9dd7
Merge pull request #14004 from bafbes/abb110213 
new:DEFAULT_WAREHOUSE to define default in warehouse selections
 2020-06-01 21:05:48 +02:00
Laurent Destailleur
ebc65f7df7
Update stockcorrection.tpl.php 2020-06-01 21:05:32 +02:00
Laurent Destailleur
6ddabd51c0 Update commonobject.class.php 2020-06-01 21:03:42 +02:00
bahfir abbes
f2c7db63cf fix:le résultat de explode est troujours un array 2020-06-01 21:02:45 +02:00
Laurent Destailleur
14a3ab68e6
Merge pull request #14008 from bafbes/abb110217 
fix:the result of explode is always an array
 2020-06-01 21:02:15 +02:00
Laurent Destailleur
d3a769a0ab
Update commonobject.class.php 2020-06-01 21:02:05 +02:00
bahfir abbes
cb551cfd5a fix:non editable fields must not be editable in creation either 2020-06-01 20:58:20 +02:00
Laurent Destailleur
56e5a3dae6
Merge pull request #14009 from bafbes/abb110218 
fix:non editable fields must not be editable in creation either
 2020-06-01 20:57:55 +02:00
Laurent Destailleur
bdeee9ea99
Merge pull request #14007 from bafbes/abb110216 
fix:replace some bd field types by their correspondant field type
 2020-06-01 20:55:06 +02:00
Laurent Destailleur
52d0c1a9ae
Update index.php 2020-06-01 20:54:24 +02:00
Laurent Destailleur
0f5eed60a2 Update commonobject.class.php 2020-06-01 20:41:12 +02:00
bahfir abbes
2984edc752 fix:bad database quotation for booleans 2020-06-01 20:40:51 +02:00
Laurent Destailleur
9bf69f11c4
Merge pull request #14010 from bafbes/abb110220 
fix:bad database quotation for booleans
 2020-06-01 20:39:58 +02:00
Laurent Destailleur
2dac87621a
Update commonobject.class.php 2020-06-01 20:39:49 +02:00
Laurent Destailleur
33859bac2c
Merge pull request #14012 from andreubisquerra/master 
TakePOS QR customer menu
 2020-06-01 20:37:29 +02:00
Laurent Destailleur
69c3b4b4ea
Merge pull request #14015 from ptibogxiv/patch-342 
FIX php error
 2020-06-01 20:17:22 +02:00
Laurent Destailleur
b20e8b9d6b
Merge pull request #14013 from bafbes/abb110222 
fix:this is required to navigate by id
 2020-06-01 20:15:48 +02:00