[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpcompta-dev] r5096 - in phpcompta/tags/rel650/include: . template
From: |
phpcompta-dev |
Subject: |
[Phpcompta-dev] r5096 - in phpcompta/tags/rel650/include: . template |
Date: |
Thu, 23 Aug 2012 23:20:33 +0200 (CEST) |
Author: danydb
Date: 2012-08-23 23:20:32 +0200 (Thu, 23 Aug 2012)
New Revision: 5096
Modified:
phpcompta/tags/rel650/include/fiche.inc.php
phpcompta/tags/rel650/include/template/fiche_list.php
Log:
#699 CARD : liste des fiches
Modified: phpcompta/tags/rel650/include/fiche.inc.php
===================================================================
--- phpcompta/tags/rel650/include/fiche.inc.php 2012-08-23 21:06:00 UTC (rev
5095)
+++ phpcompta/tags/rel650/include/fiche.inc.php 2012-08-23 21:20:32 UTC (rev
5096)
@@ -87,7 +87,7 @@
?>
<div style="position:absolute;right:230px;top:110px">
- Recherche de fiche <?=HtmlInput::infobulle(18)?>
:<?=$search_card->input()?>
+ <?=_('Recherche de fiche')?> <?=HtmlInput::infobulle(18)?>
:<?=$search_card->input()?>
<?=HtmlInput::button_anchor("Chercher","javascript:void(0)","",$search_card_js)?>
</div>
<?
@@ -165,8 +165,8 @@
}
if ($msg != "")
{
- echo h2("Fiche non effacées", '
class="error" ');
- echo '<p class="error">'." Ces fiches
n'ont pas été effacées ".$msg;
+ echo h2(_("Fiche non effacées"), '
class="error" ');
+ echo '<p class="error">'._(" Ces fiches
n'ont pas été effacées ").$msg;
}
}
}
@@ -182,10 +182,10 @@
}
else
{
- $cond = " where fd_id = " . sql_string($_GET['cat']);
+ $cond = " where f.fd_id = " . sql_string($_GET['cat']);
}
// Create nav bar
- $max = $cn->get_value("select count(*) from fiche " . $cond);
+ $max = $cn->get_value("select count(*) from fiche as f " . $cond);
$step = $_SESSION['g_pagesize'];
$page = (isset($_GET['offset'])) ? $_GET['page'] : 1;
@@ -195,9 +195,10 @@
$res = $cn->exec_sql("
select f_id,
(select ad_value from fiche_detail as fd1 where ad_id=1
and fd1.f_id=f.f_id) as name,
- (select ad_value from fiche_detail as fd1 where
ad_id=23 and fd1.f_id=f.f_id) as qcode
- from fiche as f
- $cond order by 1 offset $offset $limit
+ (select ad_value from fiche_detail as fd1 where
ad_id=23 and fd1.f_id=f.f_id) as qcode,
+ fd_label
+ from fiche as f join fiche_def as fd on (fd.fd_id=f.fd_id)
+ $cond order by 2 offset $offset $limit
");
$nb_line = Database::num_row($res);
require_once 'template/fiche_list.php';
@@ -292,7 +293,7 @@
{
if ($allcard == 0)
{
- echo "Aucune fiche trouvée";
+ echo _("Aucune fiche trouvée");
exit;
} else
continue;
Modified: phpcompta/tags/rel650/include/template/fiche_list.php
===================================================================
--- phpcompta/tags/rel650/include/template/fiche_list.php 2012-08-23
21:06:00 UTC (rev 5095)
+++ phpcompta/tags/rel650/include/template/fiche_list.php 2012-08-23
21:20:32 UTC (rev 5096)
@@ -28,7 +28,7 @@
?>
<?= $bar?>
<form method="POST" class="print" style="display:inline" onsubmit="return
confirm('Vous confirmez ?')">
- <table>
+ <table class="result">
<tr>
<th>
Quick Code
@@ -37,13 +37,19 @@
Nom
</th>
+ <? if ($allcard == 1 ) : ?>
<th>
+ Catégorie
+ </th>
+ <? endif; ?>
+ <th>
Selection
</th>
</tr>
<? for ($i = 0; $i < $nb_line; $i++) :?>
<? $row = Database::fetch_array($res, $i);?>
- <tr>
+ <? $class=($i%2 == 0)?' class="even" ':' class="odd"
';?>
+ <tr <?=$class?> >
<td>
<?=
HtmlInput::card_detail($row['qcode'], "", ' class="line" ')?>
@@ -51,7 +57,12 @@
<td>
<?= h($row['name'])?>
</td>
+ <? if ($allcard == 1 ) : ?>
<td>
+ <?= h($row['fd_label'])?>
+ </td>
+ <? endif; ?>
+ <td>
<?
if ($write == 1)
{
---
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] r5096 - in phpcompta/tags/rel650/include: . template,
phpcompta-dev <=