[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 03/05: Predefined operation VEN includes Comm
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 03/05: Predefined operation VEN includes Comment + tva amount |
Date: |
Thu, 22 Oct 2015 11:53:20 +0000 |
sparkyx pushed a commit to branch master
in repository noalyss.
commit 6e812ee686eae6374ee3669ff31f1fddcd819891
Author: Dany De Bontridder <address@hidden>
Date: Thu Oct 22 11:57:35 2015 +0200
Predefined operation VEN includes Comment + tva amount
---
include/class/class_pre_op_ven.php | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/include/class/class_pre_op_ven.php
b/include/class/class_pre_op_ven.php
index 0ca812d..e31c975 100644
--- a/include/class/class_pre_op_ven.php
+++ b/include/class/class_pre_op_ven.php
@@ -127,7 +127,9 @@ class Pre_op_ven extends Pre_operation_detail
$array+=array("e_march".$count=>$row['opd_poste'],
"e_march".$count."_price"=>$row['opd_amount'],
"e_march".$count."_tva_id"=>$row['opd_tva_id'],
- "e_quant".$count=>$row['opd_quantity']
+ "e_quant".$count=>$row['opd_quantity'],
+ "e_march".$count."_label"=>$row['opd_comment'],
+
"e_march".$count."_tva_amount"=>$row['opd_tva_amount'],
);
$count++;
}
@@ -140,7 +142,7 @@ class Pre_op_ven extends Pre_operation_detail
function load()
{
$sql="select opd_id,opd_poste,opd_amount,opd_tva_id,opd_debit,".
- " opd_quantity from op_predef_detail where
od_id=".$this->operation->od_id.
+ " opd_quantity , opd_comment,opd_tva_amount from op_predef_detail
where od_id=".$this->operation->od_id.
" order by opd_id";
$res=$this->db->exec_sql($sql);
$array=Database::fetch_all($res);
- [Noalyss-commit] [noalyss] branch master updated (9bc7e44 -> 0be477f), Dany De Bontridder, 2015/10/22
- [Noalyss-commit] [noalyss] 01/05: Debug : do not complain about install file, Dany De Bontridder, 2015/10/22
- [Noalyss-commit] [noalyss] 02/05: Allow to use 4 decimal for Sales + predefined operation and display detail, Dany De Bontridder, 2015/10/22
- [Noalyss-commit] [noalyss] 03/05: Predefined operation VEN includes Comment + tva amount,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 05/05: By default, the card's attribute for Price has 4 decimal', Dany De Bontridder, 2015/10/22
- [Noalyss-commit] [noalyss] 04/05: Allow to use 4 decimal for Purchase + predefined operation and display detail, Dany De Bontridder, 2015/10/22