dolibarr/htdocs/compta/prelevement
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
..
class Fix: picto for status8 is a flash red icon to report a critical error 2013-11-04 23:56:15 +01:00
bon.php Fix: convert line delimiters 2013-06-24 17:34:22 +02:00
bons.php Merge remote-tracking branch 'origin/3.4' into develop 2013-11-19 21:08:02 +01:00
create.php Fix: convert line delimiters 2013-06-24 17:34:22 +02:00
demandes.php Fix: convert line delimiters 2013-06-24 17:34:22 +02:00
factures.php Merge remote-tracking branch 'origin/3.4' into develop 2013-11-19 21:08:02 +01:00
fiche-rejet.php Fix for language 2013-11-14 21:02:33 +01:00
fiche-stat.php Merge remote-tracking branch 'origin/3.4' into develop 2013-11-19 21:08:02 +01:00
fiche.php Merge remote-tracking branch 'origin/3.4' into develop 2013-11-19 21:08:02 +01:00
index.php Fix: convert line delimiters 2013-06-24 17:34:22 +02:00
ligne.php Merge remote-tracking branch 'origin/3.4' into develop 2013-11-19 21:08:02 +01:00
lignes.php Merge remote-tracking branch 'origin/3.4' into develop 2013-11-19 21:08:02 +01:00
liste.php Merge remote-tracking branch 'origin/3.4' into develop 2013-11-19 21:08:02 +01:00
rejets.php Fix: convert line delimiters 2013-06-24 17:34:22 +02:00
stats.php Fix: convert line delimiters 2013-06-24 17:34:22 +02:00