Index: src-db/database/model/triggers/A_AMORTIZATIONLINE_TRG.xml
===================================================================
--- src-db/database/model/triggers/A_AMORTIZATIONLINE_TRG.xml	(revision 40)
+++ src-db/database/model/triggers/A_AMORTIZATIONLINE_TRG.xml	(revision 43)
@@ -54,7 +54,7 @@
        or COALESCE(:old.A_AMORTIZATION_ID, '0') <> COALESCE(:new.A_AMORTIZATION_ID, '0')
        or COALESCE(:old.LINE, 0) <> COALESCE(:new.LINE, 0)
        or COALESCE(:old.A_ASSET_ID, '0') <> COALESCE(:new.A_ASSET_ID, '0')
-       or COALESCE(:old.AMORTIZATION_PORCENTAGE, 0) <> COALESCE(:new.AMORTIZATION_PORCENTAGE, 0)
+       or COALESCE(:old.AMORTIZATION_PERCENTAGE, 0) <> COALESCE(:new.AMORTIZATION_PERCENTAGE, 0)
        or COALESCE(:old.AMORTIZATIONAMT, 0) <> COALESCE(:new.AMORTIZATIONAMT, 0)
        or COALESCE(:old.C_CURRENCY_ID, '0') <> COALESCE(:new.C_CURRENCY_ID, '0'))
   then
Index: src-db/database/model/functions/A_ASSET_POST.xml
===================================================================
--- src-db/database/model/functions/A_ASSET_POST.xml	(revision 40)
+++ src-db/database/model/functions/A_ASSET_POST.xml	(revision 43)
@@ -48,7 +48,7 @@
     v_AMORTIZATIONSTARTDATE DATE;
     v_AMORTIZATIONTYPE CHAR(2) ;
     v_AMORTIZATIONVALUEAMT NUMBER;
-    v_AMORTIZATIONPORCENTAGE NUMBER;
+    v_AMORTIZATIONPERCENTAGE NUMBER;
     v_ASSETDEPRECIATIONDATE DATE;
     v_ASSETVALUEAMT NUMBER;
     v_C_CURRENCY_ID VARCHAR2(32);
@@ -121,8 +121,8 @@
       WHERE A_asset_ID=v_Record_ID
       )
     WHERE a_Asset_ID=v_Record_ID;
-    SELECT ACCTVALUEAMT, AD_CLIENT_ID, AD_ORG_ID, AD_USER_ID, AMORTIZATIONENDDATE, AMORTIZATIONSTARTDATE, AMORTIZATIONTYPE, AMORTIZATIONVALUEAMT, ANNUALAMORTIZATIONPORCENTAGE, ASSETDEPRECIATIONDATE, ASSETVALUEAMT, C_CURRENCY_ID, CREATEDBY, ISDEPRECIATED, PROCESSING, RESIDUALASSETVALUEAMT, USELIFEMONTHS, USELIFEYEARS, ASSETSCHEDULE, PROCESSED, C_CURRENCY_ID, depreciatedPlan, COALESCE(depreciatedValue,0), COALESCE(DEPRECIATEDPREVIOUSAMT,0), AMORTIZATIONCALCTYPE
-    INTO v_ACCTVALUEAMT, v_AD_CLIENT_ID, v_AD_ORG_ID, v_AD_USER_ID, v_AMORTIZATIONENDDATE, v_AMORTIZATIONSTARTDATE, v_AMORTIZATIONTYPE, v_AMORTIZATIONVALUEAMT, v_AMORTIZATIONPORCENTAGE, v_ASSETDEPRECIATIONDATE, v_ASSETVALUEAMT, v_C_CURRENCY_ID, v_CREATEDBY, v_ISDEPRECIATED, v_PROCESSING, v_RESIDUALASSETVALUEAMT, v_USELIFEMONTHS, v_USELIFEYEARS, v_ASSETSCHEDULE, v_PROCESSED, v_CURRENCY_ID, v_DepreciatedPlan, v_depreciatedValue, v_DEPRECIATEDPREVIOUSAMT, v_AMORTIZATIONCALCTYPE
+    SELECT ACCTVALUEAMT, AD_CLIENT_ID, AD_ORG_ID, AD_USER_ID, AMORTIZATIONENDDATE, AMORTIZATIONSTARTDATE, AMORTIZATIONTYPE, AMORTIZATIONVALUEAMT, ANNUALAMORTIZATIONPERCENTAGE, ASSETDEPRECIATIONDATE, ASSETVALUEAMT, C_CURRENCY_ID, CREATEDBY, ISDEPRECIATED, PROCESSING, RESIDUALASSETVALUEAMT, USELIFEMONTHS, USELIFEYEARS, ASSETSCHEDULE, PROCESSED, C_CURRENCY_ID, depreciatedPlan, COALESCE(depreciatedValue,0), COALESCE(DEPRECIATEDPREVIOUSAMT,0), AMORTIZATIONCALCTYPE
+    INTO v_ACCTVALUEAMT, v_AD_CLIENT_ID, v_AD_ORG_ID, v_AD_USER_ID, v_AMORTIZATIONENDDATE, v_AMORTIZATIONSTARTDATE, v_AMORTIZATIONTYPE, v_AMORTIZATIONVALUEAMT, v_AMORTIZATIONPERCENTAGE, v_ASSETDEPRECIATIONDATE, v_ASSETVALUEAMT, v_C_CURRENCY_ID, v_CREATEDBY, v_ISDEPRECIATED, v_PROCESSING, v_RESIDUALASSETVALUEAMT, v_USELIFEMONTHS, v_USELIFEYEARS, v_ASSETSCHEDULE, v_PROCESSED, v_CURRENCY_ID, v_DepreciatedPlan, v_depreciatedValue, v_DEPRECIATEDPREVIOUSAMT, v_AMORTIZATIONCALCTYPE
     FROM A_ASSET
     WHERE A_ASSET_ID=v_Record_ID;
     DBMS_OUTPUT.PUT_LINE('A_Asset_ID=' || v_Record_ID || ' - AMORTIZATIONTYPE=' || v_AMORTIZATIONTYPE) ;
