Propchange:
ofbiz/branches/addbirt/applications/manufacturing/config/ManufacturingUiLabels.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
ofbiz/branches/addbirt/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
---
ofbiz/branches/addbirt/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml
(original)
+++
ofbiz/branches/addbirt/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml
Fri Dec 11 23:11:39 2009
@@ -60,7 +60,7 @@
</entity-options>
</drop-down>
</field>
- <field name="submitButton" title="${uiLabelMap.CommonLookup}"><submit
button-type="button"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit
button-type="button"/></field>
</form>
<form name="listFindProductionRun" list-name="listIt" title="" type="list"
paginate-target="/FindProductionRun"
Modified:
ofbiz/branches/addbirt/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
---
ofbiz/branches/addbirt/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl
(original)
+++
ofbiz/branches/addbirt/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl
Fri Dec 11 23:11:39 2009
@@ -46,7 +46,6 @@
<#if inventoryList?exists>
<a
href="<@ofbizUrl>FindInventoryEventPlan?hideFields=Y${paramList}</@ofbizUrl>"
class="smallSubmit">${uiLabelMap.CommonHideFields}</a>
</#if>
- <a href="javascript:lookupInventory();"
class="smallSubmit">${uiLabelMap.CommonLookup}</a>
</#if>
</p>
</td>
@@ -83,7 +82,7 @@
<tr>
<td width="25%" align="center" valign="top">
<td width="5"> </td>
- <td width="75%"> <a href="javascript:lookupInventory();"
class="smallSubmit"> ${uiLabelMap.CommonLookup} </a></td>
+ <td width="75%"> <a href="javascript:lookupInventory();"
class="smallSubmit"> ${uiLabelMap.CommonFind} </a></td>
</tr>
</table>
</td>
Modified:
ofbiz/branches/addbirt/applications/manufacturing/widget/manufacturing/FieldLookupForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/manufacturing/widget/manufacturing/FieldLookupForms.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
---
ofbiz/branches/addbirt/applications/manufacturing/widget/manufacturing/FieldLookupForms.xml
(original)
+++
ofbiz/branches/addbirt/applications/manufacturing/widget/manufacturing/FieldLookupForms.xml
Fri Dec 11 23:11:39 2009
@@ -28,7 +28,7 @@
<field name="fixedAssetId"><hidden value=""/></field>
<field name="fixedAssetId_op"><hidden value="equals"/></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}"><submit
button-type="button"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit
button-type="button"/></field>
</form>
<form name="listLookupRouting" list-name="listIt" title="" type="list"
paginate-target="LookupRouting" odd-row-style="alternate-row"
default-table-style="basic-table hover-bar">
@@ -63,7 +63,7 @@
<field name="fixedAssetId_op"><hidden value="equals"/></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}"><submit
button-type="button"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit
button-type="button"/></field>
</form>
<form name="listLookupRoutingTask" list-name="listIt" title="" type="list"
paginate-target="LookupRoutingTask" odd-row-style="alternate-row"
default-table-style="basic-table hover-bar">
Modified:
ofbiz/branches/addbirt/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
---
ofbiz/branches/addbirt/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml
(original)
+++
ofbiz/branches/addbirt/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml
Fri Dec 11 23:11:39 2009
@@ -30,7 +30,7 @@
<field name="workEffortName"
title="${uiLabelMap.ManufacturingRoutingName}">
<text-find/>
</field>
- <field name="submitButton" title="${uiLabelMap.CommonLookup}">
+ <field name="submitButton" title="${uiLabelMap.CommonFind}">
<submit button-type="button"/>
</field>
</form>
@@ -85,7 +85,7 @@
</entity-options>
</drop-down>
</field>
- <field name="submitButton" title="${uiLabelMap.CommonLookup}">
+ <field name="submitButton" title="${uiLabelMap.CommonFind}">
<submit button-type="button"/>
</field>
</form>
Modified:
ofbiz/branches/addbirt/applications/marketing/widget/ContactListForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/marketing/widget/ContactListForms.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/marketing/widget/ContactListForms.xml
(original)
+++ ofbiz/branches/addbirt/applications/marketing/widget/ContactListForms.xml
Fri Dec 11 23:11:39 2009
@@ -420,7 +420,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="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="ListLookupContactList" list-name="listIt" target="" title=""
type="list"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
Modified: ofbiz/branches/addbirt/applications/marketing/widget/LookupForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/marketing/widget/LookupForms.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/marketing/widget/LookupForms.xml
(original)
+++ ofbiz/branches/addbirt/applications/marketing/widget/LookupForms.xml Fri
Dec 11 23:11:39 2009
@@ -28,7 +28,7 @@
<field name="description"
title="${uiLabelMap.CommonDescription}"><text-find/></field>
<field name="productStoreId"
title="${uiLabelMap.MarketingSegmentGroupProductStoreId}"><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="listLookupSegmentGroup" list-name="listIt" target="" title=""
type="list" paginate-target="LookupSegmentGroup"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
@@ -82,7 +82,7 @@
<field name="createdByUserLoginId"><hidden/></field>
<field name="modifiedByUserLoginId"><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="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="ListLookupSalesForecast" list-name="listIt" type="list"
paginate-target="LookupSalesForecast" view-size="10"
Modified:
ofbiz/branches/addbirt/applications/marketing/widget/sfa/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/marketing/widget/sfa/CommonScreens.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/marketing/widget/sfa/CommonScreens.xml
(original)
+++ ofbiz/branches/addbirt/applications/marketing/widget/sfa/CommonScreens.xml
Fri Dec 11 23:11:39 2009
@@ -264,15 +264,17 @@
<include-screen name="Party"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
<include-screen
name="partyRelContacts"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
<include-screen name="Contact"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
- <include-screen
name="PaymentMethods"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
- <include-screen
name="LeadPartyDataSource"
location="component://marketing/widget/sfa/LeadScreens.xml"/>
</container>
<container style="profile-right">
<include-screen name="FinAccounts"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
<include-screen name="Attributes"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
- <include-screen name="Content"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
- <include-screen name="Notes"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ <include-screen
name="PaymentMethods"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ <include-screen
name="LeadPartyDataSource"
location="component://marketing/widget/sfa/LeadScreens.xml"/>
+ </container>
+ <container style="profile-bottom">
<include-screen
name="PartySalesOpportunities"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ <include-screen name="Notes"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ <include-screen name="Content"
location="component://party/widget/partymgr/ProfileScreens.xml"/>
</container>
</widgets>
</section>
Modified:
ofbiz/branches/addbirt/applications/marketing/widget/sfa/forms/OpportunityForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/marketing/widget/sfa/forms/OpportunityForms.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
---
ofbiz/branches/addbirt/applications/marketing/widget/sfa/forms/OpportunityForms.xml
(original)
+++
ofbiz/branches/addbirt/applications/marketing/widget/sfa/forms/OpportunityForms.xml
Fri Dec 11 23:11:39 2009
@@ -40,7 +40,7 @@
</entity-options>
</drop-down>
</field>
- <field name="searchButton" widget-style="smallSubmit"><submit/></field>
+ <field name="searchButton" title="${uiLabelMap.CommonFind}"
widget-style="smallSubmit"><submit/></field>
</form>
<form name="ListSalesOpportunity" type="list" list-name="listIt"
paginate-target="FindSalesOpportunity" view-size="20"
Modified:
ofbiz/branches/addbirt/applications/order/config/OrderErrorUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/order/config/OrderErrorUiLabels.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/order/config/OrderErrorUiLabels.xml
(original)
+++ ofbiz/branches/addbirt/applications/order/config/OrderErrorUiLabels.xml Fri
Dec 11 23:11:39 2009
@@ -1302,6 +1302,9 @@
<value
xml:lang="th">วัà¸à¹à¸§à¸¥à¸²à¸à¸µà¹à¸à¸³à¸«à¸à¸à¸£à¸²à¸¢à¸à¸²à¸£à¸ªà¸±à¹à¸à¸à¸·à¹à¸
: ${orderTermDays}</value>
<value xml:lang="zh">è®¢åæ¡ä»¶å¤©æ°ï¼${orderTermDays}</value>
</property>
+ <property key="OrderOrderTermDaysIsRequired">
+ <value xml:lang="en">Order Term Days is required for this term type.
</value>
+ </property>
<property key="OrderOrderTermTypeIsRequired">
<value xml:lang="en">Order Term Type is required. </value>
<value xml:lang="es">El tipo de término del pedido es
requerido.</value>