diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index b3500a4e45d..1c9ed333fae 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -1316,7 +1316,7 @@ class CommandeFournisseur extends CommonOrder
$sql .= ", multicurrency_tx";
$sql .= ") ";
$sql .= " VALUES (";
- $sql .= "''";
+ $sql .= "'(PROV)'";
$sql .= ", '".$this->db->escape($this->ref_supplier)."'";
$sql .= ", '".$this->db->escape($this->note_private)."'";
$sql .= ", '".$this->db->escape($this->note_public)."'";
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index 23a05ea0844..b124817bf9f 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -1057,7 +1057,7 @@ class ProductFournisseur extends Product
//$out .= '
| '.dol_print_date($productFournLog['datec'], 'dayhour', 'tzuser').' | ';
$out .= ''.price($productFournLog['price'], 0, $langs, 1, -1, -1, $conf->currency);
if ($productFournLog['multicurrency_code'] != $conf->currency) {
$out .= ' ('.price($productFournLog['multicurrency_price'], 0, $langs, 1, -1, -1, $productFournLog['multicurrency_code']).')';
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 05a4a78e4dc..fe854c72d48 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1146,8 +1146,8 @@ if (empty($reshook)) {
// Creation commande
$object->ref_supplier = GETPOST('refsupplier');
$object->socid = $socid;
- $object->cond_reglement_id = GETPOST('cond_reglement_id');
- $object->mode_reglement_id = GETPOST('mode_reglement_id');
+ $object->cond_reglement_id = GETPOST('cond_reglement_id', 'int');
+ $object->mode_reglement_id = GETPOST('mode_reglement_id', 'int');
$object->fk_account = GETPOST('fk_account', 'int');
$object->note_private = GETPOST('note_private', 'restricthtml');
$object->note_public = GETPOST('note_public', 'restricthtml');
@@ -1157,7 +1157,7 @@ if (empty($reshook)) {
$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
$object->multicurrency_tx = GETPOST('originmulticurrency_tx', 'int');
- $object->fk_project = GETPOST('projectid');
+ $object->fk_project = GETPOST('projectid', 'int');
// Fill array 'array_options' with data from add form
if (!$error) {
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index d5d3128071a..371713f0250 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -227,17 +227,17 @@ if (empty($reshook)) {
}
}
if (!empty($conf->multicurrency->enabled)) {
- if (empty($_POST["multicurrency_code"])) {
+ if (!GETPOST("multicurrency_code")) {
$error++;
$langs->load("errors");
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Currency")), null, 'errors');
}
- if (price2num($_POST["multicurrency_tx"]) <= 0 || $_POST["multicurrency_tx"] == '') {
+ if (price2num(GETPOST("multicurrency_tx")) <= 0 || GETPOST("multicurrency_tx") == '') {
$error++;
$langs->load("errors");
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("CurrencyRate")), null, 'errors');
}
- if (price2num($_POST["multicurrency_price"]) < 0 || $_POST["multicurrency_price"] == '') {
+ if (price2num(GETPOST("multicurrency_price")) < 0 || GETPOST("multicurrency_price") == '') {
$error++;
$langs->load("errors");
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("PriceCurrency")), null, 'errors');
@@ -1081,7 +1081,7 @@ END;
// Currency
if (!empty($conf->multicurrency->enabled)) {
- print ' | ';
+ print ' | ';
print $productfourn->fourn_multicurrency_code ? currency_name($productfourn->fourn_multicurrency_code) : '';
print ' | ';
}
@@ -1130,9 +1130,9 @@ END;
print '';
}
- // Date
+ // Date modification
if (!empty($arrayfields['pfp.tms']['checked'])) {
- print '';
+ print ' | ';
print dol_print_date(($productfourn->fourn_date_modification ? $productfourn->fourn_date_modification : $productfourn->date_modification), "dayhour");
print ' | ';
}
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index ebd126e377f..8cdc130a373 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1786,30 +1786,31 @@ if ($action == 'create') {
if ($action == 'statut') {
// Form to set proposal accepted/refused
- $form_close = '';
+ $form_close .= '';
+ $form_close .= '';
print $form_close;
}
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index d3909983c52..b3efe3f293f 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -465,6 +465,7 @@ input#onlinepaymenturl, input#directdownloadlink {
.formconsumeproduce {
background: #f3f3f3;
padding: 20px 0px 0px 0px;
+ border-radius: 8px;
}
div#moretabsList, div#moretabsListaction {