admingit/altocompta
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

restructure files and folders

Browse source
This commit is contained in:
Dany De Bontridder 2015-09-15 11:20:19 +02:00
parent d5417b857c
commit 1bdb15d4a2
23 changed files with 66 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

38
html/do.php
View file

@ -252,7 +252,8 @@ if (isset($_REQUEST['ac']))
alert(_('Accès menu impossible'));
}
else {
alert($e->getTraceAsString());
alert($e->getMessage());
error_log($e->getTraceAsString());
}
}
}
@ -261,21 +262,30 @@ else
$default = find_default_module();
$user_profile=$g_user->get_profile();
if ( $user_profile == "" )
try
{
if ( $user_profile == "" )
throw new Exception (_('Aucun profil utilisateur'));
$menu_id=$cn->get_value('select
case when pm_id_v3 = 0 then
(case when pm_id_v2 = 0 then pm_id_v1 else pm_id_v2 end)
else pm_id_v3 end
from v_menu_profile where code= upper($1) and p_id=$2',
array($default,$user_profile));
$_GET['ac']=$default;
$_POST['ac']=$default;
$_REQUEST['ac']=$default;
show_module($menu_id);
$all[0] = $default;
show_menu($menu_id);
$menu_id=$cn->get_value('select
case when pm_id_v3 = 0 then
(case when pm_id_v2 = 0 then pm_id_v1 else pm_id_v2 end)
else pm_id_v3 end
from v_menu_profile where code= upper($1) and p_id=$2',
array($default,$user_profile));
$_GET['ac']=$default;
$_POST['ac']=$default;
$_REQUEST['ac']=$default;
show_module($menu_id);
$all[0] = $default;
show_menu($menu_id);
}
catch (Exception $exc)
{
echo $exc->getMessage();
error_log($exc->getTraceAsString());
}
}

2
include/balance_age.inc.php
View file

@ -65,7 +65,7 @@ $w_lettre->selected=HtmlInput::default_value_get('p_let','unlet');
?>
</form>
<?php
require_once 'class/class_balance_age.php';
require_once NOALYSS_INCLUDE.'/class/class_balance_age.php';
$balance=new Balance_Age($cn);
$type=HtmlInput::default_value_get('p_type', 'C');
$let=HtmlInput::default_value_get('p_let', 'unlet');

23
include/class/class_acc_ledger_purchase.php
View file

