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

[hansbak-2]

Author: hansbak
Date: Thu Aug  5 08:31:50 2010
New Revision: 982503

URL: http://svn.apache.org/viewvc?rev=982503&view=rev
Log:
allow the update of invoiceId's of  'completed' timesheet entries

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=982503&r1=982502&r2=982503&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 Thu Aug  5 08:31:50 2010
@@ -388,13 +388,16 @@ under the License.
     </simple-method>
 
     <!-- subroutines -->
-    <simple-method method-name="checkTimesheetStatus" short-description="Check access and if the timesheet is in progress">
+    <simple-method method-name="checkTimesheetStatus" short-description="Check access and if the timesheet is in progress, however do allow invoiceId to be updated when completed (need to invoice completed timesheets)">
         <if>
             <condition>
-                <or>
-                    <not><if-empty field="parameters.timesheetId"/></not>
-                    <not><if-empty field="lookedUpValue.timesheetId"/></not>
-                </or>
+                <and>
+                    <or>
+                        <not><if-empty field="parameters.timesheetId"/></not>
+                        <not><if-empty field="lookedUpValue.timesheetId"/></not>
+                    </or>
+                    <if-empty field="parameters.invoiceId"/>
+                </and>
             </condition>
             <then>
                 <if-empty field="parameters.timesheetId">