[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpcompta-dev] r4942 - phpcompta/trunk/include
From: |
phpcompta-dev |
Subject: |
[Phpcompta-dev] r4942 - phpcompta/trunk/include |
Date: |
Tue, 19 Jun 2012 15:21:58 +0200 (CEST) |
Author: danydb
Date: 2012-06-19 15:21:58 +0200 (Tue, 19 Jun 2012)
New Revision: 4942
Modified:
phpcompta/trunk/include/class_acc_ledger.php
phpcompta/trunk/include/class_acc_ledger_fin.php
phpcompta/trunk/include/class_acc_ledger_purchase.php
phpcompta/trunk/include/class_acc_ledger_sold.php
phpcompta/trunk/include/class_anc_operation.php
phpcompta/trunk/include/class_contact.php
phpcompta/trunk/include/class_fiche.php
phpcompta/trunk/include/class_fiche_def.php
phpcompta/trunk/include/class_follow_up.php
phpcompta/trunk/include/class_stock.php
phpcompta/trunk/include/compta_ven.inc.php
phpcompta/trunk/include/history_operation.inc.php
phpcompta/trunk/include/search.inc.php
phpcompta/trunk/include/user_common.php
Log:
rename jrn_navigation_bar to navigation_bar
Modified: phpcompta/trunk/include/class_acc_ledger.php
===================================================================
--- phpcompta/trunk/include/class_acc_ledger.php 2012-06-19 13:18:52 UTC
(rev 4941)
+++ phpcompta/trunk/include/class_acc_ledger.php 2012-06-19 13:21:58 UTC
(rev 4942)
@@ -596,7 +596,7 @@
$page=(isset($_GET['offset']))?$_GET['page']:1;
$offset=(isset($_GET['offset']))?$_GET['offset']:0;
// create the nav. bar
- $bar=jrn_navigation_bar($offset,$max_line,$step,$page);
+ $bar=navigation_bar($offset,$max_line,$step,$page);
// show a part
list($count,$html)= $Ledger->list_operation($sql,$offset,0);
echo $html;
@@ -769,7 +769,7 @@
$page=(isset($_GET['offset']))?$_GET['page']:1;
$offset=(isset($_GET['offset']))?$_GET['offset']:0;
// create the nav. bar
- $bar=jrn_navigation_bar($offset,$max_line,$step,$page);
+ $bar=navigation_bar($offset,$max_line,$step,$page);
// show a part
list($count,$html)= $Ledger->list_operation($sql,$offset,0);
echo $html;
Modified: phpcompta/trunk/include/class_acc_ledger_fin.php
===================================================================
--- phpcompta/trunk/include/class_acc_ledger_fin.php 2012-06-19 13:18:52 UTC
(rev 4941)
+++ phpcompta/trunk/include/class_acc_ledger_fin.php 2012-06-19 13:21:58 UTC
(rev 4942)
@@ -1056,7 +1056,7 @@
list($max_line, $list) = ListJrn($this->db, "where
jrn_def_type='FIN' $filter_per $l $available_ledger "
, null, $offset, 0);
- $bar = jrn_navigation_bar($offset, $max_line, $step, $page);
+ $bar = navigation_bar($offset, $max_line, $step, $page);
echo "<hr> $bar";
echo $list;
Modified: phpcompta/trunk/include/class_acc_ledger_purchase.php
===================================================================
--- phpcompta/trunk/include/class_acc_ledger_purchase.php 2012-06-19
13:18:52 UTC (rev 4941)
+++ phpcompta/trunk/include/class_acc_ledger_purchase.php 2012-06-19
13:21:58 UTC (rev 4942)
@@ -1598,7 +1598,7 @@
// Get the max line
$m=($max_line2>$max_line)?$max_line2:$max_line;
- $bar2=jrn_navigation_bar($offset,$m,$step,$page);
+ $bar2=navigation_bar($offset,$m,$step,$page);
echo $bar2;
echo '<h2 class="info"> '._('Echeance dépassée').' </h2>';
Modified: phpcompta/trunk/include/class_acc_ledger_sold.php
===================================================================
--- phpcompta/trunk/include/class_acc_ledger_sold.php 2012-06-19 13:18:52 UTC
(rev 4941)
+++ phpcompta/trunk/include/class_acc_ledger_sold.php 2012-06-19 13:21:58 UTC
(rev 4942)
@@ -992,7 +992,7 @@
// Get the max line
$m=($max_line2>$max_line)?$max_line2:$max_line;
- $bar2=jrn_navigation_bar($offset,$m,$step,$page);
+ $bar2=navigation_bar($offset,$m,$step,$page);
echo $bar2;
echo '<h2 class="info"> '._('Echeance dépassée').' </h2>';
Modified: phpcompta/trunk/include/class_anc_operation.php
===================================================================
--- phpcompta/trunk/include/class_anc_operation.php 2012-06-19 13:18:52 UTC
(rev 4941)
+++ phpcompta/trunk/include/class_anc_operation.php 2012-06-19 13:21:58 UTC
(rev 4942)
@@ -181,11 +181,11 @@
if ( empty($array) )
return "Pas d'enregistrement trouvé";
- // jrn_navigation_bar
+ // navigation_bar
$step=$_SESSION['g_pagesize'];
$page=(isset($_GET['offset']))?$_GET['page']:1;
$offset=(isset($_GET['offset']))?$_GET['offset']:0;
- $bar=jrn_navigation_bar($offset+1,count($array),$step,$page);
+ $bar=navigation_bar($offset+1,count($array),$step,$page);
if ( $step !=-1)
$view=array_splice($array,$offset,$step);
Modified: phpcompta/trunk/include/class_contact.php
===================================================================
--- phpcompta/trunk/include/class_contact.php 2012-06-19 13:18:52 UTC (rev
4941)
+++ phpcompta/trunk/include/class_contact.php 2012-06-19 13:21:58 UTC (rev
4942)
@@ -64,7 +64,7 @@
// Get offset and page variable
$offset=( isset ($_REQUEST['offset'] )) ?$_REQUEST['offset']:0;
$page=(isset($_REQUEST['page']))?$_REQUEST['page']:1;
-
$bar=jrn_navigation_bar($offset,$all_contact,$_SESSION['g_pagesize'],$page);
+
$bar=navigation_bar($offset,$all_contact,$_SESSION['g_pagesize'],$page);
// set a filter ?
$search="";
if ( trim($p_search) != "" )
Modified: phpcompta/trunk/include/class_fiche.php
===================================================================
--- phpcompta/trunk/include/class_fiche.php 2012-06-19 13:18:52 UTC (rev
4941)
+++ phpcompta/trunk/include/class_fiche.php 2012-06-19 13:21:58 UTC (rev
4942)
@@ -1556,7 +1556,7 @@
// Get offset and page variable
$offset=( isset ($_REQUEST['offset'] )) ?$_REQUEST['offset']:0;
$page=(isset($_REQUEST['page']))?$_REQUEST['page']:1;
-
$bar=jrn_navigation_bar($offset,$all_tiers,$_SESSION['g_pagesize'],$page);
+ $bar=navigation_bar($offset,$all_tiers,$_SESSION['g_pagesize'],$page);
// set a filter ?
$search=$p_sql;
Modified: phpcompta/trunk/include/class_fiche_def.php
===================================================================
--- phpcompta/trunk/include/class_fiche_def.php 2012-06-19 13:18:52 UTC (rev
4941)
+++ phpcompta/trunk/include/class_fiche_def.php 2012-06-19 13:21:58 UTC (rev
4942)
@@ -299,7 +299,7 @@
fiche join fiche_detail using(f_id)
where ad_id=1 and fd_id=$1 order by 2";
- // we use jrn_navigation_bar
+ // we use navigation_bar
if ($step == 1 && $_SESSION['g_pagesize'] != -1 )
{
$offset=(isset($_GET['offset']))?$_GET['offset']:0;
@@ -360,7 +360,7 @@
where fd_id='".$this->id."' and
ad_id=".ATTR_DEF_NAME." order by f_id");
$sql_limit=" limit ".$step;
$sql_offset=" offset ".$offset;
- $bar=jrn_navigation_bar($offset,$max_line,$step,$page);
+ $bar=navigation_bar($offset,$max_line,$step,$page);
}
// Get all name the cards of the select category
Modified: phpcompta/trunk/include/class_follow_up.php
===================================================================
--- phpcompta/trunk/include/class_follow_up.php 2012-06-19 13:18:52 UTC (rev
4941)
+++ phpcompta/trunk/include/class_follow_up.php 2012-06-19 13:21:58 UTC (rev
4942)
@@ -708,7 +708,7 @@
$limit = " LIMIT $step OFFSET $offset ";
else
$limit = '';
- $bar = jrn_navigation_bar($offset, $max_line, $step, $page);
+ $bar = navigation_bar($offset, $max_line, $step, $page);
$Res = $this->db->exec_sql($sql . $limit);
$a_row = Database::fetch_all($Res);
Modified: phpcompta/trunk/include/class_stock.php
===================================================================
--- phpcompta/trunk/include/class_stock.php 2012-06-19 13:18:52 UTC (rev
4941)
+++ phpcompta/trunk/include/class_stock.php 2012-06-19 13:21:58 UTC (rev
4942)
@@ -64,7 +64,7 @@
$max_row = Database::num_row($res);
- $nav_bar = jrn_navigation_bar($offset, $max_row, 0, $page);
+ $nav_bar = navigation_bar($offset, $max_row, 0, $page);
if ($step != -1)
$res = $this->cn->exec_sql($sql . " , sg_id asc limit "
. $step . " offset " . $offset);
Modified: phpcompta/trunk/include/compta_ven.inc.php
===================================================================
--- phpcompta/trunk/include/compta_ven.inc.php 2012-06-19 13:18:52 UTC (rev
4941)
+++ phpcompta/trunk/include/compta_ven.inc.php 2012-06-19 13:21:58 UTC (rev
4942)
@@ -307,7 +307,7 @@
$step=$_SESSION['g_pagesize'];
$page=(isset($_GET['offset']))?$_GET['page']:1;
$offset=(isset($_GET['offset']))?$_GET['offset']:0;
- $bar=jrn_navigation_bar($offset,$max_line,$step,$page);
+ $bar=navigation_bar($offset,$max_line,$step,$page);
echo '<form method="GET" id="fpaidv" class="print" action="'.$href.'">';
@@ -393,7 +393,7 @@
$step=$_SESSION['g_pagesize'];
$page=(isset($_GET['offset']))?$_GET['page']:1;
$offset=(isset($_GET['offset']))?$_GET['offset']:0;
- $bar=jrn_navigation_bar($offset,$max_line,$step,$page);
+ $bar=navigation_bar($offset,$max_line,$step,$page);
echo '<form method="GET" id="fpaidv" class="print" action="'.$href.'">';
Modified: phpcompta/trunk/include/history_operation.inc.php
===================================================================
--- phpcompta/trunk/include/history_operation.inc.php 2012-06-19 13:18:52 UTC
(rev 4941)
+++ phpcompta/trunk/include/history_operation.inc.php 2012-06-19 13:21:58 UTC
(rev 4942)
@@ -116,7 +116,7 @@
$step = $_SESSION['g_pagesize'];
$page = (isset($_GET['offset'])) ? $_GET['page'] : 1;
$offset = (isset($_GET['offset'])) ? $_GET['offset'] : 0;
-$bar = jrn_navigation_bar($offset, $max_line, $step, $page);
+$bar = navigation_bar($offset, $max_line, $step, $page);
echo $msg;
echo '<form method="GET" id="fpaida" class="print">';
Modified: phpcompta/trunk/include/search.inc.php
===================================================================
--- phpcompta/trunk/include/search.inc.php 2012-06-19 13:18:52 UTC (rev
4941)
+++ phpcompta/trunk/include/search.inc.php 2012-06-19 13:21:58 UTC (rev
4942)
@@ -108,7 +108,7 @@
// Count nb of line
$max_line=$cn->count_sql($sql);
list($count,$content)=$ledger->list_operation_to_reconcile($sql);
- $bar=jrn_navigation_bar($offset,$max_line,$step,$page);
+ $bar=navigation_bar($offset,$max_line,$step,$page);
if (! $inside ) {
echo $bar;
Modified: phpcompta/trunk/include/user_common.php
===================================================================
--- phpcompta/trunk/include/user_common.php 2012-06-19 13:18:52 UTC (rev
4941)
+++ phpcompta/trunk/include/user_common.php 2012-06-19 13:21:58 UTC (rev
4942)
@@ -75,11 +75,11 @@
$offset=(isset($_GET['offset']))?$_GET['offset']:0;
list ($max_ligne,$list)=ListJrn($cn,$_GET['p_jrn'],$sql,null,$offset,1);
- $bar=jrn_navigation_bar($offset,$max_ligne,$step,$page);
+ $bar=navigation_bar($offset,$max_ligne,$step,$page);
\endverbatim
* \return string with the nav. bar
*/
-function
jrn_navigation_bar($p_offset,$p_line,$p_size=0,$p_page=1,$p_javascript="")
+function navigation_bar($p_offset,$p_line,$p_size=0,$p_page=1,$p_javascript="")
{
// if the pagesize is unlimited return ""
// in that case there is no nav. bar
---
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] r4942 - phpcompta/trunk/include,
phpcompta-dev <=