move static_taxes into the extension static_info_tables_taxes
authorfranzholz <franzholz@735d13b6-9817-0410-8766-e36946ffe9aa>
Sat, 26 Apr 2008 16:53:56 +0000 (16:53 +0000)
committerfranzholz <franzholz@735d13b6-9817-0410-8766-e36946ffe9aa>
Sat, 26 Apr 2008 16:53:56 +0000 (16:53 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Extensions/static_info_tables/trunk@9020 735d13b6-9817-0410-8766-e36946ffe9aa

ChangeLog
doc/manual.sxw
ext_emconf.php
ext_localconf.php
ext_tables.php
ext_tables.sql
ext_tables_static+adt.sql
locallang_db.xml
pi1/class.tx_staticinfotables_pi1.php
tca.php

index bf2a83f..4bc9796 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-26  Franz Holzinger  <contact@fholzinger.com>
+       * fix bug 7930: default values for country zones and currencies have been wrong
+       * move static_taxes into a separate extension static_info_tables_taxes
+
 2008-03-15  Franz Holzinger  <contact@fholzinger.com>
        * fix bug 6059: Static_country_zones Canada wrong ISO-Nr
        * set default country to DEU and contry zone to NRW because most persons using TYPO3 live here
index 11c1a40..7979d07 100644 (file)
Binary files a/doc/manual.sxw and b/doc/manual.sxw differ
index ccecb93..d743195 100644 (file)
@@ -43,8 +43,6 @@ $EM_CONF[$_EXTKEY] = array(
                ),
        ),
        '_md5_values_when_last_written' => 'a:23:{s:9:"ChangeLog";s:4:"6e32";s:20:"class.ext_update.php";s:4:"2803";s:33:"class.tx_staticinfotables_div.php";s:4:"6bad";s:38:"class.tx_staticinfotables_encoding.php";s:4:"03fd";s:41:"class.tx_staticinfotables_syslanguage.php";s:4:"4f57";s:16:"contributors.txt";s:4:"9c5b";s:21:"ext_conf_template.txt";s:4:"5f7b";s:12:"ext_icon.gif";s:4:"639f";s:17:"ext_localconf.php";s:4:"b526";s:14:"ext_tables.php";s:4:"7247";s:14:"ext_tables.sql";s:4:"1edc";s:25:"ext_tables_static+adt.sql";s:4:"6eaa";s:25:"icon_static_countries.gif";s:4:"2a46";s:26:"icon_static_currencies.gif";s:4:"a1e2";s:25:"icon_static_languages.gif";s:4:"639f";s:23:"icon_static_markets.gif";s:4:"bf06";s:27:"icon_static_territories.gif";s:4:"aab5";s:16:"locallang_db.xml";s:4:"33a2";s:7:"tca.php";s:4:"cadc";s:14:"doc/manual.sxw";s:4:"2769";s:37:"pi1/class.tx_staticinfotables_pi1.php";s:4:"01fc";s:39:"static/static_info_tables/constants.txt";s:4:"169d";s:35:"static/static_info_tables/setup.txt";s:4:"82b7";}',
-       'suggests' => array(
-       ),
 );
 
 ?>
