You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ofbiz.apache.org by Adam Heath <do...@brainfood.com> on 2010/11/30 23:10:47 UTC
Re: svn commit: r1021719 - /ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml
On 10/12/2010 04:54 AM, hansbak@apache.org wrote:
> Author: hansbak
> Date: Tue Oct 12 09:54:00 2010
> New Revision: 1021719
>
> URL: http://svn.apache.org/viewvc?rev=1021719&view=rev
> Log:
> correction on rev 1006104
What is the correction?
>
> 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=1021719&r1=1021718&r2=1021719&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 Tue Oct 12 09:54:00 2010
> @@ -243,10 +243,10 @@ under the License.
> <else>
> <if-compare field="parameters.combineInvoiceItem" operator="equals" value="Y">
> <!-- or combine them when it is the same rate, amount and description-->
> +<set field="invoiceItemMap.quantity" from-field="existAmountAndDescriptionInvoiceItems[0].quantity"/>
> <calculate field="invoiceItemMap.quantity">
> <calcop operator="get" field="invoiceItemMap.quantity"/>
> <calcop operator="add" field="timeEntry.hours"/>
> -<calcop operator="add" field="existAmountAndDescriptionInvoiceItems[0].quantity"/>
> </calculate>
> <call-service service-name="updateInvoiceItem" in-map-name="invoiceItemMap"/>
> </if-compare>
>
>