Laurent Destailleur 2bb1945a2f Merge remote-tracking branch 'origin/3.6' into 3.7 ...

Conflicts:
	htdocs/compta/prelevement/class/rejetprelevement.class.php
	htdocs/compta/sociales/class/paymentsocialcontribution.class.php
	htdocs/contact/exportimport.php
	htdocs/contact/ldap.php
	htdocs/contact/perso.php
	htdocs/contact/vcard.php
	htdocs/core/class/commonobject.class.php
	htdocs/product/reassort.php
	htdocs/projet/liste.php
	htdocs/societe/consumption.php
	htdocs/societe/info.php

2015-07-19 12:04:30 +02:00

..

export_csv.modules.php

FIX : tool export handle the type "select" extrafields and return the value instead of id

2015-06-23 16:26:05 +02:00

export_excel2007.modules.php

Upgrade phpexcel lib to 1.7.8

2014-09-07 12:12:30 +02:00

export_excel.modules.php

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

2015-07-19 12:04:30 +02:00

export_tsv.modules.php

FIX : tool export handle the type "select" extrafields and return the value instead of id

2015-06-23 16:26:05 +02: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

modules_export.php

Removed closing php tag

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