[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpcompta-dev] r4244 - in phpcompta/branches/rel600-dynamic-menu/includ
|
From: |
phpcompta-dev |
|
Subject: |
[Phpcompta-dev] r4244 - in phpcompta/branches/rel600-dynamic-menu/include: . template |
|
Date: |
Fri, 28 Oct 2011 00:47:56 +0200 (CEST) |
Author: danydb
Date: 2011-10-28 00:47:55 +0200 (Fri, 28 Oct 2011)
New Revision: 4244
Modified:
phpcompta/branches/rel600-dynamic-menu/include/class_periode.php
phpcompta/branches/rel600-dynamic-menu/include/fiche_def.inc.php
phpcompta/branches/rel600-dynamic-menu/include/param_pcmn.inc.php
phpcompta/branches/rel600-dynamic-menu/include/payment_middle.inc.php
phpcompta/branches/rel600-dynamic-menu/include/periode.inc.php
phpcompta/branches/rel600-dynamic-menu/include/template/list_category_document.php
phpcompta/branches/rel600-dynamic-menu/include/template/menu.php
phpcompta/branches/rel600-dynamic-menu/include/template/periode_add_exercice.php
phpcompta/branches/rel600-dynamic-menu/include/user_menu.php
Log:
#241 : modularity : parameter
company
periode
misc : tva , card attr, middle of payment, accounting,cat of doc, cat of card
Modified: phpcompta/branches/rel600-dynamic-menu/include/class_periode.php
===================================================================
--- phpcompta/branches/rel600-dynamic-menu/include/class_periode.php
2011-10-27 20:28:36 UTC (rev 4243)
+++ phpcompta/branches/rel600-dynamic-menu/include/class_periode.php
2011-10-27 22:47:55 UTC (rev 4244)
@@ -229,13 +229,13 @@
$change='<TD></TD>';
$remove=sprintf(_('Nombre opérations
%d'),$l_line['count_op']);
$remove=td($remove,' class="mtitle" ');
- $change=td ('<A class="mtitle"
HREF="?p_action=periode&action=reopen&p_per='.$l_line['p_id'].'&'.$str_dossier.'"
onclick="return confirm(\''._('Confirmez Réouverture').' ?\')">
Réouverture</A>',' class="mtitle"');
+ $change=td ('<A class="mtitle"
HREF="?ac='.$_REQUEST['ac'].'&action=reopen&p_per='.$l_line['p_id'].'&'.$str_dossier.'"
onclick="return confirm(\''._('Confirmez Réouverture').' ?\')">
Réouverture</A>',' class="mtitle"');
}
else
{
$closed='<TD class="mtitle">';
- $closed.='<A class="mtitle"
HREF="?p_action=periode&action=closed&p_per='.$l_line['p_id'].'&'.$str_dossier.'"
onclick="return confirm(\''._('Confirmez cloture').' ?\')"> Cloturer</A></td>';
+ $closed.='<A class="mtitle"
HREF="?ac='.$_REQUEST['ac'].'&action=closed&p_per='.$l_line['p_id'].'&'.$str_dossier.'"
onclick="return confirm(\''._('Confirmez cloture').' ?\')"> Cloturer</A></td>';
if ($l_line['count_op'] == 0 )
{
@@ -260,7 +260,7 @@
if ($l_line['count_op'] == 0 )
{
- $remove.='<A class="mtitle"
HREF="?p_action=periode&action=delete_per&p_per='.
+ $remove.='<A class="mtitle"
HREF="?ac='.$_REQUEST['ac'].'&action=delete_per&p_per='.
$l_line['p_id']."&$str_dossier\"
onclick=\"return confirm('"._('Confirmez effacement ?')."')\" > Efface</A>";
}
else
@@ -277,7 +277,7 @@
echo '</TR>';
}
- echo '<TR> <FORM ACTION="?p_action=periode" METHOD="POST">';
+ echo '<TR> <FORM METHOD="POST">';
echo dossier::hidden();
$istart=new IDate('p_date_start');
$iend=new IDate('p_date_end');
@@ -325,13 +325,13 @@
if ( $l_line['status'] != 'OP' )
{
- $closed=td ('<A class="mtitle"
HREF="?p_action=periode&action=reopen&p_per='.$l_line['p_id'].'&'.$str_dossier.'&jrn_def_id='.$this->jrn_def_id.'"
onclick="return confirm(\''._('Confirmez Réouverture').' ?\')">
Réouverture</A>',' class="mtitle"');
+ $closed=td ('<A class="mtitle"
HREF="?ac='.$_REQUEST['ac'].'&action=reopen&p_per='.$l_line['p_id'].'&'.$str_dossier.'&jrn_def_id='.$this->jrn_def_id.'"
onclick="return confirm(\''._('Confirmez Réouverture').' ?\')">
Réouverture</A>',' class="mtitle"');
//
$closed=($l_line['status']=='CE')?'<TD>Centralisee</TD>':'<TD>Fermée</TD>';
}
else
{
$closed='<TD class="mtitle">';
- $closed.='<A class="mtitle"
HREF="?p_action=periode&action=closed&p_per='.$l_line['p_id'].'&'.$str_dossier.'&jrn_def_id='.$this->jrn_def_id.'"
onclick="return confirm(\''._('Confirmez Cloture').' ?\')"> Cloturer</A>';
+ $closed.='<A class="mtitle"
HREF="?ac='.$_REQUEST['ac'].'&action=closed&p_per='.$l_line['p_id'].'&'.$str_dossier.'&jrn_def_id='.$this->jrn_def_id.'"
onclick="return confirm(\''._('Confirmez Cloture').' ?\')"> Cloturer</A>';
$closed.='</td>';
}
echo "$closed";
@@ -486,7 +486,7 @@
*/
function insert_exercice($p_exercice)
{
- try
+ try
{
$this->cn->start();
for ($i=1;$i < 12;$i++)
Modified: phpcompta/branches/rel600-dynamic-menu/include/fiche_def.inc.php
===================================================================
--- phpcompta/branches/rel600-dynamic-menu/include/fiche_def.inc.php
2011-10-27 20:28:36 UTC (rev 4243)
+++ phpcompta/branches/rel600-dynamic-menu/include/fiche_def.inc.php
2011-10-27 22:47:55 UTC (rev 4244)
@@ -50,8 +50,8 @@
$w=new IHidden();
echo $w->input('idx',$all[$i]->frd_id);
echo HtmlInput::submit('mod','modifie');
- echo $w->input($p_action,'p_action');
- echo $w->input($sa,'sa');
+ echo $w->input($_REQUEST['ac'],'ac');
+ //echo $w->input($sa,'sa');
echo "</form>";
echo "</TD>";
echo '</TR>';
@@ -77,8 +77,8 @@
echo $mod->Input();
echo "</ul>";
$w=new IHidden();
- echo $w->input('p_action',$p_action);
- echo $w->input('sa',$sa);
+ echo $w->input('ac',$_REQUEST['ac']);
+// echo $w->input('sa',$sa);
echo HtmlInput::submit('confirm_mod' ,'Confirme');
echo HtmlInput::submit('no','Cancel');
echo '</form>';
Modified: phpcompta/branches/rel600-dynamic-menu/include/param_pcmn.inc.php
===================================================================
--- phpcompta/branches/rel600-dynamic-menu/include/param_pcmn.inc.php
2011-10-27 20:28:36 UTC (rev 4243)
+++ phpcompta/branches/rel600-dynamic-menu/include/param_pcmn.inc.php
2011-10-27 22:47:55 UTC (rev 4244)
@@ -194,7 +194,7 @@
$p_val=trim($p_val);
$p_parent=trim($p_parent);
- if ( isset ( $p_val) && isset ( $p_lib ) && isNumber($p_val) &&
isNumber($p_parent) )
+ if ( isset ( $p_val) && isset ( $p_lib ) )
{
$p_val=trim($p_val);
$p_parent=$_POST["p_parent"];
@@ -304,7 +304,7 @@
echo $td;
- printf ('<A
href="?p_action=pcmn&l=%s&action=del&%s">Delete</A>',$A['pcm_val'],$str_dossier);
+ printf ('<A
href="?ac='.$_REQUEST['ac'].'&l=%s&action=del&%s">Efface</A>',$A['pcm_val'],$str_dossier);
echo "</TD>";
Modified: phpcompta/branches/rel600-dynamic-menu/include/payment_middle.inc.php
===================================================================
--- phpcompta/branches/rel600-dynamic-menu/include/payment_middle.inc.php
2011-10-27 20:28:36 UTC (rev 4243)
+++ phpcompta/branches/rel600-dynamic-menu/include/payment_middle.inc.php
2011-10-27 22:47:55 UTC (rev 4244)
@@ -33,7 +33,7 @@
/*!\file
* \brief payment mode
*/
-
+$sb=HtmlInput::default_value('sb', "", $_REQUEST);
echo '<div class="content">';
//----------------------------------------------------------------------
@@ -44,7 +44,7 @@
$row=new Acc_Payment($cn,$_GET['id']);
$row->load();
$javascript="return confirm('"._('Vous confirmez')."')";
- echo '<form method="post" action="parametre.php"
onsubmit="'.$javascript.'">';
+ echo '<form method="post" onsubmit="'.$javascript.'">';
echo dossier::hidden();
echo HtmlInput::hidden('p_jrn',0);
echo HtmlInput::hidden('p_action','divers');
@@ -90,7 +90,7 @@
$r=$mp->blank();
echo '<form method="POST">';
echo dossier::hidden().HtmlInput::hidden('sa',$_REQUEST['sa']).
-
HtmlInput::hidden('p_action',$_REQUEST['p_action']).HtmlInput::hidden('sb','insert');
+
HtmlInput::hidden('ac',$_REQUEST['ac']).HtmlInput::hidden('sb','insert');
echo $r;
echo HtmlInput::submit('insert',_('Enregistre'));
echo '</form>';
@@ -130,7 +130,7 @@
{
echo $tr;
echo $row->row();
- echo
$td.HtmlInput::button_anchor(_('Modifie'),'?p_action=divers&sa=mp&sb=change&'.dossier::get().
+ echo
$td.HtmlInput::button_anchor(_('Modifie'),'?ac='.$_REQUEST['ac'].'&sa=mp&sb=change&'.dossier::get().
'&id='.$row->get_parameter('id'));
echo $etr;
Modified: phpcompta/branches/rel600-dynamic-menu/include/periode.inc.php
===================================================================
--- phpcompta/branches/rel600-dynamic-menu/include/periode.inc.php
2011-10-27 20:28:36 UTC (rev 4243)
+++ phpcompta/branches/rel600-dynamic-menu/include/periode.inc.php
2011-10-27 22:47:55 UTC (rev 4244)
@@ -38,7 +38,7 @@
if ( isset ($_POST["add_per"] ))
{
- $User->can_request(PARPER,1);
+ $g_user->can_request(PARPER,1);
extract($_POST);
$obj=new Periode($cn);
if ( $obj->insert($p_date_start,$p_date_end,$p_exercice) == 1 )
@@ -50,7 +50,7 @@
}
if (isset($_POST['add_exercice']))
{
- $User->can_request(PARPER,1);
+ $g_user->can_request(PARPER,1);
$obj=new Periode($cn);
$exercice=$cn->get_value('select max(p_exercice::float)+1 from
parm_periode');
if ( $obj->insert_exercice($exercice) == 1 )
@@ -62,7 +62,7 @@
}
if ( $action=="closed")
{
- $User->can_request(PARCLO);
+ $g_user->can_request(PARCLO);
$p_per=$_GET['p_per'];
$per=new Periode($cn);
$jrn_def_id=(isset($_GET['jrn_def_id']))?$_GET['jrn_def_id']:0;
@@ -74,7 +74,7 @@
if ( $action== "delete_per" )
{
- $User->can_request(PARPER);
+ $g_user->can_request(PARPER);
$p_per=$_GET["p_per"];
// Check if the periode is not used
if ( $cn->count_sql("select * from jrnx where j_tech_per=$p_per") != 0 )
@@ -87,9 +87,9 @@
}
$choose="yes";
}
-if ( $action == 'reopen')
+if ( $action == 'reopen')
{
- $User->can_request(PARCLO);
+ $g_user->can_request(PARCLO);
$jrn_def_id=(isset($_GET['jrn_def_id']))?$_GET['jrn_def_id']:0;
$per=new Periode($cn);
$jrn_def_id=(isset($_GET['jrn_def_id']))?$_GET['jrn_def_id']:0;
@@ -101,7 +101,7 @@
}
if ( $choose=="yes" )
{
- echo HtmlInput::button_anchor('Autre Journal
?','?choose=no&p_action=periode&gDossier='.dossier::id());
+ echo HtmlInput::button_anchor('Autre Journal
?','?choose=no&ac='.$_REQUEST['ac'].'&gDossier='.dossier::id());
$per=new Periode($cn);
$jrn=(isset($_GET['jrn_def_id']))?$_GET['jrn_def_id']:0;
$per->set_jrn($jrn);
@@ -111,7 +111,7 @@
}
else
{
- echo '<form method="GET" action="?">';
+ echo '<form method="GET" >';
echo dossier::hidden();
$sel_jrn=$cn->make_array("select jrn_def_id, jrn_def_name from ".
" jrn_def order by jrn_def_name");
@@ -121,7 +121,7 @@
$wSel->name='jrn_def_id';
echo "Choississez global ou uniquement le journal à fermer".$wSel->input();
echo HtmlInput::submit('choose','Valider');
- echo HtmlInput::hidden('p_action','periode');
+ echo HtmlInput::hidden('ac',$_REQUEST['ac']);
echo "</form>";
echo '<p class="info"> Pour ajouter, effacer ou modifier une
période, il faut choisir global</p>';
}
Modified:
phpcompta/branches/rel600-dynamic-menu/include/template/list_category_document.php
===================================================================
---
phpcompta/branches/rel600-dynamic-menu/include/template/list_category_document.php
2011-10-27 20:28:36 UTC (rev 4243)
+++
phpcompta/branches/rel600-dynamic-menu/include/template/list_category_document.php
2011-10-27 22:47:55 UTC (rev 4244)
@@ -30,7 +30,6 @@
</table>
<?
echo dossier::hidden();
-echo HtmlInput::hidden('p_action',$_REQUEST['p_action']);
-echo HtmlInput::hidden('sa',$_REQUEST['sa']);
+echo HtmlInput::hidden('ac',$_REQUEST['ac']);
?>
</form>
\ No newline at end of file
Modified: phpcompta/branches/rel600-dynamic-menu/include/template/menu.php
===================================================================
--- phpcompta/branches/rel600-dynamic-menu/include/template/menu.php
2011-10-27 20:28:36 UTC (rev 4243)
+++ phpcompta/branches/rel600-dynamic-menu/include/template/menu.php
2011-10-27 22:47:55 UTC (rev 4244)
@@ -41,6 +41,7 @@
<?
endif;
+
?>
<?
endfor;
Modified:
phpcompta/branches/rel600-dynamic-menu/include/template/periode_add_exercice.php
===================================================================
---
phpcompta/branches/rel600-dynamic-menu/include/template/periode_add_exercice.php
2011-10-27 20:28:36 UTC (rev 4243)
+++
phpcompta/branches/rel600-dynamic-menu/include/template/periode_add_exercice.php
2011-10-27 22:47:55 UTC (rev 4244)
@@ -1,12 +1,12 @@
<fieldset><legend>Ajout d'un exercice</legend>
-Ajout d'un exercice comptable de 13 périodes, commençant le 1 janvier jusqu'au
31 décembre
+Ajout d'un exercice comptable de 13 périodes, commençant le 1 janvier jusqu'au
31 décembre
<form method="post" onsubmit="return confirm('Confirmez vous l\'ajout d\'un
exercice comptable ?')">
<?
-echo HtmlInput::hidden("p_action",$_REQUEST['p_action']);
+echo HtmlInput::hidden("ac",$_REQUEST['ac']);
echo HtmlInput::hidden("jrn_def_id","0");
echo HtmlInput::hidden("jrn_def_id","0");
echo Dossier::hidden();
-echo HtmlInput::submit("add_exercice","Ajout d'un exercice comptable");
+echo HtmlInput::submit("add_exercice","Ajout d'un exercice comptable");
?>
</form>
Modified: phpcompta/branches/rel600-dynamic-menu/include/user_menu.php
===================================================================
--- phpcompta/branches/rel600-dynamic-menu/include/user_menu.php
2011-10-27 20:28:36 UTC (rev 4243)
+++ phpcompta/branches/rel600-dynamic-menu/include/user_menu.php
2011-10-27 22:47:55 UTC (rev 4244)
@@ -405,18 +405,19 @@
function ShowMenuPcmn($p_start=1)
{
+ $base="?ac=".$_REQUEST['ac'];
$str_dossier="&".dossier::get();
echo '<TABLE>';
- echo '<TR><TD class="mtitle"><A class="mtitle"
HREF="?p_action=pcmn&p_start=0'.$str_dossier.'">0'._(' Hors Bilan').'
</A></TD></TR>';
- echo '<TR><TD class="mtitle"><A class="mtitle"
HREF="?p_action=pcmn&p_start=1'.$str_dossier.'">1'._(' Immobilisé').'
</A></TD></TR>';
- echo '<TR><TD class="mtitle"><A class="mtitle"
HREF="?p_action=pcmn&p_start=2'.$str_dossier.'">2 '._('Actif a un an au
plus').'</A></TD></TR>';
- echo '<TR><TD class="mtitle"><A class="mtitle"
HREF="?p_action=pcmn&p_start=3'.$str_dossier.'">3 '._('Stock et
commande').'</A></TD></TR>';
- echo '<TR><TD class="mtitle"><A class="mtitle"
HREF="?p_action=pcmn&p_start=4'.$str_dossier.'">4 '._('Compte
tiers').'</A></TD></TR>';
- echo '<TR><TD class="mtitle"><A class="mtitle"
HREF="?p_action=pcmn&p_start=5'.$str_dossier.'">5'._('Actif').'</A></TD></TR>';
- echo '<TR><TD class="mtitle"><A class="mtitle"
HREF="?p_action=pcmn&p_start=6'.$str_dossier.'">6'._('Charges').'</A></TD></TR>';
- echo '<TR><TD class="mtitle"><A class="mtitle"
HREF="?p_action=pcmn&p_start=7'.$str_dossier.'">7'._('Produits').'</A></TD></TR>';
- echo '<TR><TD class="mtitle"><A class="mtitle"
HREF="?p_action=pcmn&p_start=8'.$str_dossier.'">8'._('Hors
Comptabilité').'</A></TD></TR>';
- echo '<TR><TD class="mtitle"><A class="mtitle"
HREF="?p_action=pcmn&p_start=9'.$str_dossier.'">9 '._('Hors
Comptabilité').'</A></TD></TR>';
+ echo '<TR><TD class="mtitle"><A class="mtitle"
HREF="'.$base.'&p_start=0'.$str_dossier.'">0'._(' Hors Bilan').'
</A></TD></TR>';
+ echo '<TR><TD class="mtitle"><A class="mtitle"
HREF="'.$base.'&p_start=1'.$str_dossier.'">1'._(' Immobilisé').'
</A></TD></TR>';
+ echo '<TR><TD class="mtitle"><A class="mtitle"
HREF="'.$base.'&p_start=2'.$str_dossier.'">2 '._('Actif a un an au
plus').'</A></TD></TR>';
+ echo '<TR><TD class="mtitle"><A class="mtitle"
HREF="'.$base.'&p_start=3'.$str_dossier.'">3 '._('Stock et
commande').'</A></TD></TR>';
+ echo '<TR><TD class="mtitle"><A class="mtitle"
HREF="'.$base.'&p_start=4'.$str_dossier.'">4 '._('Compte
tiers').'</A></TD></TR>';
+ echo '<TR><TD class="mtitle"><A class="mtitle"
HREF="'.$base.'&p_start=5'.$str_dossier.'">5'._('Actif').'</A></TD></TR>';
+ echo '<TR><TD class="mtitle"><A class="mtitle"
HREF="'.$base.'&p_start=6'.$str_dossier.'">6'._('Charges').'</A></TD></TR>';
+ echo '<TR><TD class="mtitle"><A class="mtitle"
HREF="'.$base.'&p_start=7'.$str_dossier.'">7'._('Produits').'</A></TD></TR>';
+ echo '<TR><TD class="mtitle"><A class="mtitle"
HREF="'.$base.'&p_start=8'.$str_dossier.'">8'._('Hors
Comptabilité').'</A></TD></TR>';
+ echo '<TR><TD class="mtitle"><A class="mtitle"
HREF="'.$base.'&p_start=9'.$str_dossier.'">9 '._('Hors
Comptabilité').'</A></TD></TR>';
echo "</TABLE>";
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpcompta-dev] r4244 - in phpcompta/branches/rel600-dynamic-menu/include: . template,
phpcompta-dev <=