You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ofbiz.apache.org by Hans Bakker <ma...@antwebsystems.com> on 2012/01/17 11:15:39 UTC
Re: svn commit: r1232373 - in /ofbiz/trunk/applications/humanres:
config/HumanResEntityLabels.xml entitydef/entitymodel.xml widget/forms/EmplLeaveForms.xml
Hi Erwan,
i am also looking at that
don't you think it is better to move these to demo?
they vary a lot between companies.....
regards,
Hans
On 01/17/2012 04:55 PM, erwan@apache.org wrote:
> Author: erwan
> Date: Tue Jan 17 09:55:47 2012
> New Revision: 1232373
>
> URL: http://svn.apache.org/viewvc?rev=1232373&view=rev
> Log:
> Creating entityLabels in humanres component, and adding some for EmplLeaveType
>
> Added:
> ofbiz/trunk/applications/humanres/config/HumanResEntityLabels.xml
> Modified:
> ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml
> ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml
>
> Added: ofbiz/trunk/applications/humanres/config/HumanResEntityLabels.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/config/HumanResEntityLabels.xml?rev=1232373&view=auto
> ==============================================================================
> --- ofbiz/trunk/applications/humanres/config/HumanResEntityLabels.xml (added)
> +++ ofbiz/trunk/applications/humanres/config/HumanResEntityLabels.xml Tue Jan 17 09:55:47 2012
> @@ -0,0 +1,39 @@
> +<?xml version="1.0" encoding="UTF-8"?>
> +<!--
> +
> + Licensed to the Apache Software Foundation (ASF) under one
> + or more contributor license agreements. See the NOTICE file
> + distributed with this work for additional information
> + regarding copyright ownership. The ASF licenses this file
> + to you under the Apache License, Version 2.0 (the
> + "License"); you may not use this file except in compliance
> + with the License. You may obtain a copy of the License at
> +
> + http://www.apache.org/licenses/LICENSE-2.0
> +
> + Unless required by applicable law or agreed to in writing,
> + software distributed under the License is distributed on an
> + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> + KIND, either express or implied. See the License for the
> + specific language governing permissions and limitations
> + under the License.
> +-->
> +
> +<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
> +<property key="EmplLeaveType.description.INLAND_EARNED">
> +<value xml:lang="en">Inland earned</value>
> +<value xml:lang="fr">Congé payé</value>
> +</property>
> +<property key="EmplLeaveType.description.LOSS_OF_PAY">
> +<value xml:lang="en">Loss of pay</value>
> +<value xml:lang="fr">Sans solde</value>
> +</property>
> +<property key="EmplLeaveType.description.RESTRICTED_HOLIDAY">
> +<value xml:lang="en">Restricted holiday</value>
> +<value xml:lang="fr">Jour férié</value>
> +</property>
> +<property key="EmplLeaveType.description.SPECIAL_DAY_OFF">
> +<value xml:lang="en">Special day off</value>
> +<value xml:lang="fr">Congé</value>
> +</property>
> +</resource>
> \ No newline at end of file
>
> Modified: ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml?rev=1232373&r1=1232372&r2=1232373&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml (original)
> +++ ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml Tue Jan 17 09:55:47 2012
> @@ -459,6 +459,7 @@ under the License.
> </entity>
> <entity entity-name="EmplLeaveType"
> package-name="org.ofbiz.humanres.employment"
> + default-resource-name="HumanResEntityLabels"
> title="Employee Leave Type Entity">
> <field name="leaveTypeId" type="id-ne"/>
> <field name="parentTypeId" type="id-ne"/>
>
> Modified: ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml?rev=1232373&r1=1232372&r2=1232373&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml (original)
> +++ ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml Tue Jan 17 09:55:47 2012
> @@ -66,6 +66,7 @@
> </sub-hyperlink>
> </display-entity>
> </field>
> +<field name="leaveTypeId"><display-entity entity-name="EmplLeaveType"/></field>
> <field name="approverPartyId">
> <display-entity entity-name="PartyNameView" description="${firstName} ${lastName}" key-field-name="partyId">
> <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${approverPartyId}" link-style="buttontext">
> @@ -144,6 +145,7 @@
> </sub-hyperlink>
> </display-entity>
> </field>
> +<field name="leaveTypeId"><display-entity entity-name="EmplLeaveType"/></field>
> <field name="approverPartyId" field-name="approverPartyId">
> <display-entity entity-name="PartyNameView" description="${firstName} ${lastName}" key-field-name="partyId">
> <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${approverPartyId}" link-style="buttontext">
>
>
Re: svn commit: r1232373 - in /ofbiz/trunk/applications/humanres:
config/HumanResEntityLabels.xml entitydef/entitymodel.xml widget/forms/EmplLeaveForms.xml
Posted by Olivier Heintz <ho...@nereide.biz>.
Le 18/01/2012 05:08, Hans Bakker a écrit :
> Not moving the entity labels to demo but the but the following records
> move to demo:
>
> <EmplLeaveType description="Inland Earned Leave" hasTable="N"
> parentTypeId="" leaveTypeId="INLAND_EARNED"/>
> <EmplLeaveType description="Inland Loss of Pay" hasTable="N"
> parentTypeId="" leaveTypeId="LOSS_OF_PAY"/>
> <EmplLeaveType description="Inland Restricted Holiday" hasTable="N"
> parentTypeId="" leaveTypeId="RESTRICTED_HOLIDAY"/>
> <EmplLeaveType description="Inland Special Day Off" hasTable="N"
> parentTypeId="" leaveTypeId="SPECIAL_DAY_OFF"/>
>
>
> Then you can define your own records for a specific customer and no
> need for translation
but for demonstration purpose, translation is needed, so it's more
easier to have it in EntityLabel
otherwise it's necessary to manage a demonstration addon ;-)
>
> and these too in accounting:
>
> <RateType rateTypeId="AVERAGE_PAY_RATE" description="Average Pay Rate"/>
> <RateType rateTypeId="HIGH_PAY_RATE" description="Highest Pay Rate"/>
> <RateType rateTypeId="LOW_PAY_RATE" description="Lowest Pay Rate"/>
>
> If no objections, i will do that in a few days.....
>
>
> if we do that you can set these type directly with seed inside a
> hot-deploy component...
>
> On 01/17/2012 08:10 PM, Erwan de FERRIERES wrote:
>> Le 17/01/2012 11:15, Hans Bakker a écrit :
>>> Hi Erwan,
>>>
>>> i am also looking at that
>>> don't you think it is better to move these to demo?
>>> they vary a lot between companies.....
>>>
>>> regards,
>>> Hans
>>
>> Hi Hans,
>>
>> I don't see how we can move entitylabels to demo. For now, I think
>> this is the best solution. If there is a way to make it, then please
>> do so !
>>
>> cheers,
>>
>>>
>>> On 01/17/2012 04:55 PM, erwan@apache.org wrote:
>>>> Author: erwan
>>>> Date: Tue Jan 17 09:55:47 2012
>>>> New Revision: 1232373
>>>>
>>>> URL: http://svn.apache.org/viewvc?rev=1232373&view=rev
>>>> Log:
>>>> Creating entityLabels in humanres component, and adding some for
>>
>>
>
>
>
Re: svn commit: r1232373 - in /ofbiz/trunk/applications/humanres:
config/HumanResEntityLabels.xml entitydef/entitymodel.xml widget/forms/EmplLeaveForms.xml
Posted by Hans Bakker <ma...@antwebsystems.com>.
Not moving the entity labels to demo but the but the following records
move to demo:
<EmplLeaveType description="Inland Earned Leave" hasTable="N"
parentTypeId="" leaveTypeId="INLAND_EARNED"/>
<EmplLeaveType description="Inland Loss of Pay" hasTable="N"
parentTypeId="" leaveTypeId="LOSS_OF_PAY"/>
<EmplLeaveType description="Inland Restricted Holiday" hasTable="N"
parentTypeId="" leaveTypeId="RESTRICTED_HOLIDAY"/>
<EmplLeaveType description="Inland Special Day Off" hasTable="N"
parentTypeId="" leaveTypeId="SPECIAL_DAY_OFF"/>
Then you can define your own records for a specific customer and no need
for translation
and these too in accounting:
<RateType rateTypeId="AVERAGE_PAY_RATE" description="Average Pay Rate"/>
<RateType rateTypeId="HIGH_PAY_RATE" description="Highest Pay Rate"/>
<RateType rateTypeId="LOW_PAY_RATE" description="Lowest Pay Rate"/>
If no objections, i will do that in a few days.....
if we do that you can set these type directly with seed inside a
hot-deploy component...
On 01/17/2012 08:10 PM, Erwan de FERRIERES wrote:
> Le 17/01/2012 11:15, Hans Bakker a écrit :
>> Hi Erwan,
>>
>> i am also looking at that
>> don't you think it is better to move these to demo?
>> they vary a lot between companies.....
>>
>> regards,
>> Hans
>
> Hi Hans,
>
> I don't see how we can move entitylabels to demo. For now, I think
> this is the best solution. If there is a way to make it, then please
> do so !
>
> cheers,
>
>>
>> On 01/17/2012 04:55 PM, erwan@apache.org wrote:
>>> Author: erwan
>>> Date: Tue Jan 17 09:55:47 2012
>>> New Revision: 1232373
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1232373&view=rev
>>> Log:
>>> Creating entityLabels in humanres component, and adding some for
>
>
Re: svn commit: r1232373 - in /ofbiz/trunk/applications/humanres:
config/HumanResEntityLabels.xml entitydef/entitymodel.xml widget/forms/EmplLeaveForms.xml
Posted by Erwan de FERRIERES <er...@nereide.fr>.
Le 17/01/2012 11:15, Hans Bakker a écrit :
> Hi Erwan,
>
> i am also looking at that
> don't you think it is better to move these to demo?
> they vary a lot between companies.....
>
> regards,
> Hans
Hi Hans,
I don't see how we can move entitylabels to demo. For now, I think this
is the best solution. If there is a way to make it, then please do so !
cheers,
>
> On 01/17/2012 04:55 PM, erwan@apache.org wrote:
>> Author: erwan
>> Date: Tue Jan 17 09:55:47 2012
>> New Revision: 1232373
>>
>> URL: http://svn.apache.org/viewvc?rev=1232373&view=rev
>> Log:
>> Creating entityLabels in humanres component, and adding some for
--
Erwan de FERRIERES
www.nereide.biz