From MAILER-DAEMON Thu Oct 13 15:52:43 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RERKd-0001K3-1x for mharc-phpcompta-dev@gnu.org; Thu, 13 Oct 2011 15:52:43 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Thu, 13 Oct 2011 22:00:19 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4208 - in phpcompta/branches: . rel600-dynamic-menu/html rel600-dynamic-menu/include rel600-dynamic-menu/include/template X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Oct 2011 19:52:39 -0000 Author: danydb Date: 2011-10-13 22:00:17 +0200 (Thu, 13 Oct 2011) New Revision: 4208 Added: phpcompta/branches/rel600-dynamic-menu/ Modified: phpcompta/branches/rel600-dynamic-menu/html/ajax_misc.php phpcompta/branches/rel600-dynamic-menu/html/extension.php phpcompta/branches/rel600-dynamic-menu/html/style-light.css phpcompta/branches/rel600-dynamic-menu/html/user_login.php phpcompta/branches/rel600-dynamic-menu/include/ac_common.php phpcompta/branches/rel600-dynamic-menu/include/action.common.inc.php phpcompta/branches/rel600-dynamic-menu/include/action.inc.php phpcompta/branches/rel600-dynamic-menu/include/adm.inc.php phpcompta/branches/rel600-dynamic-menu/include/adm_card.inc.php phpcompta/branches/rel600-dynamic-menu/include/balance.inc.php phpcompta/branches/rel600-dynamic-menu/include/balance_card.inc.php phpcompta/branches/rel600-dynamic-menu/include/class_acc_ledger.php phpcompta/branches/rel600-dynamic-menu/include/class_action.php phpcompta/branches/rel600-dynamic-menu/include/class_dossier.php phpcompta/branches/rel600-dynamic-menu/include/class_fiche.php phpcompta/branches/rel600-dynamic-menu/include/client.inc.php phpcompta/branches/rel600-dynamic-menu/include/client_card.inc.php phpcompta/branches/rel600-dynamic-menu/include/compta_fin.inc.php phpcompta/branches/rel600-dynamic-menu/include/constant.php phpcompta/branches/rel600-dynamic-menu/include/fiche.inc.php phpcompta/branches/rel600-dynamic-menu/include/impress_bilan.inc.php phpcompta/branches/rel600-dynamic-menu/include/impress_fiche.inc.php phpcompta/branches/rel600-dynamic-menu/include/impress_gl_comptes.inc.= php phpcompta/branches/rel600-dynamic-menu/include/impress_jrn.inc.php phpcompta/branches/rel600-dynamic-menu/include/impress_poste.inc.php phpcompta/branches/rel600-dynamic-menu/include/impress_rapport.inc.php phpcompta/branches/rel600-dynamic-menu/include/impress_rec.inc.php phpcompta/branches/rel600-dynamic-menu/include/lettering.gestion.inc.p= hp phpcompta/branches/rel600-dynamic-menu/include/stock.inc.php phpcompta/branches/rel600-dynamic-menu/include/stock_inc.php phpcompta/branches/rel600-dynamic-menu/include/suivi_adm.inc.php phpcompta/branches/rel600-dynamic-menu/include/suivi_client.inc.php phpcompta/branches/rel600-dynamic-menu/include/suivi_supplier.inc.php phpcompta/branches/rel600-dynamic-menu/include/supplier.inc.php phpcompta/branches/rel600-dynamic-menu/include/supplier_card.inc.php phpcompta/branches/rel600-dynamic-menu/include/template/dashboard.php phpcompta/branches/rel600-dynamic-menu/include/user_action_gl.php phpcompta/branches/rel600-dynamic-menu/include/user_menu.php Log: **************************************************** * Modules and Menu are in tables=20 **************************************************** Copied: phpcompta/branches/rel600-dynamic-menu (from rev 4207, phpcompta/= trunk) Modified: phpcompta/branches/rel600-dynamic-menu/html/ajax_misc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/ajax_misc.php 2011-09-28 14:19:20 UTC (rev 4207) +++ phpcompta/branches/rel600-dynamic-menu/html/ajax_misc.php 2011-10-13 = 20:00:17 UTC (rev 4208) @@ -21,7 +21,7 @@ // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr =20 /*!\file - * \brief this file respond to an ajax request=20 + * \brief this file respond to an ajax request * The parameters are * - gDossier * - $op operation the file has to execute @@ -286,7 +286,7 @@ $r.=3D'
'; // needed hidden var $r.=3Ddossier::hidden(); - if ( isset($_REQUEST['p_action'])) $r.=3DHtmlInput::hidden('p_= action',$_REQUEST['p_action']); + if ( isset($_REQUEST['ac'])) $r.=3DHtmlInput::hidden('ac',$_RE= QUEST['ac']); if ( isset($_REQUEST['sa'])) $r.=3DHtmlInput::hidden('sa',$_RE= QUEST['sa']); if ( isset($_REQUEST['acc'])) $r.=3DHtmlInput::hidden('acc',$_= REQUEST['acc']); $r.=3DHtmlInput::hidden('j_id',$j_id); Modified: phpcompta/branches/rel600-dynamic-menu/html/extension.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/extension.php 2011-09-28 14:19:20 UTC (rev 4207) +++ phpcompta/branches/rel600-dynamic-menu/html/extension.php 2011-10-13 = 20:00:17 UTC (rev 4208) @@ -55,7 +55,7 @@ $hidden=3Ddossier::hidden(); echo '
-
= '. + '. $hidden; =20 echo HtmlInput::button_anchor(_('Pr=C3=A9f=C3=A9rence'),'user_pref.p= hp'); @@ -72,7 +72,7 @@ $msg=3D_('Retour accueil'); ?>
- + */ -div.add_todo_list {=20 +div.add_todo_list { border:1px solid #0000ff; display:none; background-color:#BFD0FF; @@ -879,10 +880,10 @@ padding: 5px; } div.op_detail_frame { - background-color:#e4e7ed;=20 + background-color:#e4e7ed; height:100%; width:100%; - =20 - =20 + + } div.op_detail { background-color:#e4e7ed; @@ -892,21 +893,21 @@ margin:0; overflow:hidden; z-index:3; - =20 + position:absolute; left:10%; =20 =20 -border:1px solid darkblue;=09 +border:1px solid darkblue; =20 } div.op_detail_title { background-color:grey; /* width:500;*/ -=09 -=09 + + } -div#div_jrn{=20 +div#div_jrn{ position:absolute; border:1px solid black; top:15%;left:100; @@ -914,9 +915,9 @@ z-index:2; width:50em; background-color:#EDF3FF; - =20 + } - div#div_cat{=20 + div#div_cat{ position:absolute; border:1px solid black; top:15%;left:100; @@ -924,15 +925,15 @@ z-index:2; width:50em; background-color:#EDF3FF; - =20 + } -=20 + div.divinfo { color:red;text-align:right;display:block;width:30em;height:13;font-we= ight:bold} =20 =20 div#search_form -{=20 +{ position:absolute; border:1px solid black; top:15%;left:100; @@ -942,7 +943,7 @@ display:none; background-color:#e4e7ed; } -table.result td=20 +table.result td { padding-left:5px; padding-right:5px; Modified: phpcompta/branches/rel600-dynamic-menu/html/user_login.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/user_login.php 2011-09-28 14:19:20 UTC (rev 4207= ) +++ phpcompta/branches/rel600-dynamic-menu/html/user_login.php 2011-10-13= 20:00:17 UTC (rev 4208) @@ -102,7 +102,7 @@ } else { - redirect('access.php?gDossier=3D'.$folder[0]['dos_id']); + redirect('do.php?gDossier=3D'.$folder[0]['dos_id']); exit(); } } Modified: phpcompta/branches/rel600-dynamic-menu/include/ac_common.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/ac_common.php 2011-09-28 14:19:20 UTC (rev 42= 07) +++ phpcompta/branches/rel600-dynamic-menu/include/ac_common.php 2011-10-= 13 20:00:17 UTC (rev 4208) @@ -602,7 +602,7 @@ /** *@brief try to determine on what os you are running the p=C4=A5pcompte *server - *@return=20 + *@return * 0 it is a windows * 1 it is a Unix like */ @@ -687,4 +687,46 @@ exit(); } } +/** + * + * @param int $selected module selected + */ +function show_module($selected) +{ + $cn=3DDossier::connect(); + $amodule=3D$cn->get_array("select m_code,m_menu,m_url from module or= der by m_order"); + require_once('template/module.php'); + if ( $selected !=3D -1 ) + { + $file=3D$cn->get_value("select m_file from module where m_code=3D$1",ar= ray($selected)); + if ($file !=3D '') + require_once $file; + } + +} +/** + * show default module + */ +function show_default() +{ + $cn=3DDossier::connect(); + $file=3D$cn->get_array('SELECT m_code FROM module where m_default=3D= 1'); + if (! empty ($file) ) + { + $selected=3D$file[0]['m_code']; + show_module($selected); + } +} +/** + * + */ +function show_menu($module) +{ + $cn=3DDossier::connect(); + $amenu=3D$cn->get_array("select me_id,me_menu from menu + join menu_ref using (me_code) + join module using (m_code) where + m_code=3D$1 order by me_order",array($module[0])); + require_once 'template/menu.php'; +} ?> Modified: phpcompta/branches/rel600-dynamic-menu/include/action.common.in= c.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/action.common.inc.php 2011-09-28 14:19:20 UTC= (rev 4207) +++ phpcompta/branches/rel600-dynamic-menu/include/action.common.inc.php = 2011-10-13 20:00:17 UTC (rev 4208) @@ -25,7 +25,6 @@ * administration. * The needed variables are * - $cn for the database connection - * - $p_action the $_REQUEST['p_action'] * - $sub_action sa from suivi courrier but sc from Suivi client, four= nisseur... * */ @@ -37,6 +36,7 @@ $supl_hidden.=3DHtmlInput::hidden('f_id',$_REQUEST['f_id']); if( isset($_REQUEST['sb'])) $supl_hidden.=3DHtmlInput::hidden('sb',$_REQUEST['sb']); + $supl_hidden.=3DHtmlInput::hidden('ac',$_REQUEST['ac']); =20 /*----------------------------------------------------------------------= ----- */ /* We ask to generate the document */ @@ -114,14 +114,14 @@ echo '
'; =20 // Add hidden tag - echo ''; + echo ''; =20 echo dossier::hidden(); $act->ag_comment=3D""; if (isset($_REQUEST['qcode_dest'])) $act->qcode_dest=3D$_REQUEST= ['qcode_dest']; echo $act->Display('NEW',false,$base,$retour); =20 - echo ''; + echo ''; echo ''; echo ''; echo '

'; @@ -143,12 +143,11 @@ $act->ag_id=3D$ag_id; echo $act->get(); $act->ag_comment=3DDecode($act->ag_comment); - echo ''; + echo ''; echo $supl_hidden; - echo HtmlInput::hidden('p_action',$_REQUEST['p_action']); + echo HtmlInput::hidden('ac',$_REQUEST['ac']); echo dossier::hidden(); echo $act->Display('UPD',false,$base,$retour); - echo ''; echo ''; echo HtmlInput::submit("save","Sauve"); echo HtmlInput::submit("add_action_here",_("Ajoute une action =C3=A0= celle-ci")); @@ -191,7 +190,7 @@ $act->d_id=3D0; echo '
'; // Add hidden tag - echo ''; + echo ''; echo $supl_hidden; echo dossier::hidden(); =20 @@ -200,7 +199,7 @@ if (isset($_REQUEST['qcode'])) $act->qcode_dest=3D$_REQUEST['qcode']= ; echo $act->Display('NEW',false,$base,$retour); =20 - echo ''; + echo ''; echo ''= ; echo ''; echo ''; @@ -224,8 +223,8 @@ echo $act->save(); $url=3D"?$base&sa=3Ddetail&ag_id=3D".$act->ag_id.'&'.dossier::get(); echo '

'.hb('Action Sauv=C3=A9= e : '.$act->ag_ref).'

'; - =20 =20 + ShowActionList($cn,$base); $url=3D"?$base&sa=3Ddetail&ag_id=3D".$act->ag_id.'&'.dossier::get(); echo '

'.hb('Action Sauv=C3=A9= e : '.$act->ag_ref).'

'; @@ -240,7 +239,7 @@ - + name=3D'qcode'; @@ -284,7 +284,10 @@ =20 $see_all=3Dnew ICheckBox('see_all'); $my_action=3Dnew ICheckBox('all_action'); - if ( $_REQUEST ['p_action'] !=3D 'suivi_courrier') =20 +/** + * @todo + * if ( $_REQUEST ['p_action'] !=3D 'suivi_courrier') + * { $see_all->selected=3Dtrue; $my_action->selected=3D true; @@ -294,13 +297,15 @@ $see_all->selected=3D(isset($_REQUEST ['see_all']))?true:false; $my_action->selected=3D (isset($_REQUEST ['all_action']))?true:fal= se; } + * + */ echo _('les actions ferm=C3=A9es aussi:').$see_all->input().'
'; =20 echo _('affect=C3=A9 =C3=A0 d\'autre:').$my_action->input().'
'; ?> "> - "> + =20 @@ -309,11 +314,11 @@ =20
-
+ "> - "> + "> ','','search_action')" value=3D""> Modified: phpcompta/branches/rel600-dynamic-menu/include/action.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/action.inc.php 2011-09-28 14:19:20 UTC (rev 4= 207) +++ phpcompta/branches/rel600-dynamic-menu/include/action.inc.php 2011-10= -13 20:00:17 UTC (rev 4208) @@ -22,7 +22,7 @@ * \brief Page who manage the different actions (meeting, letter) */ require_once('class_ipopup.php'); - +global $User; $User->can_request(GECOUR); =20 $retour=3DHtmlInput::button_anchor(_('Retour'),'?p_action=3Dsuivi_courri= er&my_action&'.dossier::get()); @@ -53,8 +53,8 @@ * with the generation of document */ $ag_id=3D(isset($_REQUEST['ag_id']))?$_REQUEST['ag_id']:0; -$p_action=3D$_REQUEST['p_action']; -$base=3D'p_action=3D'.$p_action; +$ac=3D$_REQUEST['ac']; +$base=3D'ac=3D'.$ac; =20 require_once('action.common.inc.php'); echo "
"; Modified: phpcompta/branches/rel600-dynamic-menu/include/adm.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/adm.inc.php 2011-09-28 14:19:20 UTC (rev 4207= ) +++ phpcompta/branches/rel600-dynamic-menu/include/adm.inc.php 2011-10-13= 20:00:17 UTC (rev 4208) @@ -31,13 +31,9 @@ require_once('class_fiche_def.php'); require_once('class_ipopup.php'); require_once('class_admin.php'); -echo js_include('accounting_item.js'); -echo js_include('prototype.js'); -echo js_include('scriptaculous.js'); -echo js_include('effects.js'); -echo js_include('controls.js'); -echo js_include('dragdrop.js'); =20 +global $User; + $low_action=3D(isset($_REQUEST['sb']))?$_REQUEST['sb']:"list"; /*! \file * \brief Called from the module "Gestion" to manage the customer @@ -136,7 +132,7 @@ } /*---------------------------------------------------------------------- * Detail for a card, Suivi, Contact, Operation,... * - * cc stands for customer card=20 + * cc stands for customer card *----------------------------------------------------------------------= */ if ( $low_action =3D=3D 'detail') { Modified: phpcompta/branches/rel600-dynamic-menu/include/adm_card.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/adm_card.inc.php 2011-09-28 14:19:20 UTC (rev= 4207) +++ phpcompta/branches/rel600-dynamic-menu/include/adm_card.inc.php 2011-= 10-13 20:00:17 UTC (rev 4208) @@ -28,14 +28,15 @@ */ require_once('class_contact.php'); require_once('class_ipopup.php'); +$str_dossier=3DDossier::get(); =20 /* $sub_action =3D sb =3D detail */ /* $cn database conx */ $return=3Dnew IAction(); $return->name=3D'retour'; $return->label=3D'Retour'; -$return->value=3D'?p_action=3Dadm&'.$str_dossier; -$root=3D"?p_action=3Dadm&sb=3Ddetail&f_id=3D".$_REQUEST["f_id"].'&'.$str= _dossier; +$return->value=3D'?ac=3D'.$_REQUEST['ac'].'&'.$str_dossier; +$root=3D'?ac=3D'.$_REQUEST['ac']."&sb=3Ddetail&f_id=3D".$_REQUEST["f_id"= ].'&'.$str_dossier; $ss_action=3D( isset ($_REQUEST['sc'] ))? $_REQUEST['sc']: ''; switch ($ss_action) { @@ -70,7 +71,7 @@ array($root.'&sc=3Dop',_('Op=C3=A9rations'),_('Toutes = les op=C3=A9rations'),4), array($root.'&sc=3Dbal',_('Balance'),_('Balance du fou= rnisseur'),7), array($root.'&sc=3Dlet',_('Lettrage'),_('Op=C3=A9ratio= ns & Lettrages'),6), - array('?p_action=3Dadm&'.dossier::get(),_('Retour list= e'),_('Retour =C3=A0 la liste des administration'),5) + array('?ac=3D'.$_REQUEST['ac']."&".dossier::get(),_('R= etour liste'),_('Retour =C3=A0 la liste des administration'),5) ), 'H',"mtitle","mtitle",$def,' '); echo '
'; Modified: phpcompta/branches/rel600-dynamic-menu/include/balance.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/balance.inc.php 2011-09-28 14:19:20 UTC (rev = 4207) +++ phpcompta/branches/rel600-dynamic-menu/include/balance.inc.php 2011-1= 0-13 20:00:17 UTC (rev 4208) @@ -34,6 +34,7 @@ require_once('class_acc_ledger.php'); require_once('class_periode.php'); require_once('class_exercice.php'); +global $User; =20 $User->can_request(IMPBAL); $exercice=3D(isset($_GET['exercice']))?$_GET['exercice']:$User->get_exer= cice(); @@ -50,14 +51,14 @@ $wex=3D$ex->select('exercice',$exercice,' onchange=3D"submit(this)"'); echo $wex->input(); echo dossier::hidden(); -echo HtmlInput::get_to_hidden(array('p_action','type')); +echo HtmlInput::get_to_hidden(array('ac','type')); echo ''; echo ''; =20 =20 // Show the form for period echo '
'; -echo HtmlInput::hidden('p_action','impress'); +echo HtmlInput::get_to_hidden(array('ac')); echo HtmlInput::hidden('type','bal'); echo HtmlInput::get_to_hidden(array('exercice')); echo dossier::hidden(); @@ -177,7 +178,7 @@ echo ''. dossier::hidden(). HtmlInput::submit('bt_pdf',"Export PDF"). - HtmlInput::hidden("p_action","impress"). + HtmlInput::hidden("ac",$_REQUEST['ac']). HtmlInput::hidden("act","PDF/balance"). =20 HtmlInput::hidden("from_periode",$_GET['from_periode']). @@ -199,10 +200,10 @@ echo ''. HtmlInput::submit('bt_csv',"Export CSV"). dossier::hidden(). - HtmlInput::hidden("p_action","impress"). HtmlInput::hidden("act","CSV/balance"). HtmlInput::hidden("from_periode",$_GET['from_periode']). HtmlInput::hidden("to_periode",$_GET['to_periode']); + echo HtmlInput::get_to_hidden(array('ac')); echo HtmlInput::hidden('p_filter',$_GET['p_filter']); if (isset($_GET ['r_jrn'])) if (isset($selected[$e])) @@ -288,12 +289,12 @@ * level x */ foreach (array(3,2,1) as $ind) - {=09 + { if ( ! isset($_GET['lvl'.$ind]))continue; if (${'lvl'.$ind.'_old'} =3D=3D '') ${'lvl'.$ind.'_old'}=3Dsubstr= ($r['poste'],0,$ind); if ( ${'lvl'.$ind.'_old'} !=3D substr($r['poste'],0,$ind)) { - =09 + echo ''; echo td("Total niveau ".$ind); echo td(${'lvl'.$ind.'_old'}); @@ -301,7 +302,7 @@ echo td(nbm(${'lvl'.$ind}['sum_cred']),'style=3D"text-align:right"'); echo td(nbm(${'lvl'.$ind}['solde_deb']),'style=3D"text-align:right"'); echo td(nbm(${'lvl'.$ind}['solde_cred']),'style=3D"text-align:right"')= ; - =09 + echo ''; ${'lvl'.$ind.'_old'}=3Dsubstr($r['poste'],0,$ind); foreach(array('sum_cred','sum_deb','solde_deb','solde_cred') as $a) Modified: phpcompta/branches/rel600-dynamic-menu/include/balance_card.inc= .php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/balance_card.inc.php 2011-09-28 14:19:20 UTC = (rev 4207) +++ phpcompta/branches/rel600-dynamic-menu/include/balance_card.inc.php 2= 011-10-13 20:00:17 UTC (rev 4208) @@ -24,6 +24,7 @@ * \brief show the status of a card */ require_once('class_exercice.php'); +global $User; echo '
'; $exercice=3Dnew Exercice($cn); $old=3D''; @@ -53,11 +54,11 @@ $default=3D(isset($_GET['ex']))?$_GET['ex']:$year; $dossier=3Ddossier::id(); =20 - $old=3D''; + $old=3D''; $is=3D$exercice->select('ex',$default,'onchange =3D "submit(this)"'= ); $old.=3D"Autre exercice ".$is->input(); $old.=3DHtmlInput::hidden('f_id',$_GET['f_id']); - $old.=3DHtmlInput::hidden('p_action',$_GET['p_action']); + $old.=3DHtmlInput::hidden('ac',$_GET['ac']); $old.=3DHtmlInput::hidden('sb',$_GET['sb']); $old.=3DHtmlInput::hidden('sc',$_GET['sc']); $old.=3Ddossier::hidden(); @@ -70,5 +71,5 @@ echo $old; =20 } -=20 + echo '
'; Modified: phpcompta/branches/rel600-dynamic-menu/include/class_acc_ledger= .php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_acc_ledger.php 2011-09-28 14:19:20 UTC = (rev 4207) +++ phpcompta/branches/rel600-dynamic-menu/include/class_acc_ledger.php 2= 011-10-13 20:00:17 UTC (rev 4208) @@ -110,7 +110,7 @@ } /** *let you delete a operation - *@note by cascade it will delete also in=20 + *@note by cascade it will delete also in * - jrnx * - stock * - quant_purchase @@ -134,7 +134,7 @@ } /** * reverse the operation by creating the opposite one, - * the result is to avoid it=20 + * the result is to avoid it * it must be done in * - jrn * - jrnx @@ -792,7 +792,7 @@ { $positive =3D $this->db->get_value("select qf_amount fro= m quant_fin where jr_id=3D$1", array($row['jr_id'])); - if ( $this->db->count() !=3D 0)=20 + if ( $this->db->count() !=3D 0) $positive=3D($positive < 0)?1:0; } $r.=3D""; @@ -1149,7 +1149,7 @@ * writing, reading or simply accessing. * \param $p_type =3D ALL or the type of the ledger (ACH,VEN,FIN,ODS= ) * \param $p_access =3D3 for READ and WRITE, 2 for write and 1 for r= eadonly - * \return object HtmlInput select=20 + * \return object HtmlInput select */ function select_ledger($p_type=3D"ALL",$p_access=3D3) { @@ -2223,6 +2223,7 @@ =20 $r.=3Ddossier::hidden(); $r.=3DHtmlInput::hidden('ledger_type',$this->type); + $r.=3DHtmlInput::hidden('ac',$_REQUEST['ac']); ob_start(); require_once('template/ledger_search.php'); $r.=3Dob_get_contents(); @@ -2466,7 +2467,7 @@ $r.=3D''; $r.=3D$this->search_form($type); $r.=3DHtmlInput::submit('search',_('Rechercher')); - $r.=3DHtmlInput::hidden('p_action',$_REQUEST['p_action']); + $r.=3DHtmlInput::hidden('ac',$_REQUEST['ac']); =20 /* when called from commercial.php some hidden values are neede= d */ if (isset($_REQUEST['sa'])) $r.=3D HtmlInput::hidden("sa",$_REQU= EST['sa']); @@ -2520,10 +2521,10 @@ } } /** - *@brief retrieve operation from jrn=20 - *@param $p_from periode (id)=20 + *@brief retrieve operation from jrn + *@param $p_from periode (id) *@param $p_to periode (id) - *@return an array=20 + *@return an array */ function get_operation($p_from,$p_to) { @@ -2644,17 +2645,17 @@ 'vat' =3D> string '21.7600' (length=3D7) 'priv' =3D> string '0.0000' (length=3D6) 'tva_nd_recup' =3D> string '0.0000' (length=3D6) - 'tva' =3D>=20 + 'tva' =3D> array - 0 =3D>=20 + 0 =3D> array 'sum_vat' =3D> string '13.7200' (length=3D7) 'tva_id' =3D> string '1' (length=3D1) - 1 =3D>=20 + 1 =3D> array 'sum_vat' =3D> string '8.0400' (length=3D6) 'tva_id' =3D> string '3' (length=3D1) - 2 =3D>=20 + 2 =3D> array 'sum_vat' =3D> string '0.0000' (length=3D6) 'tva_id' =3D> string '4' (length=3D1) @@ -2858,7 +2859,7 @@ return $r; } /** - *Retrieve the third : supplier for purchase, customer for sale, ban= k for fin,=20 + *Retrieve the third : supplier for purchase, customer for sale, ban= k for fin, *@param $p_jrn_type type of the ledger FIN, VEN ACH or ODS */ function get_tiers($p_jrn_type,$jr_id) Modified: phpcompta/branches/rel600-dynamic-menu/include/class_action.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_action.php 2011-09-28 14:19:20 UTC (rev= 4207) +++ phpcompta/branches/rel600-dynamic-menu/include/class_action.php 2011-= 10-13 20:00:17 UTC (rev 4208) @@ -89,18 +89,18 @@ //------------------------------------------------------------------= ---- /*! * \brief Display the object, the tags for the FORM - * are in the caller. It will be used for adding and updating= =20 - * action=20 + * are in the caller. It will be used for adding and updating + * action *\note If ag_id is not equal to zero then it is an update otherwi= se * it is a new document * - * \param $p_view if set to true the form will be in readonly mode (= value: true or false)=20 + * \param $p_view if set to true the form will be in readonly mode (= value: true or false) * \param $p_gen true we show the tag for generating a doc (value : = true or false) - *\param $p_base is the p_action parameter + *\param $p_base is the ac parameter *\param $retour is the html code for the return button * \note update the reference number or the document type is not al= lowed - * =20 * + * * \return string containing the html code */ function Display($p_view,$p_gen,$p_base,$retour=3D"") @@ -297,7 +297,7 @@ if( isset($_REQUEST['sb'])) $supl_hidden.=3D'&sb=3D'.$_REQUEST['sb']; =20 - $lag_ref_ag_id=3D'ag_ref_ag_id.'&'.dossier::get().'">'. $this->db->get_value("select ag_ref from = action_gestion where ag_id=3D$1",array($this->ag_ref_ag_id)). ""; @@ -568,7 +568,7 @@ } =20 /*! - * \brief Save the document and propose to save the generated docume= nt or =20 + * \brief Save the document and propose to save the generated docume= nt or * to upload one, the data are included except the file. Temporary = the generated * document is save * @@ -644,7 +644,7 @@ } /*! myList($p_filter=3D"") * \brief Show list of action by default if sorted on date - *\param $p_base base url with p_action... + *\param $p_base base url with ac... * \param $p_filter filters on the document_type * \param $p_search must a valid sql command ( ex 'and ag_title lik= e upper('%hjkh%')) * \return string containing html code @@ -822,7 +822,7 @@ //show the sub_action foreach ($a_row as $row ) { - $href=3D''; + $href=3D''; $i++; $tr=3D($i%2=3D=3D0)?'even':'odd'; if ($row['ag_priority'] < 2) $tr=3D'priority1'; @@ -858,7 +858,7 @@ { foreach ($retSql as $line) { - $ref.=3D''. + $ref.=3D''. $line['ag_ref'].""; } } @@ -870,7 +870,7 @@ /* * State */ - switch ( $row['ag_state'] )=20 + switch ( $row['ag_state'] ) { case 1: $state=3D'Ferm=C3=A9'; @@ -889,7 +889,7 @@ /* * State */ - switch ( $row['ag_priority'] )=20 + switch ( $row['ag_priority'] ) { case 1: $priority=3D'Haute'; Modified: phpcompta/branches/rel600-dynamic-menu/include/class_dossier.ph= p =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_dossier.php 2011-09-28 14:19:20 UTC (re= v 4207) +++ phpcompta/branches/rel600-dynamic-menu/include/class_dossier.php 2011= -10-13 20:00:17 UTC (rev 4208) @@ -55,9 +55,9 @@ } =20 /*! - * \param p_type string : all for all dossiers lim for only the=20 + * \param p_type string : all for all dossiers lim for only the * dossier where we've got rights - *=20 + * * Show the folder where user have access. Return : nothing ++*/ function show_dossier($p_type,$p_first=3D0,$p_max=3D10,$p_Num=3D0) @@ -230,4 +230,10 @@ { return $p_cn->get_value('select val from version'); } + static function connect() + { + $id=3DDossier::id(); + $cn=3D new Database($id); + return $cn; + } } Modified: phpcompta/branches/rel600-dynamic-menu/include/class_fiche.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_fiche.php 2011-09-28 14:19:20 UTC (rev = 4207) +++ phpcompta/branches/rel600-dynamic-menu/include/class_fiche.php 2011-1= 0-13 20:00:17 UTC (rev 4208) @@ -71,7 +71,7 @@ */ function get_bk_account() { - =20 + $user=3Dnew User($this->cn); $sql_ledger=3D$user->get_ledger_sql('FIN',3); $avail=3D$this->cn->get_array("select jrn_def_id,jrn_def_bank from= jrn_def where jrn_def_type=3D'FIN' and $sql_ledger @@ -105,7 +105,7 @@ if ( $p_qcode =3D=3D null ) $p_qcode=3D$this->quick_code; $p_qcode=3Dtrim($p_qcode); - $sql=3D"select f_id from fiche_detail=20 + $sql=3D"select f_id from fiche_detail where ad_id=3D23 and ad_value=3Dupper($1)"; $this->id=3D$this->cn->get_value($sql,array($p_qcode)); if ( $this->cn->count()=3D=3D0) @@ -149,8 +149,8 @@ return; } $sql=3D"select * - from=20 - fiche=20 + from + fiche natural join fiche_detail join jnt_fic_attr on (jnt_fic_attr.fd_id=3Dfiche.fd_id and fiche_d= etail.ad_id=3Djnt_fic_attr.ad_id) join attr_def on (attr_def.ad_id=3Dfiche_detail.ad_id) wher= e f_id=3D".$this->id. @@ -214,7 +214,7 @@ */ function seek($p_attribut,$p_value) { - $sql=3D"select jft_id,f_id,fd_id,ad_id,ad_value from fiche join = fiche_detail using (f_id)=20 + $sql=3D"select jft_id,f_id,fd_id,ad_id,ad_value from fiche join = fiche_detail using (f_id) where ad_id=3D$1 and upper(ad_value)=3Dupper($2)"; $res=3D$this->cn->get_array($sql,array($p_attribut,$p_value)); return $res; @@ -662,7 +662,7 @@ $msg=3D$w->search(); $msg.=3D$label->input(); break; - =20 + default: var_dump($r); throw new Exception("Type invalide"); @@ -732,7 +732,7 @@ =20 list ($id) =3D sscanf ($name,"av_text%d"); if ( $id =3D=3D null ) continue; - =20 + // Special traitement // quickcode if ( $id =3D=3D ATTR_DEF_QUICKCODE) @@ -833,7 +833,7 @@ foreach ($p_array as $name=3D>$value ) { if ( preg_match('/^av_text[0-9]+$/',$name) =3D=3D 0) continue; - =20 + list ($id) =3D sscanf ($name,"av_text%d"); =20 if ( $id =3D=3D null ) continue; @@ -1248,7 +1248,7 @@ * \brief HtmlTable, display a HTML of a card for the asked period * \param $p_array default =3D null keys =3D from_periode, to_period= e *\param $op_let 0 all operation, 1 only lettered one, 2 only unlett= ered one - *\return -1 if nothing is found otherwise 0 =20 + *\return -1 if nothing is found otherwise 0 *\see get_row_date */ function HtmlTable($p_array=3Dnull,$op_let=3D0,$from_div=3D1) @@ -1461,7 +1461,7 @@ ( select j_poste, case when j_debit=3D't' then j_montant = else 0 end as deb, case when j_debit=3D'f' then j_montant = else 0 end as cred - from jrnx=20 + from jrnx join jrn on (jr_grpt_id=3Dj_grpt) where j_qcode =3D ('$qcode'::text) @@ -1476,7 +1476,7 @@ return array('debit'=3D>$r['sum_deb'], 'credit'=3D>$r['sum_cred'], 'solde'=3D>abs($r['sum_deb']-$r['sum_cred'])); - =20 + } /*!\brief check if an attribute is empty *\param $p_attr the id of the attribut to check (ad_id) @@ -1576,8 +1576,8 @@ if ( $p_amount && $amount['debit']=3D=3D0 && $amount['credit= '] =3D=3D 0 && $amount['solde'] =3D=3D 0 ) continue; =20 $r.=3D""; - $e=3Dsprintf(' ', - $script,$p_action,$tiers->id,$str_dossier); + $e=3Dsprintf(' ', + $script,$_REQUEST['ac'],$tiers->id,$str_dossier); =20 $r.=3D" $e".$tiers->strAttribut(ATTR_DEF_QUICKCODE).""; $r.=3D"".h($tiers->strAttribut(ATTR_DEF_NAME)).""; @@ -1589,8 +1589,8 @@ $r.=3D' '.(($amount['debit']=3D=3D0)?0:n= bm($amount['debit'])).'€'; $r.=3D' '.(($amount['credit']=3D=3D0)?0:nbm($am= ount['credit'])).'€'; $r.=3D' '.nbm($amount['solde'])."€"; - =20 =20 + $r.=3D""; =20 } @@ -1747,7 +1747,7 @@ { // Remove from attr_value $Res=3D$this->cn->exec_sql("delete from fiche_detail - where=20 + where f_id=3D".$this->id); =20 // Remove from fiche Modified: phpcompta/branches/rel600-dynamic-menu/include/client.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/client.inc.php 2011-09-28 14:19:20 UTC (rev 4= 207) +++ phpcompta/branches/rel600-dynamic-menu/include/client.inc.php 2011-10= -13 20:00:17 UTC (rev 4208) @@ -47,7 +47,6 @@ /*! \file * \brief Called from the module "Gestion" to manage the customer */ -$User->can_request(GECUST); $href=3Dbasename($_SERVER['PHP_SELF']); =20 // by default open liste @@ -103,7 +102,7 @@ =20 ?> "> - + "> "; $retour=3Dnew IAction(); $retour->label=3D"Retour"; - $retour->value=3D"?p_action=3Dclient&".dossier::get(); + $retour->value=3D"?ac=3D".$_REQUEST["ac"]."&".dossier::get(); echo $retour->input(); echo '
'; =20 Modified: phpcompta/branches/rel600-dynamic-menu/include/client_card.inc.= php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/client_card.inc.php 2011-09-28 14:19:20 UTC (= rev 4207) +++ phpcompta/branches/rel600-dynamic-menu/include/client_card.inc.php 20= 11-10-13 20:00:17 UTC (rev 4208) @@ -32,8 +32,9 @@ =20 /* $sub_action =3D sb =3D detail */ /* $cn database conx */ +$str_dossier=3DDossier::get(); $return=3D HtmlInput::button_anchor('Retour','?p_action=3Dclient&'.$str_= dossier); -$root=3D"?p_action=3Dclient&sb=3Ddetail&f_id=3D".$_REQUEST["f_id"].'&'.$= str_dossier; +$root=3D"?p_action=3Dclient&sb=3Ddetail&f_id=3D".$_REQUEST["f_id"].'&'.$= str_dossier."&ac=3D".$_REQUEST["ac"]; $ss_action=3D( isset ($_REQUEST['sc'] ))? $_REQUEST['sc']: ''; switch ($ss_action) { @@ -68,7 +69,7 @@ array($root.'&sc=3Dop',_('Op=C3=A9rations'),_('Toutes = les op=C3=A9rations'),4), array($root.'&sc=3Dbal',_('Balance'),_('Balance du client'),7), array($root.'&sc=3Dlet',_('Lettrage'),_('Op=C3=A9ratio= ns & Lettrages'),6), - array('?p_action=3Dclient&'.dossier::get(),_('Retour l= iste'),_('Retour =C3=A0 la liste des clients'),5) + array('?ac=3D'.$_REQUEST['ac'].'&'.dossier::get(),_('R= etour liste'),_('Retour =C3=A0 la liste des clients'),5) ), 'H',"mtitle","mtitle",$def,''); echo '
'; Modified: phpcompta/branches/rel600-dynamic-menu/include/compta_fin.inc.p= hp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/compta_fin.inc.php 2011-09-28 14:19:20 UTC (r= ev 4207) +++ phpcompta/branches/rel600-dynamic-menu/include/compta_fin.inc.php 201= 1-10-13 20:00:17 UTC (rev 4208) @@ -25,6 +25,7 @@ */ require_once ('class_acc_ledger_fin.php'); require_once('class_ipopup.php'); +global $g_user; =20 $gDossier=3Ddossier::id(); $p_action=3D(isset ($_REQUEST['p_action']))?$_REQUEST['p_action']:''; @@ -80,7 +81,7 @@ $def_ledger=3D$Ledger->get_first('fin'); $Ledger->id=3D$def_ledger['jrn_def_id']; } - $jrn_priv=3D$User->get_ledger_access($Ledger->id); + $jrn_priv=3D$g_user->get_ledger_access($Ledger->id); // Check privilege if ( isset($_REQUEST['p_jrn']) && ( $jrn_priv =3D=3D 'X')) { @@ -190,7 +191,7 @@ /* by default we should the default period */ if ( ! isset($p_array['date_start'])) { - $period=3D$User->get_periode(); + $period=3D$g_user->get_periode(); $per=3Dnew Periode($cn,$period); list($date_start,$date_end)=3D$per->get_date_limit(); $p_array['date_start']=3D$date_start; @@ -250,7 +251,7 @@ .th('diff=C3=A9rence',' style=3D"text-align:right"')); // Filter the saldo // on the current year - $filter_year=3D" j_tech_per in (select p_id from parm_periode where= p_exercice=3D'".$User->get_exercice()."')"; + $filter_year=3D" j_tech_per in (select p_id from parm_periode where= p_exercice=3D'".$g_user->get_exercice()."')"; // for highligting tje line $idx=3D0; bcscale(2); @@ -269,7 +270,7 @@ $saldo_not_reconcilied=3D$array[$i]->get_bk_balance($filter_= year." and (trim(jr_pj_number) =3D'' or jr_pj_number is null)" ); =20 /* get saldo for reconcilied operation */ - =20 + $saldo_reconcilied=3D$array[$i]->get_bk_balance($filter_year." and = ( trim(jr_pj_number) !=3D '' and jr_pj_number is not null)" ); =20 if ( $idx%2 !=3D 0 ) @@ -318,7 +319,7 @@ } else $Ledger->id=3D$_REQUEST['p_jrn']; - $jrn_priv=3D$User->get_ledger_access($Ledger->id); + $jrn_priv=3D$g_user->get_ledger_access($Ledger->id); if ( isset($_GET["p_jrn"]) && $jrn_priv=3D=3D"X") { NoAccess(); @@ -355,7 +356,7 @@ echo HtmlInput::get_to_hidden(array('gDossier','p_action','sa')); $wLedger=3D$Ledger->select_ledger('FIN',3); if ($wLedger =3D=3D null ) exit ('Pas de journal disponible'); - =20 + $wLedger->javascript=3D"onchange=3D'this.form.submit()';"; echo $wLedger->input(); echo HtmlInput::submit('ref','Rafra=C3=AEchir'); @@ -414,7 +415,7 @@ echo ''; $bk_card=3Dnew Fiche($cn); $bk_card->id=3D$Ledger->get_bank(); - $filter_year=3D" j_tech_per in (select p_id from parm_periode where= p_exercice=3D'".$User->get_exercice()."')"; + $filter_year=3D" j_tech_per in (select p_id from parm_periode where= p_exercice=3D'".$g_user->get_exercice()."')"; =20 /* get saldo for not reconcilied operations */ $saldo_not_reconcilied=3D$bk_card->get_solde_detail($filter_year." a= nd j_grpt in (select jr_grpt_id from jrn where trim(jr_pj_number) =3D'' o= r jr_pj_number is null)" ); Modified: phpcompta/branches/rel600-dynamic-menu/include/constant.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/constant.php 2011-09-28 14:19:20 UTC (rev 420= 7) +++ phpcompta/branches/rel600-dynamic-menu/include/constant.php 2011-10-1= 3 20:00:17 UTC (rev 4208) @@ -35,8 +35,8 @@ /*set to none for production */ /* uncomment for production */ =20 -$version_phpcompta=3DSVNINFO;=20 -define ("DEBUG",false); +$version_phpcompta=3D9999; +define ("DEBUG",true); =20 define ("DBVERSION",97); define ("DBVERSIONREPO",13); Modified: phpcompta/branches/rel600-dynamic-menu/include/fiche.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/fiche.inc.php 2011-09-28 14:19:20 UTC (rev 42= 07) +++ phpcompta/branches/rel600-dynamic-menu/include/fiche.inc.php 2011-10-= 13 20:00:17 UTC (rev 4208) @@ -34,12 +34,14 @@ =20 $gDossier=3Ddossier::id(); $str_dossier=3Ddossier::get(); +global $User; =20 $pop_tva=3Dnew IPopup('popup_tva'); $pop_tva->title=3D_('Choix TVA'); $pop_tva->value=3D''; echo $pop_tva->input(); =20 + $cn=3Dnew Database($gDossier); // Security check $write=3D$User->check_action(FICADD); @@ -58,6 +60,8 @@ $h=3Dnew IHidden(); echo $h->input('p_action','fiche'); echo $h->input('action','search'); + echo $h->input('ac',$_REQUEST['ac']); + echo _("Recherche :").$w->input('search_text',$search_text); echo HtmlInput::submit('submit',_('Rechercher')); echo ''; @@ -92,6 +96,7 @@ $r.=3D'
'; $r.=3Ddossier::hidden(); $r.=3DHtmlInput::hidden("fd_id",$p_fiche_def->id); + $r.=3DHtmlInput::hidden("ac",$_REQUEST['ac']); $r.=3DHtmlInput::hidden("p_action","fiche"); $r.=3D $p_fiche_def->input_base(); $r.=3D'
'; @@ -101,9 +106,10 @@ /* attributes */ $r.=3D'
D=C3=A9tails'; =20 - $r.=3D ''; + $r.=3D ''; $r.=3Ddossier::hidden(); $r.=3DHtmlInput::hidden("fd_id",$p_fiche_def->id); + $r.=3DHtmlInput::hidden("ac",$_REQUEST['ac']); $r.=3D $p_fiche_def->DisplayAttribut("remove"); $r.=3D HtmlInput::submit('add_line',_('Ajoutez cet =C3=A9l=C3=A9ment= ')); $r.=3D HtmlInput::submit("save_line",_("Sauvez")); Modified: phpcompta/branches/rel600-dynamic-menu/include/impress_bilan.in= c.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/impress_bilan.inc.php 2011-09-28 14:19:20 UTC= (rev 4207) +++ phpcompta/branches/rel600-dynamic-menu/include/impress_bilan.inc.php = 2011-10-13 20:00:17 UTC (rev 4208) @@ -32,7 +32,7 @@ // Show the jrn and date //----------------------------------------------------- require_once('class_database.php'); - +global $User; //----------------------------------------------------- // Form //----------------------------------------------------- @@ -52,18 +52,17 @@ $wex=3D$ex->select('exercice',$exercice,' onchange=3D"submit(this)"'); echo $wex->input(); echo dossier::hidden(); -echo HtmlInput::get_to_hidden(array('p_action','type')); +echo HtmlInput::get_to_hidden(array('ac','type')); echo ''; echo '
'; =20 $filter_year=3D" where p_exercice=3D'".FormatString($exercice)."'"; echo '
'; -echo HtmlInput::hidden('p_action','impress'); echo HtmlInput::hidden('type','bilan'); echo dossier::hidden(); echo $bilan->display_form ($filter_year); echo HtmlInput::submit('verif',_('Verification comptabilite')); -echo HtmlInput::get_to_hidden(array('exercice')); +echo HtmlInput::get_to_hidden(array('ac','exercice')); echo '
'; =20 =20 Modified: phpcompta/branches/rel600-dynamic-menu/include/impress_fiche.in= c.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/impress_fiche.inc.php 2011-09-28 14:19:20 UTC= (rev 4207) +++ phpcompta/branches/rel600-dynamic-menu/include/impress_fiche.inc.php = 2011-10-13 20:00:17 UTC (rev 4208) @@ -27,6 +27,8 @@ =20 $gDossier=3Ddossier::id(); $cn=3Dnew Database($gDossier); +global $User; + /** * Show first the form */ @@ -69,8 +71,7 @@ echo '
'; echo '
'; echo dossier::hidden(); -echo HtmlInput::hidden('p_action',$_GET['p_action']); -echo HtmlInput::hidden('type',$_GET['type']); +echo HtmlInput::hidden('ac',$_GET['ac']); require_once('template/impress_cat_card.php'); echo HtmlInput::submit('cat_display',_('Recherche')); echo '
'; @@ -106,7 +107,7 @@ HtmlInput::submit('bt_csv',"Export CSV"). HtmlInput::hidden('act',"CSV/fiche"). $hid->input("type","fiche"). - $hid->input("p_action","impress"). + $hid->input("ac",$_REQUEST['ac']). $hid->input("fd_id",$_REQUEST['cat']); echo ""; =20 Modified: phpcompta/branches/rel600-dynamic-menu/include/impress_gl_compt= es.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/impress_gl_comptes.inc.php 2011-09-28 14:19:2= 0 UTC (rev 4207) +++ phpcompta/branches/rel600-dynamic-menu/include/impress_gl_comptes.inc= .php 2011-10-13 20:00:17 UTC (rev 4208) @@ -34,14 +34,14 @@ // Show the jrn and date //----------------------------------------------------- require_once('class_database.php'); - +global $User; //----------------------------------------------------- // Form //----------------------------------------------------- echo '
'; =20 echo '
'; -echo HtmlInput::hidden('p_action','impress'); +echo HtmlInput::hidden('ac',$_REQUEST['ac']); echo HtmlInput::hidden('type','gl_comptes'); echo dossier::hidden(); echo ''; @@ -117,7 +117,7 @@ $sql=3D'select pcm_val from tmp_pcmn '; $cond_poste=3D''; =20 - if ($from_poste->value !=3D '')=20 + if ($from_poste->value !=3D '') { $cond_poste =3D ' where '; $cond_poste .=3D' pcm_val >=3D upper (\''.Database::escape_string($fro= m_poste->value).'\')'; @@ -125,7 +125,7 @@ =20 if ( $to_poste->value !=3D '') { - if ( $cond_poste =3D=3D '')=20 + if ( $cond_poste =3D=3D '') { $cond_poste =3D ' where pcm_val <=3D upper (\''.Database::escape_s= tring($to_poste->value).'\')'; } @@ -155,13 +155,13 @@ echo '
'; $l=3D(isset($_REQUEST['letter']))?2:0; $s=3D(isset($_REQUEST['solded']))?1:0; -=09 + foreach ($a_poste as $poste_id ) { $Poste=3Dnew Acc_Account_Ledger ($cn, $poste_id['pcm_val']); $Poste->load(); -=09 =20 + $Poste->get_row_date( $_GET['from_periode'], $_GET['to_periode']= ,$l,$s); if ( empty($Poste->row)) { Modified: phpcompta/branches/rel600-dynamic-menu/include/impress_jrn.inc.= php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/impress_jrn.inc.php 2011-09-28 14:19:20 UTC (= rev 4207) +++ phpcompta/branches/rel600-dynamic-menu/include/impress_jrn.inc.php 20= 11-10-13 20:00:17 UTC (rev 4208) @@ -29,6 +29,7 @@ require_once('class_dossier.php'); load_all_script(); $gDossier=3Ddossier::id(); +global $User; //----------------------------------------------------- // Show the jrn and date //----------------------------------------------------- @@ -86,14 +87,14 @@ $wex=3D$ex->select('exercice',$exercice,' onchange=3D"submit(this)"'); echo $wex->input(); echo dossier::hidden(); -echo HtmlInput::get_to_hidden(array('p_action','type')); +echo HtmlInput::get_to_hidden(array('ac','type')); echo ''; echo ''; =20 =20 =20 echo ''.dossier::hidden(); -echo HtmlInput::hidden('p_action','impress'); +echo HtmlInput::get_to_hidden(array('ac','type')); echo HtmlInput::hidden('type','jrn'); echo HtmlInput::get_to_hidden(array('exercice')); echo '
'; @@ -171,22 +172,22 @@ HtmlInput::submit('bt_pdf',"Export PDF"). HtmlInput::hidden('act','PDF/ledger'). $hid->input("type","jrn"). - $hid->input("p_action","impress"). $hid->input("jrn_id",$Jrn->id). $hid->input("from_periode",$_GET['from_periode']). $hid->input("to_periode",$_GET['to_periode']); echo $hid->input("p_simple",$_GET['p_simple']); + echo HtmlInput::get_to_hidden(array('ac','type')); + echo ""; =20 - echo ""; echo '"; =20 echo ""; Modified: phpcompta/branches/rel600-dynamic-menu/include/impress_poste.in= c.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/impress_poste.inc.php 2011-09-28 14:19:20 UTC= (rev 4207) +++ phpcompta/branches/rel600-dynamic-menu/include/impress_poste.inc.php = 2011-10-13 20:00:17 UTC (rev 4208) @@ -28,13 +28,14 @@ * file included from user_impress * * some variable are already defined $cn, $User ... - *=20 + * */ //----------------------------------------------------- // Show the jrn and date //----------------------------------------------------- require_once('class_database.php'); require_once('class_ipopup.php'); +global $User; =20 echo IPoste::ipopup('ipop_account'); echo ICard::ipopup('ipopcard'); @@ -49,7 +50,7 @@ echo '
'; =20 echo '
'; -echo HtmlInput::hidden('p_action','impress'); +echo HtmlInput::hidden('ac',$_REQUEST['ac']); echo HtmlInput::hidden('type','poste'); echo dossier::hidden(); echo '
'.dossier::hidd= en(). HtmlInput::submit('bt_csv',"Export CSV"). HtmlInput::hidden('act','CSV/ledger'). $hid->input("type","jrn"). - $hid->input("p_action","impress"). $hid->input("jrn_id",$Jrn->id). $hid->input("from_periode",$_GET['from_periode']). $hid->input("to_periode",$_GET['to_periode']); echo $hid->input("p_simple",$_GET['p_simple']); + echo HtmlInput::get_to_hidden(array('ac','type')); echo "
'; Modified: phpcompta/branches/rel600-dynamic-menu/include/impress_rapport.= inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/impress_rapport.inc.php 2011-09-28 14:19:20 U= TC (rev 4207) +++ phpcompta/branches/rel600-dynamic-menu/include/impress_rapport.inc.ph= p 2011-10-13 20:00:17 UTC (rev 4208) @@ -28,7 +28,7 @@ require_once("class_idate.php"); require_once("class_acc_report.php"); require_once('class_exercice.php'); - +global $User; //----------------------------------------------------- // If print is asked // First time in html @@ -90,14 +90,14 @@ echo '"; + $hid->input("type","rapport").$hid->input("ac",$_GET['ac'])."= "; =20 echo '"; =20 @@ -116,12 +116,12 @@ /*! ************************************************************ * \brief return an array of f_id and f_name - * =20 - *=20 + * + * * \param $p_cn database connection * \param _sg_code stock_goods.sg_code * \return - * - array (f_id, f_label) or null if nothing is found=20 + * - array (f_id, f_label) or null if nothing is found */ function getFicheNameCode ($p_cn,$p_sg_code) { @@ -153,9 +153,9 @@ } /*! ************************************************** - * \brief View the details of a stock=20 - * =20 - *=20 + * \brief View the details of a stock + * + * *\param $p_cn database connection * \param$p_sg_code * \param $p_year @@ -315,9 +315,9 @@ } /*! ************************************************** - * \brief =20 - * =20 - * parm :=20 + * \brief + * + * parm : * - * gen : * - @@ -344,7 +344,7 @@ =20 } /*! - * \brief return the quantity of a sg_code for the period=20 + * \brief return the quantity of a sg_code for the period * * \return number or NULL */ Modified: phpcompta/branches/rel600-dynamic-menu/include/suivi_adm.inc.ph= p =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/suivi_adm.inc.php 2011-09-28 14:19:20 UTC (re= v 4207) +++ phpcompta/branches/rel600-dynamic-menu/include/suivi_adm.inc.php 2011= -10-13 20:00:17 UTC (rev 4208) @@ -22,11 +22,10 @@ =20 /*!\file * \brief this file is used for the follow up of the customer (mail, mee= ting...) - * - p_action =3D adm - * - sb =3D detail=20 + * - sb =3D detail * - sc =3D sv * - sd =3D this parameter is used here - * - $cn =3D database connection=20 + * - $cn =3D database connection */ require_once('class_action.php'); $User->can_request(GECOUR); @@ -38,8 +37,8 @@ */ $sub_action=3D(isset($_REQUEST['sa']))?$_REQUEST['sa']:"list"; $ag_id=3D(isset($_REQUEST['ag_id']))?$_REQUEST['ag_id']:0; -$p_action=3D$_REQUEST['p_action']; -$base=3D"p_action=3D$p_action&sc=3Dsv&sb=3Ddetail&f_id=3D".$_REQUEST['f_= id']; +$ac=3D$_REQUEST['ac']; +$base=3D"ac=3Dac&sc=3Dsv&sb=3Ddetail&f_id=3D".$_REQUEST['f_id']; $retour=3DHtmlInput::button_anchor('Retour','?'.dossier::get().'&'.$base= ); $fiche=3Dnew Fiche($cn,$_REQUEST['f_id']); =20 Modified: phpcompta/branches/rel600-dynamic-menu/include/suivi_client.inc= .php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/suivi_client.inc.php 2011-09-28 14:19:20 UTC = (rev 4207) +++ phpcompta/branches/rel600-dynamic-menu/include/suivi_client.inc.php 2= 011-10-13 20:00:17 UTC (rev 4208) @@ -23,13 +23,12 @@ /*!\file * \brief this file is used for the follow up of the customer (mail, mee= ting...) * - p_action =3D client - * - sb =3D detail=20 + * - sb =3D detail * - sc =3D sv * - sd =3D this parameter is used here - * - $cn =3D database connection=20 + * - $cn =3D database connection */ require_once('class_action.php'); -$User->can_request(GECOUR); load_all_script(); =20 /** @@ -39,8 +38,8 @@ */ $sub_action=3D(isset($_REQUEST['sa']))?$_REQUEST['sa']:"list"; $ag_id=3D(isset($_REQUEST['ag_id']))?$_REQUEST['ag_id']:0; -$p_action=3D$_REQUEST['p_action']; -$base=3D"p_action=3D$p_action&sc=3Dsv&sb=3Ddetail&f_id=3D".$_REQUEST['f_= id']; +//$p_action=3D$_REQUEST['p_action']; +$base=3D"ac=3D".$_REQUEST['ac']."&sc=3Dsv&sb=3Ddetail&f_id=3D".$_REQUEST= ['f_id']; $retour=3DHtmlInput::button_anchor('Retour','?'.dossier::get().'&'.$base= ); $fiche=3Dnew Fiche($cn,$_REQUEST['f_id']); =20 Modified: phpcompta/branches/rel600-dynamic-menu/include/suivi_supplier.i= nc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/suivi_supplier.inc.php 2011-09-28 14:19:20 UT= C (rev 4207) +++ phpcompta/branches/rel600-dynamic-menu/include/suivi_supplier.inc.php= 2011-10-13 20:00:17 UTC (rev 4208) @@ -22,11 +22,10 @@ =20 /*!\file * \brief this file is used for the follow up of the customer (mail, mee= ting...) - * - p_action =3D supplier - * - sb =3D detail=20 + * - sb =3D detail * - sc =3D sv * - sd =3D this parameter is used here - * - $cn =3D database connection=20 + * - $cn =3D database connection */ require_once('class_action.php'); $User->can_request(GECOUR); @@ -38,8 +37,8 @@ */ $sub_action=3D(isset($_REQUEST['sa']))?$_REQUEST['sa']:"list"; $ag_id=3D(isset($_REQUEST['ag_id']))?$_REQUEST['ag_id']:0; -$p_action=3D$_REQUEST['p_action']; -$base=3D"p_action=3D$p_action&sc=3Dsv&sb=3Ddetail&f_id=3D".$_REQUEST['f_= id']; +$p_action=3D$_REQUEST['ac']; +$base=3D"ac=3D$p_action&sc=3Dsv&sb=3Ddetail&f_id=3D".$_REQUEST['f_id']; $retour=3DHtmlInput::button_anchor('Retour','?'.dossier::get().'&'.$base= ); $fiche=3Dnew Fiche($cn,$_REQUEST['f_id']); =20 Modified: phpcompta/branches/rel600-dynamic-menu/include/supplier.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/supplier.inc.php 2011-09-28 14:19:20 UTC (rev= 4207) +++ phpcompta/branches/rel600-dynamic-menu/include/supplier.inc.php 2011-= 10-13 20:00:17 UTC (rev 4208) @@ -30,6 +30,7 @@ require_once('class_iaction.php'); require_once('class_fiche_def.php'); require_once('class_ipopup.php'); +global $User; =20 $low_action=3D(isset($_REQUEST['sb']))?$_REQUEST['sb']:"list"; /*! \file @@ -90,7 +91,7 @@ =20 ?> "> - + "> name=3D'retour'; $return->label=3D'Retour'; -$return->value=3D'?p_action=3Dsupplier&'.$str_dossier; -$root=3D"?p_action=3Dsupplier&sb=3Ddetail&f_id=3D".$_REQUEST["f_id"].'&'= .$str_dossier; +$return->value=3D'?ac=3D'.$_REQUEST['ac'].'&'.$str_dossier; +$root=3D'?ac=3D'.$_REQUEST['ac']."&sb=3Ddetail&f_id=3D".$_REQUEST["f_id"= ].'&'.$str_dossier; $ss_action=3D( isset ($_REQUEST['sc'] ))? $_REQUEST['sc']: ''; switch ($ss_action) { @@ -71,7 +71,7 @@ array($root.'&sc=3Dop',_('Op=C3=A9rations'),_('Toutes = les op=C3=A9rations'),4), array($root.'&sc=3Dbal',_('Balance'),_('Balance du fou= rnisseur'),7), array($root.'&sc=3Dlet',_('Lettrage'),_('Op=C3=A9ratio= ns & Lettrages'),6), - array('?p_action=3Dsupplier&'.dossier::get(),_('Retour= liste'),_('Retour =C3=A0 la liste des fournisseurs'),5) + array('?ac=3D'.$_REQUEST['ac'].'&'.dossier::get(),_('R= etour liste'),_('Retour =C3=A0 la liste des fournisseurs'),5) ), 'H',"mtitle","mtitle",$def,' '); echo ''; Modified: phpcompta/branches/rel600-dynamic-menu/include/template/dashboa= rd.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/template/dashboard.php 2011-09-28 14:19:20 UT= C (rev 4207) +++ phpcompta/branches/rel600-dynamic-menu/include/template/dashboard.php= 2011-10-13 20:00:17 UTC (rev 4208) @@ -2,7 +2,10 @@
-display(); ?> +display(); +?>
get_mini_report(); +$report=3D$g_user->get_mini_report(); =20 $rapport=3Dnew Acc_Report($cn); $rapport->id=3D$report; if ( $rapport->exist() =3D=3D false ) { - $user->set_mini_report(0); + $g_user->set_mini_report(0); $report=3D0; } =20 if ( $report !=3D 0 ) { echo '
'; echo '
'.$rapport->g= et_name().''; - $exercice=3D$user->get_exercice(); + $exercice=3D$g_user->get_exercice(); if ( $exercice =3D=3D 0 ) { alert(_('Aucune periode par defaut')); } else { Modified: phpcompta/branches/rel600-dynamic-menu/include/user_action_gl.p= hp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/user_action_gl.php 2011-09-28 14:19:20 UTC (r= ev 4207) +++ phpcompta/branches/rel600-dynamic-menu/include/user_action_gl.php 201= 1-10-13 20:00:17 UTC (rev 4208) @@ -59,6 +59,7 @@ if (isset($_REQUEST['sb'])) echo HtmlInput::hidden("sb",$_REQUEST['sb'])= ; if (isset($_REQUEST['sc'])) echo HtmlInput::hidden("sc",$_REQUEST['sc'])= ; if (isset($_REQUEST['f_id'])) echo HtmlInput::hidden("f_id",$_REQUEST['f= _id']); +if (isset($_REQUEST['ac'])) echo HtmlInput::hidden("ac",$_REQUEST['ac'])= ; =20 =20 echo dossier::hidden(); Modified: phpcompta/branches/rel600-dynamic-menu/include/user_menu.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/user_menu.php 2011-09-28 14:19:20 UTC (rev 42= 07) +++ phpcompta/branches/rel600-dynamic-menu/include/user_menu.php 2011-10-= 13 20:00:17 UTC (rev 4208) @@ -61,7 +61,7 @@ else $tr=3D"even"; if ( $user->check_dossier($id)!=3D'P') { - $target=3D"access.php?gDossier=3D$id"; + $target=3D"do.php?gDossier=3D$id"; } else { @@ -235,7 +235,7 @@ //('rapprt.php','Rapprochement'), =20 array('user_advanced.php?'.$str_dossier.'&p_= action=3Dpreod',_('Ecritures definies'),"",9), - =20 + array('compta.php?p_action=3Dstock&'.$str_do= ssier,'Stock',_("Gestion des stocks"),5), array('user_advanced.php?p_action=3Ddefrepor= t&'.$str_dossier,_('Rapport'),_("Rapport"),6), array('user_advanced.php?p_action=3Douv&'.$s= tr_dossier,_('Ecriture ouverture'),"",8), @@ -442,7 +442,7 @@ * \note must include javascript : acc_ledger.js * \return string */ -function menu_tool($p_from) +function menu_tool_deprecated($p_from) { =20 if ( ! isset ($_REQUEST['gDossier'])) From MAILER-DAEMON Thu Oct 13 15:58:20 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RERQ4-0004fC-Td for mharc-phpcompta-dev@gnu.org; Thu, 13 Oct 2011 15:58:20 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Thu, 13 Oct 2011 22:06:14 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4209 - in phpcompta/branches/rel600-dynamic-menu: html include include/template X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Oct 2011 19:58:19 -0000 Author: danydb Date: 2011-10-13 22:06:13 +0200 (Thu, 13 Oct 2011) New Revision: 4209 Added: phpcompta/branches/rel600-dynamic-menu/html/do.php phpcompta/branches/rel600-dynamic-menu/include/dashboard.inc.php phpcompta/branches/rel600-dynamic-menu/include/template/menu.php phpcompta/branches/rel600-dynamic-menu/include/template/module.php Log: Add new files Added: phpcompta/branches/rel600-dynamic-menu/html/do.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/html/do.php = (rev 0) +++ phpcompta/branches/rel600-dynamic-menu/html/do.php 2011-10-13 20:06:1= 3 UTC (rev 4209) @@ -0,0 +1,61 @@ +'; +global $g_user; +/* others report */ +$cal=3Dnew Calendar(); +$cal->get_preference(); +$Ledger=3Dnew Acc_Ledger($cn,0); +$last_ledger=3Darray(); +if ( $g_user->check_action(GESTION)=3D=3D1) + { + $Operation=3Dnew Action($cn); + $last_ledger=3D$Ledger->get_last(10); + $last_operation=3D$Operation->get_last(10); + } +else + { + $last_operation=3Darray(); + } +ob_start(); +require_once('template/dashboard.php'); +$ret=3Dob_get_contents(); +ob_end_clean(); +echo $ret; + +echo '
'; +?> Added: phpcompta/branches/rel600-dynamic-menu/include/template/menu.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/template/menu.php = (rev 0) +++ phpcompta/branches/rel600-dynamic-menu/include/template/menu.php 2011= -10-13 20:06:13 UTC (rev 4209) @@ -0,0 +1,87 @@ +
+
'. dossier::hidden(). HtmlInput::submit('bt_other',"Autre Rapport"). - $hid->input("type","rapport").$hid->input("p_action","impress")."
'. HtmlInput::submit('bt_pdf',"Export PDF"). HtmlInput::hidden('act','PDF/report'). dossier::hidden(). $hid->input("type","rapport"). - $hid->input("p_action","impress"). + $hid->input("ac",$_GET['ac']). $hid->input("form_id",$Form->id); if ( isset($_GET['from_periode'])) echo $hid->input("from_periode",$= _GET['from_periode']); if ( isset($_GET['to_periode'])) echo $hid->input("to_periode",$_GET= ['to_periode']); @@ -115,7 +115,7 @@ HtmlInput::submit('bt_csv',"Export CSV"). dossier::hidden(). $hid->input("type","form"). - $hid->input("p_action","impress"). + $hid->input("ac",$_GET['ac']). $hid->input("form_id",$Form->id); if ( isset($_GET['from_periode'])) echo $hid->input("from_periode",$= _GET['from_periode']); if ( isset($_GET['to_periode'])) echo $hid->input("to_periode",$_GET= ['to_periode']); @@ -186,14 +186,14 @@ $wex=3D$ex->select('exercice',$exercice,' onchange=3D"submit(this)"'); echo $wex->input(); echo dossier::hidden(); -echo HtmlInput::get_to_hidden(array('p_action','type')); +echo HtmlInput::get_to_hidden(array('ac','type')); echo '
'; echo ''; =20 =20 echo '
'; $hidden=3Dnew IHidden(); -echo $hidden->input("p_action","impress"); +echo $hidden->input("ac",$_GET['ac']); echo $hidden->input("type","rapport"); echo dossier::hidden(); =20 Modified: phpcompta/branches/rel600-dynamic-menu/include/impress_rec.inc.= php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/impress_rec.inc.php 2011-09-28 14:19:20 UTC (= rev 4207) +++ phpcompta/branches/rel600-dynamic-menu/include/impress_rec.inc.php 20= 11-10-13 20:00:17 UTC (rev 4208) @@ -25,7 +25,8 @@ */ require_once ('class_acc_reconciliation.php'); require_once('function_javascript.php'); -echo load_all_script(); +global $User; + /** *@file *@todo add the export to PDF @@ -38,7 +39,7 @@ $choice=3D(isset($_GET['choice']))?$_GET['choice']:0; $r_jrn=3D(isset($_GET['r_jrn']))?$_GET['r_jrn']:''; echo ''; -echo dossier::hidden().HtmlInput::hidden('p_action','impress').HtmlInput= ::hidden('type','rec'); +echo dossier::hidden().HtmlInput::hidden('ac',$_GET['ac']).HtmlInput::hi= dden('type','rec'); echo 'Filtre par journal :'.HtmlInput::select_ledger($aledger,$r_jrn ); echo '
'; /* Modified: phpcompta/branches/rel600-dynamic-menu/include/lettering.gestio= n.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/lettering.gestion.inc.php 2011-09-28 14:19:20= UTC (rev 4207) +++ phpcompta/branches/rel600-dynamic-menu/include/lettering.gestion.inc.= php 2011-10-13 20:00:17 UTC (rev 4208) @@ -1,10 +1,11 @@ '; echo '
'; echo ''; echo dossier::hidden(); -echo HtmlInput::hidden('p_action',$_REQUEST['p_action']); +echo HtmlInput::hidden('ac',$_REQUEST['ac']); echo HtmlInput::hidden('sb',$_REQUEST['sb']); echo HtmlInput::hidden('sc',$_REQUEST['sc']); echo HtmlInput::hidden('f_id',$_REQUEST['f_id']); Modified: phpcompta/branches/rel600-dynamic-menu/include/stock.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/stock.inc.php 2011-09-28 14:19:20 UTC (rev 42= 07) +++ phpcompta/branches/rel600-dynamic-menu/include/stock.inc.php 2011-10-= 13 20:00:17 UTC (rev 4208) @@ -34,26 +34,13 @@ html_page_start($_SESSION['g_theme']); =20 require_once('class_database.php'); -/* Admin. Dossier */ -$gDossier=3Ddossier::id(); =20 $cn=3Dnew Database($gDossier); include_once ("class_user.php"); -$User=3Dnew User($cn); -$User->Check(); +global $User; =20 - $href=3Dbasename($_SERVER['PHP_SELF']); -if ($href=3D=3D'compta.php') -{ - //Show the top menu - include_once ("user_menu.php"); =20 - // Show Menu Left - $left_menu=3DShowMenuAdvanced(5); - //echo '
'; - echo $left_menu; -} // Get The priv on the selected folder $User->can_request(STOLE,1); =20 @@ -159,16 +146,16 @@ echo '
'; echo 'Entrer la valeur qui doit augmenter ou diminuer le stock'; echo ''; - echo ''; + echo ''; echo ChangeStock($sg_code,$year); echo HtmlInput::submit("sub_change" ,"Valider"); echo dossier::hidden(); - echo HtmlInput::button_anchor('Retour','?p_action=3Dstock&'.doss= ier::get()); + echo HtmlInput::button_anchor('Retour','?ac=3D'.$_REQUEST['ac'].= '&'.dossier::get()); echo ''; echo '
'; } else - echo HtmlInput::button_anchor('Retour','?p_action=3Dstock&'.doss= ier::get()); + echo HtmlInput::button_anchor('Retour','?ac=3D'.$_REQUEST['ac'].= '&'.dossier::get()); echo '
'; =20 =20 @@ -185,7 +172,7 @@ for ( $i =3D 0; $i < Database::num_row($Res);$i++) { $l=3DDatabase::fetch_array($Res,$i); - $url=3Dsprintf("?p_action=3Dstock&year=3D%d&".dossier::get(), + $url=3Dsprintf("?ac=3D".$_REQUEST['ac']."&year=3D%d&".dossier::get()= , $l['exercice']); $r.=3DHtmlInput::button_anchor($l['exercice'],$url); } Modified: phpcompta/branches/rel600-dynamic-menu/include/stock_inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/stock_inc.php 2011-09-28 14:19:20 UTC (rev 42= 07) +++ phpcompta/branches/rel600-dynamic-menu/include/stock_inc.php 2011-10-= 13 20:00:17 UTC (rev 4208) @@ -25,9 +25,9 @@ =20 /*! ************************************************** - * \brief show the listing of all goods=20 - * =20 + * \brief show the listing of all goods * + * *\param $cn database connection * \param $p_year exercice * - @@ -38,7 +38,7 @@ // build sql -- get the different merchandise sold or bought // during the p_year /* $sql=3D" select distinct sg_code - from stock_goods=20 + from stock_goods left outer join jrnx on (stock_goods.j_id=3Djrnx.j_id) right outer join parm_periode on (parm_periode.p_id=3Djrnx.j_tec= h_per) where @@ -75,7 +75,7 @@ =20 // sg_code and link to details $result.=3D"
".''. $r['sg_code']."
+ + + + + + + +
"> + &= ac=3D:"> + + +
+
+
+1): + $file_to_include=3D$cn->get_array("select me_file,me_submenu from me= nu_ref + join menu using(me_code) + where + m_code=3D$1 and me_id=3D$2",array($module[0],$module[1])); +$gDossier=3Ddossier::id(); +?> + + +
+ + + get_array("select me_id,me_code,me_menu,me_file fro= m menu + join menu_ref using(me_code) + where + me_submenu in (select me_code from + menu where me_id=3D$1)",array($module[1])); + for ($e=3D0;$e + + + +
"> + &ac=3D::"> + + +
+
+ get_value("select me_file from menu + join menu_ref using (me_code) + where me_id=3D$1",array($module[2])); + endif; + else: + $file=3D$file_to_include[0]['me_file']; + endif; +?> + + + + +
Added: phpcompta/branches/rel600-dynamic-menu/include/template/module.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/template/module.php = (rev 0) +++ phpcompta/branches/rel600-dynamic-menu/include/template/module.php 20= 11-10-13 20:06:13 UTC (rev 4209) @@ -0,0 +1,40 @@ +
+
+ +

Dossier :

+ +
+
+ + + "; + continue; + } + if ($row['m_code']=3D=3D$selected) + { + $style=3D"background:red"; + } + if ( $row['m_url']!=3D'') + { + $url=3D$row['m_url']; + } + else + { + $url=3D"do.php?gDossier=3D".Dossier::id()."&ac=3D".$row['m_code']; + } + ?> + + + +
">">
+ +
+
\ No newline at end of file From MAILER-DAEMON Thu Oct 13 17:33:24 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RESu4-0002FQ-GU for mharc-phpcompta-dev@gnu.org; Thu, 13 Oct 2011 17:33:24 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Thu, 13 Oct 2011 23:41:16 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4210 - phpcompta/trunk/include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Oct 2011 21:33:23 -0000 Author: danydb Date: 2011-10-13 23:41:15 +0200 (Thu, 13 Oct 2011) New Revision: 4210 Modified: phpcompta/trunk/include/class_acc_ledger.php phpcompta/trunk/include/user_action_gl.php Log: 0000381: R?\195?\169?\195?\169criture des tri pour toutes les tables Modified: phpcompta/trunk/include/class_acc_ledger.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_acc_ledger.php 2011-10-13 20:06:13 UTC = (rev 4209) +++ phpcompta/trunk/include/class_acc_ledger.php 2011-10-13 21:41:15 UTC = (rev 4210) @@ -41,7 +41,7 @@ require_once('ac_common.php'); require_once('class_inum.php'); require_once('class_lettering.php'); - +require_once 'class_sort_table.php'; /*!\file * \brief Class for jrn, class acc_ledger for manipulating the ledger */ @@ -110,7 +110,7 @@ } /** *let you delete a operation - *@note by cascade it will delete also in=20 + *@note by cascade it will delete also in * - jrnx * - stock * - quant_purchase @@ -134,7 +134,7 @@ } /** * reverse the operation by creating the opposite one, - * the result is to avoid it=20 + * the result is to avoid it * it must be done in * - jrn * - jrnx @@ -594,87 +594,40 @@ $amount_unpaid=3D0.0; $limit=3D($_SESSION['g_pagesize']!=3D-1)?" LIMIT ".$_SESSION['g_= pagesize']:""; $offset=3D($_SESSION['g_pagesize']!=3D-1)?" OFFSET ".Database::e= scape_string($offset):""; - $order=3D" order by jr_date_order asc,jr_internal asc"; // Sort - $url=3DCleanUrl(); + $url=3Dbasename($_SERVER['SCRIPT_NAME']).'?'.CleanUrl(); $str_dossier=3Ddossier::get(); - $image_asc=3D''; - $image_desc=3D''; - $image_sel_desc=3D''; - $image_sel_asc=3D''; =20 - $sort_date=3D"
$image_asc"._('Date')."$image_desc"; - $sort_description=3D" $image_asc"._('Description')."$image_desc"; - $sort_amount=3D" $image_asc"._('Montant')." $image_desc"; - $sort_pj=3D" $image_asc"._('PJ')."= $image_desc"; - $sort_echeance=3D" $image_asc"._('Ech')." $image_desc "; + $sort=3Dnew Sort_Table(); + $sort->add(_('Date'), + $url, + ' order by jr_date_order asc,substring(jr_pj_number,\'\\\d+$\')::numer= ic asc ', + ' order by jr_date_order desc,substring(jr_pj_number,\'\\\d+$\')::nume= ric desc ','da','dd'); + $sort->add(_('Ech=C3=A9ance'), + $url, + ' order by jr_ech asc,substring(jr_pj_number,\'\\\d+$\')::numeric asc = ', + ' order by jr_ech desc,substring(jr_pj_number,\'\\\d+$\')::numeric des= c ','ea','ed'); + $sort->add(_('Pi=C3=A8ce'), + $url, + ' order by substring(jr_pj_number,\'\\\d+$\')::numeric asc ', + ' order by substring(jr_pj_number,\'\\\d+$\')::numeric desc ','pa','p= d'); + $sort->add(_('Description'), + $url, + ' order by jr_comment asc ', + ' order by jr_comment desc ','dsa','dsd'); + $sort->add(_('Montant'), + $url, + ' order by jr_montant asc ', + ' order by jr_montant desc ','ma','md'); =20 - $own=3Dnew Own($this->db); - // if an order is asked - if ( isset ($_GET['o']) ) - { - switch ($_GET['o']) - { - case 'pja': - // pj asc - $sort_pj=3D"$image_sel_asc PJ $image_desc"; - $order=3D' order by substring(jr_pj_number,\'\\\d+$\'):= :numeric asc '; - break; - case 'pjd': - $sort_pj=3D" $image_asc PJ $image_sel_desc"; - // pj desc - $order=3D' order by substring(jr_pj_number,\'\\\d+$\'):= :numeric desc '; - break; + $sort->add(_('Journal'), + $url, + ' order by jrn_def_name asc ', + ' order by jrn_def_name desc ','la','ld'); =20 - case 'da': - // date asc - $sort_date=3D"$image_sel_asc Date $image_desc"; - $order=3D' order by jr_date_order asc,substring(jr_pj_nu= mber,\'\\\d+$\')::numeric asc '; - break; - case 'dd': - $sort_date=3D" $image_asc Date $image_sel_desc"; - // date desc - $order=3D' order by jr_date_order desc,substring(jr_pj_n= umber,\'\\\d+$\')::numeric desc '; - break; - case 'ma': - // montant asc - $sort_amount=3D" $image= _sel_asc Montant $image_des= c"; - $order=3D" order by jr_montant asc "; - break; - case 'md': - // montant desc - $sort_amount=3D" $image_ascMontant $image_se= l_desc"; - $order=3D" order by jr_montant desc "; - break; - case 'ca': - // jr_comment asc - $sort_description=3D" $image_sel_asc Description $image_desc"; - $order=3D" order by jr_comment asc "; - break; - case 'cd': - // jr_comment desc - $sort_description=3D" $image_ascDescription $image_sel_desc"; - $order=3D" order by jr_comment desc "; - break; - case 'ea': - // jr_comment asc - $sort_echeance=3D" $image_sel_asc Ech. $image_desc"; - $order=3D" order by jr_ech asc "; - break; - case 'ed': - // jr_comment desc - $sort_echeance=3D" $image_asc Ech. $image_sel_desc"; - $order=3D" order by jr_ech desc "; - break; + $ord=3D(isset($_GET['ord']))?$_GET['ord']:'da'; =20 - } - } - else - { - // date asc - $sort_date=3D"$image_sel_asc Date $image_desc"; - $order=3D" order by jr_date_order asc,substring(jr_pj_number= ,'\\d+$')::numeric asc "; - } + $order=3D$sort->get_sql_order($ord); =20 // Count $count=3D$this->db->count_sql($sql); @@ -701,15 +654,16 @@ $r.=3D"Internal"; if ( $this->type=3D=3D'') { - $r.=3Dth('Journal'); + $r.=3D''.$sort->get_header(5).''; } - $r.=3D$sort_date; - $r.=3D$sort_echeance; - $r.=3D$sort_pj; + $r.=3D''.$sort->get_header(0).''; + $r.=3D''.$sort->get_header(1).''; + $r.=3D''.$sort->get_header(2).''; $r.=3Dth('tiers'); - $r.=3D$sort_description; + $r.=3D''.$sort->get_header(3).''; + $r.=3Dth('Notes',' style=3D"width:15%"'); - $r.=3D$sort_amount; + $r.=3D''.$sort->get_header(4).''; // if $p_paid is not equal to 0 then we have a paid column if ( $p_paid !=3D 0 ) { @@ -733,28 +687,7 @@ //internal code // button modify $r.=3D""; - // If url contains - // =20 - $href=3Dbasename($_SERVER['PHP_SELF']); - switch ($href) - { - // user_jrn.php - case 'compta.php': - $vue=3D"S"; //Expert View - break; - case 'commercial.php': - $vue=3D"S"; //Simple View - break; - case 'recherche.php': - $vue=3D(isset($_GET['expert']))?'E':'S'; - break; - default: - echo_error('user_form_ach.php',__LINE__,'Erreur invalid = request uri'); - exit (-1); - } - //DEBUG - $r.=3Dsprintf('%s ', $row['jr_id'], $gDossier, $row['jr_internal']); $r.=3D""; @@ -792,7 +725,7 @@ { $positive =3D $this->db->get_value("select qf_amount fro= m quant_fin where jr_id=3D$1", array($row['jr_id'])); - if ( $this->db->count() !=3D 0)=20 + if ( $this->db->count() !=3D 0) $positive=3D($positive < 0)?1:0; } $r.=3D""; @@ -1149,7 +1082,7 @@ * writing, reading or simply accessing. * \param $p_type =3D ALL or the type of the ledger (ACH,VEN,FIN,ODS= ) * \param $p_access =3D3 for READ and WRITE, 2 for write and 1 for r= eadonly - * \return object HtmlInput select=20 + * \return object HtmlInput select */ function select_ledger($p_type=3D"ALL",$p_access=3D3) { @@ -2520,10 +2453,10 @@ } } /** - *@brief retrieve operation from jrn=20 - *@param $p_from periode (id)=20 + *@brief retrieve operation from jrn + *@param $p_from periode (id) *@param $p_to periode (id) - *@return an array=20 + *@return an array */ function get_operation($p_from,$p_to) { @@ -2644,17 +2577,17 @@ 'vat' =3D> string '21.7600' (length=3D7) 'priv' =3D> string '0.0000' (length=3D6) 'tva_nd_recup' =3D> string '0.0000' (length=3D6) - 'tva' =3D>=20 + 'tva' =3D> array - 0 =3D>=20 + 0 =3D> array 'sum_vat' =3D> string '13.7200' (length=3D7) 'tva_id' =3D> string '1' (length=3D1) - 1 =3D>=20 + 1 =3D> array 'sum_vat' =3D> string '8.0400' (length=3D6) 'tva_id' =3D> string '3' (length=3D1) - 2 =3D>=20 + 2 =3D> array 'sum_vat' =3D> string '0.0000' (length=3D6) 'tva_id' =3D> string '4' (length=3D1) @@ -2858,7 +2791,7 @@ return $r; } /** - *Retrieve the third : supplier for purchase, customer for sale, ban= k for fin,=20 + *Retrieve the third : supplier for purchase, customer for sale, ban= k for fin, *@param $p_jrn_type type of the ledger FIN, VEN ACH or ODS */ function get_tiers($p_jrn_type,$jr_id) Modified: phpcompta/trunk/include/user_action_gl.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/user_action_gl.php 2011-10-13 20:06:13 UTC (r= ev 4209) +++ phpcompta/trunk/include/user_action_gl.php 2011-10-13 21:41:15 UTC (r= ev 4210) @@ -54,13 +54,8 @@ $bar=3Djrn_navigation_bar($offset,$max_line,$step,$page); =20 =20 -echo HtmlInput::hidden("p_action",$_REQUEST['p_action']); -if (isset($_REQUEST['sa'])) echo HtmlInput::hidden("sa",$_REQUEST['sa'])= ; -if (isset($_REQUEST['sb'])) echo HtmlInput::hidden("sb",$_REQUEST['sb'])= ; -if (isset($_REQUEST['sc'])) echo HtmlInput::hidden("sc",$_REQUEST['sc'])= ; -if (isset($_REQUEST['f_id'])) echo HtmlInput::hidden("f_id",$_REQUEST['f= _id']); +echo HtmlInput::request_to_hidden(array('sa','sb','sc','f_id','p_action'= )); =20 - echo dossier::hidden(); echo $bar; list($count,$html)=3D $Ledger->list_operation($sql,$offset); From MAILER-DAEMON Thu Oct 13 17:35:45 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RESwL-0002am-VS for mharc-phpcompta-dev@gnu.org; Thu, 13 Oct 2011 17:35:45 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Thu, 13 Oct 2011 23:43:40 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4211 - phpcompta/branches/rel560 X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Oct 2011 21:35:44 -0000 Author: danydb Date: 2011-10-13 23:43:40 +0200 (Thu, 13 Oct 2011) New Revision: 4211 Modified: phpcompta/branches/rel560/release-note Log: remove release Modified: phpcompta/branches/rel560/release-note =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel560/release-note 2011-10-13 21:41:15 UTC (rev 4= 210) +++ phpcompta/branches/rel560/release-note 2011-10-13 21:43:40 UTC (rev 4= 211) @@ -1,40 +1 @@ -1. Ajout balance par cat=C3=A9gorie de fiche -2. DONE3. changer le code pour ajouter de la CA ou la modifier dans un D= IV HTML, le fichier jrn.php devient inutile (deprecated) -3. DONE16 D=C3=A9tail op=C3=A9ration dans DIV HTML -4. Dans les d=C3=A9tails d'op=C3=A9rations, on a aussi des liens vers le= s historiques par fiche ou par poste comptable -5. Depuis les impressions -> balances et impression -> poste, on a les d= =C3=A9tails des op=C3=A9rations=20 - TODO15 Ajoutez les d=C3=A9tails pour l'impression en PDF pour impress= ion poste / fiche -6. TODO5 bug IE : les DIV HTML n'ont pas la bonne taille -7. DONE4 Ajout d'un lien sur les postes et client pour acc=C3=A8der avec= un DIV contenant l'historique (au moins une partie / pr=C3=A9sentation p= ar slice)/ bouton suivant-pr=C3=A9c=C3=A9dent ) -8. TODO18 Acc_Account_Ledger::HtmlTable et Fiche::HtmlTable, il manque l= a s=C3=A9curit=C3=A9 pour filtrer les journaux -9. Ajout d'une FK TODO1 r=C3=A9ecriture de quant_* la liaison avec la j= rn se fait =C3=A0 travers jr_id et non pas jr_internal qui n'est pas inde= x=C3=A9.=20 -Cons=C3=A9quence : r=C3=A9=C3=A9criture de code, correction modop, ... -10. TODO2 Object pour extourner proprement une operation, le fichier ann= ulation.php devient inutile (deprecated) depend de TODO1 TODO10 -11. TODO17 extourne depuis DIV HTML d=C3=A9pend de TODO16 -12. TODO10 Enlever le bouton enlever dans les listes d'op=C3=A9ration et= le mettre dans le DIV HTML qui pr=C3=A9sente les d=C3=A9tails de l'op=20 -13. Pour les balances, on peut choisir les journaux : adapt=C3=A9 =C3=A0= ceux en ayant vraiment beaucoup -14. Depuis les lettrages, on peut aussi acc=C3=A8der aux d=C3=A9tails d'= une op=C3=A9ration -15. TODO9 - d=C3=A9pend de TODO4 TODO2 - dans impressions, on peut avoir= les d=C3=A9tails de toutes les op=C3=A9rations -16. TODO19 Le menu Grand Livre devient recherche -17. TODO20 Ajouter d'attribut avec type : text, nombre ou date; ajouter = le javascript =C3=A9quivalent pour la saisie, le num=C3=A9ro de s=C3=A9qu= ence -commence =C3=A0 10000, afin de ne pas m=C3=A9langer les attributs que je= cr=C3=A9=C3=A9 avec ceux des utilisateurs. A ajouter dans la doc comme e= xemple pour la gestion d'abonn=C3=A9s dont on peut tirer un CSV par impre= ssion -> cat=C3=A9gorie -> r=C3=A9sume -18. Impression - Rapprochement=20 -19. TODO21 Dans DIV HTML donner le code de la TVA dans les d=C3=A9tails = VEN et ACH -20. TODO20 DIV HTML dans le tableau de bord -21. TODO14 confirmation quand effacement d'un PA (comptabilit=C3=A9 anal= ytique -> Plan Analytique) -22. TODO19 Pour les fiches,suivant le type d'attributs, on peut utiliser= le javascript pour les dates=20 -23. On peut ajouter aux mod=C3=A8les de fiches, des d=C3=A9tails qui son= t soit du texte soit des nombres soit une date, soit une zone. La longueu= r peut-=C3=AAtre d=C3=A9finie mais limit=C3=A9e =C3=A0 22 caract=C3=A8res= , sauf les dates et les zones dont les tailles sont fixes -24. TODO27 : D=C3=A9placement de fiche : les attributs manquant sont ajo= ut=C3=A9s ! -25 TODO24 : Dans impression -> poste , il faut avoir l'impression des d=C3= =A9tails des op=C3=A9rations=20 -26. TODO28 : dans jrnx ajouter les f_id, le qcode n'est l=C3=A0 que pou= r acc=C3=A8l=C3=A8rer; constraint fk on update cascade on delete restrict -27. TODO25 : dans recherche de liste, utilisez des tableaux ! -28. Dans les balances, on peut choisir plusieurs journaux ou plusieurs c= at. de journal. Les donn=C3=A9es sont filtr=C3=A9es en plus d'apr=C3=A8s = la s=C3=A9curit=C3=A9 -29. Dans impression -> poste, on peut filtrer les op=C3=A9rations suivan= t qu'elles sont lettr=C3=A9es ou non. -30. Apr=C3=A8s avoir sauv=C3=A9 une op=C3=A9ration, vous pouvez avoir le= d=C3=A9tail de l'op=C3=A9ration en cliquant sur le num=C3=A9ro interne q= ui s'affiche -31. Les journaux FIN doivent =C3=AAtre attach=C3=A9s =C3=A0 un compte en= banque et uniquement un A propos du mode de paiement : on ne change rien= mais il faut que dans la doc, il est pr=C3=A9cis=C3=A9 qu'il faut param=C3= =A8trer le mdp comme le journal FIN -32. Rapprochement doivent avoir les journaux + s=C3=A9curit=C3=A9 -33. ajout bouton "ajoutez ligne" pour les OD en CA -34. ajout bouton "ajoutez ligne" pour les pr=C3=A9visions -35. Ajout l'impression pour les lettrages par poste comptables -36. Les historiques des fiches et postes comptables (impression->poste) = ont un solde progressif =20 From MAILER-DAEMON Thu Oct 13 17:52:14 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RETCI-00044t-PT for mharc-phpcompta-dev@gnu.org; Thu, 13 Oct 2011 17:52:14 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Fri, 14 Oct 2011 00:00:07 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4212 - phpcompta/trunk/include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Oct 2011 21:52:12 -0000 Author: danydb Date: 2011-10-14 00:00:06 +0200 (Fri, 14 Oct 2011) New Revision: 4212 Added: phpcompta/trunk/include/class_sort_table.php Modified: phpcompta/trunk/include/constant.php Log: 0000381: R?\195?\169?\195?\169criture des tri pour toutes les tables Added: phpcompta/trunk/include/class_sort_table.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_sort_table.php = (rev 0) +++ phpcompta/trunk/include/class_sort_table.php 2011-10-13 22:00:06 UTC = (rev 4212) @@ -0,0 +1,86 @@ +nb =3D 0; + $this->array =3D array(); + } + + /** + *@brief add row of a header in the internal array ($this->array) + * , it uses the $_GET['ord'] parameter, + * @param type $p_header label of the header + * @param type $p_url base url + * @param type $p_sql_asc sql if ascending + * @param type $p_sql_desc sql if descending + * @param type $p_get_asc the value in $_GET if ascending is choosen + * @param type $p_get_desc the value in $_GET if descending is choos= en + */ + function add($p_header, $p_url, $p_sql_asc, $p_sql_desc, $p_get_asc,= $p_get_desc) + { + $array =3D array( + 'head' =3D> $p_header, + 'url' =3D> $p_url, + 'sql_asc' =3D> $p_sql_asc, + 'sql_desc' =3D> $p_sql_desc, + 'parm_asc' =3D> $p_get_asc, + 'parm_desc' =3D> $p_get_desc, + 'car_asc' =3D> '▲', + 'car_desc' =3D> '▼' + ); + $ind =3D $this->nb; + $this->array[$ind] =3D $array; + $this->nb++; + } +/** + * Returns the header (the value into th tags) with the symbol ascending= and + * descending + * @param $p_ind the element (from 0 to nb) + * @return string + */ + function get_header($p_ind) + { + if ($p_ind < 0 || $p_ind > $this->nb) + return 'ERREUR TRI'; + $file =3D str_replace('extension.php', '', $_SERVER['SCRIPT_FILENAME'])= ; + + $base =3D $this->array[$p_ind]['url']; + $str =3D ''; + $str .=3D 'array[$p_ind]['parm_asc'] . '">' . + $this->array[$p_ind]['car_asc'] . + '' . + $this->array[$p_ind]['head'] . + 'ar= ray[$p_ind]['parm_desc'] . '">' . + $this->array[$p_ind]['car_desc'] . + ''; + return $str; + } + + function get_sql_order($p_get) + { + for ($i =3D 0; $i < $this->nb; $i++) + { + if ($p_get =3D=3D $this->array[$i]['parm_asc']) + { + $this->array[$i]['car_asc'] =3D '▲'; + return $this->array[$i]['sql_asc']; + } + if ($p_get =3D=3D $this->array[$i]['parm_desc']) + { + $this->array[$i]['car_desc'] =3D '▼'; + return $this->array[$i]['sql_desc']; + } + } + } + +} + +?> Modified: phpcompta/trunk/include/constant.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/constant.php 2011-10-13 21:43:40 UTC (rev 421= 1) +++ phpcompta/trunk/include/constant.php 2011-10-13 22:00:06 UTC (rev 421= 2) @@ -35,8 +35,13 @@ /*set to none for production */ /* uncomment for production */ =20 -$version_phpcompta=3DSVNINFO;=20 -define ("DEBUG",false); +/* + * $version_phpcompta=3DSVNINFO; + * define ("DEBUG",false); + * + */ +$version_phpcompta=3D4208; +define ("DEBUG",true); =20 define ("DBVERSION",97); define ("DBVERSIONREPO",13); From MAILER-DAEMON Thu Oct 13 18:05:27 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RETP5-0005Ry-5X for mharc-phpcompta-dev@gnu.org; Thu, 13 Oct 2011 18:05:27 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Fri, 14 Oct 2011 00:13:10 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4213 - phpcompta/trunk/html X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Oct 2011 22:05:25 -0000 Author: danydb Date: 2011-10-14 00:13:10 +0200 (Fri, 14 Oct 2011) New Revision: 4213 Modified: phpcompta/trunk/html/access.php Log: format Modified: phpcompta/trunk/html/access.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/access.php 2011-10-13 22:00:06 UTC (rev 4212) +++ phpcompta/trunk/html/access.php 2011-10-13 22:13:10 UTC (rev 4213) @@ -1,4 +1,5 @@ Check(); -if ( $user->check_dossier(dossier::id()) =3D=3D 'P') +if ($user->check_dossier(dossier::id()) =3D=3D 'P') { - redirect("extension.php?".dossier::get(),0); + redirect("extension.php?" . dossier::get(), 0); exit(); } =20 html_page_start($_SESSION['g_theme']); load_all_script(); /* Check Browser version if < IE6 then unsupported */ -$browser=3D$_SERVER['HTTP_USER_AGENT']; -if ( strpos($browser,'MSIE 6')!=3Dfalse || - strpos($browser,'MSIE 5')!=3Dfalse ) +$browser =3D $_SERVER['HTTP_USER_AGENT']; +if (strpos($browser, 'MSIE 6') !=3D false || + strpos($browser, 'MSIE 5') !=3D false) { =20 =20 echo <<
-
3D'Close
-
-
3D'Warning!'/
-
-
Vous utilisez un = navigateur d=C3=A9pass=C3=A9 depuis pr=C3=A8s de 8 ans!
- Pour un= e meilleure exp=C3=A9rience web, prenez le temps de mettre votre navigate= ur =C3=A0 jour.
- =
- =
3D'Get
- =
3D'Get
- =
- =
- =
- = +
3D'Close
+
+
3D'Warning!'/
+
+
= Vous utilisez un navigateur d=C3=A9pass=C3=A9 depuis pr=C3=A8s de 8 ans!<= /div> +
= Pour une meilleure exp=C3=A9rience web, prenez le temps de mettre votre n= avigateur =C3=A0 jour.
+
+
3D'Get
+
3D'G=
+
3D'Get
+
+
+ EOF; -exit(); + exit(); } -if ( $cn->exist_table('version') =3D=3D false ) +if ($cn->exist_table('version') =3D=3D false) { - echo '

'._("Base de donn= =C3=A9e invalide").'

'; - $base=3Ddirname($_SERVER['REQUEST_URI']); - echo HtmlInput::button_anchor('Retour',$base.'/user_login.php'); + echo '

' . _("Base de do= nn=C3=A9e invalide") . '

'; + $base =3D dirname($_SERVER['REQUEST_URI']); + echo HtmlInput::button_anchor('Retour', $base . '/user_login.php'); exit(); } -if ( DBVERSION < dossier::get_version($cn)) +if (DBVERSION < dossier::get_version($cn)) { - echo '

'._("Attention: l= a version de base de donn=C3=A9e est sup=C3=A9rieure =C3=A0 la version du= programme, vous devriez mettre =C3=A0 jour").'

'; + echo '

' . _("Attention:= la version de base de donn=C3=A9e est sup=C3=A9rieure =C3=A0 la version = du programme, vous devriez mettre =C3=A0 jour") . '

'; } -if ( DBVERSION > dossier::get_version($cn)) +if (DBVERSION > dossier::get_version($cn)) { - echo '

'._("Votre base d= e donn=C3=A9es n'est pas =C3=A0 jour").' '; - $a=3D_("cliquez ici pour appliquer le patch"); - $base=3Ddirname($_SERVER['REQUEST_URI']).'/admin/setup.php'; - echo ''.$a.'

'; + echo '

' . _("Votre base= de donn=C3=A9es n'est pas =C3=A0 jour") . ' '; + $a =3D _("cliquez ici pour appliquer le patch"); + $base =3D dirname($_SERVER['REQUEST_URI']) . '/admin/setup.php'; + echo '' . $a . '

'; } =20 /* * Set a correct periode for the user */ -$periode=3D$user->get_periode(); -$oPeriode=3Dnew Periode($cn,$periode); +$periode =3D $user->get_periode(); +$oPeriode =3D new Periode($cn, $periode); =20 -if ($oPeriode->load() =3D=3D -1 ) - { - $periode=3D$cn->get_value('select p_id from parm_periode order by p_= start asc limit 1'); +if ($oPeriode->load() =3D=3D -1) +{ + $periode =3D $cn->get_value('select p_id from parm_periode order by = p_start asc limit 1'); $user->set_periode($periode); - } +} =20 echo '
'; echo menu_tool('access.php'); @@ -111,23 +112,23 @@ echo '
'; =20 /* others report */ -$cal=3Dnew Calendar(); +$cal =3D new Calendar(); $cal->get_preference(); -$Ledger=3Dnew Acc_Ledger($cn,0); -$last_ledger=3Darray(); -if ( $user->check_action(GESTION)=3D=3D1) - { - $Operation=3Dnew Action($cn); - $last_ledger=3D$Ledger->get_last(10); - $last_operation=3D$Operation->get_last(10); - } +$Ledger =3D new Acc_Ledger($cn, 0); +$last_ledger =3D array(); +if ($user->check_action(GESTION) =3D=3D 1) +{ + $Operation =3D new Action($cn); + $last_ledger =3D $Ledger->get_last(10); + $last_operation =3D $Operation->get_last(10); +} else - { - $last_operation=3Darray(); - } +{ + $last_operation =3D array(); +} ob_start(); require_once('template/dashboard.php'); -$ret=3Dob_get_contents(); +$ret =3D ob_get_contents(); ob_end_clean(); echo $ret; =20 From MAILER-DAEMON Thu Oct 13 18:28:33 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RETlR-0001Ih-I4 for mharc-phpcompta-dev@gnu.org; Thu, 13 Oct 2011 18:28:33 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Fri, 14 Oct 2011 00:36:25 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4214 - phpcompta/trunk/include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Oct 2011 22:28:31 -0000 Author: danydb Date: 2011-10-14 00:36:24 +0200 (Fri, 14 Oct 2011) New Revision: 4214 Modified: phpcompta/trunk/include/tva.inc.php Log: format Modified: phpcompta/trunk/include/tva.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/tva.inc.php 2011-10-13 22:13:10 UTC (rev 4213= ) +++ phpcompta/trunk/include/tva.inc.php 2011-10-13 22:36:24 UTC (rev 4214= ) @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with PhpCompta; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-130= 7 USA -*/ + */ /* $Revision$ */ // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr -/*! \file +/* ! \file * \brief included file for customizing with the vat (account,rate...) */ require_once('class_own.php'); @@ -27,101 +27,97 @@ require_once('class_itextarea.php'); echo '
'; // Confirm remove -if ( isset ($_POST['confirm_rm'])) +if (isset($_POST['confirm_rm'])) { - if ( $cn->count_sql('select * from tva_rate') > 1 ) - $cn->exec_sql('select tva_delete($1)',array($_POST['tva_id'])); + if ($cn->count_sql('select * from tva_rate') > 1) + $cn->exec_sql('select tva_delete($1)', array($_POST['tva_id'])); else - echo '

Vous ne pouvez pas effacer tous taux'. - ' Si votre société n\'utilise pas la TVA, changer = dans le menu société

'; - + echo '

Vous ne pouvez pas effacer tous taux' . + ' Si votre société n\'utilise pas la TVA, changer dans le= menu société

'; } //----------------------------------------------------- // Record Change -if ( isset ($_POST['confirm_mod']) - || isset ($_POST['confirm_add'])) +if (isset($_POST['confirm_mod']) + || isset($_POST['confirm_add'])) { extract($_POST); // remove space - $tva_poste=3Dstr_replace (" ","",$tva_poste); - $err=3D0; // Error code + $tva_poste =3D str_replace(" ", "", $tva_poste); + $err =3D 0; // Error code =20 - if ( isNumber($tva_rate) =3D=3D 0 ) + if (isNumber($tva_rate) =3D=3D 0) { - $err=3D2; + $err =3D 2; } =20 - if ( $err =3D=3D 0 ) + if ($err =3D=3D 0) { - if ( isset ($_POST['confirm_add']) ) - { - $sql=3D"select tva_insert($1,$2,$3,$4)"; + if (isset($_POST['confirm_add'])) + { + $sql =3D "select tva_insert($1,$2,$3,$4)"; =20 - $res=3D$cn->exec_sql( - $sql, - array($tva_label, - $tva_rate, - $tva_comment, - $tva_poste) - ); - $err=3DDatabase::fetch_result($res); - } - if ( isset ($_POST['confirm_mod']) ) - { - $Res=3D$cn->exec_sql( - "select tva_modify($tva_id,'$tva_label', + $res =3D $cn->exec_sql( + $sql, array($tva_label, + $tva_rate, + $tva_comment, + $tva_poste) + ); + $err =3D Database::fetch_result($res); + } + if (isset($_POST['confirm_mod'])) + { + $Res =3D $cn->exec_sql( + "select tva_modify($tva_id,'$tva_label', '$tva_rate','$tva_comment','$tva_poste')"); - $Res=3D$cn->exec_sql( - "select tva_modify($1,$2,$3,$4,$5)", - array($tva_id,$tva_label,$tva_rate,$tva_comment,$tv= a_poste) - ); - $err=3DDatabase::fetch_result($Res); - } - + $Res =3D $cn->exec_sql( + "select tva_modify($1,$2,$3,$4,$5)", array($tva_id, $tva_label, $t= va_rate, $tva_comment, $tva_poste) + ); + $err =3D Database::fetch_result($Res); + } } - if ( $err !=3D 0 ) + if ($err !=3D 0) { - $err_code=3Darray(1=3D>"Tva id n\'est pas un nombre", - 2=3D>"Taux tva invalide", - 3=3D>"Label ne peut =C3=AAtre vide", - 4=3D>"Poste invalide", - 5=3D>"Tva id doit =C3=AAtre unique"); - $str_err=3D$err_code[$err]; - echo ""; - ; + $err_code =3D array(1 =3D> "Tva id n\'est pas un nombre", + 2 =3D> "Taux tva invalide", + 3 =3D> "Label ne peut =C3=AAtre vide", + 4 =3D> "Poste invalide", + 5 =3D> "Tva id doit =C3=AAtre unique"); + $str_err =3D $err_code[$err]; + echo ""; + ; } } // If company not use VAT -$own=3Dnew Own($cn); -if ( $own->MY_TVA_USE=3D=3D'N' ) +$own =3D new Own($cn); +if ($own->MY_TVA_USE =3D=3D 'N') { echo '

Vous n\'=C3=AAtes pas assujetti =C3=A0 la= TVA

'; exit(); } //----------------------------------------------------- // Display -$sql=3D"select tva_id,tva_label,tva_rate,tva_comment,tva_poste from tva_= rate order by tva_label"; -$Res=3D$cn->exec_sql($sql); +$sql =3D "select tva_id,tva_label,tva_rate,tva_comment,tva_poste from tv= a_rate order by tva_label"; +$Res =3D $cn->exec_sql($sql); ?> - - - - - - + + + + + + $row['tva_label'], - 'tva_rate'=3D>$row['tva_rate'], - 'tva_comment'=3D>$row['tva_comment'], - 'tva_poste'=3D>$row['tva_poste'] - ); + $index =3D $row['tva_id']; + $tva_array[$index] =3D array( + 'tva_label' =3D> $row['tva_label'], + 'tva_rate' =3D> $row['tva_rate'], + 'tva_comment' =3D> $row['tva_comment'], + 'tva_poste' =3D> $row['tva_poste'] + ); =20 echo ""; echo ''; @@ -129,7 +125,7 @@ =20 =20 echo ""; =20 @@ -146,19 +142,19 @@ echo ""; =20 echo ""; @@ -168,143 +164,150 @@ } ?>
LabelTauxCommentairePoste
LabelTauxCommentairePoste
"; - echo HtmlInput::hidden('tva_id',$row['tva_id']); + echo HtmlInput::hidden('tva_id', $row['tva_id']); echo h($row['tva_label']); echo ""; - echo HtmlInput::submit("rm" ,"Efface"); - echo HtmlInput::submit("mod","Modifie"); - $w=3Dnew IHidden(); - $w->name=3D"tva_id"; - $w->value=3D$row['tva_id']; + echo HtmlInput::submit("rm", "Efface"); + echo HtmlInput::submit("mod", "Modifie"); + $w =3D new IHidden(); + $w->name =3D "tva_id"; + $w->value =3D $row['tva_id']; echo $w->input(); - $w=3Dnew IHidden(); - $w->name=3D"p_action"; - $w->value=3D"divers"; + $w =3D new IHidden(); + $w->name =3D "p_action"; + $w->value =3D "divers"; echo $w->input(); - $w=3Dnew IHidden(); - $w->name=3D"sa"; - $w->value=3D"tva"; + $w =3D new IHidden(); + $w->name =3D "sa"; + $w->value =3D "tva"; echo $w->input(); =20 echo "
- + + + + + + -
- - - = - =
- = + + Label + Taux + Commentaire + Poste + + + + + + + + + '; + echo '= '; + echo HtmlInput::submit("confirm_rm", "Confirme"); + echo HtmlInput::submit("Cancel", "no"); + echo ""; + } + //----------------------------------------------------- + // add + if (isset($_REQUEST['add'])) + { + echo "
Ajout d'un taux de tva "; + echo '
'; + ?> + + + + + + + + + + + + + + + +
Label (ce que vous verrez dans les jou= rnaux) size =3D 20; + echo $w->input('tva_label', '') + ?>
Taux de tva size =3D 5; + echo $w->input('tva_rate', '') + ?>
Commentaire heigh =3D 5; + $w->width =3D 50; + echo $w->input('tva_comment', '') + ?>
Poste comptable utilis=C3=A9s format :debit,cr= edit size =3D 20; + echo $w->input('tva_poste', '') + ?>
+ + =20 +
+
+ - = - = - = - = - = - = - = - = - = - = - = - = - = - =
LabelTauxCommentairePoste
- = '; - = echo ''; - = echo HtmlInput::submit("confirm_rm" ,"= Confirme"); - = echo HtmlInput::submit("Cancel" ,"no")= ; - = echo ""; + echo "Tva =C3=A0 modifier"; + $index =3D $_POST['tva_id']; + echo "
Modification d'un taux de tva "; + echo '
'; + echo ' Label (ce que vous verrez dans les jou= rnaux) + size =3D 20; + echo $w->input('tva_label', $tva_array[$index]['tva_label']) + ?> + + Taux de tva =20 - = } - = //----------------------------------------= ------------- - = // add - = if ( isset ( $_REQUEST['add'])) - = { - = echo "
Ajout d'un tau= x de tva "; - = echo ''; + size =3D 5; + echo $w->input('tva_rate', $tva_array[$index]['tva_rate']) + ?> + + + Commentaire + heigh =3D 5; + $w->width =3D 50; + echo $w->input('tva_comment', $tva_array[$index]['tva_comment']) + ?> + + + Poste comptable utilis=C3=A9s format :debit,cr= edit =20 - - = ?> - = - = - = - = - = - = - = - = - = - = - = - = - = - =
Label (ce qu= e vous verrez dans les journaux) size=3D20; - = echo $w->input('tva_label','') ?>
Taux de tva = size=3D5; - = echo $w->input('tva_rate','') ?>
Commentaire - = heigh=3D5; - = $w->width=3D50; - = echo $w->input('tva_comment','') ?> - =
Poste comptable u= tilis=C3=A9s format :debit,credit size=3D20; - = echo $w->input('tva_poste','') ?>
- = - = = - - = = - = =
- = = Modification d'un taux de tva "; - = = echo '
'; - = = echo ''; - = = ?> - = = - = = - = = - = = - = = - - = = - = = - = = - = = - = = - = = - = = - = = - - = = - = = - = =
Label (ce que vous verrez dans = les journaux) size=3D20; - = = echo $w->input('tva_label',$tva_array[$index]['tva_label'= ]) ?>
Taux de tva size=3D5; - = = echo $w->input('tva_rate',$tva_array[$index]['tva_rate'])= ?>
Commentaire heigh=3D5; - = = $w->width=3D50; - = = echo $w->input('tva_comment',$tva_array[$index]['tva_comm= ent']) ?>
Poste comptable utilis=C3=A9s format= :debit,credit size=3D20; - = = echo $w->input('tva_poste',$tva_array[$index]['tva_poste'= ]) ?>
- = = - = = - = = =
- = = =
- = = = '; - + size =3D 20; + echo $w->input('tva_poste', $tva_array[$index]['tva_poste']) + ?> + + + + + + + '; ?> Property changes on: phpcompta/trunk/include/tva.inc.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date From MAILER-DAEMON Thu Oct 13 18:31:00 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RETno-0001ZH-U9 for mharc-phpcompta-dev@gnu.org; Thu, 13 Oct 2011 18:31:00 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Fri, 14 Oct 2011 00:38:30 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4215 - in phpcompta/trunk: . contrib/comptabilite-francaise contrib/comptabilite-francaise/abrege-perso contrib/comptabilite-francaise/abrege-strict contrib/comptabilite-francaise/base-perso contrib/comptabilite-francaise/base-strict contrib/comptabilite-francaise/copropriete contrib/comptabilite-francaise/developpe-perso contrib/comptabilite-francaise/developpe-strict contrib/comptabilite-francaise/loi-1901 contrib/comptabilite-francaise/profession-liberale contrib/document_test contrib/rapport contrib/sql-utility contrib/wiki-tools dev dev/manage-code/create-file dev/manage-code/housekeeping dev/manage-code/security dev/manage-code/widget dev/test-size doc doc/developper doc/developper/html doc/fpdf doc/fpdf/doc doc/fpdf/tutorial doc/tfpdf html html/admin html/admin/sql html/admin/sql/account_repository html/admin/sql/mod1 html/admin/sql/mod2 html/admin/sql/patch html/document/fr_be html/document/fr_fr html/image html/js html/js/lang html/lang/en_US/LC_MESSAGES ht ml/lang/nl_NL/LC_MESSAGES html/securimage html/securimage/backgrounds html/securimage/database html/securimage/gdfonts html/securimage/images html/securimage/words include include/ext/dummy include/template include/tfpdf include/tfpdf/font include/tfpdf/font/unifont sql sql/trunk X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Oct 2011 22:30:59 -0000 Author: danydb Date: 2011-10-14 00:38:27 +0200 (Fri, 14 Oct 2011) New Revision: 4215 Removed: phpcompta/trunk/include/class_itva.php phpcompta/trunk/include/class_itva_select.php Modified: phpcompta/trunk/AUTHORS phpcompta/trunk/COPYING phpcompta/trunk/README phpcompta/trunk/contrib/comptabilite-francaise/abrege-perso/fr_plan_ab= rege_perso.sql phpcompta/trunk/contrib/comptabilite-francaise/abrege-perso/fr_plan_ab= rege_perso_bil10000.form phpcompta/trunk/contrib/comptabilite-francaise/abrege-perso/fr_plan_ab= rege_perso_bil10000.ods phpcompta/trunk/contrib/comptabilite-francaise/abrege-perso/fr_plan_ab= rege_perso_bil10000.xls phpcompta/trunk/contrib/comptabilite-francaise/abrege-perso/fr_plan_ab= rege_perso_comptes-defaut.sql phpcompta/trunk/contrib/comptabilite-francaise/abrege-perso/fr_plan_ab= rege_perso_cr1000.form phpcompta/trunk/contrib/comptabilite-francaise/abrege-perso/fr_plan_ab= rege_perso_cr1000.odt phpcompta/trunk/contrib/comptabilite-francaise/abrege-perso/fr_plan_ab= rege_perso_cr1000.rtf phpcompta/trunk/contrib/comptabilite-francaise/abrege-perso/fr_plan_ab= rege_perso_tva.sql phpcompta/trunk/contrib/comptabilite-francaise/abrege-strict/fr_plan_a= brege.sql phpcompta/trunk/contrib/comptabilite-francaise/abrege-strict/fr_plan_a= brege_tva.sql phpcompta/trunk/contrib/comptabilite-francaise/base-perso/fr_plan_base= _perso.sql phpcompta/trunk/contrib/comptabilite-francaise/base-perso/fr_plan_base= _perso_comptes-defaut.sql phpcompta/trunk/contrib/comptabilite-francaise/base-perso/fr_plan_base= _perso_tva.sql phpcompta/trunk/contrib/comptabilite-francaise/base-strict/fr_plan_bas= e.sql phpcompta/trunk/contrib/comptabilite-francaise/base-strict/fr_plan_bas= e_tva.sql phpcompta/trunk/contrib/comptabilite-francaise/copropriete/fr_plan_syn= diccoprop.sql phpcompta/trunk/contrib/comptabilite-francaise/developpe-perso/fr_plan= _developpe_perso.sql phpcompta/trunk/contrib/comptabilite-francaise/developpe-perso/fr_plan= _developpe_perso_comptes-defaut.sql phpcompta/trunk/contrib/comptabilite-francaise/developpe-perso/fr_plan= _developpe_perso_tva.sql phpcompta/trunk/contrib/comptabilite-francaise/developpe-strict/fr_pla= n_developpe.sql phpcompta/trunk/contrib/comptabilite-francaise/developpe-strict/fr_pla= n_developpe_tva.sql phpcompta/trunk/contrib/comptabilite-francaise/lisez-moi.txt phpcompta/trunk/contrib/comptabilite-francaise/loi-1901/fr_plan_loi190= 1.sql phpcompta/trunk/contrib/comptabilite-francaise/loi-1901/fr_plan_loi190= 1_comptes-defaut.sql phpcompta/trunk/contrib/comptabilite-francaise/loi-1901/fr_plan_loi190= 1_tva.sql phpcompta/trunk/contrib/comptabilite-francaise/profession-liberale/fr_= plan_proflib.sql phpcompta/trunk/contrib/comptabilite-francaise/profession-liberale/fr_= plan_proflib_comptes-defaut.sql phpcompta/trunk/contrib/comptabilite-francaise/profession-liberale/fr_= plan_proflib_tva.sql phpcompta/trunk/contrib/document_test/facture-calc.ods phpcompta/trunk/contrib/document_test/facture.html phpcompta/trunk/contrib/document_test/facture.odt phpcompta/trunk/contrib/document_test/facture1.rtf phpcompta/trunk/contrib/document_test/logo.png phpcompta/trunk/contrib/document_test/logo.svg phpcompta/trunk/contrib/document_test/modele-facture.ods phpcompta/trunk/contrib/document_test/note-de-frais.odt phpcompta/trunk/contrib/document_test/rappel.odt phpcompta/trunk/contrib/rapport/README phpcompta/trunk/contrib/rapport/tva_decla.sql phpcompta/trunk/contrib/rapport/tva_decla_fr_BE.sql phpcompta/trunk/contrib/sql-utility/get-sql.sh phpcompta/trunk/contrib/wiki-tools/transform.pl phpcompta/trunk/dev/README phpcompta/trunk/dev/compile_text.sh phpcompta/trunk/dev/compose_list.sh phpcompta/trunk/dev/create_changelog.sh phpcompta/trunk/dev/extract_text.sh phpcompta/trunk/dev/manage-code/create-file/create_config.py phpcompta/trunk/dev/manage-code/create-file/create_phpclass.py phpcompta/trunk/dev/manage-code/create-file/create_trigger.py phpcompta/trunk/dev/manage-code/create-file/example phpcompta/trunk/dev/manage-code/housekeeping/cleanup.sh phpcompta/trunk/dev/manage-code/housekeeping/transform.py phpcompta/trunk/dev/manage-code/housekeeping/usage_file.py phpcompta/trunk/dev/manage-code/housekeeping/usage_function.py phpcompta/trunk/dev/manage-code/security/without_check.py phpcompta/trunk/dev/manage-code/widget/add_require.py phpcompta/trunk/dev/manage-code/widget/change.py phpcompta/trunk/dev/manage-code/widget/transform.py phpcompta/trunk/dev/plugin_client.txt phpcompta/trunk/dev/test-size/readme phpcompta/trunk/dev/test-size/simul.py phpcompta/trunk/dev/test_parse_formula.php phpcompta/trunk/doc/Diagram5.dia phpcompta/trunk/doc/Makefile phpcompta/trunk/doc/Schemaabrege1.pdf phpcompta/trunk/doc/bnb.sxw phpcompta/trunk/doc/commencer-avec-phpcompta.odt phpcompta/trunk/doc/commencer-avec-phpcompta.pdf phpcompta/trunk/doc/data.dia phpcompta/trunk/doc/developper/Doxyfile phpcompta/trunk/doc/developper/create_doc.sh phpcompta/trunk/doc/developper/header.html phpcompta/trunk/doc/developper/html/.htaccess phpcompta/trunk/doc/document.dia phpcompta/trunk/doc/document2.dia phpcompta/trunk/doc/fiche.dia phpcompta/trunk/doc/fpdf/FAQ.htm phpcompta/trunk/doc/fpdf/doc/acceptpagebreak.htm phpcompta/trunk/doc/fpdf/doc/addfont.htm phpcompta/trunk/doc/fpdf/doc/addlink.htm phpcompta/trunk/doc/fpdf/doc/addpage.htm phpcompta/trunk/doc/fpdf/doc/aliasnbpages.htm phpcompta/trunk/doc/fpdf/doc/cell.htm phpcompta/trunk/doc/fpdf/doc/close.htm phpcompta/trunk/doc/fpdf/doc/error.htm phpcompta/trunk/doc/fpdf/doc/footer.htm phpcompta/trunk/doc/fpdf/doc/fpdf.htm phpcompta/trunk/doc/fpdf/doc/getstringwidth.htm phpcompta/trunk/doc/fpdf/doc/getx.htm phpcompta/trunk/doc/fpdf/doc/gety.htm phpcompta/trunk/doc/fpdf/doc/header.htm phpcompta/trunk/doc/fpdf/doc/image.htm phpcompta/trunk/doc/fpdf/doc/index.htm phpcompta/trunk/doc/fpdf/doc/line.htm phpcompta/trunk/doc/fpdf/doc/link.htm phpcompta/trunk/doc/fpdf/doc/ln.htm phpcompta/trunk/doc/fpdf/doc/multicell.htm phpcompta/trunk/doc/fpdf/doc/output.htm phpcompta/trunk/doc/fpdf/doc/pageno.htm phpcompta/trunk/doc/fpdf/doc/rect.htm phpcompta/trunk/doc/fpdf/doc/setauthor.htm phpcompta/trunk/doc/fpdf/doc/setautopagebreak.htm phpcompta/trunk/doc/fpdf/doc/setcompression.htm phpcompta/trunk/doc/fpdf/doc/setcreator.htm phpcompta/trunk/doc/fpdf/doc/setdisplaymode.htm phpcompta/trunk/doc/fpdf/doc/setdrawcolor.htm phpcompta/trunk/doc/fpdf/doc/setfillcolor.htm phpcompta/trunk/doc/fpdf/doc/setfont.htm phpcompta/trunk/doc/fpdf/doc/setfontsize.htm phpcompta/trunk/doc/fpdf/doc/setkeywords.htm phpcompta/trunk/doc/fpdf/doc/setleftmargin.htm phpcompta/trunk/doc/fpdf/doc/setlinewidth.htm phpcompta/trunk/doc/fpdf/doc/setlink.htm phpcompta/trunk/doc/fpdf/doc/setmargins.htm phpcompta/trunk/doc/fpdf/doc/setrightmargin.htm phpcompta/trunk/doc/fpdf/doc/setsubject.htm phpcompta/trunk/doc/fpdf/doc/settextcolor.htm phpcompta/trunk/doc/fpdf/doc/settitle.htm phpcompta/trunk/doc/fpdf/doc/settopmargin.htm phpcompta/trunk/doc/fpdf/doc/setx.htm phpcompta/trunk/doc/fpdf/doc/setxy.htm phpcompta/trunk/doc/fpdf/doc/sety.htm phpcompta/trunk/doc/fpdf/doc/text.htm phpcompta/trunk/doc/fpdf/doc/write.htm phpcompta/trunk/doc/fpdf/fpdf.css phpcompta/trunk/doc/fpdf/histo.htm phpcompta/trunk/doc/fpdf/install.txt phpcompta/trunk/doc/fpdf/license.txt phpcompta/trunk/doc/fpdf/sfpdf.html phpcompta/trunk/doc/fpdf/tutorial/20k_c1.txt phpcompta/trunk/doc/fpdf/tutorial/20k_c2.txt phpcompta/trunk/doc/fpdf/tutorial/calligra.afm phpcompta/trunk/doc/fpdf/tutorial/calligra.php phpcompta/trunk/doc/fpdf/tutorial/calligra.ttf phpcompta/trunk/doc/fpdf/tutorial/calligra.z phpcompta/trunk/doc/fpdf/tutorial/countries.txt phpcompta/trunk/doc/fpdf/tutorial/index.htm phpcompta/trunk/doc/fpdf/tutorial/logo.png phpcompta/trunk/doc/fpdf/tutorial/logo_pb.png phpcompta/trunk/doc/fpdf/tutorial/makefont.php phpcompta/trunk/doc/fpdf/tutorial/tuto1.htm phpcompta/trunk/doc/fpdf/tutorial/tuto1.php phpcompta/trunk/doc/fpdf/tutorial/tuto2.htm phpcompta/trunk/doc/fpdf/tutorial/tuto2.php phpcompta/trunk/doc/fpdf/tutorial/tuto3.htm phpcompta/trunk/doc/fpdf/tutorial/tuto3.php phpcompta/trunk/doc/fpdf/tutorial/tuto4.htm phpcompta/trunk/doc/fpdf/tutorial/tuto4.php phpcompta/trunk/doc/fpdf/tutorial/tuto5.htm phpcompta/trunk/doc/fpdf/tutorial/tuto5.php phpcompta/trunk/doc/fpdf/tutorial/tuto6.htm phpcompta/trunk/doc/fpdf/tutorial/tuto6.php phpcompta/trunk/doc/fpdf/tutorial/tuto7.htm phpcompta/trunk/doc/fpdf/tutorial/tuto7.php phpcompta/trunk/doc/fr_BE_liste-client-nonpapier.pdf phpcompta/trunk/doc/fr_BE_listing-client.pdf phpcompta/trunk/doc/header-file.txt phpcompta/trunk/doc/heading.php phpcompta/trunk/doc/installation-window.odt phpcompta/trunk/doc/installation-window.pdf phpcompta/trunk/doc/intervat.xsd phpcompta/trunk/doc/manuel-fr.odt phpcompta/trunk/doc/manuel-fr.pdf phpcompta/trunk/doc/mod_function phpcompta/trunk/doc/php.ini-minimum phpcompta/trunk/doc/tfpdf/HelloWorld.txt phpcompta/trunk/doc/tfpdf/README.txt phpcompta/trunk/doc/tfpdf/ex.pdf phpcompta/trunk/doc/tfpdf/ex.php phpcompta/trunk/doc/tfpdf/info.htm phpcompta/trunk/doc/xmlwriter.php phpcompta/trunk/html/.cvsignore phpcompta/trunk/html/access.php phpcompta/trunk/html/admin/setup.php phpcompta/trunk/html/admin/sql/account_repository/comment.sql phpcompta/trunk/html/admin/sql/account_repository/constraint.sql phpcompta/trunk/html/admin/sql/account_repository/data.sql phpcompta/trunk/html/admin/sql/account_repository/function.sql phpcompta/trunk/html/admin/sql/account_repository/index.sql phpcompta/trunk/html/admin/sql/account_repository/make-sql phpcompta/trunk/html/admin/sql/account_repository/schema.sql phpcompta/trunk/html/admin/sql/account_repository/sequence.sql phpcompta/trunk/html/admin/sql/account_repository/table.sql phpcompta/trunk/html/admin/sql/account_repository/view.sql phpcompta/trunk/html/admin/sql/make-sql phpcompta/trunk/html/admin/sql/mod1/comment.sql phpcompta/trunk/html/admin/sql/mod1/constraint.sql phpcompta/trunk/html/admin/sql/mod1/data.sql phpcompta/trunk/html/admin/sql/mod1/function.sql phpcompta/trunk/html/admin/sql/mod1/index.sql phpcompta/trunk/html/admin/sql/mod1/make-sql phpcompta/trunk/html/admin/sql/mod1/schema.sql phpcompta/trunk/html/admin/sql/mod1/sequence.sql phpcompta/trunk/html/admin/sql/mod1/table.sql phpcompta/trunk/html/admin/sql/mod1/view.sql phpcompta/trunk/html/admin/sql/mod2/data.sql phpcompta/trunk/html/admin/sql/mod2/make-sql phpcompta/trunk/html/admin/sql/patch/ac-upgrade10.sql phpcompta/trunk/html/admin/sql/patch/ac-upgrade11.sql phpcompta/trunk/html/admin/sql/patch/ac-upgrade12.sql phpcompta/trunk/html/admin/sql/patch/ac-upgrade4.sql phpcompta/trunk/html/admin/sql/patch/ac-upgrade5.sql phpcompta/trunk/html/admin/sql/patch/ac-upgrade6.sql phpcompta/trunk/html/admin/sql/patch/ac-upgrade7.sql phpcompta/trunk/html/admin/sql/patch/ac-upgrade8.sql phpcompta/trunk/html/admin/sql/patch/ac-upgrade9.sql phpcompta/trunk/html/admin/sql/patch/downgrade7.sql phpcompta/trunk/html/admin/sql/patch/upgrade10.sql phpcompta/trunk/html/admin/sql/patch/upgrade11.sql phpcompta/trunk/html/admin/sql/patch/upgrade12.sql phpcompta/trunk/html/admin/sql/patch/upgrade13.sql phpcompta/trunk/html/admin/sql/patch/upgrade14.sql phpcompta/trunk/html/admin/sql/patch/upgrade15.sql phpcompta/trunk/html/admin/sql/patch/upgrade16.sql phpcompta/trunk/html/admin/sql/patch/upgrade17.sql phpcompta/trunk/html/admin/sql/patch/upgrade18.sql phpcompta/trunk/html/admin/sql/patch/upgrade19.sql phpcompta/trunk/html/admin/sql/patch/upgrade20.sql phpcompta/trunk/html/admin/sql/patch/upgrade21.sql phpcompta/trunk/html/admin/sql/patch/upgrade22.sql phpcompta/trunk/html/admin/sql/patch/upgrade23.sql phpcompta/trunk/html/admin/sql/patch/upgrade24.sql phpcompta/trunk/html/admin/sql/patch/upgrade25.sql phpcompta/trunk/html/admin/sql/patch/upgrade26.sql phpcompta/trunk/html/admin/sql/patch/upgrade27.sql phpcompta/trunk/html/admin/sql/patch/upgrade28.sql phpcompta/trunk/html/admin/sql/patch/upgrade29.sql phpcompta/trunk/html/admin/sql/patch/upgrade30.sql phpcompta/trunk/html/admin/sql/patch/upgrade31.sql phpcompta/trunk/html/admin/sql/patch/upgrade32.sql phpcompta/trunk/html/admin/sql/patch/upgrade33.sql phpcompta/trunk/html/admin/sql/patch/upgrade34.sql phpcompta/trunk/html/admin/sql/patch/upgrade35.sql phpcompta/trunk/html/admin/sql/patch/upgrade36.BE.sql phpcompta/trunk/html/admin/sql/patch/upgrade36.FR.sql phpcompta/trunk/html/admin/sql/patch/upgrade36.sql phpcompta/trunk/html/admin/sql/patch/upgrade37.sql phpcompta/trunk/html/admin/sql/patch/upgrade38.sql phpcompta/trunk/html/admin/sql/patch/upgrade39.sql phpcompta/trunk/html/admin/sql/patch/upgrade4.sql phpcompta/trunk/html/admin/sql/patch/upgrade40.sql phpcompta/trunk/html/admin/sql/patch/upgrade41.sql phpcompta/trunk/html/admin/sql/patch/upgrade42.sql phpcompta/trunk/html/admin/sql/patch/upgrade43.sql phpcompta/trunk/html/admin/sql/patch/upgrade44.sql phpcompta/trunk/html/admin/sql/patch/upgrade45.sql phpcompta/trunk/html/admin/sql/patch/upgrade46.sql phpcompta/trunk/html/admin/sql/patch/upgrade47.sql phpcompta/trunk/html/admin/sql/patch/upgrade48.sql phpcompta/trunk/html/admin/sql/patch/upgrade49.sql phpcompta/trunk/html/admin/sql/patch/upgrade5.sql phpcompta/trunk/html/admin/sql/patch/upgrade50.sql phpcompta/trunk/html/admin/sql/patch/upgrade51.sql phpcompta/trunk/html/admin/sql/patch/upgrade52.sql phpcompta/trunk/html/admin/sql/patch/upgrade53.sql phpcompta/trunk/html/admin/sql/patch/upgrade54.sql phpcompta/trunk/html/admin/sql/patch/upgrade55.sql phpcompta/trunk/html/admin/sql/patch/upgrade56.sql phpcompta/trunk/html/admin/sql/patch/upgrade57.sql phpcompta/trunk/html/admin/sql/patch/upgrade58.sql phpcompta/trunk/html/admin/sql/patch/upgrade59.sql phpcompta/trunk/html/admin/sql/patch/upgrade6.sql phpcompta/trunk/html/admin/sql/patch/upgrade60.sql phpcompta/trunk/html/admin/sql/patch/upgrade61.BE.sql phpcompta/trunk/html/admin/sql/patch/upgrade61.FR.sql phpcompta/trunk/html/admin/sql/patch/upgrade61.sql phpcompta/trunk/html/admin/sql/patch/upgrade62.sql phpcompta/trunk/html/admin/sql/patch/upgrade63.sql phpcompta/trunk/html/admin/sql/patch/upgrade64.sql phpcompta/trunk/html/admin/sql/patch/upgrade65.sql phpcompta/trunk/html/admin/sql/patch/upgrade66.sql phpcompta/trunk/html/admin/sql/patch/upgrade67.sql phpcompta/trunk/html/admin/sql/patch/upgrade68.sql phpcompta/trunk/html/admin/sql/patch/upgrade69.sql phpcompta/trunk/html/admin/sql/patch/upgrade7.sql phpcompta/trunk/html/admin/sql/patch/upgrade70.sql phpcompta/trunk/html/admin/sql/patch/upgrade71.sql phpcompta/trunk/html/admin/sql/patch/upgrade72.sql phpcompta/trunk/html/admin/sql/patch/upgrade73.sql phpcompta/trunk/html/admin/sql/patch/upgrade74.sql phpcompta/trunk/html/admin/sql/patch/upgrade75.sql phpcompta/trunk/html/admin/sql/patch/upgrade76.sql phpcompta/trunk/html/admin/sql/patch/upgrade77.sql phpcompta/trunk/html/admin/sql/patch/upgrade78.sql phpcompta/trunk/html/admin/sql/patch/upgrade79.sql phpcompta/trunk/html/admin/sql/patch/upgrade8.sql phpcompta/trunk/html/admin/sql/patch/upgrade80.sql phpcompta/trunk/html/admin/sql/patch/upgrade81.sql phpcompta/trunk/html/admin/sql/patch/upgrade82.sql phpcompta/trunk/html/admin/sql/patch/upgrade83.sql phpcompta/trunk/html/admin/sql/patch/upgrade84.sql phpcompta/trunk/html/admin/sql/patch/upgrade85.sql phpcompta/trunk/html/admin/sql/patch/upgrade86.sql phpcompta/trunk/html/admin/sql/patch/upgrade87.sql phpcompta/trunk/html/admin/sql/patch/upgrade88.sql phpcompta/trunk/html/admin/sql/patch/upgrade89.sql phpcompta/trunk/html/admin/sql/patch/upgrade9.sql phpcompta/trunk/html/admin/sql/patch/upgrade90.sql phpcompta/trunk/html/admin/sql/patch/upgrade91.sql phpcompta/trunk/html/admin/sql/patch/upgrade92.sql phpcompta/trunk/html/admin/sql/patch/upgrade93.sql phpcompta/trunk/html/admin/sql/patch/upgrade94.sql phpcompta/trunk/html/admin/sql/patch/upgrade95.sql phpcompta/trunk/html/admin/sql/patch/upgrade96.sql phpcompta/trunk/html/admin_repo.php phpcompta/trunk/html/ajax.php phpcompta/trunk/html/ajax_card.php phpcompta/trunk/html/ajax_extension.php phpcompta/trunk/html/ajax_history.php phpcompta/trunk/html/ajax_ledger.php phpcompta/trunk/html/ajax_misc.php phpcompta/trunk/html/ajax_poste.php phpcompta/trunk/html/ajax_report.php phpcompta/trunk/html/backup.php phpcompta/trunk/html/bilan.php phpcompta/trunk/html/caisse.php phpcompta/trunk/html/calendar-blue.css phpcompta/trunk/html/commercial.php phpcompta/trunk/html/compta.php phpcompta/trunk/html/comptanalytic.php phpcompta/trunk/html/compute.php phpcompta/trunk/html/document/fr_be/bnb.form phpcompta/trunk/html/document/fr_be/bnb.rtf phpcompta/trunk/html/document/fr_fr/fr_plan_abrege_perso_bil10000.form phpcompta/trunk/html/document/fr_fr/fr_plan_abrege_perso_bil10000.ods phpcompta/trunk/html/document/fr_fr/fr_plan_abrege_perso_cr1000.form phpcompta/trunk/html/document/fr_fr/fr_plan_abrege_perso_cr1000.rtf phpcompta/trunk/html/export.php phpcompta/trunk/html/extension.php phpcompta/trunk/html/extension.raw.php phpcompta/trunk/html/fid.php phpcompta/trunk/html/fid_card.php phpcompta/trunk/html/get_pj.php phpcompta/trunk/html/get_predef.php phpcompta/trunk/html/get_saldo.php phpcompta/trunk/html/image/bg-submit2.gif phpcompta/trunk/html/image/bg-submit3.gif phpcompta/trunk/html/image/bgcolor.gif phpcompta/trunk/html/image/blackdot.gif phpcompta/trunk/html/image/bold.gif phpcompta/trunk/html/image/centre.gif phpcompta/trunk/html/image/copy.gif phpcompta/trunk/html/image/cut.gif phpcompta/trunk/html/image/down.gif phpcompta/trunk/html/image/email.gif phpcompta/trunk/html/image/go-next.png phpcompta/trunk/html/image/go-previous.png phpcompta/trunk/html/image/home.png phpcompta/trunk/html/image/hr.gif phpcompta/trunk/html/image/hyperlink.gif phpcompta/trunk/html/image/image.gif phpcompta/trunk/html/image/indent.gif phpcompta/trunk/html/image/insert_table.gif phpcompta/trunk/html/image/italic.gif phpcompta/trunk/html/image/justifyfull.gif phpcompta/trunk/html/image/left_just.gif phpcompta/trunk/html/image/list.gif phpcompta/trunk/html/image/load.gif phpcompta/trunk/html/image/loading.gif phpcompta/trunk/html/image/logo7.jpg phpcompta/trunk/html/image/logout.png phpcompta/trunk/html/image/numbered_list.gif phpcompta/trunk/html/image/outdent.gif phpcompta/trunk/html/image/param.png phpcompta/trunk/html/image/paste.gif phpcompta/trunk/html/image/preference.png phpcompta/trunk/html/image/print.png phpcompta/trunk/html/image/redo.gif phpcompta/trunk/html/image/right_just.gif phpcompta/trunk/html/image/search.png phpcompta/trunk/html/image/select1.gif phpcompta/trunk/html/image/select2.gif phpcompta/trunk/html/image/smiley.gif phpcompta/trunk/html/image/spellcheck.gif phpcompta/trunk/html/image/textcolor.gif phpcompta/trunk/html/image/undefined.png phpcompta/trunk/html/image/underline.gif phpcompta/trunk/html/image/undo.gif phpcompta/trunk/html/image/up.gif phpcompta/trunk/html/image/x-office-calendar.png phpcompta/trunk/html/index.html phpcompta/trunk/html/index.php phpcompta/trunk/html/jrn_search.php phpcompta/trunk/html/js/acc_ledger.js phpcompta/trunk/html/js/acc_report.js phpcompta/trunk/html/js/accounting_item.js phpcompta/trunk/html/js/ajax_fiche.js phpcompta/trunk/html/js/anc_script.js phpcompta/trunk/html/js/builder.js phpcompta/trunk/html/js/calc.js phpcompta/trunk/html/js/calendar-setup.js phpcompta/trunk/html/js/calendar.js phpcompta/trunk/html/js/card.js phpcompta/trunk/html/js/compute.js phpcompta/trunk/html/js/compute_direct.js phpcompta/trunk/html/js/confirm.js phpcompta/trunk/html/js/controls.js phpcompta/trunk/html/js/dragdrop.js phpcompta/trunk/html/js/effects.js phpcompta/trunk/html/js/extension.js phpcompta/trunk/html/js/forecast.js phpcompta/trunk/html/js/gestion.js phpcompta/trunk/html/js/infobulle.js phpcompta/trunk/html/js/jcalendar.js phpcompta/trunk/html/js/lang/calendar-af.js phpcompta/trunk/html/js/lang/calendar-al.js phpcompta/trunk/html/js/lang/calendar-bg.js phpcompta/trunk/html/js/lang/calendar-big5-utf8.js phpcompta/trunk/html/js/lang/calendar-big5.js phpcompta/trunk/html/js/lang/calendar-br.js phpcompta/trunk/html/js/lang/calendar-ca.js phpcompta/trunk/html/js/lang/calendar-cs-utf8.js phpcompta/trunk/html/js/lang/calendar-cs-win.js phpcompta/trunk/html/js/lang/calendar-da.js phpcompta/trunk/html/js/lang/calendar-de.js phpcompta/trunk/html/js/lang/calendar-du.js phpcompta/trunk/html/js/lang/calendar-el.js phpcompta/trunk/html/js/lang/calendar-en.js phpcompta/trunk/html/js/lang/calendar-es.js phpcompta/trunk/html/js/lang/calendar-fi.js phpcompta/trunk/html/js/lang/calendar-fr.js phpcompta/trunk/html/js/lang/calendar-he-utf8.js phpcompta/trunk/html/js/lang/calendar-hr-utf8.js phpcompta/trunk/html/js/lang/calendar-hr.js phpcompta/trunk/html/js/lang/calendar-hu.js phpcompta/trunk/html/js/lang/calendar-it.js phpcompta/trunk/html/js/lang/calendar-jp.js phpcompta/trunk/html/js/lang/calendar-ko-utf8.js phpcompta/trunk/html/js/lang/calendar-ko.js phpcompta/trunk/html/js/lang/calendar-lt-utf8.js phpcompta/trunk/html/js/lang/calendar-lt.js phpcompta/trunk/html/js/lang/calendar-lv.js phpcompta/trunk/html/js/lang/calendar-nl.js phpcompta/trunk/html/js/lang/calendar-no.js phpcompta/trunk/html/js/lang/calendar-pl-utf8.js phpcompta/trunk/html/js/lang/calendar-pl.js phpcompta/trunk/html/js/lang/calendar-pt.js phpcompta/trunk/html/js/lang/calendar-ro.js phpcompta/trunk/html/js/lang/calendar-ru.js phpcompta/trunk/html/js/lang/calendar-ru_win_.js phpcompta/trunk/html/js/lang/calendar-si.js phpcompta/trunk/html/js/lang/calendar-sk.js phpcompta/trunk/html/js/lang/calendar-sp.js phpcompta/trunk/html/js/lang/calendar-sv.js phpcompta/trunk/html/js/lang/calendar-tr.js phpcompta/trunk/html/js/lang/calendar-zh.js phpcompta/trunk/html/js/lang/cn_utf8.js phpcompta/trunk/html/js/modele_document.js phpcompta/trunk/html/js/prototype.js phpcompta/trunk/html/js/scriptaculous.js phpcompta/trunk/html/js/scripts.js phpcompta/trunk/html/js/slider.js phpcompta/trunk/html/js/sound.js phpcompta/trunk/html/js/todo_list.js phpcompta/trunk/html/js/unittest.js phpcompta/trunk/html/lang/en_US/LC_MESSAGES/messages.po phpcompta/trunk/html/lang/nl_NL/LC_MESSAGES/messages.po phpcompta/trunk/html/login.php phpcompta/trunk/html/logout.php phpcompta/trunk/html/not_implemented.php phpcompta/trunk/html/palette.htm phpcompta/trunk/html/parametre.php phpcompta/trunk/html/popup.php phpcompta/trunk/html/priv_user.php phpcompta/trunk/html/recherche.php phpcompta/trunk/html/remove_op.php phpcompta/trunk/html/search_ca.php phpcompta/trunk/html/securimage/AHGBold.ttf phpcompta/trunk/html/securimage/LICENSE.txt phpcompta/trunk/html/securimage/README.FONT.txt phpcompta/trunk/html/securimage/README.txt phpcompta/trunk/html/securimage/backgrounds/bg3.jpg phpcompta/trunk/html/securimage/backgrounds/bg4.jpg phpcompta/trunk/html/securimage/backgrounds/bg5.jpg phpcompta/trunk/html/securimage/backgrounds/bg6.png phpcompta/trunk/html/securimage/backgrounds/bg7.jpg phpcompta/trunk/html/securimage/database/.htaccess phpcompta/trunk/html/securimage/database/index.html phpcompta/trunk/html/securimage/database/securimage.sqlite phpcompta/trunk/html/securimage/example_form.php phpcompta/trunk/html/securimage/gdfonts/automatic.gdf phpcompta/trunk/html/securimage/images/audio_icon.gif phpcompta/trunk/html/securimage/images/refresh.gif phpcompta/trunk/html/securimage/securimage.php phpcompta/trunk/html/securimage/securimage_play.php phpcompta/trunk/html/securimage/securimage_play.swf phpcompta/trunk/html/securimage/securimage_show.php phpcompta/trunk/html/securimage/securimage_show_example.php phpcompta/trunk/html/securimage/securimage_show_example2.php phpcompta/trunk/html/securimage/words/words.txt phpcompta/trunk/html/show_document.php phpcompta/trunk/html/show_document_modele.php phpcompta/trunk/html/show_pj.php phpcompta/trunk/html/style-color.css phpcompta/trunk/html/style-light.css phpcompta/trunk/html/style-print.css phpcompta/trunk/html/style-test.css phpcompta/trunk/html/style.css phpcompta/trunk/html/test.php phpcompta/trunk/html/todo_list.php phpcompta/trunk/html/user_advanced.php phpcompta/trunk/html/user_login.php phpcompta/trunk/html/user_pref.php phpcompta/trunk/include/ac_common.php phpcompta/trunk/include/action.common.inc.php phpcompta/trunk/include/action.inc.php phpcompta/trunk/include/adm.inc.php phpcompta/trunk/include/adm_card.inc.php phpcompta/trunk/include/anc_group.inc.php phpcompta/trunk/include/anc_imp.inc.php phpcompta/trunk/include/anc_od.inc.php phpcompta/trunk/include/anc_pa.inc.php phpcompta/trunk/include/audit_log.php phpcompta/trunk/include/balance.inc.php phpcompta/trunk/include/balance_card.inc.php phpcompta/trunk/include/card_attr.inc.php phpcompta/trunk/include/cat_document.inc.php phpcompta/trunk/include/class_acc_account.php phpcompta/trunk/include/class_acc_account_ledger.php phpcompta/trunk/include/class_acc_balance.php phpcompta/trunk/include/class_acc_bilan.php phpcompta/trunk/include/class_acc_compute.php phpcompta/trunk/include/class_acc_ledger.php phpcompta/trunk/include/class_acc_ledger_fin.php phpcompta/trunk/include/class_acc_ledger_info.php phpcompta/trunk/include/class_acc_ledger_purchase.php phpcompta/trunk/include/class_acc_ledger_sold.php phpcompta/trunk/include/class_acc_operation.php phpcompta/trunk/include/class_acc_parm_code.php phpcompta/trunk/include/class_acc_payment.php phpcompta/trunk/include/class_acc_reconciliation.php phpcompta/trunk/include/class_acc_report.php phpcompta/trunk/include/class_acc_report_row.php phpcompta/trunk/include/class_acc_tva.php phpcompta/trunk/include/class_action.php phpcompta/trunk/include/class_action_detail.php phpcompta/trunk/include/class_admin.php phpcompta/trunk/include/class_anc_acc_link.php phpcompta/trunk/include/class_anc_acc_list.php phpcompta/trunk/include/class_anc_account.php phpcompta/trunk/include/class_anc_balance_double.php phpcompta/trunk/include/class_anc_balance_simple.php phpcompta/trunk/include/class_anc_grandlivre.php phpcompta/trunk/include/class_anc_group.php phpcompta/trunk/include/class_anc_group_operation.php phpcompta/trunk/include/class_anc_listing.php phpcompta/trunk/include/class_anc_operation.php phpcompta/trunk/include/class_anc_plan.php phpcompta/trunk/include/class_anc_print.php phpcompta/trunk/include/class_anc_table.php phpcompta/trunk/include/class_anticipation.php phpcompta/trunk/include/class_calendar.php phpcompta/trunk/include/class_contact.php phpcompta/trunk/include/class_customer.php phpcompta/trunk/include/class_database.php phpcompta/trunk/include/class_document.php phpcompta/trunk/include/class_document_modele.php phpcompta/trunk/include/class_document_type.php phpcompta/trunk/include/class_dossier.php phpcompta/trunk/include/class_exercice.php phpcompta/trunk/include/class_extension.php phpcompta/trunk/include/class_fiche.php phpcompta/trunk/include/class_fiche_attr.php phpcompta/trunk/include/class_fiche_def.php phpcompta/trunk/include/class_fiche_def_ref.php phpcompta/trunk/include/class_forecast.php phpcompta/trunk/include/class_forecast_cat.php phpcompta/trunk/include/class_forecast_item.php phpcompta/trunk/include/class_gestion_purchase.php phpcompta/trunk/include/class_gestion_sold.php phpcompta/trunk/include/class_gestion_table.php phpcompta/trunk/include/class_html_input.php phpcompta/trunk/include/class_html_table.php phpcompta/trunk/include/class_iaction.php phpcompta/trunk/include/class_ibox.php phpcompta/trunk/include/class_ibutton.php phpcompta/trunk/include/class_icard.php phpcompta/trunk/include/class_icheckbox.php phpcompta/trunk/include/class_iconcerned.php phpcompta/trunk/include/class_idate.php phpcompta/trunk/include/class_ifile.php phpcompta/trunk/include/class_ihidden.php phpcompta/trunk/include/class_inum.php phpcompta/trunk/include/class_iperiod.php phpcompta/trunk/include/class_ipopup.php phpcompta/trunk/include/class_iposte.php phpcompta/trunk/include/class_iradio.php phpcompta/trunk/include/class_iselect.php phpcompta/trunk/include/class_ispan.php phpcompta/trunk/include/class_itext.php phpcompta/trunk/include/class_itextarea.php phpcompta/trunk/include/class_itva_popup.php phpcompta/trunk/include/class_lettering.php phpcompta/trunk/include/class_own.php phpcompta/trunk/include/class_pdf.php phpcompta/trunk/include/class_periode.php phpcompta/trunk/include/class_pre_op_ach.php phpcompta/trunk/include/class_pre_op_advanced.php phpcompta/trunk/include/class_pre_op_fin.php phpcompta/trunk/include/class_pre_op_ods.php phpcompta/trunk/include/class_pre_op_ven.php phpcompta/trunk/include/class_pre_operation.php phpcompta/trunk/include/class_print_ledger_detail.php phpcompta/trunk/include/class_print_ledger_fin.php phpcompta/trunk/include/class_print_ledger_misc.php phpcompta/trunk/include/class_print_ledger_simple.php phpcompta/trunk/include/class_print_ledger_simple_without_vat.php phpcompta/trunk/include/class_sort_table.php phpcompta/trunk/include/class_supplier.php phpcompta/trunk/include/class_todo_list.php phpcompta/trunk/include/class_user.php phpcompta/trunk/include/class_zip_extended.php phpcompta/trunk/include/client.inc.php phpcompta/trunk/include/client_card.inc.php phpcompta/trunk/include/compta_ach.inc.php phpcompta/trunk/include/compta_fin.inc.php phpcompta/trunk/include/compta_ods.inc.php phpcompta/trunk/include/compta_ven.inc.php phpcompta/trunk/include/config.inc phpcompta/trunk/include/config_file.php phpcompta/trunk/include/constant.php phpcompta/trunk/include/constant.security.php phpcompta/trunk/include/contact.inc.php phpcompta/trunk/include/detail_adm.inc.php phpcompta/trunk/include/detail_client.inc.php phpcompta/trunk/include/detail_supplier.inc.php phpcompta/trunk/include/document_modele.inc.php phpcompta/trunk/include/dossier.inc.php phpcompta/trunk/include/export_anc_acc_list.php phpcompta/trunk/include/export_anc_acc_list_csv.php phpcompta/trunk/include/export_anc_balance_double_csv.php phpcompta/trunk/include/export_anc_balance_double_pdf.php phpcompta/trunk/include/export_anc_balance_group_csv.php phpcompta/trunk/include/export_anc_balance_simple_csv.php phpcompta/trunk/include/export_anc_balance_simple_pdf.php phpcompta/trunk/include/export_anc_list_csv.php phpcompta/trunk/include/export_anc_table_csv.php phpcompta/trunk/include/export_balance_csv.php phpcompta/trunk/include/export_balance_pdf.php phpcompta/trunk/include/export_fiche_balance_csv.php phpcompta/trunk/include/export_fiche_balance_pdf.php phpcompta/trunk/include/export_fiche_csv.php phpcompta/trunk/include/export_fiche_detail_csv.php phpcompta/trunk/include/export_fiche_detail_pdf.php phpcompta/trunk/include/export_fiche_pdf.php phpcompta/trunk/include/export_form_csv.php phpcompta/trunk/include/export_form_pdf.php phpcompta/trunk/include/export_gl_csv.php phpcompta/trunk/include/export_gl_pdf.php phpcompta/trunk/include/export_histo_csv.php phpcompta/trunk/include/export_ledger_csv.php phpcompta/trunk/include/export_ledger_pdf.php phpcompta/trunk/include/export_poste_detail.php phpcompta/trunk/include/export_poste_detail_csv.php phpcompta/trunk/include/export_poste_detail_pdf.php phpcompta/trunk/include/export_security_pdf.php phpcompta/trunk/include/export_table_csv.php phpcompta/trunk/include/ext/dummy/dummy.php phpcompta/trunk/include/ext_inc.php phpcompta/trunk/include/extension.inc.php phpcompta/trunk/include/fiche.inc.php phpcompta/trunk/include/fiche_def.inc.php phpcompta/trunk/include/forecast.inc.php phpcompta/trunk/include/function_javascript.php phpcompta/trunk/include/header_print.php phpcompta/trunk/include/impress.inc.php phpcompta/trunk/include/impress_bilan.inc.php phpcompta/trunk/include/impress_fiche.inc.php phpcompta/trunk/include/impress_gl_comptes.inc.php phpcompta/trunk/include/impress_inc.php phpcompta/trunk/include/impress_jrn.inc.php phpcompta/trunk/include/impress_poste.inc.php phpcompta/trunk/include/impress_rapport.inc.php phpcompta/trunk/include/impress_rec.inc.php phpcompta/trunk/include/letter.inc.php phpcompta/trunk/include/lettering.account.inc.php phpcompta/trunk/include/lettering.card.inc.php phpcompta/trunk/include/lettering.gestion.inc.php phpcompta/trunk/include/modele.inc.php phpcompta/trunk/include/modify_mod_document.inc.php phpcompta/trunk/include/modify_periode.inc.php phpcompta/trunk/include/modify_predf_op.php phpcompta/trunk/include/opening.inc.php phpcompta/trunk/include/operation_adm.inc.php phpcompta/trunk/include/operation_client.inc.php phpcompta/trunk/include/operation_supplier.inc.php phpcompta/trunk/include/param_jrn.inc.php phpcompta/trunk/include/param_jrn_add.inc.php phpcompta/trunk/include/param_jrn_detail.inc.php phpcompta/trunk/include/param_pcmn.inc.php phpcompta/trunk/include/param_sec.inc.php phpcompta/trunk/include/payment_middle.inc.php phpcompta/trunk/include/periode.inc.php phpcompta/trunk/include/poste.inc.php phpcompta/trunk/include/pref.inc.php phpcompta/trunk/include/preod.inc.php phpcompta/trunk/include/report.inc.php phpcompta/trunk/include/restore.inc.php phpcompta/trunk/include/save_predf_op.php phpcompta/trunk/include/stock.inc.php phpcompta/trunk/include/stock_inc.php phpcompta/trunk/include/suivi_adm.inc.php phpcompta/trunk/include/suivi_client.inc.php phpcompta/trunk/include/suivi_supplier.inc.php phpcompta/trunk/include/supplier.inc.php phpcompta/trunk/include/supplier_card.inc.php phpcompta/trunk/include/template/account_result.php phpcompta/trunk/include/template/account_search.php phpcompta/trunk/include/template/anc_balance_group.php phpcompta/trunk/include/template/calendar.php phpcompta/trunk/include/template/card_result.php phpcompta/trunk/include/template/category_of_card.php phpcompta/trunk/include/template/dashboard.php phpcompta/trunk/include/template/detail-action.php phpcompta/trunk/include/template/extension-detail.php phpcompta/trunk/include/template/extension-sec.php phpcompta/trunk/include/template/extension.php phpcompta/trunk/include/template/fiche_def_input.php phpcompta/trunk/include/template/forecast-detail.php phpcompta/trunk/include/template/forecast_cat.php phpcompta/trunk/include/template/forecast_result.php phpcompta/trunk/include/template/form_ledger_detail.php phpcompta/trunk/include/template/form_ledger_fin.php phpcompta/trunk/include/template/history_top.php phpcompta/trunk/include/template/impress_cat_card.php phpcompta/trunk/include/template/impress_reconciliation.php phpcompta/trunk/include/template/ledger_detail_ach.php phpcompta/trunk/include/template/ledger_detail_bottom.php phpcompta/trunk/include/template/ledger_detail_file.php phpcompta/trunk/include/template/ledger_detail_fin.php phpcompta/trunk/include/template/ledger_detail_forbidden.php phpcompta/trunk/include/template/ledger_detail_misc.php phpcompta/trunk/include/template/ledger_detail_top.php phpcompta/trunk/include/template/ledger_detail_ven.php phpcompta/trunk/include/template/ledger_search.php phpcompta/trunk/include/template/letter_all.php phpcompta/trunk/include/template/letter_prop.php phpcompta/trunk/include/template/list_category_document.php phpcompta/trunk/include/template/modele_document.php phpcompta/trunk/include/template/new_mod_payment.php phpcompta/trunk/include/template/param_jrn.php phpcompta/trunk/include/template/periode_add_exercice.php phpcompta/trunk/include/template/result_cat_card_summary.php phpcompta/trunk/include/template/security_list_action.php phpcompta/trunk/include/tfpdf/font/courier.php phpcompta/trunk/include/tfpdf/font/helvetica.php phpcompta/trunk/include/tfpdf/font/helveticab.php phpcompta/trunk/include/tfpdf/font/helveticabi.php phpcompta/trunk/include/tfpdf/font/helveticai.php phpcompta/trunk/include/tfpdf/font/symbol.php phpcompta/trunk/include/tfpdf/font/times.php phpcompta/trunk/include/tfpdf/font/timesb.php phpcompta/trunk/include/tfpdf/font/timesbi.php phpcompta/trunk/include/tfpdf/font/timesi.php phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSans-Bold.ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSans-BoldOblique.ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSans-ExtraLight.ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSans-Oblique.ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSans.ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSansCondensed-Bold.tt= f phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSansCondensed-BoldObl= ique.ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSansCondensed-Oblique= .ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSansCondensed.ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSansMono-Bold.ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSansMono-BoldOblique.= ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSansMono-Oblique.ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSansMono.ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSerif-Bold.ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSerif-BoldItalic.ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSerif-Italic.ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSerif.ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSerifCondensed-Bold.t= tf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSerifCondensed-BoldIt= alic.ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSerifCondensed-Italic= .ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSerifCondensed.ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVu_LICENSE.txt phpcompta/trunk/include/tfpdf/font/unifont/ttfonts.php phpcompta/trunk/include/tfpdf/font/zapfdingbats.php phpcompta/trunk/include/tfpdf/tfpdf.php phpcompta/trunk/include/user.inc.php phpcompta/trunk/include/user_action_gl.php phpcompta/trunk/include/user_common.php phpcompta/trunk/include/user_menu.php phpcompta/trunk/include/verif_bilan.inc.php phpcompta/trunk/license.txt phpcompta/trunk/release-note phpcompta/trunk/sql/change-pcmn-to-alphanum.sql phpcompta/trunk/sql/comptaproc.sql phpcompta/trunk/sql/correct-quant.sql phpcompta/trunk/sql/correct_quant_sold.sql phpcompta/trunk/sql/downgrade.sql phpcompta/trunk/sql/trunk/apply_patch.sh phpcompta/trunk/sql/trunk/plsql-orig.sql phpcompta/trunk/sql/trunk/reset.sh phpcompta/trunk/sql/trunk/upgrade_account_repository.sql phpcompta/trunk/sql/upgrade.sql Log: add svn property Property changes on: phpcompta/trunk/AUTHORS ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/COPYING ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/README ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/contrib/comptabilite-francaise/abreg= e-perso/fr_plan_abrege_perso.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/contrib/comptabilite-francaise/abreg= e-perso/fr_plan_abrege_perso_bil10000.form ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/contrib/comptabilite-francaise/abreg= e-perso/fr_plan_abrege_perso_bil10000.ods ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/contrib/comptabilite-francaise/abreg= e-perso/fr_plan_abrege_perso_bil10000.xls ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/contrib/comptabilite-francaise/abreg= e-perso/fr_plan_abrege_perso_comptes-defaut.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/contrib/comptabilite-francaise/abreg= e-perso/fr_plan_abrege_perso_cr1000.form ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/contrib/comptabilite-francaise/abreg= e-perso/fr_plan_abrege_perso_cr1000.odt ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/contrib/comptabilite-francaise/abreg= e-perso/fr_plan_abrege_perso_cr1000.rtf ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/contrib/comptabilite-francaise/abreg= e-perso/fr_plan_abrege_perso_tva.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/contrib/comptabilite-francaise/abreg= e-strict/fr_plan_abrege.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/contrib/comptabilite-francaise/abreg= e-strict/fr_plan_abrege_tva.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/contrib/comptabilite-francaise/base-= perso/fr_plan_base_perso.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/contrib/comptabilite-francaise/base-= perso/fr_plan_base_perso_comptes-defaut.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/contrib/comptabilite-francaise/base-= perso/fr_plan_base_perso_tva.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/contrib/comptabilite-francaise/base-= strict/fr_plan_base.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/contrib/comptabilite-francaise/base-= strict/fr_plan_base_tva.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/contrib/comptabilite-francaise/copro= priete/fr_plan_syndiccoprop.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/contrib/comptabilite-francaise/devel= oppe-perso/fr_plan_developpe_perso.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/contrib/comptabilite-francaise/devel= oppe-perso/fr_plan_developpe_perso_comptes-defaut.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/contrib/comptabilite-francaise/devel= oppe-perso/fr_plan_developpe_perso_tva.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/contrib/comptabilite-francaise/devel= oppe-strict/fr_plan_developpe.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/contrib/comptabilite-francaise/devel= oppe-strict/fr_plan_developpe_tva.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/contrib/comptabilite-francaise/lisez= -moi.txt ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/contrib/comptabilite-francaise/loi-1= 901/fr_plan_loi1901.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/contrib/comptabilite-francaise/loi-1= 901/fr_plan_loi1901_comptes-defaut.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/contrib/comptabilite-francaise/loi-1= 901/fr_plan_loi1901_tva.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/contrib/comptabilite-francaise/profe= ssion-liberale/fr_plan_proflib.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/contrib/comptabilite-francaise/profe= ssion-liberale/fr_plan_proflib_comptes-defaut.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/contrib/comptabilite-francaise/profe= ssion-liberale/fr_plan_proflib_tva.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/contrib/document_test/facture-calc.o= ds ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/contrib/document_test/facture.html ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/contrib/document_test/facture.odt ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/contrib/document_test/facture1.rtf ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/contrib/document_test/logo.png ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/contrib/document_test/logo.svg ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/contrib/document_test/modele-facture= .ods ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/contrib/document_test/note-de-frais.= odt ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/contrib/document_test/rappel.odt ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/contrib/rapport/README ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/contrib/rapport/tva_decla.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/contrib/rapport/tva_decla_fr_BE.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/contrib/sql-utility/get-sql.sh ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/contrib/wiki-tools/transform.pl ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/dev/README ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/dev/compile_text.sh ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/dev/compose_list.sh ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/dev/create_changelog.sh ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/dev/extract_text.sh ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/dev/manage-code/create-file/create_c= onfig.py ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/dev/manage-code/create-file/create_p= hpclass.py ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/dev/manage-code/create-file/create_t= rigger.py ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/dev/manage-code/create-file/example ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/dev/manage-code/housekeeping/cleanup= .sh ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/dev/manage-code/housekeeping/transfo= rm.py ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/dev/manage-code/housekeeping/usage_f= ile.py ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/dev/manage-code/housekeeping/usage_f= unction.py ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/dev/manage-code/security/without_che= ck.py ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/dev/manage-code/widget/add_require.p= y ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/dev/manage-code/widget/change.py ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/dev/manage-code/widget/transform.py ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/dev/plugin_client.txt ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/dev/test-size/readme ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/dev/test-size/simul.py ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/dev/test_parse_formula.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/doc/Diagram5.dia ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/Makefile ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/doc/Schemaabrege1.pdf ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/doc/bnb.sxw ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/doc/commencer-avec-phpcompta.odt ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/commencer-avec-phpcompta.pdf ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/data.dia ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/developper/Doxyfile ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/doc/developper/create_doc.sh ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/doc/developper/header.html ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/doc/developper/html/.htaccess ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/document.dia ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/document2.dia ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fiche.dia ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/FAQ.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/doc/acceptpagebreak.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/doc/addfont.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/doc/addlink.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/doc/addpage.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/doc/aliasnbpages.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/doc/cell.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/doc/close.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/doc/error.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/doc/footer.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/doc/fpdf.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/doc/getstringwidth.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/doc/getx.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/doc/gety.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/doc/header.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/doc/image.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/doc/index.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/doc/line.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/doc/link.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/doc/ln.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/doc/multicell.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/doc/output.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/doc/pageno.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/doc/rect.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/doc/setauthor.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/doc/setautopagebreak.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/doc/setcompression.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/doc/setcreator.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/doc/setdisplaymode.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/doc/setdrawcolor.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/doc/setfillcolor.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/doc/setfont.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/doc/setfontsize.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/doc/setkeywords.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/doc/setleftmargin.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/doc/setlinewidth.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/doc/setlink.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/doc/setmargins.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/doc/setrightmargin.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/doc/setsubject.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/doc/settextcolor.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/doc/settitle.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/doc/settopmargin.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/doc/setx.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/doc/setxy.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/doc/sety.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/doc/text.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/doc/write.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/fpdf.css ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/histo.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/install.txt ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/license.txt ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/sfpdf.html ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/tutorial/20k_c1.txt ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/tutorial/20k_c2.txt ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/tutorial/calligra.afm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/tutorial/calligra.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/tutorial/calligra.ttf ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/tutorial/calligra.z ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/tutorial/countries.txt ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/tutorial/index.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/tutorial/logo.png ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/tutorial/logo_pb.png ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/tutorial/makefont.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/tutorial/tuto1.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/tutorial/tuto1.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/tutorial/tuto2.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/tutorial/tuto2.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/tutorial/tuto3.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/tutorial/tuto3.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/tutorial/tuto4.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/tutorial/tuto4.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/tutorial/tuto5.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/tutorial/tuto5.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/tutorial/tuto6.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/tutorial/tuto6.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/tutorial/tuto7.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fpdf/tutorial/tuto7.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fr_BE_liste-client-nonpapier.pdf ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/doc/fr_BE_listing-client.pdf ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/doc/header-file.txt ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/doc/heading.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/doc/installation-window.odt ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/installation-window.pdf ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/intervat.xsd ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/doc/manuel-fr.odt ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/manuel-fr.pdf ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/mod_function ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/doc/php.ini-minimum ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/doc/tfpdf/HelloWorld.txt ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/tfpdf/README.txt ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/tfpdf/ex.pdf ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/tfpdf/ex.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/tfpdf/info.htm ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/doc/xmlwriter.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/.cvsignore ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Modified: phpcompta/trunk/html/access.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/access.php 2011-10-13 22:36:24 UTC (rev 4214) +++ phpcompta/trunk/html/access.php 2011-10-13 22:38:27 UTC (rev 4215) @@ -17,7 +17,7 @@ * along with PhpCompta; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-130= 7 USA */ -/* $Revision: 1615 $ */ +/* $Revision$ */ =20 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr =20 Property changes on: phpcompta/trunk/html/access.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/setup.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/account_repository/co= mment.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/account_repository/co= nstraint.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/account_repository/da= ta.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/account_repository/fu= nction.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/account_repository/in= dex.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/account_repository/ma= ke-sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/account_repository/sc= hema.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/account_repository/se= quence.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/account_repository/ta= ble.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/account_repository/vi= ew.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/make-sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/mod1/comment.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/mod1/constraint.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/mod1/data.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/mod1/function.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/mod1/index.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/mod1/make-sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/mod1/schema.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/mod1/sequence.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/mod1/table.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/mod1/view.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/mod2/data.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/mod2/make-sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/ac-upgrade10.sq= l ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/ac-upgrade11.sq= l ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/ac-upgrade12.sq= l ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/ac-upgrade4.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/ac-upgrade5.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/ac-upgrade6.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/ac-upgrade7.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/ac-upgrade8.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/ac-upgrade9.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/downgrade7.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade10.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade11.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade12.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade13.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade14.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade15.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade16.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade17.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade18.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade19.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade20.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade21.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade22.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade23.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade24.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade25.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade26.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade27.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade28.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade29.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade30.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade31.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade32.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade33.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade34.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade35.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade36.BE.sq= l ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade36.FR.sq= l ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade36.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade37.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade38.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade39.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade4.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade40.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade41.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade42.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade43.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade44.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade45.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade46.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade47.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade48.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade49.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade5.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade50.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade51.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade52.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade53.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade54.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade55.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade56.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade57.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade58.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade59.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade6.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade60.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade61.BE.sq= l ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade61.FR.sq= l ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade61.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade62.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade63.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade64.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade65.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade66.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade67.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade68.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade69.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade7.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade70.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade71.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade72.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade73.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade74.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade75.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade76.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade77.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade78.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade79.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade8.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade80.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade81.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade82.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade83.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade84.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade85.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade86.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade87.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade88.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade89.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade9.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade90.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade91.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade92.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade93.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade94.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade95.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin/sql/patch/upgrade96.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/admin_repo.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/ajax.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/ajax_card.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/ajax_extension.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/ajax_history.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/ajax_ledger.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/ajax_misc.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/ajax_poste.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Modified: phpcompta/trunk/html/ajax_report.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/ajax_report.php 2011-10-13 22:36:24 UTC (rev 421= 4) +++ phpcompta/trunk/html/ajax_report.php 2011-10-13 22:38:27 UTC (rev 421= 5) @@ -16,7 +16,7 @@ * along with PhpCompta; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-130= 7 USA */ -/* $Revision: 1992 $ */ +/* $Revision$ */ =20 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr =20 Property changes on: phpcompta/trunk/html/ajax_report.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/backup.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/bilan.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/caisse.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/calendar-blue.css ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/commercial.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/compta.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/comptanalytic.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/compute.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/document/fr_be/bnb.form ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/document/fr_be/bnb.rtf ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/document/fr_fr/fr_plan_abrege_p= erso_bil10000.form ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/document/fr_fr/fr_plan_abrege_p= erso_bil10000.ods ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/document/fr_fr/fr_plan_abrege_p= erso_cr1000.form ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/document/fr_fr/fr_plan_abrege_p= erso_cr1000.rtf ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/export.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/extension.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/extension.raw.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/fid.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/fid_card.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/get_pj.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/get_predef.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/get_saldo.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/image/bg-submit2.gif ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/image/bg-submit3.gif ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/image/bgcolor.gif ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/image/blackdot.gif ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/image/bold.gif ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/image/centre.gif ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/image/copy.gif ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/image/cut.gif ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/image/down.gif ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/image/email.gif ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/image/go-next.png ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/image/go-previous.png ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/image/home.png ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/image/hr.gif ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/image/hyperlink.gif ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/image/image.gif ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/image/indent.gif ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/image/insert_table.gif ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/image/italic.gif ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/image/justifyfull.gif ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/image/left_just.gif ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/image/list.gif ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/image/load.gif ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/image/loading.gif ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/image/logo7.jpg ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/image/logout.png ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/image/numbered_list.gif ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/image/outdent.gif ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/image/param.png ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/image/paste.gif ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/image/preference.png ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/image/print.png ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/image/redo.gif ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/image/right_just.gif ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/image/search.png ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/image/select1.gif ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/image/select2.gif ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/image/smiley.gif ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/image/spellcheck.gif ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/image/textcolor.gif ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/image/undefined.png ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/image/underline.gif ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/image/undo.gif ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/image/up.gif ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/image/x-office-calendar.png ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/index.html ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/index.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/jrn_search.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Modified: phpcompta/trunk/html/js/acc_ledger.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/js/acc_ledger.js 2011-10-13 22:36:24 UTC (rev 42= 14) +++ phpcompta/trunk/html/js/acc_ledger.js 2011-10-13 22:38:27 UTC (rev 42= 15) @@ -15,7 +15,7 @@ * along with PhpCompta; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-130= 7 USA */ -/* $Revision: 2546 $ */ +/* $Revision$ */ =20 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr =20 Property changes on: phpcompta/trunk/html/js/acc_ledger.js ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Modified: phpcompta/trunk/html/js/acc_report.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/js/acc_report.js 2011-10-13 22:36:24 UTC (rev 42= 14) +++ phpcompta/trunk/html/js/acc_report.js 2011-10-13 22:38:27 UTC (rev 42= 15) @@ -15,7 +15,7 @@ * along with PhpCompta; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-130= 7 USA */ -/* $Revision: 2546 $ */ +/* $Revision$ */ =20 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr =20 Property changes on: phpcompta/trunk/html/js/acc_report.js ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/accounting_item.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/ajax_fiche.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Modified: phpcompta/trunk/html/js/anc_script.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/js/anc_script.js 2011-10-13 22:36:24 UTC (rev 42= 14) +++ phpcompta/trunk/html/js/anc_script.js 2011-10-13 22:38:27 UTC (rev 42= 15) @@ -15,7 +15,7 @@ * along with PhpCompta; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-130= 7 USA */ -/* $Revision: 2546 $ */ +/* $Revision$ */ =20 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr /** Property changes on: phpcompta/trunk/html/js/anc_script.js ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/builder.js ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/calc.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/calendar-setup.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/calendar.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/card.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/compute.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/compute_direct.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/confirm.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/controls.js ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/dragdrop.js ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/effects.js ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Modified: phpcompta/trunk/html/js/extension.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/js/extension.js 2011-10-13 22:36:24 UTC (rev 421= 4) +++ phpcompta/trunk/html/js/extension.js 2011-10-13 22:38:27 UTC (rev 421= 5) @@ -15,7 +15,7 @@ * along with PhpCompta; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-130= 7 USA */ -/* $Revision: 2737 $ */ +/* $Revision$ */ =20 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr =20 Property changes on: phpcompta/trunk/html/js/extension.js ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Modified: phpcompta/trunk/html/js/forecast.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/js/forecast.js 2011-10-13 22:36:24 UTC (rev 4214= ) +++ phpcompta/trunk/html/js/forecast.js 2011-10-13 22:38:27 UTC (rev 4215= ) @@ -16,7 +16,7 @@ * along with PhpCompta; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-130= 7 USA */ -/* $Revision: 1649 $ */ +/* $Revision$ */ =20 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr =20 Property changes on: phpcompta/trunk/html/js/forecast.js ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Modified: phpcompta/trunk/html/js/gestion.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/js/gestion.js 2011-10-13 22:36:24 UTC (rev 4214) +++ phpcompta/trunk/html/js/gestion.js 2011-10-13 22:38:27 UTC (rev 4215) @@ -15,7 +15,7 @@ * along with PhpCompta; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-130= 7 USA */ -/* $Revision: 2546 $ */ +/* $Revision$ */ =20 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr =20 Property changes on: phpcompta/trunk/html/js/gestion.js ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/infobulle.js ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/jcalendar.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/lang/calendar-af.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/lang/calendar-al.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/lang/calendar-bg.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/lang/calendar-big5-utf8.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/lang/calendar-big5.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/lang/calendar-br.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/lang/calendar-ca.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/lang/calendar-cs-utf8.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/lang/calendar-cs-win.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/lang/calendar-da.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/lang/calendar-de.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/lang/calendar-du.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/lang/calendar-el.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/lang/calendar-en.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/lang/calendar-es.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/lang/calendar-fi.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/lang/calendar-fr.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/lang/calendar-he-utf8.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/lang/calendar-hr-utf8.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/lang/calendar-hr.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/lang/calendar-hu.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/lang/calendar-it.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/lang/calendar-jp.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/lang/calendar-ko-utf8.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/lang/calendar-ko.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/lang/calendar-lt-utf8.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/lang/calendar-lt.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/lang/calendar-lv.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/lang/calendar-nl.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/lang/calendar-no.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/lang/calendar-pl-utf8.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/lang/calendar-pl.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/lang/calendar-pt.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/lang/calendar-ro.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/lang/calendar-ru.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/lang/calendar-ru_win_.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/lang/calendar-si.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/lang/calendar-sk.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/lang/calendar-sp.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/lang/calendar-sv.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/lang/calendar-tr.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/lang/calendar-zh.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/lang/cn_utf8.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/modele_document.js ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/prototype.js ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/scriptaculous.js ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/scripts.js ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/slider.js ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/sound.js ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/todo_list.js ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/js/unittest.js ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/lang/en_US/LC_MESSAGES/messages= .po ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/lang/nl_NL/LC_MESSAGES/messages= .po ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/login.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/logout.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/not_implemented.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/palette.htm ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/parametre.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/popup.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/priv_user.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/recherche.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/remove_op.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/search_ca.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/securimage/AHGBold.ttf ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/securimage/LICENSE.txt ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/securimage/README.FONT.txt ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/securimage/README.txt ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/securimage/backgrounds/bg3.jpg ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/securimage/backgrounds/bg4.jpg ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/securimage/backgrounds/bg5.jpg ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/securimage/backgrounds/bg6.png ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/securimage/backgrounds/bg7.jpg ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/securimage/database/.htaccess ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/securimage/database/index.html ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/securimage/database/securimage.= sqlite ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/securimage/example_form.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/securimage/gdfonts/automatic.gd= f ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/securimage/images/audio_icon.gi= f ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/securimage/images/refresh.gif ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/securimage/securimage.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/securimage/securimage_play.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/securimage/securimage_play.swf ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/securimage/securimage_show.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/securimage/securimage_show_exam= ple.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/securimage/securimage_show_exam= ple2.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/securimage/words/words.txt ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/show_document.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/show_document_modele.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/show_pj.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/style-color.css ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/style-light.css ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/style-print.css ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/style-test.css ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/style.css ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/test.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/todo_list.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/html/user_advanced.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/user_login.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/html/user_pref.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/ac_common.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/action.common.inc.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/action.inc.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Modified: phpcompta/trunk/include/adm.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/adm.inc.php 2011-10-13 22:36:24 UTC (rev 4214= ) +++ phpcompta/trunk/include/adm.inc.php 2011-10-13 22:38:27 UTC (rev 4215= ) @@ -16,7 +16,7 @@ * along with PhpCompta; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-130= 7 USA */ -/* $Revision: 2729 $ */ +/* $Revision$ */ // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr /*!\brief include from adm.inc.php and concerned only the customer card = and * the customer category Property changes on: phpcompta/trunk/include/adm.inc.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/adm_card.inc.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/anc_group.inc.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/anc_imp.inc.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/anc_od.inc.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/anc_pa.inc.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/audit_log.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/balance.inc.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/balance_card.inc.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/card_attr.inc.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/cat_document.inc.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_acc_account.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_acc_account_ledger.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_acc_balance.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_acc_bilan.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_acc_compute.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_acc_ledger.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_acc_ledger_fin.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_acc_ledger_info.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_acc_ledger_purchase.ph= p ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_acc_ledger_sold.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_acc_operation.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_acc_parm_code.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_acc_payment.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_acc_reconciliation.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_acc_report.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_acc_report_row.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_acc_tva.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_action.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_action_detail.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_admin.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_anc_acc_link.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_anc_acc_list.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_anc_account.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_anc_balance_double.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_anc_balance_simple.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_anc_grandlivre.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_anc_group.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_anc_group_operation.ph= p ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_anc_listing.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_anc_operation.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_anc_plan.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_anc_print.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_anc_table.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_anticipation.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_calendar.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_contact.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_customer.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_database.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_document.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_document_modele.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_document_type.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_dossier.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_exercice.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_extension.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_fiche.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_fiche_attr.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_fiche_def.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_fiche_def_ref.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Modified: phpcompta/trunk/include/class_forecast.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_forecast.php 2011-10-13 22:36:24 UTC (r= ev 4214) +++ phpcompta/trunk/include/class_forecast.php 2011-10-13 22:38:27 UTC (r= ev 4215) @@ -16,7 +16,7 @@ * along with PhpCompta; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-130= 7 USA */ -/* $Revision: 1649 $ */ +/* $Revision$ */ =20 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr =20 Property changes on: phpcompta/trunk/include/class_forecast.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_forecast_cat.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_forecast_item.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_gestion_purchase.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_gestion_sold.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_gestion_table.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Modified: phpcompta/trunk/include/class_html_input.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_html_input.php 2011-10-13 22:36:24 UTC = (rev 4214) +++ phpcompta/trunk/include/class_html_input.php 2011-10-13 22:38:27 UTC = (rev 4215) @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-130= 7 USA */ =20 -/* $Revision: 2350 $ */ +/* $Revision$ */ =20 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr =20 Property changes on: phpcompta/trunk/include/class_html_input.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_html_table.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Modified: phpcompta/trunk/include/class_iaction.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_iaction.php 2011-10-13 22:36:24 UTC (re= v 4214) +++ phpcompta/trunk/include/class_iaction.php 2011-10-13 22:38:27 UTC (re= v 4215) @@ -16,7 +16,7 @@ * along with PhpCompta; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-130= 7 USA */ -/* $Revision: 1615 $ */ +/* $Revision$ */ =20 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr =20 Property changes on: phpcompta/trunk/include/class_iaction.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_ibox.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Modified: phpcompta/trunk/include/class_ibutton.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_ibutton.php 2011-10-13 22:36:24 UTC (re= v 4214) +++ phpcompta/trunk/include/class_ibutton.php 2011-10-13 22:38:27 UTC (re= v 4215) @@ -16,7 +16,7 @@ * along with PhpCompta; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-130= 7 USA */ -/* $Revision: 1615 $ */ +/* $Revision$ */ =20 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr =20 Property changes on: phpcompta/trunk/include/class_ibutton.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Modified: phpcompta/trunk/include/class_icard.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_icard.php 2011-10-13 22:36:24 UTC (rev = 4214) +++ phpcompta/trunk/include/class_icard.php 2011-10-13 22:38:27 UTC (rev = 4215) @@ -16,7 +16,7 @@ * along with PhpCompta; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-130= 7 USA */ -/* $Revision: 1615 $ */ +/* $Revision$ */ =20 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr =20 Property changes on: phpcompta/trunk/include/class_icard.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Modified: phpcompta/trunk/include/class_icheckbox.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_icheckbox.php 2011-10-13 22:36:24 UTC (= rev 4214) +++ phpcompta/trunk/include/class_icheckbox.php 2011-10-13 22:38:27 UTC (= rev 4215) @@ -16,7 +16,7 @@ * along with PhpCompta; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-130= 7 USA */ -/* $Revision: 1615 $ */ +/* $Revision$ */ =20 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr =20 Property changes on: phpcompta/trunk/include/class_icheckbox.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Modified: phpcompta/trunk/include/class_iconcerned.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_iconcerned.php 2011-10-13 22:36:24 UTC = (rev 4214) +++ phpcompta/trunk/include/class_iconcerned.php 2011-10-13 22:38:27 UTC = (rev 4215) @@ -16,7 +16,7 @@ * along with PhpCompta; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-130= 7 USA */ -/* $Revision: 1615 $ */ +/* $Revision$ */ =20 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr =20 Property changes on: phpcompta/trunk/include/class_iconcerned.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Modified: phpcompta/trunk/include/class_idate.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_idate.php 2011-10-13 22:36:24 UTC (rev = 4214) +++ phpcompta/trunk/include/class_idate.php 2011-10-13 22:38:27 UTC (rev = 4215) @@ -16,7 +16,7 @@ * along with PhpCompta; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-130= 7 USA */ -/* $Revision: 1615 $ */ +/* $Revision$ */ =20 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr =20 Property changes on: phpcompta/trunk/include/class_idate.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Modified: phpcompta/trunk/include/class_ifile.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_ifile.php 2011-10-13 22:36:24 UTC (rev = 4214) +++ phpcompta/trunk/include/class_ifile.php 2011-10-13 22:38:27 UTC (rev = 4215) @@ -16,7 +16,7 @@ * along with PhpCompta; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-130= 7 USA */ -/* $Revision: 1615 $ */ +/* $Revision$ */ =20 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr =20 Property changes on: phpcompta/trunk/include/class_ifile.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Modified: phpcompta/trunk/include/class_ihidden.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_ihidden.php 2011-10-13 22:36:24 UTC (re= v 4214) +++ phpcompta/trunk/include/class_ihidden.php 2011-10-13 22:38:27 UTC (re= v 4215) @@ -16,7 +16,7 @@ * along with PhpCompta; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-130= 7 USA */ -/* $Revision: 1615 $ */ +/* $Revision$ */ =20 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr =20 Property changes on: phpcompta/trunk/include/class_ihidden.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_inum.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Modified: phpcompta/trunk/include/class_iperiod.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_iperiod.php 2011-10-13 22:36:24 UTC (re= v 4214) +++ phpcompta/trunk/include/class_iperiod.php 2011-10-13 22:38:27 UTC (re= v 4215) @@ -16,7 +16,7 @@ * along with PhpCompta; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-130= 7 USA */ -/* $Revision: 1615 $ */ +/* $Revision$ */ =20 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr =20 Property changes on: phpcompta/trunk/include/class_iperiod.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_ipopup.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Modified: phpcompta/trunk/include/class_iposte.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_iposte.php 2011-10-13 22:36:24 UTC (rev= 4214) +++ phpcompta/trunk/include/class_iposte.php 2011-10-13 22:38:27 UTC (rev= 4215) @@ -16,7 +16,7 @@ * along with PhpCompta; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-130= 7 USA */ -/* $Revision: 1615 $ */ +/* $Revision$ */ =20 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr =20 Property changes on: phpcompta/trunk/include/class_iposte.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Modified: phpcompta/trunk/include/class_iradio.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_iradio.php 2011-10-13 22:36:24 UTC (rev= 4214) +++ phpcompta/trunk/include/class_iradio.php 2011-10-13 22:38:27 UTC (rev= 4215) @@ -16,7 +16,7 @@ * along with PhpCompta; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-130= 7 USA */ -/* $Revision: 1615 $ */ +/* $Revision$ */ =20 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr =20 Property changes on: phpcompta/trunk/include/class_iradio.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Modified: phpcompta/trunk/include/class_iselect.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_iselect.php 2011-10-13 22:36:24 UTC (re= v 4214) +++ phpcompta/trunk/include/class_iselect.php 2011-10-13 22:38:27 UTC (re= v 4215) @@ -16,7 +16,7 @@ * along with PhpCompta; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-130= 7 USA */ -/* $Revision: 1615 $ */ +/* $Revision$ */ =20 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr =20 Property changes on: phpcompta/trunk/include/class_iselect.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Modified: phpcompta/trunk/include/class_ispan.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_ispan.php 2011-10-13 22:36:24 UTC (rev = 4214) +++ phpcompta/trunk/include/class_ispan.php 2011-10-13 22:38:27 UTC (rev = 4215) @@ -16,7 +16,7 @@ * along with PhpCompta; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-130= 7 USA */ -/* $Revision: 1615 $ */ +/* $Revision$ */ =20 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr =20 Property changes on: phpcompta/trunk/include/class_ispan.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Modified: phpcompta/trunk/include/class_itext.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_itext.php 2011-10-13 22:36:24 UTC (rev = 4214) +++ phpcompta/trunk/include/class_itext.php 2011-10-13 22:38:27 UTC (rev = 4215) @@ -16,7 +16,7 @@ * along with PhpCompta; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-130= 7 USA */ -/* $Revision: 1615 $ */ +/* $Revision$ */ =20 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr =20 Property changes on: phpcompta/trunk/include/class_itext.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Modified: phpcompta/trunk/include/class_itextarea.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_itextarea.php 2011-10-13 22:36:24 UTC (= rev 4214) +++ phpcompta/trunk/include/class_itextarea.php 2011-10-13 22:38:27 UTC (= rev 4215) @@ -16,7 +16,7 @@ * along with PhpCompta; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-130= 7 USA */ -/* $Revision: 1615 $ */ +/* $Revision$ */ =20 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr =20 Property changes on: phpcompta/trunk/include/class_itextarea.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Deleted: phpcompta/trunk/include/class_itva.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_itva.php 2011-10-13 22:36:24 UTC (rev 4= 214) +++ phpcompta/trunk/include/class_itva.php 2011-10-13 22:38:27 UTC (rev 4= 215) @@ -1,59 +0,0 @@ -name=3D($p_name=3D=3Dnull)?$this->name:$p_name; - $this->value=3D($p_value=3D=3Dnull)?$this->value:$p_value; - if ( $this->readOnly=3D=3Dtrue) return $this->display(); - - $r=3Dsprintf('Tva ', - $this->name, - $this->name, - $this->value, - $this->label, - $this->name); - - $r.=3Dsprintf("", - dossier::id(),$this->name); - if ( $this->table =3D=3D 1 ) $r=3Dtd($r); - return $r; - - } - /*!\brief print in html the readonly value of the widget*/ - public function display() - { - throw new Exception ("Pas de function display pour la TVA",1); - } - static public function test_me() - { - } -} Modified: phpcompta/trunk/include/class_itva_popup.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_itva_popup.php 2011-10-13 22:36:24 UTC = (rev 4214) +++ phpcompta/trunk/include/class_itva_popup.php 2011-10-13 22:38:27 UTC = (rev 4215) @@ -16,7 +16,7 @@ * along with PhpCompta; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-130= 7 USA */ -/* $Revision: 1615 $ */ +/* $Revision$ */ =20 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr =20 Property changes on: phpcompta/trunk/include/class_itva_popup.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Deleted: phpcompta/trunk/include/class_itva_select.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_itva_select.php 2011-10-13 22:36:24 UTC= (rev 4214) +++ phpcompta/trunk/include/class_itva_select.php 2011-10-13 22:38:27 UTC= (rev 4215) @@ -1,69 +0,0 @@ -db=3D$p_cn; - } - - /*!\brief show the html input of the widget*/ - public function input($p_name=3Dnull,$p_value=3Dnull) - { - $this->name=3D($p_name=3D=3Dnull)?$this->name:$p_name; - $this->value=3D($p_value=3D=3Dnull)?$this->value:$p_value; - if ( $this->readOnly=3D=3Dtrue) return $this->display(); - - $select_tva=3D$this->db->make_array("select tva_id,tva_label fro= m tva_rate order by tva_label asc",0); - $this->value=3D$select_tva; - $a=3D""; - if ( $this->table =3D=3D 1 ) $a=3D''.$a.''; - - return $a; - - } - /*!\brief print in html the readonly value of the widget*/ - public function display() - { - $select_tva=3D$this->db->make_array("select tva_id,tva_label fro= m tva_rate order by tva_label asc",0); - $this->value=3D$select_tva; - $r=3Dparent::display(); - return $r; - } - static public function test_me() - { - } -} Property changes on: phpcompta/trunk/include/class_lettering.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_own.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_pdf.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_periode.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_pre_op_ach.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_pre_op_advanced.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_pre_op_fin.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_pre_op_ods.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_pre_op_ven.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_pre_operation.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_print_ledger_detail.ph= p ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_print_ledger_fin.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_print_ledger_misc.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_print_ledger_simple.ph= p ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_print_ledger_simple_wi= thout_vat.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_sort_table.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_supplier.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_todo_list.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_user.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/class_zip_extended.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/client.inc.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/client_card.inc.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/compta_ach.inc.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/compta_fin.inc.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/compta_ods.inc.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/compta_ven.inc.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/config.inc ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/config_file.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/constant.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/constant.security.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/contact.inc.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/detail_adm.inc.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/detail_client.inc.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/detail_supplier.inc.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/document_modele.inc.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/dossier.inc.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/export_anc_acc_list.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/export_anc_acc_list_csv.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/export_anc_balance_double_cs= v.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/export_anc_balance_double_pd= f.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/export_anc_balance_group_csv= .php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/export_anc_balance_simple_cs= v.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/export_anc_balance_simple_pd= f.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Modified: phpcompta/trunk/include/export_anc_list_csv.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/export_anc_list_csv.php 2011-10-13 22:36:24 U= TC (rev 4214) +++ phpcompta/trunk/include/export_anc_list_csv.php 2011-10-13 22:38:27 U= TC (rev 4215) @@ -16,7 +16,7 @@ * along with PhpCompta; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-130= 7 USA */ -/* $Revision: 3671 $ */ +/* $Revision$ */ =20 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr =20 Property changes on: phpcompta/trunk/include/export_anc_list_csv.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/export_anc_table_csv.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/export_balance_csv.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/export_balance_pdf.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/export_fiche_balance_csv.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/export_fiche_balance_pdf.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/export_fiche_csv.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/export_fiche_detail_csv.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/export_fiche_detail_pdf.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/export_fiche_pdf.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/export_form_csv.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/export_form_pdf.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/export_gl_csv.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/export_gl_pdf.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/export_histo_csv.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/export_ledger_csv.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/export_ledger_pdf.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/export_poste_detail.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/export_poste_detail_csv.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/export_poste_detail_pdf.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/export_security_pdf.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/export_table_csv.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/ext/dummy/dummy.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/ext_inc.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/extension.inc.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/fiche.inc.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/fiche_def.inc.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Modified: phpcompta/trunk/include/forecast.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/forecast.inc.php 2011-10-13 22:36:24 UTC (rev= 4214) +++ phpcompta/trunk/include/forecast.inc.php 2011-10-13 22:38:27 UTC (rev= 4215) @@ -16,7 +16,7 @@ * along with PhpCompta; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-130= 7 USA */ -/* $Revision: 1649 $ */ +/* $Revision$ */ =20 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr =20 Property changes on: phpcompta/trunk/include/forecast.inc.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/function_javascript.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/header_print.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/impress.inc.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/impress_bilan.inc.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/impress_fiche.inc.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/impress_gl_comptes.inc.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/impress_inc.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/impress_jrn.inc.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/impress_poste.inc.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/impress_rapport.inc.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/impress_rec.inc.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/letter.inc.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/lettering.account.inc.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/lettering.card.inc.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/lettering.gestion.inc.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/modele.inc.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/modify_mod_document.inc.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/modify_periode.inc.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/modify_predf_op.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/opening.inc.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/operation_adm.inc.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/operation_client.inc.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/operation_supplier.inc.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/param_jrn.inc.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/param_jrn_add.inc.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/param_jrn_detail.inc.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/param_pcmn.inc.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/param_sec.inc.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/payment_middle.inc.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/periode.inc.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/poste.inc.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/pref.inc.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/preod.inc.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Modified: phpcompta/trunk/include/report.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/report.inc.php 2011-10-13 22:36:24 UTC (rev 4= 214) +++ phpcompta/trunk/include/report.inc.php 2011-10-13 22:38:27 UTC (rev 4= 215) @@ -16,7 +16,7 @@ * along with PhpCompta; if not, write to the Free Software =20 */ -/* $Revision: 1937 $ */ +/* $Revision$ */ // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr /*! \file * \brief handle your own report: create or view report Property changes on: phpcompta/trunk/include/report.inc.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/restore.inc.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/save_predf_op.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/stock.inc.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/stock_inc.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/suivi_adm.inc.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/suivi_client.inc.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/suivi_supplier.inc.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/supplier.inc.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/supplier_card.inc.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/template/account_result.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/template/account_search.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/template/anc_balance_group.p= hp ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/template/calendar.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/template/card_result.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/template/category_of_card.ph= p ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/template/dashboard.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/template/detail-action.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/template/extension-detail.ph= p ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/template/extension-sec.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/template/extension.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/template/fiche_def_input.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/template/forecast-detail.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/template/forecast_cat.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/template/forecast_result.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/template/form_ledger_detail.= php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/template/form_ledger_fin.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/template/history_top.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/template/impress_cat_card.ph= p ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/template/impress_reconciliat= ion.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/template/ledger_detail_ach.p= hp ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/template/ledger_detail_botto= m.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/template/ledger_detail_file.= php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/template/ledger_detail_fin.p= hp ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/template/ledger_detail_forbi= dden.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/template/ledger_detail_misc.= php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/template/ledger_detail_top.p= hp ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/template/ledger_detail_ven.p= hp ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/template/ledger_search.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/template/letter_all.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/template/letter_prop.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/template/list_category_docum= ent.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/template/modele_document.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/template/new_mod_payment.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/template/param_jrn.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/template/periode_add_exercic= e.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/template/result_cat_card_sum= mary.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/template/security_list_actio= n.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/tfpdf/font/courier.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/tfpdf/font/helvetica.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/tfpdf/font/helveticab.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/tfpdf/font/helveticabi.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/tfpdf/font/helveticai.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/tfpdf/font/symbol.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/tfpdf/font/times.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/tfpdf/font/timesb.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/tfpdf/font/timesbi.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/tfpdf/font/timesi.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSan= s-Bold.ttf ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSan= s-BoldOblique.ttf ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSan= s-ExtraLight.ttf ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSan= s-Oblique.ttf ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSan= s.ttf ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSan= sCondensed-Bold.ttf ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSan= sCondensed-BoldOblique.ttf ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSan= sCondensed-Oblique.ttf ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSan= sCondensed.ttf ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSan= sMono-Bold.ttf ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSan= sMono-BoldOblique.ttf ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSan= sMono-Oblique.ttf ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSan= sMono.ttf ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSer= if-Bold.ttf ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSer= if-BoldItalic.ttf ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSer= if-Italic.ttf ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSer= if.ttf ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSer= ifCondensed-Bold.ttf ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSer= ifCondensed-BoldItalic.ttf ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSer= ifCondensed-Italic.ttf ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSer= ifCondensed.ttf ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Modified: phpcompta/trunk/include/tfpdf/font/unifont/DejaVu_LICENSE.txt =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/tfpdf/font/unifont/DejaVu_LICENSE.txt 2011-10= -13 22:36:24 UTC (rev 4214) +++ phpcompta/trunk/include/tfpdf/font/unifont/DejaVu_LICENSE.txt 2011-10= -13 22:38:27 UTC (rev 4215) @@ -96,4 +96,4 @@ from Tavmjong Bah. For further information, contact: tavmjong @ free . fr. =20 -$Id: LICENSE 2133 2007-11-28 02:46:28Z lechimp $ +$Id$ Property changes on: phpcompta/trunk/include/tfpdf/font/unifont/DejaVu_LI= CENSE.txt ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/tfpdf/font/unifont/ttfonts.p= hp ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/tfpdf/font/zapfdingbats.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/tfpdf/tfpdf.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/user.inc.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/user_action_gl.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/user_common.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/user_menu.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/include/verif_bilan.inc.php ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/license.txt ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date Property changes on: phpcompta/trunk/release-note ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/sql/change-pcmn-to-alphanum.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/sql/comptaproc.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/sql/correct-quant.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/sql/correct_quant_sold.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/sql/downgrade.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/sql/trunk/apply_patch.sh ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/sql/trunk/plsql-orig.sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/sql/trunk/reset.sh ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/sql/trunk/upgrade_account_repository= .sql ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/sql/upgrade.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Author Id Revision Date From MAILER-DAEMON Fri Oct 14 18:52:48 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1REqcR-0006Ve-W5 for mharc-phpcompta-dev@gnu.org; Fri, 14 Oct 2011 18:52:47 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sat, 15 Oct 2011 01:00:31 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4216 - phpcompta/trunk/include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Oct 2011 22:52:45 -0000 Author: danydb Date: 2011-10-15 01:00:29 +0200 (Sat, 15 Oct 2011) New Revision: 4216 Modified: phpcompta/trunk/include/class_action.php Log: code cleaning : remove obsolete Modified: phpcompta/trunk/include/class_action.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_action.php 2011-10-13 22:38:27 UTC (rev= 4215) +++ phpcompta/trunk/include/class_action.php 2011-10-14 23:00:29 UTC (rev= 4216) @@ -20,7 +20,6 @@ // Copyright Author Dany De Bontridder ddebontridder@yahoo.f require_once('class_itextarea.php'); require_once("class_idate.php"); -require_once('class_itva_select.php'); require_once("class_iselect.php"); require_once("class_ihidden.php"); require_once("class_itext.php"); @@ -89,18 +88,18 @@ //------------------------------------------------------------------= ---- /*! * \brief Display the object, the tags for the FORM - * are in the caller. It will be used for adding and updating= =20 - * action=20 + * are in the caller. It will be used for adding and updating + * action *\note If ag_id is not equal to zero then it is an update otherwi= se * it is a new document * - * \param $p_view if set to true the form will be in readonly mode (= value: true or false)=20 + * \param $p_view if set to true the form will be in readonly mode (= value: true or false) * \param $p_gen true we show the tag for generating a doc (value : = true or false) *\param $p_base is the p_action parameter *\param $retour is the html code for the return button * \note update the reference number or the document type is not al= lowed - * =20 * + * * \return string containing the html code */ function Display($p_view,$p_gen,$p_base,$retour=3D"") @@ -568,7 +567,7 @@ } =20 /*! - * \brief Save the document and propose to save the generated docume= nt or =20 + * \brief Save the document and propose to save the generated docume= nt or * to upload one, the data are included except the file. Temporary = the generated * document is save * @@ -870,7 +869,7 @@ /* * State */ - switch ( $row['ag_state'] )=20 + switch ( $row['ag_state'] ) { case 1: $state=3D'Ferm=C3=A9'; @@ -889,7 +888,7 @@ /* * State */ - switch ( $row['ag_priority'] )=20 + switch ( $row['ag_priority'] ) { case 1: $priority=3D'Haute'; From MAILER-DAEMON Fri Oct 14 18:53:00 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1REqce-0006WJ-1V for mharc-phpcompta-dev@gnu.org; Fri, 14 Oct 2011 18:53:00 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sat, 15 Oct 2011 01:00:51 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4217 - phpcompta/trunk/include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Oct 2011 22:52:58 -0000 Author: danydb Date: 2011-10-15 01:00:50 +0200 (Sat, 15 Oct 2011) New Revision: 4217 Modified: phpcompta/trunk/include/class_acc_ledger_sold.php Log: code cleaning : remove obsolete Modified: phpcompta/trunk/include/class_acc_ledger_sold.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_acc_ledger_sold.php 2011-10-14 23:00:29= UTC (rev 4216) +++ phpcompta/trunk/include/class_acc_ledger_sold.php 2011-10-14 23:00:50= UTC (rev 4217) @@ -24,7 +24,6 @@ * \brief class for the sold, herits from acc_ledger */ require_once("class_iselect.php"); -require_once('class_itva_select.php'); require_once("class_icard.php"); require_once("class_ispan.php"); require_once("class_ihidden.php"); @@ -182,8 +181,8 @@ * check if the accounting for VAT are valid */ $a_poste=3Dsplit(',',$tva_rate->tva_poste); - =09 - if (=20 + + if ( $this->db->get_value('select count(*) from tmp_pcmn where pcm_val=3D= $1',array($a_poste[0])) =3D=3D 0 || $this->db->get_value('select count(*) from tmp_pcmn where pcm_val=3D= $1',array($a_poste[1])) =3D=3D 0 ) throw new Exception(_(" La TVA ".$tva_rate->tva_label." utilise des = postes comptables inexistants")); @@ -563,17 +562,17 @@ /* * save also into quant_fin */ - =09 + /* get ledger property */ $ledger=3Dnew Acc_Ledger_Fin($this->db,$acc_pay->jrn); $prop=3D$ledger->get_propertie(); - =09 + /* if ledger is FIN then insert into quant_fin */ if ( $prop['jrn_def_type'] =3D=3D 'FIN' ) { $ledger->insert_quant_fin($acfiche->id,$mp_jr_id,$cust->id,bcmul($= cust_amount,1)); } - =09 + } =20 } From MAILER-DAEMON Fri Oct 14 20:55:13 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1REsWv-0000If-Al for mharc-phpcompta-dev@gnu.org; Fri, 14 Oct 2011 20:55:13 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sat, 15 Oct 2011 03:02:42 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4218 - in phpcompta/trunk/include/tfpdf: . font font/unifont X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Oct 2011 00:55:10 -0000 Author: danydb Date: 2011-10-15 03:02:41 +0200 (Sat, 15 Oct 2011) New Revision: 4218 Modified: phpcompta/trunk/include/tfpdf/font/courier.php phpcompta/trunk/include/tfpdf/font/helvetica.php phpcompta/trunk/include/tfpdf/font/helveticab.php phpcompta/trunk/include/tfpdf/font/helveticabi.php phpcompta/trunk/include/tfpdf/font/helveticai.php phpcompta/trunk/include/tfpdf/font/symbol.php phpcompta/trunk/include/tfpdf/font/times.php phpcompta/trunk/include/tfpdf/font/timesb.php phpcompta/trunk/include/tfpdf/font/timesbi.php phpcompta/trunk/include/tfpdf/font/timesi.php phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSans-Bold.ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSans-BoldOblique.ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSans-ExtraLight.ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSans-Oblique.ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSans.ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSansCondensed-Bold.tt= f phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSansCondensed-BoldObl= ique.ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSansCondensed-Oblique= .ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSansCondensed.ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSansMono-Bold.ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSansMono-BoldOblique.= ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSansMono-Oblique.ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSansMono.ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSerif-Bold.ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSerif-BoldItalic.ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSerif-Italic.ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSerif.ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSerifCondensed-Bold.t= tf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSerifCondensed-BoldIt= alic.ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSerifCondensed-Italic= .ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSerifCondensed.ttf phpcompta/trunk/include/tfpdf/font/unifont/ttfonts.php phpcompta/trunk/include/tfpdf/font/zapfdingbats.php phpcompta/trunk/include/tfpdf/tfpdf.php Log: update tfpdf to version 1.24=20 Must be more tested Modified: phpcompta/trunk/include/tfpdf/font/courier.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/tfpdf/font/courier.php 2011-10-14 23:00:50 UT= C (rev 4217) +++ phpcompta/trunk/include/tfpdf/font/courier.php 2011-10-15 01:02:41 UT= C (rev 4218) @@ -1,7 +1,8 @@ Modified: phpcompta/trunk/include/tfpdf/font/helvetica.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/tfpdf/font/helvetica.php 2011-10-14 23:00:50 = UTC (rev 4217) +++ phpcompta/trunk/include/tfpdf/font/helvetica.php 2011-10-15 01:02:41 = UTC (rev 4218) @@ -1,5 +1,9 @@ 278,chr(1)=3D>278,chr(2)=3D>278,chr(3)=3D>278,chr(4)=3D>278,c= hr(5)=3D>278,chr(6)=3D>278,chr(7)=3D>278,chr(8)=3D>278,chr(9)=3D>278,chr(= 10)=3D>278,chr(11)=3D>278,chr(12)=3D>278,chr(13)=3D>278,chr(14)=3D>278,ch= r(15)=3D>278,chr(16)=3D>278,chr(17)=3D>278,chr(18)=3D>278,chr(19)=3D>278,= chr(20)=3D>278,chr(21)=3D>278, chr(22)=3D>278,chr(23)=3D>278,chr(24)=3D>278,chr(25)=3D>278,chr(26)=3D>= 278,chr(27)=3D>278,chr(28)=3D>278,chr(29)=3D>278,chr(30)=3D>278,chr(31)=3D= >278,' '=3D>278,'!'=3D>278,'"'=3D>355,'#'=3D>556,'$'=3D>556,'%'=3D>889,'&= '=3D>667,'\''=3D>191,'('=3D>333,')'=3D>333,'*'=3D>389,'+'=3D>584, ','=3D>278,'-'=3D>333,'.'=3D>278,'/'=3D>278,'0'=3D>556,'1'=3D>556,'2'=3D= >556,'3'=3D>556,'4'=3D>556,'5'=3D>556,'6'=3D>556,'7'=3D>556,'8'=3D>556,'9= '=3D>556,':'=3D>278,';'=3D>278,'<'=3D>584,'=3D'=3D>584,'>'=3D>584,'?'=3D>= 556,'@'=3D>1015,'A'=3D>667, Modified: phpcompta/trunk/include/tfpdf/font/helveticab.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/tfpdf/font/helveticab.php 2011-10-14 23:00:50= UTC (rev 4217) +++ phpcompta/trunk/include/tfpdf/font/helveticab.php 2011-10-15 01:02:41= UTC (rev 4218) @@ -1,5 +1,9 @@ 278,chr(1)=3D>278,chr(2)=3D>278,chr(3)=3D>278,chr(4)=3D>278,c= hr(5)=3D>278,chr(6)=3D>278,chr(7)=3D>278,chr(8)=3D>278,chr(9)=3D>278,chr(= 10)=3D>278,chr(11)=3D>278,chr(12)=3D>278,chr(13)=3D>278,chr(14)=3D>278,ch= r(15)=3D>278,chr(16)=3D>278,chr(17)=3D>278,chr(18)=3D>278,chr(19)=3D>278,= chr(20)=3D>278,chr(21)=3D>278, chr(22)=3D>278,chr(23)=3D>278,chr(24)=3D>278,chr(25)=3D>278,chr(26)=3D>= 278,chr(27)=3D>278,chr(28)=3D>278,chr(29)=3D>278,chr(30)=3D>278,chr(31)=3D= >278,' '=3D>278,'!'=3D>333,'"'=3D>474,'#'=3D>556,'$'=3D>556,'%'=3D>889,'&= '=3D>722,'\''=3D>238,'('=3D>333,')'=3D>333,'*'=3D>389,'+'=3D>584, ','=3D>278,'-'=3D>333,'.'=3D>278,'/'=3D>278,'0'=3D>556,'1'=3D>556,'2'=3D= >556,'3'=3D>556,'4'=3D>556,'5'=3D>556,'6'=3D>556,'7'=3D>556,'8'=3D>556,'9= '=3D>556,':'=3D>333,';'=3D>333,'<'=3D>584,'=3D'=3D>584,'>'=3D>584,'?'=3D>= 611,'@'=3D>975,'A'=3D>722, Modified: phpcompta/trunk/include/tfpdf/font/helveticabi.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/tfpdf/font/helveticabi.php 2011-10-14 23:00:5= 0 UTC (rev 4217) +++ phpcompta/trunk/include/tfpdf/font/helveticabi.php 2011-10-15 01:02:4= 1 UTC (rev 4218) @@ -1,5 +1,9 @@ 278,chr(1)=3D>278,chr(2)=3D>278,chr(3)=3D>278,chr(4)=3D>278,c= hr(5)=3D>278,chr(6)=3D>278,chr(7)=3D>278,chr(8)=3D>278,chr(9)=3D>278,chr(= 10)=3D>278,chr(11)=3D>278,chr(12)=3D>278,chr(13)=3D>278,chr(14)=3D>278,ch= r(15)=3D>278,chr(16)=3D>278,chr(17)=3D>278,chr(18)=3D>278,chr(19)=3D>278,= chr(20)=3D>278,chr(21)=3D>278, chr(22)=3D>278,chr(23)=3D>278,chr(24)=3D>278,chr(25)=3D>278,chr(26)=3D>= 278,chr(27)=3D>278,chr(28)=3D>278,chr(29)=3D>278,chr(30)=3D>278,chr(31)=3D= >278,' '=3D>278,'!'=3D>333,'"'=3D>474,'#'=3D>556,'$'=3D>556,'%'=3D>889,'&= '=3D>722,'\''=3D>238,'('=3D>333,')'=3D>333,'*'=3D>389,'+'=3D>584, ','=3D>278,'-'=3D>333,'.'=3D>278,'/'=3D>278,'0'=3D>556,'1'=3D>556,'2'=3D= >556,'3'=3D>556,'4'=3D>556,'5'=3D>556,'6'=3D>556,'7'=3D>556,'8'=3D>556,'9= '=3D>556,':'=3D>333,';'=3D>333,'<'=3D>584,'=3D'=3D>584,'>'=3D>584,'?'=3D>= 611,'@'=3D>975,'A'=3D>722, Modified: phpcompta/trunk/include/tfpdf/font/helveticai.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/tfpdf/font/helveticai.php 2011-10-14 23:00:50= UTC (rev 4217) +++ phpcompta/trunk/include/tfpdf/font/helveticai.php 2011-10-15 01:02:41= UTC (rev 4218) @@ -1,5 +1,9 @@ 278,chr(1)=3D>278,chr(2)=3D>278,chr(3)=3D>278,chr(4)=3D>278,c= hr(5)=3D>278,chr(6)=3D>278,chr(7)=3D>278,chr(8)=3D>278,chr(9)=3D>278,chr(= 10)=3D>278,chr(11)=3D>278,chr(12)=3D>278,chr(13)=3D>278,chr(14)=3D>278,ch= r(15)=3D>278,chr(16)=3D>278,chr(17)=3D>278,chr(18)=3D>278,chr(19)=3D>278,= chr(20)=3D>278,chr(21)=3D>278, chr(22)=3D>278,chr(23)=3D>278,chr(24)=3D>278,chr(25)=3D>278,chr(26)=3D>= 278,chr(27)=3D>278,chr(28)=3D>278,chr(29)=3D>278,chr(30)=3D>278,chr(31)=3D= >278,' '=3D>278,'!'=3D>278,'"'=3D>355,'#'=3D>556,'$'=3D>556,'%'=3D>889,'&= '=3D>667,'\''=3D>191,'('=3D>333,')'=3D>333,'*'=3D>389,'+'=3D>584, ','=3D>278,'-'=3D>333,'.'=3D>278,'/'=3D>278,'0'=3D>556,'1'=3D>556,'2'=3D= >556,'3'=3D>556,'4'=3D>556,'5'=3D>556,'6'=3D>556,'7'=3D>556,'8'=3D>556,'9= '=3D>556,':'=3D>278,';'=3D>278,'<'=3D>584,'=3D'=3D>584,'>'=3D>584,'?'=3D>= 556,'@'=3D>1015,'A'=3D>667, Modified: phpcompta/trunk/include/tfpdf/font/symbol.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/tfpdf/font/symbol.php 2011-10-14 23:00:50 UTC= (rev 4217) +++ phpcompta/trunk/include/tfpdf/font/symbol.php 2011-10-15 01:02:41 UTC= (rev 4218) @@ -1,5 +1,9 @@ 250,chr(1)=3D>250,chr(2)=3D>250,chr(3)=3D>250,chr(4)=3D>250,c= hr(5)=3D>250,chr(6)=3D>250,chr(7)=3D>250,chr(8)=3D>250,chr(9)=3D>250,chr(= 10)=3D>250,chr(11)=3D>250,chr(12)=3D>250,chr(13)=3D>250,chr(14)=3D>250,ch= r(15)=3D>250,chr(16)=3D>250,chr(17)=3D>250,chr(18)=3D>250,chr(19)=3D>250,= chr(20)=3D>250,chr(21)=3D>250, chr(22)=3D>250,chr(23)=3D>250,chr(24)=3D>250,chr(25)=3D>250,chr(26)=3D>= 250,chr(27)=3D>250,chr(28)=3D>250,chr(29)=3D>250,chr(30)=3D>250,chr(31)=3D= >250,' '=3D>250,'!'=3D>333,'"'=3D>713,'#'=3D>500,'$'=3D>549,'%'=3D>833,'&= '=3D>778,'\''=3D>439,'('=3D>333,')'=3D>333,'*'=3D>500,'+'=3D>549, ','=3D>250,'-'=3D>549,'.'=3D>250,'/'=3D>278,'0'=3D>500,'1'=3D>500,'2'=3D= >500,'3'=3D>500,'4'=3D>500,'5'=3D>500,'6'=3D>500,'7'=3D>500,'8'=3D>500,'9= '=3D>500,':'=3D>278,';'=3D>278,'<'=3D>549,'=3D'=3D>549,'>'=3D>549,'?'=3D>= 444,'@'=3D>549,'A'=3D>722, Modified: phpcompta/trunk/include/tfpdf/font/times.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/tfpdf/font/times.php 2011-10-14 23:00:50 UTC = (rev 4217) +++ phpcompta/trunk/include/tfpdf/font/times.php 2011-10-15 01:02:41 UTC = (rev 4218) @@ -1,5 +1,9 @@ 250,chr(1)=3D>250,chr(2)=3D>250,chr(3)=3D>250,chr(4)=3D>250,c= hr(5)=3D>250,chr(6)=3D>250,chr(7)=3D>250,chr(8)=3D>250,chr(9)=3D>250,chr(= 10)=3D>250,chr(11)=3D>250,chr(12)=3D>250,chr(13)=3D>250,chr(14)=3D>250,ch= r(15)=3D>250,chr(16)=3D>250,chr(17)=3D>250,chr(18)=3D>250,chr(19)=3D>250,= chr(20)=3D>250,chr(21)=3D>250, chr(22)=3D>250,chr(23)=3D>250,chr(24)=3D>250,chr(25)=3D>250,chr(26)=3D>= 250,chr(27)=3D>250,chr(28)=3D>250,chr(29)=3D>250,chr(30)=3D>250,chr(31)=3D= >250,' '=3D>250,'!'=3D>333,'"'=3D>408,'#'=3D>500,'$'=3D>500,'%'=3D>833,'&= '=3D>778,'\''=3D>180,'('=3D>333,')'=3D>333,'*'=3D>500,'+'=3D>564, ','=3D>250,'-'=3D>333,'.'=3D>250,'/'=3D>278,'0'=3D>500,'1'=3D>500,'2'=3D= >500,'3'=3D>500,'4'=3D>500,'5'=3D>500,'6'=3D>500,'7'=3D>500,'8'=3D>500,'9= '=3D>500,':'=3D>278,';'=3D>278,'<'=3D>564,'=3D'=3D>564,'>'=3D>564,'?'=3D>= 444,'@'=3D>921,'A'=3D>722, Modified: phpcompta/trunk/include/tfpdf/font/timesb.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/tfpdf/font/timesb.php 2011-10-14 23:00:50 UTC= (rev 4217) +++ phpcompta/trunk/include/tfpdf/font/timesb.php 2011-10-15 01:02:41 UTC= (rev 4218) @@ -1,5 +1,9 @@ 250,chr(1)=3D>250,chr(2)=3D>250,chr(3)=3D>250,chr(4)=3D>250,c= hr(5)=3D>250,chr(6)=3D>250,chr(7)=3D>250,chr(8)=3D>250,chr(9)=3D>250,chr(= 10)=3D>250,chr(11)=3D>250,chr(12)=3D>250,chr(13)=3D>250,chr(14)=3D>250,ch= r(15)=3D>250,chr(16)=3D>250,chr(17)=3D>250,chr(18)=3D>250,chr(19)=3D>250,= chr(20)=3D>250,chr(21)=3D>250, chr(22)=3D>250,chr(23)=3D>250,chr(24)=3D>250,chr(25)=3D>250,chr(26)=3D>= 250,chr(27)=3D>250,chr(28)=3D>250,chr(29)=3D>250,chr(30)=3D>250,chr(31)=3D= >250,' '=3D>250,'!'=3D>333,'"'=3D>555,'#'=3D>500,'$'=3D>500,'%'=3D>1000,'= &'=3D>833,'\''=3D>278,'('=3D>333,')'=3D>333,'*'=3D>500,'+'=3D>570, ','=3D>250,'-'=3D>333,'.'=3D>250,'/'=3D>278,'0'=3D>500,'1'=3D>500,'2'=3D= >500,'3'=3D>500,'4'=3D>500,'5'=3D>500,'6'=3D>500,'7'=3D>500,'8'=3D>500,'9= '=3D>500,':'=3D>333,';'=3D>333,'<'=3D>570,'=3D'=3D>570,'>'=3D>570,'?'=3D>= 500,'@'=3D>930,'A'=3D>722, Modified: phpcompta/trunk/include/tfpdf/font/timesbi.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/tfpdf/font/timesbi.php 2011-10-14 23:00:50 UT= C (rev 4217) +++ phpcompta/trunk/include/tfpdf/font/timesbi.php 2011-10-15 01:02:41 UT= C (rev 4218) @@ -1,5 +1,9 @@ 250,chr(1)=3D>250,chr(2)=3D>250,chr(3)=3D>250,chr(4)=3D>250,c= hr(5)=3D>250,chr(6)=3D>250,chr(7)=3D>250,chr(8)=3D>250,chr(9)=3D>250,chr(= 10)=3D>250,chr(11)=3D>250,chr(12)=3D>250,chr(13)=3D>250,chr(14)=3D>250,ch= r(15)=3D>250,chr(16)=3D>250,chr(17)=3D>250,chr(18)=3D>250,chr(19)=3D>250,= chr(20)=3D>250,chr(21)=3D>250, chr(22)=3D>250,chr(23)=3D>250,chr(24)=3D>250,chr(25)=3D>250,chr(26)=3D>= 250,chr(27)=3D>250,chr(28)=3D>250,chr(29)=3D>250,chr(30)=3D>250,chr(31)=3D= >250,' '=3D>250,'!'=3D>389,'"'=3D>555,'#'=3D>500,'$'=3D>500,'%'=3D>833,'&= '=3D>778,'\''=3D>278,'('=3D>333,')'=3D>333,'*'=3D>500,'+'=3D>570, ','=3D>250,'-'=3D>333,'.'=3D>250,'/'=3D>278,'0'=3D>500,'1'=3D>500,'2'=3D= >500,'3'=3D>500,'4'=3D>500,'5'=3D>500,'6'=3D>500,'7'=3D>500,'8'=3D>500,'9= '=3D>500,':'=3D>333,';'=3D>333,'<'=3D>570,'=3D'=3D>570,'>'=3D>570,'?'=3D>= 500,'@'=3D>832,'A'=3D>667, Modified: phpcompta/trunk/include/tfpdf/font/timesi.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/tfpdf/font/timesi.php 2011-10-14 23:00:50 UTC= (rev 4217) +++ phpcompta/trunk/include/tfpdf/font/timesi.php 2011-10-15 01:02:41 UTC= (rev 4218) @@ -1,5 +1,9 @@ 250,chr(1)=3D>250,chr(2)=3D>250,chr(3)=3D>250,chr(4)=3D>250,c= hr(5)=3D>250,chr(6)=3D>250,chr(7)=3D>250,chr(8)=3D>250,chr(9)=3D>250,chr(= 10)=3D>250,chr(11)=3D>250,chr(12)=3D>250,chr(13)=3D>250,chr(14)=3D>250,ch= r(15)=3D>250,chr(16)=3D>250,chr(17)=3D>250,chr(18)=3D>250,chr(19)=3D>250,= chr(20)=3D>250,chr(21)=3D>250, chr(22)=3D>250,chr(23)=3D>250,chr(24)=3D>250,chr(25)=3D>250,chr(26)=3D>= 250,chr(27)=3D>250,chr(28)=3D>250,chr(29)=3D>250,chr(30)=3D>250,chr(31)=3D= >250,' '=3D>250,'!'=3D>333,'"'=3D>420,'#'=3D>500,'$'=3D>500,'%'=3D>833,'&= '=3D>778,'\''=3D>214,'('=3D>333,')'=3D>333,'*'=3D>500,'+'=3D>675, ','=3D>250,'-'=3D>333,'.'=3D>250,'/'=3D>278,'0'=3D>500,'1'=3D>500,'2'=3D= >500,'3'=3D>500,'4'=3D>500,'5'=3D>500,'6'=3D>500,'7'=3D>500,'8'=3D>500,'9= '=3D>500,':'=3D>333,';'=3D>333,'<'=3D>675,'=3D'=3D>675,'>'=3D>675,'?'=3D>= 500,'@'=3D>920,'A'=3D>611, Modified: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSans-Bold.ttf =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSans-BoldObliq= ue.ttf =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSans-ExtraLigh= t.ttf =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSans-Oblique.t= tf =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSans.ttf =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSansCondensed-= Bold.ttf =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSansCondensed-= BoldOblique.ttf =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSansCondensed-= Oblique.ttf =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSansCondensed.= ttf =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSansMono-Bold.= ttf =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSansMono-BoldO= blique.ttf =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSansMono-Obliq= ue.ttf =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSansMono.ttf =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSerif-Bold.ttf =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSerif-BoldItal= ic.ttf =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSerif-Italic.t= tf =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSerif.ttf =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSerifCondensed= -Bold.ttf =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSerifCondensed= -BoldItalic.ttf =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSerifCondensed= -Italic.ttf =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSerifCondensed= .ttf =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: phpcompta/trunk/include/tfpdf/font/unifont/ttfonts.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/tfpdf/font/unifont/ttfonts.php 2011-10-14 23:= 00:50 UTC (rev 4217) +++ phpcompta/trunk/include/tfpdf/font/unifont/ttfonts.php 2011-10-15 01:= 02:41 UTC (rev 4218) @@ -8,8 +8,8 @@ * written in Python - http://www.reportlab.com/software/opensource/ = * * together with ideas from the OpenOffice source code and others. = * * = * -* Version: 1.02 = * -* Date: 2010-06-07 = * +* Version: 1.04 = * +* Date: 2011-09-18 = * * Author: Ian Back = * * License: LGPL = * * Copyright (c) Ian Back, 2010 = * @@ -18,7 +18,14 @@ * = * ************************************************************************= *******/ =20 +// Define the value used in the "head" table of a created TTF file +// 0x74727565 "true" for Mac +// 0x00010000 for Windows +// Either seems to work for a font embedded in a PDF file +// when read by Adobe Reader on a Windows PC(!) +define("_TTF_MAC_HEADER", false); =20 + // TrueType Font Glyph operators define("GF_WORDS",(1 << 0)); define("GF_SCALE",(1 << 3)); @@ -30,6 +37,7 @@ =20 class TTFontFile { =20 +var $maxUni; var $_pos; var $numTables; var $searchRange; @@ -66,44 +74,38 @@ } =20 =20 - function getMetrics($file, $presubset=3D0) { + function getMetrics($file) { $this->filename =3D $file; $this->fh =3D fopen($file,'rb') or die('Can\'t open file ' . $file); $this->_pos =3D 0; - $this->charWidths =3D array(); - $this->hmetrics =3D array(); + $this->charWidths =3D ''; $this->glyphPos =3D array(); $this->charToGlyph =3D array(); $this->tables =3D array(); $this->otables =3D array(); $this->ascent =3D 0; $this->descent =3D 0; - if ($presubset) { $this->skip(4); } - else { $this->readHeader(); } - $this->readTableDirectory($presubset); - $this->extractInfo($presubset);=20 - fclose($this->fh); - } - - function readHeader() { - // read the sfnt header at the current position + $this->TTCFonts =3D array(); $this->version =3D $version =3D $this->read_ulong(); if ($version=3D=3D0x4F54544F)=20 die("Postscript outlines are not supported"); if ($version=3D=3D0x74746366)=20 - die("TTC Font collections are not supported"); + die("ERROR - TrueType Fonts Collections not supported"); if (!in_array($version, array(0x00010000,0x74727565))) die("Not a TrueType font: version=3D".$version); - return true; + $this->readTableDirectory(); + $this->extractInfo(); + fclose($this->fh); } =20 - function readTableDirectory($presubset=3D1) { - $this->numTables =3D $this->read_ushort(); + + function readTableDirectory() { + $this->numTables =3D $this->read_ushort(); $this->searchRange =3D $this->read_ushort(); $this->entrySelector =3D $this->read_ushort(); $this->rangeShift =3D $this->read_ushort(); $this->tables =3D array();=09 - for ($i=3D0;$i<$this->numTables;$i++) { // 1.02 + for ($i=3D0;$i<$this->numTables;$i++) { $record =3D array(); $record['tag'] =3D $this->read_tag(); $record['checksum'] =3D array($this->read_ushort(),$this= ->read_ushort()); @@ -111,27 +113,8 @@ $record['length'] =3D $this->read_ulong(); $this->tables[$record['tag']] =3D $record; } - if (!$presubset) $this->checksumTables(); } =20 - function checksumTables() { - // Check the checksums for all tables - foreach($this->tables AS $t) { - if ($t['length'] > 0 && $t['length'] < $this->maxStrLenRead) { // 1.= 02 - $table =3D $this->get_chunk($t['offset'], $t['length']); - $checksum =3D $this->calcChecksum($table); - if ($t['tag'] =3D=3D 'head') { - $up =3D unpack('n*', substr($table,8,4)); - $adjustment[0] =3D $up[1]; - $adjustment[1] =3D $up[2]; - $checksum =3D $this->sub32($checksum, $adjustment); - } - $xchecksum =3D $t['checksum']; - if ($xchecksum !=3D $checksum)=20 - die(sprintf('TTF file "%s": invalid checksum %s table: = %s (expected %s)', $this->filename,dechex($checksum[0]).dechex($checksum[= 1]),$t['tag'],dechex($xchecksum[0]).dechex($xchecksum[1]))); - } - } - } =20 function sub32($x, $y) { $xlo =3D $x[1]; @@ -196,6 +179,14 @@ return $a; } =20 + function unpack_short($s) { + $a =3D (ord($s[0])<<8) + ord($s[1]); + if ($a & (1 << 15) ) {=20 + $a =3D ($a - (1 << 16));=20 + } + return $a; + } + function read_ushort() { $this->_pos +=3D 2; $s =3D fread($this->fh,2); @@ -240,15 +231,25 @@ return $this->splice($stream, $offset, $up); } =20 + function _set_short($stream, $offset, $val) { + if ($val<0) {=20 + $val =3D abs($val); + $val =3D ~$val; + $val +=3D 1; + } + $up =3D pack("n",$val);=20 + return $this->splice($stream, $offset, $up); + } + function get_chunk($pos, $length) { fseek($this->fh,$pos); - if ($length <1) { return ''; } // 1.02 + if ($length <1) { return ''; } return (fread($this->fh,$length)); } =20 function get_table($tag) { list($pos, $length) =3D $this->get_table_pos($tag); - if ($length =3D=3D 0) { die('Truetype font ('.$this->filename.'): erro= r reading table: '.$tag); } // 1.02 + if ($length =3D=3D 0) { die('Truetype font ('.$this->filename.'): erro= r reading table: '.$tag); } fseek($this->fh,$pos); return (fread($this->fh,$length)); } @@ -263,22 +264,23 @@ =20 =20 ////////////////////////////////////////////////////////////////////////= ///////////////// +////////////////////////////////////////////////////////////////////////= ///////////////// =20 +////////////////////////////////////////////////////////////////////////= ///////////////// =20 - function extractInfo($presubset=3D0) { - // =3D 0 ; validate; does not need glyphPos or charToGlyph - // presubset =3D 1; no validation; does not need name and other metric= s + function extractInfo() { /////////////////////////////////// // name - Naming table /////////////////////////////////// - if (!$presubset) {=20 + $this->sFamilyClass =3D 0; + $this->sFamilySubClass =3D 0; + $name_offset =3D $this->seek_table("name"); $format =3D $this->read_ushort(); if ($format !=3D 0) die("Unknown name table format ".$format); $numRecords =3D $this->read_ushort(); $string_data_offset =3D $name_offset + $this->read_ushort(); - $names =3D array(1=3D>'',2=3D>'',3=3D>'',4=3D>'',6=3D>''); $K =3D array_keys($names); $nameCount =3D count($names); @@ -300,7 +302,7 @@ $N =3D ''; while ($length > 0) { $char =3D $this->read_ushort(); - $N .=3D (chr($char)); // 1.02 + $N .=3D (chr($char)); $length -=3D 1; } $this->_pos =3D $opos; @@ -319,7 +321,7 @@ } } if ($names[6]) - $psName =3D preg_replace('/ /','-',$names[6]); + $psName =3D $names[6]; else if ($names[4]) $psName =3D preg_replace('/ /','-',$names[4]); else if ($names[1]) @@ -328,49 +330,27 @@ $psName =3D ''; if (!$psName) die("Could not find PostScript font name"); - for ($i=3D0;$i126 || strpos(' [](){}<>/%',$c)!=3D=3Dfalse) - die("psName=3D".$psName." contains invalid character ".$c." ie U+".= ord(c)); - } $this->name =3D $psName; if ($names[1]) { $this->familyName =3D $names[1]; } else { $this->fam= ilyName =3D $psName; } if ($names[2]) { $this->styleName =3D $names[2]; } else { $this->styl= eName =3D 'Regular'; } if ($names[4]) { $this->fullName =3D $names[4]; } else { $this->fullN= ame =3D $psName; } if ($names[3]) { $this->uniqueFontID =3D $names[3]; } else { $this->u= niqueFontID =3D $psName; } - } + if ($names[6]) { $this->fullName =3D $names[6]; } =20 /////////////////////////////////// // head - Font header table /////////////////////////////////// $this->seek_table("head"); - if ($presubset) { $this->skip(18); } - else { - $ver_maj =3D $this->read_ushort(); - $ver_min =3D $this->read_ushort(); - if ($ver_maj !=3D 1) - die('Unknown head table version '. $ver_maj .'.'. $ver_min); - $this->fontRevision =3D $this->read_ushort() . $this->read_ushort(); - - $this->skip(4); - $magic =3D $this->read_ulong(); - if ($magic !=3D 0x5F0F3CF5)=20 - die('Invalid head table magic ' .$magic); - $this->skip(2); - } - $this->unitsPerEm =3D $unitsPerEm =3D $this->read_ushort(); // 1.02 - $scale =3D 1000 / $unitsPerEm; // 1.02 - if ($presubset) { $this->skip(30); } // 1.02 - else {=20 - $this->skip(16); - $xMin =3D $this->read_short(); - $yMin =3D $this->read_short(); - $xMax =3D $this->read_short(); - $yMax =3D $this->read_short(); - $this->bbox =3D array(($xMin*$scale), ($yMin*$scale), ($xMax*$scale),= ($yMax*$scale)); - $this->skip(3*2); - } + $this->skip(18);=20 + $this->unitsPerEm =3D $unitsPerEm =3D $this->read_ushort(); + $scale =3D 1000 / $unitsPerEm; + $this->skip(16); + $xMin =3D $this->read_short(); + $yMin =3D $this->read_short(); + $xMax =3D $this->read_short(); + $yMax =3D $this->read_short(); + $this->bbox =3D array(($xMin*$scale), ($yMin*$scale), ($xMax*$scale), = ($yMax*$scale)); + $this->skip(3*2); $indexToLocFormat =3D $this->read_ushort(); $glyphDataFormat =3D $this->read_ushort(); if ($glyphDataFormat !=3D 0) @@ -399,9 +379,17 @@ $usWeightClass =3D $this->read_ushort(); $this->skip(2); $fsType =3D $this->read_ushort(); - // if ($fsType =3D=3D 0x0002 || ($fsType & 0x0300) !=3D 0)=20 - // die('Font does not allow subsetting/embedding'); - $this->skip(58); //11*2 + 10 + 4*4 + 4 + 3*2 + if ($fsType =3D=3D 0x0002 || ($fsType & 0x0300) !=3D 0) { + die('ERROR - Font file '.$this->filename.' cannot be embedded due to= copyright restrictions.'); + $this->restrictedUse =3D true; + } + $this->skip(20); + $sF =3D $this->read_short(); + $this->sFamilyClass =3D ($sF >> 8); + $this->sFamilySubClass =3D ($sF & 0xFF); + $this->_pos +=3D 10; //PANOSE =3D 10 byte length + $panose =3D fread($this->fh,10); + $this->skip(26); $sTypoAscender =3D $this->read_short(); $sTypoDescender =3D $this->read_short(); if (!$this->ascent) $this->ascent =3D ($sTypoAscender*$scale); @@ -427,13 +415,7 @@ // post - PostScript table /////////////////////////////////// $this->seek_table("post"); - if ($presubset) { $this->skip(4); } - else { - $ver_maj =3D $this->read_ushort(); - $ver_min =3D $this->read_ushort(); - if ($ver_maj <1 || $ver_maj >4)=20 - die('Unknown post table version '.$ver_maj); - } + $this->skip(4);=20 $this->italicAngle =3D $this->read_short() + $this->read_ushort() / 65= 536.0; $this->underlinePosition =3D $this->read_short() * $scale; $this->underlineThickness =3D $this->read_short() * $scale; @@ -452,14 +434,7 @@ // hhea - Horizontal header table /////////////////////////////////// $this->seek_table("hhea"); - if ($presubset) { $this->skip(32); } - else { - $ver_maj =3D $this->read_ushort(); - $ver_min =3D $this->read_ushort(); - if ($ver_maj !=3D 1) - die('Unknown hhea table version '.$ver_maj); - $this->skip(28); - } + $this->skip(32);=20 $metricDataFormat =3D $this->read_ushort(); if ($metricDataFormat !=3D 0) die('Unknown horizontal metric data format '.$metricDataFormat); @@ -471,15 +446,10 @@ // maxp - Maximum profile table /////////////////////////////////// $this->seek_table("maxp"); - if ($presubset) { $this->skip(4); } - else { - $ver_maj =3D $this->read_ushort(); - $ver_min =3D $this->read_ushort(); - if ($ver_maj !=3D 1) - die('Unknown maxp table version '.$ver_maj); - } + $this->skip(4);=20 $numGlyphs =3D $this->read_ushort(); =20 + /////////////////////////////////// // cmap - Character to glyph index mapping table /////////////////////////////////// @@ -492,14 +462,88 @@ $encodingID =3D $this->read_ushort(); $offset =3D $this->read_ulong(); $save_pos =3D $this->_pos; - if ($platformID =3D=3D 3 && $encodingID =3D=3D 1) { // Microsoft, Uni= code + if (($platformID =3D=3D 3 && $encodingID =3D=3D 1) || $platformID =3D= =3D 0) { // Microsoft, Unicode $format =3D $this->get_ushort($cmap_offset + $offset); if ($format =3D=3D 4) { - $unicode_cmap_offset =3D $cmap_offset + $offset; + if (!$unicode_cmap_offset) $unicode_cmap_offset =3D $cmap_offset + = $offset; break; } } - else if ($platformID =3D=3D 0) { // Unicode -- assume all encodings a= re compatible + $this->seek($save_pos ); + } + if (!$unicode_cmap_offset) + die('Font ('.$this->filename .') does not have cmap for Unicode (plat= form 3, encoding 1, format 4, or platform 0, any encoding, format 4)'); + + + $glyphToChar =3D array(); + $charToGlyph =3D array(); + $this->getCMAP4($unicode_cmap_offset, $glyphToChar, $charToGlyph ); + + /////////////////////////////////// + // hmtx - Horizontal metrics table + /////////////////////////////////// + $this->getHMTX($numberOfHMetrics, $numGlyphs, $glyphToChar, $scale); + + } + + +////////////////////////////////////////////////////////////////////////= ///////////////// +////////////////////////////////////////////////////////////////////////= ///////////////// + + + function makeSubset($file, &$subset) { + $this->filename =3D $file; + $this->fh =3D fopen($file ,'rb') or die('Can\'t open file ' . $file); + $this->_pos =3D 0; + $this->charWidths =3D ''; + $this->glyphPos =3D array(); + $this->charToGlyph =3D array(); + $this->tables =3D array(); + $this->otables =3D array(); + $this->ascent =3D 0; + $this->descent =3D 0; + $this->skip(4); + $this->maxUni =3D 0; + $this->readTableDirectory(); + + + /////////////////////////////////// + // head - Font header table + /////////////////////////////////// + $this->seek_table("head"); + $this->skip(50);=20 + $indexToLocFormat =3D $this->read_ushort(); + $glyphDataFormat =3D $this->read_ushort(); + + /////////////////////////////////// + // hhea - Horizontal header table + /////////////////////////////////// + $this->seek_table("hhea"); + $this->skip(32);=20 + $metricDataFormat =3D $this->read_ushort(); + $orignHmetrics =3D $numberOfHMetrics =3D $this->read_ushort(); + + /////////////////////////////////// + // maxp - Maximum profile table + /////////////////////////////////// + $this->seek_table("maxp"); + $this->skip(4); + $numGlyphs =3D $this->read_ushort(); + + + /////////////////////////////////// + // cmap - Character to glyph index mapping table + /////////////////////////////////// + $cmap_offset =3D $this->seek_table("cmap"); + $this->skip(2); + $cmapTableCount =3D $this->read_ushort(); + $unicode_cmap_offset =3D 0; + for ($i=3D0;$i<$cmapTableCount;$i++) { + $platformID =3D $this->read_ushort(); + $encodingID =3D $this->read_ushort(); + $offset =3D $this->read_ulong(); + $save_pos =3D $this->_pos; + if (($platformID =3D=3D 3 && $encodingID =3D=3D 1) || $platformID =3D= =3D 0) { // Microsoft, Unicode $format =3D $this->get_ushort($cmap_offset + $offset); if ($format =3D=3D 4) { $unicode_cmap_offset =3D $cmap_offset + $offset; @@ -510,166 +554,68 @@ } =20 if (!$unicode_cmap_offset) - die('Font does not have cmap for Unicode (platform 3, encoding 1, for= mat 4, or platform 0, any encoding, format 4)'); - $this->seek($unicode_cmap_offset + 2); - $length =3D $this->read_ushort(); - $limit =3D $unicode_cmap_offset + $length; - $this->skip(2); + die('Font ('.$this->filename .') does not have cmap for Unicode (plat= form 3, encoding 1, format 4, or platform 0, any encoding, format 4)'); =20 - $segCount =3D $this->read_ushort() / 2; - $this->skip(6); - $endCount =3D array(); - for($i=3D0; $i<$segCount; $i++) { $endCount[] =3D $this->read_ushort()= ; } - $this->skip(2); - $startCount =3D array(); - for($i=3D0; $i<$segCount; $i++) { $startCount[] =3D $this->read_ushort= (); } - $idDelta =3D array(); - for($i=3D0; $i<$segCount; $i++) { $idDelta[] =3D $this->read_short(); = } // ???? was unsigned short - $idRangeOffset_start =3D $this->_pos; - $idRangeOffset =3D array(); - for($i=3D0; $i<$segCount; $i++) { $idRangeOffset[] =3D $this->read_ush= ort(); } =20 $glyphToChar =3D array(); $charToGlyph =3D array(); - for ($n=3D0;$n<$segCount;$n++) { - for ($unichar=3D$startCount[$n];$unichar<($endCount[$n] + 1);$unichar= ++) { - if ($idRangeOffset[$n] =3D=3D 0) - $glyph =3D ($unichar + $idDelta[$n]) & 0xFFFF; - else { - $offset =3D ($unichar - $startCount[$n]) * 2 + $idRangeOffset[$n]; - $offset =3D $idRangeOffset_start + 2 * $n + $offset; - if ($offset >=3D $limit) - $glyph =3D 0; - else { - $glyph =3D $this->get_ushort($offset); - if ($glyph !=3D 0) - $glyph =3D ($glyph + $idDelta[$n]) & 0xFFFF; - } - } - if ($presubset) $charToGlyph[$unichar] =3D $glyph; - $glyphToChar[$glyph][] =3D $unichar; - } - } - if ($presubset) $this->charToGlyph =3D $charToGlyph; + $this->getCMAP4($unicode_cmap_offset, $glyphToChar, $charToGlyph ); =20 + $this->charToGlyph =3D $charToGlyph; + /////////////////////////////////// // hmtx - Horizontal metrics table /////////////////////////////////// - $this->seek_table("hmtx"); - $aw =3D 0; - $this->charWidths =3D array(); - $this->hmetrics =3D array(); - for( $glyph=3D0; $glyph<$numberOfHMetrics; $glyph++) { - $aw =3D $this->read_ushort(); - $lsb =3D $this->read_short(); - $this->hmetrics[] =3D array($aw, $lsb); - $aw =3D $scale*$aw; - if ($glyph =3D=3D 0) - $this->defaultWidth =3D $aw; - if (isset($glyphToChar[$glyph])) { - foreach($glyphToChar[$glyph] AS $char) { - $this->charWidths[$char] =3D round($aw); - } - } - } - for( $glyph=3D$numberOfHMetrics; $glyph<$numGlyphs; $glyph++) { - $lsb =3D $this->read_ushort(); - $this->hmetrics[] =3D array($aw, $lsb); - if (isset($glyphToChar[$glyph])) { - foreach($glyphToChar[$glyph] AS $char) { - $this->charWidths[$char] =3D round($aw); - } - } - } + $scale =3D 1; // not used + $this->getHMTX($numberOfHMetrics, $numGlyphs, $glyphToChar, $scale); =20 /////////////////////////////////// // loca - Index to location /////////////////////////////////// - if ($presubset) { - $this->seek_table('loca'); - $this->glyphPos =3D array(); - if ($indexToLocFormat =3D=3D 0) { - for ($n=3D0; $n<=3D$numGlyphs; $n++) { // 1.02 - $this->glyphPos[] =3D ($this->read_ushort() * 2); - } - } - else if ($indexToLocFormat =3D=3D 1) { - for ($n=3D0; $n<=3D$numGlyphs; $n++) { // 1.02 - $this->glyphPos[] =3D ($this->read_ulong()); - } - } - else=20 - die('Unknown location table format '.$indexToLocFormat); - } - } + $this->getLOCA($indexToLocFormat, $numGlyphs); =20 + $subsetglyphs =3D array(0=3D>0);=20 + $subsetCharToGlyph =3D array(); + foreach($subset AS $code) { + if (isset($this->charToGlyph[$code])) { + $subsetglyphs[$this->charToGlyph[$code]] =3D $code; // Old Glyph ID = =3D> Unicode + $subsetCharToGlyph[$code] =3D $this->charToGlyph[$code]; // Unicode = to old GlyphID =20 -////////////////////////////////////////////////////////////////////////= ///////////////// - - - function makeSubset($subset) { - $this->fh =3D fopen($this->filename ,'rb') or die('Can\'t open file ' = . $this->filename ); - $this->otables =3D array(); - $glyphMap =3D array(0=3D>0);=20 - $glyphSet =3D array(0=3D>0); - $codeToGlyph =3D array(); - foreach($subset AS $code) { - if (isset($this->charToGlyph[$code])) - $originalGlyphIdx =3D $this->charToGlyph[$code]; - else - $originalGlyphIdx =3D 0; - if (!isset($glyphSet[$originalGlyphIdx])) { - $glyphSet[$originalGlyphIdx] =3D count($glyphMap); - $glyphMap[] =3D $originalGlyphIdx; } - $codeToGlyph[$code] =3D $glyphSet[$originalGlyphIdx]; + $this->maxUni =3D max($this->maxUni, $code); } =20 list($start,$dummy) =3D $this->get_table_pos('glyf'); =20 + $glyphSet =3D array(); + ksort($subsetglyphs); $n =3D 0; - while ($n < count($glyphMap)) { - $originalGlyphIdx =3D $glyphMap[$n]; - $glyphPos =3D $this->glyphPos[$originalGlyphIdx]; - $glyphLen =3D $this->glyphPos[$originalGlyphIdx + 1] - $glyphPos; - $n +=3D 1; - if (!$glyphLen) continue; - $this->seek($start + $glyphPos); - $numberOfContours =3D $this->read_short(); - if ($numberOfContours < 0) { - $this->skip(8); - $flags =3D GF_MORE; - while ($flags & GF_MORE) { - $flags =3D $this->read_ushort(); - $glyphIdx =3D $this->read_ushort(); - if (!isset($glyphSet[$glyphIdx])) { - $glyphSet[$glyphIdx] =3D count($glyphMap); - $glyphMap[] =3D $glyphIdx; - } - if ($flags & GF_WORDS) - $this->skip(4); - else - $this->skip(2); - if ($flags & GF_SCALE) - $this->skip(2); - else if ($flags & GF_XYSCALE) - $this->skip(4); - else if ($flags & GF_TWOBYTWO) - $this->skip(8); - } - } + $fsLastCharIndex =3D 0; // maximum Unicode index (character code) in t= his font, according to the cmap subtable for platform ID 3 and platform- = specific encoding ID 0 or 1. + foreach($subsetglyphs AS $originalGlyphIdx =3D> $uni) { + $fsLastCharIndex =3D max($fsLastCharIndex , $uni); + $glyphSet[$originalGlyphIdx] =3D $n; // old glyphID to new glyphID + $n++; } =20 - $numGlyphs =3D $n =3D count($glyphMap); - while ($n > 1 && $this->hmetrics[$n][0] =3D=3D $this->hmetrics[$n - 1]= [0]) { $n -=3D 1; } - $numberOfHMetrics =3D $n; + ksort($subsetCharToGlyph); + foreach($subsetCharToGlyph AS $uni =3D> $originalGlyphIdx) { + $codeToGlyph[$uni] =3D $glyphSet[$originalGlyphIdx] ; + } + $this->codeToGlyph =3D $codeToGlyph; =20 + ksort($subsetglyphs); + foreach($subsetglyphs AS $originalGlyphIdx =3D> $uni) { + $this->getGlyphs($originalGlyphIdx, $start, $glyphSet, $subsetglyphs)= ; + } + + $numGlyphs =3D $numberOfHMetrics =3D count($subsetglyphs ); + //tables copied from the original - $tags =3D array ('name', 'OS/2', 'prep'); + $tags =3D array ('name'); foreach($tags AS $tag) { $this->add($tag, $this->get_table($tag)); } - $tags =3D array ('cvt ', 'fpgm'); - foreach($tags AS $tag) { // 1.02 - if (isset($this->table['tag'])) { $this->add($tag, $this->get_table($= tag)); } + $tags =3D array ('cvt ', 'fpgm', 'prep', 'gasp'); + foreach($tags AS $tag) { + if (isset($this->tables[$tag])) { $this->add($tag, $this->get_table($= tag)); } } =20 // post - PostScript @@ -677,75 +623,85 @@ $post =3D "\x00\x03\x00\x00" . substr($opost,4,12) . "\x00\x00\x00\x00= \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"; $this->add('post', $post); =20 - // hhea - Horizontal Header - $hhea =3D $this->get_table('hhea'); - $hhea =3D $this->_set_ushort($hhea, 34, $numberOfHMetrics); - $this->add('hhea', $hhea); + // Sort CID2GID map into segments of contiguous codes + ksort($codeToGlyph); + unset($codeToGlyph[0]); + //unset($codeToGlyph[65535]); + $rangeid =3D 0; + $range =3D array(); + $prevcid =3D -2; + $prevglidx =3D -1; + // for each character + foreach ($codeToGlyph as $cid =3D> $glidx) { + if ($cid =3D=3D ($prevcid + 1) && $glidx =3D=3D ($prevglidx + 1)) { + $range[$rangeid][] =3D $glidx; + } else { + // new range + $rangeid =3D $cid; + $range[$rangeid] =3D array(); + $range[$rangeid][] =3D $glidx; + } + $prevcid =3D $cid; + $prevglidx =3D $glidx; + } =20 - // maxp - Maximum Profile - $maxp =3D $this->get_table('maxp'); - $maxp =3D $this->_set_ushort($maxp, 4, $numGlyphs); - $this->add('maxp', $maxp); - - // cmap - Character to glyph mapping - Format 6 - $entryCount =3D count($subset); - $length =3D 10 + $entryCount * 2; - $cmap =3D array(0, 1, // Index : version, number of subtables - 1, 0, // Subtable : platform, encoding - 0, 12, // offset (hi,lo) - 6, $length, // Format 6 Mapping table: format, length - 0, 1, // language, First char code - $entryCount); - - foreach($subset AS $code) { $cmap[] =3D $codeToGlyph[$code]; } - $cmapstr =3D ''; - foreach($cmap AS $cm) { $cmapstr .=3D pack("n",$cm); } - $this->add('cmap', $cmapstr); - -/* // cmap - Character to glyph mapping - Format 4 (MS / ) - $segCount =3D 2; + $segCount =3D count($range) + 1; // + 1 Last segment has missing chara= cter 0xFFFF $searchRange =3D 1; $entrySelector =3D 0; while ($searchRange * 2 <=3D $segCount ) { $searchRange =3D $searchRange * 2; $entrySelector =3D $entrySelector + 1; } - $searchRange =3D $searchRange * 16; - $rangeShift =3D $segCount * 16 - $searchRange; - $length =3D 48 + ($numGlyphs-1); - $cmap =3D array(0, 1, // Index : version, number of subtables - 3, 0, // Subtable : platform (MS=3D3), encoding - 0, 12, // Subtable : offset (hi,lo) - 4, $length, 0, // Format 4 Mapping table: format, length, language + $searchRange =3D $searchRange * 2; + $rangeShift =3D $segCount * 2 - $searchRange; + $length =3D 16 + (8*$segCount ) + ($numGlyphs+1); + $cmap =3D array(0, 1, // Index : version, number of encoding subtable= s + 3, 1, // Encoding Subtable : platform (MS=3D3), encoding (Unicode) + 0, 12, // Encoding Subtable : offset (hi,lo) + 4, $length, 0, // Format 4 Mapping subtable: format, length, langua= ge $segCount*2, $searchRange, $entrySelector, - $rangeShift, - $numGlyphs, 0xFFFF, // endCode(s) - 0, - 1, 0xFFFF, // startCode(s) - 0, 1, // idDelta(s) Delta for all character codes in segment - 0, 0); // idRangeOffset[segCount] Offset in bytes to glyph index= Array, or 0 - foreach($subset AS $code) { $cmap[] =3D $codeToGlyph[$code]; } - $cmap[] =3D 0xFFFF; + $rangeShift); + + // endCode(s) + foreach($range AS $start=3D>$subrange) { + $endCode =3D $start + (count($subrange)-1); + $cmap[] =3D $endCode; // endCode(s) + } + $cmap[] =3D 0xFFFF; // endCode of last Segment + $cmap[] =3D 0; // reservedPad + + // startCode(s) + foreach($range AS $start=3D>$subrange) { + $cmap[] =3D $start; // startCode(s) + } + $cmap[] =3D 0xFFFF; // startCode of last Segment + // idDelta(s)=20 + foreach($range AS $start=3D>$subrange) { + $idDelta =3D -($start-$subrange[0]); + $n +=3D count($subrange); + $cmap[] =3D $idDelta; // idDelta(s) + } + $cmap[] =3D 1; // idDelta of last Segment + // idRangeOffset(s)=20 + foreach($range AS $subrange) { + $cmap[] =3D 0; // idRangeOffset[segCount] Offset in bytes to glyph = indexArray, or 0 + + } + $cmap[] =3D 0; // idRangeOffset of last Segment + foreach($range AS $subrange) { + foreach($subrange AS $glidx) { + $cmap[] =3D $glidx; + } + } + $cmap[] =3D 0; // Mapping for last character $cmapstr =3D ''; foreach($cmap AS $cm) { $cmapstr .=3D pack("n",$cm); } $this->add('cmap', $cmapstr); -*/ =20 =20 - // hmtx - Horizontal Metrics - $hmtxstr =3D ''; - for($n=3D0;$n<$numGlyphs;$n++) { - $originalGlyphIdx =3D $glyphMap[$n]; - $aw =3D $this->hmetrics[$originalGlyphIdx][0]; - $lsb =3D $this->hmetrics[$originalGlyphIdx][1]; - if ($n < $numberOfHMetrics) { $hmtxstr .=3D pack("n",$aw); } - $hmtxstr .=3D $this->pack_short($lsb); - } - $this->add('hmtx', $hmtxstr); - // glyf - Glyph data list($glyfOffset,$glyfLength) =3D $this->get_table_pos('glyf'); if ($glyfLength < $this->maxStrLenRead) { @@ -756,9 +712,29 @@ $glyf =3D ''; $pos =3D 0; =20 - for ($n=3D0;$n<$numGlyphs;$n++) { + $hmtxstr =3D ''; + $xMinT =3D 0; + $yMinT =3D 0; + $xMaxT =3D 0; + $yMaxT =3D 0; + $advanceWidthMax =3D 0; + $minLeftSideBearing =3D 0; + $minRightSideBearing =3D 0; + $xMaxExtent =3D 0; + $maxPoints =3D 0; // points in non-compound glyph + $maxContours =3D 0; // contours in non-compound glyph + $maxComponentPoints =3D 0; // points in compound glyph + $maxComponentContours =3D 0; // contours in compound glyph + $maxComponentElements =3D 0; // number of glyphs referenced at top lev= el + $maxComponentDepth =3D 0; // levels of recursion, set to 0 if font ha= s only simple glyphs + $this->glyphdata =3D array(); + + foreach($subsetglyphs AS $originalGlyphIdx =3D> $uni) { + // hmtx - Horizontal Metrics + $hm =3D $this->getHMetric($orignHmetrics, $originalGlyphIdx);=09 + $hmtxstr .=3D $hm; + $offsets[] =3D $pos; - $originalGlyphIdx =3D $glyphMap[$n]; $glyphPos =3D $this->glyphPos[$originalGlyphIdx]; $glyphLen =3D $this->glyphPos[$originalGlyphIdx + 1] - $glyphPos; if ($glyfLength < $this->maxStrLenRead) { @@ -768,15 +744,22 @@ if ($glyphLen > 0) $data =3D $this->get_chunk($glyfOffset+$glyphPos,= $glyphLen); else $data =3D ''; } - if ($glyphLen > 0) $up =3D unpack("n", substr($data,0,2)); - if ($glyphLen > 2 && ($up[1] & (1 << 15)) ) { + + if ($glyphLen > 0) { + $up =3D unpack("n", substr($data,0,2)); + } + + if ($glyphLen > 2 && ($up[1] & (1 << 15)) ) { // If number of contour= s <=3D -1 i.e. composiste glyph $pos_in_glyph =3D 10; $flags =3D GF_MORE; + $nComponentElements =3D 0; while ($flags & GF_MORE) { + $nComponentElements +=3D 1; // number of glyphs referenced at top l= evel $up =3D unpack("n", substr($data,$pos_in_glyph,2)); $flags =3D $up[1]; $up =3D unpack("n", substr($data,$pos_in_glyph+2,2)); $glyphIdx =3D $up[1]; + $this->glyphdata[$originalGlyphIdx]['compGlyphs'][] =3D $glyphIdx; $data =3D $this->_set_ushort($data, $pos_in_glyph + 2, $glyphSet[$g= lyphIdx]); $pos_in_glyph +=3D 4; if ($flags & GF_WORDS) { $pos_in_glyph +=3D 4; } @@ -785,7 +768,9 @@ else if ($flags & GF_XYSCALE) { $pos_in_glyph +=3D 4; } else if ($flags & GF_TWOBYTWO) { $pos_in_glyph +=3D 8; } } + $maxComponentElements =3D max($maxComponentElements, $nComponentElem= ents); } + $glyf .=3D $data; $pos +=3D $glyphLen; if ($pos % 4 !=3D 0) { @@ -794,9 +779,13 @@ $pos +=3D $padding; } } + $offsets[] =3D $pos; $this->add('glyf', $glyf); =20 + // hmtx - Horizontal Metrics + $this->add('hmtx', $hmtxstr); + // loca - Index to location $locastr =3D ''; if ((($pos + 1) >> 1) > 0xFFFF) { @@ -814,10 +803,237 @@ $head =3D $this->_set_ushort($head, 50, $indexToLocFormat); $this->add('head', $head); =20 + + // hhea - Horizontal Header + $hhea =3D $this->get_table('hhea'); + $hhea =3D $this->_set_ushort($hhea, 34, $numberOfHMetrics); + $this->add('hhea', $hhea); + + // maxp - Maximum Profile + $maxp =3D $this->get_table('maxp'); + $maxp =3D $this->_set_ushort($maxp, 4, $numGlyphs); + $this->add('maxp', $maxp); + + + // OS/2 - OS/2 + $os2 =3D $this->get_table('OS/2'); + $this->add('OS/2', $os2 ); + fclose($this->fh); =20 // Put the TTF file together $stm =3D ''; + $this->endTTFile($stm); + return $stm ; + } + + ///////////////////////////////////////////////////////////////////////= /////////// + // Recursively get composite glyph data + function getGlyphData($originalGlyphIdx, &$maxdepth, &$depth, &$points,= &$contours) { + $depth++; + $maxdepth =3D max($maxdepth, $depth); + if (count($this->glyphdata[$originalGlyphIdx]['compGlyphs'])) { + foreach($this->glyphdata[$originalGlyphIdx]['compGlyphs'] AS $glyphId= x) { + $this->getGlyphData($glyphIdx, $maxdepth, $depth, $points, $contours= ); + } + } + else if (($this->glyphdata[$originalGlyphIdx]['nContours'] > 0) && $de= pth > 0) { // simple + $contours +=3D $this->glyphdata[$originalGlyphIdx]['nContours']; + $points +=3D $this->glyphdata[$originalGlyphIdx]['nPoints']; + } + $depth--; + } + + + ///////////////////////////////////////////////////////////////////////= /////////// + // Recursively get composite glyphs + function getGlyphs($originalGlyphIdx, &$start, &$glyphSet, &$subsetglyp= hs) { + $glyphPos =3D $this->glyphPos[$originalGlyphIdx]; + $glyphLen =3D $this->glyphPos[$originalGlyphIdx + 1] - $glyphPos; + if (!$glyphLen) {=20 + return; + } + $this->seek($start + $glyphPos); + $numberOfContours =3D $this->read_short(); + if ($numberOfContours < 0) { + $this->skip(8); + $flags =3D GF_MORE; + while ($flags & GF_MORE) { + $flags =3D $this->read_ushort(); + $glyphIdx =3D $this->read_ushort(); + if (!isset($glyphSet[$glyphIdx])) { + $glyphSet[$glyphIdx] =3D count($subsetglyphs); // old glyphID to ne= w glyphID + $subsetglyphs[$glyphIdx] =3D true; + } + $savepos =3D ftell($this->fh); + $this->getGlyphs($glyphIdx, $start, $glyphSet, $subsetglyphs); + $this->seek($savepos); + if ($flags & GF_WORDS) + $this->skip(4); + else + $this->skip(2); + if ($flags & GF_SCALE) + $this->skip(2); + else if ($flags & GF_XYSCALE) + $this->skip(4); + else if ($flags & GF_TWOBYTWO) + $this->skip(8); + } + } + } + + ///////////////////////////////////////////////////////////////////////= /////////// + + function getHMTX($numberOfHMetrics, $numGlyphs, &$glyphToChar, $scale) = { + $start =3D $this->seek_table("hmtx"); + $aw =3D 0; + $this->charWidths =3D str_pad('', 256*256*2, "\x00"); + $nCharWidths =3D 0; + if (($numberOfHMetrics*4) < $this->maxStrLenRead) { + $data =3D $this->get_chunk($start,($numberOfHMetrics*4)); + $arr =3D unpack("n*", $data); + } + else { $this->seek($start); } + for( $glyph=3D0; $glyph<$numberOfHMetrics; $glyph++) { + + if (($numberOfHMetrics*4) < $this->maxStrLenRead) { + $aw =3D $arr[($glyph*2)+1]; + } + else { + $aw =3D $this->read_ushort(); + $lsb =3D $this->read_ushort(); + } + if (isset($glyphToChar[$glyph]) || $glyph =3D=3D 0) { + + if ($aw >=3D (1 << 15) ) { $aw =3D 0; } // 1.03 Some (arabic) fonts = have -ve values for width + // although should be unsigned value - comes out as e.g. 65108 (int= ended -50) + if ($glyph =3D=3D 0) { + $this->defaultWidth =3D $scale*$aw; + continue; + } + foreach($glyphToChar[$glyph] AS $char) { + if ($char !=3D 0 && $char !=3D 65535) { + $w =3D intval(round($scale*$aw)); + if ($w =3D=3D 0) { $w =3D 65535; } + if ($char < 196608) { + $this->charWidths[$char*2] =3D chr($w >> 8); + $this->charWidths[$char*2 + 1] =3D chr($w & 0xFF); + $nCharWidths++; + } + } + } + } + } + $data =3D $this->get_chunk(($start+$numberOfHMetrics*4),($numGlyphs*2)= ); + $arr =3D unpack("n*", $data); + $diff =3D $numGlyphs-$numberOfHMetrics; + for( $pos=3D0; $pos<$diff; $pos++) { + $glyph =3D $pos + $numberOfHMetrics; + if (isset($glyphToChar[$glyph])) { + foreach($glyphToChar[$glyph] AS $char) { + if ($char !=3D 0 && $char !=3D 65535) { + $w =3D intval(round($scale*$aw)); + if ($w =3D=3D 0) { $w =3D 65535; } + if ($char < 196608) { + $this->charWidths[$char*2] =3D chr($w >> 8); + $this->charWidths[$char*2 + 1] =3D chr($w & 0xFF); + $nCharWidths++; + } + } + } + } + } + // NB 65535 is a set width of 0 + // First bytes define number of chars in font + $this->charWidths[0] =3D chr($nCharWidths >> 8); + $this->charWidths[1] =3D chr($nCharWidths & 0xFF); + } + + function getHMetric($numberOfHMetrics, $gid) { + $start =3D $this->seek_table("hmtx"); + if ($gid < $numberOfHMetrics) { + $this->seek($start+($gid*4)); + $hm =3D fread($this->fh,4); + } + else { + $this->seek($start+(($numberOfHMetrics-1)*4)); + $hm =3D fread($this->fh,2); + $this->seek($start+($numberOfHMetrics*2)+($gid*2)); + $hm .=3D fread($this->fh,2); + } + return $hm; + } + + function getLOCA($indexToLocFormat, $numGlyphs) { + $start =3D $this->seek_table('loca'); + $this->glyphPos =3D array(); + if ($indexToLocFormat =3D=3D 0) { + $data =3D $this->get_chunk($start,($numGlyphs*2)+2); + $arr =3D unpack("n*", $data); + for ($n=3D0; $n<=3D$numGlyphs; $n++) { + $this->glyphPos[] =3D ($arr[$n+1] * 2); + } + } + else if ($indexToLocFormat =3D=3D 1) { + $data =3D $this->get_chunk($start,($numGlyphs*4)+4); + $arr =3D unpack("N*", $data); + for ($n=3D0; $n<=3D$numGlyphs; $n++) { + $this->glyphPos[] =3D ($arr[$n+1]); + } + } + else=20 + die('Unknown location table format '.$indexToLocFormat); + } + + + // CMAP Format 4 + function getCMAP4($unicode_cmap_offset, &$glyphToChar, &$charToGlyph ) = { + $this->maxUniChar =3D 0; + $this->seek($unicode_cmap_offset + 2); + $length =3D $this->read_ushort(); + $limit =3D $unicode_cmap_offset + $length; + $this->skip(2); + + $segCount =3D $this->read_ushort() / 2; + $this->skip(6); + $endCount =3D array(); + for($i=3D0; $i<$segCount; $i++) { $endCount[] =3D $this->read_ushort()= ; } + $this->skip(2); + $startCount =3D array(); + for($i=3D0; $i<$segCount; $i++) { $startCount[] =3D $this->read_ushort= (); } + $idDelta =3D array(); + for($i=3D0; $i<$segCount; $i++) { $idDelta[] =3D $this->read_short(); = } // ???? was unsigned short + $idRangeOffset_start =3D $this->_pos; + $idRangeOffset =3D array(); + for($i=3D0; $i<$segCount; $i++) { $idRangeOffset[] =3D $this->read_ush= ort(); } + + for ($n=3D0;$n<$segCount;$n++) { + $endpoint =3D ($endCount[$n] + 1); + for ($unichar=3D$startCount[$n];$unichar<$endpoint;$unichar++) { + if ($idRangeOffset[$n] =3D=3D 0) + $glyph =3D ($unichar + $idDelta[$n]) & 0xFFFF; + else { + $offset =3D ($unichar - $startCount[$n]) * 2 + $idRangeOffset[$n]; + $offset =3D $idRangeOffset_start + 2 * $n + $offset; + if ($offset >=3D $limit) + $glyph =3D 0; + else { + $glyph =3D $this->get_ushort($offset); + if ($glyph !=3D 0) + $glyph =3D ($glyph + $idDelta[$n]) & 0xFFFF; + } + } + $charToGlyph[$unichar] =3D $glyph; + if ($unichar < 196608) { $this->maxUniChar =3D max($unichar,$this->m= axUniChar); } + $glyphToChar[$glyph][] =3D $unichar; + } + } + } + + + // Put the TTF file together + function endTTFile(&$stm) { + $stm =3D ''; $numTables =3D count($this->otables); $searchRange =3D 1; $entrySelector =3D 0; @@ -829,11 +1045,16 @@ $rangeShift =3D $numTables * 16 - $searchRange; =20 // Header - $stm .=3D (pack("Nnnnn", 0x74727565, $numTables, $searchRange, $entryS= elector, $rangeShift)); // 0x74727565 "true" for Mac - // 0x00010000 for Windows + if (_TTF_MAC_HEADER) { + $stm .=3D (pack("Nnnnn", 0x74727565, $numTables, $searchRange, $entry= Selector, $rangeShift)); // Mac + } + else { + $stm .=3D (pack("Nnnnn", 0x00010000 , $numTables, $searchRange, $entr= ySelector, $rangeShift)); // Windows + } =20 // Table directory $tables =3D $this->otables; + ksort ($tables);=20 $offset =3D 12 + $numTables * 16; foreach ($tables AS $tag=3D>$data) { @@ -860,6 +1081,8 @@ } =20 =20 + + } =20 =20 Modified: phpcompta/trunk/include/tfpdf/font/zapfdingbats.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/tfpdf/font/zapfdingbats.php 2011-10-14 23:00:= 50 UTC (rev 4217) +++ phpcompta/trunk/include/tfpdf/font/zapfdingbats.php 2011-10-15 01:02:= 41 UTC (rev 4218) @@ -1,5 +1,9 @@ 0,chr(1)=3D>0,chr(2)=3D>0,chr(3)=3D>0,chr(4)=3D>0,chr(5)=3D>0= ,chr(6)=3D>0,chr(7)=3D>0,chr(8)=3D>0,chr(9)=3D>0,chr(10)=3D>0,chr(11)=3D>= 0,chr(12)=3D>0,chr(13)=3D>0,chr(14)=3D>0,chr(15)=3D>0,chr(16)=3D>0,chr(17= )=3D>0,chr(18)=3D>0,chr(19)=3D>0,chr(20)=3D>0,chr(21)=3D>0, chr(22)=3D>0,chr(23)=3D>0,chr(24)=3D>0,chr(25)=3D>0,chr(26)=3D>0,chr(27= )=3D>0,chr(28)=3D>0,chr(29)=3D>0,chr(30)=3D>0,chr(31)=3D>0,' '=3D>278,'!'= =3D>974,'"'=3D>961,'#'=3D>974,'$'=3D>980,'%'=3D>719,'&'=3D>789,'\''=3D>79= 0,'('=3D>791,')'=3D>690,'*'=3D>960,'+'=3D>939, ','=3D>549,'-'=3D>855,'.'=3D>911,'/'=3D>933,'0'=3D>911,'1'=3D>945,'2'=3D= >974,'3'=3D>755,'4'=3D>846,'5'=3D>762,'6'=3D>761,'7'=3D>571,'8'=3D>677,'9= '=3D>763,':'=3D>760,';'=3D>759,'<'=3D>754,'=3D'=3D>494,'>'=3D>552,'?'=3D>= 537,'@'=3D>577,'A'=3D>692, Modified: phpcompta/trunk/include/tfpdf/tfpdf.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/tfpdf/tfpdf.php 2011-10-14 23:00:50 UTC (rev = 4217) +++ phpcompta/trunk/include/tfpdf/tfpdf.php 2011-10-15 01:02:41 UTC (rev = 4218) @@ -1,515 +1,515 @@ = * * License: LGPL = * ************************************************************************= *******/ =20 -define('tFPDF_VERSION','1.01'); +define('tFPDF_VERSION','1.24'); =20 class tFPDF { =20 var $unifontSubset; -var $extraFontSubsets =3D 0; -var $t1asm; +var $page; // current page number +var $n; // current object number +var $offsets; // array of object offsets +var $buffer; // buffer holding in-memory PDF +var $pages; // array containing pages +var $state; // current document state +var $compress; // compression flag +var $k; // scale factor (number of points in user unit) +var $DefOrientation; // default orientation +var $CurOrientation; // current orientation +var $StdPageSizes; // standard page sizes +var $DefPageSize; // default page size +var $CurPageSize; // current page size +var $PageSizes; // used for pages with non default sizes or ori= entations +var $wPt, $hPt; // dimensions of current page in points +var $w, $h; // dimensions of current page in user unit +var $lMargin; // left margin +var $tMargin; // top margin +var $rMargin; // right margin +var $bMargin; // page break margin +var $cMargin; // cell margin +var $x, $y; // current position in user unit +var $lasth; // height of last printed cell +var $LineWidth; // line width in user unit +var $fontpath; // path containing fonts +var $CoreFonts; // array of core font names +var $fonts; // array of used fonts +var $FontFiles; // array of font files +var $diffs; // array of encoding differences +var $FontFamily; // current font family +var $FontStyle; // current font style +var $underline; // underlining flag +var $CurrentFont; // current font info +var $FontSizePt; // current font size in points +var $FontSize; // current font size in user unit +var $DrawColor; // commands for drawing color +var $FillColor; // commands for filling color +var $TextColor; // commands for text color +var $ColorFlag; // indicates whether fill and text colors are d= ifferent +var $ws; // word spacing +var $images; // array of used images +var $PageLinks; // array of links in pages +var $links; // array of internal links +var $AutoPageBreak; // automatic page breaking +var $PageBreakTrigger; // threshold used to trigger page breaks +var $InHeader; // flag set when processing header +var $InFooter; // flag set when processing footer +var $ZoomMode; // zoom display mode +var $LayoutMode; // layout display mode +var $title; // title +var $subject; // subject +var $author; // author +var $keywords; // keywords +var $creator; // creator +var $AliasNbPages; // alias for total number of pages +var $PDFVersion; // PDF version number =20 -var $page; //current page number -var $n; //current object number -var $offsets; //array of object offsets -var $buffer; //buffer holding in-memory PDF -var $pages; //array containing pages -var $state; //current document state -var $compress; //compression flag -var $k; //scale factor (number of points in user unit) -var $DefOrientation; //default orientation -var $CurOrientation; //current orientation -var $PageFormats; //available page formats -var $DefPageFormat; //default page format -var $CurPageFormat; //current page format -var $PageSizes; //array storing non-default page sizes -var $wPt,$hPt; //dimensions of current page in points -var $w,$h; //dimensions of current page in user unit -var $lMargin; //left margin -var $tMargin; //top margin -var $rMargin; //right margin -var $bMargin; //page break margin -var $cMargin; //cell margin -var $x,$y; //current position in user unit -var $lasth; //height of last printed cell -var $LineWidth; //line width in user unit -var $CoreFonts; //array of standard font names -var $fonts; //array of used fonts -var $FontFiles; //array of font files -var $diffs; //array of encoding differences -var $FontFamily; //current font family -var $FontStyle; //current font style -var $underline; //underlining flag -var $CurrentFont; //current font info -var $FontSizePt; //current font size in points -var $FontSize; //current font size in user unit -var $DrawColor; //commands for drawing color -var $FillColor; //commands for filling color -var $TextColor; //commands for text color -var $ColorFlag; //indicates whether fill and text colors are di= fferent -var $ws; //word spacing -var $images; //array of used images -var $PageLinks; //array of links in pages -var $links; //array of internal links -var $AutoPageBreak; //automatic page breaking -var $PageBreakTrigger; //threshold used to trigger page breaks -var $InHeader; //flag set when processing header -var $InFooter; //flag set when processing footer -var $ZoomMode; //zoom display mode -var $LayoutMode; //layout display mode -var $title; //title -var $subject; //subject -var $author; //author -var $keywords; //keywords -var $creator; //creator -var $AliasNbPages; //alias for total number of pages -var $PDFVersion; //PDF version number - /***********************************************************************= ******** * = * * Public methods = * * = * ************************************************************************= *******/ -function tFPDF($orientation=3D'P', $unit=3D'mm', $format=3D'A4') +function tFPDF($orientation=3D'P', $unit=3D'mm', $size=3D'A4') { - //Some checks + // Some checks $this->_dochecks(); - //Initialization of properties - $this->page=3D0; - $this->n=3D2; - $this->buffer=3D''; - $this->pages=3Darray(); - $this->PageSizes=3Darray(); - $this->state=3D0; - $this->fonts=3Darray(); - $this->FontFiles=3Darray(); - $this->diffs=3Darray(); - $this->images=3Darray(); - $this->links=3Darray(); - $this->InHeader=3Dfalse; - $this->InFooter=3Dfalse; - $this->lasth=3D0; - $this->FontFamily=3D''; - $this->FontStyle=3D''; - $this->FontSizePt=3D12; - $this->underline=3Dfalse; - $this->DrawColor=3D'0 G'; - $this->FillColor=3D'0 g'; - $this->TextColor=3D'0 g'; - $this->ColorFlag=3Dfalse; - $this->ws=3D0; - //Standard fonts - $this->CoreFonts=3Darray('courier'=3D>'Courier', 'courierB'=3D>'Courier= -Bold', 'courierI'=3D>'Courier-Oblique', 'courierBI'=3D>'Courier-BoldObli= que', - 'helvetica'=3D>'Helvetica', 'helveticaB'=3D>'Helvetica-Bold', 'helveti= caI'=3D>'Helvetica-Oblique', 'helveticaBI'=3D>'Helvetica-BoldOblique', - 'times'=3D>'Times-Roman', 'timesB'=3D>'Times-Bold', 'timesI'=3D>'Times= -Italic', 'timesBI'=3D>'Times-BoldItalic', - 'symbol'=3D>'Symbol', 'zapfdingbats'=3D>'ZapfDingbats'); - //Scale factor + // Initialization of properties + $this->page =3D 0; + $this->n =3D 2; + $this->buffer =3D ''; + $this->pages =3D array(); + $this->PageSizes =3D array(); + $this->state =3D 0; + $this->fonts =3D array(); + $this->FontFiles =3D array(); + $this->diffs =3D array(); + $this->images =3D array(); + $this->links =3D array(); + $this->InHeader =3D false; + $this->InFooter =3D false; + $this->lasth =3D 0; + $this->FontFamily =3D ''; + $this->FontStyle =3D ''; + $this->FontSizePt =3D 12; + $this->underline =3D false; + $this->DrawColor =3D '0 G'; + $this->FillColor =3D '0 g'; + $this->TextColor =3D '0 g'; + $this->ColorFlag =3D false; + $this->ws =3D 0; + // Font path + if(defined('FPDF_FONTPATH')) + { + $this->fontpath =3D FPDF_FONTPATH; + if(substr($this->fontpath,-1)!=3D'/' && substr($this->fontpath,-1)!=3D= '\\') + $this->fontpath .=3D '/'; + } + elseif(is_dir(dirname(__FILE__).'/font')) + $this->fontpath =3D dirname(__FILE__).'/font/'; + else + $this->fontpath =3D ''; + // Core fonts + $this->CoreFonts =3D array('courier', 'helvetica', 'times', 'symbol', '= zapfdingbats'); + // Scale factor if($unit=3D=3D'pt') - $this->k=3D1; + $this->k =3D 1; elseif($unit=3D=3D'mm') - $this->k=3D72/25.4; + $this->k =3D 72/25.4; elseif($unit=3D=3D'cm') - $this->k=3D72/2.54; + $this->k =3D 72/2.54; elseif($unit=3D=3D'in') - $this->k=3D72; + $this->k =3D 72; else $this->Error('Incorrect unit: '.$unit); - - //Page format - $this->PageFormats=3Darray('a3'=3D>array(841.89,1190.55), 'a4'=3D>array= (595.28,841.89), 'a5'=3D>array(420.94,595.28), + // Page sizes + $this->StdPageSizes =3D array('a3'=3D>array(841.89,1190.55), 'a4'=3D>ar= ray(595.28,841.89), 'a5'=3D>array(420.94,595.28), 'letter'=3D>array(612,792), 'legal'=3D>array(612,1008)); - if(is_string($format)) - $format=3D$this->_getpageformat($format); - $this->DefPageFormat=3D$format; - $this->CurPageFormat=3D$format; - //Page orientation - $orientation=3Dstrtolower($orientation); + $size =3D $this->_getpagesize($size); + $this->DefPageSize =3D $size; + $this->CurPageSize =3D $size; + // Page orientation + $orientation =3D strtolower($orientation); if($orientation=3D=3D'p' || $orientation=3D=3D'portrait') { - $this->DefOrientation=3D'P'; - $this->w=3D$this->DefPageFormat[0]; - $this->h=3D$this->DefPageFormat[1]; + $this->DefOrientation =3D 'P'; + $this->w =3D $size[0]; + $this->h =3D $size[1]; } elseif($orientation=3D=3D'l' || $orientation=3D=3D'landscape') { - $this->DefOrientation=3D'L'; - $this->w=3D$this->DefPageFormat[1]; - $this->h=3D$this->DefPageFormat[0]; + $this->DefOrientation =3D 'L'; + $this->w =3D $size[1]; + $this->h =3D $size[0]; } else $this->Error('Incorrect orientation: '.$orientation); - $this->CurOrientation=3D$this->DefOrientation; - $this->wPt=3D$this->w*$this->k; - $this->hPt=3D$this->h*$this->k; - //Page margins (1 cm) - $margin=3D28.35/$this->k; + $this->CurOrientation =3D $this->DefOrientation; + $this->wPt =3D $this->w*$this->k; + $this->hPt =3D $this->h*$this->k; + // Page margins (1 cm) + $margin =3D 28.35/$this->k; $this->SetMargins($margin,$margin); - //Interior cell margin (1 mm) - $this->cMargin=3D$margin/10; - //Line width (0.2 mm) - $this->LineWidth=3D.567/$this->k; - //Automatic page break + // Interior cell margin (1 mm) + $this->cMargin =3D $margin/10; + // Line width (0.2 mm) + $this->LineWidth =3D .567/$this->k; + // Automatic page break $this->SetAutoPageBreak(true,2*$margin); - //Full width display mode - $this->SetDisplayMode('fullwidth'); - //Enable compression + // Default display mode + $this->SetDisplayMode('default'); + // Enable compression $this->SetCompression(true); - //Set default PDF version number - $this->PDFVersion=3D'1.3'; + // Set default PDF version number + $this->PDFVersion =3D '1.3'; } =20 function SetMargins($left, $top, $right=3Dnull) { - //Set left, top and right margins - $this->lMargin=3D$left; - $this->tMargin=3D$top; + // Set left, top and right margins + $this->lMargin =3D $left; + $this->tMargin =3D $top; if($right=3D=3D=3Dnull) - $right=3D$left; - $this->rMargin=3D$right; + $right =3D $left; + $this->rMargin =3D $right; } =20 function SetLeftMargin($margin) { - //Set left margin - $this->lMargin=3D$margin; + // Set left margin + $this->lMargin =3D $margin; if($this->page>0 && $this->x<$margin) - $this->x=3D$margin; + $this->x =3D $margin; } =20 function SetTopMargin($margin) { - //Set top margin - $this->tMargin=3D$margin; + // Set top margin + $this->tMargin =3D $margin; } =20 function SetRightMargin($margin) { - //Set right margin - $this->rMargin=3D$margin; + // Set right margin + $this->rMargin =3D $margin; } =20 function SetAutoPageBreak($auto, $margin=3D0) { - //Set auto page break mode and triggering margin - $this->AutoPageBreak=3D$auto; - $this->bMargin=3D$margin; - $this->PageBreakTrigger=3D$this->h-$margin; + // Set auto page break mode and triggering margin + $this->AutoPageBreak =3D $auto; + $this->bMargin =3D $margin; + $this->PageBreakTrigger =3D $this->h-$margin; } =20 -function SetDisplayMode($zoom, $layout=3D'continuous') +function SetDisplayMode($zoom, $layout=3D'default') { - //Set display mode in viewer + // Set display mode in viewer if($zoom=3D=3D'fullpage' || $zoom=3D=3D'fullwidth' || $zoom=3D=3D'real'= || $zoom=3D=3D'default' || !is_string($zoom)) - $this->ZoomMode=3D$zoom; + $this->ZoomMode =3D $zoom; else $this->Error('Incorrect zoom display mode: '.$zoom); if($layout=3D=3D'single' || $layout=3D=3D'continuous' || $layout=3D=3D'= two' || $layout=3D=3D'default') - $this->LayoutMode=3D$layout; + $this->LayoutMode =3D $layout; else $this->Error('Incorrect layout display mode: '.$layout); } =20 function SetCompression($compress) { - //Set page compression + // Set page compression if(function_exists('gzcompress')) - $this->compress=3D$compress; + $this->compress =3D $compress; else - $this->compress=3Dfalse; + $this->compress =3D false; } =20 function SetTitle($title, $isUTF8=3Dfalse) { - //Title of document + // Title of document if($isUTF8) - $title=3D$this->_UTF8toUTF16($title); - $this->title=3D$title; + $title =3D $this->_UTF8toUTF16($title); + $this->title =3D $title; } =20 function SetSubject($subject, $isUTF8=3Dfalse) { - //Subject of document + // Subject of document if($isUTF8) - $subject=3D$this->_UTF8toUTF16($subject); - $this->subject=3D$subject; + $subject =3D $this->_UTF8toUTF16($subject); + $this->subject =3D $subject; } =20 function SetAuthor($author, $isUTF8=3Dfalse) { - //Author of document + // Author of document if($isUTF8) - $author=3D$this->_UTF8toUTF16($author); - $this->author=3D$author; + $author =3D $this->_UTF8toUTF16($author); + $this->author =3D $author; } =20 function SetKeywords($keywords, $isUTF8=3Dfalse) { - //Keywords of document + // Keywords of document if($isUTF8) - $keywords=3D$this->_UTF8toUTF16($keywords); - $this->keywords=3D$keywords; + $keywords =3D $this->_UTF8toUTF16($keywords); + $this->keywords =3D $keywords; } =20 function SetCreator($creator, $isUTF8=3Dfalse) { - //Creator of document + // Creator of document if($isUTF8) - $creator=3D$this->_UTF8toUTF16($creator); - $this->creator=3D$creator; + $creator =3D $this->_UTF8toUTF16($creator); + $this->creator =3D $creator; } =20 function AliasNbPages($alias=3D'{nb}') { - //Define an alias for total number of pages - $this->AliasNbPages=3D$alias; + // Define an alias for total number of pages + $this->AliasNbPages =3D $alias; } =20 function Error($msg) { - //Fatal error - die('tFPDF error: '.$msg); + // Fatal error + die('FPDF error: '.$msg); } =20 function Open() { - //Begin document - $this->state=3D1; + // Begin document + $this->state =3D 1; } =20 function Close() { - //Terminate document + // Terminate document if($this->state=3D=3D3) return; if($this->page=3D=3D0) $this->AddPage(); - //Page footer - $this->InFooter=3Dtrue; + // Page footer + $this->InFooter =3D true; $this->Footer(); - $this->InFooter=3Dfalse; - //Close page + $this->InFooter =3D false; + // Close page $this->_endpage(); - //Close document + // Close document $this->_enddoc(); } =20 -function AddPage($orientation=3D'', $format=3D'') +function AddPage($orientation=3D'', $size=3D'') { - //Start a new page + // Start a new page if($this->state=3D=3D0) $this->Open(); - $family=3D$this->FontFamily; - $style=3D$this->FontStyle.($this->underline ? 'U' : ''); - $size=3D$this->FontSizePt; - $lw=3D$this->LineWidth; - $dc=3D$this->DrawColor; - $fc=3D$this->FillColor; - $tc=3D$this->TextColor; - $cf=3D$this->ColorFlag; + $family =3D $this->FontFamily; + $style =3D $this->FontStyle.($this->underline ? 'U' : ''); + $fontsize =3D $this->FontSizePt; + $lw =3D $this->LineWidth; + $dc =3D $this->DrawColor; + $fc =3D $this->FillColor; + $tc =3D $this->TextColor; + $cf =3D $this->ColorFlag; if($this->page>0) { - //Page footer - $this->InFooter=3Dtrue; + // Page footer + $this->InFooter =3D true; $this->Footer(); - $this->InFooter=3Dfalse; - //Close page + $this->InFooter =3D false; + // Close page $this->_endpage(); } - //Start new page - $this->_beginpage($orientation,$format); - //Set line cap style to square + // Start new page + $this->_beginpage($orientation,$size); + // Set line cap style to square $this->_out('2 J'); - //Set line width - $this->LineWidth=3D$lw; + // Set line width + $this->LineWidth =3D $lw; $this->_out(sprintf('%.2F w',$lw*$this->k)); - //Set font + // Set font if($family) - $this->SetFont($family,$style,$size); - //Set colors - $this->DrawColor=3D$dc; + $this->SetFont($family,$style,$fontsize); + // Set colors + $this->DrawColor =3D $dc; if($dc!=3D'0 G') $this->_out($dc); - $this->FillColor=3D$fc; + $this->FillColor =3D $fc; if($fc!=3D'0 g') $this->_out($fc); - $this->TextColor=3D$tc; - $this->ColorFlag=3D$cf; - //Page header - $this->InHeader=3Dtrue; + $this->TextColor =3D $tc; + $this->ColorFlag =3D $cf; + // Page header + $this->InHeader =3D true; $this->Header(); - $this->InHeader=3Dfalse; - //Restore line width + $this->InHeader =3D false; + // Restore line width if($this->LineWidth!=3D$lw) { - $this->LineWidth=3D$lw; + $this->LineWidth =3D $lw; $this->_out(sprintf('%.2F w',$lw*$this->k)); } - //Restore font + // Restore font if($family) - $this->SetFont($family,$style,$size); - //Restore colors + $this->SetFont($family,$style,$fontsize); + // Restore colors if($this->DrawColor!=3D$dc) { - $this->DrawColor=3D$dc; + $this->DrawColor =3D $dc; $this->_out($dc); } if($this->FillColor!=3D$fc) { - $this->FillColor=3D$fc; + $this->FillColor =3D $fc; $this->_out($fc); } - $this->TextColor=3D$tc; - $this->ColorFlag=3D$cf; + $this->TextColor =3D $tc; + $this->ColorFlag =3D $cf; } =20 function Header() { - //To be implemented in your own inherited class + // To be implemented in your own inherited class } =20 function Footer() { - //To be implemented in your own inherited class + // To be implemented in your own inherited class } =20 function PageNo() { - //Get current page number + // Get current page number return $this->page; } =20 function SetDrawColor($r, $g=3Dnull, $b=3Dnull) { - //Set color for all stroking operations + // Set color for all stroking operations if(($r=3D=3D0 && $g=3D=3D0 && $b=3D=3D0) || $g=3D=3D=3Dnull) - $this->DrawColor=3Dsprintf('%.3F G',$r/255); + $this->DrawColor =3D sprintf('%.3F G',$r/255); else - $this->DrawColor=3Dsprintf('%.3F %.3F %.3F RG',$r/255,$g/255,$b/255); + $this->DrawColor =3D sprintf('%.3F %.3F %.3F RG',$r/255,$g/255,$b/255)= ; if($this->page>0) $this->_out($this->DrawColor); } =20 function SetFillColor($r, $g=3Dnull, $b=3Dnull) { - //Set color for all filling operations + // Set color for all filling operations if(($r=3D=3D0 && $g=3D=3D0 && $b=3D=3D0) || $g=3D=3D=3Dnull) - $this->FillColor=3Dsprintf('%.3F g',$r/255); + $this->FillColor =3D sprintf('%.3F g',$r/255); else - $this->FillColor=3Dsprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255); - $this->ColorFlag=3D($this->FillColor!=3D$this->TextColor); + $this->FillColor =3D sprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255)= ; + $this->ColorFlag =3D ($this->FillColor!=3D$this->TextColor); if($this->page>0) $this->_out($this->FillColor); } =20 function SetTextColor($r, $g=3Dnull, $b=3Dnull) { - //Set color for text + // Set color for text if(($r=3D=3D0 && $g=3D=3D0 && $b=3D=3D0) || $g=3D=3D=3Dnull) - $this->TextColor=3Dsprintf('%.3F g',$r/255); + $this->TextColor =3D sprintf('%.3F g',$r/255); else - $this->TextColor=3Dsprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255); - $this->ColorFlag=3D($this->FillColor!=3D$this->TextColor); + $this->TextColor =3D sprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255)= ; + $this->ColorFlag =3D ($this->FillColor!=3D$this->TextColor); } =20 function GetStringWidth($s) { - //Get width of a string in the current font - $s=3D(string)$s; - $cw=3D&$this->CurrentFont['cw']; + // Get width of a string in the current font + $s =3D (string)$s; + $cw =3D &$this->CurrentFont['cw']; $w=3D0; if ($this->unifontSubset) { $unicode =3D $this->UTF8StringToArray($s); foreach($unicode as $char) { - if (isset($cw[$char])) { $w+=3D$cw[$char]; }=20 - else if($char>0 && $char<128 && isset($cw[chr($char)])) { $w+=3D$cw[c= hr($char)]; }=20 + if (isset($cw[$char])) { $w +=3D (ord($cw[2*$char])<<8) + ord($cw[2*$= char+1]); } + else if($char>0 && $char<128 && isset($cw[chr($char)])) { $w +=3D $cw= [chr($char)]; } else if(isset($this->CurrentFont['desc']['MissingWidth'])) { $w +=3D = $this->CurrentFont['desc']['MissingWidth']; } else if(isset($this->CurrentFont['MissingWidth'])) { $w +=3D $this->C= urrentFont['MissingWidth']; } else { $w +=3D 500; } } } else { - $l=3Dstrlen($s); + $l =3D strlen($s); for($i=3D0;$i<$l;$i++) - $w+=3D$cw[$s[$i]]; + $w +=3D $cw[$s[$i]]; } return $w*$this->FontSize/1000; } =20 function SetLineWidth($width) { - //Set line width - $this->LineWidth=3D$width; + // Set line width + $this->LineWidth =3D $width; if($this->page>0) $this->_out(sprintf('%.2F w',$width*$this->k)); } =20 function Line($x1, $y1, $x2, $y2) { - //Draw a line + // Draw a line $this->_out(sprintf('%.2F %.2F m %.2F %.2F l S',$x1*$this->k,($this->h-= $y1)*$this->k,$x2*$this->k,($this->h-$y2)*$this->k)); } =20 function Rect($x, $y, $w, $h, $style=3D'') { - //Draw a rectangle + // Draw a rectangle if($style=3D=3D'F') - $op=3D'f'; + $op =3D 'f'; elseif($style=3D=3D'FD' || $style=3D=3D'DF') - $op=3D'B'; + $op =3D 'B'; else - $op=3D'S'; + $op =3D 'S'; $this->_out(sprintf('%.2F %.2F %.2F %.2F re %s',$x*$this->k,($this->h-$= y)*$this->k,$w*$this->k,-$h*$this->k,$op)); } =20 - function AddFont($family, $style=3D'', $file=3D'', $uni=3Dfalse) { - //Add a TrueType or Type1 font - $family=3Dstrtolower($family); + // Add a TrueType, OpenType or Type1 font + $family =3D strtolower($family); + $style =3D strtoupper($style); + if($style=3D=3D'IB') + $style=3D'BI'; if($file=3D=3D'') { if ($uni) { - $file=3Dstr_replace(' ','',$family).strtolower($style).'.ttf'; + $file =3D str_replace(' ','',$family).strtolower($style).'.ttf'; } else { - $file=3Dstr_replace(' ','',$family).strtolower($style).'.php'; + $file =3D str_replace(' ','',$family).strtolower($style).'.php'; } } - if($family=3D=3D'arial') - $family=3D'helvetica'; - $style=3Dstrtoupper($style); - if($style=3D=3D'IB') - $style=3D'BI'; - $fontkey=3D$family.$style; + $fontkey =3D $family.$style; if(isset($this->fonts[$fontkey])) return; =20 if ($uni) { - if (defined("_SYSTEM_TTFONTS") && file_exists(_SYSTEM_TTFONTS.$file ))= { $ttfilename =3D _SYSTEM_TTFONTS.$file ; } - else { $ttfilename =3D $this->_getfontpath().'unifont/'.$file ; } - $filename =3D $file; - $filename =3Dstr_replace(' ','',$filename ); - $filename =3Dstr_replace('-','',$filename ); - $unifilename =3D $this->_getfontpath().'unifont/'.strtolower(substr($f= ilename ,0,(strpos($filename ,'.')))); - $diff =3D ''; - $enc =3D ''; + if (defined("_SYSTEM_TTFONTS") && file_exists(_SYSTEM_TTFONTS.$file ))= { $ttffilename =3D _SYSTEM_TTFONTS.$file ; } + else { $ttffilename =3D $this->_getfontpath().'unifont/'.$file ; } + $unifilename =3D $this->_getfontpath().'unifont/'.strtolower(substr($f= ile ,0,(strpos($file ,'.')))); + $name =3D ''; + $originalsize =3D 0; + $ttfstat =3D stat($ttffilename); if (file_exists($unifilename.'.mtx.php')) { include($unifilename.'.mtx.php'); } - if (!isset($type) || $type !=3D "TrueTypesubset") { - include_once($this->_getfontpath().'unifont/ttfonts.php'); + if (!isset($type) || !isset($name) || $originalsize !=3D $ttfstat['si= ze']) { + $ttffile =3D $ttffilename; + require_once($this->_getfontpath().'unifont/ttfonts.php'); $ttf =3D new TTFontFile(); - $ttf->getMetrics($ttfilename); + $ttf->getMetrics($ttffile); $cw =3D $ttf->charWidths; - $type =3D "TrueTypesubset"; - $name =3D preg_replace('/ /','',$ttf->fullName); + $name =3D preg_replace('/[ ()]/','',$ttf->fullName); + $desc=3D array('Ascent'=3D>round($ttf->ascent), 'Descent'=3D>round($ttf->descent), 'CapHeight'=3D>round($ttf->capHeight), @@ -520,128 +520,117 @@ 'MissingWidth'=3D>round($ttf->defaultWidth)); $up =3D round($ttf->underlinePosition); $ut =3D round($ttf->underlineThickness); - //Generate metrics .php file + $originalsize =3D $ttfstat['size']+0; + $type =3D 'TTF'; + // Generate metrics .php file $s=3D'\n"; - if (is_writable($this->_getfontpath().'unifont')) { + $s.=3D'$ttffile=3D\''.$ttffile."';\n"; + $s.=3D'$originalsize=3D'.$originalsize.";\n"; + $s.=3D'$fontkey=3D\''.$fontkey."';\n"; + $s.=3D"?>"; + if (is_writable(dirname($this->_getfontpath().'unifont/'.'x'))) { $fh =3D fopen($unifilename.'.mtx.php',"w"); fwrite($fh,$s,strlen($s)); fclose($fh); + $fh =3D fopen($unifilename.'.cw.dat',"wb"); + fwrite($fh,$cw,strlen($cw)); + fclose($fh); + @unlink($unifilename.'.cw127.php'); } unset($ttf); } - if(!isset($name)) { - $this->Error('Problem with the font definition file'); + else { + $cw =3D @file_get_contents($unifilename.'.cw.dat');=20 } - $i =3D count($this->fonts)+$this->extraFontSubsets+1; - $sbarr =3D range(0,127); =20 - $this->fonts[$fontkey] =3D array('i'=3D>$i, 'type'=3D>$type, 'name'=3D= >$name, 'desc'=3D>$desc, 'up'=3D>$up, 'ut'=3D>$ut, 'cw'=3D>$cw, 'enc'=3D>= $enc, 'file'=3D>$ttfilename, 'subsets'=3D>array(0=3D>$sbarr), 'subsetfont= ids'=3D>array($i), 'used'=3D>false); + $i =3D count($this->fonts)+1; + if(!empty($this->AliasNbPages)) + $sbarr =3D range(0,57); + else + $sbarr =3D range(0,32); + $this->fonts[$fontkey] =3D array('i'=3D>$i, 'type'=3D>$type, 'name'=3D= >$name, 'desc'=3D>$desc, 'up'=3D>$up, 'ut'=3D>$ut, 'cw'=3D>$cw, 'ttffile'= =3D>$ttffile, 'fontkey'=3D>$fontkey, 'subset'=3D>$sbarr, 'unifilename'=3D= >$unifilename); + + $this->FontFiles[$fontkey]=3Darray('length1'=3D>$originalsize, 'type'=3D= >"TTF", 'ttffile'=3D>$ttffile); + $this->FontFiles[$file]=3Darray('type'=3D>"TTF"); unset($cw); } else { - include($this->_getfontpath().$file); - if(!isset($name)) - $this->Error('Could not include font definition file'); - $i=3Dcount($this->fonts)+$this->extraFontSubsets+1; - $this->fonts[$fontkey]=3Darray('i'=3D>$i, 'type'=3D>$type, 'name'=3D>$= name, 'desc'=3D>$desc, 'up'=3D>$up, 'ut'=3D>$ut, 'cw'=3D>$cw, 'enc'=3D>$e= nc, 'file'=3D>$file); - } - - if($diff) - { - //Search existing encodings - $d=3D0; - $nb=3Dcount($this->diffs); - for($i=3D1;$i<=3D$nb;$i++) + $info =3D $this->_loadfont($file); + $info['i'] =3D count($this->fonts)+1; + if(!empty($info['diff'])) { - if($this->diffs[$i]=3D=3D$diff) + // Search existing encodings + $n =3D array_search($info['diff'],$this->diffs); + if(!$n) { - $d=3D$i; - break; + $n =3D count($this->diffs)+1; + $this->diffs[$n] =3D $info['diff']; } + $info['diffn'] =3D $n; } - if($d=3D=3D0) + if(!empty($info['file'])) { - $d=3D$nb+1; - $this->diffs[$d]=3D$diff; + // Embedded font + if($info['type']=3D=3D'TrueType') + $this->FontFiles[$info['file']] =3D array('length1'=3D>$info['origin= alsize']); + else + $this->FontFiles[$info['file']] =3D array('length1'=3D>$info['size1'= ], 'length2'=3D>$info['size2']); } - $this->fonts[$fontkey]['diff']=3D$d; + $this->fonts[$fontkey] =3D $info; } - if($file) - { - if($type=3D=3D'TrueType') - $this->FontFiles[$file]=3Darray('length1'=3D>$originalsize); - else if ($uni && $type =3D=3D "TrueTypesubset") - $this->FontFiles[$file]=3Darray('type'=3D>"TrueTypesubset"); - else - $this->FontFiles[$file]=3Darray('length1'=3D>$size1, 'length2'=3D>$si= ze2); - } } =20 function SetFont($family, $style=3D'', $size=3D0) { - //Select a font; size given in points - global $fpdf_charwidths; - - $family=3Dstrtolower($family); + // Select a font; size given in points if($family=3D=3D'') - $family=3D$this->FontFamily; - if($family=3D=3D'arial') - $family=3D'helvetica'; - elseif($family=3D=3D'symbol' || $family=3D=3D'zapfdingbats') - $style=3D''; - $style=3Dstrtoupper($style); + $family =3D $this->FontFamily; + else + $family =3D strtolower($family); + $style =3D strtoupper($style); if(strpos($style,'U')!=3D=3Dfalse) { - $this->underline=3Dtrue; - $style=3Dstr_replace('U','',$style); + $this->underline =3D true; + $style =3D str_replace('U','',$style); } else - $this->underline=3Dfalse; + $this->underline =3D false; if($style=3D=3D'IB') - $style=3D'BI'; + $style =3D 'BI'; if($size=3D=3D0) - $size=3D$this->FontSizePt; - //Test if font is already selected + $size =3D $this->FontSizePt; + // Test if font is already selected if($this->FontFamily=3D=3D$family && $this->FontStyle=3D=3D$style && $t= his->FontSizePt=3D=3D$size) return; - //Test if used for the first time - $fontkey=3D$family.$style; + // Test if font is already loaded + $fontkey =3D $family.$style; if(!isset($this->fonts[$fontkey])) { - //Check if one of the standard fonts - if(isset($this->CoreFonts[$fontkey])) + // Test if one of the core fonts + if($family=3D=3D'arial') + $family =3D 'helvetica'; + if(in_array($family,$this->CoreFonts)) { - if(!isset($fpdf_charwidths[$fontkey])) - { - //Load metric file - $file=3D$family; - if($family=3D=3D'times' || $family=3D=3D'helvetica') - $file.=3Dstrtolower($style); - include($this->_getfontpath().$file.'.php'); - if(!isset($fpdf_charwidths[$fontkey])) - $this->Error('Could not include font metric file'); - } - $i=3Dcount($this->fonts)+1+$this->extraFontSubsets; - $name=3D$this->CoreFonts[$fontkey]; - $cw=3D$fpdf_charwidths[$fontkey]; - $this->fonts[$fontkey]=3Darray('i'=3D>$i, 'type'=3D>'core', 'name'=3D= >$name, 'up'=3D>-100, 'ut'=3D>50, 'cw'=3D>$cw); + if($family=3D=3D'symbol' || $family=3D=3D'zapfdingbats') + $style =3D ''; + $fontkey =3D $family.$style; + if(!isset($this->fonts[$fontkey])) + $this->AddFont($family,$style); } else $this->Error('Undefined font: '.$family.' '.$style); } - //Select it - $this->FontFamily=3D$family; - $this->FontStyle=3D$style; - $this->FontSizePt=3D$size; - $this->FontSize=3D$size/$this->k; - $this->CurrentFont=3D&$this->fonts[$fontkey]; - if ($this->fonts[$fontkey]['type']=3D=3D'TrueTypesubset') { $this->unif= ontSubset =3D true; } + // Select it + $this->FontFamily =3D $family; + $this->FontStyle =3D $style; + $this->FontSizePt =3D $size; + $this->FontSize =3D $size/$this->k; + $this->CurrentFont =3D &$this->fonts[$fontkey]; + if ($this->fonts[$fontkey]['type']=3D=3D'TTF') { $this->unifontSubset =3D= true; } else { $this->unifontSubset =3D false; } if($this->page>0) $this->_out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this= ->FontSizePt)); @@ -649,199 +638,230 @@ =20 function SetFontSize($size) { - //Set font size in points + // Set font size in points if($this->FontSizePt=3D=3D$size) return; - $this->FontSizePt=3D$size; - $this->FontSize=3D$size/$this->k; + $this->FontSizePt =3D $size; + $this->FontSize =3D $size/$this->k; if($this->page>0) $this->_out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this= ->FontSizePt)); } =20 function AddLink() { - //Create a new internal link - $n=3Dcount($this->links)+1; - $this->links[$n]=3Darray(0, 0); + // Create a new internal link + $n =3D count($this->links)+1; + $this->links[$n] =3D array(0, 0); return $n; } =20 function SetLink($link, $y=3D0, $page=3D-1) { - //Set destination of internal link + // Set destination of internal link if($y=3D=3D-1) - $y=3D$this->y; + $y =3D $this->y; if($page=3D=3D-1) - $page=3D$this->page; - $this->links[$link]=3Darray($page, $y); + $page =3D $this->page; + $this->links[$link] =3D array($page, $y); } =20 function Link($x, $y, $w, $h, $link) { - //Put a link on the page - $this->PageLinks[$this->page][]=3Darray($x*$this->k, $this->hPt-$y*$thi= s->k, $w*$this->k, $h*$this->k, $link); + // Put a link on the page + $this->PageLinks[$this->page][] =3D array($x*$this->k, $this->hPt-$y*$t= his->k, $w*$this->k, $h*$this->k, $link); } =20 function Text($x, $y, $txt) { - //Output a string + // Output a string if ($this->unifontSubset) - $txt2 =3D $this->UTF8toSubset($txt); + { + $txt2 =3D '('.$this->_escape($this->UTF8ToUTF16BE($txt, false)).')'; + foreach($this->UTF8StringToArray($txt) as $uni) + $this->CurrentFont['subset'][$uni] =3D $uni; + } else=20 - $txt2=3D'('.$this->_escape($txt).')'; - $s=3Dsprintf('BT %.2F %.2F Td %s Tj ET',$x*$this->k,($this->h-$y)*$this= ->k,$txt2); + $txt2 =3D '('.$this->_escape($txt).')'; + $s =3D sprintf('BT %.2F %.2F Td %s Tj ET',$x*$this->k,($this->h-$y)*$th= is->k,$txt2); if($this->underline && $txt!=3D'') - $s.=3D' '.$this->_dounderline($x,$y,$txt); + $s .=3D ' '.$this->_dounderline($x,$y,$txt); if($this->ColorFlag) - $s=3D'q '.$this->TextColor.' '.$s.' Q'; + $s =3D 'q '.$this->TextColor.' '.$s.' Q'; $this->_out($s); } =20 function AcceptPageBreak() { - //Accept automatic page break or not + // Accept automatic page break or not return $this->AutoPageBreak; } =20 function Cell($w, $h=3D0, $txt=3D'', $border=3D0, $ln=3D0, $align=3D'', = $fill=3Dfalse, $link=3D'') { - //Output a cell - $k=3D$this->k; + // Output a cell + $k =3D $this->k; if($this->y+$h>$this->PageBreakTrigger && !$this->InHeader && !$this->I= nFooter && $this->AcceptPageBreak()) { - //Automatic page break - $x=3D$this->x; - $ws=3D$this->ws; + // Automatic page break + $x =3D $this->x; + $ws =3D $this->ws; if($ws>0) { - $this->ws=3D0; + $this->ws =3D 0; $this->_out('0 Tw'); } - $this->AddPage($this->CurOrientation,$this->CurPageFormat); - $this->x=3D$x; + $this->AddPage($this->CurOrientation,$this->CurPageSize); + $this->x =3D $x; if($ws>0) { - $this->ws=3D$ws; + $this->ws =3D $ws; $this->_out(sprintf('%.3F Tw',$ws*$k)); } } if($w=3D=3D0) - $w=3D$this->w-$this->rMargin-$this->x; - $s=3D''; + $w =3D $this->w-$this->rMargin-$this->x; + $s =3D ''; if($fill || $border=3D=3D1) { if($fill) - $op=3D($border=3D=3D1) ? 'B' : 'f'; + $op =3D ($border=3D=3D1) ? 'B' : 'f'; else - $op=3D'S'; - $s=3Dsprintf('%.2F %.2F %.2F %.2F re %s ',$this->x*$k,($this->h-$this-= >y)*$k,$w*$k,-$h*$k,$op); + $op =3D 'S'; + $s =3D sprintf('%.2F %.2F %.2F %.2F re %s ',$this->x*$k,($this->h-$thi= s->y)*$k,$w*$k,-$h*$k,$op); } if(is_string($border)) { - $x=3D$this->x; - $y=3D$this->y; + $x =3D $this->x; + $y =3D $this->y; if(strpos($border,'L')!=3D=3Dfalse) - $s.=3Dsprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,$x*= $k,($this->h-($y+$h))*$k); + $s .=3D sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,$= x*$k,($this->h-($y+$h))*$k); if(strpos($border,'T')!=3D=3Dfalse) - $s.=3Dsprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,($x= +$w)*$k,($this->h-$y)*$k); + $s .=3D sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,(= $x+$w)*$k,($this->h-$y)*$k); if(strpos($border,'R')!=3D=3Dfalse) - $s.=3Dsprintf('%.2F %.2F m %.2F %.2F l S ',($x+$w)*$k,($this->h-$y)*$= k,($x+$w)*$k,($this->h-($y+$h))*$k); + $s .=3D sprintf('%.2F %.2F m %.2F %.2F l S ',($x+$w)*$k,($this->h-$y)= *$k,($x+$w)*$k,($this->h-($y+$h))*$k); if(strpos($border,'B')!=3D=3Dfalse) - $s.=3Dsprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-($y+$h))*$= k,($x+$w)*$k,($this->h-($y+$h))*$k); + $s .=3D sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-($y+$h))= *$k,($x+$w)*$k,($this->h-($y+$h))*$k); } if($txt!=3D=3D'') { if($align=3D=3D'R') - $dx=3D$w-$this->cMargin-$this->GetStringWidth($txt); + $dx =3D $w-$this->cMargin-$this->GetStringWidth($txt); elseif($align=3D=3D'C') - $dx=3D($w-$this->GetStringWidth($txt))/2; + $dx =3D ($w-$this->GetStringWidth($txt))/2; else - $dx=3D$this->cMargin; + $dx =3D $this->cMargin; if($this->ColorFlag) - $s.=3D'q '.$this->TextColor.' '; - if ($this->unifontSubset) - $txt2 =3D $this->UTF8toSubset($txt); - else=20 - $txt2=3D'('.str_replace(')','\\)',str_replace('(','\\(',str_replace('= \\','\\\\',$txt))).')'; - $s.=3Dsprintf('BT %.2F %.2F Td %s Tj ET',($this->x+$dx)*$k,($this->h-(= $this->y+.5*$h+.3*$this->FontSize))*$k,$txt2); + $s .=3D 'q '.$this->TextColor.' '; + + // If multibyte, Tw has no effect - do word spacing using an adjustmen= t before each space + if ($this->ws && $this->unifontSubset) { + foreach($this->UTF8StringToArray($txt) as $uni) + $this->CurrentFont['subset'][$uni] =3D $uni; + $space =3D $this->_escape($this->UTF8ToUTF16BE(' ', false)); + $s .=3D sprintf('BT 0 Tw %.2F %.2F Td [',($this->x+$dx)*$k,($this->h-= ($this->y+.5*$h+.3*$this->FontSize))*$k); + $t =3D explode(' ',$txt); + $numt =3D count($t); + for($i=3D0;$i<$numt;$i++) { + $tx =3D $t[$i]; + $tx =3D '('.$this->_escape($this->UTF8ToUTF16BE($tx, false)).')'; + $s .=3D sprintf('%s ',$tx); + if (($i+1)<$numt) { + $adj =3D -($this->ws*$this->k)*1000/$this->FontSizePt; + $s .=3D sprintf('%d(%s) ',$adj,$space); + } + } + $s .=3D '] TJ'; + $s .=3D ' ET'; + } + else { + if ($this->unifontSubset) + { + $txt2 =3D '('.$this->_escape($this->UTF8ToUTF16BE($txt, false)).')'; + foreach($this->UTF8StringToArray($txt) as $uni) + $this->CurrentFont['subset'][$uni] =3D $uni; + } + else + $txt2=3D'('.str_replace(')','\\)',str_replace('(','\\(',str_replace(= '\\','\\\\',$txt))).')'; + $s .=3D sprintf('BT %.2F %.2F Td %s Tj ET',($this->x+$dx)*$k,($this->= h-($this->y+.5*$h+.3*$this->FontSize))*$k,$txt2); + } if($this->underline) - $s.=3D' '.$this->_dounderline($this->x+$dx,$this->y+.5*$h+.3*$this->F= ontSize,$txt); + $s .=3D ' '.$this->_dounderline($this->x+$dx,$this->y+.5*$h+.3*$this-= >FontSize,$txt); if($this->ColorFlag) - $s.=3D' Q'; + $s .=3D ' Q'; if($link) $this->Link($this->x+$dx,$this->y+.5*$h-.5*$this->FontSize,$this->Get= StringWidth($txt),$this->FontSize,$link); } if($s) $this->_out($s); - $this->lasth=3D$h; + $this->lasth =3D $h; if($ln>0) { - //Go to next line - $this->y+=3D$h; + // Go to next line + $this->y +=3D $h; if($ln=3D=3D1) - $this->x=3D$this->lMargin; + $this->x =3D $this->lMargin; } else - $this->x+=3D$w; + $this->x +=3D $w; } =20 function MultiCell($w, $h, $txt, $border=3D0, $align=3D'J', $fill=3Dfals= e) { - //Output text with automatic or explicit line breaks - $cw=3D&$this->CurrentFont['cw']; + // Output text with automatic or explicit line breaks + $cw =3D &$this->CurrentFont['cw']; if($w=3D=3D0) - $w=3D$this->w-$this->rMargin-$this->x; - $wmax=3D($w-2*$this->cMargin); - $s=3Dstr_replace("\r",'',$txt); + $w =3D $this->w-$this->rMargin-$this->x; + $wmax =3D ($w-2*$this->cMargin); + $s =3D str_replace("\r",'',$txt); if ($this->unifontSubset) { $nb=3Dmb_strlen($s, 'utf-8'); while($nb>0 && mb_substr($s,$nb-1,1,'utf-8')=3D=3D"\n") $nb--; } else { - $nb=3Dstrlen($s); + $nb =3D strlen($s); if($nb>0 && $s[$nb-1]=3D=3D"\n") $nb--; } - - $b=3D0; + $b =3D 0; if($border) { if($border=3D=3D1) { - $border=3D'LTRB'; - $b=3D'LRT'; - $b2=3D'LR'; + $border =3D 'LTRB'; + $b =3D 'LRT'; + $b2 =3D 'LR'; } else { - $b2=3D''; + $b2 =3D ''; if(strpos($border,'L')!=3D=3Dfalse) - $b2.=3D'L'; + $b2 .=3D 'L'; if(strpos($border,'R')!=3D=3Dfalse) - $b2.=3D'R'; - $b=3D(strpos($border,'T')!=3D=3Dfalse) ? $b2.'T' : $b2; + $b2 .=3D 'R'; + $b =3D (strpos($border,'T')!=3D=3Dfalse) ? $b2.'T' : $b2; } } - $sep=3D-1; - $i=3D0; - $j=3D0; - $l=3D0; - $ns=3D0; - $nl=3D1; + $sep =3D -1; + $i =3D 0; + $j =3D 0; + $l =3D 0; + $ns =3D 0; + $nl =3D 1; while($i<$nb) { - //Get next character + // Get next character if ($this->unifontSubset) { $c =3D mb_substr($s,$i,1,'UTF-8'); } else { $c=3D$s[$i]; } - if($c=3D=3D"\n") { - //Explicit line break + if($c=3D=3D"\n") + { + // Explicit line break if($this->ws>0) { - $this->ws=3D0; + $this->ws =3D 0; $this->_out('0 Tw'); } if ($this->unifontSubset) { @@ -851,19 +871,19 @@ $this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill); } $i++; - $sep=3D-1; - $j=3D$i; - $l=3D0; - $ns=3D0; + $sep =3D -1; + $j =3D $i; + $l =3D 0; + $ns =3D 0; $nl++; if($border && $nl=3D=3D2) - $b=3D$b2; + $b =3D $b2; continue; } if($c=3D=3D' ') { - $sep=3D$i; - $ls=3D$l; + $sep =3D $i; + $ls =3D $l; $ns++; } =20 @@ -872,14 +892,14 @@ =20 if($l>$wmax) { - //Automatic line break + // Automatic line break if($sep=3D=3D-1) { if($i=3D=3D$j) $i++; if($this->ws>0) { - $this->ws=3D0; + $this->ws =3D 0; $this->_out('0 Tw'); } if ($this->unifontSubset) { @@ -893,7 +913,7 @@ { if($align=3D=3D'J') { - $this->ws=3D($ns>1) ? ($wmax-$ls)/($ns-1) : 0; + $this->ws =3D ($ns>1) ? ($wmax-$ls)/($ns-1) : 0; $this->_out(sprintf('%.3F Tw',$this->ws*$this->k)); } if ($this->unifontSubset) { @@ -902,72 +922,71 @@ else { $this->Cell($w,$h,substr($s,$j,$sep-$j),$b,2,$align,$fill); } - $i=3D$sep+1; + $i =3D $sep+1; } - $sep=3D-1; - $j=3D$i; - $l=3D0; - $ns=3D0; + $sep =3D -1; + $j =3D $i; + $l =3D 0; + $ns =3D 0; $nl++; if($border && $nl=3D=3D2) - $b=3D$b2; + $b =3D $b2; } else $i++; } - //Last chunk + // Last chunk if($this->ws>0) { - $this->ws=3D0; + $this->ws =3D 0; $this->_out('0 Tw'); } if($border && strpos($border,'B')!=3D=3Dfalse) - $b.=3D'B'; + $b .=3D 'B'; if ($this->unifontSubset) { $this->Cell($w,$h,mb_substr($s,$j,$i-$j,'UTF-8'),$b,2,$align,$fill); } else { $this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill); } - $this->x=3D$this->lMargin; + $this->x =3D $this->lMargin; } =20 function Write($h, $txt, $link=3D'') { - //Output text in flowing mode - $cw=3D&$this->CurrentFont['cw']; - $w=3D$this->w-$this->rMargin-$this->x; + // Output text in flowing mode + $cw =3D &$this->CurrentFont['cw']; + $w =3D $this->w-$this->rMargin-$this->x; =20 - $wmax=3D($w-2*$this->cMargin); - $s=3Dstr_replace("\r",'',$txt); + $wmax =3D ($w-2*$this->cMargin); + $s =3D str_replace("\r",'',$txt); if ($this->unifontSubset) { - $nb=3Dmb_strlen($s, 'UTF-8'); + $nb =3D mb_strlen($s, 'UTF-8'); if($nb=3D=3D1 && $s=3D=3D" ") { $this->x +=3D $this->GetStringWidth($s); return; } } else { - $nb=3Dstrlen($s); + $nb =3D strlen($s); } - - $sep=3D-1; - $i=3D0; - $j=3D0; - $l=3D0; - $nl=3D1; + $sep =3D -1; + $i =3D 0; + $j =3D 0; + $l =3D 0; + $nl =3D 1; while($i<$nb) { - //Get next character - //Get next character + // Get next character if ($this->unifontSubset) { $c =3D mb_substr($s,$i,1,'UTF-8'); } else { - $c=3D$s[$i]; + $c =3D $s[$i]; } - if($c=3D=3D"\n") { - //Explicit line break + if($c=3D=3D"\n") + { + // Explicit line break if ($this->unifontSubset) { $this->Cell($w,$h,mb_substr($s,$j,$i-$j,'UTF-8'),0,2,'',0,$link); } @@ -975,36 +994,36 @@ $this->Cell($w,$h,substr($s,$j,$i-$j),0,2,'',0,$link); } $i++; - $sep=3D-1; - $j=3D$i; - $l=3D0; + $sep =3D -1; + $j =3D $i; + $l =3D 0; if($nl=3D=3D1) { - $this->x=3D$this->lMargin; - $w=3D$this->w-$this->rMargin-$this->x; - $wmax=3D($w-2*$this->cMargin); + $this->x =3D $this->lMargin; + $w =3D $this->w-$this->rMargin-$this->x; + $wmax =3D ($w-2*$this->cMargin); } $nl++; continue; } if($c=3D=3D' ') - $sep=3D$i; + $sep =3D $i; =20 if ($this->unifontSubset) { $l +=3D $this->GetStringWidth($c); } else { $l +=3D $cw[$c]*$this->FontSize/1000; } =20 if($l>$wmax) { - //Automatic line break + // Automatic line break if($sep=3D=3D-1) { if($this->x>$this->lMargin) { - //Move to next line - $this->x=3D$this->lMargin; - $this->y+=3D$h; - $w=3D$this->w-$this->rMargin-$this->x; - $wmax=3D($w-2*$this->cMargin); + // Move to next line + $this->x =3D $this->lMargin; + $this->y +=3D $h; + $w =3D $this->w-$this->rMargin-$this->x; + $wmax =3D ($w-2*$this->cMargin); $i++; $nl++; continue; @@ -1026,23 +1045,23 @@ else { $this->Cell($w,$h,substr($s,$j,$sep-$j),0,2,'',0,$link); } - $i=3D$sep+1; + $i =3D $sep+1; } - $sep=3D-1; - $j=3D$i; - $l=3D0; + $sep =3D -1; + $j =3D $i; + $l =3D 0; if($nl=3D=3D1) { - $this->x=3D$this->lMargin; - $w=3D$this->w-$this->rMargin-$this->x; - $wmax=3D($w-2*$this->cMargin); + $this->x =3D $this->lMargin; + $w =3D $this->w-$this->rMargin-$this->x; + $wmax =3D ($w-2*$this->cMargin); } $nl++; } else $i++; } - //Last chunk + // Last chunk if($i!=3D$j) { if ($this->unifontSubset) { $this->Cell($l,$h,mb_substr($s,$j,$i-$j,'UTF-8'),0,0,'',0,$link); @@ -1055,65 +1074,72 @@ =20 function Ln($h=3Dnull) { - //Line feed; default value is last cell height - $this->x=3D$this->lMargin; + // Line feed; default value is last cell height + $this->x =3D $this->lMargin; if($h=3D=3D=3Dnull) - $this->y+=3D$this->lasth; + $this->y +=3D $this->lasth; else - $this->y+=3D$h; + $this->y +=3D $h; } =20 function Image($file, $x=3Dnull, $y=3Dnull, $w=3D0, $h=3D0, $type=3D'', = $link=3D'') { - //Put an image on the page + // Put an image on the page if(!isset($this->images[$file])) { - //First use of this image, get info + // First use of this image, get info if($type=3D=3D'') { - $pos=3Dstrrpos($file,'.'); + $pos =3D strrpos($file,'.'); if(!$pos) $this->Error('Image file has no extension and no type was specified:= '.$file); - $type=3Dsubstr($file,$pos+1); + $type =3D substr($file,$pos+1); } - $type=3Dstrtolower($type); + $type =3D strtolower($type); if($type=3D=3D'jpeg') - $type=3D'jpg'; - $mtd=3D'_parse'.$type; + $type =3D 'jpg'; + $mtd =3D '_parse'.$type; if(!method_exists($this,$mtd)) $this->Error('Unsupported image type: '.$type); - $info=3D$this->$mtd($file); - $info['i']=3Dcount($this->images)+1; - $this->images[$file]=3D$info; + $info =3D $this->$mtd($file); + $info['i'] =3D count($this->images)+1; + $this->images[$file] =3D $info; } else - $info=3D$this->images[$file]; - //Automatic width and height calculation if needed + $info =3D $this->images[$file]; + + // Automatic width and height calculation if needed if($w=3D=3D0 && $h=3D=3D0) { - //Put image at 72 dpi - $w=3D$info['w']/$this->k; - $h=3D$info['h']/$this->k; + // Put image at 96 dpi + $w =3D -96; + $h =3D -96; } - elseif($w=3D=3D0) - $w=3D$h*$info['w']/$info['h']; - elseif($h=3D=3D0) - $h=3D$w*$info['h']/$info['w']; - //Flowing mode + if($w<0) + $w =3D -$info['w']*72/$w/$this->k; + if($h<0) + $h =3D -$info['h']*72/$h/$this->k; + if($w=3D=3D0) + $w =3D $h*$info['w']/$info['h']; + if($h=3D=3D0) + $h =3D $w*$info['h']/$info['w']; + + // Flowing mode if($y=3D=3D=3Dnull) { if($this->y+$h>$this->PageBreakTrigger && !$this->InHeader && !$this->= InFooter && $this->AcceptPageBreak()) { - //Automatic page break - $x2=3D$this->x; - $this->AddPage($this->CurOrientation,$this->CurPageFormat); - $this->x=3D$x2; + // Automatic page break + $x2 =3D $this->x; + $this->AddPage($this->CurOrientation,$this->CurPageSize); + $this->x =3D $x2; } - $y=3D$this->y; - $this->y+=3D$h; + $y =3D $this->y; + $this->y +=3D $h; } + if($x=3D=3D=3Dnull) - $x=3D$this->x; + $x =3D $this->x; $this->_out(sprintf('q %.2F 0 0 %.2F %.2F %.2F cm /I%d Do Q',$w*$this->= k,$h*$this->k,$x*$this->k,($this->h-($y+$h))*$this->k,$info['i'])); if($link) $this->Link($x,$y,$w,$h,$link); @@ -1121,102 +1147,92 @@ =20 function GetX() { - //Get x position + // Get x position return $this->x; } =20 function SetX($x) { - //Set x position + // Set x position if($x>=3D0) - $this->x=3D$x; + $this->x =3D $x; else - $this->x=3D$this->w+$x; + $this->x =3D $this->w+$x; } =20 function GetY() { - //Get y position + // Get y position return $this->y; } =20 function SetY($y) { - //Set y position and reset x - $this->x=3D$this->lMargin; + // Set y position and reset x + $this->x =3D $this->lMargin; if($y>=3D0) - $this->y=3D$y; + $this->y =3D $y; else - $this->y=3D$this->h+$y; + $this->y =3D $this->h+$y; } =20 function SetXY($x, $y) { - //Set x and y positions + // Set x and y positions $this->SetY($y); $this->SetX($x); } =20 function Output($name=3D'', $dest=3D'') { - //Output PDF to some destination + // Output PDF to some destination if($this->state<3) $this->Close(); - $dest=3Dstrtoupper($dest); + $dest =3D strtoupper($dest); if($dest=3D=3D'') { if($name=3D=3D'') { - $name=3D'doc.pdf'; - $dest=3D'I'; + $name =3D 'doc.pdf'; + $dest =3D 'I'; } else - $dest=3D'F'; + $dest =3D 'F'; } switch($dest) { case 'I': - //Send to standard output - if(ob_get_length()) - $this->Error('Some data has already been output, can\'t send PDF fil= e'); - if(php_sapi_name()!=3D'cli') + // Send to standard output + $this->_checkoutput(); + if(PHP_SAPI!=3D'cli') { - //We send to a browser + // We send to a browser header('Content-Type: application/pdf'); - if(headers_sent()) - $this->Error('Some data has already been output, can\'t send PDF fi= le'); - header('Content-Length: '.strlen($this->buffer)); header('Content-Disposition: inline; filename=3D"'.$name.'"'); header('Cache-Control: private, max-age=3D0, must-revalidate'); header('Pragma: public'); - ini_set('zlib.output_compression','0'); } echo $this->buffer; break; case 'D': - //Download file - if(ob_get_length()) - $this->Error('Some data has already been output, can\'t send PDF fil= e'); + // Download file + $this->_checkoutput(); header('Content-Type: application/x-download'); - if(headers_sent()) - $this->Error('Some data has already been output, can\'t send PDF fil= e'); - header('Content-Length: '.strlen($this->buffer)); header('Content-Disposition: attachment; filename=3D"'.$name.'"'); header('Cache-Control: private, max-age=3D0, must-revalidate'); header('Pragma: public'); - ini_set('zlib.output_compression','0'); echo $this->buffer; break; case 'F': - //Save to local file - $f=3Dfopen($name,'wb'); + // Save to local file + $f =3D fopen($name,'wb'); if(!$f) $this->Error('Unable to create output file: '.$name); fwrite($f,$this->buffer,strlen($this->buffer)); fclose($f); break; case 'S': - //Return as a string + // Return as a string return $this->buffer; default: $this->Error('Incorrect output destination: '.$dest); @@ -1231,125 +1247,163 @@ ************************************************************************= *******/ function _dochecks() { - //Check availability of %F + // Check availability of %F if(sprintf('%.1F',1.0)!=3D'1.0') $this->Error('This version of PHP is not supported'); - //Check mbstring overloading + // Check availability of mbstring + if(!function_exists('mb_strlen')) + $this->Error('mbstring extension is not available'); + // Check mbstring overloading if(ini_get('mbstring.func_overload') & 2) $this->Error('mbstring overloading must be disabled'); - //Disable runtime magic quotes + // Ensure runtime magic quotes are disabled if(get_magic_quotes_runtime()) @set_magic_quotes_runtime(0); } =20 -function _getpageformat($format) +function _getfontpath() { - $format=3Dstrtolower($format); - if(!isset($this->PageFormats[$format])) - $this->Error('Unknown page format: '.$format); - $a=3D$this->PageFormats[$format]; - return array($a[0]/$this->k, $a[1]/$this->k); + return $this->fontpath; } =20 -function _getfontpath() +function _checkoutput() { - if(!defined('FPDF_FONTPATH') && is_dir(dirname(__FILE__).'/font'))=20 - define('FPDF_FONTPATH',dirname(__FILE__).'/font/'); - return defined('FPDF_FONTPATH') ? FPDF_FONTPATH : ''; + if(PHP_SAPI!=3D'cli') + { + if(headers_sent($file,$line)) + $this->Error("Some data has already been output, can't send PDF file = (output started at $file:$line)"); + } + if(ob_get_length()) + { + // The output buffer is not empty + if(preg_match('/^(\xEF\xBB\xBF)?\s*$/',ob_get_contents())) + { + // It contains only a UTF-8 BOM and/or whitespace, let's clean it + ob_clean(); + } + else + $this->Error("Some data has already been output, can't send PDF file"= ); + } } =20 -function _beginpage($orientation, $format) +function _getpagesize($size) { + if(is_string($size)) + { + $size =3D strtolower($size); + if(!isset($this->StdPageSizes[$size])) + $this->Error('Unknown page size: '.$size); + $a =3D $this->StdPageSizes[$size]; + return array($a[0]/$this->k, $a[1]/$this->k); + } + else + { + if($size[0]>$size[1]) + return array($size[1], $size[0]); + else + return $size; + } +} + +function _beginpage($orientation, $size) +{ $this->page++; - $this->pages[$this->page]=3D''; - $this->state=3D2; - $this->x=3D$this->lMargin; - $this->y=3D$this->tMargin; - $this->FontFamily=3D''; - //Check page size + $this->pages[$this->page] =3D ''; + $this->state =3D 2; + $this->x =3D $this->lMargin; + $this->y =3D $this->tMargin; + $this->FontFamily =3D ''; + // Check page size and orientation if($orientation=3D=3D'') - $orientation=3D$this->DefOrientation; + $orientation =3D $this->DefOrientation; else - $orientation=3Dstrtoupper($orientation[0]); - if($format=3D=3D'') - $format=3D$this->DefPageFormat; + $orientation =3D strtoupper($orientation[0]); + if($size=3D=3D'') + $size =3D $this->DefPageSize; else + $size =3D $this->_getpagesize($size); + if($orientation!=3D$this->CurOrientation || $size[0]!=3D$this->CurPageS= ize[0] || $size[1]!=3D$this->CurPageSize[1]) { - if(is_string($format)) - $format=3D$this->_getpageformat($format); - } - if($orientation!=3D$this->CurOrientation || $format[0]!=3D$this->CurPag= eFormat[0] || $format[1]!=3D$this->CurPageFormat[1]) - { - //New size + // New size or orientation if($orientation=3D=3D'P') { - $this->w=3D$format[0]; - $this->h=3D$format[1]; + $this->w =3D $size[0]; + $this->h =3D $size[1]; } else { - $this->w=3D$format[1]; - $this->h=3D$format[0]; + $this->w =3D $size[1]; + $this->h =3D $size[0]; } - $this->wPt=3D$this->w*$this->k; - $this->hPt=3D$this->h*$this->k; - $this->PageBreakTrigger=3D$this->h-$this->bMargin; - $this->CurOrientation=3D$orientation; - $this->CurPageFormat=3D$format; + $this->wPt =3D $this->w*$this->k; + $this->hPt =3D $this->h*$this->k; + $this->PageBreakTrigger =3D $this->h-$this->bMargin; + $this->CurOrientation =3D $orientation; + $this->CurPageSize =3D $size; } - if($orientation!=3D$this->DefOrientation || $format[0]!=3D$this->DefPag= eFormat[0] || $format[1]!=3D$this->DefPageFormat[1]) - $this->PageSizes[$this->page]=3Darray($this->wPt, $this->hPt); + if($orientation!=3D$this->DefOrientation || $size[0]!=3D$this->DefPageS= ize[0] || $size[1]!=3D$this->DefPageSize[1]) + $this->PageSizes[$this->page] =3D array($this->wPt, $this->hPt); } =20 function _endpage() { - $this->state=3D1; + $this->state =3D 1; } =20 +function _loadfont($font) +{ + // Load a font definition file from the font directory + include($this->fontpath.$font); + $a =3D get_defined_vars(); + if(!isset($a['name'])) + $this->Error('Could not include font definition file'); + return $a; +} + function _escape($s) { - //Escape special characters in strings - $s=3Dstr_replace('\\','\\\\',$s); - $s=3Dstr_replace('(','\\(',$s); - $s=3Dstr_replace(')','\\)',$s); - $s=3Dstr_replace("\r",'\\r',$s); + // Escape special characters in strings + $s =3D str_replace('\\','\\\\',$s); + $s =3D str_replace('(','\\(',$s); + $s =3D str_replace(')','\\)',$s); + $s =3D str_replace("\r",'\\r',$s); return $s; } =20 function _textstring($s) { - //Format a text string + // Format a text string return '('.$this->_escape($s).')'; } =20 function _UTF8toUTF16($s) { - //Convert UTF-8 to UTF-16BE with BOM - $res=3D"\xFE\xFF"; - $nb=3Dstrlen($s); - $i=3D0; + // Convert UTF-8 to UTF-16BE with BOM + $res =3D "\xFE\xFF"; + $nb =3D strlen($s); + $i =3D 0; while($i<$nb) { - $c1=3Dord($s[$i++]); + $c1 =3D ord($s[$i++]); if($c1>=3D224) { - //3-byte character - $c2=3Dord($s[$i++]); - $c3=3Dord($s[$i++]); - $res.=3Dchr((($c1 & 0x0F)<<4) + (($c2 & 0x3C)>>2)); - $res.=3Dchr((($c2 & 0x03)<<6) + ($c3 & 0x3F)); + // 3-byte character + $c2 =3D ord($s[$i++]); + $c3 =3D ord($s[$i++]); + $res .=3D chr((($c1 & 0x0F)<<4) + (($c2 & 0x3C)>>2)); + $res .=3D chr((($c2 & 0x03)<<6) + ($c3 & 0x3F)); } elseif($c1>=3D192) { - //2-byte character - $c2=3Dord($s[$i++]); - $res.=3Dchr(($c1 & 0x1C)>>2); - $res.=3Dchr((($c1 & 0x03)<<6) + ($c2 & 0x3F)); + // 2-byte character + $c2 =3D ord($s[$i++]); + $res .=3D chr(($c1 & 0x1C)>>2); + $res .=3D chr((($c1 & 0x03)<<6) + ($c2 & 0x3F)); } else { - //Single-byte character - $res.=3D"\0".chr($c1); + // Single-byte character + $res .=3D "\0".chr($c1); } } return $res; @@ -1357,64 +1411,67 @@ =20 function _dounderline($x, $y, $txt) { - //Underline text - $up=3D$this->CurrentFont['up']; - $ut=3D$this->CurrentFont['ut']; - $w=3D$this->GetStringWidth($txt)+$this->ws*substr_count($txt,' '); + // Underline text + $up =3D $this->CurrentFont['up']; + $ut =3D $this->CurrentFont['ut']; + $w =3D $this->GetStringWidth($txt)+$this->ws*substr_count($txt,' '); return sprintf('%.2F %.2F %.2F %.2F re f',$x*$this->k,($this->h-($y-$up= /1000*$this->FontSize))*$this->k,$w*$this->k,-$ut/1000*$this->FontSizePt)= ; } =20 function _parsejpg($file) { - //Extract info from a JPEG file - $a=3DGetImageSize($file); + // Extract info from a JPEG file + $a =3D getimagesize($file); if(!$a) $this->Error('Missing or incorrect image file: '.$file); if($a[2]!=3D2) $this->Error('Not a JPEG file: '.$file); if(!isset($a['channels']) || $a['channels']=3D=3D3) - $colspace=3D'DeviceRGB'; + $colspace =3D 'DeviceRGB'; elseif($a['channels']=3D=3D4) - $colspace=3D'DeviceCMYK'; + $colspace =3D 'DeviceCMYK'; else - $colspace=3D'DeviceGray'; - $bpc=3Disset($a['bits']) ? $a['bits'] : 8; - //Read whole file - $f=3Dfopen($file,'rb'); - $data=3D''; - while(!feof($f)) - $data.=3Dfread($f,8192); - fclose($f); + $colspace =3D 'DeviceGray'; + $bpc =3D isset($a['bits']) ? $a['bits'] : 8; + $data =3D file_get_contents($file); return array('w'=3D>$a[0], 'h'=3D>$a[1], 'cs'=3D>$colspace, 'bpc'=3D>$b= pc, 'f'=3D>'DCTDecode', 'data'=3D>$data); } =20 function _parsepng($file) { - //Extract info from a PNG file - $f=3Dfopen($file,'rb'); + // Extract info from a PNG file + $f =3D fopen($file,'rb'); if(!$f) $this->Error('Can\'t open image file: '.$file); - //Check signature + $info =3D $this->_parsepngstream($f,$file); + fclose($f); + return $info; +} + +function _parsepngstream($f, $file) +{ + // Check signature if($this->_readstream($f,8)!=3Dchr(137).'PNG'.chr(13).chr(10).chr(26).c= hr(10)) $this->Error('Not a PNG file: '.$file); - //Read header chunk + + // Read header chunk $this->_readstream($f,4); if($this->_readstream($f,4)!=3D'IHDR') $this->Error('Incorrect PNG file: '.$file); - $w=3D$this->_readint($f); - $h=3D$this->_readint($f); - $bpc=3Dord($this->_readstream($f,1)); + $w =3D $this->_readint($f); + $h =3D $this->_readint($f); + $bpc =3D ord($this->_readstream($f,1)); if($bpc>8) $this->Error('16-bit depth not supported: '.$file); - $ct=3Dord($this->_readstream($f,1)); - if($ct=3D=3D0) - $colspace=3D'DeviceGray'; - elseif($ct=3D=3D2) - $colspace=3D'DeviceRGB'; + $ct =3D ord($this->_readstream($f,1)); + if($ct=3D=3D0 || $ct=3D=3D4) + $colspace =3D 'DeviceGray'; + elseif($ct=3D=3D2 || $ct=3D=3D6) + $colspace =3D 'DeviceRGB'; elseif($ct=3D=3D3) - $colspace=3D'Indexed'; + $colspace =3D 'Indexed'; else - $this->Error('Alpha channel not supported: '.$file); + $this->Error('Unknown color type: '.$file); if(ord($this->_readstream($f,1))!=3D0) $this->Error('Unknown compression method: '.$file); if(ord($this->_readstream($f,1))!=3D0) @@ -1422,41 +1479,42 @@ if(ord($this->_readstream($f,1))!=3D0) $this->Error('Interlacing not supported: '.$file); $this->_readstream($f,4); - $parms=3D'/DecodeParms <>'; - //Scan chunks looking for palette, transparency and image data - $pal=3D''; - $trns=3D''; - $data=3D''; + $dp =3D '/Predictor 15 /Colors '.($colspace=3D=3D'DeviceRGB' ? 3 : 1).'= /BitsPerComponent '.$bpc.' /Columns '.$w; + + // Scan chunks looking for palette, transparency and image data + $pal =3D ''; + $trns =3D ''; + $data =3D ''; do { - $n=3D$this->_readint($f); - $type=3D$this->_readstream($f,4); + $n =3D $this->_readint($f); + $type =3D $this->_readstream($f,4); if($type=3D=3D'PLTE') { - //Read palette - $pal=3D$this->_readstream($f,$n); + // Read palette + $pal =3D $this->_readstream($f,$n); $this->_readstream($f,4); } elseif($type=3D=3D'tRNS') { - //Read transparency info - $t=3D$this->_readstream($f,$n); + // Read transparency info + $t =3D $this->_readstream($f,$n); if($ct=3D=3D0) - $trns=3Darray(ord(substr($t,1,1))); + $trns =3D array(ord(substr($t,1,1))); elseif($ct=3D=3D2) - $trns=3Darray(ord(substr($t,1,1)), ord(substr($t,3,1)), ord(substr($= t,5,1))); + $trns =3D array(ord(substr($t,1,1)), ord(substr($t,3,1)), ord(substr= ($t,5,1))); else { - $pos=3Dstrpos($t,chr(0)); + $pos =3D strpos($t,chr(0)); if($pos!=3D=3Dfalse) - $trns=3Darray($pos); + $trns =3D array($pos); } $this->_readstream($f,4); } elseif($type=3D=3D'IDAT') { - //Read image data block - $data.=3D$this->_readstream($f,$n); + // Read image data block + $data .=3D $this->_readstream($f,$n); $this->_readstream($f,4); } elseif($type=3D=3D'IEND') @@ -1465,23 +1523,67 @@ $this->_readstream($f,$n+4); } while($n); + if($colspace=3D=3D'Indexed' && empty($pal)) $this->Error('Missing palette in '.$file); - fclose($f); - return array('w'=3D>$w, 'h'=3D>$h, 'cs'=3D>$colspace, 'bpc'=3D>$bpc, 'f= '=3D>'FlateDecode', 'parms'=3D>$parms, 'pal'=3D>$pal, 'trns'=3D>$trns, 'd= ata'=3D>$data); + $info =3D array('w'=3D>$w, 'h'=3D>$h, 'cs'=3D>$colspace, 'bpc'=3D>$bpc,= 'f'=3D>'FlateDecode', 'dp'=3D>$dp, 'pal'=3D>$pal, 'trns'=3D>$trns); + if($ct>=3D4) + { + // Extract alpha channel + if(!function_exists('gzuncompress')) + $this->Error('Zlib not available, can\'t handle alpha channel: '.$fil= e); + $data =3D gzuncompress($data); + $color =3D ''; + $alpha =3D ''; + if($ct=3D=3D4) + { + // Gray image + $len =3D 2*$w; + for($i=3D0;$i<$h;$i++) + { + $pos =3D (1+$len)*$i; + $color .=3D $data[$pos]; + $alpha .=3D $data[$pos]; + $line =3D substr($data,$pos+1,$len); + $color .=3D preg_replace('/(.)./s','$1',$line); + $alpha .=3D preg_replace('/.(.)/s','$1',$line); + } + } + else + { + // RGB image + $len =3D 4*$w; + for($i=3D0;$i<$h;$i++) + { + $pos =3D (1+$len)*$i; + $color .=3D $data[$pos]; + $alpha .=3D $data[$pos]; + $line =3D substr($data,$pos+1,$len); + $color .=3D preg_replace('/(.{3})./s','$1',$line); + $alpha .=3D preg_replace('/.{3}(.)/s','$1',$line); + } + } + unset($data); + $data =3D gzcompress($color); + $info['smask'] =3D gzcompress($alpha); + if($this->PDFVersion<'1.4') + $this->PDFVersion =3D '1.4'; + } + $info['data'] =3D $data; + return $info; } =20 function _readstream($f, $n) { - //Read n bytes from stream - $res=3D''; + // Read n bytes from stream + $res =3D ''; while($n>0 && !feof($f)) { - $s=3Dfread($f,$n); + $s =3D fread($f,$n); if($s=3D=3D=3Dfalse) $this->Error('Error while reading stream'); - $n-=3Dstrlen($s); - $res.=3D$s; + $n -=3D strlen($s); + $res .=3D $s; } if($n>0) $this->Error('Unexpected end of stream'); @@ -1490,38 +1592,55 @@ =20 function _readint($f) { - //Read a 4-byte integer from stream - $a=3Dunpack('Ni',$this->_readstream($f,4)); + // Read a 4-byte integer from stream + $a =3D unpack('Ni',$this->_readstream($f,4)); return $a['i']; } =20 function _parsegif($file) { - //Extract info from a GIF file (via PNG conversion) + // Extract info from a GIF file (via PNG conversion) if(!function_exists('imagepng')) $this->Error('GD extension is required for GIF support'); if(!function_exists('imagecreatefromgif')) $this->Error('GD has no GIF read support'); - $im=3Dimagecreatefromgif($file); + $im =3D imagecreatefromgif($file); if(!$im) $this->Error('Missing or incorrect image file: '.$file); imageinterlace($im,0); - $tmp=3Dtempnam('.','gif'); - if(!$tmp) - $this->Error('Unable to create a temporary file'); - if(!imagepng($im,$tmp)) - $this->Error('Error while saving to temporary file'); - imagedestroy($im); - $info=3D$this->_parsepng($tmp); - unlink($tmp); + $f =3D @fopen('php://temp','rb+'); + if($f) + { + // Perform conversion in memory + ob_start(); + imagepng($im); + $data =3D ob_get_clean(); + imagedestroy($im); + fwrite($f,$data); + rewind($f); + $info =3D $this->_parsepngstream($f,$file); + fclose($f); + } + else + { + // Use temporary file + $tmp =3D tempnam('.','gif'); + if(!$tmp) + $this->Error('Unable to create a temporary file'); + if(!imagepng($im,$tmp)) + $this->Error('Error while saving to temporary file'); + imagedestroy($im); + $info =3D $this->_parsepng($tmp); + unlink($tmp); + } return $info; } =20 function _newobj() { - //Begin a new object + // Begin a new object $this->n++; - $this->offsets[$this->n]=3Dstrlen($this->buffer); + $this->offsets[$this->n] =3D strlen($this->buffer); $this->_out($this->n.' 0 obj'); } =20 @@ -1534,46 +1653,41 @@ =20 function _out($s) { - //Add a line to the document + // Add a line to the document if($this->state=3D=3D2) - $this->pages[$this->page].=3D$s."\n"; + $this->pages[$this->page] .=3D $s."\n"; else - $this->buffer.=3D$s."\n"; + $this->buffer .=3D $s."\n"; } =20 function _putpages() { - $nb=3D$this->page; + $nb =3D $this->page; if(!empty($this->AliasNbPages)) { - //Replace number of pages in fonts using subsets - $r =3D ''; - $nstr =3D "$nb"; - for($i=3D0;$iUTF8ToUTF16BE($this->AliasNbPages, false); + $r =3D $this->UTF8ToUTF16BE("$nb", false); for($n=3D1;$n<=3D$nb;$n++) - $this->pages[$n]=3Dstr_replace('`'.$this->AliasNbPages.'`',$r,$this->= pages[$n]); + $this->pages[$n] =3D str_replace($alias,$r,$this->pages[$n]); // Now repeat for no pages in non-subset fonts - $r =3D $nb; - //Replace number of pages for($n=3D1;$n<=3D$nb;$n++) - $this->pages[$n]=3Dstr_replace($this->AliasNbPages,$r,$this->pages[$n= ]); + $this->pages[$n] =3D str_replace($this->AliasNbPages,$nb,$this->pages= [$n]); } if($this->DefOrientation=3D=3D'P') { - $wPt=3D$this->DefPageFormat[0]*$this->k; - $hPt=3D$this->DefPageFormat[1]*$this->k; + $wPt =3D $this->DefPageSize[0]*$this->k; + $hPt =3D $this->DefPageSize[1]*$this->k; } else { - $wPt=3D$this->DefPageFormat[1]*$this->k; - $hPt=3D$this->DefPageFormat[0]*$this->k; + $wPt =3D $this->DefPageSize[1]*$this->k; + $hPt =3D $this->DefPageSize[0]*$this->k; } - $filter=3D($this->compress) ? '/Filter /FlateDecode ' : ''; + $filter =3D ($this->compress) ? '/Filter /FlateDecode ' : ''; for($n=3D1;$n<=3D$nb;$n++) { - //Page + // Page $this->_newobj(); $this->_out('<_out('/Parent 1 0 R'); @@ -1582,39 +1696,41 @@ $this->_out('/Resources 2 0 R'); if(isset($this->PageLinks[$n])) { - //Links - $annots=3D'/Annots ['; + // Links + $annots =3D '/Annots ['; foreach($this->PageLinks[$n] as $pl) { - $rect=3Dsprintf('%.2F %.2F %.2F %.2F',$pl[0],$pl[1],$pl[0]+$pl[2],$p= l[1]-$pl[3]); - $annots.=3D'<_textstring($pl[4]).'>>>>'; + $annots .=3D '/A <_textstring($pl[4]).'>>>>'= ; else { - $l=3D$this->links[$pl[4]]; - $h=3Disset($this->PageSizes[$l[0]]) ? $this->PageSizes[$l[0]][1] : = $hPt; - $annots.=3Dsprintf('/Dest [%d 0 R /XYZ 0 %.2F null]>>',1+2*$l[0],$h= -$l[1]*$this->k); + $l =3D $this->links[$pl[4]]; + $h =3D isset($this->PageSizes[$l[0]]) ? $this->PageSizes[$l[0]][1] = : $hPt; + $annots .=3D sprintf('/Dest [%d 0 R /XYZ 0 %.2F null]>>',1+2*$l[0],= $h-$l[1]*$this->k); } } $this->_out($annots.']'); } + if($this->PDFVersion>'1.3') + $this->_out('/Group <>'= ); $this->_out('/Contents '.($this->n+1).' 0 R>>'); $this->_out('endobj'); - //Page content - $p=3D($this->compress) ? gzcompress($this->pages[$n]) : $this->pages[$= n]; + // Page content + $p =3D ($this->compress) ? gzcompress($this->pages[$n]) : $this->pages= [$n]; $this->_newobj(); $this->_out('<<'.$filter.'/Length '.strlen($p).'>>'); $this->_putstream($p); $this->_out('endobj'); } - //Pages root - $this->offsets[1]=3Dstrlen($this->buffer); + // Pages root + $this->offsets[1] =3D strlen($this->buffer); $this->_out('1 0 obj'); $this->_out('<_out($kids.']'); $this->_out('/Count '.$nb); $this->_out(sprintf('/MediaBox [0 0 %.2F %.2F]',$wPt,$hPt)); @@ -1627,15 +1743,15 @@ $nf=3D$this->n; foreach($this->diffs as $diff) { - //Encodings + // Encodings $this->_newobj(); $this->_out('<>'); $this->_out('endobj'); } foreach($this->FontFiles as $file=3D>$info) { - if (!isset($info['type']) || $info['type']!=3D'TrueTypesubset') { - //Font file embedding + if (!isset($info['type']) || $info['type']!=3D'TTF') { + // Font file embedding $this->_newobj(); $this->FontFiles[$file]['n']=3D$this->n; $font=3D''; @@ -1651,12 +1767,12 @@ $header=3D(ord($font[0])=3D=3D128); if($header) { - //Strip first binary header + // Strip first binary header $font=3Dsubstr($font,6); } if($header && ord($font[$info['length1']])=3D=3D128) { - //Strip second binary header + // Strip second binary header $font=3Dsubstr($font,0,$info['length1']).substr($font,$info['length1= ']+6); } } @@ -1673,13 +1789,13 @@ } foreach($this->fonts as $k=3D>$font) { - //Font objects + // Font objects //$this->fonts[$k]['n']=3D$this->n+1; - $type=3D$font['type']; - $name=3D$font['name']; - if($type=3D=3D'core') + $type =3D $font['type']; + $name =3D $font['name']; + if($type=3D=3D'Core') { - //Standard font + // Standard font $this->fonts[$k]['n']=3D$this->n+1; $this->_newobj(); $this->_out('<fonts[$k]['n']=3D$this->n+1; $this->_newobj(); $this->_out('<_out('>>'); $this->_out('endobj'); - //Widths + // Widths $this->_newobj(); $cw=3D&$font['cw']; $s=3D'['; @@ -1718,7 +1834,7 @@ $s.=3D$cw[chr($i)].' '; $this->_out($s.']'); $this->_out('endobj'); - //Descriptor + // Descriptor $this->_newobj(); $s=3D'<$v) @@ -1729,65 +1845,53 @@ $this->_out($s.'>>'); $this->_out('endobj'); } - // TrueType embedded SUBSETS - else if ($type=3D=3D'TrueTypesubset') { - $ssfaid=3D"A"; - include_once($this->_getfontpath().'unifont/ttfonts.php'); - $ttf =3D new TTFontFile(); - $ttf->getMetrics($font['file'], 1); - for($sfid=3D0;$sfidfonts[$k]['n'][$sfid]=3D$this->n+1; // NB an array for subset - $subsetname =3D 'MPDFA'.$ssfaid.'+'.$font['name']; - $ssfaid++; - $subset =3D $font['subsets'][$sfid]; + // TrueType embedded SUBSETS or FULL + else if ($type=3D=3D'TTF') { + $this->fonts[$k]['n']=3D$this->n+1; + require_once($this->_getfontpath().'unifont/ttfonts.php'); + $ttf =3D new TTFontFile(); + $fontname =3D 'MPDFAA'.'+'.$font['name']; + $subset =3D $font['subset']; unset($subset[0]); - $ttfontstream =3D $ttf->makeSubset($subset); + $ttfontstream =3D $ttf->makeSubset($font['ttffile'], $subset); $ttfontsize =3D strlen($ttfontstream); $fontstream =3D gzcompress($ttfontstream); - $widthstring =3D ''; - $toUnistring =3D ''; - foreach($font['subsets'][$sfid] AS $cp=3D>$u) { - if (isset($font['cw'][$u])) { - $widthstring .=3D $font['cw'][$u].' '; - } - else { - $widthstring .=3D $ttf->defaultWidth.' '; - } - $toUnistring .=3D sprintf("<%02s> <%04s>\n", strtoupper(dechex($cp))= , strtoupper(dechex($u))); - } + $codeToGlyph =3D $ttf->codeToGlyph; + unset($codeToGlyph[0]); =20 - //Additional Type1 or TrueType font + // Type0 Font + // A composite font - a font composed of other fonts, organized hiera= rchically $this->_newobj(); $this->_out('<_out('/BaseFont /'.$subsetname); - $this->_out('/Subtype /TrueType'); - $this->_out('/FirstChar 0 /LastChar '.(count($font['subsets'][$sfid])= )); - $this->_out('/Widths '.($this->n+1).' 0 R'); - $this->_out('/FontDescriptor '.($this->n+2).' 0 R'); - $this->_out('/ToUnicode '.($this->n + 3).' 0 R'); + $this->_out('/Subtype /Type0'); + $this->_out('/BaseFont /'.$fontname.''); + $this->_out('/Encoding /Identity-H');=20 + $this->_out('/DescendantFonts ['.($this->n + 1).' 0 R]'); + $this->_out('/ToUnicode '.($this->n + 2).' 0 R'); $this->_out('>>'); $this->_out('endobj'); =20 - //Widths + // CIDFontType2 + // A CIDFont whose glyph descriptions are based on TrueType font tech= nology $this->_newobj(); - $this->_out('['.$widthstring.']'); - $this->_out('endobj'); - - //Descriptor - $this->_newobj(); - $s=3D'<$v) { - if ($kd =3D=3D 'Flags') { $v =3D $v | 4; $v =3D $v & ~32; } - $s.=3D' /'.$kd.' '.$v."\n"; + $this->_out('<_out('/Subtype /CIDFontType2'); + $this->_out('/BaseFont /'.$fontname.''); + $this->_out('/CIDSystemInfo '.($this->n + 2).' 0 R');=20 + $this->_out('/FontDescriptor '.($this->n + 3).' 0 R'); + if (isset($font['desc']['MissingWidth'])){ + $this->_out('/DW '.$font['desc']['MissingWidth'].'');=20 } =20 - $s.=3D'/FontFile2 '.($this->n + 2).' 0 R'; - $this->_out($s.'>>'); + $this->_putTTfontwidths($font, $ttf->maxUni); + + $this->_out('/CIDToGIDMap '.($this->n + 4).' 0 R'); + $this->_out('>>'); $this->_out('endobj'); =20 // ToUnicode - $toUni =3D "stream\n"; - $toUni .=3D "/CIDInit /ProcSet findresource begin\n"; + $this->_newobj(); + $toUni =3D "/CIDInit /ProcSet findresource begin\n"; $toUni .=3D "12 dict begin\n"; $toUni .=3D "begincmap\n"; $toUni .=3D "/CIDSystemInfo\n"; @@ -1798,21 +1902,55 @@ $toUni .=3D "/CMapName /Adobe-Identity-UCS def\n"; $toUni .=3D "/CMapType 2 def\n"; $toUni .=3D "1 begincodespacerange\n"; - $toUni .=3D "<00> \n"; + $toUni .=3D "<0000> \n"; $toUni .=3D "endcodespacerange\n"; - $toUni .=3D count($font['subsets'][$sfid])." beginbfchar\n"; - $toUni .=3D $toUnistring; - $toUni .=3D "endbfchar\n"; + $toUni .=3D "1 beginbfrange\n"; + $toUni .=3D "<0000> <0000>\n"; + $toUni .=3D "endbfrange\n"; $toUni .=3D "endcmap\n"; $toUni .=3D "CMapName currentdict /CMap defineresource pop\n"; $toUni .=3D "end\n"; - $toUni .=3D "end\n"; - $toUni .=3D "endstream\n"; - $toUni .=3D "endobj"; + $toUni .=3D "end"; + $this->_out('<>'); + $this->_putstream($toUni); + $this->_out('endobj'); + + // CIDSystemInfo dictionary $this->_newobj(); - $this->_out('<>'); - $this->_out($toUni); + $this->_out('<_out('/Ordering (UCS)'); + $this->_out('/Supplement 0'); + $this->_out('>>'); + $this->_out('endobj'); =20 + // Font descriptor + $this->_newobj(); + $this->_out('<_out('/FontName /'.$fontname); + foreach($font['desc'] as $kd=3D>$v) { + if ($kd =3D=3D 'Flags') { $v =3D $v | 4; $v =3D $v & ~32; } // SYMBO= LIC font flag + $this->_out(' /'.$kd.' '.$v); + } + $this->_out('/FontFile2 '.($this->n + 2).' 0 R'); + $this->_out('>>'); + $this->_out('endobj'); + + // Embed CIDToGIDMap + // A specification of the mapping from CIDs to glyph indices + $cidtogidmap =3D ''; + $cidtogidmap =3D str_pad('', 256*256*2, "\x00"); + foreach($codeToGlyph as $cc=3D>$glyph) { + $cidtogidmap[$cc*2] =3D chr($glyph >> 8); + $cidtogidmap[$cc*2 + 1] =3D chr($glyph & 0xFF); + } + $cidtogidmap =3D gzcompress($cidtogidmap); + $this->_newobj(); + $this->_out('<_out('/Filter /FlateDecode'); + $this->_out('>>'); + $this->_putstream($cidtogidmap); + $this->_out('endobj'); + //Font file=20 $this->_newobj(); $this->_out('<_out('>>'); $this->_putstream($fontstream); $this->_out('endobj'); - } - unset($ttf); + unset($ttf); }=20 else { - //Allow for additional types - $this->fonts[$k]['n']=3D$this->n+1; + // Allow for additional types + $this->fonts[$k]['n'] =3D $this->n+1; $mtd=3D'_put'.strtolower($type); if(!method_exists($this,$mtd)) $this->Error('Unsupported font type: '.$type); @@ -1836,51 +1973,165 @@ } } =20 +function _putTTfontwidths(&$font, $maxUni) { + if (file_exists($font['unifilename'].'.cw127.php')) { + include($font['unifilename'].'.cw127.php') ; + $startcid =3D 128; + } + else { + $rangeid =3D 0; + $range =3D array(); + $prevcid =3D -2; + $prevwidth =3D -1; + $interval =3D false; + $startcid =3D 1; + } + $cwlen =3D $maxUni + 1;=20 + + // for each character + for ($cid=3D$startcid; $cid<$cwlen; $cid++) { + if ($cid=3D=3D128 && (!file_exists($font['unifilename'].'.cw127.php'))= ) { + if (is_writable(dirname($this->_getfontpath().'unifont/x'))) { + $fh =3D fopen($font['unifilename'].'.cw127.php',"wb"); + $cw127=3D'"; + fwrite($fh,$cw127,strlen($cw127)); + fclose($fh); + } + } + if ($font['cw'][$cid*2] =3D=3D "\00" && $font['cw'][$cid*2+1] =3D=3D "= \00") { continue; } + $width =3D (ord($font['cw'][$cid*2]) << 8) + ord($font['cw'][$cid*2+1]= ); + if ($width =3D=3D 65535) { $width =3D 0; } + if ($cid > 255 && (!isset($font['subset'][$cid]) || !$font['subset'][$= cid])) { continue; } + if (!isset($font['dw']) || (isset($font['dw']) && $width !=3D $font['d= w'])) { + if ($cid =3D=3D ($prevcid + 1)) { + if ($width =3D=3D $prevwidth) { + if ($width =3D=3D $range[$rangeid][0]) { + $range[$rangeid][] =3D $width; + } + else { + array_pop($range[$rangeid]); + // new range + $rangeid =3D $prevcid; + $range[$rangeid] =3D array(); + $range[$rangeid][] =3D $prevwidth; + $range[$rangeid][] =3D $width; + } + $interval =3D true; + $range[$rangeid]['interval'] =3D true; + } else { + if ($interval) { + // new range + $rangeid =3D $cid; + $range[$rangeid] =3D array(); + $range[$rangeid][] =3D $width; + } + else { $range[$rangeid][] =3D $width; } + $interval =3D false; + } + } else { + $rangeid =3D $cid; + $range[$rangeid] =3D array(); + $range[$rangeid][] =3D $width; + $interval =3D false; + } + $prevcid =3D $cid; + $prevwidth =3D $width; + } + } + $prevk =3D -1; + $nextk =3D -1; + $prevint =3D false; + foreach ($range as $k =3D> $ws) { + $cws =3D count($ws); + if (($k =3D=3D $nextk) AND (!$prevint) AND ((!isset($ws['interval'])) = OR ($cws < 4))) { + if (isset($range[$k]['interval'])) { unset($range[$k]['interval']); } + $range[$prevk] =3D array_merge($range[$prevk], $range[$k]); + unset($range[$k]); + } + else { $prevk =3D $k; } + $nextk =3D $k + $cws; + if (isset($ws['interval'])) { + if ($cws > 3) { $prevint =3D true; } + else { $prevint =3D false; } + unset($range[$k]['interval']); + --$nextk; + } + else { $prevint =3D false; } + } + $w =3D ''; + foreach ($range as $k =3D> $ws) { + if (count(array_count_values($ws)) =3D=3D 1) { $w .=3D ' '.$k.' '.($k = + count($ws) - 1).' '.$ws[0]; } + else { $w .=3D ' '.$k.' [ '.implode(' ', $ws).' ]' . "\n"; } + } + $this->_out('/W ['.$w.' ]'); +} + function _putimages() { - $filter=3D($this->compress) ? '/Filter /FlateDecode ' : ''; - reset($this->images); - while(list($file,$info)=3Deach($this->images)) + foreach(array_keys($this->images) as $file) { + $this->_putimage($this->images[$file]); + unset($this->images[$file]['data']); + unset($this->images[$file]['smask']); + } +} + +function _putimage(&$info) +{ + $this->_newobj(); + $info['n'] =3D $this->n; + $this->_out('<_out('/Subtype /Image'); + $this->_out('/Width '.$info['w']); + $this->_out('/Height '.$info['h']); + if($info['cs']=3D=3D'Indexed') + $this->_out('/ColorSpace [/Indexed /DeviceRGB '.(strlen($info['pal'])/= 3-1).' '.($this->n+1).' 0 R]'); + else + { + $this->_out('/ColorSpace /'.$info['cs']); + if($info['cs']=3D=3D'DeviceCMYK') + $this->_out('/Decode [1 0 1 0 1 0 1 0]'); + } + $this->_out('/BitsPerComponent '.$info['bpc']); + if(isset($info['f'])) + $this->_out('/Filter /'.$info['f']); + if(isset($info['dp'])) + $this->_out('/DecodeParms <<'.$info['dp'].'>>'); + if(isset($info['trns']) && is_array($info['trns'])) + { + $trns =3D ''; + for($i=3D0;$i_out('/Mask ['.$trns.']'); + } + if(isset($info['smask'])) + $this->_out('/SMask '.($this->n+1).' 0 R'); + $this->_out('/Length '.strlen($info['data']).'>>'); + $this->_putstream($info['data']); + $this->_out('endobj'); + // Soft mask + if(isset($info['smask'])) + { + $dp =3D '/Predictor 15 /Colors 1 /BitsPerComponent 8 /Columns '.$info[= 'w']; + $smask =3D array('w'=3D>$info['w'], 'h'=3D>$info['h'], 'cs'=3D>'Device= Gray', 'bpc'=3D>8, 'f'=3D>$info['f'], 'dp'=3D>$dp, 'data'=3D>$info['smask= ']); + $this->_putimage($smask); + } + // Palette + if($info['cs']=3D=3D'Indexed') + { + $filter =3D ($this->compress) ? '/Filter /FlateDecode ' : ''; + $pal =3D ($this->compress) ? gzcompress($info['pal']) : $info['pal']; $this->_newobj(); - $this->images[$file]['n']=3D$this->n; - $this->_out('<_out('/Subtype /Image'); - $this->_out('/Width '.$info['w']); - $this->_out('/Height '.$info['h']); - if($info['cs']=3D=3D'Indexed') - $this->_out('/ColorSpace [/Indexed /DeviceRGB '.(strlen($info['pal'])= /3-1).' '.($this->n+1).' 0 R]'); - else - { - $this->_out('/ColorSpace /'.$info['cs']); - if($info['cs']=3D=3D'DeviceCMYK') - $this->_out('/Decode [1 0 1 0 1 0 1 0]'); - } - $this->_out('/BitsPerComponent '.$info['bpc']); - if(isset($info['f'])) - $this->_out('/Filter /'.$info['f']); - if(isset($info['parms'])) - $this->_out($info['parms']); - if(isset($info['trns']) && is_array($info['trns'])) - { - $trns=3D''; - for($i=3D0;$i_out('/Mask ['.$trns.']'); - } - $this->_out('/Length '.strlen($info['data']).'>>'); - $this->_putstream($info['data']); - unset($this->images[$file]['data']); + $this->_out('<<'.$filter.'/Length '.strlen($pal).'>>'); + $this->_putstream($pal); $this->_out('endobj'); - //Palette - if($info['cs']=3D=3D'Indexed') - { - $this->_newobj(); - $pal=3D($this->compress) ? gzcompress($info['pal']) : $info['pal']; - $this->_out('<<'.$filter.'/Length '.strlen($pal).'>>'); - $this->_putstream($pal); - $this->_out('endobj'); - } } } =20 @@ -1895,14 +2146,7 @@ $this->_out('/ProcSet [/PDF /Text /ImageB /ImageC /ImageI]'); $this->_out('/Font <<'); foreach($this->fonts as $font) { - if ($font['type']=3D=3D'TrueTypesubset') { - foreach($font['n'] AS $k =3D> $fid) { - $this->_out('/F'.$font['subsetfontids'][$k].' '.$font['n'][$k].' 0 R= '); - } - } - else {=20 - $this->_out('/F'.$font['i'].' '.$font['n'].' 0 R'); - } + $this->_out('/F'.$font['i'].' '.$font['n'].' 0 R'); } $this->_out('>>'); $this->_out('/XObject <<'); @@ -1914,8 +2158,8 @@ { $this->_putfonts(); $this->_putimages(); - //Resource dictionary - $this->offsets[2]=3Dstrlen($this->buffer); + // Resource dictionary + $this->offsets[2] =3D strlen($this->buffer); $this->_out('2 0 obj'); $this->_out('<<'); $this->_putresourcedict(); @@ -1950,7 +2194,7 @@ elseif($this->ZoomMode=3D=3D'real') $this->_out('/OpenAction [3 0 R /XYZ null null 1]'); elseif(!is_string($this->ZoomMode)) - $this->_out('/OpenAction [3 0 R /XYZ null null '.($this->ZoomMode/100)= .']'); + $this->_out('/OpenAction [3 0 R /XYZ null null '.sprintf('%.2F',$this-= >ZoomMode/100).']'); if($this->LayoutMode=3D=3D'single') $this->_out('/PageLayout /SinglePage'); elseif($this->LayoutMode=3D=3D'continuous') @@ -1976,26 +2220,26 @@ $this->_putheader(); $this->_putpages(); $this->_putresources(); - //Info + // Info $this->_newobj(); $this->_out('<<'); $this->_putinfo(); $this->_out('>>'); $this->_out('endobj'); - //Catalog + // Catalog $this->_newobj(); $this->_out('<<'); $this->_putcatalog(); $this->_out('>>'); $this->_out('endobj'); - //Cross-ref - $o=3Dstrlen($this->buffer); + // Cross-ref + $o =3D strlen($this->buffer); $this->_out('xref'); $this->_out('0 '.($this->n+1)); $this->_out('0000000000 65535 f '); for($i=3D1;$i<=3D$this->n;$i++) $this->_out(sprintf('%010d 00000 n ',$this->offsets[$i])); - //Trailer + // Trailer $this->_out('trailer'); $this->_out('<<'); $this->_puttrailer(); @@ -2003,62 +2247,18 @@ $this->_out('startxref'); $this->_out($o); $this->_out('%%EOF'); - $this->state=3D3; + $this->state =3D 3; } =20 // ********* NEW FUNCTIONS ********* - -// Convert utf-8 string to for Font Subsets -function UTF8toSubset($str) { - $ret =3D '<'; - if ($this->AliasNbPages)=20 - $str =3D preg_replace('/'.preg_quote($this->AliasNbPages,'/').'/', chr= (7), $str ); - $unicode =3D $this->UTF8StringToArray($str); - $orig_fid =3D $this->CurrentFont['subsetfontids'][0]; - $last_fid =3D $this->CurrentFont['subsetfontids'][0]; - foreach($unicode as $c) { - if ($c =3D=3D 7) {=20 - if ($orig_fid !=3D $last_fid) { - $ret .=3D '> Tj /F'.$orig_fid.' '.$this->FontSizePt.' Tf <'; - $last_fid =3D $orig_fid; - } - $ret .=3D '`'.$this->AliasNbPages.'`'; - continue; - } - for ($i=3D0; $i<99; $i++) { - // return c as decimal char - $init =3D array_search($c, $this->CurrentFont['subsets'][$i]); - if ($init!=3D=3Dfalse) { - if ($this->CurrentFont['subsetfontids'][$i] !=3D $last_fid) { - $ret .=3D '> Tj /F'.$this->CurrentFont['subsetfontids'][$i].' '.$thi= s->FontSizePt.' Tf <'; - $last_fid =3D $this->CurrentFont['subsetfontids'][$i]; - } - $ret .=3D sprintf("%02s", strtoupper(dechex($init))); - break; - } - else if (count($this->CurrentFont['subsets'][$i]) < 255) { - $n =3D count($this->CurrentFont['subsets'][$i]); - $this->CurrentFont['subsets'][$i][$n] =3D $c; - if ($this->CurrentFont['subsetfontids'][$i] !=3D $last_fid) { - $ret .=3D '> Tj /F'.$this->CurrentFont['subsetfontids'][$i].' '.$thi= s->FontSizePt.' Tf <'; - $last_fid =3D $this->CurrentFont['subsetfontids'][$i]; - } - $ret .=3D sprintf("%02s", strtoupper(dechex($n))); - break; - } - else if (!isset($this->CurrentFont['subsets'][($i+1)])) { - $this->CurrentFont['subsets'][($i+1)] =3D array(0=3D>0); - $new_fid =3D count($this->fonts)+$this->extraFontSubsets+1; - $this->CurrentFont['subsetfontids'][($i+1)] =3D $new_fid; - $this->extraFontSubsets++; - } - } +// Converts UTF-8 strings to UTF16-BE. +function UTF8ToUTF16BE($str, $setbom=3Dtrue) { + $outstr =3D ""; + if ($setbom) { + $outstr .=3D "\xFE\xFF"; // Byte Order Mark (BOM) } - $ret .=3D '>'; - if ($last_fid !=3D $orig_fid) { - $ret .=3D ' Tj /F'.$orig_fid.' '.$this->FontSizePt.' Tf <> '; - } - return $ret; + $outstr .=3D mb_convert_encoding($str, 'UTF-16BE', 'UTF-8'); + return $outstr; } =20 // Converts UTF-8 strings to codepoints array @@ -2066,33 +2266,37 @@ $out =3D array(); $len =3D strlen($str); for ($i =3D 0; $i < $len; $i++) { + $uni =3D -1; $h =3D ord($str[$i]); if ( $h <=3D 0x7F ) - $out[] =3D $h; + $uni =3D $h; elseif ( $h >=3D 0xC2 ) { if ( ($h <=3D 0xDF) && ($i < $len -1) ) - $out[] =3D ($h & 0x1F) << 6 | (ord($str{++$i}) & 0x3F); + $uni =3D ($h & 0x1F) << 6 | (ord($str[++$i]) & 0x3F); elseif ( ($h <=3D 0xEF) && ($i < $len -2) ) - $out[] =3D ($h & 0x0F) << 12 | (ord($str{++$i}) & 0x3F) << 6 - | (ord($str{++$i}) & 0x3F); + $uni =3D ($h & 0x0F) << 12 | (ord($str[++$i]) & 0x3F) << 6 + | (ord($str[++$i]) & 0x3F); elseif ( ($h <=3D 0xF4) && ($i < $len -3) ) - $out[] =3D ($h & 0x0F) << 18 | (ord($str{++$i}) & 0x3F) << 1= 2 - | (ord($str{++$i}) & 0x3F) << 6 - | (ord($str{++$i}) & 0x3F); + $uni =3D ($h & 0x0F) << 18 | (ord($str[++$i]) & 0x3F) << 12 + | (ord($str[++$i]) & 0x3F) << 6 + | (ord($str[++$i]) & 0x3F); } + if ($uni >=3D 0) { + $out[] =3D $uni; + } } return $out; } =20 =20 -//End of class +// End of class } =20 -//Handle special IE contype request +// Handle special IE contype request if(isset($_SERVER['HTTP_USER_AGENT']) && $_SERVER['HTTP_USER_AGENT']=3D=3D= 'contype') { header('Content-Type: application/pdf'); exit; } =20 -?> \ No newline at end of file +?> From MAILER-DAEMON Fri Oct 14 20:55:15 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1REsWx-0000JE-CG for mharc-phpcompta-dev@gnu.org; Fri, 14 Oct 2011 20:55:15 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sat, 15 Oct 2011 03:03:05 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4219 - phpcompta/trunk/include/tfpdf/font X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Oct 2011 00:55:13 -0000 Author: danydb Date: 2011-10-15 03:03:04 +0200 (Sat, 15 Oct 2011) New Revision: 4219 Added: phpcompta/trunk/include/tfpdf/font/courierb.php phpcompta/trunk/include/tfpdf/font/courierbi.php phpcompta/trunk/include/tfpdf/font/courieri.php Log: update tfpdf to version 1.24=20 Must be more tested Added: phpcompta/trunk/include/tfpdf/font/courierb.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/tfpdf/font/courierb.php = (rev 0) +++ phpcompta/trunk/include/tfpdf/font/courierb.php 2011-10-15 01:03:04 U= TC (rev 4219) @@ -0,0 +1,8 @@ + Property changes on: phpcompta/trunk/include/tfpdf/font/courierb.php ___________________________________________________________________ Name: svn:executable + * Added: phpcompta/trunk/include/tfpdf/font/courierbi.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/tfpdf/font/courierbi.php = (rev 0) +++ phpcompta/trunk/include/tfpdf/font/courierbi.php 2011-10-15 01:03:04 = UTC (rev 4219) @@ -0,0 +1,8 @@ + Property changes on: phpcompta/trunk/include/tfpdf/font/courierbi.php ___________________________________________________________________ Name: svn:executable + * Added: phpcompta/trunk/include/tfpdf/font/courieri.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/tfpdf/font/courieri.php = (rev 0) +++ phpcompta/trunk/include/tfpdf/font/courieri.php 2011-10-15 01:03:04 U= TC (rev 4219) @@ -0,0 +1,8 @@ + Property changes on: phpcompta/trunk/include/tfpdf/font/courieri.php ___________________________________________________________________ Name: svn:executable + * From MAILER-DAEMON Wed Oct 19 15:42:14 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RGc1m-0008S8-4E for mharc-phpcompta-dev@gnu.org; Wed, 19 Oct 2011 15:42:14 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Wed, 19 Oct 2011 21:49:34 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4220 - phpcompta/branches/rel560/include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Oct 2011 19:42:11 -0000 Author: danydb Date: 2011-10-19 21:49:33 +0200 (Wed, 19 Oct 2011) New Revision: 4220 Modified: phpcompta/branches/rel560/include/class_html_input.php Log: bug : & in interpreted as HTML entities Modified: phpcompta/branches/rel560/include/class_html_input.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel560/include/class_html_input.php 2011-10-15 01:= 03:04 UTC (rev 4219) +++ phpcompta/branches/rel560/include/class_html_input.php 2011-10-19 19:= 49:33 UTC (rev 4220) @@ -127,8 +127,8 @@ /** * Make a JSON object, this method create a javascript object * with the attribute set, it returns a javascript string with the o= bject - * @param $p_name : name of the object, can be null. If the name is = not null, return=20 - * $p_name=3D{} otherwise only the object {}=20 + * @param $p_name : name of the object, can be null. If the name is = not null, return + * $p_name=3D{} otherwise only the object {} * @return javascript string with the object * @note: there is not check on the key->value, so you could need to= escape * special char as quote, single-quote... @@ -201,7 +201,7 @@ =20 /*!\brief create a button with a ref *\param $p_label the text - *\param $p_value the location of the window,=20 + *\param $p_value the location of the window, *\param $p_name the id of the span *\param $p_javascript javascript for this button *\return string with htmlcode @@ -286,7 +286,7 @@ /** * return the html code to create an hidden div and a button * to show this DIV. This contains all the available ledgers - * for the user in READ or RW=20 + * for the user in READ or RW *@param $p_array is an array obtains thanks User::get_ledger *@param $selected is an array of checkbox *@note the choosen ledger are stored in the array r_jrn (_GET) @@ -376,7 +376,7 @@ return $r; } /** - *close button for the HTML popup=20 + *close button for the HTML popup *@see add_div modify_operation *@param $div_name is the name of the div to remove */ @@ -418,7 +418,7 @@ /** * Return a html string with an anchor looking like anchor_button in= the right corner *@param $action action action to perform (message) - *@param $javascript javascript=20 + *@param $javascript javascript *@note not protected against html *@see Acc_Ledger::display_search_form */ @@ -453,8 +453,8 @@ } /** *transform request data to hidden - *@param $array is an of indices=20 - *@param $request name of the superglobal $_POST $_GET $_REQUEST(def= ault)=20 + *@param $array is an of indices + *@param $request name of the superglobal $_POST $_GET $_REQUEST(def= ault) *@return html string with the hidden data */ static function array_to_hidden($array,$global_array ) @@ -467,12 +467,12 @@ { if (isset($global_array [$a])) $r.=3DHtmlInput::hidden($a,$global_arr= ay [$a]); } - =20 + return $r; } /** *transform $_GET data to hidden - *@param $array is an of indices=20 + *@param $array is an of indices *@see HtmlInput::request_to_hidden *@return html string with the hidden data */ @@ -484,7 +484,7 @@ =20 /** *transform $_POST data to hidden - *@param $array is an of indices=20 + *@param $array is an of indices *@see HtmlInput::request_to_hidden *@return html string with the hidden data */ @@ -496,7 +496,7 @@ =20 /** *transform $_REQUEST data to hidden - *@param $array is an of indices=20 + *@param $array is an of indices *@see HtmlInput::request_to_hidden *@return html string with the hidden data */ @@ -508,8 +508,8 @@ =20 /** *transform request data to string - *@param $array is an of indices=20 - *@param $request name of the superglobal $_POST $_GET $_REQUEST(def= ault)=20 + *@param $array is an of indices + *@param $request name of the superglobal $_POST $_GET $_REQUEST(def= ault) *@return html string with the string data */ static function array_to_string($array,$global_array ) @@ -518,19 +518,19 @@ $r=3D"?"; =20 if ( count($global_array )=3D=3D0) return ''; - $and=3D"";=20 + $and=3D""; foreach ($array as $a) { if (isset($global_array [$a])) - $r.=3D$and."&$a=3D".$global_array [$a]; - $and=3D""; + $r.=3D$and."$a=3D".$global_array [$a]; + $and=3D"&"; } - =20 + return $r; } /** *transform $_GET data to string - *@param $array is an of indices=20 + *@param $array is an of indices *@see HtmlInput::request_to_string *@return html string with the string data */ @@ -542,7 +542,7 @@ =20 /** *transform $_POST data to string - *@param $array is an of indices=20 + *@param $array is an of indices *@see HtmlInput::request_to_string *@return html string with the string data */ @@ -554,7 +554,7 @@ =20 /** *transform $_REQUEST data to string - *@param $array is an of indices=20 + *@param $array is an of indices *@see HtmlInput::request_to_string *@return html string with the string data */ @@ -565,7 +565,7 @@ } =20 /** - * generate an unique id for a widget,=20 + * generate an unique id for a widget, *@param $p_prefix prefix *@see HtmlInput::IDate *@return string with a unique id @@ -578,7 +578,7 @@ /** * return default if the value if the array doesn't exist *@param $ind the index to check - *@param $default the value to return=20 + *@param $default the value to return *@param $array the array */ static function default_value($ind,$default,$array) From MAILER-DAEMON Wed Oct 19 16:40:07 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RGcvn-00074m-Vc for mharc-phpcompta-dev@gnu.org; Wed, 19 Oct 2011 16:40:07 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Wed, 19 Oct 2011 22:47:33 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4221 - in phpcompta/trunk: . include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Oct 2011 20:40:06 -0000 Author: danydb Date: 2011-10-19 22:47:32 +0200 (Wed, 19 Oct 2011) New Revision: 4221 Modified: phpcompta/trunk/ phpcompta/trunk/include/class_html_input.php phpcompta/trunk/include/class_icheckbox.php phpcompta/trunk/include/class_iradio.php phpcompta/trunk/release-note Log: Merged revisions 4202-4203,4211,4220 via svnmerge from=20 svn+ssh://danydb@svn/svn/phpcompta/branches/rel560 ........ r4202 | danydb | 2011-09-16 23:58:49 +0200 (Fri, 16 Sep 2011) | 1 line =20 new fct set_checked ........ r4203 | danydb | 2011-09-17 00:01:19 +0200 (Sat, 17 Sep 2011) | 1 line =20 new fct set_checked ........ r4211 | danydb | 2011-10-13 23:43:40 +0200 (Thu, 13 Oct 2011) | 1 line =20 remove release ........ r4220 | danydb | 2011-10-19 21:49:33 +0200 (Wed, 19 Oct 2011) | 1 line =20 bug : & in interpreted as HTML entities ........ Property changes on: phpcompta/trunk ___________________________________________________________________ Name: svnmerge-integrated - /phpcompta/branches/rel560:1-4197 + /phpcompta/branches/rel560:1-4220 Modified: phpcompta/trunk/include/class_html_input.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_html_input.php 2011-10-19 19:49:33 UTC = (rev 4220) +++ phpcompta/trunk/include/class_html_input.php 2011-10-19 20:47:32 UTC = (rev 4221) @@ -127,8 +127,8 @@ /** * Make a JSON object, this method create a javascript object * with the attribute set, it returns a javascript string with the o= bject - * @param $p_name : name of the object, can be null. If the name is = not null, return=20 - * $p_name=3D{} otherwise only the object {}=20 + * @param $p_name : name of the object, can be null. If the name is = not null, return + * $p_name=3D{} otherwise only the object {} * @return javascript string with the object * @note: there is not check on the key->value, so you could need to= escape * special char as quote, single-quote... @@ -201,7 +201,7 @@ =20 /*!\brief create a button with a ref *\param $p_label the text - *\param $p_value the location of the window,=20 + *\param $p_value the location of the window, *\param $p_name the id of the span *\param $p_javascript javascript for this button *\return string with htmlcode @@ -286,7 +286,7 @@ /** * return the html code to create an hidden div and a button * to show this DIV. This contains all the available ledgers - * for the user in READ or RW=20 + * for the user in READ or RW *@param $p_array is an array obtains thanks User::get_ledger *@param $selected is an array of checkbox *@note the choosen ledger are stored in the array r_jrn (_GET) @@ -376,7 +376,7 @@ return $r; } /** - *close button for the HTML popup=20 + *close button for the HTML popup *@see add_div modify_operation *@param $div_name is the name of the div to remove */ @@ -418,7 +418,7 @@ /** * Return a html string with an anchor looking like anchor_button in= the right corner *@param $action action action to perform (message) - *@param $javascript javascript=20 + *@param $javascript javascript *@note not protected against html *@see Acc_Ledger::display_search_form */ @@ -453,8 +453,8 @@ } /** *transform request data to hidden - *@param $array is an of indices=20 - *@param $request name of the superglobal $_POST $_GET $_REQUEST(def= ault)=20 + *@param $array is an of indices + *@param $request name of the superglobal $_POST $_GET $_REQUEST(def= ault) *@return html string with the hidden data */ static function array_to_hidden($array,$global_array ) @@ -467,12 +467,12 @@ { if (isset($global_array [$a])) $r.=3DHtmlInput::hidden($a,$global_arr= ay [$a]); } - =20 + return $r; } /** *transform $_GET data to hidden - *@param $array is an of indices=20 + *@param $array is an of indices *@see HtmlInput::request_to_hidden *@return html string with the hidden data */ @@ -484,7 +484,7 @@ =20 /** *transform $_POST data to hidden - *@param $array is an of indices=20 + *@param $array is an of indices *@see HtmlInput::request_to_hidden *@return html string with the hidden data */ @@ -496,7 +496,7 @@ =20 /** *transform $_REQUEST data to hidden - *@param $array is an of indices=20 + *@param $array is an of indices *@see HtmlInput::request_to_hidden *@return html string with the hidden data */ @@ -508,8 +508,8 @@ =20 /** *transform request data to string - *@param $array is an of indices=20 - *@param $request name of the superglobal $_POST $_GET $_REQUEST(def= ault)=20 + *@param $array is an of indices + *@param $request name of the superglobal $_POST $_GET $_REQUEST(def= ault) *@return html string with the string data */ static function array_to_string($array,$global_array ) @@ -518,19 +518,19 @@ $r=3D"?"; =20 if ( count($global_array )=3D=3D0) return ''; - $and=3D"";=20 + $and=3D""; foreach ($array as $a) { if (isset($global_array [$a])) - $r.=3D$and."&$a=3D".$global_array [$a]; - $and=3D""; + $r.=3D$and."$a=3D".$global_array [$a]; + $and=3D"&"; } - =20 + return $r; } /** *transform $_GET data to string - *@param $array is an of indices=20 + *@param $array is an of indices *@see HtmlInput::request_to_string *@return html string with the string data */ @@ -542,7 +542,7 @@ =20 /** *transform $_POST data to string - *@param $array is an of indices=20 + *@param $array is an of indices *@see HtmlInput::request_to_string *@return html string with the string data */ @@ -554,7 +554,7 @@ =20 /** *transform $_REQUEST data to string - *@param $array is an of indices=20 + *@param $array is an of indices *@see HtmlInput::request_to_string *@return html string with the string data */ @@ -565,7 +565,7 @@ } =20 /** - * generate an unique id for a widget,=20 + * generate an unique id for a widget, *@param $p_prefix prefix *@see HtmlInput::IDate *@return string with a unique id @@ -578,7 +578,7 @@ /** * return default if the value if the array doesn't exist *@param $ind the index to check - *@param $default the value to return=20 + *@param $default the value to return *@param $array the array */ static function default_value($ind,$default,$array) Modified: phpcompta/trunk/include/class_icheckbox.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_icheckbox.php 2011-10-19 19:49:33 UTC (= rev 4220) +++ phpcompta/trunk/include/class_icheckbox.php 2011-10-19 20:47:32 UTC (= rev 4221) @@ -55,6 +55,14 @@ return $r; =20 } + /** + *set selected to true (checked) if the value equal the parameter + * @param $p_value value to compare + */ + public function set_check($p_value) + { + if ($this->value=3D=3D$p_value)$this->selected=3Dtrue; + } static public function test_me() { } Modified: phpcompta/trunk/include/class_iradio.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_iradio.php 2011-10-19 19:49:33 UTC (rev= 4220) +++ phpcompta/trunk/include/class_iradio.php 2011-10-19 20:47:32 UTC (rev= 4221) @@ -1,4 +1,5 @@ name=3D($p_name=3D=3Dnull)?$this->name:$p_name; - $this->value=3D($p_value=3D=3Dnull)?$this->value:$p_value; - if ( $this->readOnly=3D=3Dtrue) return $this->display(); + /* !\brief show the html input of the widget */ =20 - $check=3D( $this->selected=3D=3Dtrue||$this->selected=3D=3D't' )= ?"checked":"unchecked"; - $r=3D'name.'"'; + public function input($p_name=3Dnull, $p_value=3Dnull) + { + $this->name =3D ($p_name =3D=3D null) ? $this->name : $p_name; + $this->value =3D ($p_value =3D=3D null) ? $this->value : $p_valu= e; + if ($this->readOnly =3D=3D true) + return $this->display(); + + $check =3D ( $this->selected =3D=3D true || $this->selected =3D=3D= 't' ) ? "checked" : "unchecked"; + $r =3D 'name . '"'; $r.=3D" VALUE=3D\"$this->value\""; - $r.=3D($this->javascript !=3D'')? 'onclick=3D"'.$this->javascrip= t.'"':''; + $r.=3D($this->javascript !=3D '') ? 'onclick=3D"' . $this->javas= cript . '"' : ''; $r.=3D" $check > "; return $r; - } - /*!\brief print in html the readonly value of the widget*/ + } + + /* !\brief print in html the readonly value of the widget */ + public function display() - { + { =20 - $check=3D( $this->selected=3D=3Dtrue || $this->selected=3D=3D't'= )?"Yes":"no"; - $r=3D$check; + $check =3D ( $this->selected =3D=3D true || $this->selected =3D=3D= 't' ) ? "Yes" : "no"; + $r =3D $check; return $r; + } =20 - } + /** + * set selected to true (checked) if the value equal the parameter + * @param $p_value value to compare + */ + public function set_check($p_value) + { + if ($this->value =3D=3D $p_value) + $this->selected =3D true; + } + static public function test_me() - { + { + =20 + } + } -} Modified: phpcompta/trunk/release-note =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/release-note 2011-10-19 19:49:33 UTC (rev 4220) +++ phpcompta/trunk/release-note 2011-10-19 20:47:32 UTC (rev 4221) @@ -1,40 +1 @@ -1. Ajout balance par cat=C3=A9gorie de fiche -2. DONE3. changer le code pour ajouter de la CA ou la modifier dans un D= IV HTML, le fichier jrn.php devient inutile (deprecated) -3. DONE16 D=C3=A9tail op=C3=A9ration dans DIV HTML -4. Dans les d=C3=A9tails d'op=C3=A9rations, on a aussi des liens vers le= s historiques par fiche ou par poste comptable -5. Depuis les impressions -> balances et impression -> poste, on a les d= =C3=A9tails des op=C3=A9rations=20 - TODO15 Ajoutez les d=C3=A9tails pour l'impression en PDF pour impress= ion poste / fiche -6. TODO5 bug IE : les DIV HTML n'ont pas la bonne taille -7. DONE4 Ajout d'un lien sur les postes et client pour acc=C3=A8der avec= un DIV contenant l'historique (au moins une partie / pr=C3=A9sentation p= ar slice)/ bouton suivant-pr=C3=A9c=C3=A9dent ) -8. TODO18 Acc_Account_Ledger::HtmlTable et Fiche::HtmlTable, il manque l= a s=C3=A9curit=C3=A9 pour filtrer les journaux -9. Ajout d'une FK TODO1 r=C3=A9ecriture de quant_* la liaison avec la j= rn se fait =C3=A0 travers jr_id et non pas jr_internal qui n'est pas inde= x=C3=A9.=20 -Cons=C3=A9quence : r=C3=A9=C3=A9criture de code, correction modop, ... -10. TODO2 Object pour extourner proprement une operation, le fichier ann= ulation.php devient inutile (deprecated) depend de TODO1 TODO10 -11. TODO17 extourne depuis DIV HTML d=C3=A9pend de TODO16 -12. TODO10 Enlever le bouton enlever dans les listes d'op=C3=A9ration et= le mettre dans le DIV HTML qui pr=C3=A9sente les d=C3=A9tails de l'op=20 -13. Pour les balances, on peut choisir les journaux : adapt=C3=A9 =C3=A0= ceux en ayant vraiment beaucoup -14. Depuis les lettrages, on peut aussi acc=C3=A8der aux d=C3=A9tails d'= une op=C3=A9ration -15. TODO9 - d=C3=A9pend de TODO4 TODO2 - dans impressions, on peut avoir= les d=C3=A9tails de toutes les op=C3=A9rations -16. TODO19 Le menu Grand Livre devient recherche -17. TODO20 Ajouter d'attribut avec type : text, nombre ou date; ajouter = le javascript =C3=A9quivalent pour la saisie, le num=C3=A9ro de s=C3=A9qu= ence -commence =C3=A0 10000, afin de ne pas m=C3=A9langer les attributs que je= cr=C3=A9=C3=A9 avec ceux des utilisateurs. A ajouter dans la doc comme e= xemple pour la gestion d'abonn=C3=A9s dont on peut tirer un CSV par impre= ssion -> cat=C3=A9gorie -> r=C3=A9sume -18. Impression - Rapprochement=20 -19. TODO21 Dans DIV HTML donner le code de la TVA dans les d=C3=A9tails = VEN et ACH -20. TODO20 DIV HTML dans le tableau de bord -21. TODO14 confirmation quand effacement d'un PA (comptabilit=C3=A9 anal= ytique -> Plan Analytique) -22. TODO19 Pour les fiches,suivant le type d'attributs, on peut utiliser= le javascript pour les dates=20 -23. On peut ajouter aux mod=C3=A8les de fiches, des d=C3=A9tails qui son= t soit du texte soit des nombres soit une date, soit une zone. La longueu= r peut-=C3=AAtre d=C3=A9finie mais limit=C3=A9e =C3=A0 22 caract=C3=A8res= , sauf les dates et les zones dont les tailles sont fixes -24. TODO27 : D=C3=A9placement de fiche : les attributs manquant sont ajo= ut=C3=A9s ! -25 TODO24 : Dans impression -> poste , il faut avoir l'impression des d=C3= =A9tails des op=C3=A9rations=20 -26. TODO28 : dans jrnx ajouter les f_id, le qcode n'est l=C3=A0 que pou= r acc=C3=A8l=C3=A8rer; constraint fk on update cascade on delete restrict -27. TODO25 : dans recherche de liste, utilisez des tableaux ! -28. Dans les balances, on peut choisir plusieurs journaux ou plusieurs c= at. de journal. Les donn=C3=A9es sont filtr=C3=A9es en plus d'apr=C3=A8s = la s=C3=A9curit=C3=A9 -29. Dans impression -> poste, on peut filtrer les op=C3=A9rations suivan= t qu'elles sont lettr=C3=A9es ou non. -30. Apr=C3=A8s avoir sauv=C3=A9 une op=C3=A9ration, vous pouvez avoir le= d=C3=A9tail de l'op=C3=A9ration en cliquant sur le num=C3=A9ro interne q= ui s'affiche -31. Les journaux FIN doivent =C3=AAtre attach=C3=A9s =C3=A0 un compte en= banque et uniquement un A propos du mode de paiement : on ne change rien= mais il faut que dans la doc, il est pr=C3=A9cis=C3=A9 qu'il faut param=C3= =A8trer le mdp comme le journal FIN -32. Rapprochement doivent avoir les journaux + s=C3=A9curit=C3=A9 -33. ajout bouton "ajoutez ligne" pour les OD en CA -34. ajout bouton "ajoutez ligne" pour les pr=C3=A9visions -35. Ajout l'impression pour les lettrages par poste comptables -36. Les historiques des fiches et postes comptables (impression->poste) = ont un solde progressif =20 From MAILER-DAEMON Thu Oct 20 10:34:09 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RGthB-0002Jp-4f for mharc-phpcompta-dev@gnu.org; Thu, 20 Oct 2011 10:34:09 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Thu, 20 Oct 2011 16:41:26 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4222 - phpcompta/trunk/sql X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Oct 2011 14:34:07 -0000 Author: danydb Date: 2011-10-20 16:41:25 +0200 (Thu, 20 Oct 2011) New Revision: 4222 Modified: phpcompta/trunk/sql/upgrade.sql Log: quick code must be unique Modified: phpcompta/trunk/sql/upgrade.sql =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/sql/upgrade.sql 2011-10-19 20:47:32 UTC (rev 4221) +++ phpcompta/trunk/sql/upgrade.sql 2011-10-20 14:41:25 UTC (rev 4222) @@ -1,2 +1,3 @@ drop table public.import_tmp; drop table public.format_csv_banque; +create unique index test_qcode_idx on fiche_detail (ad_value) where ad_i= d=3D23; From MAILER-DAEMON Sat Oct 22 16:08:00 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RHhrM-0002Zl-8E for mharc-phpcompta-dev@gnu.org; Sat, 22 Oct 2011 16:08:00 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sat, 22 Oct 2011 22:15:11 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4223 - phpcompta/trunk/html X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Oct 2011 20:07:58 -0000 Author: danydb Date: 2011-10-22 22:15:09 +0200 (Sat, 22 Oct 2011) New Revision: 4223 Modified: phpcompta/trunk/html/ajax_ledger.php Log: update doc Modified: phpcompta/trunk/html/ajax_ledger.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/ajax_ledger.php 2011-10-20 14:41:25 UTC (rev 422= 2) +++ phpcompta/trunk/html/ajax_ledger.php 2011-10-22 20:15:09 UTC (rev 422= 3) @@ -21,12 +21,12 @@ // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr =20 /*!\file - * \brief answer to the ajax request for the ledger=20 - * it means :=20 + * \brief answer to the ajax request for the ledger + * it means : - detail of an operation (expert, user and analytic view) - removal of an operation - load a receipt document - - for reconcialiation =20 + - for reconcialiation - update of analytic content */ require_once('class_database.php'); @@ -37,11 +37,10 @@ require_once('class_acc_reconciliation.php'); require_once('class_anc_operation.php'); require_once('class_idate.php'); -require_once('class_ibox.php'); /** * Check if we receive the needed data (jr_id...) */ -if ( ! isset ($_REQUEST['act'])|| ! isset ($_REQUEST['jr_id'])=20 +if ( ! isset ($_REQUEST['act'])|| ! isset ($_REQUEST['jr_id']) || ! isset ($_REQUEST['div'])) { exit(); @@ -340,13 +339,13 @@ { $cn->exec_sql("update jrn set jr_ech=3Dto_date($1,'DD.MM.YYYY') wher= e jr_id=3D$2", array($ech,$jr_id)); - =20 + } else { $cn->exec_sql("update jrn set jr_ech=3Dnull where jr_id=3D$1", array($jr_id)); - =20 + } } $cn->exec_sql("update jrn set jr_comment=3D$1,jr_pj_number=3D= $2,jr_date=3Dto_date($4,'DD.MM.YYYY') where jr_id=3D$3", From MAILER-DAEMON Sat Oct 22 16:08:34 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RHhru-0002ss-HH for mharc-phpcompta-dev@gnu.org; Sat, 22 Oct 2011 16:08:34 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sat, 22 Oct 2011 22:15:51 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4224 - phpcompta/trunk/include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Oct 2011 20:08:33 -0000 Author: danydb Date: 2011-10-22 22:15:50 +0200 (Sat, 22 Oct 2011) New Revision: 4224 Added: phpcompta/trunk/include/class_ibox_deprecated.php Removed: phpcompta/trunk/include/class_ibox.php Log: ibox deprecated Deleted: phpcompta/trunk/include/class_ibox.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_ibox.php 2011-10-22 20:15:09 UTC (rev 4= 223) +++ phpcompta/trunk/include/class_ibox.php 2011-10-22 20:15:50 UTC (rev 4= 224) @@ -1,140 +0,0 @@ -html=3D'loading'; -$ibox->callback=3D'ajax.php'; // uniquement fichier PHP (1) -$ibox->queryString=3D'?gDossier=3D15&id=3D5'; -$ibox->style=3D'style_css', -$ibox->cssclass=3D'width:80%'; -$ibox->label=3D'Cliquez moi'; -$ibox->onclick=3D'add_div'; // if you click the function must take only= one parameter : an object -$ibox->ajax_success=3D'autre'; // fonction qui affiche traite le callbac= k, par d=C3=A9fault, il s'agit de la fonction refresh_box qui afficher se= ulement le contenu dans le div -$ibox->ajax_error=3D'ajax_error' // fonction pour traiter les erreurs aj= ax -\endverbatim -*/ - -class IBox extends HtmlInput -{ - var $name; /*!< name name and id of the div */ - function __construct($p_name,$label) - { - $this->name=3D$p_name; - $this->parameter=3D''; - $this->attribute=3Darray(); - $this->drag=3Dfalse; - $this->blocking=3Dtrue; - $this->queryString=3D''; - $this->html=3D'Un instant...'; - $this->callback=3D''; - $this->label=3D$label; - $this->handle_callback=3D'refresh_box'; - $this->cssclass=3D''; - $this->style=3D''; - $this->ajax_success=3D'success_box'; - $this->ajax_error=3D'error_box'; - $this->onclick=3D'show_box'; - - } - /*!\brief set the attribute thanks javascript as the width, the posi= tion ... - *\param $p_name attribute name valid value are id, cssclass and htm= l - *\param $p_val val of the attribute - *\note add to the this->attribut, it will be used in input() - */ - /* function set_attribute($p_name,$p_val) { - $this->attribute[]=3Darray($p_name,$p_val); - }*/ - function set_dragguable($p_value) - { - $this->drag=3D$p_value; - } - - function input() - { - $r=3D""; - $this->set_attribute('id',$this->name); - $this->set_attribute('html',$this->html); - $this->set_attribute('cssclass',$this->cssclass); - $this->set_attribute('style',$this->style); - $this->set_attribute('js_success',$this->ajax_success); - $this->set_attribute('js_error',$this->ajax_error); - $this->set_attribute('qs',$this->queryString); - $this->set_attribute('callback',$this->callback); - $this->set_attribute('drag',$this->drag); - $obj=3D$this->make_object(); - $obj=3Dstr_replace('"',""",$obj); - $r=3D'onclick.'('.$obj.')">'.$this->label.'<= /a>'; - - return $r; - } - - static function test_me() - { - require_once('class_idate.php'); - echo js_include('prototype.js'); - echo js_include('scriptaculous.js'); - echo js_include('effects.js'); - echo js_include('dragdrop.js'); - echo js_include('scripts.js'); - - // Simple box no ajax - $simple=3Dnew IBox('alert1','click-moi'); - $simple->html=3D"Attention !!!"; - $simple->style=3D"background:red;border:1px solid rose;width:200= ;height:50px;"; - $simple->drag=3Dfalse; - echo $simple->input(); - - // Dragguable - echo '
'; - $drag=3Dnew IBox('drag','drag'); - $drag->cssclass=3D"popup_border_title"; - $drag->html=3D" Drag me "; - $drag->drag=3Dtrue; - echo $drag->input(); - // with ajax - $ajax=3Dnew IBox('ajax','ajax'); - $ajax->cssclass=3D"popup_content"; - $ajax->style=3D"width:1;left:1"; - $ajax->queryString=3D"?gDossier=3D48&op=3Dsf&c=3Dav_text5&q=3D58= &ctl=3Ddrag"; - $ajax->callback=3D"ajax_poste.php"; - echo $ajax->input(); - $reverse=3Dnew IBox('Extourne','Extourne'); - $reverse->set_attribute('drag',1); - $reverse->style=3D"padding:20;height:300;width:250;position:abso= lute;background:red;display:none"; - - echo $reverse->input(); - var_dump($reverse); - } -} Copied: phpcompta/trunk/include/class_ibox_deprecated.php (from rev 4215,= phpcompta/trunk/include/class_ibox.php) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_ibox_deprecated.php = (rev 0) +++ phpcompta/trunk/include/class_ibox_deprecated.php 2011-10-22 20:15:50= UTC (rev 4224) @@ -0,0 +1,140 @@ +html=3D'loading'; +$ibox->callback=3D'ajax.php'; // uniquement fichier PHP (1) +$ibox->queryString=3D'?gDossier=3D15&id=3D5'; +$ibox->style=3D'style_css', +$ibox->cssclass=3D'width:80%'; +$ibox->label=3D'Cliquez moi'; +$ibox->onclick=3D'add_div'; // if you click the function must take only= one parameter : an object +$ibox->ajax_success=3D'autre'; // fonction qui affiche traite le callbac= k, par d=C3=A9fault, il s'agit de la fonction refresh_box qui afficher se= ulement le contenu dans le div +$ibox->ajax_error=3D'ajax_error' // fonction pour traiter les erreurs aj= ax +\endverbatim +*/ + +class IBox extends HtmlInput +{ + var $name; /*!< name name and id of the div */ + function __construct($p_name,$label) + { + $this->name=3D$p_name; + $this->parameter=3D''; + $this->attribute=3Darray(); + $this->drag=3Dfalse; + $this->blocking=3Dtrue; + $this->queryString=3D''; + $this->html=3D'Un instant...'; + $this->callback=3D''; + $this->label=3D$label; + $this->handle_callback=3D'refresh_box'; + $this->cssclass=3D''; + $this->style=3D''; + $this->ajax_success=3D'success_box'; + $this->ajax_error=3D'error_box'; + $this->onclick=3D'show_box'; + + } + /*!\brief set the attribute thanks javascript as the width, the posi= tion ... + *\param $p_name attribute name valid value are id, cssclass and htm= l + *\param $p_val val of the attribute + *\note add to the this->attribut, it will be used in input() + */ + /* function set_attribute($p_name,$p_val) { + $this->attribute[]=3Darray($p_name,$p_val); + }*/ + function set_dragguable($p_value) + { + $this->drag=3D$p_value; + } + + function input() + { + $r=3D""; + $this->set_attribute('id',$this->name); + $this->set_attribute('html',$this->html); + $this->set_attribute('cssclass',$this->cssclass); + $this->set_attribute('style',$this->style); + $this->set_attribute('js_success',$this->ajax_success); + $this->set_attribute('js_error',$this->ajax_error); + $this->set_attribute('qs',$this->queryString); + $this->set_attribute('callback',$this->callback); + $this->set_attribute('drag',$this->drag); + $obj=3D$this->make_object(); + $obj=3Dstr_replace('"',""",$obj); + $r=3D'
onclick.'('.$obj.')">'.$this->label.'<= /a>'; + + return $r; + } + + static function test_me() + { + require_once('class_idate.php'); + echo js_include('prototype.js'); + echo js_include('scriptaculous.js'); + echo js_include('effects.js'); + echo js_include('dragdrop.js'); + echo js_include('scripts.js'); + + // Simple box no ajax + $simple=3Dnew IBox('alert1','click-moi'); + $simple->html=3D"Attention !!!"; + $simple->style=3D"background:red;border:1px solid rose;width:200= ;height:50px;"; + $simple->drag=3Dfalse; + echo $simple->input(); + + // Dragguable + echo '
'; + $drag=3Dnew IBox('drag','drag'); + $drag->cssclass=3D"popup_border_title"; + $drag->html=3D" Drag me "; + $drag->drag=3Dtrue; + echo $drag->input(); + // with ajax + $ajax=3Dnew IBox('ajax','ajax'); + $ajax->cssclass=3D"popup_content"; + $ajax->style=3D"width:1;left:1"; + $ajax->queryString=3D"?gDossier=3D48&op=3Dsf&c=3Dav_text5&q=3D58= &ctl=3Ddrag"; + $ajax->callback=3D"ajax_poste.php"; + echo $ajax->input(); + $reverse=3Dnew IBox('Extourne','Extourne'); + $reverse->set_attribute('drag',1); + $reverse->style=3D"padding:20;height:300;width:250;position:abso= lute;background:red;display:none"; + + echo $reverse->input(); + var_dump($reverse); + } +} From MAILER-DAEMON Sat Oct 22 16:09:28 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RHhsm-0002u9-GI for mharc-phpcompta-dev@gnu.org; Sat, 22 Oct 2011 16:09:28 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sat, 22 Oct 2011 22:16:45 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4225 - phpcompta/trunk/include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Oct 2011 20:09:26 -0000 Author: danydb Date: 2011-10-22 22:16:44 +0200 (Sat, 22 Oct 2011) New Revision: 4225 Modified: phpcompta/trunk/include/class_acc_bilan.php Log: add documentation Modified: phpcompta/trunk/include/class_acc_bilan.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_acc_bilan.php 2011-10-22 20:15:50 UTC (= rev 4224) +++ phpcompta/trunk/include/class_acc_bilan.php 2011-10-22 20:16:44 UTC (= rev 4225) @@ -273,7 +273,7 @@ $form=3Dfopen($this->b_file_form,'r'); if ( $form =3D=3D false) { - echo 'Cannot Open'; + echo __FILE__.":".__LINE__.'Cannot Open'.$this->b_file_form; exit(); } return $form; @@ -285,7 +285,7 @@ $templ=3Dfopen($this->b_file_template,'r'); if ( $templ =3D=3D false) { - echo 'Cannot Open'; + echo __FILE__.":".__LINE__.'Cannot Open'.$this->b_file_templ= ate; exit(); } return $templ; @@ -296,8 +296,8 @@ * \param $p_handle the handle to the file * \param * \param - *=20 * + * * \return */ function compute_formula($p_handle) @@ -305,10 +305,8 @@ while (! feof ($p_handle)) { $buffer=3Dtrim(fgets($p_handle)); - // $a=3D(CheckFormula($buffer) =3D=3D true)?"$buffer ok
= ":''.'Pas ok '.$buffer."
"; - // echo $a; - // blank line are skipped - if (strlen(trim($buffer))=3D=3D0) + + if (strlen(trim($buffer))=3D=3D0) continue; // skip comment if ( strpos($buffer,'#') =3D=3D=3D true ) @@ -324,9 +322,9 @@ }// end read form line per line } /*!\brief generate the ods document - * \param the handle to the template file=20 - * \return the xml=20 - *@note=20 + * \param the handle to the template file + * \return the xml + *@note * Sur une seule ligne il y a plusieurs donn=C3=A9es, donc il y a plu= sieurs boucles, pour les autres documents * cela devrait =C3=AAtre fait aussi, actuellement ces documents, n'a= cceptent qu'une formule par ligne. *@note @@ -352,13 +350,13 @@ ob_start(); /* unzip the document */ $zip =3D new Zip_Extended; - if ($zip->open($work_file) =3D=3D=3D TRUE)=20 + if ($zip->open($work_file) =3D=3D=3D TRUE) { $zip->extractTo($dirname.DIRECTORY_SEPARATOR); $zip->close(); - } else=20 + } else { - echo __FILE__.":".__LINE__."cannot unzip model ".$filename;=09 + echo __FILE__.":".__LINE__."cannot unzip model ".$filename; } =20 ob_end_clean(); @@ -391,7 +389,7 @@ // the line contains the magic << $tmp=3D""; =20 - =20 + while (preg_match_all($regex,$line_rtf,$f2) > 0 ) { // the f2 array contains all the magic << in the line @@ -606,13 +604,13 @@ case 'ods': /* header("Pragma: public"); header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); - header("Cache-Control: must-revalidate");=20 + header("Cache-Control: must-revalidate"); if ( $this->b_type =3D=3D 'odt' ) header('Content-type: application/vnd.oasis.opendocument.tex= t'); if ( $this->b_type =3D=3D 'ods' ) header('Content-type: application/vnd.oasis.opendocument.spr= eadsheet'); header('Content-Disposition: attachment;filename=3D"'.$this-= >b_name.'.odt"',FALSE); - header("Accept-Ranges: bytes");=20 + header("Accept-Ranges: bytes"); */ ob_start(); // save the file in a temp folder @@ -636,14 +634,14 @@ */ ob_start(); $zip =3D new Zip_Extended; - if ($zip->open($work_file) =3D=3D=3D TRUE)=20 + if ($zip->open($work_file) =3D=3D=3D TRUE) { $zip->extractTo($dirname.DIRECTORY_SEPARATOR); $zip->close(); - }=20 - else=20 + } + else { - echo __FILE__.":".__LINE__."cannot unzip model ".$filename;=09 + echo __FILE__.":".__LINE__."cannot unzip model ".$filename; } =20 // Remove the file we do not need anymore From MAILER-DAEMON Sat Oct 22 16:10:37 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RHhtt-0002zZ-LZ for mharc-phpcompta-dev@gnu.org; Sat, 22 Oct 2011 16:10:37 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sat, 22 Oct 2011 22:17:51 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4226 - in phpcompta/trunk: html include sql X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Oct 2011 20:10:36 -0000 Author: danydb Date: 2011-10-22 22:17:50 +0200 (Sat, 22 Oct 2011) New Revision: 4226 Added: phpcompta/trunk/sql/account-update.sql phpcompta/trunk/sql/account_alphanum.sql phpcompta/trunk/sql/account_compute.sql phpcompta/trunk/sql/account_insert.sql phpcompta/trunk/sql/format_account.sql phpcompta/trunk/sql/tmp_pcmn_alphanum_ins_upd.sql phpcompta/trunk/sql/trigger.tmp_pcmn.sql Modified: phpcompta/trunk/html/parametre.php phpcompta/trunk/include/class_acc_account_ledger.php phpcompta/trunk/include/class_fiche.php phpcompta/trunk/include/class_own.php phpcompta/trunk/include/impress_poste.inc.php phpcompta/trunk/sql/ phpcompta/trunk/sql/upgrade.sql Log: #120 : Support for alphanumeric account Modified: phpcompta/trunk/html/parametre.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/parametre.php 2011-10-22 20:16:44 UTC (rev 4225) +++ phpcompta/trunk/html/parametre.php 2011-10-22 20:17:50 UTC (rev 4226) @@ -258,6 +258,7 @@ if ( $User->check_action(PARSTR)!=3D0) $m->MY_STRICT=3D$p_strict= ; if ( $User->check_action(PARTVA)!=3D0)$m->MY_TVA_USE=3D$p_tva_us= e; $m->MY_PJ_SUGGEST=3D$p_pj; + $m->MY_ALPHANUM=3D$p_alphanum; $m->Update(); } =20 @@ -272,6 +273,8 @@ array('value'=3D>'N','label'=3D>_('Non')), array('value'=3D>'Y','label'=3D>_('Oui')) ); + $alpha_num_array[0]=3Darray('value'=3D>'N','label'=3D>_('Non')); + $alpha_num_array[1]=3Darray('value'=3D>'Y','label'=3D>_('Oui')); =20 $compta=3Dnew ISelect(); $compta->table=3D1; @@ -297,6 +300,11 @@ $check_periode->table=3D1; $check_periode->selected=3D$my->MY_CHECK_PERIODE; =20 + $alpha_num=3Dnew ISelect(); + $alpha_num->table=3D1; + $alpha_num->value=3D$alpha_num_array; + $alpha_num->selected=3D$my->MY_ALPHANUM; + // other parameters $all=3Dnew IText(); $all->table=3D1; @@ -329,6 +337,7 @@ echo "".td(_("Sugg=C3=A9rer le num=C3=A9ro de pi=C3=A8ce justifi= cative"),'style=3D"text-align:right"').$pj_suggest->input("p_pj",$strict_= array).""; echo "".td(_("Sugg=C3=A9rer la date"),'style=3D"text-align:right= "').$date_suggest->input("p_date_suggest",$strict_array).""; echo ''.td(_('Afficher la p=C3=A9riode comptable pour =C3=A9vite= r les erreurs de date'),'style=3D"text-align:right"').$check_periode->inp= ut('p_check_periode',$strict_array).''; + echo ''.td(_('Utilisez des postes comptables alphanum=C3=A9rique= '),'style=3D"text-align:right"').$alpha_num->input('p_alphanum').''; echo ""; echo HtmlInput::submit("record_company",_("Sauve")); echo ""; Modified: phpcompta/trunk/include/class_acc_account_ledger.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_acc_account_ledger.php 2011-10-22 20:16= :44 UTC (rev 4225) +++ phpcompta/trunk/include/class_acc_account_ledger.php 2011-10-22 20:17= :50 UTC (rev 4226) @@ -129,36 +129,36 @@ $filter=3Dstr_replace('jrn_def_id','jr_def_id',$filter_sql); $bal_sql=3D"select sum(amount_deb) as s_deb,sum(amount_cred) as s_c= red, j_poste from (select case when j_debit=3D't' then j_montant el= se 0 end as amount_deb, case when j_debit=3D'f' then j_montant else 0 end as amount_cred= , - j_poste=20 + j_poste from jrnx join jrn on (j_grpt =3D jr_grpt_id) - where=20 + where j_poste=3D$1 and $filter and - ( to_date($2,'DD.MM.YYYY') <=3D j_date and=20 + ( to_date($2,'DD.MM.YYYY') <=3D j_date and to_date($3,'DD.MM.YYYY') >=3D j_date = )) as signed_amount group by j_poste "; $r=3D$this->db->get_array($bal_sql,array($this->id,$p_from,$p_to)); if ( $this->db->count() =3D=3D 0 ) return array(); - if ($r[0]['s_deb']=3D=3D$r[0]['s_cred']) return array();=20 + if ($r[0]['s_deb']=3D=3D$r[0]['s_cred']) return array(); } - $Res=3D$this->db->exec_sql("select jr_id,to_char(j_date,'DD.MM.= YYYY') as j_date_fmt,j_date,". - "case when j_debit=3D't' then j_montant= else 0 end as deb_montant,". - "case when j_debit=3D'f' then j_montant= else 0 end as cred_montant,". - " jr_comment as description,jrn_def_nam= e as jrn_name,". - "j_debit, jr_internal,jr_pj_number, - coalesce(comptaproc.get_letter_jnt(j_id),-1) as letter ". - ",pcm_lib ". - ",jr_tech_per,p_exercice ". - " from jrnx left join jrn_def on (jrn_d= ef_id=3Dj_jrn_def )". - " left join jrn on (jr_grpt_id=3Dj_grpt= )". - " left join tmp_pcmn on (j_poste=3Dpcm_= val)". - " left join parm_periode on (p_id=3Djr_tech_per) ". - " where j_poste=3D$1 and ". - " ( to_date($2,'DD.MM.YYYY') <=3D j_dat= e and ". - " to_date($3,'DD.MM.YYYY') >=3D j_dat= e )". - " and $filter_sql $sql_let ". - " order by j_date,substring(jr_pj_numbe= r,'\\\\d+$') asc",array($this->id,$p_from,$p_to)); + $Res=3D$this->db->exec_sql("select jr_id,to_char(j_date,'DDMMYY= YY') as j_date_fmt,j_date, + case when j_debit=3D't' then j_montant = else 0 end as deb_montant, + case when j_debit=3D'f' then j_montant = else 0 end as cred_montant, + jr_comment as description,jrn_def_name= as jrn_name, + j_debit, jr_internal,jr_pj_number, + coalesce(get_letter_jnt(j_id),-1) as letter + ,pcm_lib + ,jr_tech_per,p_exercice + from jrnx left join jrn_def on (jrn_de= f_id=3Dj_jrn_def ) + left join jrn on (jr_grpt_id=3Dj_grpt) + left join tmp_pcmn on (j_poste=3Dpcm_v= al) + left join parm_periode on (p_id=3Djr_tech_per) + where j_poste=3D$1 and + ( to_date($2,'DD.MM.YYYY') <=3D j_date= and + to_date($3,'DD.MM.YYYY') >=3D j_date= ) + and $filter_sql $sql_let + order by j_date,substring(jr_pj_number= ,'\\\\d+$') asc",array($this->id,$p_from,$p_to)); return $this->get_row_sql($Res); } =20 @@ -240,7 +240,7 @@ if ($Max=3D=3D0) return 0; $r=3DDatabase::fetch_array($Res,0); =20 - return abs($r['sum_deb']-$r['sum_cred']); + return abs(bcsub($r['sum_deb'],$r['sum_cred'])); } /*! * \brief give the balance of an account @@ -311,7 +311,7 @@ } /*! * \brief HtmlTable, display a HTML of a poste for the asked period - * \param $p_array array for filter=20 + * \param $p_array array for filter * \param $let lettering of operation 0 * \return -1 if nothing is found otherwise 0 */ @@ -381,7 +381,7 @@ $progress=3Dbcadd($progress,$tmp_diff); $sum_cred=3Dbcadd($sum_cred,$op['cred_montant']); $sum_deb=3Dbcadd($sum_deb,$op['deb_montant']); - =20 + echo "". "".format_date($op['j_date'])."". td(h($op['jr_pj_number'])). @@ -390,7 +390,7 @@ "".nbm($op['deb_montant'])."". "".nbm($op['cred_montant'])."". td(nbm(abs($progress)),'style=3D"text-align:right"'). - =20 + td($let,' style=3D"color:red;text-align:right"'). ""; $old_exercice=3D$op['p_exercice']; @@ -439,9 +439,9 @@ default: throw new Exception(" Fonction HtmlTableHeader argument actiontarget = invalid"); exit; - } =20 + } $hid=3Dnew IHidden(); - =20 + echo ""; echo ''; $str_ople=3D(isset($_REQUEST['ople']))?HtmlInput::hidden('ople',= $_REQUEST['ople']):''; @@ -464,18 +464,12 @@ $hid->input("to_periode",$_REQUEST['to_periode']) ; =20 + echo HtmlInput::request_to_hidden(array('from_poste','to_poste', + 'poste_id')); + if ( isset($_REQUEST['letter'] )) echo HtmlInput::hidden('letter','2'); if ( isset($_REQUEST['solded'] )) echo HtmlInput::hidden('solded','1'); =20 - if (isset($_REQUEST['from_poste']))=20 - echo HtmlInput::hidden('from_poste',$_REQUEST['from_poste']); - - if (isset($_REQUEST['to_poste']))=20 - echo HtmlInput::hidden('to_poste',$_REQUEST['to_poste']); - - if (isset($_REQUEST['poste_id']))=20 - echo HtmlInput::hidden("poste_id",$_REQUEST['poste_id']); - if (isset($_REQUEST['poste_fille'])) echo $hid->input('poste_fille','on'); if (isset($_REQUEST['oper_detail'])) @@ -492,15 +486,9 @@ $hid->input("from_periode",$_REQUEST['from_periode']). $hid->input("to_periode",$_REQUEST['to_periode']); =20 - if (isset($_REQUEST['from_poste']))=20 - echo HtmlInput::hidden('from_poste',$_REQUEST['from_poste']); + echo HtmlInput::request_to_hidden(array('from_poste','to_poste', + 'poste_id')); =20 - if (isset($_REQUEST['to_poste']))=20 - echo HtmlInput::hidden('to_poste',$_REQUEST['to_poste']); - - if (isset($_REQUEST['poste_id']))=20 - echo HtmlInput::hidden("poste_id",$_REQUEST['poste_id']); - if ( isset($_REQUEST['letter'] )) echo HtmlInput::hidden('letter','2'); if ( isset($_REQUEST['solded'] )) echo HtmlInput::hidden('solded','1'); =20 @@ -513,8 +501,8 @@ echo ""; echo ''; echo "
"; - =20 =20 + } /*! * \brief verify that the poste belong to a ledger @@ -523,7 +511,9 @@ */ function belong_ledger($p_jrn) { - $filter=3D$this->db->get_value("select jrn_def_class_cred from j= rn_def where jrn_def_id=3D$p_jrn"); + $filter=3D$this->db->get_value("select jrn_def_class_cred from j= rn_def where jrn_def_id=3D$1", + array($p_jrn)); + if ( trim ($filter) =3D=3D '') return 0; =20 Modified: phpcompta/trunk/include/class_fiche.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_fiche.php 2011-10-22 20:16:44 UTC (rev = 4225) +++ phpcompta/trunk/include/class_fiche.php 2011-10-22 20:17:50 UTC (rev = 4226) @@ -71,7 +71,7 @@ */ function get_bk_account() { - =20 + $user=3Dnew User($this->cn); $sql_ledger=3D$user->get_ledger_sql('FIN',3); $avail=3D$this->cn->get_array("select jrn_def_id,jrn_def_bank from= jrn_def where jrn_def_type=3D'FIN' and $sql_ledger @@ -105,7 +105,7 @@ if ( $p_qcode =3D=3D null ) $p_qcode=3D$this->quick_code; $p_qcode=3Dtrim($p_qcode); - $sql=3D"select f_id from fiche_detail=20 + $sql=3D"select f_id from fiche_detail where ad_id=3D23 and ad_value=3Dupper($1)"; $this->id=3D$this->cn->get_value($sql,array($p_qcode)); if ( $this->cn->count()=3D=3D0) @@ -149,8 +149,8 @@ return; } $sql=3D"select * - from=20 - fiche=20 + from + fiche natural join fiche_detail join jnt_fic_attr on (jnt_fic_attr.fd_id=3Dfiche.fd_id and fiche_d= etail.ad_id=3Djnt_fic_attr.ad_id) join attr_def on (attr_def.ad_id=3Dfiche_detail.ad_id) wher= e f_id=3D".$this->id. @@ -214,7 +214,7 @@ */ function seek($p_attribut,$p_value) { - $sql=3D"select jft_id,f_id,fd_id,ad_id,ad_value from fiche join = fiche_detail using (f_id)=20 + $sql=3D"select jft_id,f_id,fd_id,ad_id,ad_value from fiche join = fiche_detail using (f_id) where ad_id=3D$1 and upper(ad_value)=3Dupper($2)"; $res=3D$this->cn->get_array($sql,array($p_attribut,$p_value)); return $res; @@ -662,7 +662,7 @@ $msg=3D$w->search(); $msg.=3D$label->input(); break; - =20 + default: var_dump($r); throw new Exception("Type invalide"); @@ -732,7 +732,7 @@ =20 list ($id) =3D sscanf ($name,"av_text%d"); if ( $id =3D=3D null ) continue; - =20 + // Special traitement // quickcode if ( $id =3D=3D ATTR_DEF_QUICKCODE) @@ -833,7 +833,7 @@ foreach ($p_array as $name=3D>$value ) { if ( preg_match('/^av_text[0-9]+$/',$name) =3D=3D 0) continue; - =20 + list ($id) =3D sscanf ($name,"av_text%d"); =20 if ( $id =3D=3D null ) continue; @@ -905,8 +905,13 @@ if ( $id =3D=3D ATTR_DEF_ACCOUNT ) { $v=3DFormatString($value); - if ( isNumber($v) =3D=3D 1 || strpos($v,',') !=3D 0 = ) + if ( trim($v) !=3D '' ) { + if ( strpos($v,',') !=3D 0) + { + $v=3D$this->cn->get_value('select format_account($1)', + array($v)); + } $sql=3Dsprintf("select account_update(%d,'%s')", $this->id,$v); try @@ -928,14 +933,6 @@ try { $Ret=3D$this->cn->exec_sql($sql); - /* update also the jrnx */ - - /* The jrnx CANNOT BE UPDATED - $sql=3D'update jrnx set j_post= e=3D$1 where j_qcode in (select quick_code from vw_fiche_attr where f_id=3D= $2)'; - $this->cn->exec_sql( - $sql, - array($v,$this->id)); - */ } catch (Exception $e) { @@ -1248,7 +1245,7 @@ * \brief HtmlTable, display a HTML of a card for the asked period * \param $p_array default =3D null keys =3D from_periode, to_period= e *\param $op_let 0 all operation, 1 only lettered one, 2 only unlett= ered one - *\return -1 if nothing is found otherwise 0 =20 + *\return -1 if nothing is found otherwise 0 *\see get_row_date */ function HtmlTable($p_array=3Dnull,$op_let=3D0,$from_div=3D1) @@ -1461,7 +1458,7 @@ ( select j_poste, case when j_debit=3D't' then j_montant = else 0 end as deb, case when j_debit=3D'f' then j_montant = else 0 end as cred - from jrnx=20 + from jrnx join jrn on (jr_grpt_id=3Dj_grpt) where j_qcode =3D ('$qcode'::text) @@ -1476,7 +1473,7 @@ return array('debit'=3D>$r['sum_deb'], 'credit'=3D>$r['sum_cred'], 'solde'=3D>abs($r['sum_deb']-$r['sum_cred'])); - =20 + } /*!\brief check if an attribute is empty *\param $p_attr the id of the attribut to check (ad_id) @@ -1589,8 +1586,8 @@ $r.=3D' '.(($amount['debit']=3D=3D0)?0:n= bm($amount['debit'])).'€'; $r.=3D' '.(($amount['credit']=3D=3D0)?0:nbm($am= ount['credit'])).'€'; $r.=3D' '.nbm($amount['solde'])."€"; - =20 =20 + $r.=3D""; =20 } @@ -1747,7 +1744,7 @@ { // Remove from attr_value $Res=3D$this->cn->exec_sql("delete from fiche_detail - where=20 + where f_id=3D".$this->id); =20 // Remove from fiche Modified: phpcompta/trunk/include/class_own.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_own.php 2011-10-22 20:16:44 UTC (rev 42= 25) +++ phpcompta/trunk/include/class_own.php 2011-10-22 20:17:50 UTC (rev 42= 26) @@ -54,10 +54,10 @@ /*! ************************************************** * \brief save the parameter into the database by inserting or upda= ting - * =20 - * =20 + * + * * \param $p_attr give the attribut name - *=20 + * */ function save($p_attr) { @@ -82,8 +82,8 @@ /*! ************************************************** * \brief save data - * =20 * + * */ function update() { @@ -103,6 +103,7 @@ $this->save('MY_PJ_SUGGEST'); $this->save('MY_CHECK_PERIODE'); $this->save('MY_DATE_SUGGEST'); + $this->save('MY_ALPHANUM'); =20 =20 } Modified: phpcompta/trunk/include/impress_poste.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/impress_poste.inc.php 2011-10-22 20:16:44 UTC= (rev 4225) +++ phpcompta/trunk/include/impress_poste.inc.php 2011-10-22 20:17:50 UTC= (rev 4226) @@ -28,7 +28,7 @@ * file included from user_impress * * some variable are already defined $cn, $User ... - *=20 + * */ //----------------------------------------------------- // Show the jrn and date @@ -138,18 +138,19 @@ require_once("class_acc_account_ledger.php"); $go=3D0; // we ask a poste_id - if ( isset($_GET['poste_id']) && strlen(trim($_GET['poste_id'])) !=3D= 0 && isNumber($_GET['poste_id']) ) + if ( isset($_GET['poste_id']) && strlen(trim($_GET['poste_id'])) !=3D= 0 ) { + $poste=3D$cn->get_value('select format_account($1)',array($_GET['poste_= id'])); + if ( isset ($_GET['poste_fille']) ) { - $parent=3D$_GET['poste_id']; - $a_poste=3D$cn->get_array("select pcm_val from tmp_pcmn wher= e pcm_val::text like '$parent%' order by pcm_val::text"); + $a_poste=3D$cn->get_array("select pcm_val from tmp_pcmn wher= e pcm_val::text like $1||'%' order by pcm_val::text",array($poste)); $go=3D3; } // Check if the post is numeric and exists - elseif ( $cn->count_sql('select * from tmp_pcmn where pcm_val=3D= $1',array($_GET['poste_id'])) !=3D 0 ) + elseif ( $cn->count_sql('select * from tmp_pcmn where pcm_val=3D= $1',array($poste)) !=3D 0 ) { - $Poste=3Dnew Acc_Account_Ledger($cn,$_GET['poste_id']); + $Poste=3Dnew Acc_Account_Ledger($cn,$poste); $go=3D1; } } Property changes on: phpcompta/trunk/sql ___________________________________________________________________ Name: svn:ignore + .upgrade.sql.swp Added: phpcompta/trunk/sql/account-update.sql =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/sql/account-update.sql (rev 0= ) +++ phpcompta/trunk/sql/account-update.sql 2011-10-22 20:17:50 UTC (rev 4= 226) @@ -0,0 +1,55 @@ +-- Function: comptaproc.account_update(integer, account_type) + +-- DROP FUNCTION comptaproc.account_update(integer, account_type); + +CREATE OR REPLACE FUNCTION comptaproc.account_update(p_f_id integer, p_a= ccount account_type) + RETURNS integer AS +$BODY$ +declare + nMax fiche.f_id%type; + nCount integer; + nParent tmp_pcmn.pcm_val_parent%type; + sName varchar; + first text; + second text; +begin + + if length(trim(p_account)) !=3D 0 then + -- 2 accounts in card separated by comma=20 + if position (',' in p_account) =3D 0 then + select count(*) into nCount from tmp_pcmn where pcm_val=3Dp_account; + if nCount =3D 0 then + select ad_value into sName from + fiche_detail + where + ad_id=3D1 and f_id=3Dp_f_id; + nParent:=3Daccount_parent(p_account); + insert into tmp_pcmn(pcm_val,pcm_lib,pcm_val_parent) values (p_accoun= t,sName,nParent); + end if; + else + raise info 'presence of a comma'; + -- there is 2 accounts separated by a comma + first :=3D split_part(p_account,',',1); + second :=3D split_part(p_account,',',2); + -- check there is no other coma + raise info 'first value % second value %', first, second; + + if position (',' in first) !=3D 0 or position (',' in second) !=3D 0 = then + raise exception 'Too many comas, invalid account'; + end if; + -- check that both account are in PCMN + =09 + end if; + else + -- account is null + update fiche_detail set ad_value=3Dnull where f_id=3Dp_f_id and ad_id=3D= 5 ; + end if; +=09 + update fiche_detail set ad_value=3Dp_account where f_id=3Dp_f_id and ad= _id=3D5 ; + +return 0; +end; +$BODY$ + LANGUAGE plpgsql VOLATILE + COST 100; +ALTER FUNCTION comptaproc.account_update(integer, account_type) OWNER TO= dany; Added: phpcompta/trunk/sql/account_alphanum.sql =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/sql/account_alphanum.sql (rev= 0) +++ phpcompta/trunk/sql/account_alphanum.sql 2011-10-22 20:17:50 UTC (rev= 4226) @@ -0,0 +1,21 @@ +-- Function: comptaproc.account_auto(integer) + +-- DROP FUNCTION comptaproc.account_auto(integer); + +CREATE OR REPLACE FUNCTION comptaproc.account_alphanum() + RETURNS boolean AS +$BODY$ +declare + l_auto bool; +begin + l_auto :=3D true; + select pr_value into l_auto from parameter where pr_id=3D'MY_ALPHANUM'; + if l_auto =3D 'N' or l_auto is null then + l_auto:=3Dfalse; + end if; + return l_auto; +end; +$BODY$ + LANGUAGE plpgsql VOLATILE + COST 100; +ALTER FUNCTION comptaproc.account_auto(integer) OWNER TO dany; Added: phpcompta/trunk/sql/account_compute.sql =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/sql/account_compute.sql (rev = 0) +++ phpcompta/trunk/sql/account_compute.sql 2011-10-22 20:17:50 UTC (rev = 4226) @@ -0,0 +1,48 @@ +-- Function: comptaproc.account_compute(integer) + +-- DROP FUNCTION comptaproc.account_compute(integer); + +CREATE OR REPLACE FUNCTION comptaproc.account_compute(p_f_id integer) + RETURNS account_type AS +$BODY$ +declare + class_base fiche_def.fd_class_base%type; + maxcode numeric; + sResult account_type; + bAlphanum bool; +begin + select fd_class_base into class_base + from + fiche_def join fiche using (fd_id) + where + f_id=3Dp_f_id; + raise notice 'account_compute class base %',class_base; + bAlphanum :=3D account_alphanum(); + if bAlphanum =3D false then + select count (pcm_val) into maxcode from tmp_pcmn where pcm_val_parent= =3D class_base; + if maxcode =3D 0 then + maxcode:=3Dclass_base::numeric; + else + select max (pcm_val) into maxcode from tmp_pcmn where pcm_val_parent = =3D class_base; + maxcode:=3Dmaxcode::numeric; + end if; + if maxcode::text =3D class_base then + maxcode:=3Dclass_base::numeric*1000; + end if; + maxcode:=3Dmaxcode+1; + raise notice 'account_compute Max code %',maxcode; + sResult:=3Dmaxcode::account_type; + else + -- if alphanum, use name + select ad_value into sName from fiche_detail where f_id=3Dp_f_id and a= d_id=3D1; + if sName is null then + raise exception 'Cannot compute an accounting without the name of the= card for %',p_f_id; + end if; + sResult :=3D class_base||sName; + end if; + return sResult; +end; +$BODY$ + LANGUAGE plpgsql VOLATILE + COST 100; +ALTER FUNCTION comptaproc.account_compute(integer) OWNER TO dany; Added: phpcompta/trunk/sql/account_insert.sql =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/sql/account_insert.sql (rev 0= ) +++ phpcompta/trunk/sql/account_insert.sql 2011-10-22 20:17:50 UTC (rev 4= 226) @@ -0,0 +1,94 @@ +-- Function: comptaproc.account_insert(integer, text) + +-- DROP FUNCTION comptaproc.account_insert(integer, text); + +CREATE OR REPLACE FUNCTION comptaproc.account_insert(p_f_id integer, p_a= ccount text) + RETURNS integer AS +$BODY$ +declare + nParent tmp_pcmn.pcm_val_parent%type; + sName varchar; + nNew tmp_pcmn.pcm_val%type; + bAuto bool; + nFd_id integer; + sClass_Base fiche_def.fd_class_base%TYPE; + nCount integer; + first text; + second text; +begin + + if p_account is not null and length(trim(p_account)) !=3D 0 then + -- if there is coma in p_account, treat normally + if position (',' in p_account) =3D 0 then + raise info 'p_account is not empty'; + select count(*) into nCount from tmp_pcmn where pcm_val=3Dp_account= ::account_type; + raise notice 'found in tmp_pcm %',nCount; + if nCount !=3D0 then + raise info 'this account exists in tmp_pcmn '; + perform attribut_insert(p_f_id,5,p_account); + else + -- account doesn't exist, create it + select ad_value into sName from + fiche_detail + where + ad_id=3D1 and f_id=3Dp_f_id; + + nParent:=3Daccount_parent(p_account::account_type); + insert into tmp_pcmn(pcm_val,pcm_lib,pcm_val_parent) values (p_acco= unt::account_type,sName,nParent); + perform attribut_insert(p_f_id,5,p_account); + + end if; + else + raise info 'presence of a comma'; + -- there is 2 accounts separated by a comma + first :=3D split_part(p_account,',',1); + second :=3D split_part(p_account,',',2); + -- check there is no other coma + raise info 'first value % second value %', first, second; + + if position (',' in first) !=3D 0 or position (',' in second) !=3D 0 = then + raise exception 'Too many comas, invalid account'; + end if; + perform attribut_insert(p_f_id,5,p_account); + end if; + else + raise info 'p_account is empty'; + select fd_id into nFd_id from fiche where f_id=3Dp_f_id; + + bAuto:=3D account_auto(nFd_id); + =09 +=09 + select fd_class_base into sClass_base from fiche_def where fd_id=3DnFd= _id; + raise info 'sClass_Base : %',sClass_base; + if bAuto =3D true=20 + then + raise info 'account generated automatically'; + nNew:=3Daccount_compute(p_f_id); + raise info 'nNew %', nNew; + select ad_value into sName from + fiche_detail + where + ad_id=3D1 and f_id=3Dp_f_id; + nParent:=3Daccount_parent(nNew); + perform account_add (nNew,sName); + perform attribut_insert(p_f_id,5,nNew); + + else + =09 + -- if there is an account_base then it is the default + select fd_class_base::account_type into nNew from fiche_def join= fiche using (fd_id) where f_id=3Dp_f_id; + if nNew is null or length(trim(nNew)) =3D 0 then + raise notice 'count is null'; + perform attribut_insert(p_f_id,5,null); + else + perform attribut_insert(p_f_id,5,nNew); + end if; + end if; + end if; + +return 0; +end; +$BODY$ + LANGUAGE plpgsql VOLATILE + COST 100; +ALTER FUNCTION comptaproc.account_insert(integer, text) OWNER TO dany; Added: phpcompta/trunk/sql/format_account.sql =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/sql/format_account.sql (rev 0= ) +++ phpcompta/trunk/sql/format_account.sql 2011-10-22 20:17:50 UTC (rev 4= 226) @@ -0,0 +1,32 @@ +-- Function: comptaproc.format_account(account_type) + +-- DROP FUNCTION comptaproc.format_account(account_type); + +CREATE OR REPLACE FUNCTION comptaproc.format_account(p_account account_t= ype) + RETURNS account_type AS +$BODY$ + +declare + +sResult account_type; + +begin +sResult :=3D lower(p_account); + +sResult :=3D translate(sResult,'=C3=A9=C3=A8=C3=AA=C3=AB=C3=A0=C3=A2=C3=A4= =C3=AF=C3=AE=C3=BC=C3=BB=C3=B9=C3=B6=C3=B4','eeeeaaaiiuuuoo'); +sResult :=3D translate(sResult,' $=E2=82=AC=C2=B5=C2=A3%.+-/\!(){}(),;_&= |"#''^',''); + +if not sResult similar to '^[[:alnum:]_]+$' then + raise exception 'Invalid character in %',p_account; +end if; + +return upper(sResult); + +end;$BODY$ + LANGUAGE plpgsql VOLATILE + COST 100; +ALTER FUNCTION comptaproc.format_account(account_type) OWNER TO dany; +COMMENT ON FUNCTION comptaproc.format_account(account_type) IS 'format t= he accounting : +- upper case +- remove space and special char. +'; Added: phpcompta/trunk/sql/tmp_pcmn_alphanum_ins_upd.sql =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/sql/tmp_pcmn_alphanum_ins_upd.sql = (rev 0) +++ phpcompta/trunk/sql/tmp_pcmn_alphanum_ins_upd.sql 2011-10-22 20:17:50= UTC (rev 4226) @@ -0,0 +1,16 @@ + +CREATE OR REPLACE FUNCTION comptaproc.tmp_pcmn_alphanum_ins_upd() + RETURNS trigger AS +$BODY$ +declare + r_record tmp_pcmn%ROWTYPE; +begin +r_record :=3D NEW; +r_record.pcm_val:=3Dformat_account(NEW.pcm_val); + +return r_record; +end; +$BODY$ + LANGUAGE plpgsql VOLATILE + COST 100; +ALTER FUNCTION comptaproc.tmp_pcmn_ins() OWNER TO dany; Added: phpcompta/trunk/sql/trigger.tmp_pcmn.sql =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/sql/trigger.tmp_pcmn.sql (rev= 0) +++ phpcompta/trunk/sql/trigger.tmp_pcmn.sql 2011-10-22 20:17:50 UTC (rev= 4226) @@ -0,0 +1,9 @@ +-- Trigger: t_tmp_pcm_alphanum_ins_upd on tmp_pcmn + +-- DROP TRIGGER t_tmp_pcm_alphanum_ins_upd ON tmp_pcmn; + +CREATE TRIGGER t_tmp_pcm_alphanum_ins_upd + BEFORE INSERT OR UPDATE + ON tmp_pcmn + FOR EACH ROW + EXECUTE PROCEDURE comptaproc.tmp_pcmn_alphanum_ins_upd(); Modified: phpcompta/trunk/sql/upgrade.sql =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/sql/upgrade.sql 2011-10-22 20:16:44 UTC (rev 4225) +++ phpcompta/trunk/sql/upgrade.sql 2011-10-22 20:17:50 UTC (rev 4226) @@ -1,3 +1,17 @@ drop table public.import_tmp; drop table public.format_csv_banque; +insert into parametre values ('MY_ALPHANUM','N'); + +/* +script SQL to run +account_alphanum.sql +account_compute.sql +account_insert.sql +account-update.sql +change-pcmn-to-alphanum.sql +format_account.sql +tmp_pcmn_alphanum_ins_upd.sql +tmp_pcmn_ins.sql +trigger.tmp_pcmn.sql +*/ create unique index test_qcode_idx on fiche_detail (ad_value) where ad_i= d=3D23; From MAILER-DAEMON Sat Oct 22 16:12:00 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RHhvE-00031w-KZ for mharc-phpcompta-dev@gnu.org; Sat, 22 Oct 2011 16:12:00 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sat, 22 Oct 2011 22:19:20 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4227 - phpcompta/trunk/sql X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Oct 2011 20:11:59 -0000 Author: danydb Date: 2011-10-22 22:19:19 +0200 (Sat, 22 Oct 2011) New Revision: 4227 Modified: phpcompta/trunk/sql/upgrade.sql Log: add index to avoid duplicate quickcode Modified: phpcompta/trunk/sql/upgrade.sql =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/sql/upgrade.sql 2011-10-22 20:17:50 UTC (rev 4226) +++ phpcompta/trunk/sql/upgrade.sql 2011-10-22 20:19:19 UTC (rev 4227) @@ -14,4 +14,4 @@ tmp_pcmn_ins.sql trigger.tmp_pcmn.sql */ -create unique index test_qcode_idx on fiche_detail (ad_value) where ad_i= d=3D23; +create unique index qcode_idx on fiche_detail (ad_value) where ad_id=3D2= 3; From MAILER-DAEMON Sat Oct 22 16:30:31 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RHiD9-0004iB-J6 for mharc-phpcompta-dev@gnu.org; Sat, 22 Oct 2011 16:30:31 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sat, 22 Oct 2011 22:37:49 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4228 - phpcompta/trunk/include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Oct 2011 20:30:30 -0000 Author: danydb Date: 2011-10-22 22:37:48 +0200 (Sat, 22 Oct 2011) New Revision: 4228 Modified: phpcompta/trunk/include/class_acc_account.php phpcompta/trunk/include/param_pcmn.inc.php Log: #120 alphanumeric accounting Modified: phpcompta/trunk/include/class_acc_account.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_acc_account.php 2011-10-22 20:19:19 UTC= (rev 4227) +++ phpcompta/trunk/include/class_acc_account.php 2011-10-22 20:37:48 UTC= (rev 4228) @@ -19,7 +19,7 @@ /* $Revision$ */ // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr /*! \file - * \brief Manage the account=20 + * \brief Manage the account */ /*! * \brief Manage the account from the table tmp_pcmn @@ -117,16 +117,10 @@ // otherwise we check only the value if ( strcmp ($p_member,'pcm_val') =3D=3D 0 ) { - if (is_numeric($p_value) =3D=3D0 ) - throw new Exception('Poste comptable incorrect '.$p_= value); - else return true; } else if ( strcmp ($p_member,'pcm_val_parent') =3D=3D 0 ) { - if ( is_numeric($p_value) =3D=3D 0 || ($this->count($p_v= alue) =3D=3D 0 && $p_value !=3D0)) - throw new Exception('Poste comptable parent incorrec= t '.$p_value); - else return true; } else if ( strcmp ($p_member,'pcm_lib') =3D=3D 0 ) @@ -147,7 +141,7 @@ =20 } /*!\brief Get all the value for this object from the database - * the data member are set=20 + * the data member are set * \return false if this account doesn't exist otherwise true */ function load() Modified: phpcompta/trunk/include/param_pcmn.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/param_pcmn.inc.php 2011-10-22 20:19:19 UTC (r= ev 4227) +++ phpcompta/trunk/include/param_pcmn.inc.php 2011-10-22 20:37:48 UTC (r= ev 4228) @@ -194,10 +194,10 @@ $p_val=3Dtrim($p_val); $p_parent=3Dtrim($p_parent); =20 - if ( isset ( $p_val) && isset ( $p_lib ) && isNumber($p_val) && isNu= mber($p_parent) ) + if ( isset ( $p_val) && isset ( $p_lib ) ) { - $p_val=3Dtrim($p_val); - $p_parent=3D$_POST["p_parent"]; + $p_val=3D$cn->get_value('select format_account($1)',array($p_val= )); + $p_parent=3D$cn->get_value('select format_account($1)',array($_P= OST["p_parent"])); if ( strlen ($p_val) !=3D 0 && strlen ($p_lib) !=3D 0 ) { if (strlen ($p_val) =3D=3D 1 ) From MAILER-DAEMON Sun Oct 23 14:44:06 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RI31i-0002uW-Ju for mharc-phpcompta-dev@gnu.org; Sun, 23 Oct 2011 14:44:06 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sun, 23 Oct 2011 20:51:11 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4229 - in phpcompta/branches/rel600-dynamic-menu: html include include/template sql X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Oct 2011 18:44:03 -0000 Author: danydb Date: 2011-10-23 20:51:09 +0200 (Sun, 23 Oct 2011) New Revision: 4229 Added: phpcompta/branches/rel600-dynamic-menu/sql/backup-new-object.sh phpcompta/branches/rel600-dynamic-menu/sql/object-6.0.sql Modified: phpcompta/branches/rel600-dynamic-menu/html/do.php phpcompta/branches/rel600-dynamic-menu/include/ac_common.php phpcompta/branches/rel600-dynamic-menu/include/balance.inc.php phpcompta/branches/rel600-dynamic-menu/include/class_acc_account_ledge= r.php phpcompta/branches/rel600-dynamic-menu/include/constant.php phpcompta/branches/rel600-dynamic-menu/include/fiche.inc.php phpcompta/branches/rel600-dynamic-menu/include/impress_bilan.inc.php phpcompta/branches/rel600-dynamic-menu/include/impress_fiche.inc.php phpcompta/branches/rel600-dynamic-menu/include/impress_gl_comptes.inc.= php phpcompta/branches/rel600-dynamic-menu/include/impress_jrn.inc.php phpcompta/branches/rel600-dynamic-menu/include/impress_poste.inc.php phpcompta/branches/rel600-dynamic-menu/include/impress_rapport.inc.php phpcompta/branches/rel600-dynamic-menu/include/impress_rec.inc.php phpcompta/branches/rel600-dynamic-menu/include/template/menu.php phpcompta/branches/rel600-dynamic-menu/include/template/module.php Log: Dynamic menu: impress works Modified: phpcompta/branches/rel600-dynamic-menu/html/do.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/html/do.php 2011-10-22 20:37:4= 8 UTC (rev 4228) +++ phpcompta/branches/rel600-dynamic-menu/html/do.php 2011-10-23 18:51:0= 9 UTC (rev 4229) @@ -41,21 +41,19 @@ =20 if (isset($_REQUEST['ac'])) { - $all =3D explode(':', $_REQUEST['ac']); + $all =3D explode('/', $_REQUEST['ac']); $module_selected =3D $all[0]; -} =20 // Show module and highligt selected one -show_module($module_selected); - -// if $module_selected !=3D -1, -if ($module_selected !=3D - 1) -{ - // show the menu - show_menu($all); - + show_module($module_selected); + for ( $i=3D0;$i !=3D count($all);$i++) + { // show the menu + show_menu($all,$i); + } } else { - show_default(); + show_module(-1); } + + Modified: phpcompta/branches/rel600-dynamic-menu/include/ac_common.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/ac_common.php 2011-10-= 22 20:37:48 UTC (rev 4228) +++ phpcompta/branches/rel600-dynamic-menu/include/ac_common.php 2011-10-= 23 18:51:09 UTC (rev 4229) @@ -693,12 +693,17 @@ */ function show_module($selected) { + global $g_user; $cn=3DDossier::connect(); - $amodule=3D$cn->get_array("select m_code,m_menu,m_url from module or= der by m_order"); + $amodule=3D$cn->get_array("select me_code,me_menu,me_url from v_all_= menu + where + user_name=3D$1 + and me_module=3D'Y' + order by p_order",array($g_user->login)); require_once('template/module.php'); if ( $selected !=3D -1 ) { - $file=3D$cn->get_value("select m_file from module where m_code=3D$1",ar= ray($selected)); + $file=3D$cn->get_value("select me_file from v_all_menu where me_code=3D= $1",array($selected)); if ($file !=3D '') require_once $file; } @@ -720,13 +725,35 @@ /** * */ -function show_menu($module) +function show_menu($module,$idx) { + global $g_user; $cn=3DDossier::connect(); - $amenu=3D$cn->get_array("select me_id,me_menu from menu - join menu_ref using (me_code) - join module using (m_code) where - m_code=3D$1 order by me_order",array($module[0])); - require_once 'template/menu.php'; + $amenu=3D$cn->get_array("select + me_menu,me_code + from v_all_menu + where + me_code_dep=3D$1 order by p_order",array($module[$idx])); + + if (! empty ($amenu)) + { + require 'template/menu.php'; + } + else + { + $file=3D$cn->get_value("select me_file + from v_all_menu + where + user_name=3D$1 and me_code=3D$2 and + (me_file is not null or trim(me_file) <>'')", + array($g_user->login,$module[$idx])); + + if ( $file !=3D "" ) + { + echo '
'; + require_once "$file"; + echo '
'; + } + } } ?> Modified: phpcompta/branches/rel600-dynamic-menu/include/balance.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/balance.inc.php 2011-1= 0-22 20:37:48 UTC (rev 4228) +++ phpcompta/branches/rel600-dynamic-menu/include/balance.inc.php 2011-1= 0-23 18:51:09 UTC (rev 4229) @@ -22,7 +22,7 @@ * \brief Show the balance and let you print it or export to PDF * file included by user_impress * - * some variable are already defined ($cn, $User ...) + * some variable are already defined ($cn, $g_user ...) */ =20 include_once ("ac_common.php"); @@ -34,12 +34,12 @@ require_once('class_acc_ledger.php'); require_once('class_periode.php'); require_once('class_exercice.php'); -global $User; +global $g_user; +$gDossier=3Ddossier::id(); +$g_user->can_request(IMPBAL); +$exercice=3D(isset($_GET['exercice']))?$_GET['exercice']:$g_user->get_ex= ercice(); =20 -$User->can_request(IMPBAL); -$exercice=3D(isset($_GET['exercice']))?$_GET['exercice']:$User->get_exer= cice(); =20 - echo '
'; /* * Let you change the exercice @@ -72,7 +72,7 @@ $input_from->type=3DALL; $input_from->cn=3D$cn; $input_from->filter_year=3Dtrue; -$input_from->user=3D$User; +$input_from->user=3D$g_user; =20 echo 'Depuis :'.$input_from->input(); // filter on the current year @@ -82,7 +82,7 @@ $input_to->filter_year=3Dtrue; $input_to->type=3DALL; $input_to->cn=3D$cn; -$input_to->user=3D$User; +$input_to->user=3D$g_user; echo ' jusque :'.$input_to->input(); =20 //------------------------------------------------- @@ -91,7 +91,7 @@ /* add a all ledger choice */ echo 'Filtre '; $rad=3Dnew IRadio(); -$array_ledger=3D$User->get_ledger('ALL',3); +$array_ledger=3D$g_user->get_ledger('ALL',3); $selected=3D(isset($_GET['r_jrn']))?$_GET['r_jrn']:null; $select_cat=3D(isset($_GET['r_cat']))?$_GET['r_cat']:null; $array_cat=3DAcc_Ledger::array_cat(); Modified: phpcompta/branches/rel600-dynamic-menu/include/class_acc_accoun= t_ledger.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/class_acc_account_ledg= er.php 2011-10-22 20:37:48 UTC (rev 4228) +++ phpcompta/branches/rel600-dynamic-menu/include/class_acc_account_ledg= er.php 2011-10-23 18:51:09 UTC (rev 4229) @@ -129,18 +129,18 @@ $filter=3Dstr_replace('jrn_def_id','jr_def_id',$filter_sql); $bal_sql=3D"select sum(amount_deb) as s_deb,sum(amount_cred) as s_c= red, j_poste from (select case when j_debit=3D't' then j_montant el= se 0 end as amount_deb, case when j_debit=3D'f' then j_montant else 0 end as amount_cred= , - j_poste=20 + j_poste from jrnx join jrn on (j_grpt =3D jr_grpt_id) - where=20 + where j_poste=3D$1 and $filter and - ( to_date($2,'DD.MM.YYYY') <=3D j_date and=20 + ( to_date($2,'DD.MM.YYYY') <=3D j_date and to_date($3,'DD.MM.YYYY') >=3D j_date = )) as signed_amount group by j_poste "; $r=3D$this->db->get_array($bal_sql,array($this->id,$p_from,$p_to)); if ( $this->db->count() =3D=3D 0 ) return array(); - if ($r[0]['s_deb']=3D=3D$r[0]['s_cred']) return array();=20 + if ($r[0]['s_deb']=3D=3D$r[0]['s_cred']) return array(); } $Res=3D$this->db->exec_sql("select jr_id,to_char(j_date,'DD.MM.= YYYY') as j_date_fmt,j_date,". "case when j_debit=3D't' then j_montant= else 0 end as deb_montant,". @@ -311,7 +311,7 @@ } /*! * \brief HtmlTable, display a HTML of a poste for the asked period - * \param $p_array array for filter=20 + * \param $p_array array for filter * \param $let lettering of operation 0 * \return -1 if nothing is found otherwise 0 */ @@ -381,7 +381,7 @@ $progress=3Dbcadd($progress,$tmp_diff); $sum_cred=3Dbcadd($sum_cred,$op['cred_montant']); $sum_deb=3Dbcadd($sum_deb,$op['deb_montant']); - =20 + echo "". "".format_date($op['j_date'])."". td(h($op['jr_pj_number'])). @@ -390,7 +390,7 @@ "".nbm($op['deb_montant'])."". "".nbm($op['cred_montant'])."". td(nbm(abs($progress)),'style=3D"text-align:right"'). - =20 + td($let,' style=3D"color:red;text-align:right"'). ""; $old_exercice=3D$op['p_exercice']; @@ -439,9 +439,9 @@ default: throw new Exception(" Fonction HtmlTableHeader argument actiontarget = invalid"); exit; - } =20 + } $hid=3Dnew IHidden(); - =20 + echo ""; echo ''; $str_ople=3D(isset($_REQUEST['ople']))?HtmlInput::hidden('ople',= $_REQUEST['ople']):''; @@ -450,7 +450,7 @@ echo '"; + $hid->input("type","poste").$hid->input('ac',$_REQUEST['ac']).""; } =20 =20 @@ -467,13 +467,13 @@ if ( isset($_REQUEST['letter'] )) echo HtmlInput::hidden('letter','2'); if ( isset($_REQUEST['solded'] )) echo HtmlInput::hidden('solded','1'); =20 - if (isset($_REQUEST['from_poste']))=20 + if (isset($_REQUEST['from_poste'])) echo HtmlInput::hidden('from_poste',$_REQUEST['from_poste']); =20 - if (isset($_REQUEST['to_poste']))=20 + if (isset($_REQUEST['to_poste'])) echo HtmlInput::hidden('to_poste',$_REQUEST['to_poste']); =20 - if (isset($_REQUEST['poste_id']))=20 + if (isset($_REQUEST['poste_id'])) echo HtmlInput::hidden("poste_id",$_REQUEST['poste_id']); =20 if (isset($_REQUEST['poste_fille'])) @@ -492,13 +492,13 @@ $hid->input("from_periode",$_REQUEST['from_periode']). $hid->input("to_periode",$_REQUEST['to_periode']); =20 - if (isset($_REQUEST['from_poste']))=20 + if (isset($_REQUEST['from_poste'])) echo HtmlInput::hidden('from_poste',$_REQUEST['from_poste']); =20 - if (isset($_REQUEST['to_poste']))=20 + if (isset($_REQUEST['to_poste'])) echo HtmlInput::hidden('to_poste',$_REQUEST['to_poste']); =20 - if (isset($_REQUEST['poste_id']))=20 + if (isset($_REQUEST['poste_id'])) echo HtmlInput::hidden("poste_id",$_REQUEST['poste_id']); =20 if ( isset($_REQUEST['letter'] )) echo HtmlInput::hidden('letter','2'); @@ -513,8 +513,8 @@ echo ""; echo ''; echo "
'. dossier::hidden(). HtmlInput::submit('bt_other',"Autre poste"). - $hid->input("type","poste").$hid->input('p_action','impress')."
"; - =20 =20 + } /*! * \brief verify that the poste belong to a ledger Modified: phpcompta/branches/rel600-dynamic-menu/include/constant.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/constant.php 2011-10-2= 2 20:37:48 UTC (rev 4228) +++ phpcompta/branches/rel600-dynamic-menu/include/constant.php 2011-10-2= 3 18:51:09 UTC (rev 4229) @@ -35,7 +35,12 @@ /*set to none for production */ /* uncomment for production */ =20 -$version_phpcompta=3D9999; +/* + * $version_phpcompta=3DSVNINFO; + * define ("DEBUG",false); + * + */ +$version_phpcompta=3D4208; define ("DEBUG",true); =20 define ("DBVERSION",97); Modified: phpcompta/branches/rel600-dynamic-menu/include/fiche.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/fiche.inc.php 2011-10-= 22 20:37:48 UTC (rev 4228) +++ phpcompta/branches/rel600-dynamic-menu/include/fiche.inc.php 2011-10-= 23 18:51:09 UTC (rev 4229) @@ -34,7 +34,7 @@ =20 $gDossier=3Ddossier::id(); $str_dossier=3Ddossier::get(); -global $User; +global $g_user; =20 $pop_tva=3Dnew IPopup('popup_tva'); $pop_tva->title=3D_('Choix TVA'); @@ -44,7 +44,7 @@ =20 $cn=3Dnew Database($gDossier); // Security check -$write=3D$User->check_action(FICADD); +$write=3D$g_user->check_action(FICADD); if ($write =3D=3D 0 ) { /* Cannot Access */ @@ -132,7 +132,7 @@ // in the database if ( isset($_POST['add_modele']) ) { - $User->can_request(FICCAT); + $g_user->can_request(FICCAT); // insert the model of card in database $fiche_def=3Dnew Fiche_Def($cn); $fiche_def->Add($_POST); @@ -141,7 +141,7 @@ =20 if ( isset ($_POST['remove_cat'] ) ) { - $User->can_request(FICCAT); + $g_user->can_request(FICCAT); =20 $fd_id=3Dnew Fiche_Def($cn,$_POST['fd_id']); $remains=3D$fd_id->remove(); @@ -153,7 +153,7 @@ // Add a line in the card model if ( isset ($_POST["add_line"]) ) { - $User->can_request(FIC); + $g_user->can_request(FIC); =20 $r=3D '
'; if ( $write =3D=3D0) @@ -176,7 +176,7 @@ =20 if ( isset($_POST['save_line'])) { - $User->can_request(FICCAT); + $g_user->can_request(FICCAT); $fiche_def=3Dnew Fiche_Def($cn,$_REQUEST['fd_id']); $fiche_def->save_order($_POST); $r=3D '
'; @@ -196,7 +196,7 @@ // Remove lines from a card model if ( isset ($_POST['remove_line']) ) { - $User->can_request(FICCAT); + $g_user->can_request(FICCAT); $r=3D '
'; if ( $write =3D=3D0) $r.=3D "

Pas d'acc=C3=A8s

"; @@ -219,7 +219,7 @@ // Change the name of the card model if ( isset ($_POST["change_name"] ) ) { - $User->can_request(FICCAT); + $g_user->can_request(FICCAT); $r=3D '
'; if ( $write =3D=3D0) $r.=3D "

"._("Pas d'acc=C3=A8s")."

"; @@ -250,7 +250,7 @@ && ! isset ($_POST['move']) && ! isset ($_POST['delete'])) { - $User->can_request(FICADD); + $g_user->can_request(FICADD); =20 echo '
'; $fiche_def=3Dnew Fiche_Def($cn,$_GET['fiche']); @@ -266,7 +266,7 @@ { echo '
'; $t=3Dfalse; - if ( $User->check_action(FICADD)=3D=3D0) + if ( $g_user->check_action(FICADD)=3D=3D0) { echo '

Vos changements ne seront pas sauv= =C3=A9s

'; $t=3Dtrue; @@ -321,7 +321,7 @@ // the property of the card model if ($action =3D=3D "add_modele" ) { - $User->can_request(FICCAT); + $g_user->can_request(FICCAT); echo '
'; echo '
'; $oFiche_Def=3Dnew Fiche_Def($cn); @@ -338,7 +338,7 @@ // Modify a card Model if ($action =3D=3D "modifier" ) { - $User->can_request(FICCAT); + $g_user->can_request(FICCAT); echo '
'; $fiche_def=3Dnew Fiche_Def($cn,$_GET['fiche']); =20 @@ -386,7 +386,7 @@ // Display a blank card from the selected category if ( isset ($_POST["fiche"]) && isset ($_POST["add"] ) ) { - $User->can_request(FICADD); + $g_user->can_request(FICADD); =20 echo '
'; if ( $write =3D=3D0) @@ -416,7 +416,7 @@ // delete a card if (isset($_POST['delete']) ) { - $User->can_request(FIC); + $g_user->can_request(FIC); ShowRecherche(); echo '
'; if ( $write =3D=3D0) @@ -436,7 +436,7 @@ // Add the data (attribute) of the card if ( isset ($_POST["add_fiche"]) ) { - $User->can_request(FICADD); + $g_user->can_request(FICADD); if ( $write =3D=3D0) { echo '
'; @@ -460,7 +460,7 @@ // Update a card if ( isset ($_POST["update_fiche"]) ) { - $User->can_request(FIC); + $g_user->can_request(FIC); echo '
'; if ( $write =3D=3D0) echo "

Pas d'acc=C3=A8s

"; Modified: phpcompta/branches/rel600-dynamic-menu/include/impress_bilan.in= c.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/impress_bilan.inc.php = 2011-10-22 20:37:48 UTC (rev 4228) +++ phpcompta/branches/rel600-dynamic-menu/include/impress_bilan.inc.php = 2011-10-23 18:51:09 UTC (rev 4229) @@ -25,14 +25,14 @@ * \brief form who call the printing of the bilan in RTF * file included by user_impress * - * some variable are already defined ($cn, $User ...) + * some variable are already defined ($cn, $g_user ...) */ =20 //----------------------------------------------------- // Show the jrn and date //----------------------------------------------------- require_once('class_database.php'); -global $User; +global $g_user; //----------------------------------------------------- // Form //----------------------------------------------------- @@ -40,7 +40,7 @@ $bilan=3Dnew Acc_Bilan($cn); $bilan->get_request_get(); echo '
'; -$exercice=3D(isset($_GET['exercice']))?$_GET['exercice']:$User->get_exer= cice(); +$exercice=3D(isset($_GET['exercice']))?$_GET['exercice']:$g_user->get_ex= ercice(); =20 /* * Let you change the exercice Modified: phpcompta/branches/rel600-dynamic-menu/include/impress_fiche.in= c.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/impress_fiche.inc.php = 2011-10-22 20:37:48 UTC (rev 4228) +++ phpcompta/branches/rel600-dynamic-menu/include/impress_fiche.inc.php = 2011-10-23 18:51:09 UTC (rev 4229) @@ -27,7 +27,7 @@ =20 $gDossier=3Ddossier::id(); $cn=3Dnew Database($gDossier); -global $User; +global $g_user; =20 /** * Show first the form @@ -39,7 +39,7 @@ $str_categorie=3D$categorie->input(); =20 /* periode */ -$exercice=3D$User->get_exercice(); +$exercice=3D$g_user->get_exercice(); $iperiode=3Dnew Periode($cn); list ($first,$last)=3D$iperiode->get_limit($exercice); =20 Modified: phpcompta/branches/rel600-dynamic-menu/include/impress_gl_compt= es.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/impress_gl_comptes.inc= .php 2011-10-22 20:37:48 UTC (rev 4228) +++ phpcompta/branches/rel600-dynamic-menu/include/impress_gl_comptes.inc= .php 2011-10-23 18:51:09 UTC (rev 4229) @@ -27,14 +27,14 @@ * \brief Print account (html or pdf) * file included from user_impress * - * some variable are already defined $cn, $User ... + * some variable are already defined $cn, $g_user ... * */ //----------------------------------------------------- // Show the jrn and date //----------------------------------------------------- require_once('class_database.php'); -global $User; +global $g_user; //----------------------------------------------------- // Form //----------------------------------------------------- @@ -48,7 +48,7 @@ =20 $cn=3Dnew Database(dossier::id()); $periode=3Dnew Periode($cn); -$a=3D$periode->get_limit($User->get_exercice()); +$a=3D$periode->get_limit($g_user->get_exercice()); // $a is an array $first_day=3D$a[0]->first_day(); $last_day=3D$a[1]->last_day(); @@ -56,7 +56,7 @@ // filter on period $date_from=3Dnew IDate('from_periode'); $date_to=3Dnew IDate('to_periode'); -$year=3D$User->get_exercice(); +$year=3D$g_user->get_exercice(); $date_from->value=3D(isset($_REQUEST['from_periode'])&& isDate($_REQUEST= ['from_periode'])!=3D0)?$_REQUEST['from_periode']:$first_day; $date_to->value=3D(isset($_REQUEST['to_periode']) && isDate($_REQUEST['t= o_periode']) !=3D0 )?$_REQUEST['to_periode']:$last_day; echo td(_('Depuis').$date_from->input()); Modified: phpcompta/branches/rel600-dynamic-menu/include/impress_jrn.inc.= php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/impress_jrn.inc.php 20= 11-10-22 20:37:48 UTC (rev 4228) +++ phpcompta/branches/rel600-dynamic-menu/include/impress_jrn.inc.php 20= 11-10-23 18:51:09 UTC (rev 4229) @@ -29,19 +29,19 @@ require_once('class_dossier.php'); load_all_script(); $gDossier=3Ddossier::id(); -global $User; +global $g_user; //----------------------------------------------------- // Show the jrn and date //----------------------------------------------------- require_once('class_database.php'); =20 -if ( $User->Admin() =3D=3D 0 && $User->is_local_admin()=3D=3D0) +if ( $g_user->Admin() =3D=3D 0 && $g_user->is_local_admin()=3D=3D0) { $sql=3D"select jrn_def_id,jrn_def_name from jrn_def join jrn_type on jrn_def_type=3Djrn_type_id join user_sec_jrn on uj_jrn_id=3Djrn_def_id where - uj_login=3D'$User->login' + uj_login=3D'$g_user->login' and uj_priv !=3D'X' "; $ret=3D$cn->make_array($sql); @@ -59,7 +59,7 @@ from jrn_def join jrn_type on jrn_def_type=3Djrn_= type_id join user_sec_jrn on uj_jrn_id=3Djrn_def_id where - uj_login=3D'$User->id' + uj_login=3D'$g_user->id' and uj_priv =3D'X' "); // Pour voir tout les journal ? @@ -71,7 +71,7 @@ } if ( count($ret) < 1 ) NoAccess(); -$exercice=3D(isset($_GET['exercice']))?$_GET['exercice']:$User->get_exer= cice(); +$exercice=3D(isset($_GET['exercice']))?$_GET['exercice']:$g_user->get_ex= ercice(); =20 //----------------------------------------------------- // Form Modified: phpcompta/branches/rel600-dynamic-menu/include/impress_poste.in= c.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/impress_poste.inc.php = 2011-10-22 20:37:48 UTC (rev 4228) +++ phpcompta/branches/rel600-dynamic-menu/include/impress_poste.inc.php = 2011-10-23 18:51:09 UTC (rev 4229) @@ -87,7 +87,7 @@ =20 $date_from=3Dnew IDate('from_periode'); $date_to=3Dnew IDate('to_periode'); -$year=3D$User->get_exercice(); +$year=3D$g_user->get_exercice(); $date_from->value=3D(isset($_REQUEST['from_periode']))?$_REQUEST['from_p= eriode']:"01.01.".$year; $date_to->value=3D(isset($_REQUEST['to_periode']))?$_REQUEST['to_periode= ']:"31.12.".$year; echo td(_('Depuis').$date_from->input()); Modified: phpcompta/branches/rel600-dynamic-menu/include/impress_rapport.= inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/impress_rapport.inc.ph= p 2011-10-22 20:37:48 UTC (rev 4228) +++ phpcompta/branches/rel600-dynamic-menu/include/impress_rapport.inc.ph= p 2011-10-23 18:51:09 UTC (rev 4229) @@ -21,14 +21,14 @@ * \brief print first the report in html and propose to print it in pdf * file included by user_impress * - * some variable are already defined ($cn, $User ...) + * some variable are already defined ($cn, $g_user ...) */ require_once("class_ihidden.php"); require_once("class_iselect.php"); require_once("class_idate.php"); require_once("class_acc_report.php"); require_once('class_exercice.php'); -global $User; +global $g_user; //----------------------------------------------------- // If print is asked // First time in html @@ -174,7 +174,7 @@ // Form //----------------------------------------------------- echo '
'; -$exercice=3D(isset($_GET['exercice']))?$_GET['exercice']:$User->get_exer= cice(); +$exercice=3D(isset($_GET['exercice']))?$_GET['exercice']:$g_user->get_ex= ercice(); =20 /* * Let you change the exercice Modified: phpcompta/branches/rel600-dynamic-menu/include/impress_rec.inc.= php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/impress_rec.inc.php 20= 11-10-22 20:37:48 UTC (rev 4228) +++ phpcompta/branches/rel600-dynamic-menu/include/impress_rec.inc.php 20= 11-10-23 18:51:09 UTC (rev 4229) @@ -25,13 +25,13 @@ */ require_once ('class_acc_reconciliation.php'); require_once('function_javascript.php'); -global $User; +global $g_user; =20 /** *@file *@todo add the export to PDF */ -$aledger=3D$User->get_ledger('ALL',3); +$aledger=3D$g_user->get_ledger('ALL',3); echo '
'; echo '
'; $rjrn=3D''; @@ -45,7 +45,7 @@ /* * Limit by date, default current exercice */ -list($start,$end)=3D$User->get_limit_current_exercice(); +list($start,$end)=3D$g_user->get_limit_current_exercice(); $dstart=3Dnew IDate('p_start'); $dstart->value=3D(isset($_REQUEST['p_start']))?$_REQUEST['p_start']:$sta= rt; =20 @@ -106,7 +106,6 @@ echo "Choix invalid"; exit(); } +$gDossier=3DDossier::id(); require_once('template/impress_reconciliation.php'); -exit(); -exit(); exit(); \ No newline at end of file Modified: phpcompta/branches/rel600-dynamic-menu/include/template/menu.ph= p =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/template/menu.php 2011= -10-22 20:37:48 UTC (rev 4228) +++ phpcompta/branches/rel600-dynamic-menu/include/template/menu.php 2011= -10-23 18:51:09 UTC (rev 4229) @@ -2,18 +2,37 @@ + + - + + + @@ -22,66 +41,7 @@ =20
"> + &= ac=3D"> + + + "> - &= ac=3D:"> + $url=3D"";$pt=3D""; + + for ($e=3D0;$e <=3D $idx;$e++): + $url.=3D$pt.$module[$e]; + $pt=3D"/"; + endfor; + $url.=3D$pt.$amenu[$i]['me_code']; +?> "> + &= ac=3D">
-
-1): - $file_to_include=3D$cn->get_array("select me_file,me_submenu from me= nu_ref - join menu using(me_code) - where - m_code=3D$1 and me_id=3D$2",array($module[0],$module[1])); -$gDossier=3Ddossier::id(); -?> - -
- - - get_array("select me_id,me_code,me_menu,me_file fro= m menu - join menu_ref using(me_code) - where - me_submenu in (select me_code from - menu where me_id=3D$1)",array($module[1])); - for ($e=3D0;$e - - - -
"> - &ac=3D::"> - - -
-
- get_value("select me_file from menu - join menu_ref using (me_code) - where me_id=3D$1",array($module[2])); - endif; - else: - $file=3D$file_to_include[0]['me_file']; - endif; -?> - - - - -
+// if something is selected check if file to include or submen +// + ?> Modified: phpcompta/branches/rel600-dynamic-menu/include/template/module.= php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/template/module.php 20= 11-10-22 20:37:48 UTC (rev 4228) +++ phpcompta/branches/rel600-dynamic-menu/include/template/module.php 20= 11-10-23 18:51:09 UTC (rev 4229) @@ -11,25 +11,25 @@ foreach ($amodule as $row): =20 $style=3D"background:white"; - if ( $row['m_menu']=3D=3D'new_line') + if ( $row['me_menu']=3D=3D'new_line') { echo ""; continue; } - if ($row['m_code']=3D=3D$selected) + if ($row['me_code']=3D=3D$selected) { $style=3D"background:red"; } - if ( $row['m_url']!=3D'') + if ( $row['me_url']!=3D'') { - $url=3D$row['m_url']; + $url=3D$row['me_url']; } else { - $url=3D"do.php?gDossier=3D".Dossier::id()."&ac=3D".$row['m_code']; + $url=3D"do.php?gDossier=3D".Dossier::id()."&ac=3D".$row['me_code']; } ?> - ">"> + ">"> Added: phpcompta/branches/rel600-dynamic-menu/sql/backup-new-object.sh =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/sql/backup-new-object.sh = (rev 0) +++ phpcompta/branches/rel600-dynamic-menu/sql/backup-new-object.sh 2011-= 10-23 18:51:09 UTC (rev 4229) @@ -0,0 +1 @@ +pg_dump testdossier82 --inserts -t profile -t menu_ref -t profile_menu -= t profile_user -t v_all_menu > object-6.0.sql Property changes on: phpcompta/branches/rel600-dynamic-menu/sql/backup-ne= w-object.sh ___________________________________________________________________ Name: svn:executable + * Added: phpcompta/branches/rel600-dynamic-menu/sql/object-6.0.sql =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/sql/object-6.0.sql = (rev 0) +++ phpcompta/branches/rel600-dynamic-menu/sql/object-6.0.sql 2011-10-23 = 18:51:09 UTC (rev 4229) @@ -0,0 +1,450 @@ +-- +-- PostgreSQL database dump +-- + +SET statement_timeout =3D 0; +SET client_encoding =3D 'UTF8'; +SET standard_conforming_strings =3D off; +SET check_function_bodies =3D false; +SET client_min_messages =3D warning; +SET escape_string_warning =3D off; + +SET search_path =3D public, pg_catalog; + +SET default_tablespace =3D ''; + +SET default_with_oids =3D false; + +-- +-- Name: menu_ref; Type: TABLE; Schema: public; Owner: dany; Tablespace:= =20 +-- + +CREATE TABLE menu_ref ( + me_code text NOT NULL, + me_menu text, + me_file text, + me_module character(1), + me_url text +); + + +ALTER TABLE public.menu_ref OWNER TO dany; + +-- +-- Name: COLUMN menu_ref.me_code; Type: COMMENT; Schema: public; Owner: = dany +-- + +COMMENT ON COLUMN menu_ref.me_code IS 'Menu Code '; + + +-- +-- Name: COLUMN menu_ref.me_menu; Type: COMMENT; Schema: public; Owner: = dany +-- + +COMMENT ON COLUMN menu_ref.me_menu IS 'Label to display'; + + +-- +-- Name: COLUMN menu_ref.me_file; Type: COMMENT; Schema: public; Owner: = dany +-- + +COMMENT ON COLUMN menu_ref.me_file IS 'if not empty file to include'; + + +-- +-- Name: COLUMN menu_ref.me_url; Type: COMMENT; Schema: public; Owner: d= any +-- + +COMMENT ON COLUMN menu_ref.me_url IS 'url '; + + +-- +-- Name: profile; Type: TABLE; Schema: public; Owner: dany; Tablespace:=20 +-- + +CREATE TABLE profile ( + p_name text NOT NULL, + p_id integer NOT NULL, + p_desc text +); + + +ALTER TABLE public.profile OWNER TO dany; + +-- +-- Name: TABLE profile; Type: COMMENT; Schema: public; Owner: dany +-- + +COMMENT ON TABLE profile IS 'Available profile '; + + +-- +-- Name: COLUMN profile.p_desc; Type: COMMENT; Schema: public; Owner: da= ny +-- + +COMMENT ON COLUMN profile.p_desc IS 'description of the profile'; + + +-- +-- Name: profile_menu; Type: TABLE; Schema: public; Owner: dany; Tablesp= ace:=20 +-- + +CREATE TABLE profile_menu ( + pm_id integer NOT NULL, + me_code text, + me_code_dep text, + p_id integer, + p_order integer, + p_type_display character(1) +); + + +ALTER TABLE public.profile_menu OWNER TO dany; + +-- +-- Name: TABLE profile_menu; Type: COMMENT; Schema: public; Owner: dany +-- + +COMMENT ON TABLE profile_menu IS 'Join between the profile and the menu= '; + + +-- +-- Name: COLUMN profile_menu.me_code_dep; Type: COMMENT; Schema: public;= Owner: dany +-- + +COMMENT ON COLUMN profile_menu.me_code_dep IS 'menu code dependency'; + + +-- +-- Name: COLUMN profile_menu.p_id; Type: COMMENT; Schema: public; Owner:= dany +-- + +COMMENT ON COLUMN profile_menu.p_id IS 'link to profile'; + + +-- +-- Name: COLUMN profile_menu.p_order; Type: COMMENT; Schema: public; Own= er: dany +-- + +COMMENT ON COLUMN profile_menu.p_order IS 'order of displaying menu'; + + +-- +-- Name: COLUMN profile_menu.p_type_display; Type: COMMENT; Schema: publ= ic; Owner: dany +-- + +COMMENT ON COLUMN profile_menu.p_type_display IS 'M is a module +E is a menu'; + + +-- +-- Name: profile_menu_pm_id_seq; Type: SEQUENCE; Schema: public; Owner: = dany +-- + +CREATE SEQUENCE profile_menu_pm_id_seq + START WITH 1 + INCREMENT BY 1 + NO MAXVALUE + NO MINVALUE + CACHE 1; + + +ALTER TABLE public.profile_menu_pm_id_seq OWNER TO dany; + +-- +-- Name: profile_menu_pm_id_seq; Type: SEQUENCE OWNED BY; Schema: public= ; Owner: dany +-- + +ALTER SEQUENCE profile_menu_pm_id_seq OWNED BY profile_menu.pm_id; + + +-- +-- Name: profile_menu_pm_id_seq; Type: SEQUENCE SET; Schema: public; Own= er: dany +-- + +SELECT pg_catalog.setval('profile_menu_pm_id_seq', 19, true); + + +-- +-- Name: profile_p_id_seq; Type: SEQUENCE; Schema: public; Owner: dany +-- + +CREATE SEQUENCE profile_p_id_seq + START WITH 1 + INCREMENT BY 1 + NO MAXVALUE + NO MINVALUE + CACHE 1; + + +ALTER TABLE public.profile_p_id_seq OWNER TO dany; + +-- +-- Name: profile_p_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owne= r: dany +-- + +ALTER SEQUENCE profile_p_id_seq OWNED BY profile.p_id; + + +-- +-- Name: profile_p_id_seq; Type: SEQUENCE SET; Schema: public; Owner: da= ny +-- + +SELECT pg_catalog.setval('profile_p_id_seq', 1, true); + + +-- +-- Name: profile_user; Type: TABLE; Schema: public; Owner: dany; Tablesp= ace:=20 +-- + +CREATE TABLE profile_user ( + user_name text NOT NULL, + pu_id integer NOT NULL, + p_id integer +); + + +ALTER TABLE public.profile_user OWNER TO dany; + +-- +-- Name: TABLE profile_user; Type: COMMENT; Schema: public; Owner: dany +-- + +COMMENT ON TABLE profile_user IS 'Contains the available profile for use= rs'; + + +-- +-- Name: COLUMN profile_user.user_name; Type: COMMENT; Schema: public; O= wner: dany +-- + +COMMENT ON COLUMN profile_user.user_name IS 'fk to available_user : logi= n'; + + +-- +-- Name: COLUMN profile_user.p_id; Type: COMMENT; Schema: public; Owner:= dany +-- + +COMMENT ON COLUMN profile_user.p_id IS 'fk to profile'; + + +-- +-- Name: profile_user_pu_id_seq; Type: SEQUENCE; Schema: public; Owner: = dany +-- + +CREATE SEQUENCE profile_user_pu_id_seq + START WITH 1 + INCREMENT BY 1 + NO MAXVALUE + NO MINVALUE + CACHE 1; + + +ALTER TABLE public.profile_user_pu_id_seq OWNER TO dany; + +-- +-- Name: profile_user_pu_id_seq; Type: SEQUENCE OWNED BY; Schema: public= ; Owner: dany +-- + +ALTER SEQUENCE profile_user_pu_id_seq OWNED BY profile_user.pu_id; + + +-- +-- Name: profile_user_pu_id_seq; Type: SEQUENCE SET; Schema: public; Own= er: dany +-- + +SELECT pg_catalog.setval('profile_user_pu_id_seq', 1, true); + + +-- +-- Name: v_all_menu; Type: VIEW; Schema: public; Owner: dany +-- + +CREATE VIEW v_all_menu AS + SELECT pm.me_code, pm.pm_id, pm.me_code_dep, pm.p_order, pm.p_type_d= isplay, pu.user_name, pu.pu_id, p.p_name, p.p_desc, mr.me_menu, mr.me_fil= e, mr.me_module, mr.me_url FROM (((profile_menu pm JOIN profile_user pu O= N ((pu.p_id =3D pm.p_id))) JOIN profile p ON ((p.p_id =3D pm.p_id))) JOIN= menu_ref mr USING (me_code)) ORDER BY pm.p_order; + + +ALTER TABLE public.v_all_menu OWNER TO dany; + +-- +-- Name: p_id; Type: DEFAULT; Schema: public; Owner: dany +-- + +ALTER TABLE profile ALTER COLUMN p_id SET DEFAULT nextval('profile_p_id_= seq'::regclass); + + +-- +-- Name: pm_id; Type: DEFAULT; Schema: public; Owner: dany +-- + +ALTER TABLE profile_menu ALTER COLUMN pm_id SET DEFAULT nextval('profile= _menu_pm_id_seq'::regclass); + + +-- +-- Name: pu_id; Type: DEFAULT; Schema: public; Owner: dany +-- + +ALTER TABLE profile_user ALTER COLUMN pu_id SET DEFAULT nextval('profile= _user_pu_id_seq'::regclass); + + +-- +-- Data for Name: menu_ref; Type: TABLE DATA; Schema: public; Owner: dan= y +-- + +INSERT INTO menu_ref VALUES ('CARD', 'Fiche', 'fiche.inc.php', 'N', NULL= ); +INSERT INTO menu_ref VALUES ('STOCK', 'Stock', 'stock.inc.php', 'N', NUL= L); +INSERT INTO menu_ref VALUES ('MISC', 'Op=C3=A9rations Diverses', 'compta= _ods.inc.php', 'N', NULL); +INSERT INTO menu_ref VALUES ('HIST', 'Historique', 'user_action_gl.php',= 'N', NULL); +INSERT INTO menu_ref VALUES ('VEN', 'Vente', 'compta_ven.inc.php', 'N', = NULL); +INSERT INTO menu_ref VALUES ('ACH', 'Achat', 'compta_ach.inc.php', 'N', = NULL); +INSERT INTO menu_ref VALUES ('FIN', 'Financier', 'compta_fin.inc.php', '= N', NULL); +INSERT INTO menu_ref VALUES ('LET', 'Lettrage', 'letter.inc.php', 'N', N= ULL); +INSERT INTO menu_ref VALUES ('PREOD', 'Op=C3=A9rations pr=C3=A9d=C3=A9fi= nies', 'preod.inc.php', 'N', NULL); +INSERT INTO menu_ref VALUES ('VERIFBIL', 'V=C3=A9rification ', 'verif_bi= lan.inc.php', 'N', NULL); +INSERT INTO menu_ref VALUES ('REPORT', 'Cr=C3=A9ation de rapport', 'repo= rt.inc.php', 'N', NULL); +INSERT INTO menu_ref VALUES ('OPEN', 'Ecriture Ouverture', 'opening.inc.= php', 'N', NULL); +INSERT INTO menu_ref VALUES ('ADM', 'Administration', 'adm.inc.php', 'N'= , NULL); +INSERT INTO menu_ref VALUES ('SUPPL', 'Fournisseur', 'supplier.inc.php',= 'N', NULL); +INSERT INTO menu_ref VALUES ('FOLLOW', 'Courrier', 'action.inc.php', 'N'= , NULL); +INSERT INTO menu_ref VALUES ('FORECAST', 'Pr=C3=A9vision', 'forecast.inc= .php', 'N', NULL); +INSERT INTO menu_ref VALUES ('IMPJRN', 'Historique', 'impress_jrn.inc.ph= p', 'N', NULL); +INSERT INTO menu_ref VALUES ('IMPREC', 'Rapprochement', 'impress_rec.inc= .php', 'N', NULL); +INSERT INTO menu_ref VALUES ('IMPPOSTE', 'Poste', 'impress_poste.inc.php= ', 'N', NULL); +INSERT INTO menu_ref VALUES ('IMPREPORT', 'Rapport', 'impress_rapport.in= c.php', 'N', NULL); +INSERT INTO menu_ref VALUES ('IMPBILAN', 'Bilan', 'impress_bilan.inc.php= ', 'N', NULL); +INSERT INTO menu_ref VALUES ('IMPGL', 'Grand Livre', 'impress_gl_comptes= .inc.php', 'N', NULL); +INSERT INTO menu_ref VALUES ('IMPBAL', 'Balance', 'balance.inc.php', 'N'= , NULL); +INSERT INTO menu_ref VALUES ('IMPCARD', 'Cat=C3=A9gorie de Fiches', 'imp= ress_fiche.inc.php', 'N', NULL); +INSERT INTO menu_ref VALUES ('CUSTDET', 'Fiche', 'detail_client.inc.php'= , 'N', NULL); +INSERT INTO menu_ref VALUES ('CUSTFOLLOW', 'Suivi', 'suivi_client.inc.ph= p', 'N', NULL); +INSERT INTO menu_ref VALUES ('CUSTOP', 'Op=C3=A9ration', 'operation_clie= nt.inc.php', 'N', NULL); +INSERT INTO menu_ref VALUES ('CARDBAL', 'Balance', 'balance_card.inc.php= ', 'N', NULL); +INSERT INTO menu_ref VALUES ('CUST', 'Client', 'client.inc.php', 'N', NU= LL); +INSERT INTO menu_ref VALUES ('ANC', 'C. Analytique', NULL, 'Y', NULL); +INSERT INTO menu_ref VALUES ('PARAM', 'Param=C3=A8tre', NULL, 'Y', NULL)= ; +INSERT INTO menu_ref VALUES ('GESTION', 'Gestion', NULL, 'Y', NULL); +INSERT INTO menu_ref VALUES ('CUSTCONTACT', 'Contact (=C3=A0 faire)', NU= LL, 'N', NULL); +INSERT INTO menu_ref VALUES ('COMPTA', 'Comptabilit=C3=A9', NULL, 'Y', N= ULL); +INSERT INTO menu_ref VALUES ('LOGOUT', 'Sortie', NULL, 'Y', 'logout.php'= ); +INSERT INTO menu_ref VALUES ('DASHBOARD', 'Tableau de bord', 'dashboard.= inc.php', 'Y', NULL); +INSERT INTO menu_ref VALUES ('IMP', 'Impression', NULL, 'N', NULL); + + +-- +-- Data for Name: profile; Type: TABLE DATA; Schema: public; Owner: dany +-- + +INSERT INTO profile VALUES ('default', 1, 'Profil par d=C3=A9faut'); + + +-- +-- Data for Name: profile_menu; Type: TABLE DATA; Schema: public; Owner:= dany +-- + +INSERT INTO profile_menu VALUES (1, 'COMPTA', NULL, 1, 1, 'M'); +INSERT INTO profile_menu VALUES (2, 'ANC', NULL, 1, 2, 'M'); +INSERT INTO profile_menu VALUES (3, 'ACH', 'COMPTA', 1, 3, 'E'); +INSERT INTO profile_menu VALUES (4, 'VEN', 'COMPTA', 1, 4, 'E'); +INSERT INTO profile_menu VALUES (5, 'CARD', 'COMPTA', 1, 5, 'E'); +INSERT INTO profile_menu VALUES (6, 'IMP', 'COMPTA', 1, 6, 'E'); +INSERT INTO profile_menu VALUES (9, 'IMPPOSTE', 'IMP', 1, 7, 'E'); +INSERT INTO profile_menu VALUES (10, 'IMPREC', 'IMP', 1, 8, 'E'); +INSERT INTO profile_menu VALUES (11, 'IMPREPORT', 'IMP', 1, 9, 'E'); +INSERT INTO profile_menu VALUES (13, 'IMPBILAN', 'IMP', 1, 11, 'E'); +INSERT INTO profile_menu VALUES (14, 'IMPCARD', 'IMP', 1, 12, 'E'); +INSERT INTO profile_menu VALUES (15, 'IMPGL', 'IMP', 1, 13, 'E'); +INSERT INTO profile_menu VALUES (16, 'IMPJRN', 'IMP', 1, 14, 'E'); +INSERT INTO profile_menu VALUES (17, 'IMPBAL', 'IMP', 1, 15, 'E'); +INSERT INTO profile_menu VALUES (18, 'MISC', 'COMPTA', 1, 16, 'E'); +INSERT INTO profile_menu VALUES (19, 'FIN', 'COMPTA', 1, 17, 'E'); +INSERT INTO profile_menu VALUES (20, 'LOGOUT', NULL, 1, 19, 'M'); + + +-- +-- Data for Name: profile_user; Type: TABLE DATA; Schema: public; Owner:= dany +-- + +INSERT INTO profile_user VALUES ('phpcompta', 1, 1); + + +-- +-- Name: menu_ref_pkey; Type: CONSTRAINT; Schema: public; Owner: dany; T= ablespace:=20 +-- + +ALTER TABLE ONLY menu_ref + ADD CONSTRAINT menu_ref_pkey PRIMARY KEY (me_code); + + +-- +-- Name: profile_menu_pkey; Type: CONSTRAINT; Schema: public; Owner: dan= y; Tablespace:=20 +-- + +ALTER TABLE ONLY profile_menu + ADD CONSTRAINT profile_menu_pkey PRIMARY KEY (pm_id); + + +-- +-- Name: profile_pkey; Type: CONSTRAINT; Schema: public; Owner: dany; Ta= blespace:=20 +-- + +ALTER TABLE ONLY profile + ADD CONSTRAINT profile_pkey PRIMARY KEY (p_id); + + +-- +-- Name: profile_user_pkey; Type: CONSTRAINT; Schema: public; Owner: dan= y; Tablespace:=20 +-- + +ALTER TABLE ONLY profile_user + ADD CONSTRAINT profile_user_pkey PRIMARY KEY (pu_id); + + +-- +-- Name: profile_user_user_name_key; Type: CONSTRAINT; Schema: public; O= wner: dany; Tablespace:=20 +-- + +ALTER TABLE ONLY profile_user + ADD CONSTRAINT profile_user_user_name_key UNIQUE (user_name, p_id); + + +-- +-- Name: fki_profile_menu_menu_ref; Type: INDEX; Schema: public; Owner: = dany; Tablespace:=20 +-- + +CREATE INDEX fki_profile_menu_menu_ref ON profile_menu USING btree (me_c= ode); + + +-- +-- Name: fki_profile_menu_profile; Type: INDEX; Schema: public; Owner: d= any; Tablespace:=20 +-- + +CREATE INDEX fki_profile_menu_profile ON profile_menu USING btree (p_id)= ; + + +-- +-- Name: profile_menu_me_code_fkey; Type: FK CONSTRAINT; Schema: public;= Owner: dany +-- + +ALTER TABLE ONLY profile_menu + ADD CONSTRAINT profile_menu_me_code_fkey FOREIGN KEY (me_code) REFER= ENCES menu_ref(me_code); + + +-- +-- Name: profile_menu_p_id_fkey; Type: FK CONSTRAINT; Schema: public; Ow= ner: dany +-- + +ALTER TABLE ONLY profile_menu + ADD CONSTRAINT profile_menu_p_id_fkey FOREIGN KEY (p_id) REFERENCES = profile(p_id); + + +-- +-- Name: profile_user_p_id_fkey; Type: FK CONSTRAINT; Schema: public; Ow= ner: dany +-- + +ALTER TABLE ONLY profile_user + ADD CONSTRAINT profile_user_p_id_fkey FOREIGN KEY (p_id) REFERENCES = profile(p_id) ON UPDATE CASCADE ON DELETE CASCADE; + + +-- +-- PostgreSQL database dump complete +-- + From MAILER-DAEMON Mon Oct 24 16:31:20 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RIRB2-0000ek-2g for mharc-phpcompta-dev@gnu.org; Mon, 24 Oct 2011 16:31:20 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Mon, 24 Oct 2011 22:38:17 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4230 - phpcompta/branches/rel600-dynamic-menu/include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Oct 2011 20:31:18 -0000 Author: danydb Date: 2011-10-24 22:38:15 +0200 (Mon, 24 Oct 2011) New Revision: 4230 Modified: phpcompta/branches/rel600-dynamic-menu/include/class_acc_ledger.php phpcompta/branches/rel600-dynamic-menu/include/compta_ven.inc.php Log: #241 : modularity for SALE ledger Modified: phpcompta/branches/rel600-dynamic-menu/include/class_acc_ledger= .php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/class_acc_ledger.php 2= 011-10-23 18:51:09 UTC (rev 4229) +++ phpcompta/branches/rel600-dynamic-menu/include/class_acc_ledger.php 2= 011-10-24 20:38:15 UTC (rev 4230) @@ -737,7 +737,7 @@ // =20 $href=3Dbasename($_SERVER['PHP_SELF']); - switch ($href) + /* switch ($href) { // user_jrn.php case 'compta.php': @@ -752,8 +752,8 @@ default: echo_error('user_form_ach.php',__LINE__,'Erreur invalid = request uri'); exit (-1); - } - //DEBUG + }*/ + //DEBUG =20 $r.=3Dsprintf('%s ', $row['jr_id'], $gDossier, $row['jr_internal']); @@ -2325,8 +2325,9 @@ =20 if ( $r_jrn =3D=3D -1 ) { + $p_action=3D$ledger_type; /* Specific action allow to see all the ledgers in once */ - if ( $p_action =3D=3D 'gl') $p_action=3D'ALL'; + if ( $ledger_type=3D=3D 'gl') $p_action=3D'ALL'; /* actions from commercial.php */ if ( $p_action =3D=3D 'client') $p_action=3D'ALL'; if ( $p_action =3D=3D 'supplier') $p_action=3D'ALL'; Modified: phpcompta/branches/rel600-dynamic-menu/include/compta_ven.inc.p= hp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/compta_ven.inc.php 201= 1-10-23 18:51:09 UTC (rev 4229) +++ phpcompta/branches/rel600-dynamic-menu/include/compta_ven.inc.php 201= 1-10-24 20:38:15 UTC (rev 4230) @@ -35,12 +35,11 @@ $cn=3Dnew Database(dossier::id()); //menu =3D show a list of ledger $str_dossier=3Ddossier::get(); +$ac=3D"ac=3D".$_REQUEST['ac']; $array=3Darray( - array('?p_action=3Dven&sa=3Dn&'.$str_dossier,_('Nouvelle vent= e'),_('Nouvelle vente'),1), - array('?p_action=3Dven&sa=3Dl&'.$str_dossier,_('Liste ventes'= ),_('Liste des ventes'),2), - array('?p_action=3Dven&sa=3Dlnp&'.$str_dossier,_('Liste vente= non pay=C3=A9es'),_('Liste des ventes non pay=C3=A9es'),3), - array('commercial.php?p_action=3Dclient&'.$str_dossier,_('Cli= ents'),_('Clients')), - array('?p_action=3Dimpress&type=3Djrn&'.$str_dossier,_('Impre= ssion'),_('Impression')) + array('?ledger_type=3Dven&sa=3Dn&'.$str_dossier."&$ac",_('Nou= velle vente'),_('Nouvelle vente'),1), + array('?ledger_type=3Dven&sa=3Dl&'.$str_dossier."&$ac",_('Lis= te ventes'),_('Liste des ventes'),2), + array('?ledger_type=3Dven&sa=3Dlnp&'.$str_dossier."&$ac",_('L= iste vente non pay=C3=A9es'),_('Liste des ventes non pay=C3=A9es'),3) ); =20 $sa=3D(isset ($_REQUEST['sa']))?$_REQUEST['sa']:-1; @@ -66,7 +65,7 @@ echo '
'; echo ShowItem($array,'H','mtitle','mtitle',$def); echo '
'; -$href=3Dbasename($_SERVER['PHP_SELF']); +$href=3Dbasename($_SERVER['PHP_SELF'])."?$ac&$str_dossier"; =20 =20 //---------------------------------------------------------------------- @@ -79,7 +78,7 @@ =20 // Check privilege if ( isset($_REQUEST['p_jrn']) && - $User->check_jrn($_REQUEST['p_jrn']) !=3D 'W' ) + $g_user->check_jrn($_REQUEST['p_jrn']) !=3D 'W' ) { =20 NoAccess(); @@ -120,6 +119,7 @@ echo "Nom du mod=C3=A8le ".$opd_name->input(); echo '
'; echo '
'; + echo HtmlInput::hidden('ac',$_REQUEST['ac']); echo HtmlInput::submit("record",_("Enregistrement"),'onClick= =3D"return verify_ca(\'\');"'); echo HtmlInput::submit('correct',_("Corriger")); echo ''; @@ -135,7 +135,7 @@ if ( isset($_POST['record']) ) { // Check privilege - if ( $User->check_jrn($_REQUEST['p_jrn']) !=3D 'W' ) + if ( $g_user->check_jrn($_REQUEST['p_jrn']) !=3D 'W' ) { =20 NoAccess(); @@ -244,6 +244,7 @@ else { echo HtmlInput::hidden("p_action","ven"); + echo HtmlInput::hidden("ac",$_REQUEST['ac']); echo HtmlInput::hidden("sa","p"); echo $Ledger->input($array); echo '
'; @@ -263,6 +264,7 @@ echo '
'; echo HtmlInput::hidden("sa","p"); echo HtmlInput::hidden("p_action","ven"); + echo dossier::hidden(); echo HtmlInput::hidden('p_jrn_predef',$Ledger->id); $op=3Dnew Pre_op_ven($cn); @@ -289,7 +291,7 @@ echo '
'; // Check privilege if ( isset($_REQUEST['p_jrn']) && - $User->check_jrn($_REQUEST['p_jrn']) =3D=3D 'X') + $g_user->check_jrn($_REQUEST['p_jrn']) =3D=3D 'X') { =20 NoAccess(); @@ -315,7 +317,7 @@ /* by default we should the default period */ if ( ! isset($p_array['date_start'])) { - $period=3D$User->get_periode(); + $period=3D$g_user->get_periode(); $per=3Dnew Periode($cn,$period); list($date_start,$date_end)=3D$per->get_date_limit(); $p_array['date_start']=3D$date_start; @@ -336,6 +338,7 @@ echo HtmlInput::hidden("sa","l"); echo HtmlInput::hidden("p_action","ven"); echo dossier::hidden(); + echo HtmlInput::hidden("ac",$_REQUEST['ac']); echo $bar; list($count,$html)=3D $Ledger->list_operation($sql,$offset,1); echo $html; @@ -378,7 +381,7 @@ echo '
'; // Check privilege if ( isset($_REQUEST['p_jrn']) && - $User->check_jrn($_REQUEST['p_jrn']) =3D=3D 'X') + $g_user->check_jrn($_REQUEST['p_jrn']) =3D=3D 'X') { NoAccess(); exit -1; From MAILER-DAEMON Mon Oct 24 16:39:55 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RIRJL-0004kC-2T for mharc-phpcompta-dev@gnu.org; Mon, 24 Oct 2011 16:39:55 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Mon, 24 Oct 2011 22:47:03 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4231 - phpcompta/branches/rel600-dynamic-menu/include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Oct 2011 20:39:53 -0000 Author: danydb Date: 2011-10-24 22:47:02 +0200 (Mon, 24 Oct 2011) New Revision: 4231 Modified: phpcompta/branches/rel600-dynamic-menu/include/class_pre_operation.php phpcompta/branches/rel600-dynamic-menu/include/compta_ach.inc.php phpcompta/branches/rel600-dynamic-menu/include/compta_ven.inc.php Log: #241 : modularity for PURCHASE ledger Modified: phpcompta/branches/rel600-dynamic-menu/include/class_pre_operat= ion.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/class_pre_operation.ph= p 2011-10-24 20:38:15 UTC (rev 4230) +++ phpcompta/branches/rel600-dynamic-menu/include/class_pre_operation.ph= p 2011-10-24 20:47:02 UTC (rev 4231) @@ -99,7 +99,7 @@ return true; } /*!\brief load the data from the database and return an array - * \return an array=20 + * \return an array */ function load() { @@ -195,6 +195,7 @@ =20 $hid=3Dnew IHidden(); $r=3D$hid->input("action","use_opd"); + echo HtmlInput::hidden('ac',$_REQUEST['ac']); $r.=3Ddossier::hidden(); $r.=3D$hid->input("p_jrn",$this->get("ledger")); $r.=3D$hid->input("jrn_type",$this->get("ledger_type")); Modified: phpcompta/branches/rel600-dynamic-menu/include/compta_ach.inc.p= hp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/compta_ach.inc.php 201= 1-10-24 20:38:15 UTC (rev 4230) +++ phpcompta/branches/rel600-dynamic-menu/include/compta_ach.inc.php 201= 1-10-24 20:47:02 UTC (rev 4231) @@ -34,13 +34,11 @@ $cn=3Dnew Database(dossier::id()); //menu =3D show a list of ledger $str_dossier=3Ddossier::get(); - +$ac=3D"ac=3D".$_REQUEST['ac']; $array=3Darray( - array('?p_action=3Dach&sa=3Dn&'.$str_dossier,_('Nouvelle d=C3= =A9pense'),_('Nouvel achat ou d=C3=A9pense'),1), - array('?p_action=3Dach&sa=3Dl&'.$str_dossier,_('Liste achat')= ,_('Liste des achats'),2), - array('?p_action=3Dach&sa=3Dlnp&'.$str_dossier,_('Liste d=C3=A9= penses non pay=C3=A9es'),_('Liste des ventes non pay=C3=A9es'),3), - array('commercial.php?p_action=3Dsupplier&'.$str_dossier,_('F= ournisseurs'),_('Fournisseurs')), - array('?p_action=3Dimpress&type=3Djrn&'.$str_dossier,_('Impre= ssion'),_('Impression')) + array('?ledger_type=3DACH&sa=3Dn&'.$str_dossier."&$ac",_('Nou= velle d=C3=A9pense'),_('Nouvel achat ou d=C3=A9pense'),1), + array('?ledger_type=3DACH&sa=3Dl&'.$str_dossier."&$ac",_('Lis= te achat'),_('Liste des achats'),2), + array('?ledger_type=3DACH&sa=3Dlnp&'.$str_dossier."&$ac",_('L= iste d=C3=A9penses non pay=C3=A9es'),_('Liste des ventes non pay=C3=A9es'= ),3) ); =20 $sa=3D(isset ($_REQUEST['sa']))?$_REQUEST['sa']:-1; @@ -66,8 +64,7 @@ echo '
'; echo ShowItem($array,'H','mtitle','mtitle',$def); echo '
'; -$href=3Dbasename($_SERVER['PHP_SELF']); - +$href=3Dbasename($_SERVER['PHP_SELF'])."?$ac&$str_dossier"; //---------------------------------------------------------------------- // Encode a new invoice // empty form for encoding @@ -76,7 +73,7 @@ { // Check privilege if ( isset($_REQUEST['p_jrn'])) - if ( $User->check_jrn($_REQUEST['p_jrn']) !=3D 'W' ) + if ( $g_user->check_jrn($_REQUEST['p_jrn']) !=3D 'W' ) { NoAccess(); exit -1; @@ -105,7 +102,7 @@ echo HtmlInput::hidden('p_action','ach'); echo dossier::hidden(); echo $Ledger->confirm($_POST ); - + echo HtmlInput::hidden('ac',$_REQUEST['ac']); $chk=3Dnew ICheckBox(); $chk->selected=3Dfalse; echo '
'; @@ -150,7 +147,7 @@ =20 =20 /* Save the predefined operation */ - if ( isset($_POST['opd_save']) && $User->check_action(PARPRE= DE)=3D=3D1) + if ( isset($_POST['opd_save']) && $g_user->check_action(PARP= REDE)=3D=3D1) { $opd=3Dnew Pre_op_ach($cn); $opd->get_post(); @@ -270,7 +267,7 @@ echo '
'; // Check privilege if ( isset($_REQUEST['p_jrn']) && - $User->check_jrn($_REQUEST['p_jrn']) =3D=3D 'X') + $g_user->check_jrn($_REQUEST['p_jrn']) =3D=3D 'X') { =20 NoAccess(); @@ -296,7 +293,7 @@ /* by default we should the default period */ if ( ! isset($p_array['date_start'])) { - $period=3D$User->get_periode(); + $period=3D$g_user->get_periode(); $per=3Dnew Periode($cn,$period); list($date_start,$date_end)=3D$per->get_date_limit(); $p_array['date_start']=3D$date_start; @@ -358,7 +355,7 @@ echo '
'; // Check privilege if ( isset($_REQUEST['p_jrn']) && - $User->check_jrn($_REQUEST['p_jrn']) =3D=3D 'X') + $g_user->check_jrn($_REQUEST['p_jrn']) =3D=3D 'X') { NoAccess(); exit -1; Modified: phpcompta/branches/rel600-dynamic-menu/include/compta_ven.inc.p= hp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/compta_ven.inc.php 201= 1-10-24 20:38:15 UTC (rev 4230) +++ phpcompta/branches/rel600-dynamic-menu/include/compta_ven.inc.php 201= 1-10-24 20:47:02 UTC (rev 4231) @@ -243,7 +243,7 @@ } else { - echo HtmlInput::hidden("p_action","ven"); + echo HtmlInput::hidden("ledger_type","VEN"); echo HtmlInput::hidden("ac",$_REQUEST['ac']); echo HtmlInput::hidden("sa","p"); echo $Ledger->input($array); From MAILER-DAEMON Tue Oct 25 16:57:00 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RIo3Q-000291-29 for mharc-phpcompta-dev@gnu.org; Tue, 25 Oct 2011 16:57:00 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Tue, 25 Oct 2011 23:03:54 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4232 - in phpcompta/branches/rel600-dynamic-menu: html include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Oct 2011 20:56:58 -0000 Author: danydb Date: 2011-10-25 23:03:53 +0200 (Tue, 25 Oct 2011) New Revision: 4232 Modified: phpcompta/branches/rel600-dynamic-menu/html/do.php phpcompta/branches/rel600-dynamic-menu/include/class_acc_ledger.php phpcompta/branches/rel600-dynamic-menu/include/compta_fin.inc.php Log: #241 : modularity for FINANCIAL ledger Modified: phpcompta/branches/rel600-dynamic-menu/html/do.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/html/do.php 2011-10-24 20:47:0= 2 UTC (rev 4231) +++ phpcompta/branches/rel600-dynamic-menu/html/do.php 2011-10-25 21:03:5= 3 UTC (rev 4232) @@ -30,7 +30,7 @@ require_once('ac_common.php'); require_once 'function_javascript.php'; html_page_start(); -global $g_user; +global $g_user,$cn; =20 $cn=3Dnew Database(Dossier::id()); $g_user=3Dnew User($cn); Modified: phpcompta/branches/rel600-dynamic-menu/include/class_acc_ledger= .php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/class_acc_ledger.php 2= 011-10-24 20:47:02 UTC (rev 4231) +++ phpcompta/branches/rel600-dynamic-menu/include/class_acc_ledger.php 2= 011-10-25 21:03:53 UTC (rev 4232) @@ -2322,10 +2322,10 @@ =20 $and=3D''; $user=3Dnew User($this->db); - + $p_action=3D$ledger_type; if ( $r_jrn =3D=3D -1 ) { - $p_action=3D$ledger_type; + /* Specific action allow to see all the ledgers in once */ if ( $ledger_type=3D=3D 'gl') $p_action=3D'ALL'; /* actions from commercial.php */ Modified: phpcompta/branches/rel600-dynamic-menu/include/compta_fin.inc.p= hp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/compta_fin.inc.php 201= 1-10-24 20:47:02 UTC (rev 4231) +++ phpcompta/branches/rel600-dynamic-menu/include/compta_fin.inc.php 201= 1-10-25 21:03:53 UTC (rev 4232) @@ -28,17 +28,15 @@ global $g_user; =20 $gDossier=3Ddossier::id(); -$p_action=3D(isset ($_REQUEST['p_action']))?$_REQUEST['p_action']:''; =20 =20 $cn=3Dnew Database(dossier::id()); -$menu_action=3D"?p_action=3Dfin&".dossier::get(); +$menu_action=3D"?ledger_type=3Dfin&ac=3D".$_REQUEST['ac']."&".dossier::g= et(); $menu=3Darray( array($menu_action.'&sa=3Dn',_('Nouvel extrait'),_('Encodage d= \'un nouvel extrait'),1), array($menu_action.'&sa=3Dl',_('Liste'),_('Liste op=C3=A9ratio= n bancaire'),2), array($menu_action.'&sa=3Ds',_('Solde'),_('Solde des comptes')= ,3), - array($menu_action.'&sa=3Dr',_('Rapprochements banquaires'),_(= 'Rapprochements banquaires'),4), - array('?p_action=3Dimpress&type=3Djrn&'.dossier::get(),_('Impr= ession'),_('Impression')) + array($menu_action.'&sa=3Dr',_('Rapprochements banquaires'),_(= 'Rapprochements banquaires'),4) ); $sa=3D(isset($_REQUEST['sa']))?$_REQUEST['sa']:-1; =20 @@ -72,8 +70,6 @@ if ( $def =3D=3D 1 ) { =20 - $href=3Dbasename($_SERVER['PHP_SELF']); - if ( isset($_REQUEST['p_jrn'])) $Ledger->id=3D$_REQUEST['p_jrn']; else @@ -107,7 +103,7 @@ { echo '
'; echo ''; - echo HtmlInput::hidden('p_action','fin'); + echo HtmlInput::hidden('ac',$_REQUEST['ac']); echo $Ledger->confirm($_POST); echo HtmlInput::submit('confirm',_('Confirmer')); echo HtmlInput::submit('correct',_('Corriger')); @@ -140,7 +136,7 @@ echo $a; echo '
'; echo '
'; - echo HtmlInput::button_anchor(_('Nouvel extrait'),$href.'?p_= action=3Dfin&sa=3Dn&'.dossier::get()); + echo HtmlInput::button_anchor(_('Nouvel extrait'),$href.'?le= dger_type=3Dfin&sa=3Dn&'.dossier::get()."&ac=3D".$_REQUEST['ac']); echo '
'; exit(); } @@ -159,8 +155,9 @@ =20 =20 echo ''; - echo HtmlInput::hidden('p_action','fin'); + echo HtmlInput::hidden('ledger_type','fin'); echo HtmlInput::hidden('sa','n'); + echo HtmlInput::hidden('ac',$_REQUEST['ac']); $array=3D( isset($correct))?$_POST:null; // show select ledger echo $Ledger->input($array); @@ -208,7 +205,6 @@ $bar=3Djrn_navigation_bar($offset,$max_line,$step,$page); =20 echo HtmlInput::hidden("sa","lnp"); - echo HtmlInput::hidden("p_action","ach"); echo dossier::hidden(); echo $bar; list($count,$html)=3D $Ledger->list_operation($sql,$offset); @@ -217,7 +213,7 @@ /* * Export to csv */ - $r=3DHtmlInput::get_to_hidden(array('l','date_start','date_end','des= c','amount_min','amount_max','qcode','accounting','unpaid','gDossier','le= dger_type','p_action')); + $r=3DHtmlInput::get_to_hidden(array('l','ac','date_start','date_end'= ,'desc','amount_min','amount_max','qcode','accounting','unpaid','gDossier= ','ledger_type','p_action')); if (isset($_GET['r_jrn'])) { foreach ($_GET['r_jrn'] as $k=3D>$v) $r.=3DHtmlInput::hidden('r_jrn['.$k.']',$v); @@ -353,7 +349,7 @@ //------------------------- echo '
'; echo ''; - echo HtmlInput::get_to_hidden(array('gDossier','p_action','sa')); + echo HtmlInput::get_to_hidden(array('gDossier','ledger_type','ac','s= a')); $wLedger=3D$Ledger->select_ledger('FIN',3); if ($wLedger =3D=3D null ) exit ('Pas de journal disponible'); =20 From MAILER-DAEMON Tue Oct 25 18:10:45 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RIpCn-0006dJ-9y for mharc-phpcompta-dev@gnu.org; Tue, 25 Oct 2011 18:10:45 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Wed, 26 Oct 2011 00:17:50 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4233 - phpcompta/trunk/sql X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Oct 2011 22:10:44 -0000 Author: danydb Date: 2011-10-26 00:17:49 +0200 (Wed, 26 Oct 2011) New Revision: 4233 Modified: phpcompta/trunk/sql/account_compute.sql phpcompta/trunk/sql/account_insert.sql Log: Fix bug with alphanum. accounting Modified: phpcompta/trunk/sql/account_compute.sql =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/sql/account_compute.sql 2011-10-25 21:03:53 UTC (rev = 4232) +++ phpcompta/trunk/sql/account_compute.sql 2011-10-25 22:17:49 UTC (rev = 4233) @@ -10,6 +10,7 @@ maxcode numeric; sResult account_type; bAlphanum bool; + sName text; begin select fd_class_base into class_base from Modified: phpcompta/trunk/sql/account_insert.sql =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/sql/account_insert.sql 2011-10-25 21:03:53 UTC (rev 4= 232) +++ phpcompta/trunk/sql/account_insert.sql 2011-10-25 22:17:49 UTC (rev 4= 233) @@ -8,7 +8,7 @@ declare nParent tmp_pcmn.pcm_val_parent%type; sName varchar; - nNew tmp_pcmn.pcm_val%type; + sNew tmp_pcmn.pcm_val%type; bAuto bool; nFd_id integer; sClass_Base fiche_def.fd_class_base%TYPE; @@ -54,34 +54,30 @@ else raise info 'p_account is empty'; select fd_id into nFd_id from fiche where f_id=3Dp_f_id; - bAuto:=3D account_auto(nFd_id); - =09 -=09 + select fd_class_base into sClass_base from fiche_def where fd_id=3DnFd= _id; - raise info 'sClass_Base : %',sClass_base; - if bAuto =3D true=20 - then +raise info 'sClass_Base : %',sClass_base; + if bAuto =3D true and sClass_base similar to '[[:digit:]]*' then raise info 'account generated automatically'; - nNew:=3Daccount_compute(p_f_id); - raise info 'nNew %', nNew; + sNew:=3Daccount_compute(p_f_id); + raise info 'sNew %', sNew; select ad_value into sName from fiche_detail where ad_id=3D1 and f_id=3Dp_f_id; - nParent:=3Daccount_parent(nNew); - perform account_add (nNew,sName); - perform attribut_insert(p_f_id,5,nNew); + nParent:=3Daccount_parent(sNew); + perform account_add (sNew,sName); + perform attribut_insert(p_f_id,5,sNew); =20 else - =09 -- if there is an account_base then it is the default - select fd_class_base::account_type into nNew from fiche_def join= fiche using (fd_id) where f_id=3Dp_f_id; - if nNew is null or length(trim(nNew)) =3D 0 then + select fd_class_base::account_type into sNew from fiche_def join= fiche using (fd_id) where f_id=3Dp_f_id; + if sNew is null or length(trim(sNew)) =3D 0 then raise notice 'count is null'; perform attribut_insert(p_f_id,5,null); else - perform attribut_insert(p_f_id,5,nNew); + perform attribut_insert(p_f_id,5,sNew); end if; end if; end if; From MAILER-DAEMON Tue Oct 25 19:02:00 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RIq0O-0004mS-G1 for mharc-phpcompta-dev@gnu.org; Tue, 25 Oct 2011 19:02:00 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Wed, 26 Oct 2011 01:09:03 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4234 - phpcompta/branches/rel600-dynamic-menu/include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Oct 2011 23:01:59 -0000 Author: danydb Date: 2011-10-26 01:09:02 +0200 (Wed, 26 Oct 2011) New Revision: 4234 Modified: phpcompta/branches/rel600-dynamic-menu/include/class_fiche.php phpcompta/branches/rel600-dynamic-menu/include/class_fiche_def.php phpcompta/branches/rel600-dynamic-menu/include/fiche.inc.php phpcompta/branches/rel600-dynamic-menu/include/user_menu.php Log: #241 : modularity for CARD ledger + alphanum prob Modified: phpcompta/branches/rel600-dynamic-menu/include/class_fiche.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/class_fiche.php 2011-1= 0-25 22:17:49 UTC (rev 4233) +++ phpcompta/branches/rel600-dynamic-menu/include/class_fiche.php 2011-1= 0-25 23:09:02 UTC (rev 4234) @@ -764,7 +764,7 @@ { $parameter=3Darray($this->id,null); } - $this->cn->exec_sql("select account_insert($1,$2= )",$parameter); + $v=3D$this->cn->get_value("select account_insert= ($1,$2)",$parameter); } catch (Exception $e) { Modified: phpcompta/branches/rel600-dynamic-menu/include/class_fiche_def.= php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/class_fiche_def.php 20= 11-10-25 22:17:49 UTC (rev 4233) +++ phpcompta/branches/rel600-dynamic-menu/include/class_fiche_def.php 20= 11-10-25 23:09:02 UTC (rev 4234) @@ -66,7 +66,7 @@ =20 /*! * \brief Get attribut of a fiche_def - * =20 + * * \return string value of the attribute */ function getAttribut() @@ -95,7 +95,7 @@ =20 /*! * \brief Get attribut of the fiche_def - * =20 + * */ function Get() { @@ -118,8 +118,8 @@ /*! ************************************************** * \brief Get all the fiche_def - * =20 - * \return an array of fiche_def object=20 + * + * \return an array of fiche_def object */ function GetAll() { @@ -141,10 +141,10 @@ } /*! ************************************************** - * \brief Check in vw_fiche_def if a fiche has=20 + * \brief Check in vw_fiche_def if a fiche has * a attribut X - * =20 - * =20 + * + * * \param $p_attr attribut to check * \return true or false */ @@ -156,8 +156,8 @@ /*! ************************************************** * \brief Display a fiche_def object into a table - * =20 - * \return HTML row=20 + * + * \return HTML row */ function Display() { @@ -173,7 +173,7 @@ * table : insert into fiche_def * insert into attr_def * - * \param $array array=20 + * \param $array array * index FICHE_REF * nom_mod * class_base @@ -384,6 +384,7 @@ =20 =20 echo ''; + echo HtmlInput::hidden('ac',$_REQUEST['ac']); echo dossier::hidden(); echo HtmlInput::hidden("fiche",$this->id); echo HtmlInput::submit('add','Ajout fiche'); @@ -398,13 +399,17 @@ else echo ''; =20 - $span_mod=3D''.$l_line['quick_code'].''; + $span_mod=3D''.$l_line['quick_code'] + .''; =20 echo $span_mod.''.h($l_line['vw_name']).""; echo ''; } echo ''; echo ''; + echo HtmlInput::hidden('ac',$_REQUEST['ac']); echo dossier::hidden(); echo HtmlInput::hidden("fiche",$this->id); echo HtmlInput::submit('add','Ajout fiche'); @@ -414,7 +419,7 @@ } /*!\brief show input for the basic attribute : label, class_base, cr= eate_account * use only when we want to update - *=20 + * *\return HTML string with the form */ function input_base() @@ -440,7 +445,7 @@ return $r; } /*!\brief Display all the attribut of the fiche_def - *\param $str give the action possible values are remove, empty=20 + *\param $str give the action possible values are remove, empty */ function DisplayAttribut($str=3D"") { @@ -674,8 +679,8 @@ } /*! * \brief retrieve the mandatory field of the card model - * =20 - * \param $p_fiche_def_ref=20 + * + * \param $p_fiche_def_ref * \return array of ad_id (attr_min.ad_id) and labels (attr_def.ad= _text) */ function get_attr_min($p_fiche_def_ref) Modified: phpcompta/branches/rel600-dynamic-menu/include/fiche.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/fiche.inc.php 2011-10-= 25 22:17:49 UTC (rev 4233) +++ phpcompta/branches/rel600-dynamic-menu/include/fiche.inc.php 2011-10-= 25 23:09:02 UTC (rev 4234) @@ -32,9 +32,8 @@ echo IPoste::ipopup('ipop_account'); echo ICard::ipopup('ipop_card'); =20 -$gDossier=3Ddossier::id(); $str_dossier=3Ddossier::get(); -global $g_user; +global $g_user,$cn; =20 $pop_tva=3Dnew IPopup('popup_tva'); $pop_tva->title=3D_('Choix TVA'); @@ -42,7 +41,6 @@ echo $pop_tva->input(); =20 =20 -$cn=3Dnew Database($gDossier); // Security check $write=3D$g_user->check_action(FICADD); if ($write =3D=3D 0 ) @@ -55,6 +53,7 @@ { echo ''; echo dossier::hidden(); + echo HtmlInput::hidden('ac',$_REQUEST['ac']); $w=3Dnew IText(); $search_text=3D(isset($_REQUEST['search_text']))?$_REQUEST['search_t= ext']:""; $h=3Dnew IHidden(); @@ -94,6 +93,7 @@ =20 /* show the values label class_base and create account */ $r.=3D''; + $r.=3D HtmlInput::hidden('ac',$_REQUEST['ac']); $r.=3Ddossier::hidden(); $r.=3DHtmlInput::hidden("fd_id",$p_fiche_def->id); $r.=3DHtmlInput::hidden("ac",$_REQUEST['ac']); @@ -108,6 +108,7 @@ =20 $r.=3D ''; $r.=3Ddossier::hidden(); + $r.=3D HtmlInput::hidden('ac',$_REQUEST['ac']); $r.=3DHtmlInput::hidden("fd_id",$p_fiche_def->id); $r.=3DHtmlInput::hidden("ac",$_REQUEST['ac']); $r.=3D $p_fiche_def->DisplayAttribut("remove"); @@ -230,12 +231,12 @@ } $r.=3D '
'; $recherche=3Dfalse; - ShowMenuFiche($gDossier); + ShowMenuFiche(Dossier::id()); echo $r; exit(); } =20 -ShowMenuFiche($gDossier); +ShowMenuFiche(Dossier::id()); echo $r; =20 //----------------------------------------------------------------------= -------- @@ -297,6 +298,7 @@ echo ''; echo dossier::hidden(); echo $fiche->Display($t); + echo HtmlInput::hidden('ac',$_REQUEST['ac']); echo HtmlInput::hidden("f_id",$_GET['fiche_id']); if ( $write !=3D 0 ) { @@ -310,7 +312,8 @@ echo $iselect->input(); } $str=3D""; - echo HtmlInput::button_anchor(_('Retour'),'?p_action=3Dfiche&act= ion=3Dvue&'.$str_dossier.'&fiche=3D'.$fiche->fiche_def.$str); + echo HtmlInput::button_anchor(_('Retour'),'?p_action=3Dfiche&act= ion=3Dvue&'.$str_dossier.'&fiche=3D'.$fiche->fiche_def.$str. + "&ac=3D".$_REQUEST['ac']); =20 if ( $write !=3D 0 ) echo ''; echo '
'; @@ -324,6 +327,7 @@ $g_user->can_request(FICCAT); echo '
'; echo '
'; + echo HtmlInput::hidden('ac',$_REQUEST['ac']); $oFiche_Def=3Dnew Fiche_Def($cn); echo HtmlInput::hidden("p_action","fiche"); echo dossier::hidden(); @@ -367,7 +371,7 @@ { $fiche=3Dnew Fiche($cn,$f_id['f_id']); echo ''. + '&fiche=3D'.$f_id['fd_id']."&ac=3D".$_REQUEST['ac'].'">'= . $fiche->getName().''; } } @@ -401,6 +405,7 @@ =20 echo ''; echo dossier::hidden(); + echo HtmlInput::hidden('ac',$_REQUEST['ac']); echo $fiche->blank($_POST['fiche']); echo HtmlInput::submit("add_fiche","Ajout"); echo HtmlInput::button_anchor(_('Annuler'),$url.'&fiche=3D'.$_PO= ST['fiche'].'&'.$str_dossier); Modified: phpcompta/branches/rel600-dynamic-menu/include/user_menu.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/user_menu.php 2011-10-= 25 22:17:49 UTC (rev 4233) +++ phpcompta/branches/rel600-dynamic-menu/include/user_menu.php 2011-10-= 25 23:09:02 UTC (rev 4234) @@ -257,7 +257,8 @@ function ShowMenuFiche($p_dossier) { $cn=3Dnew Database($p_dossier); - $str_dossier=3Ddossier::get(); + $mod=3D"&ac=3D".$_REQUEST['ac']; + $str_dossier=3Ddossier::get().$mod; echo '
'; echo ''; =20 From MAILER-DAEMON Tue Oct 25 19:03:13 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RIq1Z-0005Ua-0e for mharc-phpcompta-dev@gnu.org; Tue, 25 Oct 2011 19:03:13 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Wed, 26 Oct 2011 01:10:19 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4235 - phpcompta/trunk/sql X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Oct 2011 23:03:12 -0000 Author: danydb Date: 2011-10-26 01:10:17 +0200 (Wed, 26 Oct 2011) New Revision: 4235 Added: phpcompta/trunk/sql/account_add.sql Modified: phpcompta/trunk/sql/account_insert.sql Log: Fix bug : duplicate and return correct accounting Added: phpcompta/trunk/sql/account_add.sql =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/sql/account_add.sql (rev 0) +++ phpcompta/trunk/sql/account_add.sql 2011-10-25 23:10:17 UTC (rev 4235= ) @@ -0,0 +1,25 @@ +-- Function: comptaproc.account_add(account_type, character varying) + +DROP FUNCTION comptaproc.account_add(account_type, character varying); + +CREATE OR REPLACE FUNCTION comptaproc.account_add(p_id account_type, p_n= ame character varying) + RETURNS text AS +$BODY$ +declare + nParent tmp_pcmn.pcm_val_parent%type; + nCount integer; + sReturn text; +begin + sReturn:=3D format_account(p_id); + select count(*) into nCount from tmp_pcmn where pcm_val=3DsReturn; + if nCount =3D 0 then + nParent=3Daccount_parent(p_id); + insert into tmp_pcmn (pcm_val,pcm_lib,pcm_val_parent) + values (p_id, p_name,nParent) returning pcm_val into sReturn; + end if; +return sReturn; +end ; +$BODY$ + LANGUAGE plpgsql VOLATILE + COST 100; +ALTER FUNCTION comptaproc.account_add(account_type, character varying) O= WNER TO dany; Modified: phpcompta/trunk/sql/account_insert.sql =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/sql/account_insert.sql 2011-10-25 23:09:02 UTC (rev 4= 234) +++ phpcompta/trunk/sql/account_insert.sql 2011-10-25 23:10:17 UTC (rev 4= 235) @@ -1,9 +1,9 @@ -- Function: comptaproc.account_insert(integer, text) =20 --- DROP FUNCTION comptaproc.account_insert(integer, text); + DROP FUNCTION comptaproc.account_insert(integer, text); =20 CREATE OR REPLACE FUNCTION comptaproc.account_insert(p_f_id integer, p_a= ccount text) - RETURNS integer AS + RETURNS text AS $BODY$ declare nParent tmp_pcmn.pcm_val_parent%type; @@ -67,7 +67,7 @@ where ad_id=3D1 and f_id=3Dp_f_id; nParent:=3Daccount_parent(sNew); - perform account_add (sNew,sName); + sNew :=3D account_add (sNew,sName); perform attribut_insert(p_f_id,5,sNew); =20 else From MAILER-DAEMON Tue Oct 25 19:07:57 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RIq69-0005lp-U8 for mharc-phpcompta-dev@gnu.org; Tue, 25 Oct 2011 19:07:57 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Wed, 26 Oct 2011 01:15:04 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4236 - phpcompta/trunk/sql X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Oct 2011 23:07:56 -0000 Author: danydb Date: 2011-10-26 01:15:02 +0200 (Wed, 26 Oct 2011) New Revision: 4236 Modified: phpcompta/trunk/sql/upgrade.sql Log: add account_add.sql script Modified: phpcompta/trunk/sql/upgrade.sql =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/sql/upgrade.sql 2011-10-25 23:10:17 UTC (rev 4235) +++ phpcompta/trunk/sql/upgrade.sql 2011-10-25 23:15:02 UTC (rev 4236) @@ -13,5 +13,6 @@ tmp_pcmn_alphanum_ins_upd.sql tmp_pcmn_ins.sql trigger.tmp_pcmn.sql +account_add.sql */ create unique index qcode_idx on fiche_detail (ad_value) where ad_id=3D2= 3; From MAILER-DAEMON Thu Oct 27 14:52:49 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RJV4L-0007uO-0w for mharc-phpcompta-dev@gnu.org; Thu, 27 Oct 2011 14:52:49 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Thu, 27 Oct 2011 20:59:41 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4237 - phpcompta/branches/rel600-dynamic-menu/include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Oct 2011 18:52:47 -0000 Author: danydb Date: 2011-10-27 20:59:39 +0200 (Thu, 27 Oct 2011) New Revision: 4237 Modified: phpcompta/branches/rel600-dynamic-menu/include/lettering.account.inc.p= hp phpcompta/branches/rel600-dynamic-menu/include/lettering.card.inc.php Log: #241 : modularity for lettering Modified: phpcompta/branches/rel600-dynamic-menu/include/lettering.accoun= t.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/lettering.account.inc.= php 2011-10-25 23:15:02 UTC (rev 4236) +++ phpcompta/branches/rel600-dynamic-menu/include/lettering.account.inc.= php 2011-10-27 18:59:39 UTC (rev 4237) @@ -30,7 +30,7 @@ echo '
'; echo ''; echo dossier::hidden(); -echo HtmlInput::hidden('p_action','let'); +echo HtmlInput::hidden('ac',$_REQUEST['ac']); echo HtmlInput::hidden('sa','poste'); echo '
'; =20 @@ -49,7 +49,7 @@ td($poste_span->input()); echo tr($r); // limit of the year -$exercice=3D$User->get_exercice(); +$exercice=3D$g_user->get_exercice(); $periode=3Dnew Periode($cn); list($first_per,$last_per)=3D$periode->get_limit($exercice); =20 Modified: phpcompta/branches/rel600-dynamic-menu/include/lettering.card.i= nc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/lettering.card.inc.php= 2011-10-25 23:15:02 UTC (rev 4236) +++ phpcompta/branches/rel600-dynamic-menu/include/lettering.card.inc.php= 2011-10-27 18:59:39 UTC (rev 4237) @@ -31,7 +31,7 @@ echo '
'; echo ''; echo dossier::hidden(); -echo HtmlInput::hidden('p_action','let'); +echo HtmlInput::hidden('ac',$_REQUEST['ac']); echo HtmlInput::hidden('sa','qc'); echo HtmlInput::hidden('p_jrn','0'); echo '
'; @@ -52,7 +52,7 @@ td($poste_span->input()); echo tr($r); // limit of the year -$exercice=3D$User->get_exercice(); +$exercice=3D$g_user->get_exercice(); $periode=3Dnew Periode($cn); list($first_per,$last_per)=3D$periode->get_limit($exercice); =20 From MAILER-DAEMON Thu Oct 27 15:32:08 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RJVgO-0000Vo-50 for mharc-phpcompta-dev@gnu.org; Thu, 27 Oct 2011 15:32:08 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Thu, 27 Oct 2011 21:10:20 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4238 - phpcompta/branches/rel600-dynamic-menu/include/template X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Oct 2011 19:32:07 -0000 Author: danydb Date: 2011-10-27 21:10:19 +0200 (Thu, 27 Oct 2011) New Revision: 4238 Modified: phpcompta/branches/rel600-dynamic-menu/include/template/menu.php Log: #241 :adapt width submenu Modified: phpcompta/branches/rel600-dynamic-menu/include/template/menu.ph= p =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/template/menu.php 2011= -10-27 18:59:39 UTC (rev 4237) +++ phpcompta/branches/rel600-dynamic-menu/include/template/menu.php 2011= -10-27 19:10:19 UTC (rev 4238) @@ -1,5 +1,14 @@
-
+ 4 && $idx =3D=3D 0) : + $width =3D 100; + ?> +
%"> + +
+ + + From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4239 - in phpcompta/branches/rel600-dynamic-menu: html include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Oct 2011 19:33:46 -0000 Author: danydb Date: 2011-10-27 21:40:42 +0200 (Thu, 27 Oct 2011) New Revision: 4239 Modified: phpcompta/branches/rel600-dynamic-menu/html/compta.php phpcompta/branches/rel600-dynamic-menu/include/opening.inc.php phpcompta/branches/rel600-dynamic-menu/include/preod.inc.php phpcompta/branches/rel600-dynamic-menu/include/stock.inc.php Log: #241 : modularity : old user_advanced.php Modified: phpcompta/branches/rel600-dynamic-menu/html/compta.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/html/compta.php 2011-10-27 19:= 10:19 UTC (rev 4238) +++ phpcompta/branches/rel600-dynamic-menu/html/compta.php 2011-10-27 19:= 40:42 UTC (rev 4239) @@ -80,7 +80,7 @@ } if ( $action=3D=3D'quick_writing') { - require_once ('compta_ods.inc.php'); + require_once 'compta_ods.inc.php'; } if ( $action =3D=3D 'gl' ) { Modified: phpcompta/branches/rel600-dynamic-menu/include/opening.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/opening.inc.php 2011-1= 0-27 19:10:19 UTC (rev 4238) +++ phpcompta/branches/rel600-dynamic-menu/include/opening.inc.php 2011-1= 0-27 19:40:42 UTC (rev 4239) @@ -19,7 +19,7 @@ /* $Revision$ */ =20 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr - +require_once 'user_menu.php'; /*!\file * \brief The opening of the exercices. it takes the saldo of the * choosen foolder / exercice and import it as a misc operation in the @@ -48,7 +48,7 @@ exit(); } echo ''; - echo HtmlInput::hidden('p_action','ouv'); + echo HtmlInput::hidden('ac',$_REQUEST['ac']); echo HtmlInput::hidden('sa','step2'); echo dossier::hidden(); $wAvail=3Dnew ISelect(); @@ -74,7 +74,7 @@ /* -------------------------------------------------- * Step 2 choose now the exercice of this folder */ -$back=3D'user_advanced.php?p_action=3Douv&'.dossier::get(); +$back=3D'do.php?ac=3D'.$_REQUEST['ac'].'&'.dossier::get(); if ( $sa=3D=3D'step2') { echo '
'. @@ -83,7 +83,7 @@ ''. ' Choississez l\'exercice du dossier '; echo dossier::hidden(); - echo HtmlInput::hidden('p_action','ouv'); + echo HtmlInput::hidden('ac',$_REQUEST['ac']); echo HtmlInput::hidden('sa','step3'); echo HtmlInput::hidden('f',$_REQUEST['f']); $cn=3Dnew Database($_REQUEST['f']); @@ -131,9 +131,10 @@ $wLedger->value=3D$array; echo $wLedger->input('p_jrn'); echo HtmlInput::submit('ok','Continuer'); + echo HtmlInput::hidden('ac',$_REQUEST['ac']); echo dossier::hidden(); echo ""; - echo HtmlInput::button_anchor('Retour',$back); + echo HtmlInput::button_anchor('Retour',$back.'&sa=3Dstep2&f=3D'.$_RE= QUEST['f']); exit(0); =20 } @@ -171,8 +172,9 @@ $cn=3Dnew Database(dossier::id()); $User=3Dnew User($cn); $jrn=3Dnew Acc_Ledger($cn,$_REQUEST['p_jrn']); - echo '
'; - echo HtmlInput::hidden('p_action','quick_writing'); + echo ''; + echo HtmlInput::hidden('ac',$_REQUEST['ac']); + echo HtmlInput::hidden('sa','step5'); echo dossier::hidden(); echo HtmlInput::hidden('p_jrn',$_REQUEST['p_jrn']); echo $jrn->show_form($result,0); @@ -184,3 +186,13 @@ =20 echo '
'; } +// if sa=3Dstep4 then record it +// +/* + * @todo finir les ouvertures d'ann=C3=A9e + */ +if ( $_REQUEST['sa']=3D=3D'step5') +{ + echo "

A ENREGISTRER

"; + +} Modified: phpcompta/branches/rel600-dynamic-menu/include/preod.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/preod.inc.php 2011-10-= 27 19:10:19 UTC (rev 4238) +++ phpcompta/branches/rel600-dynamic-menu/include/preod.inc.php 2011-10-= 27 19:40:42 UTC (rev 4239) @@ -45,7 +45,7 @@ echo dossier::hidden(); $hid=3Dnew IHidden(); echo $hid->input("sa","jrn"); -echo $hid->input("p_action","preod"); +echo $hid->input("ac",$_REQUEST['ac']); echo '
'; echo HtmlInput::submit('Accepter','Accepter'); echo ''; @@ -96,7 +96,7 @@ echo '
'; echo dossier::hidden(); echo $hid->input("sa","del"); - echo $hid->input("p_action","preod"); + echo $hid->input("ac",$_REQUEST['ac']); echo $hid->input("del",""); echo $hid->input("od_id",$row['od_id']); echo $hid->input("jrn",$_GET['jrn']); Modified: phpcompta/branches/rel600-dynamic-menu/include/stock.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/stock.inc.php 2011-10-= 27 19:10:19 UTC (rev 4238) +++ phpcompta/branches/rel600-dynamic-menu/include/stock.inc.php 2011-10-= 27 19:40:42 UTC (rev 4239) @@ -37,12 +37,12 @@ =20 $cn=3Dnew Database($gDossier); include_once ("class_user.php"); -global $User; +global $g_user; =20 $href=3Dbasename($_SERVER['PHP_SELF']); =20 // Get The priv on the selected folder -$User->can_request(STOLE,1); +$g_user->can_request(STOLE,1); =20 =20 $action=3D ( isset ($_GET['action']))? $_GET['action']:""; @@ -51,7 +51,7 @@ // Adjust the stock if ( isset ($_POST['sub_change'])) { - $User->can_request(STOWRITE,1); + $g_user->can_request(STOWRITE,1); $change=3D$_POST['stock_change']; $sg_code=3D$_POST['sg_code']; $sg_date=3D$_POST['sg_date']; @@ -69,7 +69,7 @@ else { // Check if User Can change the stock - if ( $User->check_action($gDossier,GESTOCK) =3D=3D 0 ) + if ( $g_user->check_action($gDossier,GESTOCK) =3D=3D 0 ) { NoAccess(); exit (-1); @@ -113,7 +113,7 @@ if ( ! isset ($_GET['year']) ) { // get defaut periode - $a=3D$User->get_periode(); + $a=3D$g_user->get_periode(); // get exercice of periode $periode=3Dnew Periode($cn,$a); $year=3D$periode->get_exercice(); @@ -128,11 +128,11 @@ if ( $action =3D=3D 'detail' ) { // Check if User Can see the stock - $User->can_request(STOLE,1); + $g_user->can_request(STOLE,1); $sg_code=3D(isset ($_GET['sg_code'] ))?$_GET['sg_code']:$_POST['sg_c= ode']; $year=3D(isset($_GET['year']))?$_GET['year']:$_POST['year']; $a=3DViewDetailStock($cn,$sg_code,$year); - $write=3D$User->check_action(STOWRITE); + $write=3D$g_user->check_action(STOWRITE); =20 $b=3D""; =20 From MAILER-DAEMON Thu Oct 27 15:37:30 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RJVlZ-00032K-Vz for mharc-phpcompta-dev@gnu.org; Thu, 27 Oct 2011 15:37:29 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Thu, 27 Oct 2011 21:44:28 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4240 - phpcompta/branches/rel600-dynamic-menu/include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Oct 2011 19:37:28 -0000 Author: danydb Date: 2011-10-27 21:44:27 +0200 (Thu, 27 Oct 2011) New Revision: 4240 Modified: phpcompta/branches/rel600-dynamic-menu/include/user_menu.php Log: #241 : modularity : deprecated function Modified: phpcompta/branches/rel600-dynamic-menu/include/user_menu.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/user_menu.php 2011-10-= 27 19:40:42 UTC (rev 4239) +++ phpcompta/branches/rel600-dynamic-menu/include/user_menu.php 2011-10-= 27 19:44:27 UTC (rev 4240) @@ -142,7 +142,7 @@ * \return string * */ -function ShowMenuCompta($p_high=3D"") +function ShowMenuCompta_deprecated($p_high=3D"") { require_once('class_database.php'); =20 @@ -227,7 +227,7 @@ * * \return the menu */ -function ShowMenuAdvanced($default=3D"") +function ShowMenuAdvanced_deprecated($default=3D"") { $str_dossier=3Ddossier::get(); // Show the left menu From MAILER-DAEMON Thu Oct 27 15:39:31 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RJVnX-0004qN-Iw for mharc-phpcompta-dev@gnu.org; Thu, 27 Oct 2011 15:39:31 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Thu, 27 Oct 2011 21:46:28 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4241 - in phpcompta/branches/rel600-dynamic-menu: html include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Oct 2011 19:39:30 -0000 Author: danydb Date: 2011-10-27 21:46:26 +0200 (Thu, 27 Oct 2011) New Revision: 4241 Removed: phpcompta/branches/rel600-dynamic-menu/html/compta.php phpcompta/branches/rel600-dynamic-menu/html/user_advanced.php phpcompta/branches/rel600-dynamic-menu/include/letter.inc.php Log: #241 : modularity : remove obsolete files Deleted: phpcompta/branches/rel600-dynamic-menu/html/compta.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/html/compta.php 2011-10-27 19:= 44:27 UTC (rev 4240) +++ phpcompta/branches/rel600-dynamic-menu/html/compta.php 2011-10-27 19:= 46:26 UTC (rev 4241) @@ -1,108 +0,0 @@ -'._(' Vous =C3=AAtes d=C3=A9connect=C3=A9'= ).''; - redirect('index.php',1); - exit(); -} -//---------------------------------------------------------------------- - -require_once('class_database.php'); -/* Admin. Dossier */ -$cn=3Dnew Database($gDossier); - - -require_once ('class_user.php'); -$User=3Dnew User($cn); -$User->Check(); -if ($User->check_dossier($gDossier)=3D=3D'P') -{ - redirect("extension.php?".dossier::get(),0); - exit(); -} -require_once ('function_javascript.php'); -html_page_start($_SESSION['g_theme']); -echo load_all_script(); -include_once ("user_menu.php"); -echo '
'; - -echo ShowMenuCompta("user_advanced.php?".dossier::get()); -echo js_include('anc_script.js'); -echo '
'; -// Get action - -// call impress sub-menu -if ( $action =3D=3D 'impress' ) -{ - require_once('impress.inc.php'); -} - -if ( $action =3D=3D 'fiche') -{ - - require_once('fiche.inc.php'); -} - -if ( $action =3D=3D 'stock') -{ - require_once('stock.inc.php'); -} -if ( $action=3D=3D'quick_writing') -{ - require_once 'compta_ods.inc.php'; -} -if ( $action =3D=3D 'gl' ) -{ - require_once ('user_action_gl.php'); -} -if ( $action =3D=3D 'ven' || - $action =3D=3D 'client') -{ - require_once ('compta_ven.inc.php'); -} -if ( $action =3D=3D 'ach' || - $action =3D=3D 'fournisseur') -{ - require_once ('compta_ach.inc.php'); -} -if ( $action =3D=3D 'fin') -{ - require_once ('compta_fin.inc.php'); -} -if ($action =3D=3D 'let') -{ - require_once('letter.inc.php'); -} -html_page_stop(); -?> Deleted: phpcompta/branches/rel600-dynamic-menu/html/user_advanced.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/html/user_advanced.php 2011-10= -27 19:44:27 UTC (rev 4240) +++ phpcompta/branches/rel600-dynamic-menu/html/user_advanced.php 2011-10= -27 19:46:26 UTC (rev 4241) @@ -1,123 +0,0 @@ -Check(); -$User->check_dossier(dossier::id()); -$cn=3Dnew Database(dossier::id()); -$User->db=3D$cn; - -require_once('class_database.php'); -require_once('class_ipopup.php'); -load_all_script(); -echo ICard::ipopup('ipopcard'); -echo IPoste::ipopup('ipop_account'); -$search_card=3Dnew IPopup('ipop_card'); -$search_card->title=3D_('Recherche de fiche'); -$search_card->value=3D''; -echo $search_card->input(); - - - -// We don't check permissions here in fact, permission are tested in the -// functions - -// Show the top menus -include_once ("user_menu.php"); -echo '
'; - - -echo ShowMenuCompta(7); -echo '
'; -$p_action=3D""; - - -$p_action=3D(isset($_REQUEST['p_action']))?$_REQUEST['p_action']:""; -switch ($p_action) -{ -case 'preod': - $high=3D9; - break; -case 'periode'; - $high=3D2; - break; -case 'verif'; - $high=3D10; - break; -case 'defreport': - $high=3D6; - break; -case 'ouv': - $high=3D8; - break; -default: - $high=3D0; - -} -echo ShowMenuAdvanced($high); - - -//-------------------------------------------------- -// Predefined operation -//-------------------------------------------------- - -if ($p_action=3D=3D"preod") -{ - require_once('preod.inc.php'); - - exit(); -} -//---------------------------------------------------------------------- -// Verification solde -//---------------------------------------------------------------------- -if ( $p_action=3D=3D'verif' ) -{ - require_once ('verif_bilan.inc.php'); - exit(); -} - -if ($p_action=3D=3D'defreport') -{ - require_once('report.inc.php'); -} -/* -------------------------------------------------- -Import writing (opening exercice) --------------------------------------------------- */ -if ( $p_action =3D=3D 'ouv') -{ - require_once('opening.inc.php'); -} -html_page_stop(); -?> Deleted: phpcompta/branches/rel600-dynamic-menu/include/letter.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/letter.inc.php 2011-10= -27 19:44:27 UTC (rev 4240) +++ phpcompta/branches/rel600-dynamic-menu/include/letter.inc.php 2011-10= -27 19:46:26 UTC (rev 4241) @@ -1,56 +0,0 @@ -'; -echo ShowItem($array,'H','mtitle','mtitle',$subdef); -echo ''; -if ($sa =3D=3D 'poste') -{ - require_once('lettering.account.inc.php'); - exit; -} - -if ($sa=3D=3D'qc') -{ - require_once('lettering.card.inc.php'); - exit; -} From MAILER-DAEMON Thu Oct 27 15:47:43 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RJVvT-0000GC-FQ for mharc-phpcompta-dev@gnu.org; Thu, 27 Oct 2011 15:47:43 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Thu, 27 Oct 2011 21:54:41 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4242 - phpcompta/branches/rel600-dynamic-menu/include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Oct 2011 19:47:41 -0000 Author: danydb Date: 2011-10-27 21:54:39 +0200 (Thu, 27 Oct 2011) New Revision: 4242 Modified: phpcompta/branches/rel600-dynamic-menu/include/ac_common.php Log: #241 : modularity : gestion card + gestion IMP Modified: phpcompta/branches/rel600-dynamic-menu/include/ac_common.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/ac_common.php 2011-10-= 27 19:46:26 UTC (rev 4241) +++ phpcompta/branches/rel600-dynamic-menu/include/ac_common.php 2011-10-= 27 19:54:39 UTC (rev 4242) @@ -741,12 +741,16 @@ } else { +/** + * @todo add security + * check if user can access this module + */ $file=3D$cn->get_value("select me_file - from v_all_menu + from menu_ref where - user_name=3D$1 and me_code=3D$2 and + me_code=3D$1 and (me_file is not null or trim(me_file) <>'')", - array($g_user->login,$module[$idx])); + array($module[$idx])); =20 if ( $file !=3D "" ) { From MAILER-DAEMON Thu Oct 27 16:21:45 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RJWSP-0002pZ-I0 for mharc-phpcompta-dev@gnu.org; Thu, 27 Oct 2011 16:21:45 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Thu, 27 Oct 2011 22:28:37 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4243 - phpcompta/branches/rel600-dynamic-menu/include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Oct 2011 20:21:44 -0000 Author: danydb Date: 2011-10-27 22:28:36 +0200 (Thu, 27 Oct 2011) New Revision: 4243 Modified: phpcompta/branches/rel600-dynamic-menu/include/action.inc.php phpcompta/branches/rel600-dynamic-menu/include/adm.inc.php phpcompta/branches/rel600-dynamic-menu/include/balance_card.inc.php phpcompta/branches/rel600-dynamic-menu/include/client.inc.php phpcompta/branches/rel600-dynamic-menu/include/forecast.inc.php phpcompta/branches/rel600-dynamic-menu/include/impress_poste.inc.php phpcompta/branches/rel600-dynamic-menu/include/lettering.gestion.inc.p= hp phpcompta/branches/rel600-dynamic-menu/include/suivi_adm.inc.php phpcompta/branches/rel600-dynamic-menu/include/suivi_supplier.inc.php phpcompta/branches/rel600-dynamic-menu/include/supplier.inc.php phpcompta/branches/rel600-dynamic-menu/include/user_action_gl.php Log: #241 : modularity : gestion customer + supplier + forecast + follow up Modified: phpcompta/branches/rel600-dynamic-menu/include/action.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/action.inc.php 2011-10= -27 19:54:39 UTC (rev 4242) +++ phpcompta/branches/rel600-dynamic-menu/include/action.inc.php 2011-10= -27 20:28:36 UTC (rev 4243) @@ -22,10 +22,10 @@ * \brief Page who manage the different actions (meeting, letter) */ require_once('class_ipopup.php'); -global $User; -$User->can_request(GECOUR); +global $g_user; +$g_user->can_request(GECOUR); =20 -$retour=3DHtmlInput::button_anchor(_('Retour'),'?p_action=3Dsuivi_courri= er&my_action&'.dossier::get()); +$retour=3DHtmlInput::button_anchor(_('Retour'),'?ac=3D'.$_REQUEST['ac'].= '&my_action&'.dossier::get()); //----------------------------------------------------- // Action //----------------------------------------------------- Modified: phpcompta/branches/rel600-dynamic-menu/include/adm.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/adm.inc.php 2011-10-27= 19:54:39 UTC (rev 4242) +++ phpcompta/branches/rel600-dynamic-menu/include/adm.inc.php 2011-10-27= 20:28:36 UTC (rev 4243) @@ -32,13 +32,13 @@ require_once('class_ipopup.php'); require_once('class_admin.php'); =20 -global $User; +global $g_user; =20 $low_action=3D(isset($_REQUEST['sb']))?$_REQUEST['sb']:"list"; /*! \file * \brief Called from the module "Gestion" to manage the customer */ -$User->can_request(GECUST); +$g_user->can_request(GECUST); $href=3Dbasename($_SERVER['PHP_SELF']); =20 // by default open liste @@ -51,7 +51,7 @@ //----------------------------------------------------- if ( isset($_POST['delete_card'] ) ) { - if ( $User->check_action(FICADD) =3D=3D 0 ) + if ( $g_user->check_action(FICADD) =3D=3D 0 ) { alert('Vous ne pouvez pas enlever de fiche'); return; @@ -144,7 +144,7 @@ if ( $low_action=3D=3D"insert" ) { /* security : check if user can add card */ - if ( $User->check_action(FICADD) =3D=3D 0 ) + if ( $g_user->check_action(FICADD) =3D=3D 0 ) { alert('Vous ne pouvez pas ajouter de fiche'); return; Modified: phpcompta/branches/rel600-dynamic-menu/include/balance_card.inc= .php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/balance_card.inc.php 2= 011-10-27 19:54:39 UTC (rev 4242) +++ phpcompta/branches/rel600-dynamic-menu/include/balance_card.inc.php 2= 011-10-27 20:28:36 UTC (rev 4243) @@ -24,12 +24,12 @@ * \brief show the status of a card */ require_once('class_exercice.php'); -global $User; +global $g_user; echo '
'; $exercice=3Dnew Exercice($cn); $old=3D''; $fiche=3Dnew Fiche($cn,$_GET['f_id']); -$year=3D$User->get_exercice(); +$year=3D$g_user->get_exercice(); if ( $year =3D=3D 0 ) { $html=3D"erreur aucune p=C3=A9riode par d=C3=A9faut, allez dans pr=C3= =A9f=C3=A9rence pour en choisir une"; Modified: phpcompta/branches/rel600-dynamic-menu/include/client.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/client.inc.php 2011-10= -27 19:54:39 UTC (rev 4242) +++ phpcompta/branches/rel600-dynamic-menu/include/client.inc.php 2011-10= -27 20:28:36 UTC (rev 4243) @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with PhpCompta; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-130= 7 USA -*/ + */ /* $Revision$ */ // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr -/*!\brief include from client.inc.php and concerned only the customer ca= rd and +/* !\brief include from client.inc.php and concerned only the customer c= ard and * the customer category */ require_once("class_iselect.php"); @@ -32,149 +32,143 @@ require_once('class_ipopup.php'); =20 echo ICard::ipopup('ipop_newcard'); -$ip_cat=3Dnew IPopup('ipop_cat'); -$ip_cat->title=3D_('Ajout d\'une cat=C3=A9gorie'); -$ip_cat->value=3D''; +$ip_cat =3D new IPopup('ipop_cat'); +$ip_cat->title =3D _('Ajout d\'une cat=C3=A9gorie'); +$ip_cat->value =3D ''; echo $ip_cat->input(); echo IPoste::ipopup('ipop_account'); -$search_card=3Dnew IPopup('ipop_card'); -$search_card->title=3D_('Recherche de fiche'); -$search_card->value=3D''; +$search_card =3D new IPopup('ipop_card'); +$search_card->title =3D _('Recherche de fiche'); +$search_card->value =3D ''; echo $search_card->input(); echo ICard::ipopup('ipopcard'); =20 -$low_action=3D(isset($_REQUEST['sb']))?$_REQUEST['sb']:"list"; -/*! \file +$low_action =3D (isset($_REQUEST['sb'])) ? $_REQUEST['sb'] : "list"; +/* ! \file * \brief Called from the module "Gestion" to manage the customer */ -$href=3Dbasename($_SERVER['PHP_SELF']); +$href =3D basename($_SERVER['PHP_SELF']); =20 // by default open liste -if ( $low_action =3D=3D "" ) - $low_action=3D"list"; +if ($low_action =3D=3D "") + $low_action =3D "list"; =20 =20 //----------------------------------------------------- // Remove a card //----------------------------------------------------- -if ( isset($_POST['delete_card'] ) ) +if (isset($_POST['delete_card'])) { - if ( $User->check_action(FICADD) =3D=3D 0 ) + if ($g_user->check_action(FICADD) =3D=3D 0) { - alert(j(_('Vous ne pouvez pas enlever de fiche'))); - return; + alert(j(_('Vous ne pouvez pas enlever de fiche'))); + return; } =20 - $f_id=3D$_REQUEST['f_id']; + $f_id =3D $_REQUEST['f_id']; =20 - $fiche=3Dnew Customer($cn,$f_id); + $fiche =3D new Customer($cn, $f_id); $fiche->remove(); - $low_action=3D"list"; - + $low_action =3D "list"; } =20 //----------------------------------------------------- // list of customer //----------------------------------------------------- -if ( $low_action =3D=3D "list" ) +if ($low_action =3D=3D "list") { - ?> -
- - "> -', - $a); - $sel_card=3Dnew ISelect('cat'); - $sel_card->value=3D$cn->make_array('select fd_id, fd_label from fich= e_def '. - ' where frd_id=3D'.FICHE_TYPE_CLIE= NT. - ' order by fd_label ',1); - $sel_card->selected=3D(isset($_GET['cat']))?$_GET['cat']:-1; - $sel_card->javascript=3D' onchange=3D"submit(this);"'; - echo _('Cat=C3=A9gorie :').$sel_card->input(); - $nooperation=3Dnew ICheckBox('noop'); - $nooperation->selected=3D(isset($_GET['noop']))?true:false; +
+ + "> + ', $a); + $sel_card =3D new ISelect('cat'); + $sel_card->value =3D $cn->make_array('select fd_id, fd_label from fich= e_def ' . + ' where frd_id=3D' . FICHE_TYPE_CLIENT . + ' order by fd_label ', 1); + $sel_card->selected =3D (isset($_GET['cat'])) ? $_GET['cat'] : -1; + $sel_card->javascript =3D ' onchange=3D"submit(this);"'; + echo _('Cat=C3=A9gorie :') . $sel_card->input(); + $nooperation =3D new ICheckBox('noop'); + $nooperation->selected =3D (isset($_GET['noop'])) ? true : false; =20 - echo _('Inclure les clients sans op=C3=A9ration :').$nooperation->in= put(); + echo _('Inclure les clients sans op=C3=A9ration :') . $nooperation->in= put(); + ?> + "> + '; + echo $client->Summary($search, 'client', $sql, $noop); =20 - ?> - "> - "> - - - '; - echo $client->Summary($search,'client',$sql,$noop); =20 - - echo '
'; - echo '
'; - echo '
'; - /* Add button */ - $f_add_button=3Dnew IButton('add_card'); - $f_add_button->label=3D_('Cr=C3=A9er une nouvelle fiche'); - $f_add_button->set_attribute('ipopup','ipop_newcard'); - $f_add_button->set_attribute('win_refresh','yes'); + echo '
'; + echo '
'; + echo '
'; + /* Add button */ + $f_add_button =3D new IButton('add_card'); + $f_add_button->label =3D _('Cr=C3=A9er une nouvelle fiche'); + $f_add_button->set_attribute('ipopup', 'ipop_newcard'); + $f_add_button->set_attribute('win_refresh', 'yes'); // $list=3D$cn->make_list("select fd_id from fiche_def where frd_id=3D$1= ",array(FICHE_TYPE_CLIENT)); - $f_add_button->set_attribute('type_cat',FICHE_TYPE_CLIENT); - $f_add_button->javascript=3D" select_card_type(this);"; - echo $f_add_button->input(); + $f_add_button->set_attribute('type_cat', FICHE_TYPE_CLIENT); + $f_add_button->javascript =3D " select_card_type(this);"; + echo $f_add_button->input(); =20 - $f_cat_button=3Dnew IButton('add_cat'); - $f_cat_button->set_attribute('ipopup','ipop_cat'); - $f_cat_button->set_attribute('type_cat',FICHE_TYPE_CLIENT); - $f_cat_button->label=3D_('Ajout d\'une cat=C3=A9gorie'); - $f_cat_button->javascript=3D'add_category(this)'; - echo $f_cat_button->input(); - echo '
'; - echo '
'; - - -} -/*---------------------------------------------------------------------- - * Detail for a card, Suivi, Contact, Operation,... * - * cc stands for customer card - *----------------------------------------------------------------------= */ -if ( $low_action =3D=3D 'detail') -{ - /* Menu */ - require_once('client_card.inc.php'); - exit(); -} - -if ( $low_action=3D=3D"insert" ) -{ - /* security : check if user can add card */ - if ( $User->check_action(FICADD) =3D=3D 0 ) + $f_cat_button =3D new IButton('add_cat'); + $f_cat_button->set_attribute('ipopup', 'ipop_cat'); + $f_cat_button->set_attribute('type_cat', FICHE_TYPE_CLIENT); + $f_cat_button->label =3D _('Ajout d\'une cat=C3=A9gorie'); + $f_cat_button->javascript =3D 'add_category(this)'; + echo $f_cat_button->input(); + echo '
'; + echo ''; + } + /* -----------------------------------------------------------------= ----- + * Detail for a card, Suivi, Contact, Operation,... * + * cc stands for customer card + * -----------------------------------------------------------------= ----- */ + if ($low_action =3D=3D 'detail') { - alert('Vous ne pouvez pas ajouter de fiche'); - return; + /* Menu */ + require_once('client_card.inc.php'); + exit(); } =20 - $customer=3Dnew Customer($cn); - $customer->Save($_REQUEST['fd_id']); - echo '
'; - echo "
"; - echo $customer->Display(true); - echo "
"; - $retour=3Dnew IAction(); - $retour->label=3D"Retour"; - $retour->value=3D"?ac=3D".$_REQUEST["ac"]."&".dossier::get(); - echo $retour->input(); - echo '
'; + if ($low_action =3D=3D "insert") + { + /* security : check if user can add card */ + if ($g_user->check_action(FICADD) =3D=3D 0) + { + alert('Vous ne pouvez pas ajouter de fiche'); + return; + } =20 -} + $customer =3D new Customer($cn); + $customer->Save($_REQUEST['fd_id']); + echo '
'; + echo ""; + echo $customer->Display(true); + echo "
"; + $retour =3D new IAction(); + $retour->label =3D "Retour"; + $retour->value =3D "?ac=3D" . $_REQUEST["ac"] . "&" . dossier::get(); + echo $retour->input(); + echo '
'; + } =20 -html_page_stop(); -?> + html_page_stop(); + ?> Modified: phpcompta/branches/rel600-dynamic-menu/include/forecast.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/forecast.inc.php 2011-= 10-27 19:54:39 UTC (rev 4242) +++ phpcompta/branches/rel600-dynamic-menu/include/forecast.inc.php 2011-= 10-27 20:28:36 UTC (rev 4243) @@ -1,4 +1,5 @@ delete(); } /* * Cloning */ -if (isset ($_REQUEST ['clone'])) - { +if (isset($_REQUEST ['clone'])) +{ echo "

cloning

"; /* * We need to clone the forecast */ - $anti=3Dnew Forecast($cn,$_REQUEST ['f_id']); + $anti =3D new Forecast($cn, $_REQUEST ['f_id']); $anti->object_clone(); - - } -/********************************************************************** +} +/* * *******************************************************************= * * Save the modification mod_cat_save * * - **********************************************************************/ -if ( isset($_POST['mod_cat_save'])) - { - /* - * We save the forecast - */ - $anti=3Dnew Forecast($cn,$_POST['f_id']); - try - { - $cn->start(); - /* Save forecast */ - $anti->set_parameter('name',$_POST['an_name']); - $anti->set_parameter('start_date',$_POST['start_date']); - $anti->set_parameter('end_date',$_POST['end_date']); + * ******************************************************************** = */ +if (isset($_POST['mod_cat_save'])) +{ + /* + * We save the forecast + */ + $anti =3D new Forecast($cn, $_POST['f_id']); + try + { + $cn->start(); + /* Save forecast */ + $anti->set_parameter('name', $_POST['an_name']); + $anti->set_parameter('start_date', $_POST['start_date']); + $anti->set_parameter('end_date', $_POST['end_date']); =20 - $anti->save(); + $anti->save(); =20 - /* add new category */ - for ($i=3D0;$iset_parameter('order',$_POST['fc_order_new'.$i]); - $c->set_parameter('desc',$_POST['fr_cat_new'.$i]); - $c->set_parameter('forecast',$_POST['f_id']); - $c->save(); - } - } - } + /* add new category */ + for ($i =3D 0; $i < MAX_CAT; $i++) + { + if (isset($_POST['fr_cat_new' . $i])) + { + if (strlen(trim($_POST['fr_cat_new' . $i])) !=3D 0) + { + $c =3D new Forecast_Cat($cn); + $c->set_parameter('order', $_POST['fc_order_new' . $i]); + $c->set_parameter('desc', $_POST['fr_cat_new' . $i]); + $c->set_parameter('forecast', $_POST['f_id']); + $c->save(); + } + } + } =20 - /* update existing cat */ - foreach ($_POST as $key=3D>$value) - { - $var=3Dsscanf($key,'fr_cat%d'); - $idx=3Dsprintf("fr_cat%d",$var[0]); - if (isset($_POST[$idx])) - { - $fc=3Dnew Forecast_Cat($cn,$var[0]); - if (strlen(trim($_POST[$idx]))=3D=3D0) - { - $fc->delete(); - } - else - { - $fc->set_parameter('order',$_POST['fc_order'.$var[0]]); - $fc->set_parameter('desc',$_POST['fr_cat'.$var[0]]); - $fc->set_parameter('forecast',$_POST['f_id']); - $fc->save(); - } + /* update existing cat */ + foreach ($_POST as $key =3D> $value) + { + $var =3D sscanf($key, 'fr_cat%d'); + $idx =3D sprintf("fr_cat%d", $var[0]); + if (isset($_POST[$idx])) + { + $fc =3D new Forecast_Cat($cn, $var[0]); + if (strlen(trim($_POST[$idx])) =3D=3D 0) + { + $fc->delete(); + } + else + { + $fc->set_parameter('order', $_POST['fc_order' . $var[0]]); + $fc->set_parameter('desc', $_POST['fr_cat' . $var[0]]); + $fc->set_parameter('forecast', $_POST['f_id']); + $fc->save(); + } + } + } =20 - } - } - - $cn->commit(); - } - catch (Exception $e) - { - alert($e->getMessage()); - $cn->rollback(); - - } - $sa=3D'vw'; - =20 - } -/********************************************************************** + $cn->commit(); + } + catch (Exception $e) + { + alert($e->getMessage()); + $cn->rollback(); + } + $sa =3D 'vw'; +} +/* * *******************************************************************= * * Save first the data for new * * - **********************************************************************/ -if ( $sa =3D=3D 'new' || isset ($_POST['step3'])) + * ******************************************************************** = */ +if ($sa =3D=3D 'new' || isset($_POST['step3'])) { - $correct=3D0; + $correct =3D 0; if (isset($_POST['step3'])) { - /*save all the items */ - try - { - $cn->start(); - for ($i=3D0;$i<$_POST['nbrow'];$i++) - { + /* save all the items */ + try + { + $cn->start(); + for ($i =3D 0; $i < $_POST['nbrow']; $i++) + { =20 - // Delete if needed - if ( isset($_POST['fi_id'.$i])) - { - if (strlen(trim($_POST['an_cat_acc'.$i]))=3D=3D0 &&s= trlen(trim($_POST['an_qc'.$i]))=3D=3D 0) - { - $e=3Dnew Forecast_item($cn); - $e->set_parameter("id",$_POST['fi_id'.$i]); - $e->delete(); - } - } + // Delete if needed + if (isset($_POST['fi_id' . $i])) + { + if (strlen(trim($_POST['an_cat_acc' . $i])) =3D=3D 0 && strlen(tri= m($_POST['an_qc' . $i])) =3D=3D 0) + { + $e =3D new Forecast_item($cn); + $e->set_parameter("id", $_POST['fi_id' . $i]); + $e->delete(); + } + } =20 - if (strlen(trim($_POST['an_cat_acc'.$i]))!=3D0 || strlen= (trim($_POST['an_qc'.$i]))!=3D 0) - { - /* we save only if there is something */ - $e=3Dnew Forecast_item($cn); - if ( isset($_POST['fi_id'.$i])) - { - $e->set_parameter("id",$_POST['fi_id'.$i]); - } - $e->set_parameter('text',$_POST['an_label'.$i]); - $e->set_parameter('amount',$_POST['an_cat_amount'.$i= ]); - $e->set_parameter('debit',$_POST['an_deb'.$i]); - $e->set_parameter('cat_id',$_POST['an_cat'.$i]); - $e->set_parameter('account',$_POST['an_cat_acc'.$i])= ; - $e->set_parameter('periode',$_POST['month'.$i]); - $f=3Dnew Fiche($cn); - if ( $f->get_by_qcode($_POST['an_qc'.$i],false) =3D=3D= 0 ) - $e->set_parameter('card',$f->id); - else - $e->set_parameter('card',null); - $e->set_parameter('order',$i); - $e->save(); - } - } - $cn->commit(); - $sa=3D'vw'; // to avoid to restart the add of new anticipati= on - } - catch (Exception $e) - { - $cn->rollback(); - alert($e->getMessage()); - $correct=3D1; - } - + if (strlen(trim($_POST['an_cat_acc' . $i])) !=3D 0 || strlen(trim($_PO= ST['an_qc' . $i])) !=3D 0) + { + /* we save only if there is something */ + $e =3D new Forecast_item($cn); + if (isset($_POST['fi_id' . $i])) + { + $e->set_parameter("id", $_POST['fi_id' . $i]); + } + $e->set_parameter('text', $_POST['an_label' . $i]); + $e->set_parameter('amount', $_POST['an_cat_amount' . $i]); + $e->set_parameter('debit', $_POST['an_deb' . $i]); + $e->set_parameter('cat_id', $_POST['an_cat' . $i]); + $e->set_parameter('account', $_POST['an_cat_acc' . $i]); + $e->set_parameter('periode', $_POST['month' . $i]); + $f =3D new Fiche($cn); + if ($f->get_by_qcode($_POST['an_qc' . $i], false) =3D=3D 0) + $e->set_parameter('card', $f->id); + else + $e->set_parameter('card', null); + $e->set_parameter('order', $i); + $e->save(); + } + } + $cn->commit(); + $sa =3D 'vw'; // to avoid to restart the add of new anticipation + } + catch (Exception $e) + { + $cn->rollback(); + alert($e->getMessage()); + $correct =3D 1; + } } /* Second step : we save the name and category * and propose the items we add the item */ - if ($correct=3D=3D2 || isset ($_POST['step2'])) + if ($correct =3D=3D 2 || isset($_POST['step2'])) { - try - { - $cn->start(); - /* Save forecast */ - $a=3Dnew Forecast($cn); - $a->set_parameter('name',$_POST['an_name']); - $a->set_parameter('start_date',$_POST['start_date']); - $a->set_parameter('end_date',$_POST['end_date']); + try + { + $cn->start(); + /* Save forecast */ + $a =3D new Forecast($cn); + $a->set_parameter('name', $_POST['an_name']); + $a->set_parameter('start_date', $_POST['start_date']); + $a->set_parameter('end_date', $_POST['end_date']); =20 =20 - $a->save(); - $id=3D$a->get_parameter("id"); - /* save cat */ - for ($i=3D0;$iset_parameter('order',$_POST['fr_order'.$i]); - $c->set_parameter('desc',$_POST['fr_cat'.$i]); - $c->set_parameter('forecast',$id); - $c->save(); - } - } - $cn->commit(); - } - catch (Exception $e) - { - alert($e->getMessage()); - $correct=3D1; - unset($_POST['step2']); - $cn->rollback(); - } - + $a->save(); + $id =3D $a->get_parameter("id"); + /* save cat */ + for ($i =3D 0; $i < MAX_CAT; $i++) + { + if (strlen(trim($_POST['fr_cat' . $i])) !=3D 0) + { + $c =3D new Forecast_Cat($cn); + $c->set_parameter('order', $_POST['fr_order' . $i]); + $c->set_parameter('desc', $_POST['fr_cat' . $i]); + $c->set_parameter('forecast', $id); + $c->save(); + } + } + $cn->commit(); + } + catch (Exception $e) + { + alert($e->getMessage()); + $correct =3D 1; + unset($_POST['step2']); + $cn->rollback(); + } } - } -/********************************************************************** +/* * *******************************************************************= * * Display menu * * - **********************************************************************/ + * ******************************************************************** = */ // display button add and list of forecast to display -$aForecast=3DForecast::load_all($cn); -$menu=3Darray(); -$get_dossier=3Ddossier::get(); +$aForecast =3D Forecast::load_all($cn); +$menu =3D array(); +$get_dossier =3D dossier::get(); =20 =20 -for ($i =3D 0;$i'; -echo ShowItem($menu,'H','mtitle','mtitle',$def); +echo ShowItem($menu, 'H', 'mtitle', 'mtitle', $def); echo '
'; -/********************************************************************** +/* * *******************************************************************= * * Ask for a new anticipation (forecast) * * - **********************************************************************/ -if ( $sa =3D=3D 'new') + * ******************************************************************** = */ +if ($sa =3D=3D 'new') { /* Second step : we save the name and category * and propose the items we add the item */ - if ($correct=3D=3D2 || isset ($_POST['step2'])) + if ($correct =3D=3D 2 || isset($_POST['step2'])) { - /* Propose a form for the items - */ - $anticip=3Dnew Anticipation($cn,$a->get_parameter("id")); - echo '
'; - echo ICard::ipopup('ipopcard'); - echo IPoste::ipopup('ipop_account'); - $search_card=3Dnew IPopup('ipop_card'); - $search_card->title=3D_('Recherche de fiche'); - $search_card->value=3D''; - echo $search_card->input(); + /* Propose a form for the items + */ + $anticip =3D new Anticipation($cn, $a->get_parameter("id")); + echo '
'; + echo ICard::ipopup('ipopcard'); + echo IPoste::ipopup('ipop_account'); + $search_card =3D new IPopup('ipop_card'); + $search_card->title =3D _('Recherche de fiche'); + $search_card->value =3D ''; + echo $search_card->input(); =20 - echo ''; - echo dossier::hidden(); - echo HtmlInput::hidden('sa','new'); - echo HtmlInput::hidden('p_action','prev'); - echo HtmlInput::hidden('f_id',$id); - echo $anticip->form_item(); - echo HtmlInput::submit('step3',_('Sauver')); - echo ''; - echo '
'; - + echo '
'; + echo dossier::hidden(); + echo HtmlInput::hidden('sa', 'new'); + echo HtmlInput::hidden('ac', $_REQUEST['ac']); + echo HtmlInput::hidden('f_id', $id); + echo $anticip->form_item(); + echo HtmlInput::submit('step3', _('Sauver')); + echo '
'; + echo '
'; } /* First step, the name and the category */ - if ( ! isset ($_POST['step2']) || $correct=3D=3D1) + if (!isset($_POST['step2']) || $correct =3D=3D 1) { - $anc=3Dnew Anticipation($cn); - echo '
'; - /* display a blank form for name and category */ - echo '
'; - echo dossier::hidden(); - echo HtmlInput::hidden('sa','new'); - echo HtmlInput::hidden('p_action','prev'); - echo $anc->form_cat(); - echo HtmlInput::submit('step2',_('Sauver')); - echo '
'; - echo '
'; + $anc =3D new Anticipation($cn); + echo '
'; + /* display a blank form for name and category */ + echo '
'; + echo dossier::hidden(); + echo HtmlInput::hidden('sa', 'new'); + echo HtmlInput::hidden('ac', $_REQUEST['ac']); + echo $anc->form_cat(); + echo HtmlInput::submit('step2', _('Sauver')); + echo '
'; + echo '
'; } - } -/********************************************************************** +/* * *******************************************************************= * * If we request to modify the category or the name * * - **********************************************************************/ -if ( isset($_GET['mod_cat'])) + * ******************************************************************** = */ +if (isset($_GET['mod_cat'])) { - $anc=3Dnew Anticipation($cn,$_GET['f_id']); + $anc =3D new Anticipation($cn, $_GET['f_id']); echo '
'; /* display a blank form for name and category */ echo '
'; echo dossier::hidden(); - echo HtmlInput::hidden('sa','mod'); - echo HtmlInput::hidden('p_action','prev'); + echo HtmlInput::hidden('sa', 'mod'); + echo HtmlInput::hidden('ac', $_REQUEST['ac']); echo $anc->form_cat(); - echo HtmlInput::submit('mod_cat_save',_('Sauver')); + echo HtmlInput::submit('mod_cat_save', _('Sauver')); =20 echo '
'; echo '
'; } -/********************************************************************** +/* * *******************************************************************= * * If we request to modify the items * * - **********************************************************************/ + * ******************************************************************** = */ if (isset($_GET['mod_item'])) { =20 /* Propose a form for the items */ - $anticip=3Dnew Anticipation($cn,$_GET['f_id']); + $anticip =3D new Anticipation($cn, $_GET['f_id']); echo '
'; echo ICard::ipopup('ipopcard'); echo IPoste::ipopup('ipop_account'); - $search_card=3Dnew IPopup('ipop_card'); - $search_card->title=3D_('Recherche de fiche'); - $search_card->value=3D''; + $search_card =3D new IPopup('ipop_card'); + $search_card->title =3D _('Recherche de fiche'); + $search_card->value =3D ''; echo $search_card->input(); =20 echo '
'; echo dossier::hidden(); - echo HtmlInput::hidden('sa','new'); - echo HtmlInput::hidden('p_action','prev'); - echo HtmlInput::hidden('f_id',$_GET['f_id']); + echo HtmlInput::hidden('sa', 'new'); + echo HtmlInput::hidden('ac', $_REQUEST['ac']); + echo HtmlInput::hidden('f_id', $_GET['f_id']); echo $anticip->form_item(); - echo HtmlInput::submit('step3',_('Sauver')); + echo HtmlInput::submit('step3', _('Sauver')); echo '
'; echo '
'; } -/********************************************************************** +/* * *******************************************************************= * * if a forecast is asked we display the result * * - **********************************************************************/ -if ( isset($_REQUEST['f_id']) && $sa=3D=3D"vw") + * ******************************************************************** = */ +if (isset($_REQUEST['f_id']) && $sa =3D=3D "vw") { echo '
'; - $forecast=3Dnew Anticipation($cn); - $forecast->set_parameter("id",$_REQUEST['f_id']); - try { - echo $forecast->display(); - echo '
'; - echo '
'; - echo dossier::hidden(); - echo HtmlInput::hidden('f_id',$_REQUEST['f_id']); - echo HtmlInput::submit('mod_cat',_('Modifier nom ou cat=C3=A9gorie= s')); - echo HtmlInput::submit('mod_item',_('Modifier =C3=A9l=C3=A9ments')= ); - //echo HtmlInput::submit('cvs',_('Export CVS')); - echo HtmlInput::submit('del',_('Effacer'),'onclick=3D"return confi= rm(\''._('Vous confirmez l\\\' effacement').'\')"'); - echo HtmlInput::submit('clone',_('Cloner'),'onclick=3D"return conf= irm(\''._('Vous confirmez le clonage ').'\')"'); - - echo HtmlInput::hidden('p_action','prev'); - echo '
'; - echo '
'; - echo '
'; - exit(); - }=20 - catch (Exception $e)=20 - { - echo "

"._("Erreur : ").$e->getMessage().'

=

'._('Vous devez corriger').'

'; - $anc=3Dnew Anticipation($cn,$_GET['f_id']); + $forecast =3D new Anticipation($cn); + $forecast->set_parameter("id", $_REQUEST['f_id']); + try + { + echo $forecast->display(); + echo '
'; + echo '
'; + echo dossier::hidden(); + echo HtmlInput::hidden('f_id', $_REQUEST['f_id']); + echo HtmlInput::submit('mod_cat', _('Modifier nom ou cat=C3=A9gories'))= ; + echo HtmlInput::submit('mod_item', _('Modifier =C3=A9l=C3=A9ments')); + //echo HtmlInput::submit('cvs',_('Export CVS')); + echo HtmlInput::submit('del', _('Effacer'), 'onclick=3D"return confirm(= \'' . _('Vous confirmez l\\\' effacement') . '\')"'); + echo HtmlInput::submit('clone', _('Cloner'), 'onclick=3D"return confirm= (\'' . _('Vous confirmez le clonage ') . '\')"'); + echo HtmlInput::hidden('ac', $_REQUEST['ac']); + echo '
'; + echo '
'; + echo '
'; + exit(); + } + catch (Exception $e) + { + echo "

" . _("Erreur : ") . $e->getMessage() .= '

' . _('Vous devez corriger') . '

'; + $anc =3D new Anticipation($cn, $_GET['f_id']); echo '
'; /* display a blank form for name and category */ echo '
'; echo dossier::hidden(); - echo HtmlInput::hidden('sa','mod'); - echo HtmlInput::hidden('p_action','prev'); + echo HtmlInput::hidden('sa', 'mod'); + echo HtmlInput::hidden('ac', $_REQUEST['ac']); echo $anc->form_cat(); - echo HtmlInput::submit('mod_cat_save',_('Sauver')); + echo HtmlInput::submit('mod_cat_save', _('Sauver')); echo '
'; - echo '
';=09 - } + echo '
'; + } } - ?> Modified: phpcompta/branches/rel600-dynamic-menu/include/impress_poste.in= c.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/impress_poste.inc.php = 2011-10-27 19:54:39 UTC (rev 4242) +++ phpcompta/branches/rel600-dynamic-menu/include/impress_poste.inc.php = 2011-10-27 20:28:36 UTC (rev 4243) @@ -139,7 +139,7 @@ require_once("class_acc_account_ledger.php"); $go=3D0; // we ask a poste_id - if ( isset($_GET['poste_id']) && strlen(trim($_GET['poste_id'])) !=3D= 0 && isNumber($_GET['poste_id']) ) + if ( isset($_GET['poste_id']) && strlen(trim($_GET['poste_id'])) !=3D= 0 ) { if ( isset ($_GET['poste_fille']) ) { Modified: phpcompta/branches/rel600-dynamic-menu/include/lettering.gestio= n.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/lettering.gestion.inc.= php 2011-10-27 19:54:39 UTC (rev 4242) +++ phpcompta/branches/rel600-dynamic-menu/include/lettering.gestion.inc.= php 2011-10-27 20:28:36 UTC (rev 4243) @@ -1,6 +1,6 @@ '; echo '
'; echo '
'; @@ -13,7 +13,7 @@ echo ''; =20 // limit of the year -$exercice=3D$User->get_exercice(); +$exercice=3D$g_user->get_exercice(); $periode=3Dnew Periode($cn); list($first_per,$last_per)=3D$periode->get_limit($exercice); =20 Modified: phpcompta/branches/rel600-dynamic-menu/include/suivi_adm.inc.ph= p =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/suivi_adm.inc.php 2011= -10-27 19:54:39 UTC (rev 4242) +++ phpcompta/branches/rel600-dynamic-menu/include/suivi_adm.inc.php 2011= -10-27 20:28:36 UTC (rev 4243) @@ -28,7 +28,7 @@ * - $cn =3D database connection */ require_once('class_action.php'); -$User->can_request(GECOUR); +$g_user->can_request(GECOUR); =20 /** *\note fix problem with ShowActionList, this function is local Modified: phpcompta/branches/rel600-dynamic-menu/include/suivi_supplier.i= nc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/suivi_supplier.inc.php= 2011-10-27 19:54:39 UTC (rev 4242) +++ phpcompta/branches/rel600-dynamic-menu/include/suivi_supplier.inc.php= 2011-10-27 20:28:36 UTC (rev 4243) @@ -28,7 +28,7 @@ * - $cn =3D database connection */ require_once('class_action.php'); -$User->can_request(GECOUR); +$g_user->can_request(GECOUR); =20 /** *\note problem with ShowActionList, this function is local Modified: phpcompta/branches/rel600-dynamic-menu/include/supplier.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/supplier.inc.php 2011-= 10-27 19:54:39 UTC (rev 4242) +++ phpcompta/branches/rel600-dynamic-menu/include/supplier.inc.php 2011-= 10-27 20:28:36 UTC (rev 4243) @@ -30,13 +30,13 @@ require_once('class_iaction.php'); require_once('class_fiche_def.php'); require_once('class_ipopup.php'); -global $User; +global $g_user; =20 $low_action=3D(isset($_REQUEST['sb']))?$_REQUEST['sb']:"list"; /*! \file * \brief Called from the module "Gestion" to manage the supplier */ -$User->can_request(GECUST); +$g_user->can_request(GECUST); $href=3Dbasename($_SERVER['PHP_SELF']); =20 // by default open liste @@ -49,7 +49,7 @@ //----------------------------------------------------- if ( isset($_POST['delete_card'] ) ) { - if ( $User->check_action(FICADD) =3D=3D 0 ) + if ( $g_user->check_action(FICADD) =3D=3D 0 ) { alert('Vous ne pouvez pas enlever de fiche'); return; @@ -146,7 +146,7 @@ if ( $low_action=3D=3D"insert" ) { /* security : check if user can add card */ - if ( $User->check_action(FICADD) =3D=3D 0 ) + if ( $g_user->check_action(FICADD) =3D=3D 0 ) { alert('Vous ne pouvez pas ajouter de fiche'); return; Modified: phpcompta/branches/rel600-dynamic-menu/include/user_action_gl.p= hp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/user_action_gl.php 201= 1-10-27 19:54:39 UTC (rev 4242) +++ phpcompta/branches/rel600-dynamic-menu/include/user_action_gl.php 201= 1-10-27 20:28:36 UTC (rev 4243) @@ -27,6 +27,7 @@ include_once("class_user.php"); require_once("class_iselect.php"); require_once('class_acc_ledger.php'); +$gDossier=3DDossier::id(); $cn=3Dnew Database($gDossier); =20 require_once('class_iposte.php'); @@ -41,6 +42,10 @@ } else $Ledger->id=3D$_REQUEST['p_jrn']; +/* + * @todo usefull ? + */ +$_GET['ledger_type']=3D'ALL'; echo $Ledger->display_search_form(); echo '
'; /* compute the sql stmt */ @@ -54,7 +59,6 @@ $bar=3Djrn_navigation_bar($offset,$max_line,$step,$page); =20 =20 -echo HtmlInput::hidden("p_action",$_REQUEST['p_action']); if (isset($_REQUEST['sa'])) echo HtmlInput::hidden("sa",$_REQUEST['sa'])= ; if (isset($_REQUEST['sb'])) echo HtmlInput::hidden("sb",$_REQUEST['sb'])= ; if (isset($_REQUEST['sc'])) echo HtmlInput::hidden("sc",$_REQUEST['sc'])= ; From MAILER-DAEMON Thu Oct 27 18:41:02 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RJYdC-0006RB-7g for mharc-phpcompta-dev@gnu.org; Thu, 27 Oct 2011 18:41:02 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Fri, 28 Oct 2011 00:47:56 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4244 - in phpcompta/branches/rel600-dynamic-menu/include: . template X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Oct 2011 22:41:01 -0000 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_ex= ercice.php phpcompta/branches/rel600-dynamic-menu/include/user_menu.php Log: #241 : modularity : parameter=20 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.ph= p =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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=3D''; $remove=3Dsprintf(_('Nombre op=C3=A9rations %d'),$l_line['count_op= ']); $remove=3Dtd($remove,' class=3D"mtitle" '); - $change=3Dtd (' R=C3= =A9ouverture',' class=3D"mtitle"'); + $change=3Dtd (' R=C3=A9ouverture',' class=3D"mtitle"'); =20 } else { $closed=3D''; =20 if ($l_line['count_op'] =3D=3D 0 ) { @@ -260,7 +260,7 @@ =20 if ($l_line['count_op'] =3D=3D 0 ) { - $remove.=3D' Efface"; } else @@ -277,7 +277,7 @@ echo ''; =20 } - echo ''; + echo ''; echo dossier::hidden(); $istart=3Dnew IDate('p_date_start'); $iend=3Dnew IDate('p_date_end'); @@ -325,13 +325,13 @@ =20 if ( $l_line['status'] !=3D 'OP' ) { - $closed=3Dtd ('jrn_def_id.'" onclick=3D"return confirm(\''._('Confirmez R=C3=A9ouve= rture').' ?\')"> R=C3=A9ouverture',' class=3D"mtitle"'); + $closed=3Dtd ('jrn_def_id.'" onclick=3D"return confirm(\''._('Confirmez R=C3=A9= ouverture').' ?\')"> R=C3=A9ouverture',' class=3D"mtitle"'); // $closed=3D($l_line['status']=3D=3D'CE')?'':''; } else { $closed=3D''; } echo "$closed"; @@ -486,7 +486,7 @@ */ function insert_exercice($p_exercice) { - try=20 + try { $this->cn->start(); for ($i=3D1;$i < 12;$i++) Modified: phpcompta/branches/rel600-dynamic-menu/include/fiche_def.inc.ph= p =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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=3Dnew 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 ""; echo ""; echo ''; @@ -77,8 +77,8 @@ echo $mod->Input(); echo ""; $w=3Dnew 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 ''; Modified: phpcompta/branches/rel600-dynamic-menu/include/param_pcmn.inc.p= hp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/param_pcmn.inc.php 201= 1-10-27 20:28:36 UTC (rev 4243) +++ phpcompta/branches/rel600-dynamic-menu/include/param_pcmn.inc.php 201= 1-10-27 22:47:55 UTC (rev 4244) @@ -194,7 +194,7 @@ $p_val=3Dtrim($p_val); $p_parent=3Dtrim($p_parent); =20 - if ( isset ( $p_val) && isset ( $p_lib ) && isNumber($p_val) && isNu= mber($p_parent) ) + if ( isset ( $p_val) && isset ( $p_lib ) ) { $p_val=3Dtrim($p_val); $p_parent=3D$_POST["p_parent"]; @@ -304,7 +304,7 @@ =20 =20 echo $td; - printf ('Delete<= /A>',$A['pcm_val'],$str_dossier); + printf ('Efface',$A['pcm_val'],$str_dossier); echo ""; =20 =20 Modified: phpcompta/branches/rel600-dynamic-menu/include/payment_middle.i= nc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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=3DHtmlInput::default_value('sb', "", $_REQUEST); echo '
'; =20 //---------------------------------------------------------------------- @@ -44,7 +44,7 @@ $row=3Dnew Acc_Payment($cn,$_GET['id']); $row->load(); $javascript=3D"return confirm('"._('Vous confirmez')."')"; - echo '
'; + echo ''; echo dossier::hidden(); echo HtmlInput::hidden('p_jrn',0); echo HtmlInput::hidden('p_action','divers'); @@ -90,7 +90,7 @@ $r=3D$mp->blank(); echo ''; echo dossier::hidden().HtmlInput::hidden('sa',$_REQUEST['sa']). - HtmlInput::hidden('p_action',$_REQUEST['p_action']).HtmlInput::hidde= n('sb','insert'); + HtmlInput::hidden('ac',$_REQUEST['ac']).HtmlInput::hidden('sb','insert'= ); echo $r; echo HtmlInput::submit('insert',_('Enregistre')); echo ''; @@ -130,7 +130,7 @@ { echo $tr; echo $row->row(); - echo $td.HtmlInput::button_anchor(_('Modifie'),'?p_action=3Ddive= rs&sa=3Dmp&sb=3Dchange&'.dossier::get(). + echo $td.HtmlInput::button_anchor(_('Modifie'),'?ac=3D'.$_REQUES= T['ac'].'&sa=3Dmp&sb=3Dchange&'.dossier::get(). '&id=3D'.$row->get_paramet= er('id')); echo $etr; =20 Modified: phpcompta/branches/rel600-dynamic-menu/include/periode.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/periode.inc.php 2011-1= 0-27 20:28:36 UTC (rev 4243) +++ phpcompta/branches/rel600-dynamic-menu/include/periode.inc.php 2011-1= 0-27 22:47:55 UTC (rev 4244) @@ -38,7 +38,7 @@ =20 if ( isset ($_POST["add_per"] )) { - $User->can_request(PARPER,1); + $g_user->can_request(PARPER,1); extract($_POST); $obj=3Dnew Periode($cn); if ( $obj->insert($p_date_start,$p_date_end,$p_exercice) =3D=3D 1 ) @@ -50,7 +50,7 @@ } if (isset($_POST['add_exercice'])) { - $User->can_request(PARPER,1); + $g_user->can_request(PARPER,1); $obj=3Dnew Periode($cn); $exercice=3D$cn->get_value('select max(p_exercice::float)+1 from par= m_periode'); if ( $obj->insert_exercice($exercice) =3D=3D 1 ) @@ -62,7 +62,7 @@ } if ( $action=3D=3D"closed") { - $User->can_request(PARCLO); + $g_user->can_request(PARCLO); $p_per=3D$_GET['p_per']; $per=3Dnew Periode($cn); $jrn_def_id=3D(isset($_GET['jrn_def_id']))?$_GET['jrn_def_id']:0; @@ -74,7 +74,7 @@ =20 if ( $action=3D=3D "delete_per" ) { - $User->can_request(PARPER); + $g_user->can_request(PARPER); $p_per=3D$_GET["p_per"]; // Check if the periode is not used if ( $cn->count_sql("select * from jrnx where j_tech_per=3D$p_per") = !=3D 0 ) @@ -87,9 +87,9 @@ } $choose=3D"yes"; } -if ( $action =3D=3D 'reopen')=20 +if ( $action =3D=3D 'reopen') { - $User->can_request(PARCLO); + $g_user->can_request(PARCLO); $jrn_def_id=3D(isset($_GET['jrn_def_id']))?$_GET['jrn_def_id']:0; $per=3Dnew Periode($cn); $jrn_def_id=3D(isset($_GET['jrn_def_id']))?$_GET['jrn_def_id']:0; @@ -101,7 +101,7 @@ } if ( $choose=3D=3D"yes" ) { - echo HtmlInput::button_anchor('Autre Journal ?','?choose=3Dno&p_acti= on=3Dperiode&gDossier=3D'.dossier::id()); + echo HtmlInput::button_anchor('Autre Journal ?','?choose=3Dno&ac=3D'= .$_REQUEST['ac'].'&gDossier=3D'.dossier::id()); $per=3Dnew Periode($cn); $jrn=3D(isset($_GET['jrn_def_id']))?$_GET['jrn_def_id']:0; $per->set_jrn($jrn); @@ -111,7 +111,7 @@ } else { - echo '
'; + echo ''; echo dossier::hidden(); $sel_jrn=3D$cn->make_array("select jrn_def_id, jrn_def_name from ". " jrn_def order by jrn_def_name"); @@ -121,7 +121,7 @@ $wSel->name=3D'jrn_def_id'; echo "Choississez global ou uniquement le journal =C3=A0 fermer".$wS= el->input(); echo HtmlInput::submit('choose','Valider'); - echo HtmlInput::hidden('p_action','periode'); + echo HtmlInput::hidden('ac',$_REQUEST['ac']); echo ""; echo '

Pour ajouter, effacer ou modifier une p&eac= ute;riode, il faut choisir global

'; } Modified: phpcompta/branches/rel600-dynamic-menu/include/template/list_ca= tegory_document.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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 @@
'; - $closed.=3D' Cloturer'; + $closed.=3D' Cloturer=
C= entraliseeFermée'; - $closed.=3D'jrn_def_id.'" onclick=3D"return confirm(\''._('Confirme= z Cloture').' ?\')"> Cloturer'; + $closed.=3D'jrn_def_id.'" onclick=3D"return confirm(\''._('Co= nfirmez Cloture').' ?\')"> Cloturer'; $closed.=3D'
\ No newline at end of file Modified: phpcompta/branches/rel600-dynamic-menu/include/template/menu.ph= p =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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 @@ =20 Ajout d'un exercice -Ajout d'un exercice comptable de 13 p=C3=A9riodes, commen=C3=A7ant le 1 = janvier jusqu'au 31 d=C3=A9cembre=20 +Ajout d'un exercice comptable de 13 p=C3=A9riodes, commen=C3=A7ant le 1 = janvier jusqu'au 31 d=C3=A9cembre
=20
Modified: phpcompta/branches/rel600-dynamic-menu/include/user_menu.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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 @@ =20 function ShowMenuPcmn($p_start=3D1) { + $base=3D"?ac=3D".$_REQUEST['ac']; $str_dossier=3D"&".dossier::get(); echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; + echo ''; + echo ''= ; + echo '<= /TR>'; + echo '= '; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo '<= /TR>'; echo "
0'._(' Hors Bilan').'
1'._(' Immobilis=C3=A9').'
2 '._('Actif a un an au plus').'
3 '._('Stock et commande').'
4 '._('Compte tiers').'
5'._('Actif').'
6'._('Charges').'
7'._('Produits').'
8'._('Hors Comptabilit=C3=A9').'=
9 '._('Hors Comptabilit=C3=A9').'
0'._(' Hors Bilan').'
1'._(' Immobilis=C3=A9').'
2 '._('Actif a un an au plus').'
3 '._('Stock et commande').'
4 '._('Compte tiers').'
5'._('Actif').'
6'._('Charges').'
7'._('Produits').'
8'._('Hors Comptabilit=C3=A9').'
9 '._('Hors Comptabilit=C3=A9').'
"; } =20 From MAILER-DAEMON Thu Oct 27 18:44:48 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RJYgq-0006bz-OL for mharc-phpcompta-dev@gnu.org; Thu, 27 Oct 2011 18:44:48 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Fri, 28 Oct 2011 00:51:44 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4245 - phpcompta/branches/rel600-dynamic-menu/sql X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Oct 2011 22:44:46 -0000 Author: danydb Date: 2011-10-28 00:51:43 +0200 (Fri, 28 Oct 2011) New Revision: 4245 Modified: phpcompta/branches/rel600-dynamic-menu/sql/object-6.0.sql Log: update menu_ref, profile_menu Modified: phpcompta/branches/rel600-dynamic-menu/sql/object-6.0.sql =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/sql/object-6.0.sql 2011-10-27 = 22:47:55 UTC (rev 4244) +++ phpcompta/branches/rel600-dynamic-menu/sql/object-6.0.sql 2011-10-27 = 22:51:43 UTC (rev 4245) @@ -24,7 +24,8 @@ me_menu text, me_file text, me_module character(1), - me_url text + me_url text, + me_description text ); =20 =20 @@ -162,7 +163,7 @@ -- Name: profile_menu_pm_id_seq; Type: SEQUENCE SET; Schema: public; Own= er: dany -- =20 -SELECT pg_catalog.setval('profile_menu_pm_id_seq', 19, true); +SELECT pg_catalog.setval('profile_menu_pm_id_seq', 69, true); =20 =20 -- @@ -290,43 +291,60 @@ -- Data for Name: menu_ref; Type: TABLE DATA; Schema: public; Owner: dan= y -- =20 -INSERT INTO menu_ref VALUES ('CARD', 'Fiche', 'fiche.inc.php', 'N', NULL= ); -INSERT INTO menu_ref VALUES ('STOCK', 'Stock', 'stock.inc.php', 'N', NUL= L); -INSERT INTO menu_ref VALUES ('MISC', 'Op=C3=A9rations Diverses', 'compta= _ods.inc.php', 'N', NULL); -INSERT INTO menu_ref VALUES ('HIST', 'Historique', 'user_action_gl.php',= 'N', NULL); -INSERT INTO menu_ref VALUES ('VEN', 'Vente', 'compta_ven.inc.php', 'N', = NULL); -INSERT INTO menu_ref VALUES ('ACH', 'Achat', 'compta_ach.inc.php', 'N', = NULL); -INSERT INTO menu_ref VALUES ('FIN', 'Financier', 'compta_fin.inc.php', '= N', NULL); -INSERT INTO menu_ref VALUES ('LET', 'Lettrage', 'letter.inc.php', 'N', N= ULL); -INSERT INTO menu_ref VALUES ('PREOD', 'Op=C3=A9rations pr=C3=A9d=C3=A9fi= nies', 'preod.inc.php', 'N', NULL); -INSERT INTO menu_ref VALUES ('VERIFBIL', 'V=C3=A9rification ', 'verif_bi= lan.inc.php', 'N', NULL); -INSERT INTO menu_ref VALUES ('REPORT', 'Cr=C3=A9ation de rapport', 'repo= rt.inc.php', 'N', NULL); -INSERT INTO menu_ref VALUES ('OPEN', 'Ecriture Ouverture', 'opening.inc.= php', 'N', NULL); -INSERT INTO menu_ref VALUES ('ADM', 'Administration', 'adm.inc.php', 'N'= , NULL); -INSERT INTO menu_ref VALUES ('SUPPL', 'Fournisseur', 'supplier.inc.php',= 'N', NULL); -INSERT INTO menu_ref VALUES ('FOLLOW', 'Courrier', 'action.inc.php', 'N'= , NULL); -INSERT INTO menu_ref VALUES ('FORECAST', 'Pr=C3=A9vision', 'forecast.inc= .php', 'N', NULL); -INSERT INTO menu_ref VALUES ('IMPJRN', 'Historique', 'impress_jrn.inc.ph= p', 'N', NULL); -INSERT INTO menu_ref VALUES ('IMPREC', 'Rapprochement', 'impress_rec.inc= .php', 'N', NULL); -INSERT INTO menu_ref VALUES ('IMPPOSTE', 'Poste', 'impress_poste.inc.php= ', 'N', NULL); -INSERT INTO menu_ref VALUES ('IMPREPORT', 'Rapport', 'impress_rapport.in= c.php', 'N', NULL); -INSERT INTO menu_ref VALUES ('IMPBILAN', 'Bilan', 'impress_bilan.inc.php= ', 'N', NULL); -INSERT INTO menu_ref VALUES ('IMPGL', 'Grand Livre', 'impress_gl_comptes= .inc.php', 'N', NULL); -INSERT INTO menu_ref VALUES ('IMPBAL', 'Balance', 'balance.inc.php', 'N'= , NULL); -INSERT INTO menu_ref VALUES ('IMPCARD', 'Cat=C3=A9gorie de Fiches', 'imp= ress_fiche.inc.php', 'N', NULL); -INSERT INTO menu_ref VALUES ('CUSTDET', 'Fiche', 'detail_client.inc.php'= , 'N', NULL); -INSERT INTO menu_ref VALUES ('CUSTFOLLOW', 'Suivi', 'suivi_client.inc.ph= p', 'N', NULL); -INSERT INTO menu_ref VALUES ('CUSTOP', 'Op=C3=A9ration', 'operation_clie= nt.inc.php', 'N', NULL); -INSERT INTO menu_ref VALUES ('CARDBAL', 'Balance', 'balance_card.inc.php= ', 'N', NULL); -INSERT INTO menu_ref VALUES ('CUST', 'Client', 'client.inc.php', 'N', NU= LL); -INSERT INTO menu_ref VALUES ('ANC', 'C. Analytique', NULL, 'Y', NULL); -INSERT INTO menu_ref VALUES ('PARAM', 'Param=C3=A8tre', NULL, 'Y', NULL)= ; -INSERT INTO menu_ref VALUES ('GESTION', 'Gestion', NULL, 'Y', NULL); -INSERT INTO menu_ref VALUES ('CUSTCONTACT', 'Contact (=C3=A0 faire)', NU= LL, 'N', NULL); -INSERT INTO menu_ref VALUES ('COMPTA', 'Comptabilit=C3=A9', NULL, 'Y', N= ULL); -INSERT INTO menu_ref VALUES ('LOGOUT', 'Sortie', NULL, 'Y', 'logout.php'= ); -INSERT INTO menu_ref VALUES ('DASHBOARD', 'Tableau de bord', 'dashboard.= inc.php', 'Y', NULL); -INSERT INTO menu_ref VALUES ('IMP', 'Impression', NULL, 'N', NULL); +INSERT INTO menu_ref VALUES ('COMPANY', 'Soci=C3=A9t=C3=A9s', 'company.i= nc.php', 'N', NULL, 'Parametre societe'); +INSERT INTO menu_ref VALUES ('PERIODE', 'P=C3=A9riode', 'periode.inc.php= ', 'N', NULL, 'Gestion des p=C3=A9riodes'); +INSERT INTO menu_ref VALUES ('DIVPARM', 'Divers', NULL, 'N', NULL, NULL)= ; +INSERT INTO menu_ref VALUES ('CFGPAYMENT', 'Moyen de paiement', 'payment= _middle.inc.php', 'N', NULL, NULL); +INSERT INTO menu_ref VALUES ('CFGTVA', 'TVA', 'tva.inc.php', 'N', NULL, = NULL); +INSERT INTO menu_ref VALUES ('CFGACCOUNT', 'Poste', 'poste.inc.php', 'N'= , NULL, NULL); +INSERT INTO menu_ref VALUES ('CARD', 'Fiche', 'fiche.inc.php', 'N', NULL= , NULL); +INSERT INTO menu_ref VALUES ('STOCK', 'Stock', 'stock.inc.php', 'N', NUL= L, NULL); +INSERT INTO menu_ref VALUES ('MISC', 'Op=C3=A9rations Diverses', 'compta= _ods.inc.php', 'N', NULL, NULL); +INSERT INTO menu_ref VALUES ('HIST', 'Historique', 'user_action_gl.php',= 'N', NULL, NULL); +INSERT INTO menu_ref VALUES ('VEN', 'Vente', 'compta_ven.inc.php', 'N', = NULL, NULL); +INSERT INTO menu_ref VALUES ('ACH', 'Achat', 'compta_ach.inc.php', 'N', = NULL, NULL); +INSERT INTO menu_ref VALUES ('FIN', 'Financier', 'compta_fin.inc.php', '= N', NULL, NULL); +INSERT INTO menu_ref VALUES ('LET', 'Lettrage', 'letter.inc.php', 'N', N= ULL, NULL); +INSERT INTO menu_ref VALUES ('PREOD', 'Op=C3=A9rations pr=C3=A9d=C3=A9fi= nies', 'preod.inc.php', 'N', NULL, NULL); +INSERT INTO menu_ref VALUES ('VERIFBIL', 'V=C3=A9rification ', 'verif_bi= lan.inc.php', 'N', NULL, NULL); +INSERT INTO menu_ref VALUES ('REPORT', 'Cr=C3=A9ation de rapport', 'repo= rt.inc.php', 'N', NULL, NULL); +INSERT INTO menu_ref VALUES ('OPEN', 'Ecriture Ouverture', 'opening.inc.= php', 'N', NULL, NULL); +INSERT INTO menu_ref VALUES ('ADM', 'Administration', 'adm.inc.php', 'N'= , NULL, NULL); +INSERT INTO menu_ref VALUES ('SUPPL', 'Fournisseur', 'supplier.inc.php',= 'N', NULL, NULL); +INSERT INTO menu_ref VALUES ('FOLLOW', 'Courrier', 'action.inc.php', 'N'= , NULL, NULL); +INSERT INTO menu_ref VALUES ('FORECAST', 'Pr=C3=A9vision', 'forecast.inc= .php', 'N', NULL, NULL); +INSERT INTO menu_ref VALUES ('IMPJRN', 'Historique', 'impress_jrn.inc.ph= p', 'N', NULL, NULL); +INSERT INTO menu_ref VALUES ('IMPREC', 'Rapprochement', 'impress_rec.inc= .php', 'N', NULL, NULL); +INSERT INTO menu_ref VALUES ('IMPPOSTE', 'Poste', 'impress_poste.inc.php= ', 'N', NULL, NULL); +INSERT INTO menu_ref VALUES ('IMPREPORT', 'Rapport', 'impress_rapport.in= c.php', 'N', NULL, NULL); +INSERT INTO menu_ref VALUES ('IMPBILAN', 'Bilan', 'impress_bilan.inc.php= ', 'N', NULL, NULL); +INSERT INTO menu_ref VALUES ('IMPGL', 'Grand Livre', 'impress_gl_comptes= .inc.php', 'N', NULL, NULL); +INSERT INTO menu_ref VALUES ('IMPBAL', 'Balance', 'balance.inc.php', 'N'= , NULL, NULL); +INSERT INTO menu_ref VALUES ('IMPCARD', 'Cat=C3=A9gorie de Fiches', 'imp= ress_fiche.inc.php', 'N', NULL, NULL); +INSERT INTO menu_ref VALUES ('CUSTDET', 'Fiche', 'detail_client.inc.php'= , 'N', NULL, NULL); +INSERT INTO menu_ref VALUES ('CUSTFOLLOW', 'Suivi', 'suivi_client.inc.ph= p', 'N', NULL, NULL); +INSERT INTO menu_ref VALUES ('CUSTOP', 'Op=C3=A9ration', 'operation_clie= nt.inc.php', 'N', NULL, NULL); +INSERT INTO menu_ref VALUES ('CFGCARDCAT', 'Cat=C3=A9gorie de fiche', 'f= iche_def.inc.php', 'N', NULL, NULL); +INSERT INTO menu_ref VALUES ('CARDBAL', 'Balance', 'balance_card.inc.php= ', 'N', NULL, NULL); +INSERT INTO menu_ref VALUES ('CUST', 'Client', 'client.inc.php', 'N', NU= LL, NULL); +INSERT INTO menu_ref VALUES ('CFGCATDOC', 'Cat=C3=A9gorie de documents',= 'cat_document.inc.php', 'N', NULL, NULL); +INSERT INTO menu_ref VALUES ('CFGATTRIBCARD', 'Attribut de fiche', 'card= _attr.inc.php', 'N', NULL, NULL); +INSERT INTO menu_ref VALUES ('CFGPCMN', 'Plan Comptable', 'param_pcmn.in= c.php', 'N', NULL, NULL); +INSERT INTO menu_ref VALUES ('PARAM', 'Param=C3=A8tre', NULL, 'Y', NULL,= NULL); +INSERT INTO menu_ref VALUES ('GESTION', 'Gestion', NULL, 'Y', NULL, NULL= ); +INSERT INTO menu_ref VALUES ('CUSTCONTACT', 'Contact (=C3=A0 faire)', NU= LL, 'N', NULL, NULL); +INSERT INTO menu_ref VALUES ('COMPTA', 'Comptabilit=C3=A9', NULL, 'Y', N= ULL, NULL); +INSERT INTO menu_ref VALUES ('LOGOUT', 'Sortie', NULL, 'Y', 'logout.php'= , NULL); +INSERT INTO menu_ref VALUES ('DASHBOARD', 'Tableau de bord', 'dashboard.= inc.php', 'Y', NULL, NULL); +INSERT INTO menu_ref VALUES ('IMP', 'Impression', NULL, 'N', NULL, NULL)= ; +INSERT INTO menu_ref VALUES ('LETTER', 'Lettrage', NULL, 'N', NULL, NULL= ); +INSERT INTO menu_ref VALUES ('LETTERCARD', 'Let. Fiche', 'lettering.card= .inc.php', 'N', NULL, NULL); +INSERT INTO menu_ref VALUES ('LETTERACC', 'Let. Poste', 'lettering.accou= nt.inc.php', 'N', NULL, NULL); +INSERT INTO menu_ref VALUES ('PREDOP', 'Ecriture pr=C3=A9definie', 'preo= d.inc.php', 'N', NULL, NULL); +INSERT INTO menu_ref VALUES ('ADV', 'Avanc=C3=A9', NULL, 'N', NULL, NULL= ); +INSERT INTO menu_ref VALUES ('ANC', 'Compta Analytique', NULL, 'Y', NULL= , NULL); +INSERT INTO menu_ref VALUES ('ACCESS', 'Dossier', NULL, 'Y', 'user_login= .php', NULL); +INSERT INTO menu_ref VALUES ('DOCUMENT', 'Document', 'document_modele.in= c.php', 'N', NULL, NULL); =20 =20 -- @@ -334,29 +352,66 @@ -- =20 INSERT INTO profile VALUES ('default', 1, 'Profil par d=C3=A9faut'); +INSERT INTO profile VALUES ('Analytique', 2, 'Uniquement comptabilit=C3=A9= analytique'); +INSERT INTO profile VALUES ('Vente', 3, 'Uniquement vente'); =20 =20 -- -- Data for Name: profile_menu; Type: TABLE DATA; Schema: public; Owner:= dany -- =20 -INSERT INTO profile_menu VALUES (1, 'COMPTA', NULL, 1, 1, 'M'); -INSERT INTO profile_menu VALUES (2, 'ANC', NULL, 1, 2, 'M'); -INSERT INTO profile_menu VALUES (3, 'ACH', 'COMPTA', 1, 3, 'E'); -INSERT INTO profile_menu VALUES (4, 'VEN', 'COMPTA', 1, 4, 'E'); -INSERT INTO profile_menu VALUES (5, 'CARD', 'COMPTA', 1, 5, 'E'); -INSERT INTO profile_menu VALUES (6, 'IMP', 'COMPTA', 1, 6, 'E'); -INSERT INTO profile_menu VALUES (9, 'IMPPOSTE', 'IMP', 1, 7, 'E'); -INSERT INTO profile_menu VALUES (10, 'IMPREC', 'IMP', 1, 8, 'E'); -INSERT INTO profile_menu VALUES (11, 'IMPREPORT', 'IMP', 1, 9, 'E'); +INSERT INTO profile_menu VALUES (1, 'COMPTA', NULL, 1, 5, 'M'); +INSERT INTO profile_menu VALUES (34, 'GESTION', NULL, 1, 6, 'M'); +INSERT INTO profile_menu VALUES (2, 'ANC', NULL, 1, 7, 'M'); +INSERT INTO profile_menu VALUES (45, 'PARAM', NULL, 1, 2, 'M'); +INSERT INTO profile_menu VALUES (44, 'DASHBOARD', NULL, 1, 1, 'M'); +INSERT INTO profile_menu VALUES (50, 'ANC', NULL, 2, 1, 'M'); +INSERT INTO profile_menu VALUES (51, 'COMPTA', NULL, 3, 1, 'M'); +INSERT INTO profile_menu VALUES (52, 'VEN', 'COMPTA', 3, 1, 'E'); +INSERT INTO profile_menu VALUES (53, 'ACCESS', NULL, 1, 18, 'M'); +INSERT INTO profile_menu VALUES (54, 'COMPANY', 'PARAM', 1, 1, 'E'); +INSERT INTO profile_menu VALUES (55, 'PERIODE', 'PARAM', 1, 2, 'E'); +INSERT INTO profile_menu VALUES (56, 'DIVPARM', 'PARAM', 1, 3, 'E'); +INSERT INTO profile_menu VALUES (59, 'CFGPAYMENT', 'DIVPARM', 1, 4, 'E')= ; +INSERT INTO profile_menu VALUES (60, 'CFGTVA', 'DIVPARM', 1, 5, 'E'); +INSERT INTO profile_menu VALUES (61, 'CFGACCOUNT', 'DIVPARM', 1, 6, 'E')= ; +INSERT INTO profile_menu VALUES (65, 'CFGCARDCAT', 'DIVPARM', 1, 7, 'e')= ; +INSERT INTO profile_menu VALUES (67, 'CFGCATDOC', 'DIVPARM', 1, 8, 'E'); INSERT INTO profile_menu VALUES (13, 'IMPBILAN', 'IMP', 1, 11, 'E'); INSERT INTO profile_menu VALUES (14, 'IMPCARD', 'IMP', 1, 12, 'E'); INSERT INTO profile_menu VALUES (15, 'IMPGL', 'IMP', 1, 13, 'E'); INSERT INTO profile_menu VALUES (16, 'IMPJRN', 'IMP', 1, 14, 'E'); INSERT INTO profile_menu VALUES (17, 'IMPBAL', 'IMP', 1, 15, 'E'); -INSERT INTO profile_menu VALUES (18, 'MISC', 'COMPTA', 1, 16, 'E'); -INSERT INTO profile_menu VALUES (19, 'FIN', 'COMPTA', 1, 17, 'E'); +INSERT INTO profile_menu VALUES (68, 'CFGATTRIBCARD', 'DIVPARM', 1, 9, '= E'); +INSERT INTO profile_menu VALUES (69, 'CFGPCMN', 'PARAM', 1, 4, 'E'); INSERT INTO profile_menu VALUES (20, 'LOGOUT', NULL, 1, 19, 'M'); +INSERT INTO profile_menu VALUES (9, 'IMPPOSTE', 'IMP', 1, 8, 'E'); +INSERT INTO profile_menu VALUES (10, 'IMPREC', 'IMP', 1, 9, 'E'); +INSERT INTO profile_menu VALUES (11, 'IMPREPORT', 'IMP', 1, 10, 'E'); +INSERT INTO profile_menu VALUES (24, 'LETTERCARD', 'LETTER', 1, 1, 'M'); +INSERT INTO profile_menu VALUES (27, 'LETTERACC', 'LETTER', 1, 2, 'M'); +INSERT INTO profile_menu VALUES (28, 'ADV', 'COMPTA', 1, 20, 'M'); +INSERT INTO profile_menu VALUES (29, 'VERIFBIL', 'ADV', 1, 21, 'M'); +INSERT INTO profile_menu VALUES (30, 'STOCK', 'ADV', 1, 22, 'M'); +INSERT INTO profile_menu VALUES (31, 'PREDOP', 'ADV', 1, 23, 'M'); +INSERT INTO profile_menu VALUES (32, 'OPEN', 'ADV', 1, 24, 'M'); +INSERT INTO profile_menu VALUES (33, 'REPORT', 'ADV', 1, 25, 'M'); +INSERT INTO profile_menu VALUES (37, 'CUST', 'GESTION', 1, 1, 'E'); +INSERT INTO profile_menu VALUES (38, 'SUPPL', 'GESTION', 1, 2, 'E'); +INSERT INTO profile_menu VALUES (39, 'ADM', 'GESTION', 1, 3, 'E'); +INSERT INTO profile_menu VALUES (35, 'IMP', 'GESTION', 1, 4, 'E'); +INSERT INTO profile_menu VALUES (36, 'CARD', 'GESTION', 1, 6, 'E'); +INSERT INTO profile_menu VALUES (40, 'STOCK', 'GESTION', 1, 5, 'E'); +INSERT INTO profile_menu VALUES (41, 'FORECAST', 'GESTION', 1, 7, 'E'); +INSERT INTO profile_menu VALUES (42, 'FOLLOW', 'GESTION', 1, 8, 'E'); +INSERT INTO profile_menu VALUES (43, 'HIST', 'COMPTA', 1, 1, 'M'); +INSERT INTO profile_menu VALUES (5, 'CARD', 'COMPTA', 1, 7, 'E'); +INSERT INTO profile_menu VALUES (4, 'VEN', 'COMPTA', 1, 2, 'E'); +INSERT INTO profile_menu VALUES (3, 'ACH', 'COMPTA', 1, 3, 'E'); +INSERT INTO profile_menu VALUES (19, 'FIN', 'COMPTA', 1, 4, 'E'); +INSERT INTO profile_menu VALUES (18, 'MISC', 'COMPTA', 1, 5, 'E'); +INSERT INTO profile_menu VALUES (6, 'IMP', 'COMPTA', 1, 6, 'E'); +INSERT INTO profile_menu VALUES (23, 'LETTER', 'COMPTA', 1, 8, 'M'); =20 =20 -- From MAILER-DAEMON Thu Oct 27 18:45:16 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RJYhI-0006hB-Ql for mharc-phpcompta-dev@gnu.org; Thu, 27 Oct 2011 18:45:16 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Fri, 28 Oct 2011 00:52:14 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4246 - phpcompta/branches/rel600-dynamic-menu/include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Oct 2011 22:45:15 -0000 Author: danydb Date: 2011-10-28 00:52:13 +0200 (Fri, 28 Oct 2011) New Revision: 4246 Modified: phpcompta/branches/rel600-dynamic-menu/include/param_pcmn.inc.php phpcompta/branches/rel600-dynamic-menu/include/user_menu.php Log: rewriting : change ShowMenuPcmn by menu_acc_plan Modified: phpcompta/branches/rel600-dynamic-menu/include/param_pcmn.inc.p= hp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/param_pcmn.inc.php 201= 1-10-27 22:51:43 UTC (rev 4245) +++ phpcompta/branches/rel600-dynamic-menu/include/param_pcmn.inc.php 201= 1-10-27 22:52:13 UTC (rev 4246) @@ -88,7 +88,7 @@ =20 =20 echo '
'; -ShowMenuPcmn($_SESSION['g_start']); +menu_acc_plan($_SESSION['g_start']); echo '
'; echo '
'; /* Analyse ce qui est demand=C3=A9 */ Modified: phpcompta/branches/rel600-dynamic-menu/include/user_menu.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/user_menu.php 2011-10-= 27 22:51:43 UTC (rev 4245) +++ phpcompta/branches/rel600-dynamic-menu/include/user_menu.php 2011-10-= 27 22:52:13 UTC (rev 4246) @@ -403,7 +403,7 @@ * */ =20 -function ShowMenuPcmn($p_start=3D1) +function menu_acc_plan($p_start=3D1) { $base=3D"?ac=3D".$_REQUEST['ac']; $str_dossier=3D"&".dossier::get(); From MAILER-DAEMON Fri Oct 28 13:57:15 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RJqg7-0003Zr-6C for mharc-phpcompta-dev@gnu.org; Fri, 28 Oct 2011 13:57:15 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Fri, 28 Oct 2011 20:04:03 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4247 - in phpcompta/branches/rel600-dynamic-menu: html include include/template X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Oct 2011 17:57:13 -0000 Author: danydb Date: 2011-10-28 20:04:01 +0200 (Fri, 28 Oct 2011) New Revision: 4247 Modified: phpcompta/branches/rel600-dynamic-menu/html/parametre.php phpcompta/branches/rel600-dynamic-menu/include/class_document_modele.p= hp phpcompta/branches/rel600-dynamic-menu/include/document_modele.inc.php phpcompta/branches/rel600-dynamic-menu/include/template/modele_documen= t.php Log: #241 : modularity : parameter Document Modified: phpcompta/branches/rel600-dynamic-menu/html/parametre.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/html/parametre.php 2011-10-27 = 22:52:13 UTC (rev 4246) +++ phpcompta/branches/rel600-dynamic-menu/html/parametre.php 2011-10-28 = 18:04:01 UTC (rev 4247) @@ -401,7 +401,7 @@ $sa=3D(isset($_REQUEST['sa']))?$_REQUEST['sa']:""; // echo '
'; if ( $sa =3D=3D "add") - require_once ('param_jrn_add.inc.php'); + require_once 'param_jrn_add.inc.php'; elseif ($sa=3D=3D'detail') require_once ('param_jrn_detail.inc.php'); else Modified: phpcompta/branches/rel600-dynamic-menu/include/class_document_m= odele.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/class_document_modele.= php 2011-10-27 22:52:13 UTC (rev 4246) +++ phpcompta/branches/rel600-dynamic-menu/include/class_document_modele.= php 2011-10-28 18:04:01 UTC (rev 4247) @@ -19,10 +19,10 @@ /* $Revision$ */ // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr /*! \file - * \brief Class for the document template=20 + * \brief Class for the document template */ /*! - * \brief Class for the document template=20 + * \brief Class for the document template */ require_once('class_icheckbox.php'); require_once('class_ihidden.php'); @@ -59,7 +59,7 @@ $all=3DDatabase::fetch_all($Res); $r=3D''; if ( Database::num_row($Res) !=3D 0 ) { - =20 + $r.=3D'

'; $r.=3Ddossier::hidden(); $r.=3D""; @@ -109,13 +109,13 @@ return $r; } /*! - * \brief : Save a document_modele in the database,=20 + * \brief : Save a document_modele in the database, * if the document_modele doesn't exist yet it will be * first created (-> insert into document_modele) * in that case the name and the type must be set * set before calling Save, the name will be modified * with FormatString - * =20 + * */ function Save() { @@ -194,7 +194,7 @@ } } /*! - * \brief Remove a template=20 + * \brief Remove a template * \return nothing */ function Delete() @@ -219,17 +219,17 @@ =20 /*! * \brief show the form for loading a template - * \param p_action for the field action =3D destination url=20 - *=20 + * \param p_action for the field action =3D destination url * + * * \return string containing the forms */ - function form($p_action) + function form() { $r=3D'

'; $r.=3D'Veuillez introduire les modèles servant =C3=A0 g&e= acute;nérer vos documents'; $r.=3D'

'; - $r.=3D''; + $r.=3D''; $r.=3Ddossier::hidden(); // we need to add the sub action as hidden $h=3Dnew IHidden(); @@ -294,7 +294,7 @@ } } /*! - * \brief : update a document_modele in the database,=20 + * \brief : update a document_modele in the database, */ function update($p_array) { @@ -315,7 +315,7 @@ )); if ( $p_array['seq'] !=3D 0 ) $this->cn->alter_seq('seq_doc_type_'.$p_array['md_type'],$p_array= ['seq']); - =20 + // Save the file $new_name=3Dtempnam($_ENV['TMP'],'document_'); if ( strlen ($_FILES['doc']['tmp_name']) !=3D 0 ) Modified: phpcompta/branches/rel600-dynamic-menu/include/document_modele.= inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/document_modele.inc.ph= p 2011-10-27 22:52:13 UTC (rev 4246) +++ phpcompta/branches/rel600-dynamic-menu/include/document_modele.inc.ph= p 2011-10-28 18:04:01 UTC (rev 4247) @@ -78,7 +78,7 @@ //----------------------------------------------------- echo $doc->myList(); echo '
'; -echo $doc->form('parametre.php?p_action=3Ddocument'); +echo $doc->form(''); echo '
'; =20 ?> \ No newline at end of file Modified: phpcompta/branches/rel600-dynamic-menu/include/template/modele_= document.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/template/modele_docume= nt.php 2011-10-27 22:52:13 UTC (rev 4246) +++ phpcompta/branches/rel600-dynamic-menu/include/template/modele_docume= nt.php 2011-10-28 18:04:01 UTC (rev 4247) @@ -1,8 +1,8 @@
-Fermer=20 +Fermer

Mod=C3=A8le de document

- +
=20 @@ -84,7 +84,7 @@ if ( $cn->exist_sequence("seq_doc_type_".$doc->md_type) ) { $ret=3D $cn->get_array("select last_value,is_called from se= q_doc_type_".$doc->md_type) ; - =20 + $last=3D$ret[0]['last_value']; /*! *\note With PSQL sequence , the last_value column is = 1 when before AND after the first call, to make the difference between = them From MAILER-DAEMON Fri Oct 28 15:53:54 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RJsV0-0001pm-13 for mharc-phpcompta-dev@gnu.org; Fri, 28 Oct 2011 15:53:54 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Fri, 28 Oct 2011 22:00:44 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4248 - phpcompta/branches/rel600-dynamic-menu/include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Oct 2011 19:53:52 -0000 Author: danydb Date: 2011-10-28 22:00:42 +0200 (Fri, 28 Oct 2011) New Revision: 4248 Modified: phpcompta/branches/rel600-dynamic-menu/include/anc_imp.inc.php phpcompta/branches/rel600-dynamic-menu/include/anc_od.inc.php phpcompta/branches/rel600-dynamic-menu/include/anc_pa.inc.php phpcompta/branches/rel600-dynamic-menu/include/class_anc_print.php phpcompta/branches/rel600-dynamic-menu/include/pref.inc.php Log: #241 : modularity : pr?\195?\169f?\195?\169rence Modified: phpcompta/branches/rel600-dynamic-menu/include/anc_imp.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/anc_imp.inc.php 2011-1= 0-28 18:04:01 UTC (rev 4247) +++ phpcompta/branches/rel600-dynamic-menu/include/anc_imp.inc.php 2011-1= 0-28 20:00:42 UTC (rev 4248) @@ -31,15 +31,16 @@ require_once('class_anc_operation.php'); require_once('class_anc_plan.php'); require_once('ac_common.php'); +$str_dossier=3DDossier::get(); =20 //-- the menu -$menu=3Darray(array("?p_action=3Dca_imp&sub=3Dlisting&$str_dossier",_("H= istorique"),_("Historique des op=C3=A9rations"),"listing"), - array("?p_action=3Dca_imp&sub=3Dancgl&$str_dossier",_("grand= livre"),_("Grand livre d' plan analytique"),"ancgl"), - array("?p_action=3Dca_imp&sub=3Dbs&$str_dossier",_("Balance = simple"),_("Balance simple d'un plan analytique"),"bs"), - array("?p_action=3Dca_imp&sub=3Dbc2&$str_dossier",_("Balance= crois=C3=A9e"),_("Balance crois=C3=A9e de 2 plans analytiques"),"bc2"), - array("?p_action=3Dca_imp&sub=3Dtab&$str_dossier",_("Tableau"),_("T= ableau li=C3=A9 =C3=A0 la comptabilit=C3=A9"),'tab'), - array("?p_action=3Dca_imp&sub=3Dlico&$str_dossier",_("Balance compt= abilit=C3=A9"),_("Lien entre comptabilit=C3=A9 et Comptabilit=C3=A9 analy= tique"),'lico'), - array("?p_action=3Dca_imp&sub=3Dgroup&$str_dossier",_("Groupe"),_("= Balance par groupe"),'group'), +$menu=3Darray(array("?ac=3D".$_REQUEST['ac']."&sub=3Dlisting&$str_dossie= r",_("Historique"),_("Historique des op=C3=A9rations"),"listing"), + array("?ac=3D".$_REQUEST['ac']."&sub=3Dancgl&$str_dossier",_= ("grand livre"),_("Grand livre d' plan analytique"),"ancgl"), + array("?ac=3D".$_REQUEST['ac']."&sub=3Dbs&$str_dossier",_("B= alance simple"),_("Balance simple d'un plan analytique"),"bs"), + array("?ac=3D".$_REQUEST['ac']."&sub=3Dbc2&$str_dossier",_("= Balance crois=C3=A9e"),_("Balance crois=C3=A9e de 2 plans analytiques"),"= bc2"), + array("?ac=3D".$_REQUEST['ac']."&sub=3Dtab&$str_dossier",_("Tableau= "),_("Tableau li=C3=A9 =C3=A0 la comptabilit=C3=A9"),'tab'), + array("?ac=3D".$_REQUEST['ac']."&sub=3Dlico&$str_dossier",_("Balanc= e comptabilit=C3=A9"),_("Lien entre comptabilit=C3=A9 et Comptabilit=C3=A9= analytique"),'lico'), + array("?ac=3D".$_REQUEST['ac']."&sub=3Dgroup&$str_dossier",_("Group= e"),_("Balance par groupe"),'group'), =20 ); $sub=3D(isset($_GET['sub']))?$_GET['sub']:'no'; @@ -170,7 +171,7 @@ //----------------------------------------------------------------------= ----- // Balance by group //----------------------------------------------------------------------= ----- -if ( $sub =3D=3D 'group')=20 +if ( $sub =3D=3D 'group') { require_once('class_anc_group.php'); $gr=3Dnew Anc_Group($cn); @@ -182,7 +183,7 @@ if ( isset($_GET['result'])) { echo $gr->show_button($str_hidden); - =20 + echo $gr->display_html(); } } Modified: phpcompta/branches/rel600-dynamic-menu/include/anc_od.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/anc_od.inc.php 2011-10= -28 18:04:01 UTC (rev 4247) +++ phpcompta/branches/rel600-dynamic-menu/include/anc_od.inc.php 2011-10= -28 20:00:42 UTC (rev 4248) @@ -32,8 +32,9 @@ require_once ("class_anc_operation.php"); require_once ("class_anc_plan.php"); require_once ("class_anc_group_operation.php"); +global $g_user; =20 - +$str_dossier=3DDossier::get(); $pa=3Dnew Anc_Plan($cn); $m=3D$pa->get_list(); if ( ! $m ) @@ -54,10 +55,10 @@
- '._= ('Nouveau').' + '._('Nouveau').' -'._(= 'Liste op=C3=A9rations').' '._('Liste op=C3=A9rations').'
@@ -86,8 +87,8 @@ echo dossier::hidden(); $hid=3Dnew IHidden(); =20 - $hid->name=3D"p_action"; - $hid->value=3D"ca_od"; + $hid->name=3D"ac"; + $hid->value=3D$_REQUEST['ac']; echo $hid->input(); =20 $hid->name=3D"see"; @@ -97,11 +98,11 @@ $w=3Dnew ISelect(); $w->name=3D"p_periode"; // filter on the current year - $filter_year=3D" where p_exercice=3D'".$User->get_exercice()."'"; + $filter_year=3D" where p_exercice=3D'".$g_user->get_exercice()."'"; =20 $periode_start=3D$cn->make_array("select p_id,to_char(p_start,'DD-MM= -YYYY') from parm_periode $filter_year order by p_start,p_end",1); - $User=3Dnew User($cn); - $current=3D(isset($_GET['p_periode']))?$_GET['p_periode']:$User->get= _periode(); + $g_user=3Dnew User($cn); + $current=3D(isset($_GET['p_periode']))?$_GET['p_periode']:$g_user->g= et_periode(); $w->value=3D$periode_start; $w->selected=3D$current; echo $w->input(); Modified: phpcompta/branches/rel600-dynamic-menu/include/anc_pa.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/anc_pa.inc.php 2011-10= -28 18:04:01 UTC (rev 4247) +++ phpcompta/branches/rel600-dynamic-menu/include/anc_pa.inc.php 2011-10= -28 20:00:42 UTC (rev 4248) @@ -28,7 +28,7 @@ require_once("class_anc_plan.php"); require_once("class_anc_account.php"); $ret=3D""; - +$str_dossier=3DDossier::get(); //----------------------------------------------------------------------= ----- // action // Compute the u_redcontent div @@ -49,8 +49,6 @@ $ret.=3Ddossier::hidden(); $ret.=3D $new->form(); $ret.=3D HtmlInput::hidden("sa","pa_write"); - $ret.=3DHtmlInput::hidden("p_action","ca_pa"); - ; $ret.=3DHtmlInput::submit("submit","Enregistre"); $ret.=3D '
'; $ret.=3D '
'; @@ -87,7 +85,6 @@ if ( $sa =3D=3D "pa_detail" ) { $new=3Dnew Anc_Plan($cn,$_GET['pa_id']); - $wAction=3DHtmlInput::hidden("p_action","ca_pa"); $wSa=3DHtmlInput::hidden("sa","pa_update"); =20 $new->get(); @@ -99,13 +96,8 @@ =20 $ret.=3D $new->form(); $ret.=3D $wSa; - $ret.=3D $wAction; $ret.=3DHtmlInput::submit("submit","Enregistre"); - /* $ret.=3Dsprintf(''. - '', - "?p_action=3Dca_pa&pa_id=3D".$_GET['pa_id']."&sa=3Dpa_del= ete&$str_dossier"); - */ - $ret.=3DHtmlInput::button_anchor('Efface',"?p_action=3Dca_pa&pa_= id=3D".$_GET['pa_id']."&sa=3Dpa_delete&$str_dossier",'Efface','onclick=3D= "return confirm(\'Effacer ?\')"'); + $ret.=3DHtmlInput::button_anchor('Efface',"?ac=3D".$_REQUEST['ac= ']."&pa_id=3D".$_GET['pa_id']."&sa=3Dpa_delete&$str_dossier",'Efface','on= click=3D"return confirm(\'Effacer ?\')"'); $ret.=3D ''; $ret.=3D '
'; =20 @@ -166,7 +158,7 @@ $ret.=3D$po->form(); $ret.=3DHtmlInput::hidden('sa','po_update'); $ret.=3DHtmlInput::submit('Correction','Correction'); - $ret.=3Dsprintf(''. + $ret.=3Dsprintf(''. '= ', $po->id, $_REQUEST['pa_id'] @@ -216,7 +208,7 @@ =20 $ret.=3D""; $ret.=3D"". - 'id.'&pa_id=3D'.$_REQUEST['pa_= id'].'&'. + 'id.'&pa_id=3D'.$_REQUE= ST['pa_id'].'&'. $str_dossier.'">'. h($obj->name). ''; @@ -230,7 +222,7 @@ =20 } $ret.=3D""; - $ret.=3DHtmlInput::button_anchor('Ajout',"?p_action=3Dca_pa&sa=3D= po_add&pa_id=3D".$_GET['pa_id']."&".$str_dossier); + $ret.=3DHtmlInput::button_anchor('Ajout',"?ac=3D".$_REQUEST['ac'= ]."&sa=3Dpo_add&pa_id=3D".$_GET['pa_id']."&".$str_dossier); $ret.=3D'
'; =20 } @@ -253,7 +245,7 @@ echo '
'; echo ''; echo ''; echo '
'; - echo 'Ajout d\'un plan comptable'; + echo 'Ajout d\'un plan comptable'; echo '
'; =20 @@ -273,11 +265,11 @@ { echo ''; echo ''. - ''. + ''. h($line['name']). ''; echo ''. - ''. + ''. "Activit=C3=A9s". ""; =20 @@ -288,7 +280,7 @@ { echo ''; echo ''; echo '
'; - echo 'Ajout d\'un plan comptable'; + echo 'Ajout d\'un plan comptable'; echo '
'; } Modified: phpcompta/branches/rel600-dynamic-menu/include/class_anc_print.= php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/class_anc_print.php 20= 11-10-28 18:04:01 UTC (rev 4247) +++ phpcompta/branches/rel600-dynamic-menu/include/class_anc_print.php 20= 11-10-28 20:00:42 UTC (rev 4248) @@ -118,6 +118,7 @@ $r.=3D ''._('Les dates sont en format DD.= MM.YYYY').''; =20 $r.=3D$p_hidden; + $r.=3DHtmlInput::hidden('ac',$_REQUEST['ac']); $r.=3D''; $plan=3Dnew Anc_Plan($this->db); $plan_id=3Dnew ISelect("pa_id"); @@ -166,17 +167,17 @@ } function check() { - =20 + /* * check date */ if (($this->from !=3D '' && isDate ($this->from) =3D=3D 0) - ||=20 + || ($this->to !=3D '' && isDate ($this->to) =3D=3D 0)) return -1; =20 return 0; - } =20 + } =20 =20 } Modified: phpcompta/branches/rel600-dynamic-menu/include/pref.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/pref.inc.php 2011-10-2= 8 18:04:01 UTC (rev 4247) +++ phpcompta/branches/rel600-dynamic-menu/include/pref.inc.php 2011-10-2= 8 20:00:42 UTC (rev 4248) @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with PhpCompta; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-130= 7 USA -*/ + */ /* $Revision$ */ // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr -/*!\file +/* !\file * \brief this file is always included and then executed * it permits to change the user preferences - *\see user_pref.php + * \see user_pref.php */ =20 require_once('class_user.php'); @@ -32,214 +32,213 @@ echo '
'; //---------------------------------------------------------------------- // Change password - -if ( isset($_POST['pass_1']) - && strlen(trim($_POST['pass_1'])) !=3D 0 ) +if ( isset ($_POST['val'])) { - if ($_POST['pass_1'] !=3D $_POST['pass_2'] ) + /* + * @todo save the preference + */ + var_dump($_POST); +} +if (isset($_POST['pass_1']) + && strlen(trim($_POST['pass_1'])) !=3D 0) +{ + if ($_POST['pass_1'] !=3D $_POST['pass_2']) { - alert(_("Les mots de passe ne correspondent pas. Mot de passe in= chang=C3=A9")); + alert(_("Les mots de passe ne correspondent pas. Mot de passe inchang=C3= =A9")); } else { - $Rep=3Dnew Database(); - $l_pass=3Dmd5($_POST['pass_1']); - $Res=3D$Rep->exec_sql("update ac_users set use_pass=3D'$l_pass' = where use_login=3D'".$_SESSION['g_user']."'"); - $pass=3D$_POST['pass_1']; - $_SESSION['g_pass']=3D$_POST['pass_1']; - $g_pass=3D$_POST['pass_1']; - echo ""._('Mot de passe est modifi=C3=A9e').""; + $Rep =3D new Database(); + $l_pass =3D md5($_POST['pass_1']); + $Res =3D $Rep->exec_sql("update ac_users set use_pass=3D'$l_pass' where= use_login=3D'" . $_SESSION['g_user'] . "'"); + $pass =3D $_POST['pass_1']; + $_SESSION['g_pass'] =3D $_POST['pass_1']; + $g_pass =3D $_POST['pass_1']; + echo "" . _('Mot de passe est modifi=C3=A9e') . ""; } } =20 -$url=3D$_SERVER['REQUEST_URI']; -if ( ! isset ($_REQUEST['gDossier']) ) +if (!isset($_REQUEST['gDossier'])) { - echo HtmlInput::button_anchor(_('Retour'),'user_login.php?'); + echo HtmlInput::button_anchor(_('Retour'), 'user_login.php?'); } else { - echo '

'._('Changez vos pr=C3=A9f=C3=A9rences').'=

'; + echo '

' . _('Changez vos pr=C3=A9f=C3=A9rences')= . '

'; } - ?> =20
=20 -
" METHOD=3D"P= OST"> -
- - - = - = +
+
- Mot de passe : - - = - =
+ + + +exec_sql("select the_name from theme + $res =3D $Rep->exec_sql("select the_name from theme order by the_name"); -for ($i=3D0;$i < Database::num_row($res);$i++) -{ - $st=3DDatabase::fetch_array($res,$i); - $style[]=3D$st['the_name']; -} + $astyle =3D array(); + for ($i =3D 0; $i < Database::num_row($res); $i++) + { + $st =3D Database::fetch_array($res, $i); + $astyle[] =3D $st['the_name']; + } // Formatte le display -$disp_style=3D""; -?> -

-

- - - + $disp_style =3D ""; + ?> +

+

+ + + =20 -cn=3D$cn; + if (isset($_REQUEST['gDossier'])) + { + $inside_dossier =3D true; + $msg =3D ""; + $cn =3D new Database($_REQUEST['gDossier']); + $g_user->cn =3D $cn; =20 - if ( isset ($_POST['period'])) - { - $periode=3D$_POST["period"]; - $User->set_periode($periode); - } + if (isset($_POST['period'])) + { + $periode =3D $_POST["period"]; + $g_user->set_periode($periode); + } =20 - $l_user_per=3D$User->get_periode(); - if ( $l_user_per=3D=3D"") - $l_user_per=3D$cn->get_value("select min(p_id) from parm_periode= where p_closed=3D'f'"); + $l_user_per =3D $g_user->get_periode(); + if ($l_user_per =3D=3D "") + $l_user_per =3D $cn->get_value("select min(p_id) from parm_periode wh= ere p_closed=3D'f'"); =20 - // if periode is closed then warns the users - $period=3Dnew Periode($cn,$l_user_per); + // if periode is closed then warns the users + $period =3D new Periode($cn, $l_user_per); =20 - $period->p_id=3D$l_user_per; - $period->jrn_def_id=3D0; - if ( $period->is_closed($l_user_per)=3D=3D1) - { - $msg=3D_('Attention cette p=C3=A9riode est ferm=C3=A9e, vous ne = pourrez rien modifier dans le module comptable'); - $msg=3D '

'.$msg.'

'; - } + $period->p_id =3D $l_user_per; + $period->jrn_def_id =3D 0; + if ($period->is_closed($l_user_per) =3D=3D 1) + { + $msg =3D _('Attention cette p=C3=A9riode est ferm=C3=A9e, vous ne pou= rrez rien modifier dans le module comptable'); + $msg =3D '

' . $msg . '

'; + } =20 =20 - $period=3Dnew IPeriod("period"); - $period->user=3D$User; - $period->cn=3D$cn; - $period->filter_year=3Dfalse; - $period->value=3D$l_user_per; - $period->type=3DALL; - $l_form_per=3D$period->input(); + $period =3D new IPeriod("period"); + $period->user =3D $g_user; + $period->cn =3D $cn; + $period->filter_year =3D false; + $period->value =3D $l_user_per; + $period->type =3D ALL; + $l_form_per =3D $period->input(); + ?> + + + + =20 - - - ?> - - - - - - - - + + - -
+ Mot de passe : + + +
- - - -
+ + + +
+ +
- -
-
+ + =20 -
-
+ + + + '; - echo ''._('Options pour la page d\'accueil').''; + echo '' . _('Options pour la page d\'accueil') . ''= ; echo _('Mini-Rapport : '); - $rapport=3Dnew Acc_Report($cn); - $aRapport=3D$rapport->make_array(); - $aRapport[]=3Darray("value"=3D>0,"label"=3D>_('Aucun mini rapport'))= ; - $wRapport=3Dnew ISelect(); - $wRapport->name=3D"minirap"; - $wRapport->selected=3D$User->get_mini_report(); - $wRapport->value=3D$aRapport; + $rapport =3D new Acc_Report($cn); + $aRapport =3D $rapport->make_array(); + $aRapport[] =3D array("value" =3D> 0, "label" =3D> _('Aucun mini rap= port')); + $wRapport =3D new ISelect(); + $wRapport->name =3D "minirap"; + $wRapport->selected =3D $g_user->get_mini_report(); + $wRapport->value =3D $aRapport; echo $wRapport->input(); - echo ''._('Le mini rapport est un rapport qui= s\'affiche sur votre page d\'accueil').''; + echo '' . _('Le mini rapport est un rapport q= ui s\'affiche sur votre page d\'accueil') . ''; echo ''; } =20 echo '
'; -echo ''._('Langue').''; +echo '' . _('Langue') . ''; echo _('Selectionnez votre langue'); -$aLang=3Darray(array(_('Fran=C3=A7ais'),'fr_FR.utf8'), - array(_('Anglais'),'en_US.utf8'), - array(_('N=C3=A9erlandais'),'nl_NL.utf8'), - ); +$aLang =3D array(array(_('Fran=C3=A7ais'), 'fr_FR.utf8'), + array(_('Anglais'), 'en_US.utf8'), + array(_('N=C3=A9erlandais'), 'nl_NL.utf8'), + ); echo ''; echo '
'; =20 =20 -echo HtmlInput::submit("val",_("Valider")); +echo HtmlInput::submit("val", _("Valider")); echo '
'; =20 =20 =20 =20 -if ( ! $inside_dossier ) +if (!$inside_dossier) { - echo HtmlInput::button_anchor(_('Retour'),'user_login.php?'); +echo HtmlInput::button_anchor(_('Retour'), 'user_login.php?'); } =20 =20 From MAILER-DAEMON Fri Oct 28 16:09:55 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RJskV-0002Wj-H9 for mharc-phpcompta-dev@gnu.org; Fri, 28 Oct 2011 16:09:55 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Fri, 28 Oct 2011 22:16:46 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4249 - in phpcompta/branches/rel600-dynamic-menu: include sql X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Oct 2011 20:09:54 -0000 Author: danydb Date: 2011-10-28 22:16:44 +0200 (Fri, 28 Oct 2011) New Revision: 4249 Added: phpcompta/branches/rel600-dynamic-menu/include/company.inc.php Modified: phpcompta/branches/rel600-dynamic-menu/include/ac_common.php phpcompta/branches/rel600-dynamic-menu/sql/ phpcompta/branches/rel600-dynamic-menu/sql/object-6.0.sql Log: last fix Modified: phpcompta/branches/rel600-dynamic-menu/include/ac_common.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/ac_common.php 2011-10-= 28 20:00:42 UTC (rev 4248) +++ phpcompta/branches/rel600-dynamic-menu/include/ac_common.php 2011-10-= 28 20:16:44 UTC (rev 4249) @@ -695,10 +695,12 @@ { global $g_user; $cn=3DDossier::connect(); - $amodule=3D$cn->get_array("select me_code,me_menu,me_url from v_all_= menu + $amodule=3D$cn->get_array("select + me_code,me_menu,me_url + from v_all_menu where user_name=3D$1 - and me_module=3D'Y' + and p_type_display=3D'M' order by p_order",array($g_user->login)); require_once('template/module.php'); if ( $selected !=3D -1 ) Added: phpcompta/branches/rel600-dynamic-menu/include/company.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/include/company.inc.php = (rev 0) +++ phpcompta/branches/rel600-dynamic-menu/include/company.inc.php 2011-1= 0-28 20:16:44 UTC (rev 4249) @@ -0,0 +1,102 @@ +can_request(PARCOORD,1); + echo '
'; + require_once("class_own.php"); + if ( isset ($_POST['record_company'] )) + { + $m=3Dnew Own($cn); + extract($_POST); + $m->MY_NAME=3D$p_name; + $m->MY_TVA=3D$p_tva; + $m->MY_STREET=3D$p_street; + $m->MY_NUMBER=3D$p_no; + $m->MY_CP=3D$p_cp; + $m->MY_COMMUNE=3D$p_Commune; + $m->MY_TEL=3D$p_tel; + $m->MY_FAX=3D$p_fax; + $m->MY_PAYS=3D$p_pays; + $m->MY_CHECK_PERIODE=3D$p_check_periode; + $m->MY_DATE_SUGGEST=3D$p_date_suggest; + if ( $g_user->check_action(PARCA)!=3D0)$m->MY_ANALYTIC=3D$p_comp= ta; + if ( $g_user->check_action(PARSTR)!=3D0) $m->MY_STRICT=3D$p_stri= ct; + if ( $g_user->check_action(PARTVA)!=3D0)$m->MY_TVA_USE=3D$p_tva_= use; + $m->MY_PJ_SUGGEST=3D$p_pj; + $m->Update(); + } + + $my=3Dnew Own($cn); + ///// Compta analytic + $array=3Darray ( + array("value"=3D>"ob",'label'=3D>_("obligatoire")), + array("value"=3D>"op",'label'=3D>_("optionnel")), + array("value"=3D>"nu",'label'=3D>_("non utilis=C3=A9")) + ); + $strict_array=3Darray( + array('value'=3D>'N','label'=3D>_('Non')), + array('value'=3D>'Y','label'=3D>_('Oui')) + ); + + $compta=3Dnew ISelect(); + $compta->table=3D1; + $compta->selected=3D$my->MY_ANALYTIC; + + $strict=3Dnew ISelect(); + $strict->table=3D1; + $strict->selected=3D$my->MY_STRICT; + + $tva_use=3Dnew ISelect(); + $tva_use->table=3D1; + $tva_use->selected=3D$my->MY_TVA_USE; + + $pj_suggest=3Dnew ISelect(); + $pj_suggest->table=3D1; + $pj_suggest->selected=3D$my->MY_PJ_SUGGEST; + + $date_suggest=3Dnew ISelect(); + $date_suggest->table=3D1; + $date_suggest->selected=3D$my->MY_DATE_SUGGEST; + + $check_periode=3Dnew ISelect(); + $check_periode->table=3D1; + $check_periode->selected=3D$my->MY_CHECK_PERIODE; + + // other parameters + $all=3Dnew IText(); + $all->table=3D1; + echo '
'; + echo dossier::hidden(); + echo ""; + echo "".td(_('Nom soci=C3=A9t=C3=A9'),'style=3D"text-align:right= "').$all->input("p_name",$my->MY_NAME).""; + $all->value=3D''; + echo "".td(_("T=C3=A9l=C3=A9phone"),'style=3D"text-align:right"'= ).$all->input("p_tel",$my->MY_TEL).""; + $all->value=3D''; + echo "".td(_("Fax"),'style=3D"text-align:right"').$all->input("p= _fax",$my->MY_FAX).""; + $all->value=3D''; + echo "".td(_("Rue "),'style=3D"text-align:right"').$all->input("= p_street",$my->MY_STREET).""; + $all->value=3D''; + echo "".td(_("Num=C3=A9ro"),'style=3D"text-align:right"').$all->= input("p_no",$my->MY_NUMBER).""; + $all->value=3D''; + echo "".td(_("Code Postal"),'style=3D"text-align:right"').$all->= input("p_cp",$my->MY_CP).""; + $all->value=3D''; + echo "".td(_("Commune"),'style=3D"text-align:right"').$all->inpu= t("p_Commune",$my->MY_COMMUNE).""; + $all->value=3D''; + echo "".td(_("Pays"),'style=3D"text-align:right"').$all->input("= p_pays",$my->MY_PAYS).""; + $all->value=3D''; + echo "".td(_("Num=C3=A9ro de Tva"),'style=3D"text-align:right"')= .$all->input("p_tva",$my->MY_TVA).""; + if ( $g_user->check_action(PARCA)=3D=3D0) $compta->setReadonly(true)= ; + echo "".td(_("Utilisation de la compta. analytique"),'style=3D"t= ext-align:right"').$compta->input("p_compta",$array).""; + if ( $g_user->check_action(PARSTR)=3D=3D0) $strict->setReadonly(true= ); + echo "".td(_("Utilisation du mode strict "),'style=3D"text-align= :right"').$strict->input("p_strict",$strict_array).""; + if ( $g_user->check_action(PARTVA)=3D=3D0) $tva_use->setReadonly(tru= e); + echo "".td(_("Assujetti =C3=A0 la tva"),'style=3D"text-align:rig= ht"').$tva_use->input("p_tva_use",$strict_array).""; + echo "".td(_("Sugg=C3=A9rer le num=C3=A9ro de pi=C3=A8ce justifi= cative"),'style=3D"text-align:right"').$pj_suggest->input("p_pj",$strict_= array).""; + echo "".td(_("Sugg=C3=A9rer la date"),'style=3D"text-align:right= "').$date_suggest->input("p_date_suggest",$strict_array).""; + echo ''.td(_('Afficher la p=C3=A9riode comptable pour =C3=A9vite= r les erreurs de date'),'style=3D"text-align:right"').$check_periode->inp= ut('p_check_periode',$strict_array).''; + echo "
"; + echo HtmlInput::submit("record_company",_("Sauve")); + echo "
"; + echo '
'; + exit(); + +?> Property changes on: phpcompta/branches/rel600-dynamic-menu/sql ___________________________________________________________________ Name: svn:ignore + .upgrade.sql.swp Modified: phpcompta/branches/rel600-dynamic-menu/sql/object-6.0.sql =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/branches/rel600-dynamic-menu/sql/object-6.0.sql 2011-10-28 = 20:00:42 UTC (rev 4248) +++ phpcompta/branches/rel600-dynamic-menu/sql/object-6.0.sql 2011-10-28 = 20:16:44 UTC (rev 4249) @@ -23,7 +23,6 @@ me_code text NOT NULL, me_menu text, me_file text, - me_module character(1), me_url text, me_description text ); @@ -80,6 +79,13 @@ =20 =20 -- +-- Name: COLUMN profile.p_name; Type: COMMENT; Schema: public; Owner: da= ny +-- + +COMMENT ON COLUMN profile.p_name IS 'Name of the profile'; + + +-- -- Name: COLUMN profile.p_desc; Type: COMMENT; Schema: public; Owner: da= ny -- =20 @@ -96,7 +102,7 @@ me_code_dep text, p_id integer, p_order integer, - p_type_display character(1) + p_type_display text NOT NULL ); =20 =20 @@ -163,7 +169,7 @@ -- Name: profile_menu_pm_id_seq; Type: SEQUENCE SET; Schema: public; Own= er: dany -- =20 -SELECT pg_catalog.setval('profile_menu_pm_id_seq', 69, true); +SELECT pg_catalog.setval('profile_menu_pm_id_seq', 79, true); =20 =20 -- @@ -261,7 +267,7 @@ -- =20 CREATE VIEW v_all_menu AS - SELECT pm.me_code, pm.pm_id, pm.me_code_dep, pm.p_order, pm.p_type_d= isplay, pu.user_name, pu.pu_id, p.p_name, p.p_desc, mr.me_menu, mr.me_fil= e, mr.me_module, mr.me_url FROM (((profile_menu pm JOIN profile_user pu O= N ((pu.p_id =3D pm.p_id))) JOIN profile p ON ((p.p_id =3D pm.p_id))) JOIN= menu_ref mr USING (me_code)) ORDER BY pm.p_order; + SELECT pm.me_code, pm.pm_id, pm.me_code_dep, pm.p_order, pm.p_type_d= isplay, pu.user_name, pu.pu_id, p.p_name, p.p_desc, mr.me_menu, mr.me_fil= e, mr.me_url FROM (((profile_menu pm JOIN profile_user pu ON ((pu.p_id =3D= pm.p_id))) JOIN profile p ON ((p.p_id =3D pm.p_id))) JOIN menu_ref mr US= ING (me_code)) ORDER BY pm.p_order; =20 =20 ALTER TABLE public.v_all_menu OWNER TO dany; @@ -291,60 +297,69 @@ -- Data for Name: menu_ref; Type: TABLE DATA; Schema: public; Owner: dan= y -- =20 -INSERT INTO menu_ref VALUES ('COMPANY', 'Soci=C3=A9t=C3=A9s', 'company.i= nc.php', 'N', NULL, 'Parametre societe'); -INSERT INTO menu_ref VALUES ('PERIODE', 'P=C3=A9riode', 'periode.inc.php= ', 'N', NULL, 'Gestion des p=C3=A9riodes'); -INSERT INTO menu_ref VALUES ('DIVPARM', 'Divers', NULL, 'N', NULL, NULL)= ; -INSERT INTO menu_ref VALUES ('CFGPAYMENT', 'Moyen de paiement', 'payment= _middle.inc.php', 'N', NULL, NULL); -INSERT INTO menu_ref VALUES ('CFGTVA', 'TVA', 'tva.inc.php', 'N', NULL, = NULL); -INSERT INTO menu_ref VALUES ('CFGACCOUNT', 'Poste', 'poste.inc.php', 'N'= , NULL, NULL); -INSERT INTO menu_ref VALUES ('CARD', 'Fiche', 'fiche.inc.php', 'N', NULL= , NULL); -INSERT INTO menu_ref VALUES ('STOCK', 'Stock', 'stock.inc.php', 'N', NUL= L, NULL); -INSERT INTO menu_ref VALUES ('MISC', 'Op=C3=A9rations Diverses', 'compta= _ods.inc.php', 'N', NULL, NULL); -INSERT INTO menu_ref VALUES ('HIST', 'Historique', 'user_action_gl.php',= 'N', NULL, NULL); -INSERT INTO menu_ref VALUES ('VEN', 'Vente', 'compta_ven.inc.php', 'N', = NULL, NULL); -INSERT INTO menu_ref VALUES ('ACH', 'Achat', 'compta_ach.inc.php', 'N', = NULL, NULL); -INSERT INTO menu_ref VALUES ('FIN', 'Financier', 'compta_fin.inc.php', '= N', NULL, NULL); -INSERT INTO menu_ref VALUES ('LET', 'Lettrage', 'letter.inc.php', 'N', N= ULL, NULL); -INSERT INTO menu_ref VALUES ('PREOD', 'Op=C3=A9rations pr=C3=A9d=C3=A9fi= nies', 'preod.inc.php', 'N', NULL, NULL); -INSERT INTO menu_ref VALUES ('VERIFBIL', 'V=C3=A9rification ', 'verif_bi= lan.inc.php', 'N', NULL, NULL); -INSERT INTO menu_ref VALUES ('REPORT', 'Cr=C3=A9ation de rapport', 'repo= rt.inc.php', 'N', NULL, NULL); -INSERT INTO menu_ref VALUES ('OPEN', 'Ecriture Ouverture', 'opening.inc.= php', 'N', NULL, NULL); -INSERT INTO menu_ref VALUES ('ADM', 'Administration', 'adm.inc.php', 'N'= , NULL, NULL); -INSERT INTO menu_ref VALUES ('SUPPL', 'Fournisseur', 'supplier.inc.php',= 'N', NULL, NULL); -INSERT INTO menu_ref VALUES ('FOLLOW', 'Courrier', 'action.inc.php', 'N'= , NULL, NULL); -INSERT INTO menu_ref VALUES ('FORECAST', 'Pr=C3=A9vision', 'forecast.inc= .php', 'N', NULL, NULL); -INSERT INTO menu_ref VALUES ('IMPJRN', 'Historique', 'impress_jrn.inc.ph= p', 'N', NULL, NULL); -INSERT INTO menu_ref VALUES ('IMPREC', 'Rapprochement', 'impress_rec.inc= .php', 'N', NULL, NULL); -INSERT INTO menu_ref VALUES ('IMPPOSTE', 'Poste', 'impress_poste.inc.php= ', 'N', NULL, NULL); -INSERT INTO menu_ref VALUES ('IMPREPORT', 'Rapport', 'impress_rapport.in= c.php', 'N', NULL, NULL); -INSERT INTO menu_ref VALUES ('IMPBILAN', 'Bilan', 'impress_bilan.inc.php= ', 'N', NULL, NULL); -INSERT INTO menu_ref VALUES ('IMPGL', 'Grand Livre', 'impress_gl_comptes= .inc.php', 'N', NULL, NULL); -INSERT INTO menu_ref VALUES ('IMPBAL', 'Balance', 'balance.inc.php', 'N'= , NULL, NULL); -INSERT INTO menu_ref VALUES ('IMPCARD', 'Cat=C3=A9gorie de Fiches', 'imp= ress_fiche.inc.php', 'N', NULL, NULL); -INSERT INTO menu_ref VALUES ('CUSTDET', 'Fiche', 'detail_client.inc.php'= , 'N', NULL, NULL); -INSERT INTO menu_ref VALUES ('CUSTFOLLOW', 'Suivi', 'suivi_client.inc.ph= p', 'N', NULL, NULL); -INSERT INTO menu_ref VALUES ('CUSTOP', 'Op=C3=A9ration', 'operation_clie= nt.inc.php', 'N', NULL, NULL); -INSERT INTO menu_ref VALUES ('CFGCARDCAT', 'Cat=C3=A9gorie de fiche', 'f= iche_def.inc.php', 'N', NULL, NULL); -INSERT INTO menu_ref VALUES ('CARDBAL', 'Balance', 'balance_card.inc.php= ', 'N', NULL, NULL); -INSERT INTO menu_ref VALUES ('CUST', 'Client', 'client.inc.php', 'N', NU= LL, NULL); -INSERT INTO menu_ref VALUES ('CFGCATDOC', 'Cat=C3=A9gorie de documents',= 'cat_document.inc.php', 'N', NULL, NULL); -INSERT INTO menu_ref VALUES ('CFGATTRIBCARD', 'Attribut de fiche', 'card= _attr.inc.php', 'N', NULL, NULL); -INSERT INTO menu_ref VALUES ('CFGPCMN', 'Plan Comptable', 'param_pcmn.in= c.php', 'N', NULL, NULL); -INSERT INTO menu_ref VALUES ('PARAM', 'Param=C3=A8tre', NULL, 'Y', NULL,= NULL); -INSERT INTO menu_ref VALUES ('GESTION', 'Gestion', NULL, 'Y', NULL, NULL= ); -INSERT INTO menu_ref VALUES ('CUSTCONTACT', 'Contact (=C3=A0 faire)', NU= LL, 'N', NULL, NULL); -INSERT INTO menu_ref VALUES ('COMPTA', 'Comptabilit=C3=A9', NULL, 'Y', N= ULL, NULL); -INSERT INTO menu_ref VALUES ('LOGOUT', 'Sortie', NULL, 'Y', 'logout.php'= , NULL); -INSERT INTO menu_ref VALUES ('DASHBOARD', 'Tableau de bord', 'dashboard.= inc.php', 'Y', NULL, NULL); -INSERT INTO menu_ref VALUES ('IMP', 'Impression', NULL, 'N', NULL, NULL)= ; -INSERT INTO menu_ref VALUES ('LETTER', 'Lettrage', NULL, 'N', NULL, NULL= ); -INSERT INTO menu_ref VALUES ('LETTERCARD', 'Let. Fiche', 'lettering.card= .inc.php', 'N', NULL, NULL); -INSERT INTO menu_ref VALUES ('LETTERACC', 'Let. Poste', 'lettering.accou= nt.inc.php', 'N', NULL, NULL); -INSERT INTO menu_ref VALUES ('PREDOP', 'Ecriture pr=C3=A9definie', 'preo= d.inc.php', 'N', NULL, NULL); -INSERT INTO menu_ref VALUES ('ADV', 'Avanc=C3=A9', NULL, 'N', NULL, NULL= ); -INSERT INTO menu_ref VALUES ('ANC', 'Compta Analytique', NULL, 'Y', NULL= , NULL); -INSERT INTO menu_ref VALUES ('ACCESS', 'Dossier', NULL, 'Y', 'user_login= .php', NULL); -INSERT INTO menu_ref VALUES ('DOCUMENT', 'Document', 'document_modele.in= c.php', 'N', NULL, NULL); +INSERT INTO menu_ref VALUES ('COMPANY', 'Soci=C3=A9t=C3=A9s', 'company.i= nc.php', NULL, 'Parametre societe'); +INSERT INTO menu_ref VALUES ('PERIODE', 'P=C3=A9riode', 'periode.inc.php= ', NULL, 'Gestion des p=C3=A9riodes'); +INSERT INTO menu_ref VALUES ('DIVPARM', 'Divers', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('CFGPAYMENT', 'Moyen de paiement', 'payment= _middle.inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('CFGTVA', 'TVA', 'tva.inc.php', NULL, NULL)= ; +INSERT INTO menu_ref VALUES ('CFGACCOUNT', 'Poste', 'poste.inc.php', NUL= L, NULL); +INSERT INTO menu_ref VALUES ('CARD', 'Fiche', 'fiche.inc.php', NULL, NUL= L); +INSERT INTO menu_ref VALUES ('STOCK', 'Stock', 'stock.inc.php', NULL, NU= LL); +INSERT INTO menu_ref VALUES ('MISC', 'Op=C3=A9rations Diverses', 'compta= _ods.inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('HIST', 'Historique', 'user_action_gl.php',= NULL, NULL); +INSERT INTO menu_ref VALUES ('VEN', 'Vente', 'compta_ven.inc.php', NULL,= NULL); +INSERT INTO menu_ref VALUES ('ACH', 'Achat', 'compta_ach.inc.php', NULL,= NULL); +INSERT INTO menu_ref VALUES ('FIN', 'Financier', 'compta_fin.inc.php', N= ULL, NULL); +INSERT INTO menu_ref VALUES ('LET', 'Lettrage', 'letter.inc.php', NULL, = NULL); +INSERT INTO menu_ref VALUES ('PREOD', 'Op=C3=A9rations pr=C3=A9d=C3=A9fi= nies', 'preod.inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('VERIFBIL', 'V=C3=A9rification ', 'verif_bi= lan.inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('REPORT', 'Cr=C3=A9ation de rapport', 'repo= rt.inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('OPEN', 'Ecriture Ouverture', 'opening.inc.= php', NULL, NULL); +INSERT INTO menu_ref VALUES ('ADM', 'Administration', 'adm.inc.php', NUL= L, NULL); +INSERT INTO menu_ref VALUES ('SUPPL', 'Fournisseur', 'supplier.inc.php',= NULL, NULL); +INSERT INTO menu_ref VALUES ('FOLLOW', 'Courrier', 'action.inc.php', NUL= L, NULL); +INSERT INTO menu_ref VALUES ('FORECAST', 'Pr=C3=A9vision', 'forecast.inc= .php', NULL, NULL); +INSERT INTO menu_ref VALUES ('IMPJRN', 'Historique', 'impress_jrn.inc.ph= p', NULL, NULL); +INSERT INTO menu_ref VALUES ('IMPREC', 'Rapprochement', 'impress_rec.inc= .php', NULL, NULL); +INSERT INTO menu_ref VALUES ('IMPPOSTE', 'Poste', 'impress_poste.inc.php= ', NULL, NULL); +INSERT INTO menu_ref VALUES ('IMPREPORT', 'Rapport', 'impress_rapport.in= c.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('IMPBILAN', 'Bilan', 'impress_bilan.inc.php= ', NULL, NULL); +INSERT INTO menu_ref VALUES ('IMPGL', 'Grand Livre', 'impress_gl_comptes= .inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('IMPBAL', 'Balance', 'balance.inc.php', NUL= L, NULL); +INSERT INTO menu_ref VALUES ('IMPCARD', 'Cat=C3=A9gorie de Fiches', 'imp= ress_fiche.inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('CUSTDET', 'Fiche', 'detail_client.inc.php'= , NULL, NULL); +INSERT INTO menu_ref VALUES ('CUSTFOLLOW', 'Suivi', 'suivi_client.inc.ph= p', NULL, NULL); +INSERT INTO menu_ref VALUES ('CUSTOP', 'Op=C3=A9ration', 'operation_clie= nt.inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('CFGCARDCAT', 'Cat=C3=A9gorie de fiche', 'f= iche_def.inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('CARDBAL', 'Balance', 'balance_card.inc.php= ', NULL, NULL); +INSERT INTO menu_ref VALUES ('CUST', 'Client', 'client.inc.php', NULL, N= ULL); +INSERT INTO menu_ref VALUES ('CFGCATDOC', 'Cat=C3=A9gorie de documents',= 'cat_document.inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('CFGATTRIBCARD', 'Attribut de fiche', 'card= _attr.inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('CFGPCMN', 'Plan Comptable', 'param_pcmn.in= c.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('PARAM', 'Param=C3=A8tre', NULL, NULL, NULL= ); +INSERT INTO menu_ref VALUES ('GESTION', 'Gestion', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('CUSTCONTACT', 'Contact (=C3=A0 faire)', NU= LL, NULL, NULL); +INSERT INTO menu_ref VALUES ('CFGEXTENSION', 'Extension', 'extension.inc= .php', NULL, NULL); +INSERT INTO menu_ref VALUES ('COMPTA', 'Comptabilit=C3=A9', NULL, NULL, = NULL); +INSERT INTO menu_ref VALUES ('LOGOUT', 'Sortie', NULL, 'logout.php', NUL= L); +INSERT INTO menu_ref VALUES ('DASHBOARD', 'Tableau de bord', 'dashboard.= inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('IMP', 'Impression', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('LETTER', 'Lettrage', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('CFGSECURITY', 'S=C3=A9curit=C3=A9', 'param= _sec.inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('LETTERCARD', 'Let. Fiche', 'lettering.card= .inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('LETTERACC', 'Let. Poste', 'lettering.accou= nt.inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('PREDOP', 'Ecriture pr=C3=A9definie', 'preo= d.inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('ADV', 'Avanc=C3=A9', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('ANC', 'Compta Analytique', NULL, NULL, NUL= L); +INSERT INTO menu_ref VALUES ('CFGDOCUMENT', 'Document', 'document_modele= .inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('ACCESS', 'Dossier', NULL, 'user_login.php'= , NULL); +INSERT INTO menu_ref VALUES ('DOCUMENT', 'Document', 'document_modele.in= c.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('CFGLEDGER', 'journaux', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('PLANANC', 'Plan Compt. analytique', 'anc_p= a.inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('ANCODS', 'Op=C3=A9rations diverses', 'anc_= od.inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('ANCGROUP', 'Groupe', 'anc_group.inc.php', = NULL, NULL); +INSERT INTO menu_ref VALUES ('ANCIMP', 'Impression', 'anc_imp.inc.php', = NULL, NULL); +INSERT INTO menu_ref VALUES ('PREFERENCE', 'Pr=C3=A9f=C3=A9rence', 'pref= .inc.php', NULL, NULL); =20 =20 -- @@ -361,7 +376,6 @@ -- =20 INSERT INTO profile_menu VALUES (1, 'COMPTA', NULL, 1, 5, 'M'); -INSERT INTO profile_menu VALUES (34, 'GESTION', NULL, 1, 6, 'M'); INSERT INTO profile_menu VALUES (2, 'ANC', NULL, 1, 7, 'M'); INSERT INTO profile_menu VALUES (45, 'PARAM', NULL, 1, 2, 'M'); INSERT INTO profile_menu VALUES (44, 'DASHBOARD', NULL, 1, 1, 'M'); @@ -375,7 +389,6 @@ INSERT INTO profile_menu VALUES (59, 'CFGPAYMENT', 'DIVPARM', 1, 4, 'E')= ; INSERT INTO profile_menu VALUES (60, 'CFGTVA', 'DIVPARM', 1, 5, 'E'); INSERT INTO profile_menu VALUES (61, 'CFGACCOUNT', 'DIVPARM', 1, 6, 'E')= ; -INSERT INTO profile_menu VALUES (65, 'CFGCARDCAT', 'DIVPARM', 1, 7, 'e')= ; INSERT INTO profile_menu VALUES (67, 'CFGCATDOC', 'DIVPARM', 1, 8, 'E'); INSERT INTO profile_menu VALUES (13, 'IMPBILAN', 'IMP', 1, 11, 'E'); INSERT INTO profile_menu VALUES (14, 'IMPCARD', 'IMP', 1, 12, 'E'); @@ -384,18 +397,24 @@ INSERT INTO profile_menu VALUES (17, 'IMPBAL', 'IMP', 1, 15, 'E'); INSERT INTO profile_menu VALUES (68, 'CFGATTRIBCARD', 'DIVPARM', 1, 9, '= E'); INSERT INTO profile_menu VALUES (69, 'CFGPCMN', 'PARAM', 1, 4, 'E'); +INSERT INTO profile_menu VALUES (70, 'CFGEXTENSION', 'PARAM', 1, 5, 'E')= ; INSERT INTO profile_menu VALUES (20, 'LOGOUT', NULL, 1, 19, 'M'); +INSERT INTO profile_menu VALUES (71, 'CFGSECURITY', 'PARAM', 1, 6, 'E'); +INSERT INTO profile_menu VALUES (72, 'PREDOP', 'PARAM', 1, 7, 'E'); +INSERT INTO profile_menu VALUES (73, 'CFGDOCUMENT', 'PARAM', 1, 8, 'E'); +INSERT INTO profile_menu VALUES (74, 'CFGLEDGER', 'PARAM', 1, 9, 'E'); +INSERT INTO profile_menu VALUES (75, 'PLANANC', 'ANC', 1, 1, 'E'); +INSERT INTO profile_menu VALUES (65, 'CFGCARDCAT', 'DIVPARM', 1, 7, 'E')= ; INSERT INTO profile_menu VALUES (9, 'IMPPOSTE', 'IMP', 1, 8, 'E'); INSERT INTO profile_menu VALUES (10, 'IMPREC', 'IMP', 1, 9, 'E'); INSERT INTO profile_menu VALUES (11, 'IMPREPORT', 'IMP', 1, 10, 'E'); -INSERT INTO profile_menu VALUES (24, 'LETTERCARD', 'LETTER', 1, 1, 'M'); -INSERT INTO profile_menu VALUES (27, 'LETTERACC', 'LETTER', 1, 2, 'M'); -INSERT INTO profile_menu VALUES (28, 'ADV', 'COMPTA', 1, 20, 'M'); -INSERT INTO profile_menu VALUES (29, 'VERIFBIL', 'ADV', 1, 21, 'M'); -INSERT INTO profile_menu VALUES (30, 'STOCK', 'ADV', 1, 22, 'M'); -INSERT INTO profile_menu VALUES (31, 'PREDOP', 'ADV', 1, 23, 'M'); -INSERT INTO profile_menu VALUES (32, 'OPEN', 'ADV', 1, 24, 'M'); -INSERT INTO profile_menu VALUES (33, 'REPORT', 'ADV', 1, 25, 'M'); +INSERT INTO profile_menu VALUES (76, 'ANCODS', 'ANC', 1, 2, 'E'); +INSERT INTO profile_menu VALUES (77, 'ANCGROUP', 'ANC', 1, 3, 'E'); +INSERT INTO profile_menu VALUES (78, 'ANCIMP', 'ANC', 1, 4, 'E'); +INSERT INTO profile_menu VALUES (79, 'PREFERENCE', NULL, 1, 2, 'M'); +INSERT INTO profile_menu VALUES (23, 'LETTER', 'COMPTA', 1, 8, 'E'); +INSERT INTO profile_menu VALUES (24, 'LETTERCARD', 'LETTER', 1, 1, 'E'); +INSERT INTO profile_menu VALUES (27, 'LETTERACC', 'LETTER', 1, 2, 'E'); INSERT INTO profile_menu VALUES (37, 'CUST', 'GESTION', 1, 1, 'E'); INSERT INTO profile_menu VALUES (38, 'SUPPL', 'GESTION', 1, 2, 'E'); INSERT INTO profile_menu VALUES (39, 'ADM', 'GESTION', 1, 3, 'E'); @@ -404,14 +423,20 @@ INSERT INTO profile_menu VALUES (40, 'STOCK', 'GESTION', 1, 5, 'E'); INSERT INTO profile_menu VALUES (41, 'FORECAST', 'GESTION', 1, 7, 'E'); INSERT INTO profile_menu VALUES (42, 'FOLLOW', 'GESTION', 1, 8, 'E'); -INSERT INTO profile_menu VALUES (43, 'HIST', 'COMPTA', 1, 1, 'M'); +INSERT INTO profile_menu VALUES (29, 'VERIFBIL', 'ADV', 1, 21, 'E'); +INSERT INTO profile_menu VALUES (30, 'STOCK', 'ADV', 1, 22, 'E'); +INSERT INTO profile_menu VALUES (31, 'PREDOP', 'ADV', 1, 23, 'E'); +INSERT INTO profile_menu VALUES (32, 'OPEN', 'ADV', 1, 24, 'E'); +INSERT INTO profile_menu VALUES (33, 'REPORT', 'ADV', 1, 25, 'E'); INSERT INTO profile_menu VALUES (5, 'CARD', 'COMPTA', 1, 7, 'E'); +INSERT INTO profile_menu VALUES (43, 'HIST', 'COMPTA', 1, 1, 'E'); +INSERT INTO profile_menu VALUES (34, 'GESTION', NULL, 1, 6, 'M'); INSERT INTO profile_menu VALUES (4, 'VEN', 'COMPTA', 1, 2, 'E'); INSERT INTO profile_menu VALUES (3, 'ACH', 'COMPTA', 1, 3, 'E'); INSERT INTO profile_menu VALUES (19, 'FIN', 'COMPTA', 1, 4, 'E'); INSERT INTO profile_menu VALUES (18, 'MISC', 'COMPTA', 1, 5, 'E'); INSERT INTO profile_menu VALUES (6, 'IMP', 'COMPTA', 1, 6, 'E'); -INSERT INTO profile_menu VALUES (23, 'LETTER', 'COMPTA', 1, 8, 'M'); +INSERT INTO profile_menu VALUES (28, 'ADV', 'COMPTA', 1, 20, 'E'); =20 =20 -- From MAILER-DAEMON Fri Oct 28 16:13:49 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RJsoH-00031K-Rq for mharc-phpcompta-dev@gnu.org; Fri, 28 Oct 2011 16:13:49 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Fri, 28 Oct 2011 22:20:44 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4250 - phpcompta/trunk X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Oct 2011 20:13:48 -0000 Author: danydb Date: 2011-10-28 22:20:43 +0200 (Fri, 28 Oct 2011) New Revision: 4250 Modified: phpcompta/trunk/ Log: Initialized merge tracking via "svnmerge" with revisions "1-4208" from=20 svn+ssh://danydb@svn/svn/phpcompta/branches/rel600-dynamic-menu Property changes on: phpcompta/trunk ___________________________________________________________________ Name: svnmerge-integrated - /phpcompta/branches/rel560:1-4220 + /phpcompta/branches/rel600-dynamic-menu:1-4208 /phpcompta/branches/r= el560:1-4220 From MAILER-DAEMON Fri Oct 28 16:53:00 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RJtQC-0007M7-5w for mharc-phpcompta-dev@gnu.org; Fri, 28 Oct 2011 16:53:00 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Fri, 28 Oct 2011 22:59:27 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4251 - in phpcompta/trunk: . html include include/template sql X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Oct 2011 20:52:56 -0000 Author: danydb Date: 2011-10-28 22:59:25 +0200 (Fri, 28 Oct 2011) New Revision: 4251 Added: phpcompta/trunk/html/do.php phpcompta/trunk/include/company.inc.php phpcompta/trunk/include/dashboard.inc.php phpcompta/trunk/include/template/menu.php phpcompta/trunk/include/template/module.php phpcompta/trunk/sql/backup-new-object.sh phpcompta/trunk/sql/object-6.0.sql Removed: phpcompta/trunk/html/compta.php phpcompta/trunk/html/user_advanced.php phpcompta/trunk/include/letter.inc.php Modified: phpcompta/trunk/ phpcompta/trunk/html/parametre.php phpcompta/trunk/include/ac_common.php phpcompta/trunk/include/action.inc.php phpcompta/trunk/include/adm.inc.php phpcompta/trunk/include/anc_imp.inc.php phpcompta/trunk/include/anc_od.inc.php phpcompta/trunk/include/anc_pa.inc.php phpcompta/trunk/include/balance.inc.php phpcompta/trunk/include/balance_card.inc.php phpcompta/trunk/include/class_acc_account_ledger.php phpcompta/trunk/include/class_acc_ledger.php phpcompta/trunk/include/class_anc_print.php phpcompta/trunk/include/class_document_modele.php phpcompta/trunk/include/class_fiche.php phpcompta/trunk/include/class_fiche_def.php phpcompta/trunk/include/class_periode.php phpcompta/trunk/include/class_pre_operation.php phpcompta/trunk/include/client.inc.php phpcompta/trunk/include/compta_ach.inc.php phpcompta/trunk/include/compta_fin.inc.php phpcompta/trunk/include/compta_ven.inc.php phpcompta/trunk/include/document_modele.inc.php phpcompta/trunk/include/fiche.inc.php phpcompta/trunk/include/fiche_def.inc.php phpcompta/trunk/include/forecast.inc.php phpcompta/trunk/include/impress_bilan.inc.php phpcompta/trunk/include/impress_fiche.inc.php phpcompta/trunk/include/impress_gl_comptes.inc.php phpcompta/trunk/include/impress_jrn.inc.php phpcompta/trunk/include/impress_poste.inc.php phpcompta/trunk/include/impress_rapport.inc.php phpcompta/trunk/include/impress_rec.inc.php phpcompta/trunk/include/lettering.account.inc.php phpcompta/trunk/include/lettering.card.inc.php phpcompta/trunk/include/lettering.gestion.inc.php phpcompta/trunk/include/opening.inc.php phpcompta/trunk/include/param_pcmn.inc.php phpcompta/trunk/include/payment_middle.inc.php phpcompta/trunk/include/periode.inc.php phpcompta/trunk/include/pref.inc.php phpcompta/trunk/include/preod.inc.php phpcompta/trunk/include/stock.inc.php phpcompta/trunk/include/suivi_adm.inc.php phpcompta/trunk/include/suivi_supplier.inc.php phpcompta/trunk/include/supplier.inc.php phpcompta/trunk/include/template/list_category_document.php phpcompta/trunk/include/template/modele_document.php phpcompta/trunk/include/template/periode_add_exercice.php phpcompta/trunk/include/user_action_gl.php phpcompta/trunk/include/user_menu.php Log: Merged revisions 4209,4229-4232,4234,4237-4249 via svnmerge from=20 svn+ssh://ns352270.ovh.net/svn/phpcompta/branches/rel600-dynamic-menu ........ r4209 | danydb | 2011-10-13 22:06:13 +0200 (Thu, 13 Oct 2011) | 1 line =20 Add new files ........ r4229 | danydb | 2011-10-23 20:51:09 +0200 (Sun, 23 Oct 2011) | 1 line =20 Dynamic menu: impress works ........ r4230 | danydb | 2011-10-24 22:38:15 +0200 (Mon, 24 Oct 2011) | 2 lines =20 #241 : modularity for SALE ledger ........ r4231 | danydb | 2011-10-24 22:47:02 +0200 (Mon, 24 Oct 2011) | 2 lines =20 #241 : modularity for PURCHASE ledger ........ r4232 | danydb | 2011-10-25 23:03:53 +0200 (Tue, 25 Oct 2011) | 2 lines =20 #241 : modularity for FINANCIAL ledger ........ r4234 | danydb | 2011-10-26 01:09:02 +0200 (Wed, 26 Oct 2011) | 2 lines =20 #241 : modularity for CARD ledger + alphanum prob ........ r4237 | danydb | 2011-10-27 20:59:39 +0200 (Thu, 27 Oct 2011) | 2 lines =20 #241 : modularity for lettering ........ r4238 | danydb | 2011-10-27 21:10:19 +0200 (Thu, 27 Oct 2011) | 3 lines =20 #241 :adapt width submenu ........ r4239 | danydb | 2011-10-27 21:40:42 +0200 (Thu, 27 Oct 2011) | 3 lines =20 #241 : modularity : old user_advanced.php ........ r4240 | danydb | 2011-10-27 21:44:27 +0200 (Thu, 27 Oct 2011) | 3 lines =20 #241 : modularity : deprecated function ........ r4241 | danydb | 2011-10-27 21:46:26 +0200 (Thu, 27 Oct 2011) | 3 lines =20 #241 : modularity : remove obsolete files ........ r4242 | danydb | 2011-10-27 21:54:39 +0200 (Thu, 27 Oct 2011) | 3 lines =20 #241 : modularity : gestion card + gestion IMP ........ r4243 | danydb | 2011-10-27 22:28:36 +0200 (Thu, 27 Oct 2011) | 3 lines =20 #241 : modularity : gestion customer + supplier + forecast + follow up ........ r4244 | danydb | 2011-10-28 00:47:55 +0200 (Fri, 28 Oct 2011) | 5 lines =20 #241 : modularity : parameter=20 company periode misc : tva , card attr, middle of payment, accounting,cat of doc, cat o= f card ........ r4245 | danydb | 2011-10-28 00:51:43 +0200 (Fri, 28 Oct 2011) | 1 line =20 update menu_ref, profile_menu ........ r4246 | danydb | 2011-10-28 00:52:13 +0200 (Fri, 28 Oct 2011) | 1 line =20 rewriting : change ShowMenuPcmn by menu_acc_plan ........ r4247 | danydb | 2011-10-28 20:04:01 +0200 (Fri, 28 Oct 2011) | 1 line =20 #241 : modularity : parameter Document ........ r4248 | danydb | 2011-10-28 22:00:42 +0200 (Fri, 28 Oct 2011) | 1 line =20 #241 : modularity : pr?\195?\169f?\195?\169rence ........ r4249 | danydb | 2011-10-28 22:16:44 +0200 (Fri, 28 Oct 2011) | 1 line =20 last fix ........ Property changes on: phpcompta/trunk ___________________________________________________________________ Name: svnmerge-integrated - /phpcompta/branches/rel600-dynamic-menu:1-4208 /phpcompta/branches/r= el560:1-4220 + /phpcompta/branches/rel600-dynamic-menu:1-4250 /phpcompta/branches/r= el560:1-4220 Deleted: phpcompta/trunk/html/compta.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/compta.php 2011-10-28 20:20:43 UTC (rev 4250) +++ phpcompta/trunk/html/compta.php 2011-10-28 20:59:25 UTC (rev 4251) @@ -1,108 +0,0 @@ -'._(' Vous =C3=AAtes d=C3=A9connect=C3=A9'= ).''; - redirect('index.php',1); - exit(); -} -//---------------------------------------------------------------------- - -require_once('class_database.php'); -/* Admin. Dossier */ -$cn=3Dnew Database($gDossier); - - -require_once ('class_user.php'); -$User=3Dnew User($cn); -$User->Check(); -if ($User->check_dossier($gDossier)=3D=3D'P') -{ - redirect("extension.php?".dossier::get(),0); - exit(); -} -require_once ('function_javascript.php'); -html_page_start($_SESSION['g_theme']); -echo load_all_script(); -include_once ("user_menu.php"); -echo '
'; - -echo ShowMenuCompta("user_advanced.php?".dossier::get()); -echo js_include('anc_script.js'); -echo '
'; -// Get action - -// call impress sub-menu -if ( $action =3D=3D 'impress' ) -{ - require_once('impress.inc.php'); -} - -if ( $action =3D=3D 'fiche') -{ - - require_once('fiche.inc.php'); -} - -if ( $action =3D=3D 'stock') -{ - require_once('stock.inc.php'); -} -if ( $action=3D=3D'quick_writing') -{ - require_once ('compta_ods.inc.php'); -} -if ( $action =3D=3D 'gl' ) -{ - require_once ('user_action_gl.php'); -} -if ( $action =3D=3D 'ven' || - $action =3D=3D 'client') -{ - require_once ('compta_ven.inc.php'); -} -if ( $action =3D=3D 'ach' || - $action =3D=3D 'fournisseur') -{ - require_once ('compta_ach.inc.php'); -} -if ( $action =3D=3D 'fin') -{ - require_once ('compta_fin.inc.php'); -} -if ($action =3D=3D 'let') -{ - require_once('letter.inc.php'); -} -html_page_stop(); -?> Copied: phpcompta/trunk/html/do.php (from rev 4249, phpcompta/branches/re= l600-dynamic-menu/html/do.php) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/do.php (rev 0) +++ phpcompta/trunk/html/do.php 2011-10-28 20:59:25 UTC (rev 4251) @@ -0,0 +1,59 @@ +'; if ( $sa =3D=3D "add") - require_once ('param_jrn_add.inc.php'); + require_once 'param_jrn_add.inc.php'; elseif ($sa=3D=3D'detail') require_once ('param_jrn_detail.inc.php'); else Deleted: phpcompta/trunk/html/user_advanced.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/user_advanced.php 2011-10-28 20:20:43 UTC (rev 4= 250) +++ phpcompta/trunk/html/user_advanced.php 2011-10-28 20:59:25 UTC (rev 4= 251) @@ -1,123 +0,0 @@ -Check(); -$User->check_dossier(dossier::id()); -$cn=3Dnew Database(dossier::id()); -$User->db=3D$cn; - -require_once('class_database.php'); -require_once('class_ipopup.php'); -load_all_script(); -echo ICard::ipopup('ipopcard'); -echo IPoste::ipopup('ipop_account'); -$search_card=3Dnew IPopup('ipop_card'); -$search_card->title=3D_('Recherche de fiche'); -$search_card->value=3D''; -echo $search_card->input(); - - - -// We don't check permissions here in fact, permission are tested in the -// functions - -// Show the top menus -include_once ("user_menu.php"); -echo '
'; - - -echo ShowMenuCompta(7); -echo '
'; -$p_action=3D""; - - -$p_action=3D(isset($_REQUEST['p_action']))?$_REQUEST['p_action']:""; -switch ($p_action) -{ -case 'preod': - $high=3D9; - break; -case 'periode'; - $high=3D2; - break; -case 'verif'; - $high=3D10; - break; -case 'defreport': - $high=3D6; - break; -case 'ouv': - $high=3D8; - break; -default: - $high=3D0; - -} -echo ShowMenuAdvanced($high); - - -//-------------------------------------------------- -// Predefined operation -//-------------------------------------------------- - -if ($p_action=3D=3D"preod") -{ - require_once('preod.inc.php'); - - exit(); -} -//---------------------------------------------------------------------- -// Verification solde -//---------------------------------------------------------------------- -if ( $p_action=3D=3D'verif' ) -{ - require_once ('verif_bilan.inc.php'); - exit(); -} - -if ($p_action=3D=3D'defreport') -{ - require_once('report.inc.php'); -} -/* -------------------------------------------------- -Import writing (opening exercice) --------------------------------------------------- */ -if ( $p_action =3D=3D 'ouv') -{ - require_once('opening.inc.php'); -} -html_page_stop(); -?> Modified: phpcompta/trunk/include/ac_common.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/ac_common.php 2011-10-28 20:20:43 UTC (rev 42= 50) +++ phpcompta/trunk/include/ac_common.php 2011-10-28 20:59:25 UTC (rev 42= 51) @@ -602,7 +602,7 @@ /** *@brief try to determine on what os you are running the p=C4=A5pcompte *server - *@return=20 + *@return * 0 it is a windows * 1 it is a Unix like */ @@ -687,4 +687,79 @@ exit(); } } +/** + * + * @param int $selected module selected + */ +function show_module($selected) +{ + global $g_user; + $cn=3DDossier::connect(); + $amodule=3D$cn->get_array("select + me_code,me_menu,me_url + from v_all_menu + where + user_name=3D$1 + and p_type_display=3D'M' + order by p_order",array($g_user->login)); + require_once('template/module.php'); + if ( $selected !=3D -1 ) + { + $file=3D$cn->get_value("select me_file from v_all_menu where me_code=3D= $1",array($selected)); + if ($file !=3D '') + require_once $file; + } + +} +/** + * show default module + */ +function show_default() +{ + $cn=3DDossier::connect(); + $file=3D$cn->get_array('SELECT m_code FROM module where m_default=3D= 1'); + if (! empty ($file) ) + { + $selected=3D$file[0]['m_code']; + show_module($selected); + } +} +/** + * + */ +function show_menu($module,$idx) +{ + global $g_user; + $cn=3DDossier::connect(); + $amenu=3D$cn->get_array("select + me_menu,me_code + from v_all_menu + where + me_code_dep=3D$1 order by p_order",array($module[$idx])); + + if (! empty ($amenu)) + { + require 'template/menu.php'; + } + else + { +/** + * @todo add security + * check if user can access this module + */ + $file=3D$cn->get_value("select me_file + from menu_ref + where + me_code=3D$1 and + (me_file is not null or trim(me_file) <>'')", + array($module[$idx])); + + if ( $file !=3D "" ) + { + echo '
'; + require_once "$file"; + echo '
'; + } + } +} ?> Modified: phpcompta/trunk/include/action.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/action.inc.php 2011-10-28 20:20:43 UTC (rev 4= 250) +++ phpcompta/trunk/include/action.inc.php 2011-10-28 20:59:25 UTC (rev 4= 251) @@ -22,10 +22,10 @@ * \brief Page who manage the different actions (meeting, letter) */ require_once('class_ipopup.php'); +global $g_user; +$g_user->can_request(GECOUR); =20 -$User->can_request(GECOUR); - -$retour=3DHtmlInput::button_anchor(_('Retour'),'?p_action=3Dsuivi_courri= er&my_action&'.dossier::get()); +$retour=3DHtmlInput::button_anchor(_('Retour'),'?ac=3D'.$_REQUEST['ac'].= '&my_action&'.dossier::get()); //----------------------------------------------------- // Action //----------------------------------------------------- @@ -53,8 +53,8 @@ * with the generation of document */ $ag_id=3D(isset($_REQUEST['ag_id']))?$_REQUEST['ag_id']:0; -$p_action=3D$_REQUEST['p_action']; -$base=3D'p_action=3D'.$p_action; +$ac=3D$_REQUEST['ac']; +$base=3D'ac=3D'.$ac; =20 require_once('action.common.inc.php'); echo "
"; Modified: phpcompta/trunk/include/adm.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/adm.inc.php 2011-10-28 20:20:43 UTC (rev 4250= ) +++ phpcompta/trunk/include/adm.inc.php 2011-10-28 20:59:25 UTC (rev 4251= ) @@ -31,18 +31,14 @@ require_once('class_fiche_def.php'); require_once('class_ipopup.php'); require_once('class_admin.php'); -echo js_include('accounting_item.js'); -echo js_include('prototype.js'); -echo js_include('scriptaculous.js'); -echo js_include('effects.js'); -echo js_include('controls.js'); -echo js_include('dragdrop.js'); =20 +global $g_user; + $low_action=3D(isset($_REQUEST['sb']))?$_REQUEST['sb']:"list"; /*! \file * \brief Called from the module "Gestion" to manage the customer */ -$User->can_request(GECUST); +$g_user->can_request(GECUST); $href=3Dbasename($_SERVER['PHP_SELF']); =20 // by default open liste @@ -55,7 +51,7 @@ //----------------------------------------------------- if ( isset($_POST['delete_card'] ) ) { - if ( $User->check_action(FICADD) =3D=3D 0 ) + if ( $g_user->check_action(FICADD) =3D=3D 0 ) { alert('Vous ne pouvez pas enlever de fiche'); return; @@ -136,7 +132,7 @@ } /*---------------------------------------------------------------------- * Detail for a card, Suivi, Contact, Operation,... * - * cc stands for customer card=20 + * cc stands for customer card *----------------------------------------------------------------------= */ if ( $low_action =3D=3D 'detail') { @@ -148,7 +144,7 @@ if ( $low_action=3D=3D"insert" ) { /* security : check if user can add card */ - if ( $User->check_action(FICADD) =3D=3D 0 ) + if ( $g_user->check_action(FICADD) =3D=3D 0 ) { alert('Vous ne pouvez pas ajouter de fiche'); return; Modified: phpcompta/trunk/include/anc_imp.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/anc_imp.inc.php 2011-10-28 20:20:43 UTC (rev = 4250) +++ phpcompta/trunk/include/anc_imp.inc.php 2011-10-28 20:59:25 UTC (rev = 4251) @@ -31,15 +31,16 @@ require_once('class_anc_operation.php'); require_once('class_anc_plan.php'); require_once('ac_common.php'); +$str_dossier=3DDossier::get(); =20 //-- the menu -$menu=3Darray(array("?p_action=3Dca_imp&sub=3Dlisting&$str_dossier",_("H= istorique"),_("Historique des op=C3=A9rations"),"listing"), - array("?p_action=3Dca_imp&sub=3Dancgl&$str_dossier",_("grand= livre"),_("Grand livre d' plan analytique"),"ancgl"), - array("?p_action=3Dca_imp&sub=3Dbs&$str_dossier",_("Balance = simple"),_("Balance simple d'un plan analytique"),"bs"), - array("?p_action=3Dca_imp&sub=3Dbc2&$str_dossier",_("Balance= crois=C3=A9e"),_("Balance crois=C3=A9e de 2 plans analytiques"),"bc2"), - array("?p_action=3Dca_imp&sub=3Dtab&$str_dossier",_("Tableau"),_("T= ableau li=C3=A9 =C3=A0 la comptabilit=C3=A9"),'tab'), - array("?p_action=3Dca_imp&sub=3Dlico&$str_dossier",_("Balance compt= abilit=C3=A9"),_("Lien entre comptabilit=C3=A9 et Comptabilit=C3=A9 analy= tique"),'lico'), - array("?p_action=3Dca_imp&sub=3Dgroup&$str_dossier",_("Groupe"),_("= Balance par groupe"),'group'), +$menu=3Darray(array("?ac=3D".$_REQUEST['ac']."&sub=3Dlisting&$str_dossie= r",_("Historique"),_("Historique des op=C3=A9rations"),"listing"), + array("?ac=3D".$_REQUEST['ac']."&sub=3Dancgl&$str_dossier",_= ("grand livre"),_("Grand livre d' plan analytique"),"ancgl"), + array("?ac=3D".$_REQUEST['ac']."&sub=3Dbs&$str_dossier",_("B= alance simple"),_("Balance simple d'un plan analytique"),"bs"), + array("?ac=3D".$_REQUEST['ac']."&sub=3Dbc2&$str_dossier",_("= Balance crois=C3=A9e"),_("Balance crois=C3=A9e de 2 plans analytiques"),"= bc2"), + array("?ac=3D".$_REQUEST['ac']."&sub=3Dtab&$str_dossier",_("Tableau= "),_("Tableau li=C3=A9 =C3=A0 la comptabilit=C3=A9"),'tab'), + array("?ac=3D".$_REQUEST['ac']."&sub=3Dlico&$str_dossier",_("Balanc= e comptabilit=C3=A9"),_("Lien entre comptabilit=C3=A9 et Comptabilit=C3=A9= analytique"),'lico'), + array("?ac=3D".$_REQUEST['ac']."&sub=3Dgroup&$str_dossier",_("Group= e"),_("Balance par groupe"),'group'), =20 ); $sub=3D(isset($_GET['sub']))?$_GET['sub']:'no'; @@ -170,7 +171,7 @@ //----------------------------------------------------------------------= ----- // Balance by group //----------------------------------------------------------------------= ----- -if ( $sub =3D=3D 'group')=20 +if ( $sub =3D=3D 'group') { require_once('class_anc_group.php'); $gr=3Dnew Anc_Group($cn); @@ -182,7 +183,7 @@ if ( isset($_GET['result'])) { echo $gr->show_button($str_hidden); - =20 + echo $gr->display_html(); } } Modified: phpcompta/trunk/include/anc_od.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/anc_od.inc.php 2011-10-28 20:20:43 UTC (rev 4= 250) +++ phpcompta/trunk/include/anc_od.inc.php 2011-10-28 20:59:25 UTC (rev 4= 251) @@ -32,8 +32,9 @@ require_once ("class_anc_operation.php"); require_once ("class_anc_plan.php"); require_once ("class_anc_group_operation.php"); +global $g_user; =20 - +$str_dossier=3DDossier::get(); $pa=3Dnew Anc_Plan($cn); $m=3D$pa->get_list(); if ( ! $m ) @@ -54,10 +55,10 @@
- '._= ('Nouveau').' + '._('Nouveau').' -'._(= 'Liste op=C3=A9rations').' '._('Liste op=C3=A9rations').'
@@ -86,8 +87,8 @@ echo dossier::hidden(); $hid=3Dnew IHidden(); =20 - $hid->name=3D"p_action"; - $hid->value=3D"ca_od"; + $hid->name=3D"ac"; + $hid->value=3D$_REQUEST['ac']; echo $hid->input(); =20 $hid->name=3D"see"; @@ -97,11 +98,11 @@ $w=3Dnew ISelect(); $w->name=3D"p_periode"; // filter on the current year - $filter_year=3D" where p_exercice=3D'".$User->get_exercice()."'"; + $filter_year=3D" where p_exercice=3D'".$g_user->get_exercice()."'"; =20 $periode_start=3D$cn->make_array("select p_id,to_char(p_start,'DD-MM= -YYYY') from parm_periode $filter_year order by p_start,p_end",1); - $User=3Dnew User($cn); - $current=3D(isset($_GET['p_periode']))?$_GET['p_periode']:$User->get= _periode(); + $g_user=3Dnew User($cn); + $current=3D(isset($_GET['p_periode']))?$_GET['p_periode']:$g_user->g= et_periode(); $w->value=3D$periode_start; $w->selected=3D$current; echo $w->input(); Modified: phpcompta/trunk/include/anc_pa.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/anc_pa.inc.php 2011-10-28 20:20:43 UTC (rev 4= 250) +++ phpcompta/trunk/include/anc_pa.inc.php 2011-10-28 20:59:25 UTC (rev 4= 251) @@ -28,7 +28,7 @@ require_once("class_anc_plan.php"); require_once("class_anc_account.php"); $ret=3D""; - +$str_dossier=3DDossier::get(); //----------------------------------------------------------------------= ----- // action // Compute the u_redcontent div @@ -49,8 +49,6 @@ $ret.=3Ddossier::hidden(); $ret.=3D $new->form(); $ret.=3D HtmlInput::hidden("sa","pa_write"); - $ret.=3DHtmlInput::hidden("p_action","ca_pa"); - ; $ret.=3DHtmlInput::submit("submit","Enregistre"); $ret.=3D ''; $ret.=3D '
'; @@ -87,7 +85,6 @@ if ( $sa =3D=3D "pa_detail" ) { $new=3Dnew Anc_Plan($cn,$_GET['pa_id']); - $wAction=3DHtmlInput::hidden("p_action","ca_pa"); $wSa=3DHtmlInput::hidden("sa","pa_update"); =20 $new->get(); @@ -99,13 +96,8 @@ =20 $ret.=3D $new->form(); $ret.=3D $wSa; - $ret.=3D $wAction; $ret.=3DHtmlInput::submit("submit","Enregistre"); - /* $ret.=3Dsprintf(''. - '', - "?p_action=3Dca_pa&pa_id=3D".$_GET['pa_id']."&sa=3Dpa_del= ete&$str_dossier"); - */ - $ret.=3DHtmlInput::button_anchor('Efface',"?p_action=3Dca_pa&pa_= id=3D".$_GET['pa_id']."&sa=3Dpa_delete&$str_dossier",'Efface','onclick=3D= "return confirm(\'Effacer ?\')"'); + $ret.=3DHtmlInput::button_anchor('Efface',"?ac=3D".$_REQUEST['ac= ']."&pa_id=3D".$_GET['pa_id']."&sa=3Dpa_delete&$str_dossier",'Efface','on= click=3D"return confirm(\'Effacer ?\')"'); $ret.=3D ''; $ret.=3D '
'; =20 @@ -166,7 +158,7 @@ $ret.=3D$po->form(); $ret.=3DHtmlInput::hidden('sa','po_update'); $ret.=3DHtmlInput::submit('Correction','Correction'); - $ret.=3Dsprintf(''. + $ret.=3Dsprintf(''. '= ', $po->id, $_REQUEST['pa_id'] @@ -216,7 +208,7 @@ =20 $ret.=3D""; $ret.=3D"". - 'id.'&pa_id=3D'.$_REQUEST['pa_= id'].'&'. + 'id.'&pa_id=3D'.$_REQUE= ST['pa_id'].'&'. $str_dossier.'">'. h($obj->name). ''; @@ -230,7 +222,7 @@ =20 } $ret.=3D""; - $ret.=3DHtmlInput::button_anchor('Ajout',"?p_action=3Dca_pa&sa=3D= po_add&pa_id=3D".$_GET['pa_id']."&".$str_dossier); + $ret.=3DHtmlInput::button_anchor('Ajout',"?ac=3D".$_REQUEST['ac'= ]."&sa=3Dpo_add&pa_id=3D".$_GET['pa_id']."&".$str_dossier); $ret.=3D'
'; =20 } @@ -253,7 +245,7 @@ echo '
'; echo ''; echo ''; echo '
'; - echo 'Ajout d\'un plan comptable'; + echo 'Ajout d\'un plan comptable'; echo '
'; =20 @@ -273,11 +265,11 @@ { echo ''; echo ''. - ''. + ''. h($line['name']). ''; echo ''. - ''. + ''. "Activit=C3=A9s". ""; =20 @@ -288,7 +280,7 @@ { echo ''; echo ''; echo '
'; - echo 'Ajout d\'un plan comptable'; + echo 'Ajout d\'un plan comptable'; echo '
'; } Modified: phpcompta/trunk/include/balance.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/balance.inc.php 2011-10-28 20:20:43 UTC (rev = 4250) +++ phpcompta/trunk/include/balance.inc.php 2011-10-28 20:59:25 UTC (rev = 4251) @@ -22,7 +22,7 @@ * \brief Show the balance and let you print it or export to PDF * file included by user_impress * - * some variable are already defined ($cn, $User ...) + * some variable are already defined ($cn, $g_user ...) */ =20 include_once ("ac_common.php"); @@ -34,11 +34,12 @@ require_once('class_acc_ledger.php'); require_once('class_periode.php'); require_once('class_exercice.php'); +global $g_user; +$gDossier=3Ddossier::id(); +$g_user->can_request(IMPBAL); +$exercice=3D(isset($_GET['exercice']))?$_GET['exercice']:$g_user->get_ex= ercice(); =20 -$User->can_request(IMPBAL); -$exercice=3D(isset($_GET['exercice']))?$_GET['exercice']:$User->get_exer= cice(); =20 - echo '
'; /* * Let you change the exercice @@ -50,14 +51,14 @@ $wex=3D$ex->select('exercice',$exercice,' onchange=3D"submit(this)"'); echo $wex->input(); echo dossier::hidden(); -echo HtmlInput::get_to_hidden(array('p_action','type')); +echo HtmlInput::get_to_hidden(array('ac','type')); echo ''; echo ''; =20 =20 // Show the form for period echo '
'; -echo HtmlInput::hidden('p_action','impress'); +echo HtmlInput::get_to_hidden(array('ac')); echo HtmlInput::hidden('type','bal'); echo HtmlInput::get_to_hidden(array('exercice')); echo dossier::hidden(); @@ -71,7 +72,7 @@ $input_from->type=3DALL; $input_from->cn=3D$cn; $input_from->filter_year=3Dtrue; -$input_from->user=3D$User; +$input_from->user=3D$g_user; =20 echo 'Depuis :'.$input_from->input(); // filter on the current year @@ -81,7 +82,7 @@ $input_to->filter_year=3Dtrue; $input_to->type=3DALL; $input_to->cn=3D$cn; -$input_to->user=3D$User; +$input_to->user=3D$g_user; echo ' jusque :'.$input_to->input(); =20 //------------------------------------------------- @@ -90,7 +91,7 @@ /* add a all ledger choice */ echo 'Filtre '; $rad=3Dnew IRadio(); -$array_ledger=3D$User->get_ledger('ALL',3); +$array_ledger=3D$g_user->get_ledger('ALL',3); $selected=3D(isset($_GET['r_jrn']))?$_GET['r_jrn']:null; $select_cat=3D(isset($_GET['r_cat']))?$_GET['r_cat']:null; $array_cat=3DAcc_Ledger::array_cat(); @@ -177,7 +178,7 @@ echo ''. dossier::hidden(). HtmlInput::submit('bt_pdf',"Export PDF"). - HtmlInput::hidden("p_action","impress"). + HtmlInput::hidden("ac",$_REQUEST['ac']). HtmlInput::hidden("act","PDF/balance"). =20 HtmlInput::hidden("from_periode",$_GET['from_periode']). @@ -199,10 +200,10 @@ echo ''. HtmlInput::submit('bt_csv',"Export CSV"). dossier::hidden(). - HtmlInput::hidden("p_action","impress"). HtmlInput::hidden("act","CSV/balance"). HtmlInput::hidden("from_periode",$_GET['from_periode']). HtmlInput::hidden("to_periode",$_GET['to_periode']); + echo HtmlInput::get_to_hidden(array('ac')); echo HtmlInput::hidden('p_filter',$_GET['p_filter']); if (isset($_GET ['r_jrn'])) if (isset($selected[$e])) @@ -288,12 +289,12 @@ * level x */ foreach (array(3,2,1) as $ind) - {=09 + { if ( ! isset($_GET['lvl'.$ind]))continue; if (${'lvl'.$ind.'_old'} =3D=3D '') ${'lvl'.$ind.'_old'}=3Dsubstr= ($r['poste'],0,$ind); if ( ${'lvl'.$ind.'_old'} !=3D substr($r['poste'],0,$ind)) { - =09 + echo ''; echo td("Total niveau ".$ind); echo td(${'lvl'.$ind.'_old'}); @@ -301,7 +302,7 @@ echo td(nbm(${'lvl'.$ind}['sum_cred']),'style=3D"text-align:right"'); echo td(nbm(${'lvl'.$ind}['solde_deb']),'style=3D"text-align:right"'); echo td(nbm(${'lvl'.$ind}['solde_cred']),'style=3D"text-align:right"')= ; - =09 + echo ''; ${'lvl'.$ind.'_old'}=3Dsubstr($r['poste'],0,$ind); foreach(array('sum_cred','sum_deb','solde_deb','solde_cred') as $a) Modified: phpcompta/trunk/include/balance_card.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/balance_card.inc.php 2011-10-28 20:20:43 UTC = (rev 4250) +++ phpcompta/trunk/include/balance_card.inc.php 2011-10-28 20:59:25 UTC = (rev 4251) @@ -24,11 +24,12 @@ * \brief show the status of a card */ require_once('class_exercice.php'); +global $g_user; echo '
'; $exercice=3Dnew Exercice($cn); $old=3D''; $fiche=3Dnew Fiche($cn,$_GET['f_id']); -$year=3D$User->get_exercice(); +$year=3D$g_user->get_exercice(); if ( $year =3D=3D 0 ) { $html=3D"erreur aucune p=C3=A9riode par d=C3=A9faut, allez dans pr=C3= =A9f=C3=A9rence pour en choisir une"; @@ -53,11 +54,11 @@ $default=3D(isset($_GET['ex']))?$_GET['ex']:$year; $dossier=3Ddossier::id(); =20 - $old=3D''; + $old=3D''; $is=3D$exercice->select('ex',$default,'onchange =3D "submit(this)"'= ); $old.=3D"Autre exercice ".$is->input(); $old.=3DHtmlInput::hidden('f_id',$_GET['f_id']); - $old.=3DHtmlInput::hidden('p_action',$_GET['p_action']); + $old.=3DHtmlInput::hidden('ac',$_GET['ac']); $old.=3DHtmlInput::hidden('sb',$_GET['sb']); $old.=3DHtmlInput::hidden('sc',$_GET['sc']); $old.=3Ddossier::hidden(); @@ -70,5 +71,5 @@ echo $old; =20 } -=20 + echo '
'; Modified: phpcompta/trunk/include/class_acc_account_ledger.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_acc_account_ledger.php 2011-10-28 20:20= :43 UTC (rev 4250) +++ phpcompta/trunk/include/class_acc_account_ledger.php 2011-10-28 20:59= :25 UTC (rev 4251) @@ -142,23 +142,23 @@ if ( $this->db->count() =3D=3D 0 ) return array(); if ($r[0]['s_deb']=3D=3D$r[0]['s_cred']) return array(); } - $Res=3D$this->db->exec_sql("select jr_id,to_char(j_date,'DDMMYY= YY') as j_date_fmt,j_date, - case when j_debit=3D't' then j_montant = else 0 end as deb_montant, - case when j_debit=3D'f' then j_montant = else 0 end as cred_montant, - jr_comment as description,jrn_def_name= as jrn_name, - j_debit, jr_internal,jr_pj_number, - coalesce(get_letter_jnt(j_id),-1) as letter - ,pcm_lib - ,jr_tech_per,p_exercice - from jrnx left join jrn_def on (jrn_de= f_id=3Dj_jrn_def ) - left join jrn on (jr_grpt_id=3Dj_grpt) - left join tmp_pcmn on (j_poste=3Dpcm_v= al) - left join parm_periode on (p_id=3Djr_tech_per) - where j_poste=3D$1 and - ( to_date($2,'DD.MM.YYYY') <=3D j_date= and - to_date($3,'DD.MM.YYYY') >=3D j_date= ) - and $filter_sql $sql_let - order by j_date,substring(jr_pj_number= ,'\\\\d+$') asc",array($this->id,$p_from,$p_to)); + $Res=3D$this->db->exec_sql("select jr_id,to_char(j_date,'DD.MM.= YYYY') as j_date_fmt,j_date,". + "case when j_debit=3D't' then j_montant= else 0 end as deb_montant,". + "case when j_debit=3D'f' then j_montant= else 0 end as cred_montant,". + " jr_comment as description,jrn_def_nam= e as jrn_name,". + "j_debit, jr_internal,jr_pj_number, + coalesce(comptaproc.get_letter_jnt(j_id),-1) as letter ". + ",pcm_lib ". + ",jr_tech_per,p_exercice ". + " from jrnx left join jrn_def on (jrn_d= ef_id=3Dj_jrn_def )". + " left join jrn on (jr_grpt_id=3Dj_grpt= )". + " left join tmp_pcmn on (j_poste=3Dpcm_= val)". + " left join parm_periode on (p_id=3Djr_tech_per) ". + " where j_poste=3D$1 and ". + " ( to_date($2,'DD.MM.YYYY') <=3D j_dat= e and ". + " to_date($3,'DD.MM.YYYY') >=3D j_dat= e )". + " and $filter_sql $sql_let ". + " order by j_date,substring(jr_pj_numbe= r,'\\\\d+$') asc",array($this->id,$p_from,$p_to)); return $this->get_row_sql($Res); } =20 @@ -240,7 +240,7 @@ if ($Max=3D=3D0) return 0; $r=3DDatabase::fetch_array($Res,0); =20 - return abs(bcsub($r['sum_deb'],$r['sum_cred'])); + return abs($r['sum_deb']-$r['sum_cred']); } /*! * \brief give the balance of an account @@ -450,7 +450,7 @@ echo ''. dossier::hidden(). HtmlInput::submit('bt_other',"Autre poste"). - $hid->input("type","poste").$hid->input('p_action','impress').""; + $hid->input("type","poste").$hid->input('ac',$_REQUEST['ac']).""; } =20 =20 @@ -464,12 +464,18 @@ $hid->input("to_periode",$_REQUEST['to_periode']) ; =20 - echo HtmlInput::request_to_hidden(array('from_poste','to_poste', - 'poste_id')); - if ( isset($_REQUEST['letter'] )) echo HtmlInput::hidden('letter','2'); if ( isset($_REQUEST['solded'] )) echo HtmlInput::hidden('solded','1'); =20 + if (isset($_REQUEST['from_poste'])) + echo HtmlInput::hidden('from_poste',$_REQUEST['from_poste']); + + if (isset($_REQUEST['to_poste'])) + echo HtmlInput::hidden('to_poste',$_REQUEST['to_poste']); + + if (isset($_REQUEST['poste_id'])) + echo HtmlInput::hidden("poste_id",$_REQUEST['poste_id']); + if (isset($_REQUEST['poste_fille'])) echo $hid->input('poste_fille','on'); if (isset($_REQUEST['oper_detail'])) @@ -486,9 +492,15 @@ $hid->input("from_periode",$_REQUEST['from_periode']). $hid->input("to_periode",$_REQUEST['to_periode']); =20 - echo HtmlInput::request_to_hidden(array('from_poste','to_poste', - 'poste_id')); + if (isset($_REQUEST['from_poste'])) + echo HtmlInput::hidden('from_poste',$_REQUEST['from_poste']); =20 + if (isset($_REQUEST['to_poste'])) + echo HtmlInput::hidden('to_poste',$_REQUEST['to_poste']); + + if (isset($_REQUEST['poste_id'])) + echo HtmlInput::hidden("poste_id",$_REQUEST['poste_id']); + if ( isset($_REQUEST['letter'] )) echo HtmlInput::hidden('letter','2'); if ( isset($_REQUEST['solded'] )) echo HtmlInput::hidden('solded','1'); =20 @@ -511,9 +523,7 @@ */ function belong_ledger($p_jrn) { - $filter=3D$this->db->get_value("select jrn_def_class_cred from j= rn_def where jrn_def_id=3D$1", - array($p_jrn)); - + $filter=3D$this->db->get_value("select jrn_def_class_cred from j= rn_def where jrn_def_id=3D$p_jrn"); if ( trim ($filter) =3D=3D '') return 0; =20 Modified: phpcompta/trunk/include/class_acc_ledger.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_acc_ledger.php 2011-10-28 20:20:43 UTC = (rev 4250) +++ phpcompta/trunk/include/class_acc_ledger.php 2011-10-28 20:59:25 UTC = (rev 4251) @@ -41,7 +41,7 @@ require_once('ac_common.php'); require_once('class_inum.php'); require_once('class_lettering.php'); -require_once 'class_sort_table.php'; + /*!\file * \brief Class for jrn, class acc_ledger for manipulating the ledger */ @@ -594,40 +594,87 @@ $amount_unpaid=3D0.0; $limit=3D($_SESSION['g_pagesize']!=3D-1)?" LIMIT ".$_SESSION['g_= pagesize']:""; $offset=3D($_SESSION['g_pagesize']!=3D-1)?" OFFSET ".Database::e= scape_string($offset):""; + $order=3D" order by jr_date_order asc,jr_internal asc"; // Sort - $url=3Dbasename($_SERVER['SCRIPT_NAME']).'?'.CleanUrl(); + $url=3DCleanUrl(); $str_dossier=3Ddossier::get(); + $image_asc=3D''; + $image_desc=3D''; + $image_sel_desc=3D''; + $image_sel_asc=3D''; =20 - $sort=3Dnew Sort_Table(); - $sort->add(_('Date'), - $url, - ' order by jr_date_order asc,substring(jr_pj_number,\'\\\d+$\')::numer= ic asc ', - ' order by jr_date_order desc,substring(jr_pj_number,\'\\\d+$\')::nume= ric desc ','da','dd'); - $sort->add(_('Ech=C3=A9ance'), - $url, - ' order by jr_ech asc,substring(jr_pj_number,\'\\\d+$\')::numeric asc = ', - ' order by jr_ech desc,substring(jr_pj_number,\'\\\d+$\')::numeric des= c ','ea','ed'); - $sort->add(_('Pi=C3=A8ce'), - $url, - ' order by substring(jr_pj_number,\'\\\d+$\')::numeric asc ', - ' order by substring(jr_pj_number,\'\\\d+$\')::numeric desc ','pa','p= d'); - $sort->add(_('Description'), - $url, - ' order by jr_comment asc ', - ' order by jr_comment desc ','dsa','dsd'); - $sort->add(_('Montant'), - $url, - ' order by jr_montant asc ', - ' order by jr_montant desc ','ma','md'); + $sort_date=3D" $image_asc"._('Date')."$image_desc"; + $sort_description=3D" $image_asc"._('Description')."$image_desc"; + $sort_amount=3D" $image_asc"._('Montant')." $image_desc"; + $sort_pj=3D" $image_asc"._('PJ')."= $image_desc"; + $sort_echeance=3D" $image_asc"._('Ech')." $image_desc "; =20 - $sort->add(_('Journal'), - $url, - ' order by jrn_def_name asc ', - ' order by jrn_def_name desc ','la','ld'); + $own=3Dnew Own($this->db); + // if an order is asked + if ( isset ($_GET['o']) ) + { + switch ($_GET['o']) + { + case 'pja': + // pj asc + $sort_pj=3D"$image_sel_asc PJ $image_desc"; + $order=3D' order by substring(jr_pj_number,\'\\\d+$\'):= :numeric asc '; + break; + case 'pjd': + $sort_pj=3D" $image_asc PJ $image_sel_desc"; + // pj desc + $order=3D' order by substring(jr_pj_number,\'\\\d+$\'):= :numeric desc '; + break; =20 - $ord=3D(isset($_GET['ord']))?$_GET['ord']:'da'; + case 'da': + // date asc + $sort_date=3D"$image_sel_asc Date $image_desc"; + $order=3D' order by jr_date_order asc,substring(jr_pj_nu= mber,\'\\\d+$\')::numeric asc '; + break; + case 'dd': + $sort_date=3D" $image_asc Date $image_sel_desc"; + // date desc + $order=3D' order by jr_date_order desc,substring(jr_pj_n= umber,\'\\\d+$\')::numeric desc '; + break; + case 'ma': + // montant asc + $sort_amount=3D" $image= _sel_asc Montant $image_des= c"; + $order=3D" order by jr_montant asc "; + break; + case 'md': + // montant desc + $sort_amount=3D" $image_ascMontant $image_se= l_desc"; + $order=3D" order by jr_montant desc "; + break; + case 'ca': + // jr_comment asc + $sort_description=3D" $image_sel_asc Description $image_desc"; + $order=3D" order by jr_comment asc "; + break; + case 'cd': + // jr_comment desc + $sort_description=3D" $image_ascDescription $image_sel_desc"; + $order=3D" order by jr_comment desc "; + break; + case 'ea': + // jr_comment asc + $sort_echeance=3D" $image_sel_asc Ech. $image_desc"; + $order=3D" order by jr_ech asc "; + break; + case 'ed': + // jr_comment desc + $sort_echeance=3D" $image_asc Ech. $image_sel_desc"; + $order=3D" order by jr_ech desc "; + break; =20 - $order=3D$sort->get_sql_order($ord); + } + } + else + { + // date asc + $sort_date=3D"$image_sel_asc Date $image_desc"; + $order=3D" order by jr_date_order asc,substring(jr_pj_number= ,'\\d+$')::numeric asc "; + } =20 // Count $count=3D$this->db->count_sql($sql); @@ -654,16 +701,15 @@ $r.=3D"Internal"; if ( $this->type=3D=3D'') { - $r.=3D''.$sort->get_header(5).''; + $r.=3Dth('Journal'); } - $r.=3D''.$sort->get_header(0).''; - $r.=3D''.$sort->get_header(1).''; - $r.=3D''.$sort->get_header(2).''; + $r.=3D$sort_date; + $r.=3D$sort_echeance; + $r.=3D$sort_pj; $r.=3Dth('tiers'); - $r.=3D''.$sort->get_header(3).''; - + $r.=3D$sort_description; $r.=3Dth('Notes',' style=3D"width:15%"'); - $r.=3D''.$sort->get_header(4).''; + $r.=3D$sort_amount; // if $p_paid is not equal to 0 then we have a paid column if ( $p_paid !=3D 0 ) { @@ -687,7 +733,28 @@ //internal code // button modify $r.=3D""; + // If url contains + // =20 + $href=3Dbasename($_SERVER['PHP_SELF']); + /* switch ($href) + { + // user_jrn.php + case 'compta.php': + $vue=3D"S"; //Expert View + break; + case 'commercial.php': + $vue=3D"S"; //Simple View + break; + case 'recherche.php': + $vue=3D(isset($_GET['expert']))?'E':'S'; + break; + default: + echo_error('user_form_ach.php',__LINE__,'Erreur invalid = request uri'); + exit (-1); + }*/ + //DEBUG + $r.=3Dsprintf('%s ', $row['jr_id'], $gDossier, $row['jr_internal']); $r.=3D""; @@ -2156,6 +2223,7 @@ =20 $r.=3Ddossier::hidden(); $r.=3DHtmlInput::hidden('ledger_type',$this->type); + $r.=3DHtmlInput::hidden('ac',$_REQUEST['ac']); ob_start(); require_once('template/ledger_search.php'); $r.=3Dob_get_contents(); @@ -2254,11 +2322,12 @@ =20 $and=3D''; $user=3Dnew User($this->db); - + $p_action=3D$ledger_type; if ( $r_jrn =3D=3D -1 ) { + /* Specific action allow to see all the ledgers in once */ - if ( $p_action =3D=3D 'gl') $p_action=3D'ALL'; + if ( $ledger_type=3D=3D 'gl') $p_action=3D'ALL'; /* actions from commercial.php */ if ( $p_action =3D=3D 'client') $p_action=3D'ALL'; if ( $p_action =3D=3D 'supplier') $p_action=3D'ALL'; @@ -2399,7 +2468,7 @@ $r.=3D''; $r.=3D$this->search_form($type); $r.=3DHtmlInput::submit('search',_('Rechercher')); - $r.=3DHtmlInput::hidden('p_action',$_REQUEST['p_action']); + $r.=3DHtmlInput::hidden('ac',$_REQUEST['ac']); =20 /* when called from commercial.php some hidden values are neede= d */ if (isset($_REQUEST['sa'])) $r.=3D HtmlInput::hidden("sa",$_REQU= EST['sa']); Modified: phpcompta/trunk/include/class_anc_print.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_anc_print.php 2011-10-28 20:20:43 UTC (= rev 4250) +++ phpcompta/trunk/include/class_anc_print.php 2011-10-28 20:59:25 UTC (= rev 4251) @@ -118,6 +118,7 @@ $r.=3D ''._('Les dates sont en format DD.= MM.YYYY').''; =20 $r.=3D$p_hidden; + $r.=3DHtmlInput::hidden('ac',$_REQUEST['ac']); $r.=3D''; $plan=3Dnew Anc_Plan($this->db); $plan_id=3Dnew ISelect("pa_id"); @@ -166,17 +167,17 @@ } function check() { - =20 + /* * check date */ if (($this->from !=3D '' && isDate ($this->from) =3D=3D 0) - ||=20 + || ($this->to !=3D '' && isDate ($this->to) =3D=3D 0)) return -1; =20 return 0; - } =20 + } =20 =20 } Modified: phpcompta/trunk/include/class_document_modele.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_document_modele.php 2011-10-28 20:20:43= UTC (rev 4250) +++ phpcompta/trunk/include/class_document_modele.php 2011-10-28 20:59:25= UTC (rev 4251) @@ -19,10 +19,10 @@ /* $Revision$ */ // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr /*! \file - * \brief Class for the document template=20 + * \brief Class for the document template */ /*! - * \brief Class for the document template=20 + * \brief Class for the document template */ require_once('class_icheckbox.php'); require_once('class_ihidden.php'); @@ -59,7 +59,7 @@ $all=3DDatabase::fetch_all($Res); $r=3D''; if ( Database::num_row($Res) !=3D 0 ) { - =20 + $r.=3D'

'; $r.=3Ddossier::hidden(); $r.=3D""; @@ -109,13 +109,13 @@ return $r; } /*! - * \brief : Save a document_modele in the database,=20 + * \brief : Save a document_modele in the database, * if the document_modele doesn't exist yet it will be * first created (-> insert into document_modele) * in that case the name and the type must be set * set before calling Save, the name will be modified * with FormatString - * =20 + * */ function Save() { @@ -194,7 +194,7 @@ } } /*! - * \brief Remove a template=20 + * \brief Remove a template * \return nothing */ function Delete() @@ -219,17 +219,17 @@ =20 /*! * \brief show the form for loading a template - * \param p_action for the field action =3D destination url=20 - *=20 + * \param p_action for the field action =3D destination url * + * * \return string containing the forms */ - function form($p_action) + function form() { $r=3D'

'; $r.=3D'Veuillez introduire les modèles servant =C3=A0 g&e= acute;nérer vos documents'; $r.=3D'

'; - $r.=3D''; + $r.=3D''; $r.=3Ddossier::hidden(); // we need to add the sub action as hidden $h=3Dnew IHidden(); @@ -294,7 +294,7 @@ } } /*! - * \brief : update a document_modele in the database,=20 + * \brief : update a document_modele in the database, */ function update($p_array) { @@ -315,7 +315,7 @@ )); if ( $p_array['seq'] !=3D 0 ) $this->cn->alter_seq('seq_doc_type_'.$p_array['md_type'],$p_array= ['seq']); - =20 + // Save the file $new_name=3Dtempnam($_ENV['TMP'],'document_'); if ( strlen ($_FILES['doc']['tmp_name']) !=3D 0 ) Modified: phpcompta/trunk/include/class_fiche.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_fiche.php 2011-10-28 20:20:43 UTC (rev = 4250) +++ phpcompta/trunk/include/class_fiche.php 2011-10-28 20:59:25 UTC (rev = 4251) @@ -764,7 +764,7 @@ { $parameter=3Darray($this->id,null); } - $this->cn->exec_sql("select account_insert($1,$2= )",$parameter); + $v=3D$this->cn->get_value("select account_insert= ($1,$2)",$parameter); } catch (Exception $e) { Modified: phpcompta/trunk/include/class_fiche_def.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_fiche_def.php 2011-10-28 20:20:43 UTC (= rev 4250) +++ phpcompta/trunk/include/class_fiche_def.php 2011-10-28 20:59:25 UTC (= rev 4251) @@ -66,7 +66,7 @@ =20 /*! * \brief Get attribut of a fiche_def - * =20 + * * \return string value of the attribute */ function getAttribut() @@ -95,7 +95,7 @@ =20 /*! * \brief Get attribut of the fiche_def - * =20 + * */ function Get() { @@ -118,8 +118,8 @@ /*! ************************************************** * \brief Get all the fiche_def - * =20 - * \return an array of fiche_def object=20 + * + * \return an array of fiche_def object */ function GetAll() { @@ -141,10 +141,10 @@ } /*! ************************************************** - * \brief Check in vw_fiche_def if a fiche has=20 + * \brief Check in vw_fiche_def if a fiche has * a attribut X - * =20 - * =20 + * + * * \param $p_attr attribut to check * \return true or false */ @@ -156,8 +156,8 @@ /*! ************************************************** * \brief Display a fiche_def object into a table - * =20 - * \return HTML row=20 + * + * \return HTML row */ function Display() { @@ -173,7 +173,7 @@ * table : insert into fiche_def * insert into attr_def * - * \param $array array=20 + * \param $array array * index FICHE_REF * nom_mod * class_base @@ -384,6 +384,7 @@ =20 =20 echo ''; + echo HtmlInput::hidden('ac',$_REQUEST['ac']); echo dossier::hidden(); echo HtmlInput::hidden("fiche",$this->id); echo HtmlInput::submit('add','Ajout fiche'); @@ -398,13 +399,17 @@ else echo ''; =20 - $span_mod=3D''; + $span_mod=3D''; =20 echo $span_mod.'"; echo ''; } echo '
'.$l_line['quick_code'].''.$l_line['quick_code'] + .''.h($l_line['vw_name'])."
'; echo ''; + echo HtmlInput::hidden('ac',$_REQUEST['ac']); echo dossier::hidden(); echo HtmlInput::hidden("fiche",$this->id); echo HtmlInput::submit('add','Ajout fiche'); @@ -414,7 +419,7 @@ } /*!\brief show input for the basic attribute : label, class_base, cr= eate_account * use only when we want to update - *=20 + * *\return HTML string with the form */ function input_base() @@ -440,7 +445,7 @@ return $r; } /*!\brief Display all the attribut of the fiche_def - *\param $str give the action possible values are remove, empty=20 + *\param $str give the action possible values are remove, empty */ function DisplayAttribut($str=3D"") { @@ -674,8 +679,8 @@ } /*! * \brief retrieve the mandatory field of the card model - * =20 - * \param $p_fiche_def_ref=20 + * + * \param $p_fiche_def_ref * \return array of ad_id (attr_min.ad_id) and labels (attr_def.ad= _text) */ function get_attr_min($p_fiche_def_ref) Modified: phpcompta/trunk/include/class_periode.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_periode.php 2011-10-28 20:20:43 UTC (re= v 4250) +++ phpcompta/trunk/include/class_periode.php 2011-10-28 20:59:25 UTC (re= v 4251) @@ -229,13 +229,13 @@ $change=3D''; $remove=3Dsprintf(_('Nombre op=C3=A9rations %d'),$l_line['count_op= ']); $remove=3Dtd($remove,' class=3D"mtitle" '); - $change=3Dtd (' R=C3= =A9ouverture',' class=3D"mtitle"'); + $change=3Dtd (' R=C3=A9ouverture',' class=3D"mtitle"'); =20 } else { $closed=3D''; - $closed.=3D' Cloturer'; + $closed.=3D' Cloturer= '; =20 if ($l_line['count_op'] =3D=3D 0 ) { @@ -260,7 +260,7 @@ =20 if ($l_line['count_op'] =3D=3D 0 ) { - $remove.=3D' Efface"; } else @@ -277,7 +277,7 @@ echo ''; =20 } - echo ' '; + echo ' '; echo dossier::hidden(); $istart=3Dnew IDate('p_date_start'); $iend=3Dnew IDate('p_date_end'); @@ -325,13 +325,13 @@ =20 if ( $l_line['status'] !=3D 'OP' ) { - $closed=3Dtd ('jrn_def_id.'" onclick=3D"return confirm(\''._('Confirmez R=C3=A9ouve= rture').' ?\')"> R=C3=A9ouverture',' class=3D"mtitle"'); + $closed=3Dtd ('jrn_def_id.'" onclick=3D"return confirm(\''._('Confirmez R=C3=A9= ouverture').' ?\')"> R=C3=A9ouverture',' class=3D"mtitle"'); // $closed=3D($l_line['status']=3D=3D'CE')?'C= entralisee':'Fermée'; } else { $closed=3D''; - $closed.=3D'jrn_def_id.'" onclick=3D"return confirm(\''._('Confirme= z Cloture').' ?\')"> Cloturer'; + $closed.=3D'jrn_def_id.'" onclick=3D"return confirm(\''._('Co= nfirmez Cloture').' ?\')"> Cloturer'; $closed.=3D''; } echo "$closed"; @@ -486,7 +486,7 @@ */ function insert_exercice($p_exercice) { - try=20 + try { $this->cn->start(); for ($i=3D1;$i < 12;$i++) Modified: phpcompta/trunk/include/class_pre_operation.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_pre_operation.php 2011-10-28 20:20:43 U= TC (rev 4250) +++ phpcompta/trunk/include/class_pre_operation.php 2011-10-28 20:59:25 U= TC (rev 4251) @@ -99,7 +99,7 @@ return true; } /*!\brief load the data from the database and return an array - * \return an array=20 + * \return an array */ function load() { @@ -195,6 +195,7 @@ =20 $hid=3Dnew IHidden(); $r=3D$hid->input("action","use_opd"); + echo HtmlInput::hidden('ac',$_REQUEST['ac']); $r.=3Ddossier::hidden(); $r.=3D$hid->input("p_jrn",$this->get("ledger")); $r.=3D$hid->input("jrn_type",$this->get("ledger_type")); Modified: phpcompta/trunk/include/client.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/client.inc.php 2011-10-28 20:20:43 UTC (rev 4= 250) +++ phpcompta/trunk/include/client.inc.php 2011-10-28 20:59:25 UTC (rev 4= 251) @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with PhpCompta; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-130= 7 USA -*/ + */ /* $Revision$ */ // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr -/*!\brief include from client.inc.php and concerned only the customer ca= rd and +/* !\brief include from client.inc.php and concerned only the customer c= ard and * the customer category */ require_once("class_iselect.php"); @@ -32,105 +32,101 @@ require_once('class_ipopup.php'); =20 echo ICard::ipopup('ipop_newcard'); -$ip_cat=3Dnew IPopup('ipop_cat'); -$ip_cat->title=3D_('Ajout d\'une cat=C3=A9gorie'); -$ip_cat->value=3D''; +$ip_cat =3D new IPopup('ipop_cat'); +$ip_cat->title =3D _('Ajout d\'une cat=C3=A9gorie'); +$ip_cat->value =3D ''; echo $ip_cat->input(); echo IPoste::ipopup('ipop_account'); -$search_card=3Dnew IPopup('ipop_card'); -$search_card->title=3D_('Recherche de fiche'); -$search_card->value=3D''; +$search_card =3D new IPopup('ipop_card'); +$search_card->title =3D _('Recherche de fiche'); +$search_card->value =3D ''; echo $search_card->input(); echo ICard::ipopup('ipopcard'); =20 -$low_action=3D(isset($_REQUEST['sb']))?$_REQUEST['sb']:"list"; -/*! \file +$low_action =3D (isset($_REQUEST['sb'])) ? $_REQUEST['sb'] : "list"; +/* ! \file * \brief Called from the module "Gestion" to manage the customer */ -$User->can_request(GECUST); $href=3Dbasename($_SERVER['PHP_SELF']); =20 // by default open liste -if ( $low_action =3D=3D "" ) - $low_action=3D"list"; +if ($low_action =3D=3D "") + $low_action =3D "list"; =20 =20 //----------------------------------------------------- // Remove a card //----------------------------------------------------- -if ( isset($_POST['delete_card'] ) ) +if (isset($_POST['delete_card'])) { - if ( $User->check_action(FICADD) =3D=3D 0 ) + if ($g_user->check_action(FICADD) =3D=3D 0) { - alert(j(_('Vous ne pouvez pas enlever de fiche'))); - return; + alert(j(_('Vous ne pouvez pas enlever de fiche'))); + return; } =20 - $f_id=3D$_REQUEST['f_id']; + $f_id =3D $_REQUEST['f_id']; =20 - $fiche=3Dnew Customer($cn,$f_id); + $fiche =3D new Customer($cn, $f_id); $fiche->remove(); - $low_action=3D"list"; - + $low_action =3D "list"; } =20 //----------------------------------------------------- // list of customer //----------------------------------------------------- -if ( $low_action =3D=3D "list" ) +if ($low_action =3D=3D "list") { - ?> -

- - "> -', - $a); - $sel_card=3Dnew ISelect('cat'); - $sel_card->value=3D$cn->make_array('select fd_id, fd_label from fich= e_def '. - ' where frd_id=3D'.FICHE_TYPE_CLIE= NT. - ' order by fd_label ',1); - $sel_card->selected=3D(isset($_GET['cat']))?$_GET['cat']:-1; - $sel_card->javascript=3D' onchange=3D"submit(this);"'; - echo _('Cat=C3=A9gorie :').$sel_card->input(); - $nooperation=3Dnew ICheckBox('noop'); - $nooperation->selected=3D(isset($_GET['noop']))?true:false; +
+ + "> + ', $a); + $sel_card =3D new ISelect('cat'); + $sel_card->value =3D $cn->make_array('select fd_id, fd_label from fich= e_def ' . + ' where frd_id=3D' . FICHE_TYPE_CLIENT . + ' order by fd_label ', 1); + $sel_card->selected =3D (isset($_GET['cat'])) ? $_GET['cat'] : -1; + $sel_card->javascript =3D ' onchange=3D"submit(this);"'; + echo _('Cat=C3=A9gorie :') . $sel_card->input(); + $nooperation =3D new ICheckBox('noop'); + $nooperation->selected =3D (isset($_GET['noop'])) ? true : false; =20 - echo _('Inclure les clients sans op=C3=A9ration :').$nooperation->in= put(); + echo _('Inclure les clients sans op=C3=A9ration :') . $nooperation->in= put(); + ?> + "> + '; + echo $client->Summary($search, 'client', $sql, $noop); =20 - ?> - "> - - - - '; - echo $client->Summary($search,'client',$sql,$noop); =20 - - echo '
'; - echo '
'; - echo '
'; - /* Add button */ - $f_add_button=3Dnew IButton('add_card'); - $f_add_button->label=3D_('Cr=C3=A9er une nouvelle fiche'); - $f_add_button->set_attribute('ipopup','ipop_newcard'); - $f_add_button->set_attribute('win_refresh','yes'); + echo '
'; + echo '
'; + echo '
'; + /* Add button */ + $f_add_button =3D new IButton('add_card'); + $f_add_button->label =3D _('Cr=C3=A9er une nouvelle fiche'); + $f_add_button->set_attribute('ipopup', 'ipop_newcard'); + $f_add_button->set_attribute('win_refresh', 'yes'); // $list=3D$cn->make_list("select fd_id from fiche_def where frd_id=3D$1= ",array(FICHE_TYPE_CLIENT)); - $f_add_button->set_attribute('type_cat',FICHE_TYPE_CLIENT); - $f_add_button->javascript=3D" select_card_type(this);"; - echo $f_add_button->input(); + $f_add_button->set_attribute('type_cat', FICHE_TYPE_CLIENT); + $f_add_button->javascript =3D " select_card_type(this);"; + echo $f_add_button->input(); =20 $f_cat_button=3Dnew IButton('add_cat'); $f_cat_button->set_attribute('ipopup','ipop_cat'); @@ -153,29 +149,27 @@ require_once('client_card.inc.php'); exit(); } - -if ( $low_action=3D=3D"insert" ) -{ - /* security : check if user can add card */ - if ( $User->check_action(FICADD) =3D=3D 0 ) + if ($low_action =3D=3D "insert") { - alert('Vous ne pouvez pas ajouter de fiche'); - return; + /* security : check if user can add card */ + if ($g_user->check_action(FICADD) =3D=3D 0) + { + alert('Vous ne pouvez pas ajouter de fiche'); + return; + } + + $customer =3D new Customer($cn); + $customer->Save($_REQUEST['fd_id']); + echo '
'; + echo ""; + echo $customer->Display(true); + echo "
"; + $retour =3D new IAction(); + $retour->label =3D "Retour"; + $retour->value =3D "?ac=3D" . $_REQUEST["ac"] . "&" . dossier::get(); + echo $retour->input(); + echo '
'; } =20 - $customer=3Dnew Customer($cn); - $customer->Save($_REQUEST['fd_id']); - echo '
'; - echo ""; - echo $customer->Display(true); - echo "
"; - $retour=3Dnew IAction(); - $retour->label=3D"Retour"; - $retour->value=3D"?p_action=3Dclient&".dossier::get(); - echo $retour->input(); - echo '
'; - -} - -html_page_stop(); + html_page_stop(); ?> Copied: phpcompta/trunk/include/company.inc.php (from rev 4249, phpcompta= /branches/rel600-dynamic-menu/include/company.inc.php) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/company.inc.php (rev = 0) +++ phpcompta/trunk/include/company.inc.php 2011-10-28 20:59:25 UTC (rev = 4251) @@ -0,0 +1,102 @@ +can_request(PARCOORD,1); + echo '
'; + require_once("class_own.php"); + if ( isset ($_POST['record_company'] )) + { + $m=3Dnew Own($cn); + extract($_POST); + $m->MY_NAME=3D$p_name; + $m->MY_TVA=3D$p_tva; + $m->MY_STREET=3D$p_street; + $m->MY_NUMBER=3D$p_no; + $m->MY_CP=3D$p_cp; + $m->MY_COMMUNE=3D$p_Commune; + $m->MY_TEL=3D$p_tel; + $m->MY_FAX=3D$p_fax; + $m->MY_PAYS=3D$p_pays; + $m->MY_CHECK_PERIODE=3D$p_check_periode; + $m->MY_DATE_SUGGEST=3D$p_date_suggest; + if ( $g_user->check_action(PARCA)!=3D0)$m->MY_ANALYTIC=3D$p_comp= ta; + if ( $g_user->check_action(PARSTR)!=3D0) $m->MY_STRICT=3D$p_stri= ct; + if ( $g_user->check_action(PARTVA)!=3D0)$m->MY_TVA_USE=3D$p_tva_= use; + $m->MY_PJ_SUGGEST=3D$p_pj; + $m->Update(); + } + + $my=3Dnew Own($cn); + ///// Compta analytic + $array=3Darray ( + array("value"=3D>"ob",'label'=3D>_("obligatoire")), + array("value"=3D>"op",'label'=3D>_("optionnel")), + array("value"=3D>"nu",'label'=3D>_("non utilis=C3=A9")) + ); + $strict_array=3Darray( + array('value'=3D>'N','label'=3D>_('Non')), + array('value'=3D>'Y','label'=3D>_('Oui')) + ); + + $compta=3Dnew ISelect(); + $compta->table=3D1; + $compta->selected=3D$my->MY_ANALYTIC; + + $strict=3Dnew ISelect(); + $strict->table=3D1; + $strict->selected=3D$my->MY_STRICT; + + $tva_use=3Dnew ISelect(); + $tva_use->table=3D1; + $tva_use->selected=3D$my->MY_TVA_USE; + + $pj_suggest=3Dnew ISelect(); + $pj_suggest->table=3D1; + $pj_suggest->selected=3D$my->MY_PJ_SUGGEST; + + $date_suggest=3Dnew ISelect(); + $date_suggest->table=3D1; + $date_suggest->selected=3D$my->MY_DATE_SUGGEST; + + $check_periode=3Dnew ISelect(); + $check_periode->table=3D1; + $check_periode->selected=3D$my->MY_CHECK_PERIODE; + + // other parameters + $all=3Dnew IText(); + $all->table=3D1; + echo ''; + echo dossier::hidden(); + echo ""; + echo "".td(_('Nom soci=C3=A9t=C3=A9'),'style=3D"text-align:right= "').$all->input("p_name",$my->MY_NAME).""; + $all->value=3D''; + echo "".td(_("T=C3=A9l=C3=A9phone"),'style=3D"text-align:right"'= ).$all->input("p_tel",$my->MY_TEL).""; + $all->value=3D''; + echo "".td(_("Fax"),'style=3D"text-align:right"').$all->input("p= _fax",$my->MY_FAX).""; + $all->value=3D''; + echo "".td(_("Rue "),'style=3D"text-align:right"').$all->input("= p_street",$my->MY_STREET).""; + $all->value=3D''; + echo "".td(_("Num=C3=A9ro"),'style=3D"text-align:right"').$all->= input("p_no",$my->MY_NUMBER).""; + $all->value=3D''; + echo "".td(_("Code Postal"),'style=3D"text-align:right"').$all->= input("p_cp",$my->MY_CP).""; + $all->value=3D''; + echo "".td(_("Commune"),'style=3D"text-align:right"').$all->inpu= t("p_Commune",$my->MY_COMMUNE).""; + $all->value=3D''; + echo "".td(_("Pays"),'style=3D"text-align:right"').$all->input("= p_pays",$my->MY_PAYS).""; + $all->value=3D''; + echo "".td(_("Num=C3=A9ro de Tva"),'style=3D"text-align:right"')= .$all->input("p_tva",$my->MY_TVA).""; + if ( $g_user->check_action(PARCA)=3D=3D0) $compta->setReadonly(true)= ; + echo "".td(_("Utilisation de la compta. analytique"),'style=3D"t= ext-align:right"').$compta->input("p_compta",$array).""; + if ( $g_user->check_action(PARSTR)=3D=3D0) $strict->setReadonly(true= ); + echo "".td(_("Utilisation du mode strict "),'style=3D"text-align= :right"').$strict->input("p_strict",$strict_array).""; + if ( $g_user->check_action(PARTVA)=3D=3D0) $tva_use->setReadonly(tru= e); + echo "".td(_("Assujetti =C3=A0 la tva"),'style=3D"text-align:rig= ht"').$tva_use->input("p_tva_use",$strict_array).""; + echo "".td(_("Sugg=C3=A9rer le num=C3=A9ro de pi=C3=A8ce justifi= cative"),'style=3D"text-align:right"').$pj_suggest->input("p_pj",$strict_= array).""; + echo "".td(_("Sugg=C3=A9rer la date"),'style=3D"text-align:right= "').$date_suggest->input("p_date_suggest",$strict_array).""; + echo ''.td(_('Afficher la p=C3=A9riode comptable pour =C3=A9vite= r les erreurs de date'),'style=3D"text-align:right"').$check_periode->inp= ut('p_check_periode',$strict_array).''; + echo "
"; + echo HtmlInput::submit("record_company",_("Sauve")); + echo ""; + echo '
'; + exit(); + +?> Modified: phpcompta/trunk/include/compta_ach.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/compta_ach.inc.php 2011-10-28 20:20:43 UTC (r= ev 4250) +++ phpcompta/trunk/include/compta_ach.inc.php 2011-10-28 20:59:25 UTC (r= ev 4251) @@ -34,13 +34,11 @@ $cn=3Dnew Database(dossier::id()); //menu =3D show a list of ledger $str_dossier=3Ddossier::get(); - +$ac=3D"ac=3D".$_REQUEST['ac']; $array=3Darray( - array('?p_action=3Dach&sa=3Dn&'.$str_dossier,_('Nouvelle d=C3= =A9pense'),_('Nouvel achat ou d=C3=A9pense'),1), - array('?p_action=3Dach&sa=3Dl&'.$str_dossier,_('Liste achat')= ,_('Liste des achats'),2), - array('?p_action=3Dach&sa=3Dlnp&'.$str_dossier,_('Liste d=C3=A9= penses non pay=C3=A9es'),_('Liste des ventes non pay=C3=A9es'),3), - array('commercial.php?p_action=3Dsupplier&'.$str_dossier,_('F= ournisseurs'),_('Fournisseurs')), - array('?p_action=3Dimpress&type=3Djrn&'.$str_dossier,_('Impre= ssion'),_('Impression')) + array('?ledger_type=3DACH&sa=3Dn&'.$str_dossier."&$ac",_('Nou= velle d=C3=A9pense'),_('Nouvel achat ou d=C3=A9pense'),1), + array('?ledger_type=3DACH&sa=3Dl&'.$str_dossier."&$ac",_('Lis= te achat'),_('Liste des achats'),2), + array('?ledger_type=3DACH&sa=3Dlnp&'.$str_dossier."&$ac",_('L= iste d=C3=A9penses non pay=C3=A9es'),_('Liste des ventes non pay=C3=A9es'= ),3) ); =20 $sa=3D(isset ($_REQUEST['sa']))?$_REQUEST['sa']:-1; @@ -66,8 +64,7 @@ echo '
'; echo ShowItem($array,'H','mtitle','mtitle',$def); echo '
'; -$href=3Dbasename($_SERVER['PHP_SELF']); - +$href=3Dbasename($_SERVER['PHP_SELF'])."?$ac&$str_dossier"; //---------------------------------------------------------------------- // Encode a new invoice // empty form for encoding @@ -76,7 +73,7 @@ { // Check privilege if ( isset($_REQUEST['p_jrn'])) - if ( $User->check_jrn($_REQUEST['p_jrn']) !=3D 'W' ) + if ( $g_user->check_jrn($_REQUEST['p_jrn']) !=3D 'W' ) { NoAccess(); exit -1; @@ -105,7 +102,7 @@ echo HtmlInput::hidden('p_action','ach'); echo dossier::hidden(); echo $Ledger->confirm($_POST ); - + echo HtmlInput::hidden('ac',$_REQUEST['ac']); $chk=3Dnew ICheckBox(); $chk->selected=3Dfalse; echo '
'; @@ -150,7 +147,7 @@ =20 =20 /* Save the predefined operation */ - if ( isset($_POST['opd_save']) && $User->check_action(PARPRE= DE)=3D=3D1) + if ( isset($_POST['opd_save']) && $g_user->check_action(PARP= REDE)=3D=3D1) { $opd=3Dnew Pre_op_ach($cn); $opd->get_post(); @@ -270,7 +267,7 @@ echo '
'; // Check privilege if ( isset($_REQUEST['p_jrn']) && - $User->check_jrn($_REQUEST['p_jrn']) =3D=3D 'X') + $g_user->check_jrn($_REQUEST['p_jrn']) =3D=3D 'X') { =20 NoAccess(); @@ -296,7 +293,7 @@ /* by default we should the default period */ if ( ! isset($p_array['date_start'])) { - $period=3D$User->get_periode(); + $period=3D$g_user->get_periode(); $per=3Dnew Periode($cn,$period); list($date_start,$date_end)=3D$per->get_date_limit(); $p_array['date_start']=3D$date_start; @@ -358,7 +355,7 @@ echo '
'; // Check privilege if ( isset($_REQUEST['p_jrn']) && - $User->check_jrn($_REQUEST['p_jrn']) =3D=3D 'X') + $g_user->check_jrn($_REQUEST['p_jrn']) =3D=3D 'X') { NoAccess(); exit -1; Modified: phpcompta/trunk/include/compta_fin.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/compta_fin.inc.php 2011-10-28 20:20:43 UTC (r= ev 4250) +++ phpcompta/trunk/include/compta_fin.inc.php 2011-10-28 20:59:25 UTC (r= ev 4251) @@ -27,17 +27,15 @@ require_once('class_ipopup.php'); =20 $gDossier=3Ddossier::id(); -$p_action=3D(isset ($_REQUEST['p_action']))?$_REQUEST['p_action']:''; =20 =20 $cn=3Dnew Database(dossier::id()); -$menu_action=3D"?p_action=3Dfin&".dossier::get(); +$menu_action=3D"?ledger_type=3Dfin&ac=3D".$_REQUEST['ac']."&".dossier::g= et(); $menu=3Darray( array($menu_action.'&sa=3Dn',_('Nouvel extrait'),_('Encodage d= \'un nouvel extrait'),1), array($menu_action.'&sa=3Dl',_('Liste'),_('Liste op=C3=A9ratio= n bancaire'),2), array($menu_action.'&sa=3Ds',_('Solde'),_('Solde des comptes')= ,3), - array($menu_action.'&sa=3Dr',_('Rapprochements banquaires'),_(= 'Rapprochements banquaires'),4), - array('?p_action=3Dimpress&type=3Djrn&'.dossier::get(),_('Impr= ession'),_('Impression')) + array($menu_action.'&sa=3Dr',_('Rapprochements banquaires'),_(= 'Rapprochements banquaires'),4) ); $sa=3D(isset($_REQUEST['sa']))?$_REQUEST['sa']:-1; =20 @@ -71,8 +69,6 @@ if ( $def =3D=3D 1 ) { =20 - $href=3Dbasename($_SERVER['PHP_SELF']); - if ( isset($_REQUEST['p_jrn'])) $Ledger->id=3D$_REQUEST['p_jrn']; else @@ -106,7 +102,7 @@ { echo '
'; echo '
'; - echo HtmlInput::hidden('p_action','fin'); + echo HtmlInput::hidden('ac',$_REQUEST['ac']); echo $Ledger->confirm($_POST); echo HtmlInput::submit('confirm',_('Confirmer')); echo HtmlInput::submit('correct',_('Corriger')); @@ -139,7 +135,7 @@ echo $a; echo '
'; echo '
'; - echo HtmlInput::button_anchor(_('Nouvel extrait'),$href.'?p_= action=3Dfin&sa=3Dn&'.dossier::get()); + echo HtmlInput::button_anchor(_('Nouvel extrait'),$href.'?le= dger_type=3Dfin&sa=3Dn&'.dossier::get()."&ac=3D".$_REQUEST['ac']); echo '
'; exit(); } @@ -158,8 +154,9 @@ =20 =20 echo ''; - echo HtmlInput::hidden('p_action','fin'); + echo HtmlInput::hidden('ledger_type','fin'); echo HtmlInput::hidden('sa','n'); + echo HtmlInput::hidden('ac',$_REQUEST['ac']); $array=3D( isset($correct))?$_POST:null; // show select ledger echo $Ledger->input($array); @@ -207,7 +204,6 @@ $bar=3Djrn_navigation_bar($offset,$max_line,$step,$page); =20 echo HtmlInput::hidden("sa","lnp"); - echo HtmlInput::hidden("p_action","ach"); echo dossier::hidden(); echo $bar; list($count,$html)=3D $Ledger->list_operation($sql,$offset); @@ -216,7 +212,7 @@ /* * Export to csv */ - $r=3DHtmlInput::get_to_hidden(array('l','date_start','date_end','des= c','amount_min','amount_max','qcode','accounting','unpaid','gDossier','le= dger_type','p_action')); + $r=3DHtmlInput::get_to_hidden(array('l','ac','date_start','date_end'= ,'desc','amount_min','amount_max','qcode','accounting','unpaid','gDossier= ','ledger_type','p_action')); if (isset($_GET['r_jrn'])) { foreach ($_GET['r_jrn'] as $k=3D>$v) $r.=3DHtmlInput::hidden('r_jrn['.$k.']',$v); @@ -352,7 +348,7 @@ //------------------------- echo '
'; echo ''; - echo HtmlInput::get_to_hidden(array('gDossier','p_action','sa')); + echo HtmlInput::get_to_hidden(array('gDossier','ledger_type','ac','s= a')); $wLedger=3D$Ledger->select_ledger('FIN',3); if ($wLedger =3D=3D null ) exit ('Pas de journal disponible'); =20 Modified: phpcompta/trunk/include/compta_ven.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/compta_ven.inc.php 2011-10-28 20:20:43 UTC (r= ev 4250) +++ phpcompta/trunk/include/compta_ven.inc.php 2011-10-28 20:59:25 UTC (r= ev 4251) @@ -35,12 +35,11 @@ $cn=3Dnew Database(dossier::id()); //menu =3D show a list of ledger $str_dossier=3Ddossier::get(); +$ac=3D"ac=3D".$_REQUEST['ac']; $array=3Darray( - array('?p_action=3Dven&sa=3Dn&'.$str_dossier,_('Nouvelle vent= e'),_('Nouvelle vente'),1), - array('?p_action=3Dven&sa=3Dl&'.$str_dossier,_('Liste ventes'= ),_('Liste des ventes'),2), - array('?p_action=3Dven&sa=3Dlnp&'.$str_dossier,_('Liste vente= non pay=C3=A9es'),_('Liste des ventes non pay=C3=A9es'),3), - array('commercial.php?p_action=3Dclient&'.$str_dossier,_('Cli= ents'),_('Clients')), - array('?p_action=3Dimpress&type=3Djrn&'.$str_dossier,_('Impre= ssion'),_('Impression')) + array('?ledger_type=3Dven&sa=3Dn&'.$str_dossier."&$ac",_('Nou= velle vente'),_('Nouvelle vente'),1), + array('?ledger_type=3Dven&sa=3Dl&'.$str_dossier."&$ac",_('Lis= te ventes'),_('Liste des ventes'),2), + array('?ledger_type=3Dven&sa=3Dlnp&'.$str_dossier."&$ac",_('L= iste vente non pay=C3=A9es'),_('Liste des ventes non pay=C3=A9es'),3) ); =20 $sa=3D(isset ($_REQUEST['sa']))?$_REQUEST['sa']:-1; @@ -66,7 +65,7 @@ echo '
'; echo ShowItem($array,'H','mtitle','mtitle',$def); echo '
'; -$href=3Dbasename($_SERVER['PHP_SELF']); +$href=3Dbasename($_SERVER['PHP_SELF'])."?$ac&$str_dossier"; =20 =20 //---------------------------------------------------------------------- @@ -79,7 +78,7 @@ =20 // Check privilege if ( isset($_REQUEST['p_jrn']) && - $User->check_jrn($_REQUEST['p_jrn']) !=3D 'W' ) + $g_user->check_jrn($_REQUEST['p_jrn']) !=3D 'W' ) { =20 NoAccess(); @@ -120,6 +119,7 @@ echo "Nom du mod=C3=A8le ".$opd_name->input(); echo '
'; echo '
'; + echo HtmlInput::hidden('ac',$_REQUEST['ac']); echo HtmlInput::submit("record",_("Enregistrement"),'onClick= =3D"return verify_ca(\'\');"'); echo HtmlInput::submit('correct',_("Corriger")); echo ''; @@ -135,7 +135,7 @@ if ( isset($_POST['record']) ) { // Check privilege - if ( $User->check_jrn($_REQUEST['p_jrn']) !=3D 'W' ) + if ( $g_user->check_jrn($_REQUEST['p_jrn']) !=3D 'W' ) { =20 NoAccess(); @@ -243,7 +243,8 @@ } else { - echo HtmlInput::hidden("p_action","ven"); + echo HtmlInput::hidden("ledger_type","VEN"); + echo HtmlInput::hidden("ac",$_REQUEST['ac']); echo HtmlInput::hidden("sa","p"); echo $Ledger->input($array); echo '
'; @@ -263,6 +264,7 @@ echo '
'; echo HtmlInput::hidden("sa","p"); echo HtmlInput::hidden("p_action","ven"); + echo dossier::hidden(); echo HtmlInput::hidden('p_jrn_predef',$Ledger->id); $op=3Dnew Pre_op_ven($cn); @@ -289,7 +291,7 @@ echo '
'; // Check privilege if ( isset($_REQUEST['p_jrn']) && - $User->check_jrn($_REQUEST['p_jrn']) =3D=3D 'X') + $g_user->check_jrn($_REQUEST['p_jrn']) =3D=3D 'X') { =20 NoAccess(); @@ -315,7 +317,7 @@ /* by default we should the default period */ if ( ! isset($p_array['date_start'])) { - $period=3D$User->get_periode(); + $period=3D$g_user->get_periode(); $per=3Dnew Periode($cn,$period); list($date_start,$date_end)=3D$per->get_date_limit(); $p_array['date_start']=3D$date_start; @@ -336,6 +338,7 @@ echo HtmlInput::hidden("sa","l"); echo HtmlInput::hidden("p_action","ven"); echo dossier::hidden(); + echo HtmlInput::hidden("ac",$_REQUEST['ac']); echo $bar; list($count,$html)=3D $Ledger->list_operation($sql,$offset,1); echo $html; @@ -378,7 +381,7 @@ echo '
'; // Check privilege if ( isset($_REQUEST['p_jrn']) && - $User->check_jrn($_REQUEST['p_jrn']) =3D=3D 'X') + $g_user->check_jrn($_REQUEST['p_jrn']) =3D=3D 'X') { NoAccess(); exit -1; Copied: phpcompta/trunk/include/dashboard.inc.php (from rev 4249, phpcomp= ta/branches/rel600-dynamic-menu/include/dashboard.inc.php) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/dashboard.inc.php (re= v 0) +++ phpcompta/trunk/include/dashboard.inc.php 2011-10-28 20:59:25 UTC (re= v 4251) @@ -0,0 +1,39 @@ +'; +global $g_user; +/* others report */ +$cal=3Dnew Calendar(); +$cal->get_preference(); +$Ledger=3Dnew Acc_Ledger($cn,0); +$last_ledger=3Darray(); +if ( $g_user->check_action(GESTION)=3D=3D1) + { + $Operation=3Dnew Action($cn); + $last_ledger=3D$Ledger->get_last(10); + $last_operation=3D$Operation->get_last(10); + } +else + { + $last_operation=3Darray(); + } +ob_start(); +require_once('template/dashboard.php'); +$ret=3Dob_get_contents(); +ob_end_clean(); +echo $ret; + +echo '
'; +?> Modified: phpcompta/trunk/include/document_modele.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/document_modele.inc.php 2011-10-28 20:20:43 U= TC (rev 4250) +++ phpcompta/trunk/include/document_modele.inc.php 2011-10-28 20:59:25 U= TC (rev 4251) @@ -78,7 +78,7 @@ //----------------------------------------------------- echo $doc->myList(); echo '
'; -echo $doc->form('parametre.php?p_action=3Ddocument'); +echo $doc->form(''); echo '
'; =20 ?> \ No newline at end of file Modified: phpcompta/trunk/include/fiche.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/fiche.inc.php 2011-10-28 20:20:43 UTC (rev 42= 50) +++ phpcompta/trunk/include/fiche.inc.php 2011-10-28 20:59:25 UTC (rev 42= 51) @@ -32,17 +32,17 @@ echo IPoste::ipopup('ipop_account'); echo ICard::ipopup('ipop_card'); =20 -$gDossier=3Ddossier::id(); $str_dossier=3Ddossier::get(); +global $g_user,$cn; =20 $pop_tva=3Dnew IPopup('popup_tva'); $pop_tva->title=3D_('Choix TVA'); $pop_tva->value=3D''; echo $pop_tva->input(); =20 -$cn=3Dnew Database($gDossier); + // Security check -$write=3D$User->check_action(FICADD); +$write=3D$g_user->check_action(FICADD); if ($write =3D=3D 0 ) { /* Cannot Access */ @@ -53,11 +53,14 @@ { echo ''; echo dossier::hidden(); + echo HtmlInput::hidden('ac',$_REQUEST['ac']); $w=3Dnew IText(); $search_text=3D(isset($_REQUEST['search_text']))?$_REQUEST['search_t= ext']:""; $h=3Dnew IHidden(); echo $h->input('p_action','fiche'); echo $h->input('action','search'); + echo $h->input('ac',$_REQUEST['ac']); + echo _("Recherche :").$w->input('search_text',$search_text); echo HtmlInput::submit('submit',_('Rechercher')); echo ''; @@ -90,8 +93,10 @@ =20 /* show the values label class_base and create account */ $r.=3D'
'; + $r.=3D HtmlInput::hidden('ac',$_REQUEST['ac']); $r.=3Ddossier::hidden(); $r.=3DHtmlInput::hidden("fd_id",$p_fiche_def->id); + $r.=3DHtmlInput::hidden("ac",$_REQUEST['ac']); $r.=3DHtmlInput::hidden("p_action","fiche"); $r.=3D $p_fiche_def->input_base(); $r.=3D'
'; @@ -101,9 +106,11 @@ /* attributes */ $r.=3D'
D=C3=A9tails'; =20 - $r.=3D ''; + $r.=3D ''; $r.=3Ddossier::hidden(); + $r.=3D HtmlInput::hidden('ac',$_REQUEST['ac']); $r.=3DHtmlInput::hidden("fd_id",$p_fiche_def->id); + $r.=3DHtmlInput::hidden("ac",$_REQUEST['ac']); $r.=3D $p_fiche_def->DisplayAttribut("remove"); $r.=3D HtmlInput::submit('add_line',_('Ajoutez cet =C3=A9l=C3=A9ment= ')); $r.=3D HtmlInput::submit("save_line",_("Sauvez")); @@ -126,7 +133,7 @@ // in the database if ( isset($_POST['add_modele']) ) { - $User->can_request(FICCAT); + $g_user->can_request(FICCAT); // insert the model of card in database $fiche_def=3Dnew Fiche_Def($cn); $fiche_def->Add($_POST); @@ -135,7 +142,7 @@ =20 if ( isset ($_POST['remove_cat'] ) ) { - $User->can_request(FICCAT); + $g_user->can_request(FICCAT); =20 $fd_id=3Dnew Fiche_Def($cn,$_POST['fd_id']); $remains=3D$fd_id->remove(); @@ -147,7 +154,7 @@ // Add a line in the card model if ( isset ($_POST["add_line"]) ) { - $User->can_request(FIC); + $g_user->can_request(FIC); =20 $r=3D '
'; if ( $write =3D=3D0) @@ -170,7 +177,7 @@ =20 if ( isset($_POST['save_line'])) { - $User->can_request(FICCAT); + $g_user->can_request(FICCAT); $fiche_def=3Dnew Fiche_Def($cn,$_REQUEST['fd_id']); $fiche_def->save_order($_POST); $r=3D '
'; @@ -190,7 +197,7 @@ // Remove lines from a card model if ( isset ($_POST['remove_line']) ) { - $User->can_request(FICCAT); + $g_user->can_request(FICCAT); $r=3D '
'; if ( $write =3D=3D0) $r.=3D "

Pas d'acc=C3=A8s

"; @@ -213,7 +220,7 @@ // Change the name of the card model if ( isset ($_POST["change_name"] ) ) { - $User->can_request(FICCAT); + $g_user->can_request(FICCAT); $r=3D '
'; if ( $write =3D=3D0) $r.=3D "

"._("Pas d'acc=C3=A8s")."

"; @@ -224,12 +231,12 @@ } $r.=3D '
'; $recherche=3Dfalse; - ShowMenuFiche($gDossier); + ShowMenuFiche(Dossier::id()); echo $r; exit(); } =20 -ShowMenuFiche($gDossier); +ShowMenuFiche(Dossier::id()); echo $r; =20 //----------------------------------------------------------------------= -------- @@ -244,7 +251,7 @@ && ! isset ($_POST['move']) && ! isset ($_POST['delete'])) { - $User->can_request(FICADD); + $g_user->can_request(FICADD); =20 echo '
'; $fiche_def=3Dnew Fiche_Def($cn,$_GET['fiche']); @@ -260,7 +267,7 @@ { echo '
'; $t=3Dfalse; - if ( $User->check_action(FICADD)=3D=3D0) + if ( $g_user->check_action(FICADD)=3D=3D0) { echo '

Vos changements ne seront pas sauv= =C3=A9s

'; $t=3Dtrue; @@ -291,6 +298,7 @@ echo ''; echo dossier::hidden(); echo $fiche->Display($t); + echo HtmlInput::hidden('ac',$_REQUEST['ac']); echo HtmlInput::hidden("f_id",$_GET['fiche_id']); if ( $write !=3D 0 ) { @@ -304,7 +312,8 @@ echo $iselect->input(); } $str=3D""; - echo HtmlInput::button_anchor(_('Retour'),'?p_action=3Dfiche&act= ion=3Dvue&'.$str_dossier.'&fiche=3D'.$fiche->fiche_def.$str); + echo HtmlInput::button_anchor(_('Retour'),'?p_action=3Dfiche&act= ion=3Dvue&'.$str_dossier.'&fiche=3D'.$fiche->fiche_def.$str. + "&ac=3D".$_REQUEST['ac']); =20 if ( $write !=3D 0 ) echo ''; echo '
'; @@ -315,9 +324,10 @@ // the property of the card model if ($action =3D=3D "add_modele" ) { - $User->can_request(FICCAT); + $g_user->can_request(FICCAT); echo '
'; echo '
'; + echo HtmlInput::hidden('ac',$_REQUEST['ac']); $oFiche_Def=3Dnew Fiche_Def($cn); echo HtmlInput::hidden("p_action","fiche"); echo dossier::hidden(); @@ -332,7 +342,7 @@ // Modify a card Model if ($action =3D=3D "modifier" ) { - $User->can_request(FICCAT); + $g_user->can_request(FICCAT); echo '
'; $fiche_def=3Dnew Fiche_Def($cn,$_GET['fiche']); =20 @@ -361,7 +371,7 @@ { $fiche=3Dnew Fiche($cn,$f_id['f_id']); echo ''. + '&fiche=3D'.$f_id['fd_id']."&ac=3D".$_REQUEST['ac'].'">'= . $fiche->getName().''; } } @@ -380,7 +390,7 @@ // Display a blank card from the selected category if ( isset ($_POST["fiche"]) && isset ($_POST["add"] ) ) { - $User->can_request(FICADD); + $g_user->can_request(FICADD); =20 echo '
'; if ( $write =3D=3D0) @@ -395,6 +405,7 @@ =20 echo ''; echo dossier::hidden(); + echo HtmlInput::hidden('ac',$_REQUEST['ac']); echo $fiche->blank($_POST['fiche']); echo HtmlInput::submit("add_fiche","Ajout"); echo HtmlInput::button_anchor(_('Annuler'),$url.'&fiche=3D'.$_PO= ST['fiche'].'&'.$str_dossier); @@ -410,7 +421,7 @@ // delete a card if (isset($_POST['delete']) ) { - $User->can_request(FIC); + $g_user->can_request(FIC); ShowRecherche(); echo '
'; if ( $write =3D=3D0) @@ -430,7 +441,7 @@ // Add the data (attribute) of the card if ( isset ($_POST["add_fiche"]) ) { - $User->can_request(FICADD); + $g_user->can_request(FICADD); if ( $write =3D=3D0) { echo '
'; @@ -454,7 +465,7 @@ // Update a card if ( isset ($_POST["update_fiche"]) ) { - $User->can_request(FIC); + $g_user->can_request(FIC); echo '
'; if ( $write =3D=3D0) echo "

Pas d'acc=C3=A8s

"; Modified: phpcompta/trunk/include/fiche_def.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/fiche_def.inc.php 2011-10-28 20:20:43 UTC (re= v 4250) +++ phpcompta/trunk/include/fiche_def.inc.php 2011-10-28 20:59:25 UTC (re= v 4251) @@ -50,8 +50,8 @@ $w=3Dnew 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 ""; echo ""; echo ''; @@ -77,8 +77,8 @@ echo $mod->Input(); echo ""; $w=3Dnew 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 ''; Modified: phpcompta/trunk/include/forecast.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/forecast.inc.php 2011-10-28 20:20:43 UTC (rev= 4250) +++ phpcompta/trunk/include/forecast.inc.php 2011-10-28 20:59:25 UTC (rev= 4251) @@ -1,4 +1,5 @@ delete(); } /* * Cloning */ -if (isset ($_REQUEST ['clone'])) - { +if (isset($_REQUEST ['clone'])) +{ echo "

cloning

"; /* * We need to clone the forecast */ - $anti=3Dnew Forecast($cn,$_REQUEST ['f_id']); + $anti =3D new Forecast($cn, $_REQUEST ['f_id']); $anti->object_clone(); - - } -/********************************************************************** +} +/* * *******************************************************************= * * Save the modification mod_cat_save * * - **********************************************************************/ -if ( isset($_POST['mod_cat_save'])) - { - /* - * We save the forecast - */ - $anti=3Dnew Forecast($cn,$_POST['f_id']); - try - { - $cn->start(); - /* Save forecast */ - $anti->set_parameter('name',$_POST['an_name']); - $anti->set_parameter('start_date',$_POST['start_date']); - $anti->set_parameter('end_date',$_POST['end_date']); + * ******************************************************************** = */ +if (isset($_POST['mod_cat_save'])) +{ + /* + * We save the forecast + */ + $anti =3D new Forecast($cn, $_POST['f_id']); + try + { + $cn->start(); + /* Save forecast */ + $anti->set_parameter('name', $_POST['an_name']); + $anti->set_parameter('start_date', $_POST['start_date']); + $anti->set_parameter('end_date', $_POST['end_date']); =20 - $anti->save(); + $anti->save(); =20 - /* add new category */ - for ($i=3D0;$iset_parameter('order',$_POST['fc_order_new'.$i]); - $c->set_parameter('desc',$_POST['fr_cat_new'.$i]); - $c->set_parameter('forecast',$_POST['f_id']); - $c->save(); - } - } - } + /* add new category */ + for ($i =3D 0; $i < MAX_CAT; $i++) + { + if (isset($_POST['fr_cat_new' . $i])) + { + if (strlen(trim($_POST['fr_cat_new' . $i])) !=3D 0) + { + $c =3D new Forecast_Cat($cn); + $c->set_parameter('order', $_POST['fc_order_new' . $i]); + $c->set_parameter('desc', $_POST['fr_cat_new' . $i]); + $c->set_parameter('forecast', $_POST['f_id']); + $c->save(); + } + } + } =20 - /* update existing cat */ - foreach ($_POST as $key=3D>$value) - { - $var=3Dsscanf($key,'fr_cat%d'); - $idx=3Dsprintf("fr_cat%d",$var[0]); - if (isset($_POST[$idx])) - { - $fc=3Dnew Forecast_Cat($cn,$var[0]); - if (strlen(trim($_POST[$idx]))=3D=3D0) - { - $fc->delete(); - } - else - { - $fc->set_parameter('order',$_POST['fc_order'.$var[0]]); - $fc->set_parameter('desc',$_POST['fr_cat'.$var[0]]); - $fc->set_parameter('forecast',$_POST['f_id']); - $fc->save(); - } + /* update existing cat */ + foreach ($_POST as $key =3D> $value) + { + $var =3D sscanf($key, 'fr_cat%d'); + $idx =3D sprintf("fr_cat%d", $var[0]); + if (isset($_POST[$idx])) + { + $fc =3D new Forecast_Cat($cn, $var[0]); + if (strlen(trim($_POST[$idx])) =3D=3D 0) + { + $fc->delete(); + } + else + { + $fc->set_parameter('order', $_POST['fc_order' . $var[0]]); + $fc->set_parameter('desc', $_POST['fr_cat' . $var[0]]); + $fc->set_parameter('forecast', $_POST['f_id']); + $fc->save(); + } + } + } =20 - } - } - - $cn->commit(); - } - catch (Exception $e) - { - alert($e->getMessage()); - $cn->rollback(); - - } - $sa=3D'vw'; - =20 - } -/********************************************************************** + $cn->commit(); + } + catch (Exception $e) + { + alert($e->getMessage()); + $cn->rollback(); + } + $sa =3D 'vw'; +} +/* * *******************************************************************= * * Save first the data for new * * - **********************************************************************/ -if ( $sa =3D=3D 'new' || isset ($_POST['step3'])) + * ******************************************************************** = */ +if ($sa =3D=3D 'new' || isset($_POST['step3'])) { - $correct=3D0; + $correct =3D 0; if (isset($_POST['step3'])) { - /*save all the items */ - try - { - $cn->start(); - for ($i=3D0;$i<$_POST['nbrow'];$i++) - { + /* save all the items */ + try + { + $cn->start(); + for ($i =3D 0; $i < $_POST['nbrow']; $i++) + { =20 - // Delete if needed - if ( isset($_POST['fi_id'.$i])) - { - if (strlen(trim($_POST['an_cat_acc'.$i]))=3D=3D0 &&s= trlen(trim($_POST['an_qc'.$i]))=3D=3D 0) - { - $e=3Dnew Forecast_item($cn); - $e->set_parameter("id",$_POST['fi_id'.$i]); - $e->delete(); - } - } + // Delete if needed + if (isset($_POST['fi_id' . $i])) + { + if (strlen(trim($_POST['an_cat_acc' . $i])) =3D=3D 0 && strlen(tri= m($_POST['an_qc' . $i])) =3D=3D 0) + { + $e =3D new Forecast_item($cn); + $e->set_parameter("id", $_POST['fi_id' . $i]); + $e->delete(); + } + } =20 - if (strlen(trim($_POST['an_cat_acc'.$i]))!=3D0 || strlen= (trim($_POST['an_qc'.$i]))!=3D 0) - { - /* we save only if there is something */ - $e=3Dnew Forecast_item($cn); - if ( isset($_POST['fi_id'.$i])) - { - $e->set_parameter("id",$_POST['fi_id'.$i]); - } - $e->set_parameter('text',$_POST['an_label'.$i]); - $e->set_parameter('amount',$_POST['an_cat_amount'.$i= ]); - $e->set_parameter('debit',$_POST['an_deb'.$i]); - $e->set_parameter('cat_id',$_POST['an_cat'.$i]); - $e->set_parameter('account',$_POST['an_cat_acc'.$i])= ; - $e->set_parameter('periode',$_POST['month'.$i]); - $f=3Dnew Fiche($cn); - if ( $f->get_by_qcode($_POST['an_qc'.$i],false) =3D=3D= 0 ) - $e->set_parameter('card',$f->id); - else - $e->set_parameter('card',null); - $e->set_parameter('order',$i); - $e->save(); - } - } - $cn->commit(); - $sa=3D'vw'; // to avoid to restart the add of new anticipati= on - } - catch (Exception $e) - { - $cn->rollback(); - alert($e->getMessage()); - $correct=3D1; - } - + if (strlen(trim($_POST['an_cat_acc' . $i])) !=3D 0 || strlen(trim($_PO= ST['an_qc' . $i])) !=3D 0) + { + /* we save only if there is something */ + $e =3D new Forecast_item($cn); + if (isset($_POST['fi_id' . $i])) + { + $e->set_parameter("id", $_POST['fi_id' . $i]); + } + $e->set_parameter('text', $_POST['an_label' . $i]); + $e->set_parameter('amount', $_POST['an_cat_amount' . $i]); + $e->set_parameter('debit', $_POST['an_deb' . $i]); + $e->set_parameter('cat_id', $_POST['an_cat' . $i]); + $e->set_parameter('account', $_POST['an_cat_acc' . $i]); + $e->set_parameter('periode', $_POST['month' . $i]); + $f =3D new Fiche($cn); + if ($f->get_by_qcode($_POST['an_qc' . $i], false) =3D=3D 0) + $e->set_parameter('card', $f->id); + else + $e->set_parameter('card', null); + $e->set_parameter('order', $i); + $e->save(); + } + } + $cn->commit(); + $sa =3D 'vw'; // to avoid to restart the add of new anticipation + } + catch (Exception $e) + { + $cn->rollback(); + alert($e->getMessage()); + $correct =3D 1; + } } /* Second step : we save the name and category * and propose the items we add the item */ - if ($correct=3D=3D2 || isset ($_POST['step2'])) + if ($correct =3D=3D 2 || isset($_POST['step2'])) { - try - { - $cn->start(); - /* Save forecast */ - $a=3Dnew Forecast($cn); - $a->set_parameter('name',$_POST['an_name']); - $a->set_parameter('start_date',$_POST['start_date']); - $a->set_parameter('end_date',$_POST['end_date']); + try + { + $cn->start(); + /* Save forecast */ + $a =3D new Forecast($cn); + $a->set_parameter('name', $_POST['an_name']); + $a->set_parameter('start_date', $_POST['start_date']); + $a->set_parameter('end_date', $_POST['end_date']); =20 =20 - $a->save(); - $id=3D$a->get_parameter("id"); - /* save cat */ - for ($i=3D0;$iset_parameter('order',$_POST['fr_order'.$i]); - $c->set_parameter('desc',$_POST['fr_cat'.$i]); - $c->set_parameter('forecast',$id); - $c->save(); - } - } - $cn->commit(); - } - catch (Exception $e) - { - alert($e->getMessage()); - $correct=3D1; - unset($_POST['step2']); - $cn->rollback(); - } - + $a->save(); + $id =3D $a->get_parameter("id"); + /* save cat */ + for ($i =3D 0; $i < MAX_CAT; $i++) + { + if (strlen(trim($_POST['fr_cat' . $i])) !=3D 0) + { + $c =3D new Forecast_Cat($cn); + $c->set_parameter('order', $_POST['fr_order' . $i]); + $c->set_parameter('desc', $_POST['fr_cat' . $i]); + $c->set_parameter('forecast', $id); + $c->save(); + } + } + $cn->commit(); + } + catch (Exception $e) + { + alert($e->getMessage()); + $correct =3D 1; + unset($_POST['step2']); + $cn->rollback(); + } } - } -/********************************************************************** +/* * *******************************************************************= * * Display menu * * - **********************************************************************/ + * ******************************************************************** = */ // display button add and list of forecast to display -$aForecast=3DForecast::load_all($cn); -$menu=3Darray(); -$get_dossier=3Ddossier::get(); +$aForecast =3D Forecast::load_all($cn); +$menu =3D array(); +$get_dossier =3D dossier::get(); =20 =20 -for ($i =3D 0;$i'; -echo ShowItem($menu,'H','mtitle','mtitle',$def); +echo ShowItem($menu, 'H', 'mtitle', 'mtitle', $def); echo '
'; -/********************************************************************** +/* * *******************************************************************= * * Ask for a new anticipation (forecast) * * - **********************************************************************/ -if ( $sa =3D=3D 'new') + * ******************************************************************** = */ +if ($sa =3D=3D 'new') { /* Second step : we save the name and category * and propose the items we add the item */ - if ($correct=3D=3D2 || isset ($_POST['step2'])) + if ($correct =3D=3D 2 || isset($_POST['step2'])) { - /* Propose a form for the items - */ - $anticip=3Dnew Anticipation($cn,$a->get_parameter("id")); - echo '
'; - echo ICard::ipopup('ipopcard'); - echo IPoste::ipopup('ipop_account'); - $search_card=3Dnew IPopup('ipop_card'); - $search_card->title=3D_('Recherche de fiche'); - $search_card->value=3D''; - echo $search_card->input(); + /* Propose a form for the items + */ + $anticip =3D new Anticipation($cn, $a->get_parameter("id")); + echo '
'; + echo ICard::ipopup('ipopcard'); + echo IPoste::ipopup('ipop_account'); + $search_card =3D new IPopup('ipop_card'); + $search_card->title =3D _('Recherche de fiche'); + $search_card->value =3D ''; + echo $search_card->input(); =20 - echo '
'; - echo dossier::hidden(); - echo HtmlInput::hidden('sa','new'); - echo HtmlInput::hidden('p_action','prev'); - echo HtmlInput::hidden('f_id',$id); - echo $anticip->form_item(); - echo HtmlInput::submit('step3',_('Sauver')); - echo '
'; - echo '
'; - + echo '
'; + echo dossier::hidden(); + echo HtmlInput::hidden('sa', 'new'); + echo HtmlInput::hidden('ac', $_REQUEST['ac']); + echo HtmlInput::hidden('f_id', $id); + echo $anticip->form_item(); + echo HtmlInput::submit('step3', _('Sauver')); + echo '
'; + echo '
'; } /* First step, the name and the category */ - if ( ! isset ($_POST['step2']) || $correct=3D=3D1) + if (!isset($_POST['step2']) || $correct =3D=3D 1) { - $anc=3Dnew Anticipation($cn); - echo '
'; - /* display a blank form for name and category */ - echo '
'; - echo dossier::hidden(); - echo HtmlInput::hidden('sa','new'); - echo HtmlInput::hidden('p_action','prev'); - echo $anc->form_cat(); - echo HtmlInput::submit('step2',_('Sauver')); - echo '
'; - echo '
'; + $anc =3D new Anticipation($cn); + echo '
'; + /* display a blank form for name and category */ + echo '
'; + echo dossier::hidden(); + echo HtmlInput::hidden('sa', 'new'); + echo HtmlInput::hidden('ac', $_REQUEST['ac']); + echo $anc->form_cat(); + echo HtmlInput::submit('step2', _('Sauver')); + echo '
'; + echo '
'; } - } -/********************************************************************** +/* * *******************************************************************= * * If we request to modify the category or the name * * - **********************************************************************/ -if ( isset($_GET['mod_cat'])) + * ******************************************************************** = */ +if (isset($_GET['mod_cat'])) { - $anc=3Dnew Anticipation($cn,$_GET['f_id']); + $anc =3D new Anticipation($cn, $_GET['f_id']); echo '
'; /* display a blank form for name and category */ echo '
'; echo dossier::hidden(); - echo HtmlInput::hidden('sa','mod'); - echo HtmlInput::hidden('p_action','prev'); + echo HtmlInput::hidden('sa', 'mod'); + echo HtmlInput::hidden('ac', $_REQUEST['ac']); echo $anc->form_cat(); - echo HtmlInput::submit('mod_cat_save',_('Sauver')); + echo HtmlInput::submit('mod_cat_save', _('Sauver')); =20 echo '
'; echo '
'; } -/********************************************************************** +/* * *******************************************************************= * * If we request to modify the items * * - **********************************************************************/ + * ******************************************************************** = */ if (isset($_GET['mod_item'])) { =20 /* Propose a form for the items */ - $anticip=3Dnew Anticipation($cn,$_GET['f_id']); + $anticip =3D new Anticipation($cn, $_GET['f_id']); echo '
'; echo ICard::ipopup('ipopcard'); echo IPoste::ipopup('ipop_account'); - $search_card=3Dnew IPopup('ipop_card'); - $search_card->title=3D_('Recherche de fiche'); - $search_card->value=3D''; + $search_card =3D new IPopup('ipop_card'); + $search_card->title =3D _('Recherche de fiche'); + $search_card->value =3D ''; echo $search_card->input(); =20 echo '
'; echo dossier::hidden(); - echo HtmlInput::hidden('sa','new'); - echo HtmlInput::hidden('p_action','prev'); - echo HtmlInput::hidden('f_id',$_GET['f_id']); + echo HtmlInput::hidden('sa', 'new'); + echo HtmlInput::hidden('ac', $_REQUEST['ac']); + echo HtmlInput::hidden('f_id', $_GET['f_id']); echo $anticip->form_item(); - echo HtmlInput::submit('step3',_('Sauver')); + echo HtmlInput::submit('step3', _('Sauver')); echo '
'; echo '
'; } -/********************************************************************** +/* * *******************************************************************= * * if a forecast is asked we display the result * * - **********************************************************************/ -if ( isset($_REQUEST['f_id']) && $sa=3D=3D"vw") + * ******************************************************************** = */ +if (isset($_REQUEST['f_id']) && $sa =3D=3D "vw") { echo '
'; - $forecast=3Dnew Anticipation($cn); - $forecast->set_parameter("id",$_REQUEST['f_id']); - try { - echo $forecast->display(); - echo '
'; - echo '
'; - echo dossier::hidden(); - echo HtmlInput::hidden('f_id',$_REQUEST['f_id']); - echo HtmlInput::submit('mod_cat',_('Modifier nom ou cat=C3=A9gorie= s')); - echo HtmlInput::submit('mod_item',_('Modifier =C3=A9l=C3=A9ments')= ); - //echo HtmlInput::submit('cvs',_('Export CVS')); - echo HtmlInput::submit('del',_('Effacer'),'onclick=3D"return confi= rm(\''._('Vous confirmez l\\\' effacement').'\')"'); - echo HtmlInput::submit('clone',_('Cloner'),'onclick=3D"return conf= irm(\''._('Vous confirmez le clonage ').'\')"'); - - echo HtmlInput::hidden('p_action','prev'); - echo '
'; - echo '
'; - echo '
'; - exit(); - }=20 - catch (Exception $e)=20 - { - echo "

"._("Erreur : ").$e->getMessage().'

=

'._('Vous devez corriger').'

'; - $anc=3Dnew Anticipation($cn,$_GET['f_id']); + $forecast =3D new Anticipation($cn); + $forecast->set_parameter("id", $_REQUEST['f_id']); + try + { + echo $forecast->display(); + echo '
'; + echo '
'; + echo dossier::hidden(); + echo HtmlInput::hidden('f_id', $_REQUEST['f_id']); + echo HtmlInput::submit('mod_cat', _('Modifier nom ou cat=C3=A9gories'))= ; + echo HtmlInput::submit('mod_item', _('Modifier =C3=A9l=C3=A9ments')); + //echo HtmlInput::submit('cvs',_('Export CVS')); + echo HtmlInput::submit('del', _('Effacer'), 'onclick=3D"return confirm(= \'' . _('Vous confirmez l\\\' effacement') . '\')"'); + echo HtmlInput::submit('clone', _('Cloner'), 'onclick=3D"return confirm= (\'' . _('Vous confirmez le clonage ') . '\')"'); + echo HtmlInput::hidden('ac', $_REQUEST['ac']); + echo '
'; + echo '
'; + echo '
'; + exit(); + } + catch (Exception $e) + { + echo "

" . _("Erreur : ") . $e->getMessage() .= '

' . _('Vous devez corriger') . '

'; + $anc =3D new Anticipation($cn, $_GET['f_id']); echo '
'; /* display a blank form for name and category */ echo '
'; echo dossier::hidden(); - echo HtmlInput::hidden('sa','mod'); - echo HtmlInput::hidden('p_action','prev'); + echo HtmlInput::hidden('sa', 'mod'); + echo HtmlInput::hidden('ac', $_REQUEST['ac']); echo $anc->form_cat(); - echo HtmlInput::submit('mod_cat_save',_('Sauver')); + echo HtmlInput::submit('mod_cat_save', _('Sauver')); echo '
'; - echo '
';=09 - } + echo '
'; + } } - ?> Modified: phpcompta/trunk/include/impress_bilan.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/impress_bilan.inc.php 2011-10-28 20:20:43 UTC= (rev 4250) +++ phpcompta/trunk/include/impress_bilan.inc.php 2011-10-28 20:59:25 UTC= (rev 4251) @@ -25,7 +25,7 @@ * \brief form who call the printing of the bilan in RTF * file included by user_impress * - * some variable are already defined ($cn, $User ...) + * some variable are already defined ($cn, $g_user ...) */ =20 //----------------------------------------------------- @@ -33,6 +33,8 @@ //----------------------------------------------------- require_once('class_database.php'); =20 +global $g_user; + //----------------------------------------------------- // Form //----------------------------------------------------- @@ -40,7 +42,7 @@ $bilan=3Dnew Acc_Bilan($cn); $bilan->get_request_get(); echo '
'; -$exercice=3D(isset($_GET['exercice']))?$_GET['exercice']:$User->get_exer= cice(); +$exercice=3D(isset($_GET['exercice']))?$_GET['exercice']:$g_user->get_ex= ercice(); =20 /* * Let you change the exercice Modified: phpcompta/trunk/include/impress_fiche.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/impress_fiche.inc.php 2011-10-28 20:20:43 UTC= (rev 4250) +++ phpcompta/trunk/include/impress_fiche.inc.php 2011-10-28 20:59:25 UTC= (rev 4251) @@ -27,6 +27,8 @@ =20 $gDossier=3Ddossier::id(); $cn=3Dnew Database($gDossier); +global $g_user; + /** * Show first the form */ @@ -37,7 +39,7 @@ $str_categorie=3D$categorie->input(); =20 /* periode */ -$exercice=3D$User->get_exercice(); +$exercice=3D$g_user->get_exercice(); $iperiode=3Dnew Periode($cn); list ($first,$last)=3D$iperiode->get_limit($exercice); =20 @@ -69,8 +71,7 @@ echo '
'; echo '
'; echo dossier::hidden(); -echo HtmlInput::hidden('p_action',$_GET['p_action']); -echo HtmlInput::hidden('type',$_GET['type']); +echo HtmlInput::hidden('ac',$_GET['ac']); require_once('template/impress_cat_card.php'); echo HtmlInput::submit('cat_display',_('Recherche')); echo '
'; @@ -106,7 +107,7 @@ HtmlInput::submit('bt_csv',"Export CSV"). HtmlInput::hidden('act',"CSV/fiche"). $hid->input("type","fiche"). - $hid->input("p_action","impress"). + $hid->input("ac",$_REQUEST['ac']). $hid->input("fd_id",$_REQUEST['cat']); echo ""; =20 Modified: phpcompta/trunk/include/impress_gl_comptes.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/impress_gl_comptes.inc.php 2011-10-28 20:20:4= 3 UTC (rev 4250) +++ phpcompta/trunk/include/impress_gl_comptes.inc.php 2011-10-28 20:59:2= 5 UTC (rev 4251) @@ -27,28 +27,28 @@ * \brief Print account (html or pdf) * file included from user_impress * - * some variable are already defined $cn, $User ... + * some variable are already defined $cn, $g_user ... * */ //----------------------------------------------------- // Show the jrn and date //----------------------------------------------------- require_once('class_database.php'); - +global $g_user; //----------------------------------------------------- // Form //----------------------------------------------------- echo '
'; =20 echo '
'; -echo HtmlInput::hidden('p_action','impress'); +echo HtmlInput::hidden('ac',$_REQUEST['ac']); echo HtmlInput::hidden('type','gl_comptes'); echo dossier::hidden(); echo ''; =20 $cn=3Dnew Database(dossier::id()); $periode=3Dnew Periode($cn); -$a=3D$periode->get_limit($User->get_exercice()); +$a=3D$periode->get_limit($g_user->get_exercice()); // $a is an array $first_day=3D$a[0]->first_day(); $last_day=3D$a[1]->last_day(); @@ -56,7 +56,7 @@ // filter on period $date_from=3Dnew IDate('from_periode'); $date_to=3Dnew IDate('to_periode'); -$year=3D$User->get_exercice(); +$year=3D$g_user->get_exercice(); $date_from->value=3D(isset($_REQUEST['from_periode'])&& isDate($_REQUEST= ['from_periode'])!=3D0)?$_REQUEST['from_periode']:$first_day; $date_to->value=3D(isset($_REQUEST['to_periode']) && isDate($_REQUEST['t= o_periode']) !=3D0 )?$_REQUEST['to_periode']:$last_day; echo td(_('Depuis').$date_from->input()); @@ -117,7 +117,7 @@ $sql=3D'select pcm_val from tmp_pcmn '; $cond_poste=3D''; =20 - if ($from_poste->value !=3D '')=20 + if ($from_poste->value !=3D '') { $cond_poste =3D ' where '; $cond_poste .=3D' pcm_val >=3D upper (\''.Database::escape_string($fro= m_poste->value).'\')'; @@ -125,7 +125,7 @@ =20 if ( $to_poste->value !=3D '') { - if ( $cond_poste =3D=3D '')=20 + if ( $cond_poste =3D=3D '') { $cond_poste =3D ' where pcm_val <=3D upper (\''.Database::escape_s= tring($to_poste->value).'\')'; } @@ -155,13 +155,13 @@ echo '
'; $l=3D(isset($_REQUEST['letter']))?2:0; $s=3D(isset($_REQUEST['solded']))?1:0; -=09 + foreach ($a_poste as $poste_id ) { $Poste=3Dnew Acc_Account_Ledger ($cn, $poste_id['pcm_val']); $Poste->load(); -=09 =20 + $Poste->get_row_date( $_GET['from_periode'], $_GET['to_periode']= ,$l,$s); if ( empty($Poste->row)) { Modified: phpcompta/trunk/include/impress_jrn.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/impress_jrn.inc.php 2011-10-28 20:20:43 UTC (= rev 4250) +++ phpcompta/trunk/include/impress_jrn.inc.php 2011-10-28 20:59:25 UTC (= rev 4251) @@ -29,18 +29,19 @@ require_once('class_dossier.php'); load_all_script(); $gDossier=3Ddossier::id(); +global $g_user; //----------------------------------------------------- // Show the jrn and date //----------------------------------------------------- require_once('class_database.php'); =20 -if ( $User->Admin() =3D=3D 0 && $User->is_local_admin()=3D=3D0) +if ( $g_user->Admin() =3D=3D 0 && $g_user->is_local_admin()=3D=3D0) { $sql=3D"select jrn_def_id,jrn_def_name from jrn_def join jrn_type on jrn_def_type=3Djrn_type_id join user_sec_jrn on uj_jrn_id=3Djrn_def_id where - uj_login=3D'$User->login' + uj_login=3D'$g_user->login' and uj_priv !=3D'X' "; $ret=3D$cn->make_array($sql); @@ -58,7 +59,7 @@ from jrn_def join jrn_type on jrn_def_type=3Djrn_= type_id join user_sec_jrn on uj_jrn_id=3Djrn_def_id where - uj_login=3D'$User->id' + uj_login=3D'$g_user->id' and uj_priv =3D'X' "); // Pour voir tout les journal ? @@ -70,7 +71,7 @@ } if ( count($ret) < 1 ) NoAccess(); -$exercice=3D(isset($_GET['exercice']))?$_GET['exercice']:$User->get_exer= cice(); +$exercice=3D(isset($_GET['exercice']))?$_GET['exercice']:$g_user->get_ex= ercice(); =20 //----------------------------------------------------- // Form @@ -86,14 +87,14 @@ $wex=3D$ex->select('exercice',$exercice,' onchange=3D"submit(this)"'); echo $wex->input(); echo dossier::hidden(); -echo HtmlInput::get_to_hidden(array('p_action','type')); +echo HtmlInput::get_to_hidden(array('ac','type')); echo ''; echo ''; =20 =20 =20 echo ''.dossier::hidden(); -echo HtmlInput::hidden('p_action','impress'); +echo HtmlInput::get_to_hidden(array('ac','type')); echo HtmlInput::hidden('type','jrn'); echo HtmlInput::get_to_hidden(array('exercice')); echo '
'; @@ -171,22 +172,22 @@ HtmlInput::submit('bt_pdf',"Export PDF"). HtmlInput::hidden('act','PDF/ledger'). $hid->input("type","jrn"). - $hid->input("p_action","impress"). $hid->input("jrn_id",$Jrn->id). $hid->input("from_periode",$_GET['from_periode']). $hid->input("to_periode",$_GET['to_periode']); echo $hid->input("p_simple",$_GET['p_simple']); + echo HtmlInput::get_to_hidden(array('ac','type')); + echo ""; =20 - echo ""; echo '"; =20 echo ""; Modified: phpcompta/trunk/include/impress_poste.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/impress_poste.inc.php 2011-10-28 20:20:43 UTC= (rev 4250) +++ phpcompta/trunk/include/impress_poste.inc.php 2011-10-28 20:59:25 UTC= (rev 4251) @@ -35,6 +35,7 @@ //----------------------------------------------------- require_once('class_database.php'); require_once('class_ipopup.php'); +global $User; =20 echo IPoste::ipopup('ipop_account'); echo ICard::ipopup('ipopcard'); @@ -49,7 +50,7 @@ echo '
'; =20 echo '
'; -echo HtmlInput::hidden('p_action','impress'); +echo HtmlInput::hidden('ac',$_REQUEST['ac']); echo HtmlInput::hidden('type','poste'); echo dossier::hidden(); echo '
'.dossier::hidd= en(). HtmlInput::submit('bt_csv',"Export CSV"). HtmlInput::hidden('act','CSV/ledger'). $hid->input("type","jrn"). - $hid->input("p_action","impress"). $hid->input("jrn_id",$Jrn->id). $hid->input("from_periode",$_GET['from_periode']). $hid->input("to_periode",$_GET['to_periode']); echo $hid->input("p_simple",$_GET['p_simple']); + echo HtmlInput::get_to_hidden(array('ac','type')); echo "
'; @@ -86,7 +87,7 @@ =20 $date_from=3Dnew IDate('from_periode'); $date_to=3Dnew IDate('to_periode'); -$year=3D$User->get_exercice(); +$year=3D$g_user->get_exercice(); $date_from->value=3D(isset($_REQUEST['from_periode']))?$_REQUEST['from_p= eriode']:"01.01.".$year; $date_to->value=3D(isset($_REQUEST['to_periode']))?$_REQUEST['to_periode= ']:"31.12.".$year; echo td(_('Depuis').$date_from->input()); @@ -138,19 +139,18 @@ require_once("class_acc_account_ledger.php"); $go=3D0; // we ask a poste_id - if ( isset($_GET['poste_id']) && strlen(trim($_GET['poste_id'])) !=3D= 0 ) + if ( isset($_GET['poste_id']) && strlen(trim($_GET['poste_id'])) !=3D= 0 ) { - $poste=3D$cn->get_value('select format_account($1)',array($_GET['poste_= id'])); - if ( isset ($_GET['poste_fille']) ) { - $a_poste=3D$cn->get_array("select pcm_val from tmp_pcmn wher= e pcm_val::text like $1||'%' order by pcm_val::text",array($poste)); + $parent=3D$_GET['poste_id']; + $a_poste=3D$cn->get_array("select pcm_val from tmp_pcmn wher= e pcm_val::text like '$parent%' order by pcm_val::text"); $go=3D3; } // Check if the post is numeric and exists - elseif ( $cn->count_sql('select * from tmp_pcmn where pcm_val=3D= $1',array($poste)) !=3D 0 ) + elseif ( $cn->count_sql('select * from tmp_pcmn where pcm_val=3D= $1',array($_GET['poste_id'])) !=3D 0 ) { - $Poste=3Dnew Acc_Account_Ledger($cn,$poste); + $Poste=3Dnew Acc_Account_Ledger($cn,$_GET['poste_id']); $go=3D1; } } Modified: phpcompta/trunk/include/impress_rapport.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/impress_rapport.inc.php 2011-10-28 20:20:43 U= TC (rev 4250) +++ phpcompta/trunk/include/impress_rapport.inc.php 2011-10-28 20:59:25 U= TC (rev 4251) @@ -21,14 +21,14 @@ * \brief print first the report in html and propose to print it in pdf * file included by user_impress * - * some variable are already defined ($cn, $User ...) + * some variable are already defined ($cn, $g_user ...) */ require_once("class_ihidden.php"); require_once("class_iselect.php"); require_once("class_idate.php"); require_once("class_acc_report.php"); require_once('class_exercice.php'); - +global $g_user; //----------------------------------------------------- // If print is asked // First time in html @@ -90,14 +90,14 @@ echo '"; + $hid->input("type","rapport").$hid->input("ac",$_GET['ac'])."= "; =20 echo ' + +
'. dossier::hidden(). HtmlInput::submit('bt_other',"Autre Rapport"). - $hid->input("type","rapport").$hid->input("p_action","impress")."
'. HtmlInput::submit('bt_pdf',"Export PDF"). HtmlInput::hidden('act','PDF/report'). dossier::hidden(). $hid->input("type","rapport"). - $hid->input("p_action","impress"). + $hid->input("ac",$_GET['ac']). $hid->input("form_id",$Form->id); if ( isset($_GET['from_periode'])) echo $hid->input("from_periode",$= _GET['from_periode']); if ( isset($_GET['to_periode'])) echo $hid->input("to_periode",$_GET= ['to_periode']); @@ -115,7 +115,7 @@ HtmlInput::submit('bt_csv',"Export CSV"). dossier::hidden(). $hid->input("type","form"). - $hid->input("p_action","impress"). + $hid->input("ac",$_GET['ac']). $hid->input("form_id",$Form->id); if ( isset($_GET['from_periode'])) echo $hid->input("from_periode",$= _GET['from_periode']); if ( isset($_GET['to_periode'])) echo $hid->input("to_periode",$_GET= ['to_periode']); @@ -174,7 +174,7 @@ // Form //----------------------------------------------------- echo '
'; -$exercice=3D(isset($_GET['exercice']))?$_GET['exercice']:$User->get_exer= cice(); +$exercice=3D(isset($_GET['exercice']))?$_GET['exercice']:$g_user->get_ex= ercice(); =20 /* * Let you change the exercice @@ -186,14 +186,14 @@ $wex=3D$ex->select('exercice',$exercice,' onchange=3D"submit(this)"'); echo $wex->input(); echo dossier::hidden(); -echo HtmlInput::get_to_hidden(array('p_action','type')); +echo HtmlInput::get_to_hidden(array('ac','type')); echo ''; echo ''; =20 =20 echo '
'; $hidden=3Dnew IHidden(); -echo $hidden->input("p_action","impress"); +echo $hidden->input("ac",$_GET['ac']); echo $hidden->input("type","rapport"); echo dossier::hidden(); =20 Modified: phpcompta/trunk/include/impress_rec.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/impress_rec.inc.php 2011-10-28 20:20:43 UTC (= rev 4250) +++ phpcompta/trunk/include/impress_rec.inc.php 2011-10-28 20:59:25 UTC (= rev 4251) @@ -25,12 +25,13 @@ */ require_once ('class_acc_reconciliation.php'); require_once('function_javascript.php'); -echo load_all_script(); +global $g_user; + /** *@file *@todo add the export to PDF */ -$aledger=3D$User->get_ledger('ALL',3); +$aledger=3D$g_user->get_ledger('ALL',3); echo '
'; echo '
'; $rjrn=3D''; @@ -38,13 +39,13 @@ $choice=3D(isset($_GET['choice']))?$_GET['choice']:0; $r_jrn=3D(isset($_GET['r_jrn']))?$_GET['r_jrn']:''; echo ''; -echo dossier::hidden().HtmlInput::hidden('p_action','impress').HtmlInput= ::hidden('type','rec'); +echo dossier::hidden().HtmlInput::hidden('ac',$_GET['ac']).HtmlInput::hi= dden('type','rec'); echo 'Filtre par journal :'.HtmlInput::select_ledger($aledger,$r_jrn ); echo '
'; /* * Limit by date, default current exercice */ -list($start,$end)=3D$User->get_limit_current_exercice(); +list($start,$end)=3D$g_user->get_limit_current_exercice(); $dstart=3Dnew IDate('p_start'); $dstart->value=3D(isset($_REQUEST['p_start']))?$_REQUEST['p_start']:$sta= rt; =20 @@ -105,7 +106,6 @@ echo "Choix invalid"; exit(); } +$gDossier=3DDossier::id(); require_once('template/impress_reconciliation.php'); -exit(); -exit(); exit(); \ No newline at end of file Deleted: phpcompta/trunk/include/letter.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/letter.inc.php 2011-10-28 20:20:43 UTC (rev 4= 250) +++ phpcompta/trunk/include/letter.inc.php 2011-10-28 20:59:25 UTC (rev 4= 251) @@ -1,56 +0,0 @@ -'; -echo ShowItem($array,'H','mtitle','mtitle',$subdef); -echo '
'; -if ($sa =3D=3D 'poste') -{ - require_once('lettering.account.inc.php'); - exit; -} - -if ($sa=3D=3D'qc') -{ - require_once('lettering.card.inc.php'); - exit; -} Modified: phpcompta/trunk/include/lettering.account.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/lettering.account.inc.php 2011-10-28 20:20:43= UTC (rev 4250) +++ phpcompta/trunk/include/lettering.account.inc.php 2011-10-28 20:59:25= UTC (rev 4251) @@ -30,7 +30,7 @@ echo '
'; echo ''; echo dossier::hidden(); -echo HtmlInput::hidden('p_action','let'); +echo HtmlInput::hidden('ac',$_REQUEST['ac']); echo HtmlInput::hidden('sa','poste'); echo ''; =20 @@ -49,7 +49,7 @@ td($poste_span->input()); echo tr($r); // limit of the year -$exercice=3D$User->get_exercice(); +$exercice=3D$g_user->get_exercice(); $periode=3Dnew Periode($cn); list($first_per,$last_per)=3D$periode->get_limit($exercice); =20 Modified: phpcompta/trunk/include/lettering.card.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/lettering.card.inc.php 2011-10-28 20:20:43 UT= C (rev 4250) +++ phpcompta/trunk/include/lettering.card.inc.php 2011-10-28 20:59:25 UT= C (rev 4251) @@ -31,7 +31,7 @@ echo '
'; echo ''; echo dossier::hidden(); -echo HtmlInput::hidden('p_action','let'); +echo HtmlInput::hidden('ac',$_REQUEST['ac']); echo HtmlInput::hidden('sa','qc'); echo HtmlInput::hidden('p_jrn','0'); echo '
'; @@ -52,7 +52,7 @@ td($poste_span->input()); echo tr($r); // limit of the year -$exercice=3D$User->get_exercice(); +$exercice=3D$g_user->get_exercice(); $periode=3Dnew Periode($cn); list($first_per,$last_per)=3D$periode->get_limit($exercice); =20 Modified: phpcompta/trunk/include/lettering.gestion.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/lettering.gestion.inc.php 2011-10-28 20:20:43= UTC (rev 4250) +++ phpcompta/trunk/include/lettering.gestion.inc.php 2011-10-28 20:59:25= UTC (rev 4251) @@ -1,10 +1,11 @@ '; echo '
'; echo ''; echo dossier::hidden(); -echo HtmlInput::hidden('p_action',$_REQUEST['p_action']); +echo HtmlInput::hidden('ac',$_REQUEST['ac']); echo HtmlInput::hidden('sb',$_REQUEST['sb']); echo HtmlInput::hidden('sc',$_REQUEST['sc']); echo HtmlInput::hidden('f_id',$_REQUEST['f_id']); @@ -12,7 +13,7 @@ echo '
'; =20 // limit of the year -$exercice=3D$User->get_exercice(); +$exercice=3D$g_user->get_exercice(); $periode=3Dnew Periode($cn); list($first_per,$last_per)=3D$periode->get_limit($exercice); =20 Modified: phpcompta/trunk/include/opening.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/opening.inc.php 2011-10-28 20:20:43 UTC (rev = 4250) +++ phpcompta/trunk/include/opening.inc.php 2011-10-28 20:59:25 UTC (rev = 4251) @@ -19,7 +19,7 @@ /* $Revision$ */ =20 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr - +require_once 'user_menu.php'; /*!\file * \brief The opening of the exercices. it takes the saldo of the * choosen foolder / exercice and import it as a misc operation in the @@ -48,7 +48,7 @@ exit(); } echo ''; - echo HtmlInput::hidden('p_action','ouv'); + echo HtmlInput::hidden('ac',$_REQUEST['ac']); echo HtmlInput::hidden('sa','step2'); echo dossier::hidden(); $wAvail=3Dnew ISelect(); @@ -74,7 +74,7 @@ /* -------------------------------------------------- * Step 2 choose now the exercice of this folder */ -$back=3D'user_advanced.php?p_action=3Douv&'.dossier::get(); +$back=3D'do.php?ac=3D'.$_REQUEST['ac'].'&'.dossier::get(); if ( $sa=3D=3D'step2') { echo '
'. @@ -83,7 +83,7 @@ ''. ' Choississez l\'exercice du dossier '; echo dossier::hidden(); - echo HtmlInput::hidden('p_action','ouv'); + echo HtmlInput::hidden('ac',$_REQUEST['ac']); echo HtmlInput::hidden('sa','step3'); echo HtmlInput::hidden('f',$_REQUEST['f']); $cn=3Dnew Database($_REQUEST['f']); @@ -131,9 +131,10 @@ $wLedger->value=3D$array; echo $wLedger->input('p_jrn'); echo HtmlInput::submit('ok','Continuer'); + echo HtmlInput::hidden('ac',$_REQUEST['ac']); echo dossier::hidden(); echo ""; - echo HtmlInput::button_anchor('Retour',$back); + echo HtmlInput::button_anchor('Retour',$back.'&sa=3Dstep2&f=3D'.$_RE= QUEST['f']); exit(0); =20 } @@ -171,8 +172,9 @@ $cn=3Dnew Database(dossier::id()); $User=3Dnew User($cn); $jrn=3Dnew Acc_Ledger($cn,$_REQUEST['p_jrn']); - echo '
'; - echo HtmlInput::hidden('p_action','quick_writing'); + echo ''; + echo HtmlInput::hidden('ac',$_REQUEST['ac']); + echo HtmlInput::hidden('sa','step5'); echo dossier::hidden(); echo HtmlInput::hidden('p_jrn',$_REQUEST['p_jrn']); echo $jrn->show_form($result,0); @@ -184,3 +186,13 @@ =20 echo '
'; } +// if sa=3Dstep4 then record it +// +/* + * @todo finir les ouvertures d'ann=C3=A9e + */ +if ( $_REQUEST['sa']=3D=3D'step5') +{ + echo "

A ENREGISTRER

"; + +} Modified: phpcompta/trunk/include/param_pcmn.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/param_pcmn.inc.php 2011-10-28 20:20:43 UTC (r= ev 4250) +++ phpcompta/trunk/include/param_pcmn.inc.php 2011-10-28 20:59:25 UTC (r= ev 4251) @@ -88,7 +88,7 @@ =20 =20 echo '
'; -ShowMenuPcmn($_SESSION['g_start']); +menu_acc_plan($_SESSION['g_start']); echo '
'; echo '
'; /* Analyse ce qui est demand=C3=A9 */ @@ -304,7 +304,7 @@ =20 =20 echo $td; - printf ('Delete<= /A>',$A['pcm_val'],$str_dossier); + printf ('Efface',$A['pcm_val'],$str_dossier); echo ""; =20 =20 Modified: phpcompta/trunk/include/payment_middle.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/payment_middle.inc.php 2011-10-28 20:20:43 UT= C (rev 4250) +++ phpcompta/trunk/include/payment_middle.inc.php 2011-10-28 20:59:25 UT= C (rev 4251) @@ -33,7 +33,7 @@ /*!\file * \brief payment mode */ - +$sb=3DHtmlInput::default_value('sb', "", $_REQUEST); echo '
'; =20 //---------------------------------------------------------------------- @@ -44,7 +44,7 @@ $row=3Dnew Acc_Payment($cn,$_GET['id']); $row->load(); $javascript=3D"return confirm('"._('Vous confirmez')."')"; - echo ''; + echo ''; echo dossier::hidden(); echo HtmlInput::hidden('p_jrn',0); echo HtmlInput::hidden('p_action','divers'); @@ -90,7 +90,7 @@ $r=3D$mp->blank(); echo ''; echo dossier::hidden().HtmlInput::hidden('sa',$_REQUEST['sa']). - HtmlInput::hidden('p_action',$_REQUEST['p_action']).HtmlInput::hidde= n('sb','insert'); + HtmlInput::hidden('ac',$_REQUEST['ac']).HtmlInput::hidden('sb','insert'= ); echo $r; echo HtmlInput::submit('insert',_('Enregistre')); echo ''; @@ -130,7 +130,7 @@ { echo $tr; echo $row->row(); - echo $td.HtmlInput::button_anchor(_('Modifie'),'?p_action=3Ddive= rs&sa=3Dmp&sb=3Dchange&'.dossier::get(). + echo $td.HtmlInput::button_anchor(_('Modifie'),'?ac=3D'.$_REQUES= T['ac'].'&sa=3Dmp&sb=3Dchange&'.dossier::get(). '&id=3D'.$row->get_paramet= er('id')); echo $etr; =20 Modified: phpcompta/trunk/include/periode.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/periode.inc.php 2011-10-28 20:20:43 UTC (rev = 4250) +++ phpcompta/trunk/include/periode.inc.php 2011-10-28 20:59:25 UTC (rev = 4251) @@ -38,7 +38,7 @@ =20 if ( isset ($_POST["add_per"] )) { - $User->can_request(PARPER,1); + $g_user->can_request(PARPER,1); extract($_POST); $obj=3Dnew Periode($cn); if ( $obj->insert($p_date_start,$p_date_end,$p_exercice) =3D=3D 1 ) @@ -50,7 +50,7 @@ } if (isset($_POST['add_exercice'])) { - $User->can_request(PARPER,1); + $g_user->can_request(PARPER,1); $obj=3Dnew Periode($cn); $exercice=3D$cn->get_value('select max(p_exercice::float)+1 from par= m_periode'); if ( $obj->insert_exercice($exercice) =3D=3D 1 ) @@ -62,7 +62,7 @@ } if ( $action=3D=3D"closed") { - $User->can_request(PARCLO); + $g_user->can_request(PARCLO); $p_per=3D$_GET['p_per']; $per=3Dnew Periode($cn); $jrn_def_id=3D(isset($_GET['jrn_def_id']))?$_GET['jrn_def_id']:0; @@ -74,7 +74,7 @@ =20 if ( $action=3D=3D "delete_per" ) { - $User->can_request(PARPER); + $g_user->can_request(PARPER); $p_per=3D$_GET["p_per"]; // Check if the periode is not used if ( $cn->count_sql("select * from jrnx where j_tech_per=3D$p_per") = !=3D 0 ) @@ -87,9 +87,9 @@ } $choose=3D"yes"; } -if ( $action =3D=3D 'reopen')=20 +if ( $action =3D=3D 'reopen') { - $User->can_request(PARCLO); + $g_user->can_request(PARCLO); $jrn_def_id=3D(isset($_GET['jrn_def_id']))?$_GET['jrn_def_id']:0; $per=3Dnew Periode($cn); $jrn_def_id=3D(isset($_GET['jrn_def_id']))?$_GET['jrn_def_id']:0; @@ -101,7 +101,7 @@ } if ( $choose=3D=3D"yes" ) { - echo HtmlInput::button_anchor('Autre Journal ?','?choose=3Dno&p_acti= on=3Dperiode&gDossier=3D'.dossier::id()); + echo HtmlInput::button_anchor('Autre Journal ?','?choose=3Dno&ac=3D'= .$_REQUEST['ac'].'&gDossier=3D'.dossier::id()); $per=3Dnew Periode($cn); $jrn=3D(isset($_GET['jrn_def_id']))?$_GET['jrn_def_id']:0; $per->set_jrn($jrn); @@ -111,7 +111,7 @@ } else { - echo '
'; + echo ''; echo dossier::hidden(); $sel_jrn=3D$cn->make_array("select jrn_def_id, jrn_def_name from ". " jrn_def order by jrn_def_name"); @@ -121,7 +121,7 @@ $wSel->name=3D'jrn_def_id'; echo "Choississez global ou uniquement le journal =C3=A0 fermer".$wS= el->input(); echo HtmlInput::submit('choose','Valider'); - echo HtmlInput::hidden('p_action','periode'); + echo HtmlInput::hidden('ac',$_REQUEST['ac']); echo ""; echo '

Pour ajouter, effacer ou modifier une p&eac= ute;riode, il faut choisir global

'; } Modified: phpcompta/trunk/include/pref.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/pref.inc.php 2011-10-28 20:20:43 UTC (rev 425= 0) +++ phpcompta/trunk/include/pref.inc.php 2011-10-28 20:59:25 UTC (rev 425= 1) @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with PhpCompta; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-130= 7 USA -*/ + */ /* $Revision$ */ // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr -/*!\file +/* !\file * \brief this file is always included and then executed * it permits to change the user preferences - *\see user_pref.php + * \see user_pref.php */ =20 require_once('class_user.php'); @@ -32,214 +32,213 @@ echo '
'; //---------------------------------------------------------------------- // Change password - -if ( isset($_POST['pass_1']) - && strlen(trim($_POST['pass_1'])) !=3D 0 ) +if ( isset ($_POST['val'])) { - if ($_POST['pass_1'] !=3D $_POST['pass_2'] ) + /* + * @todo save the preference + */ + var_dump($_POST); +} +if (isset($_POST['pass_1']) + && strlen(trim($_POST['pass_1'])) !=3D 0) +{ + if ($_POST['pass_1'] !=3D $_POST['pass_2']) { - alert(_("Les mots de passe ne correspondent pas. Mot de passe in= chang=C3=A9")); + alert(_("Les mots de passe ne correspondent pas. Mot de passe inchang=C3= =A9")); } else { - $Rep=3Dnew Database(); - $l_pass=3Dmd5($_POST['pass_1']); - $Res=3D$Rep->exec_sql("update ac_users set use_pass=3D'$l_pass' = where use_login=3D'".$_SESSION['g_user']."'"); - $pass=3D$_POST['pass_1']; - $_SESSION['g_pass']=3D$_POST['pass_1']; - $g_pass=3D$_POST['pass_1']; - echo ""._('Mot de passe est modifi=C3=A9e').""; + $Rep =3D new Database(); + $l_pass =3D md5($_POST['pass_1']); + $Res =3D $Rep->exec_sql("update ac_users set use_pass=3D'$l_pass' where= use_login=3D'" . $_SESSION['g_user'] . "'"); + $pass =3D $_POST['pass_1']; + $_SESSION['g_pass'] =3D $_POST['pass_1']; + $g_pass =3D $_POST['pass_1']; + echo "" . _('Mot de passe est modifi=C3=A9e') . ""; } } =20 -$url=3D$_SERVER['REQUEST_URI']; -if ( ! isset ($_REQUEST['gDossier']) ) +if (!isset($_REQUEST['gDossier'])) { - echo HtmlInput::button_anchor(_('Retour'),'user_login.php?'); + echo HtmlInput::button_anchor(_('Retour'), 'user_login.php?'); } else { - echo '

'._('Changez vos pr=C3=A9f=C3=A9rences').'=

'; + echo '

' . _('Changez vos pr=C3=A9f=C3=A9rences')= . '

'; } - ?> =20
=20 -
" METHOD=3D"P= OST"> -
-
- - = - = +
+
- Mot de passe : - - = - =
+ + + +exec_sql("select the_name from theme + $res =3D $Rep->exec_sql("select the_name from theme order by the_name"); -for ($i=3D0;$i < Database::num_row($res);$i++) -{ - $st=3DDatabase::fetch_array($res,$i); - $style[]=3D$st['the_name']; -} + $astyle =3D array(); + for ($i =3D 0; $i < Database::num_row($res); $i++) + { + $st =3D Database::fetch_array($res, $i); + $astyle[] =3D $st['the_name']; + } // Formatte le display -$disp_style=3D""; -?> -

-

- - - + $disp_style =3D ""; + ?> +

+

+ + + =20 -cn=3D$cn; + if (isset($_REQUEST['gDossier'])) + { + $inside_dossier =3D true; + $msg =3D ""; + $cn =3D new Database($_REQUEST['gDossier']); + $g_user->cn =3D $cn; =20 - if ( isset ($_POST['period'])) - { - $periode=3D$_POST["period"]; - $User->set_periode($periode); - } + if (isset($_POST['period'])) + { + $periode =3D $_POST["period"]; + $g_user->set_periode($periode); + } =20 - $l_user_per=3D$User->get_periode(); - if ( $l_user_per=3D=3D"") - $l_user_per=3D$cn->get_value("select min(p_id) from parm_periode= where p_closed=3D'f'"); + $l_user_per =3D $g_user->get_periode(); + if ($l_user_per =3D=3D "") + $l_user_per =3D $cn->get_value("select min(p_id) from parm_periode wh= ere p_closed=3D'f'"); =20 - // if periode is closed then warns the users - $period=3Dnew Periode($cn,$l_user_per); + // if periode is closed then warns the users + $period =3D new Periode($cn, $l_user_per); =20 - $period->p_id=3D$l_user_per; - $period->jrn_def_id=3D0; - if ( $period->is_closed($l_user_per)=3D=3D1) - { - $msg=3D_('Attention cette p=C3=A9riode est ferm=C3=A9e, vous ne = pourrez rien modifier dans le module comptable'); - $msg=3D '

'.$msg.'

'; - } + $period->p_id =3D $l_user_per; + $period->jrn_def_id =3D 0; + if ($period->is_closed($l_user_per) =3D=3D 1) + { + $msg =3D _('Attention cette p=C3=A9riode est ferm=C3=A9e, vous ne pou= rrez rien modifier dans le module comptable'); + $msg =3D '

' . $msg . '

'; + } =20 =20 - $period=3Dnew IPeriod("period"); - $period->user=3D$User; - $period->cn=3D$cn; - $period->filter_year=3Dfalse; - $period->value=3D$l_user_per; - $period->type=3DALL; - $l_form_per=3D$period->input(); + $period =3D new IPeriod("period"); + $period->user =3D $g_user; + $period->cn =3D $cn; + $period->filter_year =3D false; + $period->value =3D $l_user_per; + $period->type =3D ALL; + $l_form_per =3D $period->input(); + ?> + + + + =20 - - - ?> - - - - - - - - + + - -
+ Mot de passe : + + +
- - - -
+ + + +
+ +
- -
-
+ + =20 -
- +
+
'; - echo ''._('Options pour la page d\'accueil').''; + echo '' . _('Options pour la page d\'accueil') . ''= ; echo _('Mini-Rapport : '); - $rapport=3Dnew Acc_Report($cn); - $aRapport=3D$rapport->make_array(); - $aRapport[]=3Darray("value"=3D>0,"label"=3D>_('Aucun mini rapport'))= ; - $wRapport=3Dnew ISelect(); - $wRapport->name=3D"minirap"; - $wRapport->selected=3D$User->get_mini_report(); - $wRapport->value=3D$aRapport; + $rapport =3D new Acc_Report($cn); + $aRapport =3D $rapport->make_array(); + $aRapport[] =3D array("value" =3D> 0, "label" =3D> _('Aucun mini rap= port')); + $wRapport =3D new ISelect(); + $wRapport->name =3D "minirap"; + $wRapport->selected =3D $g_user->get_mini_report(); + $wRapport->value =3D $aRapport; echo $wRapport->input(); - echo ''._('Le mini rapport est un rapport qui= s\'affiche sur votre page d\'accueil').''; + echo '' . _('Le mini rapport est un rapport q= ui s\'affiche sur votre page d\'accueil') . ''; echo ''; } =20 echo '
'; -echo ''._('Langue').''; +echo '' . _('Langue') . ''; echo _('Selectionnez votre langue'); -$aLang=3Darray(array(_('Fran=C3=A7ais'),'fr_FR.utf8'), - array(_('Anglais'),'en_US.utf8'), - array(_('N=C3=A9erlandais'),'nl_NL.utf8'), - ); +$aLang =3D array(array(_('Fran=C3=A7ais'), 'fr_FR.utf8'), + array(_('Anglais'), 'en_US.utf8'), + array(_('N=C3=A9erlandais'), 'nl_NL.utf8'), + ); echo ''; echo '
'; =20 =20 -echo HtmlInput::submit("val",_("Valider")); +echo HtmlInput::submit("val", _("Valider")); echo ''; =20 =20 =20 =20 -if ( ! $inside_dossier ) +if (!$inside_dossier) { - echo HtmlInput::button_anchor(_('Retour'),'user_login.php?'); +echo HtmlInput::button_anchor(_('Retour'), 'user_login.php?'); } =20 =20 Modified: phpcompta/trunk/include/preod.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/preod.inc.php 2011-10-28 20:20:43 UTC (rev 42= 50) +++ phpcompta/trunk/include/preod.inc.php 2011-10-28 20:59:25 UTC (rev 42= 51) @@ -45,7 +45,7 @@ echo dossier::hidden(); $hid=3Dnew IHidden(); echo $hid->input("sa","jrn"); -echo $hid->input("p_action","preod"); +echo $hid->input("ac",$_REQUEST['ac']); echo '
'; echo HtmlInput::submit('Accepter','Accepter'); echo ''; @@ -96,7 +96,7 @@ echo '
'; echo dossier::hidden(); echo $hid->input("sa","del"); - echo $hid->input("p_action","preod"); + echo $hid->input("ac",$_REQUEST['ac']); echo $hid->input("del",""); echo $hid->input("od_id",$row['od_id']); echo $hid->input("jrn",$_GET['jrn']); Modified: phpcompta/trunk/include/stock.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/stock.inc.php 2011-10-28 20:20:43 UTC (rev 42= 50) +++ phpcompta/trunk/include/stock.inc.php 2011-10-28 20:59:25 UTC (rev 42= 51) @@ -34,28 +34,15 @@ html_page_start($_SESSION['g_theme']); =20 require_once('class_database.php'); -/* Admin. Dossier */ -$gDossier=3Ddossier::id(); =20 $cn=3Dnew Database($gDossier); include_once ("class_user.php"); -$User=3Dnew User($cn); -$User->Check(); +global $g_user; =20 - $href=3Dbasename($_SERVER['PHP_SELF']); -if ($href=3D=3D'compta.php') -{ - //Show the top menu - include_once ("user_menu.php"); =20 - // Show Menu Left - $left_menu=3DShowMenuAdvanced(5); - //echo '
'; - echo $left_menu; -} // Get The priv on the selected folder -$User->can_request(STOLE,1); +$g_user->can_request(STOLE,1); =20 =20 $action=3D ( isset ($_GET['action']))? $_GET['action']:""; @@ -64,7 +51,7 @@ // Adjust the stock if ( isset ($_POST['sub_change'])) { - $User->can_request(STOWRITE,1); + $g_user->can_request(STOWRITE,1); $change=3D$_POST['stock_change']; $sg_code=3D$_POST['sg_code']; $sg_date=3D$_POST['sg_date']; @@ -82,7 +69,7 @@ else { // Check if User Can change the stock - if ( $User->check_action($gDossier,GESTOCK) =3D=3D 0 ) + if ( $g_user->check_action($gDossier,GESTOCK) =3D=3D 0 ) { NoAccess(); exit (-1); @@ -126,7 +113,7 @@ if ( ! isset ($_GET['year']) ) { // get defaut periode - $a=3D$User->get_periode(); + $a=3D$g_user->get_periode(); // get exercice of periode $periode=3Dnew Periode($cn,$a); $year=3D$periode->get_exercice(); @@ -141,11 +128,11 @@ if ( $action =3D=3D 'detail' ) { // Check if User Can see the stock - $User->can_request(STOLE,1); + $g_user->can_request(STOLE,1); $sg_code=3D(isset ($_GET['sg_code'] ))?$_GET['sg_code']:$_POST['sg_c= ode']; $year=3D(isset($_GET['year']))?$_GET['year']:$_POST['year']; $a=3DViewDetailStock($cn,$sg_code,$year); - $write=3D$User->check_action(STOWRITE); + $write=3D$g_user->check_action(STOWRITE); =20 $b=3D""; =20 @@ -159,16 +146,16 @@ echo '
'; echo 'Entrer la valeur qui doit augmenter ou diminuer le stock'; echo ''; - echo ''; + echo ''; echo ChangeStock($sg_code,$year); echo HtmlInput::submit("sub_change" ,"Valider"); echo dossier::hidden(); - echo HtmlInput::button_anchor('Retour','?p_action=3Dstock&'.doss= ier::get()); + echo HtmlInput::button_anchor('Retour','?ac=3D'.$_REQUEST['ac'].= '&'.dossier::get()); echo ''; echo '
'; } else - echo HtmlInput::button_anchor('Retour','?p_action=3Dstock&'.doss= ier::get()); + echo HtmlInput::button_anchor('Retour','?ac=3D'.$_REQUEST['ac'].= '&'.dossier::get()); echo '
'; =20 =20 @@ -185,7 +172,7 @@ for ( $i =3D 0; $i < Database::num_row($Res);$i++) { $l=3DDatabase::fetch_array($Res,$i); - $url=3Dsprintf("?p_action=3Dstock&year=3D%d&".dossier::get(), + $url=3Dsprintf("?ac=3D".$_REQUEST['ac']."&year=3D%d&".dossier::get()= , $l['exercice']); $r.=3DHtmlInput::button_anchor($l['exercice'],$url); } Modified: phpcompta/trunk/include/suivi_adm.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/suivi_adm.inc.php 2011-10-28 20:20:43 UTC (re= v 4250) +++ phpcompta/trunk/include/suivi_adm.inc.php 2011-10-28 20:59:25 UTC (re= v 4251) @@ -29,7 +29,7 @@ * - $cn =3D database connection=20 */ require_once('class_action.php'); -$User->can_request(GECOUR); +$g_user->can_request(GECOUR); =20 /** *\note fix problem with ShowActionList, this function is local Modified: phpcompta/trunk/include/suivi_supplier.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/suivi_supplier.inc.php 2011-10-28 20:20:43 UT= C (rev 4250) +++ phpcompta/trunk/include/suivi_supplier.inc.php 2011-10-28 20:59:25 UT= C (rev 4251) @@ -29,7 +29,7 @@ * - $cn =3D database connection=20 */ require_once('class_action.php'); -$User->can_request(GECOUR); +$g_user->can_request(GECOUR); =20 /** *\note problem with ShowActionList, this function is local Modified: phpcompta/trunk/include/supplier.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/supplier.inc.php 2011-10-28 20:20:43 UTC (rev= 4250) +++ phpcompta/trunk/include/supplier.inc.php 2011-10-28 20:59:25 UTC (rev= 4251) @@ -30,12 +30,13 @@ require_once('class_iaction.php'); require_once('class_fiche_def.php'); require_once('class_ipopup.php'); +global $g_user; =20 $low_action=3D(isset($_REQUEST['sb']))?$_REQUEST['sb']:"list"; /*! \file * \brief Called from the module "Gestion" to manage the supplier */ -$User->can_request(GECUST); +$g_user->can_request(GECUST); $href=3Dbasename($_SERVER['PHP_SELF']); =20 // by default open liste @@ -48,7 +49,7 @@ //----------------------------------------------------- if ( isset($_POST['delete_card'] ) ) { - if ( $User->check_action(FICADD) =3D=3D 0 ) + if ( $g_user->check_action(FICADD) =3D=3D 0 ) { alert('Vous ne pouvez pas enlever de fiche'); return; @@ -90,7 +91,7 @@ =20 ?> "> - + "> check_action(FICADD) =3D=3D 0 ) + if ( $g_user->check_action(FICADD) =3D=3D 0 ) { alert('Vous ne pouvez pas ajouter de fiche'); return; Modified: phpcompta/trunk/include/template/list_category_document.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/template/list_category_document.php 2011-10-2= 8 20:20:43 UTC (rev 4250) +++ phpcompta/trunk/include/template/list_category_document.php 2011-10-2= 8 20:59:25 UTC (rev 4251) @@ -30,7 +30,6 @@ \ No newline at end of file Copied: phpcompta/trunk/include/template/menu.php (from rev 4249, phpcomp= ta/branches/rel600-dynamic-menu/include/template/menu.php) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/template/menu.php (re= v 0) +++ phpcompta/trunk/include/template/menu.php 2011-10-28 20:59:25 UTC (re= v 4251) @@ -0,0 +1,57 @@ +
+ 4 && $idx =3D=3D 0) : + $width =3D 100; + ?> +%"> + +
+ + + + + + + + + + + + + + +
"> + &= ac=3D"> + + + "> + &= ac=3D"> + + +
+
+ Modified: phpcompta/trunk/include/template/modele_document.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/template/modele_document.php 2011-10-28 20:20= :43 UTC (rev 4250) +++ phpcompta/trunk/include/template/modele_document.php 2011-10-28 20:59= :25 UTC (rev 4251) @@ -1,8 +1,8 @@
-Fermer=20 +Fermer

Mod=C3=A8le de document

-
+ =20 @@ -84,7 +84,7 @@ if ( $cn->exist_sequence("seq_doc_type_".$doc->md_type) ) { $ret=3D $cn->get_array("select last_value,is_called from se= q_doc_type_".$doc->md_type) ; - =20 + $last=3D$ret[0]['last_value']; /*! *\note With PSQL sequence , the last_value column is = 1 when before AND after the first call, to make the difference between = them Copied: phpcompta/trunk/include/template/module.php (from rev 4249, phpco= mpta/branches/rel600-dynamic-menu/include/template/module.php) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/template/module.php (= rev 0) +++ phpcompta/trunk/include/template/module.php 2011-10-28 20:59:25 UTC (= rev 4251) @@ -0,0 +1,40 @@ +
+
+ +

Dossier :

+ +
+
+
+ + "; + continue; + } + if ($row['me_code']=3D=3D$selected) + { + $style=3D"background:red"; + } + if ( $row['me_url']!=3D'') + { + $url=3D$row['me_url']; + } + else + { + $url=3D"do.php?gDossier=3D".Dossier::id()."&ac=3D".$row['me_code']; + } + ?> + + + +
">">
+ +
+
\ No newline at end of file Modified: phpcompta/trunk/include/template/periode_add_exercice.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/template/periode_add_exercice.php 2011-10-28 = 20:20:43 UTC (rev 4250) +++ phpcompta/trunk/include/template/periode_add_exercice.php 2011-10-28 = 20:59:25 UTC (rev 4251) @@ -1,12 +1,12 @@
Ajout d'un exercice -Ajout d'un exercice comptable de 13 p=C3=A9riodes, commen=C3=A7ant le 1 = janvier jusqu'au 31 d=C3=A9cembre=20 +Ajout d'un exercice comptable de 13 p=C3=A9riodes, commen=C3=A7ant le 1 = janvier jusqu'au 31 d=C3=A9cembre =20 Modified: phpcompta/trunk/include/user_action_gl.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/user_action_gl.php 2011-10-28 20:20:43 UTC (r= ev 4250) +++ phpcompta/trunk/include/user_action_gl.php 2011-10-28 20:59:25 UTC (r= ev 4251) @@ -27,6 +27,7 @@ include_once("class_user.php"); require_once("class_iselect.php"); require_once('class_acc_ledger.php'); +$gDossier=3DDossier::id(); $cn=3Dnew Database($gDossier); =20 require_once('class_iposte.php'); @@ -41,6 +42,10 @@ } else $Ledger->id=3D$_REQUEST['p_jrn']; +/* + * @todo usefull ? + */ +$_GET['ledger_type']=3D'ALL'; echo $Ledger->display_search_form(); echo '
'; /* compute the sql stmt */ @@ -54,7 +59,7 @@ $bar=3Djrn_navigation_bar($offset,$max_line,$step,$page); =20 =20 -echo HtmlInput::request_to_hidden(array('sa','sb','sc','f_id','p_action'= )); +echo HtmlInput::request_to_hidden(array('sa','sb','sc','f_id','ac')); =20 echo dossier::hidden(); echo $bar; Modified: phpcompta/trunk/include/user_menu.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/user_menu.php 2011-10-28 20:20:43 UTC (rev 42= 50) +++ phpcompta/trunk/include/user_menu.php 2011-10-28 20:59:25 UTC (rev 42= 51) @@ -142,7 +142,7 @@ * \return string * */ -function ShowMenuCompta($p_high=3D"") +function ShowMenuCompta_deprecated($p_high=3D"") { require_once('class_database.php'); =20 @@ -227,7 +227,7 @@ * * \return the menu */ -function ShowMenuAdvanced($default=3D"") +function ShowMenuAdvanced_deprecated($default=3D"") { $str_dossier=3Ddossier::get(); // Show the left menu @@ -257,7 +257,8 @@ function ShowMenuFiche($p_dossier) { $cn=3Dnew Database($p_dossier); - $str_dossier=3Ddossier::get(); + $mod=3D"&ac=3D".$_REQUEST['ac']; + $str_dossier=3Ddossier::get().$mod; echo '
'; echo ''; =20 @@ -402,20 +403,21 @@ * */ =20 -function ShowMenuPcmn($p_start=3D1) +function menu_acc_plan($p_start=3D1) { + $base=3D"?ac=3D".$_REQUEST['ac']; $str_dossier=3D"&".dossier::get(); echo '
'; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; + echo ''; + echo ''= ; + echo '<= /TR>'; + echo '= '; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo '<= /TR>'; echo "
0'._(' Hors Bilan').'
1'._(' Immobilis=C3=A9').'
2 '._('Actif a un an au plus').'
3 '._('Stock et commande').'
4 '._('Compte tiers').'
5'._('Actif').'
6'._('Charges').'
7'._('Produits').'
8'._('Hors Comptabilit=C3=A9').'=
9 '._('Hors Comptabilit=C3=A9').'
0'._(' Hors Bilan').'
1'._(' Immobilis=C3=A9').'
2 '._('Actif a un an au plus').'
3 '._('Stock et commande').'
4 '._('Compte tiers').'
5'._('Actif').'
6'._('Charges').'
7'._('Produits').'
8'._('Hors Comptabilit=C3=A9').'
9 '._('Hors Comptabilit=C3=A9').'
"; } =20 Copied: phpcompta/trunk/sql/backup-new-object.sh (from rev 4249, phpcompt= a/branches/rel600-dynamic-menu/sql/backup-new-object.sh) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/sql/backup-new-object.sh (rev= 0) +++ phpcompta/trunk/sql/backup-new-object.sh 2011-10-28 20:59:25 UTC (rev= 4251) @@ -0,0 +1 @@ +pg_dump testdossier82 --inserts -t profile -t menu_ref -t profile_menu -= t profile_user -t v_all_menu > object-6.0.sql Copied: phpcompta/trunk/sql/object-6.0.sql (from rev 4249, phpcompta/bran= ches/rel600-dynamic-menu/sql/object-6.0.sql) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/sql/object-6.0.sql (rev 0) +++ phpcompta/trunk/sql/object-6.0.sql 2011-10-28 20:59:25 UTC (rev 4251) @@ -0,0 +1,530 @@ +-- +-- PostgreSQL database dump +-- + +SET statement_timeout =3D 0; +SET client_encoding =3D 'UTF8'; +SET standard_conforming_strings =3D off; +SET check_function_bodies =3D false; +SET client_min_messages =3D warning; +SET escape_string_warning =3D off; + +SET search_path =3D public, pg_catalog; + +SET default_tablespace =3D ''; + +SET default_with_oids =3D false; + +-- +-- Name: menu_ref; Type: TABLE; Schema: public; Owner: dany; Tablespace:= =20 +-- + +CREATE TABLE menu_ref ( + me_code text NOT NULL, + me_menu text, + me_file text, + me_url text, + me_description text +); + + +ALTER TABLE public.menu_ref OWNER TO dany; + +-- +-- Name: COLUMN menu_ref.me_code; Type: COMMENT; Schema: public; Owner: = dany +-- + +COMMENT ON COLUMN menu_ref.me_code IS 'Menu Code '; + + +-- +-- Name: COLUMN menu_ref.me_menu; Type: COMMENT; Schema: public; Owner: = dany +-- + +COMMENT ON COLUMN menu_ref.me_menu IS 'Label to display'; + + +-- +-- Name: COLUMN menu_ref.me_file; Type: COMMENT; Schema: public; Owner: = dany +-- + +COMMENT ON COLUMN menu_ref.me_file IS 'if not empty file to include'; + + +-- +-- Name: COLUMN menu_ref.me_url; Type: COMMENT; Schema: public; Owner: d= any +-- + +COMMENT ON COLUMN menu_ref.me_url IS 'url '; + + +-- +-- Name: profile; Type: TABLE; Schema: public; Owner: dany; Tablespace:=20 +-- + +CREATE TABLE profile ( + p_name text NOT NULL, + p_id integer NOT NULL, + p_desc text +); + + +ALTER TABLE public.profile OWNER TO dany; + +-- +-- Name: TABLE profile; Type: COMMENT; Schema: public; Owner: dany +-- + +COMMENT ON TABLE profile IS 'Available profile '; + + +-- +-- Name: COLUMN profile.p_name; Type: COMMENT; Schema: public; Owner: da= ny +-- + +COMMENT ON COLUMN profile.p_name IS 'Name of the profile'; + + +-- +-- Name: COLUMN profile.p_desc; Type: COMMENT; Schema: public; Owner: da= ny +-- + +COMMENT ON COLUMN profile.p_desc IS 'description of the profile'; + + +-- +-- Name: profile_menu; Type: TABLE; Schema: public; Owner: dany; Tablesp= ace:=20 +-- + +CREATE TABLE profile_menu ( + pm_id integer NOT NULL, + me_code text, + me_code_dep text, + p_id integer, + p_order integer, + p_type_display text NOT NULL +); + + +ALTER TABLE public.profile_menu OWNER TO dany; + +-- +-- Name: TABLE profile_menu; Type: COMMENT; Schema: public; Owner: dany +-- + +COMMENT ON TABLE profile_menu IS 'Join between the profile and the menu= '; + + +-- +-- Name: COLUMN profile_menu.me_code_dep; Type: COMMENT; Schema: public;= Owner: dany +-- + +COMMENT ON COLUMN profile_menu.me_code_dep IS 'menu code dependency'; + + +-- +-- Name: COLUMN profile_menu.p_id; Type: COMMENT; Schema: public; Owner:= dany +-- + +COMMENT ON COLUMN profile_menu.p_id IS 'link to profile'; + + +-- +-- Name: COLUMN profile_menu.p_order; Type: COMMENT; Schema: public; Own= er: dany +-- + +COMMENT ON COLUMN profile_menu.p_order IS 'order of displaying menu'; + + +-- +-- Name: COLUMN profile_menu.p_type_display; Type: COMMENT; Schema: publ= ic; Owner: dany +-- + +COMMENT ON COLUMN profile_menu.p_type_display IS 'M is a module +E is a menu'; + + +-- +-- Name: profile_menu_pm_id_seq; Type: SEQUENCE; Schema: public; Owner: = dany +-- + +CREATE SEQUENCE profile_menu_pm_id_seq + START WITH 1 + INCREMENT BY 1 + NO MAXVALUE + NO MINVALUE + CACHE 1; + + +ALTER TABLE public.profile_menu_pm_id_seq OWNER TO dany; + +-- +-- Name: profile_menu_pm_id_seq; Type: SEQUENCE OWNED BY; Schema: public= ; Owner: dany +-- + +ALTER SEQUENCE profile_menu_pm_id_seq OWNED BY profile_menu.pm_id; + + +-- +-- Name: profile_menu_pm_id_seq; Type: SEQUENCE SET; Schema: public; Own= er: dany +-- + +SELECT pg_catalog.setval('profile_menu_pm_id_seq', 79, true); + + +-- +-- Name: profile_p_id_seq; Type: SEQUENCE; Schema: public; Owner: dany +-- + +CREATE SEQUENCE profile_p_id_seq + START WITH 1 + INCREMENT BY 1 + NO MAXVALUE + NO MINVALUE + CACHE 1; + + +ALTER TABLE public.profile_p_id_seq OWNER TO dany; + +-- +-- Name: profile_p_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owne= r: dany +-- + +ALTER SEQUENCE profile_p_id_seq OWNED BY profile.p_id; + + +-- +-- Name: profile_p_id_seq; Type: SEQUENCE SET; Schema: public; Owner: da= ny +-- + +SELECT pg_catalog.setval('profile_p_id_seq', 1, true); + + +-- +-- Name: profile_user; Type: TABLE; Schema: public; Owner: dany; Tablesp= ace:=20 +-- + +CREATE TABLE profile_user ( + user_name text NOT NULL, + pu_id integer NOT NULL, + p_id integer +); + + +ALTER TABLE public.profile_user OWNER TO dany; + +-- +-- Name: TABLE profile_user; Type: COMMENT; Schema: public; Owner: dany +-- + +COMMENT ON TABLE profile_user IS 'Contains the available profile for use= rs'; + + +-- +-- Name: COLUMN profile_user.user_name; Type: COMMENT; Schema: public; O= wner: dany +-- + +COMMENT ON COLUMN profile_user.user_name IS 'fk to available_user : logi= n'; + + +-- +-- Name: COLUMN profile_user.p_id; Type: COMMENT; Schema: public; Owner:= dany +-- + +COMMENT ON COLUMN profile_user.p_id IS 'fk to profile'; + + +-- +-- Name: profile_user_pu_id_seq; Type: SEQUENCE; Schema: public; Owner: = dany +-- + +CREATE SEQUENCE profile_user_pu_id_seq + START WITH 1 + INCREMENT BY 1 + NO MAXVALUE + NO MINVALUE + CACHE 1; + + +ALTER TABLE public.profile_user_pu_id_seq OWNER TO dany; + +-- +-- Name: profile_user_pu_id_seq; Type: SEQUENCE OWNED BY; Schema: public= ; Owner: dany +-- + +ALTER SEQUENCE profile_user_pu_id_seq OWNED BY profile_user.pu_id; + + +-- +-- Name: profile_user_pu_id_seq; Type: SEQUENCE SET; Schema: public; Own= er: dany +-- + +SELECT pg_catalog.setval('profile_user_pu_id_seq', 1, true); + + +-- +-- Name: v_all_menu; Type: VIEW; Schema: public; Owner: dany +-- + +CREATE VIEW v_all_menu AS + SELECT pm.me_code, pm.pm_id, pm.me_code_dep, pm.p_order, pm.p_type_d= isplay, pu.user_name, pu.pu_id, p.p_name, p.p_desc, mr.me_menu, mr.me_fil= e, mr.me_url FROM (((profile_menu pm JOIN profile_user pu ON ((pu.p_id =3D= pm.p_id))) JOIN profile p ON ((p.p_id =3D pm.p_id))) JOIN menu_ref mr US= ING (me_code)) ORDER BY pm.p_order; + + +ALTER TABLE public.v_all_menu OWNER TO dany; + +-- +-- Name: p_id; Type: DEFAULT; Schema: public; Owner: dany +-- + +ALTER TABLE profile ALTER COLUMN p_id SET DEFAULT nextval('profile_p_id_= seq'::regclass); + + +-- +-- Name: pm_id; Type: DEFAULT; Schema: public; Owner: dany +-- + +ALTER TABLE profile_menu ALTER COLUMN pm_id SET DEFAULT nextval('profile= _menu_pm_id_seq'::regclass); + + +-- +-- Name: pu_id; Type: DEFAULT; Schema: public; Owner: dany +-- + +ALTER TABLE profile_user ALTER COLUMN pu_id SET DEFAULT nextval('profile= _user_pu_id_seq'::regclass); + + +-- +-- Data for Name: menu_ref; Type: TABLE DATA; Schema: public; Owner: dan= y +-- + +INSERT INTO menu_ref VALUES ('COMPANY', 'Soci=C3=A9t=C3=A9s', 'company.i= nc.php', NULL, 'Parametre societe'); +INSERT INTO menu_ref VALUES ('PERIODE', 'P=C3=A9riode', 'periode.inc.php= ', NULL, 'Gestion des p=C3=A9riodes'); +INSERT INTO menu_ref VALUES ('DIVPARM', 'Divers', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('CFGPAYMENT', 'Moyen de paiement', 'payment= _middle.inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('CFGTVA', 'TVA', 'tva.inc.php', NULL, NULL)= ; +INSERT INTO menu_ref VALUES ('CFGACCOUNT', 'Poste', 'poste.inc.php', NUL= L, NULL); +INSERT INTO menu_ref VALUES ('CARD', 'Fiche', 'fiche.inc.php', NULL, NUL= L); +INSERT INTO menu_ref VALUES ('STOCK', 'Stock', 'stock.inc.php', NULL, NU= LL); +INSERT INTO menu_ref VALUES ('MISC', 'Op=C3=A9rations Diverses', 'compta= _ods.inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('HIST', 'Historique', 'user_action_gl.php',= NULL, NULL); +INSERT INTO menu_ref VALUES ('VEN', 'Vente', 'compta_ven.inc.php', NULL,= NULL); +INSERT INTO menu_ref VALUES ('ACH', 'Achat', 'compta_ach.inc.php', NULL,= NULL); +INSERT INTO menu_ref VALUES ('FIN', 'Financier', 'compta_fin.inc.php', N= ULL, NULL); +INSERT INTO menu_ref VALUES ('LET', 'Lettrage', 'letter.inc.php', NULL, = NULL); +INSERT INTO menu_ref VALUES ('PREOD', 'Op=C3=A9rations pr=C3=A9d=C3=A9fi= nies', 'preod.inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('VERIFBIL', 'V=C3=A9rification ', 'verif_bi= lan.inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('REPORT', 'Cr=C3=A9ation de rapport', 'repo= rt.inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('OPEN', 'Ecriture Ouverture', 'opening.inc.= php', NULL, NULL); +INSERT INTO menu_ref VALUES ('ADM', 'Administration', 'adm.inc.php', NUL= L, NULL); +INSERT INTO menu_ref VALUES ('SUPPL', 'Fournisseur', 'supplier.inc.php',= NULL, NULL); +INSERT INTO menu_ref VALUES ('FOLLOW', 'Courrier', 'action.inc.php', NUL= L, NULL); +INSERT INTO menu_ref VALUES ('FORECAST', 'Pr=C3=A9vision', 'forecast.inc= .php', NULL, NULL); +INSERT INTO menu_ref VALUES ('IMPJRN', 'Historique', 'impress_jrn.inc.ph= p', NULL, NULL); +INSERT INTO menu_ref VALUES ('IMPREC', 'Rapprochement', 'impress_rec.inc= .php', NULL, NULL); +INSERT INTO menu_ref VALUES ('IMPPOSTE', 'Poste', 'impress_poste.inc.php= ', NULL, NULL); +INSERT INTO menu_ref VALUES ('IMPREPORT', 'Rapport', 'impress_rapport.in= c.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('IMPBILAN', 'Bilan', 'impress_bilan.inc.php= ', NULL, NULL); +INSERT INTO menu_ref VALUES ('IMPGL', 'Grand Livre', 'impress_gl_comptes= .inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('IMPBAL', 'Balance', 'balance.inc.php', NUL= L, NULL); +INSERT INTO menu_ref VALUES ('IMPCARD', 'Cat=C3=A9gorie de Fiches', 'imp= ress_fiche.inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('CUSTDET', 'Fiche', 'detail_client.inc.php'= , NULL, NULL); +INSERT INTO menu_ref VALUES ('CUSTFOLLOW', 'Suivi', 'suivi_client.inc.ph= p', NULL, NULL); +INSERT INTO menu_ref VALUES ('CUSTOP', 'Op=C3=A9ration', 'operation_clie= nt.inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('CFGCARDCAT', 'Cat=C3=A9gorie de fiche', 'f= iche_def.inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('CARDBAL', 'Balance', 'balance_card.inc.php= ', NULL, NULL); +INSERT INTO menu_ref VALUES ('CUST', 'Client', 'client.inc.php', NULL, N= ULL); +INSERT INTO menu_ref VALUES ('CFGCATDOC', 'Cat=C3=A9gorie de documents',= 'cat_document.inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('CFGATTRIBCARD', 'Attribut de fiche', 'card= _attr.inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('CFGPCMN', 'Plan Comptable', 'param_pcmn.in= c.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('PARAM', 'Param=C3=A8tre', NULL, NULL, NULL= ); +INSERT INTO menu_ref VALUES ('GESTION', 'Gestion', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('CUSTCONTACT', 'Contact (=C3=A0 faire)', NU= LL, NULL, NULL); +INSERT INTO menu_ref VALUES ('CFGEXTENSION', 'Extension', 'extension.inc= .php', NULL, NULL); +INSERT INTO menu_ref VALUES ('COMPTA', 'Comptabilit=C3=A9', NULL, NULL, = NULL); +INSERT INTO menu_ref VALUES ('LOGOUT', 'Sortie', NULL, 'logout.php', NUL= L); +INSERT INTO menu_ref VALUES ('DASHBOARD', 'Tableau de bord', 'dashboard.= inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('IMP', 'Impression', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('LETTER', 'Lettrage', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('CFGSECURITY', 'S=C3=A9curit=C3=A9', 'param= _sec.inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('LETTERCARD', 'Let. Fiche', 'lettering.card= .inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('LETTERACC', 'Let. Poste', 'lettering.accou= nt.inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('PREDOP', 'Ecriture pr=C3=A9definie', 'preo= d.inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('ADV', 'Avanc=C3=A9', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('ANC', 'Compta Analytique', NULL, NULL, NUL= L); +INSERT INTO menu_ref VALUES ('CFGDOCUMENT', 'Document', 'document_modele= .inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('ACCESS', 'Dossier', NULL, 'user_login.php'= , NULL); +INSERT INTO menu_ref VALUES ('DOCUMENT', 'Document', 'document_modele.in= c.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('CFGLEDGER', 'journaux', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('PLANANC', 'Plan Compt. analytique', 'anc_p= a.inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('ANCODS', 'Op=C3=A9rations diverses', 'anc_= od.inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('ANCGROUP', 'Groupe', 'anc_group.inc.php', = NULL, NULL); +INSERT INTO menu_ref VALUES ('ANCIMP', 'Impression', 'anc_imp.inc.php', = NULL, NULL); +INSERT INTO menu_ref VALUES ('PREFERENCE', 'Pr=C3=A9f=C3=A9rence', 'pref= .inc.php', NULL, NULL); + + +-- +-- Data for Name: profile; Type: TABLE DATA; Schema: public; Owner: dany +-- + +INSERT INTO profile VALUES ('default', 1, 'Profil par d=C3=A9faut'); +INSERT INTO profile VALUES ('Analytique', 2, 'Uniquement comptabilit=C3=A9= analytique'); +INSERT INTO profile VALUES ('Vente', 3, 'Uniquement vente'); + + +-- +-- Data for Name: profile_menu; Type: TABLE DATA; Schema: public; Owner:= dany +-- + +INSERT INTO profile_menu VALUES (1, 'COMPTA', NULL, 1, 5, 'M'); +INSERT INTO profile_menu VALUES (2, 'ANC', NULL, 1, 7, 'M'); +INSERT INTO profile_menu VALUES (45, 'PARAM', NULL, 1, 2, 'M'); +INSERT INTO profile_menu VALUES (44, 'DASHBOARD', NULL, 1, 1, 'M'); +INSERT INTO profile_menu VALUES (50, 'ANC', NULL, 2, 1, 'M'); +INSERT INTO profile_menu VALUES (51, 'COMPTA', NULL, 3, 1, 'M'); +INSERT INTO profile_menu VALUES (52, 'VEN', 'COMPTA', 3, 1, 'E'); +INSERT INTO profile_menu VALUES (53, 'ACCESS', NULL, 1, 18, 'M'); +INSERT INTO profile_menu VALUES (54, 'COMPANY', 'PARAM', 1, 1, 'E'); +INSERT INTO profile_menu VALUES (55, 'PERIODE', 'PARAM', 1, 2, 'E'); +INSERT INTO profile_menu VALUES (56, 'DIVPARM', 'PARAM', 1, 3, 'E'); +INSERT INTO profile_menu VALUES (59, 'CFGPAYMENT', 'DIVPARM', 1, 4, 'E')= ; +INSERT INTO profile_menu VALUES (60, 'CFGTVA', 'DIVPARM', 1, 5, 'E'); +INSERT INTO profile_menu VALUES (61, 'CFGACCOUNT', 'DIVPARM', 1, 6, 'E')= ; +INSERT INTO profile_menu VALUES (67, 'CFGCATDOC', 'DIVPARM', 1, 8, 'E'); +INSERT INTO profile_menu VALUES (13, 'IMPBILAN', 'IMP', 1, 11, 'E'); +INSERT INTO profile_menu VALUES (14, 'IMPCARD', 'IMP', 1, 12, 'E'); +INSERT INTO profile_menu VALUES (15, 'IMPGL', 'IMP', 1, 13, 'E'); +INSERT INTO profile_menu VALUES (16, 'IMPJRN', 'IMP', 1, 14, 'E'); +INSERT INTO profile_menu VALUES (17, 'IMPBAL', 'IMP', 1, 15, 'E'); +INSERT INTO profile_menu VALUES (68, 'CFGATTRIBCARD', 'DIVPARM', 1, 9, '= E'); +INSERT INTO profile_menu VALUES (69, 'CFGPCMN', 'PARAM', 1, 4, 'E'); +INSERT INTO profile_menu VALUES (70, 'CFGEXTENSION', 'PARAM', 1, 5, 'E')= ; +INSERT INTO profile_menu VALUES (20, 'LOGOUT', NULL, 1, 19, 'M'); +INSERT INTO profile_menu VALUES (71, 'CFGSECURITY', 'PARAM', 1, 6, 'E'); +INSERT INTO profile_menu VALUES (72, 'PREDOP', 'PARAM', 1, 7, 'E'); +INSERT INTO profile_menu VALUES (73, 'CFGDOCUMENT', 'PARAM', 1, 8, 'E'); +INSERT INTO profile_menu VALUES (74, 'CFGLEDGER', 'PARAM', 1, 9, 'E'); +INSERT INTO profile_menu VALUES (75, 'PLANANC', 'ANC', 1, 1, 'E'); +INSERT INTO profile_menu VALUES (65, 'CFGCARDCAT', 'DIVPARM', 1, 7, 'E')= ; +INSERT INTO profile_menu VALUES (9, 'IMPPOSTE', 'IMP', 1, 8, 'E'); +INSERT INTO profile_menu VALUES (10, 'IMPREC', 'IMP', 1, 9, 'E'); +INSERT INTO profile_menu VALUES (11, 'IMPREPORT', 'IMP', 1, 10, 'E'); +INSERT INTO profile_menu VALUES (76, 'ANCODS', 'ANC', 1, 2, 'E'); +INSERT INTO profile_menu VALUES (77, 'ANCGROUP', 'ANC', 1, 3, 'E'); +INSERT INTO profile_menu VALUES (78, 'ANCIMP', 'ANC', 1, 4, 'E'); +INSERT INTO profile_menu VALUES (79, 'PREFERENCE', NULL, 1, 2, 'M'); +INSERT INTO profile_menu VALUES (23, 'LETTER', 'COMPTA', 1, 8, 'E'); +INSERT INTO profile_menu VALUES (24, 'LETTERCARD', 'LETTER', 1, 1, 'E'); +INSERT INTO profile_menu VALUES (27, 'LETTERACC', 'LETTER', 1, 2, 'E'); +INSERT INTO profile_menu VALUES (37, 'CUST', 'GESTION', 1, 1, 'E'); +INSERT INTO profile_menu VALUES (38, 'SUPPL', 'GESTION', 1, 2, 'E'); +INSERT INTO profile_menu VALUES (39, 'ADM', 'GESTION', 1, 3, 'E'); +INSERT INTO profile_menu VALUES (35, 'IMP', 'GESTION', 1, 4, 'E'); +INSERT INTO profile_menu VALUES (36, 'CARD', 'GESTION', 1, 6, 'E'); +INSERT INTO profile_menu VALUES (40, 'STOCK', 'GESTION', 1, 5, 'E'); +INSERT INTO profile_menu VALUES (41, 'FORECAST', 'GESTION', 1, 7, 'E'); +INSERT INTO profile_menu VALUES (42, 'FOLLOW', 'GESTION', 1, 8, 'E'); +INSERT INTO profile_menu VALUES (29, 'VERIFBIL', 'ADV', 1, 21, 'E'); +INSERT INTO profile_menu VALUES (30, 'STOCK', 'ADV', 1, 22, 'E'); +INSERT INTO profile_menu VALUES (31, 'PREDOP', 'ADV', 1, 23, 'E'); +INSERT INTO profile_menu VALUES (32, 'OPEN', 'ADV', 1, 24, 'E'); +INSERT INTO profile_menu VALUES (33, 'REPORT', 'ADV', 1, 25, 'E'); +INSERT INTO profile_menu VALUES (5, 'CARD', 'COMPTA', 1, 7, 'E'); +INSERT INTO profile_menu VALUES (43, 'HIST', 'COMPTA', 1, 1, 'E'); +INSERT INTO profile_menu VALUES (34, 'GESTION', NULL, 1, 6, 'M'); +INSERT INTO profile_menu VALUES (4, 'VEN', 'COMPTA', 1, 2, 'E'); +INSERT INTO profile_menu VALUES (3, 'ACH', 'COMPTA', 1, 3, 'E'); +INSERT INTO profile_menu VALUES (19, 'FIN', 'COMPTA', 1, 4, 'E'); +INSERT INTO profile_menu VALUES (18, 'MISC', 'COMPTA', 1, 5, 'E'); +INSERT INTO profile_menu VALUES (6, 'IMP', 'COMPTA', 1, 6, 'E'); +INSERT INTO profile_menu VALUES (28, 'ADV', 'COMPTA', 1, 20, 'E'); + + +-- +-- Data for Name: profile_user; Type: TABLE DATA; Schema: public; Owner:= dany +-- + +INSERT INTO profile_user VALUES ('phpcompta', 1, 1); + + +-- +-- Name: menu_ref_pkey; Type: CONSTRAINT; Schema: public; Owner: dany; T= ablespace:=20 +-- + +ALTER TABLE ONLY menu_ref + ADD CONSTRAINT menu_ref_pkey PRIMARY KEY (me_code); + + +-- +-- Name: profile_menu_pkey; Type: CONSTRAINT; Schema: public; Owner: dan= y; Tablespace:=20 +-- + +ALTER TABLE ONLY profile_menu + ADD CONSTRAINT profile_menu_pkey PRIMARY KEY (pm_id); + + +-- +-- Name: profile_pkey; Type: CONSTRAINT; Schema: public; Owner: dany; Ta= blespace:=20 +-- + +ALTER TABLE ONLY profile + ADD CONSTRAINT profile_pkey PRIMARY KEY (p_id); + + +-- +-- Name: profile_user_pkey; Type: CONSTRAINT; Schema: public; Owner: dan= y; Tablespace:=20 +-- + +ALTER TABLE ONLY profile_user + ADD CONSTRAINT profile_user_pkey PRIMARY KEY (pu_id); + + +-- +-- Name: profile_user_user_name_key; Type: CONSTRAINT; Schema: public; O= wner: dany; Tablespace:=20 +-- + +ALTER TABLE ONLY profile_user + ADD CONSTRAINT profile_user_user_name_key UNIQUE (user_name, p_id); + + +-- +-- Name: fki_profile_menu_menu_ref; Type: INDEX; Schema: public; Owner: = dany; Tablespace:=20 +-- + +CREATE INDEX fki_profile_menu_menu_ref ON profile_menu USING btree (me_c= ode); + + +-- +-- Name: fki_profile_menu_profile; Type: INDEX; Schema: public; Owner: d= any; Tablespace:=20 +-- + +CREATE INDEX fki_profile_menu_profile ON profile_menu USING btree (p_id)= ; + + +-- +-- Name: profile_menu_me_code_fkey; Type: FK CONSTRAINT; Schema: public;= Owner: dany +-- + +ALTER TABLE ONLY profile_menu + ADD CONSTRAINT profile_menu_me_code_fkey FOREIGN KEY (me_code) REFER= ENCES menu_ref(me_code); + + +-- +-- Name: profile_menu_p_id_fkey; Type: FK CONSTRAINT; Schema: public; Ow= ner: dany +-- + +ALTER TABLE ONLY profile_menu + ADD CONSTRAINT profile_menu_p_id_fkey FOREIGN KEY (p_id) REFERENCES = profile(p_id); + + +-- +-- Name: profile_user_p_id_fkey; Type: FK CONSTRAINT; Schema: public; Ow= ner: dany +-- + +ALTER TABLE ONLY profile_user + ADD CONSTRAINT profile_user_p_id_fkey FOREIGN KEY (p_id) REFERENCES = profile(p_id) ON UPDATE CASCADE ON DELETE CASCADE; + + +-- +-- PostgreSQL database dump complete +-- + From MAILER-DAEMON Fri Oct 28 17:02:23 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RJtZH-0008JT-BD for mharc-phpcompta-dev@gnu.org; Fri, 28 Oct 2011 17:02:23 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Fri, 28 Oct 2011 23:09:15 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4252 - phpcompta/trunk/include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Oct 2011 21:02:20 -0000 Author: danydb Date: 2011-10-28 23:09:14 +0200 (Fri, 28 Oct 2011) New Revision: 4252 Modified: phpcompta/trunk/include/class_dossier.php Log: Function dossier::connect Modified: phpcompta/trunk/include/class_dossier.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_dossier.php 2011-10-28 20:59:25 UTC (re= v 4251) +++ phpcompta/trunk/include/class_dossier.php 2011-10-28 21:09:14 UTC (re= v 4252) @@ -55,9 +55,9 @@ } =20 /*! - * \param p_type string : all for all dossiers lim for only the=20 + * \param p_type string : all for all dossiers lim for only the * dossier where we've got rights - *=20 + * * Show the folder where user have access. Return : nothing ++*/ function show_dossier($p_type,$p_first=3D0,$p_max=3D10,$p_Num=3D0) @@ -230,4 +230,10 @@ { return $p_cn->get_value('select val from version'); } + static function connect() + { + $id=3DDossier::id(); + $cn=3D new Database($id); + return $cn; + } } From MAILER-DAEMON Fri Oct 28 17:26:28 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RJtwa-0003lB-3w for mharc-phpcompta-dev@gnu.org; Fri, 28 Oct 2011 17:26:28 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Fri, 28 Oct 2011 23:33:18 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4253 - in phpcompta/trunk: html include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Oct 2011 21:26:26 -0000 Author: danydb Date: 2011-10-28 23:33:16 +0200 (Fri, 28 Oct 2011) New Revision: 4253 Modified: phpcompta/trunk/html/ajax_misc.php phpcompta/trunk/html/do.php phpcompta/trunk/html/extension.php phpcompta/trunk/include/action.common.inc.php phpcompta/trunk/include/adm_card.inc.php phpcompta/trunk/include/class_action.php phpcompta/trunk/include/class_fiche.php phpcompta/trunk/include/client_card.inc.php phpcompta/trunk/include/suivi_adm.inc.php phpcompta/trunk/include/suivi_client.inc.php phpcompta/trunk/include/suivi_supplier.inc.php phpcompta/trunk/include/supplier_card.inc.php Log: problem with merging with rel600-dynamic-menu Modified: phpcompta/trunk/html/ajax_misc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/ajax_misc.php 2011-10-28 21:09:14 UTC (rev 4252) +++ phpcompta/trunk/html/ajax_misc.php 2011-10-28 21:33:16 UTC (rev 4253) @@ -21,7 +21,7 @@ // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr =20 /*!\file - * \brief this file respond to an ajax request=20 + * \brief this file respond to an ajax request * The parameters are * - gDossier * - $op operation the file has to execute @@ -286,7 +286,7 @@ $r.=3D'
'; // needed hidden var $r.=3Ddossier::hidden(); - if ( isset($_REQUEST['p_action'])) $r.=3DHtmlInput::hidden('p_= action',$_REQUEST['p_action']); + if ( isset($_REQUEST['ac'])) $r.=3DHtmlInput::hidden('ac',$_RE= QUEST['ac']); if ( isset($_REQUEST['sa'])) $r.=3DHtmlInput::hidden('sa',$_RE= QUEST['sa']); if ( isset($_REQUEST['acc'])) $r.=3DHtmlInput::hidden('acc',$_= REQUEST['acc']); $r.=3DHtmlInput::hidden('j_id',$j_id); Modified: phpcompta/trunk/html/do.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/do.php 2011-10-28 21:09:14 UTC (rev 4252) +++ phpcompta/trunk/html/do.php 2011-10-28 21:33:16 UTC (rev 4253) @@ -24,7 +24,7 @@ /* !\file * \brief Main file */ - +require_once 'class_database.php'; require_once ('class_dossier.php'); require_once('user_common.php'); require_once('ac_common.php'); Modified: phpcompta/trunk/html/extension.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/extension.php 2011-10-28 21:09:14 UTC (rev 4252) +++ phpcompta/trunk/html/extension.php 2011-10-28 21:33:16 UTC (rev 4253) @@ -55,7 +55,7 @@ $hidden=3Ddossier::hidden(); echo '
-
= '. + '. $hidden; =20 echo HtmlInput::button_anchor(_('Pr=C3=A9f=C3=A9rence'),'user_pref.p= hp'); @@ -72,7 +72,7 @@ $msg=3D_('Retour accueil'); ?>
- + '; =20 // Add hidden tag - echo ''; + echo ''; =20 echo dossier::hidden(); $act->ag_comment=3D""; if (isset($_REQUEST['qcode_dest'])) $act->qcode_dest=3D$_REQUEST= ['qcode_dest']; echo $act->Display('NEW',false,$base,$retour); =20 - echo ''; + echo ''; echo ''; echo ''; echo '

'; @@ -143,12 +143,11 @@ $act->ag_id=3D$ag_id; echo $act->get(); $act->ag_comment=3DDecode($act->ag_comment); - echo ''; + echo ''; echo $supl_hidden; - echo HtmlInput::hidden('p_action',$_REQUEST['p_action']); + echo HtmlInput::hidden('ac',$_REQUEST['ac']); echo dossier::hidden(); echo $act->Display('UPD',false,$base,$retour); - echo ''; echo ''; echo HtmlInput::submit("save","Sauve"); echo HtmlInput::submit("add_action_here",_("Ajoute une action =C3=A0= celle-ci")); @@ -191,7 +190,7 @@ $act->d_id=3D0; echo '
'; // Add hidden tag - echo ''; + echo ''; echo $supl_hidden; echo dossier::hidden(); =20 @@ -200,7 +199,7 @@ if (isset($_REQUEST['qcode'])) $act->qcode_dest=3D$_REQUEST['qcode']= ; echo $act->Display('NEW',false,$base,$retour); =20 - echo ''; + echo ''; echo ''= ; echo ''; echo ''; @@ -224,8 +223,8 @@ echo $act->save(); $url=3D"?$base&sa=3Ddetail&ag_id=3D".$act->ag_id.'&'.dossier::get(); echo '

'.hb('Action Sauv=C3=A9= e : '.$act->ag_ref).'

'; - =20 =20 + ShowActionList($cn,$base); $url=3D"?$base&sa=3Ddetail&ag_id=3D".$act->ag_id.'&'.dossier::get(); echo '

'.hb('Action Sauv=C3=A9= e : '.$act->ag_ref).'

'; @@ -240,7 +239,7 @@ - + name=3D'qcode'; @@ -284,7 +284,10 @@ =20 $see_all=3Dnew ICheckBox('see_all'); $my_action=3Dnew ICheckBox('all_action'); - if ( $_REQUEST ['p_action'] !=3D 'suivi_courrier') =20 +/** + * @todo + * if ( $_REQUEST ['p_action'] !=3D 'suivi_courrier') + * { $see_all->selected=3Dtrue; $my_action->selected=3D true; @@ -294,13 +297,15 @@ $see_all->selected=3D(isset($_REQUEST ['see_all']))?true:false; $my_action->selected=3D (isset($_REQUEST ['all_action']))?true:fal= se; } + * + */ echo _('les actions ferm=C3=A9es aussi:').$see_all->input().'
'; =20 echo _('affect=C3=A9 =C3=A0 d\'autre:').$my_action->input().'
'; ?> "> - "> + =20 @@ -309,11 +314,11 @@ =20
-
+ "> - "> + "> ','','search_action')" value=3D""> Modified: phpcompta/trunk/include/adm_card.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/adm_card.inc.php 2011-10-28 21:09:14 UTC (rev= 4252) +++ phpcompta/trunk/include/adm_card.inc.php 2011-10-28 21:33:16 UTC (rev= 4253) @@ -28,14 +28,15 @@ */ require_once('class_contact.php'); require_once('class_ipopup.php'); +$str_dossier=3DDossier::get(); =20 /* $sub_action =3D sb =3D detail */ /* $cn database conx */ $return=3Dnew IAction(); $return->name=3D'retour'; $return->label=3D'Retour'; -$return->value=3D'?p_action=3Dadm&'.$str_dossier; -$root=3D"?p_action=3Dadm&sb=3Ddetail&f_id=3D".$_REQUEST["f_id"].'&'.$str= _dossier; +$return->value=3D'?ac=3D'.$_REQUEST['ac'].'&'.$str_dossier; +$root=3D'?ac=3D'.$_REQUEST['ac']."&sb=3Ddetail&f_id=3D".$_REQUEST["f_id"= ].'&'.$str_dossier; $ss_action=3D( isset ($_REQUEST['sc'] ))? $_REQUEST['sc']: ''; switch ($ss_action) { @@ -70,7 +71,7 @@ array($root.'&sc=3Dop',_('Op=C3=A9rations'),_('Toutes = les op=C3=A9rations'),4), array($root.'&sc=3Dbal',_('Balance'),_('Balance du fou= rnisseur'),7), array($root.'&sc=3Dlet',_('Lettrage'),_('Op=C3=A9ratio= ns & Lettrages'),6), - array('?p_action=3Dadm&'.dossier::get(),_('Retour list= e'),_('Retour =C3=A0 la liste des administration'),5) + array('?ac=3D'.$_REQUEST['ac']."&".dossier::get(),_('R= etour liste'),_('Retour =C3=A0 la liste des administration'),5) ), 'H',"mtitle","mtitle",$def,' '); echo '
'; Modified: phpcompta/trunk/include/class_action.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_action.php 2011-10-28 21:09:14 UTC (rev= 4252) +++ phpcompta/trunk/include/class_action.php 2011-10-28 21:33:16 UTC (rev= 4253) @@ -95,7 +95,7 @@ * * \param $p_view if set to true the form will be in readonly mode (= value: true or false) * \param $p_gen true we show the tag for generating a doc (value : = true or false) - *\param $p_base is the p_action parameter + *\param $p_base is the ac parameter *\param $retour is the html code for the return button * \note update the reference number or the document type is not al= lowed * @@ -296,7 +296,7 @@ if( isset($_REQUEST['sb'])) $supl_hidden.=3D'&sb=3D'.$_REQUEST['sb']; =20 - $lag_ref_ag_id=3D'ag_ref_ag_id.'&'.dossier::get().'">'. $this->db->get_value("select ag_ref from = action_gestion where ag_id=3D$1",array($this->ag_ref_ag_id)). ""; @@ -643,7 +643,7 @@ } /*! myList($p_filter=3D"") * \brief Show list of action by default if sorted on date - *\param $p_base base url with p_action... + *\param $p_base base url with ac... * \param $p_filter filters on the document_type * \param $p_search must a valid sql command ( ex 'and ag_title lik= e upper('%hjkh%')) * \return string containing html code @@ -821,7 +821,7 @@ //show the sub_action foreach ($a_row as $row ) { - $href=3D''; + $href=3D''; $i++; $tr=3D($i%2=3D=3D0)?'even':'odd'; if ($row['ag_priority'] < 2) $tr=3D'priority1'; @@ -857,7 +857,7 @@ { foreach ($retSql as $line) { - $ref.=3D''. + $ref.=3D''. $line['ag_ref'].""; } } Modified: phpcompta/trunk/include/class_fiche.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_fiche.php 2011-10-28 21:09:14 UTC (rev = 4252) +++ phpcompta/trunk/include/class_fiche.php 2011-10-28 21:33:16 UTC (rev = 4253) @@ -1573,8 +1573,8 @@ if ( $p_amount && $amount['debit']=3D=3D0 && $amount['credit= '] =3D=3D 0 && $amount['solde'] =3D=3D 0 ) continue; =20 $r.=3D""; - $e=3Dsprintf(' ', - $script,$p_action,$tiers->id,$str_dossier); + $e=3Dsprintf(' ', + $script,$_REQUEST['ac'],$tiers->id,$str_dossier); =20 $r.=3D" $e".$tiers->strAttribut(ATTR_DEF_QUICKCODE).""; $r.=3D"".h($tiers->strAttribut(ATTR_DEF_NAME)).""; Modified: phpcompta/trunk/include/client_card.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/client_card.inc.php 2011-10-28 21:09:14 UTC (= rev 4252) +++ phpcompta/trunk/include/client_card.inc.php 2011-10-28 21:33:16 UTC (= rev 4253) @@ -32,8 +32,9 @@ =20 /* $sub_action =3D sb =3D detail */ /* $cn database conx */ +$str_dossier=3DDossier::get(); $return=3D HtmlInput::button_anchor('Retour','?p_action=3Dclient&'.$str_= dossier); -$root=3D"?p_action=3Dclient&sb=3Ddetail&f_id=3D".$_REQUEST["f_id"].'&'.$= str_dossier; +$root=3D"?p_action=3Dclient&sb=3Ddetail&f_id=3D".$_REQUEST["f_id"].'&'.$= str_dossier."&ac=3D".$_REQUEST["ac"]; $ss_action=3D( isset ($_REQUEST['sc'] ))? $_REQUEST['sc']: ''; switch ($ss_action) { @@ -68,7 +69,7 @@ array($root.'&sc=3Dop',_('Op=C3=A9rations'),_('Toutes = les op=C3=A9rations'),4), array($root.'&sc=3Dbal',_('Balance'),_('Balance du client'),7), array($root.'&sc=3Dlet',_('Lettrage'),_('Op=C3=A9ratio= ns & Lettrages'),6), - array('?p_action=3Dclient&'.dossier::get(),_('Retour l= iste'),_('Retour =C3=A0 la liste des clients'),5) + array('?ac=3D'.$_REQUEST['ac'].'&'.dossier::get(),_('R= etour liste'),_('Retour =C3=A0 la liste des clients'),5) ), 'H',"mtitle","mtitle",$def,''); echo '
'; Modified: phpcompta/trunk/include/suivi_adm.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/suivi_adm.inc.php 2011-10-28 21:09:14 UTC (re= v 4252) +++ phpcompta/trunk/include/suivi_adm.inc.php 2011-10-28 21:33:16 UTC (re= v 4253) @@ -22,11 +22,10 @@ =20 /*!\file * \brief this file is used for the follow up of the customer (mail, mee= ting...) - * - p_action =3D adm - * - sb =3D detail=20 + * - sb =3D detail * - sc =3D sv * - sd =3D this parameter is used here - * - $cn =3D database connection=20 + * - $cn =3D database connection */ require_once('class_action.php'); $g_user->can_request(GECOUR); @@ -38,8 +37,8 @@ */ $sub_action=3D(isset($_REQUEST['sa']))?$_REQUEST['sa']:"list"; $ag_id=3D(isset($_REQUEST['ag_id']))?$_REQUEST['ag_id']:0; -$p_action=3D$_REQUEST['p_action']; -$base=3D"p_action=3D$p_action&sc=3Dsv&sb=3Ddetail&f_id=3D".$_REQUEST['f_= id']; +$ac=3D$_REQUEST['ac']; +$base=3D"ac=3Dac&sc=3Dsv&sb=3Ddetail&f_id=3D".$_REQUEST['f_id']; $retour=3DHtmlInput::button_anchor('Retour','?'.dossier::get().'&'.$base= ); $fiche=3Dnew Fiche($cn,$_REQUEST['f_id']); =20 Modified: phpcompta/trunk/include/suivi_client.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/suivi_client.inc.php 2011-10-28 21:09:14 UTC = (rev 4252) +++ phpcompta/trunk/include/suivi_client.inc.php 2011-10-28 21:33:16 UTC = (rev 4253) @@ -23,13 +23,12 @@ /*!\file * \brief this file is used for the follow up of the customer (mail, mee= ting...) * - p_action =3D client - * - sb =3D detail=20 + * - sb =3D detail * - sc =3D sv * - sd =3D this parameter is used here - * - $cn =3D database connection=20 + * - $cn =3D database connection */ require_once('class_action.php'); -$User->can_request(GECOUR); load_all_script(); =20 /** @@ -39,8 +38,8 @@ */ $sub_action=3D(isset($_REQUEST['sa']))?$_REQUEST['sa']:"list"; $ag_id=3D(isset($_REQUEST['ag_id']))?$_REQUEST['ag_id']:0; -$p_action=3D$_REQUEST['p_action']; -$base=3D"p_action=3D$p_action&sc=3Dsv&sb=3Ddetail&f_id=3D".$_REQUEST['f_= id']; +//$p_action=3D$_REQUEST['p_action']; +$base=3D"ac=3D".$_REQUEST['ac']."&sc=3Dsv&sb=3Ddetail&f_id=3D".$_REQUEST= ['f_id']; $retour=3DHtmlInput::button_anchor('Retour','?'.dossier::get().'&'.$base= ); $fiche=3Dnew Fiche($cn,$_REQUEST['f_id']); =20 Modified: phpcompta/trunk/include/suivi_supplier.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/suivi_supplier.inc.php 2011-10-28 21:09:14 UT= C (rev 4252) +++ phpcompta/trunk/include/suivi_supplier.inc.php 2011-10-28 21:33:16 UT= C (rev 4253) @@ -38,8 +38,7 @@ */ $sub_action=3D(isset($_REQUEST['sa']))?$_REQUEST['sa']:"list"; $ag_id=3D(isset($_REQUEST['ag_id']))?$_REQUEST['ag_id']:0; -$p_action=3D$_REQUEST['p_action']; -$base=3D"p_action=3D$p_action&sc=3Dsv&sb=3Ddetail&f_id=3D".$_REQUEST['f_= id']; +$base=3D"ac=3D".$_REQUEST['ac']."&sc=3Dsv&sb=3Ddetail&f_id=3D".$_REQUEST= ['f_id']; $retour=3DHtmlInput::button_anchor('Retour','?'.dossier::get().'&'.$base= ); $fiche=3Dnew Fiche($cn,$_REQUEST['f_id']); =20 Modified: phpcompta/trunk/include/supplier_card.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/supplier_card.inc.php 2011-10-28 21:09:14 UTC= (rev 4252) +++ phpcompta/trunk/include/supplier_card.inc.php 2011-10-28 21:33:16 UTC= (rev 4253) @@ -28,14 +28,14 @@ */ require_once('class_contact.php'); =20 - +$str_dossier=3DDossier::get(); /* $sub_action =3D sb =3D detail */ /* $cn database conx */ $return=3Dnew IAction(); $return->name=3D'retour'; $return->label=3D'Retour'; -$return->value=3D'?p_action=3Dsupplier&'.$str_dossier; -$root=3D"?p_action=3Dsupplier&sb=3Ddetail&f_id=3D".$_REQUEST["f_id"].'&'= .$str_dossier; +$return->value=3D'?ac=3D'.$_REQUEST['ac'].'&'.$str_dossier; +$root=3D'?ac=3D'.$_REQUEST['ac']."&sb=3Ddetail&f_id=3D".$_REQUEST["f_id"= ].'&'.$str_dossier; $ss_action=3D( isset ($_REQUEST['sc'] ))? $_REQUEST['sc']: ''; switch ($ss_action) { @@ -71,7 +71,7 @@ array($root.'&sc=3Dop',_('Op=C3=A9rations'),_('Toutes = les op=C3=A9rations'),4), array($root.'&sc=3Dbal',_('Balance'),_('Balance du fou= rnisseur'),7), array($root.'&sc=3Dlet',_('Lettrage'),_('Op=C3=A9ratio= ns & Lettrages'),6), - array('?p_action=3Dsupplier&'.dossier::get(),_('Retour= liste'),_('Retour =C3=A0 la liste des fournisseurs'),5) + array('?ac=3D'.$_REQUEST['ac'].'&'.dossier::get(),_('R= etour liste'),_('Retour =C3=A0 la liste des fournisseurs'),5) ), 'H',"mtitle","mtitle",$def,' '); echo '
'; From MAILER-DAEMON Fri Oct 28 17:40:43 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RJuAN-0005SP-3B for mharc-phpcompta-dev@gnu.org; Fri, 28 Oct 2011 17:40:43 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Fri, 28 Oct 2011 23:47:34 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4254 - phpcompta/trunk/include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Oct 2011 21:40:41 -0000 Author: danydb Date: 2011-10-28 23:47:32 +0200 (Fri, 28 Oct 2011) New Revision: 4254 Modified: phpcompta/trunk/include/class_acc_bilan.php phpcompta/trunk/include/company.inc.php phpcompta/trunk/include/compta_fin.inc.php phpcompta/trunk/include/impress_bilan.inc.php phpcompta/trunk/include/param_pcmn.inc.php phpcompta/trunk/include/stock_inc.php phpcompta/trunk/include/suivi_supplier.inc.php Log: integration menu dynamique Modified: phpcompta/trunk/include/class_acc_bilan.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_acc_bilan.php 2011-10-28 21:33:16 UTC (= rev 4253) +++ phpcompta/trunk/include/class_acc_bilan.php 2011-10-28 21:47:32 UTC (= rev 4254) @@ -273,7 +273,7 @@ $form=3Dfopen($this->b_file_form,'r'); if ( $form =3D=3D false) { - echo __FILE__.":".__LINE__.'Cannot Open'.$this->b_file_form; + echo 'Cannot Open'; exit(); } return $form; @@ -285,7 +285,7 @@ $templ=3Dfopen($this->b_file_template,'r'); if ( $templ =3D=3D false) { - echo __FILE__.":".__LINE__.'Cannot Open'.$this->b_file_templ= ate; + echo 'Cannot Open'; exit(); } return $templ; @@ -296,8 +296,8 @@ * \param $p_handle the handle to the file * \param * \param + *=20 * - * * \return */ function compute_formula($p_handle) @@ -305,8 +305,10 @@ while (! feof ($p_handle)) { $buffer=3Dtrim(fgets($p_handle)); - - if (strlen(trim($buffer))=3D=3D0) + // $a=3D(CheckFormula($buffer) =3D=3D true)?"$buffer ok
= ":''.'Pas ok '.$buffer."
"; + // echo $a; + // blank line are skipped + if (strlen(trim($buffer))=3D=3D0) continue; // skip comment if ( strpos($buffer,'#') =3D=3D=3D true ) @@ -322,9 +324,9 @@ }// end read form line per line } /*!\brief generate the ods document - * \param the handle to the template file - * \return the xml - *@note + * \param the handle to the template file=20 + * \return the xml=20 + *@note=20 * Sur une seule ligne il y a plusieurs donn=C3=A9es, donc il y a plu= sieurs boucles, pour les autres documents * cela devrait =C3=AAtre fait aussi, actuellement ces documents, n'a= cceptent qu'une formule par ligne. *@note @@ -350,13 +352,13 @@ ob_start(); /* unzip the document */ $zip =3D new Zip_Extended; - if ($zip->open($work_file) =3D=3D=3D TRUE) + if ($zip->open($work_file) =3D=3D=3D TRUE)=20 { $zip->extractTo($dirname.DIRECTORY_SEPARATOR); $zip->close(); - } else + } else=20 { - echo __FILE__.":".__LINE__."cannot unzip model ".$filename; + echo __FILE__.":".__LINE__."cannot unzip model ".$filename;=09 } =20 ob_end_clean(); @@ -389,7 +391,7 @@ // the line contains the magic << $tmp=3D""; =20 - + =20 while (preg_match_all($regex,$line_rtf,$f2) > 0 ) { // the f2 array contains all the magic << in the line @@ -604,13 +606,13 @@ case 'ods': /* header("Pragma: public"); header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); - header("Cache-Control: must-revalidate"); + header("Cache-Control: must-revalidate");=20 if ( $this->b_type =3D=3D 'odt' ) header('Content-type: application/vnd.oasis.opendocument.tex= t'); if ( $this->b_type =3D=3D 'ods' ) header('Content-type: application/vnd.oasis.opendocument.spr= eadsheet'); header('Content-Disposition: attachment;filename=3D"'.$this-= >b_name.'.odt"',FALSE); - header("Accept-Ranges: bytes"); + header("Accept-Ranges: bytes");=20 */ ob_start(); // save the file in a temp folder @@ -634,14 +636,14 @@ */ ob_start(); $zip =3D new Zip_Extended; - if ($zip->open($work_file) =3D=3D=3D TRUE) + if ($zip->open($work_file) =3D=3D=3D TRUE)=20 { $zip->extractTo($dirname.DIRECTORY_SEPARATOR); $zip->close(); - } - else + }=20 + else=20 { - echo __FILE__.":".__LINE__."cannot unzip model ".$filename; + echo __FILE__.":".__LINE__."cannot unzip model ".$filename;=09 } =20 // Remove the file we do not need anymore Modified: phpcompta/trunk/include/company.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/company.inc.php 2011-10-28 21:33:16 UTC (rev = 4253) +++ phpcompta/trunk/include/company.inc.php 2011-10-28 21:47:32 UTC (rev = 4254) @@ -22,6 +22,8 @@ if ( $g_user->check_action(PARSTR)!=3D0) $m->MY_STRICT=3D$p_stri= ct; if ( $g_user->check_action(PARTVA)!=3D0)$m->MY_TVA_USE=3D$p_tva_= use; $m->MY_PJ_SUGGEST=3D$p_pj; + $m->MY_ALPHANUM=3D$p_alphanum; + $m->Update(); } =20 @@ -37,6 +39,9 @@ array('value'=3D>'Y','label'=3D>_('Oui')) ); =20 + $alpha_num_array[0]=3Darray('value'=3D>'N','label'=3D>_('Non')); + $alpha_num_array[1]=3Darray('value'=3D>'Y','label'=3D>_('Oui')); + $compta=3Dnew ISelect(); $compta->table=3D1; $compta->selected=3D$my->MY_ANALYTIC; @@ -60,7 +65,12 @@ $check_periode=3Dnew ISelect(); $check_periode->table=3D1; $check_periode->selected=3D$my->MY_CHECK_PERIODE; + $alpha_num=3Dnew ISelect(); + $alpha_num->table=3D1; + $alpha_num->value=3D$alpha_num_array; + $alpha_num->selected=3D$my->MY_ALPHANUM; =20 + // other parameters $all=3Dnew IText(); $all->table=3D1; @@ -93,6 +103,8 @@ echo "".td(_("Sugg=C3=A9rer le num=C3=A9ro de pi=C3=A8ce justifi= cative"),'style=3D"text-align:right"').$pj_suggest->input("p_pj",$strict_= array).""; echo "".td(_("Sugg=C3=A9rer la date"),'style=3D"text-align:right= "').$date_suggest->input("p_date_suggest",$strict_array).""; echo ''.td(_('Afficher la p=C3=A9riode comptable pour =C3=A9vite= r les erreurs de date'),'style=3D"text-align:right"').$check_periode->inp= ut('p_check_periode',$strict_array).''; + echo ''.td(_('Utilisez des postes comptables alphanum=C3=A9rique= '),'style=3D"text-align:right"').$alpha_num->input('p_alphanum').''; + echo ""; echo HtmlInput::submit("record_company",_("Sauve")); echo ""; Modified: phpcompta/trunk/include/compta_fin.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/compta_fin.inc.php 2011-10-28 21:33:16 UTC (r= ev 4253) +++ phpcompta/trunk/include/compta_fin.inc.php 2011-10-28 21:47:32 UTC (r= ev 4254) @@ -25,6 +25,7 @@ */ require_once ('class_acc_ledger_fin.php'); require_once('class_ipopup.php'); +global $g_user; =20 $gDossier=3Ddossier::id(); =20 @@ -76,7 +77,7 @@ $def_ledger=3D$Ledger->get_first('fin'); $Ledger->id=3D$def_ledger['jrn_def_id']; } - $jrn_priv=3D$User->get_ledger_access($Ledger->id); + $jrn_priv=3D$g_user->get_ledger_access($Ledger->id); // Check privilege if ( isset($_REQUEST['p_jrn']) && ( $jrn_priv =3D=3D 'X')) { @@ -187,7 +188,7 @@ /* by default we should the default period */ if ( ! isset($p_array['date_start'])) { - $period=3D$User->get_periode(); + $period=3D$g_user->get_periode(); $per=3Dnew Periode($cn,$period); list($date_start,$date_end)=3D$per->get_date_limit(); $p_array['date_start']=3D$date_start; @@ -246,7 +247,7 @@ .th('diff=C3=A9rence',' style=3D"text-align:right"')); // Filter the saldo // on the current year - $filter_year=3D" j_tech_per in (select p_id from parm_periode where= p_exercice=3D'".$User->get_exercice()."')"; + $filter_year=3D" j_tech_per in (select p_id from parm_periode where= p_exercice=3D'".$g_user->get_exercice()."')"; // for highligting tje line $idx=3D0; bcscale(2); @@ -265,7 +266,7 @@ $saldo_not_reconcilied=3D$array[$i]->get_bk_balance($filter_= year." and (trim(jr_pj_number) =3D'' or jr_pj_number is null)" ); =20 /* get saldo for reconcilied operation */ - =20 + $saldo_reconcilied=3D$array[$i]->get_bk_balance($filter_year." and = ( trim(jr_pj_number) !=3D '' and jr_pj_number is not null)" ); =20 if ( $idx%2 !=3D 0 ) @@ -314,7 +315,7 @@ } else $Ledger->id=3D$_REQUEST['p_jrn']; - $jrn_priv=3D$User->get_ledger_access($Ledger->id); + $jrn_priv=3D$g_user->get_ledger_access($Ledger->id); if ( isset($_GET["p_jrn"]) && $jrn_priv=3D=3D"X") { NoAccess(); @@ -351,7 +352,7 @@ echo HtmlInput::get_to_hidden(array('gDossier','ledger_type','ac','s= a')); $wLedger=3D$Ledger->select_ledger('FIN',3); if ($wLedger =3D=3D null ) exit ('Pas de journal disponible'); - =20 + $wLedger->javascript=3D"onchange=3D'this.form.submit()';"; echo $wLedger->input(); echo HtmlInput::submit('ref','Rafra=C3=AEchir'); @@ -410,7 +411,7 @@ echo ''; $bk_card=3Dnew Fiche($cn); $bk_card->id=3D$Ledger->get_bank(); - $filter_year=3D" j_tech_per in (select p_id from parm_periode where= p_exercice=3D'".$User->get_exercice()."')"; + $filter_year=3D" j_tech_per in (select p_id from parm_periode where= p_exercice=3D'".$g_user->get_exercice()."')"; =20 /* get saldo for not reconcilied operations */ $saldo_not_reconcilied=3D$bk_card->get_solde_detail($filter_year." a= nd j_grpt in (select jr_grpt_id from jrn where trim(jr_pj_number) =3D'' o= r jr_pj_number is null)" ); Modified: phpcompta/trunk/include/impress_bilan.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/impress_bilan.inc.php 2011-10-28 21:33:16 UTC= (rev 4253) +++ phpcompta/trunk/include/impress_bilan.inc.php 2011-10-28 21:47:32 UTC= (rev 4254) @@ -32,9 +32,7 @@ // Show the jrn and date //----------------------------------------------------- require_once('class_database.php'); - global $g_user; - //----------------------------------------------------- // Form //----------------------------------------------------- @@ -54,18 +52,17 @@ $wex=3D$ex->select('exercice',$exercice,' onchange=3D"submit(this)"'); echo $wex->input(); echo dossier::hidden(); -echo HtmlInput::get_to_hidden(array('p_action','type')); +echo HtmlInput::get_to_hidden(array('ac','type')); echo ''; echo '
'; =20 $filter_year=3D" where p_exercice=3D'".FormatString($exercice)."'"; echo '
'; -echo HtmlInput::hidden('p_action','impress'); echo HtmlInput::hidden('type','bilan'); echo dossier::hidden(); echo $bilan->display_form ($filter_year); echo HtmlInput::submit('verif',_('Verification comptabilite')); -echo HtmlInput::get_to_hidden(array('exercice')); +echo HtmlInput::get_to_hidden(array('ac','exercice')); echo '
'; =20 =20 Modified: phpcompta/trunk/include/param_pcmn.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/param_pcmn.inc.php 2011-10-28 21:33:16 UTC (r= ev 4253) +++ phpcompta/trunk/include/param_pcmn.inc.php 2011-10-28 21:47:32 UTC (r= ev 4254) @@ -196,8 +196,8 @@ =20 if ( isset ( $p_val) && isset ( $p_lib ) ) { - $p_val=3D$cn->get_value('select format_account($1)',array($p_val= )); - $p_parent=3D$cn->get_value('select format_account($1)',array($_P= OST["p_parent"])); + $p_val=3Dtrim($p_val); + $p_parent=3D$_POST["p_parent"]; if ( strlen ($p_val) !=3D 0 && strlen ($p_lib) !=3D 0 ) { if (strlen ($p_val) =3D=3D 1 ) Modified: phpcompta/trunk/include/stock_inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/stock_inc.php 2011-10-28 21:33:16 UTC (rev 42= 53) +++ phpcompta/trunk/include/stock_inc.php 2011-10-28 21:47:32 UTC (rev 42= 54) @@ -25,9 +25,9 @@ =20 /*! ************************************************** - * \brief show the listing of all goods=20 - * =20 + * \brief show the listing of all goods * + * *\param $cn database connection * \param $p_year exercice * - @@ -38,7 +38,7 @@ // build sql -- get the different merchandise sold or bought // during the p_year /* $sql=3D" select distinct sg_code - from stock_goods=20 + from stock_goods left outer join jrnx on (stock_goods.j_id=3Djrnx.j_id) right outer join parm_periode on (parm_periode.p_id=3Djrnx.j_tec= h_per) where @@ -75,7 +75,7 @@ =20 // sg_code and link to details $result.=3D"".'
'. $r['sg_code'].""; =20 @@ -116,12 +116,12 @@ /*! ************************************************************ * \brief return an array of f_id and f_name - * =20 - *=20 + * + * * \param $p_cn database connection * \param _sg_code stock_goods.sg_code * \return - * - array (f_id, f_label) or null if nothing is found=20 + * - array (f_id, f_label) or null if nothing is found */ function getFicheNameCode ($p_cn,$p_sg_code) { @@ -153,9 +153,9 @@ } /*! ************************************************** - * \brief View the details of a stock=20 - * =20 - *=20 + * \brief View the details of a stock + * + * *\param $p_cn database connection * \param$p_sg_code * \param $p_year @@ -315,9 +315,9 @@ } /*! ************************************************** - * \brief =20 - * =20 - * parm :=20 + * \brief + * + * parm : * - * gen : * - @@ -344,7 +344,7 @@ =20 } /*! - * \brief return the quantity of a sg_code for the period=20 + * \brief return the quantity of a sg_code for the period * * \return number or NULL */ Modified: phpcompta/trunk/include/suivi_supplier.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/suivi_supplier.inc.php 2011-10-28 21:33:16 UT= C (rev 4253) +++ phpcompta/trunk/include/suivi_supplier.inc.php 2011-10-28 21:47:32 UT= C (rev 4254) @@ -22,11 +22,10 @@ =20 /*!\file * \brief this file is used for the follow up of the customer (mail, mee= ting...) - * - p_action =3D supplier - * - sb =3D detail=20 + * - sb =3D detail * - sc =3D sv * - sd =3D this parameter is used here - * - $cn =3D database connection=20 + * - $cn =3D database connection */ require_once('class_action.php'); $g_user->can_request(GECOUR); @@ -38,7 +37,8 @@ */ $sub_action=3D(isset($_REQUEST['sa']))?$_REQUEST['sa']:"list"; $ag_id=3D(isset($_REQUEST['ag_id']))?$_REQUEST['ag_id']:0; -$base=3D"ac=3D".$_REQUEST['ac']."&sc=3Dsv&sb=3Ddetail&f_id=3D".$_REQUEST= ['f_id']; +$p_action=3D$_REQUEST['ac']; +$base=3D"ac=3D$p_action&sc=3Dsv&sb=3Ddetail&f_id=3D".$_REQUEST['f_id']; $retour=3DHtmlInput::button_anchor('Retour','?'.dossier::get().'&'.$base= ); $fiche=3Dnew Fiche($cn,$_REQUEST['f_id']); =20 From MAILER-DAEMON Fri Oct 28 17:41:15 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RJuAt-0005TG-5l for mharc-phpcompta-dev@gnu.org; Fri, 28 Oct 2011 17:41:15 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Fri, 28 Oct 2011 23:48:09 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4255 - phpcompta/trunk/sql X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Oct 2011 21:41:14 -0000 Author: danydb Date: 2011-10-28 23:48:08 +0200 (Fri, 28 Oct 2011) New Revision: 4255 Modified: phpcompta/trunk/sql/upgrade.sql Log: adapt SQL script( Modified: phpcompta/trunk/sql/upgrade.sql =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/sql/upgrade.sql 2011-10-28 21:47:32 UTC (rev 4254) +++ phpcompta/trunk/sql/upgrade.sql 2011-10-28 21:48:08 UTC (rev 4255) @@ -14,5 +14,6 @@ tmp_pcmn_ins.sql trigger.tmp_pcmn.sql account_add.sql +object-6.0.sql */ create unique index qcode_idx on fiche_detail (ad_value) where ad_id=3D2= 3; From MAILER-DAEMON Fri Oct 28 17:49:21 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RJuIj-0006PI-2j for mharc-phpcompta-dev@gnu.org; Fri, 28 Oct 2011 17:49:21 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Fri, 28 Oct 2011 23:56:14 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4256 - phpcompta/trunk X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Oct 2011 21:49:19 -0000 Author: danydb Date: 2011-10-28 23:56:12 +0200 (Fri, 28 Oct 2011) New Revision: 4256 Modified: phpcompta/trunk/ Log: End integration branches/rel600-dynamic-menu Property changes on: phpcompta/trunk ___________________________________________________________________ Name: svnmerge-integrated - /phpcompta/branches/rel600-dynamic-menu:1-4250 /phpcompta/branches/r= el560:1-4220 + /phpcompta/branches/rel560:1-4220 From MAILER-DAEMON Fri Oct 28 17:50:56 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RJuKG-00079M-IT for mharc-phpcompta-dev@gnu.org; Fri, 28 Oct 2011 17:50:56 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Fri, 28 Oct 2011 23:57:46 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4257 - phpcompta/trunk/html X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Oct 2011 21:50:55 -0000 Author: danydb Date: 2011-10-28 23:57:45 +0200 (Fri, 28 Oct 2011) New Revision: 4257 Removed: phpcompta/trunk/html/commercial.php phpcompta/trunk/html/comptanalytic.php phpcompta/trunk/html/parametre.php Log: remove obsolete Deleted: phpcompta/trunk/html/commercial.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/commercial.php 2011-10-28 21:56:12 UTC (rev 4256= ) +++ phpcompta/trunk/html/commercial.php 2011-10-28 21:57:45 UTC (rev 4257= ) @@ -1,239 +0,0 @@ -Check(); -if ($User->check_dossier($gDossier)=3D=3D'P') -{ - redirect("extension.php?".dossier::get(),0); - exit(); -} - -//----------------------------------------------------- -// update preference -//----------------------------------------------------- -if ( isset ( $_POST['style_user']) ) -{ - $User->update_global_pref('THEME',$_POST['style_user']); - $_SESSION['g_theme']=3D$_POST['style_user']; - -} -// Met a jour le pagesize -if ( isset ( $_POST['p_size']) ) -{ - $User->update_global_pref('PAGESIZE',$_POST['p_size']); - $_SESSION['g_pagesize']=3D$_POST['p_size']; - -} - -/// -html_page_start($_SESSION['g_theme'],"",""); - -if ( ! isset ( $gDossier ) ) -{ - echo _("Vous devez choisir un dossier "); - exit -2; -} -include_once("user_menu.php"); -$str_dossier=3Ddossier::get(); - -$p_action=3D(isset ($_REQUEST['p_action']))?$_REQUEST['p_action']:""; -echo '
'; -echo menu_tool('commercial.php'); - -echo '
'; -$def=3D0; -if ( isset($_REQUEST['p_action'])) -{ - switch($_REQUEST['p_action']) - { - case'tdb': - $def=3D1; - break; - case'client': - $def=3D2; - break; - case'tdb': - $def=3D1; - break; - case'supplier': - $def=3D3; - break; - case'adm': - $def=3D4; - break; - case'stock': - $def=3D5; - break; - case'fiche': - $def=3D6; - break; - case'prev': - $def=3D7; - break; - case'suivi_courrier': - $def=3D8; - break; - case'impress': - $def=3D9; - break; - - } -} -echo ShowItem(array( - array('?p_action=3Dclient&'.$str_dossier,_('Client'),'= ',2), - array('?p_action=3Dsupplier&'.$str_dossier,_('Fourniss= eur'),'',3), - array('?p_action=3Dadm&'.$str_dossier,_('Administratio= n'),'',4), - array('?p_action=3Dimpress&'.$str_dossier,_('Impressio= n'),'',9), - array('?p_action=3Dstock&'.$str_dossier,_('Stock'),'',= 5), - array('?p_action=3Dfiche&'.$str_dossier,_('Fiche'),'',= 6), - array('?p_action=3Dprev&'.$str_dossier,_('Prevision'),= '',7), - array('?p_action=3Dsuivi_courrier&my_action&'.$str_dos= sier,_('Suivi'),'',8), - ), - 'H',"mtitle","mtitle",$def,' style=3D"width:100%"'); - -echo '
'; -echo '
'; - -$cn=3Dnew Database($gDossier); - -//----------------------------------------------------- -// p_action =3D=3D pref -//----------------------------------------------------- -if ( $p_action =3D=3D "pref" ) -{ - require_once("pref.inc.php"); -} -//----------------------------------------------------- -// p_action =3D=3D impression -//----------------------------------------------------- -if ( $p_action =3D=3D "impress" ) -{ - require_once("impress.inc.php"); -} - - -//----------------------------------------------------- -// p_action =3D=3D adm -//----------------------------------------------------- -if ( $p_action =3D=3D "adm" ) -{ - $User->can_request(GEADM,1); - require_once("adm.inc.php"); -} -//----------------------------------------------------- -// p_action =3D=3D client -//----------------------------------------------------- -if ( $p_action =3D=3D "client" ) -{ - $User->can_request(GECUST,1); - require_once("client.inc.php"); -} -// $p_action =3D=3D fournisseur -//----------------------------------------------------- -// Fournisseur -if ( $p_action =3D=3D 'supplier') -{ - $User->can_request(GESUPPL,1); - require_once("supplier.inc.php"); -} - -//----------------------------------------------------- -// action -if ( $p_action =3D=3D 'suivi_courrier') -{ - $User->can_request(GECOUR,1); - require_once("action.inc.php"); -} -//----------------------------------------------------- -// Contact -if ( $p_action =3D=3D 'fiche') -{ - require_once("fiche.inc.php"); -} -//----------------------------------------------------- -// Impression -if ( $p_action =3D=3D 'impress') -{ - if ( $User->check_action(IMPRAP)=3D=3D1 || - $User->check_action(IMPJRN)=3D=3D1 || - $User->check_action(IMPFIC)=3D=3D1 || - $User->check_action(IMPPOSTE)=3D=3D1 || - $User->check_action(IMPBIL)=3D=3D1 ) - require_once("impress.inc.php"); - else - $User->can_request(9999,1); -} -if ( $p_action =3D=3D 'fiche') -{ - require_once('fiche.inc.php'); -} -if ( $p_action =3D=3D 'stock') -{ - require_once('stock.inc.php'); -} -if ( $p_action=3D=3D'periode') -{ - if ( $User->check_action(PARPER)=3D=3D1 || - $User->check_action(PARCLO)=3D=3D1) - require_once ('periode.inc.php'); - else - $User->can_request(9999,1); -} -//----------------------------------------------------- -// Expense -if ( $p_action =3D=3D 'defreport') -{ - $User->can_request(PARPREDE,1); - require_once("report.inc.php"); -} -/*---------------------------------------------------------------------- - * Prevision - * - *----------------------------------------------------------------------= */ -if ( $p_action=3D=3D'prev') -{ - $User->can_request(PREVCON,1); - require_once ('forecast.inc.php'); -} -?> \ No newline at end of file Deleted: phpcompta/trunk/html/comptanalytic.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/comptanalytic.php 2011-10-28 21:56:12 UTC (rev 4= 256) +++ phpcompta/trunk/html/comptanalytic.php 2011-10-28 21:57:45 UTC (rev 4= 257) @@ -1,151 +0,0 @@ -Check(); -if ($User->check_dossier($gDossier) =3D=3D 'P') exit(); - -load_all_script(); - -html_page_start($_SESSION['g_theme']); -/* javascript file */ -//----------------------------------------------------------------- -//Header -echo '
'; -//----------------------------------------------------------------- -echo menu_tool('comptanalytic.php'); -$def=3D-1; -if ( isset ($_REQUEST['p_action'])) -{ - switch ($_REQUEST['p_action']) - { - case 'ca_pa': - $def=3D0; - break; - case 'ca_od': - $def=3D1; - break; - case 'ca_imp': - $def=3D2; - break; - case 'ca_groupe': - $def=3D3; - break; - } -} -echo '
'; -echo ShowItem(array( - array('?p_action=3Dca_pa&'.$str_dossier,'Plan Analytiq= ue',"Plan Analytique",0), - array('?p_action=3Dca_od&'.$str_dossier,'Opérat= ions Diverses',"Permet d'enregistrer des operations sur la compta analyti= que",1), - array('?p_action=3Dca_groupe&'.$str_dossier,'Groupe','= Regroupe les postes analytiques',3), - array('?p_action=3Dca_imp&'.$str_dossier,'Impression',= "impression de rapport",2) - ), - 'H',"mtitle","mtitle",$def,' style=3D"width:75%;margin-lef= t:12%"'); -echo '
'; -echo '
'; -echo '
'; -if ( isset ($_REQUEST['p_action'])) -{ - switch ($_REQUEST['p_action']) - { - case 'ca_pa': - $User->can_request(CAPA,1); - $def=3D0; - break; - case 'ca_od': - $User->can_request(CAOD,1); - $def=3D1; - break; - case 'ca_imp': - $User->can_request(CAIMP,1); - $def=3D2; - break; - case 'ca_groupe': - $User->can_request(CAGA,1); - $def=3D3; - break; - } -} - -if ( !isset($_REQUEST['p_action'])) - exit(); - -//----------------------------------------------------- -// p_action =3D=3D pref -//----------------------------------------------------- -if ( $_REQUEST['p_action'] =3D=3D "pref" ) -{ - require_once("pref.inc.php"); - exit(); -} - -//----------------------------------------------------------------------= ----- -// p_action -//----------------------------------------------------------------------= ----- -// Plan Analytique -if ($_REQUEST['p_action'] =3D=3D 'ca_pa' ) -{ - require_once('anc_pa.inc.php'); - exit(); -} - -// Operations Diverses -if ($_REQUEST['p_action'] =3D=3D 'ca_od' ) -{ - require_once('anc_od.inc.php'); - exit(); -} -// Impression -if ($_REQUEST['p_action'] =3D=3D 'ca_groupe' ) -{ - require_once('anc_group.inc.php'); - exit(); -} - -// Impression -if ($_REQUEST['p_action'] =3D=3D 'ca_imp' ) -{ - echo '
'; - - require_once('anc_imp.inc.php'); - echo '
'; - - exit(); -} Deleted: phpcompta/trunk/html/parametre.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/parametre.php 2011-10-28 21:56:12 UTC (rev 4256) +++ phpcompta/trunk/html/parametre.php 2011-10-28 21:57:45 UTC (rev 4257) @@ -1,424 +0,0 @@ -Check(); -$User->check_dossier($gDossier); - -html_page_start($_SESSION['g_theme']); - -include_once("user_menu.php"); -echo '
'; - -echo menu_tool('parametre.php'); - -echo '
'; - - -$authorized =3D0; -foreach ( array(PARCA,PARPER,PARFIC,PARDOC,PARJRN,PARTVA, - PARMP, PARPOS,PARCOORD,PARSEC,EXTENSION,PARPER,PARCLO) - as $a) -{ - if ( $User->check_action($a) =3D=3D 1 ) - { - $authorized=3D1; - break; - } -} - -if ($authorized=3D=3D0) - $User->can_request(9999,1); - -// First action -$p_action=3D""; -if ( isset($_REQUEST["p_action"]) ) -{ - $p_action=3D$_REQUEST["p_action"]; -} -switch ($p_action) -{ -case 'periode': - $default=3D25; - break; - -case 'ext': - $default=3D3; - break; -case 'jrn': - $default=3D10; - break; -case 'pcmn': - $default=3D11; - break; -case 'company': - $default=3D1; - break; -case 'divers': - $default=3D2; - break; -case 'fiche': - $default=3D5; - break; -case 'sec': - $default=3D8; - break; - -case 'document': - $default=3D7; - break; -case 'company': - $default=3D1; - break; -case 'preod': - $default=3D12; - break; -default: - $default=3D"parametre.php?p_action=3D".$p_action; -} - -echo ShowMenuParam($default); -echo '
'; -echo '
'; - -// sub action -$action=3D""; -if ( isset ($_POST['action']) ) -{ - $action=3D$_POST['action']; -} - -//----------------------------------------------------- -// divers -//----------------------------------------------------- -if ( $p_action =3D=3D 'divers') -{ - $s=3Ddossier::get(); - - $array =3D array ( - array('parametre.php?p_action=3Ddivers&sa=3Dmp&'.$s,_('= Moyen de paiement'),_('Moyen de paiement'),2), - array('parametre.php?p_action=3Ddivers&sa=3Dtva&'.$s,_(= 'Tva'),_('Taux et poste comptable tva'),4), - array('parametre.php?p_action=3Ddivers&sa=3Dposte&'.$s,= _('Poste Comptable'),_('Poste comptable constant'),7), - array('parametre.php?p_action=3Ddivers&sa=3Dfiche&'.$s,= _('Cat=C3=A9gorie de fiche'),_('Modifie les classe de base, les attribut,= ...'),5), - array('parametre.php?p_action=3Ddivers&sa=3Dcdoc&'.$s,_= ('Cat=C3=A9gorie de documents'),_('Ajoute des cat=C3=A9gories de document= s,...'),6), - array('parametre.php?p_action=3Ddivers&sa=3Dfat&'.$s,_(= 'Attribut de fiche'),_('Modifie les attributs des cat=C3=A9gories de fich= es'),10) - ); - $sa=3D(isset($_REQUEST['sa']))?$_REQUEST['sa']:''; - $sb=3D(isset($_REQUEST['sb']))?$_REQUEST['sb']:''; - $def=3D0; - switch ($sa) - { - case 'mp': - $def=3D2; - break; - case 'tva': - $def=3D4; - break; - case 'poste': - $def=3D7; - break; - case 'fiche': - $def=3D5; - break; - case 'cdoc': - $def=3D6; - break; - case 'fat': - $def=3D10; - break; - } - echo '
'; - echo ShowItem($array,'H','mtitle','mtitle',$def); - echo '
'; - - if ( $sa=3D=3D'mp') - { - $User->can_request(PARMP,1); - require_once('payment_middle.inc.php'); - exit; - } - //------------------------------------------------------------------= --------- - // Add or remove attribut of card - //------------------------------------------------------------------= --------- - if ( $sa=3D=3D'fat') - { - $User->can_request('FICCAT'); - require_once('card_attr.inc.php'); - exit(); - } - //----------------------------------------------------- - // TVA RATE - //----------------------------------------------------- - if ( $sa =3D=3D "tva" ) - { - echo '
'; - $User->can_request(PARTVA,1); - require_once("tva.inc.php"); - // - } - //----------------------------------------------------- - // Accounting item - //----------------------------------------------------- - if ( $sa =3D=3D "poste" ) - { - $User->can_request(PARPOS,1); - require_once('poste.inc.php'); - - } - //----------------------------------------------------- - // fiche - //----------------------------------------------------- - if ( $sa =3D=3D "fiche" ) - { - $User->can_request(PARFIC,1); - require_once('fiche_def.inc.php'); - return; - } - //---------------------------------------------------- - // Cat. Document - //---------------------------------------------------- - if ( $def=3D=3D 6) - { - $User->can_request(PARCATDOC,1); - require_once('cat_document.inc.php'); - return; - } - -} -//----------------------------------------------------- -// Extension -//----------------------------------------------------- - -if ( $p_action=3D=3D'ext') -{ - $User->can_request(EXTENSION,1); - require_once('extension.inc.php'); - exit; -} -//----------------------------------------------------- -// Coord societe -//----------------------------------------------------- -if ( $p_action=3D=3D'company') -{ - $User->can_request(PARCOORD,1); - echo '
'; - require_once("class_own.php"); - if ( isset ($_POST['record_company'] )) - { - $m=3Dnew Own($cn); - extract($_POST); - $m->MY_NAME=3D$p_name; - $m->MY_TVA=3D$p_tva; - $m->MY_STREET=3D$p_street; - $m->MY_NUMBER=3D$p_no; - $m->MY_CP=3D$p_cp; - $m->MY_COMMUNE=3D$p_Commune; - $m->MY_TEL=3D$p_tel; - $m->MY_FAX=3D$p_fax; - $m->MY_PAYS=3D$p_pays; - $m->MY_CHECK_PERIODE=3D$p_check_periode; - $m->MY_DATE_SUGGEST=3D$p_date_suggest; - if ( $User->check_action(PARCA)!=3D0)$m->MY_ANALYTIC=3D$p_compta= ; - if ( $User->check_action(PARSTR)!=3D0) $m->MY_STRICT=3D$p_strict= ; - if ( $User->check_action(PARTVA)!=3D0)$m->MY_TVA_USE=3D$p_tva_us= e; - $m->MY_PJ_SUGGEST=3D$p_pj; - $m->MY_ALPHANUM=3D$p_alphanum; - $m->Update(); - } - - $my=3Dnew Own($cn); - ///// Compta analytic - $array=3Darray ( - array("value"=3D>"ob",'label'=3D>_("obligatoire")), - array("value"=3D>"op",'label'=3D>_("optionnel")), - array("value"=3D>"nu",'label'=3D>_("non utilis=C3=A9")) - ); - $strict_array=3Darray( - array('value'=3D>'N','label'=3D>_('Non')), - array('value'=3D>'Y','label'=3D>_('Oui')) - ); - $alpha_num_array[0]=3Darray('value'=3D>'N','label'=3D>_('Non')); - $alpha_num_array[1]=3Darray('value'=3D>'Y','label'=3D>_('Oui')); - - $compta=3Dnew ISelect(); - $compta->table=3D1; - $compta->selected=3D$my->MY_ANALYTIC; - - $strict=3Dnew ISelect(); - $strict->table=3D1; - $strict->selected=3D$my->MY_STRICT; - - $tva_use=3Dnew ISelect(); - $tva_use->table=3D1; - $tva_use->selected=3D$my->MY_TVA_USE; - - $pj_suggest=3Dnew ISelect(); - $pj_suggest->table=3D1; - $pj_suggest->selected=3D$my->MY_PJ_SUGGEST; - - $date_suggest=3Dnew ISelect(); - $date_suggest->table=3D1; - $date_suggest->selected=3D$my->MY_DATE_SUGGEST; - - $check_periode=3Dnew ISelect(); - $check_periode->table=3D1; - $check_periode->selected=3D$my->MY_CHECK_PERIODE; - - $alpha_num=3Dnew ISelect(); - $alpha_num->table=3D1; - $alpha_num->value=3D$alpha_num_array; - $alpha_num->selected=3D$my->MY_ALPHANUM; - - // other parameters - $all=3Dnew IText(); - $all->table=3D1; - echo '
'; - echo dossier::hidden(); - echo ""; - echo "".td(_('Nom soci=C3=A9t=C3=A9'),'style=3D"text-align:right= "').$all->input("p_name",$my->MY_NAME).""; - $all->value=3D''; - echo "".td(_("T=C3=A9l=C3=A9phone"),'style=3D"text-align:right"'= ).$all->input("p_tel",$my->MY_TEL).""; - $all->value=3D''; - echo "".td(_("Fax"),'style=3D"text-align:right"').$all->input("p= _fax",$my->MY_FAX).""; - $all->value=3D''; - echo "".td(_("Rue "),'style=3D"text-align:right"').$all->input("= p_street",$my->MY_STREET).""; - $all->value=3D''; - echo "".td(_("Num=C3=A9ro"),'style=3D"text-align:right"').$all->= input("p_no",$my->MY_NUMBER).""; - $all->value=3D''; - echo "".td(_("Code Postal"),'style=3D"text-align:right"').$all->= input("p_cp",$my->MY_CP).""; - $all->value=3D''; - echo "".td(_("Commune"),'style=3D"text-align:right"').$all->inpu= t("p_Commune",$my->MY_COMMUNE).""; - $all->value=3D''; - echo "".td(_("Pays"),'style=3D"text-align:right"').$all->input("= p_pays",$my->MY_PAYS).""; - $all->value=3D''; - echo "".td(_("Num=C3=A9ro de Tva"),'style=3D"text-align:right"')= .$all->input("p_tva",$my->MY_TVA).""; - if ( $User->check_action(PARCA)=3D=3D0) $compta->setReadonly(true); - echo "".td(_("Utilisation de la compta. analytique"),'style=3D"t= ext-align:right"').$compta->input("p_compta",$array).""; - if ( $User->check_action(PARSTR)=3D=3D0) $strict->setReadonly(true); - echo "".td(_("Utilisation du mode strict "),'style=3D"text-align= :right"').$strict->input("p_strict",$strict_array).""; - if ( $User->check_action(PARTVA)=3D=3D0) $tva_use->setReadonly(true)= ; - echo "".td(_("Assujetti =C3=A0 la tva"),'style=3D"text-align:rig= ht"').$tva_use->input("p_tva_use",$strict_array).""; - echo "".td(_("Sugg=C3=A9rer le num=C3=A9ro de pi=C3=A8ce justifi= cative"),'style=3D"text-align:right"').$pj_suggest->input("p_pj",$strict_= array).""; - echo "".td(_("Sugg=C3=A9rer la date"),'style=3D"text-align:right= "').$date_suggest->input("p_date_suggest",$strict_array).""; - echo ''.td(_('Afficher la p=C3=A9riode comptable pour =C3=A9vite= r les erreurs de date'),'style=3D"text-align:right"').$check_periode->inp= ut('p_check_periode',$strict_array).''; - echo ''.td(_('Utilisez des postes comptables alphanum=C3=A9rique= '),'style=3D"text-align:right"').$alpha_num->input('p_alphanum').''; - echo "
"; - echo HtmlInput::submit("record_company",_("Sauve")); - echo "
"; - echo '
'; - exit(); -} -//----------------------------------------------------- -// Document -//----------------------------------------------------- -echo "
"; -if ( $p_action =3D=3D 'document' ) -{ - $User->can_request(PARDOC,1); - echo '
'; - require_once('document_modele.inc.php'); - echo '
'; -} -//---------------------------------------------------------------------- -// Plan Comptable -//---------------------------------------------------------------------- -if ( $p_action =3D=3D 'pcmn' ) -{ - $User->can_request(PARPCMN,1); - require_once('param_pcmn.inc.php'); -} -//---------------------------------------------------------------------- -// Security -//---------------------------------------------------------------------- -if ( $p_action =3D=3D 'sec' ) -{ - $User->can_request(PARSEC,1); - require_once('param_sec.inc.php'); -} -//---------------------------------------------------------------------- -// Predefined operation -//---------------------------------------------------------------------- -if ( $p_action =3D=3D 'preod' ) -{ - $User->can_request(PARPREDE,1); - require_once('preod.inc.php'); -} - -//----------------------------------------------------------------------= ----- -// Definition of report -//----------------------------------------------------------------------= ----- -if ( $p_action =3D=3D 'defrapport' ) -{ - $User->can_request(PARRAP,1); - require_once('report.inc.php'); -} -//----------------------------------------------------------------------= ----- -// Periode management -//----------------------------------------------------------------------= ----- - -if ($p_action =3D=3D "periode" ) -{ - - if ( $User->check_action(PARPER) =3D=3D 0 && $User->check_action(PAR= CLO) =3D=3D 0 ) - NoAccess(); - - $p_action=3D$_REQUEST['p_action']; - include_once("periode.inc.php"); -} -//---------------------------------------------------------------------- -// Ledger parameter -//---------------------------------------------------------------------- -if ( $p_action =3D=3D 'jrn' ) -{ - $User->can_request(PARJRN,1); - $sa=3D(isset($_REQUEST['sa']))?$_REQUEST['sa']:""; - // echo '
'; - if ( $sa =3D=3D "add") - require_once 'param_jrn_add.inc.php'; - elseif ($sa=3D=3D'detail') - require_once ('param_jrn_detail.inc.php'); - else - require_once('param_jrn.inc.php'); - // echo '
'; -} - - - -html_page_stop(); -?> From MAILER-DAEMON Fri Oct 28 18:06:01 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RJuYr-0001Gy-A9 for mharc-phpcompta-dev@gnu.org; Fri, 28 Oct 2011 18:06:01 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sat, 29 Oct 2011 00:12:51 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4258 - in phpcompta/trunk: html include include/template X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Oct 2011 22:05:59 -0000 Author: danydb Date: 2011-10-29 00:12:51 +0200 (Sat, 29 Oct 2011) New Revision: 4258 Removed: phpcompta/trunk/html/access.php Modified: phpcompta/trunk/html/ phpcompta/trunk/html/do.php phpcompta/trunk/html/user_login.php phpcompta/trunk/include/ phpcompta/trunk/include/template/dashboard.php phpcompta/trunk/include/user_menu.php Log: remove access.php Property changes on: phpcompta/trunk/html ___________________________________________________________________ Name: svn:ignore - *.log ajax + *.log ajax .user_login.php.swp Deleted: phpcompta/trunk/html/access.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/access.php 2011-10-28 21:57:45 UTC (rev 4257) +++ phpcompta/trunk/html/access.php 2011-10-28 22:12:51 UTC (rev 4258) @@ -1,137 +0,0 @@ -Check(); -if ($user->check_dossier(dossier::id()) =3D=3D 'P') -{ - redirect("extension.php?" . dossier::get(), 0); - exit(); -} - -html_page_start($_SESSION['g_theme']); -load_all_script(); -/* Check Browser version if < IE6 then unsupported */ -$browser =3D $_SERVER['HTTP_USER_AGENT']; -if (strpos($browser, 'MSIE 6') !=3D false || - strpos($browser, 'MSIE 5') !=3D false) -{ - - - echo << -
-
3D'Close
-
-
3D'Warning!'/
-
-
= Vous utilisez un navigateur d=C3=A9pass=C3=A9 depuis pr=C3=A8s de 8 ans!<= /div> -
= Pour une meilleure exp=C3=A9rience web, prenez le temps de mettre votre n= avigateur =C3=A0 jour.
-
-
3D'Get
-
3D'G=
-
3D'Get
-
-
- -EOF; - exit(); -} -if ($cn->exist_table('version') =3D=3D false) -{ - echo '

' . _("Base de do= nn=C3=A9e invalide") . '

'; - $base =3D dirname($_SERVER['REQUEST_URI']); - echo HtmlInput::button_anchor('Retour', $base . '/user_login.php'); - exit(); -} -if (DBVERSION < dossier::get_version($cn)) -{ - echo '

' . _("Attention:= la version de base de donn=C3=A9e est sup=C3=A9rieure =C3=A0 la version = du programme, vous devriez mettre =C3=A0 jour") . '

'; -} -if (DBVERSION > dossier::get_version($cn)) -{ - echo '

' . _("Votre base= de donn=C3=A9es n'est pas =C3=A0 jour") . ' '; - $a =3D _("cliquez ici pour appliquer le patch"); - $base =3D dirname($_SERVER['REQUEST_URI']) . '/admin/setup.php'; - echo '' . $a . '

'; -} - -/* - * Set a correct periode for the user - */ -$periode =3D $user->get_periode(); -$oPeriode =3D new Periode($cn, $periode); - -if ($oPeriode->load() =3D=3D -1) -{ - $periode =3D $cn->get_value('select p_id from parm_periode order by = p_start asc limit 1'); - $user->set_periode($periode); -} - -echo '
'; -echo menu_tool('access.php'); -echo '
'; -echo '
'; - -/* others report */ -$cal =3D new Calendar(); -$cal->get_preference(); -$Ledger =3D new Acc_Ledger($cn, 0); -$last_ledger =3D array(); -if ($user->check_action(GESTION) =3D=3D 1) -{ - $Operation =3D new Action($cn); - $last_ledger =3D $Ledger->get_last(10); - $last_operation =3D $Operation->get_last(10); -} -else -{ - $last_operation =3D array(); -} -ob_start(); -require_once('template/dashboard.php'); -$ret =3D ob_get_contents(); -ob_end_clean(); -echo $ret; - -echo '
'; - - Modified: phpcompta/trunk/html/do.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/do.php 2011-10-28 21:57:45 UTC (rev 4257) +++ phpcompta/trunk/html/do.php 2011-10-28 22:12:51 UTC (rev 4258) @@ -34,6 +34,72 @@ =20 $cn=3Dnew Database(Dossier::id()); $g_user=3Dnew User($cn); + +if ($g_user->check_dossier(dossier::id()) =3D=3D 'P') +{ + redirect("extension.php?" . dossier::get(), 0); + exit(); +} + +html_page_start($_SESSION['g_theme']); +load_all_script(); +/* Check Browser version if < IE6 then unsupported */ +$browser =3D $_SERVER['HTTP_USER_AGENT']; +if (strpos($browser, 'MSIE 6') !=3D false || + strpos($browser, 'MSIE 5') !=3D false) +{ + + + echo << +
+
3D'Close
+
+
3D'Warning!'/
+
+
= Vous utilisez un navigateur d=C3=A9pass=C3=A9 depuis pr=C3=A8s de 8 ans!<= /div> +
= Pour une meilleure exp=C3=A9rience web, prenez le temps de mettre votre n= avigateur =C3=A0 jour.
+
+
3D'Get
+
3D'G=
+
3D'Get
+
+
+ +EOF; + exit(); +} +if ($cn->exist_table('version') =3D=3D false) +{ + echo '

' . _("Base de do= nn=C3=A9e invalide") . '

'; + $base =3D dirname($_SERVER['REQUEST_URI']); + echo HtmlInput::button_anchor('Retour', $base . '/user_login.php'); + exit(); +} +if (DBVERSION < dossier::get_version($cn)) +{ + echo '

' . _("Attention:= la version de base de donn=C3=A9e est sup=C3=A9rieure =C3=A0 la version = du programme, vous devriez mettre =C3=A0 jour") . '

'; +} +if (DBVERSION > dossier::get_version($cn)) +{ + echo '

' . _("Votre base= de donn=C3=A9es n'est pas =C3=A0 jour") . ' '; + $a =3D _("cliquez ici pour appliquer le patch"); + $base =3D dirname($_SERVER['REQUEST_URI']) . '/admin/setup.php'; + echo '' . $a . '

'; +} + +/* + * Set a correct periode for the user + */ +$periode =3D $g_user->get_periode(); +$oPeriode =3D new Periode($cn, $periode); + +if ($oPeriode->load() =3D=3D -1) +{ + $periode =3D $cn->get_value('select p_id from parm_periode order by = p_start asc limit 1'); + $g_user->set_periode($periode); +} + // Display available menu in the right order load_all_script(); =20 Modified: phpcompta/trunk/html/user_login.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/user_login.php 2011-10-28 21:57:45 UTC (rev 4257= ) +++ phpcompta/trunk/html/user_login.php 2011-10-28 22:12:51 UTC (rev 4258= ) @@ -102,7 +102,7 @@ } else { - redirect('access.php?gDossier=3D'.$folder[0]['dos_id']); + redirect('do.php?gDossier=3D'.$folder[0]['dos_id']); exit(); } } Property changes on: phpcompta/trunk/include ___________________________________________________________________ Name: svn:ignore + .user_menu.php.swp Modified: phpcompta/trunk/include/template/dashboard.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/template/dashboard.php 2011-10-28 21:57:45 UT= C (rev 4257) +++ phpcompta/trunk/include/template/dashboard.php 2011-10-28 22:12:51 UT= C (rev 4258) @@ -74,19 +74,19 @@ /* * Mini Report */ -$report=3D$user->get_mini_report(); +$report=3D$g_user->get_mini_report(); =20 $rapport=3Dnew Acc_Report($cn); $rapport->id=3D$report; if ( $rapport->exist() =3D=3D false ) { - $user->set_mini_report(0); + $g_user->set_mini_report(0); $report=3D0; } =20 if ( $report !=3D 0 ) { echo '
'; echo '
'.$rapport->g= et_name().''; - $exercice=3D$user->get_exercice(); + $exercice=3D$g_user->get_exercice(); if ( $exercice =3D=3D 0 ) { alert(_('Aucune periode par defaut')); } else { Modified: phpcompta/trunk/include/user_menu.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/user_menu.php 2011-10-28 21:57:45 UTC (rev 42= 57) +++ phpcompta/trunk/include/user_menu.php 2011-10-28 22:12:51 UTC (rev 42= 58) @@ -61,7 +61,7 @@ else $tr=3D"even"; if ( $user->check_dossier($id)!=3D'P') { - $target=3D"access.php?gDossier=3D$id"; + $target=3D"do.php?gDossier=3D$id"; } else { @@ -235,7 +235,7 @@ //('rapprt.php','Rapprochement'), =20 array('user_advanced.php?'.$str_dossier.'&p_= action=3Dpreod',_('Ecritures definies'),"",9), - =20 + array('compta.php?p_action=3Dstock&'.$str_do= ssier,'Stock',_("Gestion des stocks"),5), array('user_advanced.php?p_action=3Ddefrepor= t&'.$str_dossier,_('Rapport'),_("Rapport"),6), array('user_advanced.php?p_action=3Douv&'.$s= tr_dossier,_('Ecriture ouverture'),"",8), @@ -444,7 +444,7 @@ * \note must include javascript : acc_ledger.js * \return string */ -function menu_tool($p_from) +function menu_tool_deprecated($p_from) { =20 if ( ! isset ($_REQUEST['gDossier'])) From MAILER-DAEMON Fri Oct 28 19:51:59 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RJwDP-0002gt-QX for mharc-phpcompta-dev@gnu.org; Fri, 28 Oct 2011 19:51:59 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sat, 29 Oct 2011 01:58:51 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4259 - in phpcompta/trunk: html include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Oct 2011 23:51:58 -0000 Author: danydb Date: 2011-10-29 01:58:49 +0200 (Sat, 29 Oct 2011) New Revision: 4259 Modified: phpcompta/trunk/html/do.php phpcompta/trunk/include/ac_common.php Log: #422 Module by default Modified: phpcompta/trunk/html/do.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/do.php 2011-10-28 22:12:51 UTC (rev 4258) +++ phpcompta/trunk/html/do.php 2011-10-28 23:58:49 UTC (rev 4259) @@ -30,10 +30,10 @@ require_once('ac_common.php'); require_once 'function_javascript.php'; html_page_start(); -global $g_user,$cn; +global $g_user, $cn; =20 -$cn=3Dnew Database(Dossier::id()); -$g_user=3Dnew User($cn); +$cn =3D new Database(Dossier::id()); +$g_user =3D new User($cn); =20 if ($g_user->check_dossier(dossier::id()) =3D=3D 'P') { @@ -112,14 +112,17 @@ =20 // Show module and highligt selected one show_module($module_selected); - for ( $i=3D0;$i !=3D count($all);$i++) - { // show the menu - show_menu($all,$i); - } + for ($i =3D 0; $i !=3D count($all); $i++) + { // show the menu + show_menu($all, $i); + } } else { - show_module(-1); + $default =3D find_default_module(); + show_module($default); + $all[0] =3D $default; + show_menu($all, 0); } =20 =20 Modified: phpcompta/trunk/include/ac_common.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/ac_common.php 2011-10-28 22:12:51 UTC (rev 42= 58) +++ phpcompta/trunk/include/ac_common.php 2011-10-28 23:58:49 UTC (rev 42= 59) @@ -702,15 +702,51 @@ user_name=3D$1 and p_type_display=3D'M' order by p_order",array($g_user->login)); - require_once('template/module.php'); + if ( $selected !=3D -1 ) { + require_once('template/module.php'); $file=3D$cn->get_value("select me_file from v_all_menu where me_code=3D= $1",array($selected)); if ($file !=3D '') + { require_once $file; + exit(); + } } + else + { =20 + } } +function find_default_module() +{ + global $g_user; + $cn=3DDossier::connect(); + + $default_module =3D $cn->get_array("select me_code + from profile_menu join profile_user using (p_id) + where + user_name=3D$1 and pm_default=3D1", array($g_user->login)); + + if (empty($default_module)) + { + $default_module =3D $cn->get_array("select me_code + from profile_menu join profile_user using (p_id) + where + user_name=3D$1 and p_order=3D(select min(p_order) from profile_menu + where user_name=3D$1) limit 1", array($g_user->login,$g_user->login)); + return $default_module; + } + + if (count($default_module) > 1) + { + echo_error("Plusieurs modules sont le module par d=C3=A9faut", __LI= NE__, __FILE__); + } + elseif (count($default_module) =3D=3D 1) + { + return $default_module[0]['me_code']; + } +} /** * show default module */ From MAILER-DAEMON Fri Oct 28 20:04:05 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RJwP7-0003DD-Ec for mharc-phpcompta-dev@gnu.org; Fri, 28 Oct 2011 20:04:05 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sat, 29 Oct 2011 02:10:57 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4260 - in phpcompta/trunk: html include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Oct 2011 00:04:03 -0000 Author: danydb Date: 2011-10-29 02:10:54 +0200 (Sat, 29 Oct 2011) New Revision: 4260 Modified: phpcompta/trunk/html/do.php phpcompta/trunk/include/ac_common.php Log: #422 Module by default. Set the $_POST,$_GET,$_REQUEST Modified: phpcompta/trunk/html/do.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/do.php 2011-10-28 23:58:49 UTC (rev 4259) +++ phpcompta/trunk/html/do.php 2011-10-29 00:10:54 UTC (rev 4260) @@ -120,6 +120,9 @@ else { $default =3D find_default_module(); + $_GET['ac']=3D$default; + $_POST['ac']=3D$default; + $_REQUEST['ac']=3D$default; show_module($default); $all[0] =3D $default; show_menu($all, 0); Modified: phpcompta/trunk/include/ac_common.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/ac_common.php 2011-10-28 23:58:49 UTC (rev 42= 59) +++ phpcompta/trunk/include/ac_common.php 2011-10-29 00:10:54 UTC (rev 42= 60) @@ -726,6 +726,7 @@ $default_module =3D $cn->get_array("select me_code from profile_menu join profile_user using (p_id) where + p_type_display=3D'M' and user_name=3D$1 and pm_default=3D1", array($g_user->login)); =20 if (empty($default_module)) @@ -734,8 +735,8 @@ from profile_menu join profile_user using (p_id) where user_name=3D$1 and p_order=3D(select min(p_order) from profile_menu - where user_name=3D$1) limit 1", array($g_user->login,$g_user->login)); - return $default_module; + where user_name=3D$2) limit 1", array($g_user->login,$g_user->login)); + return $default_module[0]['me_code']; } =20 if (count($default_module) > 1) @@ -747,20 +748,8 @@ return $default_module[0]['me_code']; } } + /** - * show default module - */ -function show_default() -{ - $cn=3DDossier::connect(); - $file=3D$cn->get_array('SELECT m_code FROM module where m_default=3D= 1'); - if (! empty ($file) ) - { - $selected=3D$file[0]['m_code']; - show_module($selected); - } -} -/** * */ function show_menu($module,$idx) From MAILER-DAEMON Fri Oct 28 21:03:21 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RJxKT-0001es-JM for mharc-phpcompta-dev@gnu.org; Fri, 28 Oct 2011 21:03:21 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sat, 29 Oct 2011 03:10:14 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4261 - in phpcompta/trunk: html include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Oct 2011 01:03:20 -0000 Author: danydb Date: 2011-10-29 03:10:13 +0200 (Sat, 29 Oct 2011) New Revision: 4261 Modified: phpcompta/trunk/html/extension.php phpcompta/trunk/include/ext_inc.php Log: #423: Changement affichage plugin Modified: phpcompta/trunk/html/extension.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/extension.php 2011-10-29 00:10:54 UTC (rev 4260) +++ phpcompta/trunk/html/extension.php 2011-10-29 01:10:13 UTC (rev 4261) @@ -34,7 +34,7 @@ require_once('class_iselect.php'); require_once ('constant.security.php'); require_once ('class_user.php'); - +echo '
'; @html_page_start($_SESSION['g_theme']); $cn=3Dnew Database(dossier::id()); $user=3Dnew User($cn); @@ -46,45 +46,7 @@ echo load_all_script(); =20 /* show button to return to access */ -echo "

".dossier::name()."

"; -if ( $only_plugin !=3D 'P' ) -{ - // user with only plugin cannot go back to the dashboard - /* return button */ - $msg=3D_('Retour au tableau de bord'); - $hidden=3Ddossier::hidden(); - echo ' -
-
'. - $hidden; =20 - echo HtmlInput::button_anchor(_('Pr=C3=A9f=C3=A9rence'),'user_pref.p= hp'); - echo ' - -
-
- '; - - -} -else -{ - $msg=3D_('Retour accueil'); - ?> -
-
- -
-
- value=3DExtension::make_array($cn); @@ -105,7 +67,7 @@ else { echo '
'; - echo $hidden; + echo Dossier::hidden(); echo _('Extension').$a->input().HtmlInput::submit('go',_("Choix de l= 'extension")); echo '
'; echo '
'; Modified: phpcompta/trunk/include/ext_inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/ext_inc.php 2011-10-29 00:10:54 UTC (rev 4260= ) +++ phpcompta/trunk/include/ext_inc.php 2011-10-29 01:10:13 UTC (rev 4261= ) @@ -15,7 +15,7 @@ exit(); } /* show name of extension */ - echo '
'; + echo '
'; echo '

'.$ext->get_parameter('name').'

'; =20 =20 From MAILER-DAEMON Fri Oct 28 21:03:59 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RJxL5-0001gH-Ls for mharc-phpcompta-dev@gnu.org; Fri, 28 Oct 2011 21:03:59 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sat, 29 Oct 2011 03:10:53 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4262 - in phpcompta/trunk: html include include/template X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Oct 2011 01:03:58 -0000 Author: danydb Date: 2011-10-29 03:10:52 +0200 (Sat, 29 Oct 2011) New Revision: 4262 Modified: phpcompta/trunk/html/do.php phpcompta/trunk/include/ac_common.php phpcompta/trunk/include/template/menu.php Log: #418: Menu directement choisi s'il n'y en a qu'un Modified: phpcompta/trunk/html/do.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/do.php 2011-10-29 01:10:13 UTC (rev 4261) +++ phpcompta/trunk/html/do.php 2011-10-29 01:10:52 UTC (rev 4262) @@ -32,6 +32,14 @@ html_page_start(); global $g_user, $cn; =20 +// if gDossier is not set redirect to form to choose a folder +if ( ! isset($_REQUEST['gDossier'])) +{ + redirect('user_login.php'); + exit(); +} + + $cn =3D new Database(Dossier::id()); $g_user =3D new User($cn); =20 Modified: phpcompta/trunk/include/ac_common.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/ac_common.php 2011-10-29 01:10:13 UTC (rev 42= 61) +++ phpcompta/trunk/include/ac_common.php 2011-10-29 01:10:52 UTC (rev 42= 62) @@ -760,14 +760,22 @@ me_menu,me_code from v_all_menu where - me_code_dep=3D$1 order by p_order",array($module[$idx])); + me_code_dep=3D$1 and user_name=3D$2 order by p_order",array($module[$id= x],$g_user->login)); =20 - if (! empty ($amenu)) + if (! empty ($amenu) && count($amenu)>1) { require 'template/menu.php'; } - else + elseif (count($amenu)=3D=3D1) { + echo '
'; + echo h2info($amenu[0]['me_menu']); + echo '
'; + $module[$idx]=3D$amenu[0]['me_code']; + } + + if (empty($amenu) || count($amenu)=3D=3D1) + { /** * @todo add security * check if user can access this module @@ -784,6 +792,7 @@ echo '
'; require_once "$file"; echo '
'; + exit(); } } } Modified: phpcompta/trunk/include/template/menu.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/template/menu.php 2011-10-29 01:10:13 UTC (re= v 4261) +++ phpcompta/trunk/include/template/menu.php 2011-10-29 01:10:52 UTC (re= v 4262) @@ -14,7 +14,7 @@ global $g_user; // Display the menu for($i=3D0;$i < count($amenu);$i++): - if ( isset($module[$idx+1]) && $module[$idx+1]=3D=3D$amenu[$i]['me_= code']): + if ( (count($amenu)=3D=3D1)|| (isset($module[$idx+1]) && $module[$i= dx+1]=3D=3D$amenu[$i]['me_code'])): $class=3D"selectedcell"; ?> "> From MAILER-DAEMON Fri Oct 28 21:14:51 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RJxVb-0003Dt-2A for mharc-phpcompta-dev@gnu.org; Fri, 28 Oct 2011 21:14:51 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sat, 29 Oct 2011 03:21:44 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4263 - in phpcompta/trunk: html include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Oct 2011 01:14:49 -0000 Author: danydb Date: 2011-10-29 03:21:42 +0200 (Sat, 29 Oct 2011) New Revision: 4263 Removed: phpcompta/trunk/html/extension.php Modified: phpcompta/trunk/include/ext_inc.php Log: #423: Changement affichage plugin Deleted: phpcompta/trunk/html/extension.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/extension.php 2011-10-29 01:10:52 UTC (rev 4262) +++ phpcompta/trunk/html/extension.php 2011-10-29 01:21:42 UTC (rev 4263) @@ -1,76 +0,0 @@ -'; -@html_page_start($_SESSION['g_theme']); -$cn=3Dnew Database(dossier::id()); -$user=3Dnew User($cn); -$user->check(); -$only_plugin=3D$user->check_dossier(dossier::id()); - - -/* javascript file */ -echo load_all_script(); - -/* show button to return to access */ - -/* show all the extension we can access */ -$a=3Dnew ISelect('plugin_code'); -$a->value=3DExtension::make_array($cn); -$a->selected=3D(isset($_REQUEST['plugin_code']))?strtoupper($_REQUEST['p= lugin_code']):''; - -/* no plugin available */ -if ( count($a->value) =3D=3D 0 ) -{ - alert(j(_("Aucune extension disponible"))); - exit; -} - -/* only one plugin available then we don't propose a choice*/ -if ( count($a->value)=3D=3D1 ) -{ - $_REQUEST['plugin_code']=3D$a->value[0]['value']; -} -else -{ - echo '
'; - echo Dossier::hidden(); - echo _('Extension').$a->input().HtmlInput::submit('go',_("Choix de l= 'extension")); - echo '
'; - echo '
'; -} - -require_once('ext_inc.php'); Modified: phpcompta/trunk/include/ext_inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/ext_inc.php 2011-10-29 01:10:52 UTC (rev 4262= ) +++ phpcompta/trunk/include/ext_inc.php 2011-10-29 01:21:42 UTC (rev 4263= ) @@ -1,5 +1,54 @@ '; +@html_page_start($_SESSION['g_theme']); =20 +$cn=3Dnew Database(dossier::id()); +$user=3Dnew User($cn); +$user->check(); +$only_plugin=3D$user->check_dossier(dossier::id()); + + +/* javascript file */ +echo load_all_script(); + +/* show button to return to access */ + +/* show all the extension we can access */ +$a=3Dnew ISelect('plugin_code'); +$a->value=3DExtension::make_array($cn); +$a->selected=3D(isset($_REQUEST['plugin_code']))?strtoupper($_REQUEST['p= lugin_code']):''; + +/* no plugin available */ +if ( count($a->value) =3D=3D 0 ) +{ + alert(j(_("Aucune extension disponible"))); + exit; +} + +/* only one plugin available then we don't propose a choice*/ +if ( count($a->value)=3D=3D1 ) +{ + $_REQUEST['plugin_code']=3D$a->value[0]['value']; +} +else +{ + echo '
'; + echo Dossier::hidden(); + echo HtmlInput::request_to_hidden(array('plugin_code','ac')); + echo _('Extension').$a->input().HtmlInput::submit('go',_("Choix de l= 'extension")); + echo '
'; + echo '
'; +} /* if a code has been asked */ if (isset($_REQUEST['plugin_code']) ) { @@ -14,12 +63,7 @@ alert(j(_("Vous ne pouvez pas utiliser cette extension. Cont= actez votre responsable"))); exit(); } - /* show name of extension */ - echo '
'; - echo '

'.$ext->get_parameter('name').'

'; - - - echo '
'; + =20 if ( ! file_exists('../include/ext'.DIRECTORY_SEPARATOR.trim($ex= t->get_parameter('filepath')))) { alert(j(_("Ce fichier n'existe pas "))); From MAILER-DAEMON Fri Oct 28 22:29:27 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RJyfn-0008RL-9v for mharc-phpcompta-dev@gnu.org; Fri, 28 Oct 2011 22:29:27 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sat, 29 Oct 2011 04:36:12 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4264 - phpcompta/trunk/include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Oct 2011 02:29:25 -0000 Author: danydb Date: 2011-10-29 04:36:11 +0200 (Sat, 29 Oct 2011) New Revision: 4264 Added: phpcompta/trunk/include/extension_choice.inc.php phpcompta/trunk/include/extension_get.inc.php Removed: phpcompta/trunk/include/ext_inc.php Modified: phpcompta/trunk/include/ac_common.php Log: 424 : plugin dans les menus ou modules Modified: phpcompta/trunk/include/ac_common.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/ac_common.php 2011-10-29 01:21:42 UTC (rev 42= 63) +++ phpcompta/trunk/include/ac_common.php 2011-10-29 02:36:11 UTC (rev 42= 64) @@ -1,4 +1,5 @@ '.$p_string.''; + return '' . $p_string . ''; } + function hi($p_string) { - return ''.htmlspecialchars($p_string).''; + return '' . htmlspecialchars($p_string) . ''; } + function hb($p_string) { - return ''.htmlspecialchars($p_string).''; + return '' . htmlspecialchars($p_string) . ''; } -function th($p_string,$p_extra=3D'') + +function th($p_string, $p_extra=3D'') { - return ''.htmlspecialchars($p_string).''; + return '' . htmlspecialchars($p_string) . ''; } + function h2info($p_string) { - return '

'.htmlspecialchars($p_string).'

'; + return '

' . htmlspecialchars($p_string) . '

'= ; } -function h2($p_string,$p_class) + +function h2($p_string, $p_class) { - return '

'.htmlspecialchars($p_string).'

'; + return '

' . htmlspecialchars($p_string) . ''; } =20 -/*!\brief surround the string with td -*\param $p_string string to surround by TD -*\param $p_extra extra info (class, style, javascript...) -* \return string surrounded by td -*/ -function td($p_string=3D'',$p_extra=3D'') +/* !\brief surround the string with td + * \param $p_string string to surround by TD + * \param $p_extra extra info (class, style, javascript...) + * \return string surrounded by td + */ + +function td($p_string=3D'', $p_extra=3D'') { - return ''.$p_string.''; + return '' . $p_string . ''; } -function tr($p_string,$p_extra=3D'') + +function tr($p_string, $p_extra=3D'') { - return ''.$p_string.''; + return '' . $p_string . ''; } -/*!\brief escape correctly php string to javascript */ + +/* !\brief escape correctly php string to javascript */ + function j($p_string) { - $a=3Dpreg_replace("/\r?\n/", "\\n", addslashes($p_string)); - $a=3Dstr_replace("'",'\'',$a); + $a =3D preg_replace("/\r?\n/", "\\n", addslashes($p_string)); + $a =3D str_replace("'", '\'', $a); return $a; } + /** * format the number for the CSV export - *@param $p_number number + * @param $p_number number */ function nb($p_number) { - $r=3Dsprintf('%.2f',$p_number); - $r=3Dstr_replace('.',',',$r); + $r =3D sprintf('%.2f', $p_number); + $r =3D str_replace('.', ',', $r); =20 - return $r; + return $r; } + /** * format the number with a sep. for the thousand - *@param $p_number number + * @param $p_number number */ function nbm($p_number) { =20 - if (trim($p_number)=3D=3D'') return ''; - if ( $p_number=3D=3D0) return 0; - $a=3Ddoubleval($p_number); + if (trim($p_number) =3D=3D '') + return ''; + if ($p_number =3D=3D 0) + return 0; + $a =3D doubleval($p_number); =20 - $r=3Dnumber_format($a,2,",","."); - if (trim($r)=3D=3D'') { - var_dump($r);var_dump($p_number);var_dump($a);exit(); - } + $r =3D number_format($a, 2, ",", "."); + if (trim($r) =3D=3D '') + { + var_dump($r); + var_dump($p_number); + var_dump($a); + exit(); + } =20 - return $r; + return $r; } -/*! + +/* ! * \brief log error into the /tmp/phpcompta_error.log it doesn't work o= n windows * * \param p_log message @@ -117,18 +138,19 @@ * \return nothing * */ -function echo_error ($p_log, $p_line=3D"", $p_message=3D"") + +function echo_error($p_log, $p_line=3D"", $p_message=3D"") { - echo "ERREUR :".$p_log." ".$p_line." ".$p_message; - $fdebug=3Dfopen($_ENV['TMP'].DIRECTORY_SEPARATOR."phpcompta_error.lo= g","a+"); - if ($fdebug !=3D null ) + echo "ERREUR :" . $p_log . " " . $p_line . " " . $p_message; + $fdebug =3D fopen($_ENV['TMP'] . DIRECTORY_SEPARATOR . "phpcompta_er= ror.log", "a+"); + if ($fdebug !=3D null) { - fwrite($fdebug,date("Ymd H:i:s").$p_log." ".$p_line." ".$p_messa= ge."\n"); - fclose($fdebug); + fwrite($fdebug, date("Ymd H:i:s") . $p_log . " " . $p_line . " " . $p_m= essage . "\n"); + fclose($fdebug); } } =20 -/*! +/* ! * \brief Compare 2 dates * \param p_date * \param p_date_oth @@ -138,24 +160,26 @@ * - > 0 date1 > date2 * - < 0 date1 < date2 */ -function cmpDate ($p_date,$p_date_oth) + +function cmpDate($p_date, $p_date_oth) { - date_default_timezone_set ('Europe/Brussels'); + date_default_timezone_set('Europe/Brussels'); =20 - $l_date=3DisDate($p_date); - $l2_date=3DisDate($p_date_oth); - if ($l_date =3D=3D null || $l2_date =3D=3D null ) + $l_date =3D isDate($p_date); + $l2_date =3D isDate($p_date_oth); + if ($l_date =3D=3D null || $l2_date =3D=3D null) { - throw new Exception ("erreur date [$p_date] [$p_date_oth]"); + throw new Exception("erreur date [$p_date] [$p_date_oth]"); } - $l_adate=3Dexplode(".",$l_date); - $l2_adate=3Dexplode(".",$l2_date); - $l_mkdate=3Dmktime(0,0,0,$l_adate[1],$l_adate[0],$l_adate[2]); - $l2_mkdate=3Dmktime(0,0,0,$l2_adate[1],$l2_adate[0],$l2_adate[2]); + $l_adate =3D explode(".", $l_date); + $l2_adate =3D explode(".", $l2_date); + $l_mkdate =3D mktime(0, 0, 0, $l_adate[1], $l_adate[0], $l_adate[2])= ; + $l2_mkdate =3D mktime(0, 0, 0, $l2_adate[1], $l2_adate[0], $l2_adate= [2]); // si $p_date > $p_date_oth return > 0 - return $l_mkdate-$l2_mkdate; + return $l_mkdate - $l2_mkdate; } -/*! + +/* ! * \brief check if the argument is a number * * \param $p_int number to test @@ -164,57 +188,58 @@ * - 1 it's a number * - 0 it is not */ + function isNumber(&$p_int) { - if ( strlen (trim($p_int)) =3D=3D 0 ) return 0; - if ( is_numeric($p_int) =3D=3D=3D true) - return 1; + if (strlen(trim($p_int)) =3D=3D 0) + return 0; + if (is_numeric($p_int) =3D=3D=3D true) + return 1; else - return 0; - - + return 0; } =20 -/*! +/* ! * \brief Verifie qu'une date est bien format=C3=A9 * en d.m.y et est valable * \param $p_date * * \return - * - null si la date est invalide ou malformat=C3=A9 + * - null si la date est invalide ou malformat=C3=A9 * - $p_date si tout est bon * */ =20 -function isDate ( $p_date) +function isDate($p_date) { - if ( strlen (trim($p_date)) =3D=3D 0 ) return null; - if ( preg_match("/^[0-9]{1,2}\.[0-9]{1,2}\.20[0-9]{2}$/",$p_date) =3D= =3D 0 ) + if (strlen(trim($p_date)) =3D=3D 0) + return null; + if (preg_match("/^[0-9]{1,2}\.[0-9]{1,2}\.20[0-9]{2}$/", $p_date) =3D= =3D 0) { =20 - return null; + return null; } else { - $l_date=3Dexplode(".",$p_date); + $l_date =3D explode(".", $p_date); =20 - if ( sizeof ($l_date) !=3D 3 ) - return null; + if (sizeof($l_date) !=3D 3) + return null; =20 - if ( $l_date[2] > 2020 ) - { - return null; - } + if ($l_date[2] > 2020) + { + return null; + } =20 - if ( checkdate ($l_date[1],$l_date[0],$l_date[2]) =3D=3D false) - { - return null; - } - + if (checkdate($l_date[1], $l_date[0], $l_date[2]) =3D=3D false) + { + return null; + } }// !ereg return $p_date; } -/*! + +/* ! * \brief Default page header for each page * * \param p_theme default theme @@ -223,38 +248,39 @@ * * \return none */ -function html_page_start($p_theme=3D"",$p_script=3D"",$p_script2=3D"") + +function html_page_start($p_theme=3D"", $p_script=3D"", $p_script2=3D"") { =20 - $cn=3Dnew Database(); - if ( $p_theme !=3D "") + $cn =3D new Database(); + if ($p_theme !=3D "") { - $Res=3D$cn->exec_sql("select the_filestyle from theme - where the_name=3D'".$p_theme."'"); - if (Database::num_row($Res)=3D=3D0) - $style=3D"style.css"; - else - { - $s=3DDatabase::fetch_array($Res,0); - $style=3D$s['the_filestyle']; - } + $Res =3D $cn->exec_sql("select the_filestyle from theme + where the_name=3D'" . $p_theme . "'"); + if (Database::num_row($Res) =3D=3D 0) + $style =3D "style.css"; + else + { + $s =3D Database::fetch_array($Res, 0); + $style =3D $s['the_filestyle']; + } } else { - $style=3D"style.css"; + $style =3D "style.css"; } // end if echo ''; echo ""; =20 - if ( $p_script2 !=3D "" ) - $p_script2=3D''; + if ($p_script2 !=3D "") + $p_script2 =3D ''; =20 echo " PhpCompta - ". - $p_script2. " + " . + $p_script2 . " "; echo ''; + if ($p_script2 !=3D "") + $p_script2 =3D ''; =20 echo " PhpCompta - ". - $p_script2. " + " . + $p_script2 . " = "; echo ' '; =20 echo ""; /* If we are on the user_login page */ - if ( basename($_SERVER['PHP_SELF']) =3D=3D 'user_login.php') + if (basename($_SERVER['PHP_SELF']) =3D=3D 'user_login.php') { - return; + return; } - } =20 -/*! +/* ! * \brief end tag * */ + function html_page_stop() { echo ""; echo ""; } -/*! + +/* ! * \brief Echo no access and stop * * \return nothing */ =20 - function NoAccess($js=3D1) { - if ( $js =3D=3D 1 ) + if ($js =3D=3D 1) { - echo ""; + echo ""; } else { - echo '
'; - echo '

'._(' Cette action ne vous est pas aut= oris=C3=A9e Contactez votre responsable').'

'; - echo '
'; + echo '
'; + echo '

' . _(' Cette action ne vous est pas autoris=C3= =A9e Contactez votre responsable') . '

'; + echo '
'; } - exit -1; + exit - 1; } -/*! + +/* ! * \brief Fix the problem with the quote char for the database * * \param $p_string * \return a string which won't let strange char for the database */ + function FormatString($p_string) { - $p_string=3Dtrim($p_string); - if (strlen($p_string) =3D=3D 0 ) return null; - $p_string=3Dstr_replace("\'","'",$p_string); - $p_string=3Dstr_replace("''","'",$p_string); - $p_string=3Dstr_replace("'","\'",$p_string); + $p_string =3D trim($p_string); + if (strlen($p_string) =3D=3D 0) + return null; + $p_string =3D str_replace("\'", "'", $p_string); + $p_string =3D str_replace("''", "'", $p_string); + $p_string =3D str_replace("'", "\'", $p_string); return $p_string; } =20 -/*! -/* \brief store the string which print +/* ! + /* \brief store the string which print * the content of p_array in a table * used to display the menu * \param $p_array array like ( 0=3D>HREF reference, 1=3D>visible item = (name),2=3D>Help(opt), @@ -392,76 +422,79 @@ * \param $default selected item * \param $p_extra extra code for the table tag (CSS or javascript) * -/* \return : string */ -function ShowItem($p_array,$p_dir=3D'V',$class=3D"mtitle",$class_ref=3D"= mtitle",$default=3D"",$p_extra=3D"") + /* \return : string */ + +function ShowItem($p_array, $p_dir=3D'V', $class=3D"mtitle", $class_ref=3D= "mtitle", $default=3D"", $p_extra=3D"") { =20 - $ret=3D""; + $ret =3D "
"; // direction Vertical - if ( $p_dir =3D=3D 'V') + if ($p_dir =3D=3D 'V') { - foreach ($p_array as $all=3D>$href) - { - $javascript=3D(isset ($href[4]))?$href[4]:""; - $title=3D""; - $set=3D"XX"; - if ( isset ($href[2] )) - $title=3D$href[2]; - if ( isset($href[3] )) - $set=3D$href[3]; + foreach ($p_array as $all =3D> $href) + { + $javascript =3D (isset($href[4])) ? $href[4] : ""; + $title =3D ""; + $set =3D "XX"; + if (isset($href[2])) + $title =3D $href[2]; + if (isset($href[3])) + $set =3D $href[3]; =20 - if ( $set =3D=3D $default ) - $ret.=3D''; - else - $ret.=3D''; - } + if ($set =3D=3D $default) + $ret.=3D''; + else + $ret.=3D''; + } } //direction Horizontal - else if ( $p_dir =3D=3D 'H' ) + else if ($p_dir =3D=3D 'H') { =20 - $ret.=3D""; - foreach ($p_array as $all=3D>$href) - { - $title=3D""; - $javascript=3D(isset ($href[4]))?$href[4]:""; + $ret.=3D""; + foreach ($p_array as $all =3D> $href) + { + $title =3D ""; + $javascript =3D (isset($href[4])) ? $href[4] : ""; =20 - $set=3D"A"; - if ( isset ($href[2] )) - $title=3D$href[2]; + $set =3D "A"; + if (isset($href[2])) + $title =3D $href[2]; =20 - if ( isset($href[3])) - $set=3D$href[3]; + if (isset($href[3])) + $set =3D $href[3]; =20 - if ( $default=3D=3D=3D $href[0]||$set=3D=3D=3D$default ) - { - $ret.=3D''; - } - else - { - $ret.=3D''; - } - - } - $ret.=3D""; + if ($default =3D=3D=3D $href[0] || $set =3D=3D=3D $default) + { + $ret.=3D''; + } + else + { + $ret.=3D''; + } + } + $ret.=3D""; } $ret.=3D"
'.= $href[1].'
'.$h= ref[1].'
= ' . $href[1] . '
'.$hre= f[1].''.$href[= 1].'
' . = $href[1] . '' = . $href[1] . '
"; return $ret; } -/*! + +/* ! * \brief warns * * \param p_string error message * gen : - * - none + * - none * \return: * - none */ + function echo_warning($p_string) { - echo '

'.$p_string."

"; + echo '

' . $p_string . "

"; } -/*! + +/* ! * \brief Show the periode which found thanks its id * * @@ -471,17 +504,17 @@ * * \return: string */ -function getPeriodeName($p_cn,$p_id,$pos=3D'p_start') + +function getPeriodeName($p_cn, $p_id, $pos=3D'p_start') { - if ( $pos !=3D 'p_start' and - $pos !=3D 'p_end') - echo_error('ac_common.php'."-".__LINE__.' UNDEFINED PERIODE'); - $ret=3D$p_cn->get_value("select to_char($pos,'Mon YYYY') as t from p= arm_periode where p_id=3D$p_id"); + if ($pos !=3D 'p_start' and + $pos !=3D 'p_end') + echo_error('ac_common.php' . "-" . __LINE__ . ' UNDEFINED PERIODE'); + $ret =3D $p_cn->get_value("select to_char($pos,'Mon YYYY') as t from= parm_periode where p_id=3D$p_id"); return $ret; } =20 - -/*! +/* ! * \brief Return the period corresponding to the * date * @@ -491,27 +524,30 @@ * \return: * parm_periode.p_id */ -function getPeriodeFromMonth($p_cn,$p_date) + +function getPeriodeFromMonth($p_cn, $p_date) { - $R=3D$p_cn->get_value("select p_id from parm_periode where + $R =3D $p_cn->get_value("select p_id from parm_periode where to_char(p_start,'DD.MM.YYYY') =3D '01.$p_date'")= ; - if ( $R =3D=3D "" ) - return -1; + if ($R =3D=3D "") + return -1; return $R; } -/*!\brief Decode the html for the widegt richtext and remove newline - *\param $p_html string to decode + +/* !\brief Decode the html for the widegt richtext and remove newline + * \param $p_html string to decode * \return the html code without new line */ =20 function Decode($p_html) { - $p_html=3Dstr_replace('%0D','',$p_html); - $p_html=3Dstr_replace('%0A','',$p_html); - $p_html=3Durldecode($p_html); + $p_html =3D str_replace('%0D', '', $p_html); + $p_html =3D str_replace('%0A', '', $p_html); + $p_html =3D urldecode($p_html); return $p_html; } -/*!\brief Create the condition to filter on the j_tech_per + +/* !\brief Create the condition to filter on the j_tech_per * thanks a from and to date. * \param $p_cn database conx * \param $p_from start date (date) @@ -520,173 +556,182 @@ * \param $p_field column name * \return a string containg the query */ -function sql_filter_per($p_cn,$p_from,$p_to,$p_form=3D'p_id',$p_field=3D= 'jr_tech_per') + +function sql_filter_per($p_cn, $p_from, $p_to, $p_form=3D'p_id', $p_fiel= d=3D'jr_tech_per') { =20 - if ( $p_form !=3D 'p_id' && - $p_form !=3D 'date' ) + if ($p_form !=3D 'p_id' && + $p_form !=3D 'date') { - echo_error (__FILE__,__LINE__,'Mauvais parametres '); - exit(-1); + echo_error(__FILE__, __LINE__, 'Mauvais parametres '); + exit(-1); } - if ( $p_form =3D=3D 'p_id' ) + if ($p_form =3D=3D 'p_id') { - // retrieve the date - $pPeriode=3Dnew Periode($p_cn); - $a_start=3D$pPeriode->get_date_limit($p_from); - $a_end=3D$pPeriode->get_date_limit($p_to); - if ( $a_start =3D=3D null || $a_end =3D=3D null ) - throw new Exception(__FILE__.__LINE__.'Attention periode '. - ' non trouvee periode p_from=3D'.$p_from= . - 'p_to_periode =3D '.$p_to); + // retrieve the date + $pPeriode =3D new Periode($p_cn); + $a_start =3D $pPeriode->get_date_limit($p_from); + $a_end =3D $pPeriode->get_date_limit($p_to); + if ($a_start =3D=3D null || $a_end =3D=3D null) + throw new Exception(__FILE__ . __LINE__ . 'Attention periode ' . + ' non trouvee periode p_from=3D' . $p_from . + 'p_to_periode =3D ' . $p_to); =20 =20 - $p_from=3D$a_start['p_start']; - $p_to=3D$a_end['p_end']; + $p_from =3D $a_start['p_start']; + $p_to =3D $a_end['p_end']; } - if ( $p_from =3D=3D $p_to ) - $periode=3D" $p_field =3D (select p_id from parm_periode ". - " where ". - " p_start =3D to_date('$p_from','DD.MM.YYYY')) "; + if ($p_from =3D=3D $p_to) + $periode =3D " $p_field =3D (select p_id from parm_periode " . + " where " . + " p_start =3D to_date('$p_from','DD.MM.YYYY')) "; else - $periode =3D "$p_field in (select p_id from parm_periode ". - " where p_start >=3D to_date('$p_from','DD.MM.YYYY') = and p_end <=3D to_date('$p_to','DD.MM.YYYY')) "; + $periode =3D "$p_field in (select p_id from parm_periode " . + " where p_start >=3D to_date('$p_from','DD.MM.YYYY') and p_end <=3D to= _date('$p_to','DD.MM.YYYY')) "; return $periode; } =20 -/*!\brief alert in javascript - *\param $p_msg is the message - *\param $buffer if false, echo directly and execute the javascript, if = $buffer is true, the alert javascript +/* !\brief alert in javascript + * \param $p_msg is the message + * \param $buffer if false, echo directly and execute the javascript, if= $buffer is true, the alert javascript * is in the return string - *\return string with alert javascript if $buffer is true + * \return string with alert javascript if $buffer is true */ -function alert($p_msg,$buffer=3Dfalse) + +function alert($p_msg, $buffer=3Dfalse) { - $r=3D ''; =20 - if ($buffer) return $r; + if ($buffer) + return $r; echo $r; +} =20 -} /** - *@brief set the lang thanks the _SESSION['g_lang'] var. + * @brief set the lang thanks the _SESSION['g_lang'] var. */ function set_language() { - $dir=3D""; + $dir =3D ""; // set differently the language depending of the operating system - if( what_os() =3D=3D 1 ) + if (what_os() =3D=3D 1) { - $dir=3Dsetlocale(LC_MESSAGES,$_SESSION['g_lang']); - if ( $dir =3D=3D "") - { - $g_lang=3D'fr_FR.utf8'; - $dir=3Dsetlocale(LC_MESSAGES,$g_lang); - echo ''.$_SESSION['g_lang'].' domaine= non support=C3=A9'; - } - bindtextdomain('messages','./lang'); - textdomain('messages'); - bind_textdomain_codeset('messages','UTF8'); + $dir =3D setlocale(LC_MESSAGES, $_SESSION['g_lang']); + if ($dir =3D=3D "") + { + $g_lang =3D 'fr_FR.utf8'; + $dir =3D setlocale(LC_MESSAGES, $g_lang); + echo '' . $_SESSION['g_lang'] . ' domaine no= n support=C3=A9'; + } + bindtextdomain('messages', './lang'); + textdomain('messages'); + bind_textdomain_codeset('messages', 'UTF8'); =20 - return; + return; } // for windows - putenv('LANG=3D'.$_SESSION['g_lang']); - $dir=3Dsetlocale(LC_ALL,$_SESSION['g_lang']); - bindtextdomain('messages','.\\lang'); + putenv('LANG=3D' . $_SESSION['g_lang']); + $dir =3D setlocale(LC_ALL, $_SESSION['g_lang']); + bindtextdomain('messages', '.\\lang'); textdomain('messages'); - bind_textdomain_codeset('messages','UTF8'); + bind_textdomain_codeset('messages', 'UTF8'); } + /** - *@brief try to determine on what os you are running the p=C4=A5pcompte - *server - *@return + * @brief try to determine on what os you are running the p=C4=A5pcompte + * server + * @return * 0 it is a windows * 1 it is a Unix like */ function what_os() { - $inc_path=3Dget_include_path(); + $inc_path =3D get_include_path(); =20 - if ( strpos($inc_path,";") !=3D 0 ) + if (strpos($inc_path, ";") !=3D 0) { - $os=3D0; /* $os is 0 for windoz */ + $os =3D 0; /* $os is 0 for windoz */ } else { - $os=3D1; /* $os is 1 for unix */ + $os =3D 1; /* $os is 1 for unix */ } return $os; } + /** - *@brief shrink the date, make a date shorter for the printing - *@param $p_date format DD.MM.YYYY - *@return date in the format DDMMYY (size =3D 13 mm in arial 8) + * @brief shrink the date, make a date shorter for the printing + * @param $p_date format DD.MM.YYYY + * @return date in the format DDMMYY (size =3D 13 mm in arial 8) */ -function shrink_date ($p_date) +function shrink_date($p_date) { - $date=3Dstr_replace('.','',$p_date); - $str_date=3Dsubstr($date,0,4).substr($date,6,2); + $date =3D str_replace('.', '', $p_date); + $str_date =3D substr($date, 0, 4) . substr($date, 6, 2); return $str_date; } + /** - *@brief format the date, when taken from the database the format + * @brief format the date, when taken from the database the format * is MM-DD-YYYY - *@param $p_date format YYYY-MM-DD - *@return date in the format DD.MM.YYYY + * @param $p_date format YYYY-MM-DD + * @return date in the format DD.MM.YYYY */ -function format_date ($p_date) +function format_date($p_date) { - $date=3Dexplode('-',$p_date); - if ( count($date) !=3D 3) return $p_date; - $str_date=3D$date[2].'.'.$date[1].'.'.$date[0]; + $date =3D explode('-', $p_date); + if (count($date) !=3D 3) + return $p_date; + $str_date =3D $date[2] . '.' . $date[1] . '.' . $date[0]; return $str_date; } =20 /** - *@brief remove the quote or double quote them - *@param $q string - *@return string correctly quoted + * @brief remove the quote or double quote them + * @param $q string + * @return string correctly quoted */ function sql_string($q) { - $ret=3Dstr_replace("'","''",$q); + $ret =3D str_replace("'", "''", $q); return $ret; } + /** - *Should a dialog box that you are disconnected for ajax + * Should a dialog box that you are disconnected for ajax */ function ajax_disconnected($div) { -/** - *if $_SESSION['g_user'] is not set : echo a warning - */ -if ( ! isset($_SESSION['g_user'])) - { - $script=3D'var a=3D$("'.$div.'");a.style.height=3D"70%";a.style.widt= h=3D"70%";'; - $script.=3D'a.style.top=3DposY-20+offsetY;a.style.left=3DposX+offset= X;'; - $script=3Dcreate_script($script); - $html=3D$script; - $html.=3DHtmlInput::anchor_close($div); - $html.=3D'
'; - $html.=3Dh2('Donn=C3=A9es non disponibles','class=3D"info" style=3D"= width:auto"'); - $html.=3Dh2('Veuillez vous reconnecter',''); - $html.=3Dalert("D=C3=A9connect=C3=A9",true); - $html=3Descape_xml($html); + /** + * if $_SESSION['g_user'] is not set : echo a warning + */ + if (!isset($_SESSION['g_user'])) + { + $script =3D 'var a=3D$("' . $div . '");a.style.height=3D"70%";a.style.w= idth=3D"70%";'; + $script.=3D'a.style.top=3DposY-20+offsetY;a.style.left=3DposX+offsetX;'= ; + $script =3D create_script($script); + $html =3D $script; + $html.=3DHtmlInput::anchor_close($div); + $html.=3D'
'; + $html.=3Dh2('Donn=C3=A9es non disponibles', 'class=3D"info" style=3D"wi= dth:auto"'); + $html.=3Dh2('Veuillez vous reconnecter', ''); + $html.=3Dalert("D=C3=A9connect=C3=A9", true); + $html =3D escape_xml($html); =20 - header('Content-type: text/xml; charset=3DUTF-8'); -echo << $div $html EOF; -exit(); - } + exit(); + } } + /** * * @param int $selected module selected @@ -694,22 +739,29 @@ function show_module($selected) { global $g_user; - $cn=3DDossier::connect(); - $amodule=3D$cn->get_array("select + $cn =3D Dossier::connect(); + $amodule =3D $cn->get_array("select me_code,me_menu,me_url from v_all_menu where user_name=3D$1 and p_type_display=3D'M' - order by p_order",array($g_user->login)); + order by p_order", array($g_user->login)); =20 - if ( $selected !=3D -1 ) + if ($selected !=3D -1) { require_once('template/module.php'); - $file=3D$cn->get_value("select me_file from v_all_menu where me_code=3D= $1",array($selected)); - if ($file !=3D '') + $file =3D $cn->get_array("select me_file,me_parameter from v_all_menu + where me_code=3D$1 and user_name=3D$2", array($selected,$g_user->lo= gin)); + if ($file[0]['me_file'] !=3D '') { - require_once $file; + if ($file[0]['me_parameter'] !=3D=3D "") + { + // if there are paramter put them in superglobal + $array=3Dcompute_variable($file[0]['me_parameter']); + put_global($array); + } + require_once $file[0]['me_file']; exit(); } } @@ -718,82 +770,129 @@ =20 } } +/** + * Find the default module or the first one + * @global $g_user $g_user + * @return default module (string) + */ function find_default_module() { global $g_user; - $cn=3DDossier::connect(); + $cn =3D Dossier::connect(); =20 - $default_module =3D $cn->get_array("select me_code + $default_module =3D $cn->get_array("select me_code from profile_menu join profile_user using (p_id) where p_type_display=3D'M' and user_name=3D$1 and pm_default=3D1", array($g_user->login)); =20 - if (empty($default_module)) - { - $default_module =3D $cn->get_array("select me_code + if (empty($default_module)) + { + $default_module =3D $cn->get_array("select me_code from profile_menu join profile_user using (p_id) where user_name=3D$1 and p_order=3D(select min(p_order) from profile_menu - where user_name=3D$2) limit 1", array($g_user->login,$g_user->login)); - return $default_module[0]['me_code']; - } + where user_name=3D$2) limit 1", array($g_user->login, $g_user->login))= ; + return $default_module[0]['me_code']; + } =20 - if (count($default_module) > 1) - { - echo_error("Plusieurs modules sont le module par d=C3=A9faut", __LI= NE__, __FILE__); - } - elseif (count($default_module) =3D=3D 1) - { - return $default_module[0]['me_code']; - } + if (count($default_module) > 1) + { + echo_error("Plusieurs modules sont le module par d=C3=A9faut", __LINE__= , __FILE__); + } + elseif (count($default_module) =3D=3D 1) + { + return $default_module[0]['me_code']; + } } =20 /** - * + * show the module + * @global $g_user + * @param $module the $_REQUEST['ac'] exploded into an array + * @param $idx the index */ -function show_menu($module,$idx) +function show_menu($module, $idx) { global $g_user; - $cn=3DDossier::connect(); - $amenu=3D$cn->get_array("select + $cn =3D Dossier::connect(); + $amenu =3D $cn->get_array("select me_menu,me_code from v_all_menu where - me_code_dep=3D$1 and user_name=3D$2 order by p_order",array($module[$id= x],$g_user->login)); + me_code_dep=3D$1 and user_name=3D$2 order by p_order", array($module[$i= dx], $g_user->login)); =20 - if (! empty ($amenu) && count($amenu)>1) + if (!empty($amenu) && count($amenu) > 1) { require 'template/menu.php'; } - elseif (count($amenu)=3D=3D1) + elseif (count($amenu) =3D=3D 1) { echo '
'; echo h2info($amenu[0]['me_menu']); echo '
'; - $module[$idx]=3D$amenu[0]['me_code']; + $module[$idx] =3D $amenu[0]['me_code']; } =20 - if (empty($amenu) || count($amenu)=3D=3D1) + if (empty($amenu) || count($amenu) =3D=3D 1) { -/** - * @todo add security - * check if user can access this module - */ - $file=3D$cn->get_value("select me_file + /** + * @todo add security + * check if user can access this module + */ + $file =3D $cn->get_array("select me_file,me_parameter from menu_ref where me_code=3D$1 and - (me_file is not null or trim(me_file) <>'')", - array($module[$idx])); + (me_file is not null or trim(me_file) <>'')", array($module[$idx])); =20 - if ( $file !=3D "" ) + if ($file[0]['me_file'] !=3D "") { + if ($file[0]['me_parameter'] !=3D=3D "") + { + // if there are paramter put them in superglobal + $array=3Dcompute_variable($file[0]['me_parameter']); + put_global($array); + } echo '
'; - require_once "$file"; + require_once $file[0]['me_file']; echo '
'; exit(); } } } +/** + * Put in superglobal (get,post,request) the value contained in + * the superglobal + * @param $array [key] [value] + */ +function put_global($array) +{ + for ($i=3D0;$i Deleted: phpcompta/trunk/include/ext_inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/ext_inc.php 2011-10-29 01:21:42 UTC (rev 4263= ) +++ phpcompta/trunk/include/ext_inc.php 2011-10-29 02:36:11 UTC (rev 4264= ) @@ -1,81 +0,0 @@ -'; -@html_page_start($_SESSION['g_theme']); - -$cn=3Dnew Database(dossier::id()); -$user=3Dnew User($cn); -$user->check(); -$only_plugin=3D$user->check_dossier(dossier::id()); - - -/* javascript file */ -echo load_all_script(); - -/* show button to return to access */ - -/* show all the extension we can access */ -$a=3Dnew ISelect('plugin_code'); -$a->value=3DExtension::make_array($cn); -$a->selected=3D(isset($_REQUEST['plugin_code']))?strtoupper($_REQUEST['p= lugin_code']):''; - -/* no plugin available */ -if ( count($a->value) =3D=3D 0 ) -{ - alert(j(_("Aucune extension disponible"))); - exit; -} - -/* only one plugin available then we don't propose a choice*/ -if ( count($a->value)=3D=3D1 ) -{ - $_REQUEST['plugin_code']=3D$a->value[0]['value']; -} -else -{ - echo '
'; - echo Dossier::hidden(); - echo HtmlInput::request_to_hidden(array('plugin_code','ac')); - echo _('Extension').$a->input().HtmlInput::submit('go',_("Choix de l= 'extension")); - echo '
'; - echo '
'; -} -/* if a code has been asked */ -if (isset($_REQUEST['plugin_code']) ) -{ - $cn=3Dnew Database(dossier::id()); - $ext=3Dnew Extension($cn); - $ext->search('code',$_REQUEST['plugin_code']); - if ( $ext->get_parameter('id') !=3D 0 ) - { - /* security */ - if ( $ext->can_request($_SESSION['g_user']) =3D=3D 0 ) - { - alert(j(_("Vous ne pouvez pas utiliser cette extension. Cont= actez votre responsable"))); - exit(); - } - =20 - if ( ! file_exists('../include/ext'.DIRECTORY_SEPARATOR.trim($ex= t->get_parameter('filepath')))) - { - alert(j(_("Ce fichier n'existe pas "))); - exit(); - } - require_once('ext'.DIRECTORY_SEPARATOR.trim($ext->get_parameter(= 'filepath'))); - } - else - { - alert(j(_("Cette extension n'existe pas "))); - exit(); - } - -} -?> Copied: phpcompta/trunk/include/extension_choice.inc.php (from rev 4263, = phpcompta/trunk/include/ext_inc.php) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/extension_choice.inc.php = (rev 0) +++ phpcompta/trunk/include/extension_choice.inc.php 2011-10-29 02:36:11 = UTC (rev 4264) @@ -0,0 +1,52 @@ +'; +@html_page_start($_SESSION['g_theme']); + +$cn=3Dnew Database(dossier::id()); +$user=3Dnew User($cn); +$user->check(); +$only_plugin=3D$user->check_dossier(dossier::id()); + + +/* javascript file */ +echo load_all_script(); + +/* show all the extension we can access */ +$a=3Dnew ISelect('plugin_code'); +$a->value=3DExtension::make_array($cn); +$a->selected=3D(isset($_REQUEST['plugin_code']))?strtoupper($_REQUEST['p= lugin_code']):''; + +/* no plugin available */ +if ( count($a->value) =3D=3D 0 ) +{ + alert(j(_("Aucune extension disponible"))); + exit; +} + +/* only one plugin available then we don't propose a choice*/ +if ( count($a->value)=3D=3D1 ) +{ + $_REQUEST['plugin_code']=3D$a->value[0]['value']; +} +else +{ + echo '
'; + echo Dossier::hidden(); + echo HtmlInput::request_to_hidden(array('plugin_code','ac')); + echo _('Extension').$a->input().HtmlInput::submit('go',_("Choix de l= 'extension")); + echo '
'; + echo '
'; +} +require_once 'extension_get.inc.php'; + +?> Added: phpcompta/trunk/include/extension_get.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/extension_get.inc.php = (rev 0) +++ phpcompta/trunk/include/extension_get.inc.php 2011-10-29 02:36:11 UTC= (rev 4264) @@ -0,0 +1,42 @@ +search('code',$_REQUEST['plugin_code']); + if ( $ext->get_parameter('id') !=3D 0 ) + { + /* security */ + if ( $ext->can_request($_SESSION['g_user']) =3D=3D 0 ) + { + alert(j(_("Vous ne pouvez pas utiliser cette extension. Cont= actez votre responsable"))); + exit(); + } + + if ( ! file_exists('../include/ext'.DIRECTORY_SEPARATOR.trim($ex= t->get_parameter('filepath')))) + { + alert(j(_("Ce fichier n'existe pas "))); + exit(); + } + require_once('ext'.DIRECTORY_SEPARATOR.trim($ext->get_parameter(= 'filepath'))); + } + else + { + alert(j(_("Cette extension n'existe pas "))); + exit(); + } + +} +?> From MAILER-DAEMON Fri Oct 28 22:30:11 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RJygV-00004w-Cu for mharc-phpcompta-dev@gnu.org; Fri, 28 Oct 2011 22:30:11 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sat, 29 Oct 2011 04:37:04 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4265 - phpcompta/trunk/sql X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Oct 2011 02:30:09 -0000 Author: danydb Date: 2011-10-29 04:37:03 +0200 (Sat, 29 Oct 2011) New Revision: 4265 Modified: phpcompta/trunk/sql/ Log: empty Property changes on: phpcompta/trunk/sql ___________________________________________________________________ Name: svn:ignore - .upgrade.sql.swp + .upgrade.sql.swp .object-6.0.sql.swp From MAILER-DAEMON Fri Oct 28 22:38:31 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RJyoZ-0000s9-5I for mharc-phpcompta-dev@gnu.org; Fri, 28 Oct 2011 22:38:31 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sat, 29 Oct 2011 04:45:24 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4266 - in phpcompta/trunk/include: . template tfpdf/font X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Oct 2011 02:38:30 -0000 Author: danydb Date: 2011-10-29 04:45:23 +0200 (Sat, 29 Oct 2011) New Revision: 4266 Modified: phpcompta/trunk/include/company.inc.php phpcompta/trunk/include/dashboard.inc.php phpcompta/trunk/include/extension_get.inc.php phpcompta/trunk/include/template/menu.php phpcompta/trunk/include/template/module.php phpcompta/trunk/include/tfpdf/font/courierb.php phpcompta/trunk/include/tfpdf/font/courierbi.php phpcompta/trunk/include/tfpdf/font/courieri.php Log: Add properties Property changes on: phpcompta/trunk/include/company.inc.php ___________________________________________________________________ Name: svn:keywords + Revision Id Author Date Property changes on: phpcompta/trunk/include/dashboard.inc.php ___________________________________________________________________ Name: svn:keywords + Revision Id Author Date Property changes on: phpcompta/trunk/include/extension_get.inc.php ___________________________________________________________________ Name: svn:keywords + Revision Id Author Date Property changes on: phpcompta/trunk/include/template/menu.php ___________________________________________________________________ Name: svn:keywords + Revision Id Author Date Property changes on: phpcompta/trunk/include/template/module.php ___________________________________________________________________ Name: svn:keywords + Revision Id Author Date Property changes on: phpcompta/trunk/include/tfpdf/font/courierb.php ___________________________________________________________________ Name: svn:keywords + Revision Id Author Date Property changes on: phpcompta/trunk/include/tfpdf/font/courierbi.php ___________________________________________________________________ Name: svn:keywords + Revision Id Author Date Property changes on: phpcompta/trunk/include/tfpdf/font/courieri.php ___________________________________________________________________ Name: svn:keywords + Revision Id Author Date From MAILER-DAEMON Fri Oct 28 22:40:05 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RJyq5-0000uV-OM for mharc-phpcompta-dev@gnu.org; Fri, 28 Oct 2011 22:40:05 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sat, 29 Oct 2011 04:46:48 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4267 - in phpcompta/trunk: html include include/ext/dummy include/template include/tfpdf include/tfpdf/font include/tfpdf/font/unifont X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Oct 2011 02:40:02 -0000 Author: danydb Date: 2011-10-29 04:46:45 +0200 (Sat, 29 Oct 2011) New Revision: 4267 Modified: phpcompta/trunk/html/do.php phpcompta/trunk/include/ac_common.php phpcompta/trunk/include/action.common.inc.php phpcompta/trunk/include/action.inc.php phpcompta/trunk/include/adm.inc.php phpcompta/trunk/include/adm_card.inc.php phpcompta/trunk/include/anc_group.inc.php phpcompta/trunk/include/anc_imp.inc.php phpcompta/trunk/include/anc_od.inc.php phpcompta/trunk/include/anc_pa.inc.php phpcompta/trunk/include/audit_log.php phpcompta/trunk/include/balance.inc.php phpcompta/trunk/include/balance_card.inc.php phpcompta/trunk/include/card_attr.inc.php phpcompta/trunk/include/cat_document.inc.php phpcompta/trunk/include/class_acc_account.php phpcompta/trunk/include/class_acc_account_ledger.php phpcompta/trunk/include/class_acc_balance.php phpcompta/trunk/include/class_acc_bilan.php phpcompta/trunk/include/class_acc_compute.php phpcompta/trunk/include/class_acc_ledger.php phpcompta/trunk/include/class_acc_ledger_fin.php phpcompta/trunk/include/class_acc_ledger_info.php phpcompta/trunk/include/class_acc_ledger_purchase.php phpcompta/trunk/include/class_acc_ledger_sold.php phpcompta/trunk/include/class_acc_operation.php phpcompta/trunk/include/class_acc_parm_code.php phpcompta/trunk/include/class_acc_payment.php phpcompta/trunk/include/class_acc_reconciliation.php phpcompta/trunk/include/class_acc_report.php phpcompta/trunk/include/class_acc_report_row.php phpcompta/trunk/include/class_acc_tva.php phpcompta/trunk/include/class_action.php phpcompta/trunk/include/class_action_detail.php phpcompta/trunk/include/class_admin.php phpcompta/trunk/include/class_anc_acc_link.php phpcompta/trunk/include/class_anc_acc_list.php phpcompta/trunk/include/class_anc_account.php phpcompta/trunk/include/class_anc_balance_double.php phpcompta/trunk/include/class_anc_balance_simple.php phpcompta/trunk/include/class_anc_grandlivre.php phpcompta/trunk/include/class_anc_group.php phpcompta/trunk/include/class_anc_group_operation.php phpcompta/trunk/include/class_anc_listing.php phpcompta/trunk/include/class_anc_operation.php phpcompta/trunk/include/class_anc_plan.php phpcompta/trunk/include/class_anc_print.php phpcompta/trunk/include/class_anc_table.php phpcompta/trunk/include/class_anticipation.php phpcompta/trunk/include/class_calendar.php phpcompta/trunk/include/class_contact.php phpcompta/trunk/include/class_customer.php phpcompta/trunk/include/class_database.php phpcompta/trunk/include/class_document.php phpcompta/trunk/include/class_document_modele.php phpcompta/trunk/include/class_document_type.php phpcompta/trunk/include/class_dossier.php phpcompta/trunk/include/class_exercice.php phpcompta/trunk/include/class_extension.php phpcompta/trunk/include/class_fiche.php phpcompta/trunk/include/class_fiche_attr.php phpcompta/trunk/include/class_fiche_def.php phpcompta/trunk/include/class_fiche_def_ref.php phpcompta/trunk/include/class_forecast.php phpcompta/trunk/include/class_forecast_cat.php phpcompta/trunk/include/class_forecast_item.php phpcompta/trunk/include/class_gestion_purchase.php phpcompta/trunk/include/class_gestion_sold.php phpcompta/trunk/include/class_gestion_table.php phpcompta/trunk/include/class_html_input.php phpcompta/trunk/include/class_html_table.php phpcompta/trunk/include/class_iaction.php phpcompta/trunk/include/class_ibox_deprecated.php phpcompta/trunk/include/class_ibutton.php phpcompta/trunk/include/class_icard.php phpcompta/trunk/include/class_icheckbox.php phpcompta/trunk/include/class_iconcerned.php phpcompta/trunk/include/class_idate.php phpcompta/trunk/include/class_ifile.php phpcompta/trunk/include/class_ihidden.php phpcompta/trunk/include/class_inum.php phpcompta/trunk/include/class_iperiod.php phpcompta/trunk/include/class_ipopup.php phpcompta/trunk/include/class_iposte.php phpcompta/trunk/include/class_iradio.php phpcompta/trunk/include/class_iselect.php phpcompta/trunk/include/class_ispan.php phpcompta/trunk/include/class_itext.php phpcompta/trunk/include/class_itextarea.php phpcompta/trunk/include/class_itva_popup.php phpcompta/trunk/include/class_lettering.php phpcompta/trunk/include/class_own.php phpcompta/trunk/include/class_pdf.php phpcompta/trunk/include/class_periode.php phpcompta/trunk/include/class_pre_op_ach.php phpcompta/trunk/include/class_pre_op_advanced.php phpcompta/trunk/include/class_pre_op_fin.php phpcompta/trunk/include/class_pre_op_ods.php phpcompta/trunk/include/class_pre_op_ven.php phpcompta/trunk/include/class_pre_operation.php phpcompta/trunk/include/class_print_ledger_detail.php phpcompta/trunk/include/class_print_ledger_fin.php phpcompta/trunk/include/class_print_ledger_misc.php phpcompta/trunk/include/class_print_ledger_simple.php phpcompta/trunk/include/class_print_ledger_simple_without_vat.php phpcompta/trunk/include/class_sort_table.php phpcompta/trunk/include/class_supplier.php phpcompta/trunk/include/class_todo_list.php phpcompta/trunk/include/class_user.php phpcompta/trunk/include/class_zip_extended.php phpcompta/trunk/include/client.inc.php phpcompta/trunk/include/client_card.inc.php phpcompta/trunk/include/compta_ach.inc.php phpcompta/trunk/include/compta_fin.inc.php phpcompta/trunk/include/compta_ods.inc.php phpcompta/trunk/include/compta_ven.inc.php phpcompta/trunk/include/config.inc phpcompta/trunk/include/config_file.php phpcompta/trunk/include/constant.php phpcompta/trunk/include/constant.security.php phpcompta/trunk/include/contact.inc.php phpcompta/trunk/include/detail_adm.inc.php phpcompta/trunk/include/detail_client.inc.php phpcompta/trunk/include/detail_supplier.inc.php phpcompta/trunk/include/document_modele.inc.php phpcompta/trunk/include/dossier.inc.php phpcompta/trunk/include/export_anc_acc_list.php phpcompta/trunk/include/export_anc_acc_list_csv.php phpcompta/trunk/include/export_anc_balance_double_csv.php phpcompta/trunk/include/export_anc_balance_double_pdf.php phpcompta/trunk/include/export_anc_balance_group_csv.php phpcompta/trunk/include/export_anc_balance_simple_csv.php phpcompta/trunk/include/export_anc_balance_simple_pdf.php phpcompta/trunk/include/export_anc_list_csv.php phpcompta/trunk/include/export_anc_table_csv.php phpcompta/trunk/include/export_balance_csv.php phpcompta/trunk/include/export_balance_pdf.php phpcompta/trunk/include/export_fiche_balance_csv.php phpcompta/trunk/include/export_fiche_balance_pdf.php phpcompta/trunk/include/export_fiche_csv.php phpcompta/trunk/include/export_fiche_detail_csv.php phpcompta/trunk/include/export_fiche_detail_pdf.php phpcompta/trunk/include/export_fiche_pdf.php phpcompta/trunk/include/export_form_csv.php phpcompta/trunk/include/export_form_pdf.php phpcompta/trunk/include/export_gl_csv.php phpcompta/trunk/include/export_gl_pdf.php phpcompta/trunk/include/export_histo_csv.php phpcompta/trunk/include/export_ledger_csv.php phpcompta/trunk/include/export_ledger_pdf.php phpcompta/trunk/include/export_poste_detail.php phpcompta/trunk/include/export_poste_detail_csv.php phpcompta/trunk/include/export_poste_detail_pdf.php phpcompta/trunk/include/export_security_pdf.php phpcompta/trunk/include/export_table_csv.php phpcompta/trunk/include/ext/dummy/dummy.php phpcompta/trunk/include/extension.inc.php phpcompta/trunk/include/extension_choice.inc.php phpcompta/trunk/include/fiche.inc.php phpcompta/trunk/include/fiche_def.inc.php phpcompta/trunk/include/forecast.inc.php phpcompta/trunk/include/function_javascript.php phpcompta/trunk/include/header_print.php phpcompta/trunk/include/impress.inc.php phpcompta/trunk/include/impress_bilan.inc.php phpcompta/trunk/include/impress_fiche.inc.php phpcompta/trunk/include/impress_gl_comptes.inc.php phpcompta/trunk/include/impress_inc.php phpcompta/trunk/include/impress_jrn.inc.php phpcompta/trunk/include/impress_poste.inc.php phpcompta/trunk/include/impress_rapport.inc.php phpcompta/trunk/include/impress_rec.inc.php phpcompta/trunk/include/lettering.account.inc.php phpcompta/trunk/include/lettering.card.inc.php phpcompta/trunk/include/lettering.gestion.inc.php phpcompta/trunk/include/modele.inc.php phpcompta/trunk/include/modify_mod_document.inc.php phpcompta/trunk/include/modify_periode.inc.php phpcompta/trunk/include/modify_predf_op.php phpcompta/trunk/include/opening.inc.php phpcompta/trunk/include/operation_adm.inc.php phpcompta/trunk/include/operation_client.inc.php phpcompta/trunk/include/operation_supplier.inc.php phpcompta/trunk/include/param_jrn.inc.php phpcompta/trunk/include/param_jrn_add.inc.php phpcompta/trunk/include/param_jrn_detail.inc.php phpcompta/trunk/include/param_pcmn.inc.php phpcompta/trunk/include/param_sec.inc.php phpcompta/trunk/include/payment_middle.inc.php phpcompta/trunk/include/periode.inc.php phpcompta/trunk/include/poste.inc.php phpcompta/trunk/include/pref.inc.php phpcompta/trunk/include/preod.inc.php phpcompta/trunk/include/report.inc.php phpcompta/trunk/include/restore.inc.php phpcompta/trunk/include/save_predf_op.php phpcompta/trunk/include/stock.inc.php phpcompta/trunk/include/stock_inc.php phpcompta/trunk/include/suivi_adm.inc.php phpcompta/trunk/include/suivi_client.inc.php phpcompta/trunk/include/suivi_supplier.inc.php phpcompta/trunk/include/supplier.inc.php phpcompta/trunk/include/supplier_card.inc.php phpcompta/trunk/include/template/account_result.php phpcompta/trunk/include/template/account_search.php phpcompta/trunk/include/template/anc_balance_group.php phpcompta/trunk/include/template/calendar.php phpcompta/trunk/include/template/card_result.php phpcompta/trunk/include/template/category_of_card.php phpcompta/trunk/include/template/dashboard.php phpcompta/trunk/include/template/detail-action.php phpcompta/trunk/include/template/extension-detail.php phpcompta/trunk/include/template/extension-sec.php phpcompta/trunk/include/template/extension.php phpcompta/trunk/include/template/fiche_def_input.php phpcompta/trunk/include/template/forecast-detail.php phpcompta/trunk/include/template/forecast_cat.php phpcompta/trunk/include/template/forecast_result.php phpcompta/trunk/include/template/form_ledger_detail.php phpcompta/trunk/include/template/form_ledger_fin.php phpcompta/trunk/include/template/history_top.php phpcompta/trunk/include/template/impress_cat_card.php phpcompta/trunk/include/template/impress_reconciliation.php phpcompta/trunk/include/template/ledger_detail_ach.php phpcompta/trunk/include/template/ledger_detail_bottom.php phpcompta/trunk/include/template/ledger_detail_file.php phpcompta/trunk/include/template/ledger_detail_fin.php phpcompta/trunk/include/template/ledger_detail_forbidden.php phpcompta/trunk/include/template/ledger_detail_misc.php phpcompta/trunk/include/template/ledger_detail_top.php phpcompta/trunk/include/template/ledger_detail_ven.php phpcompta/trunk/include/template/ledger_search.php phpcompta/trunk/include/template/letter_all.php phpcompta/trunk/include/template/letter_prop.php phpcompta/trunk/include/template/list_category_document.php phpcompta/trunk/include/template/modele_document.php phpcompta/trunk/include/template/new_mod_payment.php phpcompta/trunk/include/template/param_jrn.php phpcompta/trunk/include/template/periode_add_exercice.php phpcompta/trunk/include/template/result_cat_card_summary.php phpcompta/trunk/include/template/security_list_action.php phpcompta/trunk/include/tfpdf/font/courier.php phpcompta/trunk/include/tfpdf/font/helvetica.php phpcompta/trunk/include/tfpdf/font/helveticab.php phpcompta/trunk/include/tfpdf/font/helveticabi.php phpcompta/trunk/include/tfpdf/font/helveticai.php phpcompta/trunk/include/tfpdf/font/symbol.php phpcompta/trunk/include/tfpdf/font/times.php phpcompta/trunk/include/tfpdf/font/timesb.php phpcompta/trunk/include/tfpdf/font/timesbi.php phpcompta/trunk/include/tfpdf/font/timesi.php phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSans-Bold.ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSans-BoldOblique.ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSans-ExtraLight.ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSans-Oblique.ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSans.ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSansCondensed-Bold.tt= f phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSansCondensed-BoldObl= ique.ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSansCondensed-Oblique= .ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSansCondensed.ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSansMono-Bold.ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSansMono-BoldOblique.= ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSansMono-Oblique.ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSansMono.ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSerif-Bold.ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSerif-BoldItalic.ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSerif-Italic.ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSerif.ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSerifCondensed-Bold.t= tf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSerifCondensed-BoldIt= alic.ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSerifCondensed-Italic= .ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSerifCondensed.ttf phpcompta/trunk/include/tfpdf/font/unifont/DejaVu_LICENSE.txt phpcompta/trunk/include/tfpdf/font/unifont/ttfonts.php phpcompta/trunk/include/tfpdf/font/zapfdingbats.php phpcompta/trunk/include/tfpdf/tfpdf.php phpcompta/trunk/include/tva.inc.php phpcompta/trunk/include/user.inc.php phpcompta/trunk/include/user_action_gl.php phpcompta/trunk/include/user_common.php phpcompta/trunk/include/user_menu.php phpcompta/trunk/include/verif_bilan.inc.php Log: Add properties Property changes on: phpcompta/trunk/html/do.php ___________________________________________________________________ Name: svn:keywords + Author Id Revision Date Property changes on: phpcompta/trunk/include/ac_common.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/action.common.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/action.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/adm.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/adm_card.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/anc_group.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/anc_imp.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/anc_od.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/anc_pa.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/audit_log.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/balance.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/balance_card.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/card_attr.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/cat_document.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_acc_account.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_acc_account_ledger.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_acc_balance.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_acc_bilan.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_acc_compute.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_acc_ledger.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_acc_ledger_fin.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_acc_ledger_info.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_acc_ledger_purchase.ph= p ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_acc_ledger_sold.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_acc_operation.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_acc_parm_code.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_acc_payment.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_acc_reconciliation.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_acc_report.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_acc_report_row.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_acc_tva.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_action.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_action_detail.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_admin.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_anc_acc_link.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_anc_acc_list.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_anc_account.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_anc_balance_double.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_anc_balance_simple.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_anc_grandlivre.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_anc_group.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_anc_group_operation.ph= p ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_anc_listing.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_anc_operation.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_anc_plan.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_anc_print.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_anc_table.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_anticipation.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_calendar.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_contact.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_customer.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_database.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_document.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_document_modele.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_document_type.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_dossier.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_exercice.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_extension.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_fiche.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_fiche_attr.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_fiche_def.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_fiche_def_ref.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_forecast.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_forecast_cat.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_forecast_item.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_gestion_purchase.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_gestion_sold.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_gestion_table.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_html_input.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_html_table.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_iaction.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_ibox_deprecated.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_ibutton.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_icard.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_icheckbox.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_iconcerned.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_idate.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_ifile.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_ihidden.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_inum.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_iperiod.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_ipopup.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_iposte.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_iradio.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_iselect.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_ispan.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_itext.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_itextarea.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_itva_popup.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_lettering.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_own.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_pdf.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_periode.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_pre_op_ach.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_pre_op_advanced.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_pre_op_fin.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_pre_op_ods.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_pre_op_ven.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_pre_operation.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_print_ledger_detail.ph= p ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_print_ledger_fin.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_print_ledger_misc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_print_ledger_simple.ph= p ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_print_ledger_simple_wi= thout_vat.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_sort_table.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_supplier.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_todo_list.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_user.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/class_zip_extended.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/client.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/client_card.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/compta_ach.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/compta_fin.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/compta_ods.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/compta_ven.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/config.inc ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/config_file.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/constant.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/constant.security.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/contact.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/detail_adm.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/detail_client.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/detail_supplier.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/document_modele.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/dossier.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/export_anc_acc_list.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/export_anc_acc_list_csv.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/export_anc_balance_double_cs= v.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/export_anc_balance_double_pd= f.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/export_anc_balance_group_csv= .php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/export_anc_balance_simple_cs= v.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/export_anc_balance_simple_pd= f.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/export_anc_list_csv.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/export_anc_table_csv.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/export_balance_csv.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/export_balance_pdf.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/export_fiche_balance_csv.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/export_fiche_balance_pdf.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/export_fiche_csv.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/export_fiche_detail_csv.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/export_fiche_detail_pdf.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/export_fiche_pdf.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/export_form_csv.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/export_form_pdf.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/export_gl_csv.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/export_gl_pdf.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/export_histo_csv.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/export_ledger_csv.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/export_ledger_pdf.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/export_poste_detail.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/export_poste_detail_csv.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/export_poste_detail_pdf.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/export_security_pdf.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/export_table_csv.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/ext/dummy/dummy.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/extension.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/extension_choice.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/fiche.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/fiche_def.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/forecast.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/function_javascript.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/header_print.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/impress.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/impress_bilan.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/impress_fiche.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/impress_gl_comptes.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/impress_inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/impress_jrn.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/impress_poste.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/impress_rapport.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/impress_rec.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/lettering.account.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/lettering.card.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/lettering.gestion.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/modele.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/modify_mod_document.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/modify_periode.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/modify_predf_op.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/opening.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/operation_adm.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/operation_client.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/operation_supplier.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/param_jrn.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/param_jrn_add.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/param_jrn_detail.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/param_pcmn.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/param_sec.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/payment_middle.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/periode.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/poste.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/pref.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/preod.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/report.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/restore.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/save_predf_op.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/stock.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/stock_inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/suivi_adm.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/suivi_client.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/suivi_supplier.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/supplier.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/supplier_card.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/template/account_result.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/template/account_search.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/template/anc_balance_group.p= hp ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/template/calendar.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/template/card_result.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/template/category_of_card.ph= p ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/template/dashboard.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/template/detail-action.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/template/extension-detail.ph= p ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/template/extension-sec.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/template/extension.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/template/fiche_def_input.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/template/forecast-detail.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/template/forecast_cat.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/template/forecast_result.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/template/form_ledger_detail.= php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/template/form_ledger_fin.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/template/history_top.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/template/impress_cat_card.ph= p ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/template/impress_reconciliat= ion.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/template/ledger_detail_ach.p= hp ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/template/ledger_detail_botto= m.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/template/ledger_detail_file.= php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/template/ledger_detail_fin.p= hp ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/template/ledger_detail_forbi= dden.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/template/ledger_detail_misc.= php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/template/ledger_detail_top.p= hp ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/template/ledger_detail_ven.p= hp ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/template/ledger_search.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/template/letter_all.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/template/letter_prop.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/template/list_category_docum= ent.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/template/modele_document.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/template/new_mod_payment.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/template/param_jrn.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/template/periode_add_exercic= e.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/template/result_cat_card_sum= mary.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/template/security_list_actio= n.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/tfpdf/font/courier.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/tfpdf/font/helvetica.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/tfpdf/font/helveticab.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/tfpdf/font/helveticabi.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/tfpdf/font/helveticai.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/tfpdf/font/symbol.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/tfpdf/font/times.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/tfpdf/font/timesb.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/tfpdf/font/timesbi.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/tfpdf/font/timesi.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSan= s-Bold.ttf ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSan= s-BoldOblique.ttf ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSan= s-ExtraLight.ttf ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSan= s-Oblique.ttf ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSan= s.ttf ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSan= sCondensed-Bold.ttf ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSan= sCondensed-BoldOblique.ttf ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSan= sCondensed-Oblique.ttf ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSan= sCondensed.ttf ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSan= sMono-Bold.ttf ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSan= sMono-BoldOblique.ttf ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSan= sMono-Oblique.ttf ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSan= sMono.ttf ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSer= if-Bold.ttf ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSer= if-BoldItalic.ttf ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSer= if-Italic.ttf ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSer= if.ttf ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSer= ifCondensed-Bold.ttf ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSer= ifCondensed-BoldItalic.ttf ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSer= ifCondensed-Italic.ttf ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/tfpdf/font/unifont/DejaVuSer= ifCondensed.ttf ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/tfpdf/font/unifont/DejaVu_LI= CENSE.txt ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/tfpdf/font/unifont/ttfonts.p= hp ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/tfpdf/font/zapfdingbats.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/tfpdf/tfpdf.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/tva.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/user.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/user_action_gl.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/user_common.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/user_menu.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date Property changes on: phpcompta/trunk/include/verif_bilan.inc.php ___________________________________________________________________ Name: svn:keywords - Author Id Revision Date + Revision Id Author Date From MAILER-DAEMON Fri Oct 28 22:58:42 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RJz86-0001Y1-4Q for mharc-phpcompta-dev@gnu.org; Fri, 28 Oct 2011 22:58:42 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sat, 29 Oct 2011 05:05:32 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4268 - phpcompta/trunk/sql X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Oct 2011 02:58:40 -0000 Author: danydb Date: 2011-10-29 05:05:29 +0200 (Sat, 29 Oct 2011) New Revision: 4268 Modified: phpcompta/trunk/sql/object-6.0.sql Log: Update menu Modified: phpcompta/trunk/sql/object-6.0.sql =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/sql/object-6.0.sql 2011-10-29 02:46:45 UTC (rev 4267) +++ phpcompta/trunk/sql/object-6.0.sql 2011-10-29 03:05:29 UTC (rev 4268) @@ -24,7 +24,8 @@ me_menu text, me_file text, me_url text, - me_description text + me_description text, + me_parameter text ); =20 =20 @@ -102,7 +103,8 @@ me_code_dep text, p_id integer, p_order integer, - p_type_display text NOT NULL + p_type_display text NOT NULL, + pm_default integer ); =20 =20 @@ -169,7 +171,7 @@ -- Name: profile_menu_pm_id_seq; Type: SEQUENCE SET; Schema: public; Own= er: dany -- =20 -SELECT pg_catalog.setval('profile_menu_pm_id_seq', 79, true); +SELECT pg_catalog.setval('profile_menu_pm_id_seq', 84, true); =20 =20 -- @@ -267,7 +269,7 @@ -- =20 CREATE VIEW v_all_menu AS - SELECT pm.me_code, pm.pm_id, pm.me_code_dep, pm.p_order, pm.p_type_d= isplay, pu.user_name, pu.pu_id, p.p_name, p.p_desc, mr.me_menu, mr.me_fil= e, mr.me_url FROM (((profile_menu pm JOIN profile_user pu ON ((pu.p_id =3D= pm.p_id))) JOIN profile p ON ((p.p_id =3D pm.p_id))) JOIN menu_ref mr US= ING (me_code)) ORDER BY pm.p_order; + SELECT pm.me_code, pm.pm_id, pm.me_code_dep, pm.p_order, pm.p_type_d= isplay, pu.user_name, pu.pu_id, p.p_name, p.p_desc, mr.me_menu, mr.me_fil= e, mr.me_url, mr.me_parameter FROM (((profile_menu pm JOIN profile_user p= u ON ((pu.p_id =3D pm.p_id))) JOIN profile p ON ((p.p_id =3D pm.p_id))) J= OIN menu_ref mr USING (me_code)) ORDER BY pm.p_order; =20 =20 ALTER TABLE public.v_all_menu OWNER TO dany; @@ -297,69 +299,71 @@ -- Data for Name: menu_ref; Type: TABLE DATA; Schema: public; Owner: dan= y -- =20 -INSERT INTO menu_ref VALUES ('COMPANY', 'Soci=C3=A9t=C3=A9s', 'company.i= nc.php', NULL, 'Parametre societe'); -INSERT INTO menu_ref VALUES ('PERIODE', 'P=C3=A9riode', 'periode.inc.php= ', NULL, 'Gestion des p=C3=A9riodes'); -INSERT INTO menu_ref VALUES ('DIVPARM', 'Divers', NULL, NULL, NULL); -INSERT INTO menu_ref VALUES ('CFGPAYMENT', 'Moyen de paiement', 'payment= _middle.inc.php', NULL, NULL); -INSERT INTO menu_ref VALUES ('CFGTVA', 'TVA', 'tva.inc.php', NULL, NULL)= ; -INSERT INTO menu_ref VALUES ('CFGACCOUNT', 'Poste', 'poste.inc.php', NUL= L, NULL); -INSERT INTO menu_ref VALUES ('CARD', 'Fiche', 'fiche.inc.php', NULL, NUL= L); -INSERT INTO menu_ref VALUES ('STOCK', 'Stock', 'stock.inc.php', NULL, NU= LL); -INSERT INTO menu_ref VALUES ('MISC', 'Op=C3=A9rations Diverses', 'compta= _ods.inc.php', NULL, NULL); -INSERT INTO menu_ref VALUES ('HIST', 'Historique', 'user_action_gl.php',= NULL, NULL); -INSERT INTO menu_ref VALUES ('VEN', 'Vente', 'compta_ven.inc.php', NULL,= NULL); -INSERT INTO menu_ref VALUES ('ACH', 'Achat', 'compta_ach.inc.php', NULL,= NULL); -INSERT INTO menu_ref VALUES ('FIN', 'Financier', 'compta_fin.inc.php', N= ULL, NULL); -INSERT INTO menu_ref VALUES ('LET', 'Lettrage', 'letter.inc.php', NULL, = NULL); -INSERT INTO menu_ref VALUES ('PREOD', 'Op=C3=A9rations pr=C3=A9d=C3=A9fi= nies', 'preod.inc.php', NULL, NULL); -INSERT INTO menu_ref VALUES ('VERIFBIL', 'V=C3=A9rification ', 'verif_bi= lan.inc.php', NULL, NULL); -INSERT INTO menu_ref VALUES ('REPORT', 'Cr=C3=A9ation de rapport', 'repo= rt.inc.php', NULL, NULL); -INSERT INTO menu_ref VALUES ('OPEN', 'Ecriture Ouverture', 'opening.inc.= php', NULL, NULL); -INSERT INTO menu_ref VALUES ('ADM', 'Administration', 'adm.inc.php', NUL= L, NULL); -INSERT INTO menu_ref VALUES ('SUPPL', 'Fournisseur', 'supplier.inc.php',= NULL, NULL); -INSERT INTO menu_ref VALUES ('FOLLOW', 'Courrier', 'action.inc.php', NUL= L, NULL); -INSERT INTO menu_ref VALUES ('FORECAST', 'Pr=C3=A9vision', 'forecast.inc= .php', NULL, NULL); -INSERT INTO menu_ref VALUES ('IMPJRN', 'Historique', 'impress_jrn.inc.ph= p', NULL, NULL); -INSERT INTO menu_ref VALUES ('IMPREC', 'Rapprochement', 'impress_rec.inc= .php', NULL, NULL); -INSERT INTO menu_ref VALUES ('IMPPOSTE', 'Poste', 'impress_poste.inc.php= ', NULL, NULL); -INSERT INTO menu_ref VALUES ('IMPREPORT', 'Rapport', 'impress_rapport.in= c.php', NULL, NULL); -INSERT INTO menu_ref VALUES ('IMPBILAN', 'Bilan', 'impress_bilan.inc.php= ', NULL, NULL); -INSERT INTO menu_ref VALUES ('IMPGL', 'Grand Livre', 'impress_gl_comptes= .inc.php', NULL, NULL); -INSERT INTO menu_ref VALUES ('IMPBAL', 'Balance', 'balance.inc.php', NUL= L, NULL); -INSERT INTO menu_ref VALUES ('IMPCARD', 'Cat=C3=A9gorie de Fiches', 'imp= ress_fiche.inc.php', NULL, NULL); -INSERT INTO menu_ref VALUES ('CUSTDET', 'Fiche', 'detail_client.inc.php'= , NULL, NULL); -INSERT INTO menu_ref VALUES ('CUSTFOLLOW', 'Suivi', 'suivi_client.inc.ph= p', NULL, NULL); -INSERT INTO menu_ref VALUES ('CUSTOP', 'Op=C3=A9ration', 'operation_clie= nt.inc.php', NULL, NULL); -INSERT INTO menu_ref VALUES ('CFGCARDCAT', 'Cat=C3=A9gorie de fiche', 'f= iche_def.inc.php', NULL, NULL); -INSERT INTO menu_ref VALUES ('CARDBAL', 'Balance', 'balance_card.inc.php= ', NULL, NULL); -INSERT INTO menu_ref VALUES ('CUST', 'Client', 'client.inc.php', NULL, N= ULL); -INSERT INTO menu_ref VALUES ('CFGCATDOC', 'Cat=C3=A9gorie de documents',= 'cat_document.inc.php', NULL, NULL); -INSERT INTO menu_ref VALUES ('CFGATTRIBCARD', 'Attribut de fiche', 'card= _attr.inc.php', NULL, NULL); -INSERT INTO menu_ref VALUES ('CFGPCMN', 'Plan Comptable', 'param_pcmn.in= c.php', NULL, NULL); -INSERT INTO menu_ref VALUES ('PARAM', 'Param=C3=A8tre', NULL, NULL, NULL= ); -INSERT INTO menu_ref VALUES ('GESTION', 'Gestion', NULL, NULL, NULL); -INSERT INTO menu_ref VALUES ('CUSTCONTACT', 'Contact (=C3=A0 faire)', NU= LL, NULL, NULL); -INSERT INTO menu_ref VALUES ('CFGEXTENSION', 'Extension', 'extension.inc= .php', NULL, NULL); -INSERT INTO menu_ref VALUES ('COMPTA', 'Comptabilit=C3=A9', NULL, NULL, = NULL); -INSERT INTO menu_ref VALUES ('LOGOUT', 'Sortie', NULL, 'logout.php', NUL= L); -INSERT INTO menu_ref VALUES ('DASHBOARD', 'Tableau de bord', 'dashboard.= inc.php', NULL, NULL); -INSERT INTO menu_ref VALUES ('IMP', 'Impression', NULL, NULL, NULL); -INSERT INTO menu_ref VALUES ('LETTER', 'Lettrage', NULL, NULL, NULL); -INSERT INTO menu_ref VALUES ('CFGSECURITY', 'S=C3=A9curit=C3=A9', 'param= _sec.inc.php', NULL, NULL); -INSERT INTO menu_ref VALUES ('LETTERCARD', 'Let. Fiche', 'lettering.card= .inc.php', NULL, NULL); -INSERT INTO menu_ref VALUES ('LETTERACC', 'Let. Poste', 'lettering.accou= nt.inc.php', NULL, NULL); -INSERT INTO menu_ref VALUES ('PREDOP', 'Ecriture pr=C3=A9definie', 'preo= d.inc.php', NULL, NULL); -INSERT INTO menu_ref VALUES ('ADV', 'Avanc=C3=A9', NULL, NULL, NULL); -INSERT INTO menu_ref VALUES ('ANC', 'Compta Analytique', NULL, NULL, NUL= L); -INSERT INTO menu_ref VALUES ('CFGDOCUMENT', 'Document', 'document_modele= .inc.php', NULL, NULL); -INSERT INTO menu_ref VALUES ('ACCESS', 'Dossier', NULL, 'user_login.php'= , NULL); -INSERT INTO menu_ref VALUES ('DOCUMENT', 'Document', 'document_modele.in= c.php', NULL, NULL); -INSERT INTO menu_ref VALUES ('CFGLEDGER', 'journaux', NULL, NULL, NULL); -INSERT INTO menu_ref VALUES ('PLANANC', 'Plan Compt. analytique', 'anc_p= a.inc.php', NULL, NULL); -INSERT INTO menu_ref VALUES ('ANCODS', 'Op=C3=A9rations diverses', 'anc_= od.inc.php', NULL, NULL); -INSERT INTO menu_ref VALUES ('ANCGROUP', 'Groupe', 'anc_group.inc.php', = NULL, NULL); -INSERT INTO menu_ref VALUES ('ANCIMP', 'Impression', 'anc_imp.inc.php', = NULL, NULL); -INSERT INTO menu_ref VALUES ('PREFERENCE', 'Pr=C3=A9f=C3=A9rence', 'pref= .inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('COMPANY', 'Soci=C3=A9t=C3=A9s', 'company.i= nc.php', NULL, 'Parametre societe', NULL); +INSERT INTO menu_ref VALUES ('PERIODE', 'P=C3=A9riode', 'periode.inc.php= ', NULL, 'Gestion des p=C3=A9riodes', NULL); +INSERT INTO menu_ref VALUES ('DIVPARM', 'Divers', NULL, NULL, NULL, NULL= ); +INSERT INTO menu_ref VALUES ('CFGPAYMENT', 'Moyen de paiement', 'payment= _middle.inc.php', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('CFGTVA', 'TVA', 'tva.inc.php', NULL, NULL,= NULL); +INSERT INTO menu_ref VALUES ('CFGACCOUNT', 'Poste', 'poste.inc.php', NUL= L, NULL, NULL); +INSERT INTO menu_ref VALUES ('CARD', 'Fiche', 'fiche.inc.php', NULL, NUL= L, NULL); +INSERT INTO menu_ref VALUES ('STOCK', 'Stock', 'stock.inc.php', NULL, NU= LL, NULL); +INSERT INTO menu_ref VALUES ('MISC', 'Op=C3=A9rations Diverses', 'compta= _ods.inc.php', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('HIST', 'Historique', 'user_action_gl.php',= NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('VEN', 'Vente', 'compta_ven.inc.php', NULL,= NULL, NULL); +INSERT INTO menu_ref VALUES ('ACH', 'Achat', 'compta_ach.inc.php', NULL,= NULL, NULL); +INSERT INTO menu_ref VALUES ('FIN', 'Financier', 'compta_fin.inc.php', N= ULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('LET', 'Lettrage', 'letter.inc.php', NULL, = NULL, NULL); +INSERT INTO menu_ref VALUES ('PREOD', 'Op=C3=A9rations pr=C3=A9d=C3=A9fi= nies', 'preod.inc.php', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('VERIFBIL', 'V=C3=A9rification ', 'verif_bi= lan.inc.php', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('REPORT', 'Cr=C3=A9ation de rapport', 'repo= rt.inc.php', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('OPEN', 'Ecriture Ouverture', 'opening.inc.= php', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('ADM', 'Administration', 'adm.inc.php', NUL= L, NULL, NULL); +INSERT INTO menu_ref VALUES ('SUPPL', 'Fournisseur', 'supplier.inc.php',= NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('FOLLOW', 'Courrier', 'action.inc.php', NUL= L, NULL, NULL); +INSERT INTO menu_ref VALUES ('FORECAST', 'Pr=C3=A9vision', 'forecast.inc= .php', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('IMPJRN', 'Historique', 'impress_jrn.inc.ph= p', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('IMPREC', 'Rapprochement', 'impress_rec.inc= .php', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('IMPPOSTE', 'Poste', 'impress_poste.inc.php= ', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('IMPREPORT', 'Rapport', 'impress_rapport.in= c.php', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('IMPBILAN', 'Bilan', 'impress_bilan.inc.php= ', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('IMPGL', 'Grand Livre', 'impress_gl_comptes= .inc.php', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('IMPBAL', 'Balance', 'balance.inc.php', NUL= L, NULL, NULL); +INSERT INTO menu_ref VALUES ('IMPCARD', 'Cat=C3=A9gorie de Fiches', 'imp= ress_fiche.inc.php', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('CUSTDET', 'Fiche', 'detail_client.inc.php'= , NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('CUSTFOLLOW', 'Suivi', 'suivi_client.inc.ph= p', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('CUSTOP', 'Op=C3=A9ration', 'operation_clie= nt.inc.php', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('CFGCARDCAT', 'Cat=C3=A9gorie de fiche', 'f= iche_def.inc.php', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('CARDBAL', 'Balance', 'balance_card.inc.php= ', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('CUST', 'Client', 'client.inc.php', NULL, N= ULL, NULL); +INSERT INTO menu_ref VALUES ('CFGCATDOC', 'Cat=C3=A9gorie de documents',= 'cat_document.inc.php', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('CFGATTRIBCARD', 'Attribut de fiche', 'card= _attr.inc.php', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('CFGPCMN', 'Plan Comptable', 'param_pcmn.in= c.php', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('PARAM', 'Param=C3=A8tre', NULL, NULL, NULL= , NULL); +INSERT INTO menu_ref VALUES ('GESTION', 'Gestion', NULL, NULL, NULL, NUL= L); +INSERT INTO menu_ref VALUES ('CUSTCONTACT', 'Contact (=C3=A0 faire)', NU= LL, NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('CFGEXTENSION', 'Extension', 'extension.inc= .php', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('COMPTA', 'Comptabilit=C3=A9', NULL, NULL, = NULL, NULL); +INSERT INTO menu_ref VALUES ('LOGOUT', 'Sortie', NULL, 'logout.php', NUL= L, NULL); +INSERT INTO menu_ref VALUES ('DASHBOARD', 'Tableau de bord', 'dashboard.= inc.php', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('IMP', 'Impression', NULL, NULL, NULL, NULL= ); +INSERT INTO menu_ref VALUES ('LETTER', 'Lettrage', NULL, NULL, NULL, NUL= L); +INSERT INTO menu_ref VALUES ('CFGSECURITY', 'S=C3=A9curit=C3=A9', 'param= _sec.inc.php', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('LETTERCARD', 'Let. Fiche', 'lettering.card= .inc.php', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('LETTERACC', 'Let. Poste', 'lettering.accou= nt.inc.php', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('PREDOP', 'Ecriture pr=C3=A9definie', 'preo= d.inc.php', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('ADV', 'Avanc=C3=A9', NULL, NULL, NULL, NUL= L); +INSERT INTO menu_ref VALUES ('ANC', 'Compta Analytique', NULL, NULL, NUL= L, NULL); +INSERT INTO menu_ref VALUES ('CFGDOCUMENT', 'Document', 'document_modele= .inc.php', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('ACCESS', 'Dossier', NULL, 'user_login.php'= , NULL, NULL); +INSERT INTO menu_ref VALUES ('DOCUMENT', 'Document', 'document_modele.in= c.php', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('CFGLEDGER', 'journaux', NULL, NULL, NULL, = NULL); +INSERT INTO menu_ref VALUES ('PLANANC', 'Plan Compt. analytique', 'anc_p= a.inc.php', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('ANCODS', 'Op=C3=A9rations diverses', 'anc_= od.inc.php', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('ANCGROUP', 'Groupe', 'anc_group.inc.php', = NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('ANCIMP', 'Impression', 'anc_imp.inc.php', = NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('PREFERENCE', 'Pr=C3=A9f=C3=A9rence', 'pref= .inc.php', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('EXTENSION', 'Extension', 'ext_inc.php', NU= LL, NULL, NULL); +INSERT INTO menu_ref VALUES ('TVA', 'Tva', 'extension_get.inc.php', NULL= , NULL, 'plugin_code=3DAMORTIS'); =20 =20 -- @@ -375,68 +379,72 @@ -- Data for Name: profile_menu; Type: TABLE DATA; Schema: public; Owner:= dany -- =20 -INSERT INTO profile_menu VALUES (1, 'COMPTA', NULL, 1, 5, 'M'); -INSERT INTO profile_menu VALUES (2, 'ANC', NULL, 1, 7, 'M'); -INSERT INTO profile_menu VALUES (45, 'PARAM', NULL, 1, 2, 'M'); -INSERT INTO profile_menu VALUES (44, 'DASHBOARD', NULL, 1, 1, 'M'); -INSERT INTO profile_menu VALUES (50, 'ANC', NULL, 2, 1, 'M'); -INSERT INTO profile_menu VALUES (51, 'COMPTA', NULL, 3, 1, 'M'); -INSERT INTO profile_menu VALUES (52, 'VEN', 'COMPTA', 3, 1, 'E'); -INSERT INTO profile_menu VALUES (53, 'ACCESS', NULL, 1, 18, 'M'); -INSERT INTO profile_menu VALUES (54, 'COMPANY', 'PARAM', 1, 1, 'E'); -INSERT INTO profile_menu VALUES (55, 'PERIODE', 'PARAM', 1, 2, 'E'); -INSERT INTO profile_menu VALUES (56, 'DIVPARM', 'PARAM', 1, 3, 'E'); -INSERT INTO profile_menu VALUES (59, 'CFGPAYMENT', 'DIVPARM', 1, 4, 'E')= ; -INSERT INTO profile_menu VALUES (60, 'CFGTVA', 'DIVPARM', 1, 5, 'E'); -INSERT INTO profile_menu VALUES (61, 'CFGACCOUNT', 'DIVPARM', 1, 6, 'E')= ; -INSERT INTO profile_menu VALUES (67, 'CFGCATDOC', 'DIVPARM', 1, 8, 'E'); -INSERT INTO profile_menu VALUES (13, 'IMPBILAN', 'IMP', 1, 11, 'E'); -INSERT INTO profile_menu VALUES (14, 'IMPCARD', 'IMP', 1, 12, 'E'); -INSERT INTO profile_menu VALUES (15, 'IMPGL', 'IMP', 1, 13, 'E'); -INSERT INTO profile_menu VALUES (16, 'IMPJRN', 'IMP', 1, 14, 'E'); -INSERT INTO profile_menu VALUES (17, 'IMPBAL', 'IMP', 1, 15, 'E'); -INSERT INTO profile_menu VALUES (68, 'CFGATTRIBCARD', 'DIVPARM', 1, 9, '= E'); -INSERT INTO profile_menu VALUES (69, 'CFGPCMN', 'PARAM', 1, 4, 'E'); -INSERT INTO profile_menu VALUES (70, 'CFGEXTENSION', 'PARAM', 1, 5, 'E')= ; -INSERT INTO profile_menu VALUES (20, 'LOGOUT', NULL, 1, 19, 'M'); -INSERT INTO profile_menu VALUES (71, 'CFGSECURITY', 'PARAM', 1, 6, 'E'); -INSERT INTO profile_menu VALUES (72, 'PREDOP', 'PARAM', 1, 7, 'E'); -INSERT INTO profile_menu VALUES (73, 'CFGDOCUMENT', 'PARAM', 1, 8, 'E'); -INSERT INTO profile_menu VALUES (74, 'CFGLEDGER', 'PARAM', 1, 9, 'E'); -INSERT INTO profile_menu VALUES (75, 'PLANANC', 'ANC', 1, 1, 'E'); -INSERT INTO profile_menu VALUES (65, 'CFGCARDCAT', 'DIVPARM', 1, 7, 'E')= ; -INSERT INTO profile_menu VALUES (9, 'IMPPOSTE', 'IMP', 1, 8, 'E'); -INSERT INTO profile_menu VALUES (10, 'IMPREC', 'IMP', 1, 9, 'E'); -INSERT INTO profile_menu VALUES (11, 'IMPREPORT', 'IMP', 1, 10, 'E'); -INSERT INTO profile_menu VALUES (76, 'ANCODS', 'ANC', 1, 2, 'E'); -INSERT INTO profile_menu VALUES (77, 'ANCGROUP', 'ANC', 1, 3, 'E'); -INSERT INTO profile_menu VALUES (78, 'ANCIMP', 'ANC', 1, 4, 'E'); -INSERT INTO profile_menu VALUES (79, 'PREFERENCE', NULL, 1, 2, 'M'); -INSERT INTO profile_menu VALUES (23, 'LETTER', 'COMPTA', 1, 8, 'E'); -INSERT INTO profile_menu VALUES (24, 'LETTERCARD', 'LETTER', 1, 1, 'E'); -INSERT INTO profile_menu VALUES (27, 'LETTERACC', 'LETTER', 1, 2, 'E'); -INSERT INTO profile_menu VALUES (37, 'CUST', 'GESTION', 1, 1, 'E'); -INSERT INTO profile_menu VALUES (38, 'SUPPL', 'GESTION', 1, 2, 'E'); -INSERT INTO profile_menu VALUES (39, 'ADM', 'GESTION', 1, 3, 'E'); -INSERT INTO profile_menu VALUES (35, 'IMP', 'GESTION', 1, 4, 'E'); -INSERT INTO profile_menu VALUES (36, 'CARD', 'GESTION', 1, 6, 'E'); -INSERT INTO profile_menu VALUES (40, 'STOCK', 'GESTION', 1, 5, 'E'); -INSERT INTO profile_menu VALUES (41, 'FORECAST', 'GESTION', 1, 7, 'E'); -INSERT INTO profile_menu VALUES (42, 'FOLLOW', 'GESTION', 1, 8, 'E'); -INSERT INTO profile_menu VALUES (29, 'VERIFBIL', 'ADV', 1, 21, 'E'); -INSERT INTO profile_menu VALUES (30, 'STOCK', 'ADV', 1, 22, 'E'); -INSERT INTO profile_menu VALUES (31, 'PREDOP', 'ADV', 1, 23, 'E'); -INSERT INTO profile_menu VALUES (32, 'OPEN', 'ADV', 1, 24, 'E'); -INSERT INTO profile_menu VALUES (33, 'REPORT', 'ADV', 1, 25, 'E'); -INSERT INTO profile_menu VALUES (5, 'CARD', 'COMPTA', 1, 7, 'E'); -INSERT INTO profile_menu VALUES (43, 'HIST', 'COMPTA', 1, 1, 'E'); -INSERT INTO profile_menu VALUES (34, 'GESTION', NULL, 1, 6, 'M'); -INSERT INTO profile_menu VALUES (4, 'VEN', 'COMPTA', 1, 2, 'E'); -INSERT INTO profile_menu VALUES (3, 'ACH', 'COMPTA', 1, 3, 'E'); -INSERT INTO profile_menu VALUES (19, 'FIN', 'COMPTA', 1, 4, 'E'); -INSERT INTO profile_menu VALUES (18, 'MISC', 'COMPTA', 1, 5, 'E'); -INSERT INTO profile_menu VALUES (6, 'IMP', 'COMPTA', 1, 6, 'E'); -INSERT INTO profile_menu VALUES (28, 'ADV', 'COMPTA', 1, 20, 'E'); +INSERT INTO profile_menu VALUES (45, 'PARAM', NULL, 1, 2, 'M', NULL); +INSERT INTO profile_menu VALUES (51, 'COMPTA', NULL, 3, 1, 'M', NULL); +INSERT INTO profile_menu VALUES (52, 'VEN', 'COMPTA', 3, 1, 'E', NULL); +INSERT INTO profile_menu VALUES (53, 'ACCESS', NULL, 1, 18, 'M', NULL); +INSERT INTO profile_menu VALUES (54, 'COMPANY', 'PARAM', 1, 1, 'E', NULL= ); +INSERT INTO profile_menu VALUES (55, 'PERIODE', 'PARAM', 1, 2, 'E', NULL= ); +INSERT INTO profile_menu VALUES (56, 'DIVPARM', 'PARAM', 1, 3, 'E', NULL= ); +INSERT INTO profile_menu VALUES (59, 'CFGPAYMENT', 'DIVPARM', 1, 4, 'E',= NULL); +INSERT INTO profile_menu VALUES (60, 'CFGTVA', 'DIVPARM', 1, 5, 'E', NUL= L); +INSERT INTO profile_menu VALUES (61, 'CFGACCOUNT', 'DIVPARM', 1, 6, 'E',= NULL); +INSERT INTO profile_menu VALUES (67, 'CFGCATDOC', 'DIVPARM', 1, 8, 'E', = NULL); +INSERT INTO profile_menu VALUES (13, 'IMPBILAN', 'IMP', 1, 11, 'E', NULL= ); +INSERT INTO profile_menu VALUES (14, 'IMPCARD', 'IMP', 1, 12, 'E', NULL)= ; +INSERT INTO profile_menu VALUES (15, 'IMPGL', 'IMP', 1, 13, 'E', NULL); +INSERT INTO profile_menu VALUES (16, 'IMPJRN', 'IMP', 1, 14, 'E', NULL); +INSERT INTO profile_menu VALUES (17, 'IMPBAL', 'IMP', 1, 15, 'E', NULL); +INSERT INTO profile_menu VALUES (68, 'CFGATTRIBCARD', 'DIVPARM', 1, 9, '= E', NULL); +INSERT INTO profile_menu VALUES (69, 'CFGPCMN', 'PARAM', 1, 4, 'E', NULL= ); +INSERT INTO profile_menu VALUES (70, 'CFGEXTENSION', 'PARAM', 1, 5, 'E',= NULL); +INSERT INTO profile_menu VALUES (20, 'LOGOUT', NULL, 1, 19, 'M', NULL); +INSERT INTO profile_menu VALUES (71, 'CFGSECURITY', 'PARAM', 1, 6, 'E', = NULL); +INSERT INTO profile_menu VALUES (72, 'PREDOP', 'PARAM', 1, 7, 'E', NULL)= ; +INSERT INTO profile_menu VALUES (73, 'CFGDOCUMENT', 'PARAM', 1, 8, 'E', = NULL); +INSERT INTO profile_menu VALUES (74, 'CFGLEDGER', 'PARAM', 1, 9, 'E', NU= LL); +INSERT INTO profile_menu VALUES (75, 'PLANANC', 'ANC', 1, 1, 'E', NULL); +INSERT INTO profile_menu VALUES (65, 'CFGCARDCAT', 'DIVPARM', 1, 7, 'E',= NULL); +INSERT INTO profile_menu VALUES (9, 'IMPPOSTE', 'IMP', 1, 8, 'E', NULL); +INSERT INTO profile_menu VALUES (10, 'IMPREC', 'IMP', 1, 9, 'E', NULL); +INSERT INTO profile_menu VALUES (11, 'IMPREPORT', 'IMP', 1, 10, 'E', NUL= L); +INSERT INTO profile_menu VALUES (76, 'ANCODS', 'ANC', 1, 2, 'E', NULL); +INSERT INTO profile_menu VALUES (77, 'ANCGROUP', 'ANC', 1, 3, 'E', NULL)= ; +INSERT INTO profile_menu VALUES (78, 'ANCIMP', 'ANC', 1, 4, 'E', NULL); +INSERT INTO profile_menu VALUES (23, 'LETTER', 'COMPTA', 1, 8, 'E', NULL= ); +INSERT INTO profile_menu VALUES (24, 'LETTERCARD', 'LETTER', 1, 1, 'E', = NULL); +INSERT INTO profile_menu VALUES (27, 'LETTERACC', 'LETTER', 1, 2, 'E', N= ULL); +INSERT INTO profile_menu VALUES (37, 'CUST', 'GESTION', 1, 1, 'E', NULL)= ; +INSERT INTO profile_menu VALUES (38, 'SUPPL', 'GESTION', 1, 2, 'E', NULL= ); +INSERT INTO profile_menu VALUES (39, 'ADM', 'GESTION', 1, 3, 'E', NULL); +INSERT INTO profile_menu VALUES (35, 'IMP', 'GESTION', 1, 4, 'E', NULL); +INSERT INTO profile_menu VALUES (36, 'CARD', 'GESTION', 1, 6, 'E', NULL)= ; +INSERT INTO profile_menu VALUES (40, 'STOCK', 'GESTION', 1, 5, 'E', NULL= ); +INSERT INTO profile_menu VALUES (41, 'FORECAST', 'GESTION', 1, 7, 'E', N= ULL); +INSERT INTO profile_menu VALUES (42, 'FOLLOW', 'GESTION', 1, 8, 'E', NUL= L); +INSERT INTO profile_menu VALUES (29, 'VERIFBIL', 'ADV', 1, 21, 'E', NULL= ); +INSERT INTO profile_menu VALUES (30, 'STOCK', 'ADV', 1, 22, 'E', NULL); +INSERT INTO profile_menu VALUES (31, 'PREDOP', 'ADV', 1, 23, 'E', NULL); +INSERT INTO profile_menu VALUES (32, 'OPEN', 'ADV', 1, 24, 'E', NULL); +INSERT INTO profile_menu VALUES (33, 'REPORT', 'ADV', 1, 25, 'E', NULL); +INSERT INTO profile_menu VALUES (5, 'CARD', 'COMPTA', 1, 7, 'E', NULL); +INSERT INTO profile_menu VALUES (43, 'HIST', 'COMPTA', 1, 1, 'E', NULL); +INSERT INTO profile_menu VALUES (34, 'GESTION', NULL, 1, 6, 'M', NULL); +INSERT INTO profile_menu VALUES (4, 'VEN', 'COMPTA', 1, 2, 'E', NULL); +INSERT INTO profile_menu VALUES (3, 'ACH', 'COMPTA', 1, 3, 'E', NULL); +INSERT INTO profile_menu VALUES (19, 'FIN', 'COMPTA', 1, 4, 'E', NULL); +INSERT INTO profile_menu VALUES (18, 'MISC', 'COMPTA', 1, 5, 'E', NULL); +INSERT INTO profile_menu VALUES (6, 'IMP', 'COMPTA', 1, 6, 'E', NULL); +INSERT INTO profile_menu VALUES (28, 'ADV', 'COMPTA', 1, 20, 'E', NULL); +INSERT INTO profile_menu VALUES (79, 'PREFERENCE', 'ANC', 1, 2, 'M', NUL= L); +INSERT INTO profile_menu VALUES (44, 'DASHBOARD', NULL, 1, 1, 'M', 0); +INSERT INTO profile_menu VALUES (1, 'COMPTA', NULL, 1, 5, 'M', 0); +INSERT INTO profile_menu VALUES (2, 'ANC', NULL, 1, 7, 'M', 1); +INSERT INTO profile_menu VALUES (80, 'PLANANC', 'ANC', 2, 1, 'E', NULL); +INSERT INTO profile_menu VALUES (50, 'ANC', NULL, 2, 1, 'M', 1); +INSERT INTO profile_menu VALUES (82, 'EXTENSION', NULL, 1, 100, 'M', NUL= L); +INSERT INTO profile_menu VALUES (83, 'TVA', NULL, 1, 101, 'M', NULL); +INSERT INTO profile_menu VALUES (84, 'TVA', 'PARAM', 1, 102, 'E', NULL); =20 =20 -- From MAILER-DAEMON Sat Oct 29 08:47:07 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RK8JX-000539-OO for mharc-phpcompta-dev@gnu.org; Sat, 29 Oct 2011 08:47:07 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sat, 29 Oct 2011 14:53:55 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4269 - in phpcompta/trunk: html include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Oct 2011 12:47:05 -0000 Author: danydb Date: 2011-10-29 14:53:53 +0200 (Sat, 29 Oct 2011) New Revision: 4269 Added: phpcompta/trunk/include/export_bilan_oth.php Removed: phpcompta/trunk/html/bilan.php Modified: phpcompta/trunk/html/export.php phpcompta/trunk/include/ac_common.php phpcompta/trunk/include/impress_bilan.inc.php Log: 421: bilan.php moved Deleted: phpcompta/trunk/html/bilan.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/bilan.php 2011-10-29 03:05:29 UTC (rev 4268) +++ phpcompta/trunk/html/bilan.php 2011-10-29 12:53:53 UTC (rev 4269) @@ -1,70 +0,0 @@ -Check(); - -// TODO a specific level of security for the "bilan" ??? -// Change must be done here -$User->can_request(IMPBIL); - - -$bilan=3Dnew Acc_Bilan($cn); -$bilan->get_request_get(); -$bilan->load(); -/*\!bug the headers shouldn't be sent here, but it doesn't work - * a html header is send before, to fix asap */ -if ( $bilan->b_type=3D=3D'odt') -{ - header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); - header("Cache-Control: must-revalidate"); - header('Content-type: application/vnd.oasis.opendocument.text'); - header('Content-Disposition: attachment;filename=3D"'.$bilan->b_name= .'.odt"',FALSE); - header("Accept-Ranges: bytes"); - -} -if ( $bilan->b_type=3D=3D'ods') -{ - header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); - header("Cache-Control: must-revalidate"); - header('Content-type: application/vnd.oasis.opendocument.spreadsheet= '); - header('Content-Disposition: attachment;filename=3D"'.$bilan->b_name= .'.ods"',FALSE); - header("Accept-Ranges: bytes"); - -} - -$bilan->generate(); -?> Modified: phpcompta/trunk/html/export.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/export.php 2011-10-29 03:05:29 UTC (rev 4268) +++ phpcompta/trunk/html/export.php 2011-10-29 12:53:53 UTC (rev 4269) @@ -22,7 +22,7 @@ =20 /*!\file * \brief manage all the export to CSV or PDF - * act can be=20 + * act can be * */ =20 @@ -46,7 +46,7 @@ exit(); } =20 -switch( $_GET['act'])=20 +switch( $_GET['act']) { case 'CSV/histo': $user->can_request(IMPJRN,0); @@ -168,7 +168,11 @@ require_once('export_anc_balance_group_csv.php'); exit(); break; - + case 'OTH/Bilan': + $user->can_request(IMPBIL); + require_once 'export_bilan_oth.php'; + exit(); + break; default: alert('Action inconnue '.$_GET['act']); exit(); Modified: phpcompta/trunk/include/ac_common.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/ac_common.php 2011-10-29 03:05:29 UTC (rev 42= 68) +++ phpcompta/trunk/include/ac_common.php 2011-10-29 12:53:53 UTC (rev 42= 69) @@ -886,7 +886,10 @@ function compute_variable($p_string) { $array=3Darray(); + if ($p_string =3D=3D '') return $array; + =20 $var=3Dexplode("&",$p_string); + if (empty ($var)) return $array; for ($i=3D0;$i < count($var);$i++) { $var2=3Dexplode('=3D',$var[$i]); Copied: phpcompta/trunk/include/export_bilan_oth.php (from rev 4265, phpc= ompta/trunk/html/bilan.php) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/export_bilan_oth.php = (rev 0) +++ phpcompta/trunk/include/export_bilan_oth.php 2011-10-29 12:53:53 UTC = (rev 4269) @@ -0,0 +1,70 @@ +Check(); + +// TODO a specific level of security for the "bilan" ??? +// Change must be done here +$User->can_request(IMPBIL); + + +$bilan=3Dnew Acc_Bilan($cn); +$bilan->get_request_get(); +$bilan->load(); +/*\!bug the headers shouldn't be sent here, but it doesn't work + * a html header is send before, to fix asap */ +if ( $bilan->b_type=3D=3D'odt') +{ + header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); + header("Cache-Control: must-revalidate"); + header('Content-type: application/vnd.oasis.opendocument.text'); + header('Content-Disposition: attachment;filename=3D"'.$bilan->b_name= .'.odt"',FALSE); + header("Accept-Ranges: bytes"); + +} +if ( $bilan->b_type=3D=3D'ods') +{ + header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); + header("Cache-Control: must-revalidate"); + header('Content-type: application/vnd.oasis.opendocument.spreadsheet= '); + header('Content-Disposition: attachment;filename=3D"'.$bilan->b_name= .'.ods"',FALSE); + header("Accept-Ranges: bytes"); + +} + +$bilan->generate(); +?> Modified: phpcompta/trunk/include/impress_bilan.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/impress_bilan.inc.php 2011-10-29 03:05:29 UTC= (rev 4268) +++ phpcompta/trunk/include/impress_bilan.inc.php 2011-10-29 12:53:53 UTC= (rev 4269) @@ -74,10 +74,11 @@ $bilan->get_request_get(); $bilan->verify(); =20 - echo '
'; + echo ''; echo dossier::hidden(); echo HtmlInput::get_to_hidden(array('exercice')); echo HtmlInput::hidden('b_id',$_GET['b_id']); + echo HtmlInput::hidden('act','OTH/Bilan'); =20 echo HtmlInput::hidden('from_periode',$bilan->from); echo HtmlInput::hidden('to_periode',$bilan->to); From MAILER-DAEMON Sat Oct 29 09:08:28 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RK8eC-0007cA-P4 for mharc-phpcompta-dev@gnu.org; Sat, 29 Oct 2011 09:08:28 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sat, 29 Oct 2011 15:15:18 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4270 - in phpcompta/trunk: html/js include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Oct 2011 13:08:27 -0000 Author: danydb Date: 2011-10-29 15:15:17 +0200 (Sat, 29 Oct 2011) New Revision: 4270 Modified: phpcompta/trunk/html/js/anc_script.js phpcompta/trunk/html/js/controls.js phpcompta/trunk/include/action.common.inc.php phpcompta/trunk/include/class_acc_tva.php phpcompta/trunk/include/contact.inc.php phpcompta/trunk/include/export_bilan_oth.php phpcompta/trunk/include/forecast.inc.php phpcompta/trunk/include/modele.inc.php Log: remove todo, dead code Modified: phpcompta/trunk/html/js/anc_script.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/js/anc_script.js 2011-10-29 12:53:53 UTC (rev 42= 69) +++ phpcompta/trunk/html/js/anc_script.js 2011-10-29 13:15:17 UTC (rev 42= 70) @@ -109,12 +109,12 @@ return true; } /*! - * \brief open a window for searching a CA account,=20 + * \brief open a window for searching a CA account, * \param p_dossier dossier id * \param p_target ctrl to update * \param p_source ctrl containing the pa_id - *=20 * + * * \return */ function search_ca (p_dossier,p_target,p_source) @@ -207,7 +207,6 @@ } /** * add a row in misc operation for ANC -*@todo if we add a line, the number of lines become variables * the code must be adapted for that */ function anc_add_row(tableid) Modified: phpcompta/trunk/html/js/controls.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/js/controls.js 2011-10-29 12:53:53 UTC (rev 4269= ) +++ phpcompta/trunk/html/js/controls.js 2011-10-29 13:15:17 UTC (rev 4270= ) @@ -781,7 +781,7 @@ onComplete: Prototype.emptyFunction, onSuccess: function(transport) { var js =3D transport.responseText.strip(); - if (!/^\[.*\]$/.test(js)) // TODO: improve sanity check + if (!/^\[.*\]$/.test(js))=20 throw('Server returned an invalid collection representation.')= ; this._collection =3D eval(js); this.checkForExternalText(); Modified: phpcompta/trunk/include/action.common.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/action.common.inc.php 2011-10-29 12:53:53 UTC= (rev 4269) +++ phpcompta/trunk/include/action.common.inc.php 2011-10-29 13:15:17 UTC= (rev 4270) @@ -284,21 +284,7 @@ =20 $see_all=3Dnew ICheckBox('see_all'); $my_action=3Dnew ICheckBox('all_action'); -/** - * @todo - * if ( $_REQUEST ['p_action'] !=3D 'suivi_courrier') - * - { - $see_all->selected=3Dtrue; - $my_action->selected=3D true; - } - else - { - $see_all->selected=3D(isset($_REQUEST ['see_all']))?true:false; - $my_action->selected=3D (isset($_REQUEST ['all_action']))?true:fal= se; - } - * - */ + echo _('les actions ferm=C3=A9es aussi:').$see_all->input().'
'; =20 echo _('affect=C3=A9 =C3=A0 d\'autre:').$my_action->input().'
'; Modified: phpcompta/trunk/include/class_acc_tva.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_acc_tva.php 2011-10-29 12:53:53 UTC (re= v 4269) +++ phpcompta/trunk/include/class_acc_tva.php 2011-10-29 13:15:17 UTC (re= v 4270) @@ -28,13 +28,13 @@ =20 /*!\brief Acc_Tva is used for to map the table tva_rate * parameter are -- private static $cn; database connection=20 +- private static $cn; database connection - private static $variable=3Darray("id"=3D>"tva_id", "label"=3D>"tva_label", "rate"=3D>"tva_rate", "comment"=3D>"tva_comment", "account"=3D>"tva_poste"); -=20 + */ class Acc_Tva { @@ -124,7 +124,7 @@ } /** *Load the VAT, - *@todo if the label is not found then we get an message error, so t= he best is probably + *@note if the label is not found then we get an message error, so t= he best is probably *to initialize the VAT object with default value */ public function load() Modified: phpcompta/trunk/include/contact.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/contact.inc.php 2011-10-29 12:53:53 UTC (rev = 4269) +++ phpcompta/trunk/include/contact.inc.php 2011-10-29 13:15:17 UTC (rev = 4270) @@ -36,7 +36,6 @@ =20 // if this page is called from another menu (customer, supplier,...) // a button back is added -// TODO add function for generating url, hidden tags... if ( isset ($_REQUEST['url'])) { $retour=3DHtmlInput::button_anchor('Retour',urldecode($_REQUEST['url= '])); Modified: phpcompta/trunk/include/export_bilan_oth.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/export_bilan_oth.php 2011-10-29 12:53:53 UTC = (rev 4269) +++ phpcompta/trunk/include/export_bilan_oth.php 2011-10-29 13:15:17 UTC = (rev 4270) @@ -34,14 +34,6 @@ /* Admin. Dossier */ $cn=3Dnew Database($gDossier); =20 -$User=3Dnew User($cn); -$User->Check(); - -// TODO a specific level of security for the "bilan" ??? -// Change must be done here -$User->can_request(IMPBIL); - - $bilan=3Dnew Acc_Bilan($cn); $bilan->get_request_get(); $bilan->load(); Modified: phpcompta/trunk/include/forecast.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/forecast.inc.php 2011-10-29 12:53:53 UTC (rev= 4269) +++ phpcompta/trunk/include/forecast.inc.php 2011-10-29 13:15:17 UTC (rev= 4270) @@ -33,9 +33,6 @@ * * * ******************************************************************** = */ -/** - * @todo add security for forecast.inc.php - */ if (isset($_GET['del'])) { $forecast =3D new Forecast($cn, $_GET['f_id']); Modified: phpcompta/trunk/include/modele.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/modele.inc.php 2011-10-29 12:53:53 UTC (rev 4= 269) +++ phpcompta/trunk/include/modele.inc.php 2011-10-29 13:15:17 UTC (rev 4= 270) @@ -22,7 +22,7 @@ =20 /*!\file * - *=20 + * * \brief concerne only the template * */ @@ -120,8 +120,6 @@ =20 $Res=3D$cn_mod->exec_sql('delete from operation_analytique'); =20 - // TODO - $Res=3D$cn_mod->exec_sql("truncate table import_tmp"); // Reset the closed periode $Res=3D$cn_mod->exec_sql("update parm_periode set p_closed=3D'f'"); From MAILER-DAEMON Sat Oct 29 10:39:31 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RKA4J-0001YC-Gc for mharc-phpcompta-dev@gnu.org; Sat, 29 Oct 2011 10:39:31 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sat, 29 Oct 2011 16:46:15 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4271 - in phpcompta/trunk: html include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Oct 2011 14:39:28 -0000 Author: danydb Date: 2011-10-29 16:46:13 +0200 (Sat, 29 Oct 2011) New Revision: 4271 Modified: phpcompta/trunk/html/ajax_card.php phpcompta/trunk/html/ajax_poste.php phpcompta/trunk/html/fid.php phpcompta/trunk/html/login.php phpcompta/trunk/html/user_login.php phpcompta/trunk/include/ac_common.php phpcompta/trunk/include/action.common.inc.php 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_acc_parm_code.php phpcompta/trunk/include/class_action.php phpcompta/trunk/include/class_anc_account.php phpcompta/trunk/include/class_anc_plan.php phpcompta/trunk/include/class_contact.php phpcompta/trunk/include/class_document_modele.php phpcompta/trunk/include/class_fiche.php phpcompta/trunk/include/class_fiche_def.php phpcompta/trunk/include/class_iperiod.php phpcompta/trunk/include/class_pre_operation.php phpcompta/trunk/include/class_user.php phpcompta/trunk/include/dossier.inc.php phpcompta/trunk/include/export_bilan_oth.php phpcompta/trunk/include/export_gl_csv.php phpcompta/trunk/include/fiche.inc.php phpcompta/trunk/include/fiche_def.inc.php phpcompta/trunk/include/impress_bilan.inc.php phpcompta/trunk/include/impress_jrn.inc.php phpcompta/trunk/include/impress_rapport.inc.php phpcompta/trunk/include/impress_rec.inc.php phpcompta/trunk/include/modele.inc.php phpcompta/trunk/include/param_jrn_add.inc.php phpcompta/trunk/include/param_jrn_detail.inc.php phpcompta/trunk/include/param_pcmn.inc.php phpcompta/trunk/include/restore.inc.php phpcompta/trunk/include/stock.inc.php phpcompta/trunk/include/user_common.php Log: replace FormatString by sql_string Modified: phpcompta/trunk/html/ajax_card.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/ajax_card.php 2011-10-29 13:15:17 UTC (rev 4270) +++ phpcompta/trunk/html/ajax_card.php 2011-10-29 14:46:13 UTC (rev 4271) @@ -233,7 +233,7 @@ /* we filter thanks a given model of card */ if ( isset($cat)) { - $sql=3D$sql.sprintf(' where frd_id =3D '.FormatString ($cat)= ); + $sql=3D$sql.sprintf(' where frd_id =3D '.sql_string ($cat)); } else /* we filter thanks a given list of category of card @@ -241,7 +241,7 @@ if ( isset($fil) && strlen(trim($fil)) > 0 ) { $sql=3D$sql.sprintf(" where fd_id in (%s)", - FormatString($fil)); + sql_string($fil)); } } $array=3D$cn->make_array($sql); Modified: phpcompta/trunk/html/ajax_poste.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/ajax_poste.php 2011-10-29 13:15:17 UTC (rev 4270= ) +++ phpcompta/trunk/html/ajax_poste.php 2011-10-29 14:46:13 UTC (rev 4271= ) @@ -80,7 +80,7 @@ $str_submit=3DHtmlInput::submit('sf',_('Recherche')); $r=3D''; $r.=3D'
'; - $r.=3D 'Fermer';=20 + $r.=3D 'Fermer'; $r.=3D'
'; $r.=3D'
'.h2info(_('Poste Comptable')).'
'; =20 @@ -117,7 +117,7 @@ /* show result */ if ( isset($q) && strlen(trim($q)) > 0) { - $q=3Dsql_string($q); + $q=3D sql_string($q); $sql.=3Dsprintf(" $sep ( pcm_val::text like '%s%%' or pcm_lib::t= ext ilike '%%%s%%') ", $q,$q); } Modified: phpcompta/trunk/html/fid.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/fid.php 2011-10-29 13:15:17 UTC (rev 4270) +++ phpcompta/trunk/html/fid.php 2011-10-29 14:46:13 UTC (rev 4271) @@ -57,8 +57,8 @@ =20 if ( isset($_SESSION['isValid']) && $_SESSION['isValid'] =3D=3D 1) { - $jrn=3DFormatString($_GET['j']); - $d=3DFormatString($_GET['d']); + $jrn=3Dsql_string($_GET['j']); + $d=3Dsql_string($_GET['d']); =20 if ( $jrn =3D=3D -1 ) $d=3D'all'; Modified: phpcompta/trunk/html/login.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/login.php 2011-10-29 13:15:17 UTC (rev 4270) +++ phpcompta/trunk/html/login.php 2011-10-29 14:46:13 UTC (rev 4271) @@ -30,7 +30,7 @@ =20 if ( isset ($_POST["p_user"] ) ) { - $g_user=3DFormatString($_POST["p_user"]); + $g_user=3Dsql_string($_POST["p_user"]); $g_pass=3D$_POST["p_pass"]; $_SESSION['g_user']=3D$g_user; $_SESSION['g_pass']=3D$g_pass; Modified: phpcompta/trunk/html/user_login.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/user_login.php 2011-10-29 13:15:17 UTC (rev 4270= ) +++ phpcompta/trunk/html/user_login.php 2011-10-29 14:46:13 UTC (rev 4271= ) @@ -142,7 +142,7 @@ $filtre=3D""; if ( isset ($_GET ['p_nom'])) { - $filtre=3DFormatString($_GET['p_nom']); + $filtre=3Dsql_string($_GET['p_nom']); } =20 // If admin show everything otherwise only the available dossier Modified: phpcompta/trunk/include/ac_common.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/ac_common.php 2011-10-29 13:15:17 UTC (rev 42= 70) +++ phpcompta/trunk/include/ac_common.php 2011-10-29 14:46:13 UTC (rev 42= 71) @@ -391,7 +391,14 @@ } exit - 1; } - +/** + * replaced by sql_string + * @deprecated + */ +function FormatString($p_string) +{ + return sql_string($p_string); +} /* ! * \brief Fix the problem with the quote char for the database * @@ -399,14 +406,13 @@ * \return a string which won't let strange char for the database */ =20 -function FormatString($p_string) +function sql_string($p_string) { $p_string =3D trim($p_string); if (strlen($p_string) =3D=3D 0) return null; - $p_string =3D str_replace("\'", "'", $p_string); - $p_string =3D str_replace("''", "'", $p_string); - $p_string =3D str_replace("'", "\'", $p_string); + $p_string =3D str_replace("'", "''", $p_string); + $p_string =3D str_replace('\\', '\\\\', $p_string); return $p_string; } =20 @@ -688,17 +694,8 @@ return $str_date; } =20 -/** - * @brief remove the quote or double quote them - * @param $q string - * @return string correctly quoted - */ -function sql_string($q) -{ - $ret =3D str_replace("'", "''", $q); - return $ret; -} =20 + /** * Should a dialog box that you are disconnected for ajax */ @@ -887,7 +884,7 @@ { $array=3Darray(); if ($p_string =3D=3D '') return $array; - =20 + $var=3Dexplode("&",$p_string); if (empty ($var)) return $array; for ($i=3D0;$i < count($var);$i++) Modified: phpcompta/trunk/include/action.common.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/action.common.inc.php 2011-10-29 13:15:17 UTC= (rev 4270) +++ phpcompta/trunk/include/action.common.inc.php 2011-10-29 14:46:13 UTC= (rev 4271) @@ -368,9 +368,9 @@ if ( isset($_REQUEST['query']) ) { // if a query is request build the sql stmt - $query=3D"and (ag_title ~* '".FormatString($_REQUEST['query'])."'= ". - "or ag_ref =3D'".trim(FormatString($_REQUEST['query'])). - "' or ag_comment ~* '".trim(FormatString($_REQUEST['query']))."'". + $query=3D"and (ag_title ~* '".sql_string($_REQUEST['query'])."' "= . + "or ag_ref =3D'".trim(sql_string($_REQUEST['query'])). + "' or ag_comment ~* '".trim(sql_string($_REQUEST['query']))."'". ")"; } =20 Modified: phpcompta/trunk/include/class_acc_ledger.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_acc_ledger.php 2011-10-29 13:15:17 UTC = (rev 4270) +++ phpcompta/trunk/include/class_acc_ledger.php 2011-10-29 14:46:13 UTC = (rev 4271) @@ -2406,7 +2406,7 @@ $and=3D" and "; } // comment - $desc=3DFormatString($desc); + $desc=3Dsql_string($desc); if ( $desc !=3D null ) { $fil_desc=3D$and." ( upper(jr_comment) like upper('%".$desc.= "%') or upper(jr_pj_number) like upper('%".$desc."%') ". Modified: phpcompta/trunk/include/class_acc_ledger_fin.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_acc_ledger_fin.php 2011-10-29 13:15:17 = UTC (rev 4270) +++ phpcompta/trunk/include/class_acc_ledger_fin.php 2011-10-29 14:46:13 = UTC (rev 4271) @@ -719,7 +719,7 @@ $acc_operation->insert_jrnx(); =20 =20 - if ( FormatString(${"e_other$i"."_comment"}) =3D=3D null= ) + if ( sql_string(${"e_other$i"."_comment"}) =3D=3D null ) { // if comment is blank set a default one $comment=3D" compte : ".$fBank->strAttribut(ATTR_DE= F_NAME).' a '. @@ -797,7 +797,7 @@ $op->j_id=3D$j_id; $op->oa_date=3D$e_date; $op->oa_debit=3D($amount < 0 )?'t':'f'; - $op->oa_description=3DFormatString($comment); + $op->oa_description=3Dsql_string($comment); $op->save_form_plan($_POST,$i,$j_id); } =20 Modified: phpcompta/trunk/include/class_acc_ledger_purchase.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_acc_ledger_purchase.php 2011-10-29 13:1= 5:17 UTC (rev 4270) +++ phpcompta/trunk/include/class_acc_ledger_purchase.php 2011-10-29 14:4= 6:13 UTC (rev 4271) @@ -486,7 +486,7 @@ $op->oa_date=3D$e_date; =20 $op->oa_debit=3D($amount > 0 )?'t':'f'; - $op->oa_description=3DFormatString($e_comm); + $op->oa_description=3Dsql_string($e_comm); $op->save_form_plan($_POST,$i,$j_id); } // insert into quant_purchase Modified: phpcompta/trunk/include/class_acc_ledger_sold.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_acc_ledger_sold.php 2011-10-29 13:15:17= UTC (rev 4270) +++ phpcompta/trunk/include/class_acc_ledger_sold.php 2011-10-29 14:46:13= UTC (rev 4271) @@ -357,7 +357,7 @@ $op->j_id=3D$j_id; $op->oa_date=3D$e_date; $op->oa_debit=3D($amount < 0 )?'t':'f'; - $op->oa_description=3DFormatString($e_comm); + $op->oa_description=3Dsql_string($e_comm); $op->save_form_plan($_POST,$i,$j_id); } if ( $owner->MY_TVA_USE=3D=3D'Y') Modified: phpcompta/trunk/include/class_acc_parm_code.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_acc_parm_code.php 2011-10-29 13:15:17 U= TC (rev 4270) +++ phpcompta/trunk/include/class_acc_parm_code.php 2011-10-29 14:46:13 U= TC (rev 4271) @@ -89,9 +89,9 @@ } else { - $this->p_comment=3DFormatString($this->p_comment); - $this->p_value=3DFormatString($this->p_value); - $this->p_code=3DFormatString($this->p_code); + $this->p_comment=3Dsql_string($this->p_comment); + $this->p_value=3Dsql_string($this->p_value); + $this->p_code=3Dsql_string($this->p_code); $sql=3D"update parm_code set ". "p_comment=3D'".$this->p_comment."' ". ",p_value=3D'".$this->p_value."' ". Modified: phpcompta/trunk/include/class_action.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_action.php 2011-10-29 13:15:17 UTC (rev= 4270) +++ phpcompta/trunk/include/class_action.php 2011-10-29 14:46:13 UTC (rev= 4271) @@ -256,7 +256,7 @@ $ag_ref=3Dnew IText(); $ag_ref->readonly=3D$upd; $ag_ref->name=3D"ag_ref"; - $ag_ref->value=3DFormatString($this->ag_ref); + $ag_ref->value=3Dsql_string($this->ag_ref); $client_label=3Dnew ISpan(); =20 /* Add button */ Modified: phpcompta/trunk/include/class_anc_account.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_anc_account.php 2011-10-29 13:15:17 UTC= (rev 4270) +++ phpcompta/trunk/include/class_anc_account.php 2011-10-29 14:46:13 UTC= (rev 4271) @@ -89,7 +89,7 @@ */ function get_by_name($p_name) { - $p_name=3DFormatString($p_name); + $p_name=3Dsql_string($p_name); if ( $p_name =3D=3D null ) $p_name=3D$this->name; =20 @@ -158,15 +158,15 @@ private function format_data() { =20 - $this->name=3DFormatString($this->name); - $this->pa_id=3DFormatString($this->pa_id); - $this->amount=3DFormatString($this->amount); + $this->name=3Dsql_string($this->name); + $this->pa_id=3Dsql_string($this->pa_id); + $this->amount=3Dsql_string($this->amount); if (strlen($this->amount) =3D=3D 0 ) $this->amount=3D0.0; if ( isNumber($this->amount) =3D=3D0 ) $this->amount=3D0; =20 - $this->description=3DFormatString($this->description); + $this->description=3Dsql_string($this->description); } function delete() { Modified: phpcompta/trunk/include/class_anc_plan.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_anc_plan.php 2011-10-29 13:15:17 UTC (r= ev 4270) +++ phpcompta/trunk/include/class_anc_plan.php 2011-10-29 14:46:13 UTC (r= ev 4271) @@ -88,22 +88,22 @@ function update() { if ( $this->id=3D=3D0) return; - $name=3DFormatString($this->name); + $name=3Dsql_string($this->name); if ( strlen($name) =3D=3D 0) return; =20 - $description=3DFormatString($this->description); + $description=3Dsql_string($this->description); $this->db->exec_sql("update plan_analytique set pa_name=3D$1, pa_description=3D$2 where pa_id=3D$3",array(= $name,$description,$this->id)); } =20 function add() { - $name=3DFormatString($this->name); + $name=3Dsql_string($this->name); if ( strlen($name) =3D=3D 0) return; if ( $this->isAppend() =3D=3D false) return; - $description=3DFormatString($this->description); + $description=3Dsql_string($this->description); $this->db->exec_sql("insert into plan_analytique(pa_name,pa_desc= ription)". " values (". "'".$name."',". Modified: phpcompta/trunk/include/class_contact.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_contact.php 2011-10-29 13:15:17 UTC (re= v 4270) +++ phpcompta/trunk/include/class_contact.php 2011-10-29 14:46:13 UTC (re= v 4271) @@ -49,7 +49,7 @@ */ function Summary($p_search=3D"",$p_action=3D"",$p_sql=3D"") { - $p_search=3DFormatString($p_search); + $p_search=3Dsql_string($p_search); $extra_sql=3D""; if ( $this->company !=3D "") { Modified: phpcompta/trunk/include/class_document_modele.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_document_modele.php 2011-10-29 13:15:17= UTC (rev 4270) +++ phpcompta/trunk/include/class_document_modele.php 2011-10-29 14:46:13= UTC (rev 4271) @@ -114,7 +114,7 @@ * first created (-> insert into document_modele) * in that case the name and the type must be set * set before calling Save, the name will be modified - * with FormatString + * with sql_string * */ function Save() Modified: phpcompta/trunk/include/class_fiche.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_fiche.php 2011-10-29 13:15:17 UTC (rev = 4270) +++ phpcompta/trunk/include/class_fiche.php 2011-10-29 14:46:13 UTC (rev = 4271) @@ -252,7 +252,7 @@ where frd_id=3D".$p_frd_id; if ( $p_search !=3D "" ) { - $a=3DFormatString($p_search); + $a=3Dsql_string($p_search); $sql=3D"select * from vw_fiche_attr where frd_id=3D".$p_frd_= id. " and vw_name ~* '$p_search'"; } @@ -344,7 +344,7 @@ if ($this->id=3D=3D0) return NOTFOUND; // object is not in memory we need to look into the database $sql=3D"select ad_value from fiche_detail - where f_id=3D".FormatString($this->id)." and ad_id=3D".= $p_ad_id; + where f_id=3D".sql_string($this->id)." and ad_id=3D".$p= _ad_id; $Res=3D$this->cn->exec_sql($sql); $row=3DDatabase::fetch_all($Res); // if not found return error @@ -738,7 +738,7 @@ if ( $id =3D=3D ATTR_DEF_QUICKCODE) { $sql=3Dsprintf("select insert_quick_code(%d,'%s')", - $fiche_id,FormatString($value)); + $fiche_id,sql_string($value)); $this->cn->exec_sql($sql); continue; } @@ -752,7 +752,7 @@ // account if ( $id =3D=3D ATTR_DEF_ACCOUNT ) { - $v=3DFormatString($value); + $v=3Dsql_string($value); try { =20 @@ -793,14 +793,14 @@ $exist=3D$this->cn->count_sql("select f_id from fich= e join fiche_def using (fd_id) ". " join fiche_detail usin= g(f_id) ". " where frd_id in (8,9,1= 4) and ad_id=3D".ATTR_DEF_QUICKCODE. - " and ad_value=3D'".Form= atString($value)."'"); - if ( $exist =3D=3D 0 && FormatString($value) !=3D nu= ll ) + " and ad_value=3D'".sql_= string($value)."'"); + if ( $exist =3D=3D 0 && sql_string($value) !=3D null= ) { $value=3D""; } } // Normal traitement - $value2=3DFormatString($value); + $value2=3Dsql_string($value); =20 $sql=3Dsprintf("select attribut_insert(%d,%d,'%s')", $fiche_id,$id,trim($value2)); @@ -861,7 +861,7 @@ if ( $id =3D=3D ATTR_DEF_QUICKCODE) { $sql=3Dsprintf("select update_quick_code(%d,'%s')", - $jft_id,FormatString($value)); + $jft_id,sql_string($value)); $this->cn->exec_sql($sql); continue; } @@ -887,7 +887,7 @@ ' values (%d,0,\'%s\',upper(\= '%s\'),\'d\',\'%s\')', $this->id, 'initial', - FormatString($value), + sql_string($value), $exercice); =20 $this->cn->exec_sql($str_stock); @@ -895,7 +895,7 @@ else { $str_stock=3Dsprintf("update stock_goods set sg_= code=3Dupper('%s') where f_id=3D%d", - FormatString($value), + sql_string($value), $this->id); $this->cn->exec_sql($str_stock); } @@ -904,7 +904,7 @@ // account if ( $id =3D=3D ATTR_DEF_ACCOUNT ) { - $v=3DFormatString($value); + $v=3Dsql_string($value); if ( trim($v) !=3D '' ) { if ( strpos($v,',') !=3D 0) @@ -964,7 +964,7 @@ array(ATTR_DEF_QUICKCODE,$value)); =20 =20 - if ( Database::num_row($exist) =3D=3D 0 && FormatSt= ring($value) !=3D null ) + if ( Database::num_row($exist) =3D=3D 0 && sql_stri= ng($value) !=3D null ) { $value=3D"Attention : pas de soci=C3=A9t=C3=A9 "= ; } @@ -1507,7 +1507,7 @@ { =20 $str_dossier=3Ddossier::get(); - $p_search=3DFormatString($p_search); + $p_search=3Dsql_string($p_search); $script=3D$_SERVER['PHP_SELF']; // Creation of the nav bar // Get the max numberRow @@ -1819,7 +1819,7 @@ $and=3D" and "; if (isset($query)) { - $query=3DFormatString($query); + $query=3Dsql_string($query); =20 if (strlen(trim($query)) > 1) { Modified: phpcompta/trunk/include/class_fiche_def.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_fiche_def.php 2011-10-29 13:15:17 UTC (= rev 4270) +++ phpcompta/trunk/include/class_fiche_def.php 2011-10-29 14:46:13 UTC (= rev 4271) @@ -185,7 +185,7 @@ ${"p_$key"}=3D$element; } // Format correctly the name of the cat. of card - $p_nom_mod=3DFormatString($p_nom_mod); + $p_nom_mod=3Dsql_string($p_nom_mod); =20 =20 // Name can't be empty @@ -205,7 +205,7 @@ // and insert into fiche_def // if p_class_base is null get the default class base from // fiche_def_ref - if ( FormatString($p_class_base) =3D=3D null ) + if ( sql_string($p_class_base) =3D=3D null ) { // p_class is null // So we take the default one $p_class_base=3D$fiche_Def_ref->frd_class_base; @@ -223,7 +223,7 @@ $p_create=3D'false'; =20 // Class is valid ? - if ( FormatString($p_class_base) !=3D null || strpos(',',$p_clas= s_base) !=3D 0 ) + if ( sql_string($p_class_base) !=3D null || strpos(',',$p_class_= base) !=3D 0 ) { // p_class is a valid number $sql=3D"insert into fiche_def(fd_label,fd_class_base,frd_id,= fd_create_account) @@ -531,7 +531,7 @@ function SaveLabel($p_label) { if ( $this->id =3D=3D 0 ) return; - $p_label=3DFormatString($p_label); + $p_label=3Dsql_string($p_label); if (strlen(trim ($p_label)) =3D=3D 0 ) { return; @@ -566,7 +566,7 @@ function save_class_base($p_label) { if ( $this->id =3D=3D 0 ) return; - $p_label=3DFormatString($p_label); + $p_label=3Dsql_string($p_label); =20 $sql=3D"update fiche_def set fd_class_base=3D$1 ". "where fd_id=3D$2"; Modified: phpcompta/trunk/include/class_iperiod.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_iperiod.php 2011-10-29 13:15:17 UTC (re= v 4270) +++ phpcompta/trunk/include/class_iperiod.php 2011-10-29 14:46:13 UTC (re= v 4271) @@ -114,7 +114,7 @@ $cond=3D''; if ( $sql_closed=3D=3D"") $and=3D" where " ; else $and=3D" and "; if ($this->type =3D=3D 'all' ) $cond=3D$and.' true '; - $cond.=3D" $and p_exercice=3D'".FormatString($this->exercice= )."'"; + $cond.=3D" $and p_exercice=3D'".sql_string($this->exercice).= "'"; } =20 $sql.=3D$cond." order by p_start,p_end"; Modified: phpcompta/trunk/include/class_pre_operation.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_pre_operation.php 2011-10-29 13:15:17 U= TC (rev 4270) +++ phpcompta/trunk/include/class_pre_operation.php 2011-10-29 14:46:13 U= TC (rev 4271) @@ -231,8 +231,8 @@ public function get_operation() { $value=3D$this->db->make_array("select od_id,od_name from op_pre= def ". - " where jrn_def_id=3D".FormatString= ($this->jrn_def_id). - " and od_direct =3D'".FormatString(= $this->od_direct)."'". + " where jrn_def_id=3D".sql_string($= this->jrn_def_id). + " and od_direct =3D'".sql_string($t= his->od_direct)."'". " order by od_name"); return $value; } Modified: phpcompta/trunk/include/class_user.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_user.php 2011-10-29 13:15:17 UTC (rev 4= 270) +++ phpcompta/trunk/include/class_user.php 2011-10-29 14:46:13 UTC (rev 4= 271) @@ -268,7 +268,7 @@ { if ( $this->admin !=3D 1 && $this->is_local_admin() !=3D 1) { - $sql_type=3D($p_type=3D=3D'ALL')?'':"and jrn_def_type=3Duppe= r('".FormatString($p_type)."')"; + $sql_type=3D($p_type=3D=3D'ALL')?'':"and jrn_def_type=3Duppe= r('".sql_string($p_type)."')"; switch($p_access) { case 3: @@ -296,7 +296,7 @@ } else { - $sql_type=3D($p_type=3D=3D'ALL')?'':"where jrn_def_type=3Dup= per('".FormatString($p_type)."')"; + $sql_type=3D($p_type=3D=3D'ALL')?'':"where jrn_def_type=3Dup= per('".sql_string($p_type)."')"; $sql=3D"select jrn_def_id,jrn_def_type,jrn_def_name,jrn_def_= class_deb,jrn_def_class_cred,jrn_deb_max_line,jrn_cred_max_line, jrn_type_id,jrn_desc,'W' as uj_priv from jrn_def join jrn_type on jrn_def_type=3Djrn_type_i= d Modified: phpcompta/trunk/include/dossier.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/dossier.inc.php 2011-10-29 13:15:17 UTC (rev = 4270) +++ phpcompta/trunk/include/dossier.inc.php 2011-10-29 14:46:13 UTC (rev = 4271) @@ -44,14 +44,14 @@ { $cn=3Dnew Database(); $dos=3Dtrim($_POST["DATABASE"]); - $dos=3DFormatString($dos); + $dos=3Dsql_string($dos); if (strlen($dos)=3D=3D0) { echo _("Le nom du dossier est vide"); exit -1; } $encoding=3D$cn->get_value("select encoding from pg_database where = ". - " datname=3D'".domaine.'mod'.FormatString($= _POST["FMOD_ID"])."'"); + " datname=3D'".domaine.'mod'.sql_string($_P= OST["FMOD_ID"])."'"); if ( $encoding !=3D 6 ) { alert(_('D=C3=A9sol=C3=A9 vous devez migrer ce mod=C3=A8le en un= icode')); @@ -62,7 +62,7 @@ exit(); } =20 - $desc=3DFormatString($_POST["DESCRIPTION"]); + $desc=3Dsql_string($_POST["DESCRIPTION"]); try { $cn->start(); @@ -89,7 +89,7 @@ //-- // setting the year //-- - $year=3DFormatString($_POST['YEAR']); + $year=3Dsql_string($_POST['YEAR']); if ( strlen($year) !=3D 4 || isNumber($year) =3D=3D 0 || $year >= 2100 || $year < 2000 || $year !=3D round($year,0)) { echo "$year"._(" est une ann=C3=A9e invalide"); @@ -101,7 +101,7 @@ domaine, $l_id, domaine, - FormatString($_POST["FMOD_ID"])); + sql_string($_POST["FMOD_ID"])); ob_start(); if ( $cn->exec_sql($Sql)=3D=3Dfalse) { @@ -336,7 +336,7 @@ echo "

$msg "._('inexistant')."

"; exit(); } - $sql=3D"drop database ".domaine."dossier".FormatString($_REQUEST['d'= ]); + $sql=3D"drop database ".domaine."dossier".sql_string($_REQUEST['d'])= ; ob_start(); if ( $cn->exec_sql($sql)=3D=3Dfalse) { Modified: phpcompta/trunk/include/export_bilan_oth.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/export_bilan_oth.php 2011-10-29 13:15:17 UTC = (rev 4270) +++ phpcompta/trunk/include/export_bilan_oth.php 2011-10-29 14:46:13 UTC = (rev 4271) @@ -37,8 +37,7 @@ $bilan=3Dnew Acc_Bilan($cn); $bilan->get_request_get(); $bilan->load(); -/*\!bug the headers shouldn't be sent here, but it doesn't work - * a html header is send before, to fix asap */ + if ( $bilan->b_type=3D=3D'odt') { header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); Modified: phpcompta/trunk/include/export_gl_csv.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/export_gl_csv.php 2011-10-29 13:15:17 UTC (re= v 4270) +++ phpcompta/trunk/include/export_gl_csv.php 2011-10-29 14:46:13 UTC (re= v 4271) @@ -52,7 +52,7 @@ $parent=3D$poste_id; $a_poste=3D$cn->get_array("select pcm_val from tmp_pcmn where pc= m_val::text like '$parent%' order by pcm_val::text"); } - elseif ( $cn->count_sql('select * from tmp_pcmn where pcm_val=3D'.Fo= rmatString($poste_id)) !=3D 0 ) + elseif ( $cn->count_sql('select * from tmp_pcmn where pcm_val=3D'.sq= l_string($poste_id)) !=3D 0 ) { $a_poste=3Darray('pcm_val' =3D> $poste_id); } Modified: phpcompta/trunk/include/fiche.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/fiche.inc.php 2011-10-29 13:15:17 UTC (rev 42= 70) +++ phpcompta/trunk/include/fiche.inc.php 2011-10-29 14:46:13 UTC (rev 42= 71) @@ -358,7 +358,7 @@ ShowRecherche(); $sql=3D"select distinct f_id,fd_id from fiche join fiche_detail = using (f_id) where - upper(ad_value) like upper('%".FormatString($_GET["search_t= ext"])."%') order by f_id"; + upper(ad_value) like upper('%".sql_string($_GET["search_tex= t"])."%') order by f_id"; =20 $all=3D$cn->get_array($sql); // test on the size Modified: phpcompta/trunk/include/fiche_def.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/fiche_def.inc.php 2011-10-29 13:15:17 UTC (re= v 4270) +++ phpcompta/trunk/include/fiche_def.inc.php 2011-10-29 14:46:13 UTC (re= v 4271) @@ -30,9 +30,9 @@ { extract ($_POST); $update=3Dnew Fiche_Def_Ref($cn); - $update->frd_id=3DFormatString($frd_id); - $update->frd_text=3DFormatString($frd_text); - $update->frd_class_base=3DFormatString($frd_class_base); + $update->frd_id=3Dsql_string($frd_id); + $update->frd_text=3Dsql_string($frd_text); + $update->frd_class_base=3Dsql_string($frd_class_base); $update->Save(); } // Load All Fiche_def Modified: phpcompta/trunk/include/impress_bilan.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/impress_bilan.inc.php 2011-10-29 13:15:17 UTC= (rev 4270) +++ phpcompta/trunk/include/impress_bilan.inc.php 2011-10-29 14:46:13 UTC= (rev 4271) @@ -56,7 +56,7 @@ echo ''; echo '
'; =20 -$filter_year=3D" where p_exercice=3D'".FormatString($exercice)."'"; +$filter_year=3D" where p_exercice=3D'".sql_string($exercice)."'"; echo '
'; echo HtmlInput::hidden('type','bilan'); echo dossier::hidden(); Modified: phpcompta/trunk/include/impress_jrn.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/impress_jrn.inc.php 2011-10-29 13:15:17 UTC (= rev 4270) +++ phpcompta/trunk/include/impress_jrn.inc.php 2011-10-29 14:46:13 UTC (= rev 4271) @@ -106,7 +106,7 @@ print ''; print ''; // filter on the current year -$filter_year=3D" where p_exercice=3D'".FormatString($exercice)."'"; +$filter_year=3D" where p_exercice=3D'".sql_string($exercice)."'"; =20 $periode_start=3D$cn->make_array("select p_id,to_char(p_start,'DD-MM-YYY= Y') from parm_periode $filter_year order by p_start,p_end"); $w->selected=3D(isset($_GET['from_periode']))?$_GET['from_periode']:''; Modified: phpcompta/trunk/include/impress_rapport.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/impress_rapport.inc.php 2011-10-29 13:15:17 U= TC (rev 4270) +++ phpcompta/trunk/include/impress_rapport.inc.php 2011-10-29 14:46:13 U= TC (rev 4271) @@ -217,7 +217,7 @@ $w->javascript=3D''; print ''; // filter on the current year -$filter_year=3D" where p_exercice=3D'".FormatString($exercice)."'"; +$filter_year=3D" where p_exercice=3D'".sql_string($exercice)."'"; =20 $periode_start=3D$cn->make_array("select p_id,to_char(p_start,'DD-MM-YYY= Y') from parm_periode $filter_year order by p_start,p_end"); print td("Période comptable : Depuis"); Modified: phpcompta/trunk/include/impress_rec.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/impress_rec.inc.php 2011-10-29 13:15:17 UTC (= rev 4270) +++ phpcompta/trunk/include/impress_rec.inc.php 2011-10-29 14:46:13 UTC (= rev 4271) @@ -29,7 +29,6 @@ =20 /** *@file - *@todo add the export to PDF */ $aledger=3D$g_user->get_ledger('ALL',3); echo '
'; Modified: phpcompta/trunk/include/modele.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/modele.inc.php 2011-10-29 13:15:17 UTC (rev 4= 270) +++ phpcompta/trunk/include/modele.inc.php 2011-10-29 14:46:13 UTC (rev 4= 271) @@ -61,7 +61,7 @@ if ( isset ($_POST["FMOD_NAME"]) ) { $encoding=3D$cn->get_value("select encoding from pg_database where = ". - " datname=3D'".domaine.'dossier'.FormatStri= ng($_POST["FMOD_DBID"])."'"); + " datname=3D'".domaine.'dossier'.sql_string= ($_POST["FMOD_DBID"])."'"); =20 if ( $encoding !=3D 6 ) { @@ -74,8 +74,8 @@ exit(); } =20 - $mod_name=3DFormatString($_POST["FMOD_NAME"]); - $mod_desc=3DFormatString($_POST["FMOD_DESC"]); + $mod_name=3Dsql_string($_POST["FMOD_NAME"]); + $mod_desc=3Dsql_string($_POST["FMOD_DESC"]); if ( $mod_name !=3D null) { $Res=3D$cn->exec_sql("insert into modeledef(mod_name,mod_desc) @@ -381,7 +381,7 @@ echo "

$msg inexistant

"; exit(); } - $sql=3D"drop database ".domaine."mod".FormatString($_REQUEST= ['m']); + $sql=3D"drop database ".domaine."mod".sql_string($_REQUEST['= m']); ob_start(); if ( $cn->exec_sql($sql)=3D=3Dfalse) { Modified: phpcompta/trunk/include/param_jrn_add.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/param_jrn_add.inc.php 2011-10-29 13:15:17 UTC= (rev 4270) +++ phpcompta/trunk/include/param_jrn_add.inc.php 2011-10-29 14:46:13 UTC= (rev 4271) @@ -76,7 +76,7 @@ =20 =20 $p_jrn_name=3D$_POST["p_jrn_name"]; - $p_jrn_class_deb=3DFormatString($_POST["p_jrn_class_deb"]); + $p_jrn_class_deb=3Dsql_string($_POST["p_jrn_class_deb"]); if (strlen(trim($p_jrn_name))=3D=3D0) return; // compute the jrn_def.jrn_def_code $p_code=3Dsprintf("%s%02d",trim(substr($_POST['p_jrn_type'],= 0,1)),Acc_Ledger::next_number($cn,$_POST['p_jrn_type'])); Modified: phpcompta/trunk/include/param_jrn_detail.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/param_jrn_detail.inc.php 2011-10-29 13:15:17 = UTC (rev 4270) +++ phpcompta/trunk/include/param_jrn_detail.inc.php 2011-10-29 14:46:13 = UTC (rev 4271) @@ -114,7 +114,7 @@ =20 $p_jrn_name=3D$_POST['p_jrn_name']; if (strlen(trim($p_jrn_name))=3D=3D0) return; - $p_jrn_name=3DFormatString($p_jrn_name); + $p_jrn_name=3Dsql_string($p_jrn_name); $p_jrn_fiche_deb=3D""; $p_jrn_fiche_cred=3D""; $bank=3Dnull; Modified: phpcompta/trunk/include/param_pcmn.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/param_pcmn.inc.php 2011-10-29 13:15:17 UTC (r= ev 4270) +++ phpcompta/trunk/include/param_pcmn.inc.php 2011-10-29 14:46:13 UTC (r= ev 4271) @@ -289,7 +289,7 @@ echo "$td"; printf ("", $A['pcm_val'], - FormatString($A['pcm_lib']), + sql_string($A['pcm_lib']), $A['pcm_val_parent'], $A['pcm_type'], dossier::id()); Modified: phpcompta/trunk/include/restore.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/restore.inc.php 2011-10-29 13:15:17 UTC (rev = 4270) +++ phpcompta/trunk/include/restore.inc.php 2011-10-29 14:46:13 UTC (rev = 4271) @@ -67,7 +67,7 @@ $id=3D$cn->get_next_seq('dossier_id'); =20 if ( strlen(trim($_REQUEST['database'])) =3D=3D 0 ) - $lname=3D$id." Restauration :".FormatString($_FILES['file'][= 'name']); + $lname=3D$id." Restauration :".sql_string($_FILES['file']['n= ame']); else $lname=3D$id." ".$_REQUEST['database']; =20 @@ -129,7 +129,7 @@ $id=3D$cn->get_next_seq('s_modid'); =20 if ( strlen(trim($_REQUEST['database'])) =3D=3D 0 ) - $lname=3D$id." Restauration :".FormatString($_FILES['file'][= 'name']); + $lname=3D$id." Restauration :".sql_string($_FILES['file']['n= ame']); else $lname=3D$id." ".$_REQUEST['database']; =20 Modified: phpcompta/trunk/include/stock.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/stock.inc.php 2011-10-29 13:15:17 UTC (rev 42= 70) +++ phpcompta/trunk/include/stock.inc.php 2011-10-29 14:46:13 UTC (rev 42= 71) @@ -79,7 +79,7 @@ $type=3D( $change < 0 )?'c':'d'; if ( $change !=3D 0) { - $comment=3DFormatString($comment); + $comment=3Dsql_string($comment); $Res=3D$cn->exec_sql("insert into stock_goods ( j_id, f_id, Modified: phpcompta/trunk/include/user_common.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/user_common.php 2011-10-29 13:15:17 UTC (rev = 4270) +++ phpcompta/trunk/include/user_common.php 2011-10-29 14:46:13 UTC (rev = 4271) @@ -56,7 +56,7 @@ $code=3Dnew Fiche($p_cn); $code->get_by_qcode($p_good); $code_marchandise=3D$code->strAttribut(ATTR_DEF_STOCK); - $p_good=3DFormatString($p_good); + $p_good=3Dsql_string($p_good); $sql=3D"select f_id from vw_poste_qcode where j_qcode=3Dupper('$p_go= od')"; $Res=3D$p_cn->exec_sql($sql); $r=3DDatabase::fetch_array($Res,0); From MAILER-DAEMON Sat Oct 29 16:51:48 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RKFsa-0006eR-4m for mharc-phpcompta-dev@gnu.org; Sat, 29 Oct 2011 16:51:48 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sat, 29 Oct 2011 22:58:35 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4272 - phpcompta/trunk/html X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Oct 2011 20:51:46 -0000 Author: danydb Date: 2011-10-29 22:58:33 +0200 (Sat, 29 Oct 2011) New Revision: 4272 Modified: phpcompta/trunk/html/style-color.css phpcompta/trunk/html/style-light.css phpcompta/trunk/html/style.css Log: Adapt width for autocomplete Modified: phpcompta/trunk/html/style-color.css =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/style-color.css 2011-10-29 14:46:13 UTC (rev 427= 1) +++ phpcompta/trunk/html/style-color.css 2011-10-29 20:58:33 UTC (rev 427= 2) @@ -659,7 +659,6 @@ } div.autocomplete { position:relative; - width:30em; background-color:white; border:1px solid #888; margin:0; @@ -674,6 +673,9 @@ } div.autocomplete ul { list-style-type:none; + background-color:white; + border:1px solid #888; + width:375; margin:0; padding:0; } @@ -687,7 +689,7 @@ /*height:32px;*/ cursor:pointer; } - +span.informal{ font-size:10; } ul.select_table { /*padding:5px;*/ overflow:hidden; Modified: phpcompta/trunk/html/style-light.css =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/style-light.css 2011-10-29 14:46:13 UTC (rev 427= 1) +++ phpcompta/trunk/html/style-light.css 2011-10-29 20:58:33 UTC (rev 427= 2) @@ -602,7 +602,7 @@ =20 z-index:1; /*background-color:lightgrey;*/ -background-color: rgba(203, 203,203, 0.2); + /*background-color: rgba(203, 203,203, 0.2);*/ display:none;=09 } =20 @@ -674,32 +674,40 @@ } div.autocomplete { position:relative; - width:30em; background-color:white; - border:1px solid #888; margin:0; padding:0; text-align:left; font-size:12px; =20 } +span.informal { + font-size:10px; + =20 + } div.autocomplete em { color:#0000ff; font-weight:bold; } div.autocomplete ul { list-style-type:none; + width: 350px; + background-color:white; margin:0; padding:0; + border:1px solid #888; } div.autocomplete ul li.selected { background-color: lightblue;} =20 div.autocomplete ul li { list-style-type:none; + width: auto; display:block; margin:0; padding:0px; /*height:32px;*/ + border:1px dotted #e6e6fa; + =20 cursor:pointer; } =20 @@ -936,7 +944,7 @@ position:absolute; border:1px solid black; top:15%;left:100; - margin-left:25% + margin-left:25%; z-index:2; width:50%; display:none; Modified: phpcompta/trunk/html/style.css =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/style.css 2011-10-29 14:46:13 UTC (rev 4271) +++ phpcompta/trunk/html/style.css 2011-10-29 20:58:33 UTC (rev 4272) @@ -676,7 +676,6 @@ } div.autocomplete { position:relative; - width:30em; background-color:white; border:1px solid #888; margin:0; @@ -691,6 +690,9 @@ } div.autocomplete ul { list-style-type:none; + background-color:white; + border:1px solid #888; + width:375px; margin:0; padding:0; } @@ -704,6 +706,7 @@ /*height:32px;*/ cursor:pointer; } +span.informal{ font-size:12; } =20 ul.select_table { /*padding:5px;*/ From MAILER-DAEMON Sat Oct 29 16:52:40 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RKFtQ-0006id-6P for mharc-phpcompta-dev@gnu.org; Sat, 29 Oct 2011 16:52:40 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sat, 29 Oct 2011 22:59:06 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4273 - in phpcompta/trunk: html/js include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Oct 2011 20:52:37 -0000 Author: danydb Date: 2011-10-29 22:59:04 +0200 (Sat, 29 Oct 2011) New Revision: 4273 Modified: phpcompta/trunk/html/js/acc_ledger.js phpcompta/trunk/html/js/accounting_item.js phpcompta/trunk/html/js/ajax_fiche.js phpcompta/trunk/html/js/anc_script.js phpcompta/trunk/html/js/builder.js phpcompta/trunk/html/js/card.js phpcompta/trunk/html/js/controls.js phpcompta/trunk/html/js/dragdrop.js phpcompta/trunk/html/js/effects.js phpcompta/trunk/html/js/extension.js phpcompta/trunk/html/js/gestion.js phpcompta/trunk/html/js/modele_document.js phpcompta/trunk/html/js/prototype.js phpcompta/trunk/html/js/scriptaculous.js phpcompta/trunk/html/js/scripts.js phpcompta/trunk/html/js/slider.js phpcompta/trunk/html/js/sound.js phpcompta/trunk/html/js/unittest.js phpcompta/trunk/include/class_icard.php Log: Adapt for prototype 1.9 and scriptaculous Modified: phpcompta/trunk/html/js/acc_ledger.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/js/acc_ledger.js 2011-10-29 20:58:33 UTC (rev 42= 72) +++ phpcompta/trunk/html/js/acc_ledger.js 2011-10-29 20:59:04 UTC (rev 42= 73) @@ -32,7 +32,7 @@ { var jrn=3Dg("p_jrn").value; var dossier=3Dg("gDossier").value; - var querystring=3D'?&gDossier=3D'+dossier+'&l=3D'+jrn+'&t=3D'+p_type= +'&d=3D'+p_direct; + var querystring=3D'gDossier=3D'+dossier+'&l=3D'+jrn+'&t=3D'+p_type+'= &d=3D'+p_direct; g("p_jrn_predef").value=3Djrn; var action=3Dnew Ajax.Request( "get_predef.php", @@ -78,7 +78,7 @@ { var jrn=3Dg("p_jrn").value; var dossier=3Dg("gDossier").value; - var querystring=3D'?&gDossier=3D'+dossier+'&l=3D'+jrn; + var querystring=3D'gDossier=3D'+dossier+'&l=3D'+jrn; var action=3Dnew Ajax.Request( "get_pj.php", { @@ -96,7 +96,7 @@ { var jrn=3Dg('p_jrn').value; var dossier=3Dg('gDossier').value; - var qs=3D'?&gDossier=3D'+dossier+'&op=3Dbkname&p_jrn=3D'+jrn; + var qs=3D'gDossier=3D'+dossier+'&op=3Dbkname&p_jrn=3D'+jrn; var action=3Dnew Ajax.Request( "ajax_misc.php", { @@ -141,7 +141,7 @@ { var jrn=3Dg('p_jrn').value; var dossier=3Dg('gDossier').value; - var qs=3D'?&gDossier=3D'+dossier+'&op=3Dlastdate&p_jrn=3D'+jrn; + var qs=3D'gDossier=3D'+dossier+'&op=3Dlastdate&p_jrn=3D'+jrn; var action=3Dnew Ajax.Request( "ajax_misc.php", { @@ -303,7 +303,7 @@ =20 g('e_quant'+p_ctl_nb).value=3Dtrim(g('e_quant'+p_ctl_nb).value); var quantity=3Dg('e_quant'+p_ctl_nb).value; - var querystring=3D'?&gDossier=3D'+dossier+'&c=3D'+qcode+'&t=3D'+tva_= id+'&p=3D'+price+'&q=3D'+quantity+'&n=3D'+p_ctl_nb; + var querystring=3D'gDossier=3D'+dossier+'&c=3D'+qcode+'&t=3D'+tva_id= +'&p=3D'+price+'&q=3D'+quantity+'&n=3D'+p_ctl_nb; $('sum').hide(); var action=3Dnew Ajax.Request( "compute.php", @@ -591,7 +591,7 @@ id=3D'det'+layer; var popup=3D{'id': id,'cssclass':'op_detail','html':loading(),'drag= ':true}; =20 - querystring=3D'?gDossier=3D'+dossier+'&act=3Dde&pcm_val=3D'+p_value+= '&div=3D'+id; + querystring=3D'gDossier=3D'+dossier+'&act=3Dde&pcm_val=3D'+p_value+'= &div=3D'+id; add_div(popup); var action=3Dnew Ajax.Request( "ajax_history.php", @@ -610,7 +610,7 @@ function update_history_account(obj) { try{ - var querystring=3D"?div=3D"+obj.div+"&gDossier=3D"+obj.gDossier+"&pcm_v= al=3D"+obj.pcm_val+"&ex=3D"+obj.select.options[obj.select.selectedIndex].= text; + var querystring=3D"div=3D"+obj.div+"&gDossier=3D"+obj.gDossier+"&pcm_va= l=3D"+obj.pcm_val+"&ex=3D"+obj.select.options[obj.select.selectedIndex].t= ext; var action=3Dnew Ajax.Request( "ajax_history.php", { @@ -639,7 +639,7 @@ ,'html': loading(),'drag': true}; - querystring=3D'?gDossier=3D'+dossier+'&act=3Dde&f_id=3D'+p_value+'&d= iv=3D'+id; + querystring=3D'gDossier=3D'+dossier+'&act=3Dde&f_id=3D'+p_value+'&di= v=3D'+id; add_div(popup); var action=3Dnew Ajax.Request( "ajax_history.php", @@ -658,7 +658,7 @@ function update_history_card(obj) { try{ - var querystring=3D"?div=3D"+obj.div+"&gDossier=3D"+obj.gDossier+"&f_id=3D= "+obj.f_id+"&ex=3D"+obj.select.options[obj.select.selectedIndex].text; + var querystring=3D"div=3D"+obj.div+"&gDossier=3D"+obj.gDossier+"&f_id=3D= "+obj.f_id+"&ex=3D"+obj.select.options[obj.select.selectedIndex].text; var action=3Dnew Ajax.Request( "ajax_history.php", { @@ -682,7 +682,7 @@ */ function removeOperation(p_jr_id,dossier,div) { - var qs=3D"?gDossier=3D"+dossier+"&act=3Drmop&div=3D"+div+"&jr_id=3D"= +p_jr_id; + var qs=3D"gDossier=3D"+dossier+"&act=3Drmop&div=3D"+div+"&jr_id=3D"+= p_jr_id; var action=3Dnew Ajax.Request( "ajax_ledger.php", { @@ -701,7 +701,7 @@ */ function reverseOperation(obj) { - var qs=3D"?"+$(obj).serialize(); + var qs=3D$(obj).serialize(); g('ext'+obj.divname).style.display=3D'none'; g('bext'+obj.divname).style.display=3D'none'; =20 @@ -730,7 +730,7 @@ ,'html': loading(),'drag': true}; - querystring=3D'?gDossier=3D'+dossier+'&act=3Dde&jr_id=3D'+p_value+'&= div=3D'+id; + querystring=3D'gDossier=3D'+dossier+'&act=3Dde&jr_id=3D'+p_value+'&d= iv=3D'+id; add_div(popup); var action=3Dnew Ajax.Request( "ajax_ledger.php", @@ -756,7 +756,7 @@ } function dropLink(p_dossier,p_div,p_jr_id,p_jr_id2) { - var querystring=3D'?gDossier=3D'+p_dossier; + var querystring=3D'gDossier=3D'+p_dossier; querystring+=3D'&div=3D'+p_div; querystring+=3D'&jr_id=3D'+p_jr_id; querystring+=3D'&act=3Drmr'; @@ -800,7 +800,7 @@ { try { - var queryString=3D'?gDossier=3D'+obj.gDossier+'&j_id=3D'+obj.j_i= d+'&op=3Ddl'+'&ot=3D'+this.obj_type; + var queryString=3D'gDossier=3D'+obj.gDossier+'&j_id=3D'+obj.j_id= +'&op=3Ddl'+'&ot=3D'+this.obj_type; var action=3Dnew Ajax.Request( "ajax_misc.php", { @@ -893,14 +893,14 @@ } } /** -*@brief save an operation in ajax, it concerns only the=20 +*@brief save an operation in ajax, it concerns only the * comment, the pj and the rapt * the form elements are access by their name *@param form */ function op_save(obj) { - var queryString=3D'?'+$(obj).serialize(); + var queryString=3D$(obj).serialize(); queryString+=3D"&lib=3D"+obj.lib.value; queryString+=3D"&gDossier=3D"+obj.gDossier.value; var rapt2=3D"rapt"+obj.whatdiv.value; Modified: phpcompta/trunk/html/js/accounting_item.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/js/accounting_item.js 2011-10-29 20:58:33 UTC (r= ev 4272) +++ phpcompta/trunk/html/js/accounting_item.js 2011-10-29 20:59:04 UTC (r= ev 4273) @@ -80,7 +80,7 @@ =20 var dossier=3D$('gDossier').value; =20 - var queryString=3D"?gDossier=3D"+dossier; + var queryString=3D"gDossier=3D"+dossier; =20 queryString+=3D"&op=3Dsf"; try @@ -155,7 +155,7 @@ function search_get_poste(obj) { var dossier=3D$('gDossier').value; - var queryString=3D"?gDossier=3D"+dossier; + var queryString=3D"gDossier=3D"+dossier; =20 queryString+=3D"&op=3Dsf"; =20 Modified: phpcompta/trunk/html/js/ajax_fiche.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/js/ajax_fiche.js 2011-10-29 20:58:33 UTC (rev 42= 72) +++ phpcompta/trunk/html/js/ajax_fiche.js 2011-10-29 20:59:04 UTC (rev 42= 73) @@ -20,7 +20,7 @@ // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr =20 /*! \file - * \brief This file permit to use the AJAX function to fill up=20 + * \brief This file permit to use the AJAX function to fill up * info from fiche * */ @@ -91,7 +91,7 @@ return; } } - var queryString=3D"?FID=3D"+trim($(p_ctl).value); + var queryString=3D"FID=3D"+trim($(p_ctl).value); if ( $(p_ctl).label) { queryString+=3D'&l=3D'+$(p_ctl).label; @@ -129,7 +129,7 @@ } /*!\brief callback function for ajax * \param request : object request - * \param json : json answer=20 + * \param json : json answer \verbatim {"answer":"ok", "flabel":"none", @@ -180,14 +180,14 @@ alert('erreur : ajax fiche'); } /*!\brief this function get the saldo - * \param p_ctl the ctrl where we take the quick_code=20 + * \param p_ctl the ctrl where we take the quick_code */ function ajax_saldo(p_ctl) { var gDossier=3D$('gDossier').value; var ctl_value=3Dtrim($(p_ctl).value); var jrn=3D$('p_jrn').value; - queryString=3D"?FID=3D"+ctl_value; + queryString=3D"FID=3D"+ctl_value; queryString=3DqueryString+'&gDossier=3D'+gDossier+'&j=3D'+jrn; queryString=3DqueryString+'&ctl=3D'+ctl_value; /* alert(queryString); */ Modified: phpcompta/trunk/html/js/anc_script.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/js/anc_script.js 2011-10-29 20:58:33 UTC (rev 42= 72) +++ phpcompta/trunk/html/js/anc_script.js 2011-10-29 20:59:04 UTC (rev 42= 73) @@ -120,7 +120,7 @@ function search_ca (p_dossier,p_target,p_source) { var pa_id=3Dg(p_source).value; - var url=3D"?gDossier=3D"+p_dossier+"&c1=3D"+p_target+"&c2=3D"+pa_id; + var url=3D"gDossier=3D"+p_dossier+"&c1=3D"+p_target+"&c2=3D"+pa_id; var a=3Dwindow.open("search_ca.php"+url,"CA recherche",'statusbar=3D= no,scrollbars=3Dyes,toolbar=3Dno'); a.focus(); } Modified: phpcompta/trunk/html/js/builder.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/js/builder.js 2011-10-29 20:58:33 UTC (rev 4272) +++ phpcompta/trunk/html/js/builder.js 2011-10-29 20:59:04 UTC (rev 4273) @@ -1,6 +1,6 @@ -// script.aculo.us builder.js v1.8.3, Thu Oct 08 11:23:33 +0200 2009 +// script.aculo.us builder.js v1.9.0, Thu Dec 23 16:54:48 -0500 2010 =20 -// Copyright (c) 2005-2009 Thomas Fuchs (http://script.aculo.us, http://= mir.aculo.us) +// Copyright (c) 2005-2010 Thomas Fuchs (http://script.aculo.us, http://= mir.aculo.us) // // script.aculo.us is freely distributable under the terms of an MIT-sty= le license. // For details, see the script.aculo.us web site: http://script.aculo.us= / Modified: phpcompta/trunk/html/js/card.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/js/card.js 2011-10-29 20:58:33 UTC (rev 4272) +++ phpcompta/trunk/html/js/card.js 2011-10-29 20:59:04 UTC (rev 4273) @@ -76,7 +76,7 @@ =20 var div_style=3D"top:"+sx+";width:60%;heigth:80%"; add_div({id:'search_card',cssclass:'op_detail',html:loading(),style:div= _style,drag:true}); -=09 + var action=3Dnew Ajax.Request ( 'ajax_card.php', { method:'get', @@ -95,13 +95,13 @@ *@brief when you submit the form for searching a card *@param obj form *@note the same as search_card, except it answer to a FORM and not - * to a click event=20 + * to a click event */ function search_get_card(obj) { var dossier=3D$('gDossier').value; =20 - var queryString=3D"?gDossier=3D"+dossier; + var queryString=3D"gDossier=3D"+dossier; queryString+=3D"&op=3Dfs"; =20 if ( obj.elements['inp'] ) @@ -315,15 +315,15 @@ } // ctl=3D$(obj).id; =20 - var queryString=3D'?gDossier=3D'+dossier; + var queryString=3D'gDossier=3D'+dossier; queryString+=3D'&qcode=3D'+qcode; queryString+=3D'&ctl=3D'+content; queryString+=3D'&op=3Ddc'; // dc for detail card - if ( obj.readonly !=3D undefined) {=20 + if ( obj.readonly !=3D undefined) { queryString+=3D'&ro'; } =20 - if ( obj.nohistory !=3D undefined) {=20 + if ( obj.nohistory !=3D undefined) { queryString+=3D'&nohistory'; } =20 @@ -339,7 +339,7 @@ /** *@brief * \param request : object request - * \param json : json answer=20 + * \param json : json answer \code \endcode */ @@ -376,7 +376,7 @@ } } /** - *@brief show the ipopup for selecting a card type, it is a needed step = before adding=20 + *@brief show the ipopup for selecting a card type, it is a needed step = before adding * a card *@param input field (obj) it must have the attribute ipopup * possible attribute : @@ -387,7 +387,7 @@ */ function select_card_type(obj) { - =20 + var dossier=3D$('gDossier').value; =20 // give a filter, -1 if not @@ -414,7 +414,7 @@ =20 add_div(popup); =20 - var queryString=3D'?gDossier=3D'+dossier; + var queryString=3D'gDossier=3D'+dossier; queryString+=3D'&ctl=3D'+content; queryString+=3D'&op=3Dst'; // st for selecting type if ( $(obj).win_refresh!=3Dundefined) @@ -478,7 +478,7 @@ =20 var dossier=3D$('gDossier').value; =20 - var queryString=3D'?gDossier=3D'+dossier; + var queryString=3D'gDossier=3D'+dossier; queryString+=3D'&ctl=3D'+content; queryString+=3D'&fd_id=3D'+fd_id; queryString+=3Dref; @@ -507,7 +507,7 @@ $(content).innerHTML=3Dloading(); =20 var dossier=3D$('gDossier').value; - var queryString=3D'?gDossier=3D'+dossier; + var queryString=3D'gDossier=3D'+dossier; queryString+=3D'&ctl=3D'+content; queryString+=3Ddata; queryString+=3D'&op=3Dsc'; // sc for save card @@ -532,7 +532,7 @@ // show ipopup showIPopup(obj.ipopup); var dossier=3D$('gDossier').value; - var queryString=3D'?gDossier=3D'+dossier; + var queryString=3D'gDossier=3D'+dossier; queryString+=3D'&op=3Dac'; queryString+=3D'&ctl=3D'+obj.ipopup+'_content'; if ( obj.type_cat) @@ -581,7 +581,7 @@ ); } /** - *@brief Remove a definition of an attribut=20 + *@brief Remove a definition of an attribut *@param attr_def.ad_id *@param gDossier *@param table_id to rm the row @@ -590,7 +590,7 @@ =20 function removeCardAttribut(ad_id,gDossier,table_id,row) { - var queryString=3D'?gDossier=3D'+gDossier; + var queryString=3D'gDossier=3D'+gDossier; queryString+=3D'&op=3Drmfa'; queryString+=3D'&ctl=3Ddebug'; // debug id queryString+=3D'&ad_id=3D'+ad_id; Modified: phpcompta/trunk/html/js/controls.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/js/controls.js 2011-10-29 20:58:33 UTC (rev 4272= ) +++ phpcompta/trunk/html/js/controls.js 2011-10-29 20:59:04 UTC (rev 4273= ) @@ -1,8 +1,8 @@ -// script.aculo.us controls.js v1.8.3, Thu Oct 08 11:23:33 +0200 2009 +// script.aculo.us controls.js v1.9.0, Thu Dec 23 16:54:48 -0500 2010 =20 -// Copyright (c) 2005-2009 Thomas Fuchs (http://script.aculo.us, http://= mir.aculo.us) -// (c) 2005-2009 Ivan Krstic (http://blogs.law.harvard.edu/iva= n) -// (c) 2005-2009 Jon Tirsen (http://www.tirsen.com) +// Copyright (c) 2005-2010 Thomas Fuchs (http://script.aculo.us, http://= mir.aculo.us) +// (c) 2005-2010 Ivan Krstic (http://blogs.law.harvard.edu/iva= n) +// (c) 2005-2010 Jon Tirsen (http://www.tirsen.com) // Contributors: // Richard Livsey // Rahul Bhargava @@ -67,6 +67,7 @@ update.style.position =3D 'absolute'; Position.clone(element, update, { setHeight: false, + setWidth:true, offsetTop: element.offsetHeight }); } @@ -781,7 +782,7 @@ onComplete: Prototype.emptyFunction, onSuccess: function(transport) { var js =3D transport.responseText.strip(); - if (!/^\[.*\]$/.test(js))=20 + if (!/^\[.*\]$/.test(js)) // TODO: improve sanity check throw('Server returned an invalid collection representation.')= ; this._collection =3D eval(js); this.checkForExternalText(); Modified: phpcompta/trunk/html/js/dragdrop.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/js/dragdrop.js 2011-10-29 20:58:33 UTC (rev 4272= ) +++ phpcompta/trunk/html/js/dragdrop.js 2011-10-29 20:59:04 UTC (rev 4273= ) @@ -1,8 +1,7 @@ -// script.aculo.us dragdrop.js v1.8.1, Thu Jan 03 22:07:12 -0500 2008 +// script.aculo.us dragdrop.js v1.9.0, Thu Dec 23 16:54:48 -0500 2010 =20 -// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://= mir.aculo.us) -// (c) 2005-2007 Sammi Williams (http://www.oriontransfer.co.n= z, sammi@oriontransfer.co.nz) -//=20 +// Copyright (c) 2005-2010 Thomas Fuchs (http://script.aculo.us, http://= mir.aculo.us) +// // script.aculo.us is freely distributable under the terms of an MIT-sty= le license. // For details, see the script.aculo.us web site: http://script.aculo.us= / =20 @@ -21,8 +20,7 @@ var options =3D Object.extend({ greedy: true, hoverclass: null, - tree: false, - scrollid: null + tree: false }, arguments[1] || { }); =20 // cache containers @@ -35,7 +33,7 @@ options._containers.push($(containment)); } } - =20 + if(options.accept) options.accept =3D [options.accept].flatten(); =20 Element.makePositioned(element); // fix IE @@ -43,43 +41,34 @@ =20 this.drops.push(options); }, - =20 + findDeepestChild: function(drops) { deepest =3D drops[0]; - =20 + for (i =3D 1; i < drops.length; ++i) if (Element.isParent(drops[i].element, deepest.element)) deepest =3D drops[i]; - =20 + return deepest; }, =20 isContained: function(element, drop) { var containmentNode; if(drop.tree) { - containmentNode =3D element.treeNode;=20 + containmentNode =3D element.treeNode; } else { containmentNode =3D element.parentNode; } return drop._containers.detect(function(c) { return containmentNode = =3D=3D c }); }, - =20 + isAffected: function(point, element, drop) { - if( drop.scrollid ){ - Position.includeScrollOffsets =3D true; - scrolling_element =3D $(drop.scrollid) - var container_off =3D Element.cumulativeOffset(scrolling_element);= =20 - if( point[1] < container_off[1] || point[1] > Element.getHeight(sc= rolling_element) + container_off[1]) - {return false;} - else if( point[0] < container_off[0] || point[0] > Element.getWidt= h(scrolling_element) + container_off[0]) - {return false;} - } return ( (drop.element!=3Delement) && ((!drop._containers) || this.isContained(element, drop)) && ((!drop.accept) || - (Element.classNames(element).detect(=20 + (Element.classNames(element).detect( function(v) { return drop.accept.include(v) } ) )) && Position.within(drop.element, point[0], point[1]) ); }, @@ -99,12 +88,12 @@ show: function(point, element) { if(!this.drops.length) return; var drop, affected =3D []; - =20 + this.drops.each( function(drop) { if(Droppables.isAffected(point, element, drop)) affected.push(drop); }); - =20 + if(affected.length>0) drop =3D Droppables.findDeepestChild(affected); =20 @@ -113,7 +102,7 @@ Position.within(drop.element, point[0], point[1]); if(drop.onHover) drop.onHover(element, drop.element, Position.overlap(drop.overla= p, drop.element)); - =20 + if (drop !=3D this.last_active) Droppables.activate(drop); } }, @@ -124,8 +113,8 @@ =20 if (this.isAffected([Event.pointerX(event), Event.pointerY(event)], = element, this.last_active)) if (this.last_active.onDrop) { - this.last_active.onDrop(element, this.last_active.element, event= );=20 - return true;=20 + this.last_active.onDrop(element, this.last_active.element, event= ); + return true; } }, =20 @@ -133,25 +122,25 @@ if(this.last_active) this.deactivate(this.last_active); } -} +}; =20 var Draggables =3D { drags: [], observers: [], - =20 + register: function(draggable) { if(this.drags.length =3D=3D 0) { this.eventMouseUp =3D this.endDrag.bindAsEventListener(this); this.eventMouseMove =3D this.updateDrag.bindAsEventListener(this); this.eventKeypress =3D this.keyPress.bindAsEventListener(this); - =20 + Event.observe(document, "mouseup", this.eventMouseUp); Event.observe(document, "mousemove", this.eventMouseMove); Event.observe(document, "keypress", this.eventKeypress); } this.drags.push(draggable); }, - =20 + unregister: function(draggable) { this.drags =3D this.drags.reject(function(d) { return d=3D=3Ddraggab= le }); if(this.drags.length =3D=3D 0) { @@ -160,24 +149,24 @@ Event.stopObserving(document, "keypress", this.eventKeypress); } }, - =20 + activate: function(draggable) { - if(draggable.options.delay) {=20 - this._timeout =3D setTimeout(function() {=20 - Draggables._timeout =3D null;=20 - window.focus();=20 - Draggables.activeDraggable =3D draggable;=20 - }.bind(this), draggable.options.delay);=20 + if(draggable.options.delay) { + this._timeout =3D setTimeout(function() { + Draggables._timeout =3D null; + window.focus(); + Draggables.activeDraggable =3D draggable; + }.bind(this), draggable.options.delay); } else { window.focus(); // allows keypress events if window isn't currentl= y focused, fails for Safari this.activeDraggable =3D draggable; } }, - =20 + deactivate: function() { this.activeDraggable =3D null; }, - =20 + updateDrag: function(event) { if(!this.activeDraggable) return; var pointer =3D [Event.pointerX(event), Event.pointerY(event)]; @@ -185,36 +174,36 @@ // the same coordinates, prevent needless redrawing (moz bug?) if(this._lastPointer && (this._lastPointer.inspect() =3D=3D pointer.= inspect())) return; this._lastPointer =3D pointer; - =20 + this.activeDraggable.updateDrag(event, pointer); }, - =20 + endDrag: function(event) { - if(this._timeout) {=20 - clearTimeout(this._timeout);=20 - this._timeout =3D null;=20 + if(this._timeout) { + clearTimeout(this._timeout); + this._timeout =3D null; } if(!this.activeDraggable) return; this._lastPointer =3D null; this.activeDraggable.endDrag(event); this.activeDraggable =3D null; }, - =20 + keyPress: function(event) { if(this.activeDraggable) this.activeDraggable.keyPress(event); }, - =20 + addObserver: function(observer) { this.observers.push(observer); this._cacheObserverCallbacks(); }, - =20 + removeObserver: function(element) { // element instead of observer fi= xes mem leaks this.observers =3D this.observers.reject( function(o) { return o.ele= ment=3D=3Delement }); this._cacheObserverCallbacks(); }, - =20 + notify: function(eventName, draggable, event) { // 'onStart', 'onEnd'= , 'onDrag' if(this[eventName+'Count'] > 0) this.observers.each( function(o) { @@ -222,7 +211,7 @@ }); if(draggable.options[eventName]) draggable.options[eventName](dragga= ble, event); }, - =20 + _cacheObserverCallbacks: function() { ['onStart','onEnd','onDrag'].each( function(eventName) { Draggables[eventName+'Count'] =3D Draggables.observers.select( @@ -230,7 +219,7 @@ ).length; }); } -} +}; =20 /*----------------------------------------------------------------------= ----*/ =20 @@ -246,12 +235,12 @@ }, endeffect: function(element) { var toOpacity =3D Object.isNumber(element._opacity) ? element._o= pacity : 1.0; - new Effect.Opacity(element, {duration:0.2, from:0.7, to:toOpacit= y,=20 + new Effect.Opacity(element, {duration:0.2, from:0.7, to:toOpacit= y, queue: {scope:'_draggable', position:'end'}, - afterFinish: function(){=20 - Draggable._dragging[element] =3D false=20 + afterFinish: function(){ + Draggable._dragging[element] =3D false } - });=20 + }); }, zindex: 1000, revert: false, @@ -262,57 +251,57 @@ snap: false, // false, or xy or [x,y] or function(x,y){ return [x= ,y] } delay: 0 }; - =20 + if(!arguments[1] || Object.isUndefined(arguments[1].endeffect)) Object.extend(defaults, { starteffect: function(element) { element._opacity =3D Element.getOpacity(element); Draggable._dragging[element] =3D true; - new Effect.Opacity(element, {duration:0.2, from:element._opaci= ty, to:0.7});=20 + new Effect.Opacity(element, {duration:0.2, from:element._opaci= ty, to:0.7}); } }); - =20 + var options =3D Object.extend(defaults, arguments[1] || { }); =20 this.element =3D $(element); - =20 + if(options.handle && Object.isString(options.handle)) this.handle =3D this.element.down('.'+options.handle, 0); - =20 + if(!this.handle) this.handle =3D $(options.handle); if(!this.handle) this.handle =3D this.element; - =20 + if(options.scroll && !options.scroll.scrollTo && !options.scroll.out= erHTML) { options.scroll =3D $(options.scroll); this._isScrollChild =3D Element.childOf(this.element, options.scro= ll); } =20 - Element.makePositioned(this.element); // fix IE =20 + Element.makePositioned(this.element); // fix IE =20 this.options =3D options; - this.dragging =3D false; =20 + this.dragging =3D false; =20 this.eventMouseDown =3D this.initDrag.bindAsEventListener(this); Event.observe(this.handle, "mousedown", this.eventMouseDown); - =20 + Draggables.register(this); }, - =20 + destroy: function() { Event.stopObserving(this.handle, "mousedown", this.eventMouseDown); Draggables.unregister(this); }, - =20 + currentDelta: function() { return([ parseInt(Element.getStyle(this.element,'left') || '0'), parseInt(Element.getStyle(this.element,'top') || '0')]); }, - =20 + initDrag: function(event) { if(!Object.isUndefined(Draggable._dragging[this.element]) && Draggable._dragging[this.element]) return; - if(Event.isLeftClick(event)) { =20 + if(Event.isLeftClick(event)) { // abort on form elements, fixes a Firefox issue var src =3D Event.element(event); if((tag_name =3D src.tagName.toUpperCase()) && ( @@ -321,34 +310,34 @@ tag_name=3D=3D'OPTION' || tag_name=3D=3D'BUTTON' || tag_name=3D=3D'TEXTAREA')) return; - =20 + var pointer =3D [Event.pointerX(event), Event.pointerY(event)]; - var pos =3D Position.cumulativeOffset(this.element); + var pos =3D this.element.cumulativeOffset(); this.offset =3D [0,1].map( function(i) { return (pointer[i] - pos[= i]) }); - =20 + Draggables.activate(this); Event.stop(event); } }, - =20 + startDrag: function(event) { this.dragging =3D true; if(!this.delta) this.delta =3D this.currentDelta(); - =20 + if(this.options.zindex) { this.originalZ =3D parseInt(Element.getStyle(this.element,'z-index= ') || 0); this.element.style.zIndex =3D this.options.zindex; } - =20 + if(this.options.ghosting) { this._clone =3D this.element.cloneNode(true); - this.element._originallyAbsolute =3D (this.element.getStyle('posit= ion') =3D=3D 'absolute'); - if (!this.element._originallyAbsolute) + this._originallyAbsolute =3D (this.element.getStyle('position') =3D= =3D 'absolute'); + if (!this._originallyAbsolute) Position.absolutize(this.element); this.element.parentNode.insertBefore(this._clone, this.element); } - =20 + if(this.options.scroll) { if (this.options.scroll =3D=3D window) { var where =3D this._getWindowScroll(this.options.scroll); @@ -359,33 +348,33 @@ this.originalScrollTop =3D this.options.scroll.scrollTop; } } - =20 + Draggables.notify('onStart', this, event); - =20 + if(this.options.starteffect) this.options.starteffect(this.element); }, - =20 + updateDrag: function(event, pointer) { if(!this.dragging) this.startDrag(event); - =20 + if(!this.options.quiet){ Position.prepare(); Droppables.show(pointer, this.element); } - =20 + Draggables.notify('onDrag', this, event); - =20 + this.draw(pointer); if(this.options.change) this.options.change(this); - =20 + if(this.options.scroll) { this.stopScrolling(); - =20 + var p; if (this.options.scroll =3D=3D window) { with(this._getWindowScroll(this.options.scroll)) { p =3D [ left,= top, left+width, top+height ]; } } else { - p =3D Position.page(this.options.scroll); + p =3D Position.page(this.options.scroll).toArray(); p[0] +=3D this.options.scroll.scrollLeft + Position.deltaX; p[1] +=3D this.options.scroll.scrollTop + Position.deltaY; p.push(p[0]+this.options.scroll.offsetWidth); @@ -398,16 +387,16 @@ if(pointer[1] > (p[3]-this.options.scrollSensitivity)) speed[1] =3D= pointer[1]-(p[3]-this.options.scrollSensitivity); this.startScrolling(speed); } - =20 + // fix AppleWebKit rendering if(Prototype.Browser.WebKit) window.scrollBy(0,0); - =20 + Event.stop(event); }, - =20 + finishDrag: function(event, success) { this.dragging =3D false; - =20 + if(this.options.quiet){ Position.prepare(); var pointer =3D [Event.pointerX(event), Event.pointerY(event)]; @@ -415,24 +404,24 @@ } =20 if(this.options.ghosting) { - if (!this.element._originallyAbsolute) + if (!this._originallyAbsolute) Position.relativize(this.element); - delete this.element._originallyAbsolute; + delete this._originallyAbsolute; Element.remove(this._clone); this._clone =3D null; } =20 - var dropped =3D false;=20 - if(success) {=20 - dropped =3D Droppables.fire(event, this.element);=20 - if (!dropped) dropped =3D false;=20 + var dropped =3D false; + if(success) { + dropped =3D Droppables.fire(event, this.element); + if (!dropped) dropped =3D false; } if(dropped && this.options.onDropped) this.options.onDropped(this.el= ement); Draggables.notify('onEnd', this, event); =20 var revert =3D this.options.revert; if(revert && Object.isFunction(revert)) revert =3D revert(this.eleme= nt); - =20 + var d =3D this.currentDelta(); if(revert && this.options.reverteffect) { if (dropped =3D=3D 0 || revert !=3D 'failure') @@ -445,67 +434,67 @@ if(this.options.zindex) this.element.style.zIndex =3D this.originalZ; =20 - if(this.options.endeffect)=20 + if(this.options.endeffect) this.options.endeffect(this.element); - =20 + Draggables.deactivate(this); Droppables.reset(); }, - =20 + keyPress: function(event) { if(event.keyCode!=3DEvent.KEY_ESC) return; this.finishDrag(event, false); Event.stop(event); }, - =20 + endDrag: function(event) { if(!this.dragging) return; this.stopScrolling(); this.finishDrag(event, true); Event.stop(event); }, - =20 + draw: function(point) { - var pos =3D Position.cumulativeOffset(this.element); + var pos =3D this.element.cumulativeOffset(); if(this.options.ghosting) { var r =3D Position.realOffset(this.element); pos[0] +=3D r[0] - Position.deltaX; pos[1] +=3D r[1] - Position.de= ltaY; } - =20 + var d =3D this.currentDelta(); pos[0] -=3D d[0]; pos[1] -=3D d[1]; - =20 + if(this.options.scroll && (this.options.scroll !=3D window && this._= isScrollChild)) { pos[0] -=3D this.options.scroll.scrollLeft-this.originalScrollLeft= ; pos[1] -=3D this.options.scroll.scrollTop-this.originalScrollTop; } - =20 - var p =3D [0,1].map(function(i){=20 - return (point[i]-pos[i]-this.offset[i])=20 + + var p =3D [0,1].map(function(i){ + return (point[i]-pos[i]-this.offset[i]) }.bind(this)); - =20 + if(this.options.snap) { if(Object.isFunction(this.options.snap)) { p =3D this.options.snap(p[0],p[1],this); } else { if(Object.isArray(this.options.snap)) { p =3D p.map( function(v, i) { - return (v/this.options.snap[i]).round()*this.options.snap[i] }= .bind(this)) + return (v/this.options.snap[i]).round()*this.options.snap[i] }= .bind(this)); } else { p =3D p.map( function(v) { - return (v/this.options.snap).round()*this.options.snap }.bind(= this)) + return (v/this.options.snap).round()*this.options.snap }.bind(= this)); } }} - =20 + var style =3D this.element.style; if((!this.options.constraint) || (this.options.constraint=3D=3D'hori= zontal')) style.left =3D p[0] + "px"; if((!this.options.constraint) || (this.options.constraint=3D=3D'vert= ical')) style.top =3D p[1] + "px"; - =20 + if(style.visibility=3D=3D"hidden") style.visibility =3D ""; // fix g= ecko rendering }, - =20 + stopScrolling: function() { if(this.scrollInterval) { clearInterval(this.scrollInterval); @@ -513,14 +502,14 @@ Draggables._lastScrollPointer =3D null; } }, - =20 + startScrolling: function(speed) { if(!(speed[0] || speed[1])) return; this.scrollSpeed =3D [speed[0]*this.options.scrollSpeed,speed[1]*thi= s.options.scrollSpeed]; this.lastScrolled =3D new Date(); this.scrollInterval =3D setInterval(this.scroll.bind(this), 10); }, - =20 + scroll: function() { var current =3D new Date(); var delta =3D current - this.lastScrolled; @@ -536,7 +525,7 @@ this.options.scroll.scrollLeft +=3D this.scrollSpeed[0] * delta / = 1000; this.options.scroll.scrollTop +=3D this.scrollSpeed[1] * delta / = 1000; } - =20 + Position.prepare(); Droppables.show(Draggables._lastPointer, this.element); Draggables.notify('onDrag', this); @@ -550,10 +539,10 @@ Draggables._lastScrollPointer[1] =3D 0; this.draw(Draggables._lastScrollPointer); } - =20 + if(this.options.change) this.options.change(this); }, - =20 + _getWindowScroll: function(w) { var T, L, W, H; with (w.document) { @@ -572,7 +561,7 @@ H =3D documentElement.clientHeight; } else { W =3D body.offsetWidth; - H =3D body.offsetHeight + H =3D body.offsetHeight; } } return { top: T, left: L, width: W, height: H }; @@ -589,11 +578,11 @@ this.observer =3D observer; this.lastValue =3D Sortable.serialize(this.element); }, - =20 + onStart: function() { this.lastValue =3D Sortable.serialize(this.element); }, - =20 + onEnd: function() { Sortable.unmark(); if(this.lastValue !=3D Sortable.serialize(this.element)) @@ -603,11 +592,11 @@ =20 var Sortable =3D { SERIALIZE_RULE: /^[^_\-](?:[A-Za-z0-9\-\_]*)[_](.*)$/, - =20 + sortables: { }, - =20 + _findRootElement: function(element) { - while (element.tagName.toUpperCase() !=3D "BODY") { =20 + while (element.tagName.toUpperCase() !=3D "BODY") { if(element.id && Sortable.sortables[element.id]) return element; element =3D element.parentNode; } @@ -618,22 +607,23 @@ if(!element) return; return Sortable.sortables[element.id]; }, - =20 + destroy: function(element){ - var s =3D Sortable.options(element); - =20 + element =3D $(element); + var s =3D Sortable.sortables[element.id]; + if(s) { Draggables.removeObserver(s.element); s.droppables.each(function(d){ Droppables.remove(d) }); s.draggables.invoke('destroy'); - =20 + delete Sortable.sortables[s.element.id]; } }, =20 create: function(element) { element =3D $(element); - var options =3D Object.extend({=20 + var options =3D Object.extend({ element: element, tag: 'li', // assumes li children, override with tag= : 'tagname' dropOnEmpty: false, @@ -647,17 +637,17 @@ delay: 0, hoverclass: null, ghosting: false, - quiet: false,=20 + quiet: false, scroll: false, scrollSensitivity: 20, scrollSpeed: 15, format: this.SERIALIZE_RULE, - =20 - // these take arrays of elements or ids and can be=20 + + // these take arrays of elements or ids and can be // used for better initialization performance elements: false, handles: false, - =20 + onChange: Prototype.emptyFunction, onUpdate: Prototype.emptyFunction }, arguments[1] || { }); @@ -694,24 +684,24 @@ if(options.zindex) options_for_draggable.zindex =3D options.zindex; =20 - // build options for the droppables =20 + // build options for the droppables var options_for_droppable =3D { overlap: options.overlap, containment: options.containment, tree: options.tree, hoverclass: options.hoverclass, onHover: Sortable.onHover - } - =20 + }; + var options_for_tree =3D { onHover: Sortable.onEmptyHover, overlap: options.overlap, containment: options.containment, hoverclass: options.hoverclass - } + }; =20 // fix for gecko engine - Element.cleanWhitespace(element);=20 + Element.cleanWhitespace(element); =20 options.draggables =3D []; options.droppables =3D []; @@ -724,14 +714,14 @@ =20 (options.elements || this.findElements(element, options) || []).each= ( function(e,i) { var handle =3D options.handles ? $(options.handles[i]) : - (options.handle ? $(e).select('.' + options.handle)[0] : e);=20 + (options.handle ? $(e).select('.' + options.handle)[0] : e); options.draggables.push( new Draggable(e, Object.extend(options_for_draggable, { handle: = handle }))); Droppables.add(e, options_for_droppable); if(options.tree) e.treeNode =3D element; - options.droppables.push(e); =20 + options.droppables.push(e); }); - =20 + if(options.tree) { (Sortable.findTreeElements(element, options) || []).each( function= (e) { Droppables.add(e, options_for_tree); @@ -741,7 +731,7 @@ } =20 // keep reference - this.sortables[element.id] =3D options; + this.sortables[element.identify()] =3D options; =20 // for onupdate Draggables.addObserver(new SortableObserver(element, options.onUpdat= e)); @@ -753,7 +743,7 @@ return Element.findChildren( element, options.only, options.tree ? true : false, options.tag); }, - =20 + findTreeElements: function(element, options) { return Element.findChildren( element, options.only, options.tree ? true : false, options.treeTa= g); @@ -770,7 +760,7 @@ var oldParentNode =3D element.parentNode; element.style.visibility =3D "hidden"; // fix gecko rendering dropon.parentNode.insertBefore(element, dropon); - if(dropon.parentNode!=3DoldParentNode)=20 + if(dropon.parentNode!=3DoldParentNode) Sortable.options(oldParentNode).onChange(element); Sortable.options(dropon.parentNode).onChange(element); } @@ -781,26 +771,26 @@ var oldParentNode =3D element.parentNode; element.style.visibility =3D "hidden"; // fix gecko rendering dropon.parentNode.insertBefore(element, nextElement); - if(dropon.parentNode!=3DoldParentNode)=20 + if(dropon.parentNode!=3DoldParentNode) Sortable.options(oldParentNode).onChange(element); Sortable.options(dropon.parentNode).onChange(element); } } }, - =20 + onEmptyHover: function(element, dropon, overlap) { var oldParentNode =3D element.parentNode; var droponOptions =3D Sortable.options(dropon); - =20 + if(!Element.isParent(dropon, element)) { var index; - =20 + var children =3D Sortable.findElements(dropon, {tag: droponOptions= .tag, only: droponOptions.only}); var child =3D null; - =20 + if(children) { var offset =3D Element.offsetSize(dropon, droponOptions.overlap)= * (1.0 - overlap); - =20 + for (index =3D 0; index < children.length; index +=3D 1) { if (offset - Element.offsetSize (children[index], droponOption= s.overlap) >=3D 0) { offset -=3D Element.offsetSize (children[index], droponOptio= ns.overlap); @@ -813,9 +803,9 @@ } } } - =20 + dropon.insertBefore(element, child); - =20 + Sortable.options(oldParentNode).onChange(element); droponOptions.onChange(element); } @@ -828,34 +818,34 @@ mark: function(dropon, position) { // mark on ghosting only var sortable =3D Sortable.options(dropon.parentNode); - if(sortable && !sortable.ghosting) return;=20 + if(sortable && !sortable.ghosting) return; =20 if(!Sortable._marker) { - Sortable._marker =3D=20 + Sortable._marker =3D ($('dropmarker') || Element.extend(document.createElement('DIV')= )). hide().addClassName('dropmarker').setStyle({position:'absolute= '}); document.getElementsByTagName("body").item(0).appendChild(Sortable= ._marker); - } =20 - var offsets =3D Position.cumulativeOffset(dropon); + } + var offsets =3D dropon.cumulativeOffset(); Sortable._marker.setStyle({left: offsets[0]+'px', top: offsets[1] + = 'px'}); - =20 + if(position=3D=3D'after') - if(sortable.overlap =3D=3D 'horizontal')=20 + if(sortable.overlap =3D=3D 'horizontal') Sortable._marker.setStyle({left: (offsets[0]+dropon.clientWidth)= + 'px'}); else Sortable._marker.setStyle({top: (offsets[1]+dropon.clientHeight)= + 'px'}); - =20 + Sortable._marker.show(); }, - =20 + _tree: function(element, options, parent) { var children =3D Sortable.findElements(element, options) || []; - =20 + for (var i =3D 0; i < children.length; ++i) { var match =3D children[i].id.match(options.format); =20 if (!match) continue; - =20 + var child =3D { id: encodeURIComponent(match ? match[1] : null), element: element, @@ -863,16 +853,16 @@ children: [], position: parent.children.length, container: $(children[i]).down(options.treeTag) - } - =20 + }; + /* Get the element containing the children and recurse over it */ if (child.container) - this._tree(child.container, options, child) - =20 + this._tree(child.container, options, child); + parent.children.push (child); } =20 - return parent;=20 + return parent; }, =20 tree: function(element) { @@ -885,15 +875,15 @@ name: element.id, format: sortableOptions.format }, arguments[1] || { }); - =20 + var root =3D { id: null, parent: null, children: [], container: element, position: 0 - } - =20 + }; + return Sortable._tree(element, options, root); }, =20 @@ -909,7 +899,7 @@ sequence: function(element) { element =3D $(element); var options =3D Object.extend(this.options(element), arguments[1] ||= { }); - =20 + return $(this.findElements(element, options) || []).map( function(it= em) { return item.id.match(options.format) ? item.id.match(options.forma= t)[1] : ''; }); @@ -918,14 +908,14 @@ setSequence: function(element, new_sequence) { element =3D $(element); var options =3D Object.extend(this.options(element), arguments[2] ||= { }); - =20 + var nodeMap =3D { }; this.findElements(element, options).each( function(n) { if (n.id.match(options.format)) nodeMap[n.id.match(options.format)[1]] =3D [n, n.parentNode]= ; n.parentNode.removeChild(n); }); - =20 + new_sequence.each(function(ident) { var n =3D nodeMap[ident]; if (n) { @@ -934,16 +924,16 @@ } }); }, - =20 + serialize: function(element) { element =3D $(element); var options =3D Object.extend(Sortable.options(element), arguments[1= ] || { }); var name =3D encodeURIComponent( (arguments[1] && arguments[1].name) ? arguments[1].name : element.= id); - =20 + if (options.tree) { return Sortable.tree(element, arguments[1]).children.map( function= (item) { - return [name + Sortable._constructIndex(item) + "[id]=3D" +=20 + return [name + Sortable._constructIndex(item) + "[id]=3D" + encodeURIComponent(item.id)].concat(item.children.map(ar= guments.callee)); }).flatten().join('&'); } else { @@ -952,16 +942,16 @@ }).join('&'); } } -} +}; =20 // Returns true if child is contained within element Element.isParent =3D function(child, element) { if (!child.parentNode || child =3D=3D element) return false; if (child.parentNode =3D=3D element) return true; return Element.isParent(child.parentNode, element); -} +}; =20 -Element.findChildren =3D function(element, only, recursive, tagName) { = =20 +Element.findChildren =3D function(element, only, recursive, tagName) { if(!element.hasChildNodes()) return null; tagName =3D tagName.toUpperCase(); if(only) only =3D [only].flatten(); @@ -977,8 +967,8 @@ }); =20 return (elements.length>0 ? elements.flatten() : []); -} +}; =20 Element.offsetSize =3D function (element, type) { return element['offset' + ((type=3D=3D'vertical' || type=3D=3D'height'= ) ? 'Height' : 'Width')]; -} +}; \ No newline at end of file Modified: phpcompta/trunk/html/js/effects.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/js/effects.js 2011-10-29 20:58:33 UTC (rev 4272) +++ phpcompta/trunk/html/js/effects.js 2011-10-29 20:59:04 UTC (rev 4273) @@ -1,6 +1,6 @@ -// script.aculo.us effects.js v1.8.3, Thu Oct 08 11:23:33 +0200 2009 +// script.aculo.us effects.js v1.9.0, Thu Dec 23 16:54:48 -0500 2010 =20 -// Copyright (c) 2005-2009 Thomas Fuchs (http://script.aculo.us, http://= mir.aculo.us) +// Copyright (c) 2005-2010 Thomas Fuchs (http://script.aculo.us, http://= mir.aculo.us) // Contributors: // Justin Palmer (http://encytemedia.com/) // Mark Pilgrim (http://diveintomark.org/) Modified: phpcompta/trunk/html/js/extension.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/js/extension.js 2011-10-29 20:58:33 UTC (rev 427= 2) +++ phpcompta/trunk/html/js/extension.js 2011-10-29 20:59:04 UTC (rev 427= 3) @@ -31,7 +31,7 @@ { var dossier=3D$("gDossier").value; showIPopup("dtext"); - var queryString=3D'?gDossier=3D'+dossier; + var queryString=3D'gDossier=3D'+dossier; queryString+=3D'&ex_id=3D'+p_code; queryString+=3D'&action=3Dde'; // de for detail extension =20 @@ -51,7 +51,7 @@ { var dossier=3D$("gDossier").value; showIPopup("dtext"); - var queryString=3D'?gDossier=3D'+dossier; + var queryString=3D'gDossier=3D'+dossier; queryString+=3D'&action=3Dne'; // ne for new extension =20 var action=3Dnew Ajax.Request ( 'ajax_extension.php', @@ -106,7 +106,7 @@ try { var dossier=3D$("gDossier").value; - var queryString=3D'?gDossier=3D'+dossier; + var queryString=3D'gDossier=3D'+dossier; queryString+=3D'&action=3Dse'; // se save extension // Data must be taken here try @@ -171,7 +171,7 @@ function extension_remove(ex_id) { var dossier=3D$("gDossier").value; - var queryString=3D'?gDossier=3D'+dossier; + var queryString=3D'gDossier=3D'+dossier; queryString+=3D'&ex_id=3D'+ex_id; queryString+=3D'&action=3Dre'; // re for remove extension var action=3Dnew Ajax.Request ( 'ajax_extension.php', Modified: phpcompta/trunk/html/js/gestion.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/js/gestion.js 2011-10-29 20:58:33 UTC (rev 4272) +++ phpcompta/trunk/html/js/gestion.js 2011-10-29 20:59:04 UTC (rev 4273) @@ -33,7 +33,7 @@ */ function remove_document(p_dossier,p_id) { - queryString=3D"?gDossier=3D"+p_dossier+"&a=3Drm&d_id=3D"+p_id; + queryString=3D"gDossier=3D"+p_dossier+"&a=3Drm&d_id=3D"+p_id; var action=3Dnew Ajax.Request ( "show_document.php", { @@ -98,7 +98,7 @@ { return; } - queryString=3D"?gDossier=3D"+p_dossier+"&op=3Drm_stock&s_id=3D"+s_id= ; + queryString=3D"gDossier=3D"+p_dossier+"&op=3Drm_stock&s_id=3D"+s_id; var action=3Dnew Ajax.Request ( "ajax_misc.php", { @@ -133,7 +133,7 @@ $(doc).style.color=3D"red"; // $(doc).href=3D"javascript:alert('Stock Effac=C3=A9')"; $(doc).style.textDecoration=3D"line-through"; - } catch (e) =20 + } catch (e) { alert("success_box"+e.message); } Modified: phpcompta/trunk/html/js/modele_document.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/js/modele_document.js 2011-10-29 20:58:33 UTC (r= ev 4272) +++ phpcompta/trunk/html/js/modele_document.js 2011-10-29 20:59:04 UTC (r= ev 4273) @@ -15,7 +15,7 @@ 'style':style }; =20 - querystring=3D'?gDossier=3D'+dossier+'&op=3Dmod_doc&id=3D'+p_value+'= &div=3Dmod_doc'; + querystring=3D'gDossier=3D'+dossier+'&op=3Dmod_doc&id=3D'+p_value+'&= div=3Dmod_doc'; if ( ! $('mod_doc')) { add_div(popup); @@ -32,7 +32,7 @@ } /** *@brief receive answer from ajax and just display it into the IBox - * XML must contains at least 2 fields : code is the ID of the IBOX and=20 + * XML must contains at least 2 fields : code is the ID of the IBOX and * html which is the contain */ function modify_document_success_box(req,json) Modified: phpcompta/trunk/html/js/prototype.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/js/prototype.js 2011-10-29 20:58:33 UTC (rev 427= 2) +++ phpcompta/trunk/html/js/prototype.js 2011-10-29 20:59:04 UTC (rev 427= 3) @@ -1,5 +1,5 @@ -/* Prototype JavaScript framework, version 1.6.1 - * (c) 2005-2009 Sam Stephenson +/* Prototype JavaScript framework, version 1.7 + * (c) 2005-2010 Sam Stephenson * * Prototype is freely distributable under the terms of an MIT-style li= cense. * For details, see the Prototype web site: http://www.prototypejs.org/ @@ -7,8 +7,9 @@ *----------------------------------------------------------------------= ----*/ =20 var Prototype =3D { - Version: '1.6.1', =20 + Version: '1.7', + Browser: (function(){ var ua =3D navigator.userAgent; var isOpera =3D Object.prototype.toString.call(window.opera) =3D=3D = '[object Opera]'; @@ -17,13 +18,15 @@ Opera: isOpera, WebKit: ua.indexOf('AppleWebKit/') > -1, Gecko: ua.indexOf('Gecko') > -1 && ua.indexOf('KHTML') =3D= =3D=3D -1, - MobileSafari: /Apple.*Mobile.*Safari/.test(ua) + MobileSafari: /Apple.*Mobile/.test(ua) } })(), =20 BrowserFeatures: { XPath: !!document.evaluate, + SelectorsAPI: !!document.querySelector, + ElementExtensions: (function() { var constructor =3D window.Element || window.HTMLElement; return !!(constructor && constructor.prototype); @@ -32,9 +35,9 @@ if (typeof window.HTMLDivElement !=3D=3D 'undefined') return true; =20 - var div =3D document.createElement('div'); - var form =3D document.createElement('form'); - var isSupported =3D false; + var div =3D document.createElement('div'), + form =3D document.createElement('form'), + isSupported =3D false; =20 if (div['__proto__'] && (div['__proto__'] !=3D=3D form['__proto__'= ])) { isSupported =3D true; @@ -50,35 +53,23 @@ JSONFilter: /^\/\*-secure-([\s\S]*)\*\/\s*$/, =20 emptyFunction: function() { }, + K: function(x) { return x } }; =20 if (Prototype.Browser.MobileSafari) Prototype.BrowserFeatures.SpecificElementExtensions =3D false; +/* Based on Alex Arnell's inheritance implementation. */ =20 +var Class =3D (function() { =20 -var Abstract =3D { }; - - -var Try =3D { - these: function() { - var returnValue; - - for (var i =3D 0, length =3D arguments.length; i < length; i++) { - var lambda =3D arguments[i]; - try { - returnValue =3D lambda(); - break; - } catch (e) { } + var IS_DONTENUM_BUGGY =3D (function(){ + for (var p in { toString: 1 }) { + if (p =3D=3D=3D 'toString') return false; } + return true; + })(); =20 - return returnValue; - } -}; - -/* Based on Alex Arnell's inheritance implementation. */ - -var Class =3D (function() { function subclass() {}; function create() { var parent =3D null, properties =3D $A(arguments); @@ -99,7 +90,7 @@ parent.subclasses.push(klass); } =20 - for (var i =3D 0; i < properties.length; i++) + for (var i =3D 0, length =3D properties.length; i < length; i++) klass.addMethods(properties[i]); =20 if (!klass.prototype.initialize) @@ -110,10 +101,10 @@ } =20 function addMethods(source) { - var ancestor =3D this.superclass && this.superclass.prototype; - var properties =3D Object.keys(source); + var ancestor =3D this.superclass && this.superclass.prototype, + properties =3D Object.keys(source); =20 - if (!Object.keys({ toString: true }).length) { + if (IS_DONTENUM_BUGGY) { if (source.toString !=3D Object.prototype.toString) properties.push("toString"); if (source.valueOf !=3D Object.prototype.valueOf) @@ -123,7 +114,7 @@ for (var i =3D 0, length =3D properties.length; i < length; i++) { var property =3D properties[i], value =3D source[property]; if (ancestor && Object.isFunction(value) && - value.argumentNames().first() =3D=3D "$super") { + value.argumentNames()[0] =3D=3D "$super") { var method =3D value; value =3D (function(m) { return function() { return ancestor[m].apply(this, arguments);= }; @@ -147,8 +138,38 @@ })(); (function() { =20 - var _toString =3D Object.prototype.toString; + var _toString =3D Object.prototype.toString, + NULL_TYPE =3D 'Null', + UNDEFINED_TYPE =3D 'Undefined', + BOOLEAN_TYPE =3D 'Boolean', + NUMBER_TYPE =3D 'Number', + STRING_TYPE =3D 'String', + OBJECT_TYPE =3D 'Object', + FUNCTION_CLASS =3D '[object Function]', + BOOLEAN_CLASS =3D '[object Boolean]', + NUMBER_CLASS =3D '[object Number]', + STRING_CLASS =3D '[object String]', + ARRAY_CLASS =3D '[object Array]', + DATE_CLASS =3D '[object Date]', + NATIVE_JSON_STRINGIFY_SUPPORT =3D window.JSON && + typeof JSON.stringify =3D=3D=3D 'function' && + JSON.stringify(0) =3D=3D=3D '0' && + typeof JSON.stringify(Prototype.K) =3D=3D=3D 'undefined'; =20 + function Type(o) { + switch(o) { + case null: return NULL_TYPE; + case (void 0): return UNDEFINED_TYPE; + } + var type =3D typeof o; + switch(type) { + case 'boolean': return BOOLEAN_TYPE; + case 'number': return NUMBER_TYPE; + case 'string': return STRING_TYPE; + } + return OBJECT_TYPE; + } + function extend(destination, source) { for (var property in source) destination[property] =3D source[property]; @@ -166,29 +187,72 @@ } } =20 - function toJSON(object) { - var type =3D typeof object; - switch (type) { - case 'undefined': - case 'function': - case 'unknown': return; - case 'boolean': return object.toString(); + function toJSON(value) { + return Str('', { '': value }, []); + } + + function Str(key, holder, stack) { + var value =3D holder[key], + type =3D typeof value; + + if (Type(value) =3D=3D=3D OBJECT_TYPE && typeof value.toJSON =3D=3D=3D= 'function') { + value =3D value.toJSON(key); } =20 - if (object =3D=3D=3D null) return 'null'; - if (object.toJSON) return object.toJSON(); - if (isElement(object)) return; + var _class =3D _toString.call(value); =20 - var results =3D []; - for (var property in object) { - var value =3D toJSON(object[property]); - if (!isUndefined(value)) - results.push(property.toJSON() + ': ' + value); + switch (_class) { + case NUMBER_CLASS: + case BOOLEAN_CLASS: + case STRING_CLASS: + value =3D value.valueOf(); } =20 - return '{' + results.join(', ') + '}'; + switch (value) { + case null: return 'null'; + case true: return 'true'; + case false: return 'false'; + } + + type =3D typeof value; + switch (type) { + case 'string': + return value.inspect(true); + case 'number': + return isFinite(value) ? String(value) : 'null'; + case 'object': + + for (var i =3D 0, length =3D stack.length; i < length; i++) { + if (stack[i] =3D=3D=3D value) { throw new TypeError(); } + } + stack.push(value); + + var partial =3D []; + if (_class =3D=3D=3D ARRAY_CLASS) { + for (var i =3D 0, length =3D value.length; i < length; i++) { + var str =3D Str(i, value, stack); + partial.push(typeof str =3D=3D=3D 'undefined' ? 'null' : str= ); + } + partial =3D '[' + partial.join(',') + ']'; + } else { + var keys =3D Object.keys(value); + for (var i =3D 0, length =3D keys.length; i < length; i++) { + var key =3D keys[i], str =3D Str(key, value, stack); + if (typeof str !=3D=3D "undefined") { + partial.push(key.inspect(true)+ ':' + str); + } + } + partial =3D '{' + partial.join(',') + '}'; + } + stack.pop(); + return partial; + } } =20 + function stringify(object) { + return JSON.stringify(object); + } + function toQueryString(object) { return $H(object).toQueryString(); } @@ -198,9 +262,13 @@ } =20 function keys(object) { + if (Type(object) !=3D=3D OBJECT_TYPE) { throw new TypeError(); } var results =3D []; - for (var property in object) - results.push(property); + for (var property in object) { + if (object.hasOwnProperty(property)) { + results.push(property); + } + } return results; } =20 @@ -220,26 +288,36 @@ } =20 function isArray(object) { - return _toString.call(object) =3D=3D "[object Array]"; + return _toString.call(object) =3D=3D=3D ARRAY_CLASS; } =20 + var hasNativeIsArray =3D (typeof Array.isArray =3D=3D 'function') + && Array.isArray([]) && !Array.isArray({}); =20 + if (hasNativeIsArray) { + isArray =3D Array.isArray; + } + function isHash(object) { return object instanceof Hash; } =20 function isFunction(object) { - return typeof object =3D=3D=3D "function"; + return _toString.call(object) =3D=3D=3D FUNCTION_CLASS; } =20 function isString(object) { - return _toString.call(object) =3D=3D "[object String]"; + return _toString.call(object) =3D=3D=3D STRING_CLASS; } =20 function isNumber(object) { - return _toString.call(object) =3D=3D "[object Number]"; + return _toString.call(object) =3D=3D=3D NUMBER_CLASS; } =20 + function isDate(object) { + return _toString.call(object) =3D=3D=3D DATE_CLASS; + } + function isUndefined(object) { return typeof object =3D=3D=3D "undefined"; } @@ -247,10 +325,10 @@ extend(Object, { extend: extend, inspect: inspect, - toJSON: toJSON, + toJSON: NATIVE_JSON_STRINGIFY_SUPPORT ? stringify : toJSON, toQueryString: toQueryString, toHTML: toHTML, - keys: keys, + keys: Object.keys || keys, values: values, clone: clone, isElement: isElement, @@ -259,6 +337,7 @@ isFunction: isFunction, isString: isString, isNumber: isNumber, + isDate: isDate, isUndefined: isUndefined }); })(); @@ -311,7 +390,7 @@ =20 function delay(timeout) { var __method =3D this, args =3D slice.call(arguments, 1); - timeout =3D timeout * 1000 + timeout =3D timeout * 1000; return window.setTimeout(function() { return __method.apply(__method, args); }, timeout); @@ -352,16 +431,30 @@ })()); =20 =20 -Date.prototype.toJSON =3D function() { - return '"' + this.getUTCFullYear() + '-' + - (this.getUTCMonth() + 1).toPaddedString(2) + '-' + - this.getUTCDate().toPaddedString(2) + 'T' + - this.getUTCHours().toPaddedString(2) + ':' + - this.getUTCMinutes().toPaddedString(2) + ':' + - this.getUTCSeconds().toPaddedString(2) + 'Z"'; -}; =20 +(function(proto) { =20 + + function toISOString() { + return this.getUTCFullYear() + '-' + + (this.getUTCMonth() + 1).toPaddedString(2) + '-' + + this.getUTCDate().toPaddedString(2) + 'T' + + this.getUTCHours().toPaddedString(2) + ':' + + this.getUTCMinutes().toPaddedString(2) + ':' + + this.getUTCSeconds().toPaddedString(2) + 'Z'; + } + + + function toJSON() { + return this.toISOString(); + } + + if (!proto.toISOString) proto.toISOString =3D toISOString; + if (!proto.toJSON) proto.toJSON =3D toJSON; + +})(Date.prototype); + + RegExp.prototype.match =3D RegExp.prototype.test; =20 RegExp.escape =3D function(str) { @@ -418,6 +511,9 @@ }); =20 Object.extend(String.prototype, (function() { + var NATIVE_JSON_PARSE_SUPPORT =3D window.JSON && + typeof JSON.parse =3D=3D=3D 'function' && + JSON.parse('{"test": true}').test; =20 function prepareReplacement(replacement) { if (Object.isFunction(replacement)) return replacement; @@ -484,8 +580,8 @@ } =20 function extractScripts() { - var matchAll =3D new RegExp(Prototype.ScriptFragment, 'img'); - var matchOne =3D new RegExp(Prototype.ScriptFragment, 'im'); + var matchAll =3D new RegExp(Prototype.ScriptFragment, 'img'), + matchOne =3D new RegExp(Prototype.ScriptFragment, 'im'); return (this.match(matchAll) || []).map(function(scriptTag) { return (scriptTag.match(matchOne) || ['', ''])[1]; }); @@ -510,8 +606,9 @@ =20 return match[1].split(separator || '&').inject({ }, function(hash, p= air) { if ((pair =3D pair.split('=3D'))[0]) { - var key =3D decodeURIComponent(pair.shift()); - var value =3D pair.length > 1 ? pair.join('=3D') : pair[0]; + var key =3D decodeURIComponent(pair.shift()), + value =3D pair.length > 1 ? pair.join('=3D') : pair[0]; + if (value !=3D undefined) value =3D decodeURIComponent(value); =20 if (key in hash) { @@ -538,17 +635,9 @@ } =20 function camelize() { - var parts =3D this.split('-'), len =3D parts.length; - if (len =3D=3D 1) return parts[0]; - - var camelized =3D this.charAt(0) =3D=3D '-' - ? parts[0].charAt(0).toUpperCase() + parts[0].substring(1) - : parts[0]; - - for (var i =3D 1; i < len; i++) - camelized +=3D parts[i].charAt(0).toUpperCase() + parts[i].substri= ng(1); - - return camelized; + return this.replace(/-+(.)?/g, function(match, chr) { + return chr ? chr.toUpperCase() : ''; + }); } =20 function capitalize() { @@ -578,10 +667,6 @@ return "'" + escapedString.replace(/'/g, '\\\'') + "'"; } =20 - function toJSON() { - return this.inspect(true); - } - function unfilterJSON(filter) { return this.replace(filter || Prototype.JSONFilter, '$1'); } @@ -589,29 +674,42 @@ function isJSON() { var str =3D this; if (str.blank()) return false; - str =3D this.replace(/\\./g, '@').replace(/"[^"\\\n\r]*"/g, ''); - return (/^[,:{}\[\]0-9.\-+Eaeflnr-u \n\r\t]*$/).test(str); + str =3D str.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@'); + str =3D str.replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?= :[eE][+\-]?\d+)?/g, ']'); + str =3D str.replace(/(?:^|:|,)(?:\s*\[)+/g, ''); + return (/^[\],:{}\s]*$/).test(str); } =20 function evalJSON(sanitize) { - var json =3D this.unfilterJSON(); + var json =3D this.unfilterJSON(), + cx =3D /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200= f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g; + if (cx.test(json)) { + json =3D json.replace(cx, function (a) { + return '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4)= ; + }); + } try { if (!sanitize || json.isJSON()) return eval('(' + json + ')'); } catch (e) { } throw new SyntaxError('Badly formed JSON string: ' + this.inspect())= ; } =20 + function parseJSON() { + var json =3D this.unfilterJSON(); + return JSON.parse(json); + } + function include(pattern) { return this.indexOf(pattern) > -1; } =20 function startsWith(pattern) { - return this.indexOf(pattern) =3D=3D=3D 0; + return this.lastIndexOf(pattern, 0) =3D=3D=3D 0; } =20 function endsWith(pattern) { var d =3D this.length - pattern.length; - return d >=3D 0 && this.lastIndexOf(pattern) =3D=3D=3D d; + return d >=3D 0 && this.indexOf(pattern, d) =3D=3D=3D d; } =20 function empty() { @@ -631,7 +729,7 @@ sub: sub, scan: scan, truncate: truncate, - strip: String.prototype.trim ? String.prototype.trim : stri= p, + strip: String.prototype.trim || strip, stripTags: stripTags, stripScripts: stripScripts, extractScripts: extractScripts, @@ -648,10 +746,9 @@ underscore: underscore, dasherize: dasherize, inspect: inspect, - toJSON: toJSON, unfilterJSON: unfilterJSON, isJSON: isJSON, - evalJSON: evalJSON, + evalJSON: NATIVE_JSON_PARSE_SUPPORT ? parseJSON : evalJSON, include: include, startsWith: startsWith, endsWith: endsWith, @@ -677,8 +774,9 @@ var before =3D match[1] || ''; if (before =3D=3D '\\') return match[2]; =20 - var ctx =3D object, expr =3D match[3]; - var pattern =3D /^([^.[]+|\[((?:.*?[^\\])?)\])(\.|\[|$)/; + var ctx =3D object, expr =3D match[3], + pattern =3D /^([^.[]+|\[((?:.*?[^\\])?)\])(\.|\[|$)/; + match =3D pattern.exec(expr); if (match =3D=3D null) return before; =20 @@ -943,6 +1041,7 @@ find: detect }; })(); + function $A(iterable) { if (!iterable) return []; if ('toArray' in Object(iterable)) return iterable.toArray(); @@ -951,6 +1050,7 @@ return results; } =20 + function $w(string) { if (!Object.isString(string)) return []; string =3D string.strip(); @@ -965,9 +1065,10 @@ slice =3D arrayProto.slice, _each =3D arrayProto.forEach; // use native browser JS 1.6 impleme= ntation if available =20 - function each(iterator) { - for (var i =3D 0, length =3D this.length; i < length; i++) - iterator(this[i]); + function each(iterator, context) { + for (var i =3D 0, length =3D this.length >>> 0; i < length; i++) { + if (i in this) iterator.call(context, this[i], i, this); + } } if (!_each) _each =3D each; =20 @@ -1007,7 +1108,7 @@ } =20 function reverse(inline) { - return (inline !=3D=3D false ? this : this.toArray())._reverse(); + return (inline =3D=3D=3D false ? this.toArray() : this)._reverse(); } =20 function uniq(sorted) { @@ -1037,15 +1138,6 @@ return '[' + this.map(Object.inspect).join(', ') + ']'; } =20 - function toJSON() { - var results =3D []; - this.each(function(object) { - var value =3D Object.toJSON(object); - if (!Object.isUndefined(value)) results.push(value); - }); - return '[' + results.join(', ') + ']'; - } - function indexOf(item, i) { i || (i =3D 0); var length =3D this.length; @@ -1094,8 +1186,7 @@ clone: clone, toArray: clone, size: size, - inspect: inspect, - toJSON: toJSON + inspect: inspect }); =20 var CONCAT_ARGUMENTS_BUGGY =3D (function() { @@ -1116,6 +1207,7 @@ this._object =3D Object.isHash(object) ? object.toObject() : Object.= clone(object); } =20 + function _each(iterator) { for (var key in this._object) { var value =3D this._object[key], pair =3D [key, value]; @@ -1144,6 +1236,8 @@ return Object.clone(this._object); } =20 + + function keys() { return this.pluck('key'); } @@ -1180,8 +1274,14 @@ var key =3D encodeURIComponent(pair.key), values =3D pair.value; =20 if (values && typeof values =3D=3D 'object') { - if (Object.isArray(values)) - return results.concat(values.map(toQueryPair.curry(key))); + if (Object.isArray(values)) { + var queryValues =3D []; + for (var i =3D 0, len =3D values.length, value; i < len; i++) = { + value =3D values[i]; + queryValues.push(toQueryPair(key, value)); + } + return results.concat(queryValues); + } } else results.push(toQueryPair(key, values)); return results; }).join('&'); @@ -1193,10 +1293,6 @@ }).join(', ') + '}>'; } =20 - function toJSON() { - return Object.toJSON(this.toObject()); - } - function clone() { return new Hash(this); } @@ -1216,7 +1312,7 @@ update: update, toQueryString: toQueryString, inspect: inspect, - toJSON: toJSON, + toJSON: toObject, clone: clone }; })()); @@ -1241,10 +1337,6 @@ return '0'.times(length - string.length) + string; } =20 - function toJSON() { - return isFinite(this) ? this.toString() : 'null'; - } - function abs() { return Math.abs(this); } @@ -1266,7 +1358,6 @@ succ: succ, times: times, toPaddedString: toPaddedString, - toJSON: toJSON, abs: abs, round: round, ceil: ceil, @@ -1310,6 +1401,25 @@ =20 =20 =20 +var Abstract =3D { }; + + +var Try =3D { + these: function() { + var returnValue; + + for (var i =3D 0, length =3D arguments.length; i < length; i++) { + var lambda =3D arguments[i]; + try { + returnValue =3D lambda(); + break; + } catch (e) { } + } + + return returnValue; + } +}; + var Ajax =3D { getTransport: function() { return Try.these( @@ -1370,9 +1480,7 @@ =20 this.options.method =3D this.options.method.toLowerCase(); =20 - if (Object.isString(this.options.parameters)) - this.options.parameters =3D this.options.parameters.toQueryParams(= ); - else if (Object.isHash(this.options.parameters)) + if (Object.isHash(this.options.parameters)) this.options.parameters =3D this.options.parameters.toObject(); } }); @@ -1388,22 +1496,21 @@ request: function(url) { this.url =3D url; this.method =3D this.options.method; - var params =3D Object.clone(this.options.parameters); + var params =3D Object.isString(this.options.parameters) ? + this.options.parameters : + Object.toQueryString(this.options.parameters); =20 if (!['get', 'post'].include(this.method)) { - params['_method'] =3D this.method; + params +=3D (params ? '&' : '') + "_method=3D" + this.method; this.method =3D 'post'; } =20 - this.parameters =3D params; - - if (params =3D Object.toQueryString(params)) { - if (this.method =3D=3D 'get') - this.url +=3D (this.url.include('?') ? '&' : '?') + params; - else if (/Konqueror|Safari|KHTML/.test(navigator.userAgent)) - params +=3D '&_=3D'; + if (params && this.method =3D=3D=3D 'get') { + this.url +=3D (this.url.include('?') ? '&' : '?') + params; } =20 + this.parameters =3D params.toQueryParams(); + try { var response =3D new Ajax.Response(this); if (this.options.onCreate) this.options.onCreate(response); @@ -1472,11 +1579,12 @@ =20 success: function() { var status =3D this.getStatus(); - return !status || (status >=3D 200 && status < 300); + return !status || (status >=3D 200 && status < 300) || status =3D=3D= 304; }, =20 getStatus: function() { try { + if (this.transport.status =3D=3D=3D 1223) return 204; return this.transport.status || 0; } catch (e) { return 0 } }, @@ -1558,14 +1666,14 @@ var transport =3D this.transport =3D request.transport, readyState =3D this.readyState =3D transport.readyState; =20 - if((readyState > 2 && !Prototype.Browser.IE) || readyState =3D=3D 4)= { + if ((readyState > 2 && !Prototype.Browser.IE) || readyState =3D=3D 4= ) { this.status =3D this.getStatus(); this.statusText =3D this.getStatusText(); this.responseText =3D String.interpret(transport.responseText); this.headerJSON =3D this._getHeaderJSON(); } =20 - if(readyState =3D=3D 4) { + if (readyState =3D=3D 4) { var xml =3D transport.responseXML; this.responseXML =3D Object.isUndefined(xml) ? null : xml; this.responseJSON =3D this._getResponseJSON(); @@ -1705,7 +1813,6 @@ }); =20 =20 - function $(element) { if (arguments.length > 1) { for (var i =3D 0, elements =3D [], length =3D arguments.length; i < = length; i++) @@ -1730,7 +1837,7 @@ =20 /*----------------------------------------------------------------------= ----*/ =20 -if (!window.Node) var Node =3D { }; +if (!Node) var Node =3D { }; =20 if (!Node.ELEMENT_NODE) { Object.extend(Node, { @@ -1750,43 +1857,62 @@ } =20 =20 + (function(global) { + function shouldUseCache(tagName, attributes) { + if (tagName =3D=3D=3D 'select') return false; + if ('type' in attributes) return false; + return true; + } =20 - var SETATTRIBUTE_IGNORES_NAME =3D (function(){ - var elForm =3D document.createElement("form"); - var elInput =3D document.createElement("input"); - var root =3D document.documentElement; - elInput.setAttribute("name", "test"); - elForm.appendChild(elInput); - root.appendChild(elForm); - var isBuggy =3D elForm.elements - ? (typeof elForm.elements.test =3D=3D "undefined") - : null; - root.removeChild(elForm); - elForm =3D elInput =3D null; - return isBuggy; + var HAS_EXTENDED_CREATE_ELEMENT_SYNTAX =3D (function(){ + try { + var el =3D document.createElement(''); + return el.tagName.toLowerCase() =3D=3D=3D 'input' && el.name =3D=3D= =3D 'x'; + } + catch(err) { + return false; + } })(); =20 var element =3D global.Element; + global.Element =3D function(tagName, attributes) { attributes =3D attributes || { }; tagName =3D tagName.toLowerCase(); var cache =3D Element.cache; - if (SETATTRIBUTE_IGNORES_NAME && attributes.name) { + + if (HAS_EXTENDED_CREATE_ELEMENT_SYNTAX && attributes.name) { tagName =3D '<' + tagName + ' name=3D"' + attributes.name + '">'; delete attributes.name; return Element.writeAttribute(document.createElement(tagName), att= ributes); } + if (!cache[tagName]) cache[tagName] =3D Element.extend(document.crea= teElement(tagName)); - return Element.writeAttribute(cache[tagName].cloneNode(false), attri= butes); + + var node =3D shouldUseCache(tagName, attributes) ? + cache[tagName].cloneNode(false) : document.createElement(tagName); + + return Element.writeAttribute(node, attributes); }; + Object.extend(global.Element, element || { }); if (element) global.Element.prototype =3D element.prototype; + })(this); =20 +Element.idCounter =3D 1; Element.cache =3D { }; -Element.idCounter =3D 1; =20 +Element._purgeElement =3D function(element) { + var uid =3D element._prototypeUID; + if (uid) { + Element.stopObserving(element); + element._prototypeUID =3D void 0; + delete Element.Storage[uid]; + } +} + Element.Methods =3D { visible: function(element) { return $(element).style.display !=3D 'none'; @@ -1798,7 +1924,6 @@ return element; }, =20 - hide: function(element) { element =3D $(element); element.style.display =3D 'none'; @@ -1844,6 +1969,21 @@ } })(); =20 + var LINK_ELEMENT_INNERHTML_BUGGY =3D (function() { + try { + var el =3D document.createElement('div'); + el.innerHTML =3D ""; + var isBuggy =3D (el.childNodes.length =3D=3D=3D 0); + el =3D null; + return isBuggy; + } catch(e) { + return true; + } + })(); + + var ANY_INNERHTML_BUGGY =3D SELECT_ELEMENT_INNERHTML_BUGGY || + TABLE_ELEMENT_INNERHTML_BUGGY || LINK_ELEMENT_INNERHTML_BUGGY; + var SCRIPT_ELEMENT_REJECTS_TEXTNODE_APPENDING =3D (function () { var s =3D document.createElement("script"), isBuggy =3D false; @@ -1858,9 +1998,15 @@ return isBuggy; })(); =20 + function update(element, content) { element =3D $(element); + var purgeElement =3D Element._purgeElement; =20 + var descendants =3D element.getElementsByTagName('*'), + i =3D descendants.length; + while (i--) purgeElement(descendants[i]); + if (content && content.toElement) content =3D content.toElement(); =20 @@ -1876,7 +2022,7 @@ return element; } =20 - if (SELECT_ELEMENT_INNERHTML_BUGGY || TABLE_ELEMENT_INNERHTML_BUGG= Y) { + if (ANY_INNERHTML_BUGGY) { if (tagName in Element._insertionTranslations.tags) { while (element.firstChild) { element.removeChild(element.firstChild); @@ -1885,6 +2031,12 @@ .each(function(node) { element.appendChild(node) }); + } else if (LINK_ELEMENT_INNERHTML_BUGGY && Object.isString(conte= nt) && content.indexOf(' -1) { + while (element.firstChild) { + element.removeChild(element.firstChild); + } + var nodes =3D Element._getContentFromAnonymousElement(tagName,= content.stripScripts(), true); + nodes.each(function(node) { element.appendChild(node) }); } else { element.innerHTML =3D content.stripScripts(); @@ -1967,19 +2119,26 @@ element =3D $(element); var result =3D '<' + element.tagName.toLowerCase(); $H({'id': 'id', 'className': 'class'}).each(function(pair) { - var property =3D pair.first(), attribute =3D pair.last(); - var value =3D (element[property] || '').toString(); + var property =3D pair.first(), + attribute =3D pair.last(), + value =3D (element[property] || '').toString(); if (value) result +=3D ' ' + attribute + '=3D' + value.inspect(tru= e); }); return result + '>'; }, =20 - recursivelyCollect: function(element, property) { + recursivelyCollect: function(element, property, maximumLength) { element =3D $(element); + maximumLength =3D maximumLength || -1; var elements =3D []; - while (element =3D element[property]) + + while (element =3D element[property]) { if (element.nodeType =3D=3D 1) elements.push(Element.extend(element)); + if (elements.length =3D=3D maximumLength) + break; + } + return elements; }, =20 @@ -1998,13 +2157,17 @@ }, =20 immediateDescendants: function(element) { - if (!(element =3D $(element).firstChild)) return []; - while (element && element.nodeType !=3D 1) element =3D element.nextS= ibling; - if (element) return [element].concat($(element).nextSiblings()); - return []; + var results =3D [], child =3D $(element).firstChild; + while (child) { + if (child.nodeType =3D=3D=3D 1) { + results.push(Element.extend(child)); + } + child =3D child.nextSibling; + } + return results; }, =20 - previousSiblings: function(element) { + previousSiblings: function(element, maximumLength) { return Element.recursivelyCollect(element, 'previousSibling'); }, =20 @@ -2019,9 +2182,10 @@ }, =20 match: function(element, selector) { + element =3D $(element); if (Object.isString(selector)) - selector =3D new Selector(selector); - return selector.match($(element)); + return Prototype.Selector.match(element, selector); + return selector.match(element); }, =20 up: function(element, expression, index) { @@ -2029,7 +2193,7 @@ if (arguments.length =3D=3D 1) return $(element.parentNode); var ancestors =3D Element.ancestors(element); return Object.isNumber(expression) ? ancestors[expression] : - Selector.findElement(ancestors, expression, index); + Prototype.Selector.find(ancestors, expression, index); }, =20 down: function(element, expression, index) { @@ -2041,29 +2205,40 @@ =20 previous: function(element, expression, index) { element =3D $(element); - if (arguments.length =3D=3D 1) return $(Selector.handlers.previousEl= ementSibling(element)); - var previousSiblings =3D Element.previousSiblings(element); - return Object.isNumber(expression) ? previousSiblings[expression] : - Selector.findElement(previousSiblings, expression, index); + if (Object.isNumber(expression)) index =3D expression, expression =3D= false; + if (!Object.isNumber(index)) index =3D 0; + + if (expression) { + return Prototype.Selector.find(element.previousSiblings(), express= ion, index); + } else { + return element.recursivelyCollect("previousSibling", index + 1)[in= dex]; + } }, =20 next: function(element, expression, index) { element =3D $(element); - if (arguments.length =3D=3D 1) return $(Selector.handlers.nextElemen= tSibling(element)); - var nextSiblings =3D Element.nextSiblings(element); - return Object.isNumber(expression) ? nextSiblings[expression] : - Selector.findElement(nextSiblings, expression, index); + if (Object.isNumber(expression)) index =3D expression, expression =3D= false; + if (!Object.isNumber(index)) index =3D 0; + + if (expression) { + return Prototype.Selector.find(element.nextSiblings(), expression,= index); + } else { + var maximumLength =3D Object.isNumber(index) ? index + 1 : 1; + return element.recursivelyCollect("nextSibling", index + 1)[index]= ; + } }, =20 =20 select: function(element) { - var args =3D Array.prototype.slice.call(arguments, 1); - return Selector.findChildElements(element, args); + element =3D $(element); + var expressions =3D Array.prototype.slice.call(arguments, 1).join(',= '); + return Prototype.Selector.select(expressions, element); }, =20 adjacent: function(element) { - var args =3D Array.prototype.slice.call(arguments, 1); - return Selector.findChildElements(element.parentNode, args).without(= element); + element =3D $(element); + var expressions =3D Array.prototype.slice.call(arguments, 1).join(',= '); + return Prototype.Selector.select(expressions, element.parentNode).wi= thout(element); }, =20 identify: function(element) { @@ -2227,28 +2402,6 @@ return element; }, =20 - getDimensions: function(element) { - element =3D $(element); - var display =3D Element.getStyle(element, 'display'); - if (display !=3D 'none' && display !=3D null) // Safari bug - return {width: element.offsetWidth, height: element.offsetHeight}; - - var els =3D element.style; - var originalVisibility =3D els.visibility; - var originalPosition =3D els.position; - var originalDisplay =3D els.display; - els.visibility =3D 'hidden'; - if (originalPosition !=3D 'fixed') // Switching fixed to absolute ca= uses issues in Safari - els.position =3D 'absolute'; - els.display =3D 'block'; - var originalWidth =3D element.clientWidth; - var originalHeight =3D element.clientHeight; - els.display =3D originalDisplay; - els.position =3D originalPosition; - els.visibility =3D originalVisibility; - return {width: originalWidth, height: originalHeight}; - }, - makePositioned: function(element) { element =3D $(element); var pos =3D Element.getStyle(element, 'position'); @@ -2293,114 +2446,6 @@ return element; }, =20 - cumulativeOffset: function(element) { - var valueT =3D 0, valueL =3D 0; - do { - valueT +=3D element.offsetTop || 0; - valueL +=3D element.offsetLeft || 0; - element =3D element.offsetParent; - } while (element); - return Element._returnOffset(valueL, valueT); - }, - - positionedOffset: function(element) { - var valueT =3D 0, valueL =3D 0; - do { - valueT +=3D element.offsetTop || 0; - valueL +=3D element.offsetLeft || 0; - element =3D element.offsetParent; - if (element) { - if (element.tagName.toUpperCase() =3D=3D 'BODY') break; - var p =3D Element.getStyle(element, 'position'); - if (p !=3D=3D 'static') break; - } - } while (element); - return Element._returnOffset(valueL, valueT); - }, - - absolutize: function(element) { - element =3D $(element); - if (Element.getStyle(element, 'position') =3D=3D 'absolute') return = element; - - var offsets =3D Element.positionedOffset(element); - var top =3D offsets[1]; - var left =3D offsets[0]; - var width =3D element.clientWidth; - var height =3D element.clientHeight; - - element._originalLeft =3D left - parseFloat(element.style.left ||= 0); - element._originalTop =3D top - parseFloat(element.style.top || 0= ); - element._originalWidth =3D element.style.width; - element._originalHeight =3D element.style.height; - - element.style.position =3D 'absolute'; - element.style.top =3D top + 'px'; - element.style.left =3D left + 'px'; - element.style.width =3D width + 'px'; - element.style.height =3D height + 'px'; - return element; - }, - - relativize: function(element) { - element =3D $(element); - if (Element.getStyle(element, 'position') =3D=3D 'relative') return = element; - - element.style.position =3D 'relative'; - var top =3D parseFloat(element.style.top || 0) - (element._origina= lTop || 0); - var left =3D parseFloat(element.style.left || 0) - (element._origina= lLeft || 0); - - element.style.top =3D top + 'px'; - element.style.left =3D left + 'px'; - element.style.height =3D element._originalHeight; - element.style.width =3D element._originalWidth; - return element; - }, - - cumulativeScrollOffset: function(element) { - var valueT =3D 0, valueL =3D 0; - do { - valueT +=3D element.scrollTop || 0; - valueL +=3D element.scrollLeft || 0; - element =3D element.parentNode; - } while (element); - return Element._returnOffset(valueL, valueT); - }, - - getOffsetParent: function(element) { - if (element.offsetParent) return $(element.offsetParent); - if (element =3D=3D document.body) return $(element); - - while ((element =3D element.parentNode) && element !=3D document.bod= y) - if (Element.getStyle(element, 'position') !=3D 'static') - return $(element); - - return $(document.body); - }, - - viewportOffset: function(forElement) { - var valueT =3D 0, valueL =3D 0; - - var element =3D forElement; - do { - valueT +=3D element.offsetTop || 0; - valueL +=3D element.offsetLeft || 0; - - if (element.offsetParent =3D=3D document.body && - Element.getStyle(element, 'position') =3D=3D 'absolute') break; - - } while (element =3D element.offsetParent); - - element =3D forElement; - do { - if (!Prototype.Browser.Opera || (element.tagName && (element.tagNa= me.toUpperCase() =3D=3D 'BODY'))) { - valueT -=3D element.scrollTop || 0; - valueL -=3D element.scrollLeft || 0; - } - } while (element =3D element.parentNode); - - return Element._returnOffset(valueL, valueT); - }, - clonePosition: function(element, source) { var options =3D Object.extend({ setLeft: true, @@ -2412,11 +2457,10 @@ }, arguments[2] || { }); =20 source =3D $(source); - var p =3D Element.viewportOffset(source); + var p =3D Element.viewportOffset(source), delta =3D [0, 0], parent =3D= null; =20 element =3D $(element); - var delta =3D [0, 0]; - var parent =3D null; + if (Element.getStyle(element, 'position') =3D=3D 'absolute') { parent =3D Element.getOffsetParent(element); delta =3D Element.viewportOffset(parent); @@ -2455,8 +2499,6 @@ Element.Methods.getStyle =3D Element.Methods.getStyle.wrap( function(proceed, element, style) { switch (style) { - case 'left': case 'top': case 'right': case 'bottom': - if (proceed(element, 'position') =3D=3D=3D 'static') return nu= ll; case 'height': case 'width': if (!Element.visible(element)) return null; =20 @@ -2492,47 +2534,6 @@ } =20 else if (Prototype.Browser.IE) { - Element.Methods.getOffsetParent =3D Element.Methods.getOffsetParent.wr= ap( - function(proceed, element) { - element =3D $(element); - try { element.offsetParent } - catch(e) { return $(document.body) } - var position =3D element.getStyle('position'); - if (position !=3D=3D 'static') return proceed(element); - element.setStyle({ position: 'relative' }); - var value =3D proceed(element); - element.setStyle({ position: position }); - return value; - } - ); - - $w('positionedOffset viewportOffset').each(function(method) { - Element.Methods[method] =3D Element.Methods[method].wrap( - function(proceed, element) { - element =3D $(element); - try { element.offsetParent } - catch(e) { return Element._returnOffset(0,0) } - var position =3D element.getStyle('position'); - if (position !=3D=3D 'static') return proceed(element); - var offsetParent =3D element.getOffsetParent(); - if (offsetParent && offsetParent.getStyle('position') =3D=3D=3D = 'fixed') - offsetParent.setStyle({ zoom: 1 }); - element.setStyle({ position: 'relative' }); - var value =3D proceed(element); - element.setStyle({ position: position }); - return value; - } - ); - }); - - Element.Methods.cumulativeOffset =3D Element.Methods.cumulativeOffset.= wrap( - function(proceed, element) { - try { element.offsetParent } - catch(e) { return Element._returnOffset(0,0) } - return proceed(element); - } - ); - Element.Methods.getStyle =3D function(element, style) { element =3D $(element); style =3D (style =3D=3D 'float' || style =3D=3D 'cssFloat') ? 'style= Float' : style.camelize(); @@ -2576,11 +2577,10 @@ =20 Element._attributeTranslations =3D (function(){ =20 - var classProp =3D 'className'; - var forProp =3D 'for'; + var classProp =3D 'className', + forProp =3D 'for', + el =3D document.createElement('div'); =20 - var el =3D document.createElement('div'); - el.setAttribute(classProp, 'x'); =20 if (el.className !=3D=3D 'x') { @@ -2622,10 +2622,9 @@ }, _getEv: (function(){ =20 - var el =3D document.createElement('div'); + var el =3D document.createElement('div'), f; el.onclick =3D Prototype.emptyFunction; var value =3D el.getAttribute('onclick'); - var f; =20 if (String(value).indexOf('{') > -1) { f =3D function(element, attribute) { @@ -2753,7 +2752,7 @@ (value < 0.00001) ? 0 : value; =20 if (value =3D=3D 1) - if(element.tagName.toUpperCase() =3D=3D 'IMG' && element.width) { + if (element.tagName.toUpperCase() =3D=3D 'IMG' && element.width) { element.width++; element.width--; } else try { var n =3D document.createTextNode(' '); @@ -2763,20 +2762,6 @@ =20 return element; }; - - Element.Methods.cumulativeOffset =3D function(element) { - var valueT =3D 0, valueL =3D 0; - do { - valueT +=3D element.offsetTop || 0; - valueL +=3D element.offsetLeft || 0; - if (element.offsetParent =3D=3D document.body) - if (Element.getStyle(element, 'position') =3D=3D 'absolute') bre= ak; - - element =3D element.offsetParent; - } while (element); - - return Element._returnOffset(valueL, valueT); - }; } =20 if ('outerHTML' in document.documentElement) { @@ -2793,8 +2778,8 @@ var parent =3D element.parentNode, tagName =3D parent.tagName.toUppe= rCase(); =20 if (Element._insertionTranslations.tags[tagName]) { - var nextSibling =3D element.next(); - var fragments =3D Element._getContentFromAnonymousElement(tagName,= content.stripScripts()); + var nextSibling =3D element.next(), + fragments =3D Element._getContentFromAnonymousElement(tagName,= content.stripScripts()); parent.removeChild(element); if (nextSibling) fragments.each(function(node) { parent.insertBefore(node, nextSi= bling) }); @@ -2815,12 +2800,27 @@ return result; }; =20 -Element._getContentFromAnonymousElement =3D function(tagName, html) { - var div =3D new Element('div'), t =3D Element._insertionTranslations.t= ags[tagName]; - if (t) { - div.innerHTML =3D t[0] + html + t[1]; - t[2].times(function() { div =3D div.firstChild }); - } else div.innerHTML =3D html; +Element._getContentFromAnonymousElement =3D function(tagName, html, forc= e) { + var div =3D new Element('div'), + t =3D Element._insertionTranslations.tags[tagName]; + + var workaround =3D false; + if (t) workaround =3D true; + else if (force) { + workaround =3D true; + t =3D ['', '', 0]; + } + + if (workaround) { + div.innerHTML =3D ' ' + t[0] + html + t[1]; + div.removeChild(div.firstChild); + for (var i =3D t[2]; i--; ) { + div =3D div.firstChild; + } + } + else { + div.innerHTML =3D html; + } return $A(div.childNodes); }; =20 @@ -2877,7 +2877,7 @@ =20 div =3D null; =20 -})(document.createElement('div')) +})(document.createElement('div')); =20 Element.extend =3D (function() { =20 @@ -2885,8 +2885,8 @@ if (typeof window.Element !=3D 'undefined') { var proto =3D window.Element.prototype; if (proto) { - var id =3D '_' + (Math.random()+'').slice(2); - var el =3D document.createElement(tagName); + var id =3D '_' + (Math.random()+'').slice(2), + el =3D document.createElement(tagName); proto[id] =3D 'x'; var isBuggy =3D (el[id] !=3D=3D 'x'); delete proto[id]; @@ -2953,10 +2953,14 @@ return extend; })(); =20 -Element.hasAttribute =3D function(element, attribute) { - if (element.hasAttribute) return element.hasAttribute(attribute); - return Element.Methods.Simulated.hasAttribute(element, attribute); -}; +if (document.documentElement.hasAttribute) { + Element.hasAttribute =3D function(element, attribute) { + return element.hasAttribute(attribute); + }; +} +else { + Element.hasAttribute =3D Element.Methods.Simulated.hasAttribute; +} =20 Element.addMethods =3D function(methods) { var F =3D Prototype.BrowserFeatures, T =3D Element.Methods.ByTag; @@ -2968,7 +2972,8 @@ "FORM": Object.clone(Form.Methods), "INPUT": Object.clone(Form.Element.Methods), "SELECT": Object.clone(Form.Element.Methods), - "TEXTAREA": Object.clone(Form.Element.Methods) + "TEXTAREA": Object.clone(Form.Element.Methods), + "BUTTON": Object.clone(Form.Element.Methods) }); } =20 @@ -3020,8 +3025,9 @@ klass =3D 'HTML' + tagName.capitalize() + 'Element'; if (window[klass]) return window[klass]; =20 - var element =3D document.createElement(tagName); - var proto =3D element['__proto__'] || element.constructor.prototype; + var element =3D document.createElement(tagName), + proto =3D element['__proto__'] || element.constructor.prototype; + element =3D null; return proto; } @@ -3104,8 +3110,8 @@ uid =3D 0; } else { if (typeof element._prototypeUID =3D=3D=3D "undefined") - element._prototypeUID =3D [Element.Storage.UID++]; - uid =3D element._prototypeUID[0]; + element._prototypeUID =3D Element.Storage.UID++; + uid =3D element._prototypeUID; } =20 if (!Element.Storage[uid]) @@ -3150,770 +3156,1809 @@ } } return Element.extend(clone); - } -}); -/* Portions of the Selector class are derived from Jack Slocum's DomQuer= y, - * part of YUI-Ext version 0.40, distributed under the terms of an MIT-s= tyle - * license. Please see http://www.yui-ext.com/ for more information. */ + }, =20 -var Selector =3D Class.create({ - initialize: function(expression) { - this.expression =3D expression.strip(); + purge: function(element) { + if (!(element =3D $(element))) return; + var purgeElement =3D Element._purgeElement; =20 - if (this.shouldUseSelectorsAPI()) { - this.mode =3D 'selectorsAPI'; - } else if (this.shouldUseXPath()) { - this.mode =3D 'xpath'; - this.compileXPathMatcher(); - } else { - this.mode =3D "normal"; - this.compileMatcher(); - } + purgeElement(element); =20 - }, + var descendants =3D element.getElementsByTagName('*'), + i =3D descendants.length; =20 - shouldUseXPath: (function() { + while (i--) purgeElement(descendants[i]); =20 - var IS_DESCENDANT_SELECTOR_BUGGY =3D (function(){ - var isBuggy =3D false; - if (document.evaluate && window.XPathResult) { - var el =3D document.createElement('div'); - el.innerHTML =3D '
'; + return null; + } +}); =20 - var xpath =3D ".//*[local-name()=3D'ul' or local-name()=3D'UL']"= + - "//*[local-name()=3D'li' or local-name()=3D'LI']"; +(function() { =20 - var result =3D document.evaluate(xpath, el, null, - XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null); + function toDecimal(pctString) { + var match =3D pctString.match(/^(\d+)%?$/i); + if (!match) return null; + return (Number(match[1]) / 100); + } =20 - isBuggy =3D (result.snapshotLength !=3D=3D 2); - el =3D null; - } - return isBuggy; - })(); + function getPixelValue(value, property, context) { + var element =3D null; + if (Object.isElement(value)) { + element =3D value; + value =3D element.getStyle(property); + } =20 - return function() { - if (!Prototype.BrowserFeatures.XPath) return false; + if (value =3D=3D=3D null) { + return null; + } =20 - var e =3D this.expression; + if ((/^(?:-)?\d+(\.\d+)?(px)?$/i).test(value)) { + return window.parseFloat(value); + } =20 - if (Prototype.Browser.WebKit && - (e.include("-of-type") || e.include(":empty"))) - return false; + var isPercentage =3D value.include('%'), isViewport =3D (context =3D= =3D=3D document.viewport); =20 - if ((/(\[[\w-]*?:|:checked)/).test(e)) - return false; + if (/\d/.test(value) && element && element.runtimeStyle && !(isPerce= ntage && isViewport)) { + var style =3D element.style.left, rStyle =3D element.runtimeStyle.= left; + element.runtimeStyle.left =3D element.currentStyle.left; + element.style.left =3D value || 0; + value =3D element.style.pixelLeft; + element.style.left =3D style; + element.runtimeStyle.left =3D rStyle; =20 - if (IS_DESCENDANT_SELECTOR_BUGGY) return false; - - return true; + return value; } =20 - })(), + if (element && isPercentage) { + context =3D context || element.parentNode; + var decimal =3D toDecimal(value); + var whole =3D null; + var position =3D element.getStyle('position'); =20 - shouldUseSelectorsAPI: function() { - if (!Prototype.BrowserFeatures.SelectorsAPI) return false; + var isHorizontal =3D property.include('left') || property.include(= 'right') || + property.include('width'); =20 - if (Selector.CASE_INSENSITIVE_CLASS_NAMES) return false; + var isVertical =3D property.include('top') || property.include('b= ottom') || + property.include('height'); =20 - if (!Selector._div) Selector._div =3D new Element('div'); + if (context =3D=3D=3D document.viewport) { + if (isHorizontal) { + whole =3D document.viewport.getWidth(); + } else if (isVertical) { + whole =3D document.viewport.getHeight(); + } + } else { + if (isHorizontal) { + whole =3D $(context).measure('width'); + } else if (isVertical) { + whole =3D $(context).measure('height'); + } + } =20 - try { - Selector._div.querySelector(this.expression); - } catch(e) { - return false; + return (whole =3D=3D=3D null) ? 0 : whole * decimal; } =20 - return true; - }, + return 0; + } =20 - compileMatcher: function() { - var e =3D this.expression, ps =3D Selector.patterns, h =3D Selector.= handlers, - c =3D Selector.criteria, le, p, m, len =3D ps.length, name; - - if (Selector._cache[e]) { - this.matcher =3D Selector._cache[e]; - return; + function toCSSPixels(number) { + if (Object.isString(number) && number.endsWith('px')) { + return number; } + return number + 'px'; + } =20 - this.matcher =3D ["this.matcher =3D function(root) {", - "var r =3D root, h =3D Selector.handlers, c =3D fals= e, n;"]; - - while (e && le !=3D e && (/\S/).test(e)) { - le =3D e; - for (var i =3D 0; i"; - } -}); + var positionedWidth =3D element.getStyle('width'); =20 -if (Prototype.BrowserFeatures.SelectorsAPI && - document.compatMode =3D=3D=3D 'BackCompat') { - Selector.CASE_INSENSITIVE_CLASS_NAMES =3D (function(){ - var div =3D document.createElement('div'), - span =3D document.createElement('span'); + var newWidth; + if (width && (positionedWidth =3D=3D=3D width)) { + newWidth =3D getPixelValue(element, 'width', context); + } else if (position =3D=3D=3D 'absolute' || position =3D=3D=3D 'fi= xed') { + newWidth =3D getPixelValue(element, 'width', context); + } else { + var parent =3D element.parentNode, pLayout =3D $(parent).getLayo= ut(); =20 - div.id =3D "prototype_test_id"; - span.className =3D 'Test'; - div.appendChild(span); - var isIgnored =3D (div.querySelector('#prototype_test_id .test') !=3D= =3D null); - div =3D span =3D null; - return isIgnored; - })(); -} + newWidth =3D pLayout.get('width') - + this.get('margin-left') - + this.get('border-left') - + this.get('padding-left') - + this.get('padding-right') - + this.get('border-right') - + this.get('margin-right'); + } =20 -Object.extend(Selector, { - _cache: { }, + element.setStyle({ width: newWidth + 'px' }); =20 - xpath: { - descendant: "//*", - child: "/*", - adjacent: "/following-sibling::*[1]", - laterSibling: '/following-sibling::*', - tagName: function(m) { - if (m[1] =3D=3D '*') return ''; - return "[local-name()=3D'" + m[1].toLowerCase() + - "' or local-name()=3D'" + m[1].toUpperCase() + "']"; + this._prepared =3D true; }, - className: "[contains(concat(' ', @class, ' '), ' #{1} ')]", - id: "[@id=3D'#{1}']", - attrPresence: function(m) { - m[1] =3D m[1].toLowerCase(); - return new Template("[@#{1}]").evaluate(m); + + _end: function() { + var element =3D this.element; + var originalStyles =3D element.retrieve('prototype_original_styles= '); + element.store('prototype_original_styles', null); + element.setStyle(originalStyles); + this._prepared =3D false; }, - attr: function(m) { - m[1] =3D m[1].toLowerCase(); - m[3] =3D m[5] || m[6]; - return new Template(Selector.xpath.operators[m[2]]).evaluate(m); + + _compute: function(property) { + var COMPUTATIONS =3D Element.Layout.COMPUTATIONS; + if (!(property in COMPUTATIONS)) { + throw "Property not found."; + } + + return this._set(property, COMPUTATIONS[property].call(this, this.= element)); }, - pseudo: function(m) { - var h =3D Selector.xpath.pseudos[m[1]]; - if (!h) return ''; - if (Object.isFunction(h)) return h(m); - return new Template(Selector.xpath.pseudos[m[1]]).evaluate(m); + + toObject: function() { + var args =3D $A(arguments); + var keys =3D (args.length =3D=3D=3D 0) ? Element.Layout.PROPERTIES= : + args.join(' ').split(' '); + var obj =3D {}; + keys.each( function(key) { + if (!Element.Layout.PROPERTIES.include(key)) return; + var value =3D this.get(key); + if (value !=3D null) obj[key] =3D value; + }, this); + return obj; }, - operators: { - '=3D': "[@#{1}=3D'#{3}']", - '!=3D': "[@#{1}!=3D'#{3}']", - '^=3D': "[starts-with(@#{1}, '#{3}')]", - '$=3D': "[substring(@#{1}, (string-length(@#{1}) - string-length('= #{3}') + 1))=3D'#{3}']", - '*=3D': "[contains(@#{1}, '#{3}')]", - '~=3D': "[contains(concat(' ', @#{1}, ' '), ' #{3} ')]", - '|=3D': "[contains(concat('-', @#{1}, '-'), '-#{3}-')]" + + toHash: function() { + var obj =3D this.toObject.apply(this, arguments); + return new Hash(obj); }, - pseudos: { - 'first-child': '[not(preceding-sibling::*)]', - 'last-child': '[not(following-sibling::*)]', - 'only-child': '[not(preceding-sibling::* or following-sibling::*)= ]', - 'empty': "[count(*) =3D 0 and (count(text()) =3D 0)]", - 'checked': "[@checked]", - 'disabled': "[(@disabled) and (@type!=3D'hidden')]", - 'enabled': "[not(@disabled) and (@type!=3D'hidden')]", - 'not': function(m) { - var e =3D m[6], p =3D Selector.patterns, - x =3D Selector.xpath, le, v, len =3D p.length, name; =20 - var exclusion =3D []; - while (e && le !=3D e && (/\S/).test(e)) { - le =3D e; - for (var i =3D 0; i"; + } + }); + + Object.extend(Element.Layout, { + PROPERTIES: $w('height width top left right bottom border-left borde= r-right border-top border-bottom padding-left padding-right padding-top p= adding-bottom margin-top margin-bottom margin-left margin-right padding-b= ox-width padding-box-height border-box-width border-box-height margin-box= -width margin-box-height'), + + COMPOSITE_PROPERTIES: $w('padding-box-width padding-box-height margi= n-box-width margin-box-height border-box-width border-box-height'), + + COMPUTATIONS: { + 'height': function(element) { + if (!this._preComputing) this._begin(); + + var bHeight =3D this.get('border-box-height'); + if (bHeight <=3D 0) { + if (!this._preComputing) this._end(); + return 0; } - return "[not(" + exclusion.join(" and ") + ")]"; + + var bTop =3D this.get('border-top'), + bBottom =3D this.get('border-bottom'); + + var pTop =3D this.get('padding-top'), + pBottom =3D this.get('padding-bottom'); + + if (!this._preComputing) this._end(); + + return bHeight - bTop - bBottom - pTop - pBottom; }, - 'nth-child': function(m) { - return Selector.xpath.pseudos.nth("(count(./preceding-sibling::*= ) + 1) ", m); + + 'width': function(element) { + if (!this._preComputing) this._begin(); + + var bWidth =3D this.get('border-box-width'); + if (bWidth <=3D 0) { + if (!this._preComputing) this._end(); + return 0; + } + + var bLeft =3D this.get('border-left'), + bRight =3D this.get('border-right'); + + var pLeft =3D this.get('padding-left'), + pRight =3D this.get('padding-right'); + + if (!this._preComputing) this._end(); + + return bWidth - bLeft - bRight - pLeft - pRight; }, - 'nth-last-child': function(m) { - return Selector.xpath.pseudos.nth("(count(./following-sibling::*= ) + 1) ", m); + + 'padding-box-height': function(element) { + var height =3D this.get('height'), + pTop =3D this.get('padding-top'), + pBottom =3D this.get('padding-bottom'); + + return height + pTop + pBottom; }, - 'nth-of-type': function(m) { - return Selector.xpath.pseudos.nth("position() ", m); + + 'padding-box-width': function(element) { + var width =3D this.get('width'), + pLeft =3D this.get('padding-left'), + pRight =3D this.get('padding-right'); + + return width + pLeft + pRight; }, - 'nth-last-of-type': function(m) { - return Selector.xpath.pseudos.nth("(last() + 1 - position()) ", = m); + + 'border-box-height': function(element) { + if (!this._preComputing) this._begin(); + var height =3D element.offsetHeight; + if (!this._preComputing) this._end(); + return height; }, - 'first-of-type': function(m) { - m[6] =3D "1"; return Selector.xpath.pseudos['nth-of-type'](m); + + 'border-box-width': function(element) { + if (!this._preComputing) this._begin(); + var width =3D element.offsetWidth; + if (!this._preComputing) this._end(); + return width; }, - 'last-of-type': function(m) { - m[6] =3D "1"; return Selector.xpath.pseudos['nth-last-of-type'](= m); + + 'margin-box-height': function(element) { + var bHeight =3D this.get('border-box-height'), + mTop =3D this.get('margin-top'), + mBottom =3D this.get('margin-bottom'); + + if (bHeight <=3D 0) return 0; + + return bHeight + mTop + mBottom; }, - 'only-of-type': function(m) { - var p =3D Selector.xpath.pseudos; return p['first-of-type'](m) += p['last-of-type'](m); + + 'margin-box-width': function(element) { + var bWidth =3D this.get('border-box-width'), + mLeft =3D this.get('margin-left'), + mRight =3D this.get('margin-right'); + + if (bWidth <=3D 0) return 0; + + return bWidth + mLeft + mRight; }, - nth: function(fragment, m) { - var mm, formula =3D m[6], predicate; - if (formula =3D=3D 'even') formula =3D '2n+0'; - if (formula =3D=3D 'odd') formula =3D '2n+1'; - if (mm =3D formula.match(/^(\d+)$/)) // digit only - return '[' + fragment + "=3D " + mm[1] + ']'; - if (mm =3D formula.match(/^(-?\d*)?n(([+-])(\d+))?/)) { // an+b - if (mm[1] =3D=3D "-") mm[1] =3D -1; - var a =3D mm[1] ? Number(mm[1]) : 1; - var b =3D mm[2] ? Number(mm[2]) : 0; - predicate =3D "[((#{fragment} - #{b}) mod #{a} =3D 0) and " + - "((#{fragment} - #{b}) div #{a} >=3D 0)]"; - return new Template(predicate).evaluate({ - fragment: fragment, a: a, b: b }); - } + + 'top': function(element) { + var offset =3D element.positionedOffset(); + return offset.top; + }, + + 'bottom': function(element) { + var offset =3D element.positionedOffset(), + parent =3D element.getOffsetParent(), + pHeight =3D parent.measure('height'); + + var mHeight =3D this.get('border-box-height'); + + return pHeight - mHeight - offset.top; + }, + + 'left': function(element) { + var offset =3D element.positionedOffset(); + return offset.left; + }, + + 'right': function(element) { + var offset =3D element.positionedOffset(), + parent =3D element.getOffsetParent(), + pWidth =3D parent.measure('width'); + + var mWidth =3D this.get('border-box-width'); + + return pWidth - mWidth - offset.left; + }, + + 'padding-top': function(element) { + return getPixelValue(element, 'paddingTop'); + }, + + 'padding-bottom': function(element) { + return getPixelValue(element, 'paddingBottom'); + }, + + 'padding-left': function(element) { + return getPixelValue(element, 'paddingLeft'); + }, + + 'padding-right': function(element) { + return getPixelValue(element, 'paddingRight'); + }, + + 'border-top': function(element) { + return getPixelValue(element, 'borderTopWidth'); + }, + + 'border-bottom': function(element) { + return getPixelValue(element, 'borderBottomWidth'); + }, + + 'border-left': function(element) { + return getPixelValue(element, 'borderLeftWidth'); + }, + + 'border-right': function(element) { + return getPixelValue(element, 'borderRightWidth'); + }, + + 'margin-top': function(element) { + return getPixelValue(element, 'marginTop'); + }, + + 'margin-bottom': function(element) { + return getPixelValue(element, 'marginBottom'); + }, + + 'margin-left': function(element) { + return getPixelValue(element, 'marginLeft'); + }, + + 'margin-right': function(element) { + return getPixelValue(element, 'marginRight'); } } - }, + }); =20 - criteria: { - tagName: 'n =3D h.tagName(n, r, "#{1}", c); c =3D false;', - className: 'n =3D h.className(n, r, "#{1}", c); c =3D false;', - id: 'n =3D h.id(n, r, "#{1}", c); c =3D false;', - attrPresence: 'n =3D h.attrPresence(n, r, "#{1}", c); c =3D false;', - attr: function(m) { - m[3] =3D (m[5] || m[6]); - return new Template('n =3D h.attr(n, r, "#{1}", "#{3}", "#{2}", c)= ; c =3D false;').evaluate(m); - }, - pseudo: function(m) { - if (m[6]) m[6] =3D m[6].replace(/"/g, '\\"'); - return new Template('n =3D h.pseudo(n, "#{1}", "#{6}", r, c); c =3D= false;').evaluate(m); - }, - descendant: 'c =3D "descendant";', - child: 'c =3D "child";', - adjacent: 'c =3D "adjacent";', - laterSibling: 'c =3D "laterSibling";' - }, + if ('getBoundingClientRect' in document.documentElement) { + Object.extend(Element.Layout.COMPUTATIONS, { + 'right': function(element) { + var parent =3D hasLayout(element.getOffsetParent()); + var rect =3D element.getBoundingClientRect(), + pRect =3D parent.getBoundingClientRect(); =20 - patterns: [ - { name: 'laterSibling', re: /^\s*~\s*/ }, - { name: 'child', re: /^\s*>\s*/ }, - { name: 'adjacent', re: /^\s*\+\s*/ }, - { name: 'descendant', re: /^\s/ }, + return (pRect.right - rect.right).round(); + }, =20 - { name: 'tagName', re: /^\s*(\*|[\w\-]+)(\b|$)?/ }, - { name: 'id', re: /^#([\w\-\*]+)(\b|$)/ }, - { name: 'className', re: /^\.([\w\-\*]+)(\b|$)/ }, - { name: 'pseudo', re: /^:((first|last|nth|nth-last|only)(-chil= d|-of-type)|empty|checked|(en|dis)abled|not)(\((.*?)\))?(\b|$|(?=3D\s|[:+= ~>]))/ }, - { name: 'attrPresence', re: /^\[((?:[\w-]+:)?[\w-]+)\]/ }, - { name: 'attr', re: /\[((?:[\w-]*:)?[\w-]+)\s*(?:([!^$*~|]?=3D= )\s*((['"])([^\4]*?)\4|([^'"][^\]]*?)))?\]/ } - ], + 'bottom': function(element) { + var parent =3D hasLayout(element.getOffsetParent()); + var rect =3D element.getBoundingClientRect(), + pRect =3D parent.getBoundingClientRect(); =20 - assertions: { - tagName: function(element, matches) { - return matches[1].toUpperCase() =3D=3D element.tagName.toUpperCase= (); + return (pRect.bottom - rect.bottom).round(); + } + }); + } + + Element.Offset =3D Class.create({ + initialize: function(left, top) { + this.left =3D left.round(); + this.top =3D top.round(); + + this[0] =3D this.left; + this[1] =3D this.top; }, =20 - className: function(element, matches) { - return Element.hasClassName(element, matches[1]); + relativeTo: function(offset) { + return new Element.Offset( + this.left - offset.left, + this.top - offset.top + ); }, =20 - id: function(element, matches) { - return element.id =3D=3D=3D matches[1]; + inspect: function() { + return "#".interpolate(t= his); }, =20 - attrPresence: function(element, matches) { - return Element.hasAttribute(element, matches[1]); + toString: function() { + return "[#{left}, #{top}]".interpolate(this); }, =20 - attr: function(element, matches) { - var nodeValue =3D Element.readAttribute(element, matches[1]); - return nodeValue && Selector.operators[matches[2]](nodeValue, matc= hes[5] || matches[6]); + toArray: function() { + return [this.left, this.top]; } - }, + }); =20 - handlers: { - concat: function(a, b) { - for (var i =3D 0, node; node =3D b[i]; i++) - a.push(node); - return a; - }, + function getLayout(element, preCompute) { + return new Element.Layout(element, preCompute); + } =20 - mark: function(nodes) { - var _true =3D Prototype.emptyFunction; - for (var i =3D 0, node; node =3D nodes[i]; i++) - node._countedByPrototype =3D _true; - return nodes; - }, + function measure(element, property) { + return $(element).getLayout().get(property); + } =20 - unmark: (function(){ + function getDimensions(element) { + element =3D $(element); + var display =3D Element.getStyle(element, 'display'); =20 - var PROPERTIES_ATTRIBUTES_MAP =3D (function(){ - var el =3D document.createElement('div'), - isBuggy =3D false, - propName =3D '_countedByPrototype', - value =3D 'x' - el[propName] =3D value; - isBuggy =3D (el.getAttribute(propName) =3D=3D=3D value); - el =3D null; - return isBuggy; - })(); + if (display && display !=3D=3D 'none') { + return { width: element.offsetWidth, height: element.offsetHeight = }; + } =20 - return PROPERTIES_ATTRIBUTES_MAP ? - function(nodes) { - for (var i =3D 0, node; node =3D nodes[i]; i++) - node.removeAttribute('_countedByPrototype'); - return nodes; - } : - function(nodes) { - for (var i =3D 0, node; node =3D nodes[i]; i++) - node._countedByPrototype =3D void 0; - return nodes; - } - })(), + var style =3D element.style; + var originalStyles =3D { + visibility: style.visibility, + position: style.position, + display: style.display + }; =20 - index: function(parentNode, reverse, ofType) { - parentNode._countedByPrototype =3D Prototype.emptyFunction; - if (reverse) { - for (var nodes =3D parentNode.childNodes, i =3D nodes.length - 1= , j =3D 1; i >=3D 0; i--) { - var node =3D nodes[i]; - if (node.nodeType =3D=3D 1 && (!ofType || node._countedByProto= type)) node.nodeIndex =3D j++; - } - } else { - for (var i =3D 0, j =3D 1, nodes =3D parentNode.childNodes; node= =3D nodes[i]; i++) - if (node.nodeType =3D=3D 1 && (!ofType || node._countedByProto= type)) node.nodeIndex =3D j++; - } - }, + var newStyles =3D { + visibility: 'hidden', + display: 'block' + }; =20 - unique: function(nodes) { - if (nodes.length =3D=3D 0) return nodes; - var results =3D [], n; - for (var i =3D 0, l =3D nodes.length; i < l; i++) - if (typeof (n =3D nodes[i])._countedByPrototype =3D=3D 'undefine= d') { - n._countedByPrototype =3D Prototype.emptyFunction; - results.push(Element.extend(n)); - } - return Selector.handlers.unmark(results); - }, + if (originalStyles.position !=3D=3D 'fixed') + newStyles.position =3D 'absolute'; =20 - descendant: function(nodes) { - var h =3D Selector.handlers; - for (var i =3D 0, results =3D [], node; node =3D nodes[i]; i++) - h.concat(results, node.getElementsByTagName('*')); - return results; - }, + Element.setStyle(element, newStyles); =20 - child: function(nodes) { - var h =3D Selector.handlers; - for (var i =3D 0, results =3D [], node; node =3D nodes[i]; i++) { - for (var j =3D 0, child; child =3D node.childNodes[j]; j++) - if (child.nodeType =3D=3D 1 && child.tagName !=3D '!') results= .push(child); - } - return results; - }, + var dimensions =3D { + width: element.offsetWidth, + height: element.offsetHeight + }; =20 - adjacent: function(nodes) { - for (var i =3D 0, results =3D [], node; node =3D nodes[i]; i++) { - var next =3D this.nextElementSibling(node); - if (next) results.push(next); + Element.setStyle(element, originalStyles); + + return dimensions; + } + + function getOffsetParent(element) { + element =3D $(element); + + if (isDocument(element) || isDetached(element) || isBody(element) ||= isHtml(element)) + return $(document.body); + + var isInline =3D (Element.getStyle(element, 'display') =3D=3D=3D 'in= line'); + if (!isInline && element.offsetParent) return $(element.offsetParent= ); + + while ((element =3D element.parentNode) && element !=3D=3D document.= body) { + if (Element.getStyle(element, 'position') !=3D=3D 'static') { + return isHtml(element) ? $(document.body) : $(element); } - return results; - }, + } =20 - laterSibling: function(nodes) { - var h =3D Selector.handlers; - for (var i =3D 0, results =3D [], node; node =3D nodes[i]; i++) - h.concat(results, Element.nextSiblings(node)); - return results; - }, + return $(document.body); + } =20 - nextElementSibling: function(node) { - while (node =3D node.nextSibling) - if (node.nodeType =3D=3D 1) return node; - return null; - }, =20 - previousElementSibling: function(node) { - while (node =3D node.previousSibling) - if (node.nodeType =3D=3D 1) return node; - return null; - }, + function cumulativeOffset(element) { + element =3D $(element); + var valueT =3D 0, valueL =3D 0; + if (element.parentNode) { + do { + valueT +=3D element.offsetTop || 0; + valueL +=3D element.offsetLeft || 0; + element =3D element.offsetParent; + } while (element); + } + return new Element.Offset(valueL, valueT); + } =20 - tagName: function(nodes, root, tagName, combinator) { - var uTagName =3D tagName.toUpperCase(); - var results =3D [], h =3D Selector.handlers; - if (nodes) { - if (combinator) { - if (combinator =3D=3D "descendant") { - for (var i =3D 0, node; node =3D nodes[i]; i++) - h.concat(results, node.getElementsByTagName(tagName)); - return results; - } else nodes =3D this[combinator](nodes); - if (tagName =3D=3D "*") return nodes; - } - for (var i =3D 0, node; node =3D nodes[i]; i++) - if (node.tagName.toUpperCase() =3D=3D=3D uTagName) results.pus= h(node); - return results; - } else return root.getElementsByTagName(tagName); - }, + function positionedOffset(element) { + element =3D $(element); =20 - id: function(nodes, root, id, combinator) { - var targetNode =3D $(id), h =3D Selector.handlers; + var layout =3D element.getLayout(); =20 - if (root =3D=3D document) { - if (!targetNode) return []; - if (!nodes) return [targetNode]; - } else { - if (!root.sourceIndex || root.sourceIndex < 1) { - var nodes =3D root.getElementsByTagName('*'); - for (var j =3D 0, node; node =3D nodes[j]; j++) { - if (node.id =3D=3D=3D id) return [node]; - } - } + var valueT =3D 0, valueL =3D 0; + do { + valueT +=3D element.offsetTop || 0; + valueL +=3D element.offsetLeft || 0; + element =3D element.offsetParent; + if (element) { + if (isBody(element)) break; + var p =3D Element.getStyle(element, 'position'); + if (p !=3D=3D 'static') break; } + } while (element); =20 - if (nodes) { - if (combinator) { - if (combinator =3D=3D 'child') { - for (var i =3D 0, node; node =3D nodes[i]; i++) - if (targetNode.parentNode =3D=3D node) return [targetNode]= ; - } else if (combinator =3D=3D 'descendant') { - for (var i =3D 0, node; node =3D nodes[i]; i++) - if (Element.descendantOf(targetNode, node)) return [target= Node]; - } else if (combinator =3D=3D 'adjacent') { - for (var i =3D 0, node; node =3D nodes[i]; i++) - if (Selector.handlers.previousElementSibling(targetNode) =3D= =3D node) - return [targetNode]; - } else nodes =3D h[combinator](nodes); - } - for (var i =3D 0, node; node =3D nodes[i]; i++) - if (node =3D=3D targetNode) return [targetNode]; - return []; - } - return (targetNode && Element.descendantOf(targetNode, root)) ? [t= argetNode] : []; - }, + valueL -=3D layout.get('margin-top'); + valueT -=3D layout.get('margin-left'); =20 - className: function(nodes, root, className, combinator) { - if (nodes && combinator) nodes =3D this[combinator](nodes); - return Selector.handlers.byClassName(nodes, root, className); - }, + return new Element.Offset(valueL, valueT); + } =20 - byClassName: function(nodes, root, className) { - if (!nodes) nodes =3D Selector.handlers.descendant([root]); - var needle =3D ' ' + className + ' '; - for (var i =3D 0, results =3D [], node, nodeClassName; node =3D no= des[i]; i++) { - nodeClassName =3D node.className; - if (nodeClassName.length =3D=3D 0) continue; - if (nodeClassName =3D=3D className || (' ' + nodeClassName + ' '= ).include(needle)) - results.push(node); - } - return results; - }, + function cumulativeScrollOffset(element) { + var valueT =3D 0, valueL =3D 0; + do { + valueT +=3D element.scrollTop || 0; + valueL +=3D element.scrollLeft || 0; + element =3D element.parentNode; + } while (element); + return new Element.Offset(valueL, valueT); + } =20 - attrPresence: function(nodes, root, attr, combinator) { - if (!nodes) nodes =3D root.getElementsByTagName("*"); - if (nodes && combinator) nodes =3D this[combinator](nodes); - var results =3D []; - for (var i =3D 0, node; node =3D nodes[i]; i++) - if (Element.hasAttribute(node, attr)) results.push(node); - return results; - }, + function viewportOffset(forElement) { + element =3D $(element); + var valueT =3D 0, valueL =3D 0, docBody =3D document.body; =20 - attr: function(nodes, root, attr, value, operator, combinator) { - if (!nodes) nodes =3D root.getElementsByTagName("*"); - if (nodes && combinator) nodes =3D this[combinator](nodes); - var handler =3D Selector.operators[operator], results =3D []; - for (var i =3D 0, node; node =3D nodes[i]; i++) { - var nodeValue =3D Element.readAttribute(node, attr); - if (nodeValue =3D=3D=3D null) continue; - if (handler(nodeValue, value)) results.push(node); + var element =3D forElement; + do { + valueT +=3D element.offsetTop || 0; + valueL +=3D element.offsetLeft || 0; + if (element.offsetParent =3D=3D docBody && + Element.getStyle(element, 'position') =3D=3D 'absolute') break; + } while (element =3D element.offsetParent); + + element =3D forElement; + do { + if (element !=3D docBody) { + valueT -=3D element.scrollTop || 0; + valueL -=3D element.scrollLeft || 0; } - return results; - }, + } while (element =3D element.parentNode); + return new Element.Offset(valueL, valueT); + } =20 - pseudo: function(nodes, name, value, root, combinator) { - if (nodes && combinator) nodes =3D this[combinator](nodes); - if (!nodes) nodes =3D root.getElementsByTagName("*"); - return Selector.pseudos[name](nodes, value, root); + function absolutize(element) { + element =3D $(element); + + if (Element.getStyle(element, 'position') =3D=3D=3D 'absolute') { + return element; } - }, =20 - pseudos: { - 'first-child': function(nodes, value, root) { - for (var i =3D 0, results =3D [], node; node =3D nodes[i]; i++) { - if (Selector.handlers.previousElementSibling(node)) continue; - results.push(node); - } - return results; - }, - 'last-child': function(nodes, value, root) { - for (var i =3D 0, results =3D [], node; node =3D nodes[i]; i++) { - if (Selector.handlers.nextElementSibling(node)) continue; - results.push(node); - } - return results; - }, - 'only-child': function(nodes, value, root) { - var h =3D Selector.handlers; - for (var i =3D 0, results =3D [], node; node =3D nodes[i]; i++) - if (!h.previousElementSibling(node) && !h.nextElementSibling(nod= e)) - results.push(node); - return results; - }, - 'nth-child': function(nodes, formula, root) { - return Selector.pseudos.nth(nodes, formula, root); - }, - 'nth-last-child': function(nodes, formula, root) { - return Selector.pseudos.nth(nodes, formula, root, true); - }, - 'nth-of-type': function(nodes, formula, root) { - return Selector.pseudos.nth(nodes, formula, root, false, true); - }, - 'nth-last-of-type': function(nodes, formula, root) { - return Selector.pseudos.nth(nodes, formula, root, true, true); - }, - 'first-of-type': function(nodes, formula, root) { - return Selector.pseudos.nth(nodes, "1", root, false, true); - }, - 'last-of-type': function(nodes, formula, root) { - return Selector.pseudos.nth(nodes, "1", root, true, true); - }, - 'only-of-type': function(nodes, formula, root) { - var p =3D Selector.pseudos; - return p['last-of-type'](p['first-of-type'](nodes, formula, root),= formula, root); - }, + var offsetParent =3D getOffsetParent(element); + var eOffset =3D element.viewportOffset(), + pOffset =3D offsetParent.viewportOffset(); =20 - getIndices: function(a, b, total) { - if (a =3D=3D 0) return b > 0 ? [b] : []; - return $R(1, total).inject([], function(memo, i) { - if (0 =3D=3D (i - b) % a && (i - b) / a >=3D 0) memo.push(i); - return memo; - }); - }, + var offset =3D eOffset.relativeTo(pOffset); + var layout =3D element.getLayout(); =20 - nth: function(nodes, formula, root, reverse, ofType) { - if (nodes.length =3D=3D 0) return []; - if (formula =3D=3D 'even') formula =3D '2n+0'; - if (formula =3D=3D 'odd') formula =3D '2n+1'; - var h =3D Selector.handlers, results =3D [], indexed =3D [], m; - h.mark(nodes); - for (var i =3D 0, node; node =3D nodes[i]; i++) { - if (!node.parentNode._countedByPrototype) { - h.index(node.parentNode, reverse, ofType); - indexed.push(node.parentNode); - } - } - if (formula.match(/^\d+$/)) { // just a number - formula =3D Number(formula); - for (var i =3D 0, node; node =3D nodes[i]; i++) - if (node.nodeIndex =3D=3D formula) results.push(node); - } else if (m =3D formula.match(/^(-?\d*)?n(([+-])(\d+))?/)) { // a= n+b - if (m[1] =3D=3D "-") m[1] =3D -1; - var a =3D m[1] ? Number(m[1]) : 1; - var b =3D m[2] ? Number(m[2]) : 0; - var indices =3D Selector.pseudos.getIndices(a, b, nodes.length); - for (var i =3D 0, node, l =3D indices.length; node =3D nodes[i];= i++) { - for (var j =3D 0; j < l; j++) - if (node.nodeIndex =3D=3D indices[j]) results.push(node); - } - } - h.unmark(nodes); - h.unmark(indexed); - return results; - }, + element.store('prototype_absolutize_original_styles', { + left: element.getStyle('left'), + top: element.getStyle('top'), + width: element.getStyle('width'), + height: element.getStyle('height') + }); =20 - 'empty': function(nodes, value, root) { - for (var i =3D 0, results =3D [], node; node =3D nodes[i]; i++) { - if (node.tagName =3D=3D '!' || node.firstChild) continue; - results.push(node); + element.setStyle({ + position: 'absolute', + top: offset.top + 'px', + left: offset.left + 'px', + width: layout.get('width') + 'px', + height: layout.get('height') + 'px' + }); + + return element; + } + + function relativize(element) { + element =3D $(element); + if (Element.getStyle(element, 'position') =3D=3D=3D 'relative') { + return element; + } + + var originalStyles =3D + element.retrieve('prototype_absolutize_original_styles'); + + if (originalStyles) element.setStyle(originalStyles); + return element; + } + + if (Prototype.Browser.IE) { + getOffsetParent =3D getOffsetParent.wrap( + function(proceed, element) { + element =3D $(element); + + if (isDocument(element) || isDetached(element) || isBody(element= ) || isHtml(element)) + return $(document.body); + + var position =3D element.getStyle('position'); + if (position !=3D=3D 'static') return proceed(element); + + element.setStyle({ position: 'relative' }); + var value =3D proceed(element); + element.setStyle({ position: position }); + return value; } - return results; - }, + ); =20 - 'not': function(nodes, selector, root) { - var h =3D Selector.handlers, selectorType, m; - var exclusions =3D new Selector(selector).findElements(root); - h.mark(exclusions); - for (var i =3D 0, results =3D [], node; node =3D nodes[i]; i++) - if (!node._countedByPrototype) results.push(node); - h.unmark(exclusions); - return results; - }, + positionedOffset =3D positionedOffset.wrap(function(proceed, element= ) { + element =3D $(element); + if (!element.parentNode) return new Element.Offset(0, 0); + var position =3D element.getStyle('position'); + if (position !=3D=3D 'static') return proceed(element); =20 - 'enabled': function(nodes, value, root) { - for (var i =3D 0, results =3D [], node; node =3D nodes[i]; i++) - if (!node.disabled && (!node.type || node.type !=3D=3D 'hidden')= ) - results.push(node); - return results; - }, + var offsetParent =3D element.getOffsetParent(); + if (offsetParent && offsetParent.getStyle('position') =3D=3D=3D 'f= ixed') + hasLayout(offsetParent); =20 - 'disabled': function(nodes, value, root) { - for (var i =3D 0, results =3D [], node; node =3D nodes[i]; i++) - if (node.disabled) results.push(node); - return results; - }, + element.setStyle({ position: 'relative' }); + var value =3D proceed(element); + element.setStyle({ position: position }); + return value; + }); + } else if (Prototype.Browser.Webkit) { + cumulativeOffset =3D function(element) { + element =3D $(element); + var valueT =3D 0, valueL =3D 0; + do { + valueT +=3D element.offsetTop || 0; + valueL +=3D element.offsetLeft || 0; + if (element.offsetParent =3D=3D document.body) + if (Element.getStyle(element, 'position') =3D=3D 'absolute') b= reak; =20 - 'checked': function(nodes, value, root) { - for (var i =3D 0, results =3D [], node; node =3D nodes[i]; i++) - if (node.checked) results.push(node); - return results; - } - }, + element =3D element.offsetParent; + } while (element); =20 - operators: { - '=3D': function(nv, v) { return nv =3D=3D v; }, - '!=3D': function(nv, v) { return nv !=3D v; }, - '^=3D': function(nv, v) { return nv =3D=3D v || nv && nv.startsWith(= v); }, - '$=3D': function(nv, v) { return nv =3D=3D v || nv && nv.endsWith(v)= ; }, - '*=3D': function(nv, v) { return nv =3D=3D v || nv && nv.include(v);= }, - '~=3D': function(nv, v) { return (' ' + nv + ' ').include(' ' + v + = ' '); }, - '|=3D': function(nv, v) { return ('-' + (nv || "").toUpperCase() + - '-').include('-' + (v || "").toUpperCase() + '-'); } - }, + return new Element.Offset(valueL, valueT); + }; + } =20 - split: function(expression) { - var expressions =3D []; - expression.scan(/(([\w#:.~>+()\s-]+|\*|\[.*?\])+)\s*(,|$)/, function= (m) { - expressions.push(m[1].strip()); + + Element.addMethods({ + getLayout: getLayout, + measure: measure, + getDimensions: getDimensions, + getOffsetParent: getOffsetParent, + cumulativeOffset: cumulativeOffset, + positionedOffset: positionedOffset, + cumulativeScrollOffset: cumulativeScrollOffset, + viewportOffset: viewportOffset, + absolutize: absolutize, + relativize: relativize + }); + + function isBody(element) { + return element.nodeName.toUpperCase() =3D=3D=3D 'BODY'; + } + + function isHtml(element) { + return element.nodeName.toUpperCase() =3D=3D=3D 'HTML'; + } + + function isDocument(element) { + return element.nodeType =3D=3D=3D Node.DOCUMENT_NODE; + } + + function isDetached(element) { + return element !=3D=3D document.body && + !Element.descendantOf(element, document.body); + } + + if ('getBoundingClientRect' in document.documentElement) { + Element.addMethods({ + viewportOffset: function(element) { + element =3D $(element); + if (isDetached(element)) return new Element.Offset(0, 0); + + var rect =3D element.getBoundingClientRect(), + docEl =3D document.documentElement; + return new Element.Offset(rect.left - docEl.clientLeft, + rect.top - docEl.clientTop); + } }); - return expressions; - }, + } +})(); +window.$$ =3D function() { + var expression =3D $A(arguments).join(', '); + return Prototype.Selector.select(expression, document); +}; =20 - matchElements: function(elements, expression) { - var matches =3D $$(expression), h =3D Selector.handlers; - h.mark(matches); - for (var i =3D 0, results =3D [], element; element =3D elements[i]; = i++) - if (element._countedByPrototype) results.push(element); - h.unmark(matches); - return results; - }, +Prototype.Selector =3D (function() { =20 - findElement: function(elements, expression, index) { - if (Object.isNumber(expression)) { - index =3D expression; expression =3D false; + function select() { + throw new Error('Method "Prototype.Selector.select" must be defined.= '); + } + + function match() { + throw new Error('Method "Prototype.Selector.match" must be defined.'= ); + } + + function find(elements, expression, index) { + index =3D index || 0; + var match =3D Prototype.Selector.match, length =3D elements.length, = matchIndex =3D 0, i; + + for (i =3D 0; i < length; i++) { + if (match(elements[i], expression) && index =3D=3D matchIndex++) { + return Element.extend(elements[i]); + } } - return Selector.matchElements(elements, expression || '*')[index || = 0]; - }, + } =20 - findChildElements: function(element, expressions) { - expressions =3D Selector.split(expressions.join(',')); - var results =3D [], h =3D Selector.handlers; - for (var i =3D 0, l =3D expressions.length, selector; i < l; i++) { - selector =3D new Selector(expressions[i].strip()); - h.concat(results, selector.findElements(element)); + function extendElements(elements) { + for (var i =3D 0, length =3D elements.length; i < length; i++) { + Element.extend(elements[i]); } - return (l > 1) ? h.unique(results) : results; + return elements; } + + + var K =3D Prototype.K; + + return { + select: select, + match: match, + find: find, + extendElements: (Element.extend =3D=3D=3D K) ? K : extendElements, + extendElement: Element.extend + }; +})(); +/*! + * Sizzle CSS Selector Engine - v1.0 + * Copyright 2009, The Dojo Foundation + * Released under the MIT, BSD, and GPL Licenses. + * More information: http://sizzlejs.com/ + */ +(function(){ + +var chunker =3D /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'= "]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)= /g, + done =3D 0, + toString =3D Object.prototype.toString, + hasDuplicate =3D false, + baseHasDuplicate =3D true; + +[0, 0].sort(function(){ + baseHasDuplicate =3D false; + return 0; }); =20 -if (Prototype.Browser.IE) { - Object.extend(Selector.handlers, { - concat: function(a, b) { - for (var i =3D 0, node; node =3D b[i]; i++) - if (node.tagName !=3D=3D "!") a.push(node); - return a; - } - }); +var Sizzle =3D function(selector, context, results, seed) { + results =3D results || []; + var origContext =3D context =3D context || document; + + if ( context.nodeType !=3D=3D 1 && context.nodeType !=3D=3D 9 ) { + return []; + } + + if ( !selector || typeof selector !=3D=3D "string" ) { + return results; + } + + var parts =3D [], m, set, checkSet, check, mode, extra, prune =3D true,= contextXML =3D isXML(context), + soFar =3D selector; + + while ( (chunker.exec(""), m =3D chunker.exec(soFar)) !=3D=3D null ) { + soFar =3D m[3]; + + parts.push( m[1] ); + + if ( m[2] ) { + extra =3D m[3]; + break; + } + } + + if ( parts.length > 1 && origPOS.exec( selector ) ) { + if ( parts.length =3D=3D=3D 2 && Expr.relative[ parts[0] ] ) { + set =3D posProcess( parts[0] + parts[1], context ); + } else { + set =3D Expr.relative[ parts[0] ] ? + [ context ] : + Sizzle( parts.shift(), context ); + + while ( parts.length ) { + selector =3D parts.shift(); + + if ( Expr.relative[ selector ] ) + selector +=3D parts.shift(); + + set =3D posProcess( selector, set ); + } + } + } else { + if ( !seed && parts.length > 1 && context.nodeType =3D=3D=3D 9 && !con= textXML && + Expr.match.ID.test(parts[0]) && !Expr.match.ID.test(parts[parts.leng= th - 1]) ) { + var ret =3D Sizzle.find( parts.shift(), context, contextXML ); + context =3D ret.expr ? Sizzle.filter( ret.expr, ret.set )[0] : ret.se= t[0]; + } + + if ( context ) { + var ret =3D seed ? + { expr: parts.pop(), set: makeArray(seed) } : + Sizzle.find( parts.pop(), parts.length =3D=3D=3D 1 && (parts[0] =3D=3D= =3D "~" || parts[0] =3D=3D=3D "+") && context.parentNode ? context.parent= Node : context, contextXML ); + set =3D ret.expr ? Sizzle.filter( ret.expr, ret.set ) : ret.set; + + if ( parts.length > 0 ) { + checkSet =3D makeArray(set); + } else { + prune =3D false; + } + + while ( parts.length ) { + var cur =3D parts.pop(), pop =3D cur; + + if ( !Expr.relative[ cur ] ) { + cur =3D ""; + } else { + pop =3D parts.pop(); + } + + if ( pop =3D=3D null ) { + pop =3D context; + } + + Expr.relative[ cur ]( checkSet, pop, contextXML ); + } + } else { + checkSet =3D parts =3D []; + } + } + + if ( !checkSet ) { + checkSet =3D set; + } + + if ( !checkSet ) { + throw "Syntax error, unrecognized expression: " + (cur || selector); + } + + if ( toString.call(checkSet) =3D=3D=3D "[object Array]" ) { + if ( !prune ) { + results.push.apply( results, checkSet ); + } else if ( context && context.nodeType =3D=3D=3D 1 ) { + for ( var i =3D 0; checkSet[i] !=3D null; i++ ) { + if ( checkSet[i] && (checkSet[i] =3D=3D=3D true || checkSet[i].nodeT= ype =3D=3D=3D 1 && contains(context, checkSet[i])) ) { + results.push( set[i] ); + } + } + } else { + for ( var i =3D 0; checkSet[i] !=3D null; i++ ) { + if ( checkSet[i] && checkSet[i].nodeType =3D=3D=3D 1 ) { + results.push( set[i] ); + } + } + } + } else { + makeArray( checkSet, results ); + } + + if ( extra ) { + Sizzle( extra, origContext, results, seed ); + Sizzle.uniqueSort( results ); + } + + return results; +}; + +Sizzle.uniqueSort =3D function(results){ + if ( sortOrder ) { + hasDuplicate =3D baseHasDuplicate; + results.sort(sortOrder); + + if ( hasDuplicate ) { + for ( var i =3D 1; i < results.length; i++ ) { + if ( results[i] =3D=3D=3D results[i-1] ) { + results.splice(i--, 1); + } + } + } + } + + return results; +}; + +Sizzle.matches =3D function(expr, set){ + return Sizzle(expr, null, null, set); +}; + +Sizzle.find =3D function(expr, context, isXML){ + var set, match; + + if ( !expr ) { + return []; + } + + for ( var i =3D 0, l =3D Expr.order.length; i < l; i++ ) { + var type =3D Expr.order[i], match; + + if ( (match =3D Expr.leftMatch[ type ].exec( expr )) ) { + var left =3D match[1]; + match.splice(1,1); + + if ( left.substr( left.length - 1 ) !=3D=3D "\\" ) { + match[1] =3D (match[1] || "").replace(/\\/g, ""); + set =3D Expr.find[ type ]( match, context, isXML ); + if ( set !=3D null ) { + expr =3D expr.replace( Expr.match[ type ], "" ); + break; + } + } + } + } + + if ( !set ) { + set =3D context.getElementsByTagName("*"); + } + + return {set: set, expr: expr}; +}; + +Sizzle.filter =3D function(expr, set, inplace, not){ + var old =3D expr, result =3D [], curLoop =3D set, match, anyFound, + isXMLFilter =3D set && set[0] && isXML(set[0]); + + while ( expr && set.length ) { + for ( var type in Expr.filter ) { + if ( (match =3D Expr.match[ type ].exec( expr )) !=3D null ) { + var filter =3D Expr.filter[ type ], found, item; + anyFound =3D false; + + if ( curLoop =3D=3D result ) { + result =3D []; + } + + if ( Expr.preFilter[ type ] ) { + match =3D Expr.preFilter[ type ]( match, curLoop, inplace, result, = not, isXMLFilter ); + + if ( !match ) { + anyFound =3D found =3D true; + } else if ( match =3D=3D=3D true ) { + continue; + } + } + + if ( match ) { + for ( var i =3D 0; (item =3D curLoop[i]) !=3D null; i++ ) { + if ( item ) { + found =3D filter( item, match, i, curLoop ); + var pass =3D not ^ !!found; + + if ( inplace && found !=3D null ) { + if ( pass ) { + anyFound =3D true; + } else { + curLoop[i] =3D false; + } + } else if ( pass ) { + result.push( item ); + anyFound =3D true; + } + } + } + } + + if ( found !=3D=3D undefined ) { + if ( !inplace ) { + curLoop =3D result; + } + + expr =3D expr.replace( Expr.match[ type ], "" ); + + if ( !anyFound ) { + return []; + } + + break; + } + } + } + + if ( expr =3D=3D old ) { + if ( anyFound =3D=3D null ) { + throw "Syntax error, unrecognized expression: " + expr; + } else { + break; + } + } + + old =3D expr; + } + + return curLoop; +}; + +var Expr =3D Sizzle.selectors =3D { + order: [ "ID", "NAME", "TAG" ], + match: { + ID: /#((?:[\w\u00c0-\uFFFF-]|\\.)+)/, + CLASS: /\.((?:[\w\u00c0-\uFFFF-]|\\.)+)/, + NAME: /\[name=3D['"]*((?:[\w\u00c0-\uFFFF-]|\\.)+)['"]*\]/, + ATTR: /\[\s*((?:[\w\u00c0-\uFFFF-]|\\.)+)\s*(?:(\S?=3D)\s*(['"]*)(.*?)= \3|)\s*\]/, + TAG: /^((?:[\w\u00c0-\uFFFF\*-]|\\.)+)/, + CHILD: /:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/, + POS: /:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=3D[^-]|$)/, + PSEUDO: /:((?:[\w\u00c0-\uFFFF-]|\\.)+)(?:\((['"]*)((?:\([^\)]+\)|[^\2= \(\)]*)+)\2\))?/ + }, + leftMatch: {}, + attrMap: { + "class": "className", + "for": "htmlFor" + }, + attrHandle: { + href: function(elem){ + return elem.getAttribute("href"); + } + }, + relative: { + "+": function(checkSet, part, isXML){ + var isPartStr =3D typeof part =3D=3D=3D "string", + isTag =3D isPartStr && !/\W/.test(part), + isPartStrNotTag =3D isPartStr && !isTag; + + if ( isTag && !isXML ) { + part =3D part.toUpperCase(); + } + + for ( var i =3D 0, l =3D checkSet.length, elem; i < l; i++ ) { + if ( (elem =3D checkSet[i]) ) { + while ( (elem =3D elem.previousSibling) && elem.nodeType !=3D=3D 1 = ) {} + + checkSet[i] =3D isPartStrNotTag || elem && elem.nodeName =3D=3D=3D = part ? + elem || false : + elem =3D=3D=3D part; + } + } + + if ( isPartStrNotTag ) { + Sizzle.filter( part, checkSet, true ); + } + }, + ">": function(checkSet, part, isXML){ + var isPartStr =3D typeof part =3D=3D=3D "string"; + + if ( isPartStr && !/\W/.test(part) ) { + part =3D isXML ? part : part.toUpperCase(); + + for ( var i =3D 0, l =3D checkSet.length; i < l; i++ ) { + var elem =3D checkSet[i]; + if ( elem ) { + var parent =3D elem.parentNode; + checkSet[i] =3D parent.nodeName =3D=3D=3D part ? parent : false; + } + } + } else { + for ( var i =3D 0, l =3D checkSet.length; i < l; i++ ) { + var elem =3D checkSet[i]; + if ( elem ) { + checkSet[i] =3D isPartStr ? + elem.parentNode : + elem.parentNode =3D=3D=3D part; + } + } + + if ( isPartStr ) { + Sizzle.filter( part, checkSet, true ); + } + } + }, + "": function(checkSet, part, isXML){ + var doneName =3D done++, checkFn =3D dirCheck; + + if ( !/\W/.test(part) ) { + var nodeCheck =3D part =3D isXML ? part : part.toUpperCase(); + checkFn =3D dirNodeCheck; + } + + checkFn("parentNode", part, doneName, checkSet, nodeCheck, isXML); + }, + "~": function(checkSet, part, isXML){ + var doneName =3D done++, checkFn =3D dirCheck; + + if ( typeof part =3D=3D=3D "string" && !/\W/.test(part) ) { + var nodeCheck =3D part =3D isXML ? part : part.toUpperCase(); + checkFn =3D dirNodeCheck; + } + + checkFn("previousSibling", part, doneName, checkSet, nodeCheck, isXML= ); + } + }, + find: { + ID: function(match, context, isXML){ + if ( typeof context.getElementById !=3D=3D "undefined" && !isXML ) { + var m =3D context.getElementById(match[1]); + return m ? [m] : []; + } + }, + NAME: function(match, context, isXML){ + if ( typeof context.getElementsByName !=3D=3D "undefined" ) { + var ret =3D [], results =3D context.getElementsByName(match[1]); + + for ( var i =3D 0, l =3D results.length; i < l; i++ ) { + if ( results[i].getAttribute("name") =3D=3D=3D match[1] ) { + ret.push( results[i] ); + } + } + + return ret.length =3D=3D=3D 0 ? null : ret; + } + }, + TAG: function(match, context){ + return context.getElementsByTagName(match[1]); + } + }, + preFilter: { + CLASS: function(match, curLoop, inplace, result, not, isXML){ + match =3D " " + match[1].replace(/\\/g, "") + " "; + + if ( isXML ) { + return match; + } + + for ( var i =3D 0, elem; (elem =3D curLoop[i]) !=3D null; i++ ) { + if ( elem ) { + if ( not ^ (elem.className && (" " + elem.className + " ").indexOf(= match) >=3D 0) ) { + if ( !inplace ) + result.push( elem ); + } else if ( inplace ) { + curLoop[i] =3D false; + } + } + } + + return false; + }, + ID: function(match){ + return match[1].replace(/\\/g, ""); + }, + TAG: function(match, curLoop){ + for ( var i =3D 0; curLoop[i] =3D=3D=3D false; i++ ){} + return curLoop[i] && isXML(curLoop[i]) ? match[1] : match[1].toUpperC= ase(); + }, + CHILD: function(match){ + if ( match[1] =3D=3D "nth" ) { + var test =3D /(-?)(\d*)n((?:\+|-)?\d*)/.exec( + match[2] =3D=3D "even" && "2n" || match[2] =3D=3D "odd" && "2n+1" |= | + !/\D/.test( match[2] ) && "0n+" + match[2] || match[2]); + + match[2] =3D (test[1] + (test[2] || 1)) - 0; + match[3] =3D test[3] - 0; + } + + match[0] =3D done++; + + return match; + }, + ATTR: function(match, curLoop, inplace, result, not, isXML){ + var name =3D match[1].replace(/\\/g, ""); + + if ( !isXML && Expr.attrMap[name] ) { + match[1] =3D Expr.attrMap[name]; + } + + if ( match[2] =3D=3D=3D "~=3D" ) { + match[4] =3D " " + match[4] + " "; + } + + return match; + }, + PSEUDO: function(match, curLoop, inplace, result, not){ + if ( match[1] =3D=3D=3D "not" ) { + if ( ( chunker.exec(match[3]) || "" ).length > 1 || /^\w/.test(match= [3]) ) { + match[3] =3D Sizzle(match[3], null, null, curLoop); + } else { + var ret =3D Sizzle.filter(match[3], curLoop, inplace, true ^ not); + if ( !inplace ) { + result.push.apply( result, ret ); + } + return false; + } + } else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test(= match[0] ) ) { + return true; + } + + return match; + }, + POS: function(match){ + match.unshift( true ); + return match; + } + }, + filters: { + enabled: function(elem){ + return elem.disabled =3D=3D=3D false && elem.type !=3D=3D "hidden"; + }, + disabled: function(elem){ + return elem.disabled =3D=3D=3D true; + }, + checked: function(elem){ + return elem.checked =3D=3D=3D true; + }, + selected: function(elem){ + elem.parentNode.selectedIndex; + return elem.selected =3D=3D=3D true; + }, + parent: function(elem){ + return !!elem.firstChild; + }, + empty: function(elem){ + return !elem.firstChild; + }, + has: function(elem, i, match){ + return !!Sizzle( match[3], elem ).length; + }, + header: function(elem){ + return /h\d/i.test( elem.nodeName ); + }, + text: function(elem){ + return "text" =3D=3D=3D elem.type; + }, + radio: function(elem){ + return "radio" =3D=3D=3D elem.type; + }, + checkbox: function(elem){ + return "checkbox" =3D=3D=3D elem.type; + }, + file: function(elem){ + return "file" =3D=3D=3D elem.type; + }, + password: function(elem){ + return "password" =3D=3D=3D elem.type; + }, + submit: function(elem){ + return "submit" =3D=3D=3D elem.type; + }, + image: function(elem){ + return "image" =3D=3D=3D elem.type; + }, + reset: function(elem){ + return "reset" =3D=3D=3D elem.type; + }, + button: function(elem){ + return "button" =3D=3D=3D elem.type || elem.nodeName.toUpperCase() =3D= =3D=3D "BUTTON"; + }, + input: function(elem){ + return /input|select|textarea|button/i.test(elem.nodeName); + } + }, + setFilters: { + first: function(elem, i){ + return i =3D=3D=3D 0; + }, + last: function(elem, i, match, array){ + return i =3D=3D=3D array.length - 1; + }, + even: function(elem, i){ + return i % 2 =3D=3D=3D 0; + }, + odd: function(elem, i){ + return i % 2 =3D=3D=3D 1; + }, + lt: function(elem, i, match){ + return i < match[3] - 0; + }, + gt: function(elem, i, match){ + return i > match[3] - 0; + }, + nth: function(elem, i, match){ + return match[3] - 0 =3D=3D i; + }, + eq: function(elem, i, match){ + return match[3] - 0 =3D=3D i; + } + }, + filter: { + PSEUDO: function(elem, match, i, array){ + var name =3D match[1], filter =3D Expr.filters[ name ]; + + if ( filter ) { + return filter( elem, i, match, array ); + } else if ( name =3D=3D=3D "contains" ) { + return (elem.textContent || elem.innerText || "").indexOf(match[3]) = >=3D 0; + } else if ( name =3D=3D=3D "not" ) { + var not =3D match[3]; + + for ( var i =3D 0, l =3D not.length; i < l; i++ ) { + if ( not[i] =3D=3D=3D elem ) { + return false; + } + } + + return true; + } + }, + CHILD: function(elem, match){ + var type =3D match[1], node =3D elem; + switch (type) { + case 'only': + case 'first': + while ( (node =3D node.previousSibling) ) { + if ( node.nodeType =3D=3D=3D 1 ) return false; + } + if ( type =3D=3D 'first') return true; + node =3D elem; + case 'last': + while ( (node =3D node.nextSibling) ) { + if ( node.nodeType =3D=3D=3D 1 ) return false; + } + return true; + case 'nth': + var first =3D match[2], last =3D match[3]; + + if ( first =3D=3D 1 && last =3D=3D 0 ) { + return true; + } + + var doneName =3D match[0], + parent =3D elem.parentNode; + + if ( parent && (parent.sizcache !=3D=3D doneName || !elem.nodeIndex= ) ) { + var count =3D 0; + for ( node =3D parent.firstChild; node; node =3D node.nextSibling = ) { + if ( node.nodeType =3D=3D=3D 1 ) { + node.nodeIndex =3D ++count; + } + } + parent.sizcache =3D doneName; + } + + var diff =3D elem.nodeIndex - last; + if ( first =3D=3D 0 ) { + return diff =3D=3D 0; + } else { + return ( diff % first =3D=3D 0 && diff / first >=3D 0 ); + } + } + }, + ID: function(elem, match){ + return elem.nodeType =3D=3D=3D 1 && elem.getAttribute("id") =3D=3D=3D= match; + }, + TAG: function(elem, match){ + return (match =3D=3D=3D "*" && elem.nodeType =3D=3D=3D 1) || elem.nod= eName =3D=3D=3D match; + }, + CLASS: function(elem, match){ + return (" " + (elem.className || elem.getAttribute("class")) + " ") + .indexOf( match ) > -1; + }, + ATTR: function(elem, match){ + var name =3D match[1], + result =3D Expr.attrHandle[ name ] ? + Expr.attrHandle[ name ]( elem ) : + elem[ name ] !=3D null ? + elem[ name ] : + elem.getAttribute( name ), + value =3D result + "", + type =3D match[2], + check =3D match[4]; + + return result =3D=3D null ? + type =3D=3D=3D "!=3D" : + type =3D=3D=3D "=3D" ? + value =3D=3D=3D check : + type =3D=3D=3D "*=3D" ? + value.indexOf(check) >=3D 0 : + type =3D=3D=3D "~=3D" ? + (" " + value + " ").indexOf(check) >=3D 0 : + !check ? + value && result !=3D=3D false : + type =3D=3D=3D "!=3D" ? + value !=3D check : + type =3D=3D=3D "^=3D" ? + value.indexOf(check) =3D=3D=3D 0 : + type =3D=3D=3D "$=3D" ? + value.substr(value.length - check.length) =3D=3D=3D check : + type =3D=3D=3D "|=3D" ? + value =3D=3D=3D check || value.substr(0, check.length + 1) =3D=3D=3D= check + "-" : + false; + }, + POS: function(elem, match, i, array){ + var name =3D match[2], filter =3D Expr.setFilters[ name ]; + + if ( filter ) { + return filter( elem, i, match, array ); + } + } + } +}; + +var origPOS =3D Expr.match.POS; + +for ( var type in Expr.match ) { + Expr.match[ type ] =3D new RegExp( Expr.match[ type ].source + /(?![^\[= ]*\])(?![^\(]*\))/.source ); + Expr.leftMatch[ type ] =3D new RegExp( /(^(?:.|\r|\n)*?)/.source + Expr= .match[ type ].source ); } =20 -function $$() { - return Selector.findChildElements(document, $A(arguments)); +var makeArray =3D function(array, results) { + array =3D Array.prototype.slice.call( array, 0 ); + + if ( results ) { + results.push.apply( results, array ); + return results; + } + + return array; +}; + +try { + Array.prototype.slice.call( document.documentElement.childNodes, 0 ); + +} catch(e){ + makeArray =3D function(array, results) { + var ret =3D results || []; + + if ( toString.call(array) =3D=3D=3D "[object Array]" ) { + Array.prototype.push.apply( ret, array ); + } else { + if ( typeof array.length =3D=3D=3D "number" ) { + for ( var i =3D 0, l =3D array.length; i < l; i++ ) { + ret.push( array[i] ); + } + } else { + for ( var i =3D 0; array[i]; i++ ) { + ret.push( array[i] ); + } + } + } + + return ret; + }; } =20 +var sortOrder; + +if ( document.documentElement.compareDocumentPosition ) { + sortOrder =3D function( a, b ) { + if ( !a.compareDocumentPosition || !b.compareDocumentPosition ) { + if ( a =3D=3D b ) { + hasDuplicate =3D true; + } + return 0; + } + + var ret =3D a.compareDocumentPosition(b) & 4 ? -1 : a =3D=3D=3D b ? 0 = : 1; + if ( ret =3D=3D=3D 0 ) { + hasDuplicate =3D true; + } + return ret; + }; +} else if ( "sourceIndex" in document.documentElement ) { + sortOrder =3D function( a, b ) { + if ( !a.sourceIndex || !b.sourceIndex ) { + if ( a =3D=3D b ) { + hasDuplicate =3D true; + } + return 0; + } + + var ret =3D a.sourceIndex - b.sourceIndex; + if ( ret =3D=3D=3D 0 ) { + hasDuplicate =3D true; + } + return ret; + }; +} else if ( document.createRange ) { + sortOrder =3D function( a, b ) { + if ( !a.ownerDocument || !b.ownerDocument ) { + if ( a =3D=3D b ) { + hasDuplicate =3D true; + } + return 0; + } + + var aRange =3D a.ownerDocument.createRange(), bRange =3D b.ownerDocume= nt.createRange(); + aRange.setStart(a, 0); + aRange.setEnd(a, 0); + bRange.setStart(b, 0); + bRange.setEnd(b, 0); + var ret =3D aRange.compareBoundaryPoints(Range.START_TO_END, bRange); + if ( ret =3D=3D=3D 0 ) { + hasDuplicate =3D true; + } + return ret; + }; +} + +(function(){ + var form =3D document.createElement("div"), + id =3D "script" + (new Date).getTime(); + form.innerHTML =3D "
"; + + var root =3D document.documentElement; + root.insertBefore( form, root.firstChild ); + + if ( !!document.getElementById( id ) ) { + Expr.find.ID =3D function(match, context, isXML){ + if ( typeof context.getElementById !=3D=3D "undefined" && !isXML ) { + var m =3D context.getElementById(match[1]); + return m ? m.id =3D=3D=3D match[1] || typeof m.getAttributeNode !=3D= =3D "undefined" && m.getAttributeNode("id").nodeValue =3D=3D=3D match[1] = ? [m] : undefined : []; + } + }; + + Expr.filter.ID =3D function(elem, match){ + var node =3D typeof elem.getAttributeNode !=3D=3D "undefined" && elem= .getAttributeNode("id"); + return elem.nodeType =3D=3D=3D 1 && node && node.nodeValue =3D=3D=3D = match; + }; + } + + root.removeChild( form ); + root =3D form =3D null; // release memory in IE +})(); + +(function(){ + + var div =3D document.createElement("div"); + div.appendChild( document.createComment("") ); + + if ( div.getElementsByTagName("*").length > 0 ) { + Expr.find.TAG =3D function(match, context){ + var results =3D context.getElementsByTagName(match[1]); + + if ( match[1] =3D=3D=3D "*" ) { + var tmp =3D []; + + for ( var i =3D 0; results[i]; i++ ) { + if ( results[i].nodeType =3D=3D=3D 1 ) { + tmp.push( results[i] ); + } + } + + results =3D tmp; + } + + return results; + }; + } + + div.innerHTML =3D ""; + if ( div.firstChild && typeof div.firstChild.getAttribute !=3D=3D "unde= fined" && + div.firstChild.getAttribute("href") !=3D=3D "#" ) { + Expr.attrHandle.href =3D function(elem){ + return elem.getAttribute("href", 2); + }; + } + + div =3D null; // release memory in IE +})(); + +if ( document.querySelectorAll ) (function(){ + var oldSizzle =3D Sizzle, div =3D document.createElement("div"); + div.innerHTML =3D "

"; + + if ( div.querySelectorAll && div.querySelectorAll(".TEST").length =3D=3D= =3D 0 ) { + return; + } + + Sizzle =3D function(query, context, extra, seed){ + context =3D context || document; + + if ( !seed && context.nodeType =3D=3D=3D 9 && !isXML(context) ) { + try { + return makeArray( context.querySelectorAll(query), extra ); + } catch(e){} + } + + return oldSizzle(query, context, extra, seed); + }; + + for ( var prop in oldSizzle ) { + Sizzle[ prop ] =3D oldSizzle[ prop ]; + } + + div =3D null; // release memory in IE +})(); + +if ( document.getElementsByClassName && document.documentElement.getElem= entsByClassName ) (function(){ + var div =3D document.createElement("div"); + div.innerHTML =3D "
"; + + if ( div.getElementsByClassName("e").length =3D=3D=3D 0 ) + return; + + div.lastChild.className =3D "e"; + + if ( div.getElementsByClassName("e").length =3D=3D=3D 1 ) + return; + + Expr.order.splice(1, 0, "CLASS"); + Expr.find.CLASS =3D function(match, context, isXML) { + if ( typeof context.getElementsByClassName !=3D=3D "undefined" && !isX= ML ) { + return context.getElementsByClassName(match[1]); + } + }; + + div =3D null; // release memory in IE +})(); + +function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) = { + var sibDir =3D dir =3D=3D "previousSibling" && !isXML; + for ( var i =3D 0, l =3D checkSet.length; i < l; i++ ) { + var elem =3D checkSet[i]; + if ( elem ) { + if ( sibDir && elem.nodeType =3D=3D=3D 1 ){ + elem.sizcache =3D doneName; + elem.sizset =3D i; + } + elem =3D elem[dir]; + var match =3D false; + + while ( elem ) { + if ( elem.sizcache =3D=3D=3D doneName ) { + match =3D checkSet[elem.sizset]; + break; + } + + if ( elem.nodeType =3D=3D=3D 1 && !isXML ){ + elem.sizcache =3D doneName; + elem.sizset =3D i; + } + + if ( elem.nodeName =3D=3D=3D cur ) { + match =3D elem; + break; + } + + elem =3D elem[dir]; + } + + checkSet[i] =3D match; + } + } +} + +function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) { + var sibDir =3D dir =3D=3D "previousSibling" && !isXML; + for ( var i =3D 0, l =3D checkSet.length; i < l; i++ ) { + var elem =3D checkSet[i]; + if ( elem ) { + if ( sibDir && elem.nodeType =3D=3D=3D 1 ) { + elem.sizcache =3D doneName; + elem.sizset =3D i; + } + elem =3D elem[dir]; + var match =3D false; + + while ( elem ) { + if ( elem.sizcache =3D=3D=3D doneName ) { + match =3D checkSet[elem.sizset]; + break; + } + + if ( elem.nodeType =3D=3D=3D 1 ) { + if ( !isXML ) { + elem.sizcache =3D doneName; + elem.sizset =3D i; + } + if ( typeof cur !=3D=3D "string" ) { + if ( elem =3D=3D=3D cur ) { + match =3D true; + break; + } + + } else if ( Sizzle.filter( cur, [elem] ).length > 0 ) { + match =3D elem; + break; + } + } + + elem =3D elem[dir]; + } + + checkSet[i] =3D match; + } + } +} + +var contains =3D document.compareDocumentPosition ? function(a, b){ + return a.compareDocumentPosition(b) & 16; +} : function(a, b){ + return a !=3D=3D b && (a.contains ? a.contains(b) : true); +}; + +var isXML =3D function(elem){ + return elem.nodeType =3D=3D=3D 9 && elem.documentElement.nodeName !=3D=3D= "HTML" || + !!elem.ownerDocument && elem.ownerDocument.documentElement.nodeName !=3D= =3D "HTML"; +}; + +var posProcess =3D function(selector, context){ + var tmpSet =3D [], later =3D "", match, + root =3D context.nodeType ? [context] : context; + + while ( (match =3D Expr.match.PSEUDO.exec( selector )) ) { + later +=3D match[0]; + selector =3D selector.replace( Expr.match.PSEUDO, "" ); + } + + selector =3D Expr.relative[selector] ? selector + "*" : selector; + + for ( var i =3D 0, l =3D root.length; i < l; i++ ) { + Sizzle( selector, root[i], tmpSet ); + } + + return Sizzle.filter( later, tmpSet ); +}; + + +window.Sizzle =3D Sizzle; + +})(); + +Prototype._original_property =3D window.Sizzle; + +;(function(engine) { + var extendElements =3D Prototype.Selector.extendElements; + + function select(selector, scope) { + return extendElements(engine(selector, scope || document)); + } + + function match(element, selector) { + return engine.matches(selector, [element]).length =3D=3D 1; + } + + Prototype.Selector.engine =3D engine; + Prototype.Selector.select =3D select; + Prototype.Selector.match =3D match; +})(Sizzle); + +window.Sizzle =3D Prototype._original_property; +delete Prototype._original_property; + var Form =3D { reset: function(form) { form =3D $(form); @@ -3924,24 +4969,34 @@ serializeElements: function(elements, options) { if (typeof options !=3D 'object') options =3D { hash: !!options }; else if (Object.isUndefined(options.hash)) options.hash =3D true; - var key, value, submitted =3D false, submit =3D options.submit; + var key, value, submitted =3D false, submit =3D options.submit, accu= mulator, initial; =20 - var data =3D elements.inject({ }, function(result, element) { + if (options.hash) { + initial =3D {}; + accumulator =3D function(result, key, value) { + if (key in result) { + if (!Object.isArray(result[key])) result[key] =3D [result[key]= ]; + result[key].push(value); + } else result[key] =3D value; + return result; + }; + } else { + initial =3D ''; + accumulator =3D function(result, key, value) { + return result + (result ? '&' : '') + encodeURIComponent(key) + = '=3D' + encodeURIComponent(value); + } + } + + return elements.inject(initial, function(result, element) { if (!element.disabled && element.name) { key =3D element.name; value =3D $(element).getValue(); if (value !=3D null && element.type !=3D 'file' && (element.type= !=3D 'submit' || (!submitted && submit !=3D=3D false && (!submit || key =3D=3D submit) && (s= ubmitted =3D true)))) { - if (key in result) { - if (!Object.isArray(result[key])) result[key] =3D [result[ke= y]]; - result[key].push(value); - } - else result[key] =3D value; + result =3D accumulator(result, key, value); } } return result; }); - - return options.hash ? data : Object.toQueryString(data); } }; =20 @@ -4008,7 +5063,8 @@ =20 focusFirstElement: function(form) { form =3D $(form); - form.findFirstElement().activate(); + var element =3D form.findFirstElement(); + if (element) element.activate(); return form; }, =20 @@ -4115,68 +5171,78 @@ =20 /*----------------------------------------------------------------------= ----*/ =20 -Form.Element.Serializers =3D { - input: function(element, value) { +Form.Element.Serializers =3D (function() { + function input(element, value) { switch (element.type.toLowerCase()) { case 'checkbox': case 'radio': - return Form.Element.Serializers.inputSelector(element, value); + return inputSelector(element, value); default: - return Form.Element.Serializers.textarea(element, value); + return valueSelector(element, value); } - }, + } =20 - inputSelector: function(element, value) { - if (Object.isUndefined(value)) return element.checked ? element.valu= e : null; + function inputSelector(element, value) { + if (Object.isUndefined(value)) + return element.checked ? element.value : null; else element.checked =3D !!value; - }, + } =20 - textarea: function(element, value) { + function valueSelector(element, value) { if (Object.isUndefined(value)) return element.value; else element.value =3D value; - }, + } =20 - select: function(element, value) { + function select(element, value) { if (Object.isUndefined(value)) - return this[element.type =3D=3D 'select-one' ? - 'selectOne' : 'selectMany'](element); - else { - var opt, currentValue, single =3D !Object.isArray(value); - for (var i =3D 0, length =3D element.length; i < length; i++) { - opt =3D element.options[i]; - currentValue =3D this.optionValue(opt); - if (single) { - if (currentValue =3D=3D value) { - opt.selected =3D true; - return; - } + return (element.type =3D=3D=3D 'select-one' ? selectOne : selectMa= ny)(element); + + var opt, currentValue, single =3D !Object.isArray(value); + for (var i =3D 0, length =3D element.length; i < length; i++) { + opt =3D element.options[i]; + currentValue =3D this.optionValue(opt); + if (single) { + if (currentValue =3D=3D value) { + opt.selected =3D true; + return; } - else opt.selected =3D value.include(currentValue); } + else opt.selected =3D value.include(currentValue); } - }, + } =20 - selectOne: function(element) { + function selectOne(element) { var index =3D element.selectedIndex; - return index >=3D 0 ? this.optionValue(element.options[index]) : nul= l; - }, + return index >=3D 0 ? optionValue(element.options[index]) : null; + } =20 - selectMany: function(element) { + function selectMany(element) { var values, length =3D element.length; if (!length) return null; =20 for (var i =3D 0, values =3D []; i < length; i++) { var opt =3D element.options[i]; - if (opt.selected) values.push(this.optionValue(opt)); + if (opt.selected) values.push(optionValue(opt)); } return values; - }, + } =20 - optionValue: function(opt) { - return Element.extend(opt).hasAttribute('value') ? opt.value : opt.t= ext; + function optionValue(opt) { + return Element.hasAttribute(opt, 'value') ? opt.value : opt.text; } -}; =20 + return { + input: input, + inputSelector: inputSelector, + textarea: valueSelector, + select: select, + selectOne: selectOne, + selectMany: selectMany, + optionValue: optionValue, + button: valueSelector + }; +})(); + /*----------------------------------------------------------------------= ----*/ =20 =20 @@ -4286,24 +5352,53 @@ var MOUSEENTER_MOUSELEAVE_EVENTS_SUPPORTED =3D 'onmouseenter' in docEl && 'onmouseleave' in docEl; =20 + + + var isIELegacyEvent =3D function(event) { return false; }; + + if (window.attachEvent) { + if (window.addEventListener) { + isIELegacyEvent =3D function(event) { + return !(event instanceof window.Event); + }; + } else { + isIELegacyEvent =3D function(event) { return true; }; + } + } + var _isButton; - if (Prototype.Browser.IE) { - var buttonMap =3D { 0: 1, 1: 4, 2: 2 }; - _isButton =3D function(event, code) { - return event.button =3D=3D=3D buttonMap[code]; - }; + + function _isButtonForDOMEvents(event, code) { + return event.which ? (event.which =3D=3D=3D code + 1) : (event.butto= n =3D=3D=3D code); + } + + var legacyButtonMap =3D { 0: 1, 1: 4, 2: 2 }; + function _isButtonForLegacyEvents(event, code) { + return event.button =3D=3D=3D legacyButtonMap[code]; + } + + function _isButtonForWebKit(event, code) { + switch (code) { + case 0: return event.which =3D=3D 1 && !event.metaKey; + case 1: return event.which =3D=3D 2 || (event.which =3D=3D 1 && ev= ent.metaKey); + case 2: return event.which =3D=3D 3; + default: return false; + } + } + + if (window.attachEvent) { + if (!window.addEventListener) { + _isButton =3D _isButtonForLegacyEvents; + } else { + _isButton =3D function(event, code) { + return isIELegacyEvent(event) ? _isButtonForLegacyEvents(event, = code) : + _isButtonForDOMEvents(event, code); + } + } } else if (Prototype.Browser.WebKit) { - _isButton =3D function(event, code) { - switch (code) { - case 0: return event.which =3D=3D 1 && !event.metaKey; - case 1: return event.which =3D=3D 1 && event.metaKey; - default: return false; - } - }; + _isButton =3D _isButtonForWebKit; } else { - _isButton =3D function(event, code) { - return event.which ? (event.which =3D=3D=3D code + 1) : (event.but= ton =3D=3D=3D code); - }; + _isButton =3D _isButtonForDOMEvents; } =20 function isLeftClick(event) { return _isButton(event, 0) } @@ -4333,9 +5428,14 @@ =20 function findElement(event, expression) { var element =3D Event.element(event); + if (!expression) return element; - var elements =3D [element].concat(element.ancestors()); - return Selector.findElement(elements, expression, 0); + while (element) { + if (Object.isElement(element) && Prototype.Selector.match(element,= expression)) { + return Element.extend(element); + } + element =3D element.parentNode; + } } =20 function pointer(event) { @@ -4369,49 +5469,59 @@ event.stopped =3D true; } =20 + Event.Methods =3D { - isLeftClick: isLeftClick, + isLeftClick: isLeftClick, isMiddleClick: isMiddleClick, - isRightClick: isRightClick, + isRightClick: isRightClick, =20 - element: element, + element: element, findElement: findElement, =20 - pointer: pointer, + pointer: pointer, pointerX: pointerX, pointerY: pointerY, =20 stop: stop }; =20 - var methods =3D Object.keys(Event.Methods).inject({ }, function(m, nam= e) { m[name] =3D Event.Methods[name].methodize(); return m; }); =20 - if (Prototype.Browser.IE) { + if (window.attachEvent) { function _relatedTarget(event) { var element; switch (event.type) { - case 'mouseover': element =3D event.fromElement; break; - case 'mouseout': element =3D event.toElement; break; - default: return null; + case 'mouseover': + case 'mouseenter': + element =3D event.fromElement; + break; + case 'mouseout': + case 'mouseleave': + element =3D event.toElement; + break; + default: + return null; } return Element.extend(element); } =20 - Object.extend(methods, { + var additionalMethods =3D { stopPropagation: function() { this.cancelBubble =3D true }, preventDefault: function() { this.returnValue =3D false }, inspect: function() { return '[object Event]' } - }); + }; =20 Event.extend =3D function(event, element) { if (!event) return false; + + if (!isIELegacyEvent(event)) return event; + if (event._extendedByPrototype) return event; + event._extendedByPrototype =3D Prototype.emptyFunction; =20 - event._extendedByPrototype =3D Prototype.emptyFunction; var pointer =3D Event.pointer(event); =20 Object.extend(event, { @@ -4421,12 +5531,18 @@ pageY: pointer.y }); =20 - return Object.extend(event, methods); + Object.extend(event, methods); + Object.extend(event, additionalMethods); + + return event; }; } else { + Event.extend =3D Prototype.K; + } + + if (window.addEventListener) { Event.prototype =3D window.Event.prototype || document.createEvent('= HTMLEvents').__proto__; Object.extend(Event.prototype, methods); - Event.extend =3D Prototype.K; } =20 function _createResponder(element, eventName, handler) { @@ -4504,12 +5620,12 @@ window.addEventListener('unload', Prototype.emptyFunction, false); =20 =20 - var _getDOMEventName =3D Prototype.K; + var _getDOMEventName =3D Prototype.K, + translations =3D { mouseenter: "mouseover", mouseleave: "mouseout"= }; =20 if (!MOUSEENTER_MOUSELEAVE_EVENTS_SUPPORTED) { _getDOMEventName =3D function(eventName) { - var translations =3D { mouseenter: "mouseover", mouseleave: "mouse= out" }; - return eventName in translations ? translations[eventName] : event= Name; + return (translations[eventName] || eventName); }; } =20 @@ -4525,7 +5641,7 @@ element.addEventListener("dataavailable", responder, false); else { element.attachEvent("ondataavailable", responder); - element.attachEvent("onfilterchange", responder); + element.attachEvent("onlosecapture", responder); } } else { var actualEventName =3D _getDOMEventName(eventName); @@ -4543,46 +5659,44 @@ element =3D $(element); =20 var registry =3D Element.retrieve(element, 'prototype_event_registry= '); + if (!registry) return element; =20 - if (Object.isUndefined(registry)) return element; - - if (eventName && !handler) { - var responders =3D registry.get(eventName); - - if (Object.isUndefined(responders)) return element; - - responders.each( function(r) { - Element.stopObserving(element, eventName, r.handler); - }); - return element; - } else if (!eventName) { + if (!eventName) { registry.each( function(pair) { - var eventName =3D pair.key, responders =3D pair.value; - - responders.each( function(r) { - Element.stopObserving(element, eventName, r.handler); - }); + var eventName =3D pair.key; + stopObserving(element, eventName); }); return element; } =20 var responders =3D registry.get(eventName); + if (!responders) return element; =20 - if (!responders) return; + if (!handler) { + responders.each(function(r) { + stopObserving(element, eventName, r.handler); + }); + return element; + } =20 - var responder =3D responders.find( function(r) { return r.handler =3D= =3D=3D handler; }); + var i =3D responders.length, responder; + while (i--) { + if (responders[i].handler =3D=3D=3D handler) { + responder =3D responders[i]; + break; + } + } if (!responder) return element; =20 - var actualEventName =3D _getDOMEventName(eventName); - if (eventName.include(':')) { if (element.removeEventListener) element.removeEventListener("dataavailable", responder, false); else { element.detachEvent("ondataavailable", responder); - element.detachEvent("onfilterchange", responder); + element.detachEvent("onlosecapture", responder); } } else { + var actualEventName =3D _getDOMEventName(eventName); if (element.removeEventListener) element.removeEventListener(actualEventName, responder, false); else @@ -4606,10 +5720,10 @@ var event; if (document.createEvent) { event =3D document.createEvent('HTMLEvents'); - event.initEvent('dataavailable', true, true); + event.initEvent('dataavailable', bubble, true); } else { event =3D document.createEventObject(); - event.eventType =3D bubble ? 'ondataavailable' : 'onfilterchange'; + event.eventType =3D bubble ? 'ondataavailable' : 'onlosecapture'; } =20 event.eventName =3D eventName; @@ -4623,13 +5737,47 @@ return Event.extend(event); } =20 + Event.Handler =3D Class.create({ + initialize: function(element, eventName, selector, callback) { + this.element =3D $(element); + this.eventName =3D eventName; + this.selector =3D selector; + this.callback =3D callback; + this.handler =3D this.handleEvent.bind(this); + }, =20 + start: function() { + Event.observe(this.element, this.eventName, this.handler); + return this; + }, + + stop: function() { + Event.stopObserving(this.element, this.eventName, this.handler); + return this; + }, + + handleEvent: function(event) { + var element =3D Event.findElement(event, this.selector); + if (element) this.callback.call(this.element, event, element); + } + }); + + function on(element, eventName, selector, callback) { + element =3D $(element); + if (Object.isFunction(selector) && Object.isUndefined(callback)) { + callback =3D selector, selector =3D null; + } + + return new Event.Handler(element, eventName, selector, callback).sta= rt(); + } + Object.extend(Event, Event.Methods); =20 Object.extend(Event, { fire: fire, observe: observe, - stopObserving: stopObserving + stopObserving: stopObserving, + on: on }); =20 Element.addMethods({ @@ -4637,7 +5785,9 @@ =20 observe: observe, =20 - stopObserving: stopObserving + stopObserving: stopObserving, + + on: on }); =20 Object.extend(document, { @@ -4647,6 +5797,8 @@ =20 stopObserving: stopObserving.methodize(), =20 + on: on.methodize(), + loaded: false }); =20 @@ -4694,8 +5846,8 @@ Event.observe(window, 'load', fireContentLoadedEvent); })(); =20 + Element.addMethods(); - /*------------------------------- DEPRECATED ---------------------------= ----*/ =20 Hash.toQueryString =3D Object.toQueryString; @@ -4872,3 +6024,58 @@ Object.extend(Element.ClassNames.prototype, Enumerable); =20 /*----------------------------------------------------------------------= ----*/ + +(function() { + window.Selector =3D Class.create({ + initialize: function(expression) { + this.expression =3D expression.strip(); + }, + + findElements: function(rootElement) { + return Prototype.Selector.select(this.expression, rootElement); + }, + + match: function(element) { + return Prototype.Selector.match(element, this.expression); + }, + + toString: function() { + return this.expression; + }, + + inspect: function() { + return "#"; + } + }); + + Object.extend(Selector, { + matchElements: function(elements, expression) { + var match =3D Prototype.Selector.match, + results =3D []; + + for (var i =3D 0, length =3D elements.length; i < length; i++) { + var element =3D elements[i]; + if (match(element, expression)) { + results.push(Element.extend(element)); + } + } + return results; + }, + + findElement: function(elements, expression, index) { + index =3D index || 0; + var matchIndex =3D 0, element; + for (var i =3D 0, length =3D elements.length; i < length; i++) { + element =3D elements[i]; + if (Prototype.Selector.match(element, expression) && index =3D=3D= =3D matchIndex++) { + return Element.extend(element); + } + } + }, + + findChildElements: function(element, expressions) { + var selector =3D expressions.toArray().join(', '); + return Prototype.Selector.select(selector, element || document); + } + }); +})(); Modified: phpcompta/trunk/html/js/scriptaculous.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/js/scriptaculous.js 2011-10-29 20:58:33 UTC (rev= 4272) +++ phpcompta/trunk/html/js/scriptaculous.js 2011-10-29 20:59:04 UTC (rev= 4273) @@ -1,6 +1,6 @@ -// script.aculo.us scriptaculous.js v1.8.3, Thu Oct 08 11:23:33 +0200 20= 09 +// script.aculo.us scriptaculous.js v1.9.0, Thu Dec 23 16:54:48 -0500 20= 10 =20 -// Copyright (c) 2005-2009 Thomas Fuchs (http://script.aculo.us, http://= mir.aculo.us) +// Copyright (c) 2005-2010 Thomas Fuchs (http://script.aculo.us, http://= mir.aculo.us) // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the @@ -24,7 +24,7 @@ // For details, see the script.aculo.us web site: http://script.aculo.us= / =20 var Scriptaculous =3D { - Version: '1.8.3', + Version: '1.9.0', require: function(libraryName) { try{ // inserting via DOM fails in Safari 2.0, so brute force approach @@ -37,7 +37,7 @@ document.getElementsByTagName('head')[0].appendChild(script); } }, - REQUIRED_PROTOTYPE: '1.6.1', + REQUIRED_PROTOTYPE: '1.6.0.3', load: function() { function convertVersionString(versionString) { var v =3D versionString.replace(/_.*|\./g, ''); @@ -54,7 +54,7 @@ Scriptaculous.REQUIRED_PROTOTYPE); =20 var js =3D /scriptaculous\.js(\?.*)?$/; - $$('head script[src]').findAll(function(s) { + $$('script[src]').findAll(function(s) { return s.src.match(js); }).each(function(s) { var path =3D s.src.replace(js, ''), @@ -65,4 +65,4 @@ } }; =20 -Scriptaculous.load(); +Scriptaculous.load(); \ No newline at end of file Modified: phpcompta/trunk/html/js/scripts.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/js/scripts.js 2011-10-29 20:58:33 UTC (rev 4272) +++ phpcompta/trunk/html/js/scripts.js 2011-10-29 20:59:04 UTC (rev 4273) @@ -24,7 +24,7 @@ * */ /** -* callback function when we just need to update a hidden div with an inf= o=20 +* callback function when we just need to update a hidden div with an inf= o * message */ function infodiv(req,json) @@ -378,13 +378,13 @@ =20 } /** -*@brief basic answer to ajax on success, it will fill the DOMID code wit= h=20 +*@brief basic answer to ajax on success, it will fill the DOMID code wit= h * the code. In that case, you need to create the object before the Ajax.= Request -*The difference with success box is that=20 +*The difference with success box is that *@see add_div removeDiv success_box is that the width and height are not= changed ajax_misc.php *@parameter code is the ID of the object containing the html (div, butto= n...) *@parameter value is the html code, with it you fill the ctl element -*/=20 +*/ =20 function success_misc(req) { @@ -466,7 +466,7 @@ } /** *@brief display the popup with vat and explanation - *@param obj with 4 attributes gdossier, ctl,popup=20 + *@param obj with 4 attributes gdossier, ctl,popup */ function popup_select_tva(obj) { @@ -533,7 +533,7 @@ =20 /** *@brief display the popup with vat and explanation - *@param obj with 4 attributes gdossier, ctl,popup=20 + *@param obj with 4 attributes gdossier, ctl,popup */ function set_tva_label(obj) { @@ -595,7 +595,7 @@ } /** *@brief add dynamically a object for AJAX - *@param obj.=20 + *@param obj. * the attributes are * - style to add style * - id to add an id @@ -650,7 +650,7 @@ } /** * remove a object created with add_div - * @param elt id of the elt=20 + * @param elt id of the elt */ function removeDiv(elt) { @@ -704,7 +704,7 @@ } /** *@brief receive answer from ajax and just display it into the IBox - * XML must contains at least 2 fields : ctl is the ID of the IBOX and=20 + * XML must contains at least 2 fields : ctl is the ID of the IBOX and * code is the HTML to put in it *@see fill_box */ @@ -913,7 +913,7 @@ { alert("display_periode "+e.message); } - =20 + } function success_display_periode(req) { try @@ -951,7 +951,7 @@ { try { - var queryString=3D"?"+$(obj).serialize()+"&op=3Dsave_per"; + var queryString=3D$(obj).serialize()+"&op=3Dsave_per"; =20 var action =3D new Ajax.Request( "ajax_misc.php" , @@ -971,13 +971,13 @@ return false; } /** -*@brief basic answer to ajax on success, it will fill the ctl with=20 +*@brief basic answer to ajax on success, it will fill the ctl with * the code. In that case, you need to create the object before the Ajax.= Request -*The difference with success box is that=20 +*The difference with success box is that *@see add_div removeDiv success_box is that the width and height are not= changed *@parameter ctl is the ID of the object containing the html (div, button= ...) *@parameter code is the html code, with it you fill the ctl element -*/=20 +*/ function fill_box(req) { try{ @@ -989,7 +989,7 @@ var code_html=3DgetNodeText(html[0]); // Firefox ne prend que les 4096 = car. code_html=3Dunescape_xml(code_html); $(name_ctl).innerHTML=3Dcode_html; - }=20 + } catch (e) { alert(e.message);} try{ @@ -1001,13 +1001,13 @@ } /** *display a popin to let you modified a predefined operation -*@param dossier_id=20 +*@param dossier_id *@param od_id from table op_predef */ function mod_predf_op(dossier_id,od_id) { var target=3D"mod_predf_op"; - if ( $(target))=20 + if ( $(target)) { removeDiv(target); } @@ -1016,11 +1016,11 @@ var str_style=3D"top:"+sx+";left:"+sy; =20 var div=3D{id:target, cssclass:'op_detail',style:str_style,html:load= ing(),drag:1}; - =20 + add_div(div); =20 - var qs=3D"?gDossier=3D"+dossier_id+'&op=3Dmod_predf&id=3D'+od_id; - =20 + var qs=3D"gDossier=3D"+dossier_id+'&op=3Dmod_predf&id=3D'+od_id; + var action=3Dnew Ajax.Request ( 'ajax_misc.php', { method:'get', @@ -1034,7 +1034,7 @@ =20 function save_predf_op(obj) { - var querystring=3D"?"+$(obj).serialize()+'&op=3Dsave_predf'; + var querystring=3D$(obj).serialize()+'&op=3Dsave_predf'; // Create a ajax request to get all the person var action =3D new Ajax.Request ('ajax_misc.php', { @@ -1045,5 +1045,5 @@ } ); =20 - return false; =20 + return false; } Modified: phpcompta/trunk/html/js/slider.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/js/slider.js 2011-10-29 20:58:33 UTC (rev 4272) +++ phpcompta/trunk/html/js/slider.js 2011-10-29 20:59:04 UTC (rev 4273) @@ -1,6 +1,6 @@ -// script.aculo.us slider.js v1.8.3, Thu Oct 08 11:23:33 +0200 2009 +// script.aculo.us slider.js v1.9.0, Thu Dec 23 16:54:48 -0500 2010 =20 -// Copyright (c) 2005-2009 Marty Haught, Thomas Fuchs +// Copyright (c) 2005-2010 Marty Haught, Thomas Fuchs // // script.aculo.us is freely distributable under the terms of an MIT-sty= le license. // For details, see the script.aculo.us web site: http://script.aculo.us= / Modified: phpcompta/trunk/html/js/sound.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/js/sound.js 2011-10-29 20:58:33 UTC (rev 4272) +++ phpcompta/trunk/html/js/sound.js 2011-10-29 20:59:04 UTC (rev 4273) @@ -1,6 +1,6 @@ -// script.aculo.us sound.js v1.8.3, Thu Oct 08 11:23:33 +0200 2009 +// script.aculo.us sound.js v1.9.0, Thu Dec 23 16:54:48 -0500 2010 =20 -// Copyright (c) 2005-2009 Thomas Fuchs (http://script.aculo.us, http://= mir.aculo.us) +// Copyright (c) 2005-2010 Thomas Fuchs (http://script.aculo.us, http://= mir.aculo.us) // // Based on code created by Jules Gravinese (http://www.webveteran.com/) // Modified: phpcompta/trunk/html/js/unittest.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/js/unittest.js 2011-10-29 20:58:33 UTC (rev 4272= ) +++ phpcompta/trunk/html/js/unittest.js 2011-10-29 20:59:04 UTC (rev 4273= ) @@ -1,8 +1,8 @@ -// script.aculo.us unittest.js v1.8.3, Thu Oct 08 11:23:33 +0200 2009 +// script.aculo.us unittest.js v1.9.0, Thu Dec 23 16:54:48 -0500 2010 =20 -// Copyright (c) 2005-2009 Thomas Fuchs (http://script.aculo.us, http://= mir.aculo.us) -// (c) 2005-2009 Jon Tirsen (http://www.tirsen.com) -// (c) 2005-2009 Michael Schuerig (http://www.schuerig.de/mich= ael/) +// Copyright (c) 2005-2010 Thomas Fuchs (http://script.aculo.us, http://= mir.aculo.us) +// (c) 2005-2010 Jon Tirsen (http://www.tirsen.com) +// (c) 2005-2010 Michael Schuerig (http://www.schuerig.de/mich= ael/) // // script.aculo.us is freely distributable under the terms of an MIT-sty= le license. // For details, see the script.aculo.us web site: http://script.aculo.us= / Modified: phpcompta/trunk/include/class_icard.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_icard.php 2011-10-29 20:58:33 UTC (rev = 4272) +++ phpcompta/trunk/include/class_icard.php 2011-10-29 20:59:04 UTC (rev = 4273) @@ -41,8 +41,8 @@ * * Set the hidden field or input field to be set by javascript with the = function set_attribute * call the input method. After selecting a value the update_value funct= ion is called. If you need - * to modify the queryString before the request is sent, you'll use the = set_callback; the first=20 - * parameter is the INPUT field and the second the queryString, the func= tion must returns a=20 + * to modify the queryString before the request is sent, you'll use the = set_callback; the first + * parameter is the INPUT field and the second the queryString, the func= tion must returns a * queryString *\code // insert all the javascript files @@ -50,8 +50,8 @@ echo js_include('scriptaculous.js'); echo js_include('effects.js'); echo js_include('controls.js'); -=20 -//=20 + +// $W1=3Dnew ICard(); $W1->label=3D"Client ".HtmlInput::infobulle(0) ; $W1->name=3D"e_client"; @@ -60,18 +60,18 @@ $W1->table=3D0; // If double click call the javascript fill_ipopcard $W1->set_dblclick("fill_ipopcard(this);"); -=20 + // Type of card : deb, cred or all $W1->set_attribute('typecard','deb'); -=20 + $W1->extra=3D'deb'; -=20 + // Add the callback function to filter the card on the jrn $W1->set_callback('filter_card'); -=20 + // when value selected in the autcomplete $W1->set_function('fill_data'); -=20 + // when the data change $W1->javascript=3Dsprintf(' onchange=3D"fill_data_onchange(\'%s\');" '= , $W1->name); @@ -83,9 +83,9 @@ $f_client=3D$client_label->input("e_client_label",$e_client_label); =20 $f_client_qcode=3D$W1->input(); -=20 + // Search button for card - $f_client_bt=3D$W1->search();=20 + $f_client_bt=3D$W1->search(); * \endcode For searching a card, you need a popup, the script card.js and set the values for card, popup filter_card callback @@ -95,10 +95,10 @@ $card->extra=3D"all"; $card->set_attribute('typecard','all'); $card->set_callback('filter_card'); -=20 + echo $card->input(); echo $card->search(); -// example 2=20 +// example 2 $w=3Dnew ICard("av_text".$attr->ad_id); // filter on frd_id $sql=3D' select fd_id from fiche_def where frd_id in ('.FICHE_TYPE_CLIEN= T.','.FICHE_TYPE_FOURNISSEUR.','.FICHE_TYPE_ADM_TAX.')'; @@ -107,7 +107,7 @@ $w->set_attribute('typecard',$filter); $w->set_attribute('inp',"av_text".$attr->ad_id); $w->set_attribute('label',"av_text".$attr->ad_id."_label"); -=20 + $w->extra=3D$filter; $w->extra2=3D0; $label=3Dnew ISpan(); @@ -129,8 +129,8 @@ $this->javascript=3D''; } /*!\brief set the javascript callback function - * by default it is update_value called BEFORE the querystring is se= nd=20 - *=20 + * by default it is update_value called BEFORE the querystring is se= nd + * *\param $p_name callback function name */ function set_callback($p_name) @@ -214,7 +214,7 @@ '', $this->name); =20 - $div=3Dsprintf('
', + $div=3Dsprintf('
<= /div>', $this->name); =20 $query=3Ddossier::get().'&e=3D'.urlencode($this->typecard); @@ -249,7 +249,7 @@ /** *@brief return a string containing the button for displaying * a search form. When clicking on the result, update the input text= file - * the common used attribute as=20 + * the common used attribute as * - jrn the ledger * - label the field to update * - name name of the input text @@ -346,7 +346,7 @@ ajaxFid(text); } -=09 + EOF; echo ""; $l=3Dnew IText('ctl_label'); From MAILER-DAEMON Sat Oct 29 18:13:05 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RKH9F-0005si-M2 for mharc-phpcompta-dev@gnu.org; Sat, 29 Oct 2011 18:13:05 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sun, 30 Oct 2011 00:19:51 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4274 - in phpcompta/trunk: html include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Oct 2011 22:13:04 -0000 Author: danydb Date: 2011-10-30 00:19:49 +0200 (Sun, 30 Oct 2011) New Revision: 4274 Modified: phpcompta/trunk/html/do.php phpcompta/trunk/html/style-color.css phpcompta/trunk/include/class_user.php phpcompta/trunk/include/pref.inc.php Log: #420: R?\195?\169?\195?\169criture pr?\195?\169ference Modified: phpcompta/trunk/html/do.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/do.php 2011-10-29 20:59:04 UTC (rev 4273) +++ phpcompta/trunk/html/do.php 2011-10-29 22:19:49 UTC (rev 4274) @@ -29,6 +29,7 @@ require_once('user_common.php'); require_once('ac_common.php'); require_once 'function_javascript.php'; +if (isset ($_POST["style_user"])){$_SESSION['g_theme']=3D$_POST['style_u= ser'];} html_page_start(); global $g_user, $cn; =20 Modified: phpcompta/trunk/html/style-color.css =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/style-color.css 2011-10-29 20:59:04 UTC (rev 427= 3) +++ phpcompta/trunk/html/style-color.css 2011-10-29 22:19:49 UTC (rev 427= 4) @@ -768,7 +768,7 @@ =20 .button { font-size:10; - color:black; + color:white; text-decoration:none; font-family: helvetica,arial,sans-serif; background-color:#DFDFDF; Modified: phpcompta/trunk/include/class_user.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_user.php 2011-10-29 20:59:04 UTC (rev 4= 273) +++ phpcompta/trunk/include/class_user.php 2011-10-29 22:19:49 UTC (rev 4= 274) @@ -159,7 +159,7 @@ =20 } $sql=3D"insert into audit_connect (ac_user,ac_ip,ac_module,ac_url,ac_st= ate) values ($1,$2,$3,$4,$5)"; -=09 + if ( $res =3D=3D 0 ) { $cn->exec_sql($sql,array($_SESSION['g_user'],$_SERVER["REMOTE_ADDR"= ],$from,$_SERVER['REQUEST_URI'],'FAIL')); @@ -388,7 +388,7 @@ =20 $sql=3Dsprintf("insert into user_local_pref (user_id,parameter_v= alue,parameter_type) values ('%s','%d','PERIODE')", - $this->id,$pid); + $this->login,$pid); $Res=3D$this->db->exec_sql($sql); } =20 @@ -442,16 +442,35 @@ =20 =20 } + function save_global_preference($key,$value) + { + $repo=3Dnew Database(); + $count=3D$repo->get_value("select count(*) + from + user_global_pref + where + parameter_type=3D$1 and user_id=3D$2", + array($key,$this->login)); + if ( $count =3D=3D 1 ) + { + $repo->exec_sql("update user_global_pref set parameter_value=3D$1 + where parameter_type=3D$2 and user_id=3D$3", + array($value,$key,$this->login)); + } elseif($count =3D=3D 0) + { + $repo->exec_sql("insert into user_global_pref(user_id,parameter_typ= e,parameter_value) + values($1,$2,$3)",array($this->login,$key,$value)); + } + } =20 - /*! * \brief Get the default user's preferences * \return array of (parameter_type =3D> parameter_value) */ function get_preference () { - $sql=3D"select parameter_type,parameter_value from user_local_pr= ef where user_id=3D'".$this->id."'"; - $Res=3D$this->db->exec_sql($sql); + $sql=3D"select parameter_type,parameter_value from user_local_pr= ef where user_id=3D$1"; + $Res=3D$this->db->exec_sql($sql,array($this->id)); $l_array=3Darray(); for ( $i =3D0;$i < Database::num_row($Res);$i++) { Modified: phpcompta/trunk/include/pref.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/pref.inc.php 2011-10-29 20:59:04 UTC (rev 427= 3) +++ phpcompta/trunk/include/pref.inc.php 2011-10-29 22:19:49 UTC (rev 427= 4) @@ -31,41 +31,66 @@ require_once('class_periode.php'); echo '
'; //---------------------------------------------------------------------- -// Change password -if ( isset ($_POST['val'])) +// +global $g_user; +$inside_dossier =3D false; + +if (isset($_REQUEST['gDossier'])) { - /* - * @todo save the preference - */ - var_dump($_POST); + $g_user->load_global_pref(); + $msg =3D ""; + $cn =3D new Database($_REQUEST['gDossier']); + $g_user->cn =3D $cn; + $inside_dossier =3D true; + $local_pref=3D$g_user->get_preference(); } -if (isset($_POST['pass_1']) - && strlen(trim($_POST['pass_1'])) !=3D 0) +//// Save value +if (isset($_POST['val'])) { - if ($_POST['pass_1'] !=3D $_POST['pass_2']) + extract($_POST); + + if (strlen(trim($pass_1)) !=3D 0 && strlen(trim($pass_2)) !=3D 0) { - alert(_("Les mots de passe ne correspondent pas. Mot de passe inchang=C3= =A9")); + if ($pass_1 =3D=3D $pass_2) + { + $repo =3D new Database(); + $l_pass =3D md5($_POST['pass_1']); + $repo->exec_sql("update ac_users set use_pass=3D$1 where use_login=3D= $2", array($l_pass, $_SESSION['g_user'])); + $_SESSION['g_pass'] =3D $_POST['pass_1']; + echo "" . _('Mot de passe est modifi=C3=A9e') . ""; + } + else + { + alert(_("Les mots de passe ne correspondent pas. Mot de passe incha= ng=C3=A9")); + } } - else + if ($inside_dossier) { - $Rep =3D new Database(); - $l_pass =3D md5($_POST['pass_1']); - $Res =3D $Rep->exec_sql("update ac_users set use_pass=3D'$l_pass' where= use_login=3D'" . $_SESSION['g_user'] . "'"); - $pass =3D $_POST['pass_1']; - $_SESSION['g_pass'] =3D $_POST['pass_1']; - $g_pass =3D $_POST['pass_1']; - echo "" . _('Mot de passe est modifi=C3=A9e') . ""; + $g_user->set_periode($period); + $g_user->save_global_preference('THEME', $style_user); + $g_user->save_global_preference('LANG', $lang); + $g_user->save_global_preference('PAGESIZE', $p_size); + $g_user->set_mini_report($minirap); + $_SESSION['g_theme']=3D$style_user; + $_SESSION['g_pagesize']=3D$p_size; + $_SESSION['g_lang']=3D$lang; } } =20 -if (!isset($_REQUEST['gDossier'])) -{ - echo HtmlInput::button_anchor(_('Retour'), 'user_login.php?'); -} -else -{ +////////////////////////////////////////////////////////////////////////= // +// Theme +////////////////////////////////////////////////////////////////////////= // + + $repo =3D new Database(); +// charge tous les styles + $res =3D $repo->exec_sql("select the_name from theme + order by the_name"); + $style =3D new ISelect('style_user'); + $style->value =3D $repo->make_array("select the_name,the_name + from theme + order by the_name"); + $style->selected =3D$_SESSION['g_theme']; echo '

' . _('Changez vos pr=C3=A9f=C3=A9rences')= . '

'; -} ?> =20
@@ -80,67 +105,24 @@ -exec_sql("select the_name from theme - order by the_name"); - $astyle =3D array(); - for ($i =3D 0; $i < Database::num_row($res); $i++) - { - $st =3D Database::fetch_array($res, $i); - $astyle[] =3D $st['the_name']; - } -// Formatte le display - $disp_style =3D ""; - ?> -

+ - + - + input();?> =20 cn =3D $cn; - - if (isset($_POST['period'])) - { - $periode =3D $_POST["period"]; - $g_user->set_periode($periode); - } - $l_user_per =3D $g_user->get_periode(); if ($l_user_per =3D=3D "") $l_user_per =3D $cn->get_value("select min(p_id) from parm_periode wh= ere p_closed=3D'f'"); =20 - // if periode is closed then warns the users +// if periode is closed then warns the users $period =3D new Periode($cn, $l_user_per); =20 $period->p_id =3D $l_user_per; @@ -151,7 +133,6 @@ $msg =3D '

' . $msg . '

'; } =20 - $period =3D new IPeriod("period"); $period->user =3D $g_user; $period->cn =3D $cn; @@ -160,88 +141,85 @@ $period->type =3D ALL; $l_form_per =3D $period->input(); ?> - + - + - + + + + =20 - - - - - - - + + + -'; - echo '' . _('Options pour la page d\'accueil') . ''= ; - echo _('Mini-Rapport : '); - $rapport =3D new Acc_Report($cn); - $aRapport =3D $rapport->make_array(); - $aRapport[] =3D array("value" =3D> 0, "label" =3D> _('Aucun mini rap= port')); - $wRapport =3D new ISelect(); - $wRapport->name =3D "minirap"; - $wRapport->selected =3D $g_user->get_mini_report(); - $wRapport->value =3D $aRapport; - echo $wRapport->input(); - echo '' . _('Le mini rapport est un rapport q= ui s\'affiche sur votre page d\'accueil') . ''; - echo ''; -} + '; + echo '' . _('Options pour la page d\'accueil') . '= '; + echo _('Mini-Rapport : '); + $rapport =3D new Acc_Report($cn); + $aRapport =3D $rapport->make_array(); + $aRapport[] =3D array("value" =3D> 0, "label" =3D> _('Aucun mini ra= pport')); + $wRapport =3D new ISelect(); + $wRapport->name =3D "minirap"; + $wRapport->selected =3D $g_user->get_mini_report(); + $wRapport->value =3D $aRapport; + echo $wRapport->input(); + echo '' . _('Le mini rapport est un rapport = qui s\'affiche sur votre page d\'accueil') . ''; + echo ''; + } =20 -echo '
'; -echo '' . _('Langue') . ''; -echo _('Selectionnez votre langue'); -$aLang =3D array(array(_('Fran=C3=A7ais'), 'fr_FR.utf8'), - array(_('Anglais'), 'en_US.utf8'), - array(_('N=C3=A9erlandais'), 'nl_NL.utf8'), - ); -echo ''; -echo '
'; + echo '
'; + echo '' . _('Langue') . ''; + echo _('Selectionnez votre langue'); + $aLang =3D array(array(_('Fran=C3=A7ais'), 'fr_FR.utf8'), + array(_('Anglais'), 'en_US.utf8'), + array(_('N=C3=A9erlandais'), 'nl_NL.utf8'), + ); + echo ''; + echo '
'; =20 =20 -echo HtmlInput::submit("val", _("Valider")); -echo ''; + echo HtmlInput::submit("val", _("Valider")); + echo ''; =20 =20 =20 =20 -if (!$inside_dossier) -{ -echo HtmlInput::button_anchor(_('Retour'), 'user_login.php?'); -} + if (!$inside_dossier) + { + echo HtmlInput::button_anchor(_('Retour'), 'user_login.php?'); + } =20 =20 =20 -echo "
"; -?> + echo "
"; + ?> From MAILER-DAEMON Sat Oct 29 19:23:36 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RKIFU-0002MM-23 for mharc-phpcompta-dev@gnu.org; Sat, 29 Oct 2011 19:23:36 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sun, 30 Oct 2011 01:30:19 +0200 (CEST) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4275 - phpcompta/trunk/html X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Oct 2011 23:23:34 -0000 Author: danydb Date: 2011-10-30 01:30:17 +0200 (Sun, 30 Oct 2011) New Revision: 4275 Modified: phpcompta/trunk/html/style-light.css Log: style-light : span.informal font-size Modified: phpcompta/trunk/html/style-light.css =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/style-light.css 2011-10-29 22:19:49 UTC (rev 427= 4) +++ phpcompta/trunk/html/style-light.css 2011-10-29 23:30:17 UTC (rev 427= 5) @@ -682,7 +682,7 @@ =20 } span.informal { - font-size:10px; + font-size:12px; =20 } div.autocomplete em { From MAILER-DAEMON Sun Oct 30 13:09:11 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RKYsh-0001Sq-J6 for mharc-phpcompta-dev@gnu.org; Sun, 30 Oct 2011 13:09:11 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sun, 30 Oct 2011 18:15:54 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r188 - in trunk/amortis: . include include/template X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Oct 2011 17:09:10 -0000 Author: danydb Date: 2011-10-30 18:15:52 +0100 (Sun, 30 Oct 2011) New Revision: 188 Modified: trunk/amortis/amortize_javascript.js trunk/amortis/include/am_card.php trunk/amortis/include/am_histo.inc.php trunk/amortis/include/am_print.php trunk/amortis/include/am_util.php trunk/amortis/include/print_all.inc.php trunk/amortis/include/print_fiche.inc.php trunk/amortis/include/print_table.inc.php trunk/amortis/include/template/listing_histo.php trunk/amortis/include/template/listing_year.php trunk/amortis/index.php Log: Adapt prototype.js Modified: trunk/amortis/amortize_javascript.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/amortis/amortize_javascript.js 2011-09-08 17:50:04 UTC (rev 187= ) +++ trunk/amortis/amortize_javascript.js 2011-10-30 17:15:52 UTC (rev 188= ) @@ -3,8 +3,8 @@ */ function add_material(dossier_id,plugin_code,target) { - var qs=3D"?gDossier=3D"+dossier_id+'&plugin_code=3D'+plugin_code+'&o= p=3Dadd_mat&t=3D'+target; - =20 + var qs=3D"gDossier=3D"+dossier_id+'&plugin_code=3D'+plugin_code+'&op= =3Dadd_mat&t=3D'+target; + var action=3Dnew Ajax.Request ( 'ajax.php', { method:'get', @@ -13,7 +13,7 @@ onSuccess:success_add_material } ); - if ( $(target))=20 + if ( $(target)) { removeDiv(target); } @@ -30,14 +30,14 @@ var str_style=3D"top:"+sx+";width:50%;height:70%"; =20 var div=3D{id:target, cssclass:'op_detail',style:str_style,html:load= ing()}; - =20 + add_div(div); =20 } function display_material(dossier_id,f_id,plugin_code,target) { - var qs=3D"?gDossier=3D"+dossier_id+'&plugin_code=3D'+plugin_code+'&o= p=3Ddisplay_modify&t=3D'+target+'&f=3D'+f_id; - =20 + var qs=3D"gDossier=3D"+dossier_id+'&plugin_code=3D'+plugin_code+'&op= =3Ddisplay_modify&t=3D'+target+'&f=3D'+f_id; + var action=3Dnew Ajax.Request ( 'ajax.php', { method:'get', @@ -46,7 +46,7 @@ onSuccess:success_add_material } ); - if ( $(target))=20 + if ( $(target)) { removeDiv(target); } @@ -63,7 +63,7 @@ var str_style=3D"top:"+sx+";width:50%;height:auto"; =20 var div=3D{id:target, cssclass:'op_detail',style:str_style,html:load= ing()}; - =20 + add_div(div); =20 } @@ -82,7 +82,7 @@ function save_new_material(obj) { =20 - var querystring=3D"?"+$(obj).serialize()+'&op=3Dsave_new_material&t=3D= bxmat'; + var querystring=3D$(obj).serialize()+'&op=3Dsave_new_material&t=3Dbx= mat'; =20 // Create a ajax request to get all the person var action =3D new Ajax.Request ('ajax.php', @@ -94,7 +94,7 @@ } ); =20 - return false; =20 + return false; } =20 function success_save_new_material(req) @@ -104,7 +104,7 @@ } function save_modify(obj) { - var querystring=3D"?"+$(obj).serialize()+'&op=3Dsave_modify&t=3Dbxm= at'; + var querystring=3D$(obj).serialize()+'&op=3Dsave_modify&t=3Dbxmat'; =20 // Create a ajax request to get all the person var action =3D new Ajax.Request ('ajax.php', @@ -116,8 +116,8 @@ } ); =20 - return false; =20 - =20 + return false; + } function success_save_modify(req) { @@ -127,7 +127,7 @@ function remove_mat(g_dossier,plugin_code,a_id) { if ( ! confirm('Vous confirmez EFFACEMENT')) { return false;} - var qs=3D"?gDossier=3D"+g_dossier+"&plugin_code=3D"+plugin_code+"&a_= id=3D"+a_id+"&op=3Drm&t=3Dbxmat"; =20 + var qs=3D"gDossier=3D"+g_dossier+"&plugin_code=3D"+plugin_code+"&a_i= d=3D"+a_id+"&op=3Drm&t=3Dbxmat"; var action=3Dnew Ajax.Request ( 'ajax.php', { method:'get', @@ -136,15 +136,15 @@ onSuccess:success_add_material } ); -=20 =20 - =20 + + } =20 function list_csv(obj) { alert ("dossier =3D "+obj.dossier+" plugin :"+obj.plugin+" year "+ob= j.year); - var qs=3D"?gDossier=3D"+obj.dossier+"&plugin_code=3D"+obj.plugin+"&l= ist_year=3D1"+"&year=3D"+obj.year; + var qs=3D"gDossier=3D"+obj.dossier+"&plugin_code=3D"+obj.plugin+"&li= st_year=3D1"+"&year=3D"+obj.year; var action=3Dnew Ajax.Request ( 'extension.raw.php', { method:'get', @@ -153,6 +153,6 @@ onSuccess:null } ); -=20 =20 + } \ No newline at end of file Modified: trunk/amortis/include/am_card.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/amortis/include/am_card.php 2011-09-08 17:50:04 UTC (rev 187) +++ trunk/amortis/include/am_card.php 2011-10-30 17:15:52 UTC (rev 188) @@ -37,6 +37,7 @@ echo dossier::hidden(); echo HtmlInput::hidden('plugin_code',$_REQUEST['plugin_code']); echo HtmlInput::hidden('sa',$_REQUEST['sa']); +echo HtmlInput::hidden('ac',$_REQUEST['ac']); $ck=3Dnew ICheckBox('all'); $ck->selected=3D(isset ($_GET['all']))?true:false; echo '

Tous les biens y compris ceux qui sont compl=C3=A9tement amort= is '.$ck->input(); Modified: trunk/amortis/include/am_histo.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/amortis/include/am_histo.inc.php 2011-09-08 17:50:04 UTC (rev 1= 87) +++ trunk/amortis/include/am_histo.inc.php 2011-10-30 17:15:52 UTC (rev 1= 88) @@ -21,11 +21,11 @@ // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr =20 /*!\file - * \brief print all=20 + * \brief print all */ $sql=3D"select quick_code,a_id,ha_id,h_amount,jr_internal,h_year,h_pj,vw= _name from amortissement.amortissement join amortissement.amortissement_h= isto using (a_id) join vw_fiche_attr using(f_id) where h_amount > 0 order= by vw_name"; =20 -$array=3D$cn->get_array($sql); + if ( isset($_POST['remove'])) { for ($i=3D0;$iget_array($sql); require_once('template/listing_histo.php'); =20 Modified: trunk/amortis/include/am_print.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/amortis/include/am_print.php 2011-09-08 17:50:04 UTC (rev 187) +++ trunk/amortis/include/am_print.php 2011-10-30 17:15:52 UTC (rev 188) @@ -23,10 +23,10 @@ /*!\file * \brief this file let you print a report about * - card (simple listing) - * - paid off of the selected year=20 + * - paid off of the selected year * - ... */ -$url=3D'?'.dossier::get().'&plugin_code=3D'.$_REQUEST['plugin_code'].'&s= a=3Dreport'; +$url=3D'?'.dossier::get().'&plugin_code=3D'.$_REQUEST['plugin_code'].'&s= a=3Dreport'."&ac=3D".$_REQUEST['ac']; =20 $menu=3Darray( array($url.'&sb=3Ddfiche','D=C3=A9tail fiche',' D=C3=A9tail fiche '= ,1), Modified: trunk/amortis/include/am_util.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/amortis/include/am_util.php 2011-09-08 17:50:04 UTC (rev 187) +++ trunk/amortis/include/am_util.php 2011-10-30 17:15:52 UTC (rev 188) @@ -24,7 +24,7 @@ * \brief let you generate the accounting for the paid off for a selecte= d * year history and remove */ -$url=3D'?'.dossier::get().'&plugin_code=3D'.$_REQUEST['plugin_code'].'&s= a=3Dutil'; +$url=3D'?'.dossier::get().'&plugin_code=3D'.$_REQUEST['plugin_code'].'&s= a=3Dutil'.'&ac=3D'.$_REQUEST['ac']; =20 $menu=3Darray( array($url.'&sb=3Dgenerate','G=C3=A9n=C3=A9re =C3=A9criture',' G=C3= =A9n=C3=A9ration =C3=A9criture comptable ',1), Modified: trunk/amortis/include/print_all.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/amortis/include/print_all.inc.php 2011-09-08 17:50:04 UTC (rev = 187) +++ trunk/amortis/include/print_all.inc.php 2011-10-30 17:15:52 UTC (rev = 188) @@ -35,6 +35,7 @@

+
Modified: trunk/amortis/include/print_fiche.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/amortis/include/print_fiche.inc.php 2011-09-08 17:50:04 UTC (re= v 187) +++ trunk/amortis/include/print_fiche.inc.php 2011-10-30 17:15:52 UTC (re= v 188) @@ -27,6 +27,7 @@ echo '
'; echo HtmlInput::hidden('sa',$_REQUEST['sa']); echo HtmlInput::hidden('sb',$_REQUEST['sb']); +echo HtmlInput::hidden('ac',$_REQUEST['ac']); echo HtmlInput::hidden('plugin_code',$_REQUEST['plugin_code']); echo dossier::hidden(); $list=3D$cn->make_list('select fd_id from fiche_def where frd_id=3D7'); @@ -53,7 +54,7 @@ echo "Fiche ".$p_card->input().$p_card->search(); echo HtmlInput::submit('search','Accepter'); echo '
'; - =20 + echo '
'; echo HtmlInput::hidden('sa',$_REQUEST['sa']); echo HtmlInput::hidden('sb',$_REQUEST['sb']); @@ -61,7 +62,7 @@ echo dossier::hidden(); echo HtmlInput::submit('pdf_all','Toutes les fiches en PDF'); echo '
'; - =20 + if ( isset($_GET['search'])) { $a=3Dnew Am_Card(); Modified: trunk/amortis/include/print_table.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/amortis/include/print_table.inc.php 2011-09-08 17:50:04 UTC (re= v 187) +++ trunk/amortis/include/print_table.inc.php 2011-10-30 17:15:52 UTC (re= v 188) @@ -28,6 +28,7 @@ echo '
'; echo HtmlInput::hidden('sa',$_REQUEST['sa']); echo HtmlInput::hidden('sb',$_REQUEST['sb']); +echo HtmlInput::hidden('ac',$_REQUEST['ac']); echo HtmlInput::hidden('plugin_code',$_REQUEST['plugin_code']); echo dossier::hidden(); $year=3Dnew INum('p_year'); Modified: trunk/amortis/include/template/listing_histo.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/amortis/include/template/listing_histo.php 2011-09-08 17:50:04 = UTC (rev 187) +++ trunk/amortis/include/template/listing_histo.php 2011-10-30 17:15:52 = UTC (rev 188) @@ -4,6 +4,7 @@ @@ -25,7 +26,7 @@ echo td($array[$i]['vw_name']); echo td(nbm($array[$i]['h_amount']), 'align=3D"right"'); echo td($array[$i]['h_year'],'align=3D"center"'); - =20 + echo td($array[$i]['h_pj']); $msg=3D''; if ( $array[$i]['jr_internal'] !=3D '' ) @@ -37,9 +38,9 @@ $ic=3Dnew ICheckBox('p_sel[]'); =20 echo td($ic->input().HtmlInput::hidden('h[]',$array[$i]['ha_id'])); - =20 =20 =20 + echo ''; endfor; ?> Modified: trunk/amortis/include/template/listing_year.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/amortis/include/template/listing_year.php 2011-09-08 17:50:04 U= TC (rev 187) +++ trunk/amortis/include/template/listing_year.php 2011-10-30 17:15:52 U= TC (rev 188) @@ -2,7 +2,7 @@ =20 + @@ -24,7 +24,7 @@ echo td($fiche->strAttribut(ATTR_DEF_QUICKCODE)); echo td($fiche->strAttribut(ATTR_DEF_NAME)); echo td(format_date($array[$i]['a_date'])); -=09 + echo td($array[$i]['a_start']); =20 echo td(nbm($array[$i]['a_amount']),'style=3D"text-align:right"'); @@ -44,11 +44,11 @@ $pct=3D$cn->get_value("select ad_percentage from amortissement.amortis= sement_detail where a_id=3D$1 and ad_year =3D $2", array($array[$i]['a_id'],$year)); - =09 =20 + echo td(nbm($remain),'style=3D"text-align:right"'); echo td(nbm($amortize),'style=3D"text-align:right"'); - echo td(nbm($pct),'style=3D"text-align:right"'); =09 + echo td(nbm($pct),'style=3D"text-align:right"'); echo td(nbm($toamortize),'style=3D"text-align:right"'); echo ''; endfor; @@ -81,6 +81,7 @@ + Modified: trunk/amortis/index.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/amortis/index.php 2011-09-08 17:50:04 UTC (rev 187) +++ trunk/amortis/index.php 2011-10-30 17:15:52 UTC (rev 188) @@ -35,7 +35,7 @@ ob_clean(); echo create_script($j); =20 -$url=3D'?'.dossier::get().'&plugin_code=3D'.$_REQUEST['plugin_code']; +$url=3D'?'.dossier::get().'&plugin_code=3D'.$_REQUEST['plugin_code'].'&a= c=3D'.$_REQUEST['ac']; =20 $cn=3Dnew Database (dossier::id()); =20 From MAILER-DAEMON Sun Oct 30 14:08:52 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RKZoS-0006I1-UG for mharc-phpcompta-dev@gnu.org; Sun, 30 Oct 2011 14:08:52 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sun, 30 Oct 2011 19:15:38 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4276 - phpcompta/trunk/html/js X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Oct 2011 18:08:51 -0000 Author: danydb Date: 2011-10-30 19:15:37 +0100 (Sun, 30 Oct 2011) New Revision: 4276 Modified: phpcompta/trunk/html/js/calendar.js Log: Correct calendar for prototype 1.9 Modified: phpcompta/trunk/html/js/calendar.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/js/calendar.js 2011-10-29 23:30:17 UTC (rev 4275= ) +++ phpcompta/trunk/html/js/calendar.js 2011-10-30 18:15:37 UTC (rev 4276= ) @@ -1790,7 +1790,11 @@ return str; }; =20 -Date.prototype.__msh_oldSetFullYear =3D Date.prototype.setFullYear; + if ( Date.prototype.__msh_oldSetFullYear =3D=3D null ) + { + Date.prototype.__msh_oldSetFullYear =3D Date.prototype.setFullYe= ar; + } +//Date.prototype.__msh_oldSetFullYear =3D Date.prototype.setFullYear; Date.prototype.setFullYear =3D function(y) { var d =3D new Date(this); d.__msh_oldSetFullYear(y); From MAILER-DAEMON Sun Oct 30 15:24:25 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RKazZ-0005RG-0K for mharc-phpcompta-dev@gnu.org; Sun, 30 Oct 2011 15:24:25 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sun, 30 Oct 2011 20:31:08 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4277 - phpcompta/trunk/doc/developper X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Oct 2011 19:24:23 -0000 Author: danydb Date: 2011-10-30 20:31:06 +0100 (Sun, 30 Oct 2011) New Revision: 4277 Modified: phpcompta/trunk/doc/developper/Doxyfile Log: Update doxyfile Modified: phpcompta/trunk/doc/developper/Doxyfile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/doc/developper/Doxyfile 2011-10-30 18:15:37 UTC (rev = 4276) +++ phpcompta/trunk/doc/developper/Doxyfile 2011-10-30 19:31:06 UTC (rev = 4277) @@ -654,13 +654,13 @@ # excluded from the INPUT source files. This way you can easily exclude = a # subdirectory from a directory tree whose root is specified with the IN= PUT tag. =20 -EXCLUDE =3D ../../html/addon +EXCLUDE =3D ../../html/addon ../../include/tfpdf =20 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or # directories that are symbolic links (a Unix filesystem feature) are ex= cluded # from the input. =20 -EXCLUDE_SYMLINKS =3D NO +EXCLUDE_SYMLINKS =3D YES =20 # If the value of the INPUT tag contains directories, you can use the # EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclu= de @@ -673,8 +673,19 @@ ?.php \ test*.php \ calendar-*.js \ - richtext.js + richtext.js \ + builder.js \ + controls.js \ + dragdrop.js \ + effects.js \ + prototype.js \ + scriptaculous.js \ + scripts.js \ + slider.js \ + sound.js \ + unittest.js. =20 + # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol name= s # (namespaces, classes, functions, etc.) that should be excluded from th= e # output. The symbol name can be a fully qualified name, a word, or if t= he From MAILER-DAEMON Sun Oct 30 15:25:31 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RKb0d-0005Xx-5J for mharc-phpcompta-dev@gnu.org; Sun, 30 Oct 2011 15:25:31 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sun, 30 Oct 2011 20:32:17 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4278 - in phpcompta/trunk: html include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Oct 2011 19:25:30 -0000 Author: danydb Date: 2011-10-30 20:32:17 +0100 (Sun, 30 Oct 2011) New Revision: 4278 Modified: phpcompta/trunk/html/do.php phpcompta/trunk/include/ac_common.php phpcompta/trunk/include/function_javascript.php Log: html_page and load_all_script can be called only once. Otherwise, there a= re problem with calendar.js Modified: phpcompta/trunk/html/do.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/do.php 2011-10-30 19:31:06 UTC (rev 4277) +++ phpcompta/trunk/html/do.php 2011-10-30 19:32:17 UTC (rev 4278) @@ -30,7 +30,9 @@ require_once('ac_common.php'); require_once 'function_javascript.php'; if (isset ($_POST["style_user"])){$_SESSION['g_theme']=3D$_POST['style_u= ser'];} -html_page_start(); + +html_page_start($_SESSION['g_theme']); + global $g_user, $cn; =20 // if gDossier is not set redirect to form to choose a folder @@ -50,7 +52,6 @@ exit(); } =20 -html_page_start($_SESSION['g_theme']); load_all_script(); /* Check Browser version if < IE6 then unsupported */ $browser =3D $_SERVER['HTTP_USER_AGENT']; Modified: phpcompta/trunk/include/ac_common.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/ac_common.php 2011-10-30 19:31:06 UTC (rev 42= 77) +++ phpcompta/trunk/include/ac_common.php 2011-10-30 19:32:17 UTC (rev 42= 78) @@ -245,12 +245,16 @@ * \param p_theme default theme * \param $p_script * \param $p_script2 another js script - * + * Must be called only once * \return none */ =20 function html_page_start($p_theme=3D"", $p_script=3D"", $p_script2=3D"") { + // check not called twiced + static $already_call=3D0; + if ( $already_call=3D=3D1)return; + $already_call=3D1; =20 $cn =3D new Database(); if ($p_theme !=3D "") Modified: phpcompta/trunk/include/function_javascript.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/function_javascript.php 2011-10-30 19:31:06 U= TC (rev 4277) +++ phpcompta/trunk/include/function_javascript.php 2011-10-30 19:32:17 U= TC (rev 4278) @@ -2708,7 +2708,7 @@ } /*!\brief When data are transfered thanks ajax in a xml document, the xm= l * can not contains some character, to escape those characters, we must = use this - * function=20 + * function *\param $p_xml the xml to escape *\return the xml string with the forbidden char escaped *\see ajax_card.js ajaxFid @@ -2728,6 +2728,11 @@ */ function load_all_script() { + // check not called twiced + static $already_call=3D0; + if ( $already_call=3D=3D1)return; + $already_call=3D1; + echo JS_INFOBULLE; echo js_include('prototype.js'); echo js_include('scriptaculous.js'); From MAILER-DAEMON Sun Oct 30 15:26:04 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RKb1A-0005ZE-IG for mharc-phpcompta-dev@gnu.org; Sun, 30 Oct 2011 15:26:04 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sun, 30 Oct 2011 20:32:48 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4279 - phpcompta/trunk/include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Oct 2011 19:26:02 -0000 Author: danydb Date: 2011-10-30 20:32:47 +0100 (Sun, 30 Oct 2011) New Revision: 4279 Modified: phpcompta/trunk/include/class_acc_ledger.php phpcompta/trunk/include/export_histo_csv.php phpcompta/trunk/include/export_ledger_csv.php Log: improve query, to avoid call to get_tiers Modified: phpcompta/trunk/include/class_acc_ledger.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_acc_ledger.php 2011-10-30 19:32:17 UTC = (rev 4278) +++ phpcompta/trunk/include/class_acc_ledger.php 2011-10-30 19:32:47 UTC = (rev 4279) @@ -737,24 +737,8 @@ // =20 $href=3Dbasename($_SERVER['PHP_SELF']); - /* switch ($href) - { - // user_jrn.php - case 'compta.php': - $vue=3D"S"; //Expert View - break; - case 'commercial.php': - $vue=3D"S"; //Simple View - break; - case 'recherche.php': - $vue=3D(isset($_GET['expert']))?'E':'S'; - break; - default: - echo_error('user_form_ach.php',__LINE__,'Erreur invalid = request uri'); - exit (-1); - }*/ - //DEBUG =20 + $r.=3Dsprintf('%s ', $row['jr_id'], $gDossier, $row['jr_internal']); $r.=3D""; @@ -774,7 +758,7 @@ $r.=3D""; =20 // Tiers - $other=3D$this->get_tiers($row['jrn_def_type'],$row['jr_id']); + $other=3D($row['quick_code']!=3D'')?'['.$row['quick_code'].'] '.$ro= w['name'].' '.$row['first_name']:''; $r.=3Dtd($other); // comment $r.=3D"'; - $sort_exp=3D''; - $sort_titre=3D''; - $sort_concerne=3D''; - $sort_reference=3D''; - - if ( isset($_GET['s'])) - { - switch ($_GET['s']) - { - case "date_a": - $sort=3D" ag_timestamp asc"; - $sort_date=3D''; - break; - - case "date_d": - $sort=3D" ag_timestamp desc"; - $sort_date=3D''; - break; - - case "exp": - $sort_exp=3D''; - $sort=3D" f_id_dest asc"; - break; - - case "exp_d": - $sort_exp=3D''; - - $sort=3D" f_id_dest desc"; - break; - - case "ti": - $sort_titre=3D''; - - $sort=3D" ag_title asc"; - break; - case "ti_d": - $sort_titre=3D''; - - $sort=3D" ag_title desc"; - break; - - case "conc": - $sort_concerne=3D''; - - $sort=3D" ag_ref_ag_id asc"; - break; - case "conc_d": - $sort_concerne=3D''; - - $sort=3D" ag_ref_ag_id desc"; - break; - - case "ref": - $sort_reference=3D''; - - $sort=3D" ag_ref "; - break; - - case "ref_d": - $sort_reference=3D''; - - $sort=3D" ag_ref desc"; - break; - - - } - - } - else - { - $sort=3D" ag_timestamp desc"; - $sort_date=3D''; - } - - $sort=3D" order by ".$sort; - - if ( strlen(trim($p_filter)) !=3D 0 ) - $p_filter_doc=3D" dt_id in ( $p_filter )"; - else - $p_filter_doc=3D" 1=3D1 "; - - $sql=3D" - select ag_id,to_char(ag_timestamp,'DD.MM.YYYY') as my_date,= ag_ref_ag_id,f_id_dest". - ",ag_title,md_type,dt_value,ag_ref, ag_priority,ag_state - from action_gestion - left outer join document_modele on (ag_type=3Dmd_type) - join document_type on (ag_type=3Ddt_id) - where $p_filter_doc $p_search $sort"; - $max_line=3D$this->db->count_sql($sql); - $step=3D$_SESSION['g_pagesize']; - $page=3D(isset($_GET['offset']))?$_GET['page']:1; - $offset=3D(isset($_GET['offset']))?Database::escape_string($_GET= ['offset']):0; - if ( $step !=3D -1 ) $limit=3D" LIMIT $step OFFSET $offset "; - else $limit=3D''; - $bar=3Djrn_navigation_bar($offset,$max_line,$step,$page); - - $Res=3D$this->db->exec_sql($sql.$limit); - $a_row=3DDatabase::fetch_all($Res); - - $r=3D""; - $r.=3D$bar; - $r.=3D'
Code
"; @@ -2277,9 +2261,32 @@ jr_pj_name, p_closed, jr_pj_number, - n_text + n_text, + case + when jrn_def_type=3D'VEN' then + (select ad_value from fiche_detail where ad_id=3D1 + and f_id=3D(select max(qs_client) from quant_sold join jrnx using (j_= id) join jrn as e on (e.jr_grpt_id=3Dj_grpt) where e.jr_id=3Dx.jr_id)) + when jrn_def_type =3D 'ACH' then + (select ad_value from fiche_detail where ad_id=3D1 + and f_id=3D(select max(qp_supplier) from quant_purchase join jrnx usin= g (j_id) join jrn as e on (e.jr_grpt_id=3Dj_grpt) where e.jr_id=3Dx.jr_id= )) + when jrn_def_type =3D 'FIN' then + (select ad_value from fiche_detail where ad_id=3D1 + and f_id=3D(select qf_other from quant_fin where quant_fin.jr_id=3Dx.j= r_id)) + end as name, + case + when jrn_def_type=3D'VEB' then (select ad_value from fiche_detail = where ad_id=3D32 and f_id=3D(select max(qs_client) from quant_sold join j= rnx using (j_id) join jrn as e on (e.jr_grpt_id=3Dj_grpt) where e.jr_id=3D= x.jr_id)) + when jrn_def_type =3D 'ACH' then (select ad_value from fiche_detail= where ad_id=3D32 and f_id=3D(select max(qp_supplier) from quant_purchase= join jrnx using (j_id) join jrn as e on (e.jr_grpt_id=3Dj_grpt) where e.= jr_id=3Dx.jr_id)) + when jrn_def_type =3D 'FIN' then (select ad_value from fiche_detail= where ad_id=3D32 and f_id=3D(select qf_other from quant_fin where quant_= fin.jr_id=3Dx.jr_id)) + end as first_name, + case + when jrn_def_type=3D'VEN' then (select ad_value from fiche_detail = where ad_id=3D23 and f_id=3D(select max(qs_client) from quant_sold join j= rnx using (j_id) join jrn as e on (e.jr_grpt_id=3Dj_grpt) where e.jr_id=3D= x.jr_id)) + when jrn_def_type =3D 'ACH' then (select ad_value from fiche_detail= where ad_id=3D23 and f_id=3D(select max(qp_supplier) from quant_purchase= join jrnx using (j_id) join jrn as e on (e.jr_grpt_id=3Dj_grpt) where e.= jr_id=3Dx.jr_id)) + when jrn_def_type =3D 'FIN' then (select ad_value from fiche_detail= where ad_id=3D23 and f_id=3D(select qf_other from quant_fin where quant_= fin.jr_id=3Dx.jr_id)) + end as quick_code + + from - jrn left join jrn_note using(jr_id) + jrn as X left join jrn_note using(jr_id) join jrn_def on jrn_def_id=3Djr_def_id join parm_periode on p_id=3Djr_tech_per"; =20 Modified: phpcompta/trunk/include/export_histo_csv.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/export_histo_csv.php 2011-10-30 19:32:17 UTC = (rev 4278) +++ phpcompta/trunk/include/export_histo_csv.php 2011-10-30 19:32:47 UTC = (rev 4279) @@ -53,12 +53,13 @@ printf('"%s";',$res[$i]['jr_date']); printf('"%s";',$res[$i]['jr_ech']); printf('"%s";',$res[$i]['jr_pj_number']); - printf('"%s";',$ledger->get_tiers($res[$i]['jrn_def_type'],$res[$i][= 'jr_id'])); + printf('"%s";',$res[$i]['quick_code']); + printf('"%s %s";',$res[$i]['name'],$res[$i]['first_name']); printf('"%s";',$res[$i]['jr_comment']); printf('"%s";',$res[$i]['n_text']); =20 $amount=3D$res[$i]['jr_montant']; - =20 + if ( $res[$i]['jrn_def_type'] =3D=3D 'FIN') { $positive =3D $cn->get_value("select qf_amount from quant_fin where jr_= id=3D$1",array($res[$i]['jr_id'])); Modified: phpcompta/trunk/include/export_ledger_csv.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/export_ledger_csv.php 2011-10-30 19:32:17 UTC= (rev 4278) +++ phpcompta/trunk/include/export_ledger_csv.php 2011-10-30 19:32:47 UTC= (rev 4279) @@ -106,7 +106,7 @@ "\r\n"); foreach ($Row as $line) { - =20 + echo $line['num'].";"; echo $line['date'].";"; echo $line['jr_pj_number'].";"; @@ -120,18 +120,18 @@ if ( $line['jrn_def_type'] =3D=3D 'FIN' ) { $positive =3D $cn->get_value("select qf_amount from quant_fin "= . " where jr_id=3D".$line['jr_id']); - =20 + echo nb($positive); echo ";"; } - else=20 + else { echo nb($line['montant']).";"; } - =20 + printf("\r\n"); } - } =20 + } =20 //----------------------------------------------------- if ( $jrn_type=3D=3D'ACH' || $jrn_type=3D=3D'VEN') From MAILER-DAEMON Sun Oct 30 15:56:08 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RKbUG-0000QI-S0 for mharc-phpcompta-dev@gnu.org; Sun, 30 Oct 2011 15:56:08 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sun, 30 Oct 2011 21:02:51 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4280 - phpcompta/trunk/include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Oct 2011 19:56:06 -0000 Author: danydb Date: 2011-10-30 21:02:50 +0100 (Sun, 30 Oct 2011) New Revision: 4280 Modified: phpcompta/trunk/include/class_contact.php phpcompta/trunk/include/class_fiche.php Log: 431 Fiche::CountByDef Fiche::count_by_modele Modified: phpcompta/trunk/include/class_contact.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_contact.php 2011-10-30 19:32:47 UTC (re= v 4279) +++ phpcompta/trunk/include/class_contact.php 2011-10-30 20:02:50 UTC (re= v 4280) @@ -60,7 +60,7 @@ $script=3D$_SERVER['PHP_SELF']; // Creation of the nav bar // Get the max numberRow - $all_contact=3D$this->CountByDef($this->fiche_def_ref,$p_search,= $extra_sql); + $all_contact=3D$this->count_by_modele($this->fiche_def_ref,$p_se= arch,$extra_sql); // Get offset and page variable $offset=3D( isset ($_REQUEST['offset'] )) ?$_REQUEST['offset']:0= ; $page=3D(isset($_REQUEST['page']))?$_REQUEST['page']:1; Modified: phpcompta/trunk/include/class_fiche.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_fiche.php 2011-10-30 19:32:47 UTC (rev = 4279) +++ phpcompta/trunk/include/class_fiche.php 2011-10-30 20:02:50 UTC (rev = 4280) @@ -244,7 +244,7 @@ * * \return array of fiche object */ - function CountByDef($p_frd_id,$p_search=3D"",$p_sql=3D"") + function count_by_modele($p_frd_id,$p_search=3D"",$p_sql=3D"") { $sql=3D"select * from @@ -1519,7 +1519,7 @@ =20 if ( $p_amount) $filter_amount=3D' and f_id in (select f_id from= jrnx where '.$filter_year.')'; =20 - $all_tiers=3D$this->CountByDef($this->fiche_def_ref,$p_search,$p= _sql.$filter_amount); + $all_tiers=3D$this->count_by_modele($this->fiche_def_ref,$p_sear= ch,$p_sql.$filter_amount); // Get offset and page variable $offset=3D( isset ($_REQUEST['offset'] )) ?$_REQUEST['offset']:0= ; $page=3D(isset($_REQUEST['page']))?$_REQUEST['page']:1; From MAILER-DAEMON Sun Oct 30 16:10:08 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RKbho-0002RP-GA for mharc-phpcompta-dev@gnu.org; Sun, 30 Oct 2011 16:10:08 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sun, 30 Oct 2011 21:16:41 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4281 - phpcompta/trunk/include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Oct 2011 20:10:07 -0000 Author: danydb Date: 2011-10-30 21:16:40 +0100 (Sun, 30 Oct 2011) New Revision: 4281 Added: phpcompta/trunk/include/class_follow_up.php phpcompta/trunk/include/class_follow_up_detail.php Removed: phpcompta/trunk/include/class_action.php phpcompta/trunk/include/class_action_detail.php Modified: phpcompta/trunk/include/action.common.inc.php phpcompta/trunk/include/action.inc.php phpcompta/trunk/include/class_acc_ledger.php phpcompta/trunk/include/class_document.php phpcompta/trunk/include/dashboard.inc.php phpcompta/trunk/include/export_security_pdf.php phpcompta/trunk/include/modele.inc.php phpcompta/trunk/include/suivi_adm.inc.php phpcompta/trunk/include/suivi_client.inc.php phpcompta/trunk/include/suivi_supplier.inc.php Log: 0000429: Class Action -> class Follow_Up Modified: phpcompta/trunk/include/action.common.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/action.common.inc.php 2011-10-30 20:02:50 UTC= (rev 4280) +++ phpcompta/trunk/include/action.common.inc.php 2011-10-30 20:16:40 UTC= (rev 4281) @@ -43,7 +43,7 @@ /*----------------------------------------------------------------------= ----- */ if ( isset($_POST['generate'])) { - $act=3Dnew Action($cn); + $act=3Dnew Follow_Up($cn); $act->fromArray($_POST); if ($act->ag_id =3D=3D 0 ) { @@ -80,7 +80,7 @@ // Update the modification if ( isset($_POST['save'])) { - $act2=3Dnew Action($cn); + $act2=3Dnew Follow_Up($cn); $act2->fromArray($_POST ); =20 if ( $act2->Update() =3D=3D false ) @@ -101,7 +101,7 @@ //------------------------------------------------------------------= ---- if ( isset ($_POST['add_action_here']) ) { - $act=3Dnew Action($cn); + $act=3Dnew Follow_Up($cn); =20 =20 //---------------------------------------- @@ -139,7 +139,7 @@ if ( $sub_action=3D=3D'detail' ) { echo '
'; - $act=3Dnew Action($cn); + $act=3Dnew Follow_Up($cn); $act->ag_id=3D$ag_id; echo $act->get(); $act->ag_comment=3DDecode($act->ag_comment); @@ -162,7 +162,7 @@ { // confirmed $cn->start(); - $act=3Dnew Action($cn); + $act=3Dnew Follow_Up($cn); $act->ag_id=3D$_REQUEST['ag_id']; $act->get(); $act->remove(); @@ -184,7 +184,7 @@ // Add an action if ( $sub_action =3D=3D "add_action" ) { - $act=3Dnew Action($cn); + $act=3Dnew Follow_Up($cn); $act->fromArray($_POST ); $act->ag_id=3D0; $act->d_id=3D0; @@ -208,12 +208,12 @@ echo '
'; } //----------------------------------------------------------------------= ---------- -// Save Action +// Save Follow_Up // Stage 2 : Save the action + Files and generate eventually a document //----------------------------------------------------------------------= ---------- if ( $sub_action =3D=3D "save_action_st2" ) { - $act=3Dnew Action($cn); + $act=3Dnew Follow_Up($cn); $act->fromArray($_POST); $act->d_id=3D0; $act->ag_ref_ag_id=3D(isset($_POST['ag_ref_ag_id']))?$_POST['ag_ref_= ag_id']:0; @@ -359,7 +359,7 @@ =20 - *
  • an invoice - *
  • a meeting - *
  • an order - *
  • a letter - * - * The table document_type are the possible actions - */ -/*! - * \brief class_action for manipulating actions - * action can be : - *
      - *
    • a meeting - *
    • an order - *
    • a letter - *
    - * The table document_type are the possible actions - */ - -class Action -{ - var $db; /*!< $db database connexion */ - var $ag_comment; /*!< $ag_comment description (ag_gestion.ag_com= ment) */ - var $ag_timestamp; /*!< $ag_timestamp document date (ag_gestion.a= g_timestamp)*/ - var $dt_id; /*!< $dt_id type of the document (document_typ= e.dt_id)*/ - var $ag_state; /*!< $ag_state stage of the document (printed= , send to client...)*/ - var $d_number; /*!< $d_number number of the document*/ - var $d_filename; /*!< $d_filename filename's document */ - var $d_mimetype; /*!< $d_mimetype document's filename */ - var $ag_title; /*!< $ag_title title document */ - var $f_id; /*!< $f_id_dest fiche id (From field ) */ - var $ag_ref_ag_id; /*!< $ag_ref_ag_id concern previous action*/ - var $ag_ref; /*!< $ag_ref is the ref */ - var $ag_hour; /*!< $ag_hour is the hour of the meeting, actio= n */ - var $ag_priority; /*!< $ag_priority is the priority 1 High, 2 med= ium, 3 low */ - var $ag_dest; /*!< $ag_dest person who is in charged */ - var $ag_contact; /*!< $ag_contact contact */ - /*! constructor - * \brief constructor - * \param p_cn database connection - */ - function __construct ($p_cn) - { - $this->db=3D$p_cn; - $this->f_id=3D0; - - } - //------------------------------------------------------------------= ---- - /*! - * \brief Display the object, the tags for the FORM - * are in the caller. It will be used for adding and updating - * action - *\note If ag_id is not equal to zero then it is an update otherwi= se - * it is a new document - * - * \param $p_view if set to true the form will be in readonly mode (= value: true or false) - * \param $p_gen true we show the tag for generating a doc (value : = true or false) - *\param $p_base is the ac parameter - *\param $retour is the html code for the return button - * \note update the reference number or the document type is not al= lowed - * - * - * \return string containing the html code - */ - function Display($p_view,$p_gen,$p_base,$retour=3D"") - { - if ( $p_view=3D=3D'UPD') - { - $upd=3Dtrue; - $readonly=3Dfalse; - } - elseif ($p_view=3D=3D"NEW") - { - $upd=3Dfalse; - $readonly=3Dfalse; - } - elseif ($p_view=3D=3D'READ') - { - $upd=3Dtrue; - $readonly=3Dtrue; - } - else - { - exit('class_action'.__LINE__.'Action::Display error unknown = parameter'.$p_view); - - } - // Compute the widget - // Date - $date=3Dnew IDate(); - $date->readonly=3D$readonly; - $date->name=3D"ag_timestamp"; - $date->value=3D$this->ag_timestamp; - - // for insert mode only - if ( $upd =3D=3D false ) - { - // Doc Type - $doc_type=3Dnew ISelect(); - $doc_type->name=3D"dt_id"; - $doc_type->value=3D$this->db->make_array("select dt_id,dt_va= lue from document_type"); - $doc_type->selected=3D$this->dt_id; - $doc_type->readonly=3Dfalse; - $str_doc_type=3D$doc_type->input(); - } - else - { - // Doc Type - $doc_type=3Dnew IHidden(); - $doc_type->name=3D"dt_id"; - $doc_type->value=3D$this->dt_id; - $str_doc_type=3D$doc_type->input().$this->db->get_value("sel= ect dt_value from document_type where dt_id=3D".$this->dt_id); - } - - // Description - $desc=3Dnew ITextArea(); - $desc->width=3D70; - $desc->heigh=3D5; - $desc->name=3D"ag_comment"; - $desc->readonly=3D$readonly; - $desc->value=3D$this->ag_comment; - if ( strlen($desc->value) >300 ) - { - $desc->width=3D120; - $desc->heigh=3D40; - } - - // state - // Retrieve the value - $a=3D$this->db->make_array("select s_id,s_value from document_st= ate "); - $state=3Dnew ISelect(); - $state->readonly=3D$readonly; - $state->name=3D"ag_state"; - $state->value=3D$a; - $state->selected=3D$this->ag_state; - $str_state=3D$state->input(); - - // Retrieve the value if there is an attached doc - $doc_ref=3D""; - // Document id - - $h2=3Dnew IHidden(); - $h2->name=3D"d_id"; - $h2->value=3D$this->d_id; - - if ( $this->d_id !=3D 0 && $this->d_id !=3D "" ) - { - $h2->readonly=3D($p_view=3D=3D'NEW')?false:true; - $doc=3Dnew Document($this->db,$this->d_id); - $doc->get(); - if ( strlen(trim($doc->d_lob)) !=3D 0 ) - { - $d_id=3Dnew IHidden(); - $doc_ref=3D"

    Document ".$doc->a_ref().'

    '; - $doc_ref.=3D$h2->input().$d_id->input('d_id',$this->d_id= ); - } - - } - - - // title - $title=3Dnew IText(); - $title->readonly=3D$readonly; - $title->name=3D"ag_title"; - $title->value=3D$this->ag_title; - $title->size=3D60; - - // ag_cal - $ag_cal=3Dnew ICheckBox('ag_cal'); - $ag_cal->readonly=3D$readonly; - $ag_cal->name=3D"ag_cal"; - - if ( $this->ag_cal=3D=3D'C' ) - $ag_cal->selected=3Dtrue; - else - $ag_cal->selected=3Dfalse; - - $str_ag_cal=3D$ag_cal->input(); - - // Priority of the ag_priority - $ag_priority=3Dnew ISelect(); - $ag_priority->readonly=3D$readonly; - $ag_priority->name=3D"ag_priority"; - $ag_priority->selected=3D$this->ag_priority; - $ag_priority->value=3Darray(array('value'=3D>1,'label'=3D>'Haute= '), - array('value'=3D>2,'label'=3D>'Moyenne= '), - array('value'=3D>3,'label'=3D>'Basse') - ); - $str_ag_priority=3D$ag_priority->input(); - - // hour of the action (meeting) ag_hour - $ag_hour=3Dnew IText(); - $ag_hour->readonly=3D$readonly; - $ag_hour->name=3D"ag_hour"; - $ag_hour->value=3D$this->ag_hour; - $ag_hour->size=3D6; - $ag_hour->javascript=3D" onblur=3Dcheck_hour('ag_hour');"; - $str_ag_hour=3D$ag_hour->input(); - - // Person in charged of the action - $ag_dest=3Dnew ISelect(); - $ag_dest->readonly=3D$readonly; - $ag_dest->name=3D"ag_dest"; - $repo=3Dnew Database(); - $aAg_dest=3D$repo->make_array("select use_id as value, ". - "use_first_name||' '||use_name||'('|= |use_login||')' as label ". - " from ac_users natural join jnt_use= _dos ". - " join priv_user on (jnt_id=3Dpriv_j= nt) ". - "where dos_id=3D ".$_REQUEST['gDossi= er']); - $aAg_dest[]=3Darray('value'=3D>0,'label'=3D>'phpcompta'); - $ag_dest->value=3D$aAg_dest; - $ag_dest->selected=3D$this->ag_dest; - $str_ag_dest=3D$ag_dest->input(); - - // ag_ref - // Always false for update - $ag_ref=3Dnew IText(); - $ag_ref->readonly=3D$upd; - $ag_ref->name=3D"ag_ref"; - $ag_ref->value=3Dsql_string($this->ag_ref); - $client_label=3Dnew ISpan(); - - /* Add button */ - $f_add_button=3Dnew IButton('add_card'); - $f_add_button->label=3D_('Cr=C3=A9er une nouvelle fiche'); - $f_add_button->set_attribute('ipopup','ipop_newcard'); - $filter=3D$this->db->make_list('select fd_id from fiche_def '); - $f_add_button->set_attribute('filter',$filter); - - $f_add_button->javascript=3D" select_card_type(this);"; - $str_add_button=3D$f_add_button->input(); - - // f_id_dest sender - if ( $this->qcode_dest !=3D NOTFOUND && strlen(trim($this->qcode= _dest)) !=3D 0) - { - $tiers=3Dnew Fiche($this->db); - $tiers->get_by_qcode($this->qcode_dest); - $qcode_dest_label=3D$tiers->strAttribut(1); - $this->f_id_dest=3D$tiers->id; - } - else - { - $qcode_dest_label=3D($this->f_id_dest=3D=3D0 || trim($this->= qcode_dest)=3D=3D"")?'Interne ':'Error'; - } - - $h_ag_id=3Dnew IHidden(); - // if concerns another action : show the link otherwise nothing - $lag_ref_ag_id=3D" 00 / 00 "; - - if ( $this->ag_ref_ag_id !=3D 0 ) - { - $supl_hidden=3D''; - if( isset($_REQUEST['sc'])) - $supl_hidden.=3D'&sc=3D'.$_REQUEST['sc']; - if( isset($_REQUEST['f_id'])) - $supl_hidden.=3D'&f_id=3D'.$_REQUEST['f_id']; - if( isset($_REQUEST['sb'])) - $supl_hidden.=3D'&sb=3D'.$_REQUEST['sb']; - - $lag_ref_ag_id=3D'ag_ref_ag_id.'&'.dossier::get().'">'. - $this->db->get_value("select ag_ref from = action_gestion where ag_id=3D$1",array($this->ag_ref_ag_id)). - ""; - } - // sender - $w=3Dnew ICard(); - $w->readonly=3D$readonly; - $w->jrn=3D0; - $w->name=3D'qcode_dest'; - $w->value=3D($this->f_id_dest !=3D 0)?$this->qcode_dest:""; - $w->label=3D""; - $list_recipient=3D$this->db->make_list('select fd_id from fiche_= def where frd_id in (14,25,8,9,16)'); - $w->extra=3D$list_recipient; - $w->set_attribute('typecard',$list_recipient); - $w->set_dblclick("fill_ipopcard(this);"); - $w->set_attribute('ipopup','ipopcard'); - - // name of the field to update with the name of the card - $w->set_attribute('label','qcode_dest_label'); - // name of the field to update with the name of the card - $w->set_attribute('typecard',$w->extra); - $w->set_function('fill_data'); - $w->javascript=3Dsprintf(' onchange=3D"fill_data_onchange(\'%s\'= );" ', - $w->name); - - $sp=3Dnew ISpan(); - $sp->name=3D'qcode_dest_label'; - $sp->value=3D$qcode_dest_label; - - // contact - $ag_contact=3Dnew ICard(); - $ag_contact->readonly=3D$readonly; - $ag_contact->jrn=3D0; - $ag_contact->name=3D'ag_contact'; - $ag_contact->value=3D''; - $ag_contact->set_attribute('ipopup','ipopcard'); - - if( $this->ag_contact !=3D 0 ) - { - $contact=3Dnew Fiche($this->db,$this->ag_contact); - $ag_contact->value=3D$contact->get_quick_code(); - } - - $ag_contact->label=3D""; - - $list_contact=3D$this->db->make_list('select fd_id from fiche_de= f where frd_id=3D16'); - $ag_contact->extra=3D$list_contact; - - $ag_contact->set_dblclick("fill_ipopcard(this);"); - // name of the field to update with the name of the card - $ag_contact->set_attribute('label','ag_contact_label'); - // name of the field to update with the name of the card - $ag_contact->set_attribute('typecard',$list_contact); - $ag_contact->set_function('fill_data'); - $ag_contact->javascript=3Dsprintf(' onchange=3D"fill_data_onchan= ge(\'%s\');" ', - $ag_contact->name); - - $spcontact=3Dnew ISpan(); - $spcontact->name=3D'ag_contact_label'; - $spcontact->value=3D''; - $fiche_contact=3Dnew Fiche($this->db); - $fiche_contact->get_by_qcode($this->ag_contact); - if ( $fiche_contact->id !=3D 0 ) - { - $spcontact->value=3D$fiche_contact->strAttribut(ATTR_DEF_NAM= E); - } - - - $h_agrefid=3Dnew IHidden(); - $str_ag_ref=3D"".(($this->ag_ref !=3D "")?$this->ag_ref:" Nou= veau ").""; - // Preparing the return string - $r=3D""; - - /* for new files */ - $upload=3Dnew IFile(); - $upload->name=3D"file_upload[]"; - $upload->value=3D""; - $aAttachedFile=3D$this->db->get_array('select d_id,d_filename,d_= mimetype,'. - '\'show_document.php?'. - Dossier::get().'&d_id=3D\'||= d_id as link'. - ' from document where ag= _id=3D$1', - array($this->ag_id)); - /* create the select for document */ - $aDocMod=3Dnew ISelect(); - $aDocMod->name=3D'doc_mod'; - $aDocMod->value=3D$this->db->make_array('select md_id,dt_value||= \' : \'||md_name as md_name'. - ' from document_modele joi= n document_type on (md_type=3Ddt_id)'. - ' order by md_name'); - $str_select_doc=3D$aDocMod->input(); - /* if no document then do not show the generate button */ - if ( empty($aDocMod->value) ) - $str_submit_generate=3D""; - else - $str_submit_generate=3DHtmlInput::submit("generate",_("G=C3=A9= n=C3=A9re le document")); - - $ag_id=3D$this->ag_id; - - /* fid =3D Icard */ - $icard=3Dnew ICard(); - $icard->jrn=3D0; - $icard->table=3D0; - $icard->extra2=3D'QuickCode'; - $icard->noadd=3D"no"; - $icard->extra=3D'all'; - - /* Text desc */ - $text=3Dnew IText(); - $num=3Dnew INum(); - - /* TVA */ - $itva=3Dnew ITva_Popup($this->db); - $itva->in_table=3Dtrue; - - /* create aArticle for the detail section */ - for ($i=3D0;$i< MAX_ARTICLE;$i++) - { - /* fid =3D Icard */ - $icard=3Dnew ICard(); - $icard->jrn=3D0; - $icard->table=3D0; - $icard->noadd=3D"no"; - $icard->extra=3D'all'; - $icard->name=3D"e_march".$i; - $tmp_ad=3D(isset($this->aAction_detail[$i]))?$this->aAction_= detail[$i]:false; - $icard->value=3D''; - if ( $tmp_ad ) - { - $march=3Dnew Fiche($this->db); - $f=3D$tmp_ad->get_parameter('qcode'); - if ( $f !=3D 0 ) - { - $march->id=3D$f; - $icard->value=3D$march->get_quick_code(); - } - } - $icard->set_dblclick("fill_ipopcard(this);"); - // name of the field to update with the name of the card - $icard->set_attribute('label',"e_march".$i."_label"); - // name of the field to update with the name of the card - $icard->set_attribute('typecard',$icard->extra); - $icard->set_attribute('ipopup','ipopcard'); - $icard->set_function('fill_data'); - $icard->javascript=3Dsprintf(' onchange=3D"fill_data_onchang= e(\'%s\');" ', - $icard->name); - - $aArticle[$i]['fid']=3D$icard->search().$icard->input(); - - $text->javascript=3D' onchange=3D"clean_tva('.$i.');compute_= ledger('.$i.')"'; - $text->name=3D"e_march".$i."_label"; - $text->size=3D40; - $text->value=3D($tmp_ad)?$tmp_ad->get_parameter('text'):""; - $aArticle[$i]['desc']=3D$text->input(); - - $num->javascript=3D' onchange=3D"format_number(this);clean_t= va('.$i.');compute_ledger('.$i.')"'; - $num->name=3D"e_march".$i."_price"; - $num->size=3D8; - $num->value=3D($tmp_ad)?$tmp_ad->get_parameter('price_unit')= :0; - $aArticle[$i]['pu']=3D$num->input(); - - $num->name=3D"e_quant".$i; - $num->size=3D8; - $num->value=3D($tmp_ad)?$tmp_ad->get_parameter('quantity'):0= ; - $aArticle[$i]['quant']=3D$num->input(); - - $itva->name=3D'e_march'.$i.'_tva_id'; - $itva->value=3D($tmp_ad)?$tmp_ad->get_parameter('tva_id'):0; - $itva->javascript=3D' onchange=3D"format_number(this);clean_= tva('.$i.');compute_ledger('.$i.')"'; - $itva->set_attribute('compute',$i); - - $aArticle[$i]['tvaid']=3D$itva->input(); - - $num->name=3D"e_march".$i."_tva_amount"; - $num->value=3D($tmp_ad)?$tmp_ad->get_parameter('tva_amount')= :0; - $num->javascript=3D' onchange=3D"compute_ledger('.$i.')"'; - $num->size=3D8; - $aArticle[$i]['tva']=3D$num->input(); - - $num->name=3D"tvac_march".$i; - $num->value=3D($tmp_ad)?$tmp_ad->get_parameter('total'):0; - $num->size=3D8; - $aArticle[$i]['tvac']=3D$num->input(); - - $aArticle[$i]['hidden_htva']=3DHtmlInput::hidden('htva_march= '.$i,0); - $aArticle[$i]['hidden_tva']=3DHtmlInput::hidden('tva_march'.= $i,0); - $aArticle[$i]['ad_id']=3D ($tmp_ad)?HtmlInput::hidden('ad_id= '.$i,$tmp_ad->get_parameter('id')):HtmlInput::hidden('ad_id'.$i,0); - - - } - - /* Add the needed hidden values */ - $r.=3Ddossier::hidden(); - - /* add the number of item */ - $Hid=3Dnew IHidden(); - $r.=3D$Hid->input("nb_item",MAX_ARTICLE); - - /* get template */ - ob_start(); - require_once ('template/detail-action.php'); - $content=3Dob_get_contents(); - ob_end_clean(); - $r.=3D$content; - - //hidden - $r.=3D"

    "; - $r.=3D$h2->input(); - $r.=3D$h_agrefid->input("ag_ref_ag_id",$this->ag_ref_ag_id); - $r.=3D$h_ag_id->input('ag_id',$this->ag_id); - $hidden2=3Dnew IHidden(); - $r.=3D$hidden2->input('f_id_dest',$this->f_id_dest); - $r.=3D"

    "; - - // show the list of the concern operation - if ( $this->db->count_sql('select * from action_gestion where ag= _ref_ag_id!=3D0 and ag_ref_ag_id=3D'.$this->ag_id. - " limit 2") > 0 ) - { - $sql=3Dsprintf(" and ag_id in (select action_get_tree from c= omptaproc.action_get_tree(%s)) ",$this->ag_id); - $r.=3D$this->myList($p_base,"",$sql); - } - return $r; - - } - //------------------------------------------------------------------= ---- - /*!\brief This function shows the detail of an action thanks the ag_= id - */ - function get() - { - $sql=3D"select ag_id, ag_comment,to_char (ag_timestamp,'DD.MM.YY= YY') as ag_timestamp,". - " f_id_dest,ag_title,ag_comment,ag_ref,d_id,ag_type,ag_stat= e, ". - " ag_ref_ag_id, ag_dest, ag_hour, ag_priority, ag_cal,ag_co= ntact ". - " from action_gestion left join document using (ag_id) wher= e ag_id=3D".$this->ag_id; - $r=3D$this->db->exec_sql($sql); - $row=3DDatabase::fetch_all($r); - if ( $row=3D=3Dfalse) return; - $this->ag_comment=3D$row[0]['ag_comment']; - $this->ag_timestamp=3D$row[0]['ag_timestamp']; - $this->ag_contact=3D$row[0]['ag_contact']; - $this->f_id_dest=3D$row[0]['f_id_dest']; - $this->ag_title=3D$row[0]['ag_title']; - $this->ag_type=3D$row[0]['ag_type']; - $this->ag_ref=3D$row[0]['ag_ref']; - $this->ag_state=3D$row[0]['ag_state']; - $this->ag_ref_ag_id=3D$row[0]['ag_ref_ag_id']; - $this->d_id=3D$row[0]['d_id']; - $this->ag_dest=3D$row[0]['ag_dest']; - $this->ag_hour=3D$row[0]['ag_hour']; - $this->ag_priority=3D$row[0]['ag_priority']; - $this->ag_cal=3D$row[0]['ag_cal']; - - $action_detail=3Dnew Action_Detail($this->db); - $action_detail->set_parameter('ag_id',$this->ag_id); - $this->aAction_detail=3D$action_detail->load_all(); - - - // if there is no document set 0 to d_id - if ( $this->d_id =3D=3D "" ) - $this->d_id=3D0; - // if there is a document fill the object - if ($this->d_id !=3D 0 ) - { - $this->state=3D$row['0']['ag_state']; - $this->ag_state=3D$row[0]['ag_state']; - } - $this->dt_id=3D$this->ag_type; - $aexp=3Dnew Fiche($this->db,$this->f_id_dest); - $this->qcode_dest=3D$aexp->strAttribut(ATTR_DEF_QUICKCODE); - - } - - /*! - * \brief Save the document and propose to save the generated docume= nt or - * to upload one, the data are included except the file. Temporary = the generated - * document is save - * - * \return - */ - function save() - { - - // Get The sequence id, - $seq_name=3D"seq_doc_type_".$this->dt_id; - $str_file=3D""; - $add_file=3D''; - - // f_id exp - $exp=3Dnew Fiche($this->db); - $exp->get_by_qcode($this->qcode_dest); - - $contact=3Dnew Fiche($this->db); - $contact->get_by_qcode($this->ag_contact); - - if ( trim($this->ag_title) =3D=3D "") - { - $doc_mod=3Dnew document_type($this->db); - $doc_mod->dt_id=3D$this->dt_id; - $doc_mod->get(); - $this->ag_title=3D$doc_mod->dt_value; - } - $this->ag_id=3D$this->db->get_next_seq('action_gestion_ag_id_seq= '); - - // Create the reference - $ref=3D$this->dt_id.'/'.$this->ag_id; - $this->ag_ref=3D$ref; - if ( $this->ag_cal=3D=3D'on') - $ag_cal=3D'C'; - else - $ag_cal=3D'I'; - $this->ag_ref_ag_id=3D(strlen(trim($this->ag_ref_ag_id))=3D=3D0)= ?0:$this->ag_ref_ag_id; - // save into the database - $sql=3D"insert into action_gestion". - "(ag_id,ag_timestamp,ag_type,ag_title,f_id_dest,ag_comment,= ag_ref,ag_ref_ag_id, ag_dest, ". - " ag_hour, ag_priority,ag_cal,ag_owner,ag_contact,ag_state)= ". - " values ($1,to_date($2,'DD.MM.YYYY'),$3,$4,$5,$6,$7,$8,$9,= $10,$11,$12,$13,$14,$15)"; - $this->db->exec_sql($sql,array($this->ag_id, /* 1 */ - $this->ag_timestamp, /* 2 */ - $this->dt_id, /* 3 */ - $this->ag_title, /* 4 */ - $exp->id, /* 5 */ - $this->ag_comment, /* 6 */ - $ref, /* 7 */ - $this->ag_ref_ag_id, /* 8 */ - $this->ag_dest, /* 9 */ - $this->ag_hour, /* 10 */ - $this->ag_priority, /* 11 */ - $ag_cal, /* 12 */ - $_SESSION['g_user'], /* 13 */ - $contact->id, /* 14 */ - $this->ag_state /* 15 */ - ) - ); - - /* insert also the details */ - for ( $i =3D 0; $i < MAX_ARTICLE;$i++) - { - $act=3Dnew Action_Detail($this->db); - $act->from_array($_POST,$i); - $act->ag_id=3D$this->ag_id; - $act->save(); - } - - /* Upload the documents */ - $doc=3Dnew Document($this->db); - $doc->Upload($this->ag_id); - } - /*! myList($p_filter=3D"") - * \brief Show list of action by default if sorted on date - *\param $p_base base url with ac... - * \param $p_filter filters on the document_type - * \param $p_search must a valid sql command ( ex 'and ag_title lik= e upper('%hjkh%')) - * \return string containing html code - */ - function myList($p_base,$p_filter=3D"",$p_search=3D"") - { - $str_dossier=3Ddossier::get(); - // for the sort - $sort=3D""; - $image_asc=3D''; - $image_desc=3D''; - $image_sel_desc=3D''; - $image_sel_asc=3D''; - $url=3DCleanUrl(); - $url=3D$str_dossier.'&'.$p_base; - - $sort_date=3D'
  • '.$image_asc.''. - 'Date'. - ''.$image_desc.''.$image_asc.''. - 'Exp=C3=A9diteur'. - ''.$image_desc.''.$image_asc.''. - 'Titre'. - ''.$image_desc.''.$image_asc.''. - 'Concerne'. - ''.$image_desc.''.$image_asc.''. - 'R=C3=A9f=C3=A9rence'. - ''.$image_desc.''.$image_sel_asc.''. - 'Date'. - ''.$image_desc.''.$image_asc.''. - 'Date'. - $image_sel_desc.''.$image_sel_asc.''. - 'Exp=C3=A9diteur'. - ''.$image_asc.''.$image_asc.''. - 'Exp=C3=A9diteur'. - $image_sel_desc.''.$image_sel_asc. - 'Titre'. - ''.$image_desc.''.$image_asc.''. - 'Titre'. - $image_sel_desc.''.$image_sel_asc. - 'Concerne'. - ''.$image_desc.''.$image_asc.''. - 'Concerne'. - $image_sel_desc.''.$image_sel_asc. - 'R=C3=A9f=C3=A9rence'. - ''.$image_desc.''.$image_asc.''. - 'R=C3=A9f=C3=A9rence'. - $image_sel_desc.''.$image_asc.''. - 'Date'. - $image_sel_desc.'
    '; - $r.=3D""; - $r.=3D$sort_date; - $r.=3D$sort_exp; - $r.=3D$sort_titre; - $r.=3D''; - $r.=3Dth('Etat'); - $r.=3Dth('Priorit=C3=A9'); - $r.=3D$sort_reference; - $r.=3D$sort_concerne; - $r.=3D""; - - - // if there are no records return a message - if ( sizeof ($a_row) =3D=3D 0 or $a_row =3D=3D false ) - { - $r=3D'
    '; - $r.=3D'
    Aucun enregistrement trouv=C3=A9'; - $r.=3D"
    "; - return $r; - - } - $today=3Ddate('d.m.Y'); - $i=3D0; - //show the sub_action - foreach ($a_row as $row ) - { - $href=3D''; - $i++; - $tr=3D($i%2=3D=3D0)?'even':'odd'; - if ($row['ag_priority'] < 2) $tr=3D'priority1'; - $st=3D''; - if ($row['my_date']=3D=3D$today) $st=3D' style=3D"font-famil= y:bold; border:2px solid orange;"'; - $r.=3D""; - $r.=3D""; - - // Expediteur - $fexp=3Dnew Fiche($this->db); - $fexp->id=3D$row['f_id_dest']; - $qcode_dest=3D$fexp->strAttribut(ATTR_DEF_QUICKCODE); - - $qexp=3D($qcode_dest=3D=3DNOTFOUND)?"Interne":$qcode_dest; - $jsexp=3Dsprintf("javascript:showfiche('%s')", - $qexp); - if ( $qexp !=3D 'Interne' ) - { - $r.=3D""; - - $ref=3D""; - - // show reference - if ( $row['ag_ref_ag_id'] !=3D 0 ) - { - $retSqlStmt=3D$this->db->exec_sql( - "select ag_ref from action_gestion where= ag_id=3D".$row['ag_ref_ag_id']); - $retSql=3DDatabase::fetch_all($retSqlStmt); - if ( $retSql !=3D null ) - { - foreach ($retSql as $line) - { - $ref.=3D''. - $line['ag_ref'].""; - } - } - } - - $r.=3D'"; - $r.=3D""; - /* - * State - */ - switch ( $row['ag_state'] ) - { - case 1: - $state=3D'Ferm=C3=A9'; - break; - case 2: - $state=3D"A suivre"; - break; - case 3: - $state=3D"A faire"; - break; - case 4: - $state=3D"Abandonn=C3=A9"; - break; - } - $r.=3Dtd($state); - /* - * State - */ - switch ( $row['ag_priority'] ) - { - case 1: - $priority=3D'Haute'; - break; - case 2: - $priority=3D"Moyenne"; - break; - case 3: - $priority=3D"Important"; - break; - } - $r.=3Dtd($priority); - - $r.=3D""; - $r.=3D""; - $r.=3D""; - - } - $r.=3D"
    type
    ".$href.$row['my_date'].''."$href".$qexp." : ".$fexp->getName().''; - } - else - $r.=3D"$href Interne '.$href. - h($row['ag_title'])."".$row['dt_value']."".$row['ag_ref']."".$ref."
    "; - - $r.=3D$bar; - //$r.=3D"
    "; - return $r; - } - //------------------------------------------------------------------= ---- - /*!\brief Update the data into the database - * - * \return true on success otherwise false - */ - function Update() - { - // if ag_id =3D=3D 0 nothing to do - if ( $this->ag_id =3D=3D 0 ) return ; - // retrieve customer - // f_id - - if ( trim($this->qcode_dest) =3D=3D"" ) - { - // internal document - $this->f_id_dest=3D0; // internal document - } - else - { - $tiers=3Dnew Fiche($this->db); - if ( $tiers->get_by_qcode($this->qcode_dest) =3D=3D -1 ) // = Error we cannot retrieve this qcode - return false; - else - $this->f_id_dest=3D$tiers->id; - - } - $contact=3Dnew Fiche($this->db); - if ( $contact->get_by_qcode($this->ag_contact) =3D=3D -1 ) - $contact->id=3D0; - - - $ref=3D$this->dt_id.'/'.$this->ag_id; - if ( $this->ag_cal =3D=3D 'on') $ag_cal=3D'C'; - else $ag_cal=3D'I'; - $this->ag_ref=3D$ref; - $this->db->exec_sql("update action_gestion set ag_comment=3D$1,"= . - " ag_timestamp=3Dto_date($2,'DD.MM.YYYY'),". - " ag_title=3D$3,". - " ag_type=3D$4, ". - " f_id_dest=3D$5, ". - " ag_ref_ag_id=3D$6 ,". - "ag_state=3D$7,". - " ag_hour =3D $9 ,". - " ag_priority =3D $10 ,". - " ag_dest =3D $11 , ". - " ag_cal =3D $12 ,". - " ag_contact =3D $13 ". - " where ag_id =3D $8", - array ( $this->ag_comment, /* 1 */ - $this->ag_timestamp, /* 2 */ - $this->ag_title, /* 3 */ - $this->dt_id, /* 4 */ - $this->f_id_dest, /* 5 */ - $this->ag_ref_ag_id, /* 6 */ - $this->ag_state, /* 7 */ - $this->ag_id, /* 8 */ - $this->ag_hour, /* 9 */ - $this->ag_priority, /* 10 */ - $this->ag_dest, /* 11 */ - $ag_cal, /* 12 */ - $contact->id /* 13 */ - )); - // Upload documents - $doc=3Dnew Document($this->db); - $doc->Upload($this->ag_id); - - /* save action details */ - for ( $i =3D 0; $i < MAX_ARTICLE;$i++) - { - $act=3Dnew Action_Detail($this->db); - $act->from_array($_POST,$i); - $act->save(); - } - return true; - - } - - /*!\brief generate the document and add it to the action - * \param md_id is the id of the document_modele - */ - function generate_document($md_id) - { - $doc=3Dnew Document($this->db); - $mod=3Dnew Document_Modele($this->db,$md_id); - $mod->load(); - $doc->f_id=3D$this->f_id_dest; - $doc->md_id=3D$md_id; - $doc->ag_id=3D$this->ag_id; - $doc->Generate(); - } - /*!\brief put an array in the variable member, the indice - * is the member name - *\param $p_array to parse - *\return nothing - */ - function fromArray($p_array) - { - $this->ag_id=3D(isset($p_array['ag_id']))?$p_array['ag_id']:""; - $this->qcode_dest=3D(isset($p_array['qcode_dest']))?$p_array['qc= ode_dest']:""; - $this->f_id_dest=3D(isset($p_array['f_id_dest']))?$p_array['f_id= _dest']:0; - $this->ag_ref_ag_id=3D(isset($p_array['ag_ref_ag_id']))?$p_array= ['ag_ref_ag_id']:0; - $this->ag_timestamp=3D(isset($p_array['ag_timestamp']))?$p_array= ['ag_timestamp']:date('d.m.Y'); - $this->qcode_dest=3D(isset($p_array['qcode_dest']))?$p_array['qc= ode_dest']:""; - $this->dt_id=3D(isset($p_array['dt_id']))?$p_array['dt_id']:""; - $this->ag_state=3D(isset($p_array['ag_state']))?$p_array['ag_sta= te']:2; - $this->ag_ref=3D(isset($p_array['ag_ref']))?$p_array['ag_ref']:"= "; - $this->ag_title=3D(isset($p_array['ag_title']))?$p_array['ag_tit= le']:""; - $this->ag_hour=3D(isset($p_array['ag_hour']))?$p_array['ag_hour'= ]:""; - $this->ag_dest=3D(isset($p_array['ag_dest']))?$p_array['ag_dest'= ]:""; - $this->ag_priority=3D(isset($p_array['ag_priority']))?$p_array['= ag_priority']:2; - $this->ag_cal=3D(isset($p_array['ag_cal']))?'on':""; - $this->ag_contact=3D(isset($p_array['ag_contact']))?$p_array['ag= _contact']:""; - $this->ag_comment=3D(isset($p_array['ag_comment']))?$p_array['ag= _comment']:""; - - } - /*!\brief remove the action - * - */ - function remove() - { - $this->get(); - // remove the key - $sql=3D"delete from action_gestion where ag_id=3D$1"; - $this->db->exec_sql($sql,array($this->ag_id)); - - // remove the ref of the depending action - $sql=3D"update action_gestion set ag_ref_ag_id=3D0 where ag_ref_= ag_id=3D$1"; - $this->db->exec_sql($sql,array($this->ag_id)); - - /* check the number of attached document */ - $doc=3Dnew Document($this->db); - $aDoc=3D$doc->get_all($this->ag_id); - if ( ! empty ($aDoc)) - { - // if there are documents - for ($i=3D0;$i remove(); - } - } - } - /*!\brief return the last p_limit operation into an array - *\param $p_limit is the max of operation to return - *\return $p_array of Action object - */ - function get_last($p_limit) - { - $sql=3D"select coalesce(vw_name,'Interne') as vw_name,ag_id,ag_t= itle,ag_ref, dt_value,to_char(ag_timestamp,'DD.MM.YYYY') as ag_timestamp_= fmt,ag_timestamp ". - " from action_gestion join document_type ". - " on (ag_type=3Ddt_id) left join vw_fiche_attr on (f_id=3Df= _id_dest) where ag_state in (2,3) order by ag_timestamp desc limit $p_lim= it"; - $array=3D$this->db->get_array($sql); - return $array; - } -} Deleted: phpcompta/trunk/include/class_action_detail.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_action_detail.php 2011-10-30 20:02:50 U= TC (rev 4280) +++ phpcompta/trunk/include/class_action_detail.php 2011-10-30 20:16:40 U= TC (rev 4281) @@ -1,248 +0,0 @@ -"ad_id", primary key - * - "qcode"=3D>"f_id", quick_code - * - "text"=3D>"ad_text", description lines - * - "price_unit"=3D>"ad_pu", price by unit - * - "quantity"=3D>"ad_quant", quantity - * - "tva_id"=3D>"ad_tva_id", tva_od - * - "tva_amount"=3D>"ad_tva_amount", vat amount=20 - * - "total"=3D>"ad_total_amount", total amount including vat - * - "ag_id"=3D>"ag_id" =3D> foreign key to action_gestion - * - db is the database connection - */ -class Action_Detail -{ - private static $variable=3Darray( - "id"=3D>"ad_id", - "qcode"=3D>"f_id", - "text"=3D>"ad_text", - "price_unit"=3D>"ad_pu", - "quantity"=3D>"ad_quant", - "tva_id"=3D>"ad_tva_id", - "tva_amount"=3D>"ad_tva_amount", - "total"=3D>"ad_total_amount", - "ag_id"=3D>"ag_id" - ); - function __construct ($p_cn,$p_id=3D0) - { - $this->db=3D$p_cn; - $this->ad_id=3D$p_id; - } - public function get_parameter($p_string) - { - if ( array_key_exists($p_string,self::$variable) ) - { - $idx=3Dself::$variable[$p_string]; - return $this->$idx; - } - else - exit (__FILE__.":".__LINE__.'Erreur attribut inexistant'); - } - public function set_parameter($p_string,$p_value) - { - if ( array_key_exists($p_string,self::$variable) ) - { - $idx=3Dself::$variable[$p_string]; - $this->$idx=3D$p_value; - } - else - exit (__FILE__.":".__LINE__.'Erreur attribut inexistant'); - - - } - public function get_info() - { - return var_export(self::$variable,true); - } - public function verify() - { - // Verify that the elt we want to add is correct - return 0; - } - public function save() - { - if ( $this->ad_id =3D=3D 0 ) - $this->insert(); - else - $this->update(); - } - - public function insert() - { - if ( $this->verify() !=3D 0 ) return; - $sql=3D'INSERT INTO action_detail('. - ' f_id, ad_text, ad_pu, ad_quant, ad_tva_id, ad_tva_amount,= '. - ' ad_total_amount, ag_id)'. - ' VALUES ($1, $2, $3, $4,$5,$6,$7,$8) returning ad_id'; - $this->ad_id=3D$this->db->get_value($sql,array( - $this->f_id, - $this->ad_text, - $this->ad_pu, - $this->ad_quant, - $this->ad_tva_id, - $this->ad_tva_amount, - $this->ad_total_amount, - $this->ag_id - ) - ); - - } - - public function update() - { - if ( $this->verify() !=3D 0 ) return; - - $sql=3D'UPDATE action_detail '. - ' SET f_id=3D$1, ad_text=3D$2, ad_pu=3D$3, ad_quant=3D$4, a= d_tva_id=3D$5,'. - ' ad_tva_amount=3D$6, ad_total_amount=3D$7, ag_id=3D$8'= . - ' WHERE ad_id=3D$9'; - $this->id=3D$this->db->exec_sql($sql,array( - $this->f_id, - $this->ad_text, - $this->ad_pu, - $this->ad_quant, - $this->ad_tva_id, - $this->ad_tva_amount, - $this->ad_total_amount, - $this->ag_id, - $this->ad_id - ) - ); - - - } - /*!\brief retrieve all the details of an Action - *\return array of Action_Detail - *\see Action::get - */ - public function load_all() - { - $sql=3D"SELECT ad_id, f_id, ad_text, ad_pu, ad_quant, ad_tva_id,= ad_tva_amount, - ad_total_amount, ag_id FROM action_detail ". - " where ag_id=3D$1"; - $res=3D$this->db->get_array( - $sql, - array($this->ag_id) - ); - if ( $this->db->count() =3D=3D 0 ) return; - $aRet=3Darray(); - for($i=3D0;$idb); - $row=3D$res[$i]; - foreach ($row as $idx=3D>$value) - { - $a->$idx=3D$value; - } - $aRet[$i]=3Dclone $a; - } - return $aRet; - } - - public function load() - { - $sql=3D"SELECT ad_id, f_id, ad_text, ad_pu, ad_quant, ad_tva_id,= ad_tva_amount, - ad_total_amount, ag_id FROM action_detail". - " where ad_id=3D$1"; - - $res=3D$this->db->get_array($this->db, - $sql, - array($this->ad_id) - ); - if ( $this->db->count() =3D=3D 0 ) return; - $row=3D$res[0]; - foreach ($row as $idx=3D>$value) - { - $this->$idx=3D$value; - } - - } - public function delete() - { - exit(__FILE__.__LINE__.' : Non impl=C3=A9ment=C3=A9'); - } - /*!\brief Fill an Action_Detail Object with the data contained in an= array - *\param $array=20 - - [ad_id7] =3D> ad_id - - [e_march7] =3D> f_id - - [e_march7_label] =3D> ad_text - - [e_march7_price] =3D> ad_pu - - [e_quant7] =3D> ad_quant - - [e_march7_tva_id] =3D> ad_tva_id - - [e_march7_tva_amount] =3D> ad_tva_amount - - [tvac_march7] =3D> ad_total_amount - - [ag_id] =3D> ag_id - *\param $idx is the idx (example 7) - *\note */ - public function from_array($array,$idx) - { - $row=3D$array; - $this->ad_id=3D(isset($row['ad_id'.$idx]))?$row['ad_id'.$idx]:0; - - $qcode=3D(isset($row['e_march'.$idx]))?$row['e_march'.$idx]:""; - if (trim($qcode)=3D=3D'') - { - $this->f_id=3D0; - } - else - { - $tmp=3Dnew Fiche($this->db); - $tmp->get_by_qcode($qcode,false); - $this->f_id=3D$tmp->id; - } - $this->ad_text=3D(isset($row['e_march'.$idx.'_label']))?$row['e_= march'.$idx.'_label']:""; - $this->ad_pu=3D(isset($row['e_march'.$idx.'_price']))?$row['e_ma= rch'.$idx.'_price']:0; - $this->ad_quant=3D(isset($row['e_quant'.$idx]))?$row['e_quant'.$= idx]:0; - $this->ad_tva_id=3D(isset($row['e_march'.$idx.'_tva_id']))?$row[= 'e_march'.$idx.'_tva_id']:0; - $this->ad_tva_amount=3D(isset($row['e_march'.$idx.'_tva_amount']= ))?$row['e_march'.$idx.'_tva_amount']:0; - $this->ad_total_amount=3D(isset($row['tvac_march'.$idx]))?$row['= tvac_march'.$idx]:0; - $this->ag_id=3D(isset($array['ag_id']))?$array['ag_id']:0; - /* protect numeric */ - if (trim($this->ad_pu)=3D=3D"" || isNumber($this->ad_pu)=3D=3D0)= $this->ad_pu=3D0; - if (trim($this->ad_quant)=3D=3D"" || isNumber($this->ad_quant)=3D= =3D0) $this->ad_quant=3D0; - if (trim($this->ad_tva_amount)=3D=3D""||isNumber($this->ad_tva_a= mount)=3D=3D0) $this->ad_tva_amount=3D0; - if (trim($this->ad_total_amount)=3D=3D""||isNumber($this->ad_tot= al_amount)=3D=3D0) $this->ad_total_amount=3D0; - if (trim($this->ad_tva_id)=3D=3D"" || isNumber($this->ad_tva_id)= =3D=3D0) $this->ad_tva_id=3D0; - } - /*!\brief - *\param - *\return - *\note - *\see - */ - static function test_me() -{} - -} - -/* test::test_me(); */ - Modified: phpcompta/trunk/include/class_document.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_document.php 2011-10-30 20:02:50 UTC (r= ev 4280) +++ phpcompta/trunk/include/class_document.php 2011-10-30 20:16:40 UTC (r= ev 4281) @@ -20,7 +20,7 @@ // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr require_once('class_own.php'); require_once('class_acc_account_ledger.php'); -require_once('class_action.php'); +require_once('class_follow_up.php'); require_once('class_acc_tva.php'); require_once('class_user.php'); require_once('class_zip_extended.php'); @@ -755,7 +755,7 @@ =20 break; case 'REFERENCE': - $act=3Dnew Action($this->db); + $act=3Dnew Follow_Up($this->db); $act->ag_id=3D$this->ag_id; $act->get(); $r=3D$act->ag_ref; Copied: phpcompta/trunk/include/class_follow_up.php (from rev 4274, phpco= mpta/trunk/include/class_action.php) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_follow_up.php (= rev 0) +++ phpcompta/trunk/include/class_follow_up.php 2011-10-30 20:16:40 UTC (= rev 4281) @@ -0,0 +1,1069 @@ + + *
  • an invoice + *
  • a meeting + *
  • an order + *
  • a letter + * + * The table document_type are the possible actions + */ +/*! + * \brief class_action for manipulating actions + * action can be : + *
      + *
    • a meeting + *
    • an order + *
    • a letter + *
    + * The table document_type are the possible actions + */ + +class Follow_Up +{ + var $db; /*!< $db database connexion */ + var $ag_comment; /*!< $ag_comment description (ag_gestion.ag_com= ment) */ + var $ag_timestamp; /*!< $ag_timestamp document date (ag_gestion.a= g_timestamp)*/ + var $dt_id; /*!< $dt_id type of the document (document_typ= e.dt_id)*/ + var $ag_state; /*!< $ag_state stage of the document (printed= , send to client...)*/ + var $d_number; /*!< $d_number number of the document*/ + var $d_filename; /*!< $d_filename filename's document */ + var $d_mimetype; /*!< $d_mimetype document's filename */ + var $ag_title; /*!< $ag_title title document */ + var $f_id; /*!< $f_id_dest fiche id (From field ) */ + var $ag_ref_ag_id; /*!< $ag_ref_ag_id concern previous action*/ + var $ag_ref; /*!< $ag_ref is the ref */ + var $ag_hour; /*!< $ag_hour is the hour of the meeting, actio= n */ + var $ag_priority; /*!< $ag_priority is the priority 1 High, 2 med= ium, 3 low */ + var $ag_dest; /*!< $ag_dest person who is in charged */ + var $ag_contact; /*!< $ag_contact contact */ + /*! constructor + * \brief constructor + * \param p_cn database connection + */ + function __construct ($p_cn) + { + $this->db=3D$p_cn; + $this->f_id=3D0; + + } + //------------------------------------------------------------------= ---- + /*! + * \brief Display the object, the tags for the FORM + * are in the caller. It will be used for adding and updating + * action + *\note If ag_id is not equal to zero then it is an update otherwi= se + * it is a new document + * + * \param $p_view if set to true the form will be in readonly mode (= value: true or false) + * \param $p_gen true we show the tag for generating a doc (value : = true or false) + *\param $p_base is the ac parameter + *\param $retour is the html code for the return button + * \note update the reference number or the document type is not al= lowed + * + * + * \return string containing the html code + */ + function Display($p_view,$p_gen,$p_base,$retour=3D"") + { + if ( $p_view=3D=3D'UPD') + { + $upd=3Dtrue; + $readonly=3Dfalse; + } + elseif ($p_view=3D=3D"NEW") + { + $upd=3Dfalse; + $readonly=3Dfalse; + } + elseif ($p_view=3D=3D'READ') + { + $upd=3Dtrue; + $readonly=3Dtrue; + } + else + { + exit('class_action'.__LINE__.'Follow_Up::Display error unkno= wn parameter'.$p_view); + + } + // Compute the widget + // Date + $date=3Dnew IDate(); + $date->readonly=3D$readonly; + $date->name=3D"ag_timestamp"; + $date->value=3D$this->ag_timestamp; + + // for insert mode only + if ( $upd =3D=3D false ) + { + // Doc Type + $doc_type=3Dnew ISelect(); + $doc_type->name=3D"dt_id"; + $doc_type->value=3D$this->db->make_array("select dt_id,dt_va= lue from document_type"); + $doc_type->selected=3D$this->dt_id; + $doc_type->readonly=3Dfalse; + $str_doc_type=3D$doc_type->input(); + } + else + { + // Doc Type + $doc_type=3Dnew IHidden(); + $doc_type->name=3D"dt_id"; + $doc_type->value=3D$this->dt_id; + $str_doc_type=3D$doc_type->input().$this->db->get_value("sel= ect dt_value from document_type where dt_id=3D".$this->dt_id); + } + + // Description + $desc=3Dnew ITextArea(); + $desc->width=3D70; + $desc->heigh=3D5; + $desc->name=3D"ag_comment"; + $desc->readonly=3D$readonly; + $desc->value=3D$this->ag_comment; + if ( strlen($desc->value) >300 ) + { + $desc->width=3D120; + $desc->heigh=3D40; + } + + // state + // Retrieve the value + $a=3D$this->db->make_array("select s_id,s_value from document_st= ate "); + $state=3Dnew ISelect(); + $state->readonly=3D$readonly; + $state->name=3D"ag_state"; + $state->value=3D$a; + $state->selected=3D$this->ag_state; + $str_state=3D$state->input(); + + // Retrieve the value if there is an attached doc + $doc_ref=3D""; + // Document id + + $h2=3Dnew IHidden(); + $h2->name=3D"d_id"; + $h2->value=3D$this->d_id; + + if ( $this->d_id !=3D 0 && $this->d_id !=3D "" ) + { + $h2->readonly=3D($p_view=3D=3D'NEW')?false:true; + $doc=3Dnew Document($this->db,$this->d_id); + $doc->get(); + if ( strlen(trim($doc->d_lob)) !=3D 0 ) + { + $d_id=3Dnew IHidden(); + $doc_ref=3D"

    Document ".$doc->a_ref().'

    '; + $doc_ref.=3D$h2->input().$d_id->input('d_id',$this->d_id= ); + } + + } + + + // title + $title=3Dnew IText(); + $title->readonly=3D$readonly; + $title->name=3D"ag_title"; + $title->value=3D$this->ag_title; + $title->size=3D60; + + // ag_cal + $ag_cal=3Dnew ICheckBox('ag_cal'); + $ag_cal->readonly=3D$readonly; + $ag_cal->name=3D"ag_cal"; + + if ( $this->ag_cal=3D=3D'C' ) + $ag_cal->selected=3Dtrue; + else + $ag_cal->selected=3Dfalse; + + $str_ag_cal=3D$ag_cal->input(); + + // Priority of the ag_priority + $ag_priority=3Dnew ISelect(); + $ag_priority->readonly=3D$readonly; + $ag_priority->name=3D"ag_priority"; + $ag_priority->selected=3D$this->ag_priority; + $ag_priority->value=3Darray(array('value'=3D>1,'label'=3D>'Haute= '), + array('value'=3D>2,'label'=3D>'Moyenne= '), + array('value'=3D>3,'label'=3D>'Basse') + ); + $str_ag_priority=3D$ag_priority->input(); + + // hour of the action (meeting) ag_hour + $ag_hour=3Dnew IText(); + $ag_hour->readonly=3D$readonly; + $ag_hour->name=3D"ag_hour"; + $ag_hour->value=3D$this->ag_hour; + $ag_hour->size=3D6; + $ag_hour->javascript=3D" onblur=3Dcheck_hour('ag_hour');"; + $str_ag_hour=3D$ag_hour->input(); + + // Person in charged of the action + $ag_dest=3Dnew ISelect(); + $ag_dest->readonly=3D$readonly; + $ag_dest->name=3D"ag_dest"; + $repo=3Dnew Database(); + $aAg_dest=3D$repo->make_array("select use_id as value, ". + "use_first_name||' '||use_name||'('|= |use_login||')' as label ". + " from ac_users natural join jnt_use= _dos ". + " join priv_user on (jnt_id=3Dpriv_j= nt) ". + "where dos_id=3D ".$_REQUEST['gDossi= er']); + $aAg_dest[]=3Darray('value'=3D>0,'label'=3D>'phpcompta'); + $ag_dest->value=3D$aAg_dest; + $ag_dest->selected=3D$this->ag_dest; + $str_ag_dest=3D$ag_dest->input(); + + // ag_ref + // Always false for update + $ag_ref=3Dnew IText(); + $ag_ref->readonly=3D$upd; + $ag_ref->name=3D"ag_ref"; + $ag_ref->value=3Dsql_string($this->ag_ref); + $client_label=3Dnew ISpan(); + + /* Add button */ + $f_add_button=3Dnew IButton('add_card'); + $f_add_button->label=3D_('Cr=C3=A9er une nouvelle fiche'); + $f_add_button->set_attribute('ipopup','ipop_newcard'); + $filter=3D$this->db->make_list('select fd_id from fiche_def '); + $f_add_button->set_attribute('filter',$filter); + + $f_add_button->javascript=3D" select_card_type(this);"; + $str_add_button=3D$f_add_button->input(); + + // f_id_dest sender + if ( $this->qcode_dest !=3D NOTFOUND && strlen(trim($this->qcode= _dest)) !=3D 0) + { + $tiers=3Dnew Fiche($this->db); + $tiers->get_by_qcode($this->qcode_dest); + $qcode_dest_label=3D$tiers->strAttribut(1); + $this->f_id_dest=3D$tiers->id; + } + else + { + $qcode_dest_label=3D($this->f_id_dest=3D=3D0 || trim($this->= qcode_dest)=3D=3D"")?'Interne ':'Error'; + } + + $h_ag_id=3Dnew IHidden(); + // if concerns another action : show the link otherwise nothing + $lag_ref_ag_id=3D" 00 / 00 "; + + if ( $this->ag_ref_ag_id !=3D 0 ) + { + $supl_hidden=3D''; + if( isset($_REQUEST['sc'])) + $supl_hidden.=3D'&sc=3D'.$_REQUEST['sc']; + if( isset($_REQUEST['f_id'])) + $supl_hidden.=3D'&f_id=3D'.$_REQUEST['f_id']; + if( isset($_REQUEST['sb'])) + $supl_hidden.=3D'&sb=3D'.$_REQUEST['sb']; + + $lag_ref_ag_id=3D'
    ag_ref_ag_id.'&'.dossier::get().'">'. + $this->db->get_value("select ag_ref from = action_gestion where ag_id=3D$1",array($this->ag_ref_ag_id)). + ""; + } + // sender + $w=3Dnew ICard(); + $w->readonly=3D$readonly; + $w->jrn=3D0; + $w->name=3D'qcode_dest'; + $w->value=3D($this->f_id_dest !=3D 0)?$this->qcode_dest:""; + $w->label=3D""; + $list_recipient=3D$this->db->make_list('select fd_id from fiche_= def where frd_id in (14,25,8,9,16)'); + $w->extra=3D$list_recipient; + $w->set_attribute('typecard',$list_recipient); + $w->set_dblclick("fill_ipopcard(this);"); + $w->set_attribute('ipopup','ipopcard'); + + // name of the field to update with the name of the card + $w->set_attribute('label','qcode_dest_label'); + // name of the field to update with the name of the card + $w->set_attribute('typecard',$w->extra); + $w->set_function('fill_data'); + $w->javascript=3Dsprintf(' onchange=3D"fill_data_onchange(\'%s\'= );" ', + $w->name); + + $sp=3Dnew ISpan(); + $sp->name=3D'qcode_dest_label'; + $sp->value=3D$qcode_dest_label; + + // contact + $ag_contact=3Dnew ICard(); + $ag_contact->readonly=3D$readonly; + $ag_contact->jrn=3D0; + $ag_contact->name=3D'ag_contact'; + $ag_contact->value=3D''; + $ag_contact->set_attribute('ipopup','ipopcard'); + + if( $this->ag_contact !=3D 0 ) + { + $contact=3Dnew Fiche($this->db,$this->ag_contact); + $ag_contact->value=3D$contact->get_quick_code(); + } + + $ag_contact->label=3D""; + + $list_contact=3D$this->db->make_list('select fd_id from fiche_de= f where frd_id=3D16'); + $ag_contact->extra=3D$list_contact; + + $ag_contact->set_dblclick("fill_ipopcard(this);"); + // name of the field to update with the name of the card + $ag_contact->set_attribute('label','ag_contact_label'); + // name of the field to update with the name of the card + $ag_contact->set_attribute('typecard',$list_contact); + $ag_contact->set_function('fill_data'); + $ag_contact->javascript=3Dsprintf(' onchange=3D"fill_data_onchan= ge(\'%s\');" ', + $ag_contact->name); + + $spcontact=3Dnew ISpan(); + $spcontact->name=3D'ag_contact_label'; + $spcontact->value=3D''; + $fiche_contact=3Dnew Fiche($this->db); + $fiche_contact->get_by_qcode($this->ag_contact); + if ( $fiche_contact->id !=3D 0 ) + { + $spcontact->value=3D$fiche_contact->strAttribut(ATTR_DEF_NAM= E); + } + + + $h_agrefid=3Dnew IHidden(); + $str_ag_ref=3D"".(($this->ag_ref !=3D "")?$this->ag_ref:" Nou= veau ").""; + // Preparing the return string + $r=3D""; + + /* for new files */ + $upload=3Dnew IFile(); + $upload->name=3D"file_upload[]"; + $upload->value=3D""; + $aAttachedFile=3D$this->db->get_array('select d_id,d_filename,d_= mimetype,'. + '\'show_document.php?'. + Dossier::get().'&d_id=3D\'||= d_id as link'. + ' from document where ag= _id=3D$1', + array($this->ag_id)); + /* create the select for document */ + $aDocMod=3Dnew ISelect(); + $aDocMod->name=3D'doc_mod'; + $aDocMod->value=3D$this->db->make_array('select md_id,dt_value||= \' : \'||md_name as md_name'. + ' from document_modele joi= n document_type on (md_type=3Ddt_id)'. + ' order by md_name'); + $str_select_doc=3D$aDocMod->input(); + /* if no document then do not show the generate button */ + if ( empty($aDocMod->value) ) + $str_submit_generate=3D""; + else + $str_submit_generate=3DHtmlInput::submit("generate",_("G=C3=A9= n=C3=A9re le document")); + + $ag_id=3D$this->ag_id; + + /* fid =3D Icard */ + $icard=3Dnew ICard(); + $icard->jrn=3D0; + $icard->table=3D0; + $icard->extra2=3D'QuickCode'; + $icard->noadd=3D"no"; + $icard->extra=3D'all'; + + /* Text desc */ + $text=3Dnew IText(); + $num=3Dnew INum(); + + /* TVA */ + $itva=3Dnew ITva_Popup($this->db); + $itva->in_table=3Dtrue; + + /* create aArticle for the detail section */ + for ($i=3D0;$i< MAX_ARTICLE;$i++) + { + /* fid =3D Icard */ + $icard=3Dnew ICard(); + $icard->jrn=3D0; + $icard->table=3D0; + $icard->noadd=3D"no"; + $icard->extra=3D'all'; + $icard->name=3D"e_march".$i; + $tmp_ad=3D(isset($this->aAction_detail[$i]))?$this->aAction_= detail[$i]:false; + $icard->value=3D''; + if ( $tmp_ad ) + { + $march=3Dnew Fiche($this->db); + $f=3D$tmp_ad->get_parameter('qcode'); + if ( $f !=3D 0 ) + { + $march->id=3D$f; + $icard->value=3D$march->get_quick_code(); + } + } + $icard->set_dblclick("fill_ipopcard(this);"); + // name of the field to update with the name of the card + $icard->set_attribute('label',"e_march".$i."_label"); + // name of the field to update with the name of the card + $icard->set_attribute('typecard',$icard->extra); + $icard->set_attribute('ipopup','ipopcard'); + $icard->set_function('fill_data'); + $icard->javascript=3Dsprintf(' onchange=3D"fill_data_onchang= e(\'%s\');" ', + $icard->name); + + $aArticle[$i]['fid']=3D$icard->search().$icard->input(); + + $text->javascript=3D' onchange=3D"clean_tva('.$i.');compute_= ledger('.$i.')"'; + $text->name=3D"e_march".$i."_label"; + $text->size=3D40; + $text->value=3D($tmp_ad)?$tmp_ad->get_parameter('text'):""; + $aArticle[$i]['desc']=3D$text->input(); + + $num->javascript=3D' onchange=3D"format_number(this);clean_t= va('.$i.');compute_ledger('.$i.')"'; + $num->name=3D"e_march".$i."_price"; + $num->size=3D8; + $num->value=3D($tmp_ad)?$tmp_ad->get_parameter('price_unit')= :0; + $aArticle[$i]['pu']=3D$num->input(); + + $num->name=3D"e_quant".$i; + $num->size=3D8; + $num->value=3D($tmp_ad)?$tmp_ad->get_parameter('quantity'):0= ; + $aArticle[$i]['quant']=3D$num->input(); + + $itva->name=3D'e_march'.$i.'_tva_id'; + $itva->value=3D($tmp_ad)?$tmp_ad->get_parameter('tva_id'):0; + $itva->javascript=3D' onchange=3D"format_number(this);clean_= tva('.$i.');compute_ledger('.$i.')"'; + $itva->set_attribute('compute',$i); + + $aArticle[$i]['tvaid']=3D$itva->input(); + + $num->name=3D"e_march".$i."_tva_amount"; + $num->value=3D($tmp_ad)?$tmp_ad->get_parameter('tva_amount')= :0; + $num->javascript=3D' onchange=3D"compute_ledger('.$i.')"'; + $num->size=3D8; + $aArticle[$i]['tva']=3D$num->input(); + + $num->name=3D"tvac_march".$i; + $num->value=3D($tmp_ad)?$tmp_ad->get_parameter('total'):0; + $num->size=3D8; + $aArticle[$i]['tvac']=3D$num->input(); + + $aArticle[$i]['hidden_htva']=3DHtmlInput::hidden('htva_march= '.$i,0); + $aArticle[$i]['hidden_tva']=3DHtmlInput::hidden('tva_march'.= $i,0); + $aArticle[$i]['ad_id']=3D ($tmp_ad)?HtmlInput::hidden('ad_id= '.$i,$tmp_ad->get_parameter('id')):HtmlInput::hidden('ad_id'.$i,0); + + + } + + /* Add the needed hidden values */ + $r.=3Ddossier::hidden(); + + /* add the number of item */ + $Hid=3Dnew IHidden(); + $r.=3D$Hid->input("nb_item",MAX_ARTICLE); + + /* get template */ + ob_start(); + require_once ('template/detail-action.php'); + $content=3Dob_get_contents(); + ob_end_clean(); + $r.=3D$content; + + //hidden + $r.=3D"

    "; + $r.=3D$h2->input(); + $r.=3D$h_agrefid->input("ag_ref_ag_id",$this->ag_ref_ag_id); + $r.=3D$h_ag_id->input('ag_id',$this->ag_id); + $hidden2=3Dnew IHidden(); + $r.=3D$hidden2->input('f_id_dest',$this->f_id_dest); + $r.=3D"

    "; + + // show the list of the concern operation + if ( $this->db->count_sql('select * from action_gestion where ag= _ref_ag_id!=3D0 and ag_ref_ag_id=3D'.$this->ag_id. + " limit 2") > 0 ) + { + $sql=3Dsprintf(" and ag_id in (select action_get_tree from c= omptaproc.action_get_tree(%s)) ",$this->ag_id); + $r.=3D$this->myList($p_base,"",$sql); + } + return $r; + + } + //------------------------------------------------------------------= ---- + /*!\brief This function shows the detail of an action thanks the ag_= id + */ + function get() + { + $sql=3D"select ag_id, ag_comment,to_char (ag_timestamp,'DD.MM.YY= YY') as ag_timestamp,". + " f_id_dest,ag_title,ag_comment,ag_ref,d_id,ag_type,ag_stat= e, ". + " ag_ref_ag_id, ag_dest, ag_hour, ag_priority, ag_cal,ag_co= ntact ". + " from action_gestion left join document using (ag_id) wher= e ag_id=3D".$this->ag_id; + $r=3D$this->db->exec_sql($sql); + $row=3DDatabase::fetch_all($r); + if ( $row=3D=3Dfalse) return; + $this->ag_comment=3D$row[0]['ag_comment']; + $this->ag_timestamp=3D$row[0]['ag_timestamp']; + $this->ag_contact=3D$row[0]['ag_contact']; + $this->f_id_dest=3D$row[0]['f_id_dest']; + $this->ag_title=3D$row[0]['ag_title']; + $this->ag_type=3D$row[0]['ag_type']; + $this->ag_ref=3D$row[0]['ag_ref']; + $this->ag_state=3D$row[0]['ag_state']; + $this->ag_ref_ag_id=3D$row[0]['ag_ref_ag_id']; + $this->d_id=3D$row[0]['d_id']; + $this->ag_dest=3D$row[0]['ag_dest']; + $this->ag_hour=3D$row[0]['ag_hour']; + $this->ag_priority=3D$row[0]['ag_priority']; + $this->ag_cal=3D$row[0]['ag_cal']; + + $action_detail=3Dnew Follow_Up_Detail($this->db); + $action_detail->set_parameter('ag_id',$this->ag_id); + $this->aAction_detail=3D$action_detail->load_all(); + + + // if there is no document set 0 to d_id + if ( $this->d_id =3D=3D "" ) + $this->d_id=3D0; + // if there is a document fill the object + if ($this->d_id !=3D 0 ) + { + $this->state=3D$row['0']['ag_state']; + $this->ag_state=3D$row[0]['ag_state']; + } + $this->dt_id=3D$this->ag_type; + $aexp=3Dnew Fiche($this->db,$this->f_id_dest); + $this->qcode_dest=3D$aexp->strAttribut(ATTR_DEF_QUICKCODE); + + } + + /*! + * \brief Save the document and propose to save the generated docume= nt or + * to upload one, the data are included except the file. Temporary = the generated + * document is save + * + * \return + */ + function save() + { + + // Get The sequence id, + $seq_name=3D"seq_doc_type_".$this->dt_id; + $str_file=3D""; + $add_file=3D''; + + // f_id exp + $exp=3Dnew Fiche($this->db); + $exp->get_by_qcode($this->qcode_dest); + + $contact=3Dnew Fiche($this->db); + $contact->get_by_qcode($this->ag_contact); + + if ( trim($this->ag_title) =3D=3D "") + { + $doc_mod=3Dnew document_type($this->db); + $doc_mod->dt_id=3D$this->dt_id; + $doc_mod->get(); + $this->ag_title=3D$doc_mod->dt_value; + } + $this->ag_id=3D$this->db->get_next_seq('action_gestion_ag_id_seq= '); + + // Create the reference + $ref=3D$this->dt_id.'/'.$this->ag_id; + $this->ag_ref=3D$ref; + if ( $this->ag_cal=3D=3D'on') + $ag_cal=3D'C'; + else + $ag_cal=3D'I'; + $this->ag_ref_ag_id=3D(strlen(trim($this->ag_ref_ag_id))=3D=3D0)= ?0:$this->ag_ref_ag_id; + // save into the database + $sql=3D"insert into action_gestion". + "(ag_id,ag_timestamp,ag_type,ag_title,f_id_dest,ag_comment,= ag_ref,ag_ref_ag_id, ag_dest, ". + " ag_hour, ag_priority,ag_cal,ag_owner,ag_contact,ag_state)= ". + " values ($1,to_date($2,'DD.MM.YYYY'),$3,$4,$5,$6,$7,$8,$9,= $10,$11,$12,$13,$14,$15)"; + $this->db->exec_sql($sql,array($this->ag_id, /* 1 */ + $this->ag_timestamp, /* 2 */ + $this->dt_id, /* 3 */ + $this->ag_title, /* 4 */ + $exp->id, /* 5 */ + $this->ag_comment, /* 6 */ + $ref, /* 7 */ + $this->ag_ref_ag_id, /* 8 */ + $this->ag_dest, /* 9 */ + $this->ag_hour, /* 10 */ + $this->ag_priority, /* 11 */ + $ag_cal, /* 12 */ + $_SESSION['g_user'], /* 13 */ + $contact->id, /* 14 */ + $this->ag_state /* 15 */ + ) + ); + + /* insert also the details */ + for ( $i =3D 0; $i < MAX_ARTICLE;$i++) + { + $act=3Dnew Action_Detail($this->db); + $act->from_array($_POST,$i); + $act->ag_id=3D$this->ag_id; + $act->save(); + } + + /* Upload the documents */ + $doc=3Dnew Document($this->db); + $doc->Upload($this->ag_id); + } + /*! myList($p_filter=3D"") + * \brief Show list of action by default if sorted on date + *\param $p_base base url with ac... + * \param $p_filter filters on the document_type + * \param $p_search must a valid sql command ( ex 'and ag_title lik= e upper('%hjkh%')) + * \return string containing html code + */ + function myList($p_base,$p_filter=3D"",$p_search=3D"") + { + $str_dossier=3Ddossier::get(); + // for the sort + $sort=3D""; + $image_asc=3D''; + $image_desc=3D''; + $image_sel_desc=3D''; + $image_sel_asc=3D''; + $url=3DCleanUrl(); + $url=3D$str_dossier.'&'.$p_base; + + $sort_date=3D''.$image_asc.''. + 'Date'. + ''.$image_desc.''; + $sort_exp=3D''.$image_asc.''. + 'Exp=C3=A9diteur'. + ''.$image_desc.''; + $sort_titre=3D''.$image_asc.''. + 'Titre'. + ''.$image_desc.''; + $sort_concerne=3D''.$image_asc.''. + 'Concerne'. + ''.$image_desc.''; + $sort_reference=3D''.$image_asc.''. + 'R=C3=A9f=C3=A9rence'. + ''.$image_desc.''; + + if ( isset($_GET['s'])) + { + switch ($_GET['s']) + { + case "date_a": + $sort=3D" ag_timestamp asc"; + $sort_date=3D''.$image_sel_asc.''. + 'Date'. + ''.$image_desc.''; + break; + + case "date_d": + $sort=3D" ag_timestamp desc"; + $sort_date=3D''.$image_asc.''. + 'Date'. + $image_sel_desc.''; + break; + + case "exp": + $sort_exp=3D''.$image_sel_asc.''. + 'Exp=C3=A9diteur'. + ''.$image_asc.''; + $sort=3D" f_id_dest asc"; + break; + + case "exp_d": + $sort_exp=3D''.$image_asc.''. + 'Exp=C3=A9diteur'. + $image_sel_desc.''; + + $sort=3D" f_id_dest desc"; + break; + + case "ti": + $sort_titre=3D''.$image_sel_asc. + 'Titre'. + ''.$image_desc.''; + + $sort=3D" ag_title asc"; + break; + case "ti_d": + $sort_titre=3D''.$image_asc.''. + 'Titre'. + $image_sel_desc.''; + + $sort=3D" ag_title desc"; + break; + + case "conc": + $sort_concerne=3D''.$image_sel_asc. + 'Concerne'. + ''.$image_desc.''; + + $sort=3D" ag_ref_ag_id asc"; + break; + case "conc_d": + $sort_concerne=3D''.$image_asc.''. + 'Concerne'. + $image_sel_desc.''; + + $sort=3D" ag_ref_ag_id desc"; + break; + + case "ref": + $sort_reference=3D''.$image_sel_asc. + 'R=C3=A9f=C3=A9rence'. + ''.$image_desc.''; + + $sort=3D" ag_ref "; + break; + + case "ref_d": + $sort_reference=3D''.$image_asc.''. + 'R=C3=A9f=C3=A9rence'. + $image_sel_desc.''; + + $sort=3D" ag_ref desc"; + break; + + + } + + } + else + { + $sort=3D" ag_timestamp desc"; + $sort_date=3D''.$image_asc.''. + 'Date'. + $image_sel_desc.''; + } + + $sort=3D" order by ".$sort; + + if ( strlen(trim($p_filter)) !=3D 0 ) + $p_filter_doc=3D" dt_id in ( $p_filter )"; + else + $p_filter_doc=3D" 1=3D1 "; + + $sql=3D" + select ag_id,to_char(ag_timestamp,'DD.MM.YYYY') as my_date,= ag_ref_ag_id,f_id_dest". + ",ag_title,md_type,dt_value,ag_ref, ag_priority,ag_state + from action_gestion + left outer join document_modele on (ag_type=3Dmd_type) + join document_type on (ag_type=3Ddt_id) + where $p_filter_doc $p_search $sort"; + $max_line=3D$this->db->count_sql($sql); + $step=3D$_SESSION['g_pagesize']; + $page=3D(isset($_GET['offset']))?$_GET['page']:1; + $offset=3D(isset($_GET['offset']))?Database::escape_string($_GET= ['offset']):0; + if ( $step !=3D -1 ) $limit=3D" LIMIT $step OFFSET $offset "; + else $limit=3D''; + $bar=3Djrn_navigation_bar($offset,$max_line,$step,$page); + + $Res=3D$this->db->exec_sql($sql.$limit); + $a_row=3DDatabase::fetch_all($Res); + + $r=3D""; + $r.=3D$bar; + $r.=3D''; + $r.=3D""; + $r.=3D$sort_date; + $r.=3D$sort_exp; + $r.=3D$sort_titre; + $r.=3D''; + $r.=3Dth('Etat'); + $r.=3Dth('Priorit=C3=A9'); + $r.=3D$sort_reference; + $r.=3D$sort_concerne; + $r.=3D""; + + + // if there are no records return a message + if ( sizeof ($a_row) =3D=3D 0 or $a_row =3D=3D false ) + { + $r=3D'
    '; + $r.=3D'
    Aucun enregistrement trouv=C3=A9'; + $r.=3D"
    "; + return $r; + + } + $today=3Ddate('d.m.Y'); + $i=3D0; + //show the sub_action + foreach ($a_row as $row ) + { + $href=3D''; + $i++; + $tr=3D($i%2=3D=3D0)?'even':'odd'; + if ($row['ag_priority'] < 2) $tr=3D'priority1'; + $st=3D''; + if ($row['my_date']=3D=3D$today) $st=3D' style=3D"font-famil= y:bold; border:2px solid orange;"'; + $r.=3D""; + $r.=3D""; + + // Expediteur + $fexp=3Dnew Fiche($this->db); + $fexp->id=3D$row['f_id_dest']; + $qcode_dest=3D$fexp->strAttribut(ATTR_DEF_QUICKCODE); + + $qexp=3D($qcode_dest=3D=3DNOTFOUND)?"Interne":$qcode_dest; + $jsexp=3Dsprintf("javascript:showfiche('%s')", + $qexp); + if ( $qexp !=3D 'Interne' ) + { + $r.=3D""; + + $ref=3D""; + + // show reference + if ( $row['ag_ref_ag_id'] !=3D 0 ) + { + $retSqlStmt=3D$this->db->exec_sql( + "select ag_ref from action_gestion where= ag_id=3D".$row['ag_ref_ag_id']); + $retSql=3DDatabase::fetch_all($retSqlStmt); + if ( $retSql !=3D null ) + { + foreach ($retSql as $line) + { + $ref.=3D''. + $line['ag_ref'].""; + } + } + } + + $r.=3D'"; + $r.=3D""; + /* + * State + */ + switch ( $row['ag_state'] ) + { + case 1: + $state=3D'Ferm=C3=A9'; + break; + case 2: + $state=3D"A suivre"; + break; + case 3: + $state=3D"A faire"; + break; + case 4: + $state=3D"Abandonn=C3=A9"; + break; + } + $r.=3Dtd($state); + /* + * State + */ + switch ( $row['ag_priority'] ) + { + case 1: + $priority=3D'Haute'; + break; + case 2: + $priority=3D"Moyenne"; + break; + case 3: + $priority=3D"Important"; + break; + } + $r.=3Dtd($priority); + + $r.=3D""; + $r.=3D""; + $r.=3D""; + + } + $r.=3D"
    type
    ".$href.$row['my_date'].''."$href".$qexp." : ".$fexp->getName().''; + } + else + $r.=3D"$href Interne '.$href. + h($row['ag_title'])."".$row['dt_value']."".$row['ag_ref']."".$ref."
    "; + + $r.=3D$bar; + //$r.=3D"
  • "; + return $r; + } + //------------------------------------------------------------------= ---- + /*!\brief Update the data into the database + * + * \return true on success otherwise false + */ + function Update() + { + // if ag_id =3D=3D 0 nothing to do + if ( $this->ag_id =3D=3D 0 ) return ; + // retrieve customer + // f_id + + if ( trim($this->qcode_dest) =3D=3D"" ) + { + // internal document + $this->f_id_dest=3D0; // internal document + } + else + { + $tiers=3Dnew Fiche($this->db); + if ( $tiers->get_by_qcode($this->qcode_dest) =3D=3D -1 ) // = Error we cannot retrieve this qcode + return false; + else + $this->f_id_dest=3D$tiers->id; + + } + $contact=3Dnew Fiche($this->db); + if ( $contact->get_by_qcode($this->ag_contact) =3D=3D -1 ) + $contact->id=3D0; + + + $ref=3D$this->dt_id.'/'.$this->ag_id; + if ( $this->ag_cal =3D=3D 'on') $ag_cal=3D'C'; + else $ag_cal=3D'I'; + $this->ag_ref=3D$ref; + $this->db->exec_sql("update action_gestion set ag_comment=3D$1,"= . + " ag_timestamp=3Dto_date($2,'DD.MM.YYYY'),". + " ag_title=3D$3,". + " ag_type=3D$4, ". + " f_id_dest=3D$5, ". + " ag_ref_ag_id=3D$6 ,". + "ag_state=3D$7,". + " ag_hour =3D $9 ,". + " ag_priority =3D $10 ,". + " ag_dest =3D $11 , ". + " ag_cal =3D $12 ,". + " ag_contact =3D $13 ". + " where ag_id =3D $8", + array ( $this->ag_comment, /* 1 */ + $this->ag_timestamp, /* 2 */ + $this->ag_title, /* 3 */ + $this->dt_id, /* 4 */ + $this->f_id_dest, /* 5 */ + $this->ag_ref_ag_id, /* 6 */ + $this->ag_state, /* 7 */ + $this->ag_id, /* 8 */ + $this->ag_hour, /* 9 */ + $this->ag_priority, /* 10 */ + $this->ag_dest, /* 11 */ + $ag_cal, /* 12 */ + $contact->id /* 13 */ + )); + // Upload documents + $doc=3Dnew Document($this->db); + $doc->Upload($this->ag_id); + + /* save action details */ + for ( $i =3D 0; $i < MAX_ARTICLE;$i++) + { + $act=3Dnew Follow_Up_Detail($this->db); + $act->from_array($_POST,$i); + $act->save(); + } + return true; + + } + + /*!\brief generate the document and add it to the action + * \param md_id is the id of the document_modele + */ + function generate_document($md_id) + { + $doc=3Dnew Document($this->db); + $mod=3Dnew Document_Modele($this->db,$md_id); + $mod->load(); + $doc->f_id=3D$this->f_id_dest; + $doc->md_id=3D$md_id; + $doc->ag_id=3D$this->ag_id; + $doc->Generate(); + } + /*!\brief put an array in the variable member, the indice + * is the member name + *\param $p_array to parse + *\return nothing + */ + function fromArray($p_array) + { + $this->ag_id=3D(isset($p_array['ag_id']))?$p_array['ag_id']:""; + $this->qcode_dest=3D(isset($p_array['qcode_dest']))?$p_array['qc= ode_dest']:""; + $this->f_id_dest=3D(isset($p_array['f_id_dest']))?$p_array['f_id= _dest']:0; + $this->ag_ref_ag_id=3D(isset($p_array['ag_ref_ag_id']))?$p_array= ['ag_ref_ag_id']:0; + $this->ag_timestamp=3D(isset($p_array['ag_timestamp']))?$p_array= ['ag_timestamp']:date('d.m.Y'); + $this->qcode_dest=3D(isset($p_array['qcode_dest']))?$p_array['qc= ode_dest']:""; + $this->dt_id=3D(isset($p_array['dt_id']))?$p_array['dt_id']:""; + $this->ag_state=3D(isset($p_array['ag_state']))?$p_array['ag_sta= te']:2; + $this->ag_ref=3D(isset($p_array['ag_ref']))?$p_array['ag_ref']:"= "; + $this->ag_title=3D(isset($p_array['ag_title']))?$p_array['ag_tit= le']:""; + $this->ag_hour=3D(isset($p_array['ag_hour']))?$p_array['ag_hour'= ]:""; + $this->ag_dest=3D(isset($p_array['ag_dest']))?$p_array['ag_dest'= ]:""; + $this->ag_priority=3D(isset($p_array['ag_priority']))?$p_array['= ag_priority']:2; + $this->ag_cal=3D(isset($p_array['ag_cal']))?'on':""; + $this->ag_contact=3D(isset($p_array['ag_contact']))?$p_array['ag= _contact']:""; + $this->ag_comment=3D(isset($p_array['ag_comment']))?$p_array['ag= _comment']:""; + + } + /*!\brief remove the action + * + */ + function remove() + { + $this->get(); + // remove the key + $sql=3D"delete from action_gestion where ag_id=3D$1"; + $this->db->exec_sql($sql,array($this->ag_id)); + + // remove the ref of the depending action + $sql=3D"update action_gestion set ag_ref_ag_id=3D0 where ag_ref_= ag_id=3D$1"; + $this->db->exec_sql($sql,array($this->ag_id)); + + /* check the number of attached document */ + $doc=3Dnew Document($this->db); + $aDoc=3D$doc->get_all($this->ag_id); + if ( ! empty ($aDoc)) + { + // if there are documents + for ($i=3D0;$i remove(); + } + } + } + /*!\brief return the last p_limit operation into an array + *\param $p_limit is the max of operation to return + *\return $p_array of Follow_Up object + */ + function get_last($p_limit) + { + $sql=3D"select coalesce(vw_name,'Interne') as vw_name,ag_id,ag_t= itle,ag_ref, dt_value,to_char(ag_timestamp,'DD.MM.YYYY') as ag_timestamp_= fmt,ag_timestamp ". + " from action_gestion join document_type ". + " on (ag_type=3Ddt_id) left join vw_fiche_attr on (f_id=3Df= _id_dest) where ag_state in (2,3) order by ag_timestamp desc limit $p_lim= it"; + $array=3D$this->db->get_array($sql); + return $array; + } +} Copied: phpcompta/trunk/include/class_follow_up_detail.php (from rev 4274= , phpcompta/trunk/include/class_action_detail.php) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_follow_up_detail.php = (rev 0) +++ phpcompta/trunk/include/class_follow_up_detail.php 2011-10-30 20:16:4= 0 UTC (rev 4281) @@ -0,0 +1,248 @@ +"ad_id", primary key + * - "qcode"=3D>"f_id", quick_code + * - "text"=3D>"ad_text", description lines + * - "price_unit"=3D>"ad_pu", price by unit + * - "quantity"=3D>"ad_quant", quantity + * - "tva_id"=3D>"ad_tva_id", tva_od + * - "tva_amount"=3D>"ad_tva_amount", vat amount + * - "total"=3D>"ad_total_amount", total amount including vat + * - "ag_id"=3D>"ag_id" =3D> foreign key to action_gestion + * - db is the database connection + */ +class Follow_Up_Detail +{ + private static $variable=3Darray( + "id"=3D>"ad_id", + "qcode"=3D>"f_id", + "text"=3D>"ad_text", + "price_unit"=3D>"ad_pu", + "quantity"=3D>"ad_quant", + "tva_id"=3D>"ad_tva_id", + "tva_amount"=3D>"ad_tva_amount", + "total"=3D>"ad_total_amount", + "ag_id"=3D>"ag_id" + ); + function __construct ($p_cn,$p_id=3D0) + { + $this->db=3D$p_cn; + $this->ad_id=3D$p_id; + } + public function get_parameter($p_string) + { + if ( array_key_exists($p_string,self::$variable) ) + { + $idx=3Dself::$variable[$p_string]; + return $this->$idx; + } + else + exit (__FILE__.":".__LINE__.'Erreur attribut inexistant'); + } + public function set_parameter($p_string,$p_value) + { + if ( array_key_exists($p_string,self::$variable) ) + { + $idx=3Dself::$variable[$p_string]; + $this->$idx=3D$p_value; + } + else + exit (__FILE__.":".__LINE__.'Erreur attribut inexistant'); + + + } + public function get_info() + { + return var_export(self::$variable,true); + } + public function verify() + { + // Verify that the elt we want to add is correct + return 0; + } + public function save() + { + if ( $this->ad_id =3D=3D 0 ) + $this->insert(); + else + $this->update(); + } + + public function insert() + { + if ( $this->verify() !=3D 0 ) return; + $sql=3D'INSERT INTO action_detail('. + ' f_id, ad_text, ad_pu, ad_quant, ad_tva_id, ad_tva_amount,= '. + ' ad_total_amount, ag_id)'. + ' VALUES ($1, $2, $3, $4,$5,$6,$7,$8) returning ad_id'; + $this->ad_id=3D$this->db->get_value($sql,array( + $this->f_id, + $this->ad_text, + $this->ad_pu, + $this->ad_quant, + $this->ad_tva_id, + $this->ad_tva_amount, + $this->ad_total_amount, + $this->ag_id + ) + ); + + } + + public function update() + { + if ( $this->verify() !=3D 0 ) return; + + $sql=3D'UPDATE action_detail '. + ' SET f_id=3D$1, ad_text=3D$2, ad_pu=3D$3, ad_quant=3D$4, a= d_tva_id=3D$5,'. + ' ad_tva_amount=3D$6, ad_total_amount=3D$7, ag_id=3D$8'= . + ' WHERE ad_id=3D$9'; + $this->id=3D$this->db->exec_sql($sql,array( + $this->f_id, + $this->ad_text, + $this->ad_pu, + $this->ad_quant, + $this->ad_tva_id, + $this->ad_tva_amount, + $this->ad_total_amount, + $this->ag_id, + $this->ad_id + ) + ); + + + } + /*!\brief retrieve all the details of an Follow_Up + *\return array of Action_Detail + *\see Follow_Up::get + */ + public function load_all() + { + $sql=3D"SELECT ad_id, f_id, ad_text, ad_pu, ad_quant, ad_tva_id,= ad_tva_amount, + ad_total_amount, ag_id FROM action_detail ". + " where ag_id=3D$1"; + $res=3D$this->db->get_array( + $sql, + array($this->ag_id) + ); + if ( $this->db->count() =3D=3D 0 ) return; + $aRet=3Darray(); + for($i=3D0;$idb); + $row=3D$res[$i]; + foreach ($row as $idx=3D>$value) + { + $a->$idx=3D$value; + } + $aRet[$i]=3Dclone $a; + } + return $aRet; + } + + public function load() + { + $sql=3D"SELECT ad_id, f_id, ad_text, ad_pu, ad_quant, ad_tva_id,= ad_tva_amount, + ad_total_amount, ag_id FROM action_detail". + " where ad_id=3D$1"; + + $res=3D$this->db->get_array($this->db, + $sql, + array($this->ad_id) + ); + if ( $this->db->count() =3D=3D 0 ) return; + $row=3D$res[0]; + foreach ($row as $idx=3D>$value) + { + $this->$idx=3D$value; + } + + } + public function delete() + { + exit(__FILE__.__LINE__.' : Non impl=C3=A9ment=C3=A9'); + } + /*!\brief Fill an Action_Detail Object with the data contained in an= array + *\param $array + - [ad_id7] =3D> ad_id + - [e_march7] =3D> f_id + - [e_march7_label] =3D> ad_text + - [e_march7_price] =3D> ad_pu + - [e_quant7] =3D> ad_quant + - [e_march7_tva_id] =3D> ad_tva_id + - [e_march7_tva_amount] =3D> ad_tva_amount + - [tvac_march7] =3D> ad_total_amount + - [ag_id] =3D> ag_id + *\param $idx is the idx (example 7) + *\note */ + public function from_array($array,$idx) + { + $row=3D$array; + $this->ad_id=3D(isset($row['ad_id'.$idx]))?$row['ad_id'.$idx]:0; + + $qcode=3D(isset($row['e_march'.$idx]))?$row['e_march'.$idx]:""; + if (trim($qcode)=3D=3D'') + { + $this->f_id=3D0; + } + else + { + $tmp=3Dnew Fiche($this->db); + $tmp->get_by_qcode($qcode,false); + $this->f_id=3D$tmp->id; + } + $this->ad_text=3D(isset($row['e_march'.$idx.'_label']))?$row['e_= march'.$idx.'_label']:""; + $this->ad_pu=3D(isset($row['e_march'.$idx.'_price']))?$row['e_ma= rch'.$idx.'_price']:0; + $this->ad_quant=3D(isset($row['e_quant'.$idx]))?$row['e_quant'.$= idx]:0; + $this->ad_tva_id=3D(isset($row['e_march'.$idx.'_tva_id']))?$row[= 'e_march'.$idx.'_tva_id']:0; + $this->ad_tva_amount=3D(isset($row['e_march'.$idx.'_tva_amount']= ))?$row['e_march'.$idx.'_tva_amount']:0; + $this->ad_total_amount=3D(isset($row['tvac_march'.$idx]))?$row['= tvac_march'.$idx]:0; + $this->ag_id=3D(isset($array['ag_id']))?$array['ag_id']:0; + /* protect numeric */ + if (trim($this->ad_pu)=3D=3D"" || isNumber($this->ad_pu)=3D=3D0)= $this->ad_pu=3D0; + if (trim($this->ad_quant)=3D=3D"" || isNumber($this->ad_quant)=3D= =3D0) $this->ad_quant=3D0; + if (trim($this->ad_tva_amount)=3D=3D""||isNumber($this->ad_tva_a= mount)=3D=3D0) $this->ad_tva_amount=3D0; + if (trim($this->ad_total_amount)=3D=3D""||isNumber($this->ad_tot= al_amount)=3D=3D0) $this->ad_total_amount=3D0; + if (trim($this->ad_tva_id)=3D=3D"" || isNumber($this->ad_tva_id)= =3D=3D0) $this->ad_tva_id=3D0; + } + /*!\brief + *\param + *\return + *\note + *\see + */ + static function test_me() +{} + +} + +/* test::test_me(); */ + Modified: phpcompta/trunk/include/dashboard.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/dashboard.inc.php 2011-10-30 20:02:50 UTC (re= v 4280) +++ phpcompta/trunk/include/dashboard.inc.php 2011-10-30 20:16:40 UTC (re= v 4281) @@ -21,7 +21,7 @@ $last_ledger=3Darray(); if ( $g_user->check_action(GESTION)=3D=3D1) { - $Operation=3Dnew Action($cn); + $Operation=3Dnew Follow_Up($cn); $last_ledger=3D$Ledger->get_last(10); $last_operation=3D$Operation->get_last(10); } Modified: phpcompta/trunk/include/export_security_pdf.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/export_security_pdf.php 2011-10-30 20:02:50 U= TC (rev 4280) +++ phpcompta/trunk/include/export_security_pdf.php 2011-10-30 20:16:40 U= TC (rev 4281) @@ -142,7 +142,7 @@ } =20 //----------------------------------------------------- -// Action +// Follow_Up $pdf->SetFont('DejaVu','B',9); $pdf->Cell(0,7,'Acc=C3=A8s action',1,0,'C'); $pdf->Ln(); Modified: phpcompta/trunk/include/modele.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/modele.inc.php 2011-10-30 20:02:50 UTC (rev 4= 280) +++ phpcompta/trunk/include/modele.inc.php 2011-10-30 20:16:40 UTC (rev 4= 281) @@ -159,7 +159,7 @@ =20 } //--- - // Cleaning Action + // Cleaning Follow_Up //-- if ( isset($_POST['DOC'] )) { Modified: phpcompta/trunk/include/suivi_adm.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/suivi_adm.inc.php 2011-10-30 20:02:50 UTC (re= v 4280) +++ phpcompta/trunk/include/suivi_adm.inc.php 2011-10-30 20:16:40 UTC (re= v 4281) @@ -27,7 +27,7 @@ * - sd =3D this parameter is used here * - $cn =3D database connection */ -require_once('class_action.php'); +require_once('class_follow_up.php'); $g_user->can_request(GECOUR); =20 /** Modified: phpcompta/trunk/include/suivi_client.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/suivi_client.inc.php 2011-10-30 20:02:50 UTC = (rev 4280) +++ phpcompta/trunk/include/suivi_client.inc.php 2011-10-30 20:16:40 UTC = (rev 4281) @@ -28,7 +28,7 @@ * - sd =3D this parameter is used here * - $cn =3D database connection */ -require_once('class_action.php'); +require_once('class_follow_up.php'); load_all_script(); =20 /** Modified: phpcompta/trunk/include/suivi_supplier.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/suivi_supplier.inc.php 2011-10-30 20:02:50 UT= C (rev 4280) +++ phpcompta/trunk/include/suivi_supplier.inc.php 2011-10-30 20:16:40 UT= C (rev 4281) @@ -27,7 +27,7 @@ * - sd =3D this parameter is used here * - $cn =3D database connection */ -require_once('class_action.php'); +require_once('class_follow_up.php'); $g_user->can_request(GECOUR); =20 /** From MAILER-DAEMON Sun Oct 30 16:26:29 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RKbxc-0007Ra-W0 for mharc-phpcompta-dev@gnu.org; Sun, 30 Oct 2011 16:26:28 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Sun, 30 Oct 2011 21:33:07 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4282 - in phpcompta/trunk: html include X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Oct 2011 20:26:27 -0000 Author: danydb Date: 2011-10-30 21:33:05 +0100 (Sun, 30 Oct 2011) New Revision: 4282 Modified: phpcompta/trunk/html/user_login.php phpcompta/trunk/include/class_user.php phpcompta/trunk/include/opening.inc.php phpcompta/trunk/include/user_menu.php Log: 0000430: r?\195?\169?\195?\169criture de u_ShowDossier & GetAvailable fol= der Modified: phpcompta/trunk/html/user_login.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/user_login.php 2011-10-30 20:16:40 UTC (rev 4281= ) +++ phpcompta/trunk/html/user_login.php 2011-10-30 20:33:05 UTC (rev 4282= ) @@ -91,7 +91,7 @@ if ( $User->admin =3D=3D 0 ) { // how many folder ? - $folder=3DGetAvailableFolder($_SESSION['g_user'],0); + $folder=3D$User->get_available_folder(); if ( $folder !=3D null && count($folder) =3D=3D 1 ) { =20 @@ -142,11 +142,11 @@ $filtre=3D""; if ( isset ($_GET ['p_nom'])) { - $filtre=3Dsql_string($_GET['p_nom']); + $filtre=3D$_GET['p_nom']; } =20 // If admin show everything otherwise only the available dossier -$res=3Du_ShowDossier($_SESSION['g_user'],$User->Admin(),$filtre); +$res=3D$User->show_dossier($filtre); echo $res; ?>

    Modified: phpcompta/trunk/include/class_user.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/class_user.php 2011-10-30 20:16:40 UTC (rev 4= 281) +++ phpcompta/trunk/include/class_user.php 2011-10-30 20:33:05 UTC (rev 4= 282) @@ -1,4 +1,5 @@ '._('Session expir=C3=A9e
    U= tilisateur d=C3=A9connect=C3=A9').''; - redirect('index.php',1); - exit(); - } + var $id; + var $pass; + var $db; + var $admin; + var $valid; =20 - $this->login=3D$_SESSION['g_user']; - $this->pass=3D$_SESSION['g_pass']; - $this->lang=3D(isset($_SESSION['g_lang']))?$_SESSION['g_lang= ']:'fr_FR.utf8'; - $this->valid=3D(isset ($_SESSION['isValid']))?1:0; - $this->db=3D$p_cn; - $this->id=3D-1; - if ( isset($_SESSION['g_theme']) ) - $this->theme=3D$_SESSION['g_theme']; + function User($p_cn, $p_id=3D-1) + { + // if p_id is not set then check the connected user + if ($p_id =3D=3D -1) + { + if (!isset($_SESSION['g_user'])) + { + echo '

    ' . _('Session expir=C3=A9e
    Utilisateur= d=C3=A9connect=C3=A9') . '

    '; + redirect('index.php', 1); + exit(); + } =20 - $this->admin=3D( isset($_SESSION['use_admin']) )?$_SESSION['= use_admin']:0; + $this->login =3D $_SESSION['g_user']; + $this->pass =3D $_SESSION['g_pass']; + $this->lang =3D (isset($_SESSION['g_lang'])) ? $_SESSION['g_lang'] : = 'fr_FR.utf8'; + $this->valid =3D (isset($_SESSION['isValid'])) ? 1 : 0; + $this->db =3D $p_cn; + $this->id =3D -1; + if (isset($_SESSION['g_theme'])) + $this->theme =3D $_SESSION['g_theme']; =20 - if ( isset($_SESSION['use_name']) ) - $this->name=3D$_SESSION['use_name']; - if ( isset($_SESSION['use_first_name']) ) - $this->first_name=3D$_SESSION['use_first_name']; - $this->load(); - } - else // if p_id is set get data of another user - { - $this->id=3D$p_id; - $this->db=3D$p_cn; - $this->load(); - } - } - /*!\brief load data from database. - * if this->id =3D=3D -1, it is unknown so we have to retrieve it - from the database by the login - * return -1 if nothing is found - */ - function load() - { - /* if this->id =3D=3D -1, it is unknown so we have to retrieve i= t from - the database thanks it login */ - if ( $this->id < 0 ) - { - $sql_cond=3D" where use_login=3D$1"; - $sql_array=3Darray($this->login); - } - else - { - $sql_cond=3D" where use_id=3D$1"; - $sql_array=3Darray($this->id); - } - $sql=3D"select use_id, + $this->admin =3D ( isset($_SESSION['use_admin']) ) ? $_SESSION['use_a= dmin'] : 0; + + if (isset($_SESSION['use_name'])) + $this->name =3D $_SESSION['use_name']; + if (isset($_SESSION['use_first_name'])) + $this->first_name =3D $_SESSION['use_first_name']; + $this->load(); + } + else // if p_id is set get data of another user + { + $this->id =3D $p_id; + $this->db =3D $p_cn; + $this->load(); + } + } + + /* !\brief load data from database. + * if this->id =3D=3D -1, it is unknown so we have to retrieve it + from the database by the login + * return -1 if nothing is found + */ + + function load() + { + /* if this->id =3D=3D -1, it is unknown so we have to retrieve it from + the database thanks it login */ + if ($this->id < 0) + { + $sql_cond =3D " where use_login=3D$1"; + $sql_array =3D array($this->login); + } + else + { + $sql_cond =3D " where use_id=3D$1"; + $sql_array =3D array($this->id); + } + $sql =3D "select use_id, use_first_name, use_name, use_login, use_active, use_admin from ac_users "; - $cn=3Dnew Database(); - $Res=3D$cn->exec_sql($sql.$sql_cond,$sql_array); - if (($Max=3DDatabase::num_row($Res)) =3D=3D 0 ) return -1; - $row=3DDatabase::fetch_array($Res,0); - $this->id=3D$row['use_id']; - $this->first_name=3D$row['use_first_name']; - $this->name=3D$row['use_name']; - $this->active=3D$row['use_active']; - $this->login=3D$row['use_login']; - $this->admin=3D$row['use_admin']; - } - function save() - { + $cn =3D new Database(); + $Res =3D $cn->exec_sql($sql . $sql_cond, $sql_array); + if (($Max =3D Database::num_row($Res)) =3D=3D 0) + return -1; + $row =3D Database::fetch_array($Res, 0); + $this->id =3D $row['use_id']; + $this->first_name =3D $row['use_first_name']; + $this->name =3D $row['use_name']; + $this->active =3D $row['use_active']; + $this->login =3D $row['use_login']; + $this->admin =3D $row['use_admin']; + } =20 - $Sql=3D"update ac_users set use_first_name=3D$1, use_name=3D$2 + function save() + { + + $Sql =3D "update ac_users set use_first_name=3D$1, use_name=3D$2 ,use_active=3D$3,use_admin=3D$4 where use_id=3D$5"; - $cn=3Dnew Database(); - $Res=3D$cn->exec_sql($Sql,array($this->first_name,$this->last_na= me,$this->active,$this->admin,$this->id)); - } - /*! - * \brief Check if user is active and exists in therepository - * Automatically redirect, it doesn't check if a user can access a f= older - *\param $silent false, echo an error message and exit, true : exit = without warning - * default is false - * - ++*/ - function Check($silent=3Dfalse,$from=3D'') - { + $cn =3D new Database(); + $Res =3D $cn->exec_sql($Sql, array($this->first_name, $this->last_name= , $this->active, $this->admin, $this->id)); + } =20 - $res=3D0; - $pass5=3Dmd5($this->pass); + /* ! + * \brief Check if user is active and exists in therepository + * Automatically redirect, it doesn't check if a user can access a fold= er + * \param $silent false, echo an error message and exit, true : exit wi= thout warning + * default is false + * + ++ */ =20 - $cn=3Dnew Database(); - $sql=3D"select ac_users.use_login,ac_users.use_active, ac_users.= use_pass, + function Check($silent=3Dfalse, $from=3D'') + { + + $res =3D 0; + $pass5 =3D md5($this->pass); + + $cn =3D new Database(); + $sql =3D "select ac_users.use_login,ac_users.use_active, ac_users.use_= pass, use_admin,use_first_name,use_name from ac_users where ac_users.use_id=3D'$this->id' and ac_users.use_active=3D1 and ac_users.use_pass=3D'$pass5'"; - $ret=3D$cn->exec_sql($sql); - $res=3DDatabase::num_row($ret); - if ( $res >0 ) - { - $r=3DDatabase::fetch_array($ret,0); - $_SESSION['use_admin']=3D$r['use_admin']; - $_SESSION['use_name']=3D$r['use_name']; - $_SESSION['use_first_name']=3D$r['use_first_name']; - $_SESSION['isValid']=3D1; + $ret =3D $cn->exec_sql($sql); + $res =3D Database::num_row($ret); + if ($res > 0) + { + $r =3D Database::fetch_array($ret, 0); + $_SESSION['use_admin'] =3D $r['use_admin']; + $_SESSION['use_name'] =3D $r['use_name']; + $_SESSION['use_first_name'] =3D $r['use_first_name']; + $_SESSION['isValid'] =3D 1; =20 - $this->admin=3D$_SESSION['use_admin']; - $this->name=3D$_SESSION['use_name']; - $this->first_name=3D$_SESSION['use_first_name']; - $this->load_global_pref(); + $this->admin =3D $_SESSION['use_admin']; + $this->name =3D $_SESSION['use_name']; + $this->first_name =3D $_SESSION['use_first_name']; + $this->load_global_pref(); + } + $sql =3D "insert into audit_connect (ac_user,ac_ip,ac_module,ac_url,ac= _state) values ($1,$2,$3,$4,$5)"; =20 + if ($res =3D=3D 0) + { + $cn->exec_sql($sql, array($_SESSION['g_user'], $_SERVER["REMOTE_ADDR"= ], $from, $_SERVER['REQUEST_URI'], 'FAIL')); + if (!$silent) + { + alert(_('Utilisateur ou mot de passe incorrect')); + redirect('index.html'); + } + $this->valid =3D 0; + session_unset(); + exit - 1; + } + else + { + if ($from =3D=3D 'LOGIN') + $cn->exec_sql($sql, array($_SESSION['g_user'], $_SERVER["REMOTE_ADDR= "], $from, $_SERVER['REQUEST_URI'], 'SUCCESS')); + $this->valid =3D 1; + } =20 + return $ret; + } =20 - } - $sql=3D"insert into audit_connect (ac_user,ac_ip,ac_module,ac_url,ac_st= ate) values ($1,$2,$3,$4,$5)"; + /* !\brief return the access to a folder, + * \param $p_dossier id if it is =3D=3D 0 then we take the value from $= _SESSION + * \return the priv_priv + * - X no access + * - R has access (normal user) + * - L Local Admin + * + */ =20 - if ( $res =3D=3D 0 ) - { - $cn->exec_sql($sql,array($_SESSION['g_user'],$_SERVER["REMOTE_ADDR"= ],$from,$_SERVER['REQUEST_URI'],'FAIL')); - if ( ! $silent) - { - alert(_('Utilisateur ou mot de passe incorrect')); - redirect('index.html'); - } - $this->valid=3D0; - session_unset(); - exit -1; - } - else - { - if ( $from=3D=3D'LOGIN') - $cn->exec_sql($sql,array($_SESSION['g_user'],$_SERVER["REMOTE_ADDR"= ],$from,$_SERVER['REQUEST_URI'],'SUCCESS')); - $this->valid=3D1; - } + function get_folder_access($p_dossier =3D 0) + { =20 - return $ret; + if ($p_dossier =3D=3D 0) + $p_dossier =3D dossier::id(); + if ($this->is_local_admin($p_dossier) =3D=3D 1) + return 'L'; + $cn =3D new Database(); =20 - } - /*!\brief return the access to a folder, - * \param $p_dossier id if it is =3D=3D 0 then we take the value fro= m $_SESSION - *\return the priv_priv - * - X no access - * - R has access (normal user) - * - L Local Admin - * - */ - function get_folder_access($p_dossier =3D 0) - { + $sql =3D "select priv_priv from priv_user join jnt_use_dos on (jnt_id=3D= priv_jnt) join ac_users using (use_id) + where use_id=3D$1 and dos_id=3D$2"; =20 - if ($p_dossier=3D=3D0) $p_dossier=3Ddossier::id(); - if ( $this->is_local_admin($p_dossier) =3D=3D 1) return 'L'; - $cn=3Dnew Database(); + $res =3D $cn->get_value($sql, array($this->id, $p_dossier)); + if ($res =3D=3D '') + return 'X'; + return $res; + } =20 - $sql=3D"select priv_priv from priv_user join jnt_use_dos on (jnt= _id=3Dpriv_jnt) join ac_users using (use_id) - where use_id=3D$1 and dos_id=3D$2"; + /* \brief save the access of a folder + * \param $db_id the dossier id + * \param $priv the priv. to set + */ =20 - $res=3D$cn->get_value($sql,array($this->id,$p_dossier)); - if ( $res=3D=3D'') return 'X'; - return $res; - } - /*\brief save the access of a folder - *\param $db_id the dossier id - *\param $priv the priv. to set - */ - function set_folder_access($db_id,$priv) - { + function set_folder_access($db_id, $priv) + { =20 - $cn=3Dnew Database(); - $jnt=3D$cn->get_value("select jnt_id from jnt_use_dos where dos_= id=3D$1 and use_id=3D$2",array($db_id,$this->id)); + $cn =3D new Database(); + $jnt =3D $cn->get_value("select jnt_id from jnt_use_dos where dos_id=3D= $1 and use_id=3D$2", array($db_id, $this->id)); =20 - if ( $cn->size() =3D=3D 0 ) - { + if ($cn->size() =3D=3D 0) + { =20 - $Res=3D$cn->exec_sql("insert into jnt_use_dos(dos_id,use_id)= values($1,$2)",array($db_id,$this->id)); - $jnt=3D$cn->get_value("select jnt_id from jnt_use_dos where = dos_id=3D$1 and use_id=3D$2",array($db_id,$this->id)); - $Res=3D$cn->exec_sql("insert into priv_user (priv_priv,priv_= jnt) values($1,$2)",array($priv,$jnt)); - } - $Res=3D$cn->exec_sql("update priv_user set priv_priv=3D$1 where = priv_jnt=3D$2",array($priv,$jnt)); + $Res =3D $cn->exec_sql("insert into jnt_use_dos(dos_id,use_id) values= ($1,$2)", array($db_id, $this->id)); + $jnt =3D $cn->get_value("select jnt_id from jnt_use_dos where dos_id=3D= $1 and use_id=3D$2", array($db_id, $this->id)); + $Res =3D $cn->exec_sql("insert into priv_user (priv_priv,priv_jnt) va= lues($1,$2)", array($priv, $jnt)); + } + $Res =3D $cn->exec_sql("update priv_user set priv_priv=3D$1 where priv= _jnt=3D$2", array($priv, $jnt)); + } =20 - } - /*!\brief check that a user is valid and the access to the folder - * \param $p_ledger the ledger to check - *\return the priv_priv - * - O only predefined operation - * - W write - * - R read only - * - X no access - * + /* !\brief check that a user is valid and the access to the folder + * \param $p_ledger the ledger to check + * \return the priv_priv + * - O only predefined operation + * - W write + * - R read only + * - X no access + * =20 - * - */ - function get_ledger_access($p_ledger) - { - if ( $this->admin =3D=3D 1 || - $this->is_local_admin(dossier::id()) =3D=3D1 ) - return 'W'; + * + */ =20 - $sql=3D"select uj_priv from user_sec_jrn where uj_login=3D$1 and= uj_jrn_id=3D$2"; - $res=3D$this->db->get_value($sql,array($this->login,$p_ledger)); + function get_ledger_access($p_ledger) + { + if ($this->admin =3D=3D 1 || + $this->is_local_admin(dossier::id()) =3D=3D 1) + return 'W'; =20 - if ( $res=3D=3D'' ) $res=3D'X'; - return $res; - } + $sql =3D "select uj_priv from user_sec_jrn where uj_login=3D$1 and uj_= jrn_id=3D$2"; + $res =3D $this->db->get_value($sql, array($this->login, $p_ledger)); =20 - /*! - * \brief get all the available ledgers for the current user - * \param $p_type =3D ALL or the type of the ledger (ACH,VEN,FIN,ODS= ) - * \param $p_access =3D3 for Read or WRITE, 2 write, 1 for readonly - * \return a double array of available ledgers - @verbatim - [0] =3D> [jrn_def_id] - [jrn_def_type] - [jrn_def_name] - [jrn_def_class_deb] - [jrn_def_class_cred] - [jrn_type_id] - [jrn_desc] - [uj_priv] - @endverbatim - */ - function get_ledger($p_type=3D'ALL',$p_access=3D3) - { - if ( $this->admin !=3D 1 && $this->is_local_admin() !=3D 1) - { - $sql_type=3D($p_type=3D=3D'ALL')?'':"and jrn_def_type=3Duppe= r('".sql_string($p_type)."')"; - switch($p_access) - { - case 3: - $sql_access=3D" and uj_priv!=3D 'X'"; - break; - case 2: - $sql_access=3D" and uj_priv =3D 'W'"; - break; + if ($res =3D=3D '') + $res =3D 'X'; + return $res; + } =20 - case 1: - $sql_access=3D" and uj_priv =3D 'R'"; - break; + /* ! + * \brief get all the available ledgers for the current user + * \param $p_type =3D ALL or the type of the ledger (ACH,VEN,FIN,ODS) + * \param $p_access =3D3 for Read or WRITE, 2 write, 1 for readonly + * \return a double array of available ledgers + @verbatim + [0] =3D> [jrn_def_id] + [jrn_def_type] + [jrn_def_name] + [jrn_def_class_deb] + [jrn_def_class_cred] + [jrn_type_id] + [jrn_desc] + [uj_priv] + @endverbatim + */ =20 - } + function get_ledger($p_type=3D'ALL', $p_access=3D3) + { + if ($this->admin !=3D 1 && $this->is_local_admin() !=3D 1) + { + $sql_type =3D ($p_type =3D=3D 'ALL') ? '' : "and jrn_def_type=3Dupper= ('" . sql_string($p_type) . "')"; + switch ($p_access) + { + case 3: + $sql_access =3D " and uj_priv!=3D 'X'"; + break; + case 2: + $sql_access =3D " and uj_priv =3D 'W'"; + break; =20 - $sql=3D"select jrn_def_id,jrn_def_type, + case 1: + $sql_access =3D " and uj_priv =3D 'R'"; + break; + } + + $sql =3D "select jrn_def_id,jrn_def_type, jrn_def_name,jrn_def_class_deb,jrn_def_class_cred,jrn_t= ype_id,jrn_desc,uj_priv, jrn_deb_max_line,jrn_cred_max_line from jrn_def join jrn_type on jrn_def_type=3Djrn_type_i= d join user_sec_jrn on uj_jrn_id=3Djrn_def_id where - uj_login=3D'".$this->login."'". - $sql_type.$sql_access. - " order by jrn_Def_id"; - } - else - { - $sql_type=3D($p_type=3D=3D'ALL')?'':"where jrn_def_type=3Dup= per('".sql_string($p_type)."')"; - $sql=3D"select jrn_def_id,jrn_def_type,jrn_def_name,jrn_def_= class_deb,jrn_def_class_cred,jrn_deb_max_line,jrn_cred_max_line, + uj_login=3D'" . $this->login . "'" . + $sql_type . $sql_access . + " order by jrn_Def_id"; + } + else + { + $sql_type =3D ($p_type =3D=3D 'ALL') ? '' : "where jrn_def_type=3Dupp= er('" . sql_string($p_type) . "')"; + $sql =3D "select jrn_def_id,jrn_def_type,jrn_def_name,jrn_def_class_d= eb,jrn_def_class_cred,jrn_deb_max_line,jrn_cred_max_line, jrn_type_id,jrn_desc,'W' as uj_priv from jrn_def join jrn_type on jrn_def_type=3Djrn_type_i= d $sql_type order by jrn_Def_id"; + } + $res =3D $this->db->exec_sql($sql); + if (Database::num_row($res) =3D=3D 0) + return null; + $array =3D Database::fetch_all($res); + return $array; + } =20 - } - $res=3D$this->db->exec_sql($sql); - if ( Database::num_row($res) =3D=3D 0 ) return null; - $array=3DDatabase::fetch_all($res); - return $array; - } + /* !\brief return an sql condition for filtering the permitted ledger + * \param $p_type =3D ALL or the type of the ledger (ACH,VEN,FIN,ODS) + * \param $p_access =3D3 for READ or WRITE, 2 READ and write, 1 for rea= donly + * + * \return sql condition like =3D jrn_def_id in (...) + */ =20 - /*!\brief return an sql condition for filtering the permitted ledger - * \param $p_type =3D ALL or the type of the ledger (ACH,VEN,FIN,ODS= ) - * \param $p_access =3D3 for READ or WRITE, 2 READ and write, 1 for = readonly - * - *\return sql condition like =3D jrn_def_id in (...) - */ - function get_ledger_sql($p_type=3D'ALL',$p_access=3D3) - { - $aLedger=3D$this->get_ledger($p_type,$p_access); - if ( empty ($aLedger)) return ' jrn_def_id < 0 '; - $sql=3D" jrn_def_id in ("; - foreach ($aLedger as $row) - { - $sql.=3D$row['jrn_def_id'].','; - } - $sql.=3D'-1)'; - return $sql; - } - /*! - * \brief Check if an user is an admin - * - * \return 1 for yes 0 for no - */ - function Admin() - { - if ( $this->login !=3D 'phpcompta') - { - $pass5=3Dmd5($this->pass); - $sql=3D"select use_admin from ac_users where use_login=3D$1 + function get_ledger_sql($p_type=3D'ALL', $p_access=3D3) + { + $aLedger =3D $this->get_ledger($p_type, $p_access); + if (empty($aLedger)) + return ' jrn_def_id < 0 '; + $sql =3D " jrn_def_id in ("; + foreach ($aLedger as $row) + { + $sql.=3D$row['jrn_def_id'] . ','; + } + $sql.=3D'-1)'; + return $sql; + } + + /* ! + * \brief Check if an user is an admin + * + * \return 1 for yes 0 for no + */ + + function Admin() + { + if ($this->login !=3D 'phpcompta') + { + $pass5 =3D md5($this->pass); + $sql =3D "select use_admin from ac_users where use_login=3D$1 and use_active=3D1 "; =20 - $cn=3Dnew Database(); - $res=3D$cn->exec_sql($sql,array($this->login)); - if ( Database::num_row($res)=3D=3D0) exit(__FILE__." ".__LIN= E__." aucun resultat"); - $this->admin=3DDatabase::fetch_result($res,0); - } - else $this->admin=3D1; + $cn =3D new Database(); + $res =3D $cn->exec_sql($sql, array($this->login)); + if (Database::num_row($res) =3D=3D 0) + exit(__FILE__ . " " . __LINE__ . " aucun resultat"); + $this->admin =3D Database::fetch_result($res, 0); + } + else + $this->admin =3D 1; =20 - return $this->admin; - } - /*! - * \brief Set the selected periode in the user's preferences - * - * \param $p_periode periode - * \param - $p_user - * - */ - function set_periode($p_periode) - { - $sql=3D"update user_local_pref set parameter_value=3D'$p_periode= ' where user_id=3D'$this->id' and parameter_type=3D'PERIODE'"; - $Res=3D$this->db->exec_sql($sql); - } + return $this->admin; + } =20 - private function set_default_periode() - { + /* ! + * \brief Set the selected periode in the user's preferences + * + * \param $p_periode periode + * \param - $p_user + * + */ =20 - /* get the first periode */ - $sql=3D'select min(p_id) as pid from parm_periode where p_closed= =3D false and p_start =3D (select min(p_start) from parm_periode)'; - $Res=3D$this->db->exec_sql($sql); + function set_periode($p_periode) + { + $sql =3D "update user_local_pref set parameter_value=3D'$p_periode' wh= ere user_id=3D'$this->id' and parameter_type=3D'PERIODE'"; + $Res =3D $this->db->exec_sql($sql); + } =20 - $pid=3DDatabase::fetch_result($Res,0,0); - /* if all the periode are closed, then we use the last closed pe= riod */ - if ( $pid =3D=3D null ) - { - $sql=3D'select min(p_id) as pid from parm_periode where p_st= art =3D (select max(p_start) from parm_periode)'; - $Res2=3D$this->db->exec_sql($sql); - $pid=3DDatabase::fetch_result($Res2,0,0); - if ( $pid =3D=3D null ) - { - echo _("Aucune p=C3=A9riode trouv=C3=A9ee !!!"); - exit(1); - } + private function set_default_periode() + { =20 - $pid=3DDatabase::fetch_result($Res2,0,0); - } + /* get the first periode */ + $sql =3D 'select min(p_id) as pid from parm_periode where p_closed =3D= false and p_start =3D (select min(p_start) from parm_periode)'; + $Res =3D $this->db->exec_sql($sql); =20 - $sql=3Dsprintf("insert into user_local_pref (user_id,parameter_v= alue,parameter_type) - values ('%s','%d','PERIODE')", - $this->login,$pid); - $Res=3D$this->db->exec_sql($sql); - } + $pid =3D Database::fetch_result($Res, 0, 0); + /* if all the periode are closed, then we use the last closed period *= / + if ($pid =3D=3D null) + { + $sql =3D 'select min(p_id) as pid from parm_periode where p_start =3D= (select max(p_start) from parm_periode)'; + $Res2 =3D $this->db->exec_sql($sql); + $pid =3D Database::fetch_result($Res2, 0, 0); + if ($pid =3D=3D null) + { + echo _("Aucune p=C3=A9riode trouv=C3=A9ee !!!"); + exit(1); + } =20 - /*! - * \brief Get the default periode from the user's preferences - * - * \return the default periode - * - * - */ + $pid =3D Database::fetch_result($Res2, 0, 0); + } =20 - function get_periode() - { + $sql =3D sprintf("insert into user_local_pref (user_id,parameter_value= ,parameter_type) + values ('%s','%d','PERIODE')", $this->login, $pid); + $Res =3D $this->db->exec_sql($sql); + } =20 - $array=3D$this->get_preference(); - if ( ! isset ($array['PERIODE'])) - { - $this->set_default_periode(); - $array=3D$this->get_preference(); - } - return $array['PERIODE']; - } - /*!\brief return the mini rapport to display on the welcome page - *\return 0 if nothing if found or the report to display (formdef.fr= _id) - */ - function get_mini_report() - { - $array=3D$this->get_preference(); - $fr_id=3D(isset($array['MINIREPORT']))?$array['MINIREPORT']:0; - return $fr_id; + /* ! + * \brief Get the default periode from the user's preferences + * + * \return the default periode + * + * + */ =20 - } + function get_periode() + { =20 - /*!\brief set the mini rapport to display on the welcome page - */ - function set_mini_report($p_id) - { - $count=3D$this->db->get_value("select count(*) from user_local_p= ref where user_id=3D$1 and parameter_type=3D$2", - array($this->id,'MINIREPORT')); - if ( $count =3D=3D 1 ) - { - $sql=3D"update user_local_pref set parameter_value=3D$1 wher= e user_id=3D$2 and parameter_type=3D'MINIREPORT'"; - $Res=3D$this->db->exec_sql($sql,array($p_id,$this->id)); - } - else - { - $sql=3D"insert into user_local_pref (user_id,parameter_type,= parameter_value)". - "values($1,'MINIREPORT',$2)"; - $Res=3D$this->db->exec_sql($sql,array($this->id,$p_id)); - } + $array =3D $this->get_preference(); + if (!isset($array['PERIODE'])) + { + $this->set_default_periode(); + $array =3D $this->get_preference(); + } + return $array['PERIODE']; + } =20 + /* !\brief return the mini rapport to display on the welcome page + * \return 0 if nothing if found or the report to display (formdef.fr_i= d) + */ =20 - } - function save_global_preference($key,$value) - { - $repo=3Dnew Database(); - $count=3D$repo->get_value("select count(*) + function get_mini_report() + { + $array =3D $this->get_preference(); + $fr_id =3D (isset($array['MINIREPORT'])) ? $array['MINIREPORT'] : 0; + return $fr_id; + } + + /* !\brief set the mini rapport to display on the welcome page + */ + + function set_mini_report($p_id) + { + $count =3D $this->db->get_value("select count(*) from user_local_pref = where user_id=3D$1 and parameter_type=3D$2", array($this->id, 'MINIREPORT= ')); + if ($count =3D=3D 1) + { + $sql =3D "update user_local_pref set parameter_value=3D$1 where user_= id=3D$2 and parameter_type=3D'MINIREPORT'"; + $Res =3D $this->db->exec_sql($sql, array($p_id, $this->id)); + } + else + { + $sql =3D "insert into user_local_pref (user_id,parameter_type,paramet= er_value)" . + "values($1,'MINIREPORT',$2)"; + $Res =3D $this->db->exec_sql($sql, array($this->id, $p_id)); + } + } + + function save_global_preference($key, $value) + { + $repo =3D new Database(); + $count =3D $repo->get_value("select count(*) from user_global_pref where - parameter_type=3D$1 and user_id=3D$2", - array($key,$this->login)); - if ( $count =3D=3D 1 ) + parameter_type=3D$1 and user_id=3D$2", array($key, $this->login)); + if ($count =3D=3D 1) + { + $repo->exec_sql("update user_global_pref set parameter_value=3D$1 + where parameter_type=3D$2 and user_id=3D$3", array($value, $key, $this= ->login)); + } + elseif ($count =3D=3D 0) + { + $repo->exec_sql("insert into user_global_pref(user_id,parameter_type,= parameter_value) + values($1,$2,$3)", array($this->login, $key, $value)); + } + } + + /* ! + * \brief Get the default user's preferences + * \return array of (parameter_type =3D> parameter_value) + */ + + function get_preference() { - $repo->exec_sql("update user_global_pref set parameter_value=3D$1 - where parameter_type=3D$2 and user_id=3D$3", - array($value,$key,$this->login)); - } elseif($count =3D=3D 0) - { - $repo->exec_sql("insert into user_global_pref(user_id,parameter_typ= e,parameter_value) - values($1,$2,$3)",array($this->login,$key,$value)); + $sql =3D "select parameter_type,parameter_value from user_local_pref w= here user_id=3D$1"; + $Res =3D $this->db->exec_sql($sql, array($this->id)); + $l_array =3D array(); + for ($i =3D 0; $i < Database::num_row($Res); $i++) + { + $row =3D Database::fetch_array($Res, $i); + $type =3D $row['parameter_type']; + $l_array[$type] =3D $row['parameter_value']; + } + + + return $l_array; } - } =20 - /*! - * \brief Get the default user's preferences - * \return array of (parameter_type =3D> parameter_value) - */ - function get_preference () - { - $sql=3D"select parameter_type,parameter_value from user_local_pr= ef where user_id=3D$1"; - $Res=3D$this->db->exec_sql($sql,array($this->id)); - $l_array=3Darray(); - for ( $i =3D0;$i < Database::num_row($Res);$i++) - { - $row=3D Database::fetch_array($Res,$i); - $type=3D$row['parameter_type']; - $l_array[$type]=3D$row['parameter_value']; - } + /* ! + * \brief Check if an user is allowed to do an action + * \param p_action_id + * \return + * - 0 no priv + * - 1 priv granted + * @see constant.security.php + */ =20 + function check_action($p_action_id) + { + /* save it into the log */ + global $audit; + if ($this->Admin() =3D=3D 1) + return 1; + if ($this->is_local_admin(dossier::id()) =3D=3D 1) + return 1; =20 - return $l_array; - } - /*! - * \brief Check if an user is allowed to do an action - * \param p_action_id - * \return - * - 0 no priv - * - 1 priv granted - *@see constant.security.php - */ - function check_action ( $p_action_id) - { - /* save it into the log */ - global $audit; - if ( $this->Admin()=3D=3D1 ) return 1; - if ( $this->is_local_admin(dossier::id()) =3D=3D 1 ) return 1; + $Res =3D $this->db->exec_sql( + "select * from user_sec_act where ua_login=3D$1 and ua_act_id=3D$2",= array($this->login, $p_action_id)); + $Count =3D Database::num_row($Res); + if ($Count =3D=3D 0) + { + if (isset($audit) && $audit =3D=3D true) + { + $cn =3D new Database(); + $sql =3D "insert into audit_connect (ac_user,ac_ip,ac_module,ac_url,= ac_state) values ($1,$2,$3,$4,$5)"; + $cn->exec_sql($sql, array($_SESSION['g_user'], $_SERVER["REMOTE_ADDR= "], $p_action_id, $_SERVER['REQUEST_URI'], 'FAIL')); + } + return 0; + } + if ($Count =3D=3D 1) + return 1; + echo "

    Action Invalide !!! $Count select * from = user_sec_act where ua_login=3D'$p_login' and ua_act_id=3D$p_action_id "; + exit(); + } =20 - $Res=3D$this->db->exec_sql( - "select * from user_sec_act where ua_login=3D$1 and ua_= act_id=3D$2", - array($this->login,$p_action_id)); - $Count=3DDatabase::num_row($Res); - if ( $Count =3D=3D 0 ) - { - if (isset ($audit) && $audit =3D=3D true) - { - $cn=3Dnew Database(); - $sql=3D"insert into audit_connect (ac_user,ac_ip,ac_module,ac_url,ac_s= tate) values ($1,$2,$3,$4,$5)"; - $cn->exec_sql($sql,array($_SESSION['g_user'],$_SERVER["REMOTE_ADDR"],$= p_action_id,$_SERVER['REQUEST_URI'],'FAIL')); - } - return 0; - } - if ( $Count =3D=3D 1 ) return 1; - echo "

    Action Invalide !!! $Count select *= from user_sec_act where ua_login=3D'$p_login' and ua_act_id=3D$p_action_= id

    "; - exit(); - } - /*! - * \brief Get the global preferences from user_global_pref - * in the account_repository db - * - * \note set $SESSION[g_variable] - */ - function load_global_pref() - { - $cn=3Dnew Database(); - // Load everything in an array - $Res=3D$cn->exec_sql ("select parameter_type,parameter_value fro= m + /* ! + * \brief Get the global preferences from user_global_pref + * in the account_repository db + * + * \note set $SESSION[g_variable] + */ + + function load_global_pref() + { + $cn =3D new Database(); + // Load everything in an array + $Res =3D $cn->exec_sql("select parameter_type,parameter_value from user_global_pref - where user_id=3D'".$this->login."'"); - $Max=3DDatabase::num_row($Res); - if ( $Max =3D=3D 0 ) - { - $this->insert_default_global_pref(); - $this->load_global_pref(); - return; - } - // Load value into array - $line=3Darray(); - for ($i=3D0;$i<$Max;$i++) - { - $row=3DDatabase::fetch_array($Res,$i); - $type=3D$row['parameter_type']; - $line[$type]=3D$row['parameter_value']; - ; - } - // save array into g_ variable - $array_pref=3Darray ('g_theme'=3D>'THEME','g_pagesize'=3D>'PAGES= IZE','g_topmenu'=3D>'TOPMENU','g_lang'=3D>'LANG'); - foreach ($array_pref as $name=3D>$parameter ) - { - if ( ! isset ($line[$parameter]) ) - { - $this->insert_default_global_pref($parameter); - $this->load_global_pref(); - return; - } - $_SESSION[$name]=3D$line[$parameter]; - } - } + where user_id=3D'" . $this->login . "'"); + $Max =3D Database::num_row($Res); + if ($Max =3D=3D 0) + { + $this->insert_default_global_pref(); + $this->load_global_pref(); + return; + } + // Load value into array + $line =3D array(); + for ($i =3D 0; $i < $Max; $i++) + { + $row =3D Database::fetch_array($Res, $i); + $type =3D $row['parameter_type']; + $line[$type] =3D $row['parameter_value']; + ; + } + // save array into g_ variable + $array_pref =3D array('g_theme' =3D> 'THEME', 'g_pagesize' =3D> 'PAGES= IZE', 'g_topmenu' =3D> 'TOPMENU', 'g_lang' =3D> 'LANG'); + foreach ($array_pref as $name =3D> $parameter) + { + if (!isset($line[$parameter])) + { + $this->insert_default_global_pref($parameter); + $this->load_global_pref(); + return; + } + $_SESSION[$name] =3D $line[$parameter]; + } + } =20 - /*! - * \brief insert default pref - * if no parameter are given insert all the existing - * parameter otherwise only the requested - * \param $p_type parameter's type or nothing - * \param $p_value parameter value - * - */ - function insert_default_global_pref($p_type=3D"",$p_value=3D"") - { + /* ! + * \brief insert default pref + * if no parameter are given insert all the existing + * parameter otherwise only the requested + * \param $p_type parameter's type or nothing + * \param $p_value parameter value + * + */ =20 - $default_parameter=3D array("THEME"=3D>"Light", - "PAGESIZE"=3D>"50", - 'TOPMENU'=3D>'TEXT', - 'LANG'=3D>'fr_FR.utf8'); - $cn=3Dnew Database(); - $Sql=3D"insert into user_global_pref(user_id,parameter_type,para= meter_value) + function insert_default_global_pref($p_type=3D"", $p_value=3D"") + { + + $default_parameter =3D array("THEME" =3D> "Light", + "PAGESIZE" =3D> "50", + 'TOPMENU' =3D> 'TEXT', + 'LANG' =3D> 'fr_FR.utf8'); + $cn =3D new Database(); + $Sql =3D "insert into user_global_pref(user_id,parameter_type,paramete= r_value) values ('%s','%s','%s')"; - if ( $p_type =3D=3D "" ) - { - foreach ( $default_parameter as $name=3D>$value) - { - $Insert=3Dsprintf($Sql,$this->login,$name,$value); - $cn->exec_sql($Insert); - } - } - else - { - $value=3D($p_value=3D=3D"")?$default_parameter[$p_type]:$p_v= alue; - $Insert=3Dsprintf($Sql,$this->login,$p_type,$value); - $cn->exec_sql($Insert); - } + if ($p_type =3D=3D "") + { + foreach ($default_parameter as $name =3D> $value) + { + $Insert =3D sprintf($Sql, $this->login, $name, $value); + $cn->exec_sql($Insert); + } + } + else + { + $value =3D ($p_value =3D=3D "") ? $default_parameter[$p_type] : $p_va= lue; + $Insert =3D sprintf($Sql, $this->login, $p_type, $value); + $cn->exec_sql($Insert); + } + } =20 + /* ! + * \brief update default pref + * if value is not given then use the default value + * + * \param $p_type parameter's type + * \param $p_value parameter's value value of the type + */ =20 - } - - /*! - * \brief update default pref - * if value is not given then use the default value - * - * \param $p_type parameter's type - * \param $p_value parameter's value value of the type - */ - function update_global_pref($p_type,$p_value=3D"") - { - $default_parameter=3D array("THEME"=3D>"Light", - "PAGESIZE"=3D>"50", - "LANG"=3D>'fr_FR.utf8', - 'TOPMENU'=3D>'SELECT'); - $cn=3Dnew Database(); - $Sql=3D"update user_global_pref set parameter_value=3D$1 + function update_global_pref($p_type, $p_value=3D"") + { + $default_parameter =3D array("THEME" =3D> "Light", + "PAGESIZE" =3D> "50", + "LANG" =3D> 'fr_FR.utf8', + 'TOPMENU' =3D> 'SELECT'); + $cn =3D new Database(); + $Sql =3D "update user_global_pref set parameter_value=3D$1 where parameter_type=3D$2 and user_id=3D$3"; - $value=3D($p_value=3D=3D"")?$default_parameter[$p_type]:$p_value= ; - $cn->exec_sql($Sql,array($value,$p_type,$this->login)); + $value =3D ($p_value =3D=3D "") ? $default_parameter[$p_type] : $p_val= ue; + $cn->exec_sql($Sql, array($value, $p_type, $this->login)); + } =20 - }//end function - /*!\brief Return the year of current Periode - * it is the parm_periode.p_exercice col - * if an error occurs return 0 - */ - function get_exercice() - { - $sql=3D"select p_exercice from parm_periode where p_id=3D".$this= ->get_periode(); - $Ret=3D$this->db->exec_sql($sql); - if (Database::num_row($Ret) =3D=3D 1) - { - $r=3DDatabase::fetch_array($Ret,0); - return $r['p_exercice']; - } - else - return 0; +//end function + /* !\brief Return the year of current Periode + * it is the parm_periode.p_exercice col + * if an error occurs return 0 + */ =20 - } + function get_exercice() + { + $sql =3D "select p_exercice from parm_periode where p_id=3D" . $this->= get_periode(); + $Ret =3D $this->db->exec_sql($sql); + if (Database::num_row($Ret) =3D=3D 1) + { + $r =3D Database::fetch_array($Ret, 0); + return $r['p_exercice']; + } + else + return 0; + } =20 - /*!\brief Check if the user can access - * otherwise warn and exit - * \param $p_action requested action - * \param $p_js =3D 1 javascript, or 0 just a text - * \return nothing the program exits automatically - */ - function can_request($p_action,$p_js=3D0) - { - if ( $this->check_action($p_action)=3D=3D0 ) - { - if ( $p_js =3D=3D 1 ) - { - echo ""; + /* !\brief Check if the user can access + * otherwise warn and exit + * \param $p_action requested action + * \param $p_js =3D 1 javascript, or 0 just a text + * \return nothing the program exits automatically + */ =20 - } - else - { - echo '
    '; - echo '

    Cette action ne vous est pas = autoris=C3=A9e Contactez votre responsable

    '; - echo '
    '; + function can_request($p_action, $p_js=3D0) + { + if ($this->check_action($p_action) =3D=3D 0) + { + if ($p_js =3D=3D 1) + { + echo ""; + } + else + { + echo '
    '; + echo '

    Cette action ne vous est pas autoris=C3=A9= e Contactez votre responsable

    '; + echo '
    '; + } + exit(-1); + } + } =20 - } - exit(-1); + /* ! + * \brief Check if an user is an local administrator + * + * + * \param $p_dossier : dossier_id + * + * \return + * - 0 if no + * - 1 if yes + * + */ =20 - } - } + function is_local_admin($p_dossier=3D-1) + { + if ($p_dossier =3D=3D -1) + { + $p_dossier =3D dossier::id(); + } =20 - /*! - * \brief Check if an user is an local administrator - * - * - * \param $p_dossier : dossier_id - * - * \return - * - 0 if no - * - 1 if yes - * - */ - function is_local_admin($p_dossier=3D-1) - { - if ($p_dossier=3D=3D-1) - { - $p_dossier=3Ddossier::id(); - } + if ($this->login =3D=3D 'phpcompta') + return 1; + $sql =3D 'select priv_priv from ac_users join jnt_use_dos using (use_i= d) join priv_user ' . + ' on ( jnt_use_dos.jnt_id =3D priv_user.priv_jnt) ' . + " where priv_priv=3D'L' and use_login=3D'" . $this->login . "' and d= os_id=3D$p_dossier"; =20 - if ( $this->login =3D=3D 'phpcompta') return 1; - $sql=3D'select priv_priv from ac_users join jnt_use_dos using (u= se_id) join priv_user '. - ' on ( jnt_use_dos.jnt_id =3D priv_user.priv_jnt) '. - " where priv_priv=3D'L' and use_login=3D'".$this->login."' = and dos_id=3D$p_dossier"; + $cn =3D new Database(); =20 - $cn=3Dnew Database(); + $isAdmin =3D $cn->count_sql($sql); =20 - $isAdmin=3D$cn->count_sql($sql); =20 + return $isAdmin; + } =20 - return $isAdmin; + /* ! + * \brief return an array with all the users who can access $p_dossier = including the global admin. The user + * must be activated + * + * \param $p_dossier dossier + * \return an array of user's object + * array indices + * - use_id (id ) + * - use_login (login of the user) + * - use_name + * - use_first_name + * + * \exception throw an exception if nobody can access + */ =20 - } - /*! - *\brief return an array with all the users who can access $p_dossie= r including the global admin. The user - * must be activated - * - *\param $p_dossier dossier - *\return an array of user's object - * array indices - * - use_id (id ) - * - use_login (login of the user) - * - use_name - * - use_first_name - * - *\exception throw an exception if nobody can access - */ - static function get_list($p_dossier) - { - $sql=3D"select distinct use_id,use_login,use_first_name,use_name= from ac_users + static function get_list($p_dossier) + { + $sql =3D "select distinct use_id,use_login,use_first_name,use_name fro= m ac_users left outer join jnt_use_dos using (use_id) left join priv_user on (priv_jnt=3Djnt_id) where (dos_id=3D$1 or use_admin=3D1) and use_active=3D1 and (us= e_admin=3D1 or priv_priv <> 'X') order by use_login,use_name"; =20 =20 - $repo=3Dnew Database(); - $array=3D$repo->get_array($sql,array($p_dossier)); - if ( $repo->size() =3D=3D 0 ) throw new Exception ('Error inacce= ssible folder'); - return $array; - } - /*! - * \brief check the access of an user on a ledger - * - * \param $p_jrn the ledger id - * \return - * - O only predefined operation - * - W write - * - R read only - * - X no access - * - */ + $repo =3D new Database(); + $array =3D $repo->get_array($sql, array($p_dossier)); + if ($repo->size() =3D=3D 0) + throw new Exception('Error inaccessible folder'); + return $array; + } =20 - function check_jrn($p_jrn) - { - return $this->get_ledger_access($p_jrn); - } - /*!\brief check if an user can access a folder, if he cannot display= a dialog box - * and exit - *\param the folder if - *\param $silent false, echo an error message and exit, true : exit = without warning - * default is false - * \return - * - L for administrator (local and global) - * - P for extension only - * - R regular user - */ - function check_dossier($p_dossier_id,$silent=3Dfalse) - { - $this->Admin(); - if ( $this->admin=3D=3D1 || $this->is_local_admin($p_dossier_id)= =3D=3D1) return 'L'; - $cn=3Dnew Database(); + /* ! + * \brief check the access of an user on a ledger + * + * \param $p_jrn the ledger id + * \return + * - O only predefined operation + * - W write + * - R read only + * - X no access + * + */ =20 - $dossier=3D$cn->get_value("select priv_priv from jnt_use_dos joi= n priv_user on (priv_jnt=3Djnt_id) where dos_id=3D$1 and use_id=3D$2", - array($p_dossier_id,$this->id)); - $dossier=3D($dossier=3D=3D'')?'X':$dossier; - if ( $dossier=3D=3D'X') - { - if ( ! $silent) - { - alert(_('Dossier non accessible')); - exit(); - } + function check_jrn($p_jrn) + { + return $this->get_ledger_access($p_jrn); + } =20 - } - return $dossier; - } - /** - *@brief return the first date and the last date of the current exerci= ce for the current user - *@return and array ([0] =3D> start_date,[1] =3D> end_date) - */ - function get_limit_current_exercice() - { - $current_exercice=3D$this->get_exercice(); - $periode=3Dnew Periode($this->db); - list($per_start,$per_end)=3D$periode->get_limit($current_exercice)= ; - $start=3D$per_start->first_day(); - $end=3D$per_end->last_day(); - return array($start,$end); - } + /* !\brief check if an user can access a folder, if he cannot display a= dialog box + * and exit + * \param the folder if + * \param $silent false, echo an error message and exit, true : exit wi= thout warning + * default is false + * \return + * - L for administrator (local and global) + * - P for extension only + * - R regular user + */ =20 + function check_dossier($p_dossier_id, $silent=3Dfalse) + { + $this->Admin(); + if ($this->admin =3D=3D 1 || $this->is_local_admin($p_dossier_id) =3D=3D= 1) + return 'L'; + $cn =3D new Database(); + + $dossier =3D $cn->get_value("select priv_priv from jnt_use_dos join pr= iv_user on (priv_jnt=3Djnt_id) where dos_id=3D$1 and use_id=3D$2", array(= $p_dossier_id, $this->id)); + $dossier =3D ($dossier =3D=3D '') ? 'X' : $dossier; + if ($dossier =3D=3D 'X') + { + if (!$silent) + { + alert(_('Dossier non accessible')); + exit(); + } + } + return $dossier; + } + + /** + * @brief return the first date and the last date of the current exerci= ce for the current user + * @return and array ([0] =3D> start_date,[1] =3D> end_date) + */ + function get_limit_current_exercice() + { + $current_exercice =3D $this->get_exercice(); + $periode =3D new Periode($this->db); + list($per_start, $per_end) =3D $periode->get_limit($current_exercice); + $start =3D $per_start->first_day(); + $end =3D $per_end->last_day(); + return array($start, $end); + } + + /* ! + * \brief Show all the available folder for the users + * at the login page. For the special case 'E' + * go directly to extension and bypasse the dashboard + * \param $p_user user + * \param $p_admin 1 if admin + * + * \return table in HTML + * + */ + + function show_dossier($p_filtre=3D"") + { + $p_array =3D $this->get_available_folder($p_filtre); + + $result =3D ""; + if ($p_array =3D=3D 0) + return $result . " * Aucun dossier *"; + + $result.=3D""; + for ($i =3D 0; $i < sizeof($p_array); $i++) + { + + $id =3D $p_array[$i]['dos_id']; + $name =3D $p_array[$i]['dos_name']; + $desc =3D $p_array[$i]['dos_description']; + if ($i % 2 =3D=3D 0) + $tr =3D "odd"; + else + $tr =3D "even"; + if ($this->check_dossier($id) !=3D 'P') + { + $target =3D "do.php?gDossier=3D$id"; + } + else + { + $target =3D "extension.php?gDossier=3D$id"; + } + + $result.=3D""; + + $result.=3D""; + $desc =3D ($desc =3D=3D "") ? "Aucune description" : h($desc); + $desc =3D "$desc"; + $result.=3D""; + $result.=3D""; + } + $result.=3D"
    "; + $result.=3D""; + $result.=3D$id . " " . h($name) . ""; + $result.=3D""; + $result.=3D"" . $de= sc; + $result.=3D"
    "; + return $result; + } + + /* ! + * \brief Get all the available folders + * for the users, checked with the security + * + * \param $p_user user login + * \param $p_admin 1 if admin + * \return array containing + * - ac_dossier.dos_id + * - ac_dossier.dos_name + * - ac_dossier.dos_description + * + */ + + function get_available_folder( $p_filter=3D"") + { + + $filter =3D ""; + if ($this->admin =3D=3D 0) + { + // show only available folders + // if user is not an admin + $sql =3D "select distinct dos_id,dos_name,dos_description from ac_use= rs + natural join jnt_use_dos + natural join ac_dossier + join priv_user on ( priv_jnt=3Djnt_id) + where use_active=3D1 + and use_login=3D'".sql_string($this->login)."' + and priv_priv !=3D 'X' and dos_name ilike '%$p_filter%' + order by dos_name"; + } + else + { + $sql =3D "select distinct dos_id,dos_name,dos_description from ac_dos= sier + where dos_name ilike '%".sql_string($p_filter)."%' order b= y dos_name"; + } + require_once('class_database.php'); + $cn =3D new Database(); + + $Res =3D $cn->exec_sql($sql); + $max =3D Database::num_row($Res); + if ($max =3D=3D 0) + return 0; + + for ($i =3D 0; $i < $max; $i++) + { + $array[] =3D Database::fetch_array($Res, $i); + } + return $array; + } + } + ?> Modified: phpcompta/trunk/include/opening.inc.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/opening.inc.php 2011-10-30 20:16:40 UTC (rev = 4281) +++ phpcompta/trunk/include/opening.inc.php 2011-10-30 20:33:05 UTC (rev = 4282) @@ -40,7 +40,7 @@ echo '
    Etape 1 '; =20 echo 'Choississez le dossier o=C3=B9 sont les soldes =C3=A0 importer= '; - $avail=3DGetAvailableFolder($User->id,$User->Admin()); + $avail=3D$User->get_available_folder(); =20 if ( empty( $avail) ) { Modified: phpcompta/trunk/include/user_menu.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/include/user_menu.php 2011-10-30 20:16:40 UTC (rev 42= 81) +++ phpcompta/trunk/include/user_menu.php 2011-10-30 20:33:05 UTC (rev 42= 82) @@ -29,111 +29,9 @@ require_once("class_ispan.php"); =20 =20 -/*! - * \brief Show all the available folder for the users - * at the login page. For the special case 'E' - * go directly to extension and bypasse the dashboard - * \param $p_user user - * \param $p_admin 1 if admin - * - * \return table in HTML - * - */ -function u_ShowDossier($p_user,$p_admin,$p_filtre=3D"") -{ - $p_array=3DGetAvailableFolder($p_user,$p_admin,$p_filtre); =20 - $result=3D""; - if ( $p_array =3D=3D 0 ) return $result." * Aucun dossier *"; - $cn=3Dnew Database(); - $user=3Dnew User($cn); =20 - - $result.=3D""; - for ($i=3D0;$icheck_dossier($id)!=3D'P') - { - $target=3D"do.php?gDossier=3D$id"; - } - else - { - $target=3D"extension.php?gDossier=3D$id"; - } - - $result.=3D""; - - $result.=3D""; - $desc=3D($desc=3D=3D"")?"Aucune description":h($desc); - $desc=3D"$desc"; - $result.=3D""; - $result.=3D""; - - } - $result.=3D"
    "; - $result.=3D""; - $result.=3D$id." ".h($name).""; - $result.=3D""; - $result.=3D"".= $desc; - $result.=3D"
    "; - return $result; -} /*! - * \brief Get all the available folders - * for the users, checked with the security - * - * \param $p_user user login - * \param $p_admin 1 if admin - * \return array containing - * - ac_dossier.dos_id - * - ac_dossier.dos_name - * - ac_dossier.dos_description - * - */ -function GetAvailableFolder($p_user,$p_admin,$p_filter=3D"") -{ - - $filter=3D""; - if ($p_admin=3D=3D0) - { - // show only available folders - // if user is not an admin - $sql=3D"select distinct dos_id,dos_name,dos_description from ac_= users - natural join jnt_use_dos - natural join ac_dossier - join priv_user on ( priv_jnt=3Djnt_id) - where use_active=3D1 - and use_login=3D'$p_user' - and priv_priv !=3D 'X' and dos_name ilike '%$p_filter%' - order by dos_name"; - - } - else - { - $sql=3D"select distinct dos_id,dos_name,dos_description from ac_= dossier - where dos_name ilike '%$p_filter%' order by dos_name"; - } - require_once('class_database.php'); - $cn=3Dnew Database(); - - $Res=3D$cn->exec_sql($sql); - $max=3DDatabase::num_row($Res); - if ( $max =3D=3D 0 ) return 0; - - for ($i=3D0;$i<$max;$i++) - { - $array[]=3DDatabase::fetch_array($Res,$i); - } - return $array; -} -/*! * \brief show the top menu for the user profile * and highight the selected one * \param p_high what to hightlight, by default it is autodetected From MAILER-DAEMON Mon Oct 31 20:32:05 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RL2Gr-0005y6-E3 for mharc-phpcompta-dev@gnu.org; Mon, 31 Oct 2011 20:32:05 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Tue, 1 Nov 2011 01:38:39 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4283 - phpcompta/trunk/html X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Nov 2011 00:32:02 -0000 Author: danydb Date: 2011-11-01 01:38:37 +0100 (Tue, 01 Nov 2011) New Revision: 4283 Modified: phpcompta/trunk/html/get_pj.php Log: fix bug : update PJ Modified: phpcompta/trunk/html/get_pj.php =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/get_pj.php 2011-10-30 20:33:05 UTC (rev 4282) +++ phpcompta/trunk/html/get_pj.php 2011-11-01 00:38:37 UTC (rev 4283) @@ -23,10 +23,10 @@ /*!\file * \brief respond ajax request, the get contains * the value : - * - l for ledger=20 + * - l for ledger * - gDossier * Must return at least tva, htva and tvac -=20 + */ =20 require_once ('constant.php'); @@ -46,7 +46,7 @@ } =20 } -if ( is_integer($l) =3D=3D false ) +if ( is_numeric($l) =3D=3D false ) { exit(); } From MAILER-DAEMON Mon Oct 31 23:50:40 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RL5N2-0002G9-AL for mharc-phpcompta-dev@gnu.org; Mon, 31 Oct 2011 23:50:40 -0400 To: phpcompta-dev@nongnu.org Content-Type: text/plain; charset=UTF-8 Date: Tue, 1 Nov 2011 04:57:19 +0100 (CET) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 91.121.80.190 Message-ID: From: phpcompta-dev@nongnu.org Subject: [Phpcompta-dev] r4284 - phpcompta/trunk/html/js X-BeenThere: phpcompta-dev@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: phpcompta-dev@nongnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Nov 2011 03:50:39 -0000 Author: danydb Date: 2011-11-01 04:57:17 +0100 (Tue, 01 Nov 2011) New Revision: 4284 Modified: phpcompta/trunk/html/js/anc_script.js Log: 433: am?\195?\169lioration Compta Analytique : montant v?\195?\169rifi?\1= 95?\169 Modified: phpcompta/trunk/html/js/anc_script.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- phpcompta/trunk/html/js/anc_script.js 2011-11-01 00:38:37 UTC (rev 42= 83) +++ phpcompta/trunk/html/js/anc_script.js 2011-11-01 03:57:17 UTC (rev 42= 84) @@ -29,17 +29,25 @@ function add_row(p_table,p_seq) { var mytable=3Dg(p_table).tBodies[0]; - + var max=3DparseFloat(g('amount_t'+p_seq).value); if ( ! mytable ) { return; } var new_value=3Dmytable.rows.length+1; + + if ( mytable.rows.length > 5 ) { alert("Maximum 5 lignes "); return; } + amount=3Dcompute_total_table(p_table,p_seq); + if ( max < amount ) + { + alert('Montant incorrect : max =3D '+max+" calcul=C3=A9=3D"+amount); + return; + } // For the detail view (modify_op) there is several form and then se= veral time the // element var rowToCopy=3Dmytable.rows[1]; @@ -52,8 +60,33 @@ // txt=3Dtxt.replace(/row_1/g,"row_"+new_value); cell.innerHTML=3Dtxt; } + var col=3Ddocument.getElementsByName("val["+p_seq+"][]"); + col[col.length-1].value=3Dmax-amount; =20 } +/** + *@bug cannot compute total for ANC_TABLE + *@todo fix this bug + */ +function compute_total_table(p_table,seq) +{ + try{ + + var i=3D0;var tot=3D0; + var col=3Ddocument.getElementsByName("val["+seq+"][]"); + for (i=3D0;i