Laurent Destailleur 5b29c87933 Merge remote-tracking branch 'origin/3.6' into 3.7 ...

Conflicts:
	htdocs/compta/deplacement/fiche.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/expedition/fiche.php

2015-04-19 00:23:46 +02:00

..

ajax

Update objectonoff.php

2014-10-18 22:47:12 +02:00

boxes

Fix bad style for total

2015-03-23 13:50:14 +01:00

class

Merge remote-tracking branch 'origin/3.6' into 3.7

2015-04-19 00:23:46 +02:00

db

Introduce a protection to avoid migration if database has critical bugs

2015-02-14 12:24:16 +01:00

filemanagerdol

Fix bad operator for and

2015-02-03 13:05:28 +01:00

js

Recherche bug travis

2014-11-07 23:58:30 +01:00

lib

Remove debug

2015-04-16 14:22:48 +02:00

login

Simplify code

2015-03-28 18:32:53 +01:00

menus

Merge remote-tracking branch 'origin/3.6' into 3.7

2015-04-19 00:23:46 +02:00

modules

Merge remote-tracking branch 'origin/3.6' into 3.7

2015-04-19 00:23:46 +02:00

tpl

Fix : discount were not working anymore on supplier order and bill

2015-04-17 23:31:51 +02:00

triggers

Merge pull request #2511 from fappels/3.7

2015-04-02 11:24:01 +02:00

actions_extrafields.inc.php

New : Add option to allow extrafield to be modified regardless of the document status

2014-10-14 15:27:40 +02:00

actions_printipp.inc.php

Fixed a lot of bugs into PrintIPP module. Seems to be stable enough now

2014-12-04 13:20:56 +01:00

actions_sendmails.inc.php

Fix: bcc was lost if notif to bcc was also forced

2015-04-01 12:22:50 +02:00

actions_setnotes.inc.php

Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on

2014-09-27 17:13:15 +02:00

antispamimage.php

Update antispamimage.php

2014-11-05 20:02:58 +01:00

datepicker.php

Fix: calendar was not using option START_WEEK.

2015-02-03 14:02:36 +01:00

doxygen.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

get_menudiv.php

Fix translation

2015-03-24 11:19:51 +01:00

index.html

Removed index.php and replaced them with blank index.html as it is more appropriate

2014-07-12 23:18:57 +02:00

photos_resize.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

search_page.php

Fix [ bug #1714 ] Id "sall" is used twice in different HTML tags

2014-12-26 12:03:29 +01:00

tools.php

Removed closing php tag

2014-05-03 18:18:44 +02:00