You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by as...@apache.org on 2008/06/13 11:59:03 UTC
svn commit: r667449 - in /ofbiz/trunk/applications: accounting/widget/
humanres/config/ manufacturing/config/
manufacturing/webapp/manufacturing/routing/
manufacturing/widget/manufacturing/
Author: ashish
Date: Fri Jun 13 02:59:03 2008
New Revision: 667449
URL: http://svn.apache.org/viewvc?rev=667449&view=rev
Log:
Patch from JIRA issue # https://issues.apache.org/jira/browse/OFBIZ-1839.
Improvement in HR and Manufacturing component.
Thanks Harsha Chadhar for your patch.
Modified:
ofbiz/trunk/applications/accounting/widget/CostScreens.xml
ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml
ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml
ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostScreens.xml
ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml
Modified: ofbiz/trunk/applications/accounting/widget/CostScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/CostScreens.xml?rev=667449&r1=667448&r2=667449&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/CostScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/CostScreens.xml Fri Jun 13 02:59:03 2008
@@ -36,7 +36,7 @@
<widgets>
<decorator-screen name="GlobalGLSettingsDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <screenlet id="CostComponentCalcPanel" title="${uiLabelMap.AccountingCreateCostComponentCalc}" collapsible="true">
+ <screenlet id="AccountingCostComponentCalcPanel" title="${uiLabelMap.AccountingCreateCostComponentCalc}" collapsible="true">
<include-form name="AddCostComponentCalc" location="component://accounting/widget/CostForms.xml"/>
</screenlet>
<include-form name="ListCostComponentCalc" location="component://accounting/widget/CostForms.xml"/>
Modified: ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml?rev=667449&r1=667448&r2=667449&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml (original)
+++ ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml Fri Jun 13 02:59:03 2008
@@ -609,6 +609,11 @@
<value xml:lang="en">List Skill Types</value>
<value xml:lang="th">รายà¸à¸²à¸£à¸à¸£à¸°à¹à¸ à¸à¸à¸±à¸à¸©à¸°</value>
</property>
+ <property key="HumanResListValidResponsibility">
+ <value xml:lang="en">List Valid Responsibility</value>
+ <value xml:lang="it">Lista Validità Responsibilità </value>
+ <value xml:lang="th">รายà¸à¸²à¸£à¸«à¸à¹à¸²à¸à¸µà¹à¸£à¸±à¸à¸à¸´à¸à¸à¸à¸</value>
+ </property>
<property key="HumanResLookupBudgetByName">
<value xml:lang="en">Lookup Budget by Name</value>
<value xml:lang="it">Ricerca Budget per Nome</value>
Modified: ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml?rev=667449&r1=667448&r2=667449&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml (original)
+++ ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml Fri Jun 13 02:59:03 2008
@@ -2829,6 +2829,11 @@
<value xml:lang="th">à¸à¹à¸à¸«à¸² - à¹à¸à¹à¹à¸ à¸à¸²à¸</value>
<value xml:lang="zh">æ¥æ¾ - ç¼è¾è§ç¨ä»»å¡</value>
</property>
+ <property key="PageTitleListRoutingTaskAssoc">
+ <value xml:lang="en">List Routing Task Assoc</value>
+ <value xml:lang="it">Lista Associazioni Operazioni</value>
+ <value xml:lang="th">รายà¸à¸²à¸£à¸à¸¥à¸¥à¸¸à¹à¸¡à¸à¸à¸à¸à¸²à¸</value>
+ </property>
<property key="PageTitleListCalendarWeek">
<value xml:lang="en">List of weeks</value>
<value xml:lang="es">Lista de semanas</value>
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml?rev=667449&r1=667448&r2=667449&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml Fri Jun 13 02:59:03 2008
@@ -198,7 +198,7 @@
<!-- Routing Task Assoc Forms -->
<form name="ListRoutingTaskAssoc" type="list" target="EditRoutingTaskAssoc" title="" list-name="allRoutingTasks"
- odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<auto-fields-service service-name="updateWorkEffortAssoc" map-name="routingTaskAssoc"/>
<field name="workEffortIdFrom"><hidden/></field>
<field name="sequenceNum" title="${uiLabelMap.CommonSequenceNum}"><display/></field>
Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostScreens.xml?rev=667449&r1=667448&r2=667449&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostScreens.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostScreens.xml Fri Jun 13 02:59:03 2008
@@ -38,7 +38,7 @@
<container>
<label style="h1">${uiLabelMap.ManufacturingManageCostComponentCalc}</label>
</container>
- <screenlet id="CostComponentCalcPanel" title="${uiLabelMap.ManufacturingEditCostComponentCalc}" collapsible="true">
+ <screenlet id="ManufacturingCostComponentCalcPanel" title="${uiLabelMap.ManufacturingEditCostComponentCalc}" collapsible="true">
<include-form name="EditCostComponentCalc" location="component://manufacturing/widget/manufacturing/CostForms.xml"/>
</screenlet>
<include-form name="ListCostComponentCalc" location="component://manufacturing/widget/manufacturing/CostForms.xml"/>
Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml?rev=667449&r1=667448&r2=667449&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml Fri Jun 13 02:59:03 2008
@@ -399,12 +399,36 @@
<widgets>
<decorator-screen name="CommonRoutingDecorator">
<decorator-section name="body">
- <screenlet id="RoutingTaskAssocPanel" title="${uiLabelMap.PageTitleEditRoutingTaskAssoc}" collapsible="true">
- <platform-specific>
- <html><html-template location="component://manufacturing/webapp/manufacturing/routing/EditRoutingTaskAssoc.ftl"/></html>
- </platform-specific>
- </screenlet>
- <include-form name="ListRoutingTaskAssoc" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="h3">
+ <label text="${uiLabelMap.PageTitleEditRoutingTaskAssoc}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <platform-specific>
+ <html><html-template location="component://manufacturing/webapp/manufacturing/routing/EditRoutingTaskAssoc.ftl"/></html>
+ </platform-specific>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="h3">
+ <label text="${uiLabelMap.PageTitleListRoutingTaskAssoc}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListRoutingTaskAssoc" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>