From 6e14b34867ab1c7023e9fbddb4f93ed1847254c7 Mon Sep 17 00:00:00 2001 From: sparkyx Date: Sat, 25 Jun 2022 00:15:00 +0200 Subject: [PATCH] Bug : supplemental tax cannot be deleted --- include/constant.php | 503 +++++++++++++++---------------- include/sql/patch/upgrade173.sql | 7 + 2 files changed, 256 insertions(+), 254 deletions(-) create mode 100644 include/sql/patch/upgrade173.sql diff --git a/include/constant.php b/include/constant.php index 66e00a30a..3c3c02bfb 100644 --- a/include/constant.php +++ b/include/constant.php @@ -28,345 +28,340 @@ global $version_noalyss; /* * Include path */ -$inc_path=get_include_path(); -$dirname=dirname(__FILE__); +$inc_path = get_include_path(); +$dirname = dirname(__FILE__); /* Global variable of the include dir */ -global $g_include_dir,$g_ext_dir,$g_template_dir; -$g_include_dir=$dirname; -$g_ext_dir = $dirname."/ext"; -$g_template_dir = $dirname."/template"; +global $g_include_dir, $g_ext_dir, $g_template_dir; +$g_include_dir = $dirname; +$g_ext_dir = $dirname . "/ext"; +$g_template_dir = $dirname . "/template"; -if (file_exists($dirname.'/config.inc.php')) require_once $dirname.'/config.inc.php'; +if (file_exists($dirname . '/config.inc.php')) require_once $dirname . '/config.inc.php'; -if ( !defined("NOALYSS_HOME")) define ("NOALYSS_HOME",dirname($dirname)."/html"); -if ( !defined("NOALYSS_PLUGIN")) define ("NOALYSS_PLUGIN",$g_ext_dir); -if ( !defined("NOALYSS_INCLUDE")) define ("NOALYSS_INCLUDE",$g_include_dir); -if ( !defined("NOALYSS_TEMPLATE")) define ("NOALYSS_TEMPLATE",$g_template_dir); +if (!defined("NOALYSS_HOME")) define("NOALYSS_HOME", dirname($dirname) . "/html"); +if (!defined("NOALYSS_PLUGIN")) define("NOALYSS_PLUGIN", $g_ext_dir); +if (!defined("NOALYSS_INCLUDE")) define("NOALYSS_INCLUDE", $g_include_dir); +if (!defined("NOALYSS_TEMPLATE")) define("NOALYSS_TEMPLATE", $g_template_dir); // pdftk can deal with all the PDF , for some of them it is preferable to fix it // with convert , see also PDF2PS and PS2PDF if yes -if ( !defined("FIX_BROKEN_PDF")) define ("FIX_BROKEN_PDF",'NO'); +if (!defined("FIX_BROKEN_PDF")) define("FIX_BROKEN_PDF", 'NO'); // version < 6.9.1.4 , the default administrator was phpcompta -if ( !defined('NOALYSS_ADMINISTRATOR')) { - define ('NOALYSS_ADMINISTRATOR','phpcompta'); +if (!defined('NOALYSS_ADMINISTRATOR')) { + define('NOALYSS_ADMINISTRATOR', 'phpcompta'); } -if (!defined ("SESSION_KEY")) { - define ("SESSION_KEY","RtYu0uu"); +if (!defined("SESSION_KEY")) { + define("SESSION_KEY", "RtYu0uu"); } -require_once NOALYSS_INCLUDE.'/constant.security.php'; +require_once NOALYSS_INCLUDE . '/constant.security.php'; -if ( strpos($inc_path,";") != 0 ) { - $new_path=$inc_path.';'.$dirname; - $os=0; /* $os is 0 for windoz */ +if (strpos($inc_path, ";") != 0) { + $new_path = $inc_path . ';' . $dirname; + $os = 0; /* $os is 0 for windoz */ } else { - $new_path=$inc_path.':'.$dirname; - $os=1; /* $os is 1 for unix */ + $new_path = $inc_path . ':' . $dirname; + $os = 1; /* $os is 1 for unix */ } set_include_path($new_path); -@ini_set ('default_charset',"UTF-8"); -@ini_set ('session.use_cookies',1); -@ini_set ('magic_quotes_gpc','off'); +@ini_set('default_charset', "UTF-8"); +@ini_set('session.use_cookies', 1); +@ini_set('magic_quotes_gpc', 'off'); -if ( ! defined('OVERRIDE_PARAM')) { - ini_set ('max_execution_time',240); - ini_set ('memory_limit','256M'); +if (!defined('OVERRIDE_PARAM')) { + ini_set('max_execution_time', 240); + ini_set('memory_limit', '256M'); } -@ini_set ('session.use_trans_sid','on'); +@ini_set('session.use_trans_sid', 'on'); @session_start(); /* * Ini session */ -if (! defined('NOALYSS_CAPTCHA') ) -{ - define ("NOALYSS_CAPTCHA",false); +if (!defined('NOALYSS_CAPTCHA')) { + define("NOALYSS_CAPTCHA", false); } -global $g_failed,$g_succeed; -$g_failed="✖"; -$g_succeed="✓"; -define ('SMALLX','#xe816;'); -define ('BUTTONADD',"✚"); +global $g_failed, $g_succeed; +$g_failed = "✖"; +$g_succeed = "✓"; +define('SMALLX', '#xe816;'); +define('BUTTONADD', "✚"); -define ('SVNINFO',NOALYSS_VERSION); -if ( ! defined ('DEBUGNOALYSS')) { - define ("DEBUGNOALYSS",0); +define('SVNINFO', NOALYSS_VERSION); +if (!defined('DEBUGNOALYSS')) { + define("DEBUGNOALYSS", 0); } -if ( ! defined ('LOGINPUT')) { - define ("LOGINPUT",false); +if (!defined('LOGINPUT')) { + define("LOGINPUT", false); } -if ( ! defined ('DEBUGNOALYSS') ) { - define ('DEBUGNOALYSS',0); +if (!defined('DEBUGNOALYSS')) { + define('DEBUGNOALYSS', 0); } -$version_noalyss=SVNINFO; +$version_noalyss = SVNINFO; // If you don't want to be notified of the update -if ( !defined("SITE_UPDATE")) - define ("SITE_UPDATE",'http://www.noalyss.eu/last_version.txt'); -if ( !defined("SITE_UPDATE_PLUGIN")) - define ("SITE_UPDATE_PLUGIN",'http://www.noalyss.eu/plugin_last_version.txt'); -if ( !defined ("NOALYSS_PACKAGE_REPOSITORY")) { - define ("NOALYSS_PACKAGE_REPOSITORY","https://package.noalyss.eu/"); +if (!defined("SITE_UPDATE")) + define("SITE_UPDATE", 'http://www.noalyss.eu/last_version.txt'); +if (!defined("SITE_UPDATE_PLUGIN")) + define("SITE_UPDATE_PLUGIN", 'http://www.noalyss.eu/plugin_last_version.txt'); +if (!defined("NOALYSS_PACKAGE_REPOSITORY")) { + define("NOALYSS_PACKAGE_REPOSITORY", "https://package.noalyss.eu/"); } // If you don't want that the system information is accessible -if ( ! defined ("SYSINFO_DISPLAY")) { - define ("SYSINFO_DISPLAY",TRUE); +if (!defined("SYSINFO_DISPLAY")) { + define("SYSINFO_DISPLAY", TRUE); } -define ("DBVERSION",173); -define ("MONO_DATABASE",25); -define ("DBVERSIONREPO",20); -define ('NOTFOUND','--not found--'); -define ("MAX_COMPTE",4); -define ('MAX_ARTICLE',5); -define ('MAX_ARTICLE_STOCK',10); -define ('MAX_CAT',15); -define ('MAX_CARD_SEARCH',550); -define ('MAX_FORECAST_ITEM',10); -define ('MAX_PREDEFINED_OPERATION',50); -define ('MAX_COMPTE_CARD',4); -define ('COMPTA_MAX_YEAR',2100); -define ('COMPTA_MIN_YEAR',1900); -define ('MAX_RECONCILE',25); -define ('MAX_QCODE',4); -if ( ! defined ('MAX_SEARCH_CARD') ) { - define ('MAX_SEARCH_CARD',20); +define("DBVERSION", 174); +define("MONO_DATABASE", 25); +define("DBVERSIONREPO", 20); +define('NOTFOUND', '--not found--'); +define("MAX_COMPTE", 4); +define('MAX_ARTICLE', 5); +define('MAX_ARTICLE_STOCK', 10); +define('MAX_CAT', 15); +define('MAX_CARD_SEARCH', 550); +define('MAX_FORECAST_ITEM', 10); +define('MAX_PREDEFINED_OPERATION', 50); +define('MAX_COMPTE_CARD', 4); +define('COMPTA_MAX_YEAR', 2100); +define('COMPTA_MIN_YEAR', 1900); +define('MAX_RECONCILE', 25); +define('MAX_QCODE', 4); +if (!defined('MAX_SEARCH_CARD')) { + define('MAX_SEARCH_CARD', 20); } -define ('MAX_FOLDER_TO_SHOW',80); -define ('MAX_ACTION_SHOW',20); +define('MAX_FOLDER_TO_SHOW', 80); +define('MAX_ACTION_SHOW', 20); -if ( DEBUGNOALYSS == 0 ) { - // PRODUCTION : nothing is displaid , report only errors and warning - // Rapporte les erreurs d'exécution de script - error_reporting(E_ERROR | E_WARNING ); - ini_set("display_errors",0); - ini_set("html_errors",0); - ini_set('log_errors',1); - ini_set('log_errors_max_len',0); -}elseif (DEBUGNOALYSS==1) { +if (DEBUGNOALYSS == 0) { + // PRODUCTION : nothing is displaid , report only errors and warning + // Rapporte les erreurs d'exécution de script + error_reporting(E_ERROR | E_WARNING); + ini_set("display_errors", 0); + ini_set("html_errors", 0); + ini_set('log_errors', 1); + ini_set('log_errors_max_len', 0); +} elseif (DEBUGNOALYSS == 1) { /* DEVELOPPEMENT : display all errors warning notice deprecated ...*/ - error_reporting(2147483647); - ini_set("display_errors",1); - ini_set("display_startup_errors",1); - ini_set("html_errors",1); - ini_set('log_errors',1); - ini_set('log_errors_max_len',0); -} elseif (DEBUGNOALYSS == 2 ) { - // like level 1 plus extra info (filename, ...) - error_reporting(2147483647); - ini_set("display_errors",1); - ini_set("display_startup_errors",1); - ini_set("html_errors",1); - ini_set('log_errors',1); - ini_set('log_errors_max_len',0); + error_reporting(2147483647); + ini_set("display_errors", 1); + ini_set("display_startup_errors", 1); + ini_set("html_errors", 1); + ini_set('log_errors', 1); + ini_set('log_errors_max_len', 0); +} elseif (DEBUGNOALYSS == 2) { + // like level 1 plus extra info (filename, ...) + error_reporting(2147483647); + ini_set("display_errors", 1); + ini_set("display_startup_errors", 1); + ini_set("html_errors", 1); + ini_set('log_errors', 1); + ini_set('log_errors_max_len', 0); } // Erreur -define ("NOERROR",0); -define ("BADPARM",1); -define ("BADDATE",2); -define ("NOTPERIODE",3); -define ("PERIODCLOSED",4); -define ("INVALID_ECH",5); -define ("RAPPT_ALREADY_USED",6); -define ("RAPPT_NOT_EXIST",7); -define ("DIFF_AMOUNT",8); -define ("RAPPT_NOMATCH_AMOUNT",9); -define ("NO_PERIOD_SELECTED",10); -define ("NO_POST_SELECTED",11); -define ("LAST",1); -define ("FIRST",0); -define ("ERROR",12); +define("NOERROR", 0); +define("BADPARM", 1); +define("BADDATE", 2); +define("NOTPERIODE", 3); +define("PERIODCLOSED", 4); +define("INVALID_ECH", 5); +define("RAPPT_ALREADY_USED", 6); +define("RAPPT_NOT_EXIST", 7); +define("DIFF_AMOUNT", 8); +define("RAPPT_NOMATCH_AMOUNT", 9); +define("NO_PERIOD_SELECTED", 10); +define("NO_POST_SELECTED", 11); +define("LAST", 1); +define("FIRST", 0); +define("ERROR", 12); //! '); // Sql string -define ("SQL_LIST_ALL_INVOICE",""); +define("SQL_LIST_ALL_INVOICE", ""); -define ("SQL_LIST_UNPAID_INVOICE"," (jr_rapt is null or jr_rapt = '') and jr_valid = true " - ); +define("SQL_LIST_UNPAID_INVOICE", " (jr_rapt is null or jr_rapt = '') and jr_valid = true " +); -define ("SQL_LIST_UNPAID_INVOICE_DATE_LIMIT" ," +define("SQL_LIST_UNPAID_INVOICE_DATE_LIMIT", " where (jr_rapt is null or jr_rapt = '') and to_date(to_char(jr_ech,'DD.MM.YYYY'),'DD.MM.YYYY') < to_date(to_char(now(),'DD.MM.YYYY'),'DD.MM.YYYY') - and jr_valid = true" ); + and jr_valid = true"); /** * Exception */ // Limit email exceeds parameter -define ('EMAIL_LIMIT',1002); -define ('EXC_PARAM_VALUE',1005); -define ('EXC_PARAM_TYPE',1006); -define ('EXC_DUPLICATE',1200); -define ('EXC_INVALID',1400); -define ("UNPINDG",""); -define ("PINDG",""); +define('EMAIL_LIMIT', 1002); +define('EXC_PARAM_VALUE', 1005); +define('EXC_PARAM_TYPE', 1006); +define('EXC_DUPLICATE', 1200); +define('EXC_INVALID', 1400); +define("UNPINDG", ""); +define("PINDG", ""); // Url of NOALYSS (http://...) // -if ( ! defined ("NOALYSS_URL")) { - $protocol="http"; - if ( isset ($_SERVER['REQUEST_SCHEME'] )) { - $protocol=$_SERVER['REQUEST_SCHEME']; +if (!defined("NOALYSS_URL")) { + $protocol = "http"; + if (isset ($_SERVER['REQUEST_SCHEME'])) { + $protocol = $_SERVER['REQUEST_SCHEME']; } - $base=$protocol.'://'. - $_SERVER['SERVER_NAME']. - ":".$_SERVER['SERVER_PORT']. - dirname($_SERVER['PHP_SELF']); - define ("NOALYSS_URL",$base); + $base = $protocol . '://' . + $_SERVER['SERVER_NAME'] . + ":" . $_SERVER['SERVER_PORT'] . + dirname($_SERVER['PHP_SELF']); + define("NOALYSS_URL", $base); } -if (!defined ("DEFAULT_SERVER_VIDEO_CONF")) { - define ("DEFAULT_SERVER_VIDEO_CONF","https://www.free-solutions.org/"); +if (!defined("DEFAULT_SERVER_VIDEO_CONF")) { + define("DEFAULT_SERVER_VIDEO_CONF", "https://www.free-solutions.org/"); } /** * @brief load automatically class - * + * * @param string $class classname to load */ -function noalyss_class_autoloader($class) { - $class=strtolower($class); +function noalyss_class_autoloader($class) +{ + $class = strtolower($class); $aClass = array( - "database"=>"class/database.class.php", - "user"=>"class/user.class.php", + "database" => "class/database.class.php", + "user" => "class/user.class.php", "acc_account" => "class/acc_account.class.php", "acc_account_ledger" => "class/acc_account_ledger.class.php", "acc_balance" => "class/acc_balance.class.php", @@ -421,7 +416,7 @@ function noalyss_class_autoloader($class) { "card_attribut_mtable" => "class/card_attribut_mtable.class.php", "card_multiple" => "class/card_multiple.class.php", "class_acc_account_ledger.php~" => "class/class_acc_account_ledger.php~", - "contact" => "class/contact.class.php", + "contact" => "class/contact.class.php", "contact_option_ref_mtable" => "class/contact_option_ref_mtable.class.php", "currency_mtable" => "class/currency_mtable.class.php", "customer" => "class/customer.class.php", @@ -429,7 +424,7 @@ function noalyss_class_autoloader($class) { "data_currency_operation" => "class/data_currency_operation.class.php", "default_menu" => "class/default_menu.class.php", "document" => "class/document.class.php", - "document_export" => "class/document_export.class.php", + "document_export" => "class/document_export.class.php", "document_modele" => "class/document_modele.class.php", "document_option" => "class/document_option.class.php", "document_state_mtable.php" => "class/document_state_mtable.php", @@ -438,7 +433,7 @@ function noalyss_class_autoloader($class) { "exercice" => "class/exercice.class.php", "extension" => "class/extension.class.php", "fiche" => "class/fiche.class.php", - "fiche_def" => "class/fiche_def.class.php", + "fiche_def" => "class/fiche_def.class.php", "fiche_def_ref" => "class/fiche_def_ref.class.php", "filter_data_currency_accounting" => "class/filter_data_currency_accounting.class.php", "filter_data_currency_card_category" => "class/filter_data_currency_card_category.class.php", @@ -455,10 +450,10 @@ function noalyss_class_autoloader($class) { "manager" => "class/manager.class.php", "menu_ref" => "class/menu_ref.class.php", "noalyss_parameter_folder" => "class/noalyss_parameter_folder.class.php", - "operation_category_card" => "class/operation_category_card.class.php", + "operation_category_card" => "class/operation_category_card.class.php", "operation_category_currency_account" => "class/operation_category_currency_account.class.php", "operation_predef_mtable" => "class/operation_predef_mtable.class.php", - "package_contrib" => "class/package_contrib.class.php", + "package_contrib" => "class/package_contrib.class.php", "package_core" => "class/package_core.class.php", "package_noalyss" => "class/package_noalyss.class.php", "package_plugin" => "class/package_plugin.class.php", @@ -486,7 +481,7 @@ function noalyss_class_autoloader($class) { "print_ledger_detail_item" => "class/print_ledger_detail_item.class.php", "print_ledger_financial" => "class/print_ledger_fin.class.php", "print_ledger_misc" => "class/print_ledger_misc.class.php", - "print_ledger_simple" => "class/print_ledger_simple.class.php", + "print_ledger_simple" => "class/print_ledger_simple.class.php", "print_ledger_simple_without_vat" => "class/print_ledger_simple_without_vat.class.php", "print_operation_currency" => "class/print_operation_currency.class.php", "profile_menu" => "class/profile_menu.class.php", @@ -591,24 +586,24 @@ function noalyss_class_autoloader($class) { "sort_table" => "lib/sort_table.class.php", "table_data_sql" => "lib/table_data_sql.class.php", "zip_extended" => "lib/zip_extended.class.php", - "document_state_mtable"=>"class/document_state_mtable.class.php", - "noalyss\mobile"=>"class/mobile.class.php", - "profile_mobile_sql"=>"database/profile_mobile_sql.class.php", - "mobile_device_mtable"=>"class/mobile_device_mtable.class.php", - "html_input_noalyss"=>"class/html_input_noalyss.class.php", - "card_property"=>"class/card_property.class.php", - "pdfland"=>"class/pdf_land.class.php", - "pdf_anc_acc_list"=>"class/pdf_anc_acc_list.class.php", - 'acc_reconciliation_lettering'=>'class/acc_reconciliation_lettering.class.php', - "acc_other_tax_mtable"=>'class/acc_other_tax_mtable.class.php', - 'acc_other_tax_sql'=>'database/acc_other_tax_sql.class.php', - 'jrn_tax_sql'=>'database/jrn_tax_sql.class.php', - 'additional_tax'=>'class/additional_tax.class.php' + "document_state_mtable" => "class/document_state_mtable.class.php", + "noalyss\mobile" => "class/mobile.class.php", + "profile_mobile_sql" => "database/profile_mobile_sql.class.php", + "mobile_device_mtable" => "class/mobile_device_mtable.class.php", + "html_input_noalyss" => "class/html_input_noalyss.class.php", + "card_property" => "class/card_property.class.php", + "pdfland" => "class/pdf_land.class.php", + "pdf_anc_acc_list" => "class/pdf_anc_acc_list.class.php", + 'acc_reconciliation_lettering' => 'class/acc_reconciliation_lettering.class.php', + "acc_other_tax_mtable" => 'class/acc_other_tax_mtable.class.php', + 'acc_other_tax_sql' => 'database/acc_other_tax_sql.class.php', + 'jrn_tax_sql' => 'database/jrn_tax_sql.class.php', + 'additional_tax' => 'class/additional_tax.class.php' ); - if ( isset ($aClass[$class]) ) { - require_once NOALYSS_INCLUDE."/".$aClass[$class]; + if (isset ($aClass[$class])) { + require_once NOALYSS_INCLUDE . "/" . $aClass[$class]; } - + } -spl_autoload_register('\noalyss_class_autoloader',true); +spl_autoload_register('\noalyss_class_autoloader', true); diff --git a/include/sql/patch/upgrade173.sql b/include/sql/patch/upgrade173.sql new file mode 100644 index 000000000..7dfa74ae0 --- /dev/null +++ b/include/sql/patch/upgrade173.sql @@ -0,0 +1,7 @@ +begin; + +ALTER TABLE public.jrn_tax drop CONSTRAINT jrn_tax_fk ; +ALTER TABLE public.jrn_tax ADD CONSTRAINT jrn_tax_fk FOREIGN KEY (j_id) REFERENCES jrnx(j_id) on delete cascade on update cascade; + +insert into version (val,v_description) values (174,'Supplemental tax : delete'); +commit; \ No newline at end of file