dolibarr/htdocs/fourn
Laurent Destailleur 0e743d5024 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	ChangeLog
	htdocs/adherents/admin/adherent.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/document.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/compta/facture/list.php
	htdocs/cron/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/commande/document.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cron.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/langs/nl_NL/admin.lang
	htdocs/langs/nl_NL/categories.lang
	htdocs/langs/nl_NL/commercial.lang
	htdocs/langs/nl_NL/companies.lang
	htdocs/langs/nl_NL/dict.lang
	htdocs/langs/nl_NL/main.lang
	htdocs/langs/nl_NL/margins.lang
	htdocs/langs/nl_NL/products.lang
	htdocs/societe/class/societe.class.php
	htdocs/societe/rib.php
2013-11-19 21:08:02 +01:00
..
ajax Merge remote-tracking branch 'origin/3.4' into develop 2013-09-19 01:02:53 +02:00
class Merge remote-tracking branch 'origin/3.4' into develop 2013-11-19 21:08:02 +01:00
commande Merge remote-tracking branch 'origin/3.4' into develop 2013-11-19 21:08:02 +01:00
facture Merge remote-tracking branch 'origin/3.4' into develop 2013-11-19 21:08:02 +01:00
paiement Show ref with label on bank account. 2013-10-16 19:00:00 +02:00
product Merge remote-tracking branch 'origin/3.4' into develop 2013-10-07 16:17:51 +02:00
contact.php Fix: Fix ton of regression due to field name change 2013-03-09 20:34:38 +01:00
fiche.php Wrong call of show_contact into fourn/fiche.php 2013-11-13 16:37:17 +01:00
index.php standardize code 2013-06-20 09:18:12 +02:00
liste.php changed parameter 2013-09-16 14:17:53 +02:00
recap-fourn.php standardize code 2013-06-20 09:18:12 +02:00