0024045: Amortization Line Accounting Dimensions are ignored when posting an amortization

diff --git a/src/org/openbravo/erpCommon/ad_forms/DocLineAmortization_data.xsql b/src/org/openbravo/erpCommon/ad_forms/DocLineAmortization_data.xsql
--- a/src/org/openbravo/erpCommon/ad_forms/DocLineAmortization_data.xsql
+++ b/src/org/openbravo/erpCommon/ad_forms/DocLineAmortization_data.xsql
@@ -23,12 +23,22 @@
     <SqlMethodComment></SqlMethodComment>
     <Sql>
       <![CDATA[
-        SELECT A_AMORTIZATIONLINE.AD_ORG_ID, A_AMORTIZATIONLINE.LINE, A_AMORTIZATIONLINE.AMORTIZATIONAMT, A_AMORTIZATIONLINE.C_CURRENCY_ID,
-        A_ASSET.M_PRODUCT_ID, A_AMORTIZATIONLINE.A_ASSET_ID, A_AMORTIZATIONLINE.A_AMORTIZATION_ID, A_AMORTIZATIONLINE.A_AMORTIZATIONLINE_ID,
-        A_AMORTIZATIONLINE.C_PROJECT_ID, A_AMORTIZATIONLINE.C_COSTCENTER_ID, A_AMORTIZATIONLINE.USER1_ID, A_AMORTIZATIONLINE.USER2_ID
-        FROM A_AMORTIZATIONLINE, A_ASSET
-        WHERE A_AMORTIZATIONLINE.A_ASSET_ID = A_ASSET.A_ASSET_ID
-        AND A_AMORTIZATIONLINE.A_AMORTIZATION_ID =?
+        SELECT COALESCE(ALAD.AD_ORG_ID, AL.AD_ORG_ID) AS AD_ORG_ID,
+               AL.LINE,
+               AL.C_CURRENCY_ID,
+               AL.A_AMORTIZATION_ID,
+               AL.A_AMORTIZATIONLINE_ID,
+               COALESCE(ALAD.AMT, AL.AMORTIZATIONAMT) AS AMORTIZATIONAMT,
+               COALESCE(ALAD.A_ASSET_ID, ASSET.M_PRODUCT_ID) AS M_PRODUCT_ID,
+               COALESCE(ALAD.A_ASSET_ID, AL.A_ASSET_ID) AS A_ASSET_ID,
+               COALESCE(ALAD.C_PROJECT_ID, AL.C_PROJECT_ID) AS C_PROJECT_ID,
+               COALESCE(ALAD.C_COSTCENTER_ID, AL.C_COSTCENTER_ID) AS C_COSTCENTER_ID,
+               COALESCE(ALAD.USER1_ID, AL.USER1_ID) AS USER1_ID,
+               COALESCE(ALAD.USER2_ID, AL.USER2_ID) AS USER2_ID
+        FROM A_AMORTIZATIONLINE AL JOIN A_ASSET ASSET ON (AL.A_ASSET_ID = ASSET.A_ASSET_ID)
+             LEFT JOIN A_AMORTLINE_ACCTDIMENSION ALAD ON (AL.A_AMORTIZATIONLINE_ID = ALAD.A_AMORTIZATIONLINE_ID)
+        WHERE AL.A_ASSET_ID = ASSET.A_ASSET_ID
+              AND AL.A_AMORTIZATION_ID = ?
      ]]>
      </Sql>
      <Parameter name="A_AMORTIZATION_ID"/>