lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
90,904 Commits 43 Branches 150 Tags 886 MiB
f4e63bb046
Commit Graph

90904 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian HENRY
ca37827e72 Merge branch 'dev_objectrefferent_for_BOM' of github.com:FHenry/dolibarr into dev_objectrefferent_for_BOM 2020-10-14 11:20:48 +02:00
Florian HENRY
14a3e30270 fix travis 2020-10-14 11:20:27 +02:00
stickler-ci
8bfb04ea7f Fixing style errors. 2020-10-14 08:34:30 +00:00
Florian HENRY
08379cbfc6 Merge branch 'dev_objectrefferent_for_BOM' of github.com:FHenry/dolibarr into dev_objectrefferent_for_BOM 2020-10-14 10:32:07 +02:00
Florian HENRY
ee67d2b1a8 fixnhish bom product stats 2020-10-14 10:30:39 +02:00
Yamuna Adhikari
f46c0de35e
Merge pull request #6 from amunaadh/APItest_branch 
API test added for addUsers
 2020-10-14 13:04:27 +05:45
amunaadh
5d33761b13 API test added for addUsers 
Co-authored-by: Swikriti Tripathi <swikriti808@gmail.com>
 2020-10-14 13:03:38 +05:45
stickler-ci
7abb0caf91 Fixing style errors. 2020-10-14 06:47:16 +00:00
Florian HENRY
6ff58aafdc Merge github.com:Dolibarr/dolibarr into dev_objectrefferent_for_BOM 2020-10-14 08:43:07 +02:00
Florian HENRY
74155a49be finish BOM stat referent object 2020-10-14 08:42:57 +02:00
Laurent Destailleur
7838ca32ba Fix sql injection reported by Jason Nordenstam 2020-10-14 01:52:53 +02:00
Laurent Destailleur
4a3a3190ea Standardize pdf templates 2020-10-14 01:46:49 +02:00
bahfir abbes
8b0a6d7f40 fix:two fields with same ids is incorrect html 2020-10-14 00:21:12 +01:00
bahfir abbes
ad21f1e293 fix:boolean values in showinputfield are 1 and 0 not 'on' and 'off' 2020-10-14 00:15:51 +01:00
Laurent Destailleur
85825a0104 Init page for security info 2020-10-14 00:57:39 +02:00
bahfir abbes
4ee6cedbe6 Option d’Activation du fichier global de configuration. 2020-10-13 23:33:25 +01:00
Laurent Destailleur
c539c6d00d Responsive 2020-10-13 17:36:45 +02:00
stickler-ci
dcd8a88e72 Fixing style errors. 2020-10-13 13:28:23 +00:00
Sekan, Tobias
f28e1dc4fb cleanup 2020-10-13 15:27:42 +02:00
Regis Houssin
0407ab013c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_bug2 2020-10-13 15:09:54 +02:00
Sekan, Tobias
dfff32f239 Selectable columns on sales tax list 2020-10-13 15:09:25 +02:00
Laurent Destailleur
805fa00422 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-13 15:09:24 +02:00
Laurent Destailleur
d3b6ada4eb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/compta/stats/cabyprodserv.php
 2020-10-13 15:08:53 +02:00
Regis Houssin
00ee1a7433 FIX compatibility with LF (Line Feed) 2020-10-13 15:08:43 +02:00
Laurent Destailleur
f1f1f2b9c8 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-10-13 15:04:34 +02:00
Laurent Destailleur
496d429dcd Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-10-13 15:04:25 +02:00
Laurent Destailleur
029cc3734a
Merge pull request #15004 from hregis/develop_timestamp 
FIX update dolibarr.pl for Virtualmin
 2020-10-13 15:03:39 +02:00
Laurent Destailleur
98a4356e7c
Merge pull request #15005 from orebd/develop 
FIX unkwown column tms in llx_ecm_files.sql #14947
 2020-10-13 15:02:29 +02:00
Laurent Destailleur
035325152f Fix migration 2020-10-13 15:02:05 +02:00
davidNDU
43a029ef2f Model Builder template/class/myobject.class.php faulty SQL statement 2020-10-13 15:59:50 +03:00
Regis Houssin
1348c03ca0 FIX avoid spaces in file name 2020-10-13 14:46:17 +02:00
Aurélien
abfcb73a45
FIX unkwown columm tms #14947 2020-10-13 12:10:06 +02:00
Regis Houssin
dded02ebbf FIX update dolibarr.pl for Virtualmin 2020-10-13 12:06:28 +02:00
Laurent Destailleur
85f15b5f69 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-13 11:52:34 +02:00
Laurent Destailleur
969ed4acc1 Better label for status schedule of cron tasks. 2020-10-13 11:52:20 +02:00
Laurent Destailleur
32fe8a37b4
Merge pull request #14992 from TobiasSekan/SelectableColumnsOnSocialTaxesList 
NEW Select-able columns on social taxes list
 2020-10-13 11:11:06 +02:00
Laurent Destailleur
69432284d0
Merge pull request #14999 from andreubisquerra/master 
NEW: Add third order printer to TakePOS
 2020-10-13 11:03:41 +02:00
Laurent Destailleur
4f28b3e7ff
Merge pull request #15003 from grandoc/new_branch_13_10_2020 
fix Call to undefined method Form::formTransportMode()
 2020-10-13 11:03:11 +02:00
Laurent Destailleur
64e20959f6 Fix bad link 2020-10-13 11:00:56 +02:00
Laurent Destailleur
bc6b5d919a Better responsive 2020-10-13 10:51:51 +02:00
Laurent Destailleur
7c67dbf6d5 Better responsive 2020-10-13 10:05:47 +02:00
Philippe GRAND
d66a1ac350 fix Call to undefined method Form::formTransportMode() 2020-10-13 10:05:44 +02:00
Florian HENRY
4bf428fbf8 Merge github.com:Dolibarr/dolibarr into dev_objectrefferent_for_BOM 2020-10-13 08:13:54 +02:00
andreubisquerra
d80931429e
Fix travis 2020-10-12 22:34:05 +02:00
jove@bisquerra.com
54f9ed6346 NEW: Add third order printer to TakePOS 2020-10-12 22:07:05 +02:00
Laurent Destailleur
57702a1fb1 Retrieve commit a056d37f7255200ef0baf664a6b64516b2392dd9 2020-10-12 20:47:32 +02:00
Laurent Destailleur
e00cf0d37c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-12 19:40:13 +02:00
Laurent Destailleur
042a9f3efe Fix missing newtoken() 2020-10-12 19:39:54 +02:00
Laurent Destailleur
66a6415230
Merge pull request #14994 from grandoc/new_branch_12_10_2020 
fix : undefined index
 2020-10-12 19:37:37 +02:00
Laurent Destailleur
ff8f4c46d9
Merge pull request #14996 from Givriz/dev 
Fix : correction de commentaires
 2020-10-12 19:37:03 +02:00