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

Merge branch 'dev_new_add_desc_when_select_product' of github.com:FHenry/dolibarr into dev_new_add_desc_when_select_product

Browse Source
This commit is contained in:
Florian HENRY 2020-10-28 17:18:32 +01:00
commit c202108359
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
htdocs/core/tpl/objectline_create.tpl.php
View File

@ -678,13 +678,13 @@ if (!empty($usemargins) && $user->rights->margins->creer)
if (!empty($conf->global->PRODUIT_AUTOFILL_DESC)) { if (!empty($conf->global->PRODUIT_AUTOFILL_DESC)) {
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)) { ?>
var proddesc = data.desc_trans; var proddesc = data.desc_trans;
<?php <?php
} else { ?> } else { ?>
var proddesc = data.desc; var proddesc = data.desc;
<?php <?php
} ?> } ?>
console.log("Load desciption into text area : "+proddesc); console.log("Load desciption into text area : "+proddesc);
<?php <?php
if (!empty($conf->global->FCKEDITOR_ENABLE_DETAILS)) { ?> if (!empty($conf->global->FCKEDITOR_ENABLE_DETAILS)) { ?>
if (typeof CKEDITOR == "object" && typeof CKEDITOR.instances != "undefined") if (typeof CKEDITOR == "object" && typeof CKEDITOR.instances != "undefined")
{ {
@ -693,12 +693,12 @@ if (!empty($usemargins) && $user->rights->margins->creer)
editor.setData(proddesc); editor.setData(proddesc);
} }
} }
<?php <?php
} else { ?> } else { ?>
jQuery('#dp_desc').text(proddesc); jQuery('#dp_desc').text(proddesc);
<?php <?php
} ?> } ?>
<?php <?php
} ?> } ?>
}, },
'json' 'json'
@ -873,12 +873,12 @@ if (!empty($usemargins) && $user->rights->margins->creer)
<?php <?php
if (!empty($conf->global->PRODUIT_AUTOFILL_DESC)) { if (!empty($conf->global->PRODUIT_AUTOFILL_DESC)) {
?> ?>
var description = $('option:selected', this).attr('data-description'); var description = $('option:selected', this).attr('data-description');
if (typeof description == 'undefined') { description = jQuery('#idprodfournprice').attr('data-description'); } if (typeof description == 'undefined') { description = jQuery('#idprodfournprice').attr('data-description'); }
console.log("Load desciption into text area : "+description); console.log("Load desciption into text area : "+description);
<?php <?php
if (!empty($conf->global->FCKEDITOR_ENABLE_DETAILS)) { ?> if (!empty($conf->global->FCKEDITOR_ENABLE_DETAILS)) { ?>
if (typeof CKEDITOR == "object" && typeof CKEDITOR.instances != "undefined") if (typeof CKEDITOR == "object" && typeof CKEDITOR.instances != "undefined")
{ {
@ -887,10 +887,10 @@ if (!empty($usemargins) && $user->rights->margins->creer)
editor.setData(description); editor.setData(description);
} }
} }
<?php <?php
} else { ?> } else { ?>
jQuery('#dp_desc').text(description); jQuery('#dp_desc').text(description);
<?php <?php
} }
}?> }?>
} else if (jQuery('#idprodfournprice').length > 0) { } else if (jQuery('#idprodfournprice').length > 0) {
@ -904,10 +904,10 @@ if (!empty($usemargins) && $user->rights->margins->creer)
editor.setData(''); editor.setData('');
} }
} }
<?php <?php
} else { ?> } else { ?>
jQuery('#dp_desc').text(''); jQuery('#dp_desc').text('');
<?php <?php
} }
}?> }?>
} }