svn commit: r690705 - in /ofbiz/trunk: applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml specialpurpose/projectmgr/widget/forms/ProjectForms.xml

[hansbak-2]

Author: hansbak
Date: Sun Aug 31 07:22:43 2008
New Revision: 690705

URL: http://svn.apache.org/viewvc?rev=690705&view=rev
Log:
spaces for tabs

Modified:
    ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml

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=690705&r1=690704&r2=690705&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 Aug 31 07:22:43 2008
@@ -147,80 +147,80 @@
         <iterate entry-name="timeEntry" list-name="timeEntryList">
             <!-- check invoice -->
             <if-compare field="invoice.statusId" operator="equals" value="INVOICE_IN_PROCESS">
-            <!-- only add to invoice if it is not already on an invoice-->
-            <if-empty field="timeEntry.invoiceId">
-                <!--  check if the RateTypeId changed or the first time entry record -->
-                <if>
-                    <condition>
-                        <or>
-                            <if-empty field="oldRateTypeId"/>
-                            <and>
-                                <not><if-empty field="oldRateTypeId"/></not>
-                                <if-compare-field field="timeEntry.rateTypeId" operator="not-equals" to-field="oldRateTypeId"/>
-                            </and>
-                        </or>
-                    </condition>
-                    <then>
+                <!-- only add to invoice if it is not already on an invoice-->
+                <if-empty field="timeEntry.invoiceId">
+                    <!--  check if the RateTypeId changed or the first time entry record -->
+                    <if>
+                        <condition>
+                            <or>
+                                <if-empty field="oldRateTypeId"/>
+                                <and>
+                                    <not><if-empty field="oldRateTypeId"/></not>
+                                    <if-compare-field field="timeEntry.rateTypeId" operator="not-equals" to-field="oldRateTypeId"/>
+                                </and>
+                            </or>
+                        </condition>
+                        <then>
                             <set field="getTimeEntryRate.timeEntryId" from-field="timeEntry.timeEntryId"/>
                             <set field="getTimeEntryRate.currencyUomId" from-field="invoice.currencyUomId"/>
-                        <call-service service-name="getTimeEntryRate" in-map-name="getTimeEntryRate">
-                            <result-to-field result-name="rateAmount"/>
-                        </call-service>
-                        <set field="invoiceItemMap.amount" from-field="rateAmount" default-value="0.0" type="Double"/>
-                        <if-compare field="parameters.combineInvoiceItem" operator="equals" value="Y" >
+                            <call-service service-name="getTimeEntryRate" in-map-name="getTimeEntryRate">
+                                <result-to-field result-name="rateAmount"/>
+                            </call-service>
+                            <set field="invoiceItemMap.amount" from-field="rateAmount" default-value="0.0" type="Double"/>
+                            <if-compare field="parameters.combineInvoiceItem" operator="equals" value="Y" >
                                 <set field="invoiceItemMap.description" value="${workEffort.workEffortName} [Task:${workEffort.workEffortId}]"/>
-                            <get-related value-name="workEffort" relation-name="CustRequestWorkEffort" list-name="custRequestWorkEfforts"/>
-                            <first-from-list entry-name="custRequestWorkEffort" list-name="custRequestWorkEfforts"/>
-                            <get-related-one value-name="custRequestWorkEffort" relation-name="CustRequest" to-value-name="custRequest"/>
-                            <if-not-empty field="custRequest">
+                                <get-related value-name="workEffort" relation-name="CustRequestWorkEffort" list-name="custRequestWorkEfforts"/>
+                                <first-from-list entry-name="custRequestWorkEffort" list-name="custRequestWorkEfforts"/>
+                                <get-related-one value-name="custRequestWorkEffort" relation-name="CustRequest" to-value-name="custRequest"/>
+                                <if-not-empty field="custRequest">
                                     <set field="invoiceItemMap.description" value="${custRequest.custRequestName} [CRQ:${custRequest.custRequestId}]"/>
