[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpcompta-dev] r4623 - in phpcompta/trunk/include: . template
|
From: |
phpcompta-dev |
|
Subject: |
[Phpcompta-dev] r4623 - in phpcompta/trunk/include: . template |
|
Date: |
Sun, 18 Dec 2011 21:08:34 +0100 (CET) |
Author: danydb
Date: 2011-12-18 21:08:33 +0100 (Sun, 18 Dec 2011)
New Revision: 4623
Modified:
phpcompta/trunk/include/class_acc_ledger_purchase.php
phpcompta/trunk/include/class_acc_ledger_sold.php
phpcompta/trunk/include/template/ledger_detail_ach.php
phpcompta/trunk/include/template/ledger_detail_fin.php
phpcompta/trunk/include/template/ledger_detail_misc.php
phpcompta/trunk/include/template/ledger_detail_ven.php
Log:
Cosmetic : align column VAT + display j_text
Modified: phpcompta/trunk/include/class_acc_ledger_purchase.php
===================================================================
--- phpcompta/trunk/include/class_acc_ledger_purchase.php 2011-12-18
19:28:46 UTC (rev 4622)
+++ phpcompta/trunk/include/class_acc_ledger_purchase.php 2011-12-18
20:08:33 UTC (rev 4623)
@@ -765,7 +765,7 @@
$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 @@
$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);
Modified: phpcompta/trunk/include/class_acc_ledger_sold.php
===================================================================
--- phpcompta/trunk/include/class_acc_ledger_sold.php 2011-12-18 19:28:46 UTC
(rev 4622)
+++ phpcompta/trunk/include/class_acc_ledger_sold.php 2011-12-18 20:08:33 UTC
(rev 4623)
@@ -445,8 +445,8 @@
$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 @@
$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 @@
$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 */
+ $acjrn->desc=$e_comm;
+ $acjrn->grpt_id=$acseq;
$mp_jr_id=$acc_pay->insert_jrn();
- $acjrn->grpt_id=$acseq;
$acjrn->update_internal_code($acinternal);
$r1=$this->get_id($internal);
Modified: phpcompta/trunk/include/template/ledger_detail_ach.php
===================================================================
--- phpcompta/trunk/include/template/ledger_detail_ach.php 2011-12-18
19:28:46 UTC (rev 4622)
+++ phpcompta/trunk/include/template/ledger_detail_ach.php 2011-12-18
20:08:33 UTC (rev 4623)
@@ -194,10 +194,13 @@
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);
?>
</table>
Modified: phpcompta/trunk/include/template/ledger_detail_fin.php
===================================================================
--- phpcompta/trunk/include/template/ledger_detail_fin.php 2011-12-18
19:28:46 UTC (rev 4622)
+++ phpcompta/trunk/include/template/ledger_detail_fin.php 2011-12-18
20:08:33 UTC (rev 4623)
@@ -123,6 +123,7 @@
$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 @@
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);
Modified: phpcompta/trunk/include/template/ledger_detail_misc.php
===================================================================
--- phpcompta/trunk/include/template/ledger_detail_misc.php 2011-12-18
19:28:46 UTC (rev 4622)
+++ phpcompta/trunk/include/template/ledger_detail_misc.php 2011-12-18
20:08:33 UTC (rev 4623)
@@ -105,6 +105,7 @@
$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 @@
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);
Modified: phpcompta/trunk/include/template/ledger_detail_ven.php
===================================================================
--- phpcompta/trunk/include/template/ledger_detail_ven.php 2011-12-18
19:28:46 UTC (rev 4622)
+++ phpcompta/trunk/include/template/ledger_detail_ven.php 2011-12-18
20:08:33 UTC (rev 4623)
@@ -185,10 +185,13 @@
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);
?>
</table>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpcompta-dev] r4623 - in phpcompta/trunk/include: . template,
phpcompta-dev <=