From 6aeb18ed7532aa534a3fc261145fd29f928238e6 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Fri, 15 Jan 2016 13:14:55 +0100
Subject: [PATCH] Revert "Fix: for avoid division by 0"
This reverts commit c71d578931ed9126937fdcb3dda0e8e5a332f0c8.
---
htdocs/core/tpl/objectline_create.tpl.php | 19 +++++++++----------
htdocs/core/tpl/objectline_edit.tpl.php | 17 +++++++----------
2 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index d2827cb0b8e..e600df26147 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2010-2015 Regis Houssin <regis.houssin@capnetworks.com>
+/* Copyright (C) 2010-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2010-2014 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2012-2013 Christophe Battarel <christophe.battarel@altairis.fr>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
@@ -352,36 +352,35 @@ if (! empty($usemargins) && $user->rights->margins->creer)
if (! $.isNumeric(rate.val().replace(',','.')))
{
- alert('<?php echo dol_escape_js($langs->transnoentities("rateMustBeNumeric")); ?>');
+ alert('<?php echo dol_escape_js($langs->trans("rateMustBeNumeric")); ?>');
e.stopPropagation();
setTimeout(function () { rate.focus() }, 50);
return false;
}
if (npRate == "np_markRate" && rate.val() >= 100)
{
- alert('<?php echo dol_escape_js($langs->transnoentities("markRateShouldBeLesserThan100")); ?>');
+ alert('<?php echo dol_escape_js($langs->trans("markRateShouldBeLesserThan100")); ?>');
e.stopPropagation();
setTimeout(function () { rate.focus() }, 50);
return false;
}
+ var price = 0;
remisejs=price2numjs(remise.val());
- if (remisejs == '') remisejs=0;
- bpjs=price2numjs(buying_price.val());
-
- if (bpjs > 0 && remisejs != 100) // If buying_price and a discount not 100 or no discount
+ if (remisejs != 100) // If a discount not 100 or no discount
{
- var price = 0;
+ if (remisejs == '') remisejs=0;
+
+ bpjs=price2numjs(buying_price.val());
ratejs=price2numjs(rate.val());
if (npRate == "np_marginRate")
price = ((bpjs * (1 + ratejs / 100)) / (1 - remisejs / 100));
else if (npRate == "np_markRate")
price = ((bpjs / (1 - ratejs / 100)) / (1 - remisejs / 100));
-
- $("input[name='price_ht']:first").val(price); // TODO Must use a function like php price to have here a formated value
}
+ $("input[name='price_ht']:first").val(price); // TODO Must use a function like php price to have here a formated value
return true;
}
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index eacba3519af..bb75b007524 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2010-2015 Regis Houssin <regis.houssin@capnetworks.com>
+/* Copyright (C) 2010-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2010-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2012 Christophe Battarel <christophe.battarel@altairis.fr>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
@@ -282,27 +282,25 @@ if (! empty($conf->margin->enabled))
if (! $.isNumeric(rate.val().replace(',','.')))
{
- alert('<?php echo $langs->transnoentities("rateMustBeNumeric"); ?>');
+ alert('<?php echo $langs->trans("rateMustBeNumeric"); ?>');
e.stopPropagation();
setTimeout(function () { rate.focus() }, 50);
return false;
}
if (npRate == "np_markRate" && rate.val() >= 100)
{
- alert('<?php echo $langs->transnoentities("markRateShouldBeLesserThan100"); ?>');
+ alert('<?php echo $langs->trans("markRateShouldBeLesserThan100"); ?>');
e.stopPropagation();
setTimeout(function () { rate.focus() }, 50);
return false;
}
+ var price = 0;
remisejs=price2numjs(remise.val());
- if (remisejs == '') remisejs=0;
- bpjs=price2numjs(buying_price.val());
-
- if (bpjs > 0 && remisejs != 100) // If buying_price and a discount not 100 or no discount
+ if (remisejs != 100)
{
- var price = 0;
+ bpjs=price2numjs(buying_price.val());
ratejs=price2numjs(rate.val());
/* console.log(npRate+" - "+bpjs+" - "+ratejs); */
@@ -311,9 +309,8 @@ if (! empty($conf->margin->enabled))
price = ((bpjs * (1 + ratejs / 100)) / (1 - remisejs / 100));
else if (npRate == "np_markRate")
price = ((bpjs / (1 - ratejs / 100)) / (1 - remisejs / 100));
-
- $("input[name='price_ht']:first").val(price); // TODO Must use a function like php price to have here a formated value
}
+ $("input[name='price_ht']:first").val(price); // TODO Must use a function like php price to have here a formated value
return true;
}
--
GitLab