\ No newline at end of file
index 62fa87e..961b62f 100644 (file)
@@ -30,7 +30,7 @@ if (!isset($GLOBALS['TYPO3_CONF_VARS']['EXTCONF'][STATIC_INFO_TABLES_EXTkey]['ch
        $GLOBALS['TYPO3_CONF_VARS']['EXTCONF'][STATIC_INFO_TABLES_EXTkey]['charset'] = $_EXTCONF['charset'] ? $_EXTCONF['charset'] : 'utf-8';
 }
 
-$GLOBALS['TYPO3_CONF_VARS']['EXTCONF'][STATIC_INFO_TABLES_EXTkey]['tables'] = array(
+$labelTable = array(
        'static_territories' => array(
                'label_fields' => array(        // possible label fields for different languages. Default as last.
                        'tr_name_##', 'tr_name_en',
@@ -71,14 +71,6 @@ $GLOBALS['TYPO3_CONF_VARS']['EXTCONF'][STATIC_INFO_TABLES_EXTkey]['tables'] = ar
                        'cu_iso_##',
                ),
        ),
-       'static_taxes' => array(
-               'label_fields' => array(
-                       'tx_name_##', 'tx_name_en',
-               ),
-               'isocode_field' => array(
-                       'tx_code', 'tx_country_iso_##', 'tx_zn_code',
-               ),
-       ),
        'static_markets' => array(
                'label_fields' => array(
                        'institution_description',
@@ -89,6 +81,12 @@ $GLOBALS['TYPO3_CONF_VARS']['EXTCONF'][STATIC_INFO_TABLES_EXTkey]['tables'] = ar
        ),
 );
 
+if (isset($GLOBALS['TYPO3_CONF_VARS']['EXTCONF'][STATIC_INFO_TABLES_EXTkey]['tables']) && is_array($GLOBALS['TYPO3_CONF_VARS']['EXTCONF'][STATIC_INFO_TABLES_EXTkey]['tables']))       {
+       $GLOBALS['TYPO3_CONF_VARS']['EXTCONF'][STATIC_INFO_TABLES_EXTkey]['tables'] = array_merge ($labelTable, $GLOBALS['TYPO3_CONF_VARS']['EXTCONF'][STATIC_INFO_TABLES_EXTkey]['tables']);
+} else {
+       $GLOBALS['TYPO3_CONF_VARS']['EXTCONF'][STATIC_INFO_TABLES_EXTkey]['tables'] = $labelTable;
+}
+
 require_once(t3lib_extMgm::extPath(STATIC_INFO_TABLES_EXTkey).'class.tx_staticinfotables_div.php');
 
 ?>
\ No newline at end of file
index 19be5d5..8d48dea 100644 (file)
@@ -97,31 +97,6 @@ $TCA['static_currencies'] = array(
        )
 );
 
-$TCA['static_taxes'] = Array (
-       'ctrl' => Array (
-               'label' => 'tx_name_en',
-               'type' => 'tx_scope',
-               'readOnly' => 1,
-               'adminOnly' => 1,
-               'rootLevel' => 1,
-               'is_static' => 1,
-               'default_sortby' => 'ORDER BY tx_name_en',
-               'crdate' => 'crdate',
-               'delete' => 'deleted',
-               'enablecolumns' => Array (
-                       'disabled' => 'hidden',
-                       'starttime' => 'starttime',
-                       'endtime' => 'endtime',
-               ),
-               'title' => 'LLL:EXT:'.STATIC_INFO_TABLES_EXTkey.'/locallang_db.xml:static_taxes.title',
-               'dynamicConfigFile' => PATH_BE_staticinfotables.'tca.php',
-               'iconfile' => PATH_BE_staticinfotables_rel.'icon_static_currencies.gif',
-       ),
-       'interface' => Array (
-               'showRecordFieldList' => 'tx_name_en,tx_scope,tx_code,tx_country_iso_3,tx_country_iso_2,tx_country_iso_nr,tx_zn_code,tx_class,tx_rate,tx_priority,crdate,hidden,starttime,endtime'
-       )
-);
-
 // Static markets from ISO 10383
 $TCA['static_markets'] = array (
        'ctrl' => array (
@@ -145,7 +120,6 @@ $TCA['static_languages']['ctrl']['readOnly'] = 0;
 $TCA['static_country_zones']['ctrl']['readOnly'] = 0;
 $TCA['static_currencies']['ctrl']['readOnly'] = 0;
 $TCA['static_territories']['ctrl']['readOnly'] = 0;
-$TCA['static_taxes']['ctrl']['readOnly'] = 0;
 $TCA['static_markets']['ctrl']['readOnly'] = 0;
 
 
index 6954758..47ee22b 100644 (file)
@@ -99,31 +99,6 @@ CREATE TABLE static_languages (
   KEY parent (pid)
 );
 
-#
-# Table structure for table "static_taxes"
-#
-CREATE TABLE static_taxes (
-  uid int(11) unsigned DEFAULT '0' NOT NULL auto_increment,
-  pid int(11) unsigned DEFAULT '0' NOT NULL,
-  crdate int(11) unsigned DEFAULT '0' NOT NULL,
-  deleted tinyint(4) unsigned DEFAULT '0' NOT NULL,
-  hidden tinyint(4) unsigned DEFAULT '0' NOT NULL,
-  starttime int(11) unsigned DEFAULT '0' NOT NULL,
-  endtime int(11) unsigned DEFAULT '0' NOT NULL,
-  tx_country_iso_nr int(11) unsigned DEFAULT '0' NOT NULL,
-  tx_country_iso_2 char(2) DEFAULT '' NOT NULL,
-  tx_country_iso_3 char(3) DEFAULT '' NOT NULL,
-  tx_zn_code varchar(45) DEFAULT '' NOT NULL,
-  tx_name_en varchar(255) DEFAULT '' NOT NULL,
-  tx_scope tinyint(3) unsigned DEFAULT '0' NOT NULL,
-  tx_code varchar(5) DEFAULT '' NOT NULL,
-  tx_class tinyint(3) unsigned DEFAULT '0' NOT NULL,
-  tx_rate varchar(20) DEFAULT '' NOT NULL,
-  tx_priority tinyint(3) unsigned DEFAULT '0' NOT NULL,
-  PRIMARY KEY (uid),
-  KEY parent (pid)
-);
-
 
 #
 # Table structure for table "static_markets"
index 6d360f2..f58c8d8 100644 (file)
@@ -1227,74 +1227,6 @@ INSERT INTO static_languages VALUES ('160', '0', 'IO', 'Ido', '', '', '', 'Ido',
 INSERT INTO static_languages VALUES ('182', '0', 'PI', 'Pali', '', '', '', 'Pāli', '1', '0');
 
 
-# TYPO3 Extension Manager dump 1.1
-#
-#--------------------------------------------------------
-
-
-#
-# Table structure for table "static_taxes"
-#
-DROP TABLE IF EXISTS static_taxes;
-CREATE TABLE static_taxes (
-  uid int(11) unsigned auto_increment,
-  pid int(11) unsigned default '0',
-  crdate int(11) unsigned default '0',
-  deleted tinyint(4) unsigned default '0',
-  hidden tinyint(4) unsigned default '0',
-  starttime int(11) unsigned default '0',
-  endtime int(11) unsigned default '0',
-  tx_country_iso_nr int(11) unsigned default '0',
-  tx_country_iso_2 char(2) default '',
-  tx_country_iso_3 char(3) default '',
-  tx_zn_code varchar(45) default '',
-  tx_name_en varchar(255) default '',
-  tx_scope tinyint(3) unsigned default '0',
-  tx_code varchar(5) default '',
-  tx_class tinyint(3) unsigned default '0',
-  tx_rate varchar(20) default '',
-  tx_priority tinyint(3) unsigned default '0',
-  PRIMARY KEY (uid),
-  KEY parent (pid)
-);
-
-
-INSERT INTO static_taxes VALUES ('1', '0', '1078592928', '0', '0', '0', '0', '124', 'CA', 'CAN', 'SK', 'Saskatchewan Retail Sales Tax', '2', 'SKRST', '3', '0.06', '1');
-INSERT INTO static_taxes VALUES ('2', '0', '1078593040', '0', '0', '0', '0', '124', 'CA', 'CAN', 'QC', 'Québec Sales Tax', '2', 'TVQ', '3', '0.075', '2');
-INSERT INTO static_taxes VALUES ('3', '0', '1078630120', '0', '0', '0', '0', '124', 'CA', 'CAN', '', 'Canada Goods and Services Tax', '1', 'GST', '3', '0.07', '1');
-INSERT INTO static_taxes VALUES ('4', '0', '1078630420', '0', '0', '0', '0', '124', 'CA', 'CAN', 'MB', 'Manitoba Retail Sales Tax', '2', 'MBRST', '3', '0.07', '1');
-INSERT INTO static_taxes VALUES ('5', '0', '1078630556', '0', '0', '0', '0', '124', 'CA', 'CAN', 'BC', 'British Columbia Retail Sales Tax', '2', 'BCRST', '3', '0.075', '1');
-INSERT INTO static_taxes VALUES ('6', '0', '1078630731', '0', '0', '0', '0', '124', 'CA', 'CAN', 'ON', 'Ontario Retail Sales Tax', '2', 'ONRST', '3', '0.08', '1');
-INSERT INTO static_taxes VALUES ('7', '0', '1078631374', '0', '0', '0', '0', '124', 'CA', 'CAN', 'NB', 'New Brunswick Harmonized Sales Tax', '2', 'HST', '3', '0.08', '1');
-INSERT INTO static_taxes VALUES ('8', '0', '1078631540', '0', '0', '0', '0', '124', 'CA', 'CAN', 'NS', 'Nova Scotia Harmonized Sales Tax', '2', 'HST', '3', '0.08', '1');
-INSERT INTO static_taxes VALUES ('9', '0', '1078631644', '0', '0', '0', '0', '124', 'CA', 'CAN', 'PE', 'Prince Edward Island Retail Sales Tax', '2', 'PERST', '3', '0.1', '2');
-INSERT INTO static_taxes VALUES ('10', '0', '1078631800', '0', '0', '0', '0', '124', 'CA', 'CAN', 'NL', 'Newfoundland and Labrador Harmonized Sales Tax', '2', 'HST', '3', '0.08', '1');
-INSERT INTO static_taxes VALUES ('11', '0', '1078671742', '0', '0', '0', '0', '56', 'BE', 'BEL', '', 'Belgium VAT', '1', 'VAT', '3', '0.21', '1');
-INSERT INTO static_taxes VALUES ('12', '0', '1078672536', '0', '0', '0', '0', '203', 'CZ', 'CZE', '', 'Czech Republic VAT', '1', 'GST', '3', '0.22', '1');
-INSERT INTO static_taxes VALUES ('13', '0', '1078672881', '0', '0', '0', '0', '208', 'DK', 'DNK', '', 'Denmark VAT', '1', 'VAT', '3', '0.25', '1');
-INSERT INTO static_taxes VALUES ('14', '0', '1078673059', '0', '0', '0', '0', '276', 'DE', 'DEU', '', 'Germany VAT', '1', 'VAT', '3', '0.19', '1');
-INSERT INTO static_taxes VALUES ('15', '0', '1078673324', '0', '0', '0', '0', '233', 'EE', 'EST', '', 'Estonia VAT', '1', 'VAT', '3', '0.18', '1');
-INSERT INTO static_taxes VALUES ('16', '0', '1078673460', '0', '0', '0', '0', '300', 'GR', 'GRC', '', 'Greece VAT', '1', 'VAT', '3', '0.18', '1');
-INSERT INTO static_taxes VALUES ('17', '0', '1078673622', '0', '0', '0', '0', '724', 'ES', 'ESP', '', 'Spain VAT', '1', 'VAT', '3', '0.16', '1');
-INSERT INTO static_taxes VALUES ('18', '0', '1078673762', '0', '0', '0', '0', '250', 'FR', 'FRA', '', 'France VAT', '1', 'VAT', '3', '0.196', '1');
-INSERT INTO static_taxes VALUES ('19', '0', '1078673891', '0', '0', '0', '0', '372', 'IE', 'IRL', '', 'Ireland VAT', '1', 'VAT', '3', '0.21', '1');
-INSERT INTO static_taxes VALUES ('20', '0', '1078674015', '0', '0', '0', '0', '380', 'IT', 'ITA', '', 'Italy VAT', '1', 'VAT', '3', '0.2', '1');
-INSERT INTO static_taxes VALUES ('21', '0', '1078674320', '0', '0', '0', '0', '196', 'CY', 'CYP', '', 'Cyprus VAT', '1', 'VAT', '3', '0.15', '1');
-INSERT INTO static_taxes VALUES ('22', '0', '1078674486', '0', '0', '0', '0', '428', 'LV', 'LVA', '', 'Latvia VAT', '1', 'VAT', '3', '0.18', '1');
-INSERT INTO static_taxes VALUES ('23', '0', '1078674636', '0', '0', '0', '0', '440', 'LT', 'LTU', '', 'Lithuania VAT', '1', 'VAT', '3', '0.18', '1');
-INSERT INTO static_taxes VALUES ('24', '0', '1078674772', '0', '0', '0', '0', '442', 'LU', 'LUX', '', 'Luxembourg VAT', '1', 'VAT', '3', '0.15', '1');
-INSERT INTO static_taxes VALUES ('25', '0', '1078674916', '0', '0', '0', '0', '348', 'HU', 'HUN', '', 'Hungary VAT', '1', 'VAT', '3', '0.25', '1');
-INSERT INTO static_taxes VALUES ('26', '0', '1078675045', '0', '0', '0', '0', '470', 'MT', 'MLT', '', 'Malta VAT', '1', 'VAT', '3', '0.15', '1');
-INSERT INTO static_taxes VALUES ('27', '0', '1078675385', '0', '0', '0', '0', '528', 'NL', 'NLD', '', 'Netherlands VAT', '1', 'VAT', '3', '0.19', '1');
-INSERT INTO static_taxes VALUES ('28', '0', '1078675533', '0', '0', '0', '0', '40', 'AT', 'AUT', '', 'Austria VAT', '1', 'VAT', '3', '0.2', '1');
-INSERT INTO static_taxes VALUES ('29', '0', '1078675707', '0', '0', '0', '0', '620', 'PT', 'PRT', '', 'Portugal VAT', '1', 'VAT', '3', '0.19', '1');
-INSERT INTO static_taxes VALUES ('30', '0', '1078675852', '0', '0', '0', '0', '705', 'SI', 'SVN', '', 'Slovenia VAT', '1', 'VAT', '3', '0.2', '1');
-INSERT INTO static_taxes VALUES ('31', '0', '1078675980', '0', '0', '0', '0', '703', 'SK', 'SVK', '', 'Slovakia VAT', '1', 'VAT', '3', '0.19', '1');
-INSERT INTO static_taxes VALUES ('32', '0', '1078676117', '0', '0', '0', '0', '246', 'FI', 'FIN', '', 'Finland VAT', '1', 'VAT', '3', '0.22', '1');
-INSERT INTO static_taxes VALUES ('33', '0', '1078676450', '0', '0', '0', '0', '752', 'SE', 'SWE', '', 'Sweden VAT', '1', 'VAT', '3', '0.25', '1');
-INSERT INTO static_taxes VALUES ('34', '0', '1078676577', '0', '0', '0', '0', '826', 'GB', 'GBR', '', 'United Kingdom VAT', '1', 'VAT', '3', '0.175', '1');
-INSERT INTO static_taxes VALUES ('35', '0', '1078709361', '0', '0', '0', '0', '484', 'MX', 'MEX', '', 'Mexico VAT', '1', 'IVA', '3', '0.15', '1');
-
 
 # TYPO3 Extension Manager dump 1.1
 #
index d7d9302..436f79d 100644 (file)
             <label index="static_currencies_item.cu_sub_divisor">Divisor:</label>
             <label index="static_currencies_item.cu_sub_symbol_left">Sub symbol left:</label>
             <label index="static_currencies_item.cu_sub_symbol_right">Sub symbol right:</label>
-            <label index="static_taxes.title">Static taxes</label>
-            <label index="static_taxes_item.cn_iso_2">ISO 3166-1 A2 Country code:</label>
-            <label index="static_taxes_item.cn_iso_3">ISO 3166-1 A3 Country code:</label>
-            <label index="static_taxes_item.cn_iso_nr">ISO 3166-1 Nr Country code:</label>
-            <label index="static_taxes_item.zn_code">ISO 3166-2 Country Zone code:</label>
-            <label index="static_taxes_item.tx_name_en">Tax name (EN):</label>
-            <label index="static_taxes_item.tx_code">Tax code:</label>
-            <label index="static_taxes_item.tx_scope">Juridiction:</label>
-            <label index="static_taxes_item.tx_scope.I.0">Country</label>
-            <label index="static_taxes_item.tx_scope.I.1">State/province</label>
-            <label index="static_taxes_item.tx_class">Class:</label>
-            <label index="static_taxes_item.tx_class.I.0">Taxable goods</label>
-            <label index="static_taxes_item.tx_class.I.1">Taxable services</label>
-            <label index="static_taxes_item.tx_class.I.2">Taxable goods and services</label>
-            <label index="static_taxes_item.tx_rate">Rate:</label>
-            <label index="static_taxes_item.tx_priority">Priority:</label>\r
-                       <label index="static_markets.title">Markets</label>\r
-                       <label index="static_markets.country">Country:</label>\r
-                       <label index="static_markets.mic">MIC:</label>\r
-                       <label index="static_markets.institution_description">Institution:</label>\r
-                       <label index="static_markets.acronym">Acronym:</label>\r
-                       <label index="static_markets.city">City:</label>\r
+                       <label index="static_markets.title">Markets</label>
+                       <label index="static_markets.country">Country:</label>
+                       <label index="static_markets.mic">MIC:</label>
+                       <label index="static_markets.institution_description">Institution:</label>
+                       <label index="static_markets.acronym">Acronym:</label>
+                       <label index="static_markets.city">City:</label>
                        <label index="static_markets.url">URL:</label>
         </languageKey>
         <languageKey index="dk" type="array">
             <label index="static_currencies_item.cu_sub_divisor">Divisor:</label>
             <label index="static_currencies_item.cu_sub_symbol_left">Sub-Symbol links:</label>
             <label index="static_currencies_item.cu_sub_symbol_right">Sub-Symbol rechts:</label>
-            <label index="static_taxes.title">Steuern</label>
-            <label index="static_taxes_item.cn_iso_2">Ländercode nach ISO 3166 A2:</label>
-            <label index="static_taxes_item.cn_iso_3">Ländercode nach ISO 3166 A3:</label>
-            <label index="static_taxes_item.cn_iso_nr">Ländercode nach ISO 3166 Nr:</label>
-            <label index="static_taxes_item.zn_code">Zonenkürzel:</label>
-            <label index="static_taxes_item.tx_name_en">Steuername (EN):</label>
-            <label index="static_taxes_item.tx_code">Steuerkürzel:</label>
-            <label index="static_taxes_item.tx_scope">Geltungsbereich:</label>
-            <label index="static_taxes_item.tx_scope.I.0">Land</label>
-            <label index="static_taxes_item.tx_scope.I.1">Bundesland/Provinz</label>
-            <label index="static_taxes_item.tx_class">Steuerklasse:</label>
-            <label index="static_taxes_item.tx_class.I.0">Steuerpflichtge Waren</label>
-            <label index="static_taxes_item.tx_class.I.1">Steuerpflichtge Dienstleistungen</label>
-            <label index="static_taxes_item.tx_class.I.2">Steuerpflichtge Waren und Dienstleistungen</label>
-            <label index="static_taxes_item.tx_rate">Steuersatz:</label>
-            <label index="static_taxes_item.tx_priority">Priorität:</label>\r
-                       <label index="static_markets.title">Marktplätze</label>\r
-                       <label index="static_markets.country">Land:</label>\r
-                       <label index="static_markets.mic">MIC:</label>\r
-                       <label index="static_markets.institution_description">Institution:</label>\r
-                       <label index="static_markets.acronym">Abkürzung:</label>\r
-                       <label index="static_markets.city">Stadt:</label>\r
+                       <label index="static_markets.title">Marktplätze</label>
+                       <label index="static_markets.country">Land:</label>
+                       <label index="static_markets.mic">MIC:</label>
+                       <label index="static_markets.institution_description">Institution:</label>
+                       <label index="static_markets.acronym">Abkürzung:</label>
+                       <label index="static_markets.city">Stadt:</label>
                        <label index="static_markets.url">URL:</label>
         </languageKey>
         <languageKey index="no" type="array">
             <label index="static_currencies_item.cu_sub_divisor">Diviseur:</label>
             <label index="static_currencies_item.cu_sub_symbol_left">Symbole à gauche - Subdivision:</label>
             <label index="static_currencies_item.cu_sub_symbol_right">Symbole à droite - Subdivision:</label>
-            <label index="static_taxes.title">Taxe</label>
-            <label index="static_taxes_item.cn_iso_2">Code de pays ISO 3166-1 A2:</label>
-            <label index="static_taxes_item.cn_iso_3">Code de pays ISO 3166-1 A3:</label>
-            <label index="static_taxes_item.cn_iso_nr">Code de pays ISO 3166-1 numérique:</label>
-            <label index="static_taxes_item.zn_code">Code de subdivision de pays ISO 3166-2:</label>
-            <label index="static_taxes_item.tx_name_en">Dénomination de la taxe (EN):</label>
-            <label index="static_taxes_item.tx_code">Code de taxe:</label>
-            <label index="static_taxes_item.tx_scope">Juridiction:</label>
-            <label index="static_taxes_item.tx_scope.I.0">Pays</label>
-            <label index="static_taxes_item.tx_scope.I.1">État/province</label>
-            <label index="static_taxes_item.tx_class">Classe:</label>
-            <label index="static_taxes_item.tx_class.I.0">Biens taxables</label>
-            <label index="static_taxes_item.tx_class.I.1">Services taxables</label>
-            <label index="static_taxes_item.tx_class.I.2">Biens et services taxables</label>
-            <label index="static_taxes_item.tx_rate">Taux:</label>
-            <label index="static_taxes_item.tx_priority">Priorité:</label>
         </languageKey>
         <languageKey index="es" type="array">
             <label index="static_countries.title">País - Datos státicos</label>
             <label index="static_currencies_item.cu_sub_divisor">Divisor:</label>
             <label index="static_currencies_item.cu_sub_symbol_left">Símbolo a la izquierda - Subdivisión:</label>
             <label index="static_currencies_item.cu_sub_symbol_right">Símbolo a la derecha - Subdivisión:</label>
-            <label index="static_taxes.title">Impuesto - Datos státicos</label>
-            <label index="static_taxes_item.cn_iso_2">Código de país ISO 2:</label>
-            <label index="static_taxes_item.cn_iso_3">Código de país ISO 3:</label>
-            <label index="static_taxes_item.cn_iso_nr">Código de país ISO numérico:</label>
-            <label index="static_taxes_item.zn_code">Código de subdivisión de país:</label>
-            <label index="static_taxes_item.tx_name_en">Denominación del impuesto (EN):</label>
-            <label index="static_taxes_item.tx_code">Código de impuesto:</label>
-            <label index="static_taxes_item.tx_scope">Juridicción:</label>
-            <label index="static_taxes_item.tx_scope.I.0">País</label>
-            <label index="static_taxes_item.tx_scope.I.1">Estado/provincia</label>
-            <label index="static_taxes_item.tx_class">Clase:</label>
-            <label index="static_taxes_item.tx_class.I.0">Bienes imponibles</label>
-            <label index="static_taxes_item.tx_class.I.1">Servicios imponibles</label>
-            <label index="static_taxes_item.tx_class.I.2">Bienes y servicios imponibles</label>
-            <label index="static_taxes_item.tx_rate">Tasa del impuesto:</label>
-            <label index="static_taxes_item.tx_priority">Prioridad:</label>
         </languageKey>
         <languageKey index="nl" type="array">
         </languageKey>
             <label index="static_currencies_item.cu_sub_divisor" type="integer">181976944</label>
             <label index="static_currencies_item.cu_sub_symbol_left" type="integer">257294363</label>
             <label index="static_currencies_item.cu_sub_symbol_right" type="integer">180538285</label>
-            <label index="static_taxes.title" type="integer">43562229</label>
-            <label index="static_taxes_item.cn_iso_2" type="integer">47145425</label>
-            <label index="static_taxes_item.cn_iso_3" type="integer">129658471</label>
-            <label index="static_taxes_item.cn_iso_nr" type="integer">46311532</label>
-            <label index="static_taxes_item.zn_code" type="integer">117876527</label>
-            <label index="static_taxes_item.tx_name_en" type="integer">226775552</label>
-            <label index="static_taxes_item.tx_code" type="integer">153496813</label>
-            <label index="static_taxes_item.tx_scope" type="integer">92266942</label>
-            <label index="static_taxes_item.tx_scope.I.0" type="integer">93787849</label>
-            <label index="static_taxes_item.tx_scope.I.1" type="integer">151152448</label>
-            <label index="static_taxes_item.tx_class" type="integer">108564327</label>
-            <label index="static_taxes_item.tx_class.I.0" type="integer">180454434</label>
-            <label index="static_taxes_item.tx_class.I.1" type="integer">109297838</label>
-            <label index="static_taxes_item.tx_class.I.2" type="integer">130964316</label>
-            <label index="static_taxes_item.tx_rate" type="integer">167203922</label>
-            <label index="static_taxes_item.tx_priority" type="integer">6238968</label>
         </languageKey>
         <languageKey index="dk" type="array">
         </languageKey>
             <label index="static_currencies_item.cu_sub_divisor" type="integer">181976944</label>
             <label index="static_currencies_item.cu_sub_symbol_left" type="integer">257294363</label>
             <label index="static_currencies_item.cu_sub_symbol_right" type="integer">180538285</label>
-            <label index="static_taxes.title" type="integer">43562229</label>
-            <label index="static_taxes_item.cn_iso_2" type="integer">47145425</label>
-            <label index="static_taxes_item.cn_iso_3" type="integer">129658471</label>
-            <label index="static_taxes_item.cn_iso_nr" type="integer">46311532</label>
-            <label index="static_taxes_item.zn_code" type="integer">117876527</label>
-            <label index="static_taxes_item.tx_name_en" type="integer">226775552</label>
-            <label index="static_taxes_item.tx_code" type="integer">153496813</label>
-            <label index="static_taxes_item.tx_scope" type="integer">92266942</label>
-            <label index="static_taxes_item.tx_scope.I.0" type="integer">93787849</label>
-            <label index="static_taxes_item.tx_scope.I.1" type="integer">151152448</label>
-            <label index="static_taxes_item.tx_class" type="integer">108564327</label>
-            <label index="static_taxes_item.tx_class.I.0" type="integer">180454434</label>
-            <label index="static_taxes_item.tx_class.I.1" type="integer">109297838</label>
-            <label index="static_taxes_item.tx_class.I.2" type="integer">130964316</label>
-            <label index="static_taxes_item.tx_rate" type="integer">167203922</label>
-            <label index="static_taxes_item.tx_priority" type="integer">6238968</label>
         </languageKey>
         <languageKey index="no" type="array">
         </languageKey>
             <label index="static_currencies_item.cu_sub_divisor" type="integer">181976944</label>
             <label index="static_currencies_item.cu_sub_symbol_left" type="integer">257294363</label>
             <label index="static_currencies_item.cu_sub_symbol_right" type="integer">180538285</label>
-            <label index="static_taxes.title" type="integer">43562229</label>
-            <label index="static_taxes_item.cn_iso_2" type="integer">47145425</label>
-            <label index="static_taxes_item.cn_iso_3" type="integer">129658471</label>
-            <label index="static_taxes_item.cn_iso_nr" type="integer">46311532</label>
-            <label index="static_taxes_item.zn_code" type="integer">117876527</label>
-            <label index="static_taxes_item.tx_name_en" type="integer">226775552</label>
-            <label index="static_taxes_item.tx_code" type="integer">153496813</label>
-            <label index="static_taxes_item.tx_scope" type="integer">92266942</label>
-            <label index="static_taxes_item.tx_scope.I.0" type="integer">93787849</label>
-            <label index="static_taxes_item.tx_scope.I.1" type="integer">151152448</label>
-            <label index="static_taxes_item.tx_class" type="integer">108564327</label>
-            <label index="static_taxes_item.tx_class.I.0" type="integer">180454434</label>
-            <label index="static_taxes_item.tx_class.I.1" type="integer">109297838</label>
-            <label index="static_taxes_item.tx_class.I.2" type="integer">130964316</label>
-            <label index="static_taxes_item.tx_rate" type="integer">167203922</label>
-            <label index="static_taxes_item.tx_priority" type="integer">6238968</label>
         </languageKey>
         <languageKey index="es" type="array">
             <label index="static_countries.title" type="integer">126932382</label>
             <label index="static_currencies_item.cu_sub_divisor" type="integer">181976944</label>
             <label index="static_currencies_item.cu_sub_symbol_left" type="integer">257294363</label>
             <label index="static_currencies_item.cu_sub_symbol_right" type="integer">180538285</label>
-            <label index="static_taxes.title" type="integer">43562229</label>
-            <label index="static_taxes_item.cn_iso_2" type="integer">47145425</label>
-            <label index="static_taxes_item.cn_iso_3" type="integer">129658471</label>
-            <label index="static_taxes_item.cn_iso_nr" type="integer">46311532</label>
-            <label index="static_taxes_item.zn_code" type="integer">117876527</label>
-            <label index="static_taxes_item.tx_name_en" type="integer">226775552</label>
-            <label index="static_taxes_item.tx_code" type="integer">153496813</label>
-            <label index="static_taxes_item.tx_scope" type="integer">92266942</label>
-            <label index="static_taxes_item.tx_scope.I.0" type="integer">93787849</label>
-            <label index="static_taxes_item.tx_scope.I.1" type="integer">151152448</label>
-            <label index="static_taxes_item.tx_class" type="integer">108564327</label>
-            <label index="static_taxes_item.tx_class.I.0" type="integer">180454434</label>
-            <label index="static_taxes_item.tx_class.I.1" type="integer">109297838</label>
-            <label index="static_taxes_item.tx_class.I.2" type="integer">130964316</label>
-            <label index="static_taxes_item.tx_rate" type="integer">167203922</label>
-            <label index="static_taxes_item.tx_priority" type="integer">6238968</label>
         </languageKey>
         <languageKey index="nl" type="array">
         </languageKey>
index d26cfff..292ccf3 100644 (file)
@@ -50,7 +50,6 @@
  *  501:     function loadCurrencyInfo($currencyCode)
  *  546:     function formatAmount($amount, $displayCurrencyCode='')
  *  574:     function formatAddress($delim, $streetAddress, $city, $zip, $subdivisionCode='', $countryCode='')
- *  623:     function applyConsumerTaxes($amount, $taxClass=0, $shopCountryCode, $shopCountrySubdivisionCode, $buyerCountryCode, $buyerCountrySubdivisionCode, $EUThreshold=0)
  *  747:     function getCurrentLanguage()
  *
  * TOTAL FUNCTIONS: 13
@@ -250,18 +249,19 @@ class tx_staticinfotables_pi1 extends tslib_pibase {
                                $param = (trim($country) ? trim($country) : $this->defaultCountry);
                                $nameArray = $this->initCountrySubdivisions($param,$addWhere);
                                if($param == $this->defaultCountry) {
-                                       $selectedDefault = $this->defaultCountryZone;
+                                       $defaultSelectedArray = array($this->defaultCountryZone);
                                }
                                break;
                        case 'CURRENCIES':
                                $nameArray = $this->initCurrencies($addWhere);
-                               $selectedDefault = $this->currency;
+                               $defaultSelectedArray = array($this->currency);
                                break;
                        case 'LANGUAGES':
                                $nameArray = $this->initLanguages($addWhere);
                                $defaultSelectedArray = array($this->defaultLanguage);
                                break;
                }
+
                if (!$defaultSelectedArray)     {
                        reset($nameArray);
                        $defaultSelectedArray = array(key($nameArray));
@@ -608,137 +608,6 @@ class tx_staticinfotables_pi1 extends tslib_pibase {
        }
 
        /**
-        * Applying taxes to a given amount
-        *
-        * @param       float           An amount to which taxes should be applied
-        * @param       integer         The class of taxation of the product
-        * @param       string          The ISO alpha-3 code of the country of the selling shop
-        * @param       string          The country subdivision code of the region of the selling shop
-        * @param       string          The ISO alpha-3 code of the country of the buying consumer
-        * @param       string          The country subdivision code of the region of the buying consumer
-        * @param       boolean         Should be set if the shop has sales of goods beyond the regulatory threshold in the buyer's country (when both shop and buyer in EU)
-        * @return      array           An array of 4-plets of applied taxes: ('tx_name','tx_rate','tx_amount','tx_priority')
-        */
-       function applyConsumerTaxes($amount, $taxClass=0, $shopCountryCode, $shopCountrySubdivisionCode, $buyerCountryCode, $buyerCountrySubdivisionCode, $EUThreshold=0)       {
-               global $TYPO3_DB;
-
-               $appliedTaxesIndex = 0;
-               $appliedTaxes = array();
-               $shopCountryCode = ($shopCountryCode) ? $shopCountryCode : $this->defaultCountry;
-               $buyerCountryCode = ($buyerCountryCode) ? $buyerCountryCode : $this->defaultCountry;
-
-                       // Not taxable!
-               if (!$taxClass || !trim($shopCountryCode) || !trim($buyerCountryCode)) {
-                       return $appliedTaxes;
-               }
-
-                       // Get national taxes
-               if (trim($shopCountryCode) == trim($buyerCountryCode)) {
-                       $res = $TYPO3_DB->exec_SELECTquery(
-                               '*',
-                               'static_taxes',
-                               'tx_country_iso_3='.$TYPO3_DB->fullQuoteStr(trim($shopCountryCode),'static_taxes').
-                                       ' AND tx_scope="1"'.
-                                       ' AND (tx_class='.$TYPO3_DB->fullQuoteStr($taxClass,'static_taxes').' OR tx_class="3")'.
-                                       $this->enableFields('static_taxes')
-                       );
-                       while($row = $TYPO3_DB->sql_fetch_assoc($res))  {
-                               $appliedTaxes[$appliedTaxesIndex] = array();
-                               $appliedTaxes[$appliedTaxesIndex]['tx_name'] =  $this->getStaticInfoName('TAXES', $row['tx_code'], trim($shopCountryCode));
-                               $appliedTaxes[$appliedTaxesIndex]['tx_rate'] = doubleval($row['tx_rate']);
-                               $appliedTaxes[$appliedTaxesIndex]['tx_priority'] = $row['tx_priority'];
-                               $appliedTaxesIndex++;
-                       }
-                       $TYPO3_DB->sql_free_result($res);
-
-                               // Get state or provincial taxes
-                       if( trim($shopCountrySubdivisionCode) && trim($buyerCountrySubdivisionCode) &&  trim($shopCountrySubdivisionCode) == trim($buyerCountrySubdivisionCode) ) {
-                               $res = $TYPO3_DB->exec_SELECTquery(
-                                       '*',
-                                       'static_taxes',
-                                       'tx_country_iso_3='.$TYPO3_DB->fullQuoteStr(trim($shopCountryCode),'static_taxes').
-                                               ' AND tx_zn_code='.$TYPO3_DB->fullQuoteStr(trim($shopCountrySubdivisionCode),'static_taxes').
-                                               ' AND tx_scope="2"'.
-                                               ' AND (tx_class='.$TYPO3_DB->fullQuoteStr($taxClass,'static_taxes').' OR tx_class="3")'.
-                                               $this->enableFields('static_taxes')
-                               );
-                               while($row = $TYPO3_DB->sql_fetch_assoc($res))  {
-                                       $appliedTaxes[$appliedTaxesIndex] = array();
-                                       $appliedTaxes[$appliedTaxesIndex]['tx_name'] =  $this->getStaticInfoName('SUBTAXES', $row['tx_code'], trim($shopCountryCode), trim($shopCountrySubdivisionCode));
-                                       $appliedTaxes[$appliedTaxesIndex]['tx_rate'] = doubleval($row['tx_rate']);
-                                       $appliedTaxes[$appliedTaxesIndex]['tx_priority'] = $row['tx_priority'];
-                                       $appliedTaxesIndex++;
-                               }
-                               $TYPO3_DB->sql_free_result($res);
-                       }
-               } else  {
-                               // Apply EU Internal Market rules for under threshold sales
-                       $res = $TYPO3_DB->exec_SELECTquery(
-                               'cn_eu_member',
-                               'static_countries',
-                               'cn_iso_3='.$TYPO3_DB->fullQuoteStr(trim($shopCountryCode),'static_countries')
-                       );
-                       $row = $TYPO3_DB->sql_fetch_assoc($res);
-                       $TYPO3_DB->sql_free_result($res);
-                       $shop_cn_eu_member = $row['cn_eu_member'];
-                       if ($shop_cn_eu_member) {
-                               $res = $TYPO3_DB->exec_SELECTquery(
-                                       'cn_eu_member',
-                                       'static_countries',
-                                       'cn_iso_3='.$TYPO3_DB->fullQuoteStr(trim($buyerCountryCode),'static_countries')
-                               );
-                               $row = $TYPO3_DB->sql_fetch_assoc($res);
-                               $TYPO3_DB->sql_free_result($res);
-                               $buyer_cn_eu_member = $row['cn_eu_member'];
-                               if ($buyer_cn_eu_member) {
-                                                       // Here we apply the rules of the European Union Internal Market
-                                       $taxCountryCode = trim($shopCountryCode);
-                                       if ($taxClass == '1' && $EUThreshold)   {
-                                               $taxCountryCode = trim($buyerCountryCode);
-                                       }
-                                       $res = $TYPO3_DB->exec_SELECTquery(
-                                               '*',
-                                               'static_taxes',
-                                               'tx_country_iso_3='.$TYPO3_DB->fullQuoteStr($taxCountryCode,'static_taxes').
-                                                       ' AND tx_scope="1"'.
-                                                       ' AND (tx_class='.$TYPO3_DB->fullQuoteStr($taxClass,'static_taxes').' OR tx_class="3")'.
-                                                       $this->enableFields('static_taxes')
-                                       );
-                                       while($row = $TYPO3_DB->sql_fetch_assoc($res))  {
-                                               $appliedTaxes[$appliedTaxesIndex] = array();
-                                               $appliedTaxes[$appliedTaxesIndex]['tx_name'] =  $this->getStaticInfoName('TAXES', $row['tx_code'], trim($shopCountryCode));
-                                               $appliedTaxes[$appliedTaxesIndex]['tx_rate'] = doubleval($row['tx_rate']);
-                                               $appliedTaxes[$appliedTaxesIndex]['tx_priority'] = $row['tx_priority'];
-                                               $appliedTaxesIndex++;
-                                       }
-                                       $TYPO3_DB->sql_free_result($res);
-                               }
-                       }
-               }
-
-                       // Apply rates
-               if( count($appliedTaxes) )      {
-                       foreach ($appliedTaxes as $key => $row) {
-                               $priority[$key] = $row['tx_priority'];
-                       }
-                       array_multisort($priority, SORT_ASC, $appliedTaxes);
-                       $priority = $priority['0'];
-                       $appliedTaxesAmount = $amount;
-                       $baseAmount = $appliedTaxesAmount;
-                       foreach ($appliedTaxes as $key => $row) {
-                               if( $row['tx_priority'] > $priority ) {
-                                       $baseAmount = $appliedTaxesAmount;
-                                       $priority = $row['tx_priority'];
-                               }
-                               $taxedAmount = $row['tx_rate']*$baseAmount;
-                               $appliedTaxes[$key]['tx_amount'] = round($taxedAmount, ceil(0 - log10($taxedAmount)) + $this->currencyInfo['cu_decimal_digits']);
-                               $appliedTaxesAmount += $appliedTaxes[$key]['tx_amount'];
-                       }
-               }
-               return $appliedTaxes;
-       }
-
-       /**
         * Returns the current language as iso-2-alpha code
         *
         * @return      string          'DE', 'EN', 'DK', ...
diff --git a/tca.php b/tca.php
index 05f396b..05619ad 100644 (file)
--- a/tca.php
+++ b/tca.php
@@ -618,264 +618,79 @@ $TCA['static_country_zones'] = array(
        )
 );
 
-$TCA['static_taxes'] = Array (
-       'ctrl' => $TCA['static_taxes']['ctrl'],
-       'interface' => Array (
-               'showRecordFieldList' => 'tx_name_en,tx_scope,tx_code,tx_country_iso_3,tx_country_iso_2,tx_country_iso_nr,tx_zn_code,tx_class,tx_rate,tx_priority,crdate,hidden,starttime,endtime'
+$TCA['static_markets'] = array (
+       'ctrl' => $TCA['static_markets']['ctrl'],
+       'interface' => array (
+               'showRecordFieldList' => 'country,mic,institution_description,acronym,city,url'
        ),
-       'columns' => Array (
-               'hidden' => Array (
-                       'exclude' => 0,
-                       'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.hidden',
+       'feInterface' => $TCA['tx_staticmarkets_markets']['feInterface'],
+       'columns' => array (
+               'country' => Array (            
+                       'exclude' => 1,         
+                       'label' => 'LLL:EXT:static_info_tables/locallang_db.xml:static_markets.country',
                        'config' => Array (
-                               'type' => 'check',
-                               'default' => '0'
-                       )
-               ),
-               'starttime' => Array (
-                       'exclude' => 0,
-                       'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.starttime',
-                       'config' => Array (
-                               'type' => 'input',
-                               'size' => '8',
-                               'max' => '20',
-                               'eval' => 'date',
-                               'default' => '0',
-                               'checkbox' => '0'
-                       )
-               ),
-               'endtime' => Array (
-                       'exclude' => 0,
-                       'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.endtime',
-                       'config' => Array (
-                               'type' => 'input',
-                               'size' => '8',
-                               'max' => '20',
-                               'eval' => 'date',
-                               'checkbox' => '0',
-                               'default' => '0',
-                               'range' => Array (
-                                       'upper' => mktime(0,0,0,12,31,2020),
-                                       'lower' => mktime(0,0,0,date('m')-1,date('d'),date('Y'))
-                               )
+                               'type' => 'select',     
+                               'foreign_table' => 'static_countries',  
+                               'foreign_table_where' => 'AND static_countries.pid=###SITEROOT### ORDER BY static_countries.uid',       
+                               'size' => 1,    
+                               'minitems' => 0,
+                               'maxitems' => 1,
                        )
                ),
-               'tx_country_iso_nr' => Array (
-                       'label' => 'LLL:EXT:static_info_tables/locallang_db.xml:static_taxes_item.cn_iso_nr',
-                       'exclude' => '0',
+               'mic' => Array (                
+                       'exclude' => 1,         
+                       'label' => 'LLL:EXT:static_info_tables/locallang_db.xml:static_markets.mic',
                        'config' => Array (
-                               'type' => 'input',
-                               'size' => '5',
-                               'max' => '20',
-                               'eval' => 'int',
-                               'default' => '0'
-                       )
-               ),
-               'tx_country_iso_2' => Array (
-                       'label' => 'LLL:EXT:static_info_tables/locallang_db.xml:static_taxes_item.cn_iso_2',
-                       'exclude' => '0',
-                       'config' => Array (
-                               'type' => 'input',
-                               'size' => '3',
-                               'max' => '2',
-                               'eval' => '',
-                               'default' => ''
-                       )
-               ),
-               'tx_country_iso_3' => Array (
-                       'label' => 'LLL:EXT:static_info_tables/locallang_db.xml:static_taxes_item.cn_iso_3',
-                       'exclude' => '0',
-                       'config' => Array (
-                               'type' => 'input',
-                               'size' => '5',
-                               'max' => '3',
-                               'eval' => 'required,trim',
-                               'default' => ''
-                       )
-               ),
-               'tx_zn_code' => Array (
-                       'label' => 'LLL:EXT:static_info_tables/locallang_db.xml:static_taxes_item.zn_code',
-                       'exclude' => '0',
-                       'config' => Array (
-                               'type' => 'input',
-                               'size' => '18',
-                               'max' => '45',
+                               'type' => 'input',      
+                               'size' => '5',  
+                               'max' => '4',   
                                'eval' => 'trim',
-                               'default' => ''
                        )
                ),
-               'tx_name_en' => Array (
-                       'label' => 'LLL:EXT:static_info_tables/locallang_db.xml:static_taxes_item.tx_name_en',
-                       'exclude' => '0',
+               'institution_description' => Array (            
+                       'exclude' => 1,         
+                       'label' => 'LLL:EXT:static_info_tables/locallang_db.xml:static_markets.institution_description',
                        'config' => Array (
-                               'type' => 'input',
-                               'size' => '30',
-                               'max' => '255',
+                               'type' => 'input',      
+                               'size' => '48', 
+                               'max' => '90',  
                                'eval' => 'trim',
-                               'default' => ''
                        )
                ),
-               'tx_code' => Array (
-                       'label' => 'LLL:EXT:static_info_tables/locallang_db.xml:static_taxes_item.tx_code',
-                       'exclude' => '0',
+               'acronym' => Array (            
+                       'exclude' => 1,         
+                       'label' => 'LLL:EXT:static_info_tables/locallang_db.xml:static_markets.acronym',
                        'config' => Array (
-                               'type' => 'input',
-                               'size' => '5',
-                               'max' => '5',
+                               'type' => 'input',      
+                               'size' => '30', 
+                               'max' => '30',  
                                'eval' => 'trim',
-                               'default' => ''
                        )
                ),
-               'tx_scope' => Array (
-                       'exclude' => 0,
-                       'label' => 'LLL:EXT:static_info_tables/locallang_db.xml:static_taxes_item.tx_scope',
+               'city' => Array (               
+                       'exclude' => 1,         
+                       'label' => 'LLL:EXT:static_info_tables/locallang_db.xml:static_markets.city',
                        'config' => Array (
-                               'type' => 'select',
-                               'items' => Array (
-                                       Array('LLL:EXT:static_info_tables/locallang_db.xml:static_taxes_item.tx_scope.I.0', '1'),
-                                       Array('LLL:EXT:static_info_tables/locallang_db.xml:static_taxes_item.tx_scope.I.1', '2'),
-                               ),
-                       )
-               ),
-               'tx_class' => Array (
-                       'exclude' => 0,
-                       'label' => 'LLL:EXT:static_info_tables/locallang_db.xml:static_taxes_item.tx_class',
-                       'config' => Array (
-                               'type' => 'select',
-                               'items' => Array (
-                                       Array('LLL:EXT:static_info_tables/locallang_db.xml:static_taxes_item.tx_class.I.0', '1'),
-                                       Array('LLL:EXT:static_info_tables/locallang_db.xml:static_taxes_item.tx_class.I.1', '2'),
-                                       Array('LLL:EXT:static_info_tables/locallang_db.xml:static_taxes_item.tx_class.I.2', '3'),
-                               ),
+                               'type' => 'input',      
+                               'size' => '30', 
+                               'max' => '30',  
+                               'eval' => 'trim',
                        )
                ),
-               'tx_rate' => Array (
-                       'label' => 'LLL:EXT:static_info_tables/locallang_db.xml:static_taxes_item.tx_rate',
-                       'exclude' => '0',
+               'url' => Array (                
+                       'exclude' => 1,         
+                       'label' => 'LLL:EXT:static_info_tables/locallang_db.xml:static_markets.url',
                        'config' => Array (
-                               'type' => 'input',
-                               'size' => '12',
-                               'max' => '20',
-                               'eval' => 'required,trim,double',
-                               'default' => '0',
-                               'range' => Array (
-                                       'upper' => 1,
-                                       'lower' => 0)
+                               'type' => 'input',      
+                               'size' => '48', 
+                               'max' => '90',  
+                               'eval' => 'trim',
                        )
                ),
-               'tx_priority' => Array (
-                       'label' => 'LLL:EXT:static_info_tables/locallang_db.xml:static_taxes_item.tx_priority',
-                       'exclude' => '0',
-                       'config' => Array (
-                               'type' => 'input',
-                               'size' => '3',
-                               'max' => '2',
-                               'eval' => 'int',
-                               'default' => '1'
-                       )
-               )
        ),
-       'types' => Array (
-               '1' => Array (
-                       'showitem' => 'tx_name_en;;4;;1-1-1,--palette--;;1;;2-2-2,--palette--;;3;;3-3-3'
-               ),
-               '2' => Array (
-                       'showitem' => 'tx_name_en;;4;;1-1-1,--palette--;;2;;2-2-2,--palette--;;3;;3-3-3'
-               ),
+       'types' => array (
+               '0' => array('showitem' => 'country;;;;1-1-1, mic, institution_description, acronym, city, url')
        ),
-       'palettes' => Array (
-               '1' => Array(
-                       'showitem' => 'tx_country_iso_3,tx_country_iso_2,tx_country_iso_nr',
-                       'canNotCollapse' => '1'
-               ),
-               '2' => Array(
-                       'showitem' => 'tx_country_iso_3,tx_country_iso_2,tx_country_iso_nr,tx_zn_code',
-                       'canNotCollapse' => '1'
-               ),
-               '3' => Array(
-                       'showitem' => 'hidden,starttime,endtime',
-                       'canNotCollapse' => '1'
-               ),
-               '4' => Array(
-                       'showitem' => 'tx_scope,tx_code,tx_class,tx_rate,tx_priority',
-                       'canNotCollapse' => '1'
-               )
-       )
-);\r
-\r
-$TCA['static_markets'] = array (\r
-       'ctrl' => $TCA['static_markets']['ctrl'],\r
-       'interface' => array (\r
-               'showRecordFieldList' => 'country,mic,institution_description,acronym,city,url'\r
-       ),\r
-       'feInterface' => $TCA['tx_staticmarkets_markets']['feInterface'],\r
-       'columns' => array (\r
-               'country' => Array (            \r
-                       'exclude' => 1,         \r
-                       'label' => 'LLL:EXT:static_info_tables/locallang_db.xml:static_markets.country',\r
-                       'config' => Array (\r
-                               'type' => 'select',     \r
-                               'foreign_table' => 'static_countries',  \r
-                               'foreign_table_where' => 'AND static_countries.pid=###SITEROOT### ORDER BY static_countries.uid',       \r
-                               'size' => 1,    \r
-                               'minitems' => 0,\r
-                               'maxitems' => 1,\r
-                       )\r
-               ),\r
-               'mic' => Array (                \r
-                       'exclude' => 1,         \r
-                       'label' => 'LLL:EXT:static_info_tables/locallang_db.xml:static_markets.mic',\r
-                       'config' => Array (\r
-                               'type' => 'input',      \r
-                               'size' => '5',  \r
-                               'max' => '4',   \r
-                               'eval' => 'trim',\r
-                       )\r
-               ),\r
-               'institution_description' => Array (            \r
-                       'exclude' => 1,         \r
-                       'label' => 'LLL:EXT:static_info_tables/locallang_db.xml:static_markets.institution_description',\r
-                       'config' => Array (\r
-                               'type' => 'input',      \r
-                               'size' => '48', \r
-                               'max' => '90',  \r
-                               'eval' => 'trim',\r
-                       )\r
-               ),\r
-               'acronym' => Array (            \r
-                       'exclude' => 1,         \r
-                       'label' => 'LLL:EXT:static_info_tables/locallang_db.xml:static_markets.acronym',\r
-                       'config' => Array (\r
-                               'type' => 'input',      \r
-                               'size' => '30', \r
-                               'max' => '30',  \r
-                               'eval' => 'trim',\r
-                       )\r
-               ),\r
-               'city' => Array (               \r
-                       'exclude' => 1,         \r
-                       'label' => 'LLL:EXT:static_info_tables/locallang_db.xml:static_markets.city',\r
-                       'config' => Array (\r
-                               'type' => 'input',      \r
-                               'size' => '30', \r
-                               'max' => '30',  \r
-                               'eval' => 'trim',\r
-                       )\r
-               ),\r
-               'url' => Array (                \r
-                       'exclude' => 1,         \r
-                       'label' => 'LLL:EXT:static_info_tables/locallang_db.xml:static_markets.url',\r
-                       'config' => Array (\r
-                               'type' => 'input',      \r
-                               'size' => '48', \r
-                               'max' => '90',  \r
-                               'eval' => 'trim',\r
-                       )\r
-               ),\r
-       ),\r
-       'types' => array (\r
-               '0' => array('showitem' => 'country;;;;1-1-1, mic, institution_description, acronym, city, url')\r
-       ),\r
-);\r
+);
 
 ?>
\ No newline at end of file