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

Rewriting Change class Own by Noalyss_Parameter_Folder

Browse source
This commit is contained in:
Dany De Bontridder 2018-01-10 10:54:04 +01:00
parent f818183fcf
commit 9090302a33
34 changed files with 54 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dev/misc-testing/pdf/pdf-page-break.php
View file

@ -25,7 +25,7 @@
include_once '../../include/constant.php';
require_once NOALYSS_INCLUDE.'/lib/pdf.class.php';
require_once NOALYSS_INCLUDE.'/class/dossier.class.php';
require_once NOALYSS_INCLUDE.'/class/own.class.php';
require_once NOALYSS_INCLUDE.'/class/noalyss_parameter_folder.class.php';
bcscale(2);
$_REQUEST['gDossier']=37;
$_GET['gDossier']=37;

4
html/ajax.php
View file

@ -19,12 +19,12 @@ require_once NOALYSS_INCLUDE.'/class/user.class.php';
require_once NOALYSS_INCLUDE.'/class/extension.class.php';
if ( !isset ($_REQUEST['gDossier'])) exit();
require_once NOALYSS_INCLUDE.'/class/own.class.php';
require_once NOALYSS_INCLUDE.'/class/noalyss_parameter_folder.class.php';
mb_internal_encoding("UTF-8");
global $g_user,$cn,$g_parameter;
$cn=Dossier::connect();
$g_parameter=new Own($cn);
$g_parameter=new Noalyss_Parameter_Folder($cn);
$g_user=new User($cn);
$g_user->check(true);
set_language();

2
html/ajax_misc.php
View file