@@ -130,7 +130,7 @@
     IF COALESCE(v_AMORTIZATIONVALUEAMT, 0)<=0 THEN
      RAISE_APPLICATION_ERROR(-20000, '@AmountNotDefined@') ;
     END IF;
-    IF v_AMORTIZATIONCALCTYPE='PE' AND v_AMORTIZATIONPORCENTAGE IS NULL THEN
+    IF v_AMORTIZATIONCALCTYPE='PE' AND v_AMORTIZATIONPERCENTAGE IS NULL THEN
       RAISE_APPLICATION_ERROR(-20000, '@PercentageNotDefined@') ;
     END IF;
     IF v_AMORTIZATIONCALCTYPE!='PE' AND((v_ASSETSCHEDULE!='YE' AND v_USELIFEMONTHS IS NULL) OR(v_ASSETSCHEDULE='YE' AND v_USELIFEYEARS IS NULL)) THEN
@@ -176,7 +176,7 @@
           END IF; --FINISH_PROCESS
           IF(NOT FINISH_PROCESS) THEN
             if v_AMORTIZATIONCALCTYPE='PE' then
-              v_PercentageGeneral:=v_AMORTIZATIONPORCENTAGE;
+              v_PercentageGeneral:=v_AMORTIZATIONPERCENTAGE;
               v_UseLifeYears:=trunc(100/v_PercentageGeneral) ;
             else
               --  v_PercentageGeneral := 100 / v_USELIFEYEARS;
@@ -236,7 +236,7 @@
               FROM A_AMORTIZATIONLINE
               WHERE A_AMORTIZATION_ID=v_NEW_AMORTIZATION;
               IF((((v_AMORTIZATIONVALUEAMT+v_DEPRECIATEDPREVIOUSAMT) *v_PERCENTAGE/100)>(v_AMORTIZATIONVALUEAMT -v_TotalAmt))OR(v_Inserted+1>=v_USELIFEYEARS)) THEN
-                SELECT COALESCE(SUM(AMORTIZATIONAMT),0), COALESCE(SUM(AMORTIZATION_PORCENTAGE),0)
+                SELECT COALESCE(SUM(AMORTIZATIONAMT),0), COALESCE(SUM(AMORTIZATION_PERCENTAGE),0)
                 INTO v_AMOUNT, v_PERCENTAGE
                 FROM A_AMORTIZATIONLINE
                 WHERE A_ASSET_ID=v_Record_ID;
@@ -253,7 +253,7 @@
                   (
                     A_AMORTIZATION_ID, A_AMORTIZATIONLINE_ID, A_ASSET_ID, AD_CLIENT_ID,
                     AD_ORG_ID, CREATED, CREATEDBY, UPDATED,
-                    UPDATEDBY, AMORTIZATION_PORCENTAGE, AMORTIZATIONAMT, C_CURRENCY_ID,
+                    UPDATEDBY, AMORTIZATION_PERCENTAGE, AMORTIZATIONAMT, C_CURRENCY_ID,
                     ISACTIVE, LINE
                   )
                   VALUES
@@ -286,8 +286,8 @@
           IF(NOT FINISH_PROCESS) THEN
             v_AMORTIZATIONVALUEAMT:=v_AMORTIZATIONVALUEAMT-v_DEPRECIATEDPREVIOUSAMT;
             if v_AMORTIZATIONCALCTYPE='PE' then
