Laurent Destailleur 5c5ff72ecd Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: ChangeLog htdocs/adherents/fiche.php htdocs/comm/fiche.php htdocs/comm/mailing/fiche.php htdocs/comm/propal.php htdocs/comm/propal/class/propal.class.php htdocs/commande/class/commande.class.php htdocs/commande/fiche.php htdocs/compta/facture.php htdocs/compta/paiement.php htdocs/core/class/html.formcompany.class.php htdocs/core/tpl/login.tpl.php htdocs/expedition/fiche.php htdocs/fourn/commande/fiche.php htdocs/fourn/facture/fiche.php htdocs/fourn/facture/paiement.php htdocs/fourn/fiche.php htdocs/main.inc.php htdocs/product/fournisseurs.php htdocs/resource/card.php		2015-01-18 17:13:42 +01:00
..
tpl	New: Feature to link manually an order to an invoice does not disappear	2014-10-24 14:17:36 +02:00
card.php	Fixed [ bug #1766 ] PHP Warning when adding a service to a supplier invoice	2014-12-25 23:08:07 +01:00
contact.php	New: Show amount and status of supplier invoice also on document tab.	2014-07-20 19:35:45 +02:00
document.php	Fixed [ bug #1658 ] Linked files in supplier invoices wrongly shows amounts	2014-11-23 16:55:12 +01:00
impayees.php	Update /fourn/facture/impayees.php	2014-11-23 17:45:14 +01: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	Fix: [ bug #1687 ] The ref filter searches on ref and rowid in supplier	2014-12-23 13:21:40 +01:00
note.php	Fix: Bad alignement of cells	2014-07-20 19:35:00 +02:00
paiement.php	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-01-18 17:13:42 +01:00