OFBiz › OFBiz - Commits

svn commit: r690360 - in /ofbiz/trunk: applications/accounting/entitydef/ applications/accounting/script/org/ofbiz/accounting/tax/ applications/accounting/servicedef/ applications/accounting/src/org/ofbiz/accounting/tax/ applications/ecommerce/data/ ap...

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
jleroux@apache.org
Reply | Threaded
Open this post in threaded view
♦
♦
|

svn commit: r690360 - in /ofbiz/trunk: applications/accounting/entitydef/ applications/accounting/script/org/ofbiz/accounting/tax/ applications/accounting/servicedef/ applications/accounting/src/org/ofbiz/accounting/tax/ applications/ecommerce/data/ ap...

jleroux@apache.org
Author: jleroux
Date: Fri Aug 29 11:29:57 2008
New Revision: 690360

URL: http://svn.apache.org/viewvc?rev=690360&view=rev
Log:
Remove
    taxCategory
    taxVatCode
    taxDutyCode
fields from Product entity and all things related.

Removed:
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/tax/TaxRateServices.xml
    ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/SimpleTaxServices.java
    ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreTaxSetup.ftl
Modified:
    ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
    ofbiz/trunk/applications/accounting/servicedef/services_tax.xml
    ofbiz/trunk/applications/ecommerce/data/DemoRentalProduct.xml
    ofbiz/trunk/applications/ecommerce/data/DemoTaxAuthority.xml
    ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml
    ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/taxware/TaxwareUTL.java
    ofbiz/trunk/applications/product/config/ProductUiLabels.xml
    ofbiz/trunk/applications/product/entitydef/entitymodel.xml
    ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
    ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml
    ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml
    ofbiz/trunk/specialpurpose/pos/data/DemoRetail.xml

Modified: ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml?rev=690360&r1=690359&r2=690360&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml Fri Aug 29 11:29:57 2008
@@ -2939,32 +2939,6 @@
             <key-map field-name="taxAuthGeoId" rel-field-name="geoId"/>
         </view-link>
     </view-entity>
-    <entity entity-name="SimpleSalesTaxLookup" package-name="org.ofbiz.accounting.tax" title="Simple Sales Tax Lookup Entity">
-        <description>NOTE: this entity is deprecated by TaxAuthorityRateProduct</description>
-        <field name="productStoreId" type="id-ne"></field>
-        <field name="countryGeoId" type="id-ne"></field>
-        <field name="stateProvinceGeoId" type="id-ne"></field>
-        <field name="taxCategory" type="id-ne"></field>
-        <field name="fromDate" type="date-time"></field>
-        <field name="thruDate" type="date-time"></field>
-        <field name="description" type="description"></field>
-        <field name="minItemPrice" type="currency-amount"></field>
-        <field name="minPurchase" type="currency-amount"></field>
-        <field name="taxShipping" type="indicator"></field>
-        <field name="salesTaxPercentage" type="floating-point"></field>
-        <field name="taxAuthPartyId" type="id"></field>
-        <field name="taxAuthGlAccountId" type="id"></field>
-        <prim-key field="productStoreId"/>
-        <prim-key field="countryGeoId"/>
-        <prim-key field="stateProvinceGeoId"/>
-        <prim-key field="taxCategory"/>
-        <prim-key field="minItemPrice"/>
-        <prim-key field="minPurchase"/>
-        <prim-key field="fromDate"/>
-        <relation type="many" rel-entity-name="Product">
-            <key-map field-name="taxCategory"/>
-        </relation>
-    </entity>
     <entity entity-name="TaxAuthority" package-name="org.ofbiz.accounting.tax" title="Tax Authority Entity">
         <field name="taxAuthGeoId" type="id-ne"></field>
         <field name="taxAuthPartyId" type="id-ne"></field>

Modified: ofbiz/trunk/applications/accounting/servicedef/services_tax.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_tax.xml?rev=690360&r1=690359&r2=690360&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/servicedef/services_tax.xml (original)
+++ ofbiz/trunk/applications/accounting/servicedef/services_tax.xml Fri Aug 29 11:29:57 2008
@@ -196,40 +196,6 @@
         <attribute name="fromDate" type="String" mode="IN" optional="true"/>
     </service>
     
