diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 78248719908..baf454fdf67 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1622,7 +1622,7 @@ if ($id > 0)
// Type
if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
{
- print '| '.$langs->trans("Type").' | '.$object->type.' |
';
+ print '| '.$langs->trans("Type").' | '.$langs->trans($object->type).' |
';
}
// Full day event
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index c6462cba9b9..99a5f78691f 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -2077,7 +2077,7 @@ class Contrat extends CommonObject
* Return list of line rowid
*
* @param int $statut Status of lines to get
- * @return array Array of line's rowid
+ * @return array|int Array of line's rowid or <0 if error
*/
public function array_detail($statut = -1)
{
@@ -2114,7 +2114,7 @@ class Contrat extends CommonObject
* Return list of other contracts for same company than current contract
*
* @param string $option 'all' or 'others'
- * @return array Array of contracts id
+ * @return array|int Array of contracts id or <0 if error
*/
public function getListOfContracts($option = 'all')
{
diff --git a/htdocs/core/modules/holiday/modules_holiday.php b/htdocs/core/modules/holiday/modules_holiday.php
index 74cbb0dbfd5..c5f5dc16b25 100644
--- a/htdocs/core/modules/holiday/modules_holiday.php
+++ b/htdocs/core/modules/holiday/modules_holiday.php
@@ -96,7 +96,7 @@ class ModelNumRefHolidays
public function info()
{
global $langs;
- $langs->load("holidays");
+ $langs->load("holiday");
return $langs->trans("NoDescription");
}
@@ -108,7 +108,7 @@ class ModelNumRefHolidays
public function getExample()
{
global $langs;
- $langs->load("holidays");
+ $langs->load("holiday");
return $langs->trans("NoExample");
}
diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php
index bde888157dd..1e4284dec7f 100644
--- a/htdocs/core/modules/import/import_csv.modules.php
+++ b/htdocs/core/modules/import/import_csv.modules.php
@@ -509,12 +509,12 @@ class ImportCsv extends ModeleImports
}
$classinstance=new $class($this->db);
// Try the fetch from code or ref
- call_user_func_array(array($classinstance, $method), array('', $units, $newval));
- $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval]=$classinstance->code;
+ call_user_func_array(array($classinstance, $method), array('', '', $newval, $units));
+ $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval]=$classinstance->id;
//print 'We have made a '.$class.'->'.$method.' to get id from code '.$newval.'. ';
- if ($classinstance->code != '') // id may be 0, it is a found value
+ if ($classinstance->id != '') // id may be 0, it is a found value
{
- $newval=$classinstance->code;
+ $newval=$classinstance->id;
}
else
{
diff --git a/htdocs/core/modules/import/import_xlsx.modules.php b/htdocs/core/modules/import/import_xlsx.modules.php
index a67a0c90c4b..b83199e2ac6 100644
--- a/htdocs/core/modules/import/import_xlsx.modules.php
+++ b/htdocs/core/modules/import/import_xlsx.modules.php
@@ -536,12 +536,12 @@ class ImportXlsx extends ModeleImports
}
$classinstance=new $class($this->db);
// Try the fetch from code or ref
- call_user_func_array(array($classinstance, $method), array('', $units, '', $newval));
- $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval]=$classinstance->code;
+ call_user_func_array(array($classinstance, $method), array('', '', $newval, $units));
+ $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval]=$classinstance->id;
//print 'We have made a '.$class.'->'.$method.' to get id from code '.$newval.'. ';
- if ($classinstance->code != '') // id may be 0, it is a found value
+ if ($classinstance->id != '') // id may be 0, it is a found value
{
- $newval=$classinstance->code;
+ $newval=$classinstance->id;
}
else
{
diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index c71694c48ec..3d943d432a9 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -354,6 +354,7 @@ class modProduct extends DolibarrModules
'p.note_public' => "PublicNote",//public note
'p.note' => "PrivateNote",//private note
'p.customcode' => 'CustomCode',
+ 'p.fk_country' => 'CountryCode',
'p.price' => "SellingPriceHT",//without
'p.price_min' => "MinPrice",
'p.price_ttc' => "SellingPriceTTC",//with tax
@@ -441,8 +442,15 @@ class modProduct extends DolibarrModules
'method' => 'fetch',
'units' => 'volume',
'dict' => 'DictionaryMeasuringUnits'
- )
- );*/
+ ),
+ 'p.fk_country' => array(
+ 'rule' => 'fetchidfromcodeid',
+ 'classfile' => '/core/class/ccountry.class.php',
+ 'class' => 'Ccountry',
+ 'method' => 'fetch',
+ 'dict' => 'DictionaryCountry'
+ )
+ );
if (! empty($conf->fournisseur->enabled) || !empty($conf->margin->enabled)) $this->import_fields_array[$r]=array_merge($this->import_fields_array[$r], array('p.cost_price'=>'CostPrice'));
if (is_object($mysoc) && $mysoc->useNPR()) $this->import_fields_array[$r]=array_merge($this->import_fields_array[$r], array('p.recuperableonly'=>'NPR'));
@@ -486,6 +494,7 @@ class modProduct extends DolibarrModules
'p.note_public' => "a public note (free text)",
'p.note' => "a private note (free text)",
'p.customcode' => 'customs code',
+ 'p.fk_country' => 'FR',
'p.price' => "price ex-vat eg. 100",
'p.price_min' => "price ex-vat eg. 100",
'p.price_ttc' => "price inc-vat eg. 110",
diff --git a/htdocs/holiday/document.php b/htdocs/holiday/document.php
index 00bc7ac1b24..05ddf164105 100644
--- a/htdocs/holiday/document.php
+++ b/htdocs/holiday/document.php
@@ -37,7 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/holiday.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
// Load translation files required by the page
-$langs->loadLangs(array('other', 'holidays', 'companies'));
+$langs->loadLangs(array('other', 'holiday', 'companies'));
$id = GETPOST('id', 'int');
$ref = GETPOST('ref', 'alpha');
@@ -48,8 +48,6 @@ $confirm = GETPOST('confirm', 'alpha');
if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'holiday', $id, 'holiday');
-$langs->load("holiday");
-
// Get parameters
$sortfield = GETPOST('sortfield', 'alpha');
$sortorder = GETPOST('sortorder', 'alpha');
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 42515d0de48..bd948a58453 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
// Load translation files required by the page
-$langs->loadLangs(array('users', 'holidays', 'hrm'));
+$langs->loadLangs(array('users', 'holiday', 'hrm'));
// Protection if external user
if ($user->societe_id > 0) accessforbidden();
diff --git a/htdocs/index.php b/htdocs/index.php
index 050058cd819..7279eebe80f 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -301,7 +301,7 @@ if (empty($user->societe_id) && empty($conf->global->MAIN_DISABLE_GLOBAL_BOXSTAT
"supplier_proposal",
"projects",
"trips",
- "holidays",
+ "holiday",
"donations"
);
diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index 866eeb116cf..346aef06a91 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -15,10 +15,11 @@
* along with this program. If not, see .
*/
- use Luracast\Restler\RestException;
+use Luracast\Restler\RestException;
- require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
- require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
/**
* API class for products
@@ -41,6 +42,11 @@ class Products extends DolibarrApi
*/
public $product;
+ /**
+ * @var ProductFournisseur $productsupplier {@type ProductFournisseur}
+ */
+ public $productsupplier;
+
/**
* Constructor
*/
@@ -49,6 +55,7 @@ class Products extends DolibarrApi
global $db, $conf;
$this->db = $db;
$this->product = new Product($this->db);
+ $this->productsupplier = new ProductFournisseur($this->db);
}
/**
@@ -475,7 +482,7 @@ class Products extends DolibarrApi
*
* @url DELETE {id}/purchase_prices/{priceid}
*
- * @return array
+ * @return int
*
* @throws 401
* @throws 404
@@ -494,13 +501,13 @@ class Products extends DolibarrApi
if(! DolibarrApi::_checkAccessToResource('product', $this->product->id)) {
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}
-
- if($result) {
- $this->product = new ProductFournisseur($this->db);
- $this->product->fetch($id);
+ $resultsupplier = 0;
+ if ($result) {
+ $this->productsupplier->fetch($id);
+ $resultsupplier = $this->product->remove_product_fournisseur_price($priceid);
}
- return $this->product->remove_product_fournisseur_price($priceid);
+ return $resultsupplier;
}
/**
@@ -632,16 +639,15 @@ class Products extends DolibarrApi
}
if ($includestockdata) {
- $this->product->load_stock();
+ $this->product->load_stock();
}
- if($result) {
- $this->product = new ProductFournisseur($this->db);
- $this->product->fetch($id, $ref);
- $this->product->list_product_fournisseur_price($id, '', '', 0, 0);
+ if ($result) {
+ $this->productsupplier->fetch($id, $ref);
+ $this->productsupplier->list_product_fournisseur_price($id, '', '', 0, 0);
}
- return $this->_cleanObjectDatas($this->product);
+ return $this->_cleanObjectDatas($this->productsupplier);
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore