diff --git a/html/ajax_misc.php b/html/ajax_misc.php index 08ac5d0e0..7d18c844a 100644 --- a/html/ajax_misc.php +++ b/html/ajax_misc.php @@ -301,7 +301,7 @@ EOF; return; break; case 'mod_cat_doc': - require_once NOALYSS_INCLUDE.'/template/document_mod_change.php'; + require_once NOALYSS_TEMPLATE.'/document_mod_change.php'; break; case 'dsp_tva': $cn = Dossier::connect(); diff --git a/include/ajax/ajax_add_concerned_card.php b/include/ajax/ajax_add_concerned_card.php index 25181606d..2c0dd0746 100644 --- a/include/ajax/ajax_add_concerned_card.php +++ b/include/ajax/ajax_add_concerned_card.php @@ -66,7 +66,7 @@ for ($i=0; $i

input(); $submit=HtmlInput::submit('save',_('Sauve')); ob_start(); - require(NOALYSS_INCLUDE.'/template/category_of_card.php'); + require(NOALYSS_TEMPLATE.'/category_of_card.php'); $html.=ob_get_contents(); ob_end_clean(); diff --git a/include/ajax/ajax_create_menu.php b/include/ajax/ajax_create_menu.php index 2c3784d5a..31471eab6 100644 --- a/include/ajax/ajax_create_menu.php +++ b/include/ajax/ajax_create_menu.php @@ -8,7 +8,7 @@ $msg=_("Création"); $m=new Menu_Ref($cn); echo '
'; echo HtmlInput::hidden('create_menu', 1); -require_once NOALYSS_INCLUDE.'/template/menu_detail.php'; +require_once NOALYSS_TEMPLATE.'/menu_detail.php'; echo HtmlInput::submit('create_menubt',_('Sauver')); echo HtmlInput::button_close('divmenu'); echo '
'; diff --git a/include/ajax/ajax_gestion.php b/include/ajax/ajax_gestion.php index f9a9a3254..f7eae9a46 100644 --- a/include/ajax/ajax_gestion.php +++ b/include/ajax/ajax_gestion.php @@ -34,7 +34,7 @@ if ($op=='action_show') $gestion=new Follow_Up($cn); $array=$gestion->get_last(25); $len_array=count($array); - require_once NOALYSS_INCLUDE.'/template/action_show.php'; + require_once NOALYSS_TEMPLATE.'/action_show.php'; return; } if ($op=='action_add') diff --git a/include/ajax/ajax_history.php b/include/ajax/ajax_history.php index 158ecb930..2bc2dc5f2 100644 --- a/include/ajax/ajax_history.php +++ b/include/ajax/ajax_history.php @@ -106,7 +106,7 @@ if ( isset($_GET['f_id'])) ob_start(); - require_once NOALYSS_INCLUDE.'/template/history_top.php'; + require_once NOALYSS_TEMPLATE.'/history_top.php'; $detail_card=HtmlInput::card_detail($fiche->strAttribut(ATTR_DEF_QUICKCODE),$fiche->getName()); echo h2( $fiche->getName().'['.$fiche->strAttribut(ATTR_DEF_QUICKCODE).']',' class="title" '); echo '

'.$detail_card.'

'; @@ -189,7 +189,7 @@ if ( isset($_REQUEST['pcm_val'])) ob_start(); - require_once NOALYSS_INCLUDE.'/template/history_top.php'; + require_once NOALYSS_TEMPLATE.'/history_top.php'; echo h2( $poste->id." ".h($poste->label),' class="title" '); diff --git a/include/ajax/ajax_ledger.php b/include/ajax/ajax_ledger.php index d1f455feb..877a903fc 100644 --- a/include/ajax/ajax_ledger.php +++ b/include/ajax/ajax_ledger.php @@ -67,7 +67,7 @@ $g_user->check(); if ( $g_user->check_dossier(dossier::id(),true)=='X' ) { ob_start(); - require_once NOALYSS_INCLUDE.'/template/ledger_detail_forbidden.php'; + require_once NOALYSS_TEMPLATE.'/ledger_detail_forbidden.php'; echo HtmlInput::button_close($div); $html=ob_get_contents(); ob_end_clean(); @@ -94,7 +94,7 @@ if ($ledger=="") ob_start(); echo HtmlInput::title_box(_("Information"), $div); - require_once NOALYSS_INCLUDE.'/template/ledger_detail_forbidden.php'; + require_once NOALYSS_TEMPLATE.'/ledger_detail_forbidden.php'; echo HtmlInput::button_close($div); $html=ob_get_contents(); ob_end_clean(); @@ -116,7 +116,7 @@ if ( $access == 'X' ) { ob_start(); echo HtmlInput::title_box(_("Information"), $div); - require_once NOALYSS_INCLUDE.'/template/ledger_detail_forbidden.php'; + require_once NOALYSS_TEMPLATE.'/ledger_detail_forbidden.php'; echo HtmlInput::button_close($div); $html=ob_get_contents(); ob_end_clean(); @@ -184,19 +184,19 @@ case 'de': if ( $obj==null || $obj->signature == 'ODS' ) { /* only the details */ - require_once NOALYSS_INCLUDE.'/template/ledger_detail_misc.php'; + require_once NOALYSS_TEMPLATE.'/ledger_detail_misc.php'; } elseif ( $obj->signature=='ACH') { - require_once NOALYSS_INCLUDE.'/template/ledger_detail_ach.php'; + require_once NOALYSS_TEMPLATE.'/ledger_detail_ach.php'; } elseif ($obj->signature=='FIN') { - require_once NOALYSS_INCLUDE.'/template/ledger_detail_fin.php'; + require_once NOALYSS_TEMPLATE.'/ledger_detail_fin.php'; } elseif ( $obj->signature=='VEN') { - require_once NOALYSS_INCLUDE.'/template/ledger_detail_ven.php'; + require_once NOALYSS_TEMPLATE.'/ledger_detail_ven.php'; } } catch (Exception $e) diff --git a/include/ajax/ajax_mod_document.php b/include/ajax/ajax_mod_document.php index 909a8030b..881e84341 100644 --- a/include/ajax/ajax_mod_document.php +++ b/include/ajax/ajax_mod_document.php @@ -35,7 +35,7 @@ $doc=new Document_Modele($cn,$id); /* 3. display it */ $doc->load(); ob_start(); -require(NOALYSS_INCLUDE.'/template/modele_document.php'); +require(NOALYSS_TEMPLATE.'/modele_document.php'); $html=ob_get_contents(); ob_end_clean(); diff --git a/include/ajax/ajax_mod_menu.php b/include/ajax/ajax_mod_menu.php index b3136d45d..df759beed 100644 --- a/include/ajax/ajax_mod_menu.php +++ b/include/ajax/ajax_mod_menu.php @@ -9,7 +9,7 @@ $msg="Modification ".$m->me_code.' '.h($m->me_menu); echo '
'; echo HtmlInput::hidden('modify_menu', 1); -require_once NOALYSS_INCLUDE.'/template/menu_detail.php'; +require_once NOALYSS_TEMPLATE.'/menu_detail.php'; echo HtmlInput::submit('modify_menutb',_('Sauver')); echo HtmlInput::button_close('divmenu'); diff --git a/include/ajax/ajax_poste.php b/include/ajax/ajax_poste.php index f7d270ee0..ef3111e25 100644 --- a/include/ajax/ajax_poste.php +++ b/include/ajax/ajax_poste.php @@ -66,7 +66,7 @@ case "sf": $r.=''; ob_start(); - require_once NOALYSS_INCLUDE.'/template/account_search.php'; + require_once NOALYSS_TEMPLATE.'/account_search.php'; $r.=ob_get_contents(); ob_end_clean(); $r.=dossier::hidden(); @@ -142,7 +142,7 @@ case "sf": } ob_start(); - require_once NOALYSS_INCLUDE.'/template/account_result.php'; + require_once NOALYSS_TEMPLATE.'/account_result.php'; $r.=ob_get_contents(); ob_end_clean(); diff --git a/include/ajax/ajax_tag_detail.php b/include/ajax/ajax_tag_detail.php index fc575af21..902c26085 100644 --- a/include/ajax/ajax_tag_detail.php +++ b/include/ajax/ajax_tag_detail.php @@ -32,7 +32,7 @@ else : echo HtmlInput::hidden('t_id', $_GET['tag']); echo HtmlInput::hidden('ac',$_GET['ac']); $data=$tag->data; - require_once NOALYSS_INCLUDE.'/template/tag_detail.php'; + require_once NOALYSS_TEMPLATE.'/tag_detail.php'; echo HtmlInput::submit("save_tag_sb", "Valider"); ?>
diff --git a/include/cat_document.inc.php b/include/cat_document.inc.php index a0b458f59..8ab646638 100644 --- a/include/cat_document.inc.php +++ b/include/cat_document.inc.php @@ -54,7 +54,7 @@ $str_addCat=$addCat->input(); $str_addPrefix=$addPrefix->input(); $str_submit=HtmlInput::submit('add',_('Ajout')); echo '
'; -require_once NOALYSS_INCLUDE.'/template/list_category_document.php'; +require_once NOALYSS_TEMPLATE.'/list_category_document.php'; echo '
'; ?> diff --git a/include/class/class_acc_ledger.php b/include/class/class_acc_ledger.php index d28c26899..12ab1e153 100644 --- a/include/class/class_acc_ledger.php +++ b/include/class/class_acc_ledger.php @@ -2643,7 +2643,7 @@ class Acc_Ledger extends jrn_def_sql $r.=HtmlInput::hidden('ledger_type', $this->type); $r.=HtmlInput::hidden('ac', $_REQUEST['ac']); ob_start(); - require_once NOALYSS_INCLUDE.'/template/ledger_search.php'; + require_once NOALYSS_TEMPLATE.'/ledger_search.php'; $r.=ob_get_contents(); ob_end_clean(); return $r; @@ -3516,7 +3516,7 @@ class Acc_Ledger extends jrn_def_sql $new = 0; $cn = $this->db; echo $hidden; - require_once NOALYSS_INCLUDE.'/template/param_jrn.php'; + require_once NOALYSS_TEMPLATE.'/param_jrn.php'; } /** @@ -3727,7 +3727,7 @@ class Acc_Ledger extends jrn_def_sql $cn = $this->db; $min_row = new INum("min_row",MAX_ARTICLE); $min_row->prec=0; - require_once NOALYSS_INCLUDE.'/template/param_jrn.php'; + require_once NOALYSS_TEMPLATE.'/param_jrn.php'; } /** diff --git a/include/class/class_acc_ledger_fin.php b/include/class/class_acc_ledger_fin.php index 3d441f960..247166d63 100644 --- a/include/class/class_acc_ledger_fin.php +++ b/include/class/class_acc_ledger_fin.php @@ -440,7 +440,7 @@ class Acc_Ledger_Fin extends Acc_Ledger } ob_start(); - require_once NOALYSS_INCLUDE.'/template/form_ledger_fin.php'; + require_once NOALYSS_TEMPLATE.'/form_ledger_fin.php'; $r.=ob_get_contents(); ob_end_clean(); $r.= create_script("$('".$Date->id."').focus()"); diff --git a/include/class/class_acc_ledger_purchase.php b/include/class/class_acc_ledger_purchase.php index 2811badf9..1221cf33c 100644 --- a/include/class/class_acc_ledger_purchase.php +++ b/include/class/class_acc_ledger_purchase.php @@ -1280,7 +1280,7 @@ class Acc_Ledger_Purchase extends Acc_Ledger $f_type=_('Fournisseur'); ob_start(); - require_once NOALYSS_INCLUDE.'/template/form_ledger_detail.php'; + require_once NOALYSS_TEMPLATE.'/form_ledger_detail.php'; $r.=ob_get_contents(); ob_end_clean(); diff --git a/include/class/class_acc_ledger_sold.php b/include/class/class_acc_ledger_sold.php index 803a87741..a8de2035b 100644 --- a/include/class/class_acc_ledger_sold.php +++ b/include/class/class_acc_ledger_sold.php @@ -1290,7 +1290,7 @@ EOF; ob_start(); - require_once NOALYSS_INCLUDE.'/template/form_ledger_detail.php'; + require_once NOALYSS_TEMPLATE.'/form_ledger_detail.php'; $r.=ob_get_contents(); ob_end_clean(); diff --git a/include/class/class_acc_payment.php b/include/class/class_acc_payment.php index 3bc5543f0..fea26dad5 100644 --- a/include/class/class_acc_payment.php +++ b/include/class/class_acc_payment.php @@ -267,7 +267,7 @@ class Acc_Payment $msg="Modification de ".$this->mp_lib; ob_start(); - require_once NOALYSS_INCLUDE.'/template/new_mod_payment.php'; + require_once NOALYSS_TEMPLATE.'/new_mod_payment.php'; $r=ob_get_contents(); ob_end_clean(); return $r; @@ -389,7 +389,7 @@ class Acc_Payment $f_qcode=$qcode->input(); $msg="Ajout d'un nouveau moyen de paiement"; ob_start(); - require_once NOALYSS_INCLUDE.'/template/new_mod_payment.php'; + require_once NOALYSS_TEMPLATE.'/new_mod_payment.php'; $r=ob_get_contents(); ob_end_clean(); return $r; diff --git a/include/class/class_acc_reconciliation.php b/include/class/class_acc_reconciliation.php index 3feb08671..1695357a5 100644 --- a/include/class/class_acc_reconciliation.php +++ b/include/class/class_acc_reconciliation.php @@ -417,7 +417,7 @@ j1.j_poste as poste echo ''; echo ''; echo ''; - include NOALYSS_INCLUDE.'/template/impress_reconciliation_detail.php'; + include NOALYSS_TEMPLATE.'/impress_reconciliation_detail.php'; echo ''; echo ''; } diff --git a/include/class/class_anc_group.php b/include/class/class_anc_group.php index 30d3a0436..1dc9ef91b 100644 --- a/include/class/class_anc_group.php +++ b/include/class/class_anc_group.php @@ -193,7 +193,7 @@ order by ga_description,po_name"; $array=$this->get_result(); if ( empty ($array) ) return ""; - require_once NOALYSS_INCLUDE.'/template/anc_balance_group.php'; + require_once NOALYSS_TEMPLATE.'/anc_balance_group.php'; } diff --git a/include/class/class_anc_key.php b/include/class/class_anc_key.php index 4a5856494..c8af6efc1 100644 --- a/include/class/class_anc_key.php +++ b/include/class/class_anc_key.php @@ -83,7 +83,7 @@ class Anc_Key echo _('Aucune clef disponible'); echo _('Allez dans ANCKEY pour en ajouter pour ce journal'); } - include NOALYSS_INCLUDE.'/template/anc_key_display_choice.php'; + include NOALYSS_TEMPLATE.'/anc_key_display_choice.php'; } /** @@ -100,7 +100,7 @@ class Anc_Key { echo _('Aucune clef disponible'); } - include NOALYSS_INCLUDE.'/template/anc_key_display_list.php'; + include NOALYSS_TEMPLATE.'/anc_key_display_list.php'; } /** @@ -125,7 +125,7 @@ class Anc_Key where kd_id=$1 order by ke_row', array($this->key->getp('id'))); - require_once NOALYSS_INCLUDE.'/template/anc_key_input.php'; + require_once NOALYSS_TEMPLATE.'/anc_key_input.php'; } /** diff --git a/include/class/class_anticipation.php b/include/class/class_anticipation.php index 230339fcf..f4672ee37 100644 --- a/include/class/class_anticipation.php +++ b/include/class/class_anticipation.php @@ -174,7 +174,7 @@ class Anticipation } ob_start(); - require_once NOALYSS_INCLUDE.'/template/forecast_result.php'; + require_once NOALYSS_TEMPLATE.'/forecast_result.php'; $r.=ob_get_contents(); ob_end_clean(); return $r; @@ -245,7 +245,7 @@ class Anticipation } ob_start(); - require_once NOALYSS_INCLUDE.'/template/forecast_cat.php'; + require_once NOALYSS_TEMPLATE.'/forecast_cat.php'; $r.=ob_get_contents(); ob_end_clean(); return $r; @@ -308,7 +308,7 @@ class Anticipation } ob_start(); - require_once NOALYSS_INCLUDE.'/template/forecast_cat.php'; + require_once NOALYSS_TEMPLATE.'/forecast_cat.php'; $r.=ob_get_contents(); ob_end_clean(); return $r; @@ -432,7 +432,7 @@ class Anticipation $add_row->javascript='for_add_row(\'fortable\')'; $f_add_row=$add_row->input(); ob_start(); - require_once NOALYSS_INCLUDE.'/template/forecast-detail.php'; + require_once NOALYSS_TEMPLATE.'/forecast-detail.php'; $r.=ob_get_contents(); ob_end_clean(); return $r; diff --git a/include/class/class_balance_age.php b/include/class/class_balance_age.php index a356623d6..9706f8b26 100644 --- a/include/class/class_balance_age.php +++ b/include/class/class_balance_age.php @@ -91,7 +91,7 @@ class Balance_Age $this->get_array_card('U', $p_fiche); $a_fiche=$this->afiche; $nb_fiche=count($a_fiche); - require NOALYSS_INCLUDE.'/template/balance_aged_result.php'; + require NOALYSS_TEMPLATE.'/balance_aged_result.php'; } function display_category($p_date_start, $p_cat, $p_let) @@ -101,7 +101,7 @@ class Balance_Age $this->get_array_card('X', $p_cat); $a_fiche=$this->afiche; $nb_fiche=count($a_fiche); - require NOALYSS_INCLUDE.'/template/balance_aged_result.php'; + require NOALYSS_TEMPLATE.'/balance_aged_result.php'; } /** @@ -115,7 +115,7 @@ class Balance_Age $this->get_array_card('F'); $a_fiche=$this->afiche; $nb_fiche=count($a_fiche); - require NOALYSS_INCLUDE.'/template/balance_aged_result.php'; + require NOALYSS_TEMPLATE.'/balance_aged_result.php'; } /** @@ -129,7 +129,7 @@ class Balance_Age $this->get_array_card('C'); $a_fiche=$this->afiche; $nb_fiche=count($a_fiche); - require NOALYSS_INCLUDE.'/template/balance_aged_result.php'; + require NOALYSS_TEMPLATE.'/balance_aged_result.php'; } function export_csv($p_date_start, $p_let) diff --git a/include/class/class_calendar.php b/include/class/class_calendar.php index c3854f9f5..a36fac77a 100644 --- a/include/class/class_calendar.php +++ b/include/class/class_calendar.php @@ -183,7 +183,7 @@ class Calendar ob_start(); $zoom=($p_type=='short')?0:1; - require_once NOALYSS_INCLUDE.'/template/calendar.php'; + require_once NOALYSS_TEMPLATE.'/calendar.php'; if (count($this->action_div) > 0) { @@ -272,7 +272,7 @@ class Calendar ob_start(); $zoom=1; $notitle=HtmlInput::default_value_get('notitle', 0); - require_once NOALYSS_INCLUDE.'/template/calendar.php'; + require_once NOALYSS_TEMPLATE.'/calendar.php'; if (count($this->action_div) > 0) { @@ -314,7 +314,7 @@ class Calendar "; $a_event=$cn->get_array($sql,array($profile)); ob_start(); - require_once NOALYSS_INCLUDE.'/template/calendar-list.php'; + require_once NOALYSS_TEMPLATE.'/calendar-list.php'; $ret=ob_get_clean(); return $ret; diff --git a/include/class/class_fiche_def.php b/include/class/class_fiche_def.php index 1f2551525..5600217b1 100644 --- a/include/class/class_fiche_def.php +++ b/include/class/class_fiche_def.php @@ -63,7 +63,7 @@ class Fiche_Def $fd_description->width=80; $fd_description->heigh=4; $fd_description->style='class="itextarea" style="margin-left:0px;vertical-align:text-top"'; - require_once NOALYSS_INCLUDE.'/template/fiche_def_input.php'; + require_once NOALYSS_TEMPLATE.'/fiche_def_input.php'; return; } @@ -182,7 +182,7 @@ frd_text , fd_description FROM fiche_def join fiche_def_ref on (fiche_def.frd_id $order "); - require_once NOALYSS_INCLUDE.'/template/fiche_def_list.php'; + require_once NOALYSS_TEMPLATE.'/fiche_def_list.php'; } /*!\brief Add a fiche category thanks the element from the array * you cannot add twice the same cat. name diff --git a/include/class/class_follow_up.php b/include/class/class_follow_up.php index d81ecda7b..92b9c488b 100644 --- a/include/class/class_follow_up.php +++ b/include/class/class_follow_up.php @@ -541,7 +541,7 @@ class Follow_Up $menu=new Default_Menu(); /* get template */ ob_start(); - require NOALYSS_INCLUDE.'/template/detail-action.php'; + require NOALYSS_TEMPLATE.'/detail-action.php'; $content=ob_get_contents(); ob_end_clean(); $r.=$content; @@ -1192,7 +1192,7 @@ class Follow_Up * Show the default button (add action, show search...) */ if (!$inner) - require_once NOALYSS_INCLUDE.'/template/action_button.php'; + require_once NOALYSS_TEMPLATE.'/action_button.php'; $w=new ICard(); $w->name='qcode'; @@ -1262,7 +1262,7 @@ class Follow_Up $otag=new Tag($cn); // show the action in - require_once NOALYSS_INCLUDE.'/template/action_search.php'; + require_once NOALYSS_TEMPLATE.'/action_search.php'; } /** @@ -1283,7 +1283,7 @@ class Follow_Up echo '
'; echo HtmlInput::request_to_hidden(array("gDossier", "ac", "sb", "sc", "f_id")); - require_once NOALYSS_INCLUDE.'/template/action_other_action.php'; + require_once NOALYSS_TEMPLATE.'/action_other_action.php'; echo $act->myList($p_base, "", $query); echo '
'; } @@ -1436,7 +1436,7 @@ class Follow_Up $limit=($max_line>25)?25:$max_line; $Res=$cn->exec_sql($sql."limit ".$limit); $a_row=Database::fetch_all($Res); - require_once NOALYSS_INCLUDE.'/template/action_search_result.php'; + require_once NOALYSS_TEMPLATE.'/action_search_result.php'; } /** @@ -1772,7 +1772,7 @@ class Follow_Up function display_short() { $cn=$this->db; - include NOALYSS_INCLUDE.'/template/action_display_short.php'; + include NOALYSS_TEMPLATE.'/action_display_short.php'; } /** * Add an event , with the minimum of informations, diff --git a/include/class/class_lettering.php b/include/class/class_lettering.php index 1e1fc64a5..11119779d 100644 --- a/include/class/class_lettering.php +++ b/include/class/class_lettering.php @@ -258,7 +258,7 @@ class Lettering $this->get_all(); $r=""; ob_start(); - include(NOALYSS_INCLUDE.'/template/letter_all.php'); + include(NOALYSS_TEMPLATE.'/letter_all.php'); $r=ob_get_contents(); ob_end_clean(); return $r; @@ -286,7 +286,7 @@ class Lettering $this->get_letter(); $r=""; ob_start(); - include(NOALYSS_INCLUDE.'/template/letter_all.php'); + include(NOALYSS_TEMPLATE.'/letter_all.php'); $r=ob_get_contents(); ob_end_clean(); return $r; @@ -300,7 +300,7 @@ class Lettering $this->get_letter_diff(); $r=""; ob_start(); - include(NOALYSS_INCLUDE.'/template/letter_all.php'); + include(NOALYSS_TEMPLATE.'/letter_all.php'); $r=ob_get_contents(); ob_end_clean(); return $r; @@ -316,7 +316,7 @@ class Lettering $this->get_unletter(); $r=""; ob_start(); - include(NOALYSS_INCLUDE.'/template/letter_all.php'); + include(NOALYSS_TEMPLATE.'/letter_all.php'); $r=ob_get_contents(); ob_end_clean(); return $r; @@ -366,7 +366,7 @@ class Lettering } $this->get_linked($jnt_id); ob_start(); - require_once NOALYSS_INCLUDE.'/template/letter_prop.php'; + require_once NOALYSS_TEMPLATE.'/letter_prop.php'; $r=ob_get_contents(); ob_end_clean(); $r.=HtmlInput::hidden('j_id',$p_jid); diff --git a/include/class/class_pre_op_ach.php b/include/class/class_pre_op_ach.php index 3f3085112..356c0268a 100644 --- a/include/class/class_pre_op_ach.php +++ b/include/class/class_pre_op_ach.php @@ -391,7 +391,7 @@ class Pre_op_ach extends Pre_operation_detail $f_type=_('Fournisseur'); ob_start(); - require_once NOALYSS_INCLUDE.'/template/predf_ledger_detail.php'; + require_once NOALYSS_TEMPLATE.'/predf_ledger_detail.php'; $r.=ob_get_contents(); ob_end_clean(); diff --git a/include/class/class_pre_op_ven.php b/include/class/class_pre_op_ven.php index 318bb5b97..186e8102d 100644 --- a/include/class/class_pre_op_ven.php +++ b/include/class/class_pre_op_ven.php @@ -385,7 +385,7 @@ class Pre_op_ven extends Pre_operation_detail ob_start(); - require_once NOALYSS_INCLUDE.'/template/predf_ledger_detail.php'; + require_once NOALYSS_TEMPLATE.'/predf_ledger_detail.php'; $r.=ob_get_contents(); ob_end_clean(); diff --git a/include/class/class_profile_menu.php b/include/class/class_profile_menu.php index e53f469a4..a56d630aa 100644 --- a/include/class/class_profile_menu.php +++ b/include/class/class_profile_menu.php @@ -161,7 +161,7 @@ class Profile_Menu extends Profile_Menu_sql */ function display_module($ap_module) { - include NOALYSS_INCLUDE.'/template/profile_menu_display_module.php'; + include NOALYSS_TEMPLATE.'/profile_menu_display_module.php'; } /** @@ -192,7 +192,7 @@ class Profile_Menu extends Profile_Menu_sql p_id = $1 and pm_id_dep = $2 order by p_order', array($this->p_id, $p_module_id)); - require NOALYSS_INCLUDE.'/template/profile_menu_display_submenu.php'; + require NOALYSS_TEMPLATE.'/profile_menu_display_submenu.php'; } /** @@ -246,7 +246,7 @@ class Profile_Menu extends Profile_Menu_sql array('value'=>'W', 'label'=>_('Ecriture')), array('value'=>'X', 'label'=>_('Aucun accès')) ); - require_once NOALYSS_INCLUDE.'/template/user_sec_profile.php'; + require_once NOALYSS_TEMPLATE.'/user_sec_profile.php'; } /** @@ -271,7 +271,7 @@ class Profile_Menu extends Profile_Menu_sql array('value'=>'W', 'label'=>_('Ecriture')), array('value'=>'X', 'label'=>_('Aucun accès')) ); - require_once NOALYSS_INCLUDE.'/template/profile_sec_repository.php'; + require_once NOALYSS_TEMPLATE.'/profile_sec_repository.php'; } } diff --git a/include/class/class_stock.php b/include/class/class_stock.php index 76fcb430d..4a0606c94 100644 --- a/include/class/class_stock.php +++ b/include/class/class_stock.php @@ -71,7 +71,7 @@ class Stock extends Stock_Sql $this->search_box_button(); $this->search_box($p_array); - require_once NOALYSS_INCLUDE.'/template/stock_histo.php'; + require_once NOALYSS_TEMPLATE.'/stock_histo.php'; $this->export_stock_histo_form(); echo HtmlInput::print_window(); } @@ -150,7 +150,7 @@ class Stock extends Stock_Sql ); $wdirection->selected = HtmlInput::default_value("wdirection", "-1", $p_array); - require_once NOALYSS_INCLUDE.'/template/stock_histo_search.php'; + require_once NOALYSS_TEMPLATE.'/stock_histo_search.php'; } function create_query_histo($p_array) @@ -245,11 +245,11 @@ class Stock extends Stock_Sql } if ($present == 'T') { - require_once NOALYSS_INCLUDE.'/template/stock_summary_table.php'; + require_once NOALYSS_TEMPLATE.'/stock_summary_table.php'; } if ($present == 'L') { - require_once NOALYSS_INCLUDE.'/template/stock_summary_list.php'; + require_once NOALYSS_TEMPLATE.'/stock_summary_list.php'; $this->export_stock_summary_list_form(); } diff --git a/include/class/class_stock_goods.php b/include/class/class_stock_goods.php index 96a817ad3..5283d302d 100644 --- a/include/class/class_stock_goods.php +++ b/include/class/class_stock_goods.php @@ -110,7 +110,7 @@ class Stock_Goods extends Stock_Goods_Sql $select_exercice=new ISelect('p_exercice'); $select_exercice->value=$cn->make_array('select distinct p_exercice,p_exercice from parm_periode order by 1 desc'); - require_once NOALYSS_INCLUDE.'/template/stock_inv.php'; + require_once NOALYSS_TEMPLATE.'/stock_inv.php'; } function record_save($p_array) diff --git a/include/class/class_tag.php b/include/class/class_tag.php index 81ce9c69a..75b0d8720 100644 --- a/include/class/class_tag.php +++ b/include/class/class_tag.php @@ -34,7 +34,7 @@ class Tag { $ret=$this->data->seek(' order by t_tag'); if ( $this->cn->count($ret) == 0) return ""; - require_once NOALYSS_INCLUDE.'/template/tag_list.php'; + require_once NOALYSS_TEMPLATE.'/tag_list.php'; } /** * let select a tag to add @@ -42,7 +42,7 @@ class Tag function select() { $ret=$this->data->seek(' order by t_tag'); - require_once NOALYSS_INCLUDE.'/template/tag_select.php'; + require_once NOALYSS_TEMPLATE.'/tag_select.php'; } /** * Display a inner window with the detail of a tag @@ -50,7 +50,7 @@ class Tag function form_add() { $data=$this->data; - require_once NOALYSS_INCLUDE.'/template/tag_detail.php'; + require_once NOALYSS_TEMPLATE.'/tag_detail.php'; } /** * Show the tag you can add to a document @@ -90,7 +90,7 @@ class Tag function select_search($p_prefix) { $ret=$this->data->seek(' order by t_tag'); - require_once NOALYSS_INCLUDE.'/template/tag_search_select.php'; + require_once NOALYSS_TEMPLATE.'/tag_search_select.php'; } /** * In the screen search add this data to the cell diff --git a/include/class/class_todo_list.php b/include/class/class_todo_list.php index 9c32c4cdd..6898b9386 100644 --- a/include/class/class_todo_list.php +++ b/include/class/class_todo_list.php @@ -292,7 +292,7 @@ class Todo_List { ob_start(); $this->load(); - include NOALYSS_INCLUDE.'/template/todo_list_display.php'; + include NOALYSS_TEMPLATE.'/todo_list_display.php'; $ret=ob_get_clean(); return $ret; @@ -373,7 +373,7 @@ class Todo_List // Get array of user $p_array=User::get_list(Dossier::id()); $dossier=Dossier::id(); - include NOALYSS_INCLUDE.'/template/todo_list_list_user.php'; + include NOALYSS_TEMPLATE.'/todo_list_list_user.php'; } /** diff --git a/include/dashboard.inc.php b/include/dashboard.inc.php index 01dbd4569..0f50d4cb4 100644 --- a/include/dashboard.inc.php +++ b/include/dashboard.inc.php @@ -40,7 +40,7 @@ $customer_now=$Ledger->get_customer_now(); $customer_late=$Ledger->get_customer_late(); ob_start(); -require_once NOALYSS_INCLUDE.'/template/dashboard.php'; +require_once NOALYSS_TEMPLATE.'/dashboard.php'; $ret=ob_get_contents(); ob_end_clean(); echo $ret; diff --git a/include/fiche.inc.php b/include/fiche.inc.php index 97a381244..717abff3b 100644 --- a/include/fiche.inc.php +++ b/include/fiche.inc.php @@ -81,7 +81,7 @@ echo '
'; echo '
'; echo dossier::hidden(); echo HtmlInput::hidden('ac', $_GET['ac']); -require_once NOALYSS_INCLUDE.'/template/impress_cat_card.php'; +require_once NOALYSS_TEMPLATE.'/impress_cat_card.php'; echo HtmlInput::submit('cat_display', _('Recherche')); echo '
'; $search_card=new IText('card_search'); @@ -218,7 +218,7 @@ if ($_GET['histo'] == -1) "); $nb_line = Database::num_row($res); if ($write != 1 || $allcard != 0 ) $str_add_card=""; - require_once NOALYSS_INCLUDE.'/template/fiche_list.php'; + require_once NOALYSS_TEMPLATE.'/fiche_list.php'; echo '
'.$bar; return; } @@ -232,7 +232,7 @@ if ($_GET['histo'] == 3) $cat_card->id = $_GET['cat']; $aHeading = $cat_card->getAttribut(); if ( $allcard == 0) echo $str_add_card; - require_once NOALYSS_INCLUDE.'/template/result_cat_card_summary.php'; + require_once NOALYSS_TEMPLATE.'/result_cat_card_summary.php'; $hid = new IHidden(); echo '
' . dossier::hidden() . diff --git a/include/impress_jrn.inc.php b/include/impress_jrn.inc.php index 56ad9c2f0..e0eb74ad0 100644 --- a/include/impress_jrn.inc.php +++ b/include/impress_jrn.inc.php @@ -323,7 +323,7 @@ if (isset($_REQUEST['bt_html'])) * Ledger ACH or VEN */ $own=new Own($cn); - require_once NOALYSS_INCLUDE.'/template/print_ledger_simple.php'; + require_once NOALYSS_TEMPLATE.'/print_ledger_simple.php'; } } @@ -379,16 +379,16 @@ if (isset($_REQUEST['bt_html'])) switch ($obj->signature) { case 'FIN': - require NOALYSS_INCLUDE.'/template/operation_detail_fin.php'; + require NOALYSS_TEMPLATE.'/operation_detail_fin.php'; break; case 'ACH': - require NOALYSS_INCLUDE.'/template/operation_detail_ach.php'; + require NOALYSS_TEMPLATE.'/operation_detail_ach.php'; break; case 'VEN': - require NOALYSS_INCLUDE.'/template/operation_detail_ven.php'; + require NOALYSS_TEMPLATE.'/operation_detail_ven.php'; break; case 'ODS': - require NOALYSS_INCLUDE.'/template/operation_detail_misc.php'; + require NOALYSS_TEMPLATE.'/operation_detail_misc.php'; break; default: die("unknown type of ledger"); diff --git a/include/impress_rec.inc.php b/include/impress_rec.inc.php index f24467313..abeb6fe5a 100644 --- a/include/impress_rec.inc.php +++ b/include/impress_rec.inc.php @@ -99,5 +99,5 @@ $gDossier=Dossier::id(); ?>
get_value('select me_code from profile_menu where' . ' pm_id = $1 ', array($selected)); - require_once NOALYSS_INCLUDE.'/template/module.php'; + require_once NOALYSS_TEMPLATE.'/module.php'; $file = $cn->get_array("select me_file,me_parameter,me_javascript,me_type,me_description from v_all_menu where pm_id=$1 and p_id=$2", array($selected,$g_user->get_profile())); if ( count($file ) == 0 ) @@ -1008,7 +1008,7 @@ function show_menu($module) else { $style_menu=$a_style_menu[$level]; } - require NOALYSS_INCLUDE.'/template/menu.php'; + require NOALYSS_TEMPLATE.'/menu.php'; } // there is only one submenu so we include the code or javascript // or we show the submenu elseif (count($amenu) == 1) diff --git a/include/lib/config_file.php b/include/lib/config_file.php index d2091d124..8cf8b698d 100644 --- a/include/lib/config_file.php +++ b/include/lib/config_file.php @@ -98,7 +98,7 @@ function config_file_form($p_array=null) $icdbname=new IText('cdbname'); - require NOALYSS_INCLUDE.'/template/template_config_form.php'; + require NOALYSS_TEMPLATE.'/template_config_form.php'; } /** * Display the content of the config.inc.php with variables diff --git a/include/param_sec.inc.php b/include/param_sec.inc.php index 9ac3b8b47..77cab8eaa 100644 --- a/include/param_sec.inc.php +++ b/include/param_sec.inc.php @@ -319,7 +319,7 @@ if ( $action == "view" ) echo '
Actions '; echo HtmlInput::button("grant_all_action", _("Toutes les actions"), " onclick=\" grant_action(1) \""); echo HtmlInput::button("revoke_all_action", _("Aucune action"), " onclick=\" grant_action (0) \""); - include(NOALYSS_INCLUDE.'/template/security_list_action.php'); + include(NOALYSS_TEMPLATE.'/security_list_action.php'); echo '
'; echo HtmlInput::button('Imprime','imprime',"onclick=\"window.open('".$sHref."');\""); echo HtmlInput::submit('ok','Sauve'); diff --git a/include/payment_middle.inc.php b/include/payment_middle.inc.php index 0ee57a85a..f7667aee8 100644 --- a/include/payment_middle.inc.php +++ b/include/payment_middle.inc.php @@ -143,7 +143,7 @@ $array=$cn->get_array(" if ( ! empty ($array)) { - require_once NOALYSS_INCLUDE.'/template/list_mod_payment.php'; + require_once NOALYSS_TEMPLATE.'/list_mod_payment.php'; } echo HtmlInput::button_anchor("Ajout", $base_url."&sb=ins","","","smallbutton"); echo '
'; diff --git a/include/periode.inc.php b/include/periode.inc.php index 2cb074fb5..f23ecab0c 100644 --- a/include/periode.inc.php +++ b/include/periode.inc.php @@ -125,7 +125,7 @@ if ( $choose=="yes" ) array('value'=>13,'label'=>"13 périodes") ); - require_once NOALYSS_INCLUDE.'/template/periode_add_exercice.php'; + require_once NOALYSS_TEMPLATE.'/periode_add_exercice.php'; } else { diff --git a/include/stock_state.inc.php b/include/stock_state.inc.php index 46f1c235c..0a9ca0a0b 100644 --- a/include/stock_state.inc.php +++ b/include/stock_state.inc.php @@ -47,7 +47,7 @@ $presentation->value=array ( array("value"=>"L","label"=>"Liste") ); $presentation->selected=(isset($_GET['present']))?$_GET['present']:"T"; -require_once NOALYSS_INCLUDE.'/template/stock_state_search.php'; +require_once NOALYSS_TEMPLATE.'/stock_state_search.php'; $stock=new Stock($cn); diff --git a/include/template/ledger_detail_ach.php b/include/template/ledger_detail_ach.php index 248d74a14..b443db3ee 100644 --- a/include/template/ledger_detail_ach.php +++ b/include/template/ledger_detail_ach.php @@ -2,7 +2,7 @@ //This file is part of NOALYSS and is under GPL //see licence.txt $str_anc=""; -?> +?>
diff --git a/include/template/ledger_detail_bottom.php b/include/template/ledger_detail_bottom.php index bde34bc87..948c2e556 100644 --- a/include/template/ledger_detail_bottom.php +++ b/include/template/ledger_detail_bottom.php @@ -235,7 +235,7 @@ echo ''; diff --git a/include/template/ledger_detail_fin.php b/include/template/ledger_detail_fin.php index 045f4d0c4..42bea4d8a 100644 --- a/include/template/ledger_detail_fin.php +++ b/include/template/ledger_detail_fin.php @@ -2,7 +2,7 @@ //This file is part of NOALYSS and is under GPL //see licence.txt $str_anc=""; -?> +?>
input()); ?>
\ No newline at end of file diff --git a/include/template/ledger_detail_misc.php b/include/template/ledger_detail_misc.php index 50476b73a..600a1c7c7 100644 --- a/include/template/ledger_detail_misc.php +++ b/include/template/ledger_detail_misc.php @@ -2,7 +2,7 @@ //This file is part of NOALYSS and is under GPL //see licence.txt ?> diff --git a/include/template/ledger_detail_ven.php b/include/template/ledger_detail_ven.php index 5e3739ee8..f330f6095 100644 --- a/include/template/ledger_detail_ven.php +++ b/include/template/ledger_detail_ven.php @@ -1,7 +1,7 @@ +?> input();