-              v_PercentageGeneral:=v_AMORTIZATIONPORCENTAGE/12;
-              v_UseLifeMonths:=trunc(100/v_AMORTIZATIONPORCENTAGE*12) ;
+              v_PercentageGeneral:=v_AMORTIZATIONPERCENTAGE/12;
+              v_UseLifeMonths:=trunc(100/v_AMORTIZATIONPERCENTAGE*12) ;
             else
               --  v_PercentageGeneral := 100 / v_USELIFEYEARS;
               v_UseLifeYears:=v_UseLifeMonths/12;
@@ -340,7 +340,7 @@
               FROM A_AMORTIZATIONLINE
               WHERE A_AMORTIZATION_ID=v_NEW_AMORTIZATION;
               IF(((v_AMORTIZATIONVALUEAMT*v_PERCENTAGE/100)>(v_AMORTIZATIONVALUEAMT-v_TotalAmt))OR(v_Inserted+1>=v_USELIFEMONTHS) ) THEN
-                SELECT COALESCE(SUM(AMORTIZATIONAMT),0), COALESCE(SUM(AMORTIZATION_PORCENTAGE),0)
+                SELECT COALESCE(SUM(AMORTIZATIONAMT),0), COALESCE(SUM(AMORTIZATION_PERCENTAGE),0)
                 INTO v_AMOUNT, v_PERCENTAGE
                 FROM A_AMORTIZATIONLINE
                 WHERE A_ASSET_ID=v_Record_ID;
@@ -356,7 +356,7 @@
                   (
                     A_AMORTIZATION_ID, A_AMORTIZATIONLINE_ID, A_ASSET_ID, AD_CLIENT_ID,
                     AD_ORG_ID, CREATED, CREATEDBY, UPDATED, UPDATEDBY,
-                    AMORTIZATION_PORCENTAGE, AMORTIZATIONAMT, C_CURRENCY_ID, ISACTIVE, LINE
+                    AMORTIZATION_PERCENTAGE, AMORTIZATIONAMT, C_CURRENCY_ID, ISACTIVE, LINE
                   )
                   VALUES
                   (v_NEW_AMORTIZATION, v_AMORTIZATIONLINE, v_Record_ID, v_AD_CLIENT_ID, v_AD_ORG_ID, now(), v_CREATEDBY, now(), v_CREATEDBY, ROUND(v_PERCENTAGE,v_Currency_Pre), ROUND(v_AMOUNT,v_Currency_Pre), v_C_CURRENCY_ID, 'Y', v_LINE) ;
Index: src-db/database/model/tables/A_AMORTIZATIONLINE.xml
===================================================================
--- src-db/database/model/tables/A_AMORTIZATIONLINE.xml	(revision 40)
+++ src-db/database/model/tables/A_AMORTIZATIONLINE.xml	(revision 43)
@@ -45,7 +45,7 @@
         <default/>
         <onCreateDefault/>
       </column>
-      <column name="AMORTIZATION_PORCENTAGE" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false">
+      <column name="AMORTIZATION_PERCENTAGE" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false">
         <default/>
         <onCreateDefault/>
       </column>
Index: src-db/database/model/tables/A_ASSET.xml
===================================================================
--- src-db/database/model/tables/A_ASSET.xml	(revision 40)
+++ src-db/database/model/tables/A_ASSET.xml	(revision 43)
@@ -157,7 +157,7 @@
         <default/>
         <onCreateDefault/>
       </column>
-      <column name="ANNUALAMORTIZATIONPORCENTAGE" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false">
+      <column name="ANNUALAMORTIZATIONPERCENTAGE" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false">
         <default/>
         <onCreateDefault/>
       </column>
