svn commit: r671537 - in /ofbiz/trunk/applications: accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml

[ashish-18]

Author: ashish
Date: Wed Jun 25 05:46:25 2008
New Revision: 671537

URL: http://svn.apache.org/viewvc?rev=671537&view=rev
Log:
Kept the Default values for few fields so that Invoice PDF don't give any error.
Thanks Ratnesh Upadhyay for discussing this issue with me.

Modified:
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml
    ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml

Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml?rev=671537&r1=671536&r2=671537&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml Wed Jun 25 05:46:25 2008
@@ -262,6 +262,11 @@
                 </call-service>
             </if-not-empty>
         </if-empty>
+        <if-not-empty field="parameters.productId">
+            <if-empty field="parameters.quantity">
+                <set field="newEntity.quantity" value="1.0" type="Double"/>
+             </if-empty>
+        </if-not-empty>
         <if-empty field="newEntity.amount">
             <add-error>
                 <fail-message message="The amount value is mandatory"/>

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=671537&r1=671536&r2=671537&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 Wed Jun 25 05:46:25 2008
@@ -154,9 +154,9 @@
                 <set field="createInvoiceItemMap.taxableFlag" value="N"/>
                 <set field="createInvoiceItemMap.invoiceItemTypeId" value="INV_TE_ITEM"/>
                 
-                <set field="createInvoiceItemMap.quantity" from-field="timeEntry.hours"/>
+                <set field="createInvoiceItemMap.quantity" from-field="timeEntry.hours" default-value="0.0" type="Double"/>
                 <set field="createInvoiceItemMap.uomId" value="TF_hr"/>
-                <set field="createInvoiceItemMap.amount" from-field="rateAmount"/>
+                <set field="createInvoiceItemMap.amount" from-field="rateAmount" default-value="0.0" type="Double"/>
                 
                 <set field="createInvoiceItemMap.description" from-field="timeEntry.comments"/>