';
print '
';
-
+var_dump($value_public);
$cssclass="titlefield";
include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 6e3604a4e68..ec831b91458 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1649,7 +1649,7 @@ class Product extends CommonObject
* @param string $newdefaultvatcode Default vat code
* @return int <0 if KO, >0 if OK
*/
- function updatePrice($newprice, $newpricebase, $user, $newvat='',$newminprice='', $level=0, $newnpr=0, $newpbq=0, $ignore_autogen=0, $localtaxes_array=array(), $newdefaultvatcode='')
+ function updatePrice($newprice, $newpricebase, $user, $newvat='',$newminprice=0, $level=0, $newnpr=0, $newpbq=0, $ignore_autogen=0, $localtaxes_array=array(), $newdefaultvatcode='')
{
global $conf,$langs;
@@ -1685,7 +1685,7 @@ class Product extends CommonObject
$price = price2num($newprice) / (1 + ($newvat / 100));
$price = price2num($price,'MU');
- if ($newminprice!='' || $newminprice==0)
+ if ($newminprice != '' || $newminprice == 0)
{
$price_min_ttc = price2num($newminprice,'MU');
$price_min = price2num($newminprice) / (1 + ($newvat / 100));
@@ -2271,6 +2271,35 @@ class Product extends CommonObject
}
}
}
+
+ // If stock decrease is on invoice validation, the theorical stock continue to
+ // count the orders to ship in theorical stock when some are already removed b invoice validation.
+ // If option DECREASE_ONLY_UNINVOICEDPRODUCTS is on, we make a compensation.
+ if (! empty($conf->global->STOCK_CALCULATE_ON_BILL))
+ {
+ if (! empty($conf->global->DECREASE_ONLY_UNINVOICEDPRODUCTS))
+ {
+ $adeduire = 0;
+ $sql = "SELECT sum(fd.qty) as count FROM ".MAIN_DB_PREFIX."facturedet fd ";
+ $sql .= " JOIN ".MAIN_DB_PREFIX."facture f ON fd.fk_facture = f.rowid ";
+ $sql .= " JOIN ".MAIN_DB_PREFIX."element_element el ON el.fk_target = f.rowid and el.targettype = 'facture' and sourcetype = 'commande'";
+ $sql .= " JOIN ".MAIN_DB_PREFIX."commande c ON el.fk_source = c.rowid ";
+ $sql .= " WHERE c.fk_statut IN (".$filtrestatut.") AND c.facture = 0 AND fd.fk_product = ".$this->id;
+ dol_syslog(__METHOD__.":: sql $sql", LOG_NOTICE);
+
+ $resql = $this->db->query($sql);
+ if ( $resql )
+ {
+ if ($this->db->num_rows($resql) > 0)
+ {
+ $obj = $this->db->fetch_object($resql);
+ $adeduire += $obj->count;
+ }
+ }
+
+ $this->stats_commande['qty'] -= $adeduire;
+ }
+ }
return 1;
}
diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php
index e393721c47d..30bb3312576 100644
--- a/htdocs/product/inventory/card.php
+++ b/htdocs/product/inventory/card.php
@@ -36,6 +36,15 @@ $action = GETPOST('action', 'alpha');
$cancel = GETPOST('cancel', 'aZ09');
$backtopage = GETPOST('backtopage', 'alpha');
+if (empty($conf->global->MAIN_USE_ADVANCED_PERMS))
+{
+ $result = restrictedArea($user, 'stock', $id);
+}
+else
+{
+ $result = restrictedArea($user, 'stock', $id, '', 'advance_inventory');
+}
+
// Initialize technical objects
$object=new Inventory($db);
$extrafields = new ExtraFields($db);
@@ -66,6 +75,16 @@ $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
// Load object
include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+if (empty($conf->global->MAIN_USE_ADVANCED_PERMS))
+{
+ $permissiontoadd = $user->rights->stock->write;
+ $permissiontodelete = $user->rights->stock->write;
+}
+else
+{
+ $permissiontoadd = $user->rights->stock->advance_inventory->create;
+ $permissiontodelete = $user->rights->stock->advance_inventory->write;
+}
/*
@@ -80,8 +99,6 @@ if (empty($reshook))
{
$error=0;
- $permissiontoadd = $user->rights->stock->creer;
- $permissiontodelete = $user->rights->stock->supprimer;
$backurlforlist = DOL_URL_ROOT.'/product/inventory/list.php';
// Actions cancel, add, update or delete
@@ -327,7 +344,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
// Send
print '
' . $langs->trans('SendMail') . ''."\n";
- if ($user->rights->inventory->write)
+ if ($permissiontoadd)
{
print '
'.$langs->trans("Modify").''."\n";
}
@@ -336,7 +353,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
print '
'.$langs->trans('Modify').''."\n";
}
- if ($user->rights->inventory->delete)
+ if ($permissiontodelete)
{
print '
'.$langs->trans('Delete').''."\n";
}
diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php
index cb67168b214..f3089099efe 100644
--- a/htdocs/product/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -72,6 +72,14 @@ if ($user->societe_id > 0)
//$socid = $user->societe_id;
accessforbidden();
}
+if (empty($conf->global->MAIN_USE_ADVANCED_PERMS))
+{
+ $result = restrictedArea($user, 'stock', $objectid);
+}
+else
+{
+ $result = restrictedArea($user, 'stock', $objectid, '', 'advance_inventory');
+}
// Initialize array of search criterias
$search_all=trim(GETPOST("search_all",'alpha'));