From bb04e6837efa86d5af04401ffa104a603f6f50cb Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Sun, 18 Dec 2011 20:08:33 +0000 Subject: [PATCH] Cosmetic : align column VAT + display j_text --- include/class_acc_ledger_purchase.php | 7 ++++--- include/class_acc_ledger_sold.php | 14 ++++++++------ include/template/ledger_detail_ach.php | 7 +++++-- include/template/ledger_detail_fin.php | 5 +++++ include/template/ledger_detail_misc.php | 6 +++++- include/template/ledger_detail_ven.php | 7 +++++-- 6 files changed, 32 insertions(+), 14 deletions(-) diff --git a/include/class_acc_ledger_purchase.php b/include/class_acc_ledger_purchase.php index bceda6e62..0b93a2a7b 100644 --- a/include/class_acc_ledger_purchase.php +++ b/include/class_acc_ledger_purchase.php @@ -765,7 +765,7 @@ class Acc_Ledger_Purchase extends Acc_Ledger $acc_pay->poste=$poste_val; $acc_pay->qcode=$fqcode; $acc_pay->amount=abs(round($cust_amount,2)); - $acc_pay->desc=$e_comm; + $acc_pay->desc=''; $acc_pay->grpt=$acseq; $acc_pay->jrn=$mp->get_parameter('ledger_target'); $acc_pay->periode=$tperiode; @@ -778,15 +778,16 @@ class Acc_Ledger_Purchase extends Acc_Ledger $acc_pay->poste=$poste; $acc_pay->qcode=$e_client; $acc_pay->amount=abs(round($cust_amount,2)); - $acc_pay->desc=$e_comm; + $acc_pay->desc=''; $acc_pay->grpt=$acseq; $acc_pay->jrn=$mp->get_parameter('ledger_target'); $acc_pay->periode=$tperiode; - $acc_pay->type=($cust_amount>=0)?'d':'c'; + $acc_pay->type=($cust_amount>=0)?'d':'c'; $let_other=$acc_pay->insert_jrnx(); /* insert into jrn */ $acc_pay->mt=$mt; + $acc_pay->desc=$e_comm; $mp_jr_id=$acc_pay->insert_jrn(); $acjrn->grpt_id=$acseq; $acjrn->update_internal_code($acinternal); diff --git a/include/class_acc_ledger_sold.php b/include/class_acc_ledger_sold.php index 6e76bad02..42e7fd668 100644 --- a/include/class_acc_ledger_sold.php +++ b/include/class_acc_ledger_sold.php @@ -445,8 +445,8 @@ class Acc_Ledger_Sold extends Acc_Ledger $acc_operation->jrn=$p_jrn; $acc_operation->type='d'; $acc_operation->periode=$tperiode; - $acc_operation->insert_jrnx(); - $tot_debit=bcadd($tot_debit,$value); + $acc_operation->insert_jrnx(); + $tot_debit=bcadd($tot_debit,$value); $n_both=$value; } @@ -535,7 +535,8 @@ class Acc_Ledger_Sold extends Acc_Ledger $acc_pay->poste=$poste_val; $acc_pay->qcode=$fqcode; $acc_pay->amount=abs(round($cust_amount,2)); - $acc_pay->desc=$e_comm; + $acc_pay->desc=null; + $acc_pay->grpt=$acseq; $acc_pay->jrn=$mp->get_parameter('ledger_target'); $acc_pay->periode=$tperiode; @@ -548,16 +549,17 @@ class Acc_Ledger_Sold extends Acc_Ledger $acc_pay->poste=$poste; $acc_pay->qcode=$e_client; $acc_pay->amount=abs(round($cust_amount,2)); - $acc_pay->desc=$e_comm; + $acc_pay->desc=null; $acc_pay->grpt=$acseq; $acc_pay->jrn=$mp->get_parameter('ledger_target'); $acc_pay->periode=$tperiode; - $acc_pay->type=($cust_amount>=0)?'c':'d'; + $acc_pay->type=($cust_amount>=0)?'c':'d'; $let_other=$acc_pay->insert_jrnx(); /* insert into jrn */ - $mp_jr_id=$acc_pay->insert_jrn(); + $acjrn->desc=$e_comm; $acjrn->grpt_id=$acseq; + $mp_jr_id=$acc_pay->insert_jrn(); $acjrn->update_internal_code($acinternal); $r1=$this->get_id($internal); diff --git a/include/template/ledger_detail_ach.php b/include/template/ledger_detail_ach.php index d848384aa..dc428ff26 100644 --- a/include/template/ledger_detail_ach.php +++ b/include/template/ledger_detail_ach.php @@ -194,10 +194,13 @@ echo ''; echo tr($row); } -$row= td(_('Total'),' style="font-style:italic;text-align:right;font-weight: bolder;" colspan="5"'); + if ($owner->MY_TVA_USE=='Y') + $row= td(_('Total'),' style="font-style:italic;text-align:right;font-weight: bolder;widtg:auto" colspan="6"'); + else + $row= td(_('Total'),' style="font-style:italic;text-align:right;font-weight: bolder;widtg:auto" colspan="6"'); $row.=td(nbm($total_htva),'class="num" style="font-style:italic;font-weight: bolder;"'); if ($owner->MY_TVA_USE=='Y') - $row.=td(nbm($total_tvac),'class="num" style="font-style:italic;font-weight: bolder;"'); + $row.=td("").td(nbm($total_tvac),'class="num" style="font-style:italic;font-weight: bolder;"'); echo tr($row); ?> diff --git a/include/template/ledger_detail_fin.php b/include/template/ledger_detail_fin.php index c97acc410..86828e7d0 100644 --- a/include/template/ledger_detail_fin.php +++ b/include/template/ledger_detail_fin.php @@ -123,6 +123,7 @@ echo ''; $q[$e]['j_poste'], $gDossier, $q[$e]['j_poste']); $row.=td($view_history); + if ( $q[$e]['j_qcode'] !=''){ $fiche=new Fiche($cn); $fiche->get_by_qcode($q[$e]['j_qcode']); @@ -132,6 +133,10 @@ echo ''; else $view_history=''; $row.=td($view_history); + if ( $q[$e]['j_text']!='') + { + $row.=td(h(strip_tags($q[$e]['j_text']))); + }else if ( $q[$e]['j_qcode'] !='') { // nom de la fiche $ff=new Fiche($cn); diff --git a/include/template/ledger_detail_misc.php b/include/template/ledger_detail_misc.php index e9b477910..2176b396c 100644 --- a/include/template/ledger_detail_misc.php +++ b/include/template/ledger_detail_misc.php @@ -105,6 +105,7 @@ echo ''; $q[$e]['j_poste'], $gDossier, $q[$e]['j_poste']); $row.=td($view_history); + if ( $q[$e]['j_qcode'] !='') { $fiche=new Fiche($cn); $fiche->get_by_qcode($q[$e]['j_qcode']); @@ -114,7 +115,10 @@ echo ''; else $view_history=''; $row.=td($view_history); - + if ( $q[$e]['j_text']!='') + { + $row.=td(h(strip_tags($q[$e]['j_text']))); + }else if ( $q[$e]['j_qcode'] !='') { // nom de la fiche $ff=new Fiche($cn); diff --git a/include/template/ledger_detail_ven.php b/include/template/ledger_detail_ven.php index 189aafbed..7397aa122 100644 --- a/include/template/ledger_detail_ven.php +++ b/include/template/ledger_detail_ven.php @@ -185,10 +185,13 @@ echo ''; echo tr($row); } -$row= td(_('Total'),' style="font-style:italic;text-align:right;font-weight: bolder;" colspan="5"'); + if ($owner->MY_TVA_USE=='Y') + $row= td(_('Total'),' style="font-style:italic;text-align:right;font-weight: bolder;" colspan="5"'); + else + $row= td(_('Total'),' style="font-style:italic;text-align:right;font-weight: bolder;" colspan="5"'); $row.=td(nbm($total_htva),'class="num" style="font-style:italic;font-weight: bolder;"'); if ($owner->MY_TVA_USE=='Y') - $row.=td(nbm($total_tvac),'class="num" style="font-style:italic;font-weight: bolder;"'); + $row.=td("").td(nbm($total_tvac),'class="num" style="font-style:italic;font-weight: bolder;"'); echo tr($row); ?>