diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 97db059594f..00f08a0804e 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -167,8 +167,10 @@ BuyingPrices=Buying prices
CustomerPrices=Customer prices
SuppliersPrices=Vendor prices
SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
CountryOrigin=Origin country
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
Nature=Nature of product (material/finished)
NatureOfProductShort=Nature of product
NatureOfProductDesc=Raw material or finished product
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 04933018410..33a30a00f47 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1175,10 +1175,10 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
// State
if (empty($conf->global->PRODUCT_DISABLE_STATE))
{
- if ($conf->browser->layout == 'phone') print '
';
+ if ($conf->browser->layout == 'phone') print '
';
if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2))
{
- print '| '.$form->editfieldkey('Region-StateOrigine', 'state_id', '', $object, 0).' | ';
+ print ' | '.$form->editfieldkey('RegionStateOrigin', 'state_id', '', $object, 0).' | ';
} else {
print ' | '.$form->editfieldkey('StateOrigin', 'state_id', '', $object, 0).' | ';
}
@@ -1186,7 +1186,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
print $formcompany->select_state($object->state_id, $object->country_code);
print ' |
';
}
- print '';
+
+ print '';
}
// Other attributes
@@ -1634,7 +1635,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
if ($conf->browser->layout == 'phone') print '';
if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2))
{
- print '| '.$form->editfieldkey('Region-StateOrigine', 'state_id', '', $object, 0).' | ';
+ print ' | '.$form->editfieldkey('RegionStateOrigin', 'state_id', '', $object, 0).' | ';
} else {
print ' | '.$form->editfieldkey('StateOrigin', 'state_id', '', $object, 0).' | ';
}
|