Laurent Destailleur 100fa1067e Merge remote-tracking branch 'origin/3.7' into develop ...

Conflicts:
	htdocs/compta/bank/virement.php
	htdocs/compta/facture/impayees.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/modProjet.class.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/en_GB/admin.lang
	htdocs/langs/es_AR/orders.lang
	htdocs/langs/es_AR/trips.lang
	htdocs/langs/es_CO/admin.lang
	htdocs/langs/es_CO/orders.lang
	htdocs/langs/es_CO/trips.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/pl_PL/interventions.lang
	htdocs/langs/pt_BR/trips.lang
	htdocs/langs/ro_RO/productbatch.lang
	htdocs/langs/ro_RO/trips.lang
	htdocs/main.inc.php
	htdocs/projet/element.php

2015-04-22 17:57:57 +02:00

..

antivir.class.php

Fix: PHPCS

2014-12-05 20:18:30 +01:00

canvas.class.php

Fix missing test of action when using canvas

2015-02-16 02:02:11 +01:00

ccountry.class.php

Fix: Pb of object with wrong type.

2014-11-15 18:24:38 +01:00

CMailFile.class.php

Travis fix CMailFile.class.php

2015-04-06 20:02:29 +02:00

commondocgenerator.class.php

Add missing value for object line type (product or service)

2015-04-20 16:20:04 +02:00

commoninvoice.class.php

Merge pull request #2537 from marcosgdf/cq

2015-04-06 12:37:52 +02:00

commonobject.class.php

First clean of code after devcamp

2015-04-21 15:49:58 +02:00

commonobjectline.class.php

First clean of code after devcamp

2015-04-21 15:49:58 +02:00

commonorder.class.php

Revert "Revert "Refactor 1""

2015-03-23 01:39:12 +01:00

conf.class.php

Fix js warnings, select2 css was not loaded.

2015-04-21 12:08:36 +02:00

cookie.class.php

Scrutinizer Auto-Fixes

2015-03-06 02:10:01 +00:00

CSMSFile.class.php

Fix: PHPCS

2014-12-05 20:18:30 +01:00

ctypent.class.php

Fix missing fields into import of thirdparties.

2015-02-24 15:40:50 +01:00

discount.class.php

QUAL: Traduce terms + remove <center>

2015-03-15 14:04:07 +01:00

doleditor.class.php

revert bug1840 to eldy solution

2015-03-02 10:13:06 +01:00

dolexception.class.php

…

dolgeoip.class.php

Fix: PHPCS

2014-12-05 20:18:30 +01:00

dolgraph.class.php

Scrutinizer Auto-Fixes

2015-04-06 10:25:30 +00:00

dolprintipp.class.php

Clean code

2015-04-06 11:59:58 +02:00

events.class.php

fix var not declared

2015-04-08 21:50:17 +02:00

extrafields.class.php

Remove warnings

2015-04-06 19:46:10 +02:00

fileupload.class.php

…

fiscalyear.class.php

Doxygen

2015-03-17 10:47:20 +01:00

genericobject.class.php

…

google.class.php

Fix: PHPCS

2014-12-05 20:18:30 +01:00

hookmanager.class.php

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

2015-04-13 13:08:46 +02:00

html.form.class.php

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

2015-04-22 17:57:57 +02:00

html.formactions.class.php

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

2015-04-01 16:33:39 +02:00

html.formadmin.class.php

Fixed: Protection to lock language setup in demo mode was not working

2014-11-29 12:11:12 +01:00

html.formaskpricesupplier.class.php

[CORE] Avancement des replace (#new_ask_price).

2015-01-27 17:43:07 +01:00

html.formbank.class.php

Scrutinizer Auto-Fixes

2015-03-06 02:10:01 +00:00

html.formbarcode.class.php

…

html.formcompany.class.php

NEW: Introduce option SUPPLIER_ORDER_DOUBLE_APPROVAL to allow 2

2015-04-01 21:00:51 +02:00

html.formcontract.class.php

Update html.formcontract.class.php

2014-11-22 15:41:18 +01:00

html.formcron.class.php

Scrutinizer Auto-Fixes

2015-03-06 02:10:01 +00:00

html.formfile.class.php

Fix hook management match spec

2015-03-20 00:34:55 +01:00

html.formintervention.class.php

…

html.formmail.class.php

Merge

2015-04-18 18:14:55 +02:00

html.formmailing.class.php

Scrutinizer Auto-Fixes

2015-03-06 02:10:01 +00:00

html.formorder.class.php

NEW: Implement option SUPPLIER_ORDER_USE_DISPATCH_STATUS to add a status

2015-03-08 02:08:26 +01:00

html.formother.class.php

NEW: Feature request: A page to merge two thirdparties into one #2613

2015-04-18 20:41:09 +02:00

html.formprojet.class.php

Work on expense report module

2015-02-21 15:18:05 +01:00

html.formpropal.class.php

…

html.formsms.class.php

Replace <center> tags

2014-11-25 20:13:43 +01:00

html.formsocialcontrib.class.php

…

index.html

…

infobox.class.php

Scrutinizer Auto-Fixes

2015-04-06 10:25:30 +00:00

interfaces.class.php

Fix: Forging email content must use dol_concatdesc.

2014-11-02 12:32:38 +01:00

ldap.class.php

Scrutinizer Auto-Fixes

2015-04-06 10:25:30 +00:00

link.class.php

Fix: [ bug #1533 ] Links triggers do not show trigger error message

2014-12-23 11:39:43 +01:00

menu.class.php

Scrutinizer Auto-Fixes

2015-03-06 02:10:01 +00:00

menubase.class.php

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

2015-01-18 17:13:42 +01:00

mobiledetect.class.php

Scrutinizer Auto-Fixes

2015-03-06 02:10:01 +00:00

notify.class.php

NEW Module notification should details of emails into confirm box, not

2015-04-13 17:04:18 +02:00

openid.class.php

Scrutinizer Auto-Fixes

2015-03-06 02:10:01 +00:00

rssparser.class.php

Fix bad operator for and

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

smtps.class.php

Fix: A little clean of dol_hash usage.

2014-10-18 16:08:15 +02:00

stats.class.php

Error management

2015-04-03 15:25:24 +02:00

translate.class.php

Scrutinizer Auto-Fixes

2015-03-06 02:10:01 +00:00

vcard.class.php

PHPDoc and misc fixes for several folders

2015-02-10 13:32:00 +01:00

workboardresponse.class.php

All files must be lowercase

2015-03-10 14:17:58 +01:00