[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpcompta-dev] r5186 - in phpcompta/tags/rel650/include: . template
|
From: |
phpcompta-dev |
|
Subject: |
[Phpcompta-dev] r5186 - in phpcompta/tags/rel650/include: . template |
|
Date: |
Wed, 13 Mar 2013 22:10:15 +0100 (CET) |
Author: danydb
Date: 2013-03-13 22:10:15 +0100 (Wed, 13 Mar 2013)
New Revision: 5186
Modified:
phpcompta/tags/rel650/include/class_acc_account_ledger.php
phpcompta/tags/rel650/include/class_fiche.php
phpcompta/tags/rel650/include/export_fiche_balance_csv.php
phpcompta/tags/rel650/include/export_fiche_balance_pdf.php
phpcompta/tags/rel650/include/export_fiche_detail_csv.php
phpcompta/tags/rel650/include/export_fiche_detail_pdf.php
phpcompta/tags/rel650/include/export_fiche_pdf.php
phpcompta/tags/rel650/include/export_poste_detail_csv.php
phpcompta/tags/rel650/include/fiche.inc.php
phpcompta/tags/rel650/include/impress_gl_comptes.inc.php
phpcompta/tags/rel650/include/template/letter_all.php
phpcompta/tags/rel650/include/template/letter_prop.php
Log:
0000796: Lettrage : en code Hexad?\195?\169cimal ou en base 36 (A ?\195?\160 Z
+ 0 ?\195?\160 10)
Modified: phpcompta/tags/rel650/include/class_acc_account_ledger.php
===================================================================
--- phpcompta/tags/rel650/include/class_acc_account_ledger.php 2013-03-13
15:30:37 UTC (rev 5185)
+++ phpcompta/tags/rel650/include/class_acc_account_ledger.php 2013-03-13
21:10:15 UTC (rev 5186)
@@ -355,7 +355,7 @@
$vw_operation=sprintf('<A class="detail"
style="text-decoration:underline"
HREF="javascript:modifyOperation(\'%s\',\'%s\')" >%s</A>',
$op['jr_id'], dossier::id(),
$op['jr_internal']);
$let='';
- if ( $op['letter'] !=-1) $let=$op['letter'];
+ if ( $op['letter'] !=-1) $let= strtoupper (base_convert (
$op['letter'],10,36));
$tmp_diff=bcsub($op['deb_montant'],$op['cred_montant']);
/*
Modified: phpcompta/tags/rel650/include/class_fiche.php
===================================================================
--- phpcompta/tags/rel650/include/class_fiche.php 2013-03-13 15:30:37 UTC
(rev 5185)
+++ phpcompta/tags/rel650/include/class_fiche.php 2013-03-13 21:10:15 UTC
(rev 5186)
@@ -1285,7 +1285,7 @@
$vw_operation=sprintf('<A class="detail"
style="text-decoration:underline"
HREF="javascript:modifyOperation(\'%s\',\'%s\')" >%s</A>',
$op['jr_id'], dossier::id(),
$op['jr_internal']);
$let='';
- if ( $op['letter'] !=-1) $let=$op['letter'];
+ if ( $op['letter'] !=-1) $let=
strtoupper(base_convert($op['letter'],10,36));
$tmp_diff=bcsub($op['deb_montant'],$op['cred_montant']);
Modified: phpcompta/tags/rel650/include/export_fiche_balance_csv.php
===================================================================
--- phpcompta/tags/rel650/include/export_fiche_balance_csv.php 2013-03-13
15:30:37 UTC (rev 5185)
+++ phpcompta/tags/rel650/include/export_fiche_balance_csv.php 2013-03-13
21:10:15 UTC (rev 5186)
@@ -175,7 +175,7 @@
printf
("%s;\"%s\";",abs(nb($prog)),$fic->get_amount_side($prog));
if ($row['letter'] != -1)
{
- printf('"%s";',$row['letter']);
+ printf('"%s";',
strtoupper(base_convert($row['letter'],10,36)));
printf("%s",nb($row['letter_diff']));
}
else
Modified: phpcompta/tags/rel650/include/export_fiche_balance_pdf.php
===================================================================
--- phpcompta/tags/rel650/include/export_fiche_balance_pdf.php 2013-03-13
15:30:37 UTC (rev 5185)
+++ phpcompta/tags/rel650/include/export_fiche_balance_pdf.php 2013-03-13
21:10:15 UTC (rev 5186)
@@ -265,7 +265,7 @@
}
if ($row['letter'] != -1)
{
- $pdf->Cell($tab[6], 4, $row['letter'],
0, 0, $align[6], $fill);
+ $pdf->Cell($tab[6], 4,
strtoupper(base_convert($row['letter'],10,36)), 0, 0, $align[6], $fill);
// get sum for this lettering
$pdf->Cell($tab[7], 4, sprintf('%s',
nbm($row['letter_diff'])), '0', '0', $align[7], $fill);
Modified: phpcompta/tags/rel650/include/export_fiche_detail_csv.php
===================================================================
--- phpcompta/tags/rel650/include/export_fiche_detail_csv.php 2013-03-13
15:30:37 UTC (rev 5185)
+++ phpcompta/tags/rel650/include/export_fiche_detail_csv.php 2013-03-13
21:10:15 UTC (rev 5186)
@@ -74,7 +74,7 @@
nb($op['deb_montant']).";".
nb($op['cred_montant']).";".
nb(abs($progress)).';'.
- '"'.(($op['letter']==-1)?'':$op['letter']).'"';
+
'"'.(($op['letter']==-1)?'':strtoupper(base_convert($op['letter'],10,36))).'"';
printf("\n");
}
Modified: phpcompta/tags/rel650/include/export_fiche_detail_pdf.php
===================================================================
--- phpcompta/tags/rel650/include/export_fiche_detail_pdf.php 2013-03-13
15:30:37 UTC (rev 5185)
+++ phpcompta/tags/rel650/include/export_fiche_detail_pdf.php 2013-03-13
21:10:15 UTC (rev 5186)
@@ -107,7 +107,7 @@
$pdf->LongLine($size[$l],6,($row['description'].'('.$row['jr_internal'].")"),0,$align[$l]);
$l++;
-
$pdf->Cell($size[$l],6,(($row['letter']!=-1)?$row['letter']:''),0,0,$align[$l]);
+
$pdf->Cell($size[$l],6,(($row['letter']!=-1)?strtoupper(base_convert($row['letter'],10,36)):''),0,0,$align[$l]);
$l++;
$pdf->Cell($size[$l],6,(sprintf('%
12.2f',$row['deb_montant'])),0,0,$align[$l]);
$l++;
Modified: phpcompta/tags/rel650/include/export_fiche_pdf.php
===================================================================
--- phpcompta/tags/rel650/include/export_fiche_pdf.php 2013-03-13 15:30:37 UTC
(rev 5185)
+++ phpcompta/tags/rel650/include/export_fiche_pdf.php 2013-03-13 21:10:15 UTC
(rev 5186)
@@ -197,7 +197,7 @@
}
if ($row['letter'] != -1 )
{
- $pdf->Cell($tab[5],4,$row['letter'],0,0,$align[5],$fill);
+
$pdf->Cell($tab[5],4,strtoupper(base_convert($row['letter'],10,36)),0,0,$align[5],$fill);
// get sum for this lettering
$sql="select sum(j_montant) from jrnx where j_debit=$1 and
j_id in ".
" (select j_id from jnt_letter join letter_deb using
(jl_id) where jl_id=$2 union ".
Modified: phpcompta/tags/rel650/include/export_poste_detail_csv.php
===================================================================
--- phpcompta/tags/rel650/include/export_poste_detail_csv.php 2013-03-13
15:30:37 UTC (rev 5185)
+++ phpcompta/tags/rel650/include/export_poste_detail_csv.php 2013-03-13
21:10:15 UTC (rev 5186)
@@ -86,7 +86,7 @@
nb($op['deb_montant']).";".
nb($op['cred_montant']).";".
nb(abs($prog)).";".
- (($op['letter']!=-1)?$op['letter']:"");
+
(($op['letter']!=-1)?strtoupper(base_convert($op['letter'],10,36)):"");
printf("\n");
Modified: phpcompta/tags/rel650/include/fiche.inc.php
===================================================================
--- phpcompta/tags/rel650/include/fiche.inc.php 2013-03-13 15:30:37 UTC (rev
5185)
+++ phpcompta/tags/rel650/include/fiche.inc.php 2013-03-13 21:10:15 UTC (rev
5186)
@@ -464,7 +464,7 @@
$span_error = "";
if ($row['letter_diff'] != 0)
$span_error = $g_failed;
- echo td($row['letter'] . $span_error);
+ echo
td(strtoupper(base_convert($row['letter'],10,36)) . $span_error);
}
else
echo td('');
Modified: phpcompta/tags/rel650/include/impress_gl_comptes.inc.php
===================================================================
--- phpcompta/tags/rel650/include/impress_gl_comptes.inc.php 2013-03-13
15:30:37 UTC (rev 5185)
+++ phpcompta/tags/rel650/include/impress_gl_comptes.inc.php 2013-03-13
21:10:15 UTC (rev 5186)
@@ -218,7 +218,7 @@
$solde_d = bcadd($solde_d,$detail['deb_montant']);
}
$side=" ".$Poste->get_amount_side($solde);
- $letter=($detail['letter']!=-1)?hi($detail['letter']):'';
+
$letter=($detail['letter']!=-1)?hi(strtoupper(base_convert($detail['letter'],10,36))):'';
$i++;
if (($i % 2 ) == 0) $class="odd"; else $class="even";
echo '<tr class="'.$class.'">
Modified: phpcompta/tags/rel650/include/template/letter_all.php
===================================================================
--- phpcompta/tags/rel650/include/template/letter_all.php 2013-03-13
15:30:37 UTC (rev 5185)
+++ phpcompta/tags/rel650/include/template/letter_all.php 2013-03-13
21:10:15 UTC (rev 5186)
@@ -11,7 +11,7 @@
<? exit();
endif;?>
-<table class="result">
+ <table class="result">
<tr>
<th>
<?=_('Lettrage')?>
@@ -28,14 +28,14 @@
<th>
<?=_('Description')?>
</th>
-<th>
- <?=_('Montant')?>
+<th style="text-align:right">
+ <?=_('Débit')?>
</th>
-<th>
- <?=_('Debit / Credit')?>
+<th style="text-align:right">
+ <?=_('Crédit')?>
</th>
-<th>
- <?=_('Op. concerné')?>
+<th style="text-align:center">
+ <?=_('Op. concernée')?>
</th>
</tr>
@@ -47,14 +47,14 @@
<tr <? echo "class=\"$class\""; ?> >
<td>
<?php
-$letter=($this->content[$i]['letter']==-1)?"x":base_convert($this->content[$i]['letter'],10,36);
+$letter=($this->content[$i]['letter']==-1)?" aucun lettrage
":strtoupper(base_convert($this->content[$i]['letter'],10,36));
$js="this.gDossier=".dossier::id().
";this.j_id=".$this->content[$i]['j_id'].
";this.obj_type='".$this->object_type."'".
";dsp_letter(this)";
?>
-<A class="detail" href="javascript:<?=$js?>"><?=$letter?>
+<A class="detail" style="text-decoration: underline"
href="javascript:<?=$js?>"><?=$letter?>
<? if ( $this->content[$i]['letter_diff'] != 0) echo $g_failed; ?>
</A>
</td>
@@ -67,9 +67,14 @@
?>
<td> <?=$r?> </td>
<td> <?=h($this->content[$i]['jr_comment'])?> </td>
+ <? if ($this->content[$i]['j_debit']=='t') : ?>
<td style="text-align:right"> <?=nb($this->content[$i]['j_montant'])?> </td>
-<td> <?=($this->content[$i]['j_debit']=='t')?'D':'C'?> </td>
-<td>
+ <td></td>
+ <? else : ?>
+ <td></td>
+ <td style="text-align:right"> <?=nb($this->content[$i]['j_montant'])?> </td>
+ <? endif ?>
+<td style="text-align:center">
<?php
// Rapprochement
$rec=new Acc_Reconciliation($this->db);
@@ -97,14 +102,14 @@
endfor;
?>
</table>
-<h2 class="info2" style="margin:0 0"> Solde débit : <?=nb($amount_deb);?>
-<h2 class="info2" style="margin:0 0"> Solde crédit : <?=nb($amount_cred);?>
+<h2 class="info2" style="margin:0 0"> Solde débit : <?=nb($amount_deb);?></h2>
+<h2 class="info2" style="margin:0 0"> Solde crédit :
<?=nb($amount_cred);?></h2>
<?
bcscale(2);
$solde=bcsub($amount_deb,$amount_cred);
if ( $solde > 0 ) :
?>
- <h2 class="info2" style="margin:0 0"> Solde débiteur : <?=nb($solde)?>
+ <h2 class="info2" style="margin:0 0"> Solde débiteur :
<?=nb($solde)?></h2>
<? else : ?>
- <h2 class="info2" style="margin:0 0"> Solde créditeur :
<?=nb(abs($solde))?>
+ <h2 class="info2" style="margin:0 0"> Solde créditeur :
<?=nb(abs($solde))?></h2>
<? endif; ?>
Modified: phpcompta/tags/rel650/include/template/letter_prop.php
===================================================================
--- phpcompta/tags/rel650/include/template/letter_prop.php 2013-03-13
15:30:37 UTC (rev 5185)
+++ phpcompta/tags/rel650/include/template/letter_prop.php 2013-03-13
21:10:15 UTC (rev 5186)
@@ -3,7 +3,6 @@
require_once ('class_acc_reconciliation.php');
$gDossier=dossier::id();
-
if ( count($this->content) == 0 ) :
?>
<h2 class="info2"><?=_('Désolé aucun résultat trouvé')?></h2>
@@ -27,14 +26,14 @@
<th>
<?=_('Description')?>
</th>
-<th>
- <?=_('Montant')?>
+<th style="text-align:right">
+ <?=_('Débit')?>
</th>
-<th>
- <?=_('Debit / Credit')?>
+<th style="text-align:right">
+ <?=_('Crédit')?>
</th>
-<th>
- <?=_('Op. concerné')?>
+<th style="text-align:center">
+ <?=_('Op. concernée')?>
</th>
</tr>
@@ -67,14 +66,14 @@
<th>
<?=_('Description')?>
</th>
-<th>
- <?=_('Montant')?>
+<th style="text-align:right">
+ <?=_('Débit')?>
</th>
-<th>
- <?=_('Debit / Credit')?>
+<th style="text-align:right">
+ <?=_('Crédit')?>
</th>
-<th>
- <?=_('Op. concerné')?>
+<th style="text-align:center">
+ <?=_('Op. concernée')?>
</th>
</tr>
<?
@@ -98,7 +97,7 @@
</td>
<td>
<?php
-$letter=($this->content[$i]['letter']< 0)?"
":base_convert($this->content[$i]['letter'],10,36);
+$letter=($this->content[$i]['letter']< 0)?"
":strtoupper(base_convert($this->content[$i]['letter'],10,36));
?>
<?=$letter?>
</td>
@@ -109,9 +108,14 @@
?>
<td> <?=$r?> </td>
<td> <?=$this->content[$i]['jr_comment']?> </td>
- <td> <?=nb($this->content[$i]['j_montant'])?> </td>
-<td> <?=($this->content[$i]['j_debit']=='t')?'D':'C'?> </td>
-<td>
+ <? if ($this->content[$i]['j_debit']=='t') : ?>
+ <td style="text-align:right"> <?=nb($this->content[$i]['j_montant'])?> </td>
+ <td></td>
+ <? else : ?>
+ <td></td>
+ <td style="text-align:right"> <?=nb($this->content[$i]['j_montant'])?> </td>
+ <? endif ?>
+<td style="text-align:center">
<?php
// Rapprochement
$rec=new Acc_Reconciliation($this->db);
---
PhpCompta est un logiciel de comptabilité libre en ligne (full web)
Projet opensource http://www.phpcompta.eu
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpcompta-dev] r5186 - in phpcompta/tags/rel650/include: . template,
phpcompta-dev <=