-    <!-- Simple Tax Rate Services (SimpleSalesTaxLookup) -->
-    <service name="simpleTaxCalc" engine="java"
-        location="org.ofbiz.accounting.tax.SimpleTaxServices" invoke="simpleTaxCalc">
-        <description>Simple Calc Tax Service</description>
-        <implements service="calcTaxInterface"/>
-    </service>
-    
-    <service name="createTaxRate" engine="simple"
-        location="org/ofbiz/accounting/tax/TaxRateServices.xml" invoke="createTaxRate">
-        <description>Create a Tax Rate entry</description>
-        <attribute name="productStoreId" type="String" mode="IN" optional="false"/>
-        <attribute name="countryGeoId" type="String" mode="IN" optional="false"/>
-        <attribute name="stateProvinceGeoId" type="String" mode="IN" optional="false"/>
-        <attribute name="taxCategory" type="String" mode="IN" optional="true"/>
-        <attribute name="taxShipping" type="String" mode="IN" optional="false"/>
-        <attribute name="minItemPrice" type="Double" mode="IN" optional="false"/>
-        <attribute name="minPurchase" type="Double" mode="IN" optional="false"/>
-        <attribute name="description" type="String" mode="IN" optional="true"/>
-        <attribute name="salesTaxPercentage" type="Double" mode="IN" optional="false"/>
-        <attribute name="fromDate" type="Timestamp" mode="IN" optional="true"/>
-        <attribute name="thruDate" type="Timestamp" mode="IN" optional="true"/>
-    </service>
-    <service name="removeTaxRate" engine="simple"
-        location="org/ofbiz/accounting/tax/TaxRateServices.xml" invoke="removeTaxRate">
-        <description>Remove a Tax Rate entry</description>
-        <attribute name="productStoreId" type="String" mode="IN" optional="false"/>
-        <attribute name="countryGeoId" type="String" mode="IN" optional="false"/>
-        <attribute name="stateProvinceGeoId" type="String" mode="IN" optional="false"/>
-        <attribute name="taxCategory" type="String" mode="IN" optional="false"/>
-        <attribute name="minItemPrice" type="Double" mode="IN" optional="false"/>
-        <attribute name="minPurchase" type="Double" mode="IN" optional="false"/>
-        <attribute name="fromDate" type="Timestamp" mode="IN" optional="false"/>
-    </service>
-    
     <!-- ZipSales Tax Services -->
     <service name="importZipSalesTaxData" engine="java" transaction-timeout="7200"
         location="org.ofbiz.order.thirdparty.zipsales.ZipSalesServices" invoke="importFlatTable">

Modified: ofbiz/trunk/applications/ecommerce/data/DemoRentalProduct.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/data/DemoRentalProduct.xml?rev=690360&r1=690359&r2=690360&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/data/DemoRentalProduct.xml (original)
+++ ofbiz/trunk/applications/ecommerce/data/DemoRentalProduct.xml Fri Aug 29 11:29:57 2008
@@ -61,8 +61,6 @@
     <ProductStoreRole partyId="admin" roleTypeId="SALES_REP" productStoreId="RentalStore" fromDate="2001-05-13 12:00:00.0"/>
     <ProductStoreKeywordOvrd productStoreId="RentalStore" keyword="gizmo" fromDate="2001-05-13 12:00:00.0" target="100" targetTypeEnumId="KOTT_PRODCAT"/>
 
-    <SimpleSalesTaxLookup productStoreId="RentalStore" countryGeoId="_NA_" stateProvinceGeoId="_NA_" taxCategory="_NA_" fromDate="2001-01-01 00:00:00.001" description="10% OFB Tax" minItemPrice="0.0" minPurchase="0.0" taxShipping="N" salesTaxPercentage="0.1" taxAuthPartyId="OFBIZ_TAX" taxAuthGlAccountId="224000"/>
-
     <WebSite webSiteId="OpenTravelSystem" siteName="The Open source Travel System" productStoreId="RentalStore"/>
     
     <!-- product catalog -->

