From 5c497d5092a5b9f7bebd161f066d6872ff5977c8 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Fri, 28 Oct 2011 20:59:25 +0000 Subject: [PATCH] Merged revisions 4209,4229-4232,4234,4237-4249 via svnmerge from svn+ssh://ns352270.ovh.net/svn/phpcompta/branches/rel600-dynamic-menu MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ........ r4209 | danydb | 2011-10-13 22:06:13 +0200 (Thu, 13 Oct 2011) | 1 line Add new files ........ r4229 | danydb | 2011-10-23 20:51:09 +0200 (Sun, 23 Oct 2011) | 1 line Dynamic menu: impress works ........ r4230 | danydb | 2011-10-24 22:38:15 +0200 (Mon, 24 Oct 2011) | 2 lines #241 : modularity for SALE ledger ........ r4231 | danydb | 2011-10-24 22:47:02 +0200 (Mon, 24 Oct 2011) | 2 lines #241 : modularity for PURCHASE ledger ........ r4232 | danydb | 2011-10-25 23:03:53 +0200 (Tue, 25 Oct 2011) | 2 lines #241 : modularity for FINANCIAL ledger ........ r4234 | danydb | 2011-10-26 01:09:02 +0200 (Wed, 26 Oct 2011) | 2 lines #241 : modularity for CARD ledger + alphanum prob ........ r4237 | danydb | 2011-10-27 20:59:39 +0200 (Thu, 27 Oct 2011) | 2 lines #241 : modularity for lettering ........ r4238 | danydb | 2011-10-27 21:10:19 +0200 (Thu, 27 Oct 2011) | 3 lines #241 :adapt width submenu ........ r4239 | danydb | 2011-10-27 21:40:42 +0200 (Thu, 27 Oct 2011) | 3 lines #241 : modularity : old user_advanced.php ........ r4240 | danydb | 2011-10-27 21:44:27 +0200 (Thu, 27 Oct 2011) | 3 lines #241 : modularity : deprecated function ........ r4241 | danydb | 2011-10-27 21:46:26 +0200 (Thu, 27 Oct 2011) | 3 lines #241 : modularity : remove obsolete files ........ r4242 | danydb | 2011-10-27 21:54:39 +0200 (Thu, 27 Oct 2011) | 3 lines #241 : modularity : gestion card + gestion IMP ........ r4243 | danydb | 2011-10-27 22:28:36 +0200 (Thu, 27 Oct 2011) | 3 lines #241 : modularity : gestion customer + supplier + forecast + follow up ........ r4244 | danydb | 2011-10-28 00:47:55 +0200 (Fri, 28 Oct 2011) | 5 lines #241 : modularity : parameter company periode misc : tva , card attr, middle of payment, accounting,cat of doc, cat of card ........ r4245 | danydb | 2011-10-28 00:51:43 +0200 (Fri, 28 Oct 2011) | 1 line update menu_ref, profile_menu ........ r4246 | danydb | 2011-10-28 00:52:13 +0200 (Fri, 28 Oct 2011) | 1 line rewriting : change ShowMenuPcmn by menu_acc_plan ........ r4247 | danydb | 2011-10-28 20:04:01 +0200 (Fri, 28 Oct 2011) | 1 line #241 : modularity : parameter Document ........ r4248 | danydb | 2011-10-28 22:00:42 +0200 (Fri, 28 Oct 2011) | 1 line #241 : modularity : préférence ........ r4249 | danydb | 2011-10-28 22:16:44 +0200 (Fri, 28 Oct 2011) | 1 line last fix ........ --- html/compta.php | 108 ---- include/letter.inc.php => html/do.php | 59 +-- html/parametre.php | 2 +- html/user_advanced.php | 123 ----- include/ac_common.php | 77 ++- include/action.inc.php | 10 +- include/adm.inc.php | 16 +- include/anc_imp.inc.php | 19 +- include/anc_od.inc.php | 17 +- include/anc_pa.inc.php | 26 +- include/balance.inc.php | 29 +- include/balance_card.inc.php | 9 +- include/class_acc_account_ledger.php | 64 ++- include/class_acc_ledger.php | 147 ++++-- include/class_anc_print.php | 7 +- include/class_document_modele.php | 24 +- include/class_fiche.php | 2 +- include/class_fiche_def.php | 35 +- include/class_periode.php | 14 +- include/class_pre_operation.php | 3 +- include/client.inc.php | 176 ++++--- include/company.inc.php | 102 ++++ include/compta_ach.inc.php | 25 +- include/compta_fin.inc.php | 20 +- include/compta_ven.inc.php | 27 +- include/dashboard.inc.php | 39 ++ include/document_modele.inc.php | 2 +- include/fiche.inc.php | 55 +- include/fiche_def.inc.php | 8 +- include/forecast.inc.php | 515 ++++++++++--------- include/impress_bilan.inc.php | 6 +- include/impress_fiche.inc.php | 9 +- include/impress_gl_comptes.inc.php | 18 +- include/impress_jrn.inc.php | 19 +- include/impress_poste.inc.php | 16 +- include/impress_rapport.inc.php | 16 +- include/impress_rec.inc.php | 12 +- include/lettering.account.inc.php | 4 +- include/lettering.card.inc.php | 4 +- include/lettering.gestion.inc.php | 5 +- include/opening.inc.php | 26 +- include/param_pcmn.inc.php | 4 +- include/payment_middle.inc.php | 8 +- include/periode.inc.php | 18 +- include/pref.inc.php | 313 ++++++------ include/preod.inc.php | 4 +- include/stock.inc.php | 35 +- include/suivi_adm.inc.php | 2 +- include/suivi_supplier.inc.php | 2 +- include/supplier.inc.php | 11 +- include/template/list_category_document.php | 3 +- include/template/menu.php | 57 +++ include/template/modele_document.php | 6 +- include/template/module.php | 40 ++ include/template/periode_add_exercice.php | 6 +- include/user_action_gl.php | 7 +- include/user_menu.php | 30 +- sql/backup-new-object.sh | 1 + sql/object-6.0.sql | 530 ++++++++++++++++++++ 59 files changed, 1834 insertions(+), 1138 deletions(-) delete mode 100644 html/compta.php rename include/letter.inc.php => html/do.php (53%) delete mode 100644 html/user_advanced.php create mode 100644 include/company.inc.php create mode 100644 include/dashboard.inc.php create mode 100644 include/template/menu.php create mode 100644 include/template/module.php create mode 100755 sql/backup-new-object.sh create mode 100644 sql/object-6.0.sql diff --git a/html/compta.php b/html/compta.php deleted file mode 100644 index 7d1d91210..000000000 --- a/html/compta.php +++ /dev/null @@ -1,108 +0,0 @@ -'._(' Vous êtes déconnecté').''; - redirect('index.php',1); - exit(); -} -//---------------------------------------------------------------------- - -require_once('class_database.php'); -/* Admin. Dossier */ -$cn=new Database($gDossier); - - -require_once ('class_user.php'); -$User=new User($cn); -$User->Check(); -if ($User->check_dossier($gDossier)=='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 == 'impress' ) -{ - require_once('impress.inc.php'); -} - -if ( $action == 'fiche') -{ - - require_once('fiche.inc.php'); -} - -if ( $action == 'stock') -{ - require_once('stock.inc.php'); -} -if ( $action=='quick_writing') -{ - require_once ('compta_ods.inc.php'); -} -if ( $action == 'gl' ) -{ - require_once ('user_action_gl.php'); -} -if ( $action == 'ven' || - $action == 'client') -{ - require_once ('compta_ven.inc.php'); -} -if ( $action == 'ach' || - $action == 'fournisseur') -{ - require_once ('compta_ach.inc.php'); -} -if ( $action == 'fin') -{ - require_once ('compta_fin.inc.php'); -} -if ($action == 'let') -{ - require_once('letter.inc.php'); -} -html_page_stop(); -?> diff --git a/include/letter.inc.php b/html/do.php similarity index 53% rename from include/letter.inc.php rename to html/do.php index 62ea5586a..0666a2dea 100644 --- a/include/letter.inc.php +++ b/html/do.php @@ -1,4 +1,5 @@ '; -echo ShowItem($array,'H','mtitle','mtitle',$subdef); -echo ''; -if ($sa == 'poste') +else { - require_once('lettering.account.inc.php'); - exit; + show_module(-1); } -if ($sa=='qc') -{ - require_once('lettering.card.inc.php'); - exit; -} + diff --git a/html/parametre.php b/html/parametre.php index d15c57a39..6f4ece330 100644 --- a/html/parametre.php +++ b/html/parametre.php @@ -410,7 +410,7 @@ if ( $p_action == 'jrn' ) $sa=(isset($_REQUEST['sa']))?$_REQUEST['sa']:""; // echo '
'; if ( $sa == "add") - require_once ('param_jrn_add.inc.php'); + require_once 'param_jrn_add.inc.php'; elseif ($sa=='detail') require_once ('param_jrn_detail.inc.php'); else diff --git a/html/user_advanced.php b/html/user_advanced.php deleted file mode 100644 index 911e0b938..000000000 --- a/html/user_advanced.php +++ /dev/null @@ -1,123 +0,0 @@ -Check(); -$User->check_dossier(dossier::id()); -$cn=new Database(dossier::id()); -$User->db=$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=new IPopup('ipop_card'); -$search_card->title=_('Recherche de fiche'); -$search_card->value=''; -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=""; - - -$p_action=(isset($_REQUEST['p_action']))?$_REQUEST['p_action']:""; -switch ($p_action) -{ -case 'preod': - $high=9; - break; -case 'periode'; - $high=2; - break; -case 'verif'; - $high=10; - break; -case 'defreport': - $high=6; - break; -case 'ouv': - $high=8; - break; -default: - $high=0; - -} -echo ShowMenuAdvanced($high); - - -//-------------------------------------------------- -// Predefined operation -//-------------------------------------------------- - -if ($p_action=="preod") -{ - require_once('preod.inc.php'); - - exit(); -} -//---------------------------------------------------------------------- -// Verification solde -//---------------------------------------------------------------------- -if ( $p_action=='verif' ) -{ - require_once ('verif_bilan.inc.php'); - exit(); -} - -if ($p_action=='defreport') -{ - require_once('report.inc.php'); -} -/* -------------------------------------------------- -Import writing (opening exercice) --------------------------------------------------- */ -if ( $p_action == 'ouv') -{ - require_once('opening.inc.php'); -} -html_page_stop(); -?> diff --git a/include/ac_common.php b/include/ac_common.php index 08a8b60e7..4ae1d1418 100644 --- a/include/ac_common.php +++ b/include/ac_common.php @@ -602,7 +602,7 @@ function set_language() /** *@brief try to determine on what os you are running the pĥpcompte *server - *@return + *@return * 0 it is a windows * 1 it is a Unix like */ @@ -687,4 +687,79 @@ EOF; exit(); } } +/** + * + * @param int $selected module selected + */ +function show_module($selected) +{ + global $g_user; + $cn=Dossier::connect(); + $amodule=$cn->get_array("select + me_code,me_menu,me_url + from v_all_menu + where + user_name=$1 + and p_type_display='M' + order by p_order",array($g_user->login)); + require_once('template/module.php'); + if ( $selected != -1 ) + { + $file=$cn->get_value("select me_file from v_all_menu where me_code=$1",array($selected)); + if ($file != '') + require_once $file; + } + +} +/** + * show default module + */ +function show_default() +{ + $cn=Dossier::connect(); + $file=$cn->get_array('SELECT m_code FROM module where m_default=1'); + if (! empty ($file) ) + { + $selected=$file[0]['m_code']; + show_module($selected); + } +} +/** + * + */ +function show_menu($module,$idx) +{ + global $g_user; + $cn=Dossier::connect(); + $amenu=$cn->get_array("select + me_menu,me_code + from v_all_menu + where + me_code_dep=$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=$cn->get_value("select me_file + from menu_ref + where + me_code=$1 and + (me_file is not null or trim(me_file) <>'')", + array($module[$idx])); + + if ( $file != "" ) + { + echo '
'; + require_once "$file"; + echo '
'; + } + } +} ?> diff --git a/include/action.inc.php b/include/action.inc.php index 609f1ecc8..d1f33d91f 100644 --- a/include/action.inc.php +++ b/include/action.inc.php @@ -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); -$User->can_request(GECOUR); - -$retour=HtmlInput::button_anchor(_('Retour'),'?p_action=suivi_courrier&my_action&'.dossier::get()); +$retour=HtmlInput::button_anchor(_('Retour'),'?ac='.$_REQUEST['ac'].'&my_action&'.dossier::get()); //----------------------------------------------------- // Action //----------------------------------------------------- @@ -53,8 +53,8 @@ $sub_action=(isset($_REQUEST['sa']))?$_REQUEST['sa']:""; * with the generation of document */ $ag_id=(isset($_REQUEST['ag_id']))?$_REQUEST['ag_id']:0; -$p_action=$_REQUEST['p_action']; -$base='p_action='.$p_action; +$ac=$_REQUEST['ac']; +$base='ac='.$ac; require_once('action.common.inc.php'); echo "
"; diff --git a/include/adm.inc.php b/include/adm.inc.php index c559e0014..d7e1de478 100644 --- a/include/adm.inc.php +++ b/include/adm.inc.php @@ -31,18 +31,14 @@ require_once('class_iaction.php'); 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'); + +global $g_user; $low_action=(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=basename($_SERVER['PHP_SELF']); // by default open liste @@ -55,7 +51,7 @@ if ( $low_action == "" ) //----------------------------------------------------- if ( isset($_POST['delete_card'] ) ) { - if ( $User->check_action(FICADD) == 0 ) + if ( $g_user->check_action(FICADD) == 0 ) { alert('Vous ne pouvez pas enlever de fiche'); return; @@ -136,7 +132,7 @@ if ( $low_action == "list" ) } /*---------------------------------------------------------------------- * Detail for a card, Suivi, Contact, Operation,... * - * cc stands for customer card + * cc stands for customer card *----------------------------------------------------------------------*/ if ( $low_action == 'detail') { @@ -148,7 +144,7 @@ if ( $low_action == 'detail') if ( $low_action=="insert" ) { /* security : check if user can add card */ - if ( $User->check_action(FICADD) == 0 ) + if ( $g_user->check_action(FICADD) == 0 ) { alert('Vous ne pouvez pas ajouter de fiche'); return; diff --git a/include/anc_imp.inc.php b/include/anc_imp.inc.php index 8e177de6b..2c2d689d1 100644 --- a/include/anc_imp.inc.php +++ b/include/anc_imp.inc.php @@ -31,15 +31,16 @@ require_once("class_ihidden.php"); require_once('class_anc_operation.php'); require_once('class_anc_plan.php'); require_once('ac_common.php'); +$str_dossier=Dossier::get(); //-- the menu -$menu=array(array("?p_action=ca_imp&sub=listing&$str_dossier",_("Historique"),_("Historique des opérations"),"listing"), - array("?p_action=ca_imp&sub=ancgl&$str_dossier",_("grand livre"),_("Grand livre d' plan analytique"),"ancgl"), - array("?p_action=ca_imp&sub=bs&$str_dossier",_("Balance simple"),_("Balance simple d'un plan analytique"),"bs"), - array("?p_action=ca_imp&sub=bc2&$str_dossier",_("Balance croisée"),_("Balance croisée de 2 plans analytiques"),"bc2"), - array("?p_action=ca_imp&sub=tab&$str_dossier",_("Tableau"),_("Tableau lié à la comptabilité"),'tab'), - array("?p_action=ca_imp&sub=lico&$str_dossier",_("Balance comptabilité"),_("Lien entre comptabilité et Comptabilité analytique"),'lico'), - array("?p_action=ca_imp&sub=group&$str_dossier",_("Groupe"),_("Balance par groupe"),'group'), +$menu=array(array("?ac=".$_REQUEST['ac']."&sub=listing&$str_dossier",_("Historique"),_("Historique des opérations"),"listing"), + array("?ac=".$_REQUEST['ac']."&sub=ancgl&$str_dossier",_("grand livre"),_("Grand livre d' plan analytique"),"ancgl"), + array("?ac=".$_REQUEST['ac']."&sub=bs&$str_dossier",_("Balance simple"),_("Balance simple d'un plan analytique"),"bs"), + array("?ac=".$_REQUEST['ac']."&sub=bc2&$str_dossier",_("Balance croisée"),_("Balance croisée de 2 plans analytiques"),"bc2"), + array("?ac=".$_REQUEST['ac']."&sub=tab&$str_dossier",_("Tableau"),_("Tableau lié à la comptabilité"),'tab'), + array("?ac=".$_REQUEST['ac']."&sub=lico&$str_dossier",_("Balance comptabilité"),_("Lien entre comptabilité et Comptabilité analytique"),'lico'), + array("?ac=".$_REQUEST['ac']."&sub=group&$str_dossier",_("Groupe"),_("Balance par groupe"),'group'), ); $sub=(isset($_GET['sub']))?$_GET['sub']:'no'; @@ -170,7 +171,7 @@ if ( $sub == 'ancgl') //--------------------------------------------------------------------------- // Balance by group //--------------------------------------------------------------------------- -if ( $sub == 'group') +if ( $sub == 'group') { require_once('class_anc_group.php'); $gr=new Anc_Group($cn); @@ -182,7 +183,7 @@ if ( $sub == 'group') if ( isset($_GET['result'])) { echo $gr->show_button($str_hidden); - + echo $gr->display_html(); } } diff --git a/include/anc_od.inc.php b/include/anc_od.inc.php index 694f3f66e..a415367db 100644 --- a/include/anc_od.inc.php +++ b/include/anc_od.inc.php @@ -32,8 +32,9 @@ require_once("class_anc_account.php"); require_once ("class_anc_operation.php"); require_once ("class_anc_plan.php"); require_once ("class_anc_group_operation.php"); +global $g_user; - +$str_dossier=Dossier::get(); $pa=new Anc_Plan($cn); $m=$pa->get_list(); if ( ! $m ) @@ -54,10 +55,10 @@ echo '
- '._('Nouveau').' + '._('Nouveau').' -'._('Liste opérations').' '._('Liste opérations').'
@@ -86,8 +87,8 @@ if ( isset($_GET['see'])) echo dossier::hidden(); $hid=new IHidden(); - $hid->name="p_action"; - $hid->value="ca_od"; + $hid->name="ac"; + $hid->value=$_REQUEST['ac']; echo $hid->input(); $hid->name="see"; @@ -97,11 +98,11 @@ if ( isset($_GET['see'])) $w=new ISelect(); $w->name="p_periode"; // filter on the current year - $filter_year=" where p_exercice='".$User->get_exercice()."'"; + $filter_year=" where p_exercice='".$g_user->get_exercice()."'"; $periode_start=$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=new User($cn); - $current=(isset($_GET['p_periode']))?$_GET['p_periode']:$User->get_periode(); + $g_user=new User($cn); + $current=(isset($_GET['p_periode']))?$_GET['p_periode']:$g_user->get_periode(); $w->value=$periode_start; $w->selected=$current; echo $w->input(); diff --git a/include/anc_pa.inc.php b/include/anc_pa.inc.php index bca801aa7..96b180d66 100644 --- a/include/anc_pa.inc.php +++ b/include/anc_pa.inc.php @@ -28,7 +28,7 @@ require_once("class_anc_plan.php"); require_once("class_anc_account.php"); $ret=""; - +$str_dossier=Dossier::get(); //--------------------------------------------------------------------------- // action // Compute the u_redcontent div @@ -49,8 +49,6 @@ if ( isset($_REQUEST['sa'])) $ret.=dossier::hidden(); $ret.= $new->form(); $ret.= HtmlInput::hidden("sa","pa_write"); - $ret.=HtmlInput::hidden("p_action","ca_pa"); - ; $ret.=HtmlInput::submit("submit","Enregistre"); $ret.= ''; $ret.= ''; @@ -87,7 +85,6 @@ if ( isset($_REQUEST['sa'])) if ( $sa == "pa_detail" ) { $new=new Anc_Plan($cn,$_GET['pa_id']); - $wAction=HtmlInput::hidden("p_action","ca_pa"); $wSa=HtmlInput::hidden("sa","pa_update"); $new->get(); @@ -99,13 +96,8 @@ if ( isset($_REQUEST['sa'])) $ret.= $new->form(); $ret.= $wSa; - $ret.= $wAction; $ret.=HtmlInput::submit("submit","Enregistre"); - /* $ret.=sprintf(''. - '', - "?p_action=ca_pa&pa_id=".$_GET['pa_id']."&sa=pa_delete&$str_dossier"); - */ - $ret.=HtmlInput::button_anchor('Efface',"?p_action=ca_pa&pa_id=".$_GET['pa_id']."&sa=pa_delete&$str_dossier",'Efface','onclick="return confirm(\'Effacer ?\')"'); + $ret.=HtmlInput::button_anchor('Efface',"?ac=".$_REQUEST['ac']."&pa_id=".$_GET['pa_id']."&sa=pa_delete&$str_dossier",'Efface','onclick="return confirm(\'Effacer ?\')"'); $ret.= ''; $ret.= ''; @@ -166,7 +158,7 @@ if ( isset($_REQUEST['sa'])) $ret.=$po->form(); $ret.=HtmlInput::hidden('sa','po_update'); $ret.=HtmlInput::submit('Correction','Correction'); - $ret.=sprintf(''. + $ret.=sprintf(''. '', $po->id, $_REQUEST['pa_id'] @@ -216,7 +208,7 @@ if ( isset($_REQUEST['sa'])) $ret.=""; $ret.="". - ''. h($obj->name). ''; @@ -230,7 +222,7 @@ if ( isset($_REQUEST['sa'])) } $ret.=""; - $ret.=HtmlInput::button_anchor('Ajout',"?p_action=ca_pa&sa=po_add&pa_id=".$_GET['pa_id']."&".$str_dossier); + $ret.=HtmlInput::button_anchor('Ajout',"?ac=".$_REQUEST['ac']."&sa=po_add&pa_id=".$_GET['pa_id']."&".$str_dossier); $ret.=''; } @@ -253,7 +245,7 @@ if ( empty($list) ) echo '
'; echo ''; echo ''; echo '
'; - echo 'Ajout d\'un plan comptable'; + echo 'Ajout d\'un plan comptable'; echo '
'; @@ -273,11 +265,11 @@ else { echo ''; echo ''. - ''. + ''. h($line['name']). ''; echo ''. - ''. + ''. "Activités". ""; @@ -288,7 +280,7 @@ else { echo ''; echo ''; echo '
'; - echo 'Ajout d\'un plan comptable'; + echo 'Ajout d\'un plan comptable'; echo '
'; } diff --git a/include/balance.inc.php b/include/balance.inc.php index 911b90b30..a12d473e8 100644 --- a/include/balance.inc.php +++ b/include/balance.inc.php @@ -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 ...) */ include_once ("ac_common.php"); @@ -34,9 +34,10 @@ require_once("class_ihidden.php"); require_once('class_acc_ledger.php'); require_once('class_periode.php'); require_once('class_exercice.php'); - -$User->can_request(IMPBAL); -$exercice=(isset($_GET['exercice']))?$_GET['exercice']:$User->get_exercice(); +global $g_user; +$gDossier=dossier::id(); +$g_user->can_request(IMPBAL); +$exercice=(isset($_GET['exercice']))?$_GET['exercice']:$g_user->get_exercice(); echo '
'; @@ -50,14 +51,14 @@ $ex=new Exercice($cn); $wex=$ex->select('exercice',$exercice,' onchange="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 ''; // 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->show_end_date=false; $input_from->type=ALL; $input_from->cn=$cn; $input_from->filter_year=true; -$input_from->user=$User; +$input_from->user=$g_user; echo 'Depuis :'.$input_from->input(); // filter on the current year @@ -81,7 +82,7 @@ $input_to->show_start_date=false; $input_to->filter_year=true; $input_to->type=ALL; $input_to->cn=$cn; -$input_to->user=$User; +$input_to->user=$g_user; echo ' jusque :'.$input_to->input(); //------------------------------------------------- @@ -90,7 +91,7 @@ echo ' jusque :'.$input_to->input(); /* add a all ledger choice */ echo 'Filtre '; $rad=new IRadio(); -$array_ledger=$User->get_ledger('ALL',3); +$array_ledger=$g_user->get_ledger('ALL',3); $selected=(isset($_GET['r_jrn']))?$_GET['r_jrn']:null; $select_cat=(isset($_GET['r_cat']))?$_GET['r_cat']:null; $array_cat=Acc_Ledger::array_cat(); @@ -177,7 +178,7 @@ if ( isset ($_GET['view'] ) ) echo ''. dossier::hidden(). HtmlInput::submit('bt_pdf',"Export PDF"). - HtmlInput::hidden("p_action","impress"). + HtmlInput::hidden("ac",$_REQUEST['ac']). HtmlInput::hidden("act","PDF/balance"). HtmlInput::hidden("from_periode",$_GET['from_periode']). @@ -199,10 +200,10 @@ if ( isset ($_GET['view'] ) ) 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 @@ if ( isset($_GET['view'] ) ) * level x */ foreach (array(3,2,1) as $ind) - { + { if ( ! isset($_GET['lvl'.$ind]))continue; if (${'lvl'.$ind.'_old'} == '') ${'lvl'.$ind.'_old'}=substr($r['poste'],0,$ind); if ( ${'lvl'.$ind.'_old'} != substr($r['poste'],0,$ind)) { - + echo ''; echo td("Total niveau ".$ind); echo td(${'lvl'.$ind.'_old'}); @@ -301,7 +302,7 @@ if ( isset($_GET['view'] ) ) echo td(nbm(${'lvl'.$ind}['sum_cred']),'style="text-align:right"'); echo td(nbm(${'lvl'.$ind}['solde_deb']),'style="text-align:right"'); echo td(nbm(${'lvl'.$ind}['solde_cred']),'style="text-align:right"'); - + echo ''; ${'lvl'.$ind.'_old'}=substr($r['poste'],0,$ind); foreach(array('sum_cred','sum_deb','solde_deb','solde_cred') as $a) diff --git a/include/balance_card.inc.php b/include/balance_card.inc.php index a2716a44a..f7c809b04 100644 --- a/include/balance_card.inc.php +++ b/include/balance_card.inc.php @@ -24,11 +24,12 @@ * \brief show the status of a card */ require_once('class_exercice.php'); +global $g_user; echo '
'; $exercice=new Exercice($cn); $old=''; $fiche=new Fiche($cn,$_GET['f_id']); -$year=$User->get_exercice(); +$year=$g_user->get_exercice(); if ( $year == 0 ) { $html="erreur aucune période par défaut, allez dans préférence pour en choisir une"; @@ -53,11 +54,11 @@ else $default=(isset($_GET['ex']))?$_GET['ex']:$year; $dossier=dossier::id(); - $old=''; + $old=''; $is=$exercice->select('ex',$default,'onchange = "submit(this)"'); $old.="Autre exercice ".$is->input(); $old.=HtmlInput::hidden('f_id',$_GET['f_id']); - $old.=HtmlInput::hidden('p_action',$_GET['p_action']); + $old.=HtmlInput::hidden('ac',$_GET['ac']); $old.=HtmlInput::hidden('sb',$_GET['sb']); $old.=HtmlInput::hidden('sc',$_GET['sc']); $old.=dossier::hidden(); @@ -70,5 +71,5 @@ else echo $old; } - + echo '
'; diff --git a/include/class_acc_account_ledger.php b/include/class_acc_account_ledger.php index 3db9adbfb..80ede2033 100644 --- a/include/class_acc_account_ledger.php +++ b/include/class_acc_account_ledger.php @@ -142,23 +142,23 @@ class Acc_Account_Ledger if ( $this->db->count() == 0 ) return array(); if ($r[0]['s_deb']==$r[0]['s_cred']) return array(); } - $Res=$this->db->exec_sql("select jr_id,to_char(j_date,'DDMMYYYY') as j_date_fmt,j_date, - case when j_debit='t' then j_montant else 0 end as deb_montant, - case when j_debit='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_def_id=j_jrn_def ) - left join jrn on (jr_grpt_id=j_grpt) - left join tmp_pcmn on (j_poste=pcm_val) - left join parm_periode on (p_id=jr_tech_per) - where j_poste=$1 and - ( to_date($2,'DD.MM.YYYY') <= j_date and - to_date($3,'DD.MM.YYYY') >= 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=$this->db->exec_sql("select jr_id,to_char(j_date,'DD.MM.YYYY') as j_date_fmt,j_date,". + "case when j_debit='t' then j_montant else 0 end as deb_montant,". + "case when j_debit='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(comptaproc.get_letter_jnt(j_id),-1) as letter ". + ",pcm_lib ". + ",jr_tech_per,p_exercice ". + " from jrnx left join jrn_def on (jrn_def_id=j_jrn_def )". + " left join jrn on (jr_grpt_id=j_grpt)". + " left join tmp_pcmn on (j_poste=pcm_val)". + " left join parm_periode on (p_id=jr_tech_per) ". + " where j_poste=$1 and ". + " ( to_date($2,'DD.MM.YYYY') <= j_date and ". + " to_date($3,'DD.MM.YYYY') >= 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); } @@ -240,7 +240,7 @@ class Acc_Account_Ledger if ($Max==0) return 0; $r=Database::fetch_array($Res,0); - 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 @@ class Acc_Account_Ledger 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']).""; } @@ -464,12 +464,18 @@ class Acc_Account_Ledger $hid->input("to_periode",$_REQUEST['to_periode']) ; - 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'); + 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,8 +492,14 @@ class Acc_Account_Ledger $hid->input("from_periode",$_REQUEST['from_periode']). $hid->input("to_periode",$_REQUEST['to_periode']); - 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']); + + 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'); @@ -511,9 +523,7 @@ class Acc_Account_Ledger */ function belong_ledger($p_jrn) { - $filter=$this->db->get_value("select jrn_def_class_cred from jrn_def where jrn_def_id=$1", - array($p_jrn)); - + $filter=$this->db->get_value("select jrn_def_class_cred from jrn_def where jrn_def_id=$p_jrn"); if ( trim ($filter) == '') return 0; diff --git a/include/class_acc_ledger.php b/include/class_acc_ledger.php index f88c4b823..b606f0676 100644 --- a/include/class_acc_ledger.php +++ b/include/class_acc_ledger.php @@ -41,7 +41,7 @@ require_once ('class_acc_account.php'); 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 @@ class Acc_Ledger $amount_unpaid=0.0; $limit=($_SESSION['g_pagesize']!=-1)?" LIMIT ".$_SESSION['g_pagesize']:""; $offset=($_SESSION['g_pagesize']!=-1)?" OFFSET ".Database::escape_string($offset):""; + $order=" order by jr_date_order asc,jr_internal asc"; // Sort - $url=basename($_SERVER['SCRIPT_NAME']).'?'.CleanUrl(); + $url=CleanUrl(); $str_dossier=dossier::get(); + $image_asc=''; + $image_desc=''; + $image_sel_desc=''; + $image_sel_asc=''; - $sort=new Sort_Table(); - $sort->add(_('Date'), - $url, - ' order by jr_date_order asc,substring(jr_pj_number,\'\\\d+$\')::numeric asc ', - ' order by jr_date_order desc,substring(jr_pj_number,\'\\\d+$\')::numeric desc ','da','dd'); - $sort->add(_('Echéance'), - $url, - ' order by jr_ech asc,substring(jr_pj_number,\'\\\d+$\')::numeric asc ', - ' order by jr_ech desc,substring(jr_pj_number,\'\\\d+$\')::numeric desc ','ea','ed'); - $sort->add(_('Pièce'), - $url, - ' order by substring(jr_pj_number,\'\\\d+$\')::numeric asc ', - ' order by substring(jr_pj_number,\'\\\d+$\')::numeric desc ','pa','pd'); - $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=" $image_asc"._('Date')."$image_desc"; + $sort_description=" $image_asc"._('Description')."$image_desc"; + $sort_amount=" $image_asc"._('Montant')." $image_desc"; + $sort_pj=" $image_asc"._('PJ')."$image_desc"; + $sort_echeance=" $image_asc"._('Ech')." $image_desc "; - $sort->add(_('Journal'), - $url, - ' order by jrn_def_name asc ', - ' order by jrn_def_name desc ','la','ld'); + $own=new Own($this->db); + // if an order is asked + if ( isset ($_GET['o']) ) + { + switch ($_GET['o']) + { + case 'pja': + // pj asc + $sort_pj="$image_sel_asc PJ $image_desc"; + $order=' order by substring(jr_pj_number,\'\\\d+$\')::numeric asc '; + break; + case 'pjd': + $sort_pj=" $image_asc PJ $image_sel_desc"; + // pj desc + $order=' order by substring(jr_pj_number,\'\\\d+$\')::numeric desc '; + break; - $ord=(isset($_GET['ord']))?$_GET['ord']:'da'; + case 'da': + // date asc + $sort_date="$image_sel_asc Date $image_desc"; + $order=' order by jr_date_order asc,substring(jr_pj_number,\'\\\d+$\')::numeric asc '; + break; + case 'dd': + $sort_date=" $image_asc Date $image_sel_desc"; + // date desc + $order=' order by jr_date_order desc,substring(jr_pj_number,\'\\\d+$\')::numeric desc '; + break; + case 'ma': + // montant asc + $sort_amount=" $image_sel_asc Montant $image_desc"; + $order=" order by jr_montant asc "; + break; + case 'md': + // montant desc + $sort_amount=" $image_ascMontant $image_sel_desc"; + $order=" order by jr_montant desc "; + break; + case 'ca': + // jr_comment asc + $sort_description=" $image_sel_asc Description $image_desc"; + $order=" order by jr_comment asc "; + break; + case 'cd': + // jr_comment desc + $sort_description=" $image_ascDescription $image_sel_desc"; + $order=" order by jr_comment desc "; + break; + case 'ea': + // jr_comment asc + $sort_echeance=" $image_sel_asc Ech. $image_desc"; + $order=" order by jr_ech asc "; + break; + case 'ed': + // jr_comment desc + $sort_echeance=" $image_asc Ech. $image_sel_desc"; + $order=" order by jr_ech desc "; + break; - $order=$sort->get_sql_order($ord); + } + } + else + { + // date asc + $sort_date="$image_sel_asc Date $image_desc"; + $order=" order by jr_date_order asc,substring(jr_pj_number,'\\d+$')::numeric asc "; + } // Count $count=$this->db->count_sql($sql); @@ -654,16 +701,15 @@ class Acc_Ledger $r.="Internal"; if ( $this->type=='') { - $r.=''.$sort->get_header(5).''; + $r.=th('Journal'); } - $r.=''.$sort->get_header(0).''; - $r.=''.$sort->get_header(1).''; - $r.=''.$sort->get_header(2).''; + $r.=$sort_date; + $r.=$sort_echeance; + $r.=$sort_pj; $r.=th('tiers'); - $r.=''.$sort->get_header(3).''; - + $r.=$sort_description; $r.=th('Notes',' style="width:15%"'); - $r.=''.$sort->get_header(4).''; + $r.=$sort_amount; // if $p_paid is not equal to 0 then we have a paid column if ( $p_paid != 0 ) { @@ -687,6 +733,27 @@ class Acc_Ledger //internal code // button modify $r.=""; + // If url contains + // + + $href=basename($_SERVER['PHP_SELF']); + /* switch ($href) + { + // user_jrn.php + case 'compta.php': + $vue="S"; //Expert View + break; + case 'commercial.php': + $vue="S"; //Simple View + break; + case 'recherche.php': + $vue=(isset($_GET['expert']))?'E':'S'; + break; + default: + echo_error('user_form_ach.php',__LINE__,'Erreur invalid request uri'); + exit (-1); + }*/ + //DEBUG $r.=sprintf('%s ', $row['jr_id'], $gDossier, $row['jr_internal']); @@ -2156,6 +2223,7 @@ class Acc_Ledger $r.=dossier::hidden(); $r.=HtmlInput::hidden('ledger_type',$this->type); + $r.=HtmlInput::hidden('ac',$_REQUEST['ac']); ob_start(); require_once('template/ledger_search.php'); $r.=ob_get_contents(); @@ -2254,11 +2322,12 @@ class Acc_Ledger $and=''; $user=new User($this->db); - + $p_action=$ledger_type; if ( $r_jrn == -1 ) { + /* Specific action allow to see all the ledgers in once */ - if ( $p_action == 'gl') $p_action='ALL'; + if ( $ledger_type== 'gl') $p_action='ALL'; /* actions from commercial.php */ if ( $p_action == 'client') $p_action='ALL'; if ( $p_action == 'supplier') $p_action='ALL'; @@ -2399,7 +2468,7 @@ class Acc_Ledger $r.='
'; $r.=$this->search_form($type); $r.=HtmlInput::submit('search',_('Rechercher')); - $r.=HtmlInput::hidden('p_action',$_REQUEST['p_action']); + $r.=HtmlInput::hidden('ac',$_REQUEST['ac']); /* when called from commercial.php some hidden values are needed */ if (isset($_REQUEST['sa'])) $r.= HtmlInput::hidden("sa",$_REQUEST['sa']); diff --git a/include/class_anc_print.php b/include/class_anc_print.php index d07af3866..54bb27b67 100644 --- a/include/class_anc_print.php +++ b/include/class_anc_print.php @@ -118,6 +118,7 @@ class Anc_Print $r.= ''._('Les dates sont en format DD.MM.YYYY').''; $r.=$p_hidden; + $r.=HtmlInput::hidden('ac',$_REQUEST['ac']); $r.=''; $plan=new Anc_Plan($this->db); $plan_id=new ISelect("pa_id"); @@ -166,17 +167,17 @@ class Anc_Print } function check() { - + /* * check date */ if (($this->from != '' && isDate ($this->from) == 0) - || + || ($this->to != '' && isDate ($this->to) == 0)) return -1; return 0; - } + } } diff --git a/include/class_document_modele.php b/include/class_document_modele.php index 1e53ac96b..c08d75dc6 100644 --- a/include/class_document_modele.php +++ b/include/class_document_modele.php @@ -19,10 +19,10 @@ /* $Revision$ */ // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr /*! \file - * \brief Class for the document template + * \brief Class for the document template */ /*! - * \brief Class for the document template + * \brief Class for the document template */ require_once('class_icheckbox.php'); require_once('class_ihidden.php'); @@ -59,7 +59,7 @@ class Document_modele $all=Database::fetch_all($Res); $r=''; if ( Database::num_row($Res) != 0 ) { - + $r.='

'; $r.=dossier::hidden(); $r.=""; @@ -109,13 +109,13 @@ class Document_modele return $r; } /*! - * \brief : Save a document_modele in the database, + * \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 - * + * */ function Save() { @@ -194,7 +194,7 @@ class Document_modele } } /*! - * \brief Remove a template + * \brief Remove a template * \return nothing */ function Delete() @@ -219,17 +219,17 @@ class Document_modele /*! * \brief show the form for loading a template - * \param p_action for the field action = destination url - * + * \param p_action for the field action = destination url + * * * \return string containing the forms */ - function form($p_action) + function form() { $r='

'; $r.='Veuillez introduire les modèles servant à générer vos documents'; $r.='

'; - $r.=''; + $r.=''; $r.=dossier::hidden(); // we need to add the sub action as hidden $h=new IHidden(); @@ -294,7 +294,7 @@ class Document_modele } } /*! - * \brief : update a document_modele in the database, + * \brief : update a document_modele in the database, */ function update($p_array) { @@ -315,7 +315,7 @@ class Document_modele )); if ( $p_array['seq'] != 0 ) $this->cn->alter_seq('seq_doc_type_'.$p_array['md_type'],$p_array['seq']); - + // Save the file $new_name=tempnam($_ENV['TMP'],'document_'); if ( strlen ($_FILES['doc']['tmp_name']) != 0 ) diff --git a/include/class_fiche.php b/include/class_fiche.php index 4a112add3..a5f930476 100644 --- a/include/class_fiche.php +++ b/include/class_fiche.php @@ -764,7 +764,7 @@ class Fiche { $parameter=array($this->id,null); } - $this->cn->exec_sql("select account_insert($1,$2)",$parameter); + $v=$this->cn->get_value("select account_insert($1,$2)",$parameter); } catch (Exception $e) { diff --git a/include/class_fiche_def.php b/include/class_fiche_def.php index 09bd9f6fb..d4300d3ed 100644 --- a/include/class_fiche_def.php +++ b/include/class_fiche_def.php @@ -66,7 +66,7 @@ class Fiche_Def /*! * \brief Get attribut of a fiche_def - * + * * \return string value of the attribute */ function getAttribut() @@ -95,7 +95,7 @@ class Fiche_Def /*! * \brief Get attribut of the fiche_def - * + * */ function Get() { @@ -118,8 +118,8 @@ class Fiche_Def /*! ************************************************** * \brief Get all the fiche_def - * - * \return an array of fiche_def object + * + * \return an array of fiche_def object */ function GetAll() { @@ -141,10 +141,10 @@ class Fiche_Def } /*! ************************************************** - * \brief Check in vw_fiche_def if a fiche has + * \brief Check in vw_fiche_def if a fiche has * a attribut X - * - * + * + * * \param $p_attr attribut to check * \return true or false */ @@ -156,8 +156,8 @@ class Fiche_Def /*! ************************************************** * \brief Display a fiche_def object into a table - * - * \return HTML row + * + * \return HTML row */ function Display() { @@ -173,7 +173,7 @@ class Fiche_Def * table : insert into fiche_def * insert into attr_def * - * \param $array array + * \param $array array * index FICHE_REF * nom_mod * class_base @@ -384,6 +384,7 @@ class Fiche_Def 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 @@ class Fiche_Def else echo ''; - $span_mod=''; + $span_mod=''; 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 @@ class Fiche_Def } /*!\brief show input for the basic attribute : label, class_base, create_account * use only when we want to update - * + * *\return HTML string with the form */ function input_base() @@ -440,7 +445,7 @@ class Fiche_Def return $r; } /*!\brief Display all the attribut of the fiche_def - *\param $str give the action possible values are remove, empty + *\param $str give the action possible values are remove, empty */ function DisplayAttribut($str="") { @@ -674,8 +679,8 @@ class Fiche_Def } /*! * \brief retrieve the mandatory field of the card model - * - * \param $p_fiche_def_ref + * + * \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) diff --git a/include/class_periode.php b/include/class_periode.php index 31d7d5b6b..056a202d4 100644 --- a/include/class_periode.php +++ b/include/class_periode.php @@ -229,13 +229,13 @@ class Periode $change=''; $remove=sprintf(_('Nombre opérations %d'),$l_line['count_op']); $remove=td($remove,' class="mtitle" '); - $change=td (' Réouverture',' class="mtitle"'); + $change=td (' Réouverture',' class="mtitle"'); } else { $closed=''; - $closed.=' Cloturer'; + $closed.=' Cloturer'; if ($l_line['count_op'] == 0 ) { @@ -260,7 +260,7 @@ class Periode if ($l_line['count_op'] == 0 ) { - $remove.=' Efface"; } else @@ -277,7 +277,7 @@ class Periode echo ''; } - echo ' '; + echo ' '; echo dossier::hidden(); $istart=new IDate('p_date_start'); $iend=new IDate('p_date_end'); @@ -325,13 +325,13 @@ class Periode if ( $l_line['status'] != 'OP' ) { - $closed=td (' Réouverture',' class="mtitle"'); + $closed=td (' Réouverture',' class="mtitle"'); // $closed=($l_line['status']=='CE')?'Centralisee':'Fermée'; } else { $closed=''; - $closed.=' Cloturer'; + $closed.=' Cloturer'; $closed.=''; } echo "$closed"; @@ -486,7 +486,7 @@ class Periode */ function insert_exercice($p_exercice) { - try + try { $this->cn->start(); for ($i=1;$i < 12;$i++) diff --git a/include/class_pre_operation.php b/include/class_pre_operation.php index 73ff3ef6a..5293cdc80 100644 --- a/include/class_pre_operation.php +++ b/include/class_pre_operation.php @@ -99,7 +99,7 @@ class Pre_operation return true; } /*!\brief load the data from the database and return an array - * \return an array + * \return an array */ function load() { @@ -195,6 +195,7 @@ class Pre_operation_detail $hid=new IHidden(); $r=$hid->input("action","use_opd"); + echo HtmlInput::hidden('ac',$_REQUEST['ac']); $r.=dossier::hidden(); $r.=$hid->input("p_jrn",$this->get("ledger")); $r.=$hid->input("jrn_type",$this->get("ledger_type")); diff --git a/include/client.inc.php b/include/client.inc.php index baaeca010..84fb246fb 100644 --- a/include/client.inc.php +++ b/include/client.inc.php @@ -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-1307 USA -*/ + */ /* $Revision$ */ // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr -/*!\brief include from client.inc.php and concerned only the customer card and +/* !\brief include from client.inc.php and concerned only the customer card and * the customer category */ require_once("class_iselect.php"); @@ -32,105 +32,101 @@ require_once('class_fiche_def.php'); require_once('class_ipopup.php'); echo ICard::ipopup('ipop_newcard'); -$ip_cat=new IPopup('ipop_cat'); -$ip_cat->title=_('Ajout d\'une catégorie'); -$ip_cat->value=''; +$ip_cat = new IPopup('ipop_cat'); +$ip_cat->title = _('Ajout d\'une catégorie'); +$ip_cat->value = ''; echo $ip_cat->input(); echo IPoste::ipopup('ipop_account'); -$search_card=new IPopup('ipop_card'); -$search_card->title=_('Recherche de fiche'); -$search_card->value=''; +$search_card = new IPopup('ipop_card'); +$search_card->title = _('Recherche de fiche'); +$search_card->value = ''; echo $search_card->input(); echo ICard::ipopup('ipopcard'); -$low_action=(isset($_REQUEST['sb']))?$_REQUEST['sb']:"list"; -/*! \file +$low_action = (isset($_REQUEST['sb'])) ? $_REQUEST['sb'] : "list"; +/* ! \file * \brief Called from the module "Gestion" to manage the customer */ -$User->can_request(GECUST); $href=basename($_SERVER['PHP_SELF']); // by default open liste -if ( $low_action == "" ) - $low_action="list"; +if ($low_action == "") + $low_action = "list"; //----------------------------------------------------- // Remove a card //----------------------------------------------------- -if ( isset($_POST['delete_card'] ) ) +if (isset($_POST['delete_card'])) { - if ( $User->check_action(FICADD) == 0 ) + if ($g_user->check_action(FICADD) == 0) { - alert(j(_('Vous ne pouvez pas enlever de fiche'))); - return; + alert(j(_('Vous ne pouvez pas enlever de fiche'))); + return; } - $f_id=$_REQUEST['f_id']; + $f_id = $_REQUEST['f_id']; - $fiche=new Customer($cn,$f_id); + $fiche = new Customer($cn, $f_id); $fiche->remove(); - $low_action="list"; - + $low_action = "list"; } //----------------------------------------------------- // list of customer //----------------------------------------------------- -if ( $low_action == "list" ) +if ($low_action == "list") { - ?> -

- - -', - $a); - $sel_card=new ISelect('cat'); - $sel_card->value=$cn->make_array('select fd_id, fd_label from fiche_def '. - ' where frd_id='.FICHE_TYPE_CLIENT. - ' order by fd_label ',1); - $sel_card->selected=(isset($_GET['cat']))?$_GET['cat']:-1; - $sel_card->javascript=' onchange="submit(this);"'; - echo _('Catégorie :').$sel_card->input(); - $nooperation=new ICheckBox('noop'); - $nooperation->selected=(isset($_GET['noop']))?true:false; +
+ + + ', $a); + $sel_card = new ISelect('cat'); + $sel_card->value = $cn->make_array('select fd_id, fd_label from fiche_def ' . + ' where frd_id=' . FICHE_TYPE_CLIENT . + ' order by fd_label ', 1); + $sel_card->selected = (isset($_GET['cat'])) ? $_GET['cat'] : -1; + $sel_card->javascript = ' onchange="submit(this);"'; + echo _('Catégorie :') . $sel_card->input(); + $nooperation = new ICheckBox('noop'); + $nooperation->selected = (isset($_GET['noop'])) ? true : false; - echo _('Inclure les clients sans opération :').$nooperation->input(); - - ?> - - - - - '; - echo $client->Summary($search,'client',$sql,$noop); + echo _('Inclure les clients sans opération :') . $nooperation->input(); + ?> + + + + + '; + echo $client->Summary($search, 'client', $sql, $noop); - echo '
'; - echo '
'; - echo '
'; - /* Add button */ - $f_add_button=new IButton('add_card'); - $f_add_button->label=_('Créer 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 = new IButton('add_card'); + $f_add_button->label = _('Créer une nouvelle fiche'); + $f_add_button->set_attribute('ipopup', 'ipop_newcard'); + $f_add_button->set_attribute('win_refresh', 'yes'); // $list=$cn->make_list("select fd_id from fiche_def where frd_id=$1",array(FICHE_TYPE_CLIENT)); - $f_add_button->set_attribute('type_cat',FICHE_TYPE_CLIENT); - $f_add_button->javascript=" select_card_type(this);"; - echo $f_add_button->input(); + $f_add_button->set_attribute('type_cat', FICHE_TYPE_CLIENT); + $f_add_button->javascript = " select_card_type(this);"; + echo $f_add_button->input(); $f_cat_button=new IButton('add_cat'); $f_cat_button->set_attribute('ipopup','ipop_cat'); @@ -153,29 +149,27 @@ if ( $low_action == 'detail') require_once('client_card.inc.php'); exit(); } - -if ( $low_action=="insert" ) -{ - /* security : check if user can add card */ - if ( $User->check_action(FICADD) == 0 ) + if ($low_action == "insert") { - alert('Vous ne pouvez pas ajouter de fiche'); - return; + /* security : check if user can add card */ + if ($g_user->check_action(FICADD) == 0) + { + alert('Vous ne pouvez pas ajouter de fiche'); + return; + } + + $customer = new Customer($cn); + $customer->Save($_REQUEST['fd_id']); + echo '
'; + echo ""; + echo $customer->Display(true); + echo "
"; + $retour = new IAction(); + $retour->label = "Retour"; + $retour->value = "?ac=" . $_REQUEST["ac"] . "&" . dossier::get(); + echo $retour->input(); + echo '
'; } - $customer=new Customer($cn); - $customer->Save($_REQUEST['fd_id']); - echo '
'; - echo ""; - echo $customer->Display(true); - echo "
"; - $retour=new IAction(); - $retour->label="Retour"; - $retour->value="?p_action=client&".dossier::get(); - echo $retour->input(); - echo '
'; - -} - -html_page_stop(); + html_page_stop(); ?> diff --git a/include/company.inc.php b/include/company.inc.php new file mode 100644 index 000000000..bd3f30c3b --- /dev/null +++ b/include/company.inc.php @@ -0,0 +1,102 @@ +can_request(PARCOORD,1); + echo '
'; + require_once("class_own.php"); + if ( isset ($_POST['record_company'] )) + { + $m=new Own($cn); + extract($_POST); + $m->MY_NAME=$p_name; + $m->MY_TVA=$p_tva; + $m->MY_STREET=$p_street; + $m->MY_NUMBER=$p_no; + $m->MY_CP=$p_cp; + $m->MY_COMMUNE=$p_Commune; + $m->MY_TEL=$p_tel; + $m->MY_FAX=$p_fax; + $m->MY_PAYS=$p_pays; + $m->MY_CHECK_PERIODE=$p_check_periode; + $m->MY_DATE_SUGGEST=$p_date_suggest; + if ( $g_user->check_action(PARCA)!=0)$m->MY_ANALYTIC=$p_compta; + if ( $g_user->check_action(PARSTR)!=0) $m->MY_STRICT=$p_strict; + if ( $g_user->check_action(PARTVA)!=0)$m->MY_TVA_USE=$p_tva_use; + $m->MY_PJ_SUGGEST=$p_pj; + $m->Update(); + } + + $my=new Own($cn); + ///// Compta analytic + $array=array ( + array("value"=>"ob",'label'=>_("obligatoire")), + array("value"=>"op",'label'=>_("optionnel")), + array("value"=>"nu",'label'=>_("non utilisé")) + ); + $strict_array=array( + array('value'=>'N','label'=>_('Non')), + array('value'=>'Y','label'=>_('Oui')) + ); + + $compta=new ISelect(); + $compta->table=1; + $compta->selected=$my->MY_ANALYTIC; + + $strict=new ISelect(); + $strict->table=1; + $strict->selected=$my->MY_STRICT; + + $tva_use=new ISelect(); + $tva_use->table=1; + $tva_use->selected=$my->MY_TVA_USE; + + $pj_suggest=new ISelect(); + $pj_suggest->table=1; + $pj_suggest->selected=$my->MY_PJ_SUGGEST; + + $date_suggest=new ISelect(); + $date_suggest->table=1; + $date_suggest->selected=$my->MY_DATE_SUGGEST; + + $check_periode=new ISelect(); + $check_periode->table=1; + $check_periode->selected=$my->MY_CHECK_PERIODE; + + // other parameters + $all=new IText(); + $all->table=1; + echo '
'; + echo dossier::hidden(); + echo ""; + echo "".td(_('Nom société'),'style="text-align:right"').$all->input("p_name",$my->MY_NAME).""; + $all->value=''; + echo "".td(_("Téléphone"),'style="text-align:right"').$all->input("p_tel",$my->MY_TEL).""; + $all->value=''; + echo "".td(_("Fax"),'style="text-align:right"').$all->input("p_fax",$my->MY_FAX).""; + $all->value=''; + echo "".td(_("Rue "),'style="text-align:right"').$all->input("p_street",$my->MY_STREET).""; + $all->value=''; + echo "".td(_("Numéro"),'style="text-align:right"').$all->input("p_no",$my->MY_NUMBER).""; + $all->value=''; + echo "".td(_("Code Postal"),'style="text-align:right"').$all->input("p_cp",$my->MY_CP).""; + $all->value=''; + echo "".td(_("Commune"),'style="text-align:right"').$all->input("p_Commune",$my->MY_COMMUNE).""; + $all->value=''; + echo "".td(_("Pays"),'style="text-align:right"').$all->input("p_pays",$my->MY_PAYS).""; + $all->value=''; + echo "".td(_("Numéro de Tva"),'style="text-align:right"').$all->input("p_tva",$my->MY_TVA).""; + if ( $g_user->check_action(PARCA)==0) $compta->setReadonly(true); + echo "".td(_("Utilisation de la compta. analytique"),'style="text-align:right"').$compta->input("p_compta",$array).""; + if ( $g_user->check_action(PARSTR)==0) $strict->setReadonly(true); + echo "".td(_("Utilisation du mode strict "),'style="text-align:right"').$strict->input("p_strict",$strict_array).""; + if ( $g_user->check_action(PARTVA)==0) $tva_use->setReadonly(true); + echo "".td(_("Assujetti à la tva"),'style="text-align:right"').$tva_use->input("p_tva_use",$strict_array).""; + echo "".td(_("Suggérer le numéro de pièce justificative"),'style="text-align:right"').$pj_suggest->input("p_pj",$strict_array).""; + echo "".td(_("Suggérer la date"),'style="text-align:right"').$date_suggest->input("p_date_suggest",$strict_array).""; + echo ''.td(_('Afficher la période comptable pour éviter les erreurs de date'),'style="text-align:right"').$check_periode->input('p_check_periode',$strict_array).''; + echo "
"; + echo HtmlInput::submit("record_company",_("Sauve")); + echo "
"; + echo '
'; + exit(); + +?> diff --git a/include/compta_ach.inc.php b/include/compta_ach.inc.php index f7c2d7fee..614906100 100644 --- a/include/compta_ach.inc.php +++ b/include/compta_ach.inc.php @@ -34,13 +34,11 @@ $p_action=(isset($_REQUEST['p_action']))?$_REQUEST['p_action']:''; $cn=new Database(dossier::id()); //menu = show a list of ledger $str_dossier=dossier::get(); - +$ac="ac=".$_REQUEST['ac']; $array=array( - array('?p_action=ach&sa=n&'.$str_dossier,_('Nouvelle dépense'),_('Nouvel achat ou dépense'),1), - array('?p_action=ach&sa=l&'.$str_dossier,_('Liste achat'),_('Liste des achats'),2), - array('?p_action=ach&sa=lnp&'.$str_dossier,_('Liste dépenses non payées'),_('Liste des ventes non payées'),3), - array('commercial.php?p_action=supplier&'.$str_dossier,_('Fournisseurs'),_('Fournisseurs')), - array('?p_action=impress&type=jrn&'.$str_dossier,_('Impression'),_('Impression')) + array('?ledger_type=ACH&sa=n&'.$str_dossier."&$ac",_('Nouvelle dépense'),_('Nouvel achat ou dépense'),1), + array('?ledger_type=ACH&sa=l&'.$str_dossier."&$ac",_('Liste achat'),_('Liste des achats'),2), + array('?ledger_type=ACH&sa=lnp&'.$str_dossier."&$ac",_('Liste dépenses non payées'),_('Liste des ventes non payées'),3) ); $sa=(isset ($_REQUEST['sa']))?$_REQUEST['sa']:-1; @@ -66,8 +64,7 @@ case 'lnp': echo '
'; echo ShowItem($array,'H','mtitle','mtitle',$def); echo '
'; -$href=basename($_SERVER['PHP_SELF']); - +$href=basename($_SERVER['PHP_SELF'])."?$ac&$str_dossier"; //---------------------------------------------------------------------- // Encode a new invoice // empty form for encoding @@ -76,7 +73,7 @@ if ( $def==1 || $def == 4 ) { // Check privilege if ( isset($_REQUEST['p_jrn'])) - if ( $User->check_jrn($_REQUEST['p_jrn']) != 'W' ) + if ( $g_user->check_jrn($_REQUEST['p_jrn']) != 'W' ) { NoAccess(); exit -1; @@ -105,7 +102,7 @@ if ( $def==1 || $def == 4 ) echo HtmlInput::hidden('p_action','ach'); echo dossier::hidden(); echo $Ledger->confirm($_POST ); - + echo HtmlInput::hidden('ac',$_REQUEST['ac']); $chk=new ICheckBox(); $chk->selected=false; echo '
'; @@ -150,7 +147,7 @@ if ( $def==1 || $def == 4 ) /* Save the predefined operation */ - if ( isset($_POST['opd_save']) && $User->check_action(PARPREDE)==1) + if ( isset($_POST['opd_save']) && $g_user->check_action(PARPREDE)==1) { $opd=new Pre_op_ach($cn); $opd->get_post(); @@ -270,7 +267,7 @@ if ( $def == 2 ) echo '
'; // Check privilege if ( isset($_REQUEST['p_jrn']) && - $User->check_jrn($_REQUEST['p_jrn']) == 'X') + $g_user->check_jrn($_REQUEST['p_jrn']) == 'X') { NoAccess(); @@ -296,7 +293,7 @@ if ( $def == 2 ) /* by default we should the default period */ if ( ! isset($p_array['date_start'])) { - $period=$User->get_periode(); + $period=$g_user->get_periode(); $per=new Periode($cn,$period); list($date_start,$date_end)=$per->get_date_limit(); $p_array['date_start']=$date_start; @@ -358,7 +355,7 @@ if ( $def==3 ) echo '
'; // Check privilege if ( isset($_REQUEST['p_jrn']) && - $User->check_jrn($_REQUEST['p_jrn']) == 'X') + $g_user->check_jrn($_REQUEST['p_jrn']) == 'X') { NoAccess(); exit -1; diff --git a/include/compta_fin.inc.php b/include/compta_fin.inc.php index 61d6cea5e..bd8869d18 100644 --- a/include/compta_fin.inc.php +++ b/include/compta_fin.inc.php @@ -27,17 +27,15 @@ require_once ('class_acc_ledger_fin.php'); require_once('class_ipopup.php'); $gDossier=dossier::id(); -$p_action=(isset ($_REQUEST['p_action']))?$_REQUEST['p_action']:''; $cn=new Database(dossier::id()); -$menu_action="?p_action=fin&".dossier::get(); +$menu_action="?ledger_type=fin&ac=".$_REQUEST['ac']."&".dossier::get(); $menu=array( array($menu_action.'&sa=n',_('Nouvel extrait'),_('Encodage d\'un nouvel extrait'),1), array($menu_action.'&sa=l',_('Liste'),_('Liste opération bancaire'),2), array($menu_action.'&sa=s',_('Solde'),_('Solde des comptes'),3), - array($menu_action.'&sa=r',_('Rapprochements banquaires'),_('Rapprochements banquaires'),4), - array('?p_action=impress&type=jrn&'.dossier::get(),_('Impression'),_('Impression')) + array($menu_action.'&sa=r',_('Rapprochements banquaires'),_('Rapprochements banquaires'),4) ); $sa=(isset($_REQUEST['sa']))?$_REQUEST['sa']:-1; @@ -71,8 +69,6 @@ $Ledger=new Acc_Ledger_Fin($cn,0); if ( $def == 1 ) { - $href=basename($_SERVER['PHP_SELF']); - if ( isset($_REQUEST['p_jrn'])) $Ledger->id=$_REQUEST['p_jrn']; else @@ -106,7 +102,7 @@ if ( $def == 1 ) { 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 @@ if ( $def == 1 ) echo $a; echo '
'; echo '
'; - echo HtmlInput::button_anchor(_('Nouvel extrait'),$href.'?p_action=fin&sa=n&'.dossier::get()); + echo HtmlInput::button_anchor(_('Nouvel extrait'),$href.'?ledger_type=fin&sa=n&'.dossier::get()."&ac=".$_REQUEST['ac']); echo '
'; exit(); } @@ -158,8 +154,9 @@ if ( $def == 1 ) 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=( isset($correct))?$_POST:null; // show select ledger echo $Ledger->input($array); @@ -207,7 +204,6 @@ if ( $def == 2) $bar=jrn_navigation_bar($offset,$max_line,$step,$page); echo HtmlInput::hidden("sa","lnp"); - echo HtmlInput::hidden("p_action","ach"); echo dossier::hidden(); echo $bar; list($count,$html)= $Ledger->list_operation($sql,$offset); @@ -216,7 +212,7 @@ if ( $def == 2) /* * Export to csv */ - $r=HtmlInput::get_to_hidden(array('l','date_start','date_end','desc','amount_min','amount_max','qcode','accounting','unpaid','gDossier','ledger_type','p_action')); + $r=HtmlInput::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=>$v) $r.=HtmlInput::hidden('r_jrn['.$k.']',$v); @@ -352,7 +348,7 @@ if ($def==4) //------------------------- echo '
'; echo ''; - echo HtmlInput::get_to_hidden(array('gDossier','p_action','sa')); + echo HtmlInput::get_to_hidden(array('gDossier','ledger_type','ac','sa')); $wLedger=$Ledger->select_ledger('FIN',3); if ($wLedger == null ) exit ('Pas de journal disponible'); diff --git a/include/compta_ven.inc.php b/include/compta_ven.inc.php index 302678070..6adde61f5 100644 --- a/include/compta_ven.inc.php +++ b/include/compta_ven.inc.php @@ -35,12 +35,11 @@ $gDossier=dossier::id(); $cn=new Database(dossier::id()); //menu = show a list of ledger $str_dossier=dossier::get(); +$ac="ac=".$_REQUEST['ac']; $array=array( - array('?p_action=ven&sa=n&'.$str_dossier,_('Nouvelle vente'),_('Nouvelle vente'),1), - array('?p_action=ven&sa=l&'.$str_dossier,_('Liste ventes'),_('Liste des ventes'),2), - array('?p_action=ven&sa=lnp&'.$str_dossier,_('Liste vente non payées'),_('Liste des ventes non payées'),3), - array('commercial.php?p_action=client&'.$str_dossier,_('Clients'),_('Clients')), - array('?p_action=impress&type=jrn&'.$str_dossier,_('Impression'),_('Impression')) + array('?ledger_type=ven&sa=n&'.$str_dossier."&$ac",_('Nouvelle vente'),_('Nouvelle vente'),1), + array('?ledger_type=ven&sa=l&'.$str_dossier."&$ac",_('Liste ventes'),_('Liste des ventes'),2), + array('?ledger_type=ven&sa=lnp&'.$str_dossier."&$ac",_('Liste vente non payées'),_('Liste des ventes non payées'),3) ); $sa=(isset ($_REQUEST['sa']))?$_REQUEST['sa']:-1; @@ -66,7 +65,7 @@ case 'lnp': echo '
'; echo ShowItem($array,'H','mtitle','mtitle',$def); echo '
'; -$href=basename($_SERVER['PHP_SELF']); +$href=basename($_SERVER['PHP_SELF'])."?$ac&$str_dossier"; //---------------------------------------------------------------------- @@ -79,7 +78,7 @@ if ( $def==1 || $def == 4 ) // Check privilege if ( isset($_REQUEST['p_jrn']) && - $User->check_jrn($_REQUEST['p_jrn']) != 'W' ) + $g_user->check_jrn($_REQUEST['p_jrn']) != 'W' ) { NoAccess(); @@ -120,6 +119,7 @@ if ( $def==1 || $def == 4 ) echo "Nom du modèle ".$opd_name->input(); echo '
'; echo '
'; + echo HtmlInput::hidden('ac',$_REQUEST['ac']); echo HtmlInput::submit("record",_("Enregistrement"),'onClick="return verify_ca(\'\');"'); echo HtmlInput::submit('correct',_("Corriger")); echo ''; @@ -135,7 +135,7 @@ if ( $def==1 || $def == 4 ) if ( isset($_POST['record']) ) { // Check privilege - if ( $User->check_jrn($_REQUEST['p_jrn']) != 'W' ) + if ( $g_user->check_jrn($_REQUEST['p_jrn']) != 'W' ) { NoAccess(); @@ -243,7 +243,8 @@ if ( $def==1 || $def == 4 ) } 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 @@ if ( $def==1 || $def == 4 ) echo '
'; echo HtmlInput::hidden("sa","p"); echo HtmlInput::hidden("p_action","ven"); + echo dossier::hidden(); echo HtmlInput::hidden('p_jrn_predef',$Ledger->id); $op=new Pre_op_ven($cn); @@ -289,7 +291,7 @@ if ( $def == 2 ) echo '
'; // Check privilege if ( isset($_REQUEST['p_jrn']) && - $User->check_jrn($_REQUEST['p_jrn']) == 'X') + $g_user->check_jrn($_REQUEST['p_jrn']) == 'X') { NoAccess(); @@ -315,7 +317,7 @@ if ( $def == 2 ) /* by default we should the default period */ if ( ! isset($p_array['date_start'])) { - $period=$User->get_periode(); + $period=$g_user->get_periode(); $per=new Periode($cn,$period); list($date_start,$date_end)=$per->get_date_limit(); $p_array['date_start']=$date_start; @@ -336,6 +338,7 @@ if ( $def == 2 ) 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)= $Ledger->list_operation($sql,$offset,1); echo $html; @@ -378,7 +381,7 @@ if ( $def==3 ) echo '
'; // Check privilege if ( isset($_REQUEST['p_jrn']) && - $User->check_jrn($_REQUEST['p_jrn']) == 'X') + $g_user->check_jrn($_REQUEST['p_jrn']) == 'X') { NoAccess(); exit -1; diff --git a/include/dashboard.inc.php b/include/dashboard.inc.php new file mode 100644 index 000000000..7b388d411 --- /dev/null +++ b/include/dashboard.inc.php @@ -0,0 +1,39 @@ +'; +global $g_user; +/* others report */ +$cal=new Calendar(); +$cal->get_preference(); +$Ledger=new Acc_Ledger($cn,0); +$last_ledger=array(); +if ( $g_user->check_action(GESTION)==1) + { + $Operation=new Action($cn); + $last_ledger=$Ledger->get_last(10); + $last_operation=$Operation->get_last(10); + } +else + { + $last_operation=array(); + } +ob_start(); +require_once('template/dashboard.php'); +$ret=ob_get_contents(); +ob_end_clean(); +echo $ret; + +echo '
'; +?> diff --git a/include/document_modele.inc.php b/include/document_modele.inc.php index 4ef2f9b7c..37b1d452b 100644 --- a/include/document_modele.inc.php +++ b/include/document_modele.inc.php @@ -78,7 +78,7 @@ if ( $sub_action == 'mod_template') //----------------------------------------------------- echo $doc->myList(); echo ''; ?> \ No newline at end of file diff --git a/include/fiche.inc.php b/include/fiche.inc.php index 654f4cf6e..e518d830a 100644 --- a/include/fiche.inc.php +++ b/include/fiche.inc.php @@ -32,17 +32,17 @@ require_once('class_ipopup.php'); echo IPoste::ipopup('ipop_account'); echo ICard::ipopup('ipop_card'); -$gDossier=dossier::id(); $str_dossier=dossier::get(); +global $g_user,$cn; $pop_tva=new IPopup('popup_tva'); $pop_tva->title=_('Choix TVA'); $pop_tva->value=''; echo $pop_tva->input(); -$cn=new Database($gDossier); + // Security check -$write=$User->check_action(FICADD); +$write=$g_user->check_action(FICADD); if ($write == 0 ) { /* Cannot Access */ @@ -53,11 +53,14 @@ function ShowRecherche() { echo ''; echo dossier::hidden(); + echo HtmlInput::hidden('ac',$_REQUEST['ac']); $w=new IText(); $search_text=(isset($_REQUEST['search_text']))?$_REQUEST['search_text']:""; $h=new 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 @@ function ShowFicheDefInput($p_fiche_def) /* show the values label class_base and create account */ $r.='
'; + $r.= HtmlInput::hidden('ac',$_REQUEST['ac']); $r.=dossier::hidden(); $r.=HtmlInput::hidden("fd_id",$p_fiche_def->id); + $r.=HtmlInput::hidden("ac",$_REQUEST['ac']); $r.=HtmlInput::hidden("p_action","fiche"); $r.= $p_fiche_def->input_base(); $r.='
'; @@ -101,9 +106,11 @@ function ShowFicheDefInput($p_fiche_def) /* attributes */ $r.='
Détails'; - $r.= ''; + $r.= ''; $r.=dossier::hidden(); + $r.= HtmlInput::hidden('ac',$_REQUEST['ac']); $r.=HtmlInput::hidden("fd_id",$p_fiche_def->id); + $r.=HtmlInput::hidden("ac",$_REQUEST['ac']); $r.= $p_fiche_def->DisplayAttribut("remove"); $r.= HtmlInput::submit('add_line',_('Ajoutez cet élément')); $r.= HtmlInput::submit("save_line",_("Sauvez")); @@ -126,7 +133,7 @@ $recherche=true; // 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=new Fiche_Def($cn); $fiche_def->Add($_POST); @@ -135,7 +142,7 @@ $r=""; if ( isset ($_POST['remove_cat'] ) ) { - $User->can_request(FICCAT); + $g_user->can_request(FICCAT); $fd_id=new Fiche_Def($cn,$_POST['fd_id']); $remains=$fd_id->remove(); @@ -147,7 +154,7 @@ if ( isset ($_POST['remove_cat'] ) ) // Add a line in the card model if ( isset ($_POST["add_line"]) ) { - $User->can_request(FIC); + $g_user->can_request(FIC); $r= '
'; if ( $write ==0) @@ -170,7 +177,7 @@ if ( isset ($_POST["add_line"]) ) if ( isset($_POST['save_line'])) { - $User->can_request(FICCAT); + $g_user->can_request(FICCAT); $fiche_def=new Fiche_Def($cn,$_REQUEST['fd_id']); $fiche_def->save_order($_POST); $r= '
'; @@ -190,7 +197,7 @@ if ( isset($_POST['save_line'])) // Remove lines from a card model if ( isset ($_POST['remove_line']) ) { - $User->can_request(FICCAT); + $g_user->can_request(FICCAT); $r= '
'; if ( $write ==0) $r.= "

Pas d'accès

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

"._("Pas d'accès")."

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

Vos changements ne seront pas sauvés

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

Pas d'accès

"; diff --git a/include/fiche_def.inc.php b/include/fiche_def.inc.php index 07ceaa4c6..f34154770 100644 --- a/include/fiche_def.inc.php +++ b/include/fiche_def.inc.php @@ -50,8 +50,8 @@ for ($i=0;$iinput('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 @@ if ( isset ($_POST['mod']) ) echo $mod->Input(); echo ""; $w=new IHidden(); - echo $w->input('p_action',$p_action); - echo $w->input('sa',$sa); + echo $w->input('ac',$_REQUEST['ac']); +// echo $w->input('sa',$sa); echo HtmlInput::submit('confirm_mod' ,'Confirme'); echo HtmlInput::submit('no','Cancel'); echo ''; diff --git a/include/forecast.inc.php b/include/forecast.inc.php index 669df717c..5fc645c0a 100644 --- a/include/forecast.inc.php +++ b/include/forecast.inc.php @@ -1,4 +1,5 @@ delete(); } /* * Cloning */ -if (isset ($_REQUEST ['clone'])) - { +if (isset($_REQUEST ['clone'])) +{ echo "

cloning

"; /* * We need to clone the forecast */ - $anti=new Forecast($cn,$_REQUEST ['f_id']); + $anti = 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=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']); + * ******************************************************************** */ +if (isset($_POST['mod_cat_save'])) +{ + /* + * We save the forecast + */ + $anti = 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']); - $anti->save(); + $anti->save(); - /* add new category */ - for ($i=0;$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 = 0; $i < MAX_CAT; $i++) + { + if (isset($_POST['fr_cat_new' . $i])) + { + if (strlen(trim($_POST['fr_cat_new' . $i])) != 0) + { + $c = 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(); + } + } + } - /* update existing cat */ - foreach ($_POST as $key=>$value) - { - $var=sscanf($key,'fr_cat%d'); - $idx=sprintf("fr_cat%d",$var[0]); - if (isset($_POST[$idx])) - { - $fc=new Forecast_Cat($cn,$var[0]); - if (strlen(trim($_POST[$idx]))==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(); - } + /* update existing cat */ + foreach ($_POST as $key => $value) + { + $var = sscanf($key, 'fr_cat%d'); + $idx = sprintf("fr_cat%d", $var[0]); + if (isset($_POST[$idx])) + { + $fc = new Forecast_Cat($cn, $var[0]); + if (strlen(trim($_POST[$idx])) == 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(); + } + } + } - } - } - - $cn->commit(); - } - catch (Exception $e) - { - alert($e->getMessage()); - $cn->rollback(); - - } - $sa='vw'; - - } -/********************************************************************** + $cn->commit(); + } + catch (Exception $e) + { + alert($e->getMessage()); + $cn->rollback(); + } + $sa = 'vw'; +} +/* * ******************************************************************** * Save first the data for new * * - **********************************************************************/ -if ( $sa == 'new' || isset ($_POST['step3'])) + * ******************************************************************** */ +if ($sa == 'new' || isset($_POST['step3'])) { - $correct=0; + $correct = 0; if (isset($_POST['step3'])) { - /*save all the items */ - try - { - $cn->start(); - for ($i=0;$i<$_POST['nbrow'];$i++) - { + /* save all the items */ + try + { + $cn->start(); + for ($i = 0; $i < $_POST['nbrow']; $i++) + { - // Delete if needed - if ( isset($_POST['fi_id'.$i])) - { - if (strlen(trim($_POST['an_cat_acc'.$i]))==0 &&strlen(trim($_POST['an_qc'.$i]))== 0) - { - $e=new Forecast_item($cn); - $e->set_parameter("id",$_POST['fi_id'.$i]); - $e->delete(); - } - } - - if (strlen(trim($_POST['an_cat_acc'.$i]))!=0 || strlen(trim($_POST['an_qc'.$i]))!= 0) - { - /* we save only if there is something */ - $e=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=new Fiche($cn); - if ( $f->get_by_qcode($_POST['an_qc'.$i],false) == 0 ) - $e->set_parameter('card',$f->id); - else - $e->set_parameter('card',null); - $e->set_parameter('order',$i); - $e->save(); - } - } - $cn->commit(); - $sa='vw'; // to avoid to restart the add of new anticipation - } - catch (Exception $e) - { - $cn->rollback(); - alert($e->getMessage()); - $correct=1; - } + // Delete if needed + if (isset($_POST['fi_id' . $i])) + { + if (strlen(trim($_POST['an_cat_acc' . $i])) == 0 && strlen(trim($_POST['an_qc' . $i])) == 0) + { + $e = new Forecast_item($cn); + $e->set_parameter("id", $_POST['fi_id' . $i]); + $e->delete(); + } + } + if (strlen(trim($_POST['an_cat_acc' . $i])) != 0 || strlen(trim($_POST['an_qc' . $i])) != 0) + { + /* we save only if there is something */ + $e = 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 = new Fiche($cn); + if ($f->get_by_qcode($_POST['an_qc' . $i], false) == 0) + $e->set_parameter('card', $f->id); + else + $e->set_parameter('card', null); + $e->set_parameter('order', $i); + $e->save(); + } + } + $cn->commit(); + $sa = 'vw'; // to avoid to restart the add of new anticipation + } + catch (Exception $e) + { + $cn->rollback(); + alert($e->getMessage()); + $correct = 1; + } } /* Second step : we save the name and category * and propose the items we add the item */ - if ($correct==2 || isset ($_POST['step2'])) + if ($correct == 2 || isset($_POST['step2'])) { - try - { - $cn->start(); - /* Save forecast */ - $a=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']); + try + { + $cn->start(); + /* Save forecast */ + $a = 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']); - $a->save(); - $id=$a->get_parameter("id"); - /* save cat */ - for ($i=0;$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=1; - unset($_POST['step2']); - $cn->rollback(); - } - + $a->save(); + $id = $a->get_parameter("id"); + /* save cat */ + for ($i = 0; $i < MAX_CAT; $i++) + { + if (strlen(trim($_POST['fr_cat' . $i])) != 0) + { + $c = 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 = 1; + unset($_POST['step2']); + $cn->rollback(); + } } - } -/********************************************************************** +/* * ******************************************************************** * Display menu * * - **********************************************************************/ + * ******************************************************************** */ // display button add and list of forecast to display -$aForecast=Forecast::load_all($cn); -$menu=array(); -$get_dossier=dossier::get(); +$aForecast = Forecast::load_all($cn); +$menu = array(); +$get_dossier = dossier::get(); -for ($i = 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 == 'new') + * ******************************************************************** */ +if ($sa == 'new') { /* Second step : we save the name and category * and propose the items we add the item */ - if ($correct==2 || isset ($_POST['step2'])) + if ($correct == 2 || isset($_POST['step2'])) { - /* Propose a form for the items - */ - $anticip=new Anticipation($cn,$a->get_parameter("id")); - echo '
'; - echo ICard::ipopup('ipopcard'); - echo IPoste::ipopup('ipop_account'); - $search_card=new IPopup('ipop_card'); - $search_card->title=_('Recherche de fiche'); - $search_card->value=''; - echo $search_card->input(); - - 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 '
'; + /* Propose a form for the items + */ + $anticip = new Anticipation($cn, $a->get_parameter("id")); + echo '
'; + echo ICard::ipopup('ipopcard'); + echo IPoste::ipopup('ipop_account'); + $search_card = new IPopup('ipop_card'); + $search_card->title = _('Recherche de fiche'); + $search_card->value = ''; + echo $search_card->input(); + 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==1) + if (!isset($_POST['step2']) || $correct == 1) { - $anc=new 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 = 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=new Anticipation($cn,$_GET['f_id']); + $anc = 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 '
'; } -/********************************************************************** +/* * ******************************************************************** * If we request to modify the items * * - **********************************************************************/ + * ******************************************************************** */ if (isset($_GET['mod_item'])) { /* Propose a form for the items */ - $anticip=new Anticipation($cn,$_GET['f_id']); + $anticip = new Anticipation($cn, $_GET['f_id']); echo '
'; echo ICard::ipopup('ipopcard'); echo IPoste::ipopup('ipop_account'); - $search_card=new IPopup('ipop_card'); - $search_card->title=_('Recherche de fiche'); - $search_card->value=''; + $search_card = new IPopup('ipop_card'); + $search_card->title = _('Recherche de fiche'); + $search_card->value = ''; echo $search_card->input(); 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=="vw") + * ******************************************************************** */ +if (isset($_REQUEST['f_id']) && $sa == "vw") { echo '
'; - $forecast=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égories')); - echo HtmlInput::submit('mod_item',_('Modifier éléments')); - //echo HtmlInput::submit('cvs',_('Export CVS')); - echo HtmlInput::submit('del',_('Effacer'),'onclick="return confirm(\''._('Vous confirmez l\\\' effacement').'\')"'); - echo HtmlInput::submit('clone',_('Cloner'),'onclick="return confirm(\''._('Vous confirmez le clonage ').'\')"'); - - echo HtmlInput::hidden('p_action','prev'); - echo '
'; - echo '
'; - echo '
'; - exit(); - } - catch (Exception $e) - { - echo "

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

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

