';
- print '';
+ print '';
print $langs->trans('DateDeliveryPlanned');
print ' ';
@@ -2008,7 +2008,7 @@ if ($action == 'create') {
// Sending method
print '';
- print '';
+ print '';
print $langs->trans('SendingMethod');
print ' ';
diff --git a/htdocs/expedition/dispatch.php b/htdocs/expedition/dispatch.php
index cf7c5023bea..b64908d02e3 100644
--- a/htdocs/expedition/dispatch.php
+++ b/htdocs/expedition/dispatch.php
@@ -148,6 +148,7 @@ if ($action == 'updatelines' && $usercancreate) {
$ent = "entrepot_".$reg[1].'_'.$reg[2];
$fk_commandedet = "fk_commandedet_".$reg[1].'_'.$reg[2];
$idline = GETPOST("idline_".$reg[1].'_'.$reg[2]);
+ $warehouse_id = GETPOSTINT($ent);
$pu = "pu_".$reg[1].'_'.$reg[2]; // This is unit price including discount
$lot = '';
$dDLUO = '';
@@ -159,11 +160,12 @@ if ($action == 'updatelines' && $usercancreate) {
}
$newqty = price2num(GETPOST($qty, 'alpha'), 'MS');
+ //var_dump("modebatch=".$modebatch." newqty=".$newqty." ent=".$ent." idline=".$idline);
// We ask to move a qty
if (($modebatch == "batch" && $newqty >= 0) || ($modebatch == "barcode" && $newqty != 0)) {
if ($newqty > 0) { // If we want a qty, we make test on input data
- if (!(GETPOST($ent, 'int') > 0)) {
+ if (!($warehouse_id > 0)) {
dol_syslog('No dispatch for line '.$key.' as no warehouse was chosen.');
$text = $langs->transnoentities('Warehouse').', '.$langs->transnoentities('Line').' '.($numline);
setEventMessages($langs->trans('ErrorFieldRequired', $text), null, 'errors');
@@ -200,7 +202,7 @@ if ($action == 'updatelines' && $usercancreate) {
$qtystart = 0;
if ($idline > 0) {
- $result = $expeditiondispatch->fetch($idline);
+ $result = $expeditiondispatch->fetch($idline); // get line from llx_expeditiondet
if ($result < 0) {
setEventMessages($expeditiondispatch->error, $expeditiondispatch->errors, 'errors');
$error++;
@@ -225,13 +227,30 @@ if ($action == 'updatelines' && $usercancreate) {
$sellby = dol_mktime(0, 0, 0, GETPOST('dlc'.$suffixkeyfordate.'month'), GETPOST('dlc'.$suffixkeyfordate.'day'), GETPOST('dlc'.$suffixkeyfordate.'year'), '');
$eatby = dol_mktime(0, 0, 0, GETPOST('dluo'.$suffixkeyfordate.'month'), GETPOST('dluo'.$suffixkeyfordate.'day'), GETPOST('dluo'.$suffixkeyfordate.'year'));
- $sql = "UPDATE ".MAIN_DB_PREFIX.$expeditionlinebatch->table_element." SET";
- $sql .= " eatby = ".($eatby ? "'".$db->idate($eatby)."'" : "null");
- $sql .= " , sellby = ".($sellby ? "'".$db->idate($sellby)."'" : "null");
- $sql .= " , qty = ".((float) $newqty);
- // TODO Add a column fk_warehouse
- $sql .= " WHERE fk_expeditiondet = ".((int) $idline);
- $sql .= " AND batch = '".$db->escape($lot)."'";
+ $sqlsearchdet = "SELECT rowid FROM ".MAIN_DB_PREFIX.$expeditionlinebatch->table_element;
+ $sqlsearchdet .= " WHERE fk_expeditiondet = ".((int) $idline);
+ $sqlsearchdet .= " AND batch = '".$db->escape($lot)."'";
+ $resqlsearchdet = $db->query($sqlsearchdet);
+
+ if ($resqlsearchdet) {
+ $objsearchdet = $db->fetch_object($resqlsearchdet);
+ } else {
+ dol_print_error($db);
+ }
+
+ if ($objsearchdet) {
+ $sql = "UPDATE ".MAIN_DB_PREFIX.$expeditionlinebatch->table_element." SET";
+ $sql .= " eatby = ".($eatby ? "'".$db->idate($eatby)."'" : "null");
+ $sql .= " , sellby = ".($sellby ? "'".$db->idate($sellby)."'" : "null");
+ $sql .= " , qty = ".((float) $newqty);
+ $sql .= " , fk_warehouse = ".((int) $warehouse_id);
+ $sql .= " WHERE rowid = ".((int) $objsearchdet->rowid);
+ } else {
+ $sql = "INSERT INTO ".MAIN_DB_PREFIX.$expeditionlinebatch->table_element." (";
+ $sql .= "fk_expeditiondet, eatby, sellby, batch, qty, fk_origin_stock, fk_warehouse)";
+ $sql .= " VALUES (".((int) $idline).", ".($eatby ? "'".$db->idate($eatby)."'" : "null").", ".($sellby ? "'".$db->idate($sellby)."'" : "null").", ";
+ $sql .= " '".$db->escape($lot)."', ".((float) $newqty).", 0, ".((int) $warehouse_id).")";
+ }
} else {
$sql = " DELETE FROM ".MAIN_DB_PREFIX.$expeditionlinebatch->table_element;
$sql .= " WHERE fk_expeditiondet = ".((int) $idline);
@@ -239,7 +258,7 @@ if ($action == 'updatelines' && $usercancreate) {
}
$resql = $db->query($sql);
- if (!$db->query($sql)) {
+ if (!$resql) {
dol_print_error($db);
$error++;
}
@@ -317,6 +336,7 @@ if ($action == 'updatelines' && $usercancreate) {
}
}
}
+
if ($error > 0) {
$db->rollback();
setEventMessages($error, $errors, 'errors');
@@ -446,7 +466,7 @@ if ($object->id > 0 || !empty($object->ref)) {
print '';
print '
';
- print '
';
+ print '';
// Linked documents
if ($typeobject == 'commande' && $object->$typeobject->id && isModEnabled('commande')) {
@@ -605,11 +625,11 @@ if ($object->id > 0 || !empty($object->ref)) {
}
print ''.$langs->trans("QtyOrdered").' ';
if ($object->status == Expedition::STATUS_DRAFT) {
- print ''.$langs->trans("QtyToDispatchShort"); // Qty to dispatch (sum for all lines of batch detail if there is)
+ print ' '.$langs->trans("QtyToShip"); // Qty to dispatch (sum for all lines of batch detail if there is)
} else {
print ' '.$langs->trans("QtyDispatchedShort").' ';
}
- print ''.$langs->trans("QtyToDispatchShort");
+ print ' '.$langs->trans("Details");
print ' ';
- print ' ';
if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index d110660b6f5..cfad9f838b1 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -80,7 +80,7 @@ $result = @include_once $conffile; // Keep @ because with some error reporting t
// Disable some not used PHP stream
$listofwrappers = stream_get_wrappers();
-// We need '.phar' for geoip2. TODO Replace phar with explode files so we can disable phar.
+// We need '.phar' for geoip2. TODO Replace phar in geoip with exploded files so we can disable phar.
$arrayofstreamtodisable = array('compress.zlib', 'compress.bzip2', 'ftps', 'glob', 'data', 'expect', 'ftp', 'ogg', 'rar', 'zip', 'zlib');
foreach ($arrayofstreamtodisable as $streamtodisable) {
if (!empty($listofwrappers) && in_array($streamtodisable, $listofwrappers)) {
diff --git a/htdocs/fourn/class/api_supplier_invoices.class.php b/htdocs/fourn/class/api_supplier_invoices.class.php
index 09700c58855..a09b8d4fbf6 100644
--- a/htdocs/fourn/class/api_supplier_invoices.class.php
+++ b/htdocs/fourn/class/api_supplier_invoices.class.php
@@ -18,8 +18,8 @@
use Luracast\Restler\RestException;
-require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
+require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
+require_once DOL_DOCUMENT_ROOT . '/fourn/class/paiementfourn.class.php';
/**
* API class for supplier invoices
@@ -75,7 +75,7 @@ class SupplierInvoices extends DolibarrApi
}
if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->invoice->id, 'facture_fourn', 'facture')) {
- throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+ throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
}
$this->invoice->fetchObjectLinked();
@@ -123,19 +123,19 @@ class SupplierInvoices extends DolibarrApi
if (!DolibarrApiAccess::$user->hasRight("societe", "client", "voir") || $search_sale > 0) {
$sql .= ", sc.fk_soc, sc.fk_user";
}
- $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn AS t LEFT JOIN ".MAIN_DB_PREFIX."facture_fourn_extrafields AS ef ON (ef.fk_object = t.rowid)"; // Modification VMR Global Solutions to include extrafields as search parameters in the API GET call, so we will be able to filter on extrafields
+ $sql .= " FROM " . MAIN_DB_PREFIX . "facture_fourn AS t LEFT JOIN " . MAIN_DB_PREFIX . "facture_fourn_extrafields AS ef ON (ef.fk_object = t.rowid)"; // Modification VMR Global Solutions to include extrafields as search parameters in the API GET call, so we will be able to filter on extrafields
// We need this table joined to the select in order to filter by sale
if (!DolibarrApiAccess::$user->hasRight("societe", "client", "voir") || $search_sale > 0) {
- $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
}
- $sql .= ' WHERE t.entity IN ('.getEntity('supplier_invoice').')';
+ $sql .= ' WHERE t.entity IN (' . getEntity('supplier_invoice') . ')';
if (!DolibarrApiAccess::$user->hasRight("societe", "client", "voir") || $search_sale > 0) {
$sql .= " AND t.fk_soc = sc.fk_soc";
}
if ($socids) {
- $sql .= " AND t.fk_soc IN (".$this->db->sanitize($socids).")";
+ $sql .= " AND t.fk_soc IN (" . $this->db->sanitize($socids) . ")";
}
if ($search_sale > 0) {
$sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
@@ -156,14 +156,14 @@ class SupplierInvoices extends DolibarrApi
}
// Insert sale filter
if ($search_sale > 0) {
- $sql .= " AND sc.fk_user = ".((int) $search_sale);
+ $sql .= " AND sc.fk_user = " . ((int) $search_sale);
}
// Add sql filters
if ($sqlfilters) {
$errormessage = '';
$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
if ($errormessage) {
- throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
+ throw new RestException(400, 'Error when validating parameter sqlfilters -> ' . $errormessage);
}
}
@@ -191,7 +191,7 @@ class SupplierInvoices extends DolibarrApi
$i++;
}
} else {
- throw new RestException(503, 'Error when retrieve supplier invoice list : '.$this->db->lasterror());
+ throw new RestException(503, 'Error when retrieve supplier invoice list : ' . $this->db->lasterror());
}
if (!count($obj_ret)) {
throw new RestException(404, 'No supplier invoice found');
@@ -257,7 +257,7 @@ class SupplierInvoices extends DolibarrApi
}
if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->invoice->id, 'facture_fourn', 'facture')) {
- throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+ throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
}
foreach ($request_data as $field => $value) {
@@ -296,7 +296,7 @@ class SupplierInvoices extends DolibarrApi
}
if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->invoice->id, 'facture_fourn', 'facture')) {
- throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+ throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
}
if ($this->invoice->delete(DolibarrApiAccess::$user) < 0) {
@@ -339,7 +339,7 @@ class SupplierInvoices extends DolibarrApi
}
if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->invoice->id, 'facture_fourn', 'facture')) {
- throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+ throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
}
$result = $this->invoice->validate(DolibarrApiAccess::$user, '', $idwarehouse, $notrigger);
@@ -347,13 +347,13 @@ class SupplierInvoices extends DolibarrApi
throw new RestException(304, 'Error nothing done. The invoice is already validated');
}
if ($result < 0) {
- throw new RestException(500, 'Error when validating Invoice: '.$this->invoice->error);
+ throw new RestException(500, 'Error when validating Invoice: ' . $this->invoice->error);
}
return array(
'success' => array(
'code' => 200,
- 'message' => 'Invoice validated (Ref='.$this->invoice->ref.')'
+ 'message' => 'Invoice validated (Ref=' . $this->invoice->ref . ')'
)
);
}
@@ -381,7 +381,7 @@ class SupplierInvoices extends DolibarrApi
}
if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->invoice->id, 'facture_fourn', 'facture')) {
- throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+ throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
}
$result = $this->invoice->fetch($id);
@@ -410,6 +410,7 @@ class SupplierInvoices extends DolibarrApi
* @param string $comment {@from body} Note (optional)
* @param string $chqemetteur {@from body} Payment issuer (mandatory if payment_mode_id corresponds to 'CHQ'-payment type)
* @param string $chqbank {@from body} Issuer bank name (optional)
+ * @param float $amount {@from body} Amount of payment if we don't want to use the remain to pay
*
* @url POST {id}/payments
*
@@ -418,7 +419,7 @@ class SupplierInvoices extends DolibarrApi
* @throws RestException 401
* @throws RestException 404
*/
- public function addPayment($id, $datepaye, $payment_mode_id, $closepaidinvoices, $accountid, $num_payment = '', $comment = '', $chqemetteur = '', $chqbank = '')
+ public function addPayment($id, $datepaye, $payment_mode_id, $closepaidinvoices, $accountid, $num_payment = '', $comment = '', $chqemetteur = '', $chqbank = '', $amount = null)
{
global $conf;
@@ -430,7 +431,7 @@ class SupplierInvoices extends DolibarrApi
}
if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->invoice->id, 'facture_fourn', 'facture')) {
- throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+ throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
}
if (isModEnabled("banque")) {
@@ -449,18 +450,24 @@ class SupplierInvoices extends DolibarrApi
throw new RestException(404, 'Invoice not found');
}
- // Calculate amount to pay
- $totalpaid = $this->invoice->getSommePaiement();
- $totaldeposits = $this->invoice->getSumDepositsUsed();
- $resteapayer = price2num($this->invoice->total_ttc - $totalpaid - $totaldeposits, 'MT');
+ if (null !== $amount && $amount > 0) {
+ // We use the amount given in parameter
+ $paymentamount = $amount;
+ } else {
+ // We calculate the remain to pay, and use it as amount
+ $totalpaid = $this->invoice->getSommePaiement();
+ $totaldeposits = $this->invoice->getSumDepositsUsed();
+ $paymentamount = price2num($this->invoice->total_ttc - $totalpaid - $totaldeposits, 'MT');
+ }
$this->db->begin();
$amounts = array();
$multicurrency_amounts = array();
- $resteapayer = price2num($resteapayer, 'MT');
- $amounts[$id] = $resteapayer;
+ $paymentamount = price2num($paymentamount, 'MT');
+
+ $amounts[$id] = $paymentamount;
// Multicurrency
$newvalue = price2num($this->invoice->multicurrency_total_ttc, 'MT');
@@ -479,14 +486,14 @@ class SupplierInvoices extends DolibarrApi
$paiement_id = $paiement->create(DolibarrApiAccess::$user, ($closepaidinvoices == 'yes' ? 1 : 0)); // This include closing invoices
if ($paiement_id < 0) {
$this->db->rollback();
- throw new RestException(400, 'Payment error : '.$paiement->error);
+ throw new RestException(400, 'Payment error : ' . $paiement->error);
}
if (isModEnabled("banque")) {
$result = $paiement->addPaymentToBank(DolibarrApiAccess::$user, 'payment_supplier', '(SupplierInvoicePayment)', $accountid, $chqemetteur, $chqbank);
if ($result < 0) {
$this->db->rollback();
- throw new RestException(400, 'Add payment to bank error : '.$paiement->error);
+ throw new RestException(400, 'Add payment to bank error : ' . $paiement->error);
}
}
@@ -516,7 +523,7 @@ class SupplierInvoices extends DolibarrApi
}
if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->invoice->id, 'facture_fourn', 'facture')) {
- throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+ throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
}
$this->invoice->fetch_lines();
$result = array();
@@ -552,7 +559,7 @@ class SupplierInvoices extends DolibarrApi
}
if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->invoice->id, 'facture_fourn', 'facture')) {
- throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+ throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
}
$request_data = (object) $request_data;
@@ -586,7 +593,7 @@ class SupplierInvoices extends DolibarrApi
);
if ($updateRes < 0) {
- throw new RestException(400, 'Unable to insert the new line. Check your inputs. '.$this->invoice->error);
+ throw new RestException(400, 'Unable to insert the new line. Check your inputs. ' . $this->invoice->error);
}
return $updateRes;
@@ -619,7 +626,7 @@ class SupplierInvoices extends DolibarrApi
}
if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->invoice->id, 'facture_fourn', 'facture')) {
- throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+ throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
}
$request_data = (object) $request_data;
@@ -690,7 +697,7 @@ class SupplierInvoices extends DolibarrApi
}
if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->invoice->id, 'facture_fourn', 'facture')) {
- throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+ throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
}
// TODO Check the lineid $lineid is a line of ojbect
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 93e1ad0c4d4..c06467d1d24 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -279,6 +279,7 @@ if (empty($reshook)) {
$object->date_debut = $date_debut;
$object->date_fin = $date_fin;
$object->halfday = $halfday;
+ $object->entity = $conf->entity;
$result = $object->create($user);
if ($result <= 0) {
@@ -657,7 +658,7 @@ if (empty($reshook)) {
$societeName = $conf->global->MAIN_APPLICATION_TITLE;
}
- $subject = $societeName." - ".$langs->transnoentitiesnoconv("HolidaysValidated");
+ $subject = '['.$societeName."] ".$langs->transnoentitiesnoconv("HolidaysValidated");
// Content
$message = "".$langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",
\n";
diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php
index a661758dfad..c4bc55bd067 100644
--- a/htdocs/hrm/index.php
+++ b/htdocs/hrm/index.php
@@ -260,7 +260,7 @@ if (isModEnabled('holiday') && $user->hasRight('holiday', 'read')) {
$i++;
}
} else {
- print ''.$langs->trans("None").' '.$langs->trans("None").'
';
print '';
@@ -332,7 +332,7 @@ if (isModEnabled('expensereport') && $user->hasRight('expensereport', 'read')) {
$i++;
}
} else {
- print ''.$langs->trans("None").' '.$langs->trans("None").'
';
print '
%s is not found, please check your url
+
ErrorTableExist=Table %s already exist
ErrorDictionaryNotFound=Dictionary %s not found
ErrorFailedToCreateSymLinkToMedias=Failed to create the symbolic link %s to point to %s
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index 41ca1f5c7f0..2d25697845a 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -318,10 +318,12 @@ ErrorTheUrlOfYourDolInstanceDoesNotMatchURLIntoOAuthSetup=Erreur : L'URL de vot
ErrorMenuExistValue=Un menu existe déjà avec ce titre ou cette URL
ErrorSVGFilesNotAllowedAsLinksWithout=Les fichiers SVG ne sont pas autorisés en tant que liens externes sans l'option %s
ErrorTypeMenu=Impossible d'ajouter un autre menu pour le même module sur la barre de navigation, pas encore géré
+ErrorObjectNotFound=L'objet %s est introuvable verifier votre url
ErrorTableExist=La table %s existe déja
ErrorDictionaryNotFound=Le dictionnaire %s introuvable
ErrorFailedToCreateSymLinkToMedias=Failed to create the symlinks %s to point to %s
+
# Warnings
WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Votre paramètre PHP upload_max_filesize (%s) est supérieur au paramètre PHP post_max_size (%s). Ceci n'est pas une configuration cohérente.
WarningPasswordSetWithNoAccount=Un mot de passe a été fixé pour cet adhérent. Cependant, aucun compte d'utilisateur n'a été créé. Donc, ce mot de passe est stocké, mais ne peut être utilisé pour accéder à Dolibarr. Il peut être utilisé par un module/interface externe, mais si vous n'avez pas besoin de définir ni login ni mot de passe pour un adhérent, vous pouvez désactiver l'option «Gérer un login pour chaque adhérent" depuis la configuration du module Adhérents. Si vous avez besoin de gérer un login, mais pas de mot de passe, vous pouvez laisser ce champ vide pour éviter cet avertissement. Remarque: L'email peut également être utilisé comme login si l'adhérent est lié à un utilisateur.
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 4057397c6e5..2528d402810 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1802,8 +1802,8 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
if (!defined('DISABLE_FONT_AWSOME')) {
print ''."\n";
- print '