diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index b4c12fbcdab9d1c85e0713076eac1600e060aed3..82988dfcb0d6db8936d11b5ad65f31670f0b79b9 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -568,15 +568,6 @@ if (empty($reshook))
}
}
- // Reopen proposal
- else if ($action == 'confirm_reopen' && $user->rights->propal->cloturer && ! GETPOST('cancel'))
- {
- // prevent browser refresh from reopening proposal several times
- if ($object->statut == Propal::STATUS_SIGNED || $object->statut == Propal::STATUS_NOTSIGNED || $object->statut == Propal::STATUS_BILLED) {
- $object->reopen($user, 1);
- }
- }
-
// Close proposal
else if ($action == 'setstatut' && $user->rights->propal->cloturer && ! GETPOST('cancel'))
{
@@ -597,17 +588,6 @@ if (empty($reshook))
}
}
- // Classify billed
- else if ($action == 'classifybilled' && $user->rights->propal->cloturer)
- {
- $result=$object->cloture($user, 4, '');
- if ($result < 0)
- {
- setEventMessages($object->error, $object->errors, 'errors');
- $error++;
- }
- }
-
// Reopen proposal
else if ($action == 'confirm_reopen' && $user->rights->propal->cloturer && ! GETPOST('cancel'))
{
@@ -623,20 +603,6 @@ if (empty($reshook))
}
}
- // Close proposal
- else if ($action == 'setstatut' && $user->rights->propal->cloturer && ! GETPOST('cancel'))
- {
- if (! GETPOST('statut')) {
- setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CloseAs")), null, 'errors');
- $action = 'statut';
- } else {
- // prevent browser refresh from closing proposal several times
- if ($object->statut == Propal::STATUS_VALIDATED) {
- $object->cloture($user, GETPOST('statut'), GETPOST('note'));
- }
- }
- }
-
include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 07c3e598818827715b2c7c9966323c93f00909c4..6394b97790888e82d7e334cd4ccb731663c52c61 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -2,6 +2,7 @@
/* Copyright (C) 2011 Dimitri Mouillard <dmouillard@teclib.com>
* Copyright (C) 2015 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2016 Ferran Marcet <fmarcet@2byte.es>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -140,6 +141,7 @@ class ExpenseReport extends CommonObject
$sql.= ",paid";
$sql.= ",note_public";
$sql.= ",note_private";
+ $sql.= ",entity";
$sql.= ") VALUES(";
$sql.= "'(PROV)'";
$sql.= ", ".$this->total_ht;
@@ -156,6 +158,7 @@ class ExpenseReport extends CommonObject
$sql.= ", 0";
$sql.= ", ".($this->note_public?"'".$this->db->escape($this->note_public)."'":"null");
$sql.= ", ".($this->note_private?"'".$this->db->escape($this->note_private)."'":"null");
+ $sql.= ", ".$conf->entity;
$sql.= ")";
dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index 34dd4ad180fa6b669ee4746909a18500bf3ab393..f46854697111fac0156301c27319d01bd7da9544 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -381,6 +381,7 @@ if ($id > 0 || ! empty($ref))
$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as l";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON l.fk_product=p.rowid";
$sql.= " WHERE l.fk_commande = ".$commande->id;
+ if(empty($conf->global->STOCK_SUPPORTS_SERVICES)) $sql.= " AND l.product_type = 0";
$sql.= " GROUP BY p.ref, p.label, p.tobatch, l.rowid, l.fk_product, l.subprice, l.remise_percent"; // Calculation of amount dispatched is done per fk_product so we must group by fk_product
$sql.= " ORDER BY p.ref, p.label";
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 03ffcf2b465e3f03b644e97ea80e711722b2f5c1..a31bd28da49e752cbb6314a65dbc4edcb9f077a4 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -3,6 +3,7 @@
* Copyright (C) 2012-2014 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2012-2016 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
+ * Copyright (C) 2016 Juanjo Menent <jmenent@2byte.es>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -117,7 +118,7 @@ class Holiday extends CommonObject
*/
function create($user, $notrigger=0)
{
- global $conf, $langs;
+ global $conf;
$error=0;
$now=dol_now();
@@ -137,7 +138,8 @@ class Holiday extends CommonObject
$sql.= "statut,";
$sql.= "fk_validator,";
$sql.= "fk_type,";
- $sql.= "fk_user_create";
+ $sql.= "fk_user_create,";
+ $sql.= "entity";
$sql.= ") VALUES (";
$sql.= "'".$this->fk_user."',";
$sql.= " '".$this->db->idate($now)."',";
@@ -148,7 +150,8 @@ class Holiday extends CommonObject
$sql.= " '1',";
$sql.= " '".$this->fk_validator."',";
$sql.= " '".$this->fk_type."',";
- $sql.= " ".$user->id;
+ $sql.= " ".$user->id.",";
+ $sql.= " ".$conf->entity;
$sql.= ")";
$this->db->begin();
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 3030058fe9e1bd45862ccc679fb8602bfc07a958..97925bff99cad341f468eee5b9d73ea638d9951f 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -236,7 +236,8 @@ if ($object->id)
if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) // For backward compatiblity, we scan also old dirs
{
- $filearray = dol_dir_list($upload_dirold, "files", 0, '', '\.meta$', 'name', SORT_ASC, 1);
+
+ $filearray = array_merge($filearray,dol_dir_list($upload_dirold, "files", 0, '', '\.meta$', 'name', SORT_ASC, 1));
}
// For each file build select list with PDF extention
diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index 6f5e79b9d6098406d862c94f2dde10b41918c677..716db97b9118fd45d1a43c8326206c3f1099ad28 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -64,6 +64,7 @@ $extrafields = new ExtraFields($db);
// fetch optionals attributes and labels
$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
+$hookmanager->initHooks(array('groupcard','globalcard'));
/**
* Action remove group