From d9daebe813692a14311ee0573cb271f42e0e9e15 Mon Sep 17 00:00:00 2001 From: sparkyx Date: Fri, 1 Aug 2025 09:52:27 +0200 Subject: [PATCH] Change MY_* parameter --- include/class/document.class.php | 16 ++++++++----- .../class/noalyss_parameter_folder.class.php | 24 +++++++++---------- include/company.inc.php | 16 ++++++------- include/constant.php | 2 ++ .../class/noalyss_parameter_folderTest.php | 8 +++---- 5 files changed, 36 insertions(+), 30 deletions(-) diff --git a/include/class/document.class.php b/include/class/document.class.php index 14a317de1..0fa3efd61 100644 --- a/include/class/document.class.php +++ b/include/class/document.class.php @@ -670,8 +670,8 @@ class Document * - [DATE_LIMIT_CALC] * - [NUMBER] * - [MY_NAME] - * - [MY_CP] - * - [MY_COMMUNE] + * - [MY_POSTCODE] + * - [MY_CITY] * - [MY_TVA] * - [MY_STREET] * - [MY_NUMBER] @@ -760,11 +760,13 @@ class Document case 'MY_NAME': $r=$g_parameter->MY_NAME; break; + case 'MY_POSTCODE': case 'MY_CP': - $r=$g_parameter->MY_CP; + $r=$g_parameter->MY_POSTCODE; break; + case 'MY_CITY': case 'MY_COMMUNE': - $r=$g_parameter->MY_COMMUNE; + $r=$g_parameter->MY_CITY; break; case 'MY_TVA': $r=$g_parameter->MY_TVA; @@ -775,14 +777,16 @@ class Document case 'MY_NUMBER': $r=$g_parameter->MY_NUMBER; break; + case 'MY_PHONE': case 'MY_TEL': - $r=$g_parameter->MY_TEL; + $r=$g_parameter->MY_PHONE; break; case 'MY_FAX': $r=$g_parameter->MY_FAX; break; + case 'MY_COUNTRY': case 'MY_PAYS': - $r=$g_parameter->MY_PAYS; + $r=$g_parameter->MY_COUNTRY; break; diff --git a/include/class/noalyss_parameter_folder.class.php b/include/class/noalyss_parameter_folder.class.php index 9756ee47c..de5e38aea 100644 --- a/include/class/noalyss_parameter_folder.class.php +++ b/include/class/noalyss_parameter_folder.class.php @@ -31,10 +31,10 @@ class Noalyss_Parameter_Folder var $MY_TVA; var $MY_STREET; var $MY_NUMBER; - var $MY_CP; - var $MY_TEL; - var $MY_PAYS; - var $MY_COMMUNE; + var $MY_POSTCODE; + var $MY_PHONE; + var $MY_COUNTRY; + var $MY_CITY; var $MY_FAX; var $MY_ANALYTIC; var $MY_STRICT; @@ -75,10 +75,10 @@ class Noalyss_Parameter_Folder MY_TVA = [ {$this->MY_TVA }] MY_STREET = [ {$this->MY_STREET }] MY_NUMBER= [ {$this->MY_NUMBER }] -MY_CP= [ {$this->MY_CP }] -MY_TEL= [ {$this->MY_TEL }] -MY_PAYS= [ {$this->MY_PAYS }] -MY_COMMUNE= [ {$this->MY_COMMUNE }] +MY_POSTCODE= [ {$this->MY_POSTCODE }] +MY_PHONE= [ {$this->MY_PHONE }] +MY_COUNTRY= [ {$this->MY_COUNTRY }] +MY_CITY= [ {$this->MY_CITY }] MY_FAX= [ {$this->MY_FAX }] MY_ANALYTIC= [ {$this->MY_ANALYTIC }] MY_STRICT= [ {$this->MY_STRICT }] @@ -188,10 +188,10 @@ EOF; $this->save('MY_TVA'); $this->save('MY_STREET'); $this->save('MY_NUMBER'); - $this->save('MY_CP'); - $this->save('MY_TEL'); - $this->save('MY_PAYS'); - $this->save('MY_COMMUNE'); + $this->save('MY_POSTCODE'); + $this->save('MY_PHONE'); + $this->save('MY_COUNTRY'); + $this->save('MY_CITY'); $this->save('MY_FAX'); $this->save('MY_ANALYTIC'); $this->save('MY_STRICT'); diff --git a/include/company.inc.php b/include/company.inc.php index c7e0328c4..4248b1b4b 100644 --- a/include/company.inc.php +++ b/include/company.inc.php @@ -35,11 +35,11 @@ if (isset($_POST['record_company'])) $m->MY_TVA=$http->post("p_tva"); $m->MY_STREET=$http->post("p_street"); $m->MY_NUMBER=$http->post("p_no"); - $m->MY_CP=$http->post("p_cp"); - $m->MY_COMMUNE=$http->post("p_commune"); - $m->MY_TEL=$http->post("p_tel"); + $m->MY_POSTCODE=$http->post("p_cp"); + $m->MY_CITY=$http->post("p_commune"); + $m->MY_PHONE=$http->post("p_tel"); $m->MY_FAX=$http->post("p_fax"); - $m->MY_PAYS=$http->post("p_pays"); + $m->MY_COUNTRY=$http->post("p_pays"); $m->MY_CHECK_PERIODE=$http->post("p_check_periode"); $m->MY_DATE_SUGGEST=$http->post("p_date_suggest"); $m->MY_ANALYTIC=$http->post("p_compta"); @@ -165,7 +165,7 @@ $all->style=' class="input_text"'; $all->style=' class="input_text"'; ?> - input("p_tel", $my->MY_TEL) ?> + input("p_tel", $my->MY_PHONE) ?>
style=' class="input_text"'; $all->style=' class="input_text"'; ?> - input("p_cp", $my->MY_CP) ?> + input("p_cp", $my->MY_POSTCODE) ?>
style=' class="input_text"'; $all->style=' class="input_text"'; ?> - input("p_commune", $my->MY_COMMUNE) ?> + input("p_commune", $my->MY_CITY) ?>
style=' class="input_text"'; $all->style=' class="input_text"'; ?> - input("p_pays", $my->MY_PAYS) ?> + input("p_pays", $my->MY_COUNTRY) ?>