Commit Graph

14886 Commits

Author SHA1 Message Date
Laurent Destailleur
12b449fe49 It's easier to select fields to show on list 2018-09-19 16:41:33 +02:00
Laurent Destailleur
ee788b543e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-19 15:06:42 +02:00
Laurent Destailleur
1d47569651 Brighter gradient 2018-09-19 15:06:14 +02:00
Laurent Destailleur
2643b6e1dd
Merge pull request #9558 from grandoc/new_branch_18_09_2018
Standardize and update code
2018-09-19 14:26:28 +02:00
Laurent Destailleur
2ec02afa8b Fix nb of module 2018-09-19 01:14:55 +02:00
Philippe GRAND
4536993fdc Standardize and update code 2018-09-18 17:34:01 +02:00
Philippe GRAND
c3db591d7b Standardize and update code 2018-09-18 17:31:01 +02:00
Philippe GRAND
73d161833a Standardize and update code 2018-09-18 17:26:20 +02:00
Philippe GRAND
d021a3d5af Standardize and update code 2018-09-18 17:24:10 +02:00
Philippe GRAND
30601accc3 Standardize and update code 2018-09-18 17:15:06 +02:00
Philippe GRAND
f28f3d12c2 Standardize and update code 2018-09-18 17:10:47 +02:00
Philippe GRAND
ac3efe1d5b Standardize and update code 2018-09-18 17:06:25 +02:00
Philippe GRAND
ad6ecc6231 Standardize and update code 2018-09-18 16:49:20 +02:00
Philippe GRAND
71d8356f6a Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_branch_18_09_2018 2018-09-18 16:48:32 +02:00
Philippe GRAND
b4692f0812 fix merge 2018-09-18 16:45:06 +02:00
Philippe GRAND
c3bbe70e2d fix merge 2018-09-18 16:38:14 +02:00
Laurent Destailleur
b67392b016 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-18 15:18:16 +02:00
Laurent Destailleur
52b6dd16da Standardize code 2018-09-18 15:18:07 +02:00
Laurent Destailleur
61f5a2e899
Merge pull request #9533 from frederic34/trimParameters
trimParameters function
2018-09-18 15:04:32 +02:00
Laurent Destailleur
1c13fbb122
Merge pull request #9532 from frederic34/patch-17
reduce complexity of commoninvoice class
2018-09-18 15:03:25 +02:00
Laurent Destailleur
1a31071a5e
Merge pull request #9527 from frederic34/patch-11
clean datepicker
2018-09-18 15:00:52 +02:00
Laurent Destailleur
dcc1c855fb
Merge pull request #9542 from frederic34/patch-24
reduce complexity of company lib
2018-09-18 14:58:17 +02:00
Laurent Destailleur
fa61ebeb9d
Merge pull request #9547 from grandoc/new_branch_17_09_2018
Standardize and update code
2018-09-18 14:57:50 +02:00
Laurent Destailleur
e07ce644e8 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/admin.lib.php
	htdocs/langs/en_US/admin.lang
2018-09-18 11:49:35 +02:00
Philippe GRAND
ad061f4e13 Standardize and update code 2018-09-18 11:14:21 +02:00
Philippe GRAND
c08f443f0a Standardize and update code 2018-09-18 11:09:56 +02:00
Philippe GRAND
72f906683f Standardize and update code 2018-09-18 11:02:18 +02:00
Laurent Destailleur
2d8eb034e3 FIX Maxi debug to allow to load chart of account with multicompany 2018-09-17 21:02:07 +02:00
Philippe GRAND
d1a27b33fb Standardize and update code 2018-09-17 17:28:05 +02:00
Philippe GRAND
b06516180b Standardize and update code 2018-09-17 15:06:41 +02:00
Laurent Destailleur
3fc3cc4688 Fix missing email in popup 2018-09-17 14:17:10 +02:00
Philippe GRAND
cd796bf682 Standardize and update code 2018-09-17 12:29:21 +02:00
Philippe GRAND
484b36c5aa Standardize and update code 2018-09-17 09:31:32 +02:00
Laurent Destailleur
0bf540b3c1 Fix regression in edition of date 2018-09-17 09:17:11 +02:00
Laurent Destailleur
797de131a6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-17 02:26:15 +02:00
Laurent Destailleur
f3f18bf8cb Fix sql 2018-09-17 02:23:11 +02:00
Frédéric FRANCE
aec1f779ff
reduce complexity of company lib 2018-09-16 21:40:28 +02:00
Frédéric FRANCE
b950043618
trimParameters 2018-09-16 15:16:08 +02:00
Laurent Destailleur
eeb919dcda Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-16 14:24:13 +02:00
Frédéric FRANCE
f9441d3249
Update commoninvoice.class.php 2018-09-16 14:07:11 +02:00
Laurent Destailleur
055a0b2859 Merge branch '8.0' of github.com:Dolibarr/dolibarr into 8.0 2018-09-16 13:29:13 +02:00
Laurent Destailleur
79b15b81f2 Fix list of tasks on time consumed 2018-09-16 13:28:37 +02:00
Laurent Destailleur
ab0f842db6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-16 12:55:44 +02:00
Laurent Destailleur
cc4fbfc3ef Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/core/class/commonobject.class.php
2018-09-16 12:54:39 +02:00
Laurent Destailleur
d06785e91a Fix responsive 2018-09-16 12:48:36 +02:00
Laurent Destailleur
4151ca49eb Fix position of menu 2018-09-16 12:15:33 +02:00
Frédéric FRANCE
2f633857af
clean datepicker 2018-09-16 11:26:39 +02:00
Laurent Destailleur
10c6bc44ca Fix scrutinizer 2018-09-16 10:28:41 +02:00
Laurent Destailleur
d6ee00f2e7 Fix constructors does not need return value 2018-09-16 10:22:23 +02:00
Laurent Destailleur
e90a60d4ee Remove warnings 2018-09-16 10:09:19 +02:00