Modified: ofbiz/trunk/applications/ecommerce/data/DemoTaxAuthority.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/data/DemoTaxAuthority.xml?rev=690360&r1=690359&r2=690360&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/data/DemoTaxAuthority.xml (original)
+++ ofbiz/trunk/applications/ecommerce/data/DemoTaxAuthority.xml Fri Aug 29 11:29:57 2008
@@ -115,6 +115,7 @@
     <TaxAuthorityGlAccount taxAuthGeoId="ON" taxAuthPartyId="ON_TAXMAN" organizationPartyId="Company" glAccountId="224209"/>
     
     <!-- Party TaxAuthority info for Company -->
+    <!-- some interesting information at: http://www.taxadmin.org/fta/rate/tax_stru.html -->
     <PartyTaxAuthInfo partyId="Company" taxAuthGeoId="_NA_" taxAuthPartyId="_NA_" fromDate="2001-05-13 00:00:00.001" thruDate="" partyTaxId="" isExempt="" isNexus="Y"/>
     <PartyTaxAuthInfo partyId="Company" taxAuthGeoId="USA" taxAuthPartyId="USA_IRS" fromDate="2001-05-13 00:00:00.001" thruDate="" partyTaxId="12-3456789" isExempt="Y" isNexus="N"/>
     <PartyTaxAuthInfo partyId="Company" taxAuthGeoId="CA" taxAuthPartyId="CA_BOE" fromDate="2001-05-13 00:00:00.001" thruDate="" partyTaxId="" isExempt="" isNexus="Y"/>
@@ -125,17 +126,4 @@
     <PartyTaxAuthInfo partyId="Company" taxAuthGeoId="CAN" taxAuthPartyId="CAN_TAXMAN" fromDate="2001-05-13 00:00:00.001" thruDate="" partyTaxId="87654321" isExempt="N" isNexus="Y"/>
     <PartyTaxAuthInfo partyId="Company" taxAuthGeoId="ON" taxAuthPartyId="ON_TAXMAN" fromDate="2001-05-13 00:00:00.001" thruDate="" partyTaxId="" isExempt="" isNexus="Y"/>
     
-  <!-- the older style records... -->
-    <SimpleSalesTaxLookup productStoreId="9000" countryGeoId="_NA_" stateProvinceGeoId="_NA_" taxCategory="_NA_" fromDate="2001-05-13 00:00:00.001" description="1% OFB _NA_ Tax" minItemPrice="25.00" minPurchase="0.0" taxShipping="N" salesTaxPercentage="0.01" taxAuthPartyId="_NA_" taxAuthGlAccountId="224000"/>
-    
-    <!-- some interesting information at: http://www.taxadmin.org/fta/rate/tax_stru.html -->
-    <!-- note that these rates are for the given Geo only and do not include local taxes (county, city) -->
-    <SimpleSalesTaxLookup productStoreId="9000" countryGeoId="USA" stateProvinceGeoId="CA" taxCategory="_NA_" fromDate="2001-05-13 00:00:00.001"
-        description="California State Sales Tax" minItemPrice="0.0" minPurchase="0.0" taxShipping="N" salesTaxPercentage="0.0625" taxAuthPartyId="CA_BOE" taxAuthGlAccountId="224100"/>
-    <SimpleSalesTaxLookup productStoreId="9000" countryGeoId="USA" stateProvinceGeoId="NY" taxCategory="_NA_" fromDate="2001-05-13 00:00:00.001"
-        description="New York State Sales Tax" minItemPrice="0.0" minPurchase="0.0" taxShipping="N" salesTaxPercentage="0.0425" taxAuthPartyId="NY_DTF" taxAuthGlAccountId="224200"/>
-    <SimpleSalesTaxLookup productStoreId="9000" countryGeoId="USA" stateProvinceGeoId="TX" taxCategory="_NA_" fromDate="2001-05-13 00:00:00.001"
-        description="Texas State Sales Tax" minItemPrice="0.0" minPurchase="0.0" taxShipping="N" salesTaxPercentage="0.0625" taxAuthPartyId="TX_TAXMAN" taxAuthGlAccountId="224400"/>
-    <SimpleSalesTaxLookup productStoreId="9000" countryGeoId="USA" stateProvinceGeoId="UT" taxCategory="_NA_" fromDate="2001-05-13 00:00:00.001"
-        description="Utah State Sales Tax" minItemPrice="0.0" minPurchase="0.0" taxShipping="N" salesTaxPercentage="0.0475" taxAuthPartyId="UT_TAXMAN" taxAuthGlAccountId="224300"/>
 </entity-engine-xml>

