Ferran Marcet
b658626e21
NEW: Highlight lines on lists when they are checked
2018-09-04 11:54:13 +02:00
Laurent Destailleur
f2ec94e9fd
FIX #9353 Bug: html error - div inside span on graphs
2018-09-04 11:13:54 +02:00
Laurent Destailleur
c59b0f95e6
FIX #9403
2018-09-04 10:10:47 +02:00
Frédéric FRANCE
d08b68e8ed
move phpcs:ignore
2018-09-03 20:38:52 +02:00
Frédéric FRANCE
7288335c6d
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-03 19:01:11 +02:00
Philippe GRAND
7a0c19485e
fix merge
2018-09-03 09:34:08 +02:00
Regis Houssin
912c05774b
FIX remove deprecated triggers USER_LOG*
2018-09-03 09:30:36 +02:00
Frédéric FRANCE
e4946cc8eb
move phpcs:ignore
2018-09-03 00:03:17 +02:00
Frédéric FRANCE
9c3352d2de
move phpcs:ignore
2018-09-02 23:44:53 +02:00
Frédéric FRANCE
47e73bfd8e
move phpcs:ignore
2018-09-02 23:01:14 +02:00
Frédéric FRANCE
2a9ef8dc05
move phpcs:ignore
2018-09-02 22:05:19 +02:00
Frédéric FRANCE
b05c175a78
Merge remote-tracking branch 'upstream/develop' into testsqlAndScript
2018-09-02 19:00:43 +02:00
Frédéric FRANCE
e13a8ec572
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-02 18:19:45 +02:00
Laurent Destailleur
a68f5cad77
Fix syntax error
2018-09-02 17:18:19 +02:00
Laurent Destailleur
887a40cf1d
Remove TODO
2018-09-02 16:46:01 +02:00
Laurent Destailleur
3d3edb19d8
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
htdocs/langs/en_US/commercial.lang
2018-09-02 15:48:26 +02:00
Laurent Destailleur
76d6affb27
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
.travis.yml
2018-09-02 15:46:09 +02:00
Frédéric FRANCE
04c1a7d4af
move phpcs:ignore
2018-09-02 13:38:11 +02:00
Philippe GRAND
3de16a145e
Standardize and update code
2018-09-02 11:08:41 +02:00
Frédéric FRANCE
b60f7db60a
move phpcs:ignore
2018-09-02 10:43:34 +02:00
Frédéric FRANCE
e98b8e5e25
move phpcs:ignore
2018-09-02 09:27:59 +02:00
Philippe GRAND
ae2df6be11
Standardize and Update code
2018-09-01 23:04:46 +02:00
Philippe GRAND
7b0d3c32ab
Standardize and Update code
2018-09-01 22:55:10 +02:00
Philippe GRAND
5d273960dc
fix conflict
2018-09-01 22:40:38 +02:00
Frédéric FRANCE
ab9bf78ecf
replace test_sql_and_script_inject
2018-09-01 17:42:16 +02:00
Laurent Destailleur
c8912d6a4f
Merge pull request #9242 from frederic34/camelCaps
...
mark non camelCaps function
2018-09-01 15:37:56 +02:00
Philippe GRAND
f77dd2ebc7
Standardize and update code
2018-09-01 15:13:59 +02:00
Laurent Destailleur
2301ecf1dc
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-01 14:51:20 +02:00
Philippe GRAND
8d7dfaf98c
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2018-09-01 14:49:42 +02:00
Laurent Destailleur
945e925399
Update html.form.class.php
2018-09-01 14:41:44 +02:00
Laurent Destailleur
e4e1bf5a1a
Merge pull request #9361 from frederic34/patch-19
...
Update discount.class.php
2018-09-01 14:30:16 +02:00
Philippe GRAND
17e349eba2
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2018-09-01 14:27:53 +02:00
Laurent Destailleur
359eebbbec
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-01 14:26:48 +02:00
Laurent Destailleur
08bc81a7ab
Merge pull request #9370 from joseplluis/patch-5
...
NEW optional param to show a specific extrafield
2018-09-01 14:24:23 +02:00
Laurent Destailleur
bc71aef7b4
Code comment
2018-09-01 14:24:02 +02:00
Philippe GRAND
7b47c79bc3
precise label comment
2018-09-01 14:06:58 +02:00
Frédéric FRANCE
10200374ef
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-09-01 14:06:23 +02:00
Philippe GRAND
b59d49d3b3
Merge remote-tracking branch 'upstream/develop' into develop
2018-09-01 13:58:33 +02:00
Frédéric FRANCE
57fb3dc2f4
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-09-01 13:52:51 +02:00
Laurent Destailleur
06355f7f08
Merge pull request #9362 from frederic34/patch-20
...
Update ldap.class.php
2018-09-01 13:28:32 +02:00
Philippe GRAND
d8e6492e93
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2018-09-01 13:07:30 +02:00
Laurent Destailleur
5604f3b0c3
Merge pull request #9376 from frederic34/functionCommentMissing
...
function Comment Missing
2018-09-01 12:59:32 +02:00
Philippe GRAND
1944ef0dc3
conflict resolution
2018-09-01 12:38:22 +02:00
Laurent Destailleur
b863b5176d
Merge pull request #9322 from grandoc/new_branch_29_08_2018
...
New branch 29 08 2018
2018-09-01 12:11:01 +02:00
Frédéric FRANCE
9454f897ef
doxygen fix
2018-09-01 09:40:50 +02:00
Philippe GRAND
3a8bde227b
Standardize and update code
2018-08-31 19:26:08 +02:00
Philippe GRAND
edaa575435
Standardize and update code
2018-08-31 18:36:15 +02:00
Philippe GRAND
70ae8c6081
Standardize and update code
2018-08-31 18:27:16 +02:00
Philippe GRAND
9e880d3e72
Standardize and update code
2018-08-31 17:55:31 +02:00
Josep Lluís
78c0aa437f
NEW optional param to show a specific extrafield
...
Using params in showOptionals you can show only a specific extrafield in a personalized form or canvas.
For example: print $object->showOptionals($extrafields, 'view', array('onlykey'=>'myfield_5'));
2018-08-31 17:16:27 +02:00