@ -909,7 +909,7 @@ class Acc_Ledger_Purchase extends Acc_Ledger
'Erreur dans l\'enregistrement '.
__FILE__.':'.__LINE__.' '.
$e->getMessage().$e->getTraceAsString();
error_log($e->getMessage());
$this->db->rollback();
throw new Exception($e);
}
@ -1032,16 +1032,17 @@ class Acc_Ledger_Purchase extends Acc_Ledger
if ( $g_parameter->MY_PJ_SUGGEST=='Y')
{
$add_js="update_pj();";
}
if ($g_parameter->MY_DATE_SUGGEST == 'Y')
{
$add_js.='get_last_date();';
}
if ($g_parameter->MY_DATE_SUGGEST == 'Y')
{
$add_js.='get_last_date();';
}
$add_js.='update_name();';
$add_js.='update_pay_method();';
$add_js.='update_row("sold_item");';
$add_js.='update_name();';
$add_js.='update_pay_method();';
$add_js.='update_row("sold_item");';
$wLedger=$this->select_ledger('ACH',2);
$wLedger=$this->select_ledger('ACH',2);
if ($wLedger == null) throw new Exception(_('Pas de journal disponible'));
$wLedger->javascript="onChange='update_predef(\"ach\",\"f\",\"".$_REQUEST['ac']."\");$add_js'";
$wLedger->table=1;
@ -1717,8 +1718,8 @@ EOF;
* Retrieve data from the view v_detail_purchase
* @global $g_user connected user
* @param $p_from jrn.jr_tech_per from
* @param type $p_end jrn.jr_tech_per to
* @return type
* @param $p_end jrn.jr_tech_per to
* @return handle to database result
*/
function get_detail_purchase($p_from,$p_end)
{

2
include/class/class_anc_balance_double.php
View file

@ -34,7 +34,7 @@ require_once NOALYSS_INCLUDE.'/lib/class_ibutton.php';
require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php';
require_once NOALYSS_INCLUDE.'/class/class_anc_print.php';
require_once NOALYSS_INCLUDE.'/class/class_anc_plan.php';
require_once NOALYSS_INCLUDE.'/lib/lib/class_pdf.php';
require_once NOALYSS_INCLUDE.'/lib/class_pdf.php';
class Anc_Balance_Double extends Anc_Print
{

2
include/class/class_anc_balance_simple.php
View file

@ -27,7 +27,7 @@ require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php';
require_once NOALYSS_INCLUDE.'/class/class_anc_print.php';
require_once NOALYSS_INCLUDE.'/class/class_anc_plan.php';
require_once NOALYSS_INCLUDE.'/lib/ac_common.php';
require_once NOALYSS_INCLUDE.'/lib/lib/class_pdf.php';
require_once NOALYSS_INCLUDE.'/lib/class_pdf.php';
require_once NOALYSS_INCLUDE.'/header_print.php';
/*! \brief manage the simple balance for CA, inherit from balance_ca
*

3
include/class/class_anc_key.php
View file

@ -265,7 +265,8 @@ class Anc_Key
}
catch (Exception $e)
{
if ( DEBUG ) { echo $e->getTraceAsString(); var_dump($_POST);} else { echo _('erreur');}
if ( DEBUG ) { echo $e->getTraceAsString(); } else { echo _('erreur');}
error_log($e->getTraceAsString());
$cn->rollback();
}
}

2
include/class/class_print_ledger_detail.php
View file

@ -23,7 +23,7 @@
* \brief this class extends PDF and let you export the detailled printing
* of any ledgers
*/
require_once NOALYSS_INCLUDE.'/lib/lib/class_pdf.php';
require_once NOALYSS_INCLUDE.'/lib/class_pdf.php';
class Print_Ledger_Detail extends PDF
{

2
include/class/class_print_ledger_fin.php
View file

@ -22,7 +22,7 @@
/*!\file
* \brief print a listing of financial
*/
require_once NOALYSS_INCLUDE.'/lib/lib/class_pdf.php';
require_once NOALYSS_INCLUDE.'/lib/class_pdf.php';
class Print_Ledger_Financial extends PDF
{
private $rap_amount; /* amount from begining exercice */

2
include/class/class_print_ledger_misc.php
View file

@ -22,7 +22,7 @@
/*!\file
* \brief print a listing of financial
*/
require_once NOALYSS_INCLUDE.'/lib/lib/class_pdf.php';
require_once NOALYSS_INCLUDE.'/lib/class_pdf.php';
class Print_Ledger_Misc extends PDF
{
function __construct($p_cn,$p_jrn)

2
include/class/class_print_ledger_simple.php
View file

@ -23,7 +23,7 @@
* \brief this class extends PDF and let you export the detailled printing
* of any ledgers
*/
require_once NOALYSS_INCLUDE.'/lib/lib/class_pdf.php';
require_once NOALYSS_INCLUDE.'/lib/class_pdf.php';
class Print_Ledger_Simple extends PDF
{

2
include/class/class_print_ledger_simple_without_vat.php
View file

@ -23,7 +23,7 @@
* \brief this class extends PDF and let you export the detailled printing
* of any ledgers
*/
require_once NOALYSS_INCLUDE.'/lib/lib/class_pdf.php';
require_once NOALYSS_INCLUDE.'/lib/class_pdf.php';
class Print_Ledger_Simple_Without_Vat extends PDF
{

2
include/compta_ods.inc.php
View file

@ -76,7 +76,7 @@ elseif (isset($_POST['summary']))
{
echo alert($e->getMessage());
$p_msg=$e->getMessage();
require('operation_ods_new.inc.php');
require_once NOALYSS_INCLUDE.'/operation_ods_new.inc.php';
}
return;

2
include/export/export_balance_pdf.php
View file

@ -35,7 +35,7 @@ require_once NOALYSS_INCLUDE.'/lib/class_database.php';
include_once("class/class_acc_balance.php");
require_once NOALYSS_INCLUDE.'/header_print.php';
require_once NOALYSS_INCLUDE.'/class/class_dossier.php';
require_once NOALYSS_INCLUDE.'/lib/lib/class_pdf.php';
require_once NOALYSS_INCLUDE.'/lib/class_pdf.php';
$gDossier=dossier::id();
bcscale(4);
$cn=new Database($gDossier);

2
include/export/export_fiche_balance_pdf.php
View file

@ -27,7 +27,7 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
// Security we check if user does exist and his privilege
require_once NOALYSS_INCLUDE.'/class/class_user.php';
require_once NOALYSS_INCLUDE.'/lib/class_database.php';
require_once NOALYSS_INCLUDE.'/lib/lib/class_pdf.php';
require_once NOALYSS_INCLUDE.'/lib/class_pdf.php';
require_once NOALYSS_INCLUDE.'/class/class_lettering.php';
require_once NOALYSS_INCLUDE.'/class/class_dossier.php';
require_once NOALYSS_INCLUDE.'/lib/ac_common.php';

2
include/export/export_fiche_detail_pdf.php
View file

@ -30,7 +30,7 @@ include_once("lib/class_impress.php");
require_once NOALYSS_INCLUDE.'/class/class_fiche.php';
require_once NOALYSS_INCLUDE.'/header_print.php';
require_once NOALYSS_INCLUDE.'/class/class_dossier.php';
require_once NOALYSS_INCLUDE.'/lib/lib/class_pdf.php';
require_once NOALYSS_INCLUDE.'/lib/class_pdf.php';
$gDossier=dossier::id();
$cn=new Database($gDossier);

2
include/export/export_fiche_pdf.php
View file

@ -27,7 +27,7 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
// Security we check if user does exist and his privilege
require_once NOALYSS_INCLUDE.'/class/class_user.php';
require_once NOALYSS_INCLUDE.'/lib/class_database.php';
require_once NOALYSS_INCLUDE.'/lib/lib/class_pdf.php';
require_once NOALYSS_INCLUDE.'/lib/class_pdf.php';
require_once NOALYSS_INCLUDE.'/class/class_lettering.php';
require_once NOALYSS_INCLUDE.'/class/class_dossier.php';
require_once NOALYSS_INCLUDE.'/lib/ac_common.php';

2
include/export/export_form_pdf.php
View file

@ -31,7 +31,7 @@ require_once NOALYSS_INCLUDE.'/class/class_user.php';
require_once NOALYSS_INCLUDE.'/header_print.php';
require_once NOALYSS_INCLUDE.'/class/class_dossier.php';
require_once NOALYSS_INCLUDE.'/class/class_acc_report.php';
require_once NOALYSS_INCLUDE.'/lib/lib/class_pdf.php';
require_once NOALYSS_INCLUDE.'/lib/class_pdf.php';
$gDossier=dossier::id();

2
include/export/export_gl_pdf.php
View file

@ -30,7 +30,7 @@ include_once('lib/class_impress.php');
require_once NOALYSS_INCLUDE.'/class/class_own.php';
require_once NOALYSS_INCLUDE.'/class/class_dossier.php';
require_once NOALYSS_INCLUDE.'/class/class_user.php';
require_once NOALYSS_INCLUDE.'/lib/lib/class_pdf.php';
require_once NOALYSS_INCLUDE.'/lib/class_pdf.php';
bcscale(2);
$gDossier=dossier::id();

2
include/export/export_ledger_pdf.php
View file

@ -28,7 +28,7 @@ if (!defined('ALLOWED'))
die('Appel direct ne sont pas permis');
require_once NOALYSS_INCLUDE.'/class/class_dossier.php';
$gDossier = dossier::id();
require_once NOALYSS_INCLUDE.'/lib/lib/class_pdf.php';
require_once NOALYSS_INCLUDE.'/lib/class_pdf.php';
require_once NOALYSS_INCLUDE.'/class/class_user.php';
require_once NOALYSS_INCLUDE.'/lib/ac_common.php';
require_once NOALYSS_INCLUDE.'/lib/class_database.php';

2
include/export/export_poste_detail_pdf.php
View file

@ -30,7 +30,7 @@ require_once NOALYSS_INCLUDE.'/lib/class_impress.php';
require_once NOALYSS_INCLUDE.'/header_print.php';
require_once NOALYSS_INCLUDE.'/class/class_dossier.php';
require_once NOALYSS_INCLUDE.'/class/class_user.php';
require_once NOALYSS_INCLUDE.'/lib/lib/class_pdf.php';
require_once NOALYSS_INCLUDE.'/lib/class_pdf.php';
$gDossier=dossier::id();

2
include/export/export_security_pdf.php
View file

@ -26,7 +26,7 @@ require_once NOALYSS_INCLUDE.'/class/class_dossier.php';
$gDossier=dossier::id();
require_once NOALYSS_INCLUDE.'/lib/ac_common.php';
require_once NOALYSS_INCLUDE.'/lib/class_database.php';
require_once NOALYSS_INCLUDE.'/lib/lib/class_pdf.php';
require_once NOALYSS_INCLUDE.'/lib/class_pdf.php';
$cn=new Database($gDossier);
//-----------------------------------------------------
// Security

18
include/opening.inc.php
View file

@ -58,7 +58,7 @@ if ( isset($_POST['summary']))
} catch (Exception $e)
{
echo alert($e->getMessage());
require('operation_ods_new.inc.php');
require(NOALYSS_INCLUDE.'/operation_ods_new.inc.php');
}
return;
@ -88,7 +88,7 @@ if (isset($_POST['save']))
}
catch (Exception $e)
{
require('operation_ods_new.inc.php');
require(NOALYSS_INCLUDE.'/operation_ods_new.inc.php');
alert($e->getMessage());
}
return;
@ -109,7 +109,7 @@ if ($sa == '')
if (empty($avail))
{
echo '*** Aucun dossier ***';
echo '*** '._("Aucun dossier").' ***';
return;
}
echo '<form class="print" method="post">';
@ -129,7 +129,7 @@ if ($sa == '')
$wAvail->value = $array;
echo 'Choix du dossier :' . $wAvail->input('f');
echo HtmlInput::submit('ok', 'Continuer');
echo HtmlInput::submit('ok', _('Continuer'));
echo '</form>';
echo '</div>';
@ -160,10 +160,10 @@ if ($sa == 'step2')
$w->value = $periode;
$w->name = "p_periode";
echo 'P&eacute;riode : ' . $w->input();
echo HtmlInput::submit('ok', 'Continuer');
echo HtmlInput::submit('ok', _('Continuer'));
echo dossier::hidden();
echo "</form>";
echo HtmlInput::button_anchor('Retour', $back);
echo HtmlInput::button_anchor(_('Retour'), $back);
exit(0);
}
/* --------------------------------------------------
@ -175,7 +175,7 @@ if ($sa == 'step3')
'<div><h1 class="legend">Etape 3</h1>' .
'<h2 class="info">' . dossier::name($_REQUEST['f']) . '</h2>' .
'<form class="print" method="post">' .
' Choisissez le journal qui contiendra l\'opération d\'ouverture ';
_(" Choisissez le journal qui contiendra l'opération d'ouverture ");
echo dossier::hidden();
echo HtmlInput::hidden('p_action', 'ouv');
echo HtmlInput::hidden('sa', 'step4');
@ -247,10 +247,10 @@ if ($sa == 'step4')
echo HtmlInput::hidden('p_jrn', $_REQUEST['p_jrn']);
echo $jrn->input($result, 0);
echo '<hr>';
echo '<h2 class="notice">Ne corrigez pas encore, cliquez continuer pour passer à l\'étape suivante</h2>';
echo '<h2 class="notice">'._("Ne corrigez pas encore, cliquez continuer pour passer à l'étape suivante").'</h2>';
echo HtmlInput::submit('correct_it', 'Continuer');
echo '</form>';
echo HtmlInput::button_anchor('Retour', $back);
echo HtmlInput::button_anchor(_('Retour'), $back);
echo '</div>';
}

2
include/user_menu.php
View file

@ -161,4 +161,4 @@ function menu_acc_plan($p_start=1)
</ul>
<?php
}
?>