Modified: ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml?rev=690360&r1=690359&r2=690360&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml Fri Aug 29 11:29:57 2008
@@ -2148,16 +2148,6 @@
         <value xml:lang="th">การตั้งค่าสกุลเงินผิดพลาด</value>
         <value xml:lang="zh">设置货币错误： </value>
     </property>
-    <property key="OrderSimpleTaxCalcNoStateTaxCategoryPairFoundWithOrWithoutTaxCat">
-        <value xml:lang="en">SimpleTaxCalc : No State/TaxCategory pair found (with or without taxCat). </value>
-        <value xml:lang="es">Cálculo de impuestos simple: No se encontró categoría de impuestos</value>
-        <value xml:lang="fr">Calcul d'impôt simple : aucune paire d' état/de catégorie trouvé (avec ou sans la catégorie fiscale).</value>
-        <value xml:lang="it">SimpleTaxCalc : Nessun coppia Stato/Categoria Tasse trovata (con o senza taxCat). </value>
-        <value xml:lang="ro">SimpleTaxCalc : Nici-o pereche Stat/Categoria Taxe gasita (cu sau fara taxCat). </value>
-        <value xml:lang="ru">SimpleTaxCalc: Не найдена пара Штат/Налоговая категория (с или без taxCat). </value>
-        <value xml:lang="th">SimpleTaxCalc : ไม่มีรัฐ/พบหมวดหมู่ภาษีคู่ (with or without taxCat). </value>
-        <value xml:lang="zh">简化税务计算：没有找到省/税务类别对 (有或没有税务类别)。 </value>
-    </property>
     <property key="OrderStatusIdNotExist">
         <value xml:lang="en">Status id not exist</value>
         <value xml:lang="es">Código de estado inexistente</value>

Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/taxware/TaxwareUTL.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/taxware/TaxwareUTL.java?rev=690360&r1=690359&r2=690360&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/taxware/TaxwareUTL.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/taxware/TaxwareUTL.java Fri Aug 29 11:29:57 2008
@@ -155,6 +155,7 @@
         this.shipToAddress = v;
     }
 