'; - $anc=new Anticipation($cn,$_GET['f_id']); + $forecast = 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égories')); + echo HtmlInput::submit('mod_item', _('Modifier éléments')); + //echo HtmlInput::submit('cvs',_('Export CVS')); + echo HtmlInput::submit('del', _('Effacer'), 'onclick="return confirm(\'' . _('Vous confirmez l\\\' effacement') . '\')"'); + echo HtmlInput::submit('clone', _('Cloner'), 'onclick="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 = 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 '
'; - } + echo '
'; + } } - ?> diff --git a/include/impress_bilan.inc.php b/include/impress_bilan.inc.php index e8d63003e..5bb915d07 100644 --- a/include/impress_bilan.inc.php +++ b/include/impress_bilan.inc.php @@ -25,7 +25,7 @@ require_once('class_exercice.php'); * \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 ...) */ //----------------------------------------------------- @@ -33,6 +33,8 @@ require_once('class_exercice.php'); //----------------------------------------------------- require_once('class_database.php'); +global $g_user; + //----------------------------------------------------- // Form //----------------------------------------------------- @@ -40,7 +42,7 @@ require_once('class_database.php'); $bilan=new Acc_Bilan($cn); $bilan->get_request_get(); echo '
'; -$exercice=(isset($_GET['exercice']))?$_GET['exercice']:$User->get_exercice(); +$exercice=(isset($_GET['exercice']))?$_GET['exercice']:$g_user->get_exercice(); /* * Let you change the exercice diff --git a/include/impress_fiche.inc.php b/include/impress_fiche.inc.php index 09e4348a7..943eff8c8 100644 --- a/include/impress_fiche.inc.php +++ b/include/impress_fiche.inc.php @@ -27,6 +27,8 @@ require_once('class_lettering.php'); $gDossier=dossier::id(); $cn=new Database($gDossier); +global $g_user; + /** * Show first the form */ @@ -37,7 +39,7 @@ $categorie->selected=(isset($_GET['cat']))?$_GET['cat']:0; $str_categorie=$categorie->input(); /* periode */ -$exercice=$User->get_exercice(); +$exercice=$g_user->get_exercice(); $iperiode=new Periode($cn); list ($first,$last)=$iperiode->get_limit($exercice); @@ -69,8 +71,7 @@ $str_histo=$histo->input(); 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 @@ if ( $_GET['histo'] == 3 ) 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 ""; diff --git a/include/impress_gl_comptes.inc.php b/include/impress_gl_comptes.inc.php index 521789d5d..150eafbe3 100644 --- a/include/impress_gl_comptes.inc.php +++ b/include/impress_gl_comptes.inc.php @@ -27,28 +27,28 @@ require_once('class_acc_operation.php'); * \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 '
'; echo '
'; -echo HtmlInput::hidden('p_action','impress'); +echo HtmlInput::hidden('ac',$_REQUEST['ac']); echo HtmlInput::hidden('type','gl_comptes'); echo dossier::hidden(); echo ''; $cn=new Database(dossier::id()); $periode=new Periode($cn); -$a=$periode->get_limit($User->get_exercice()); +$a=$periode->get_limit($g_user->get_exercice()); // $a is an array $first_day=$a[0]->first_day(); $last_day=$a[1]->last_day(); @@ -56,7 +56,7 @@ $last_day=$a[1]->last_day(); // filter on period $date_from=new IDate('from_periode'); $date_to=new IDate('to_periode'); -$year=$User->get_exercice(); +$year=$g_user->get_exercice(); $date_from->value=(isset($_REQUEST['from_periode'])&& isDate($_REQUEST['from_periode'])!=0)?$_REQUEST['from_periode']:$first_day; $date_to->value=(isset($_REQUEST['to_periode']) && isDate($_REQUEST['to_periode']) !=0 )?$_REQUEST['to_periode']:$last_day; echo td(_('Depuis').$date_from->input()); @@ -117,7 +117,7 @@ if ( isset( $_REQUEST['bt_html'] ) ) $sql='select pcm_val from tmp_pcmn '; $cond_poste=''; - if ($from_poste->value != '') + if ($from_poste->value != '') { $cond_poste = ' where '; $cond_poste .=' pcm_val >= upper (\''.Database::escape_string($from_poste->value).'\')'; @@ -125,7 +125,7 @@ if ( isset( $_REQUEST['bt_html'] ) ) if ( $to_poste->value != '') { - if ( $cond_poste == '') + if ( $cond_poste == '') { $cond_poste = ' where pcm_val <= upper (\''.Database::escape_string($to_poste->value).'\')'; } @@ -155,12 +155,12 @@ if ( isset( $_REQUEST['bt_html'] ) ) echo '
'; $l=(isset($_REQUEST['letter']))?2:0; $s=(isset($_REQUEST['solded']))?1:0; - + foreach ($a_poste as $poste_id ) { $Poste=new Acc_Account_Ledger ($cn, $poste_id['pcm_val']); $Poste->load(); - + $Poste->get_row_date( $_GET['from_periode'], $_GET['to_periode'],$l,$s); if ( empty($Poste->row)) diff --git a/include/impress_jrn.inc.php b/include/impress_jrn.inc.php index 6fbb10dde..6931298f3 100644 --- a/include/impress_jrn.inc.php +++ b/include/impress_jrn.inc.php @@ -29,18 +29,19 @@ require_once('class_exercice.php'); require_once('class_dossier.php'); load_all_script(); $gDossier=dossier::id(); +global $g_user; //----------------------------------------------------- // Show the jrn and date //----------------------------------------------------- require_once('class_database.php'); -if ( $User->Admin() == 0 && $User->is_local_admin()==0) +if ( $g_user->Admin() == 0 && $g_user->is_local_admin()==0) { $sql="select jrn_def_id,jrn_def_name from jrn_def join jrn_type on jrn_def_type=jrn_type_id join user_sec_jrn on uj_jrn_id=jrn_def_id where - uj_login='$User->login' + uj_login='$g_user->login' and uj_priv !='X' "; $ret=$cn->make_array($sql); @@ -58,7 +59,7 @@ $NoPriv=$cn->count_sql("select jrn_def_id,jrn_def_name,jrn_def_class_deb,jrn_def from jrn_def join jrn_type on jrn_def_type=jrn_type_id join user_sec_jrn on uj_jrn_id=jrn_def_id where - uj_login='$User->id' + uj_login='$g_user->id' and uj_priv ='X' "); // Pour voir tout les journal ? @@ -70,7 +71,7 @@ if ( $NoPriv == 0 ) } if ( count($ret) < 1 ) NoAccess(); -$exercice=(isset($_GET['exercice']))?$_GET['exercice']:$User->get_exercice(); +$exercice=(isset($_GET['exercice']))?$_GET['exercice']:$g_user->get_exercice(); //----------------------------------------------------- // Form @@ -86,14 +87,14 @@ $ex=new Exercice($cn); $wex=$ex->select('exercice',$exercice,' onchange="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 ''; 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 @@ if ( isset( $_REQUEST['bt_html'] ) ) 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 ""; + echo '"; echo ""; diff --git a/include/impress_poste.inc.php b/include/impress_poste.inc.php index f4a20c7b9..cf5a4c168 100644 --- a/include/impress_poste.inc.php +++ b/include/impress_poste.inc.php @@ -35,6 +35,7 @@ require_once('class_acc_operation.php'); //----------------------------------------------------- require_once('class_database.php'); require_once('class_ipopup.php'); +global $User; echo IPoste::ipopup('ipop_account'); echo ICard::ipopup('ipopcard'); @@ -49,7 +50,7 @@ echo $search_card->input(); echo '
'; echo '
'; -echo HtmlInput::hidden('p_action','impress'); +echo HtmlInput::hidden('ac',$_REQUEST['ac']); echo HtmlInput::hidden('type','poste'); echo dossier::hidden(); echo '
'.dossier::hidden(). 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 @@ print ''; $date_from=new IDate('from_periode'); $date_to=new IDate('to_periode'); -$year=$User->get_exercice(); +$year=$g_user->get_exercice(); $date_from->value=(isset($_REQUEST['from_periode']))?$_REQUEST['from_periode']:"01.01.".$year; $date_to->value=(isset($_REQUEST['to_periode']))?$_REQUEST['to_periode']:"31.12.".$year; echo td(_('Depuis').$date_from->input()); @@ -138,19 +139,18 @@ if ( isset( $_REQUEST['bt_html'] ) ) require_once("class_acc_account_ledger.php"); $go=0; // we ask a poste_id - if ( isset($_GET['poste_id']) && strlen(trim($_GET['poste_id'])) != 0 ) + if ( isset($_GET['poste_id']) && strlen(trim($_GET['poste_id'])) != 0 ) { - $poste=$cn->get_value('select format_account($1)',array($_GET['poste_id'])); - if ( isset ($_GET['poste_fille']) ) { - $a_poste=$cn->get_array("select pcm_val from tmp_pcmn where pcm_val::text like $1||'%' order by pcm_val::text",array($poste)); + $parent=$_GET['poste_id']; + $a_poste=$cn->get_array("select pcm_val from tmp_pcmn where pcm_val::text like '$parent%' order by pcm_val::text"); $go=3; } // Check if the post is numeric and exists - elseif ( $cn->count_sql('select * from tmp_pcmn where pcm_val=$1',array($poste)) != 0 ) + elseif ( $cn->count_sql('select * from tmp_pcmn where pcm_val=$1',array($_GET['poste_id'])) != 0 ) { - $Poste=new Acc_Account_Ledger($cn,$poste); + $Poste=new Acc_Account_Ledger($cn,$_GET['poste_id']); $go=1; } } diff --git a/include/impress_rapport.inc.php b/include/impress_rapport.inc.php index 1b63f81f3..6ce52c445 100644 --- a/include/impress_rapport.inc.php +++ b/include/impress_rapport.inc.php @@ -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 @@ if ( isset( $_GET['bt_html'] ) ) echo '"; + $hid->input("type","rapport").$hid->input("ac",$_GET['ac']).""; 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 @@ if ( isset( $_GET['bt_html'] ) ) 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 @@ if ( sizeof($ret) == 0 ) // Form //----------------------------------------------------- echo '
'; -$exercice=(isset($_GET['exercice']))?$_GET['exercice']:$User->get_exercice(); +$exercice=(isset($_GET['exercice']))?$_GET['exercice']:$g_user->get_exercice(); /* * Let you change the exercice @@ -186,14 +186,14 @@ $ex=new Exercice($cn); $wex=$ex->select('exercice',$exercice,' onchange="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 ''; echo '
'; $hidden=new IHidden(); -echo $hidden->input("p_action","impress"); +echo $hidden->input("ac",$_GET['ac']); echo $hidden->input("type","rapport"); echo dossier::hidden(); diff --git a/include/impress_rec.inc.php b/include/impress_rec.inc.php index 9b8e05022..9095b5d9e 100644 --- a/include/impress_rec.inc.php +++ b/include/impress_rec.inc.php @@ -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=$User->get_ledger('ALL',3); +$aledger=$g_user->get_ledger('ALL',3); echo '
'; echo '
'; $rjrn=''; @@ -38,13 +39,13 @@ $radio=new IRadio('choice'); $choice=(isset($_GET['choice']))?$_GET['choice']:0; $r_jrn=(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::hidden('type','rec'); echo 'Filtre par journal :'.HtmlInput::select_ledger($aledger,$r_jrn ); echo '
'; /* * Limit by date, default current exercice */ -list($start,$end)=$User->get_limit_current_exercice(); +list($start,$end)=$g_user->get_limit_current_exercice(); $dstart=new IDate('p_start'); $dstart->value=(isset($_REQUEST['p_start']))?$_REQUEST['p_start']:$start; @@ -105,7 +106,6 @@ default: echo "Choix invalid"; exit(); } +$gDossier=Dossier::id(); require_once('template/impress_reconciliation.php'); -exit(); -exit(); exit(); \ No newline at end of file diff --git a/include/lettering.account.inc.php b/include/lettering.account.inc.php index 660878a06..e729d4976 100644 --- a/include/lettering.account.inc.php +++ b/include/lettering.account.inc.php @@ -30,7 +30,7 @@ echo '
'; echo '
+
'; - echo ''._('Options pour la page d\'accueil').''; + echo '' . _('Options pour la page d\'accueil') . ''; echo _('Mini-Rapport : '); - $rapport=new Acc_Report($cn); - $aRapport=$rapport->make_array(); - $aRapport[]=array("value"=>0,"label"=>_('Aucun mini rapport')); - $wRapport=new ISelect(); - $wRapport->name="minirap"; - $wRapport->selected=$User->get_mini_report(); - $wRapport->value=$aRapport; + $rapport = new Acc_Report($cn); + $aRapport = $rapport->make_array(); + $aRapport[] = array("value" => 0, "label" => _('Aucun mini rapport')); + $wRapport = new ISelect(); + $wRapport->name = "minirap"; + $wRapport->selected = $g_user->get_mini_report(); + $wRapport->value = $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 qui s\'affiche sur votre page d\'accueil') . ''; echo ''; } echo '
'; -echo ''._('Langue').''; +echo '' . _('Langue') . ''; echo _('Selectionnez votre langue'); -$aLang=array(array(_('Français'),'fr_FR.utf8'), - array(_('Anglais'),'en_US.utf8'), - array(_('Néerlandais'),'nl_NL.utf8'), - ); +$aLang = array(array(_('Français'), 'fr_FR.utf8'), + array(_('Anglais'), 'en_US.utf8'), + array(_('Néerlandais'), 'nl_NL.utf8'), + ); echo ''; echo '
'; -echo HtmlInput::submit("val",_("Valider")); +echo HtmlInput::submit("val", _("Valider")); echo ''; -if ( ! $inside_dossier ) +if (!$inside_dossier) { - echo HtmlInput::button_anchor(_('Retour'),'user_login.php?'); +echo HtmlInput::button_anchor(_('Retour'), 'user_login.php?'); } diff --git a/include/preod.inc.php b/include/preod.inc.php index 9f9baa1a1..9c73c04f4 100644 --- a/include/preod.inc.php +++ b/include/preod.inc.php @@ -45,7 +45,7 @@ echo 'Choississez un journal '.$sel->input(); echo dossier::hidden(); $hid=new 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 @@ if ( $sa == 'jrn' ) 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']); diff --git a/include/stock.inc.php b/include/stock.inc.php index ef009393f..759015fd3 100644 --- a/include/stock.inc.php +++ b/include/stock.inc.php @@ -34,28 +34,15 @@ $gDossier=dossier::id(); html_page_start($_SESSION['g_theme']); require_once('class_database.php'); -/* Admin. Dossier */ -$gDossier=dossier::id(); $cn=new Database($gDossier); include_once ("class_user.php"); -$User=new User($cn); -$User->Check(); - +global $g_user; $href=basename($_SERVER['PHP_SELF']); -if ($href=='compta.php') -{ - //Show the top menu - include_once ("user_menu.php"); - // Show Menu Left - $left_menu=ShowMenuAdvanced(5); - //echo '
'; - echo $left_menu; -} // Get The priv on the selected folder -$User->can_request(STOLE,1); +$g_user->can_request(STOLE,1); $action= ( isset ($_GET['action']))? $_GET['action']:""; @@ -64,7 +51,7 @@ include_once("stock_inc.php"); // Adjust the stock if ( isset ($_POST['sub_change'])) { - $User->can_request(STOWRITE,1); + $g_user->can_request(STOWRITE,1); $change=$_POST['stock_change']; $sg_code=$_POST['sg_code']; $sg_date=$_POST['sg_date']; @@ -82,7 +69,7 @@ if ( isset ($_POST['sub_change'])) else { // Check if User Can change the stock - if ( $User->check_action($gDossier,GESTOCK) == 0 ) + if ( $g_user->check_action($gDossier,GESTOCK) == 0 ) { NoAccess(); exit (-1); @@ -126,7 +113,7 @@ if ( isset ($_POST['sub_change'])) if ( ! isset ($_GET['year']) ) { // get defaut periode - $a=$User->get_periode(); + $a=$g_user->get_periode(); // get exercice of periode $periode=new Periode($cn,$a); $year=$periode->get_exercice(); @@ -141,11 +128,11 @@ else if ( $action == 'detail' ) { // Check if User Can see the stock - $User->can_request(STOLE,1); + $g_user->can_request(STOLE,1); $sg_code=(isset ($_GET['sg_code'] ))?$_GET['sg_code']:$_POST['sg_code']; $year=(isset($_GET['year']))?$_GET['year']:$_POST['year']; $a=ViewDetailStock($cn,$sg_code,$year); - $write=$User->check_action(STOWRITE); + $write=$g_user->check_action(STOWRITE); $b=""; @@ -159,16 +146,16 @@ if ( $action == 'detail' ) 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=stock&'.dossier::get()); + echo HtmlInput::button_anchor('Retour','?ac='.$_REQUEST['ac'].'&'.dossier::get()); echo ''; echo '
'; } else - echo HtmlInput::button_anchor('Retour','?p_action=stock&'.dossier::get()); + echo HtmlInput::button_anchor('Retour','?ac='.$_REQUEST['ac'].'&'.dossier::get()); echo '
'; @@ -185,7 +172,7 @@ $r=""; for ( $i = 0; $i < Database::num_row($Res);$i++) { $l=Database::fetch_array($Res,$i); - $url=sprintf("?p_action=stock&year=%d&".dossier::get(), + $url=sprintf("?ac=".$_REQUEST['ac']."&year=%d&".dossier::get(), $l['exercice']); $r.=HtmlInput::button_anchor($l['exercice'],$url); } diff --git a/include/suivi_adm.inc.php b/include/suivi_adm.inc.php index 103782555..bab1f4185 100644 --- a/include/suivi_adm.inc.php +++ b/include/suivi_adm.inc.php @@ -29,7 +29,7 @@ * - $cn = database connection */ require_once('class_action.php'); -$User->can_request(GECOUR); +$g_user->can_request(GECOUR); /** *\note fix problem with ShowActionList, this function is local diff --git a/include/suivi_supplier.inc.php b/include/suivi_supplier.inc.php index 96cb418bd..5b70a1922 100644 --- a/include/suivi_supplier.inc.php +++ b/include/suivi_supplier.inc.php @@ -29,7 +29,7 @@ * - $cn = database connection */ require_once('class_action.php'); -$User->can_request(GECOUR); +$g_user->can_request(GECOUR); /** *\note problem with ShowActionList, this function is local diff --git a/include/supplier.inc.php b/include/supplier.inc.php index 566233c8f..aaea58fba 100644 --- a/include/supplier.inc.php +++ b/include/supplier.inc.php @@ -30,12 +30,13 @@ require_once('class_fiche_def.php'); require_once('class_iaction.php'); require_once('class_fiche_def.php'); require_once('class_ipopup.php'); +global $g_user; $low_action=(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=basename($_SERVER['PHP_SELF']); // by default open liste @@ -48,7 +49,7 @@ if ( $low_action == "" ) //----------------------------------------------------- if ( isset($_POST['delete_card'] ) ) { - if ( $User->check_action(FICADD) == 0 ) + if ( $g_user->check_action(FICADD) == 0 ) { alert('Vous ne pouvez pas enlever de fiche'); return; @@ -90,7 +91,7 @@ if ( $low_action == "list" ) ?> - + check_action(FICADD) == 0 ) + if ( $g_user->check_action(FICADD) == 0 ) { alert('Vous ne pouvez pas ajouter de fiche'); return; diff --git a/include/template/list_category_document.php b/include/template/list_category_document.php index 0355c71de..e8428dcf0 100644 --- a/include/template/list_category_document.php +++ b/include/template/list_category_document.php @@ -30,7 +30,6 @@ endfor; \ No newline at end of file diff --git a/include/template/menu.php b/include/template/menu.php new file mode 100644 index 000000000..60e11b4aa --- /dev/null +++ b/include/template/menu.php @@ -0,0 +1,57 @@ +
+ 4 && $idx == 0) : + $width = 100; + ?> + + +
+ + + + + + + + + + + + + + +
+ + + + + + + +
+
+ diff --git a/include/template/modele_document.php b/include/template/modele_document.php index 22ef07cf7..06350f754 100644 --- a/include/template/modele_document.php +++ b/include/template/modele_document.php @@ -1,8 +1,8 @@

