[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 107/151: Add Receipt number to detail operati
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 107/151: Add Receipt number to detail operation |
Date: |
Sat, 4 Feb 2017 17:14:32 +0000 (UTC) |
sparkyx pushed a commit to branch master
in repository noalyss.
commit b9c2ad9af0e6c0c833d9dc42ddc37b9ffcd12a66
Author: Rachel <address@hidden>
Date: Tue Jan 10 14:14:16 2017 +0100
Add Receipt number to detail operation
Signed-off-by: Dany De Bontridder <address@hidden>
---
include/template/ledger_detail_bottom.php | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/include/template/ledger_detail_bottom.php
b/include/template/ledger_detail_bottom.php
index 948c2e5..1034e8a 100644
--- a/include/template/ledger_detail_bottom.php
+++ b/include/template/ledger_detail_bottom.php
@@ -162,14 +162,17 @@ if ($aRap != null ) {
$opRap=new Acc_Operation($cn);
$opRap->jr_id=$aRap[$e];
$internal=$opRap->get_internal();
- $array_jr=$cn->get_array('select jr_date,jr_montant,jr_comment from jrn
where jr_id=$1',array($aRap[$e]));
+ $array_jr=$cn->get_array('select
jr_date,jr_pj_number,jr_montant,jr_comment from jrn where
jr_id=$1',array($aRap[$e]));
$amount=$array_jr[0]['jr_montant'];
$str="modifyOperation(".$aRap[$e].",".$gDossier.")";
- $rmReconciliation=new IButton('rmr');
- $rmReconciliation->label=SMALLX;
- $rmReconciliation->class="tinybutton";
- $rmReconciliation->javascript="return confirm_box(null,'"._("vous
confirmez?")."',";
- $rmReconciliation->javascript.=sprintf('function () {
dropLink(\'%s\',\'%s\',\'%s\',\'%s\');deleteRowRec(\'%s\',$(\'row%d\'));})',
+
+ // If write access , allow to drop Reconciles operations
+ if ( $access=='W') {
+ $rmReconciliation=new IButton('rmr');
+ $rmReconciliation->label=SMALLX;
+ $rmReconciliation->class="tinybutton";
+ $rmReconciliation->javascript="return confirm_box(null,'"._("vous
confirmez?")."',";
+ $rmReconciliation->javascript.=sprintf('function () {
dropLink(\'%s\',\'%s\',\'%s\',\'%s\');deleteRowRec(\'%s\',$(\'row%d\'));})',
$gDossier,
$div,
$jr_id,
@@ -177,14 +180,17 @@ if ($aRap != null ) {
$tableid,
$e
);
- if ( $access=='W')
+
$remove=$rmReconciliation->input();
+ }
else
$remove='';
$comment=strip_tags($array_jr[0]['jr_comment']);
+ $pj_nb=h($array_jr[0]['jr_pj_number']);
echo tr (td(format_date($array_jr[0]['jr_date'])).
td('<a class="line" href="javascript:void(0)" onclick="'.$str.'"
>'.$internal.'</A>').
+ td($pj_nb).
td($comment).
td(nbm($amount)).
td($remove),' id = "row'.$e.'"');
- [Noalyss-commit] [noalyss] 75/151: Scenario pour dév. de comptabilité analytique, (continued)
- [Noalyss-commit] [noalyss] 75/151: Scenario pour dév. de comptabilité analytique, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 70/151: sécurité Task #8 - Sécurité protection SQL, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 64/151: Clean code, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 79/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] 81/151: syntax, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 88/151: remove debug info, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 93/151: Export PDF : check files properly, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 95/151: Problème htmlentities : charset par défaut différent entre version, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 91/151: Improve Performance Acc_Bilan::warning, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 104/151: Improve Noalyss_SQL : add set and get, Dany De Bontridder, 2017/02/04
- [Noalyss-commit] [noalyss] 107/151: Add Receipt number to detail operation,
Dany De Bontridder <=
- [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, 2017/02/04