Index: src-db/database/model/views/A_ASSET_AMORTIZATION.xml
===================================================================
--- src-db/database/model/views/A_ASSET_AMORTIZATION.xml	(revision 40)
+++ src-db/database/model/views/A_ASSET_AMORTIZATION.xml	(revision 43)
@@ -1,6 +1,6 @@
-<?xml version="1.0"?>
-  <database name="VIEW A_ASSET_AMORTIZATION">
-    <view name="A_ASSET_AMORTIZATION"><![CDATA[SELECT a_asset.ad_client_id, a_asset.ad_org_id, a_asset.isactive, a_asset.created, a_asset.createdby, a_asset.updated, a_asset.updatedby, a_asset.a_asset_id, a_amortization.a_amortization_id, a_amortization.startdate, a_amortization.enddate, a_amortizationline.amortization_porcentage, a_amortizationline.amortizationamt
-   FROM a_asset, a_amortization, a_amortizationline
-  WHERE a_asset.a_asset_id = a_amortizationline.a_asset_id AND a_amortizationline.a_amortization_id = a_amortization.a_amortization_id]]></view>
-  </database>
+<?xml version="1.0"?>
+  <database name="VIEW A_ASSET_AMORTIZATION">
+    <view name="A_ASSET_AMORTIZATION"><![CDATA[SELECT a_asset.ad_client_id, a_asset.ad_org_id, a_asset.isactive, a_asset.created, a_asset.createdby, a_asset.updated, a_asset.updatedby, a_asset.a_asset_id, a_amortization.a_amortization_id, a_amortization.startdate, a_amortization.enddate, a_amortizationline.amortization_percentage, a_amortizationline.amortizationamt
+   FROM a_asset, a_amortization, a_amortizationline
+  WHERE a_asset.a_asset_id = a_amortizationline.a_asset_id AND a_amortizationline.a_amortization_id = a_amortization.a_amortization_id]]></view>
+  </database>
Index: src-db/database/sourcedata/AD_FIELD.xml
===================================================================
--- src-db/database/sourcedata/AD_FIELD.xml	(revision 40)
+++ src-db/database/sourcedata/AD_FIELD.xml	(revision 43)
@@ -326774,11 +326774,11 @@
 <!--802840 UPDATEDBY-->
 <!--802840-->              <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
 <!--802840 NAME-->
-<!--802840-->              <NAME><![CDATA[Machine Type]]></NAME>
+<!--802840-->              <NAME><![CDATA[Machine Category]]></NAME>
 <!--802840 DESCRIPTION-->
 <!--802840-->              <DESCRIPTION><![CDATA[A distinct machine characteristic used for processes.]]></DESCRIPTION>
 <!--802840 HELP-->
-<!--802840-->              <HELP><![CDATA[Identifies a machine type.]]></HELP>
+<!--802840-->              <HELP><![CDATA[Identifies a machine category.]]></HELP>
 <!--802840 ISCENTRALLYMAINTAINED-->
 <!--802840-->              <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--802840 AD_TAB_ID-->
@@ -326829,7 +326829,7 @@
 <!--802841 DESCRIPTION-->
 <!--802841-->              <DESCRIPTION><![CDATA[The act of ensuring the proper working order for a specified item.]]></DESCRIPTION>
 <!--802841 HELP-->
-<!--802841-->              <HELP><![CDATA[Identifies a maintenance of a machine or machine type.]]></HELP>
+<!--802841-->              <HELP><![CDATA[Identifies a maintenance of a machine or machine category.]]></HELP>
 <!--802841 ISCENTRALLYMAINTAINED-->
 <!--802841-->              <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--802841 AD_TAB_ID-->
@@ -327282,11 +327282,11 @@
 <!--802850 UPDATEDBY-->
 <!--802850-->              <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
 <!--802850 NAME-->
-<!--802850-->              <NAME><![CDATA[Machine Type]]></NAME>
+<!--802850-->              <NAME><![CDATA[Machine Category]]></NAME>
 <!--802850 DESCRIPTION-->
 <!--802850-->              <DESCRIPTION><![CDATA[A distinct machine characteristic used for processes.]]></DESCRIPTION>
 <!--802850 HELP-->
-<!--802850-->              <HELP><![CDATA[Identifies a machine type.]]></HELP>
+<!--802850-->              <HELP><![CDATA[Identifies a machine category.]]></HELP>
 <!--802850 ISCENTRALLYMAINTAINED-->
 <!--802850-->              <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--802850 AD_TAB_ID-->
@@ -327531,11 +327531,11 @@
 <!--802855 UPDATEDBY-->
 <!--802855-->              <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
 <!--802855 NAME-->
-<!--802855-->              <NAME><![CDATA[Machine Type]]></NAME>
+<!--802855-->              <NAME><![CDATA[Machine Category]]></NAME>
 <!--802855 DESCRIPTION-->
 <!--802855-->              <DESCRIPTION><![CDATA[A distinct machine characteristic used for processes.]]></DESCRIPTION>
 <!--802855 HELP-->
-<!--802855-->              <HELP><![CDATA[Identifies a machine type.]]></HELP>
+<!--802855-->              <HELP><![CDATA[Identifies a machine category.]]></HELP>
 <!--802855 ISCENTRALLYMAINTAINED-->
 <!--802855-->              <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--802855 AD_TAB_ID-->
@@ -327739,7 +327739,7 @@
 <!--802859 DESCRIPTION-->
 <!--802859-->              <DESCRIPTION><![CDATA[The act of ensuring the proper working order for a specified item.]]></DESCRIPTION>
 <!--802859 HELP-->
-<!--802859-->              <HELP><![CDATA[Identifies a maintenance of a machine or machine type.]]></HELP>
+<!--802859-->              <HELP><![CDATA[Identifies a maintenance of a machine or machine category.]]></HELP>
 <!--802859 ISCENTRALLYMAINTAINED-->
 <!--802859-->              <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--802859 AD_TAB_ID-->
