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

Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/expedition/doc/pdf_merou.modules.php
	htdocs/core/modules/modProduct.class.php
	htdocs/fourn/commande/fiche.php
	htdocs/projet/fiche.php

2014-06-20 15:26:02 +02:00

..

class

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

2014-06-20 15:26:02 +02:00

stats

Removed closing php tag

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

tpl

Fix: [ bug #698 ] Bad calculation of totals of associated documents

2013-01-25 11:37:30 +01:00

apercu.php

Removed closing php tag

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

contact.php

Qual: remove PHP closing tag (again)

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

customer.php

Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1

2014-01-13 09:43:21 +01:00

document.php

Removed closing php tag

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

fiche.php

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

2014-06-20 15:26:02 +02:00

index.php

Removed closing php tag

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

info.php

Removed closing php tag

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

liste.php

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

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

note.php

Removed closing php tag

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

orderstoinvoice.php

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

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