lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NEW add country code in import product model

Browse Source
This commit is contained in:
VESSILLER 2019-10-04 10:04:02 +02:00
parent 331148499a
commit 0e23fbc6df
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/core/modules/import/import_csv.modules.php
View File

@ -509,12 +509,12 @@ class ImportCsv extends ModeleImports
} }
$classinstance=new $class($this->db); $classinstance=new $class($this->db);
// Try the fetch from code or ref // Try the fetch from code or ref
call_user_func_array(array($classinstance, $method), array('', $units, $newval)); call_user_func_array(array($classinstance, $method), array('', '', $newval, $units));
$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval]=$classinstance->code; $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval]=$classinstance->id;
//print 'We have made a '.$class.'->'.$method.' to get id from code '.$newval.'. '; //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 else
{ {

8
htdocs/core/modules/import/import_xlsx.modules.php
View File

@ -536,12 +536,12 @@ class ImportXlsx extends ModeleImports
} }
$classinstance=new $class($this->db); $classinstance=new $class($this->db);
// Try the fetch from code or ref // Try the fetch from code or ref
call_user_func_array(array($classinstance, $method), array('', $units, '', $newval)); call_user_func_array(array($classinstance, $method), array('', '', $newval, $units));
$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval]=$classinstance->code; $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval]=$classinstance->id;
//print 'We have made a '.$class.'->'.$method.' to get id from code '.$newval.'. '; //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 else
{ {

11
htdocs/core/modules/modProduct.class.php
View File

@ -354,6 +354,7 @@ class modProduct extends DolibarrModules
'p.note_public' => "PublicNote",//public note 'p.note_public' => "PublicNote",//public note
'p.note' => "PrivateNote",//private note 'p.note' => "PrivateNote",//private note
'p.customcode' => 'CustomCode', 'p.customcode' => 'CustomCode',
'p.fk_country' => 'CountryCode',
'p.price' => "SellingPriceHT",//without 'p.price' => "SellingPriceHT",//without
'p.price_min' => "MinPrice", 'p.price_min' => "MinPrice",
'p.price_ttc' => "SellingPriceTTC",//with tax 'p.price_ttc' => "SellingPriceTTC",//with tax
@ -440,7 +441,14 @@ class modProduct extends DolibarrModules
'method' => 'fetch', 'method' => 'fetch',
'units' => 'volume', 'units' => 'volume',
'dict' => 'DictionaryMeasuringUnits' '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 (! 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'));
@ -485,6 +493,7 @@ class modProduct extends DolibarrModules
'p.note_public' => "a public note (free text)", 'p.note_public' => "a public note (free text)",
'p.note' => "a private note (free text)", 'p.note' => "a private note (free text)",
'p.customcode' => 'customs code', 'p.customcode' => 'customs code',
'p.fk_country' => 'FR',
'p.price' => "price ex-vat eg. 100", 'p.price' => "price ex-vat eg. 100",
'p.price_min' => "price ex-vat eg. 100", 'p.price_min' => "price ex-vat eg. 100",
'p.price_ttc' => "price inc-vat eg. 110", 'p.price_ttc' => "price inc-vat eg. 110",