[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 76/151: Ajout options Task #9 - PDF_Operation
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 76/151: Ajout options Task #9 - PDF_Operation : ajout des options |
Date: |
Sat, 4 Feb 2017 17:14:29 +0000 (UTC) |
sparkyx pushed a commit to branch master
in repository noalyss.
commit 91ffe8d7777d8ac9c989d94faf80db2c15fc94b4
Author: Dany De Bontridder <address@hidden>
Date: Sat Nov 26 23:19:21 2016 +0100
Ajout options
Task #9 - PDF_Operation : ajout des options
---
include/class/class_pdf_operation.php | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/include/class/class_pdf_operation.php
b/include/class/class_pdf_operation.php
index aa3bdbe..20bb79d 100644
--- a/include/class/class_pdf_operation.php
+++ b/include/class/class_pdf_operation.php
@@ -413,7 +413,7 @@ class PDF_Operation extends PDF {
/**
* @brief export operation into a PDF
*
- * @param String $p_option containing EXTEND ACC ANC or a combination
+ * @param Array $p_option containing [acc anc] or a combination
*/
function export_pdf($p_option) {
@@ -431,11 +431,16 @@ class PDF_Operation extends PDF {
// Write only for Sale or purchase summary (QCode, label,amount,tva...)
$this->print_operation_quant();
- // if option contains ACC export ACC (accountancy writings
- $this->print_acc_writing();
-
+ // if option contains ACC or $this->acc_detail is FIN or ODS
+ if ($this->acc_detail->signature=="ODS" ||
+ $this->acc_detail->signature=="FIN" ||
+ array_search("acc", $p_option) !== false
+ ){
+ $this->print_acc_writing();
+ }
// ANC only if exists
- $this->print_anc_writing();
+ if (array_search("anc", $p_option) !== false )
+ $this->print_anc_writing();
// if option contains EXTEND add document name + comment + action name
// if options contains ANC export ANC plan table
- [Noalyss-commit] [noalyss] 107/151: Add Receipt number to detail operation, (continued)
- [Noalyss-commit] [noalyss] 107/151: Add Receipt number to detail operation, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 118/151: correct typo, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 124/151: Test ManageTable ; fix parseXML function, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 129/151: #1380 : Duplication d'opérations, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 138/151: Merge branch 'master' of ns3:/srv/git/noalyss, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 134/151: Fix Bug : Predefined operation in Sales , impossible to add new items, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 139/151: ManageTable correct color of HighLigthed row, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 140/151: ManageTable use icon, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 136/151: Esthetic for duplicate operation & Correct esthetic, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 72/151: Documentation Task #2 - Documentation nouveau code, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 76/151: Ajout options Task #9 - PDF_Operation : ajout des options,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 83/151: Performance : improve VERIF, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 74/151: Export en PDF d'operation : PDF_Operation::print_section Task #10 - PDF_Operation : ajout titre Analytique, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 84/151: Performance : improve VERIF , change query pour fiche utilisé avec 2 postes, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 115/151: Correct doxygen, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 109/151: Add a class to manage the Param table (CRUD), Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 113/151: Correct doxygen doc, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 131/151: Doxygen, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 120/151: Add managetable.js to the script to load, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 128/151: Security : add security, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 130/151: #1380 : change the name of the function Acc_Ledger::button_copy_operation, Dany De Bontridder, 2017/02/04