dolibarr/htdocs/comm
Laurent Destailleur a93ba86ce0 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/expedition/modules_expedition.php
	htdocs/core/modules/modContrat.class.php
	htdocs/expedition/class/expedition.class.php
2015-05-07 13:35:09 +02:00
..
action Merge pull request #2673 from aternatik/fix_getentity 2015-05-07 00:48:19 +02:00
admin Change generic and setup image title 2015-04-18 23:13:48 +02:00
askpricesupplier Code fixes 2015-05-06 23:44:53 +02:00
mailing Merge remote-tracking branch 'origin/3.7' into develop 2015-04-22 17:57:57 +02:00
propal Merge remote-tracking branch 'origin/3.7' into develop 2015-05-07 13:35:09 +02:00
prospect Merge pull request #2673 from aternatik/fix_getentity 2015-05-07 00:48:19 +02:00
address.php Replace <center> tags 2014-11-25 20:13:43 +01:00
card.php Merge pull request #2673 from aternatik/fix_getentity 2015-05-07 00:48:19 +02:00
contact.php Uniformize code: property "nom" for thirdparty is aliased into "name" 2014-10-04 17:20:17 +02:00
index.php Merge pull request #2673 from aternatik/fix_getentity 2015-05-07 00:48:19 +02:00
list.php Add picto for commercial pages titles 2015-04-18 23:17:44 +02:00
multiprix.php Removed closing php tag 2014-05-03 18:18:44 +02:00
propal.php Merge remote-tracking branch 'origin/3.7' into develop 2015-05-07 13:35:09 +02:00
recap-client.php Uniformize code: property "nom" for thirdparty is aliased into "name" 2014-10-04 17:20:17 +02:00
remise.php Replace <center> tags 2014-11-25 20:13:43 +01:00
remx.php Merge remote-tracking branch 'origin/3.7' into develop 2015-02-19 00:01:26 +01:00