[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 05/10: Task #0001878: quantité sur deux décim
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 05/10: Task #0001878: quantité sur deux décimales |
Date: |
Sun, 28 Mar 2021 09:22:04 -0400 (EDT) |
sparkyx pushed a commit to branch master
in repository noalyss.
commit 79024f7d92627e62d2f272b36534d3801f5512ac
Author: sparkyx <danydb@noalyss.eu>
AuthorDate: Tue Mar 23 19:33:19 2021 +0100
Task #0001878: quantité sur deux décimales
---
include/class/acc_ledger_purchase.class.php | 3 ++-
include/class/acc_ledger_sold.class.php | 3 ++-
include/class/pre_op_ach.class.php | 1 +
include/class/pre_op_ven.class.php | 1 +
include/template/ledger_detail_ach.php | 2 +-
include/template/ledger_detail_ven.php | 2 +-
6 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/include/class/acc_ledger_purchase.class.php
b/include/class/acc_ledger_purchase.class.php
index 99a5405..b3d9ebf 100644
--- a/include/class/acc_ledger_purchase.class.php
+++ b/include/class/acc_ledger_purchase.class.php
@@ -1403,6 +1403,7 @@ class Acc_Ledger_Purchase extends Acc_Ledger
$quant=(isset(${"e_quant$i"}))?${"e_quant$i"}:"1"
;
$Quantity=new INum();
+ $Quantity->prec=4;
$Quantity->setReadOnly(false);
$Quantity->size=9;
$Quantity->javascript="onchange=\"format_number(this);clean_tva($i);compute_ledger($i)\"";
@@ -1646,7 +1647,7 @@ class Acc_Ledger_Purchase extends Acc_Ledger
$r.=nbm(${"e_march".$i."_price"},4);
$r.='</td>';
$r.='<td class="num">';
- $r.=nbm(${"e_quant".$i});
+ $r.=nbm(${"e_quant".$i},4);
$r.='</td>';
$both_side=0;
if ($g_parameter->MY_TVA_USE == 'Y')
diff --git a/include/class/acc_ledger_sold.class.php
b/include/class/acc_ledger_sold.class.php
index bc713a6..4d49624 100644
--- a/include/class/acc_ledger_sold.class.php
+++ b/include/class/acc_ledger_sold.class.php
@@ -904,7 +904,7 @@ class Acc_Ledger_Sold extends Acc_Ledger {
$r.=nbm(${"e_march" . $i . "_price"},4);
$r.='</td>';
$r.='<td class="num">';
- $r.=nbm(${"e_quant" . $i});
+ $r.=nbm(${"e_quant" . $i},4);
$r.='</td>';
$both_side=0;
if ($g_parameter->MY_TVA_USE == 'Y') {
@@ -1465,6 +1465,7 @@ EOF;
$quant = (isset(${"e_quant$i"})) ? ${"e_quant$i"} : "1"
;
$Quantity = new INum();
+ $Quantity->prec=4;
$Quantity->setReadOnly(false);
$Quantity->size = 8;
$Quantity->javascript =
"onchange=\"format_number(this);clean_tva($i);compute_ledger($i);\"";
diff --git a/include/class/pre_op_ach.class.php
b/include/class/pre_op_ach.class.php
index 6fe9028..f010b16 100644
--- a/include/class/pre_op_ach.class.php
+++ b/include/class/pre_op_ach.class.php
@@ -386,6 +386,7 @@ class Pre_op_ach extends Pre_operation_detail
;
$Quantity=new INum();
$Quantity->setReadOnly(false);
+ $Quantity->prec=4;
$Quantity->size=8;
$Quantity->javascript="onChange='format_number(this);clean_tva($i);compute_ledger($i)'";
$array[$i]['quantity']=$Quantity->input("e_quant".$i,$quant);
diff --git a/include/class/pre_op_ven.class.php
b/include/class/pre_op_ven.class.php
index c73f5e9..b70d7af 100644
--- a/include/class/pre_op_ven.class.php
+++ b/include/class/pre_op_ven.class.php
@@ -384,6 +384,7 @@ class Pre_op_ven extends Pre_operation_detail
;
$Quantity=new INum();
$Quantity->setReadOnly(false);
+ $Quantity->prec=4;
$Quantity->size=8;
$Quantity->javascript="onChange='format_number(this);clean_tva($i);compute_ledger($i)'";
$array[$i]['quantity']=$Quantity->input("e_quant".$i,$quant);
diff --git a/include/template/ledger_detail_ach.php
b/include/template/ledger_detail_ach.php
index 145be8d..70f303b 100644
--- a/include/template/ledger_detail_ach.php
+++ b/include/template/ledger_detail_ach.php
@@ -198,7 +198,7 @@ $str_anc="";
$row.=td($sym_tva, 'style="text-align:center"');
$pu = $q['qp_unit'];
$row.=td(nbm($pu,4), 'class="num"');
- $row.=td(nbm($q['qp_quantite']), 'class="num"');
+ $row.=td(nbm($q['qp_quantite'],4), 'class="num"');
$no_ded = bcadd($q['qp_dep_priv'], $q['qp_nd_amount']);
$row.=td(nbm($no_ded), ' style="text-align:right"');
diff --git a/include/template/ledger_detail_ven.php
b/include/template/ledger_detail_ven.php
index cf943e5..347f98b 100644
--- a/include/template/ledger_detail_ven.php
+++ b/include/template/ledger_detail_ven.php
@@ -196,7 +196,7 @@ echo $ipaid->input();
$sym_tva = '';
$pu = $q['qs_unit'];
$row.=td(nbm($pu,4), 'class="num"');
- $row.=td(nbm($q['qs_quantite']), 'class="num"');
+ $row.=td(nbm($q['qs_quantite'],4), 'class="num"');
$sym_tva = '';
if ($owner->MY_TVA_USE == 'Y' && $q['qs_vat_code'] != '')
{
- [Noalyss-commit] [noalyss] branch master updated (a02ebda -> b00558e), Dany De Bontridder, 2021/03/28
- [Noalyss-commit] [noalyss] 01/10: Manage_Table : add CSS Class, Dany De Bontridder, 2021/03/28
- [Noalyss-commit] [noalyss] 02/10: Merge branch 'master' of gitlab.noalyss.eu:noalyss/noalyss, Dany De Bontridder, 2021/03/28
- [Noalyss-commit] [noalyss] 03/10: Merge branch 'd8103', Dany De Bontridder, 2021/03/28
- [Noalyss-commit] [noalyss] 05/10: Task #0001878: quantité sur deux décimales,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 10/10: Task #0001904: Previsions et budgets Ajout montant initial and estimation cumulée pour avoir évolution passif/actif, Dany De Bontridder, 2021/03/28
- [Noalyss-commit] [noalyss] 08/10: Task #0001904: Previsions et budgets rewriting of forecast : missing SQL files, Dany De Bontridder, 2021/03/28
- [Noalyss-commit] [noalyss] 07/10: Improve ManageTable : input can return a value + cosmetic, Dany De Bontridder, 2021/03/28
- [Noalyss-commit] [noalyss] 06/10: Task #0001904: Previsions et budgets Réécriture prévision, Dany De Bontridder, 2021/03/28
- [Noalyss-commit] [noalyss] 09/10: Cosmetic, Dany De Bontridder, 2021/03/28
- [Noalyss-commit] [noalyss] 04/10: Task #1913 : cosmetic CSS, Dany De Bontridder, 2021/03/28