svn commit: r754669 - in /ofbiz/trunk/applications: accounting/script/org/ofbiz/accounting/rate/ accounting/servicedef/ humanres/servicedef/ workeffort/script/org/ofbiz/workeffort/timesheet/ workeffort/servicedef/

[mrisaliti]

Author: mrisaliti
Date: Sun Mar 15 14:29:06 2009
New Revision: 754669

URL: http://svn.apache.org/viewvc?rev=754669&view=rev
Log:
Edit party rates screen breaks because it has been not converted to BigDecimal (OFBIZ-2241)

Modified:
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml
    ofbiz/trunk/applications/accounting/servicedef/services_rate.xml
    ofbiz/trunk/applications/humanres/servicedef/services.xml
    ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml
    ofbiz/trunk/applications/workeffort/servicedef/services_timesheet.xml

Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml?rev=754669&r1=754668&r2=754669&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml Sun Mar 15 14:29:06 2009
@@ -279,7 +279,7 @@
         <if-not-empty field="amounts">
             <first-from-list entry="amount" list="amounts"/>
             <if-empty field="amount.rateAmount">
-                <set field="amount.rateAmount" value="0" type="Double"/>
+                <set field="amount.rateAmount" value="0" type="BigDecimal"/>
             </if-empty>
             <field-to-result field="amount.rateAmount" result-name="rateAmount"/>
             <field-to-result field="amount.periodTypeId" result-name="periodTypeId"/>

Modified: ofbiz/trunk/applications/accounting/servicedef/services_rate.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_rate.xml?rev=754669&r1=754668&r2=754669&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/servicedef/services_rate.xml (original)
+++ ofbiz/trunk/applications/accounting/servicedef/services_rate.xml Sun Mar 15 14:29:06 2009
@@ -43,7 +43,7 @@
         <description>Get Rate Amount</description>
         <auto-attributes include="pk" mode="IN" optional="true"/>
         <attribute name="level" type="String" mode="OUT" optional="true"/><!-- the level the amount was retrieved from(specific -> general): workEffort, party, emplPositionType, rateType or 'null' if not found-->
-        <attribute name="rateAmount" type="Double" mode="OUT" optional="true"/>
+        <attribute name="rateAmount" type="BigDecimal" mode="OUT" optional="true"/>
         <attribute name="periodTypeId" type="String" mode="INOUT" optional="true"/>
         <attribute name="rateCurrencyUomId" type="String" mode="INOUT" optional="true"/>
         <attribute name="fromDate" type="Timestamp" mode="OUT" optional="true"/>
@@ -57,7 +57,7 @@
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
         <attribute name="organizationPartyId" type="String" mode="IN" optional="true"/>
-        <attribute name="rateAmount" type="Double" mode="IN" optional="true"/>
+        <attribute name="rateAmount" type="BigDecimal" mode="IN" optional="true"/>
         <attribute name="rateCurrencyUomId" type="String" mode="IN" optional="true"/>
         <attribute name="periodTypeId" type="String" mode="IN"/>
         <override name="fromDate" optional="true"/>

Modified: ofbiz/trunk/applications/humanres/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/servicedef/services.xml?rev=754669&r1=754668&r2=754669&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/humanres/servicedef/services.xml Sun Mar 15 14:29:06 2009
@@ -639,7 +639,7 @@
         <permission-service service-name="humanResManagerPermission" main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
-        <attribute name="rateAmount" type="Double" mode="IN" optional="true"/>
+        <attribute name="rateAmount" type="BigDecimal" mode="IN" optional="true"/>
         <attribute name="rateCurrencyUomId" type="String" mode="IN" optional="true"/>
         <attribute name="periodTypeId" type="String" mode="IN"/>
         <override name="fromDate" optional="true"/>

Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml?rev=754669&r1=754668&r2=754669&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml (original)
+++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml Sun Mar 15 14:29:06 2009
@@ -182,12 +182,12 @@
                                 <if-not-empty field="partyRates">
                                     <first-from-list entry="partyRate" list="partyRates"/>
                                     <if-not-empty field="partyRate.percentageUsed">