@@ -328192,11 +328192,11 @@
 <!--802868 UPDATEDBY-->
 <!--802868-->              <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
 <!--802868 NAME-->
-<!--802868-->              <NAME><![CDATA[Machine Type]]></NAME>
+<!--802868-->              <NAME><![CDATA[Machine Category]]></NAME>
 <!--802868 DESCRIPTION-->
 <!--802868-->              <DESCRIPTION><![CDATA[A distinct machine characteristic used for processes.]]></DESCRIPTION>
 <!--802868 HELP-->
-<!--802868-->              <HELP><![CDATA[Identifies a machine type.]]></HELP>
+<!--802868-->              <HELP><![CDATA[Identifies a machine category.]]></HELP>
 <!--802868 ISCENTRALLYMAINTAINED-->
 <!--802868-->              <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--802868 AD_TAB_ID-->
@@ -328902,7 +328902,7 @@
 <!--802883 DESCRIPTION-->
 <!--802883-->              <DESCRIPTION><![CDATA[The act of ensuring the proper working order for a specified item.]]></DESCRIPTION>
 <!--802883 HELP-->
-<!--802883-->              <HELP><![CDATA[Identifies a maintenance of a machine or machine type.]]></HELP>
+<!--802883-->              <HELP><![CDATA[Identifies a maintenance of a machine or machine category.]]></HELP>
 <!--802883 ISCENTRALLYMAINTAINED-->
 <!--802883-->              <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--802883 AD_TAB_ID-->
@@ -329410,7 +329410,7 @@
 <!--802895 DESCRIPTION-->
 <!--802895-->              <DESCRIPTION><![CDATA[The act of ensuring the proper working order for a specified item.]]></DESCRIPTION>
 <!--802895 HELP-->
-<!--802895-->              <HELP><![CDATA[Identifies a maintenance of a machine or machine type.]]></HELP>
+<!--802895-->              <HELP><![CDATA[Identifies a maintenance of a machine or machine category.]]></HELP>
 <!--802895 ISCENTRALLYMAINTAINED-->
 <!--802895-->              <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--802895 AD_TAB_ID-->
@@ -329869,7 +329869,7 @@
 <!--802911 DESCRIPTION-->
 <!--802911-->              <DESCRIPTION><![CDATA[The act of ensuring the proper working order for a specified item.]]></DESCRIPTION>
 <!--802911 HELP-->
-<!--802911-->              <HELP><![CDATA[Identifies a maintenance of a machine or machine type.]]></HELP>
+<!--802911-->              <HELP><![CDATA[Identifies a maintenance of a machine or machine category.]]></HELP>
 <!--802911 ISCENTRALLYMAINTAINED-->
 <!--802911-->              <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--802911 AD_TAB_ID-->
@@ -330020,11 +330020,11 @@
 <!--802914 UPDATEDBY-->
 <!--802914-->              <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
 <!--802914 NAME-->
-<!--802914-->              <NAME><![CDATA[Machine Type]]></NAME>
+<!--802914-->              <NAME><![CDATA[Machine Category]]></NAME>
 <!--802914 DESCRIPTION-->
 <!--802914-->              <DESCRIPTION><![CDATA[A distinct machine characteristic used for processes.]]></DESCRIPTION>
 <!--802914 HELP-->
-<!--802914-->              <HELP><![CDATA[Identifies a machine type.]]></HELP>
+<!--802914-->              <HELP><![CDATA[Identifies a machine category.]]></HELP>
 <!--802914 ISCENTRALLYMAINTAINED-->
 <!--802914-->              <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--802914 AD_TAB_ID-->
@@ -331395,7 +331395,7 @@
 <!--802957 DESCRIPTION-->
 <!--802957-->              <DESCRIPTION><![CDATA[The act of ensuring the proper working order for a specified item.]]></DESCRIPTION>
 <!--802957 HELP-->
-<!--802957-->              <HELP><![CDATA[Identifies a maintenance of a machine or machine type.]]></HELP>
+<!--802957-->              <HELP><![CDATA[Identifies a maintenance of a machine or machine category.]]></HELP>
 <!--802957 ISCENTRALLYMAINTAINED-->
 <!--802957-->              <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--802957 AD_TAB_ID-->
@@ -331546,11 +331546,11 @@
 <!--802960 UPDATEDBY-->
 <!--802960-->              <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
 <!--802960 NAME-->
-<!--802960-->              <NAME><![CDATA[Machine Type]]></NAME>
+<!--802960-->              <NAME><![CDATA[Machine Category]]></NAME>
 <!--802960 DESCRIPTION-->
 <!--802960-->              <DESCRIPTION><![CDATA[A distinct machine characteristic used for processes.]]></DESCRIPTION>
 <!--802960 HELP-->