-                            </if-not-empty>
-                            <set field="invoiceItemMap.quantity" from-field="timeEntry.hours" default-value="0.0" type="Double"/>
-                            <clear-field field-name="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-name="invoiceItemMap.invoiceItemSeqId"/>
-                            </call-service>
-                        </if-compare>
-                    </then>
-                    <else>
-                        <if-compare field="parameters.combineInvoiceItem" operator="equals" value="Y" >
-                            <!-- or combine them when it is the same rate -->
-                            <calculate field-name="invoiceItemMap.quantity">
-                                <calcop operator="get" field-name="invoiceItemMap.quantity"/>
-                                <calcop operator="add" field-name="timeEntry.hours"/>
-                            </calculate>
-                            <call-service service-name="updateInvoiceItem" in-map-name="invoiceItemMap"/>
-                        </if-compare>
-                    </else>                
-                </if>
-                <set field="oldRateTypeId" from-field="timeEntry.rateTypeId"/>
-                
-                <!-- create an invoiceitem for every time entry -->
-                <if-compare field="parameters.combineInvoiceItem" operator="not-equals" value="Y" >
+                                </if-not-empty>
+                                <set field="invoiceItemMap.quantity" from-field="timeEntry.hours" default-value="0.0" type="Double"/>
+                                <clear-field field-name="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-name="invoiceItemMap.invoiceItemSeqId"/>
+                                </call-service>
+                            </if-compare>
+                        </then>
+                        <else>
+                            <if-compare field="parameters.combineInvoiceItem" operator="equals" value="Y" >
+                                <!-- or combine them when it is the same rate -->
+                                <calculate field-name="invoiceItemMap.quantity">
+                                    <calcop operator="get" field-name="invoiceItemMap.quantity"/>
+                                    <calcop operator="add" field-name="timeEntry.hours"/>
+                                </calculate>
+                                <call-service service-name="updateInvoiceItem" in-map-name="invoiceItemMap"/>
+                            </if-compare>
+                        </else>                
+                    </if>
+                    <set field="oldRateTypeId" from-field="timeEntry.rateTypeId"/>
+                    
+                    <!-- create an invoiceitem for every time entry -->
+                    <if-compare field="parameters.combineInvoiceItem" operator="not-equals" value="Y" >
                         <set field="invoiceItemMap.description" from-field="timeEntry.comments"/>
                         <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"/>
-                    <call-service service-name="createInvoiceItem" in-map-name="invoiceItemMap">
-                        <result-to-field result-name="invoiceItemSeqId" field-name="invoiceItemMap.invoiceItemSeqId"/>
-                    </call-service>
-                </if-compare>
-                
-                <!--  update the timeentry -->
-                <set field="timeEntry.invoiceId" from-field="invoiceItemMap.invoiceId"/>
-                <set field="timeEntry.invoiceItemSeqId" from-field="invoiceItemMap.invoiceItemSeqId"/>
-                <store-value value-name="timeEntry"/>
-                <else>
-                    <log level="info" message="Timeentry: ${timeEntry.timeEntryId} already connected to invoiceId: ${timeEntry.invoiceId}...not added to invoiceItem"/>
-                </else>                    
-            </if-empty>
-            <else>
-            <set field="errMsg" value="Invoice ${invoiceId} should have the status 'in progress', the status is however: ${invoice.statusId}"/>
-            <log level="error" message="${errMsg}"/>
-            <add-error error-list-name="errorMessageList"><fail-message message="${errMsg}"/></add-error>
-            <return response-code="error"/>
-            </else>
+                        <set field="invoiceItemMap.quantity" from-field="timeEntry.hours" default-value="0.0" type="Double"/>
+                        <call-service service-name="createInvoiceItem" in-map-name="invoiceItemMap">
+                            <result-to-field result-name="invoiceItemSeqId" field-name="invoiceItemMap.invoiceItemSeqId"/>
+                        </call-service>
+                    </if-compare>
+                    
+                    <!--  update the timeentry -->
+                    <set field="timeEntry.invoiceId" from-field="invoiceItemMap.invoiceId"/>
+                    <set field="timeEntry.invoiceItemSeqId" from-field="invoiceItemMap.invoiceItemSeqId"/>
+                    <store-value value-name="timeEntry"/>
+                    <else>
+                        <log level="info" message="Timeentry: ${timeEntry.timeEntryId} already connected to invoiceId: ${timeEntry.invoiceId}...not added to invoiceItem"/>
+                    </else>                    
+                </if-empty>
+                <else>
+                    <set field="errMsg" value="Invoice ${invoiceId} should have the status 'in progress', the status is however: ${invoice.statusId}"/>
+                    <log level="error" message="${errMsg}"/>
+                    <add-error error-list-name="errorMessageList"><fail-message message="${errMsg}"/></add-error>
+                    <return response-code="error"/>
+                </else>
             </if-compare>
         </iterate>
     </simple-method>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=690705&r1=690704&r2=690705&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Sun Aug 31 07:22:43 2008
@@ -119,7 +119,7 @@
         <field name="plannedHours" map-name="resultProject.projectInfo" title="${uiLabelMap.ProjectMgrPlannedHours}"><display/></field>
         <field name="actualHours" map-name="resultProject.projectInfo" title="${uiLabelMap.ProjectMgrActualHours}"><display/></field>
         <field name="createdStamp" title="${uiLabelMap.FormFieldTitle_createdDate}"><display type="date"/></field>
-    </form>                                        
+    </form>                                            
     <form name="EditSubProjects" list-name="projects" type="list" target="RemoveSubProject"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>