@ -71,7 +71,7 @@ global $g_user, $cn, $g_parameter;
//
if ($gDossier<>0) {
$cn =Dossier::connect();
$g_parameter=new Own($cn);
$g_parameter=new Noalyss_Parameter_Folder($cn);
$g_user = new User($cn);
$g_user->check(true);
if ( $g_user->check_dossier($gDossier, true) == 'X' ) {

2
html/ajax_test.php
View file

@ -48,7 +48,7 @@ $gDossierLogInput=$gDossier;
global $cn, $g_user, $g_succeed, $g_failed;
$cn=Dossier::connect();
$g_parameter=new Own($cn);
$g_parameter=new Noalyss_Parameter_Folder($cn);
$g_user=new User($cn);
if (!file_exists('authorized_debug'))

2
html/do.php
View file

@ -142,7 +142,7 @@ if ( DEBUG ) {
<?php
}
$g_parameter=new Own($cn);
$g_parameter=new Noalyss_Parameter_Folder($cn);
$g_user->Check();
$g_user->check_dossier(Dossier::id());

2
html/fid.php
View file

@ -33,7 +33,7 @@
*\note if the j is -1 then all the card are shown
*/
require_once '../include/constant.php';
require_once NOALYSS_INCLUDE.'/class/own.class.php';
require_once NOALYSS_INCLUDE.'/class/noalyss_parameter_folder.class.php';
require_once NOALYSS_INCLUDE.'/lib/database.class.php';
require_once NOALYSS_INCLUDE.'/lib/user_common.php';
require_once NOALYSS_INCLUDE.'/lib/http_input.class.php';

2
html/test.php
View file

@ -53,7 +53,7 @@ $gDossierLogInput=$gDossier;
global $cn, $g_user, $g_succeed, $g_failed;
$cn=Dossier::connect();
$g_parameter=new Own($cn);
$g_parameter=new Noalyss_Parameter_Folder($cn);
$g_user=new User($cn);
if (!file_exists('authorized_debug'))

7
include/ajax/ajax_fiche_def_detail.php
View file

@ -31,9 +31,10 @@ require_once NOALYSS_INCLUDE.'/lib/single_record.class.php';
global $g_user;
$g_user->can_request(FICCAT,0);
$fd=new Fiche_Def($cn,$_GET['id']);
if ( $_GET['id'] > 0 )
$http=new HttpInput();
$id=$http->get("id","number");
$fd=new Fiche_Def($cn,$id);
if ( $id > 0 )
{
echo $fd->input_detail();

6
include/ajax/ajax_ledger.php
View file

@ -38,7 +38,7 @@ require_once NOALYSS_INCLUDE.'/class/fiche.class.php';
require_once NOALYSS_INCLUDE.'/class/acc_reconciliation.class.php';
require_once NOALYSS_INCLUDE.'/class/anc_operation.class.php';
require_once NOALYSS_INCLUDE.'/lib/idate.class.php';
require_once NOALYSS_INCLUDE.'/class/own.class.php';
require_once NOALYSS_INCLUDE.'/class/noalyss_parameter_folder.class.php';
require_once NOALYSS_INCLUDE.'/lib/iconcerned.class.php';
require_once NOALYSS_INCLUDE.'/lib/http_input.class.php';
$http=new HttpInput();
@ -68,7 +68,7 @@ catch (Exception $exc)
*/
$cn=Dossier::connect();
$g_parameter=new Own($cn);
$g_parameter=new Noalyss_Parameter_Folder($cn);
$g_user->check();
if ( $g_user->check_dossier(dossier::id(),true)=='X' )
@ -484,7 +484,7 @@ case 'save':
////////////////////////////////////////////////////
// CA
//////////////////////////////////////////////////
$owner = new Own($cn);
$owner = new Noalyss_Parameter_Folder($cn);
if ( $owner->MY_ANALYTIC != "nu" && isset ($_POST['op']) )
{
// for each item, insert into operation_analytique */

2
include/cfgfiche.inc.php
View file

@ -160,6 +160,6 @@ if ( isset($_POST['add_modele']))
}
$fiche_def=new Fiche_def($cn);
$fiche_def->Display();
$fiche_def->display();
$dossier=Dossier::id();
?>

2
include/class/acc_ledger_sold.class.php
View file

@ -37,7 +37,7 @@ require_once NOALYSS_INCLUDE.'/class/anc_operation.class.php';
require_once NOALYSS_INCLUDE.'/lib/user_common.php';
require_once NOALYSS_INCLUDE.'/class/acc_payment.class.php';
require_once NOALYSS_INCLUDE.'/lib/ac_common.php';
require_once NOALYSS_INCLUDE.'/class/own.class.php';
require_once NOALYSS_INCLUDE.'/class/noalyss_parameter_folder.class.php';
require_once NOALYSS_INCLUDE.'/lib/itva_popup.class.php';
require_once NOALYSS_INCLUDE.'/class/acc_ledger_fin.class.php';
require_once NOALYSS_INCLUDE.'/class/stock_goods.class.php';

2
include/class/document.class.php
View file

@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
// Copyright Author Dany De Bontridder danydb@aevalys.eu
require_once NOALYSS_INCLUDE.'/class/own.class.php';
require_once NOALYSS_INCLUDE.'/class/noalyss_parameter_folder.class.php';
require_once NOALYSS_INCLUDE.'/class/acc_account_ledger.class.php';
require_once NOALYSS_INCLUDE.'/class/follow_up.class.php';
require_once NOALYSS_INCLUDE.'/class/acc_tva.class.php';

4
include/class/fiche_def.class.php
View file

@ -160,11 +160,11 @@ class Fiche_Def
}
/*!
**************************************************
* \brief Display category into a table
* \brief Display all card categories into a table
*
* \return HTML row
*/
function Display()
function display()
{
$tab = new Sort_Table();

2
include/class/own.class.php → include/class/noalyss_parameter_folder.class.php
View file

@ -24,7 +24,7 @@
* \brief Class to manage the company parameter (address, name...)
*/
class Own
class Noalyss_Parameter_Folder
{
var $db;
var $MY_NAME;

4
include/class/print_ledger.class.php
View file

@ -62,7 +62,7 @@ class Print_Ledger {
//----------------------------------------------------------------------
// Simple Printing Purchase Ledger
//---------------------------------------------------------------------
$own = new Own($cn);
$own = new Noalyss_Parameter_Folder($cn);
$jrn_type = $p_ledger->get_type();
@ -98,7 +98,7 @@ class Print_Ledger {
/**********************************************************
* Print Detail Operation + Item
********************************************************** */
$own = new Own($cn);
$own = new Noalyss_Parameter_Folder($cn);
$jrn_type = $p_ledger->get_type();
if ($jrn_type == 'FIN') {
$pdf = new Print_Ledger_Financial($cn, $p_ledger);

6
include/company.inc.php
View file

@ -26,10 +26,10 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
global $g_user;
$http=new HttpInput();
echo '<div class="content">';
require_once NOALYSS_INCLUDE.'/class/own.class.php';
require_once NOALYSS_INCLUDE.'/class/noalyss_parameter_folder.class.php';
if (isset($_POST['record_company']))
{
$m = new Own($cn);
$m = new Noalyss_Parameter_Folder($cn);
$m->MY_NAME = $http->post("p_name");
$m->MY_TVA = $http->post("p_tva");
$m->MY_STREET = $http->post("p_street");
@ -52,7 +52,7 @@ if (isset($_POST['record_company']))
$m->Update();
}
$my = new Own($cn);
$my = new Noalyss_Parameter_Folder($cn);
///// Compta analytic
$array = array(
array("value" => "ob", 'label' => _("obligatoire")),

2
include/export/export_gl_csv.php
View file

@ -43,7 +43,7 @@ include_once NOALYSS_INCLUDE.'/class/acc_account_ledger.class.php';
include_once NOALYSS_INCLUDE.'/lib/ac_common.php';
require_once NOALYSS_INCLUDE.'/lib/database.class.php';
include_once NOALYSS_INCLUDE.'/lib/impress.class.php';
require_once NOALYSS_INCLUDE.'/class/own.class.php';
require_once NOALYSS_INCLUDE.'/class/noalyss_parameter_folder.class.php';
require_once NOALYSS_INCLUDE.'/class/dossier.class.php';
require_once NOALYSS_INCLUDE.'/class/user.class.php';
require_once NOALYSS_INCLUDE.'/lib/noalyss_csv.class.php';

2
include/export/export_gl_pdf.php
View file

@ -27,7 +27,7 @@ include_once('class/acc_account_ledger.class.php');
include_once('lib/ac_common.php');
require_once NOALYSS_INCLUDE.'/lib/database.class.php';
include_once('lib/impress.class.php');
require_once NOALYSS_INCLUDE.'/class/own.class.php';
require_once NOALYSS_INCLUDE.'/class/noalyss_parameter_folder.class.php';
require_once NOALYSS_INCLUDE.'/class/dossier.class.php';
require_once NOALYSS_INCLUDE.'/class/user.class.php';
require_once NOALYSS_INCLUDE.'/lib/pdf.class.php';

4
include/export/export_ledger_csv.php
View file

@ -22,7 +22,7 @@
*/
if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
include_once NOALYSS_INCLUDE."/lib/ac_common.php";
require_once NOALYSS_INCLUDE.'/class/own.class.php';
require_once NOALYSS_INCLUDE.'/class/noalyss_parameter_folder.class.php';
require_once NOALYSS_INCLUDE.'/class/acc_ledger_sold.class.php';
require_once NOALYSS_INCLUDE.'/class/acc_ledger_purchase.class.php';
require_once NOALYSS_INCLUDE.'/class/dossier.class.php';
@ -246,7 +246,7 @@ if ($get_option == 1)
. "where "
. "jr_id in (select jra_concerned from jrn_rapt where jr_id = $1 union all select jr_id from jrn_rapt where jra_concerned=$1)");
$own=new Own($cn);
$own=new Noalyss_Parameter_Folder($cn);
$title=array();
$title[]=_('Date');
$title[]=_("Paiement");

4
include/export/export_ledger_pdf.php
View file

@ -34,7 +34,7 @@ require_once NOALYSS_INCLUDE.'/lib/ac_common.php';
require_once NOALYSS_INCLUDE.'/lib/database.class.php';
require_once NOALYSS_INCLUDE.'/lib/impress.class.php';
require_once NOALYSS_INCLUDE.'/class/acc_ledger.class.php';
require_once NOALYSS_INCLUDE.'/class/own.class.php';
require_once NOALYSS_INCLUDE.'/class/noalyss_parameter_folder.class.php';
require_once NOALYSS_INCLUDE.'/class/periode.class.php';
require_once NOALYSS_INCLUDE.'/class/print_ledger.class.php';
require_once NOALYSS_INCLUDE.'/lib/http_input.class.php';
@ -56,7 +56,7 @@ catch (Exception $exc)
throw $exc;
}
$l_type = "JRN";
$own = new Own($cn);
$own = new Noalyss_Parameter_Folder($cn);
$Jrn = new Acc_Ledger($cn, $jrn_id);

4
include/header_print.php
View file

@ -25,7 +25,7 @@
*/
require_once NOALYSS_INCLUDE.'/lib/database.class.php';
require_once NOALYSS_INCLUDE.'/class/own.class.php';
require_once NOALYSS_INCLUDE.'/class/noalyss_parameter_folder.class.php';
require_once NOALYSS_INCLUDE.'/class/dossier.class.php';
@ -33,7 +33,7 @@ date_default_timezone_set ('Europe/Brussels');
function header_txt($p_cn)
{
$own=new own($p_cn);
$own=new Noalyss_Parameter_Folder($p_cn);
$soc=$own->MY_NAME;
$date=date('d / m / Y H:i ');

2
include/impress_jrn.inc.php
View file

@ -338,7 +338,7 @@ if (isset($_REQUEST['bt_html']))
/*
* Ledger ACH or VEN
*/
$own=new Own($cn);
$own=new Noalyss_Parameter_Folder($cn);
require_once NOALYSS_TEMPLATE.'/print_ledger_simple.php';
}

4
include/lib/pdf.class.php
View file

@ -74,7 +74,7 @@ class PDF extends TFPDF
date_default_timezone_set ('Europe/Paris');
$this->cn = $p_cn;
$this->own = new own($this->cn);
$this->own = new Noalyss_Parameter_Folder($this->cn);
$this->soc = $this->own->MY_NAME;
$this->date = date('d.m.Y');
$this->cells=array();
@ -344,7 +344,7 @@ class PDFLand extends PDF
$this->AddFont('DejaVuCond','I','DejaVuSansCondensed-Oblique.ttf',true);
$this->cn = $p_cn;
$this->own = new own($this->cn);
$this->own = new Noalyss_Parameter_Folder($this->cn);
$this->soc = $this->own->MY_NAME;
$this->date = date('d.m.Y');
}

4
include/template/ledger_detail_ach.php
View file

@ -5,8 +5,8 @@ $str_anc="";
?><?php require_once NOALYSS_TEMPLATE.'/ledger_detail_top.php'; ?>
<div class="content" style="padding:0;">
<?php
require_once NOALYSS_INCLUDE.'/class/own.class.php';
$owner = new Own($cn);
require_once NOALYSS_INCLUDE.'/class/noalyss_parameter_folder.class.php';
$owner = new Noalyss_Parameter_Folder($cn);
?>
<?php if ($access == 'W') : ?>

2
include/template/ledger_detail_bottom.php
View file

@ -298,7 +298,7 @@ if ( $div != 'popup' ) {
*/
if ( $access=='W') {
echo HtmlInput::submit('save',_('Sauver'),'onClick="return verify_ca(\'popup\');"');
$owner=new Own($cn);
$owner=new Noalyss_Parameter_Folder($cn);
if ($owner->MY_ANALYTIC != 'nu' /*&& $div=='popup' */){
echo '<input type="button" class="smallbutton" value="'._('verifie CA').'" onClick="verify_ca(\''.$div.'\');">';
}

4
include/template/ledger_detail_fin.php
View file

@ -5,8 +5,8 @@ $str_anc="";
?><?php require_once NOALYSS_TEMPLATE.'/ledger_detail_top.php'; ?>
<div class="content" style="padding:0;">
<?php
require_once NOALYSS_INCLUDE.'/class/own.class.php';
$owner=new Own($cn);
require_once NOALYSS_INCLUDE.'/class/noalyss_parameter_folder.class.php';
$owner=new Noalyss_Parameter_Folder($cn);
require_once NOALYSS_INCLUDE.'/class/anc_plan.class.php';
require_once NOALYSS_INCLUDE.'/class/anc_operation.class.php';

6
include/template/ledger_detail_misc.php
View file

@ -8,7 +8,7 @@ require_once NOALYSS_INCLUDE.'/class/anc_plan.class.php';
$str_anc="";
?>
<?php
require_once NOALYSS_INCLUDE.'/class/own.class.php';
require_once NOALYSS_INCLUDE.'/class/noalyss_parameter_folder.class.php';
require_once NOALYSS_INCLUDE.'/class/anc_plan.class.php';
?>
<div class="content" style="padding:0">
@ -86,8 +86,8 @@ require_once NOALYSS_INCLUDE.'/class/anc_plan.class.php';
<div class="myfieldset">
<?php
require_once NOALYSS_INCLUDE.'/class/own.class.php';
$owner=new Own($cn);
require_once NOALYSS_INCLUDE.'/class/noalyss_parameter_folder.class.php';
$owner=new Noalyss_Parameter_Folder($cn);
?>
<table class="result">
<tr>

4
include/template/ledger_detail_ven.php
View file

@ -11,8 +11,8 @@
?>
<div class="content" style="padding:0;">
<?php
require_once NOALYSS_INCLUDE.'/class/own.class.php';
$owner = new Own($cn);
require_once NOALYSS_INCLUDE.'/class/noalyss_parameter_folder.class.php';
$owner = new Noalyss_Parameter_Folder($cn);
?>
<?php if ($access == 'W') : ?>

4
include/tva.inc.php
View file

@ -21,7 +21,7 @@
* \brief included file for customizing with the vat (account,rate...)
*/
if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
require_once NOALYSS_INCLUDE.'/class/own.class.php';
require_once NOALYSS_INCLUDE.'/class/noalyss_parameter_folder.class.php';
require_once NOALYSS_INCLUDE.'/lib/html_input.class.php';
require_once NOALYSS_INCLUDE.'/lib/ihidden.class.php';
require_once NOALYSS_INCLUDE.'/lib/itextarea.class.php';
@ -87,7 +87,7 @@ if (isset($_POST['confirm_mod'])
}
}
// If company not use VAT
$own = new Own($cn);
$own = new Noalyss_Parameter_Folder($cn);
if ($own->MY_TVA_USE == 'N')
{
echo '<h2 class="error">'._("Vous n'êtes pas assujetti à la TVA").'</h2>';

2
unit-test/global.example.php
View file

@ -26,7 +26,7 @@
global $g_connection,$g_parameter,$g_user;
$_REQUEST['gDossier'] = DOSSIER;
$g_connection=new Database(DOSSIER);
$g_parameter = new Own($g_connection);
$g_parameter = new Noalyss_Parameter_Folder($g_connection);
$_SESSION['g_user']='phpcompta';
$_SESSION['g_pass']='dany';
$_SESSION['g_pagesize']='50';

2
unit-test/include/class/acc_account.classTest.php
View file

@ -20,7 +20,7 @@ class Acc_AccountTest extends PHPUnit_Framework_TestCase
global $g_connection, $g_parameter, $g_user;
$_REQUEST['gDossier']=DOSSIER;
$g_connection=new Database(DOSSIER);
$g_parameter=new Own($g_connection);
$g_parameter=new Noalyss_Parameter_Folder($g_connection);
$g_user=new User($g_connection);
$cn=Dossier::connect();
$this->object=new Acc_Account($cn, '400');

2
unit-test/include/class/acc_account_ledgerTest.class.php
View file

@ -21,7 +21,7 @@ class Acc_Account_LedgerTest extends PHPUnit_Framework_TestCase
global $g_connection, $g_parameter,$g_user;
$_REQUEST['gDossier']=DOSSIER;
$g_connection=new Database(DOSSIER);
$g_parameter=new Own($g_connection);
$g_parameter=new Noalyss_Parameter_Folder($g_connection);
$g_user=new User($g_connection);
$this->object=new Acc_Account_Ledger($g_connection, 400);
}

2
unit-test/include/class/acc_balanceTest.class.php
View file

@ -20,7 +20,7 @@ class Acc_BalanceTest extends PHPUnit_Framework_TestCase
global $g_connection, $g_parameter;
$_REQUEST['gDossier']=DOSSIER;
$g_connection=new Database(DOSSIER);
$g_parameter=new Own($g_connection);
$g_parameter=new Noalyss_Parameter_Folder($g_connection);
$this->object=new Acc_Balance($g_connection);
}

2
unit-test/include/class/acc_bilanTest.class.php
View file

@ -21,7 +21,7 @@ class Acc_BilanTest extends PHPUnit_Framework_TestCase
global $g_connection, $g_parameter;
$_REQUEST['gDossier']=DOSSIER;
$g_connection=new Database(DOSSIER);
$g_parameter=new Own($g_connection);
$g_parameter=new Noalyss_Parameter_Folder($g_connection);
$this->object=new Acc_Bilan($g_connection);
}