Laurent Destailleur e220ce5a82 Merge remote-tracking branch 'origin/3.7' into develop ...

Conflicts:
	htdocs/comm/card.php
	htdocs/comm/propal.php
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/custom/.gitignore
	htdocs/expedition/card.php
	htdocs/fourn/card.php
	htdocs/product/fournisseurs.php

2015-01-18 18:44:22 +01:00

..

admin

Show field alwayseditable

2014-11-07 22:24:52 +01:00

class

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

2015-01-18 18:44:22 +01:00

tpl

Qual: Renamed all files & links "fiche.php" into "card.php"

2014-09-18 21:18:25 +02:00

apercu.php

#1657 Intervention preview date is not displayed

2014-11-20 06:01:08 +01:00

card.php

Update card.php

2015-01-12 10:16:34 +01:00

contact.php

Missing hook to add button on intervention

2014-09-22 20:16:58 +02:00

document.php

Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on

2014-09-27 17:13:15 +02:00

index.html

Removed index.php and replaced them with blank index.html as it is more appropriate

2014-07-12 23:18:57 +02:00

info.php

Removed closing php tag

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

list.php

Fixed: Filter lost with navigation

2014-12-25 12:00:49 +01:00

note.php

Deprecating arbitrary use of dol_htmloutput* functions

2014-07-20 02:32:13 +02:00