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

Merge pull request #16214 from FHenry/dev_fix_continue

Browse Source 
Various fix in dev branch
This commit is contained in:
Laurent Destailleur 2021-02-08 15:11:32 +01:00 committed by GitHub
commit 2440c11eec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/core/class/commonobject.class.php
View File

@ -7169,9 +7169,6 @@ abstract class CommonObject
if ($(this).val() == 0){ if ($(this).val() == 0){
$("#"+child_list).hide(); $("#"+child_list).hide();
} }
$("select[name=\""+parent_list+"\"]").change(function() {
showOptions(child_list, parent_list, orig_select[child_list]);
}); });
}); });
} }

1
htdocs/core/class/html.form.class.php
View File

@ -2229,6 +2229,7 @@ class Form
{ {
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_lang as pl ON pl.fk_product = p.rowid "; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_lang as pl ON pl.fk_product = p.rowid ";
if (!empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE) && !empty($socid)) { if (!empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE) && !empty($socid)) {
require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
$soc = new Societe($db); $soc = new Societe($db);
$result = $soc->fetch($socid); $result = $soc->fetch($socid);
if ($result > 0 && !empty($soc->default_lang)) { if ($result > 0 && !empty($soc->default_lang)) {

10
htdocs/product/ajax/products.php
View File

@ -82,14 +82,10 @@ if (!empty($action) && $action == 'fetch' && !empty($id))
$found = false; $found = false;
$price_level = 1; $price_level = 1;
if ($socid > 0 && (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))) { if ($socid > 0 ) {
$thirdpartytemp = new Societe($db); $thirdpartytemp = new Societe($db);
$thirdpartytemp->fetch($socid); $thirdpartytemp->fetch($socid);
if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
$price_level = $thirdpartytemp->price_level;
}
//Load translation description and label //Load translation description and label
if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) { if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
$newlang = $thirdpartytemp->default_lang; $newlang = $thirdpartytemp->default_lang;
@ -104,6 +100,10 @@ if (!empty($action) && $action == 'fetch' && !empty($id))
$outlabel_trans = $object->label; $outlabel_trans = $object->label;
} }
} }
if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
$price_level = $thirdpartytemp->price_level;
}
} }
// Price by qty // Price by qty