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

..

accountancy

Merge branch 'review' of https://github.com/GPCsolutions/dolibarr into

2015-01-17 15:11:12 +01:00

bank

Qual: Function getmypid were renamed into dol_getmypid.

2014-07-31 17:35:58 +02:00

clicktodial

Avoid terminal

2013-03-31 04:12:20 +02:00

company

Qual: Function getmypid were renamed into dol_getmypid.

2014-07-31 17:35:58 +02:00

contracts

fix syntax errors

2015-04-18 18:07:41 +02:00

cron

FIX #2519

2015-04-02 11:11:03 +02:00

emailings

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

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

invoices

fix syntax errors

2015-04-18 18:07:41 +02:00

members

Renamed llx_c_pays to llx_c_country & field "libelle" to "label"

2014-08-10 13:37:39 +02:00

odt2pdf

Fix jodconverter can't work without the wrapper jodconverter.

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

user

Uniformize code: property "nom" for thirdparty is aliased into "name"

2014-10-04 17:20:17 +02:00

withdrawals

Qual: Function getmypid were renamed into dol_getmypid.

2014-07-31 17:35:58 +02:00