-                                        <calculate field="timeEntry.hours" type="Double">
+                                        <calculate field="timeEntry.hours" type="BigDecimal">
                                             <calcop operator="multiply" field="timeEntry.hours">
                                                 <calcop operator="get" field="partyRate.percentageUsed"/>
                                             </calcop>
                                         </calculate>
-                                        <calculate field="timeEntry.hours" type="Double">
+                                        <calculate field="timeEntry.hours" type="BigDecimal">
                                             <calcop operator="divide" field="timeEntry.hours">
                                                 <number value="100"/>
                                             </calcop>
@@ -212,7 +212,7 @@
                                     </or>
                                 </condition>
                                 <then>
-                                    <set field="invoiceItemMap.amount" from-field="rateAmount" default-value="0.0" type="Double"/>
+                                    <set field="invoiceItemMap.amount" from-field="rateAmount" default-value="0.0" type="BigDecimal"/>
                                     <if-compare field="parameters.combineInvoiceItem" operator="equals" value="Y" >
                                         <set field="invoiceItemMap.description" value="${workEffort.workEffortName} [Task:${workEffort.workEffortId}]"/>
                                         <get-related value-field="workEffort" relation-name="CustRequestWorkEffort" list="custRequestWorkEfforts"/>
@@ -223,7 +223,7 @@
                                                 <set field="invoiceItemMap.description" value="${custRequest.custRequestName} [CRQ:${custRequest.custRequestId}]"/>
                                             </if-not-empty>
                                         </if-not-empty>
-                                        <set field="invoiceItemMap.quantity" from-field="timeEntry.hours" default-value="0.0" type="Double"/>
+                                        <set field="invoiceItemMap.quantity" from-field="timeEntry.hours" default-value="0.0" type="BigDecimal"/>
                                         <clear-field field="invoiceItemMap.invoiceItemSeqId"/><!-- make sure a new one is created -->
                                         <call-service service-name="createInvoiceItem" in-map-name="invoiceItemMap">
                                             <result-to-field result-name="invoiceItemSeqId" field="invoiceItemMap.invoiceItemSeqId"/>
@@ -249,7 +249,7 @@
                                 <if-empty field="invoiceItemMap.description">
                                     <set field="invoiceItemMap.description" from-field="workEffort.workEffortName"/>
                                 </if-empty>
-                                <set field="invoiceItemMap.quantity" from-field="timeEntry.hours" default-value="0.0" type="Double"/>
+                                <set field="invoiceItemMap.quantity" from-field="timeEntry.hours" default-value="0.0" type="BigDecimal"/>
                                 <clear-field field="invoiceItemMap.invoiceItemSeqId"/><!-- make sure a new one is created -->
                                 <call-service service-name="createInvoiceItem" in-map-name="invoiceItemMap">
                                     <result-to-field result-name="invoiceItemSeqId" field="invoiceItemMap.invoiceItemSeqId"/>

Modified: ofbiz/trunk/applications/workeffort/servicedef/services_timesheet.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/servicedef/services_timesheet.xml?rev=754669&r1=754668&r2=754669&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/servicedef/services_timesheet.xml (original)
+++ ofbiz/trunk/applications/workeffort/servicedef/services_timesheet.xml Sun Mar 15 14:29:06 2009
@@ -144,7 +144,7 @@
         <description>Creates TimeEntry</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <attribute name="currencyUomId" mode="IN" type="String" optional="true"/>
-        <attribute name="rateAmount" type="Double" mode="OUT" optional="true"/>
+        <attribute name="rateAmount" type="BigDecimal" mode="OUT" optional="true"/>
     </service>
     
     <!-- WorkEffortRate Services (WorkEffortAssignmentRate Services now depreciated and replced by RateAmount services )-->