Laurent Destailleur c895c892a5 Merge remote-tracking branch 'origin/3.6' into develop ...

Conflicts:
	ChangeLog
	htdocs/filefunc.inc.php

2014-07-29 01:17:00 +02:00

..

box_actions.php

Update box_actions.php

2014-07-11 14:21:36 +02:00

box_activity.php

Update box_activity.php

2014-07-27 11:27:33 +02:00

box_bookmarks.php

Removed closing php tag

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

box_clients.php

More substitutions

2014-06-12 11:31:53 +02:00

box_commandes.php

Removed closing php tag

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

box_comptes.php

More substitutions

2014-06-12 11:31:53 +02:00

box_contacts.php

Properties "civilite_id" were renamed into "civility_id".

2014-05-05 00:23:09 +02:00

box_contracts.php

Removed closing php tag

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

box_external_rss.php

Removed closing php tag

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

box_factures_fourn_imp.php

Removed closing php tag

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

box_factures_fourn.php

Removed closing php tag

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

box_factures_imp.php

Removed closing php tag

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

box_factures.php

Qual: Remove end php tag.

2014-07-08 01:02:30 +02:00

box_ficheinter.php

Removed SQL string from call debug log

2014-06-13 01:34:39 +02:00

box_fournisseurs.php

Removed closing php tag

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

box_graph_invoices_permonth.php

Fix: When option to use optimize display for text borwser and blin

2014-07-29 00:50:57 +02:00

box_graph_invoices_supplier_permonth.php

Fix: When option to use optimize display for text borwser and blin

2014-07-29 00:50:57 +02:00

box_graph_orders_permonth.php

Fix: When option to use optimize display for text borwser and blin

2014-07-29 00:50:57 +02:00

box_graph_orders_supplier_permonth.php

Fix: When option to use optimize display for text borwser and blin

2014-07-29 00:50:57 +02:00

box_graph_product_distribution.php

Fix: When option to use optimize display for text borwser and blin

2014-07-29 00:50:57 +02:00

box_graph_propales_permonth.php

Fix: When option to use optimize display for text borwser and blin

2014-07-29 00:50:57 +02:00

box_members.php

Removed closing php tag

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

box_osc_client.php

Removed closing php tag

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

box_produits_alerte_stock.php

Removed closing php tag

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

box_produits.php

Removed closing php tag

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

box_project.php

Qual: Remove end php tag.

2014-07-08 01:02:30 +02:00

box_propales.php

Removed closing php tag

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

box_prospect.php

More substitutions

2014-06-12 11:31:53 +02:00

box_services_contracts.php

Removed closing php tag

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

box_services_expired.php

Removed closing php tag

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

box_supplier_orders.php

Removed closing php tag

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

box_task.php

Qual: Remove end php tag.

2014-07-08 01:02:30 +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

modules_boxes.php

Removed closing php tag

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