'."\n";
- print $langs->trans('SelectMailModel').': '.$formmail->selectarray('modelmailselected', $modelmail_array, $this->param['models_id'], 1);
+ print $langs->trans('SelectMailModel').': '.$formmail->selectarray('modelmailselected', $modelmail_array, $this->param['models_id'], 1, 0, "", "", 0, 0, 0, '', 'minwidth200');
if ($user->admin) {
print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
}
diff --git a/htdocs/fourn/class/api_supplier_orders.class.php b/htdocs/fourn/class/api_supplier_orders.class.php
index 01c0079171e..e21eb3436dc 100644
--- a/htdocs/fourn/class/api_supplier_orders.class.php
+++ b/htdocs/fourn/class/api_supplier_orders.class.php
@@ -369,6 +369,189 @@ class SupplierOrders extends DolibarrApi
);
}
+ /**
+ * Approve an order
+ *
+ * @param int $id Order ID
+ * @param int $idwarehouse Warehouse ID
+ * @param int $secondlevel 1=Does not execute triggers, 0= execute triggers
+ *
+ * @url POST {id}/approve
+ *
+ * @return array
+ * FIXME An error 403 is returned if the request has an empty body.
+ * Error message: "Forbidden: Content type `text/plain` is not supported."
+ * Workaround: send this in the body
+ * {
+ * "idwarehouse": 0,
+ * "secondlevel": 0
+ * }
+ */
+ public function approve($id, $idwarehouse = 0, $secondlevel = 0)
+ {
+ if (empty(DolibarrApiAccess::$user->rights->fournisseur->commande->creer) && empty(DolibarrApiAccess::$user->rights->supplier_order->creer)) {
+ throw new RestException(401);
+ }
+ $result = $this->order->fetch($id);
+ if (!$result) {
+ throw new RestException(404, 'Order not found');
+ }
+
+ if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->order->id, 'commande_fournisseur', 'commande')) {
+ throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+ }
+
+ $result = $this->order->approve(DolibarrApiAccess::$user, $idwarehouse, $secondlevel);
+ if ($result == 0) {
+ throw new RestException(304, 'Error nothing done. May be object is already approved');
+ }
+ if ($result < 0) {
+ throw new RestException(500, 'Error when approve Order: '.$this->order->error);
+ }
+
+ return array(
+ 'success' => array(
+ 'code' => 200,
+ 'message' => 'Order approved (Ref='.$this->order->ref.')'
+ )
+ );
+ }
+
+
+ /**
+ * Sends an order to the vendor
+ *
+ * @param int $id Order ID
+ * @param integer $date Date (unix timestamp in sec)
+ * @param int $method Method
+ * @param string $comment Comment
+ *
+ * @url POST {id}/makeorder
+ *
+ * @return array
+ * FIXME An error 403 is returned if the request has an empty body.
+ * Error message: "Forbidden: Content type `text/plain` is not supported."
+ * Workaround: send this in the body
+ * {
+ * "date": 0,
+ * "method": 0,
+ * "comment": ""
+ * }
+ */
+ public function makeOrder($id, $date, $method, $comment = '')
+ {
+ if (empty(DolibarrApiAccess::$user->rights->fournisseur->commande->creer) && empty(DolibarrApiAccess::$user->rights->supplier_order->creer)) {
+ throw new RestException(401);
+ }
+ $result = $this->order->fetch($id);
+ if (!$result) {
+ throw new RestException(404, 'Order not found');
+ }
+
+ if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->order->id, 'commande_fournisseur', 'commande')) {
+ throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+ }
+
+ $result = $this->order->commande(DolibarrApiAccess::$user, $date, $method, $comment);
+ if ($result == 0) {
+ throw new RestException(304, 'Error nothing done. May be object is already sent');
+ }
+ if ($result < 0) {
+ throw new RestException(500, 'Error when sending Order: '.$this->order->error);
+ }
+
+ return array(
+ 'success' => array(
+ 'code' => 200,
+ 'message' => 'Order sent (Ref='.$this->order->ref.')'
+ )
+ );
+ }
+
+ /**
+ * Receives the order, dispatches products.
+ *
+ * Example:
+ *
{
+ * "closeopenorder": 1,
+ * "comment": "",
+ * "lines": [{
+ * "id": 14,
+ * "fk_product": 112,
+ * "qty": 18,
+ * "warehouse": 1,
+ * "price": 114,
+ * "comment": "",
+ * "eatby": 0,
+ * "sellby": 0,
+ * "batch": 0,
+ * "notrigger": 0
+ * }]
+ * }
+ *
+ * @param int $id Order ID
+ * @param integer $closeopenorder Close order if everything is received {@required false}
+ * @param string $comment Comment {@required false}
+ * @param array $lines Array of product dispatches
+ *
+ * @url POST {id}/receive
+ *
+ * @return array
+ * FIXME An error 403 is returned if the request has an empty body.
+ * Error message: "Forbidden: Content type `text/plain` is not supported."
+ *
+ */
+ public function receiveOrder($id, $closeopenorder, $comment, $lines)
+ {
+ if (empty(DolibarrApiAccess::$user->rights->fournisseur->commande->creer) && empty(DolibarrApiAccess::$user->rights->supplier_order->creer)) {
+ throw new RestException(401);
+ }
+ $result = $this->order->fetch($id);
+ if (!$result) {
+ throw new RestException(404, 'Order not found');
+ }
+
+ if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->order->id, 'commande_fournisseur', 'commande')) {
+ throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+ }
+
+ foreach ($lines as $line) {
+ $lineObj =(object) $line;
+
+ $result=$this->order->dispatchProduct(DolibarrApiAccess::$user,
+ $lineObj->fk_product,
+ $lineObj->qty,
+ $lineObj->warehouse,
+ $lineObj->price,
+ $lineObj->comment,
+ $lineObj->eatby,
+ $lineObj->sellby,
+ $lineObj->batch,
+ $lineObj->id,
+ $lineObj->notrigger);
+
+ if ($result < 0) {
+ throw new RestException(500, 'Error dispatch order line '.$line->id.': '.$this->order->error);
+ }
+ }
+
+ $result = $this->order->calcAndSetStatusDispatch(DolibarrApiAccess::$user, $closeopenorder, $comment);
+
+ if ($result == 0) {
+ throw new RestException(304, 'Error nothing done. May be object is already dispatched');
+ }
+ if ($result < 0) {
+ throw new RestException(500, 'Error when receivce order: '.$this->order->error);
+ }
+
+ return array(
+ 'success' => array(
+ 'code' => 200,
+ 'message' => 'Order received (Ref='.$this->order->ref.')'
+ )
+ );
+ }
+
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
/**
* Clean sensible object datas
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index e8a64b3f72b..47daec0851b 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -343,7 +343,7 @@ StepNb=Step %s
FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
DownloadPackageFromWebSite=Download package (for example from the official web site %s).
UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory:
%s
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:
%s
+UnpackPackageInModulesRoot=To deploy/install an external module, you must unpack/unzip the archive file into the server directory dedicated to external modules:
%s
SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going to the page setup modules:
%s.
NotExistsDirect=The alternative root directory is not defined to an existing directory.
InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.
Just create a directory at the root of Dolibarr (eg: custom).
diff --git a/htdocs/theme/eldy/dropdown.inc.php b/htdocs/theme/eldy/dropdown.inc.php
index 81734c817b8..5c62a703f67 100644
--- a/htdocs/theme/eldy/dropdown.inc.php
+++ b/htdocs/theme/eldy/dropdown.inc.php
@@ -7,6 +7,11 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
* Dropdown of user popup
*/
+.bookmark-footer a.top-menu-dropdown-link {
+ white-space: normal;
+ word-break: break-word;
+}
+
button.dropdown-item.global-search-item {
outline: none;
}
@@ -15,6 +20,12 @@ button.dropdown-item.global-search-item {
display: block;
}
+#topmenu-bookmark-dropdown .dropdown-menu {
+ min-width: 300px;
+ max-width: 360px;
+}
+
+
.dropdown-search {
border-color: #eee;
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index a830002d197..deb7cdadf9e 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -261,7 +261,7 @@ input:invalid, select:invalid, input.--error , select.--error {
div.tabBar textarea:focus {
border: 1px solid #aaa !important;
}
-input:focus:not(.select2-search__field), select:focus, .select2-container--open .select2-selection--single {
+input:focus:not(.button):not(.select2-search__field):not(#top-bookmark-search-input), select:focus, .select2-container--open .select2-selection--single {
/* div.tabBar input:focus, div.tabBar select:focus { */
border-bottom: 1px solid #666 !important;
border-bottom-left-radius: 0 !important;
@@ -985,12 +985,18 @@ span.fa.fa-plus-circle.paddingleft {
padding-: 20px;
}
div.divsearchfield {
- float: ;
+ /* float: ; */
+ display: inline-block;
margin-: 12px;
margin-: 2px;
margin-top: 4px;
margin-bottom: 4px;
- padding-left: 2px;
+ padding-left: 2px;
+}
+.divfilteralone {
+ background-color: rgba(0, 0, 0, 0.08);
+ border-radius: 5px;
+ padding-left: 5px;
}
.divsearchfieldfilter {
text-overflow: clip;
@@ -2808,8 +2814,8 @@ div.login a:hover {
div.login_block_user {
display: inline-block;
vertical-align: middle;
- line-height: px;
- height: px;
+ line-height: px;
+ height: px;
}
div.login_block_other {
display: inline-block;
@@ -3396,6 +3402,7 @@ input.buttonreset {
padding: 8px 15px;
text-decoration: underline;
color: var(--colortextlink);
+ background-color: transparent;
cursor: pointer;
}
.nopaddingleft {
diff --git a/htdocs/theme/md/dropdown.inc.php b/htdocs/theme/md/dropdown.inc.php
index 1aec654410f..ff7285a2772 100644
--- a/htdocs/theme/md/dropdown.inc.php
+++ b/htdocs/theme/md/dropdown.inc.php
@@ -2,7 +2,6 @@
if (!defined('ISLOADEDBYSTEELSHEET')) {
die('Must be call by steelsheet');
} ?>
-
/*