+    /* deprecated : the taxCategory field does not exist anymore in OFBiz
     public void addItem(GenericValue product, double linePrice, double itemShipping) {
         Record record = outItem.makeRecord("outItem");
 
@@ -169,7 +170,7 @@
                 record.set("FREIGHT_AMOUNT", new Double(itemShipping));
         }
         records.add(record);
-    }
+    }*/
 
     public List getItemAdjustments() {
         return itemAdjustments;

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=690360&r1=690359&r2=690360&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Fri Aug 29 11:29:57 2008
@@ -16732,26 +16732,6 @@
         <value xml:lang="th">การระบุประเภทเป้าหมาย [รหัส]</value>
         <value xml:lang="zh">目标类型枚举 [标识]</value>
     </property>
-    <property key="ProductTaxCategory">
-        <value xml:lang="en">Tax Category</value>
-        <value xml:lang="es">Categoría de impuesto</value>
-        <value xml:lang="fr">Catégorie de taxe</value>
-        <value xml:lang="it">Categoria Tasse</value>
-        <value xml:lang="ro">Categorie Taxe</value>
-        <value xml:lang="ru">Налоговая категория</value>
-        <value xml:lang="th">หมวดหมู่ภาษี</value>
-        <value xml:lang="zh">税务分类</value>
-    </property>
-    <property key="ProductTaxDutyCode">
-        <value xml:lang="en">Tax Duty Code</value>
-        <value xml:lang="es">Código del impuesto</value>
-        <value xml:lang="fr">Code taxe</value>
-        <value xml:lang="it">Codice Tassa</value>
-        <value xml:lang="ro">Cod Taxa</value>
-        <value xml:lang="ru">Код налоговой пошлины</value>
-        <value xml:lang="th">รหัสค่าธรรมเนียมภาษี</value>
-        <value xml:lang="zh">关税代码</value>
-    </property>
     <property key="ProductTaxRate">
         <value xml:lang="en">Tax Rate</value>
         <value xml:lang="es">Porcentaje de Impuesto</value>
@@ -16772,16 +16752,6 @@
         <value xml:lang="th">ภาษีการขนส่ง</value>
         <value xml:lang="zh">货运税</value>
     </property>
-    <property key="ProductTaxVatCode">
-        <value xml:lang="en">Tax Vat Code</value>
-        <value xml:lang="es">Código del IGV</value>
-        <value xml:lang="fr">Code TVA</value>
-        <value xml:lang="it">Codice IVA Tasse</value>
-        <value xml:lang="ro">Cod IVA Taxe</value>
-        <value xml:lang="ru">Код НДС</value>
-        <value xml:lang="th">รหัสภาษีมูลค่าเพิ่ม</value>
-        <value xml:lang="zh">增值税代码</value>
-    </property>
     <property key="ProductTaxable">
         <value xml:lang="en">Taxable</value>
         <value xml:lang="es">Imponible</value>

Modified: ofbiz/trunk/applications/product/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel.xml?rev=690360&r1=690359&r2=690360&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitymodel.xml Fri Aug 29 11:29:57 2008
@@ -2443,9 +2443,6 @@
       <field name="ratingTypeEnum" type="id"></field>
       <field name="returnable" type="indicator"></field>
       <field name="taxable" type="indicator"></field>
-      <field name="taxCategory" type="id"></field>
-      <field name="taxVatCode" type="short-varchar"></field>
-      <field name="taxDutyCode" type="short-varchar"></field>
       <field name="chargeShipping" type="indicator"></field>
       <field name="autoCreateKeywords" type="indicator"></field>
       <field name="includeInPromotions" type="indicator"></field>
@@ -2520,9 +2517,6 @@
       <relation type="many" rel-entity-name="ProductFeatureAndAppl">
         <key-map field-name="productId"/>
       </relation>
-      <relation type="many" rel-entity-name="SimpleSalesTaxLookup">
-        <key-map field-name="taxCategory"/>
-      </relation>
       <relation type="one" fk-name="PROD_SHBX_TYPE" title="Default" rel-entity-name="ShipmentBoxType">
           <key-map field-name="defaultShipmentBoxTypeId" rel-field-name="shipmentBoxTypeId"/>
       </relation>  

Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml?rev=690360&r1=690359&r2=690360&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml Fri Aug 29 11:29:57 2008
@@ -1955,24 +1955,6 @@
         <response name="error" type="view" value="EditProductStorePaySetup"/>
     </request-map>
 
-    <!-- ================ ProductStore Tax Requests ================= -->
-    <request-map uri="EditProductStoreTaxSetup">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="EditProductStoreTaxSetup"/>
-    </request-map>
-    <request-map uri="storeCreateTaxRate">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="createTaxRate"/>
-        <response name="success" type="view" value="EditProductStoreTaxSetup"/>
-        <response name="error" type="view" value="EditProductStoreTaxSetup"/>
-    </request-map>
-    <request-map uri="storeRemoveTaxRate">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="removeTaxRate"/>
-        <response name="success" type="view" value="EditProductStoreTaxSetup"/>
-        <response name="error" type="view" value="EditProductStoreTaxSetup"/>
-    </request-map>
-
     <!-- ================ ProductStore Shipping Requests ================= -->
     <request-map uri="EditProductStoreShipSetup">
         <security https="true" auth="true"/>
@@ -2633,7 +2615,6 @@
     <view-map name="EditProductStoreShipSetup" type="screen" page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreShipSetup"/>
     <view-map name="EditProductStoreShipmentCostEstimates" type="screen" page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreShipmentCostEstimates"/>
     <view-map name="EditProductStoreSurveys" type="screen" page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreSurveys"/>
-    <view-map name="EditProductStoreTaxSetup" type="screen" page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreTaxSetup"/>
     <view-map name="EditProductStorePaySetup" type="screen" page="component://product/widget/catalog/StoreScreens.xml#EditProductStorePaySetup"/>
     <view-map name="EditProductStoreWebSites" type="screen" page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreWebSites"/>
     <view-map name="EditProductStoreKeywordOvrd" type="screen" page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreKeywordOvrd"/>

Modified: ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml?rev=690360&r1=690359&r2=690360&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml Fri Aug 29 11:29:57 2008
@@ -181,9 +181,6 @@
         <field position="1" name="taxable" title="${uiLabelMap.ProductTaxable}">
             <drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
         </field>
-        <field position="2" name="taxCategory" title="${uiLabelMap.ProductTaxCategory}"><text size="10" maxlength="20"/></field>
-        <field position="1" name="taxVatCode" title="${uiLabelMap.ProductTaxVatCode}" ><text size="10" maxlength="20"/></field>
-        <field position="2" name="taxDutyCode" title="${uiLabelMap.ProductTaxDutyCode}" ><text size="10" maxlength="20"/></field>
 
         <field position="1" name="chargeShipping" title="${uiLabelMap.ProductChargeShipping}">
             <drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>

Modified: ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml?rev=690360&r1=690359&r2=690360&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml Fri Aug 29 11:29:57 2008
@@ -268,35 +268,6 @@
             </widgets>
        </section>
     </screen>
-    <screen name="EditProductStoreTaxSetup">
-       <section>
-            <actions>
-                <set field="titleProperty" value="PageTitleEditProductStoreTaxSetup"/>
-                <set field="headerItem" value="store"/>
-                <set field="tabButtonItem" value="EditProductStoreTaxSetup"/>
-                <set field="labelTitleProperty" value="ProductProductStoreTaxSettings"/>
-
-                <set field="productStoreId" from-field="parameters.productStoreId"/>
-                <entity-one entity-name="ProductStore" value-name="productStore" auto-field-map="true"/>
-
-                <entity-condition entity-name="SimpleSalesTaxLookup" list-name="taxItems">
-                    <condition-expr field-name="productStoreId" env-name="productStoreId"/>
-                    <order-by field-name="stateProvinceGeoId"/>
-                    <order-by field-name="taxCategory"/>
-                    <order-by field-name="-fromDate"/>
-                </entity-condition>
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonProductStoreDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <platform-specific>
-                            <html><html-template location="component://product/webapp/catalog/store/EditProductStoreTaxSetup.ftl"/></html>
-                        </platform-specific>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-       </section>
-    </screen>
     <screen name="EditProductStoreShipSetup">
        <section>
             <actions>

Modified: ofbiz/trunk/specialpurpose/pos/data/DemoRetail.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/data/DemoRetail.xml?rev=690360&r1=690359&r2=690360&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/data/DemoRetail.xml (original)
+++ ofbiz/trunk/specialpurpose/pos/data/DemoRetail.xml Fri Aug 29 11:29:57 2008
@@ -66,8 +66,6 @@
     <ProductStoreFacility productStoreId="9100" facilityId="MyRetailStore" fromDate="2001-05-13 12:00:00.0"/>
     <ProductStoreRole partyId="admin" roleTypeId="SALES_REP" productStoreId="9100" fromDate="2001-05-13 12:00:00.0"/>
 
-    <SimpleSalesTaxLookup productStoreId="9100" countryGeoId="_NA_" stateProvinceGeoId="_NA_" taxCategory="_NA_" fromDate="2001-01-01 00:00:00.001" description="10% OFB Tax" minItemPrice="0.00" minPurchase="0.0" taxShipping="N" salesTaxPercentage="0.1"/>
-
     <ProductStoreCatalog productStoreId="9100" prodCatalogId="DemoCatalog" fromDate="2001-05-13 12:00:00.0" sequenceNum="1"/>
 
     <Facility facilityId="MyRetailStore" productStoreId="9100" defaultInventoryItemTypeId="NON_SERIAL_INV_ITEM"/>


Free forum by Nabble Edit this page