diff --git a/html/bud_csv.php b/html/bud_csv.php
index 576fd7365..81bffa897 100644
--- a/html/bud_csv.php
+++ b/html/bud_csv.php
@@ -46,14 +46,15 @@ if ( $do == 'po') {
}
/* 2nd Synthese */
if ( $do == 'ga') {
+ header('Content-type: application/csv');
+ header('Content-Disposition: attachment;filename="bud_groupe.csv"',FALSE);
require_once ('class_bud_synthese_hypo.php');
+
$obj=new Bud_Synthese_Hypo($cn);
$obj->from_array($_GET);
$res=$obj->load();
- header('Content-type: application/csv');
- header('Content-Disposition: attachment;filename="bud_groupe.csv"',FALSE);
-
+
echo $obj->display_csv($res);
}
diff --git a/html/bud_search_poste.php b/html/bud_search_poste.php
index abe9c9162..ff2ca8398 100644
--- a/html/bud_search_poste.php
+++ b/html/bud_search_poste.php
@@ -57,9 +57,9 @@ if ( isset($_GET['search']) ) {
if ( isset($p_comment) && strlen(trim($p_comment)) != 0 ) {
$condition=" where (upper(pcm_lib) like upper('%$p_comment%') or ".
" pcm_val::text like '$p_comment%') ".
- " and (pcm_val::text like '7%' or pcm_val::text like '6%' or pcm_val::text like '5%') ";
+ " and (pcm_val::text like '7%' or pcm_val::text like '6%') ";
} else {
- $condition="where pcm_val::text like '7%' or pcm_val::text like '6%' or pcm_val::text like '5%' ";
+ $condition="where pcm_val::text like '7%' or pcm_val::text like '6%' ";
}
}
diff --git a/html/js/jrn_concerned.js b/html/js/jrn_concerned.js
index 611ac8c23..0298c28d8 100644
--- a/html/js/jrn_concerned.js
+++ b/html/js/jrn_concerned.js
@@ -52,6 +52,18 @@ function SearchJrn(p_sessid,p_dossier,p_ctl,p_montant,p_paid)
}
}
}
+ if ( p_montant == 0 && document.forms[1]) {
+
+ for ( i=0; i < document.forms[1].length; i++)
+ {
+ var e=document.forms[1].elements[i];
+ if ( e.name == ctl_montant_name ) {
+ p_montant=e.value;
+ break;
+ }
+ }
+ }
+
}
diff --git a/html/poste_csv.php b/html/poste_csv.php
index 8fa347df2..5096d0f0d 100644
--- a/html/poste_csv.php
+++ b/html/poste_csv.php
@@ -38,11 +38,11 @@ $User=new User($cn);
$User->Check();
if ( isset ( $_POST['poste_fille']) )
{ //choisit de voir tous les postes
- $a_poste=getarray($cn,"select pcm_val from tmp_pcmn where pcm_val like '".$_POST["poste_id"]."%'");
+ $a_poste=get_array($cn,"select pcm_val from tmp_pcmn where pcm_val like '".$_POST["poste_id"]."%'");
}
else
{
- $a_poste=getarray($cn,"select pcm_val from tmp_pcmn where pcm_val = '".$_POST['poste_id']."'");
+ $a_poste=get_array($cn,"select pcm_val from tmp_pcmn where pcm_val = '".$_POST['poste_id']."'");
}
if ( count($a_poste) == 0 )
exit;
diff --git a/html/poste_pdf.php b/html/poste_pdf.php
index 68be58d63..f94473200 100644
--- a/html/poste_pdf.php
+++ b/html/poste_pdf.php
@@ -38,9 +38,9 @@ foreach ($_POST as $key=>$element) {
${"$key"}=$element;
}
if ( isset ( $poste_fille) ){ //choisit de voir tous les postes
- $a_poste=getarray($cn,"select pcm_val from tmp_pcmn where pcm_val like '$poste_id%'");
+ $a_poste=get_array($cn,"select pcm_val from tmp_pcmn where pcm_val like '$poste_id%'");
} else
- $a_poste=getarray($cn,"select pcm_val from tmp_pcmn where pcm_val = '$poste_id'");
+ $a_poste=get_array($cn,"select pcm_val from tmp_pcmn where pcm_val = '$poste_id'");
$ret="";
diff --git a/include/balance.inc.php b/include/balance.inc.php
index 3e26c7a87..f6aed3423 100644
--- a/include/balance.inc.php
+++ b/include/balance.inc.php
@@ -35,43 +35,6 @@ $User->can_request($cn,BALANCE);
echo '
';
-//-----------------------------------------------------
-// Form
-//-----------------------------------------------------
-// Show the export button
-if ( isset ($_POST['view'] ) ) {
- $submit=new widget();
- $hid=new widget("hidden");
-
- echo "
";
- echo '';
- echo ' | ";
- echo ' | ";
-
- echo "
";
-
- echo "
";
-}
-
// Show the form for period
echo '
";
//$a=FormPeriodeMult($cn);
//echo $a;
-echo '';
+echo '';
+echo '';
+
+//-----------------------------------------------------
+// Form
+//-----------------------------------------------------
+// Show the export button
+if ( isset ($_POST['view'] ) ) {
+ $submit=new widget();
+ $hid=new widget("hidden");
+
+ echo "";
+ echo '';
+ echo ' | ";
+ echo ' | ";
+
+ echo "
";
+
+ echo "
";
+}
//-----------------------------------------------------
diff --git a/include/bud_detail.inc.php b/include/bud_detail.inc.php
index 14015d621..36d6d12cc 100644
--- a/include/bud_detail.inc.php
+++ b/include/bud_detail.inc.php
@@ -104,7 +104,7 @@ if ( $po_id !== -1 ) {
echo "Poste Analytique ".$wPo_id->IOValue();
}
echo $button_other;
-//echo http://localhost/phpcompta-dev/phpcompta/html/budget.php?gDossier=21&bh_id=3&recherche=recherche&p_action=detail//
+
if ( isset ($_GET['po_id'] ) )
$str_po_id="&po_id=".$_REQUEST['po_id'];
else
diff --git a/include/bud_sga.inc.php b/include/bud_sga.inc.php
index 5b0312aa9..1cb9ed795 100644
--- a/include/bud_sga.inc.php
+++ b/include/bud_sga.inc.php
@@ -44,6 +44,8 @@ if ( isset($_GET['display'])) {
$obj->from_array($_GET);
$res=$obj->load();
echo $obj->display_html($res);
+ echo 'Resume
';
+ echo $obj->summary_html($res);
echo '