Look and feel v22: Smaller label with tooltip for customs code.
This commit is contained in:
parent
b61bb3252e
commit
19e63684c7
10 changed files with 23 additions and 22 deletions
|
|
@ -1373,7 +1373,7 @@ if (empty($reshook)) {
|
|||
$outputlangs->load('products');
|
||||
}
|
||||
if (!empty($prod->customcode)) {
|
||||
$tmptxt .= $outputlangs->transnoentitiesnoconv("CustomCode").': '.$prod->customcode;
|
||||
$tmptxt .= $outputlangs->transnoentitiesnoconv("CustomsCode").': '.$prod->customcode;
|
||||
}
|
||||
if (!empty($prod->customcode) && !empty($prod->country_code)) {
|
||||
$tmptxt .= ' - ';
|
||||
|
|
@ -1383,7 +1383,7 @@ if (empty($reshook)) {
|
|||
}
|
||||
} else {
|
||||
if (!empty($prod->customcode)) {
|
||||
$tmptxt .= $langs->transnoentitiesnoconv("CustomCode").': '.$prod->customcode;
|
||||
$tmptxt .= $langs->transnoentitiesnoconv("CustomsCode").': '.$prod->customcode;
|
||||
}
|
||||
if (!empty($prod->customcode) && !empty($prod->country_code)) {
|
||||
$tmptxt .= ' - ';
|
||||
|
|
|
|||
|
|
@ -1081,7 +1081,7 @@ if (empty($reshook)) {
|
|||
$outputlangs->load('products');
|
||||
}
|
||||
if (!empty($prod->customcode)) {
|
||||
$tmptxt .= $outputlangs->transnoentitiesnoconv("CustomCode").': '.$prod->customcode;
|
||||
$tmptxt .= $outputlangs->transnoentitiesnoconv("CustomsCode").': '.$prod->customcode;
|
||||
}
|
||||
if (!empty($prod->customcode) && !empty($prod->country_code)) {
|
||||
$tmptxt .= ' - ';
|
||||
|
|
@ -1091,7 +1091,7 @@ if (empty($reshook)) {
|
|||
}
|
||||
} else {
|
||||
if (!empty($prod->customcode)) {
|
||||
$tmptxt .= $langs->transnoentitiesnoconv("CustomCode").': '.$prod->customcode;
|
||||
$tmptxt .= $langs->transnoentitiesnoconv("CustomsCode").': '.$prod->customcode;
|
||||
}
|
||||
if (!empty($prod->customcode) && !empty($prod->country_code)) {
|
||||
$tmptxt .= ' - ';
|
||||
|
|
|
|||
|
|
@ -669,7 +669,7 @@ if (empty($reshook)) {
|
|||
$outputlangs->load('products');
|
||||
}
|
||||
if (!empty($prod->customcode)) {
|
||||
$tmptxt .= $outputlangs->transnoentitiesnoconv("CustomCode").': '.$prod->customcode;
|
||||
$tmptxt .= $outputlangs->transnoentitiesnoconv("CustomsCode").': '.$prod->customcode;
|
||||
}
|
||||
if (!empty($prod->customcode) && !empty($prod->country_code)) {
|
||||
$tmptxt .= ' - ';
|
||||
|
|
@ -679,7 +679,7 @@ if (empty($reshook)) {
|
|||
}
|
||||
} else {
|
||||
if (!empty($prod->customcode)) {
|
||||
$tmptxt .= $langs->transnoentitiesnoconv("CustomCode").': '.$prod->customcode;
|
||||
$tmptxt .= $langs->transnoentitiesnoconv("CustomsCode").': '.$prod->customcode;
|
||||
}
|
||||
if (!empty($prod->customcode) && !empty($prod->country_code)) {
|
||||
$tmptxt .= ' - ';
|
||||
|
|
|
|||
|
|
@ -2430,7 +2430,7 @@ if (empty($reshook)) {
|
|||
$outputlangs->load('products');
|
||||
}
|
||||
if (!empty($prod->customcode)) {
|
||||
$tmptxt .= $outputlangs->transnoentitiesnoconv("CustomCode").': '.$prod->customcode;
|
||||
$tmptxt .= $outputlangs->transnoentitiesnoconv("CustomsCode").': '.$prod->customcode;
|
||||
}
|
||||
if (!empty($prod->customcode) && !empty($prod->country_code)) {
|
||||
$tmptxt .= ' - ';
|
||||
|
|
@ -2440,7 +2440,7 @@ if (empty($reshook)) {
|
|||
}
|
||||
} else {
|
||||
if (!empty($prod->customcode)) {
|
||||
$tmptxt .= $langs->transnoentitiesnoconv("CustomCode").': '.$prod->customcode;
|
||||
$tmptxt .= $langs->transnoentitiesnoconv("CustomsCode").': '.$prod->customcode;
|
||||
}
|
||||
if (!empty($prod->customcode) && !empty($prod->country_code)) {
|
||||
$tmptxt .= ' - ';
|
||||
|
|
|
|||
|
|
@ -205,7 +205,7 @@ class modProduct extends DolibarrModules
|
|||
'p.rowid' => "Id", 'p.ref' => "Ref", 'p.label' => "Label",
|
||||
'p.fk_product_type' => 'Type', 'p.tosell' => "OnSell", 'p.tobuy' => "OnBuy",
|
||||
'p.description' => "Description", 'p.url' => "PublicUrl",
|
||||
'p.customcode' => 'CustomCode', 'p.fk_country' => 'IDCountry',
|
||||
'p.customcode' => 'CustomsCode', 'p.fk_country' => 'IDCountry',
|
||||
$alias_product_perentity . '.accountancy_code_sell' => "ProductAccountancySellCode", $alias_product_perentity . '.accountancy_code_sell_intra' => "ProductAccountancySellIntraCode",
|
||||
$alias_product_perentity . '.accountancy_code_sell_export' => "ProductAccountancySellExportCode", $alias_product_perentity . '.accountancy_code_buy' => "ProductAccountancyBuyCode",
|
||||
$alias_product_perentity . '.accountancy_code_buy_intra' => "ProductAccountancyBuyIntraCode", $alias_product_perentity . '.accountancy_code_buy_export' => "ProductAccountancyBuyExportCode",
|
||||
|
|
@ -424,7 +424,7 @@ class modProduct extends DolibarrModules
|
|||
$alias_product_perentity . '.accountancy_code_sell_export' => "ProductAccountancySellExportCode", $alias_product_perentity . '.accountancy_code_buy' => "ProductAccountancyBuyCode",
|
||||
$alias_product_perentity . '.accountancy_code_buy_intra' => "ProductAccountancyBuyIntraCode", $alias_product_perentity . '.accountancy_code_buy_export' => "ProductAccountancyBuyExportCode",
|
||||
'p.note' => "NotePrivate", 'p.note_public' => 'NotePublic',
|
||||
'p.weight' => "Weight", 'p.length' => "Length", 'p.surface' => "Surface", 'p.volume' => "Volume", 'p.customcode' => 'CustomCode',
|
||||
'p.weight' => "Weight", 'p.length' => "Length", 'p.surface' => "Surface", 'p.volume' => "Volume", 'p.customcode' => 'CustomsCode',
|
||||
'p.price_base_type' => "PriceBase", 'p.price' => "UnitPriceHT", 'p.price_ttc' => "UnitPriceTTC", 'p.tva_tx' => 'VATRate', 'p.tosell' => "OnSell",
|
||||
'p.tobuy' => "OnBuy", 'p.datec' => 'DateCreation', 'p.tms' => 'DateModification'
|
||||
);
|
||||
|
|
@ -505,7 +505,7 @@ class modProduct extends DolibarrModules
|
|||
'p.tobuy' => "OnBuy*",
|
||||
'p.description' => "Description",
|
||||
'p.url' => "PublicUrl",
|
||||
'p.customcode' => 'CustomCode',
|
||||
'p.customcode' => 'CustomsCode',
|
||||
'p.fk_country' => 'CountryCode',
|
||||
'p.accountancy_code_sell' => "ProductAccountancySellCode",
|
||||
'p.accountancy_code_sell_intra' => "ProductAccountancySellIntraCode",
|
||||
|
|
|
|||
|
|
@ -161,7 +161,7 @@ class modService extends DolibarrModules
|
|||
'p.rowid' => "Id", 'p.ref' => "Ref", 'p.label' => "Label",
|
||||
'p.fk_product_type' => 'Type', 'p.tosell' => "OnSell", 'p.tobuy' => "OnBuy",
|
||||
'p.description' => "Description", 'p.url' => "PublicUrl",
|
||||
'p.customcode' => 'CustomCode', 'p.fk_country' => 'IDCountry',
|
||||
'p.customcode' => 'CustomsCode', 'p.fk_country' => 'IDCountry',
|
||||
$alias_product_perentity . '.accountancy_code_sell' => "ProductAccountancySellCode", $alias_product_perentity . '.accountancy_code_sell_intra' => "ProductAccountancySellIntraCode",
|
||||
$alias_product_perentity . '.accountancy_code_sell_export' => "ProductAccountancySellExportCode", $alias_product_perentity . '.accountancy_code_buy' => "ProductAccountancyBuyCode",
|
||||
$alias_product_perentity . '.accountancy_code_buy_intra' => "ProductAccountancyBuyIntraCode", $alias_product_perentity . '.accountancy_code_buy_export' => "ProductAccountancyBuyExportCode",
|
||||
|
|
@ -370,7 +370,7 @@ class modService extends DolibarrModules
|
|||
$alias_product_perentity . '.accountancy_code_sell_export' => "ProductAccountancySellExportCode", $alias_product_perentity . '.accountancy_code_buy' => "ProductAccountancyBuyCode",
|
||||
$alias_product_perentity . '.accountancy_code_buy_intra' => "ProductAccountancyBuyIntraCode", $alias_product_perentity . '.accountancy_code_buy_export' => "ProductAccountancyBuyExportCode",
|
||||
'p.note' => "NotePrivate", 'p.note_public' => 'NotePublic',
|
||||
'p.weight' => "Weight", 'p.length' => "Length", 'p.surface' => "Surface", 'p.volume' => "Volume", 'p.customcode' => 'CustomCode',
|
||||
'p.weight' => "Weight", 'p.length' => "Length", 'p.surface' => "Surface", 'p.volume' => "Volume", 'p.customcode' => 'CustomsCode',
|
||||
'p.price_base_type' => "PriceBase", 'p.price' => "UnitPriceHT", 'p.price_ttc' => "UnitPriceTTC", 'p.tva_tx' => 'VATRate', 'p.tosell' => "OnSell",
|
||||
'p.tobuy' => "OnBuy", 'p.datec' => 'DateCreation', 'p.tms' => 'DateModification'
|
||||
);
|
||||
|
|
@ -452,7 +452,7 @@ class modService extends DolibarrModules
|
|||
'p.tobuy' => "OnBuy*",
|
||||
'p.description' => "Description",
|
||||
'p.url' => "PublicUrl",
|
||||
'p.customcode' => 'CustomCode',
|
||||
'p.customcode' => 'CustomsCode',
|
||||
'p.fk_country' => 'CountryCode',
|
||||
'p.accountancy_code_sell' => "ProductAccountancySellCode",
|
||||
'p.accountancy_code_sell_intra' => "ProductAccountancySellIntraCode",
|
||||
|
|
|
|||
|
|
@ -635,7 +635,7 @@ if (empty($reshook)) {
|
|||
$outputlangs->load('products');
|
||||
}
|
||||
if (!empty($prod->customcode)) {
|
||||
$tmptxt .= $outputlangs->transnoentitiesnoconv("CustomCode") . ': ' . $prod->customcode;
|
||||
$tmptxt .= $outputlangs->transnoentitiesnoconv("CustomsCode") . ': ' . $prod->customcode;
|
||||
}
|
||||
if (!empty($prod->customcode) && !empty($prod->country_code)) {
|
||||
$tmptxt .= ' - ';
|
||||
|
|
@ -645,7 +645,7 @@ if (empty($reshook)) {
|
|||
}
|
||||
} else {
|
||||
if (!empty($prod->customcode)) {
|
||||
$tmptxt .= $langs->transnoentitiesnoconv("CustomCode") . ': ' . $prod->customcode;
|
||||
$tmptxt .= $langs->transnoentitiesnoconv("CustomsCode") . ': ' . $prod->customcode;
|
||||
}
|
||||
if (!empty($prod->customcode) && !empty($prod->country_code)) {
|
||||
$tmptxt .= ' - ';
|
||||
|
|
|
|||
|
|
@ -173,7 +173,8 @@ BuyingPrices=Buying prices
|
|||
CustomerPrices=Customer prices
|
||||
SuppliersPrices=Vendor prices
|
||||
SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
|
||||
CustomCode=Customs|Commodity|HS|TARIC code
|
||||
CustomsCode=Customs nomenclature
|
||||
CustomsCodeHelp=The code used by customs. Also called the Commodity code, HS code or TARIC code.
|
||||
CountryOrigin=Country of origin
|
||||
RegionStateOrigin=Region of origin
|
||||
StateOrigin=State|Province of origin
|
||||
|
|
|
|||
|
|
@ -1742,7 +1742,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
|
|||
|
||||
// Custom code
|
||||
if (!getDolGlobalString('PRODUCT_DISABLE_CUSTOM_INFO') && empty($type)) {
|
||||
print '<tr><td class="wordbreak">'.$langs->trans("CustomCode").'</td><td><input name="customcode" class="maxwidth100onsmartphone" value="'.GETPOST('customcode').'"></td></tr>';
|
||||
print '<tr><td class="wordbreak">'.$form->textwithpicto($langs->trans("CustomsCode"), $langs->trans("CustomsCodeHelp")).'</td><td><input name="customcode" class="maxwidth100onsmartphone" value="'.GETPOST('customcode').'"></td></tr>';
|
||||
|
||||
// Origin country
|
||||
print '<tr><td>'.$langs->trans("CountryOrigin").'</td>';
|
||||
|
|
@ -2386,7 +2386,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
|
|||
|
||||
// Custom code
|
||||
if (!$object->isService() && !getDolGlobalString('PRODUCT_DISABLE_CUSTOM_INFO')) {
|
||||
print '<tr><td class="wordbreak">'.$langs->trans("CustomCode").'</td><td><input name="customcode" class="maxwidth100onsmartphone" value="'.(GETPOSTISSET('customcode') ? GETPOST('customcode') : $object->customcode).'"></td></tr>';
|
||||
print '<tr><td class="wordbreak">'.$form->textwithpicto($langs->trans("CustomsCode"), $langs->trans("CustomsCodeHelp")).'</td><td><input name="customcode" class="maxwidth100onsmartphone" value="'.(GETPOSTISSET('customcode') ? GETPOST('customcode') : $object->customcode).'"></td></tr>';
|
||||
// Origin country
|
||||
print '<tr><td>'.$langs->trans("CountryOrigin").'</td>';
|
||||
print '<td>';
|
||||
|
|
@ -2958,7 +2958,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
|
|||
|
||||
// Custom code
|
||||
if (!$object->isService() && !getDolGlobalString('PRODUCT_DISABLE_CUSTOM_INFO')) {
|
||||
print '<tr><td>'.$langs->trans("CustomCode").'</td><td>'.$object->customcode.'</td></tr>';
|
||||
print '<tr><td>'.$form->textwithpicto($langs->trans("CustomsCode"), $langs->trans("CustomsCodeHelp")).'</td><td>'.dolPrintHTML($object->customcode).'</td></tr>';
|
||||
|
||||
// Origin country code
|
||||
print '<tr><td>'.$langs->trans("Origin").'</td><td>'.getCountry($object->country_id, '', $db);
|
||||
|
|
|
|||
|
|
@ -632,7 +632,7 @@ if ($id > 0 || !empty($ref)) {
|
|||
|
||||
// Form with product to add
|
||||
if ((empty($action) || $action == 'view' || $action == 'edit' || $action == 'search' || $action == 're-edit') && ($user->hasRight('produit', 'creer') || $user->hasRight('service', 'creer'))) {
|
||||
print '<br>';
|
||||
//print '<br>';
|
||||
|
||||
$rowspan = 1;
|
||||
if (isModEnabled('category')) {
|
||||
|
|
@ -640,7 +640,7 @@ if ($id > 0 || !empty($ref)) {
|
|||
}
|
||||
|
||||
print load_fiche_titre($langs->trans("ProductToAddSearch"), '', '');
|
||||
print '<form action="'.DOL_URL_ROOT.'/product/composition/card.php?id='.$id.'" method="POST">';
|
||||
print '<form action="'.DOL_URL_ROOT.'/product/composition/card.php?id='.$id.'" method="POST" name="formtoaddinkit" id="formtoaddinkit">';
|
||||
print '<input type="hidden" name="action" value="search">';
|
||||
print '<input type="hidden" name="id" value="'.$id.'">';
|
||||
print '<div class="inline-block">';
|
||||
|
|
|
|||
Loading…
Reference in a new issue