-<!--802960-->              <HELP><![CDATA[Identifies a machine type.]]></HELP>
+<!--802960-->              <HELP><![CDATA[Identifies a machine category.]]></HELP>
 <!--802960 ISCENTRALLYMAINTAINED-->
 <!--802960-->              <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--802960 AD_TAB_ID-->
Index: src-db/database/sourcedata/AD_COLUMN.xml
===================================================================
--- src-db/database/sourcedata/AD_COLUMN.xml	(revision 40)
+++ src-db/database/sourcedata/AD_COLUMN.xml	(revision 43)
@@ -372108,7 +372108,7 @@
 <!--801064 HELP-->
 <!--801064-->              <HELP><![CDATA[Anual percentage used to depreciate this asset.]]></HELP>
 <!--801064 COLUMNNAME-->
-<!--801064-->              <COLUMNNAME><![CDATA[Annualamortizationporcentage]]></COLUMNNAME>
+<!--801064-->              <COLUMNNAME><![CDATA[Annualamortizationpercentage]]></COLUMNNAME>
 <!--801064 AD_TABLE_ID-->
 <!--801064-->              <AD_TABLE_ID><![CDATA[539]]></AD_TABLE_ID>
 <!--801064 AD_REFERENCE_ID-->
@@ -374570,7 +374570,7 @@
 <!--801101 HELP-->
 <!--801101-->              <HELP><![CDATA[Amortization Percentage]]></HELP>
 <!--801101 COLUMNNAME-->
-<!--801101-->              <COLUMNNAME><![CDATA[Amortization_Porcentage]]></COLUMNNAME>
+<!--801101-->              <COLUMNNAME><![CDATA[Amortization_Percentage]]></COLUMNNAME>
 <!--801101 AD_TABLE_ID-->
 <!--801101-->              <AD_TABLE_ID><![CDATA[800061]]></AD_TABLE_ID>
 <!--801101 AD_REFERENCE_ID-->
@@ -409492,7 +409492,7 @@
 <!--802421 HELP-->
 <!--802421-->              <HELP><![CDATA[Amortization Percentage]]></HELP>
 <!--802421 COLUMNNAME-->
-<!--802421-->              <COLUMNNAME><![CDATA[Amortization_Porcentage]]></COLUMNNAME>
+<!--802421-->              <COLUMNNAME><![CDATA[Amortization_Percentage]]></COLUMNNAME>
 <!--802421 AD_TABLE_ID-->
 <!--802421-->              <AD_TABLE_ID><![CDATA[800145]]></AD_TABLE_ID>
 <!--802421 AD_REFERENCE_ID-->
@@ -418541,11 +418541,11 @@
 <!--802572 UPDATEDBY-->
 <!--802572-->              <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
 <!--802572 NAME-->
-<!--802572-->              <NAME><![CDATA[Machine Type]]></NAME>
+<!--802572-->              <NAME><![CDATA[Machine Category]]></NAME>
 <!--802572 DESCRIPTION-->
 <!--802572-->              <DESCRIPTION><![CDATA[A distinct machine characteristic used for processes.]]></DESCRIPTION>
 <!--802572 HELP-->
-<!--802572-->              <HELP><![CDATA[Identifies a machine type.]]></HELP>
+<!--802572-->              <HELP><![CDATA[Identifies a machine category.]]></HELP>
 <!--802572 COLUMNNAME-->
 <!--802572-->              <COLUMNNAME><![CDATA[MA_Machine_Type_ID]]></COLUMNNAME>
 <!--802572 AD_TABLE_ID-->
@@ -418606,11 +418606,11 @@
 <!--802573 UPDATEDBY-->
 <!--802573-->              <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
 <!--802573 NAME-->
-<!--802573-->              <NAME><![CDATA[Machine Type]]></NAME>
+<!--802573-->              <NAME><![CDATA[Machine Category]]></NAME>
 <!--802573 DESCRIPTION-->
 <!--802573-->              <DESCRIPTION><![CDATA[A distinct machine characteristic used for processes.]]></DESCRIPTION>
 <!--802573 HELP-->
-<!--802573-->              <HELP><![CDATA[Identifies a machine type.]]></HELP>
+<!--802573-->              <HELP><![CDATA[Identifies a machine category.]]></HELP>
 <!--802573 COLUMNNAME-->
 <!--802573-->              <COLUMNNAME><![CDATA[MA_Machine_Type_ID]]></COLUMNNAME>
 <!--802573 AD_TABLE_ID-->
@@ -419942,7 +419942,7 @@
 <!--802593 DESCRIPTION-->
 <!--802593-->              <DESCRIPTION><![CDATA[The act of ensuring the proper working order for a specified item.]]></DESCRIPTION>
 <!--802593 HELP-->
