diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php
index b82bd618a42..66e8c2ee957 100644
--- a/htdocs/commande/class/api_orders.class.php
+++ b/htdocs/commande/class/api_orders.class.php
@@ -156,12 +156,13 @@ class Orders extends DolibarrApi
* @param int $page Page number
* @param string $thirdparty_ids Thirdparty ids to filter orders of (example '1' or '1,2,3') {@pattern /^[0-9,]*$/i}
* @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
+ * @param string $sqlfilterlines Other criteria to filter answers separated by a comma. Syntax example "(tl.fk_product:=:'17') and (tl.price:<:'250')"
* @return array Array of order objects
*
* @throws RestException 404 Not found
* @throws RestException 503 Error
*/
- public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '')
+ public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '', $sqlfilterlines = '')
{
global $db, $conf;
@@ -212,7 +213,16 @@ class Orders extends DolibarrApi
throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
}
}
-
+ // Add sql filters for lines
+ if ($sqlfilterlines) {
+ $errormessage = '';
+ $sql .= " AND EXISTS (SELECT tl.rowid FROM ".MAIN_DB_PREFIX."commandedet AS tl WHERE tl.fk_commande = t.rowid";
+ $sql .= forgeSQLFromUniversalSearchCriteria($sqlfilterlines, $errormessage);
+ $sql .= ")";
+ if ($errormessage) {
+ throw new RestException(400, 'Error when validating parameter sqlfilterlines -> '.$errormessage);
+ }
+ }
$sql .= $this->db->order($sortfield, $sortorder);
if ($limit) {
if ($page < 0) {
diff --git a/htdocs/core/actions_setnotes.inc.php b/htdocs/core/actions_setnotes.inc.php
index 44fd5754e22..6ce9d3b08b3 100644
--- a/htdocs/core/actions_setnotes.inc.php
+++ b/htdocs/core/actions_setnotes.inc.php
@@ -81,7 +81,7 @@ if ($action == 'setnote_public' && !empty($permissionnote) && !GETPOST('cancel',
if (empty($object->id)) {
$object->fetch($id); // Fetch may not be already done
}
- $result = $object->update_note(dol_html_entity_decode(GETPOST('note_private', 'restricthtml'), ENT_QUOTES | ENT_HTML5), '_private');
+ $result = $object->update_note(dol_html_entity_decode(GETPOST('note_private', 'restricthtml'), ENT_QUOTES | ENT_HTML5, 'UTF-8', 1), '_private');
if ($result < 0) {
setEventMessages($object->error, $object->errors, 'errors');
}
diff --git a/htdocs/fourn/class/api_supplier_orders.class.php b/htdocs/fourn/class/api_supplier_orders.class.php
index 503bd908a2d..120b3d9ef99 100644
--- a/htdocs/fourn/class/api_supplier_orders.class.php
+++ b/htdocs/fourn/class/api_supplier_orders.class.php
@@ -93,11 +93,12 @@ class SupplierOrders extends DolibarrApi
* @param string $product_ids Product ids to filter orders of (example '1' or '1,2,3') {@pattern /^[0-9,]*$/i}
* @param string $status Filter by order status : draft | validated | approved | running | received_start | received_end | cancelled | refused
* @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.datec:<:'20160101')"
+ * @param string $sqlfilterlines Other criteria to filter answers separated by a comma. Syntax example "(tl.fk_product:=:'17') and (tl.price:<:'250')"
* @return array Array of order objects
*
* @throws RestException
*/
- public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $product_ids = '', $status = '', $sqlfilters = '')
+ public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $product_ids = '', $status = '', $sqlfilters = '', $sqlfilterlines = '')
{
global $db, $conf;
@@ -181,6 +182,16 @@ class SupplierOrders extends DolibarrApi
throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
}
}
+ // Add sql filters for lines
+ if ($sqlfilterlines) {
+ $errormessage = '';
+ $sql .= " AND EXISTS (SELECT tl.rowid FROM ".MAIN_DB_PREFIX."commande_fournisseurdet AS tl WHERE tl.fk_commande = t.rowid";
+ $sql .= forgeSQLFromUniversalSearchCriteria($sqlfilterlines, $errormessage);
+ $sql .= ")";
+ if ($errormessage) {
+ throw new RestException(400, 'Error when validating parameter sqlfilterlines -> '.$errormessage);
+ }
+ }
$sql .= $this->db->order($sortfield, $sortorder);
if ($limit) {
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 327bcdc8af7..e2bcbe62fc3 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -352,6 +352,7 @@ PackagingForThisProductDesc=You will automaticaly purchase a multiple of this qu
QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
#Attributes
+Attributes=Attributes
VariantAttributes=Variant attributes
ProductAttributes=Variant attributes for products
ProductAttributeName=Variant attribute %s
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index c9ac61c28d0..060f7780a70 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -352,6 +352,7 @@ PackagingForThisProductDesc=Vous achèterez automatiquement un multiple de cette
QtyRecalculatedWithPackaging=La quantité de la ligne a été recalculée en fonction de l'emballage du fournisseur
#Attributes
+Attributes=Attributs
VariantAttributes=Attributs de variante
ProductAttributes=Attributs de variantes pour les produits
ProductAttributeName=Attribut de variante %s
diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index 40ccee11b4e..4ca3768fa11 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -97,11 +97,10 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be includ
//$result = restrictedArea($user, 'mymodule', $id);
//Parameters Page
-$param = '&id='.$object->id;
+$paramwithsearch = '';
if ($limit > 0 && $limit != $conf->liste_limit) {
- $param .= '&limit='.((int) $limit);
+ $paramwithsearch .= '&limit='.((int) $limit);
}
-$paramwithsearch = $param;
if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
@@ -459,7 +458,7 @@ if ($action == 'clone') {
// Confirmation to close
if ($action == 'record') {
- $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('Close'), $langs->trans('ConfirmFinish'), 'update', '', 0, 1);
+ $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&page='.$page.$paramwithsearch, $langs->trans('Close'), $langs->trans('ConfirmFinish'), 'update', '', 0, 1);
$action = 'view';
}
@@ -583,13 +582,13 @@ if ($action != 'record') {
// Save
if ($object->status == $object::STATUS_VALIDATED) {
if ($permissiontoadd) {
- print ''.$langs->trans("MakeMovementsAndClose").''."\n";
+ print ''.$langs->trans("MakeMovementsAndClose").''."\n";
} else {
print ''.$langs->trans('MakeMovementsAndClose').''."\n";
}
if ($permissiontoadd) {
- print ''.$langs->trans("Cancel").''."\n";
+ print ''.$langs->trans("Cancel").''."\n";
}
}
}
@@ -990,7 +989,7 @@ if ($resql) {
$num = $db->num_rows($resql);
if (!empty($limit != 0) || $num > $limit || $page) {
- print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num >= $limit), '', '', $limit);
+ print_fleche_navigation($page, $_SERVER["PHP_SELF"], '&id='.$object->id.$paramwithsearch, ($num >= $limit), '', '', $limit);
}
$i = 0;
@@ -1206,38 +1205,38 @@ print '