Laurent Destailleur ccca46f380 Merge remote-tracking branch 'origin/3.5' into develop ...

Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/list.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/functions.lib.php
	htdocs/expedition/note.php
	htdocs/fourn/commande/liste.php
	htdocs/fourn/facture/fiche.php
	htdocs/main.inc.php
	htdocs/projet/tasks/index.php
	htdocs/theme/eldy/style.css.php

2014-05-29 19:20:48 +02:00

..

bank

Qual: remove PHP closing tag (again)

2014-05-26 13:51:25 +02:00

charges

Fix: [ bug #1374 ] Salaries module requires "Special costs" module to

2014-05-10 18:57:04 +02:00

deplacement

Removed closing php tag

2014-05-03 18:18:44 +02:00

dons

Removed closing php tag

2014-05-03 18:18:44 +02:00

facture

Qual: remove PHP closing tag (again)

2014-05-26 13:51:25 +02:00

journal

Removed closing php tag

2014-05-03 18:18:44 +02:00

localtax

Qual: remove PHP closing tag (again)

2014-05-26 13:51:25 +02:00

paiement

Removed closing php tag

2014-05-03 18:18:44 +02:00

payment_sc

Removed closing php tag

2014-05-03 18:18:44 +02:00

prelevement

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

2014-05-21 20:30:07 +02:00

resultat

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

2014-05-18 11:52:52 +02:00

salaries

Qual: remove PHP closing tag (again)

2014-05-26 13:51:25 +02:00

sociales

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

2014-05-06 23:58:17 +02:00

stats

Removed closing php tag

2014-05-03 18:18:44 +02:00

tva

Print instead of echo

2014-05-11 06:49:11 +02:00

ventilation

Removed closing php tag

2014-05-03 18:18:44 +02:00

ajaxpayment.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

clients.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

facture.php

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

2014-05-29 19:20:48 +02:00

hrm.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

index.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

paiement_charge.php

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

2014-05-06 23:58:17 +02:00

paiement.php

Fix: select_date accepts -1, '' or a date but not '0'

2014-05-25 14:51:56 +02:00

recap-compta.php

Removed closing php tag

2014-05-03 18:18:44 +02:00