';
// Ref
@@ -1529,12 +1588,29 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
// Custom code
if (!$object->isService() && empty($conf->global->PRODUCT_DISABLE_CUSTOM_INFO))
{
- print '| '.$langs->trans("CustomCode").' | | ';
+ print '
| '.$langs->trans("CustomCode").' | |
';
// Origin country
- print ''.$langs->trans("CountryOrigin").' | ';
+ print ' | '.$langs->trans("CountryOrigin").' | ';
+ print '';
+ print img_picto('', 'globe-americas', 'class="paddingrightonly"');
print $form->select_country($object->country_id, 'country_id', '', 0, 'minwidth100 maxwidthonsmartphone');
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
- print ' | ';
+ print '';
+ // State
+ if (empty($conf->global->PRODUCT_DISABLE_STATE))
+ {
+ 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).' | ';
+ } else {
+ print ' | '.$form->editfieldkey('StateOrigin', 'state_id', '', $object, 0).' | ';
+ }
+
+ print $formcompany->select_state($object->state_id, $object->country_code);
+ print ' | ';
+ }
+ print '
';
}
// Other attributes
@@ -2031,7 +2107,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
print '| '.$langs->trans("CustomCode").' | '.$object->customcode.' | ';
// Origin country code
- print '
| '.$langs->trans("CountryOrigin").' | '.getCountry($object->country_id, 0, $db).' | ';
+ print '
| '.$langs->trans("Origin").' | '.getCountry($object->country_id, 0, $db);
+ if (!empty($object->state_id)) print ' - '.getState($object->state_id, 0, $db);
+ print ' | ';
}
// Other attributes
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 8ae09ea45aa..9ba528d3b3d 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -883,6 +883,10 @@ class Product extends CommonObject
$this->country_id = 0;
}
+ if (empty($this->state_id)) {
+ $this->state_id = 0;
+ }
+
// Barcode value
$this->barcode = trim($this->barcode);
@@ -1000,6 +1004,7 @@ class Product extends CommonObject
$sql .= ", url = ".($this->url ? "'".$this->db->escape($this->url)."'" : 'null');
$sql .= ", customcode = '".$this->db->escape($this->customcode)."'";
$sql .= ", fk_country = ".($this->country_id > 0 ? (int) $this->country_id : 'null');
+ $sql .= ", fk_state = ".($this->state_id > 0 ? (int) $this->state_id : 'null');
$sql .= ", note = ".(isset($this->note) ? "'".$this->db->escape($this->note)."'" : 'null');
$sql .= ", duration = '".$this->db->escape($this->duration_value.$this->duration_unit)."'";
$sql .= ", accountancy_code_buy = '".$this->db->escape($this->accountancy_code_buy)."'";
@@ -2025,7 +2030,7 @@ class Product extends CommonObject
return -1;
}
- $sql = "SELECT rowid, ref, ref_ext, label, description, url, note_public, note as note_private, customcode, fk_country, price, price_ttc,";
+ $sql = "SELECT rowid, ref, ref_ext, label, description, url, note_public, note as note_private, customcode, fk_country, fk_state, price, price_ttc,";
$sql .= " price_min, price_min_ttc, price_base_type, cost_price, default_vat_code, tva_tx, recuperableonly as tva_npr, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, tosell,";
$sql .= " tobuy, fk_product_type, duration, fk_default_warehouse, seuil_stock_alerte, canvas, net_measure, net_measure_units, weight, weight_units,";
$sql .= " length, length_units, width, width_units, height, height_units,";
@@ -2073,6 +2078,7 @@ class Product extends CommonObject
$this->customcode = $obj->customcode;
$this->country_id = $obj->fk_country;
$this->country_code = getCountry($this->country_id, 2, $this->db);
+ $this->state_id = $obj->fk_state;
$this->price = $obj->price;
$this->price_ttc = $obj->price_ttc;
$this->price_min = $obj->price_min;
@@ -5204,17 +5210,15 @@ class Product extends CommonObject
$this->barcode = -1; // Create barcode automatically
}
- /**
- * Returns the label, shot_label or code found in units dictionary from ->fk_unit.
- * A langs->trans() must be called on result to get translated value.
- *
- * @param string $type Label type (long, short or code)
- * @return string|int <0 if KO, label if OK (Example: 'long', 'short', 'unitCODE')
- * @see getLabelOfUnit() in CommonObjectLine
- */
- public function getLabelOfUnit($type = 'long')
- {
- global $langs;
+ /**
+ * Returns the text label from units dictionary
+ *
+ * @param string $type Label type (long or short)
+ * @return string|int <0 if ko, label if ok
+ */
+ public function getLabelOfUnit($type = 'long')
+ {
+ global $langs;
if (!$this->fk_unit) {
return '';
@@ -5222,24 +5226,25 @@ class Product extends CommonObject
$langs->load('products');
- $label_type = 'label';
- if ($type == 'short') $label_type = 'short_label';
- elseif ($type == 'code') $label_type = 'code';
+ $label_type = 'label';
- $sql = 'select '.$label_type.', code from '.MAIN_DB_PREFIX.'c_units where rowid='.$this->fk_unit;
- $resql = $this->db->query($sql);
- if ($resql && $this->db->num_rows($resql) > 0) {
- $res = $this->db->fetch_array($resql);
- if ($label_type == 'code') $label = 'unit'.$res['code'];
- else $label = $res[$label_type];
- $this->db->free($resql);
- return $label;
- } else {
- $this->error = $this->db->error().' sql='.$sql;
- dol_syslog(get_class($this)."::getLabelOfUnit Error ".$this->error, LOG_ERR);
- return -1;
- }
- }
+ if ($type == 'short') {
+ $label_type = 'short_label';
+ }
+
+ $sql = 'select '.$label_type.', code from '.MAIN_DB_PREFIX.'c_units where rowid='.$this->fk_unit;
+ $resql = $this->db->query($sql);
+ if ($resql && $this->db->num_rows($resql) > 0) {
+ $res = $this->db->fetch_array($resql);
+ $label = ($label_type == 'short_label' ? $res[$label_type] : 'unit'.$res['code']);
+ $this->db->free($resql);
+ return $label;
+ } else {
+ $this->error = $this->db->error().' sql='.$sql;
+ dol_syslog(get_class($this)."::getLabelOfUnit Error ".$this->error, LOG_ERR);
+ return -1;
+ }
+ }
/**
* Return if object has a sell-by date or eat-by date