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

Merge pull request #405 from cbattarel/develop

Browse Source 
correct some ajax bugs caused by tpl recent updates
This commit is contained in:
Laurent Destailleur 2012-09-19 05:53:29 -07:00
commit 9bc0011290
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/tpl/objectline_edit.tpl.php
View File

@ -329,9 +329,9 @@ $(document).ready(function() {
<?php } ?> <?php } ?>
<?php if (! empty($conf->margin->enabled)) { ?> <?php if (! empty($conf->margin->enabled)) { ?>
$.post('<?php echo DOL_URL_ROOT; ?>/fourn/ajax/getSupplierPrices.php', {'idprod': <?php echo $line->fk_product; ?>}, function(data) { $.post('<?php echo DOL_URL_ROOT; ?>/fourn/ajax/getSupplierPrices.php', {'idprod': <?php echo $line->fk_product?$line->fk_product:0; ?>}, function(data) {
if (data.length > 0) { if (data && data.length > 0) {
var options = ''; var options = '';
var trouve=false; var trouve=false;
$(data).each(function() { $(data).each(function() {

22
htdocs/core/tpl/predefinedproductline_create.tpl.php
View File

@ -140,10 +140,12 @@ if (! empty($conf->margin->enabled)) {
?> ?>
<script type="text/javascript"> <script type="text/javascript">
$("#idprod").change(function() { $("#idprod").change(function() {
$("#np_fournprice options").remove(); $("#fournprice options").remove();
$("#np_buying_price").show(); $("#fournprice").hide();
$("#buying_price").val("");
$("#buying_price").show();
$.post('<?php echo DOL_URL_ROOT; ?>/fourn/ajax/getSupplierPrices.php', {'idprod': $(this).val()}, function(data) { $.post('<?php echo DOL_URL_ROOT; ?>/fourn/ajax/getSupplierPrices.php', {'idprod': $(this).val()}, function(data) {
if (data.length > 0) { if (data && data.length > 0) {
var options = ''; var options = '';
var i = 0; var i = 0;
$(data).each(function() { $(data).each(function() {
@ -151,20 +153,20 @@ $("#idprod").change(function() {
options += '<option value="'+this.id+'" price="'+this.price+'"'; options += '<option value="'+this.id+'" price="'+this.price+'"';
if (i == 1) { if (i == 1) {
options += ' selected'; options += ' selected';
$("#np_buying_price").val(this.price); $("#buying_price").val(this.price);
} }
options += '>'+this.label+'</option>'; options += '>'+this.label+'</option>';
}); });
options += '<option value=null><?php echo $langs->trans("InputPrice"); ?></option>'; options += '<option value=null><?php echo $langs->trans("InputPrice"); ?></option>';
$("#np_fournprice").html(options); $("#fournprice").html(options);
$("#np_buying_price").hide(); $("#buying_price").hide();
$("#np_fournprice").show(); $("#fournprice").show();
$("#np_fournprice").change(function() { $("#fournprice").change(function() {
var selval = $(this).find('option:selected').attr("price"); var selval = $(this).find('option:selected').attr("price");
if (selval) if (selval)
$("#np_buying_price").val(selval).hide(); $("#buying_price").val(selval).hide();
else else
$('#np_buying_price').show(); $('#buying_price').show();
}); });
} }
}, },