Commit Graph

4 Commits

Author SHA1 Message Date
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
Laurent Destailleur
79ac620ab5 Fix label of status 2015-02-07 01:32:21 +01:00
Laurent Destailleur
97eec37f1c Uniformize code: property "nom" for thirdparty is aliased into "name"
everywhere.
2014-10-04 17:20:17 +02:00
aspangaro
b22aef3521 Qual: Renamed all files & links "liste.php" into "list.php" 2014-09-18 20:33:37 +02:00