Marcos García de La Fuente 7e1cf124b8 Merge branch 'develop' into syslog ...

Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/product/class/product.class.php
	htdocs/product/stock/lib/replenishment.lib.php
	htdocs/societe/soc.php

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

..

box_actions.php

More substitutions

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

box_activity.php

Removed closing php tag

2014-05-03 18:18:44 +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

fix travis error

2014-06-20 23:56:03 +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

Removed closing php tag

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

box_graph_invoices_supplier_permonth.php

Removed closing php tag

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

box_graph_orders_permonth.php

Removed closing php tag

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

box_graph_orders_supplier_permonth.php

Removed closing php tag

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

box_graph_product_distribution.php

Removed closing php tag

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

box_graph_propales_permonth.php

Removed closing php tag

2014-05-03 18:18:44 +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

fix travis error

2014-06-21 00:08:13 +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

fix travis error

2014-06-21 00:08:13 +02:00

index.php

…

modules_boxes.php

Removed closing php tag

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