';
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index b18738bde9f..be5272cf7c2 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -771,7 +771,7 @@ class ExtraFields
}
elseif ($type == 'price')
{
- $out=' '.$langs->getCurrencySymbol($conf->currency);
+ $out=' '.$langs->getCurrencySymbol($conf->currency);
}
elseif ($type == 'double')
{
diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php
index c8ce225e0c2..72ee7e8b4ff 100644
--- a/htdocs/core/class/smtps.class.php
+++ b/htdocs/core/class/smtps.class.php
@@ -1195,6 +1195,8 @@ class SMTPs
$host=preg_replace('@tcp://@i','',$host); // Remove prefix
$host=preg_replace('@ssl://@i','',$host); // Remove prefix
+ $host=dol_getprefix().'-'.$host;
+
//NOTE: Message-ID should probably contain the username of the user who sent the msg
$_header .= 'Subject: ' . $this->getSubject() . "\r\n";
$_header .= 'Date: ' . date("r") . "\r\n";
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 082177b5cbc..fc463dadd71 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -325,8 +325,15 @@ function GETPOST($paramname,$check='',$method=0,$filter=NULL,$options=NULL)
*/
function dol_getprefix()
{
+ global $conf;
+
if (isset($_SERVER["SERVER_NAME"]) && isset($_SERVER["DOCUMENT_ROOT"]))
{
+ if (! empty($conf->global->MAIL_PREFIX_FOR_EMAIL_ID))
+ {
+ if ($conf->global->MAIL_PREFIX_FOR_EMAIL_ID == 'SERVER_NAME') return $_SERVER["SERVER_NAME"];
+ return $conf->global->MAIL_PREFIX_FOR_EMAIL_ID;
+ }
return dol_hash($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"].DOL_DOCUMENT_ROOT.DOL_URL_ROOT);
// Use this for a "clear" cookie name
//return dol_sanitizeFileName($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"].DOL_DOCUMENT_ROOT.DOL_URL_ROOT);
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 34bc05a7d42..3e889ba263c 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -327,10 +327,10 @@ class CommandeFournisseur extends CommonOrder
$line->product_label = $objp->product_label;
$line->product_desc = $objp->product_desc;
- $line->ref = $objp->product_ref;
- $line->product_ref = $objp->product_ref;
- $line->ref_fourn = $objp->ref_supplier;
- $line->ref_supplier = $objp->ref_supplier;
+ $line->ref = $objp->product_ref; // Ref of product
+ $line->product_ref = $objp->product_ref; // Ref of product
+ $line->ref_fourn = $objp->ref_supplier; // The supplier ref of price when product was added. May have change since
+ $line->ref_supplier = $objp->ref_supplier; // The supplier ref of price when product was added. May have change since
$line->date_start = $this->db->jdate($objp->date_start);
$line->date_end = $this->db->jdate($objp->date_end);
@@ -1160,7 +1160,7 @@ class CommandeFournisseur extends CommonOrder
$this->lines[$i]->localtax2_tx,
$this->lines[$i]->fk_product,
0,
- $this->lines[$i]->ref_fourn,
+ $this->lines[$i]->ref_fourn, // $this->lines[$i]->ref_fourn comes from field ref into table of lines. Value may ba a ref that does not exists anymore, so we first try with value of product
$this->lines[$i]->remise_percent,
'HT',
0,
@@ -1322,7 +1322,7 @@ class CommandeFournisseur extends CommonOrder
* @param float $txlocaltax2 Localtax2 tax
* @param int $fk_product Id product
* @param int $fk_prod_fourn_price Id supplier price
- * @param string $fourn_ref Supplier reference
+ * @param string $fourn_ref Supplier reference price
* @param float $remise_percent Remise
* @param string $price_base_type HT or TTC
* @param float $pu_ttc Unit price TTC
@@ -1369,7 +1369,8 @@ class CommandeFournisseur extends CommonOrder
$pu=$pu_ttc;
}
$desc=trim($desc);
-
+ $ref_supplier=''; // Ref of supplier price when we add line
+
// Check parameters
if ($qty < 1 && ! $fk_product)
{
@@ -1391,15 +1392,28 @@ class CommandeFournisseur extends CommonOrder
$prod = new Product($this->db, $fk_product);
if ($prod->fetch($fk_product) > 0)
{
- $result=$prod->get_buyprice($fk_prod_fourn_price, $qty, $fk_product, $fourn_ref); // Search on couple $fk_prod_fourn_price/$qty first, then on triplet $qty/$fk_product/$fourn_ref
+ $product_type = $prod->type;
+ $label = $prod->libelle;
+
+ // We use 'none' instead of $fourn_ref, because fourn_ref may not exists anymore. So we will take the first supplier price ok.
+ // If we want a dedicated supplier price, we must provide $fk_prod_fourn_price.
+ $result=$prod->get_buyprice($fk_prod_fourn_price, $qty, $fk_product, 'none', $this->fk_soc); // Search on couple $fk_prod_fourn_price/$qty first, then on triplet $qty/$fk_product/$fourn_ref/$this->fk_soc
if ($result > 0)
{
- $label = $prod->libelle;
- $pu = $prod->fourn_pu;
- $ref_supplier = $prod->ref_supplier;
- $product_type = $prod->type;
+ $pu = $prod->fourn_pu; // Unit price supplier price set by get_buyprice
+ $ref_supplier = $prod->ref_supplier; // Ref supplier price set by get_buyprice
}
- if ($result == 0 || $result == -1)
+ if ($result == 0) // If result == 0, we failed to found the supplier reference price
+ {
+ $langs->load("errors");
+ $this->error = "Ref " . $prod->ref . " " . $langs->trans("ErrorQtyTooLowForThisSupplier");
+ $this->db->rollback();
+ dol_syslog(get_class($this)."::addline we did not found supplier price, so we can't guess unit price");
+ //$pu = $prod->fourn_pu; // We do not overwrite unit price
+ //$ref = $prod->ref_fourn; // We do not overwrite ref supplier price
+ return -1;
+ }
+ if ($result == -1)
{
$langs->load("errors");
$this->error = "Ref " . $prod->ref . " " . $langs->trans("ErrorQtyTooLowForThisSupplier");
@@ -2899,15 +2913,7 @@ class CommandeFournisseurLigne extends CommonOrderLine
// From llx_product_fournisseur_price
/**
- * Supplier ref
- * @var string
- * @deprecated Use ref_supplier
- * @see ref_supplier
- */
- public $ref_fourn;
-
- /**
- * Supplier reference
+ * Supplier reference of price when we added the line. May have been changed after line was added.
* @var string
*/
public $ref_supplier;
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 8137592b41d..29b52fe45c1 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -2263,12 +2263,14 @@ class SupplierInvoiceLine extends CommonObjectLine
* @var string
*/
public $product_ref;
+
/**
- * Reference product supplier
- * TODO Rename field ref to ref_supplier into table llx_facture_fourn_det and llx_commande_fournisseurdet and update fields it into updateline
+ * Supplier reference of price when we added the line. May have been changed after line was added.
+ * TODO Rename field ref to ref_supplier into table llx_facture_fourn_det and llx_commande_fournisseurdet and update fields into updateline
* @var string
*/
public $ref_supplier;
+
/**
* @deprecated
* @see label
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index bf87a32f3c9..a61406c90d7 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -944,7 +944,7 @@ class Product extends CommonObject
// Delete all child tables
if (! $error)
{
- $elements = array('product_fournisseur_price','product_price','product_lang','categorie_product','product_stock','product_customer_price','product_lot','product_warehouse_properties');
+ $elements = array('product_fournisseur_price','product_price','product_lang','categorie_product','product_stock','product_customer_price','product_lot','product_warehouse_properties'); // product_batch is done before
foreach($elements as $table)
{
if (! $error)
@@ -1341,10 +1341,11 @@ class Product extends CommonObject
* @param int $prodfournprice Id du tarif = rowid table product_fournisseur_price
* @param double $qty Quantity asked or -1 to get first entry found
* @param int $product_id Filter on a particular product id
- * @param string $fourn_ref Filter on a supplier ref. 'none' to exclude ref in search.
+ * @param string $fourn_ref Filter on a supplier price ref. 'none' to exclude ref in search.
+ * @param int $fk_soc If of supplier
* @return int <-1 if KO, -1 if qty not enough, 0 if OK but nothing found, id_product if OK and found. May also initialize some properties like (->ref_supplier, buyprice, fourn_pu, vatrate_supplier...)
*/
- function get_buyprice($prodfournprice, $qty, $product_id=0, $fourn_ref='')
+ function get_buyprice($prodfournprice, $qty, $product_id=0, $fourn_ref='', $fk_soc=0)
{
global $conf;
$result = 0;
@@ -1390,12 +1391,13 @@ class Product extends CommonObject
}
else // If not found
{
- // We do a second search by doing a select again but searching with qty and id product
+ // We do a second search by doing a select again but searching with less reliable criteria: couple qty/id product, and if set fourn_ref or fk_soc.
$sql = "SELECT pfp.rowid, pfp.price as price, pfp.quantity as quantity, pfp.fk_soc,";
$sql.= " pfp.fk_product, pfp.ref_fourn as ref_supplier, pfp.tva_tx, pfp.fk_supplier_price_expression";
$sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
$sql.= " WHERE pfp.fk_product = ".$product_id;
if ($fourn_ref != 'none') $sql.= " AND pfp.ref_fourn = '".$fourn_ref."'";
+ if ($fk_soc > 0) $sql.= " AND pfp.fk_soc = ".$fk_soc;
if ($qty > 0) $sql.= " AND pfp.quantity <= ".$qty;
$sql.= " ORDER BY pfp.quantity DESC";
$sql.= " LIMIT 1";
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 8f1e7484ced..51c3375677a 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -5,7 +5,7 @@
* Copyright (C) 2005-2015 Regis Houssin
* Copyright (C) 2006 Andre Cianfarani
* Copyright (C) 2014 Florian Henry
- * Copyright (C) 2014 Juanjo Menent
+ * Copyright (C) 2014-2016 Juanjo Menent
* Copyright (C) 2014-2015 Philippe Grand
* Copyright (C) 2014 Ion agorria
* Copyright (C) 2015 Alexandre Spangaro
@@ -286,8 +286,8 @@ if (empty($reshook))
{
$obj = $db->fetch_object($resql);
$npr = $obj->recuperableonly;
- $localtax1 = $obj->localtax1;
- $localtax2 = $obj->localtax2;
+ $localtax1 = get_localtax($tva_tx,1);
+ $localtax2 = get_localtax($tva_tx,2);
$localtax1_type = $obj->localtax1_type;
$localtax2_type = $obj->localtax2_type;
}