dolibarr/htdocs/comm/propal
Laurent Destailleur 5c5ff72ecd Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	ChangeLog
	htdocs/adherents/fiche.php
	htdocs/comm/fiche.php
	htdocs/comm/mailing/fiche.php
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/compta/paiement.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/core/tpl/login.tpl.php
	htdocs/expedition/fiche.php
	htdocs/fourn/commande/fiche.php
	htdocs/fourn/facture/fiche.php
	htdocs/fourn/facture/paiement.php
	htdocs/fourn/fiche.php
	htdocs/main.inc.php
	htdocs/product/fournisseurs.php
	htdocs/resource/card.php
2015-01-18 17:13:42 +01:00
..
class Merge remote-tracking branch 'origin/3.6' into 3.7 2015-01-18 17:13:42 +01:00
stats Removed closing php tag 2014-05-03 18:18:44 +02:00
tpl Merge remote-tracking branch 'origin/3.6' into develop 2014-09-15 22:58:39 +02:00
apercu.php Update apercu.php 2014-11-27 21:03:01 +01:00
contact.php Removed closing php tag 2014-05-03 18:18:44 +02:00
document.php Qual: remove PHP closing tag (again) 2014-05-26 13:51:25 +02:00
index.php Uniformize code: property "nom" for thirdparty is aliased into "name" 2014-10-04 17:20:17 +02:00
info.php Removed closing php tag 2014-05-03 18:18:44 +02:00
list.php Merge branch '1680' of github.com:aspangaro/dolibarr into aspangaro-1680 2014-11-22 15:57:06 +01:00
note.php Removed closing php tag 2014-05-03 18:18:44 +02:00