|
Modified: ofbiz/branches/addbirt/applications/accounting/widget/TransactionForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/accounting/widget/TransactionForms.xml?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/accounting/widget/TransactionForms.xml (original) +++ ofbiz/branches/addbirt/applications/accounting/widget/TransactionForms.xml Fri Dec 11 23:11:39 2009 @@ -57,7 +57,7 @@ </field> <field name="performSearch"><hidden value="Y"/></field> <field name="noConditionFind"><hidden value="Y"/></field> - <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"> + <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"> <submit button-type="button"/> </field> </form> Modified: ofbiz/branches/addbirt/applications/accounting/widget/ap/ApScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/accounting/widget/ap/ApScreens.xml?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/accounting/widget/ap/ApScreens.xml (original) +++ ofbiz/branches/addbirt/applications/accounting/widget/ap/ApScreens.xml Fri Dec 11 23:11:39 2009 @@ -76,6 +76,12 @@ <actions> <set field="titleProperty" value="AccountingFindApPaymentGroups"/> <set field="headerItem" value="apPaymentGroups"/> + <entity-condition entity-name="PaymentGroup" list="paymentGroupList"> + <condition-list combine="and"> + <condition-expr field-name="paymentGroupId" from-field="parameters.paymentGroupId" ignore-if-empty="true"/> + <condition-expr field-name="paymentGroupTypeId" value="CHECK_RUN"/> + </condition-list> + </entity-condition> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/branches/addbirt/applications/accounting/widget/ap/forms/InvoiceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/accounting/widget/ap/forms/InvoiceForms.xml?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/accounting/widget/ap/forms/InvoiceForms.xml (original) +++ ofbiz/branches/addbirt/applications/accounting/widget/ap/forms/InvoiceForms.xml Fri Dec 11 23:11:39 2009 @@ -100,7 +100,7 @@ </entity-options> </drop-down> </field> - <field name="search" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="search" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="CommissionRun" type="single" target="CommissionRun"> @@ -115,7 +115,7 @@ <field name="statusId"><hidden value="INVOICE_PAID"/></field> <field name="fromDate" position="1"><date-time/></field> <field name="thruDate" position="2"><date-time/></field> - <field name="search" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="search" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="CommissionReport" type="single" target="FindCommissions"> @@ -130,6 +130,6 @@ </field> <field name="fromDate" position="1"><date-time/></field> <field name="thruDate" position="2"><date-time/></field> - <field name="search" widget-style="smallSubmit" position="1"><submit button-type="button"/></field> + <field name="search" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit" position="1"><submit button-type="button"/></field> </form> </forms> Modified: ofbiz/branches/addbirt/applications/accounting/widget/ar/ArPaymentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/accounting/widget/ar/ArPaymentScreens.xml?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/accounting/widget/ar/ArPaymentScreens.xml (original) +++ ofbiz/branches/addbirt/applications/accounting/widget/ar/ArPaymentScreens.xml Fri Dec 11 23:11:39 2009 @@ -116,6 +116,12 @@ <actions> <set field="titleProperty" value="AccountingFindArPaymentGroups"/> <set field="headerItem" value="paymentGroups"/> + <entity-condition entity-name="PaymentGroup" list="paymentGroupList"> + <condition-list combine="and"> + <condition-expr field-name="paymentGroupId" from-field="parameters.paymentGroupId" ignore-if-empty="true"/> + <condition-expr field-name="paymentGroupTypeId" value="BATCH_PAYMENT"/> + </condition-list> + </entity-condition> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/branches/addbirt/applications/commonext/documents/ApacheOfbizTechnical.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/commonext/documents/ApacheOfbizTechnical.xml?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/commonext/documents/ApacheOfbizTechnical.xml (original) +++ ofbiz/branches/addbirt/applications/commonext/documents/ApacheOfbizTechnical.xml Fri Dec 11 23:11:39 2009 @@ -54,7 +54,7 @@ <section> <title>The production setup guide.</title> <para> - An excellent guide to configure the system in a production environment, read the document at the <link xl:href="http://docs.ofbiz.org/display/OFBTECH/Apache+OFBiz+Technical+Production+Setup+Guide">OFBiz documentation site</link> + An excellent guide to configure the system in a production environment, read the document at the <link xl:href="http://cwiki.apache.org/confluence/display/OFBTECH/Apache+OFBiz+Technical+Production+Setup+Guide">OFBiz documentation site</link> </para> </section> @@ -343,7 +343,7 @@ <section> <title>Revisions Requiring Data Migration.</title> <para> - A List of migration actions you need to perform can be found at the <link xl:href="http://docs.ofbiz.org/display/OFBTECH/Revisions+Requiring+Data+Migration">OFBiz documentation site</link> + A List of migration actions you need to perform can be found at the <link xl:href="http://cwiki.apache.org/confluence/display/OFBTECH/Revisions+Requiring+Data+Migration">OFBiz documentation site</link> </para> </section> </appendix> Modified: ofbiz/branches/addbirt/applications/commonext/documents/ApacheOfbizUser.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/commonext/documents/ApacheOfbizUser.xml?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/commonext/documents/ApacheOfbizUser.xml (original) +++ ofbiz/branches/addbirt/applications/commonext/documents/ApacheOfbizUser.xml Fri Dec 11 23:11:39 2009 @@ -34,10 +34,10 @@ Welcome to Apache OFBiz the ready to use open source ERP system. </para> <para> - A project introduction can be found at the <link xl:href="http://docs.ofbiz.org/display/OFBADMIN/Apache+OFBiz+Project+Overview">OFBiz documentation site</link> + A project introduction can be found at the <link xl:href="http://cwiki.apache.org/confluence/display/OFBADMIN/Apache+OFBiz+Project+Overview">OFBiz documentation site</link> </para> <para> - A general Business setup guide can be found at <link xl:href="http://docs.ofbiz.org/display/OFBENDUSER/Apache+OFBiz+Business+Setup+Guide">OFBiz documentation site</link> + A general Business setup guide can be found at <link xl:href="http://cwiki.apache.org/confluence/display/OFBENDUSER/Apache+OFBiz+Business+Setup+Guide">OFBiz documentation site</link> For a quick setup check the <link xl:href="#componentSetup">Setup component.</link> </para> @@ -55,7 +55,7 @@ <appendix> <title>New features recently added</title> <para> - A description of the new features recently added can be found at the <link xl:href="http://docs.ofbiz.org/display/OFBIZ/Main+New+Features">OFBiz documentation site</link> + A description of the new features recently added can be found at the <link xl:href="http://cwiki.apache.org/confluence/display/OFBIZ/Main+New+Features">OFBiz documentation site</link> </para> </appendix> Modified: ofbiz/branches/addbirt/applications/content/data/helpdata/HELP_CONTENT_IT.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/content/data/helpdata/HELP_CONTENT_IT.xml?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/content/data/helpdata/HELP_CONTENT_IT.xml (original) +++ ofbiz/branches/addbirt/applications/content/data/helpdata/HELP_CONTENT_IT.xml Fri Dec 11 23:11:39 2009 @@ -1,28 +1,28 @@ -<?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. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" - xmlns:xl="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>Panoramica sul gestore di contenuti</title> - <para>Il gestore di contenuti e documenti (CMS/DMS) e' utilizzato per archiviare i dati e per richiamarli in contesti multipli.</para> -</section> - +<?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. +--> +<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" + xmlns:xl="http://www.w3.org/1999/xlink" + xmlns:xi="http://www.w3.org/2001/XInclude" + xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" + xmlns="http://docbook.org/ns/docbook"> + <title>Panoramica sul gestore di contenuti</title> + <para>Il gestore di contenuti e documenti (CMS/DMS) e' utilizzato per archiviare i dati e per richiamarli in contesti multipli.</para> +</section> + Propchange: ofbiz/branches/addbirt/applications/content/data/helpdata/HELP_CONTENT_IT.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: ofbiz/branches/addbirt/applications/content/data/helpdata/HELP_ROOT_FR.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/content/data/helpdata/HELP_ROOT_FR.xml?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/content/data/helpdata/HELP_ROOT_FR.xml (original) +++ ofbiz/branches/addbirt/applications/content/data/helpdata/HELP_ROOT_FR.xml Fri Dec 11 23:11:39 2009 @@ -1,39 +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. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>Bienvenue dans l'aide Apache OFBiz</title> - <section> - <para>Si vous êtes arrivés sur cette page sans sélectionner la page d'index, - c'est qu'il n'y a pas de page d'aide spécifique pour cette catégorie. - </para> - </section> - <section> - <para> - Cette fenêtre permet d'avoir une aide sur les différents composants de l'application Apache OFBiz. - </para> - <para> - L'aide est en cours de traduction. Toutes les contributions sont les bienvenues ! - </para> - </section> -</section> - +<?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. +--> +<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" + xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" + xmlns="http://docbook.org/ns/docbook"> + <title>Bienvenue dans l'aide Apache OFBiz</title> + <section> + <para>Si vous êtes arrivés sur cette page sans sélectionner la page d'index, + c'est qu'il n'y a pas de page d'aide spécifique pour cette catégorie. + </para> + </section> + <section> + <para> + Cette fenêtre permet d'avoir une aide sur les différents composants de l'application Apache OFBiz. + </para> + <para> + L'aide est en cours de traduction. Toutes les contributions sont les bienvenues ! + </para> + </section> +</section> + Propchange: ofbiz/branches/addbirt/applications/content/data/helpdata/HELP_ROOT_FR.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: ofbiz/branches/addbirt/applications/content/data/helpdata/HELP_ROOT_IT.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/content/data/helpdata/HELP_ROOT_IT.xml?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/content/data/helpdata/HELP_ROOT_IT.xml (original) +++ ofbiz/branches/addbirt/applications/content/data/helpdata/HELP_ROOT_IT.xml Fri Dec 11 23:11:39 2009 @@ -1,31 +1,31 @@ -<?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. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>Benvenuto nel sistema di guida in linea di Apache OFBiz</title> - <section> - <para>Se sei arrivato a questa pagina senza aver selezionato l'indice, - significa che non e' ancora disponibile una guida specifica per questa - sezione</para> - </section> -</section> - +<?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. +--> +<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" + xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" + xmlns="http://docbook.org/ns/docbook"> + <title>Benvenuto nel sistema di guida in linea di Apache OFBiz</title> + <section> + <para>Se sei arrivato a questa pagina senza aver selezionato l'indice, + significa che non e' ancora disponibile una guida specifica per questa + sezione</para> + </section> +</section> + Propchange: ofbiz/branches/addbirt/applications/content/data/helpdata/HELP_ROOT_IT.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: ofbiz/branches/addbirt/applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java (original) +++ ofbiz/branches/addbirt/applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java Fri Dec 11 23:11:39 2009 @@ -101,13 +101,10 @@ * @param passThru */ public void setPassThru(Map passThru) { - /* Creates an XSS vulnerability, by passing incoming parameters straight back out to the browser - * commented until someone decides either cleanse the parameters or find an alternative solution if (passThru != null) { this.passThru = FastMap.newInstance(); this.passThru.putAll(passThru); } - */ } /** Modified: ofbiz/branches/addbirt/applications/content/template/HelpTemplate.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/content/template/HelpTemplate.ftl?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/content/template/HelpTemplate.ftl (original) +++ ofbiz/branches/addbirt/applications/content/template/HelpTemplate.ftl Fri Dec 11 23:11:39 2009 @@ -32,6 +32,8 @@ <@orderedlist node=child/> <#elseif child?node_type = 'element' && child?node_name = "itemizedlist"> <@itemizedlist node=child/> + <#elseif child?node_type = 'element' && child?node_name = "mediaobject"> + <@mediaobject node=child/> </#if> </#list> </#macro> @@ -74,7 +76,21 @@ <ul class=dots><@listItems node=node/></ul> </#macro> - +<#macro mediaobject node> + <#list node?children as item> + <#if item?node_type = "element" && item?node_name = "imageobject"> + <#assign fileref = item.imagedata["@fileref"]/> + <#assign depth = item.imagedata["@depth"]/> + <#assign width = item.imagedata["@width"]/> + <#elseif item?node_type = "element" && item?node_name = "textobject"> + <#assign alt = item.phrase/> + <#elseif item?node_type = "element" && item?node_name = "caption"> + <#assign caption = item/> + </#if> + </#list> + <img src="${fileref}" <#if depth?has_content> height="${depth}"</#if> <#if width?has_content> width="${width}"</#if> <#if alt?has_content> alt="${alt}"</#if>/> + <#if caption?has_content><div>${caption}</div></#if> +</#macro> <#macro para para> <@text text=para/> Modified: ofbiz/branches/addbirt/applications/content/webapp/content/survey/SurveyForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/content/webapp/content/survey/SurveyForms.xml?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/content/webapp/content/survey/SurveyForms.xml (original) +++ ofbiz/branches/addbirt/applications/content/webapp/content/survey/SurveyForms.xml Fri Dec 11 23:11:39 2009 @@ -255,7 +255,7 @@ <auto-fields-entity entity-name="SurveyResponse" default-field-type="find"/> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> - <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ListFindSurveyResponse" list-name="listIt" title="" type="list" paginate-target="FindSurveyResponse" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> @@ -284,7 +284,7 @@ <field name="allowUpdate"><drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> - <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="listLookupSurvey" list-name="listIt" title="" type="list" paginate-target="LookupSurvey" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> @@ -307,7 +307,7 @@ <auto-fields-entity entity-name="SurveyResponse" default-field-type="find"/> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> - <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="listLookupSurveyResponse" list-name="listIt" title="" type="list" paginate-target="LookupSurveyResponse" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> Modified: ofbiz/branches/addbirt/applications/content/widget/content/ContentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/content/widget/content/ContentForms.xml?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/content/widget/content/ContentForms.xml (original) +++ ofbiz/branches/addbirt/applications/content/widget/content/ContentForms.xml Fri Dec 11 23:11:39 2009 @@ -64,7 +64,7 @@ </entity-options> </drop-down> </field> - <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ListContent" target="" title="" list-name="listIt" type="list" paginate-target="findContent" Modified: ofbiz/branches/addbirt/applications/content/widget/content/DataResourceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/content/widget/content/DataResourceForms.xml?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/content/widget/content/DataResourceForms.xml (original) +++ ofbiz/branches/addbirt/applications/content/widget/content/DataResourceForms.xml Fri Dec 11 23:11:39 2009 @@ -63,7 +63,7 @@ </entity-options> </drop-down> </field> - <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ListDataResource" target="" title="" list-name="listIt" type="list" paginate-target="findDataResource" @@ -98,7 +98,7 @@ header-row-style="header-row" default-table-style="basic-table"> <auto-fields-entity entity-name="DataResource" default-field-type="find"/> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> - <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> <sort-order> <field-group> <sort-field name="dataResourceId"/> @@ -446,7 +446,7 @@ </entity-options> </drop-down> </field> - <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="listLookupProductFeature" list-name="entityList" title="" type="list" paginate-target="LookupProductFeature" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> Modified: ofbiz/branches/addbirt/applications/humanres/data/helpdata/HELP_HR.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/humanres/data/helpdata/HELP_HR.xml?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/humanres/data/helpdata/HELP_HR.xml (original) +++ ofbiz/branches/addbirt/applications/humanres/data/helpdata/HELP_HR.xml Fri Dec 11 23:11:39 2009 @@ -1,26 +1,26 @@ -<?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. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" - xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>Human Resources Introduction</title> - <para>WIP, to be continued...</para> -</section> +<?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. +--> +<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" + xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" + xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" + xmlns="http://docbook.org/ns/docbook"> + <title>Human Resources Introduction</title> + <para>WIP, to be continued...</para> +</section> Propchange: ofbiz/branches/addbirt/applications/humanres/data/helpdata/HELP_HR.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: ofbiz/branches/addbirt/applications/humanres/data/helpdata/HELP_HR_main.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/humanres/data/helpdata/HELP_HR_main.xml?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/humanres/data/helpdata/HELP_HR_main.xml (original) +++ ofbiz/branches/addbirt/applications/humanres/data/helpdata/HELP_HR_main.xml Fri Dec 11 23:11:39 2009 @@ -1,27 +1,27 @@ -<?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. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" - xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Human Resources Main screen.</title> - <para> This is the default tab for the Human Resources Manager application. WIP, to be - continued...</para> -</section> +<?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. +--> +<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" + xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" + xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" + xmlns="http://docbook.org/ns/docbook"> + <title>The Human Resources Main screen.</title> + <para> This is the default tab for the Human Resources Manager application. WIP, to be + continued...</para> +</section> Propchange: ofbiz/branches/addbirt/applications/humanres/data/helpdata/HELP_HR_main.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: ofbiz/branches/addbirt/applications/humanres/data/helpdata/HELP_HR_training.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/humanres/data/helpdata/HELP_HR_training.xml?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/humanres/data/helpdata/HELP_HR_training.xml (original) +++ ofbiz/branches/addbirt/applications/humanres/data/helpdata/HELP_HR_training.xml Fri Dec 11 23:11:39 2009 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?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 @@ -12,117 +12,117 @@ CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---> -<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" - xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>Simple Howto for the moment, work in progress...</title> - <para>Introduction: Trainings in HR module includes Training Calendar where we can create new - schedules from trainings available in an organization. Admin can assign trainings & - employee can request for scheduled trainings. Employee can also check status of their training - requests & assignments. </para> - <para/> - <para>Need of Trainings in HR: </para> - <para> - <itemizedlist> - <listitem> - <para>Training and development of professionals fills up the skill gaps and further improve - the levels of proficiency. </para> - </listitem> - <listitem> - <para>Training and development manages constantly changing business and industrial scenario - and therefore, matches with the requirements or demands of changes on the organizations. - </para> - </listitem> - <listitem> - <para>Creates a learning organization culture.</para> - </listitem> - </itemizedlist> - </para> - <para>Organizational development: </para> - <para> - <itemizedlist> - <listitem> - <para>Organization decides to use certain initiatives and wants to train and develop a good - number of people in the entire organization or the people in certain chosen departments or - projects on those initiatives. </para> - </listitem> - <listitem> - <para>Prepares the organization to meet the needs of legal/statutory requirements. Features - of Trainings: </para> - </listitem> - <listitem> - <para>New Trainings can be added/modified. </para> - </listitem> - <listitem> - <para>Trainings can be scheduled in the calendar. </para> - </listitem> - <listitem> - <para>Employees can apply to supervisor for available scheduled trainings but, cannot - request same training event again to same approver </para> - </listitem> - <listitem> - <para>Admin can assign trainings to Employees. </para> - </listitem> - <listitem> - <para>Admin can approve/reject the trainings requested to him but, once rejected cannot be - approved again. </para> - </listitem> - <listitem> - <para>Employees can check the status of their training requests and Trainings assigned to - them. </para> - <para/> - </listitem> - </itemizedlist> - </para> - <para>Road Ahead: Currently we have implemented Trainings under HR module. We are working on the - implementation of Training calendar in profile tab of Employee. We are also planning to - introduce trainer's information in training calendar.</para> - <para/> - <section> - <para>In "GlobalHRSetting" </para> - <orderedlist> - <listitem> - <para>Admin can create & manage the trainings provided by the organization. </para> - </listitem> - </orderedlist> - </section> - <section> - <para>In "Training Calendar" </para> - <para> - <orderedlist> - <listitem> - <para>Admin can schedule a training through training calender. </para> - </listitem> - <listitem> - <para>Admin can assign training to an employee(right half of calendar screen). </para> - </listitem> - <listitem> - <para> Employee with his login can request for Training to admin from the calendar. - </para> - </listitem> - <listitem> - <para> Employee cannot request same training event again to same approver. </para> - </listitem> - </orderedlist> - </para> - </section> - <section> - <para>In "Training Approval" tab (in case of Employee login tab name would be "Training - Status")</para> - <para> - <orderedlist> - <listitem> - <para>Admin can approve/reject the training requested to him </para> - </listitem> - <listitem> - <para>Admin can not change the training status once it is rejected. </para> - </listitem> - <listitem> - <para>Employee can check status of requested and assigned trainings. </para> - </listitem> - </orderedlist> - </para> - </section> -</section> +--> +<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" + xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" + xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" + xmlns="http://docbook.org/ns/docbook"> + <title>Simple Howto for the moment, work in progress...</title> + <para>Introduction: Trainings in HR module includes Training Calendar where we can create new + schedules from trainings available in an organization. Admin can assign trainings & + employee can request for scheduled trainings. Employee can also check status of their training + requests & assignments. </para> + <para/> + <para>Need of Trainings in HR: </para> + <para> + <itemizedlist> + <listitem> + <para>Training and development of professionals fills up the skill gaps and further improve + the levels of proficiency. </para> + </listitem> + <listitem> + <para>Training and development manages constantly changing business and industrial scenario + and therefore, matches with the requirements or demands of changes on the organizations. + </para> + </listitem> + <listitem> + <para>Creates a learning organization culture.</para> + </listitem> + </itemizedlist> + </para> + <para>Organizational development: </para> + <para> + <itemizedlist> + <listitem> + <para>Organization decides to use certain initiatives and wants to train and develop a good + number of people in the entire organization or the people in certain chosen departments or + projects on those initiatives. </para> + </listitem> + <listitem> + <para>Prepares the organization to meet the needs of legal/statutory requirements. Features + of Trainings: </para> + </listitem> + <listitem> + <para>New Trainings can be added/modified. </para> + </listitem> + <listitem> + <para>Trainings can be scheduled in the calendar. </para> + </listitem> + <listitem> + <para>Employees can apply to supervisor for available scheduled trainings but, cannot + request same training event again to same approver </para> + </listitem> + <listitem> + <para>Admin can assign trainings to Employees. </para> + </listitem> + <listitem> + <para>Admin can approve/reject the trainings requested to him but, once rejected cannot be + approved again. </para> + </listitem> + <listitem> + <para>Employees can check the status of their training requests and Trainings assigned to + them. </para> + <para/> + </listitem> + </itemizedlist> + </para> + <para>Road Ahead: Currently we have implemented Trainings under HR module. We are working on the + implementation of Training calendar in profile tab of Employee. We are also planning to + introduce trainer's information in training calendar.</para> + <para/> + <section> + <para>In "GlobalHRSetting" </para> + <orderedlist> + <listitem> + <para>Admin can create & manage the trainings provided by the organization. </para> + </listitem> + </orderedlist> + </section> + <section> + <para>In "Training Calendar" </para> + <para> + <orderedlist> + <listitem> + <para>Admin can schedule a training through training calender. </para> + </listitem> + <listitem> + <para>Admin can assign training to an employee(right half of calendar screen). </para> + </listitem> + <listitem> + <para> Employee with his login can request for Training to admin from the calendar. + </para> + </listitem> + <listitem> + <para> Employee cannot request same training event again to same approver. </para> + </listitem> + </orderedlist> + </para> + </section> + <section> + <para>In "Training Approval" tab (in case of Employee login tab name would be "Training + Status")</para> + <para> + <orderedlist> + <listitem> + <para>Admin can approve/reject the training requested to him </para> + </listitem> + <listitem> + <para>Admin can not change the training status once it is rejected. </para> + </listitem> + <listitem> + <para>Employee can check status of requested and assigned trainings. </para> + </listitem> + </orderedlist> + </para> + </section> +</section> Propchange: ofbiz/branches/addbirt/applications/humanres/data/helpdata/HELP_HR_training.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: ofbiz/branches/addbirt/applications/humanres/widget/forms/EmplLeaveForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/humanres/widget/forms/EmplLeaveForms.xml?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/humanres/widget/forms/EmplLeaveForms.xml (original) +++ ofbiz/branches/addbirt/applications/humanres/widget/forms/EmplLeaveForms.xml Fri Dec 11 23:11:39 2009 @@ -45,7 +45,7 @@ <field name="approverPartyId" title="${uiLabelMap.PartyApproverId}"><lookup target-form-name="LookupPartyName"/></field> <field name="description"><hidden/></field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> - <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ListEmplLeaves" list-name="listIt" type="list" odd-row-style="alternate-row" header-row-style="header-row-2" paginate-target="FindEmplLeaves" default-table-style="basic-table hover-bar"> @@ -126,7 +126,7 @@ </drop-down> </field> <field name="description"><hidden/></field> - <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ListLeaveApprovals" list-name="listIt" type="list" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> Modified: ofbiz/branches/addbirt/applications/humanres/widget/forms/EmplPositionForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/humanres/widget/forms/EmplPositionForms.xml?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/humanres/widget/forms/EmplPositionForms.xml (original) +++ ofbiz/branches/addbirt/applications/humanres/widget/forms/EmplPositionForms.xml Fri Dec 11 23:11:39 2009 @@ -298,7 +298,7 @@ <option key="N" description="${uiLabelMap.CommonNo}"/> </drop-down> </field> - <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="EmplPositionInfo" type="single" default-map-name="emplPosition" paginate-target="FindEmplPositions" header-row-style="header-row" default-table-style="basic-table"> Modified: ofbiz/branches/addbirt/applications/humanres/widget/forms/EmploymentAppForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/humanres/widget/forms/EmploymentAppForms.xml?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/humanres/widget/forms/EmploymentAppForms.xml (original) +++ ofbiz/branches/addbirt/applications/humanres/widget/forms/EmploymentAppForms.xml Fri Dec 11 23:11:39 2009 @@ -102,7 +102,7 @@ <field name="approverPartyId"><hidden/></field> <field name="jobRequisitionId"><hidden/></field> <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field> - <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="AddEmploymentApp" type="single" target="createEmploymentApp?applicationId=${applicationId}&&partyId=${referredByPartyId}" default-entity-name="EmploymentApp" paginate-target="FindEmploymentApps" header-row-style="header-row" default-table-style="basic-table"> Modified: ofbiz/branches/addbirt/applications/humanres/widget/forms/EmploymentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/humanres/widget/forms/EmploymentForms.xml?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/humanres/widget/forms/EmploymentForms.xml (original) +++ ofbiz/branches/addbirt/applications/humanres/widget/forms/EmploymentForms.xml Fri Dec 11 23:11:39 2009 @@ -45,7 +45,7 @@ </drop-down> </field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> - <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ListEmploymentsPerson" type="list" paginate-target="FindEmployments" default-entity-name="EmploymentAndPerson" list-name="listIt" separate-columns="true" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> Modified: ofbiz/branches/addbirt/applications/humanres/widget/forms/GlobalHRSettingForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/humanres/widget/forms/GlobalHRSettingForms.xml?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/humanres/widget/forms/GlobalHRSettingForms.xml (original) +++ ofbiz/branches/addbirt/applications/humanres/widget/forms/GlobalHRSettingForms.xml Fri Dec 11 23:11:39 2009 @@ -97,7 +97,7 @@ </drop-down> </field> <field name="description" title="${uiLabelMap.CommonDescription}"><text/></field> - <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ListEmplPositionTypes" type="list" list-name="listIt" target="updateEmplPositionType" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> Modified: ofbiz/branches/addbirt/applications/humanres/widget/forms/LookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/humanres/widget/forms/LookupForms.xml?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/humanres/widget/forms/LookupForms.xml (original) +++ ofbiz/branches/addbirt/applications/humanres/widget/forms/LookupForms.xml Fri Dec 11 23:11:39 2009 @@ -31,7 +31,7 @@ </field> <field name="customTimePeriodId"><lookup target-form-name="LookupCustomTimePeriod"/></field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> - <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ListBudgets" type="list" list-name="listIt" paginate-target="LookupBudget" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> @@ -59,7 +59,7 @@ </field> <field name="budgetId"><lookup target-form-name="LookupBudget"/></field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> - <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ListBudgetItems" type="list" list-name="listIt" paginate-target="LookupBudgetItem" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> @@ -94,7 +94,7 @@ <field name="budgetId"><lookup target-form-name="LookupBudget"/></field> <field name="budgetItemSeqId"><lookup target-form-name="LookupBudgetItem"/></field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> - <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ListEmplPositions" type="list" list-name="listIt" paginate-target="LookupEmplPosition" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> @@ -120,7 +120,7 @@ <auto-fields-entity entity-name="TerminationReason" default-field-type="hidden"/> <field name="terminationReasonId" title="${uiLabelMap.HumanResTerminationReasonId}"><text-find/></field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> - <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ListTerminationReasons" type="list" list-name="listIt" paginate-target="LookupEmplPosition" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> @@ -142,7 +142,7 @@ <auto-fields-entity entity-name="SalaryStep" default-field-type="hidden"/> <field name="salaryStepSeqId" title="${uiLabelMap.HumanResLookupSalaryStepSeqId}"><text-find/></field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> - <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ListSalarySteps" type="list" list-name="listIt" paginate-target="LookupSalaryStep" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> @@ -164,7 +164,7 @@ <auto-fields-entity entity-name="SalaryStep" default-field-type="hidden"/> <field name="payGradeId" title="${uiLabelMap.HumanResLookupPayGradeId}"><text-find/></field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> - <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ListPayGrades" type="list" list-name="listIt" paginate-target="LookupPayGrade" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> @@ -186,7 +186,7 @@ <auto-fields-entity entity-name="PayrollPreference" default-field-type="hidden"/> <field name="payrollPreferenceSeqId" title="${uiLabelMap.HumanResLookupPayrollPreferenceSeqId}"><text-find/></field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> - <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ListPayRollPreferences" type="list" list-name="listIt" paginate-target="LookupPayRollPreference" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> @@ -208,7 +208,7 @@ <auto-fields-entity entity-name="UnemploymentClaim" default-field-type="hidden"/> <field name="unemploymentClaimId" title="${uiLabelMap.HumanResLookupUnemploymentClaimId}"><text-find/></field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> - <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ListUnemploymentClaims" type="list" list-name="listIt" paginate-target="LookupUnemploymentClaim" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> @@ -230,7 +230,7 @@ <auto-fields-entity entity-name="AgreementEmploymentAppl" default-field-type="hidden"/> <field name="agreementItemSeqId" title="${uiLabelMap.HumanResLookupAgreementItemSeqId}"><text-find/></field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> - <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ListAgreementEmploymentAppls" type="list" list-name="listIt" paginate-target="LookupAgreementEmploymentAppl" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> @@ -252,7 +252,7 @@ <auto-fields-entity entity-name="PerfReview" default-field-type="hidden"/> <field name="perfReviewId" title="${uiLabelMap.HumanResLookupPerfReviewId}"><text-find/></field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> - <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ListPerfReviews" type="list" list-name="listIt" paginate-target="LookupPerfReview" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> @@ -274,7 +274,7 @@ <auto-fields-entity entity-name="PartyResume" default-field-type="hidden"/> <field name="resumeId" title="${uiLabelMap.HumanResLookupPartyResume}"><text-find/></field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> - <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ListPartyResumes" type="list" list-name="listIt" paginate-target="LookupPartyResume" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> @@ -296,7 +296,7 @@ <auto-fields-entity entity-name="EmploymentApp" default-field-type="hidden"/> <field name="applicationId" title="${uiLabelMap.HumanResLookupApplicationId}"><text-find/></field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> - <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ListEmploymentApps" type="list" list-name="listIt" paginate-target="LookupEmploymentApp" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> @@ -333,7 +333,7 @@ </drop-down> </field> <field name="noConditionFind"><hidden value="Y"/></field> - <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ListLookupJobRequisition" type="list" list-name="listIt" paginate-target="LookupJobRequisition"> <actions> @@ -357,7 +357,7 @@ <field name="parentTypeId" title="${uiLabelMap.HumanResPreRequisiteSkill}"><text-find ignore-case="true"/></field> <field name="description" title="${uiLabelMap.CommonDescription}"><text-find ignore-case="true"/></field> <field name="noConditionFind"><hidden value="Y"/></field> - <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ListLookupTraining" type="list" list-name="listIt" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> Modified: ofbiz/branches/addbirt/applications/humanres/widget/forms/PartyQualForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/humanres/widget/forms/PartyQualForms.xml?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/humanres/widget/forms/PartyQualForms.xml (original) +++ ofbiz/branches/addbirt/applications/humanres/widget/forms/PartyQualForms.xml Fri Dec 11 23:11:39 2009 @@ -47,7 +47,7 @@ </entity-options> </drop-down> </field> - <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ListPartyQuals" type="multi" list-name="listIt" use-row-submit="true" separate-columns="true" target="updatePartyQualExt?partyId=${partyId}" paginate-target="FindPartyQuals" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> Modified: ofbiz/branches/addbirt/applications/humanres/widget/forms/PartyResumeForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/humanres/widget/forms/PartyResumeForms.xml?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/humanres/widget/forms/PartyResumeForms.xml (original) +++ ofbiz/branches/addbirt/applications/humanres/widget/forms/PartyResumeForms.xml Fri Dec 11 23:11:39 2009 @@ -26,7 +26,7 @@ <field name="partyId"><lookup target-form-name="LookupPartyName"/></field> <field name="contentId"><lookup target-form-name="LookupContent"/></field> <field name="resumeId"><lookup target-form-name="LookupPartyResume"/></field> - <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ListPartyResumes" type="list" separate-columns="true" default-entity-name="PartyResume" list-name="listIt" paginate-target="FindPartyResumes" paginate="true" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> Modified: ofbiz/branches/addbirt/applications/humanres/widget/forms/PartySkillForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/humanres/widget/forms/PartySkillForms.xml?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/humanres/widget/forms/PartySkillForms.xml (original) +++ ofbiz/branches/addbirt/applications/humanres/widget/forms/PartySkillForms.xml Fri Dec 11 23:11:39 2009 @@ -35,7 +35,7 @@ <field name="rating"><text-find/></field> <field name="skillLevel"><text-find/></field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> - <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ListPartySkills" type="list" list-name="listIt" use-row-submit="true" separate-columns="true" target="updatePartySkillExt" paginate-target="findPartySkills" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> Modified: ofbiz/branches/addbirt/applications/humanres/widget/forms/PayGradeForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/humanres/widget/forms/PayGradeForms.xml?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/humanres/widget/forms/PayGradeForms.xml (original) +++ ofbiz/branches/addbirt/applications/humanres/widget/forms/PayGradeForms.xml Fri Dec 11 23:11:39 2009 @@ -25,7 +25,7 @@ <auto-fields-service service-name="createPayGrade" default-field-type="find"/> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="payGradeId"><lookup target-form-name="LookupPayGrade"/></field> - <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ListPayGrades" type="list" list-name="listIt" title="" target="updatePayGrade" paginate-target="FindPayGrade" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> Modified: ofbiz/branches/addbirt/applications/humanres/widget/forms/PerfReviewForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/humanres/widget/forms/PerfReviewForms.xml?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/humanres/widget/forms/PerfReviewForms.xml (original) +++ ofbiz/branches/addbirt/applications/humanres/widget/forms/PerfReviewForms.xml Fri Dec 11 23:11:39 2009 @@ -30,7 +30,7 @@ <field name="managerPartyId"><lookup target-form-name="LookupPartyName"/></field> <field name="paymentId" title="${uiLabelMap.FormFieldTitle_paymentId}"><lookup target-form-name="LookupPayment"/></field> <field name="emplPositionId" title="${uiLabelMap.FormFieldTitle_emplPositionId}"><lookup target-form-name="LookupEmplPosition"/></field> - <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ListPerfReviews" type="list" title="" separate-columns="true" default-entity-name="PerfReview" list-name="listIt" paginate-target="FindPerfReviews" paginate="true" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> Modified: ofbiz/branches/addbirt/applications/humanres/widget/forms/PersonTrainingForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/humanres/widget/forms/PersonTrainingForms.xml?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/humanres/widget/forms/PersonTrainingForms.xml (original) +++ ofbiz/branches/addbirt/applications/humanres/widget/forms/PersonTrainingForms.xml Fri Dec 11 23:11:39 2009 @@ -97,7 +97,7 @@ <field name="approverId" use-when="!hasAdminPermission"><hidden value="${loginPartyId}"/></field> <field name="reason"><text-find ignore-case="true"/></field> <field name="noConditionFind"><hidden value="Y"/></field> - <field name="submitButton" title="${uiLabelMap.CommonSearch}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ListTrainingApprovals" type="list" list-name="listIt" target="updateTrainingStatus" title="" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> Modified: ofbiz/branches/addbirt/applications/humanres/widget/forms/RecruitmentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/humanres/widget/forms/RecruitmentForms.xml?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/humanres/widget/forms/RecruitmentForms.xml (original) +++ ofbiz/branches/addbirt/applications/humanres/widget/forms/RecruitmentForms.xml Fri Dec 11 23:11:39 2009 @@ -57,7 +57,7 @@ <field name="jobRequisitionDate"><hidden/></field> <field name="requiredOnDate"><hidden/></field> <field name="qualification"><hidden/></field> - <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ListJobRequisitions" list-name="listIt" type="list" odd-row-style="alternate-row" header-row-style="header-row-2" paginate-target="FindJobRequisitions" default-table-style="basic-table hover-bar"> @@ -160,7 +160,7 @@ <field name="emplPositionId"><hidden/></field> <field name="employmentAppSourceTypeId"><hidden/></field> <field name="referredByPartyId"><hidden/></field> - <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ListInternalJobPosting" list-name="listIt" type="list" odd-row-style="alternate-row" header-row-style="header-row-2" paginate-target="FindInternalJobPosting" default-table-style="basic-table hover-bar"> @@ -250,7 +250,7 @@ </entity-options> </drop-down> </field> - <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ListInterview" type="list" list-name="listIt" paginate-target="FindJobInterview" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> @@ -341,7 +341,7 @@ </drop-down> </field> <field name="jobRequisitionId"><lookup target-form-name="LookupJobRequisition"/></field> - <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ListApprovals" list-name="listIt" type="list" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> @@ -413,7 +413,7 @@ <field name="reportingDate"><date-find/></field> <field name="location"><text-find/></field> <field name="noConditionFind"><hidden value="Y"/></field> - <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ListRelocation" list-name="listIt" type="list" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> |
| Free forum by Nabble | Edit this page |
