Laurent Destailleur 774389940e Merge remote-tracking branch 'origin/3.6' into 3.7 ...

Conflicts:
	ChangeLog
	htdocs/comm/propal/list.php
	htdocs/compta/bank/ligne.php
	htdocs/compta/resultat/clientfourn.php
	htdocs/compta/salaries/fiche.php
	htdocs/core/lib/functions.lib.php
	htdocs/fourn/facture/paiement.php

2015-02-18 23:51:41 +01:00

..

ajax

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

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

class

Merge branch '3.7' of https://github.com/atm-gauthier/dolibarr into

2015-02-18 23:15:40 +01:00

commande

Merge branch '3.7' of https://github.com/atm-gauthier/dolibarr into

2015-02-18 23:15:40 +01:00

facture

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

2015-02-18 23:51:41 +01:00

paiement

Fixed: User of creation was not visible.

2015-01-10 12:23:15 +01:00

product

Fix 1667 Pagination is only partially shown in supplier references list

2014-11-23 00:51:13 +01:00

card.php

Fixed approve during validation if user has permission

2015-01-25 00:59:46 +01:00

contact.php

Qual: Renamed all files & links "fiche.php" into "card.php"

2014-09-18 21:18:25 +02:00

index.php

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

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

list.php

Update /fourn/list.php

2014-11-23 17:43:52 +01:00

recap-fourn.php

Qual: Renamed all files & links "fiche.php" into "card.php"

2014-09-18 21:18:25 +02:00