Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-07 08:31:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
89,109 Commits 39 Branches 191 Tags
9165ea9e673a0e4f743d43a627cda170ce5547eb
Commit Graph

78410 Commits

Author SHA1 Message Date
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
Laurent Destailleur
0362d28cf7 Update commonobject.class.php 2020-06-01 20:13:27 +02:00
Laurent Destailleur
5141fe0a74 Merge pull request #14017 from andreubisquerra/12.0 
Fix QR and add QR customer menu
 2020-06-01 20:07:21 +02:00
andreubisquerra
b0f904508a Fix travis 2020-06-01 17:52:38 +02:00
Florian Mortgat
3213148d87 FIX 11.0 - when using pdftk as per hidden conf USE_PDFTK_FOR_PDF_CONCAT, check that the file exists before displaying a success message 2020-06-01 17:12:02 +02:00
andreubisquerra
8abe60db0b Add Restaurant QR menu 2020-06-01 17:05:22 +02:00
andreubisquerra
3cc249a887 Update QR 2020-06-01 17:04:23 +02:00
andreubisquerra
5325971517 Update settings 2020-06-01 17:02:11 +02:00
andreubisquerra
c60982ce60 Update langs 2020-06-01 16:58:05 +02:00
Laurent Destailleur
2324834b73 Debug modulebuilder for doc generation 
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/modulebuilder/template/admin/setup.php
 2020-06-01 16:47:50 +02:00
Laurent Destailleur
38001a4e89 Fix perms 2020-06-01 16:46:11 +02:00
Laurent Destailleur
58e76947ac Debug modulebuilder for doc generation 2020-06-01 16:44:22 +02:00
Laurent Destailleur
b648f30482 Fix perms 2020-06-01 14:52:26 +02:00
Laurent Destailleur
adb20c6a90 checkstyle 2020-06-01 12:36:09 +02:00
Laurent Destailleur
c4d8f0b6cc css 2020-06-01 12:35:27 +02:00
florian HENRY
c655720b78 fix travis 2020-06-01 10:51:50 +02:00
florian HENRY
2337d75d92 better fix for #13968 2020-06-01 10:43:57 +02:00
florian HENRY
face2d644e Merge branch '11.0' of github.com:Dolibarr/dolibarr into 11.0 2020-06-01 10:05:07 +02:00
Laurent Destailleur
c8d0476728 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
 2020-06-01 04:09:52 +02:00
Laurent Destailleur
dbac97a908 Fix several troubles into numbering modules. 
Prefix for takepos moved from TK to TC (TK was already used for tasks)
 2020-06-01 04:02:47 +02:00
Laurent Destailleur
838a13cec1 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-01 02:41:11 +02:00
Laurent Destailleur
5a8c4ad3f5 Debug modulebuilder 2020-06-01 00:01:23 +02:00
Laurent Destailleur
4af17a342c Doc 2020-06-01 00:00:24 +02:00
Laurent Destailleur
e83b754e6f Debug modulebuilder 2020-05-31 23:32:36 +02:00
Laurent Destailleur
f63aa7f527 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
 2020-05-31 23:27:20 +02:00
Laurent Destailleur
28df07225d Debug modulebuilder 2020-05-31 23:23:56 +02:00
Laurent Destailleur
3349144f5e Fix lose enabled and default when editing field signatures in 
modulebuilder
 2020-05-31 23:23:42 +02:00
Laurent Destailleur
67f007ea40 Fix length of field. Make some module die. 2020-05-31 23:12:26 +02:00
Laurent Destailleur
62dacfa713 Debug modulebuilder 2020-05-31 23:11:49 +02:00
Laurent Destailleur
c04903d15c Fix debug modulebuilder for doc and ref generation 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2020-05-31 23:01:13 +02:00