svn commit: r983544 - /ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml

[hansbak-2]

Author: hansbak
Date: Mon Aug  9 07:39:51 2010
New Revision: 983544

URL: http://svn.apache.org/viewvc?rev=983544&view=rev
Log:
simplyfication of code and comment out log message

Modified:
    ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.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=983544&r1=983543&r2=983544&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 Mon Aug  9 07:39:51 2010
@@ -208,10 +208,7 @@ under the License.
                                 <condition>
                                     <or>
                                         <if-empty field="oldRateAmount"/>
-                                        <and>
-                                            <not><if-empty field="OldRateAmount"/></not>
-                                            <if-compare-field field="rateAmount" operator="not-equals" to-field="oldRateAmount"/>
-                                        </and>
+                                        <if-compare-field field="rateAmount" operator="not-equals" to-field="oldRateAmount"/>
                                     </or>
                                 </condition>
                                 <then>
@@ -263,9 +260,9 @@ under the License.
                             <set field="updTimeEntry.invoiceId" from-field="invoiceItemMap.invoiceId"/>
                             <set field="updTimeEntry.invoiceItemSeqId" from-field="invoiceItemMap.invoiceItemSeqId"/>
                             <call-service service-name="updateTimeEntry" in-map-name="updTimeEntry"/>
-                            <else>
+                            <!-- else>
                                 <log level="info" message="Timeentry: ${timeEntry.timeEntryId} already connected to invoiceId: ${timeEntry.invoiceId}...not added to invoiceItem"/>
-                            </else>
+                            </else-->
                         </if-empty>
                         <else>
                             <set field="errMsg" value="Invoice ${invoiceId} should have the status 'in progress', the status is however: ${invoice.statusId}"/>