Commit Graph

14849 Commits

Author SHA1 Message Date
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
Laurent Destailleur
eeb919dcda Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-16 14:24:13 +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
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
Laurent Destailleur
eebd329c7c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/core/modules/modAgenda.class.php
	htdocs/core/modules/modFacture.class.php
	htdocs/langs/en_US/admin.lang
	htdocs/langs/en_US/main.lang
	htdocs/stripe/transaction.php
2018-09-16 09:50:13 +02:00
Laurent Destailleur
55e7989552 FIX #9043 2018-09-16 09:42:30 +02:00
Laurent Destailleur
2c8064967b Code comment 2018-09-16 09:31:06 +02:00
Laurent Destailleur
272944983c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-09-16 09:27:54 +02:00
Laurent Destailleur
34b75828d3 Work on fix for #9043 2018-09-16 09:27:36 +02:00
Laurent Destailleur
6ba2127377
Merge pull request #9516 from grandoc/new_branch_15_09_2018
New branch 15 09 2018
2018-09-15 23:59:10 +02:00
Laurent Destailleur
69dcdcbe75
Merge pull request #9509 from grandoc/new_branch_14_09_2018
Standardize and update code
2018-09-15 17:30:14 +02:00
Laurent Destailleur
75f3dd94c6
Merge pull request #9506 from frederic34/printing
printing remove no camelcaps function
2018-09-15 17:29:21 +02:00
Laurent Destailleur
ecfbe0a568
Merge pull request #9499 from tarrsalah/fix-show-default-vat-rate
FIX #9497
2018-09-15 17:14:05 +02:00
Laurent Destailleur
76cdbc8bf1
Merge branch 'develop' into testsqlAndScript 2018-09-15 17:01:23 +02:00
Laurent Destailleur
bbfe4462dc NEW Add lib for multiselect with checkboxes
NEW Can select several prospect level in thirdparty filter.
Remove old multiselect lib that was not used by core.
2018-09-15 13:31:25 +02:00
Philippe GRAND
5c3a24a00c Standardize and update code 2018-09-15 11:51:21 +02:00
Philippe GRAND
5910e1ddf8 Standardize and update code 2018-09-15 11:15:59 +02:00
Philippe GRAND
7deccb3215 Standardize and update code 2018-09-15 11:06:35 +02:00
Philippe GRAND
0654b7b0ef Standardize and update code 2018-09-15 10:49:40 +02:00
Philippe GRAND
73c26a2d04 Standardize and update code 2018-09-15 10:47:50 +02:00
Philippe GRAND
fa1521d948 Standardize and update code 2018-09-14 15:09:23 +02:00
Philippe GRAND
ca9b1f155f Standardize and update code 2018-09-14 14:05:19 +02:00
Philippe GRAND
33d9e24bd6 Standardize and update code 2018-09-14 11:58:49 +02:00
Philippe GRAND
18f4755a90 Standardize and update code 2018-09-14 10:20:21 +02:00
Laurent Destailleur
16ed582124 Add comment 2018-09-14 01:45:03 +02:00
Laurent Destailleur
78e983a1f5 CSS v9 2018-09-13 16:39:50 +02:00
tarrsalah
08453a5337 FIX #9497
Extract $defaultcode and $defaulttxt from the value returned by
get_default_tva function .
2018-09-13 11:04:11 +01:00
Frédéric FRANCE
5862a5e2ee
printing remove no camelcaps function 2018-09-13 11:13:32 +02:00
Laurent Destailleur
ca85356b45
Merge pull request #9427 from frederic34/patch-6
deprecate Form::select_date
2018-09-12 22:07:23 +02:00
Laurent Destailleur
b4264ee0a0 Use font awesome for sort image 2018-09-12 21:57: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
Laurent Destailleur
c5e30b61c0 Fix translation 2018-09-12 21:25:14 +02:00
Laurent Destailleur
963d5eeddf
Merge pull request #9387 from frederic34/camelCaps2
start changing phpcs:ignore
2018-09-12 21:14:34 +02:00
Laurent Destailleur
b1d9846969
Merge pull request #9486 from grandoc/new_branch_12_09_2018
New branch 12 09 2018
2018-09-12 21:13:32 +02:00
Laurent Destailleur
9d9e2bc3e3
Merge pull request #9405 from fmarcet/develop
NEW: Highlight lines on lists when they are checked
2018-09-12 20:50:42 +02:00
Frédéric FRANCE
ce76a2e714
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-12 20:21:35 +02:00
Philippe GRAND
06cde1c35f Standardize and update code 2018-09-12 19:32:30 +02:00
Philippe GRAND
04017367f9 Standardize and update code 2018-09-12 19:24:45 +02:00
Laurent Destailleur
163bc55e4a
Merge pull request #9468 from jmarsac/numericextrafields9464
Convert localized numeric extrafields value before inserting/updating
2018-09-12 19:06:43 +02:00
Laurent Destailleur
7d726f9734
Merge pull request #9457 from frederic34/selectbarcodetype
Selectbarcodetype
2018-09-12 19:02:41 +02:00
ias-ceo
fece67b629 use correct resultset 2018-09-12 19:00:19 +02:00