[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 25/151: Ajout options Task #9 - PDF_Operation
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 25/151: Ajout options Task #9 - PDF_Operation : ajout des options |
Date: |
Sat, 4 Feb 2017 17:14:25 +0000 (UTC) |
sparkyx pushed a commit to branch master
in repository noalyss.
commit 834bdc4d7f133c52ec2f7ba9fbf16f31354a1ce3
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] 18/151: adapt for php 7.0, (continued)
- [Noalyss-commit] [noalyss] 18/151: adapt for php 7.0, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 16/151: Merge branch 'master' of ns3:/srv/git/noalyss, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 19/151: sécurité Task #8 - Sécurité protection SQL, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 24/151: Scenario pour dév. de comptabilité analytique, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 17/151: add newline at the end of file, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 20/151: Database Ajout d'une fonction pour retirer une seule ligne, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 23/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] 26/151: Scenario test pour PDF_Operation, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 30/151: syntax, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 29/151: Export Detail Operation Analytique + Document, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 25/151: Ajout options Task #9 - PDF_Operation : ajout des options,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 12/151: Clean code, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 28/151: PDF Operation ajout détail opération pour GrandLivre ANC , export des pièces avec tampon, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 31/151: Remove useless file, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 33/151: Performance : improve VERIF , change query pour fiche utilisé avec 2 postes, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 42/151: Export PDF : check files properly, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 41/151: Fix config.inc.php : add carriage return, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 38/151: remove debug info, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 32/151: Performance : improve VERIF, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 27/151: Scenario test pour PDF_Operation Task #9 - PDF_Operation : ajout des options, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 46/151: update of the config.inc.example file, Dany De Bontridder, 2017/02/04