Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Debug v21

Browse Source
This commit is contained in:
Laurent Destailleur 2024-11-22 10:53:08 +01:00
parent dbba584dfb
commit 7b30d8d37c
7 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/class/html.form.class.php
View File

@ -2767,9 +2767,9 @@ class Form
}
if (empty($hidelabel)) {
$out .= $langs->trans("RefOrLabel") . ' : ';
$placeholder = ' placeholder="' . dolPrintHTMLForAttribute($langs->trans("RefOrLabel")) . '"';
} elseif ($hidelabel > 1) {
$placeholder = ' placeholder="' . $langs->trans("RefOrLabel") . '"';
$placeholder = ' placeholder="' . dolPrintHTMLForAttribute($langs->trans("RefOrLabel")) . '"';
if ($hidelabel == 2) {
$out .= img_picto($langs->trans("Search"), 'search');
}

1
htdocs/langs/en_US/products.lang
View File

@ -97,7 +97,6 @@ ShowService=Show service
ProductsAndServicesArea=Product and Services area
ProductsArea=Product area
ServicesArea=Services area
ListOfStockMovements=List of stock movements
BuyingPrice=Buying price
PriceForEachProduct=Products with specific prices
SupplierCard=Vendor card

3
htdocs/langs/en_US/stocks.lang
View File

@ -27,9 +27,6 @@ LotSerialList=List of lot/serials
SubjectToLotSerialOnly=Products subject to lot/serial only
Movements=Movements
ErrorWarehouseRefRequired=Warehouse reference name is required
ListOfWarehouses=List of warehouses
ListOfStockMovements=List of stock movements
ListOfInventories=List of inventories
MovementId=Movement ID
StockMovementForId=Movement ID %d
ListMouvementStockProject=List of stock movements associated to project

3
htdocs/product/admin/product.php
View File

@ -650,6 +650,9 @@ print '<input type="submit" class="button reposition" value="'.$langs->trans("Mo
print '</div>';
print '<br>';
print load_fiche_titre($langs->trans("UserInterface"), '', '');

2
htdocs/product/stats/card.php
View File

@ -217,7 +217,7 @@ if ($result || !($id > 0)) {
// Product
print '<tr class="nooddeven"><td class="titlefield">'.$langs->trans("ProductOrService").'</td><td>';
print img_picto('', 'product', 'class="pictofixedwidth"');
print $form->select_produits($id, 'id', '', 0, 0, 1, 2, '', ($conf->dol_optimize_smallscreen ? 1 : 0), array(), 0, '1', 0, 'widthcentpercentminusx maxwidth400');
print $form->select_produits($id, 'id', '', 0, 0, 1, 2, '', 0, array(), 0, $langs->trans("RefOrLabel"), 0, 'widthcentpercentminusx maxwidth400');
print '</td></tr>';
// Tag

2
htdocs/product/stock/movement_card.php
View File

@ -560,7 +560,7 @@ if ($resql) {
if ($msid) {
$texte = $langs->trans('StockMovementForId', $msid);
} else {
$texte = $langs->trans("ListOfStockMovements");
$texte = $langs->trans("StockMovements");
if ($id) {
$texte .= ' ('.$langs->trans("ForThisWarehouse").')';
}

8
htdocs/product/stock/movement_list.php
View File

@ -832,7 +832,7 @@ $help_url = 'EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
if ($msid) {
$title = $langs->trans('StockMovementForId', $msid);
} else {
$title = $langs->trans("ListOfStockMovements");
$title = $langs->trans("StockMovements");
if ($id) {
if (!empty($warehouse->ref)) {
$title .= ' ('.$warehouse->ref.')';
@ -1236,7 +1236,7 @@ if (!empty($arrayfields['pl.sellby']['checked'])) {
if (!empty($arrayfields['e.ref']['checked'])) {
print '<td class="liste_titre maxwidthonsmartphone left">';
//print '<input class="flat" type="text" size="8" name="search_warehouse" value="'.($search_warehouse).'">';
print $formproduct->selectWarehouses($search_warehouse, 'search_warehouse', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, array(), 'maxwidth200');
print $formproduct->selectWarehouses($search_warehouse, 'search_warehouse', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, array(), 'maxwidth150');
print '</td>';
}
if (!empty($arrayfields['m.fk_user_author']['checked'])) {
@ -1564,7 +1564,7 @@ while ($i < $imaxinloop) {
}
// Warehouse
if (!empty($arrayfields['e.ref']['checked'])) {
print '<td class="tdoverflowmax100">';
print '<td class="tdoverflowmax150">';
print $warehousestatic->getNomUrl(1);
print "</td>\n";
}
@ -1591,7 +1591,7 @@ while ($i < $imaxinloop) {
if (!empty($arrayfields['origin']['checked'])) {
print '<td class="nowraponall">'.$origin.'</td>';
}
// fk_project
// Project
if (!empty($arrayfields['m.fk_projet']['checked'])) {
print '<td>';
if ($obj->fk_project != 0) {