Modèle de document

-
+ @@ -84,7 +84,7 @@ $last=0; if ( $cn->exist_sequence("seq_doc_type_".$doc->md_type) ) { $ret= $cn->get_array("select last_value,is_called from seq_doc_type_".$doc->md_type) ; - + $last=$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 diff --git a/include/template/module.php b/include/template/module.php new file mode 100644 index 000000000..4796415aa --- /dev/null +++ b/include/template/module.php @@ -0,0 +1,40 @@ +
+
+ +

Dossier :

+ +
+
+
+ + "; + continue; + } + if ($row['me_code']==$selected) + { + $style="background:red"; + } + if ( $row['me_url']!='') + { + $url=$row['me_url']; + } + else + { + $url="do.php?gDossier=".Dossier::id()."&ac=".$row['me_code']; + } + ?> + + + +
+ +
+
\ No newline at end of file diff --git a/include/template/periode_add_exercice.php b/include/template/periode_add_exercice.php index adcdeb7cb..ebf048427 100644 --- a/include/template/periode_add_exercice.php +++ b/include/template/periode_add_exercice.php @@ -1,12 +1,12 @@
Ajout d'un exercice -Ajout d'un exercice comptable de 13 périodes, commençant le 1 janvier jusqu'au 31 décembre +Ajout d'un exercice comptable de 13 périodes, commençant le 1 janvier jusqu'au 31 décembre diff --git a/include/user_action_gl.php b/include/user_action_gl.php index 2f0b1df66..603e395c8 100644 --- a/include/user_action_gl.php +++ b/include/user_action_gl.php @@ -27,6 +27,7 @@ include_once ("user_common.php"); include_once("class_user.php"); require_once("class_iselect.php"); require_once('class_acc_ledger.php'); +$gDossier=Dossier::id(); $cn=new Database($gDossier); require_once('class_iposte.php'); @@ -41,6 +42,10 @@ if ( !isset($_REQUEST['p_jrn'])) } else $Ledger->id=$_REQUEST['p_jrn']; +/* + * @todo usefull ? + */ +$_GET['ledger_type']='ALL'; echo $Ledger->display_search_form(); echo '
'; /* compute the sql stmt */ @@ -54,7 +59,7 @@ $offset=(isset($_GET['offset']))?$_GET['offset']:0; $bar=jrn_navigation_bar($offset,$max_line,$step,$page); -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')); echo dossier::hidden(); echo $bar; diff --git a/include/user_menu.php b/include/user_menu.php index 840aedf17..3cbd3514e 100644 --- a/include/user_menu.php +++ b/include/user_menu.php @@ -142,7 +142,7 @@ function GetAvailableFolder($p_user,$p_admin,$p_filter="") * \return string * */ -function ShowMenuCompta($p_high="") +function ShowMenuCompta_deprecated($p_high="") { require_once('class_database.php'); @@ -227,7 +227,7 @@ function ShowMenuCompta($p_high="") * * \return the menu */ -function ShowMenuAdvanced($default="") +function ShowMenuAdvanced_deprecated($default="") { $str_dossier=dossier::get(); // Show the left menu @@ -257,7 +257,8 @@ function ShowMenuAdvanced($default="") function ShowMenuFiche($p_dossier) { $cn=new Database($p_dossier); - $str_dossier=dossier::get(); + $mod="&ac=".$_REQUEST['ac']; + $str_dossier=dossier::get().$mod; echo '
'; echo ''; @@ -402,20 +403,21 @@ function MenuJrn() * */ -function ShowMenuPcmn($p_start=1) +function menu_acc_plan($p_start=1) { + $base="?ac=".$_REQUEST['ac']; $str_dossier="&".dossier::get(); echo '
'; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; echo "
0'._(' Hors Bilan').'
1'._(' Immobilisé').'
2 '._('Actif a un an au plus').'
3 '._('Stock et commande').'
4 '._('Compte tiers').'
5'._('Actif').'
6'._('Charges').'
7'._('Produits').'
8'._('Hors Comptabilité').'
9 '._('Hors Comptabilité').'
0'._(' Hors Bilan').'
1'._(' Immobilisé').'
2 '._('Actif a un an au plus').'
3 '._('Stock et commande').'
4 '._('Compte tiers').'
5'._('Actif').'
6'._('Charges').'
7'._('Produits').'
8'._('Hors Comptabilité').'
9 '._('Hors Comptabilité').'
"; } diff --git a/sql/backup-new-object.sh b/sql/backup-new-object.sh new file mode 100755 index 000000000..24b6ada5e --- /dev/null +++ b/sql/backup-new-object.sh @@ -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 diff --git a/sql/object-6.0.sql b/sql/object-6.0.sql new file mode 100644 index 000000000..830604a6b --- /dev/null +++ b/sql/object-6.0.sql @@ -0,0 +1,530 @@ +-- +-- PostgreSQL database dump +-- + +SET statement_timeout = 0; +SET client_encoding = 'UTF8'; +SET standard_conforming_strings = off; +SET check_function_bodies = false; +SET client_min_messages = warning; +SET escape_string_warning = off; + +SET search_path = public, pg_catalog; + +SET default_tablespace = ''; + +SET default_with_oids = false; + +-- +-- Name: menu_ref; Type: TABLE; Schema: public; Owner: dany; Tablespace: +-- + +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: dany +-- + +COMMENT ON COLUMN menu_ref.me_url IS 'url '; + + +-- +-- Name: profile; Type: TABLE; Schema: public; Owner: dany; Tablespace: +-- + +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: dany +-- + +COMMENT ON COLUMN profile.p_name IS 'Name of the profile'; + + +-- +-- Name: COLUMN profile.p_desc; Type: COMMENT; Schema: public; Owner: dany +-- + +COMMENT ON COLUMN profile.p_desc IS 'description of the profile'; + + +-- +-- Name: profile_menu; Type: TABLE; Schema: public; Owner: dany; Tablespace: +-- + +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; Owner: dany +-- + +COMMENT ON COLUMN profile_menu.p_order IS 'order of displaying menu'; + + +-- +-- Name: COLUMN profile_menu.p_type_display; Type: COMMENT; Schema: public; 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; Owner: 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; Owner: dany +-- + +ALTER SEQUENCE profile_p_id_seq OWNED BY profile.p_id; + + +-- +-- Name: profile_p_id_seq; Type: SEQUENCE SET; Schema: public; Owner: dany +-- + +SELECT pg_catalog.setval('profile_p_id_seq', 1, true); + + +-- +-- Name: profile_user; Type: TABLE; Schema: public; Owner: dany; Tablespace: +-- + +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 users'; + + +-- +-- Name: COLUMN profile_user.user_name; Type: COMMENT; Schema: public; Owner: dany +-- + +COMMENT ON COLUMN profile_user.user_name IS 'fk to available_user : login'; + + +-- +-- 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; Owner: 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_display, pu.user_name, pu.pu_id, p.p_name, p.p_desc, mr.me_menu, mr.me_file, mr.me_url FROM (((profile_menu pm JOIN profile_user pu ON ((pu.p_id = pm.p_id))) JOIN profile p ON ((p.p_id = 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: dany +-- + +INSERT INTO menu_ref VALUES ('COMPANY', 'Sociétés', 'company.inc.php', NULL, 'Parametre societe'); +INSERT INTO menu_ref VALUES ('PERIODE', 'Période', 'periode.inc.php', NULL, 'Gestion des périodes'); +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', NULL, NULL); +INSERT INTO menu_ref VALUES ('CARD', 'Fiche', 'fiche.inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('STOCK', 'Stock', 'stock.inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('MISC', 'Opérations 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', NULL, NULL); +INSERT INTO menu_ref VALUES ('LET', 'Lettrage', 'letter.inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('PREOD', 'Opérations prédéfinies', 'preod.inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('VERIFBIL', 'Vérification ', 'verif_bilan.inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('REPORT', 'Création de rapport', 'report.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', NULL, NULL); +INSERT INTO menu_ref VALUES ('SUPPL', 'Fournisseur', 'supplier.inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('FOLLOW', 'Courrier', 'action.inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('FORECAST', 'Prévision', 'forecast.inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('IMPJRN', 'Historique', 'impress_jrn.inc.php', 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.inc.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', NULL, NULL); +INSERT INTO menu_ref VALUES ('IMPCARD', 'Catégorie de Fiches', 'impress_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.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('CUSTOP', 'Opération', 'operation_client.inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('CFGCARDCAT', 'Catégorie de fiche', 'fiche_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, NULL); +INSERT INTO menu_ref VALUES ('CFGCATDOC', 'Catégorie 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.inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('PARAM', 'Paramètre', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('GESTION', 'Gestion', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('CUSTCONTACT', 'Contact (à faire)', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('CFGEXTENSION', 'Extension', 'extension.inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('COMPTA', 'Comptabilité', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('LOGOUT', 'Sortie', NULL, 'logout.php', NULL); +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écurité', '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.account.inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('PREDOP', 'Ecriture prédefinie', 'preod.inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('ADV', 'Avancé', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('ANC', 'Compta Analytique', NULL, NULL, NULL); +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.inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('CFGLEDGER', 'journaux', NULL, NULL, NULL); +INSERT INTO menu_ref VALUES ('PLANANC', 'Plan Compt. analytique', 'anc_pa.inc.php', NULL, NULL); +INSERT INTO menu_ref VALUES ('ANCODS', 'Opérations 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éférence', '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éfaut'); +INSERT INTO profile VALUES ('Analytique', 2, 'Uniquement comptabilité 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; Tablespace: +-- + +ALTER TABLE ONLY menu_ref + ADD CONSTRAINT menu_ref_pkey PRIMARY KEY (me_code); + + +-- +-- Name: profile_menu_pkey; Type: CONSTRAINT; Schema: public; Owner: dany; Tablespace: +-- + +ALTER TABLE ONLY profile_menu + ADD CONSTRAINT profile_menu_pkey PRIMARY KEY (pm_id); + + +-- +-- Name: profile_pkey; Type: CONSTRAINT; Schema: public; Owner: dany; Tablespace: +-- + +ALTER TABLE ONLY profile + ADD CONSTRAINT profile_pkey PRIMARY KEY (p_id); + + +-- +-- Name: profile_user_pkey; Type: CONSTRAINT; Schema: public; Owner: dany; Tablespace: +-- + +ALTER TABLE ONLY profile_user + ADD CONSTRAINT profile_user_pkey PRIMARY KEY (pu_id); + + +-- +-- Name: profile_user_user_name_key; Type: CONSTRAINT; Schema: public; Owner: dany; Tablespace: +-- + +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: +-- + +CREATE INDEX fki_profile_menu_menu_ref ON profile_menu USING btree (me_code); + + +-- +-- Name: fki_profile_menu_profile; Type: INDEX; Schema: public; Owner: dany; Tablespace: +-- + +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) REFERENCES menu_ref(me_code); + + +-- +-- Name: profile_menu_p_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: 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; Owner: 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 +-- +