-<!--802593-->              <HELP><![CDATA[Identifies a maintenance of a machine or machine type.]]></HELP>
+<!--802593-->              <HELP><![CDATA[Identifies a maintenance of a machine or machine category.]]></HELP>
 <!--802593 COLUMNNAME-->
 <!--802593-->              <COLUMNNAME><![CDATA[MA_Maintenance_ID]]></COLUMNNAME>
 <!--802593 AD_TABLE_ID-->
@@ -420799,11 +420799,11 @@
 <!--802606 UPDATEDBY-->
 <!--802606-->              <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
 <!--802606 NAME-->
-<!--802606-->              <NAME><![CDATA[Machine Type]]></NAME>
+<!--802606-->              <NAME><![CDATA[Machine Category]]></NAME>
 <!--802606 DESCRIPTION-->
 <!--802606-->              <DESCRIPTION><![CDATA[A distinct machine characteristic used for processes.]]></DESCRIPTION>
 <!--802606 HELP-->
-<!--802606-->              <HELP><![CDATA[Identifies a machine type.]]></HELP>
+<!--802606-->              <HELP><![CDATA[Identifies a machine category.]]></HELP>
 <!--802606 COLUMNNAME-->
 <!--802606-->              <COLUMNNAME><![CDATA[MA_Machine_Type_ID]]></COLUMNNAME>
 <!--802606 AD_TABLE_ID-->
@@ -421595,7 +421595,7 @@
 <!--802633 DESCRIPTION-->
 <!--802633-->              <DESCRIPTION><![CDATA[The act of ensuring the proper working order for a specified item.]]></DESCRIPTION>
 <!--802633 HELP-->
-<!--802633-->              <HELP><![CDATA[Identifies a maintenance of a machine or machine type.]]></HELP>
+<!--802633-->              <HELP><![CDATA[Identifies a maintenance of a machine or machine category.]]></HELP>
 <!--802633 COLUMNNAME-->
 <!--802633-->              <COLUMNNAME><![CDATA[MA_Maintenance_ID]]></COLUMNNAME>
 <!--802633 AD_TABLE_ID-->
@@ -422391,7 +422391,7 @@
 <!--802645 DESCRIPTION-->
 <!--802645-->              <DESCRIPTION><![CDATA[The act of ensuring the proper working order for a specified item.]]></DESCRIPTION>
 <!--802645 HELP-->
-<!--802645-->              <HELP><![CDATA[Identifies a maintenance of a machine or machine type.]]></HELP>
+<!--802645-->              <HELP><![CDATA[Identifies a maintenance of a machine or machine category.]]></HELP>
 <!--802645 COLUMNNAME-->
 <!--802645-->              <COLUMNNAME><![CDATA[MA_Maintenance_ID]]></COLUMNNAME>
 <!--802645 AD_TABLE_ID-->
@@ -422586,11 +422586,11 @@
 <!--802648 UPDATEDBY-->
 <!--802648-->              <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
 <!--802648 NAME-->
-<!--802648-->              <NAME><![CDATA[Machine Type]]></NAME>
+<!--802648-->              <NAME><![CDATA[Machine Category]]></NAME>
 <!--802648 DESCRIPTION-->
 <!--802648-->              <DESCRIPTION><![CDATA[A distinct machine characteristic used for processes.]]></DESCRIPTION>
 <!--802648 HELP-->
-<!--802648-->              <HELP><![CDATA[Identifies a machine type.]]></HELP>
+<!--802648-->              <HELP><![CDATA[Identifies a machine category.]]></HELP>
 <!--802648 COLUMNNAME-->
 <!--802648-->              <COLUMNNAME><![CDATA[MA_Machine_Type_ID]]></COLUMNNAME>
 <!--802648 AD_TABLE_ID-->
Index: src-db/database/sourcedata/AD_MESSAGE.xml
===================================================================
--- src-db/database/sourcedata/AD_MESSAGE.xml	(revision 40)
+++ src-db/database/sourcedata/AD_MESSAGE.xml	(revision 43)
@@ -115949,7 +115949,7 @@
 <!--803705 VALUE-->
 <!--803705-->              <VALUE><![CDATA["MA_MACHINE_TYPE_ID" IS NOT NULL]]></VALUE>
 <!--803705 MSGTEXT-->
-<!--803705-->              <MSGTEXT><![CDATA[The field  Machine Type  is mandatory and cannot be left empty]]></MSGTEXT>
+<!--803705-->              <MSGTEXT><![CDATA[The field  Machine Category  is mandatory and cannot be left empty]]></MSGTEXT>
 <!--803705 MSGTYPE-->
 <!--803705-->              <MSGTYPE><![CDATA[E]]></MSGTYPE>
 <!--803705 AD_MODULE_ID-->
