[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpcompta-dev] r710 - in branches/rel672n/amortis: . include include/te
|
From: |
phpcompta-dev |
|
Subject: |
[Phpcompta-dev] r710 - in branches/rel672n/amortis: . include include/template |
|
Date: |
Thu, 13 Feb 2014 20:00:41 +0100 (CET) |
Author: danydb
Date: 2014-02-13 20:00:40 +0100 (Thu, 13 Feb 2014)
New Revision: 710
Modified:
branches/rel672n/amortis/ajax.php
branches/rel672n/amortis/include/am_card.php
branches/rel672n/amortis/include/am_generate.inc.php
branches/rel672n/amortis/include/am_histo.inc.php
branches/rel672n/amortis/include/am_print.php
branches/rel672n/amortis/include/am_util.php
branches/rel672n/amortis/include/class_am_card.php
branches/rel672n/amortis/include/class_am_generate.php
branches/rel672n/amortis/include/class_pdf_card.php
branches/rel672n/amortis/include/material_delete.inc.php
branches/rel672n/amortis/include/material_modify.inc.php
branches/rel672n/amortis/include/print_all.inc.php
branches/rel672n/amortis/include/print_fiche.inc.php
branches/rel672n/amortis/include/template/listing_histo.php
branches/rel672n/amortis/include/template/listing_year.php
branches/rel672n/amortis/include/template/material_add.php
branches/rel672n/amortis/include/template/material_detail.php
branches/rel672n/amortis/include/template/material_display.php
branches/rel672n/amortis/include/template/material_listing.php
branches/rel672n/amortis/include/template/util_generate.php
branches/rel672n/amortis/index.php
branches/rel672n/amortis/raw.php
Log:
Translation amortissement
Modified: branches/rel672n/amortis/ajax.php
===================================================================
--- branches/rel672n/amortis/ajax.php 2014-02-12 17:42:02 UTC (rev 709)
+++ branches/rel672n/amortis/ajax.php 2014-02-13 19:00:40 UTC (rev 710)
@@ -29,7 +29,7 @@
extract ($_REQUEST);
$ctl=$t;
-$html='opération non trouvée';
+$html=_('opération non trouvée');
$extra='';
$close=HtmlInput::anchor_close($t);
$html=$close.$html;
Modified: branches/rel672n/amortis/include/am_card.php
===================================================================
--- branches/rel672n/amortis/include/am_card.php 2014-02-12 17:42:02 UTC
(rev 709)
+++ branches/rel672n/amortis/include/am_card.php 2014-02-13 19:00:40 UTC
(rev 710)
@@ -40,8 +40,8 @@
echo HtmlInput::hidden('ac',$_REQUEST['ac']);
$ck=new ICheckBox('all');
$ck->selected=(isset ($_GET['all']))?true:false;
-echo '<p> Tous les biens y compris ceux qui sont complétement amortis
'.$ck->input();
-echo HtmlInput::submit('look','Recherche').'</p>';
+echo '<p>'._('Tous les biens y compris ceux qui sont complétement amortis').'
'.$ck->input();
+echo HtmlInput::submit('look',_('Recherche')).'</p>';
echo '</form>';
echo $but->input();
echo $good->listing($ck->selected);
Modified: branches/rel672n/amortis/include/am_generate.inc.php
===================================================================
--- branches/rel672n/amortis/include/am_generate.inc.php 2014-02-12
17:42:02 UTC (rev 709)
+++ branches/rel672n/amortis/include/am_generate.inc.php 2014-02-13
19:00:40 UTC (rev 710)
@@ -73,7 +73,7 @@
}
echo '<div class="content" style="width:80%;margin-left:10%">';
- $p_mesg = "Opération sauvée : " . $ledger->internal;
+ $p_mesg = _("Opération sauvée")." : " . $ledger->internal;
echo sprintf('<A class="detail"
style="display:inline;text-decoration:underline"
HREF="javascript:modifyOperation(%d,%d)">%s</A>', $jr_id, dossier::id(),
$p_mesg);
echo '</div>';
Modified: branches/rel672n/amortis/include/am_histo.inc.php
===================================================================
--- branches/rel672n/amortis/include/am_histo.inc.php 2014-02-12 17:42:02 UTC
(rev 709)
+++ branches/rel672n/amortis/include/am_histo.inc.php 2014-02-13 19:00:40 UTC
(rev 710)
@@ -31,11 +31,11 @@
$r=HtmlInput::array_to_string(array('ac','gDossier','sa','sb','plugin_code'),$_REQUEST);
$url=basename($_SERVER['PHP_SELF']).$r;
$header->add('Quick_code',$url,'order by 1 asc','order by 1 desc','qca','qcd');
-$header->add('Nom',$url,'order by vw_name asc','order by vw_name
desc','na','nd');
-$header->add('Montant',$url,'order by h_amount asc','order by h_amount
desc','aa','ad');
-$header->add('Année',$url,'order by h_year asc','order by h_year
desc','ya','yd');
-$header->add('Pièce',$url,'order by h_pj asc','order by h_pj
desc','pja','pjd');
-$header->add('N° interne',$url,'order by jr_internal asc','order by
jr_internal desc','nia','nid');
+$header->add(_('Nom'),$url,'order by vw_name asc','order by vw_name
desc','na','nd');
+$header->add(_('Montant'),$url,'order by h_amount asc','order by h_amount
desc','aa','ad');
+$header->add(_('Année'),$url,'order by h_year asc','order by h_year
desc','ya','yd');
+$header->add(_('Pièce'),$url,'order by h_pj asc','order by h_pj
desc','pja','pjd');
+$header->add(_('N° interne'),$url,'order by jr_internal asc','order by
jr_internal desc','nia','nid');
$ord=(isset($_REQUEST['ord']))?$_REQUEST['ord']:'na';
Modified: branches/rel672n/amortis/include/am_print.php
===================================================================
--- branches/rel672n/amortis/include/am_print.php 2014-02-12 17:42:02 UTC
(rev 709)
+++ branches/rel672n/amortis/include/am_print.php 2014-02-13 19:00:40 UTC
(rev 710)
@@ -29,9 +29,9 @@
$url='?'.dossier::get().'&plugin_code='.$_REQUEST['plugin_code'].'&sa=report'."&ac=".$_REQUEST['ac'];
$menu=array(
- array($url.'&sb=dfiche','Détail fiche',' Détail fiche ',1),
- array($url.'&sb=dall','Listing','',2),
- array($url.'&sb=tabyear','Tableau / année','Tableau amortissement
par année',3)
+ array($url.'&sb=dfiche',_('Détail fiche'),_('Détail fiche'),1),
+ array($url.'&sb=dall',_('Listing'),'',2),
+ array($url.'&sb=tabyear',_('Tableau / année'),_('Tableau
amortissement par année'),3)
);
Modified: branches/rel672n/amortis/include/am_util.php
===================================================================
--- branches/rel672n/amortis/include/am_util.php 2014-02-12 17:42:02 UTC
(rev 709)
+++ branches/rel672n/amortis/include/am_util.php 2014-02-13 19:00:40 UTC
(rev 710)
@@ -27,8 +27,8 @@
$url='?'.dossier::get().'&plugin_code='.$_REQUEST['plugin_code'].'&sa=util'.'&ac='.$_REQUEST['ac'];
$menu=array(
- array($url.'&sb=generate','Génére écriture',' Génération écriture
comptable ',1),
- array($url.'&sb=histo','Historique','Historique des opérations',3)
+ array($url.'&sb=generate',_('Génére écriture'),_('Génération
écriture comptable'),1),
+ array($url.'&sb=histo',_('Historique'),_('Historique des
opérations'),3)
);
Modified: branches/rel672n/amortis/include/class_am_card.php
===================================================================
--- branches/rel672n/amortis/include/class_am_card.php 2014-02-12 17:42:02 UTC
(rev 709)
+++ branches/rel672n/amortis/include/class_am_card.php 2014-02-13 19:00:40 UTC
(rev 710)
@@ -177,9 +177,9 @@
if ( isNumber($_POST['p_year']) == null ||
$_POST['p_year']<1900||$_POST['p_year'] > 3000 ) $error_msg.=_('Année
invalide')."\n";
if ( isNumber($_POST['p_number']) == null ||
$_POST['p_number']==0)$error_msg.=_ ('Nombre annuités invalide')."\n";
if ( isNumber($_POST['p_amount']) == null || $_POST['p_amount']==0)
$error_msg.=_ ('Montant invalide')."\n";
- if ( $_POST['p_visible'] != 'Y' && $_POST['p_visible'] != 'N')
$error_msg.="Visible Y ou N\n";
- if ( $cn->get_value('select count(*) from tmp_pcmn where
pcm_val=$1',array($_POST['p_deb'])) == 0) $error_msg.=" Poste de charge
incorrect"."\n";
- if ( $cn->get_value('select count(*) from tmp_pcmn where
pcm_val=$1',array($_POST['p_cred'])) == 0) $error_msg.=" Poste à créditer
incorrect"."\n";
+ if ( $_POST['p_visible'] != 'Y' && $_POST['p_visible'] != 'N')
$error_msg.=_("Visible Y ou N")."\n";
+ if ( $cn->get_value('select count(*) from tmp_pcmn where
pcm_val=$1',array($_POST['p_deb'])) == 0) $error_msg.=" "._("Poste de charge
incorrect")."\n";
+ if ( $cn->get_value('select count(*) from tmp_pcmn where
pcm_val=$1',array($_POST['p_cred'])) == 0) $error_msg.=" "._("Poste à créditer
incorrect")."\n";
return $error_msg;
}
/**
@@ -242,7 +242,7 @@
if ( $amort->a_id =='')
{
- echo '<h2 class="error">Non trouvé</h2>';
+ echo '<h2 class="error">'._('Non trouvé').'</h2>';
exit();
}
$amort->load();
Modified: branches/rel672n/amortis/include/class_am_generate.php
===================================================================
--- branches/rel672n/amortis/include/class_am_generate.php 2014-02-12
17:42:02 UTC (rev 709)
+++ branches/rel672n/amortis/include/class_am_generate.php 2014-02-13
19:00:40 UTC (rev 710)
@@ -118,7 +118,7 @@
global $cn;
$msg='';
if ( isNumber($p_array['p_year']) == 0 || $p_array['p_year'] < 1900 ||
$p_array['p_year']>2100) $msg="Année invalide\n";
- if ( isDate($p_array['p_date']) == null) $msg.="Date invalide ";
+ if ( isDate($p_array['p_date']) == null) $msg.=_("Date invalide ");
if ( $msg != '')
{
echo alert($msg);
@@ -154,14 +154,14 @@
$val=($val=='')?0:$val;
$mat=array('poste'.$idx => $n->account_deb,
'amount'.$idx=> $val,
- 'ld'.$idx =>'Dotation à
'.$fiche->strAttribut(ATTR_DEF_QUICKCODE),
+ 'ld'.$idx =>_('Dotation à
').$fiche->strAttribut(ATTR_DEF_QUICKCODE),
'ck'.$idx=>1,
'qc_'.$idx=>'');
$array+=$mat;
$idx++;
$mat=array('poste'.$idx => $n->account_cred,
'amount'.$idx=> $val,
- 'ld'.$idx =>'Amortissement
'.$fiche->strAttribut(ATTR_DEF_QUICKCODE),
+ 'ld'.$idx =>_('Amortissement
').$fiche->strAttribut(ATTR_DEF_QUICKCODE),
'qc_'.$idx=>'');
$array+=$mat;
$idx++;
@@ -211,7 +211,7 @@
if ( isset($p_array['p_ck'.$i]))
echo HtmlInput::hidden('p_ck'.$i,'1');
}
- echo HtmlInput::submit('correct','Corriger');
+ echo HtmlInput::submit('correct',_('Corriger'));
echo '</form>';
echo '</div>';
return true;
Modified: branches/rel672n/amortis/include/class_pdf_card.php
===================================================================
--- branches/rel672n/amortis/include/class_pdf_card.php 2014-02-12 17:42:02 UTC
(rev 709)
+++ branches/rel672n/amortis/include/class_pdf_card.php 2014-02-13 19:00:40 UTC
(rev 710)
@@ -71,36 +71,36 @@
$this->Ln(12);
$this->SetFont('DejaVu','',7);
- $this->Cell(50,7,'Montant');
+ $this->Cell(50,7,_('Montant'));
$this->Cell(50,7,nbm($row['a_amount']));
$this->ln(4);
- $this->Cell(50,7,"Année d'achat");
+ $this->Cell(50,7,_("Année d'achat"));
$this->Cell(50,7,$row['a_start']);
$this->ln(4);
- $this->Cell(50,7,"Poste charge");
+ $this->Cell(50,7,_("Poste charge"));
$this->Cell(50,7,$row['account_deb']);
$deb=$this->cn->get_value("select pcm_lib from tmp_pcmn where
pcm_val=$1",
array($row['account_deb']));
$this->Cell(120,7,$deb);
$this->ln(4);
- $this->Cell(50,7,"Poste contrepartie");
+ $this->Cell(50,7,_("Poste contrepartie"));
$this->Cell(50,7,$row['account_cred']);
$cred=$this->cn->get_value("select pcm_lib from tmp_pcmn where
pcm_val=$1",
array($row['account_cred']));
$this->Cell(120,7,$cred);
$this->ln(4);
- $this->Cell(50,7,"Nbre annuités");
+ $this->Cell(50,7,_("Nbre annuités"));
$this->Cell(50,7,$row['a_nb_year']);
$this->ln(12);
/*
* Now we print for each year
*/
- $col=array('Année','Montant','Am. actés','Pièce','n° interne','%');
+ $col=array(_('Année'),_('Montant'),_('Am. actés'),_('Pièce'),_('n°
interne'),'%');
foreach ($col as $scol)
{
$this->Cell(25,7,$scol,1);
@@ -130,7 +130,7 @@
}// for all year
if ($i < count($array)) $this->AddPage();
} // for ... all card
- $this->Output('toutes_les_fiches.pdf','I');
+ $this->Output(_("toutes_les_fiches.pdf"),'I');
}
}
?>
\ No newline at end of file
Modified: branches/rel672n/amortis/include/material_delete.inc.php
===================================================================
--- branches/rel672n/amortis/include/material_delete.inc.php 2014-02-12
17:42:02 UTC (rev 709)
+++ branches/rel672n/amortis/include/material_delete.inc.php 2014-02-13
19:00:40 UTC (rev 710)
@@ -2,7 +2,7 @@
$cn->exec_sql('delete from amortissement.amortissement where a_id=$1',
array($a_id));
echo HtmlInput::anchor_close($t);
-echo h2info('Bien à amortir');
-echo '<h2 class="notice">'.'Effacé'.'</h2>';
-echo HtmlInput::button('close','Fermer',"onclick=\"removeDiv('$t');\"");
+echo h2info(_('Bien à amortir'));
+echo '<h2 class="notice">'._('Effacé').'</h2>';
+echo HtmlInput::button('close',_('Fermer'),"onclick=\"removeDiv('$t');\"");
?>
\ No newline at end of file
Modified: branches/rel672n/amortis/include/material_modify.inc.php
===================================================================
--- branches/rel672n/amortis/include/material_modify.inc.php 2014-02-12
17:42:02 UTC (rev 709)
+++ branches/rel672n/amortis/include/material_modify.inc.php 2014-02-13
19:00:40 UTC (rev 710)
@@ -37,9 +37,9 @@
if ( $cn->count() == 0 )
{
echo HtmlInput::anchor_close($t);
- echo '<h2 class="info">Détail de matériel</h2>';
- echo "<h2 class=\"error\"> Bien à amortir effacé </h2>";
- echo
HtmlInput::button('close','Fermer',"onclick=\"removeDiv('bxmat');refresh_window()\"
");
+ echo '<h2 class="info">'._('Détail de matériel').'</h2>';
+ echo "<h2 class=\"error\">"._('Bien à amortir effacé')." </h2>";
+ echo
HtmlInput::button('close',_('Fermer'),"onclick=\"removeDiv('bxmat');refresh_window()\"
");
}
else
{
Modified: branches/rel672n/amortis/include/print_all.inc.php
===================================================================
--- branches/rel672n/amortis/include/print_all.inc.php 2014-02-12 17:42:02 UTC
(rev 709)
+++ branches/rel672n/amortis/include/print_all.inc.php 2014-02-13 19:00:40 UTC
(rev 710)
@@ -37,6 +37,6 @@
<?php echo HtmlInput::hidden('material','1');?>
<?php echo HtmlInput::hidden('ac',$_REQUEST['ac']);?>
<?php echo HtmlInput::extension()?>
-<?php echo HtmlInput::submit('csv','Export CSV');?>
+ <?php echo HtmlInput::submit('csv',_('Export CSV'));?>
</form>
</div>
\ No newline at end of file
Modified: branches/rel672n/amortis/include/print_fiche.inc.php
===================================================================
--- branches/rel672n/amortis/include/print_fiche.inc.php 2014-02-12
17:42:02 UTC (rev 709)
+++ branches/rel672n/amortis/include/print_fiche.inc.php 2014-02-13
19:00:40 UTC (rev 710)
@@ -41,7 +41,7 @@
$p_card->name);
$p_card->set_function('fill_data');
$p_card->set_dblclick("fill_ipopcard(this);");
- $msg="Fiche";
+ $msg=_("Fiche");
if ( isset($_GET['p_card']))
{
/* search the card */
@@ -52,7 +52,7 @@
}
echo '<span style="text-align:left;display:block;font-size:2em"
id="p_card_label" >'.$msg.'</span>';
echo "Fiche ".$p_card->input().$p_card->search();
- echo HtmlInput::submit('search','Accepter');
+ echo HtmlInput::submit('search',_('Accepter'));
echo '</form>';
echo '<FORM METHOD="GET" ACTION="extension.raw.php">';
@@ -60,7 +60,7 @@
echo HtmlInput::hidden('sb',$_REQUEST['sb']);
echo HtmlInput::hidden('plugin_code',$_REQUEST['plugin_code']);
echo dossier::hidden();
- echo HtmlInput::submit('pdf_all','Toutes les fiches en PDF');
+ echo HtmlInput::submit('pdf_all',_('Toutes les fiches en PDF'));
echo '</form>';
if ( isset($_GET['search']))
Modified: branches/rel672n/amortis/include/template/listing_histo.php
===================================================================
--- branches/rel672n/amortis/include/template/listing_histo.php 2014-02-12
17:42:02 UTC (rev 709)
+++ branches/rel672n/amortis/include/template/listing_histo.php 2014-02-13
19:00:40 UTC (rev 710)
@@ -1,5 +1,5 @@
<div class="content" style="width:80%;margin-left:10%">
-<!-- <h2 class="info">Historique</h2> -->
+ <!-- <h2 class="info"><?php echo_("Historique")?></h2> -->
<form method="POST">
<?php
echo HtmlInput::hidden('sa',$_REQUEST['sa']);
@@ -7,7 +7,7 @@
echo HtmlInput::hidden('ac',$_REQUEST['ac']);
echo HtmlInput::hidden('plugin_code',$_REQUEST['plugin_code']);
echo dossier::hidden();
-echo 'Filtre : '.HtmlInput::filter_table('amortissement_tb','1,2,3,5,6',1);
+echo _('Filtre')." :
".HtmlInput::filter_table('amortissement_tb','1,2,3,5,6',1);
?>
<table id="amortissement_tb" class="result">
<tr>
@@ -47,6 +47,6 @@
?>
</table>
-<?php echo HtmlInput::submit('remove','Effacer la
sélection','onclick="confirm(\'Confirmez Effacement ?\')"')?>
+<?php echo HtmlInput::submit('remove',_('Effacer la
sélection'),'onclick="confirm(\'Confirmez Effacement ?\')"')?>
</form>
</div>
Modified: branches/rel672n/amortis/include/template/listing_year.php
===================================================================
--- branches/rel672n/amortis/include/template/listing_year.php 2014-02-12
17:42:02 UTC (rev 709)
+++ branches/rel672n/amortis/include/template/listing_year.php 2014-02-13
19:00:40 UTC (rev 710)
@@ -5,16 +5,16 @@
</style>
<table class="result">
<tr>
- <th>Code</th>
- <th>Description</th>
- <th>Date d'acquisition</th>
- <th>Année d'achat</th>
- <th style="text-align:right">Montant à l'achat</th>
- <th style="text-align:right">Nombre amortissement</th>
- <th style="text-align:right">Montant à amortir</th>
- <th style="text-align:right">Amortissement</th>
- <th style="text-align:right">Pourcentage</th>
- <th style="text-align:right">Reste à amortir</th>
+ <th><?php echo_("Code")?></th>
+ <th><?php echo_("Description")?></th>
+ <th><?php echo_("Date d'acquisition")?></th>
+ <th><?php echo_("Année d'achat")?></th>
+ <th style="text-align:right"><?php echo_("Montant à l'achat")?></th>
+ <th style="text-align:right"><?php echo_("Nombre amortissement")?></th>
+ <th style="text-align:right"><?php echo_("Montant à amortir")?></th>
+ <th style="text-align:right"><?php echo_("Amortissement")?></th>
+ <th style="text-align:right"><?php echo_("Pourcentage")?></th>
+ <th style="text-align:right"><?php echo_("Reste à amortir")?></th>
</tr>
<?php
$tot_amort=0;$tot_net=0;bcscale(2);
@@ -58,7 +58,7 @@
<table class="result" style="width:50%;margin-left:25%">
<tr>
<?php
-echo td("Acquisition de l'année");
+ echo td(_("Acquisition de l'année"));
$tot=$cn->get_value(" select coalesce(sum(a_amount),0) from
amortissement.amortissement where a_start=$1",
array($year));
echo td(nbm($tot),"align=\"right\"");
@@ -66,13 +66,13 @@
</tr>
<tr>
<?php
-echo td("Amortissement ");
+echo td(_("Amortissement"));
echo td(nbm($tot_amort),"align=\"right\"");
?>
</tr>
<tr>
<?php
-echo td("Valeur net ");
+echo td(_("Valeur net "));
echo td(nbm($tot_net),"align=\"right\"");
?>
Modified: branches/rel672n/amortis/include/template/material_add.php
===================================================================
--- branches/rel672n/amortis/include/template/material_add.php 2014-02-12
17:42:02 UTC (rev 709)
+++ branches/rel672n/amortis/include/template/material_add.php 2014-02-13
19:00:40 UTC (rev 710)
@@ -1,37 +1,37 @@
<h2 class="info">Ajout de matériel</h2>
<form method="POST" onsubmit="save_new_material(this);return false;">
-<span style="text-align:center;display:block;font-size:2em" id="p_card_label"
>Nouveau matériel</span>
+ <span style="text-align:center;display:block;font-size:2em"
id="p_card_label" ><?php echo_("Nouveau matériel")?></span>
<table>
<tr>
- <td>Fiche</td>
+ <td><?php echo_("Fiche")?></td>
<td><?php echo $p_card->input()?><?php echo $p_card->search()?></td>
</tr>
<tr>
- <td>Date d'acquisition</td>
+ <td><?php echo_("Date d'acquisition")?></td>
<td><?php echo $p_date->input()?></td>
</tr>
<tr>
- <td>Montant à amortir</td>
+ <td><?php echo_("Montant à amortir")?></td>
<td><?php echo $p_amount->input()?></td>
</tr>
<tr>
- <td>Année comptable d'achat</td>
+ <td><?php echo_("Année comptable d'achat")?></td>
<td> <?php echo $p_year->input();?></td>
</tr>
<tr>
- <td>Poste de charge dotations amortissement (débit)</td>
+ <td><?php echo_("Poste de charge dotations amortissement
(débit)")?></td>
<td><?php echo $p_deb->input()?></td>
<td><?php echo $deb_span->input()?></td>
</tr>
<tr>
- <td>Poste amortissement en contrepartie</td>
+ <td><?php echo_("Poste amortissement en contrepartie")?></td>
<td><?php echo $p_cred->input();?></td>
<td><?php echo $cred_span->input();?></td>
</tr>
<tr>
- <td>Nombre d'années amortissement</td>
+ <td><?php echo_("Nombre d'années amortissement")?></td>
<td><?php echo $p_number->input()?></td>
</tr>
<tr>
@@ -48,8 +48,8 @@
</tr>
</table>
<?php
- echo HtmlInput::button('close','Annuler',"onclick=\"removeDiv('$t')\"");
- echo HtmlInput::submit('sauver','Sauver',"onclick=\"return
confirm('Vous confirmez ?')\" ");
+ echo
HtmlInput::button('close',_('Annuler'),"onclick=\"removeDiv('$t')\"");
+echo HtmlInput::submit('sauver',_('Sauver'),"onclick=\"return confirm('Vous
confirmez ?')\" ");
echo HtmlInput::extension();
echo dossier::hidden();
Modified: branches/rel672n/amortis/include/template/material_detail.php
===================================================================
--- branches/rel672n/amortis/include/template/material_detail.php
2014-02-12 17:42:02 UTC (rev 709)
+++ branches/rel672n/amortis/include/template/material_detail.php
2014-02-13 19:00:40 UTC (rev 710)
@@ -1,43 +1,43 @@
-<h2 class="info">Modification de matériel</h2>
+<h2 class="info"><?php echo_("Modification de matériel")?></h2>
<form onsubmit="save_modify(this);return false">
<?php echo $p_card?>
<?php echo $a_id?>
<span style="text-align:center;display:block;font-size:2em" id="p_card_label"
><?php echo $card->strAttribut(ATTR_DEF_NAME)?></span>
<table>
<tr>
- <td>Fiche</td>
+ <td><?php echo_("Fiche")?></td>
<td><?php echo
HtmlInput::card_detail($card->strAttribut(ATTR_DEF_QUICKCODE))?></td>
</tr>
<tr>
- <td>Date Acquisition</td>
+ <td><?php echo_("Date Acquisition")?></td>
<td><?php echo $p_date->input()?></td>
</tr>
<tr>
- <td>Montant à amortir</td>
+ <td><?php echo_("Montant à amortir")?></td>
<td><?php echo $p_amount->input()?></td>
</tr>
<tr>
- <td>Année comptable d'achat</td>
+ <td><?php echo_("Année comptable d'achat")?></td>
<td> <?php echo $p_year->input();?></td>
</tr>
<tr>
- <td>Poste de charge dotations amortissement (débit)</td>
+ <td><?php echo_("Poste de charge dotations amortissement
(débit)")?></td>
<td><?php echo $p_deb->input()?></td>
<td><?php echo $deb_span->input()?></td>
</tr>
<tr>
- <td>Poste amortissement en contrepartie</td>
+ <td><?php echo_("Poste amortissement en contrepartie")?></td>
<td><?php echo $p_cred->input();?></td>
<td><?php echo $cred_span->input();?></td>
</tr>
<tr>
- <td>Nombre d'années amortissement (non modifiable)</td>
+ <td><?php echo_("Nombre d'années amortissement (non modifiable)")?></td>
<td><?php echo $p_number->input()?></td>
</tr>
<tr>
- <td>Visible <span class="notice">Y pour oui ou N pour non</span></td>
+ <td><?php echo_("Visible")?> <span class="notice"><?php echo_("Y pour
oui ou N pour non")?></span></td>
<td><?php echo $p_visible->input();?></td>
</tr>
<tr>
@@ -49,17 +49,17 @@
<td></td>
</tr>
</table>
-<span class="notice"> En changeant le montant à amortir, l'année ou le nombre
d'années, les annuités seront recalculées et l'historique effacé</span>
-<fieldset><legend>Annuités</legend>
+ <span class="notice"> <?php echo_("En changeant le montant à amortir,
l'année ou le nombre d'années, les annuités seront recalculées et l'historique
effacé")?></span>
+ <fieldset><legend><?php echo_("Annuités")?></legend>
<table class="result">
-<th>Année</th>
-<th>Montant</th>
-<th>Amortissement acté</th>
-<th>Pièce </th>
-<th>n° interne</th>
+ <th><?php echo_("Année")?></th>
+ <th><?php echo_("Montant")?></th>
+ <th><?php echo_("Amortissement acté")?></th>
+ <th><?php echo_("Pièce")?> </th>
+ <th><?php echo_("n° interne")?></th>
-<th>Pourcent</th>
+ <th><?php echo_("Pourcent")?></th>
<?php
bcscale(2);
@@ -118,24 +118,24 @@
endfor;
?>
</table>
-<span
style="font-size:120%;font-weight:bold;font-family:arial;font-style:italic;margin-right:10%">Total
= <?php echo nbm($annuite)?></span>
-<span
style="font-size:120%;font-weight:bold;font-family:arial;font-style:italic;margin-right:10%">Amorti
= <?php echo nbm($done)?></span>
-<span
style="font-size:120%;font-weight:bold;font-family:arial;font-style:italic;margin-right:10%">Reste
= <?php echo nbm($p_amount->value-$done)?></span>
+<span
style="font-size:120%;font-weight:bold;font-family:arial;font-style:italic;margin-right:10%"><?php
echo_("Total")?> = <?php echo nbm($annuite)?></span>
+ <span
style="font-size:120%;font-weight:bold;font-family:arial;font-style:italic;margin-right:10%"><?php
echo_("Amorti")?> = <?php echo nbm($done)?></span>
+ <span
style="font-size:120%;font-weight:bold;font-family:arial;font-style:italic;margin-right:10%"><?php
echo_("Reste")?> = <?php echo nbm($p_amount->value-$done)?></span>
<?php
if ( $annuite != $p_amount->value)
{
- echo '<h2 class="error">Différence entre le montant à amortir et le
montant amorti =';
+ echo '<h2 class="error">'._("Différence entre le montant à amortir et le
montant amorti =");
echo nbm($annuite - $p_amount->value);
echo '<h2>';
}
?>
</fieldset>
<?php
- echo HtmlInput::submit('sauver','Sauver',"onclick=\"return confirm('Vous
confirmez ?')\" ");
+echo HtmlInput::submit('sauver',_('Sauver'),"onclick=\"return confirm('Vous
confirmez ?')\" ");
$rm=sprintf("remove_mat(%d,'%s',%d)",dossier::id(),$_REQUEST['plugin_code'],$value_a_id);
- echo HtmlInput::button('remove','Effacer',"onclick=\"$rm\" ");
- echo
HtmlInput::button('close','Fermer',"onclick=\"removeDiv('bxmat');refresh_window()\"
");
+echo HtmlInput::button('remove',_('Effacer'),"onclick=\"$rm\" ");
+echo
HtmlInput::button('close',_('Fermer'),"onclick=\"removeDiv('bxmat');refresh_window()\"
");
?>
</FORM>
Modified: branches/rel672n/amortis/include/template/material_display.php
===================================================================
--- branches/rel672n/amortis/include/template/material_display.php
2014-02-12 17:42:02 UTC (rev 709)
+++ branches/rel672n/amortis/include/template/material_display.php
2014-02-13 19:00:40 UTC (rev 710)
@@ -1,51 +1,51 @@
-<h2 class="info">Détail de matériel</h2>
+<h2 class="info"><?php echo_("Détail de matériel")?></h2>
<span style="text-align:center;display:block;font-size:2em" id="p_card_label"
><?php echo $card->strAttribut(ATTR_DEF_NAME)?></span>
<table>
<tr>
- <td>Fiche</td>
+ <td><?php echo_("Fiche")?></td>
<td><?php echo $card->strAttribut(ATTR_DEF_QUICKCODE)?></td>
</tr>
<tr>
- <td>Date d'acquisition</td>
+ <td><?php echo_("Date d'acquisition")?></td>
<td><?php echo $p_date?></td>
</tr>
<tr>
- <td>Montant à amortir</td>
+ <td><?php echo_("Montant à amortir")?></td>
<td><?php echo $p_amount?></td>
</tr>
<tr>
- <td>Année comptable d'achat</td>
+ <td><?php echo_("Année comptable d'achat")?></td>
<td> <?php echo $p_year;?></td>
</tr>
<tr>
- <td>Poste de charge dotations amortissement (débit)</td>
+ <td><?php echo_("Poste de charge dotations amortissement
(débit)")?></td>
<td><?php echo $p_deb?></td>
<td><?php echo $deb_span?></td>
</tr>
<tr>
- <td>Poste amortissement en contrepartie</td>
+ <td><?php echo_("Poste amortissement en contrepartie")?></td>
<td><?php echo $p_cred?></td>
<td><?php echo $cred_span?></td>
</tr>
<tr>
- <td>Nombre d'années amortissement (non modifiable)</td>
+ <td><?php echo_("Nombre d'années amortissement (non modifiable)")?></td>
<td><?php echo $p_number?></td>
</tr>
</table>
-<fieldset><legend>Annuités</legend>
+<fieldset><legend><?php echo_("Annuités")?></legend>
<table class="result">
-<th>Année</th>
-<th>Montant</th>
-<th style="text-align:right" >Amortissement acté</th>
-<th style="text-align:center">Pièce </th>
-<th>n° interne</th>
+ <th><?php echo_("Année")?></th>
+ <th><?php echo_("Montant")?></th>
+ <th style="text-align:right" ><?php echo_("Amortissement acté")?></th>
+ <th style="text-align:center"><?php echo_("Pièce")?> </th>
+ <th><?php echo_("n° interne")?></th>
-<th>Pourcent</th>
+ <th><?php echo_("Pourcent")?></th>
<?php
bcscale(2);
@@ -92,19 +92,19 @@
endfor;
?>
</table>
-<span
style="font-size:120%;font-weight:bold;font-family:arial;font-style:italic;margin-right:10%">Total
= <?php echo nbm($annuite)?></span>
-<span
style="font-size:120%;font-weight:bold;font-family:arial;font-style:italic;margin-right:10%">Amorti
= <?php echo nbm($done)?></span>
-<span
style="font-size:120%;font-weight:bold;font-family:arial;font-style:italic;margin-right:10%">Reste
= <?php echo nbm($p_amount-$done)?></span>
+<span
style="font-size:120%;font-weight:bold;font-family:arial;font-style:italic;margin-right:10%"><?php
echo_("Total")?> = <?php echo nbm($annuite)?></span>
+ <span
style="font-size:120%;font-weight:bold;font-family:arial;font-style:italic;margin-right:10%"><?php
echo_("Amorti")?> = <?php echo nbm($done)?></span>
+ <span
style="font-size:120%;font-weight:bold;font-family:arial;font-style:italic;margin-right:10%"><?php
echo_("Reste")?> = <?php echo nbm($p_amount-$done)?></span>
<?php
if ( $annuite != $p_amount)
{
- echo '<h2 class="error">Différence entre le montant à amortir et le
montant amorti =';
+ echo '<h2 class="error">'._("Différence entre le montant à amortir et le
montant amorti =");
echo nbm($annuite - $p_amount);
echo '<h2>';
}
?>
</fieldset>
-<?php echo "Date ".date ('d.m.Y');?>
+<?php echo _("Date ").date ('d.m.Y');?>
<?php echo HtmlInput::print_window()?>
Modified: branches/rel672n/amortis/include/template/material_listing.php
===================================================================
--- branches/rel672n/amortis/include/template/material_listing.php
2014-02-12 17:42:02 UTC (rev 709)
+++ branches/rel672n/amortis/include/template/material_listing.php
2014-02-13 19:00:40 UTC (rev 710)
@@ -3,16 +3,16 @@
<table id="list_amortissement" class="sortable"
style="width:80%;margin-left:10%">
<tr>
-<th>Quickcode</th>
+ <th><?php echo_("Quickcode")?></th>
<th class=" sorttable_sorted">
Nom
<span id="sorttable_sortfwdind"> ▾</span>
</th>
-<th>Date acquisition</th>
-<th>Année achat</th>
-<th style="text-align:right">Montant Initial</th>
-<th style="text-align:right">Montant Amorti</th>
-<th style="text-align:right">Montant à amortir</th>
+<th><?php echo_("Date acquisition")?></th>
+<th><?php echo_("Année achat")?></th>
+<th style="text-align:right"><?php echo_("Montant Initial")?></th>
+<th style="text-align:right"><?php echo_("Montant Amorti")?></th>
+<th style="text-align:right"><?php echo_("Montant à amortir")?></th>
</tr>
Modified: branches/rel672n/amortis/include/template/util_generate.php
===================================================================
--- branches/rel672n/amortis/include/template/util_generate.php 2014-02-12
17:42:02 UTC (rev 709)
+++ branches/rel672n/amortis/include/template/util_generate.php 2014-02-13
19:00:40 UTC (rev 710)
@@ -32,15 +32,15 @@
<table>
<tr>
-<td>Année</td>
+ <td><?php echo_("Année")?></td>
<td><?php echo $year->input();?></td>
</tr>
<tr>
-<td>Journal dans lequel l'écriture sera passée</td>
+<td><?php echo _("Journal dans lequel l'écriture sera passée")?></td>
<td><?php echo $sel_ledger->input()?></td>
</tr>
<tr>
-<td>Date de l'opération</td>
+<td><?php echo _("Date de l'opération")?></td>
<td><?php echo $p_date->input()?></td>
</tr>
<?php if ( isset ($f_periode)) : ?>
@@ -54,18 +54,18 @@
</tr>
<?php endif; ?>
<tr>
-<td>Pièce</td>
+<td><?php echo_("Pièce")?></td>
<td><?php echo $pj->input()?></td>
</tr>
</table>
-Cochez ce qu'il faut amortir
+ <?php echo_("Cochez ce qu'il faut amortir")?>
<table class="result">
<tr>
- <th>Selection</th>
- <th>Quick Code</th>
- <th>Nom</th>
- <th>Description</th>
+ <th><?php echo_("Selection")?></th>
+ <th><?php echo_("Quick Code")?></th>
+ <th><?php echo_("Nom")?></th>
+ <th><?php echo_("Description")?></th>
</tr>
<?php
/*
@@ -95,7 +95,7 @@
endfor;
?>
</table>
-<?php echo HtmlInput::submit('generate',"Générer l'écriture");?>
+<?php echo HtmlInput::submit('generate',_("Générer l'écriture"));?>
</form>
-<?php echo HtmlInput::button('check_all','Sélectionner tout','
onclick="select_checkbox(\'gen_amort\')"');?>
-<?php echo HtmlInput::button('check_none','Tout Désélectionner ','
onclick="unselect_checkbox(\'gen_amort\')"');?>
+<?php echo HtmlInput::button('check_all',_('Sélectionner tout'),'
onclick="select_checkbox(\'gen_amort\')"');?>
+<?php echo HtmlInput::button('check_none',_('Tout Désélectionner'),'
onclick="unselect_checkbox(\'gen_amort\')"');?>
Modified: branches/rel672n/amortis/index.php
===================================================================
--- branches/rel672n/amortis/index.php 2014-02-12 17:42:02 UTC (rev 709)
+++ branches/rel672n/amortis/index.php 2014-02-13 19:00:40 UTC (rev 710)
@@ -49,9 +49,9 @@
}
$menu=array(
- array($url.'&sa=card','Biens amortissables','Liste des biens
amortissables',1),
- array($url.'&sa=report','Rapport','rapport et tableaux sur les biens
amortissables',2),
- array($url.'&sa=util','Utilitaire','Génération écriture comptable',3)
+ array($url.'&sa=card',_('Biens amortissables'),_('Liste des biens
amortissables'),1),
+ array($url.'&sa=report',_('Rapport'),_('rapport et tableaux sur
les biens amortissables'),2),
+ array($url.'&sa=util',_('Utilitaire'),_('Génération écriture
comptable'),3)
);
Modified: branches/rel672n/amortis/raw.php
===================================================================
--- branches/rel672n/amortis/raw.php 2014-02-12 17:42:02 UTC (rev 709)
+++ branches/rel672n/amortis/raw.php 2014-02-13 19:00:40 UTC (rev 710)
@@ -48,7 +48,15 @@
header('Pragma: public');
header('Content-type: application/csv');
header('Content-Disposition: attachment;filename="'.$name.'.csv"',FALSE);
- print "\"Code\";\"Description\";\"Date acquisition\";\"Année
Achat\";\"Montant Achat\";\"Nombre annuités\";\"Montant à
amortir\";\"Amortissement\";\"Reste\"\r\n";
+ $header=array(_('Code'),_('Description'),_('Date acquisition'),_('Année
achat'),_('Montant Achats'),_('Nombre annuités'),_('Montant à
amortir'),_('Amortissement'));
+ $sep="";
+ foreach ($header as $h)
+ {
+ print $sep.'"'.$h.'"';
+ $sep=';';
+ }
+ print "\r\n";
+ // print "\"Code\";\"Description\";\"Date acquisition\";\"Année
Achat\";\"Montant Achat\";\"Nombre annuités\";\"Montant à
amortir\";\"Amortissement\";\"Reste\"\r\n";
$year=$_REQUEST['list_year'];
$sql="select * from amortissement.amortissement where a_id
in (select a_id from amortissement.amortissement_detail where
ad_year=$1)";
@@ -89,7 +97,16 @@
header('Content-Disposition: attachment;filename="'.$name.'.csv"',FALSE);
$ret=$cn->get_array("select * from amortissement.amortissement order by
a_start,a_date");
- printf ("\"Visible\";\"qcode\";\"Nom\";\"Date acquisition\";\"Année
Achat\";\"Nbre annuité\";\"Poste Charge\";\"Poste amortis\";\"Montant
achat\";\"Montant amorti\";\"Montant a amortir\"\r\n");
+ $header=array(_("Visible"),_("qcode"),_("Nom"),_("Date
acquisition"),_('Année Achat'),_("Nbre annuité"),_("Poste Charge"),_("Poste
amortis"),_("Montant achat"),_("Montant amorti"),_("Montant a amortir"));
+ $sep="";
+ foreach ($header as $h)
+ {
+ print $sep.'"'.$h.'"';
+ $sep=';';
+ }
+ print "\r\n";
+ // printf ("\"Visible\";\"qcode\";\"Nom\";\"Date acquisition\";\"Année
Achat\";\"Nbre annuité\";\"Poste Charge\";\"Poste amortis\";\"Montant
achat\";\"Montant amorti\";\"Montant a amortir\"\r\n");
+
for ($i=0;$i<count($ret);$i++)
{
printf('"%s";',$ret[$i]['a_visible']);
---
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] r710 - in branches/rel672n/amortis: . include include/template,
phpcompta-dev <=