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
..
admin	Fix: $error var must use type int and be increased when error found.	2014-05-24 15:20:26 +02:00
class	Removed duplicated SQL error logging	2014-06-13 02:28:30 +02:00
img
common.inc.php	Removed closing php tag	2014-05-03 18:18:44 +02:00
define_holiday.php	Removed SQL string from call debug log	2014-06-13 01:34:39 +02:00
fiche.php	New: Can enter holiday for someone else if user has permission for.	2014-05-07 15:03:05 +02:00
index.php	Removed useless translation key	2014-05-10 15:50:32 +02:00
month_report.php	Merge remote-tracking branch 'origin/3.5' into 3.6	2014-06-28 14:53:28 +02:00
view_log.php	Removed closing php tag	2014-05-03 18:18:44 +02:00