Index: src-db/database/sourcedata/AD_ELEMENT.xml
===================================================================
--- src-db/database/sourcedata/AD_ELEMENT.xml	(revision 40)
+++ src-db/database/sourcedata/AD_ELEMENT.xml	(revision 43)
@@ -37374,7 +37374,7 @@
 <!--800258 UPDATEDBY-->
 <!--800258-->              <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
 <!--800258 COLUMNNAME-->
-<!--800258-->              <COLUMNNAME><![CDATA[Amortization_Porcentage]]></COLUMNNAME>
+<!--800258-->              <COLUMNNAME><![CDATA[Amortization_Percentage]]></COLUMNNAME>
 <!--800258 NAME-->
 <!--800258-->              <NAME><![CDATA[Amortization Percentage]]></NAME>
 <!--800258 PRINTNAME-->
@@ -37498,7 +37498,7 @@
 <!--800262 UPDATEDBY-->
 <!--800262-->              <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
 <!--800262 COLUMNNAME-->
-<!--800262-->              <COLUMNNAME><![CDATA[Annualamortizationporcentage]]></COLUMNNAME>
+<!--800262-->              <COLUMNNAME><![CDATA[Annualamortizationpercentage]]></COLUMNNAME>
 <!--800262 NAME-->
 <!--800262-->              <NAME><![CDATA[Annual Depreciation %]]></NAME>
 <!--800262 PRINTNAME-->
@@ -42059,13 +42059,13 @@
 <!--800560 COLUMNNAME-->
 <!--800560-->              <COLUMNNAME><![CDATA[MA_Machine_Type_ID]]></COLUMNNAME>
 <!--800560 NAME-->
-<!--800560-->              <NAME><![CDATA[Machine Type]]></NAME>
+<!--800560-->              <NAME><![CDATA[Machine Category]]></NAME>
 <!--800560 PRINTNAME-->
-<!--800560-->              <PRINTNAME><![CDATA[Machine Type]]></PRINTNAME>
+<!--800560-->              <PRINTNAME><![CDATA[Machine Category]]></PRINTNAME>
 <!--800560 DESCRIPTION-->
 <!--800560-->              <DESCRIPTION><![CDATA[A distinct machine characteristic used for processes.]]></DESCRIPTION>
 <!--800560 HELP-->
-<!--800560-->              <HELP><![CDATA[Identifies a machine type.]]></HELP>
+<!--800560-->              <HELP><![CDATA[Identifies a machine category.]]></HELP>
 <!--800560 AD_MODULE_ID-->
 <!--800560-->              <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800560**************--></AD_ELEMENT>
@@ -42245,7 +42245,7 @@
 <!--800567 DESCRIPTION-->
 <!--800567-->              <DESCRIPTION><![CDATA[The act of ensuring the proper working order for a specified item.]]></DESCRIPTION>
 <!--800567 HELP-->
-<!--800567-->              <HELP><![CDATA[Identifies a maintenance of a machine or machine type.]]></HELP>
+<!--800567-->              <HELP><![CDATA[Identifies a maintenance of a machine or machine category.]]></HELP>
 <!--800567 AD_MODULE_ID-->
 <!--800567-->              <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800567**************--></AD_ELEMENT>
Index: src-db/database/sourcedata/AD_TABLE.xml
===================================================================
--- src-db/database/sourcedata/AD_TABLE.xml	(revision 40)
+++ src-db/database/sourcedata/AD_TABLE.xml	(revision 43)
@@ -17814,7 +17814,7 @@
 <!--800157 NAME-->
 <!--800157-->              <NAME><![CDATA[MA_Machine_Type]]></NAME>
 <!--800157 HELP-->
-<!--800157-->              <HELP><![CDATA[In this table are stored the used machine types to group similar machines.]]></HELP>
+<!--800157-->              <HELP><![CDATA[In this table are stored the used machine categories to group similar machines.]]></HELP>
 <!--800157 TABLENAME-->
 <!--800157-->              <TABLENAME><![CDATA[MA_Machine_Type]]></TABLENAME>
 <!--800157 ISVIEW-->
@@ -17961,7 +17961,7 @@
 <!--800160 NAME-->
 <!--800160-->              <NAME><![CDATA[MA_Maint_Periodicity]]></NAME>
 <!--800160 HELP-->
-<!--800160-->              <HELP><![CDATA[Periodicities of the maintenances defined for machines and machine types.]]></HELP>
+<!--800160-->              <HELP><![CDATA[Periodicities of the maintenances defined for machines and machine categories.]]></HELP>
 <!--800160 TABLENAME-->
 <!--800160-->              <TABLENAME><![CDATA[MA_Maint_Periodicity]]></TABLENAME>
 <!--800160 ISVIEW-->