Commit Graph

14820 Commits

Author SHA1 Message Date
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
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
78e983a1f5 CSS v9 2018-09-13 16:39:50 +02: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
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
7d726f9734
Merge pull request #9457 from frederic34/selectbarcodetype
Selectbarcodetype
2018-09-12 19:02:41 +02:00
Laurent Destailleur
cb174c3d1a
Merge pull request #9455 from IAS-SYSTEMS-CSC/develop
Fix : use correct resultset
2018-09-12 18:59:45 +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
358bc7ab1b
Merge pull request #9454 from frederic34/patch-16
Update dolreceiptprinter.class.php
2018-09-12 18:28:10 +02:00
Laurent Destailleur
ad54159c85
Merge pull request #9485 from frederic34/patch-9
remove superfluous space
2018-09-12 18:25:17 +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
Frédéric FRANCE
6c17edd1d1
remove superfluous space 2018-09-12 18:23:58 +02:00
Laurent Destailleur
64d99dd302
Merge pull request #9459 from frederic34/patch-18
Completely comment unused code
2018-09-12 18:21:51 +02:00
Laurent Destailleur
81f4bae159
Merge pull request #9461 from grandoc/new_branch_11_09_2018
New branch 11 09 2018
2018-09-12 18:15:03 +02:00
Laurent Destailleur
f5074f4962 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-12 18:12:17 +02:00
Laurent Destailleur
b341cb9245 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/core/tpl/objectline_view.tpl.php
2018-09-12 18:11:51 +02:00
Laurent Destailleur
10becd2046
Merge pull request #9483 from ptibogxiv/patch-54
New donation module
2018-09-12 17:34:21 +02:00
Laurent Destailleur
bdcbc71ce9
Merge pull request #9443 from frederic34/patch-10
Completely comment unused code
2018-09-12 17:28:29 +02:00
Philippe GRAND
b8df44167a Standardize and update code 2018-09-12 15:09:12 +02:00
Laurent Destailleur
729d03862f Fix warning 2018-09-12 15:02:59 +02:00
Philippe GRAND
69bf43f851 Merge remote-tracking branch 'upstream/develop' into new_branch_11_09_2018 2018-09-12 14:48:50 +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
53da80a79f FIX Missing translation in predefined email to membership renewal 2018-09-12 12:55:10 +02:00
Laurent Destailleur
af2e19eba8 Replace skype module with social networks module to support more fields 2018-09-12 10:55:45 +02:00
Philippe GRAND
c51a0ef901 Standardize and update code 2018-09-12 10:10:07 +02:00
atm-ph
40c79cb7cd Fix classname liencolht to linecolht 2018-09-11 17:56:11 +02:00
Philippe GRAND
05772f5327 Standardize and update code 2018-09-11 17:30:43 +02:00
Philippe GRAND
b4cbb0561d Standardize and update code 2018-09-11 10:36:39 +02:00
Frédéric FRANCE
2995208e5b
Completely comment unused code 2018-09-11 00:36:44 +02:00