Commit Graph

8223 Commits

Author SHA1 Message Date
Philippe GRAND
803505b6b7 Standardize and update code 2018-09-20 12:27:06 +02:00
Frédéric FRANCE
126e5ae3ad remove not needed require 2018-09-18 20:05:48 +02:00
Frédéric FRANCE
032f9729a5 correct trimParameters 2018-09-18 19:05:00 +02:00
Laurent Destailleur
61f5a2e899 Merge pull request #9533 from frederic34/trimParameters
trimParameters function
2018-09-18 15:04:32 +02:00
Laurent Destailleur
e65ec9f4ef Merge pull request #9530 from frederic34/patch-15
reduce complexity of cchargesociales class
2018-09-18 15:02:44 +02:00
Laurent Destailleur
e6791e1763 Merge pull request #9526 from frederic34/patch-10
completely comment unused code
2018-09-18 14:59:55 +02:00
Philippe GRAND
a1b15f170e Standardize and update code 2018-09-17 09:00:23 +02:00
Frédéric FRANCE
f935701d30 trimParameters 2018-09-16 15:35:19 +02:00
Frédéric FRANCE
b950043618 trimParameters 2018-09-16 15:16:08 +02:00
Frédéric FRANCE
367e202df0 reduce complexity of cchargesociales class 2018-09-16 13:54:17 +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
74a9c680df FIX "Other ..." link so the "Back to" link works. 2018-09-16 12:27:56 +02:00
Laurent Destailleur
f7c2bd877a Comment dead code 2018-09-16 10:39:30 +02:00
Laurent Destailleur
d6ee00f2e7 Fix constructors does not need return value 2018-09-16 10:22:23 +02:00
Frédéric FRANCE
7b3b020533 completely comment unused code 2018-09-16 09:41:38 +02:00
Laurent Destailleur
5eff159e27 Merge pull request #9489 from frederic34/patch-9
Completely comment unused code
2018-09-15 16:59:49 +02:00
Laurent Destailleur
961505d510 NEW Add filter on staff range in list of thirdparties 2018-09-14 01:29:03 +02:00
Frédéric FRANCE
a128ea821e Completely comment unused code 2018-09-12 22:49:32 +02:00
Frédéric FRANCE
987fdbe73c Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-12 21:29:41 +02:00
Frédéric FRANCE
ce76a2e714 Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-12 20:21:35 +02:00
Laurent Destailleur
82580cadf6 Merge pull request #9458 from frederic34/patch-17
Update account.class.php
2018-09-12 19:07:19 +02:00
Frédéric FRANCE
3e71f4e6b0 Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-12 18:36:49 +02:00
Frédéric FRANCE
998b67fa98 Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-12 18:32:15 +02:00
Laurent Destailleur
de8496773d Merge pull request #9441 from grandoc/new_branch_09_09_2018
New branch 09 09 2018
2018-09-12 18:24:34 +02:00
Laurent Destailleur
6291f18179 Merge pull request #9440 from frederic34/patch-5
Upper Lower Casing
2018-09-12 18:24:02 +02:00
Laurent Destailleur
fcabe67e4b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-12 13:30:28 +02:00
Laurent Destailleur
7bea9f5ffb FIX Lose filter on payment type or category after a sort on invoice list 2018-09-12 10:57:09 +02:00
Frédéric FRANCE
cdc5a174aa Update account.class.php 2018-09-11 00:29:01 +02:00
Frédéric FRANCE
7e0b1055db Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-09 13:36:53 +02:00
Frédéric FRANCE
f02b2f0239 Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-09 13:35:58 +02:00
Philippe GRAND
b40fe8e4c9 Standardize and update code 2018-09-09 12:07:14 +02:00
Frédéric FRANCE
a558c3bdac replace select_date 2018-09-09 11:25:59 +02:00
Philippe GRAND
7fcbd0fe42 Standardize and update code 2018-09-09 11:10:32 +02:00
Frédéric FRANCE
c2ad09cc0e replace select_date 2018-09-09 10:11:27 +02:00
Frédéric FRANCE
b2a58067d9 replace select_date 2018-09-09 09:56:33 +02:00
Frédéric FRANCE
a3fa13994b replace select_date 2018-09-09 09:36:12 +02:00
Frédéric FRANCE
ee8d56e047 Update card.php 2018-09-08 23:18:38 +02:00
Frédéric FRANCE
ef2ee8a6e4 Update card.php 2018-09-08 23:17:29 +02:00
Laurent Destailleur
84bbe8684b Fix scrutinizer 2018-09-08 18:38:24 +02:00
Frédéric FRANCE
80880d8fb9 replace select_date by selectDate 2018-09-08 13:00:39 +02:00
Frédéric FRANCE
2b62c4ca8f Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-08 10:50:27 +02:00
Laurent Destailleur
bcfb5fc42e Merge pull request #9425 from atm-maxime/8.0
FIX : Homepage links were using wrong topmenus
2018-09-07 19:35:10 +02:00
Laurent Destailleur
0ef17fe581 FIX Problems with permissions of module to record payment of salaries 2018-09-07 13:32:56 +02:00
Maxime Kohlhaas
a5f4a74ecc FIX : Homepage links were using wrong topmenus 2018-09-06 14:49:48 +02:00
Frédéric FRANCE
4e619dd0ed Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-05 18:51:21 +02:00
Philippe GRAND
056b0b26cc fix : Public member variable _fetched must not be prefixed with an underscore 2018-09-05 15:39:04 +02:00
Philippe GRAND
38ca6096b2 Standardize and update code 2018-09-05 10:31:12 +02:00
Frédéric FRANCE
7799774ca1 move phpcs:ignore 2018-09-04 22:52:55 +02:00
Laurent Destailleur
ab8155f170 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/card.php
	htdocs/filefunc.inc.php
2018-09-04 21:35:43 +02:00
Frédéric FRANCE
65b74ad30f Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-04 20:48:35 +02:00