diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php index e2cf02ce3c7..11aa5e860ae 100644 --- a/htdocs/product/stock/card.php +++ b/htdocs/product/stock/card.php @@ -258,7 +258,7 @@ if ($action == 'create') // Parent entrepot print ''.$langs->trans("AddIn").''; - print $formproduct->selectWarehouses('', 'fk_parent', '', 1); + print $formproduct->selectWarehouses('ifone', 'fk_parent', '', 1); print ''; // Description diff --git a/htdocs/takepos/admin/terminal.php b/htdocs/takepos/admin/terminal.php index fb43af6356a..384be4f8f13 100644 --- a/htdocs/takepos/admin/terminal.php +++ b/htdocs/takepos/admin/terminal.php @@ -202,11 +202,11 @@ if (!empty($conf->stock->enabled)) print ''.$langs->trans("CashDeskIdWareHouse").''; // Force warehouse (this is not a default value) - print ''; + print ''; if (!$disabled) { - print $formproduct->selectWarehouses($conf->global->{'CASHDESK_ID_WAREHOUSE'.$terminal}, 'CASHDESK_ID_WAREHOUSE'.$terminal, '', 1, $disabled); - print ' '; + print $formproduct->selectWarehouses($conf->global->{'CASHDESK_ID_WAREHOUSE'.$terminal}, 'CASHDESK_ID_WAREHOUSE'.$terminal, '', 1, $disabled, 0, '', 0, 0, array(), 'maxwidth250'); + print ' '; } else { print ''.$langs->trans("StockDecreaseForPointOfSaleDisabled").''; } diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php index 69adde70895..5e70e87c76c 100644 --- a/htdocs/takepos/invoice.php +++ b/htdocs/takepos/invoice.php @@ -1081,10 +1081,10 @@ if ($placeid > 0) if ($resql) { $obj = $db->fetch_object($resql); $stock_real = price2num($obj->reel, 'MS'); - $htmlforlines .= $line->qty - if ($line->qty>$stock_real) $htmlforlines .= ''; - $htmlforlines .= ' ('.$langs->trans("Stock").' '.$stock_real.')'; - if ($line->qty>$stock_real) $htmlforlines .= ""; + $htmlforlines .= $line->qty; + if ($line->qty>$stock_real) $htmlforlines .= ''; + $htmlforlines .= ' ('.$langs->trans("Stock").' '.$stock_real.')'; + if ($line->qty>$stock_real) $htmlforlines .= ""; } } else $htmlforlines .= $line->qty; diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index a50e45d8f51..96bf875bf3b 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -1209,6 +1209,7 @@ table[summary="list_of_modules"] .fa-cog { .maxwidth125 { max-width: 125px; } .maxwidth150 { max-width: 150px; } .maxwidth200 { max-width: 200px; } +.maxwidth250 { max-width: 250px; } .maxwidth300 { max-width: 300px; } .maxwidth400 { max-width: 400px; } .maxwidth500 { max-width: 500px; } @@ -1270,6 +1271,11 @@ table[summary="list_of_modules"] .fa-cog { .minwidth500imp { min-width: 250px !important; } } +.widthcentpercentminusx { + width: calc(100% - 50px) !important; + display: inline-block; +} + /* Force values for small screen 767 */ @media only screen and (max-width: 767px) { @@ -1292,7 +1298,7 @@ table[summary="list_of_modules"] .fa-cog { margin-bottom: 15px !important; } - select.minwidth100imp, select.minwidth100, select.minwidth200, select.minwidth300, .widthcentpercentminusx { + select.minwidth100imp, select.minwidth100, select.minwidth200, select.minwidth300 { width: calc(100% - 50px) !important; display: inline-block; } diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index f81bcff5e83..d468eccf87d 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -1205,6 +1205,7 @@ table[summary="list_of_modules"] .fa-cog { .maxwidth125 { max-width: 125px; } .maxwidth150 { max-width: 150px; } .maxwidth200 { max-width: 200px; } +.maxwidth250 { max-width: 250px; } .maxwidth300 { max-width: 300px; } .maxwidth400 { max-width: 400px; } .maxwidth500 { max-width: 500px; }