[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpcompta-dev] r535 - in trunk/rapport_avance: . include
From: |
phpcompta-dev |
Subject: |
[Phpcompta-dev] r535 - in trunk/rapport_avance: . include |
Date: |
Thu, 17 Oct 2013 21:42:31 +0200 (CEST) |
Author: danydb
Date: 2013-10-17 21:42:30 +0200 (Thu, 17 Oct 2013)
New Revision: 535
Modified:
trunk/rapport_avance/include/class_rapav_declaration.php
trunk/rapport_avance/index.php
Log:
Ajout de journal comme filtre correction pour formule
Modified: trunk/rapport_avance/include/class_rapav_declaration.php
===================================================================
--- trunk/rapport_avance/include/class_rapav_declaration.php 2013-10-17
19:08:37 UTC (rev 534)
+++ trunk/rapport_avance/include/class_rapav_declaration.php 2013-10-17
19:42:30 UTC (rev 535)
@@ -698,7 +698,12 @@
function compute($p_start, $p_end)
{
global $cn;
- $amount = Impress::parse_formula($cn, "", $this->form->fp_formula,
$p_start, $p_end, true, 1);
+ $sql="";
+ if ($this->form->jrn_def_id !=null )
+ {
+ $sql=' and j_jrn_def ='.$this->form->jrn_def_id;
+ }
+ $amount = Impress::parse_formula($cn, "", $this->form->fp_formula,
$p_start, $p_end, true, 1,$sql);
return $amount['montant'];
}
Modified: trunk/rapport_avance/index.php
===================================================================
--- trunk/rapport_avance/index.php 2013-10-17 19:08:37 UTC (rev 534)
+++ trunk/rapport_avance/index.php 2013-10-17 19:42:30 UTC (rev 535)
@@ -55,6 +55,7 @@
$url = '?' . dossier::get() . "&plugin_code=" . $_REQUEST['plugin_code'] .
"&ac=" . $_REQUEST['ac'];
$array = array(
+ array($url . '&sa=li', _('Liste'), _('Création, modification, Paramètre
de listes, mailing list'), 0),
array($url . '&sa=fo', _('Formulaire'), _('Création, modification,
Paramètre'), 1),
array($url . '&sa=de', _('Déclaration'), _('Déclaration TVA calculée'),
2),
array($url . '&sa=hi', _('Historique'), _('Historique des déclarations
faites'), 3)
@@ -73,6 +74,9 @@
case 'hi':
$def = 3;
break;
+ case 'li':
+ $def=0;
+ break;
}
$cn = new Database(dossier::id());
@@ -84,6 +88,13 @@
echo ShowItem($array, 'H', 'mtitle ', 'mtitle ', $def, '
style="width:80%;margin-left:10%;border-collapse: separate;border-spacing:
5px;"');
echo '<div class="content" style="width:80%;margin-left:10%">';
// include the right file
+if ($def == 0)
+{
+ require_once('include/liste.inc.php');
+ exit();
+}
+
+// include the right file
if ($def == 1)
{
require_once('include/formulaire.inc.php');
---
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] r535 - in trunk/rapport_avance: . include,
phpcompta-dev <=