dolibarr/htdocs/comm
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
..
action Codestyle 2013-11-08 15:31:22 +01:00
admin Qual: Uniformise name of include files we use to share common code found 2013-09-23 13:22:28 +02:00
mailing Fix: Several bugs. 2013-11-16 13:00:21 +01:00
propal Merge remote-tracking branch 'origin/3.4' into develop 2013-11-19 21:08:02 +01:00
prospect Add prospect code client into prospect list 2013-11-13 13:17:32 +01:00
address.php Fix: security sql injection 2013-10-07 22:50:27 +02:00
bookmark.php standardize code 2013-06-20 09:18:12 +02:00
contact.php standardize code 2013-06-20 09:18:12 +02:00
fiche.php Fix: Must navigate between all thirdparties elligible for tab. 2013-11-18 15:41:42 +01:00
index.php I killed <td nowrap>. Hello <td class="nowrap"> ! 2013-07-19 14:23:42 +02:00
list.php Add status filter into prospect and customer list 2013-11-12 15:22:11 +01:00
multiprix.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
propal.php Make AJAX new line form work again 2013-11-19 17:54:36 +01:00
recap-client.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
remise.php Qual: Removed useless methods 2013-06-16 21:31:21 +02:00
remx.php Qual: Remove duplicate form instanciation. 2013-09-06 12:10:09 +02:00