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

FIX Each time we edit a line, we loose the unit price.

Browse Source
This commit is contained in:
Laurent Destailleur 2016-03-30 16:26:34 +02:00
parent fa10f9e030
commit 7146a8319b
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -252,6 +252,10 @@ if (! empty($conf->margin->enabled))
jQuery("input[name='np_marginRate']:first").val(''); jQuery("input[name='np_marginRate']:first").val('');
jQuery("input[name='np_markRate']:first").val(''); jQuery("input[name='np_markRate']:first").val('');
}); });
jQuery("#qty").keyup(function() {
jQuery("input[name='np_marginRate']:first").val('');
jQuery("input[name='np_markRate']:first").val('');
});
jQuery("#remise_percent").keyup(function() { jQuery("#remise_percent").keyup(function() {
jQuery("input[name='np_marginRate']:first").val(''); jQuery("input[name='np_marginRate']:first").val('');
jQuery("input[name='np_markRate']:first").val(''); jQuery("input[name='np_markRate']:first").val('');
@ -300,7 +304,7 @@ if (! empty($conf->margin->enabled))
/* Add rules to reset price_ht from margin info */ /* Add rules to reset price_ht from margin info */
<?php <?php
if (! empty($conf->global->DISPLAY_MARGIN_RATES)) if (! empty($conf->global->DISPLAY_MARGIN_RATES) && !empty($conf->global->MARGIN_RESET_HT_FROM_MARGIN_FIELD))
{ {
?> ?>
$('#savelinebutton').click(function (e) { $('#savelinebutton').click(function (e) {
@ -312,7 +316,7 @@ if (! empty($conf->margin->enabled))
});*/ });*/
<?php <?php
} }
if (! empty($conf->global->DISPLAY_MARK_RATES)) if (! empty($conf->global->DISPLAY_MARK_RATES) && !empty($conf->global->MARGIN_RESET_HT_FROM_MARGIN_FIELD))
{ {
?> ?>
$('#savelinebutton').click(function (e) { $('#savelinebutton').click(function (e) {