lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2019-12-14 13:41:44 +01:00
commit edaff84f41
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/contrat/class/contrat.class.php
View File

@ -643,7 +643,7 @@ class Contrat extends CommonObject
$sql .= " note_private, note_public, model_pdf, extraparams";
$sql .= " FROM ".MAIN_DB_PREFIX."contrat";
if (!$id) $sql .= " WHERE entity IN (".getEntity('contract').")";
else $sql .= " WHERE rowid=".$id;
else $sql .= " WHERE rowid=".(int) $id;
if ($ref_customer)
{
$sql .= " AND ref_customer = '".$this->db->escape($ref_customer)."'";
@ -1291,20 +1291,20 @@ class Contrat extends CommonObject
// Clean parameters
if (empty($this->fk_commercial_signature) && $this->commercial_signature_id > 0) $this->fk_commercial_signature = $this->commercial_signature_id;
if (empty($this->fk_commercial_suivi) && $this->commercial_suivi_id > 0) $this->fk_commercial_suivi = $this->commercial_suivi_id;
if (empty($this->fk_soc) && $this->socid > 0) $this->fk_soc = $this->socid;
if (empty($this->fk_project) && $this->projet > 0) $this->fk_project = $this->projet;
if (empty($this->fk_soc) && $this->socid > 0) $this->fk_soc = (int) $this->socid;
if (empty($this->fk_project) && $this->projet > 0) $this->fk_project = (int) $this->projet;
if (isset($this->ref)) $this->ref = trim($this->ref);
if (isset($this->ref_customer)) $this->ref_customer = trim($this->ref_customer);
if (isset($this->ref_supplier)) $this->ref_supplier = trim($this->ref_supplier);
if (isset($this->ref_ext)) $this->ref_ext = trim($this->ref_ext);
if (isset($this->entity)) $this->entity = trim($this->entity);
if (isset($this->entity)) $this->entity = (int) $this->entity;
if (isset($this->statut)) $this->statut = (int) $this->statut;
if (isset($this->fk_soc)) $this->fk_soc = trim($this->fk_soc);
if (isset($this->fk_soc)) $this->fk_soc = (int) $this->fk_soc;
if (isset($this->fk_commercial_signature)) $this->fk_commercial_signature = trim($this->fk_commercial_signature);
if (isset($this->fk_commercial_suivi)) $this->fk_commercial_suivi = trim($this->fk_commercial_suivi);
if (isset($this->fk_user_mise_en_service)) $this->fk_user_mise_en_service = trim($this->fk_user_mise_en_service);
if (isset($this->fk_user_cloture)) $this->fk_user_cloture = trim($this->fk_user_cloture);
if (isset($this->fk_user_mise_en_service)) $this->fk_user_mise_en_service = (int) $this->fk_user_mise_en_service;
if (isset($this->fk_user_cloture)) $this->fk_user_cloture = (int) $this->fk_user_cloture;
if (isset($this->note_private)) $this->note_private = trim($this->note_private);
if (isset($this->note_public)) $this->note_public = trim($this->note_public);
if (isset($this->import_key)) $this->import_key = trim($this->import_key);

2
htdocs/core/class/html.form.class.php
View File

@ -2097,7 +2097,7 @@ class Form
}
else
{
$selectFieldsGrouped = ", p.stock";
$selectFieldsGrouped = ", ".$db->ifsql("p.stock IS NULL", 0, "p.stock")." AS stock";
}
$sql = "SELECT ";

6
htdocs/langs/en_US/sendings.lang
View File

@ -54,10 +54,10 @@ ActionsOnShipping=Events on shipment
LinkToTrackYourPackage=Link to track your package
ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card.
ShipmentLine=Shipment line
ProductQtyInCustomersOrdersRunning=Product quantity into open sales orders
ProductQtyInSuppliersOrdersRunning=Product quantity into open purchase orders
ProductQtyInCustomersOrdersRunning=Product quantity from open sales orders
ProductQtyInSuppliersOrdersRunning=Product quantity from open purchase orders
ProductQtyInShipmentAlreadySent=Product quantity from open sales order already sent
ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from open purchase order already received
ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from open purchase orders already received
NoProductToShipFoundIntoStock=No product to ship found in warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
WeightVolShort=Weight/Vol.
ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.

2
htdocs/product/stock/replenish.php
View File

@ -374,7 +374,7 @@ if ($usevirtualstock)
$sqlExpeditionsCli .= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON (c.rowid = cd.fk_commande)";
$sqlExpeditionsCli .= " WHERE e.entity IN (".getEntity('expedition').")";
$sqlExpeditionsCli .= " AND cd.fk_product = p.rowid";
$sqlExpeditionsCli .= " AND c.fk_statut IN (1,2))";
$sqlExpeditionsCli .= " AND e.fk_statut IN (1,2))";
$sqlCommandesFourn = "(SELECT ".$db->ifsql("SUM(cd.qty) IS NULL", "0", "SUM(cd.qty)")." as qty";
$sqlCommandesFourn .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd";