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

..

bank

Merge pull request #1292 from aspangaro/3.4

2013-11-09 16:08:19 -08:00

charges

Fix: Pagination

2013-11-18 12:20:53 +01:00

deplacement

renamed templates

2013-11-06 10:22:01 +01:00

dons

changed parameter

2013-09-16 14:17:53 +02:00

facture

renamed templates

2013-11-06 10:22:01 +01:00

journal

Fix: Try a fix to avoid error on big sql

2013-10-31 14:39:41 +01:00

localtax

Fixed typos

2013-09-05 18:06:51 +02:00

paiement

Show ref with label on bank account.

2013-10-16 19:00:00 +02:00

payment_sc

Qual: Remove duplicate form instanciation.

2013-09-06 12:10:09 +02:00

prelevement

Merge remote-tracking branch 'origin/3.4' into develop

2013-11-19 21:08:02 +01:00

resultat

Qual: Show the rule name used to make calculation and link to change

2013-10-10 19:33:49 +02:00

sociales

renamed templates

2013-11-06 10:22:01 +01:00

stats

Qual: Show the rule name used to make calculation and link to change

2013-10-10 19:33:49 +02:00

tva

Qual: Normalize code of vat class

2013-10-25 19:27:38 +02:00

ventilation

standardize code

2013-06-20 09:18:12 +02:00

ajaxpayment.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

clients.php

standardize code

2013-06-20 09:18:12 +02:00

facture.php

Make AJAX new line form work again

2013-11-19 17:54:36 +01:00

index.php

Qual: Normalize file name.

2013-07-26 11:36:36 +02:00

paiement_charge.php

Fix: Permissions on files

2013-08-06 00:36:21 +02:00

paiement.php

Fix invoice fetch on payment page

2013-10-14 09:45:32 +02:00

recap-compta.php

standardize code

2013-06-20 09:18:12 +02:00