OFBiz › OFBiz - Commits

svn commit: r746049 [2/2] - in /ofbiz/trunk: applications/accounting/webapp/accounting/lookup/ applications/accounting/widget/ applications/content/config/ applications/content/webapp/content/cms/ applications/content/webapp/content/content/ applicatio...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

mrisaliti

svn commit: r746049 [2/2] - in /ofbiz/trunk: applications/accounting/webapp/accounting/lookup/ applications/accounting/widget/ applications/content/config/ applications/content/webapp/content/cms/ applications/content/webapp/content/content/ applicatio...

Modified: ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml Thu Feb 19 23:08:30 2009
@@ -784,7 +784,7 @@
</container>
</widgets>
<fail-widgets>
- <label style="h3">${uiLabelMap.OrderErrorQuoteNotFound}</label>
+ <label style="h3">${uiLabelMap.OrderNoQuoteFound}</label>
</fail-widgets>
</section>
</screen>

Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.xml?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/config/PartyUiLabels.xml (original)
+++ ofbiz/trunk/applications/party/config/PartyUiLabels.xml Thu Feb 19 23:08:30 2009
@@ -3954,6 +3954,10 @@
<value xml:lang="th">à¸§à¸±à¸à¸à¸µà¹à¸à¸¥à¸¸à¹à¸¡à¸à¸¹à¹à¹à¸à¹à¸ªà¸£à¹à¸²à¸</value>
<value xml:lang="zh">ä¼ååå»ºæ¥æ</value>
</property>
+ <property key="PartyCurrency">
+ <value xml:lang="en">In party currency</value>
+ <value xml:lang="it">Nella valuta del soggetto</value>
+ </property>
<property key="PartyCurrentShoppingCart">
<value xml:lang="de">Aktueller Einkaufswagen</value>
<value xml:lang="en">Current Shopping Cart</value>
@@ -4341,6 +4345,10 @@
<value xml:lang="it">Email da soggetti sconosciuti</value>
<value xml:lang="nl">E-mail van een onbekende relatie of contact</value>
</property>
+ <property key="PartyEmailMessage">
+ <value xml:lang="en">Allocate this message to a existing or new party and add an email address</value>
+ <value xml:lang="it">Allocare questo messagio ad un soggetto esistente o nuovo e aggiungere un indirizzo email</value>
+ </property>
<property key="PartyEmailTo">
<value xml:lang="en">Email to</value>
<value xml:lang="fr">Courriel dest.</value>
@@ -4587,6 +4595,10 @@
<value xml:lang="th">à¸à¸¥à¸à¸²à¸£à¸à¹à¸à¸«à¸²à¸à¸²à¸£à¸à¸´à¸à¸à¹à¸</value>
<value xml:lang="zh">æ¾å°çæ²éäºä»¶</value>
</property>
+ <property key="PartyForward">
+ <value xml:lang="en">Forward</value>
+ <value xml:lang="it">Inoltra</value>
+ </property>
<property key="PartyFromContactMech">
<value xml:lang="de">Von Kontaktmechanismus</value>
<value xml:lang="en">From Contact Mech</value>
@@ -6273,6 +6285,18 @@
<value xml:lang="th">à¹à¸¡à¹à¸¡à¸µà¸à¸¹à¹à¸à¸±à¸à¸«à¸²à¸ªà¸´à¹à¸à¸à¸à¸à¹à¸«à¹</value>
<value xml:lang="zh">æ²¡æä¾è´§å</value>
</property>
+ <property key="PartyNotificationMailChange">
+ <value xml:lang="en">Change Personal Info Notification Mail</value>
+ <value xml:lang="it">Mail di notifica per cambio informazioni personali</value>
+ </property>
+ <property key="PartyNotificationMailCreate">
+ <value xml:lang="en">Party Account Creation Notification Mail</value>
+ <value xml:lang="it">Mail di notifica creazione utenza</value>
+ </property>
+ <property key="PartyNotificationMailVerification">
+ <value xml:lang="en">Email Address Verification</value>
+ <value xml:lang="it">Verifica indirizzo Email</value>
+ </property>
<property key="PartyNoUserLogin">
<value xml:lang="de">Keine Benutzeranmeldung gefunden fÃ¼r diesen Akteur.</value>
<value xml:lang="en">No UserLogin(s) found for this party.</value>
@@ -6379,6 +6403,10 @@
<value xml:lang="th">à¸£à¸«à¸±à¸ªà¸à¸à¸à¹à¸à¸£à¸à¸¥à¸¸à¹à¸¡à¸à¸¹à¹à¹à¸à¹</value>
<value xml:lang="zh">æºæä¼åæ è¯</value>
</property>
+ <property key="PartyOriginEmailNotKnown">
+ <value xml:lang="en">Origin Email address not known!</value>
+ <value xml:lang="it">Indirizzo origine email address not conosciuto!</value>
+ </property>
<property key="PartyOverrideDefaultRateAmount">
<value xml:lang="en">Override Default Rate Amount</value>
<value xml:lang="fr">Remplacer le taux par dÃ©faut</value>

Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml Thu Feb 19 23:08:30 2009
@@ -95,7 +95,7 @@
<if-compare value="CAN" operator="equals" field="parameters.countryGeoId">
<if-empty field="parameters.stateProvinceGeoId">
<add-error>
- <fail-property resource="PartyUiLabels" property="PartyProveinceInCanadaMissing"/>
+ <fail-property resource="PartyUiLabels" property="PartyProvinceInCanadaMissing"/>
</add-error>
</if-empty>
</if-compare>
@@ -123,7 +123,7 @@
<if-compare value="CAN" operator="equals" field="parameters.countryGeoId">
<if-empty field="parameters.stateProvinceGeoId">
<add-error>
- <fail-property resource="PartyUiLabels" property="PartyProveinceInCanadaMissing"/>
+ <fail-property resource="PartyUiLabels" property="PartyProvinceInCanadaMissing"/>
</add-error>
</if-empty>
</if-compare>

Modified: ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml Thu Feb 19 23:08:30 2009
@@ -90,7 +90,7 @@
</condition>
<link target="EditCommunicationEvent?parentCommEventId=${parameters.communicationEventId}"/>
</menu-item>
- <menu-item name="forward" title="${uiLabelMap.Forward}">
+ <menu-item name="forward" title="${uiLabelMap.PartyForward}">
<condition>
<and>
<not><if-empty field="parameters.communicationEventId"/></not>

Modified: ofbiz/trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml Thu Feb 19 23:08:30 2009
@@ -194,7 +194,7 @@
<field name="lastName" title="${uiLabelMap.PartyLastName}"><display/></field>
<field name="personalTitle" title="${uiLabelMap.PartyPersonalTitle}"><display/></field>
<field name="suffix" title="${uiLabelMap.PartySuffix}"><display/></field>
- <field name="nickname" title="${uiLabelMap.PartyNickname}"><display/></field>
+ <field name="nickname" title="${uiLabelMap.PartyNickName}"><display/></field>
</form>

<form name="lookupPartyAndUserLoginAndPerson" type="single" target="LookupPartyAndUserLoginAndPerson"

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml Thu Feb 19 23:08:30 2009
@@ -123,8 +123,8 @@
<field name="logoImageUrl"><ignored/></field>
<field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
<field name="preferredCurrencyUomId" title="${uiLabelMap.CommonCurrency}"><display-entity entity-name="Uom" key-field-name="uomId" description="${description}"/></field>
- <field name="externalId" title="${uiLabelMap.External} ${uiLabelMap.Id}"><display/></field>
- <field name="statusId" title="${uiLabelMap.Status} ${uiLabelMap.Id}"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+ <field name="externalId"><display/></field>
+ <field name="statusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
</form>

<form name="ViewPartyPerson" type="single" default-map-name="lookupPerson">

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Visits.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Visits.ftl?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Visits.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Visits.ftl Thu Feb 19 23:08:30 2009
@@ -20,7 +20,7 @@
<div id="partyVisits" class="screenlet">
<div class="screenlet-title-bar">
<ul>
- <li class="h3">${uiLabelMap.PartyLastVisit}</li>
+ <li class="h3">${uiLabelMap.PartyVisits}</li>
<li><a href="<@ofbizUrl>showvisits?partyId=${partyId}</@ofbizUrl>">${uiLabelMap.CommonListAll}</a></li>
</ul>
<br class="clear" />

Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml Thu Feb 19 23:08:30 2009
@@ -175,7 +175,7 @@
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container style="lefthalf">
- <label style="h1" text="Communication Event id: ${parameters.communicationEventId}"></label>
+ <label style="h1" text="${uiLabelMap.PartyCommEvent}: ${parameters.communicationEventId}"></label>
<include-screen name="commEvent" />
<section>
<condition>
@@ -264,11 +264,10 @@
<widgets>
<screenlet>
<container>
- <label style="h1" text="Origin Email address not known!" />
+ <label style="h1" text="${uiLabelMap.PartyOriginEmailNotKnown}" />
</container>
<container>
- <label style="h2"
- text="Allocate this message to a existing or new party and add an email address" />
+ <label style="h2" text="${uiLabelMap.PartyEmailMessage}" />
</container>
<include-form name="allocateMsgToPartyForm"
location="component://party/webapp/partymgr/communication/CommForms.xml" />

Modified: ofbiz/trunk/applications/party/widget/partymgr/EmailPartyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/EmailPartyScreens.xml?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/EmailPartyScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/EmailPartyScreens.xml Thu Feb 19 23:08:30 2009
@@ -23,7 +23,7 @@
<screen name="CreatePartyNotification">
<section>
<actions>
- <set field="title" value="Party Account Creation Notification Mail"/>
+ <set field="titleProperty" value="PartyNotificationMailCreate"/>
</actions>
<widgets>
<platform-specific><html><html-template location="component://party/templates/email/CreatePartyNotification.ftl"/></html></platform-specific>
@@ -33,7 +33,7 @@
<screen name="ChangePersonalInfoNotification">
<section>
<actions>
- <set field="title" value="Change Personal Info Notification Mail"/>
+ <set field="titleProperty" value="PartyNotificationMailChange"/>
</actions>
<widgets>
<platform-specific><html><html-template location="component://party/templates/email/ChangePersonalInfoNotification.ftl"/></html></platform-specific>
@@ -43,11 +43,11 @@
<screen name="VerifyEmailAddressNotification">
<section>
<actions>
- <set field="title" value="Email Address Verification"/>
+ <set field="titleProperty" value="PartyNotificationMailVerification"/>
</actions>
<widgets>
<platform-specific><html><html-template location="component://party/templates/email/VerifyEmailAddressNotification.ftl"/></html></platform-specific>
</widgets>
- </section>
+ </section>
</screen>
</screens>

Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Thu Feb 19 23:08:30 2009
@@ -1046,7 +1046,7 @@
<set field="actualCurrencyUomId" from-field="party.preferredCurrencyUomId" />
</actions>
<widgets>
- <label style="h2" text="In party currency"></label>
+ <label style="h2" text="${uiLabelMap.PartyCurrency}"></label>
<include-form name="ListInvoicesApplPayments" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
</widgets>
</section>
@@ -1075,7 +1075,7 @@
<set field="actualCurrencyUomId" from-field="party.preferredCurrencyUomId" />
</actions>
<widgets>
- <label style="h2" text="In party currency"></label>
+ <label style="h2" text="${uiLabelMap.PartyCurrency}"></label>
<include-form name="ListUnAppliedInvoices" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
</widgets>
</section>
@@ -1102,7 +1102,7 @@
<set field="actualCurrencyUomId" from-field="party.preferredCurrencyUomId" />
</actions>
<widgets>
- <label style="h2" text="In party currency"></label>
+ <label style="h2" text="${uiLabelMap.PartyCurrency}"></label>
<include-form name="ListUnAppliedPayments" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
</widgets>
</section>
@@ -1129,7 +1129,7 @@
<set field="actualCurrencyUomId" from-field="party.preferredCurrencyUomId" />
</actions>
<widgets>
- <label style="h2" text="In party currency"></label>
+ <label style="h2" text="${uiLabelMap.PartyCurrency}"></label>
<include-form name="partyFinancialSummary" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
</widgets>
</section>

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Thu Feb 19 23:08:30 2009
@@ -5297,6 +5297,10 @@
<value xml:lang="th">à¹à¸à¸´à¹à¸¡à¸à¸§à¸²à¸¡à¸à¸¸à¸ªà¸´à¸à¸à¹à¸²</value>
<value xml:lang="zh">æ¹éæ·»å äº§å</value>
</property>
+ <property key="PageTitleLookupBulkAddSupplierProduct">
+ <value xml:lang="en">Bulk Add Supplier Product</value>
+ <value xml:lang="it">Aggiungi prodotti fornitore in massa</value>
+ </property>
<property key="PageTitleLookupFacility">
<value xml:lang="de">Einrichtung nachschlagen</value>
<value xml:lang="en">Lookup Facility</value>
@@ -10521,6 +10525,10 @@
<value xml:lang="it">Valore Identificazione Prodotto</value>
<value xml:lang="th">à¸à¹à¸²à¸à¸²à¸£à¹à¸ªà¸à¸à¸à¸±à¸§à¸à¸¹à¸à¸à¹à¸à¸</value>
</property>
+ <property key="ProductGoodsReceipt">
+ <value xml:lang="en">Goods Receipt</value>
+ <value xml:lang="it">Ricezione bene</value>
+ </property>
<property key="ProductGrams">
<value xml:lang="de">Gramm</value>
<value xml:lang="en">Grams</value>

Modified: ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml Thu Feb 19 23:08:30 2009
@@ -189,6 +189,6 @@
<field name="detailSubScreen" tooltip="example: component://ecommerce/widget/CatalogScreens.xml#categorydetail"><text size="60" maxlength="255"/></field>
<field name="submitButton" use-when="productCategoryLink==null" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
<field name="submitButton" use-when="productCategoryLink!=null" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
- <field name="clearFormButton" title="${uiLabelMap.CommonEmptyHeader}" use-when="productCategoryLink!=null"><hyperlink target="EditProductCategoryLinks?productCategoryId=${productCategoryId}" target-type="intra-app" description="Clear Form"/></field>
+ <field name="clearFormButton" title="${uiLabelMap.CommonEmptyHeader}" use-when="productCategoryLink!=null"><hyperlink target="EditProductCategoryLinks?productCategoryId=${productCategoryId}" target-type="intra-app" description="${uiLabelMap.CommonClear}"/></field>
</form>
</forms>

Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl Thu Feb 19 23:08:30 2009
@@ -100,7 +100,7 @@
<td width="74%"><input type="text" value="${(productCategory.categoryName)?if_exists}" name="categoryName" size="60" maxlength="60"/></td>
</tr>
<tr>
- <td width="26%" align="right" class="label">${uiLabelMap.Description}</td>
+ <td width="26%" align="right" class="label">${uiLabelMap.ProductProductDescription}</td>
<td> </td>
<td width="74%"><textarea name="description" cols="60" rows="2"><#if productCategory?has_content>${(productCategory.description)?if_exists}</#if></textarea></td>
</tr>

Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryContent.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryContent.ftl?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryContent.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryContent.ftl Thu Feb 19 23:08:30 2009
@@ -41,7 +41,7 @@
<td width="74%"><input type="text" value="${(productCategory.categoryName)?if_exists}" name="categoryName" size="60" maxlength="60"/></td>
</tr>
<tr>
- <td width="26%" align="right" class="label">${uiLabelMap.Description}</td>
+ <td width="26%" align="right" class="label">${uiLabelMap.ProductProductDescription}</td>
<td> </td>
<td width="74%" colspan="4" valign="top">
<textarea name="description" cols="60" rows="2">${(productCategory.description)?if_exists}</textarea>

Modified: ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml Thu Feb 19 23:08:30 2009
@@ -151,7 +151,7 @@
<auto-fields-entity entity-name="ProdConfItemContent" map-name="productContentData"/>
<field name="fromDate" title="${uiLabelMap.CommonFromDate}" ></field>
<field name="thruDate" title="${uiLabelMap.CommonThruDate}"></field>
- <field name="description" title="${uiLabelMap.Description}" map-name="content"><text size="40"/></field>
+ <field name="description" title="${uiLabelMap.ProductProductDescription}" map-name="content"><text size="40"/></field>
<field name="localeString" title="${uiLabelMap.ProductLocaleString}" map-name="content"><text size="40"/></field>
<field use-when="contentId == null" name="contentId"><ignored/></field>
<field use-when="contentId != null" name="contentId" tooltip="${uiLabelMap.ProductNotModificationRecrationProductContentAssociation}" map-name="productContentData" ><display/></field>

Modified: ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml Thu Feb 19 23:08:30 2009
@@ -92,7 +92,7 @@
<display-entity entity-name="PartyGroup" description="${groupName}"/>
</field>

- <field name="description" title="${uiLabelMap.Description}"><text size="40"/></field>
+ <field name="description" title="${uiLabelMap.ProductProductDescription}"><text size="40"/></field>
<field name="idCode" title="${uiLabelMap.ProductIdCode}"><text size="5"/></field>
<field name="uomId" title="${uiLabelMap.ProductCurrency}">
<drop-down allow-empty="true">

Modified: ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml Thu Feb 19 23:08:30 2009
@@ -644,7 +644,7 @@
</drop-down>
</field>
<field name="useRoleTypeId" title="${uiLabelMap.ProductUseRole}"></field>
- <field name="description" title="${uiLabelMap.Description}" map-name="content"><text size="40"/></field>
+ <field name="description" title="${uiLabelMap.ProductProductDescription}" map-name="content"><text size="40"/></field>
<field name="subject" title="${uiLabelMap.ProductSubject}" map-name="emailData"><text size="40"/></field>
<field name="plainBody" title="${uiLabelMap.ProductContentPlainBody}" map-name="emailData"><textarea cols="60" rows="7"/></field>
<field name="htmlBody" title="${uiLabelMap.ProductContentHtmlBody}" map-name="emailData"><textarea cols="60" rows="7"/></field>
@@ -676,7 +676,7 @@
</drop-down>
</field>
<field name="useRoleTypeId" title="${uiLabelMap.ProductUseRole}"></field>
- <field name="description" title="${uiLabelMap.Description}" map-name="content"><text size="40"/></field>
+ <field name="description" title="${uiLabelMap.ProductProductDescription}" map-name="content"><text size="40"/></field>
<field use-when="contentId == null" name="contentId" title="${uiLabelMap.ProductContentId}" tooltip="${uiLabelMap.ProductOptional}"><text maxlength="20"/></field>
<field use-when="contentId != null" name="contentId" title="${uiLabelMap.ProductContentId}" tooltip="${uiLabelMap.ProductNotModificationRecrationProductContentAssociation}" map-name="productContentData" ><hyperlink description="${contentId} ${contentName}" target="/content/control/editContent?contentId=${contentId}" target-type="inter-app"/></field>
<field name="imageData" title="${uiLabelMap.ProductFile}"><file/></field>
@@ -690,7 +690,7 @@
header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="contentId==null" target="createExternalContentForProduct"/>
<auto-fields-entity entity-name="ProductContent" map-name="productContentData"/>
- <field name="description" title="${uiLabelMap.Description}" map-name="content"><text size="40"/></field>
+ <field name="description" title="${uiLabelMap.ProductProductDescription}" map-name="content"><text size="40"/></field>
<field name="fromDate" title="${uiLabelMap.CommonFromDate}" ></field>
<field name="thruDate" title="${uiLabelMap.CommonThruDate}"></field>
<field name="serviceName" title="${uiLabelMap.ProductServiceName}" map-name="content"><text size="40"/></field>
@@ -708,7 +708,7 @@
<field name="fromDate" use-when="contentId==null" title="${uiLabelMap.CommonFromDate}*" ><date-time/></field>
<field name="fromDate" use-when="contentId!=null" title="${uiLabelMap.CommonFromDate}" ><display/></field>
<field name="thruDate" title="${uiLabelMap.CommonThruDate}"></field>
- <field name="description" title="${uiLabelMap.Description}" map-name="content"><text size="40"/></field>
+ <field name="description" title="${uiLabelMap.ProductProductDescription}" map-name="content"><text size="40"/></field>
<field name="localeString" title="${uiLabelMap.ProductLocaleString}" map-name="content"><text size="40"/></field>
<field use-when="contentId == null" name="contentId"><ignored/></field>
<field use-when="contentId != null" name="contentId" tooltip="${uiLabelMap.ProductNotModificationRecrationProductContentAssociation}" map-name="productContentData" ><display/></field>

Modified: ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl Thu Feb 19 23:08:30 2009
@@ -115,7 +115,7 @@
<td><input type="text" name="squareFootage" value="${facility.squareFootage?if_exists}" size="10" maxlength="20"></td>
</tr>
<tr>
- <td class="label">${uiLabelMap.Description}</td>
+ <td class="label">${uiLabelMap.ProductProductDescription}</td>
<td ><input type="text" name="description" value="${facility.description?if_exists}" size="60" maxlength="250"></td>
</tr>
<tr>

Modified: ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl Thu Feb 19 23:08:30 2009
@@ -145,7 +145,7 @@
<td>${uiLabelMap.FormFieldTitle_orderDate}</td>
<td>${uiLabelMap.ProductChannel}</td>
<td>${uiLabelMap.ProductOrderItem}</td>
- <td>${uiLabelMap.Description}</td>
+ <td>${uiLabelMap.ProductProductDescription}</td>
<td>${uiLabelMap.ProductOrderShipGroupId}</td>
<td>${uiLabelMap.ProductQuantity}</td>
<td>${uiLabelMap.ProductQuantityNotAvailable}</td>

Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentItems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentItems.ftl?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentItems.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentItems.ftl Thu Feb 19 23:08:30 2009
@@ -124,7 +124,7 @@
<td><span class="label">${uiLabelMap.ProductNewItem}</span></td>
<td colspan="2"><span class="label">${uiLabelMap.ProductProductId}</span> <input type="text" name="productId" size="15" maxlength="20"/></td>
<td><input type="text" name="quantity" size="5" value="0"/></td>
- <td colspan="2"><span class="label">${uiLabelMap.Description}</span> <input name="shipmentContentDescription" size="30" maxlength="255"/></td>
+ <td colspan="2"><span class="label">${uiLabelMap.ProductProductDescription}</span> <input name="shipmentContentDescription" size="30" maxlength="255"/></td>
<td><a href="javascript:document.createShipmentItemForm.submit()" class="buttontext">${uiLabelMap.CommonCreate}</a></td>
</form>
</tr>

Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl Thu Feb 19 23:08:30 2009
@@ -407,7 +407,7 @@
<tr class="header-row">
<td>${uiLabelMap.ProductItem} #</td>
<td>${uiLabelMap.ProductProductId}</td>
- <td>${uiLabelMap.Description}</td>
+ <td>${uiLabelMap.ProductProductDescription}</td>
<td>${uiLabelMap.ProductInventoryItem} #</td>
<td align="right">${uiLabelMap.ProductPackedQty}</td>
<td align="right">${uiLabelMap.ProductPackedWeight} (${("uiLabelMap.ProductShipmentUomAbbreviation_" + defaultWeightUomId)?eval}) (${uiLabelMap.ProductPackage})</td>
@@ -451,7 +451,7 @@
<tr class="header-row">
<td>${uiLabelMap.ProductItem} #</td>
<td>${uiLabelMap.ProductProductId}</td>
- <td>${uiLabelMap.Description}</td>
+ <td>${uiLabelMap.ProductProductDescription}</td>
<td>${uiLabelMap.ProductInventoryItem} #</td>
<td align="right">${uiLabelMap.ProductPackedQty}</td>
<td align="right">${uiLabelMap.ProductPackedWeight} (${("uiLabelMap.ProductShipmentUomAbbreviation_" + defaultWeightUomId)?eval}) (${uiLabelMap.ProductPackage})</td>

Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml Thu Feb 19 23:08:30 2009
@@ -98,7 +98,7 @@
</field>
<field name="brandName" title="${uiLabelMap.ProductBrandName}"><display/></field>
<field name="internalName" title="${uiLabelMap.ProductInternalName}"><display/></field>
- <field name="primaryProductCategoryId" title="Category"><display/></field>
+ <field name="primaryProductCategoryId" title="${uiLabelMap.ProductPrimaryCategory}"><display/></field>
<field name="searchVariants" title="" widget-style="buttontext" use-when="isVirtual!=null&&"${isVirtual}".equals("Y")">
<hyperlink also-hidden="false" target-type="plain" description="${uiLabelMap.ProductVariants}" target="LookupVariantProduct?productId=${productId}"/>
</field>

Modified: ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/forms/FacilityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/forms/FacilityForms.xml?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/forms/FacilityForms.xml (original)
+++ ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/forms/FacilityForms.xml Thu Feb 19 23:08:30 2009
@@ -23,11 +23,11 @@

<form name="ListFacilities" type="list" list-name="facilities" paginate-target="main"
default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
- <field name="facilityId" title="ID" widget-style="buttontext">
+ <field name="facilityId" widget-style="buttontext">
<hyperlink also-hidden="false" description="${facilityId}" target="menu?facilityId=${facilityId}"/>
</field>
- <field name="facilityName" title="Name"><display/></field>
- <field name="description" title="Description"><display/></field>
+ <field name="facilityName"><display/></field>
+ <field name="description" title="${uiLabelMap.ProductProductDescription}"><display/></field>
</form>


@@ -35,15 +35,15 @@
default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
<field name="facilityId"><hidden/></field>
<field name="OrderId" required-field="true" title="PO Number"><text size="10"/></field>
- <field name="submitButton" title="Next" widget-style="standardSubmit"><submit button-type="button"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonNext}" widget-style="standardSubmit"><submit button-type="button"/></field>
</form>


<form name="ProductEnter" type="single" target="productqtyreceipt"
default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
<field name="facilityId"><hidden/></field>
- <field name="productId" required-field="true" title="Product ID" ><text size="10" default-value=""/></field>
- <field name="submitButton" title="Next" widget-style="standardSubmit"><submit button-type="button"/></field>
+ <field name="productId" required-field="true"><text size="10" default-value=""/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonNext}" widget-style="standardSubmit"><submit button-type="button"/></field>
</form>


@@ -51,19 +51,19 @@
default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
<field name="facilityId"><hidden/></field>
<field name="productId"><hidden/></field>
- <field name="productId" title="Product" entry-name="product.productId" ><display/></field>
- <field name="productName" title=" " entry-name="product.productName" ><display/></field>
- <field name="productLocation" title="Location" event="onkeypress" action="return enter(event,document.forms[0].productQty)"><text size="10"/></field>
+ <field name="productId" entry-name="product.productId" ><display/></field>
+ <field name="productName" title="${uiLabelMap.CommonEmptyHeader}" entry-name="product.productName" ><display/></field>
+ <field name="productLocation" event="onkeypress" action="return enter(event,document.forms[0].productQty)"><text size="10"/></field>
<field name="productQty" required-field="true" title="Qty" ><text default-value="1" size="5"/></field>
- <field name="submitButton" title="Receive" widget-style="standardSubmit"><submit button-type="button"/></field>
+ <field name="submitButton" title="${uiLabelMap.ProductReceiveProduct}" widget-style="standardSubmit"><submit button-type="button"/></field>
</form>


<form name="FindProductStock" type="single" target="findstocktake"
default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
<field name="facilityId"><hidden/></field>
- <field name="idValue" required-field="true" title="ID Value" ><text size="10" default-value=""/></field>
- <field name="submitButton" title="Next" widget-style="standardSubmit"><submit button-type="button"/></field>
+ <field name="idValue" required-field="true"><text size="10" default-value=""/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonNext}" widget-style="standardSubmit"><submit button-type="button"/></field>
</form>

<form name="ProductStocktake" type="single" target="updateproductstocktake"
@@ -71,7 +71,7 @@
<field name="facilityId"><hidden/></field>
<field name="productId"><display/></field>
<field name="productName" entry-name="product.productName"><display/></field>
- <field name="atp_qoh" title="ATP/QOH" entry-name="quantitySummary.atp_qoh"><display/></field>
+ <field name="atp_qoh" title="${uiLabelMap.ProductAtpQoh}" entry-name="quantitySummary.atp_qoh"><display/></field>
<field name="locationSeqId" entry-name="locationSeqId"><display/></field>

</form>
@@ -81,7 +81,7 @@

<field name="productId"><hidden/></field>
<field name="facilityId"><hidden/></field>
- <field name="atp_qoh" title="ATP/QOH" entry-name="atp_qoh"><display/></field>
+ <field name="atp_qoh" title="${uiLabelMap.ProductAtpQoh}" entry-name="atp_qoh"><display/></field>
<field name="locationSeqId"><hidden/></field>
<field name="locationSeqIdNew" entry-name="locationSeqId"><text size="10" default-value=""/></field>
<field name="quantity" required-field="true" entry-name="totalQuantityOnHand"><text size="6" default-value=""/></field>
@@ -95,7 +95,7 @@
<form name="MainMenu" type="single" target="menu">
<field name="facilityId"><hidden/></field>
<field name="m1" title="${uiLabelMap.FacilityFacility} : ${facilityId}" position="1"><display/></field>
- <field name="receipt" title="1. Goods Receipt">
+ <field name="receipt" title="1. ${uiLabelMap.ProductGoodsReceipt}">
<submit button-type="text-link"/>
</field>
<field name="picking" title="2. ${uiLabelMap.ProductPicking}" position="1">

Modified: ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityScreens.xml?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityScreens.xml Thu Feb 19 23:08:30 2009
@@ -90,7 +90,7 @@
<decorator-screen name="FacilityDecorator">
<decorator-section name="body">
<container>
- <label style="h1">Goods Receipt</label>
+ <label style="h1">${uiLabelMap.ProductGoodsReceipt}</label>
</container>
<platform-specific><html><html-template location="component://hhfacility/webapp/hhfacility/receipt.ftl"/></html></platform-specific>
</decorator-section>
@@ -185,7 +185,7 @@
<decorator-screen name="FacilityDecorator">
<decorator-section name="body">
<container>
- <label style="h1">Picking</label>
+ <label style="h1">${uiLabelMap.ProductPicking}</label>
</container>
</decorator-section>
</decorator-screen>
@@ -199,7 +199,7 @@
<decorator-screen name="FacilityDecorator">
<decorator-section name="body">
<container>
- <label style="h1">Packing</label>
+ <label style="h1">${uiLabelMap.ProductPacking}</label>
</container>
</decorator-section>
</decorator-screen>

Modified: ofbiz/trunk/specialpurpose/mypage/config/MyPageUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/config/MyPageUiLabels.xml?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/config/MyPageUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/config/MyPageUiLabels.xml Thu Feb 19 23:08:30 2009
@@ -73,6 +73,18 @@
<value xml:lang="it">Proprie richieste cliente</value>
<value xml:lang="th">à¸¥à¸¹à¸à¸à¹à¸²à¹à¸£à¸µà¸¢à¸à¸£à¹à¸à¸</value>
</property>
+ <property key="MyPageCustRequestNotificationMailCompleted">
+ <value xml:lang="en">Customer Request Completed Notification Mai</value>
+ <value xml:lang="it">Notifica mail per richiesta cliente completata</value>
+ </property>
+ <property key="MyPageCustRequestNotificationMailCreation">
+ <value xml:lang="en">Customer Request Creation Notification Mail</value>
+ <value xml:lang="it">Notifica mail per richiesta cliente creata</value>
+ </property>
+ <property key="MyPageDraftEmails">
+ <value xml:lang="en">Draft Emails</value>
+ <value xml:lang="it">Bozze emails</value>
+ </property>
<property key="MyPageEmailsFromKnownOrigin">
<value xml:lang="en">Emails from known origin</value>
<value xml:lang="fr">Courriel issue d'une origine connue</value>

Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml Thu Feb 19 23:08:30 2009
@@ -129,7 +129,7 @@
</row-actions>
<field name="custRequestId"><hidden/></field>
<field name="custRequestName"><hyperlink description="${custRequestName} [${custRequestId}]" target="ViewRequest?custRequestId=${custRequestId}"/></field>
- <field name="custRequestDate" title="Date"><display type="date"/></field>
+ <field name="custRequestDate" title="${uiLabelMap.CommonDate}"><display type="date"/></field>
<field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
<field name="priority">
<drop-down allow-empty="true">

Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml Thu Feb 19 23:08:30 2009
@@ -227,7 +227,7 @@
</condition>
<link target="NewCommunicationEvents?communicationEventTypeId=EMAIL_COMMUNICATION&parentCommEventId=${parameters.communicationEventId}&donePage=${parameters.donePage}"/>
</menu-item>
- <menu-item name="forward" title="${uiLabelMap.Forward}">
+ <menu-item name="forward" title="${uiLabelMap.PartyForward}">
<condition>
<and>
<not><if-empty field="parameters.communicationEventId"/></not>
@@ -278,16 +278,16 @@
</menu-item>
</menu>
<menu name="RequestTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
- <menu-item name="ViewRequest" title="Overview" >
+ <menu-item name="ViewRequest" title="${uiLabelMap.OrderRequestOverview}" >
<link target="ViewRequest?custRequestId=${custRequest.custRequestId}"/>
</menu-item>
- <menu-item name="custRequestContent" title="Content">
+ <menu-item name="custRequestContent" title="${uiLabelMap.ContentContent}">
<link target="EditCustRequestContent?custRequestId=${custRequest.custRequestId}"/>
</menu-item>
</menu>
<menu name="RequestSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
menu-container-style="button-bar button-style-2">
- <menu-item name="cancelledRequest" title="Cancel request" >
+ <menu-item name="cancelledRequest" title="${uiLabelMap.CommonCancel} ${uiLabelMap.OrderRequest}" >
<condition>
<and>
<not><if-empty field="custRequest"/></not>
@@ -297,7 +297,7 @@
</condition>
<link target="setCustRequestStatus?custRequestId=${custRequestId}&statusId=CRQ_CANCELLED"/>
</menu-item>
- <menu-item name="addContent" title="Add content">
+ <menu-item name="addContent" title="${uiLabelMap.PageTitleAddContent}">
<condition>
<and>
<not><if-empty field="custRequest"/></not>

Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml Thu Feb 19 23:08:30 2009
@@ -259,7 +259,7 @@
</not>
</condition>
<widgets>
- <label style="h2" text="${uiLabelMap.DraftEmails}"></label>
+ <label style="h2" text="${uiLabelMap.MyPageDraftEmails}"></label>
<include-form
location="component://mypage/widget/MyPageForms.xml"
name="ListDraftEmails" />
@@ -518,7 +518,7 @@
<screen name="CreateCustRequestNotification">
<section>
<actions>
- <set field="title" value="Customer Request Creation Notification Mail #${custRequestId}"/>
+ <set field="title" value="${uiLabelMap.MyPageCustRequestNotificationMailCreation} #${custRequestId}"/>
</actions>
<widgets>
<platform-specific><html><html-template location="component://mypage/templates/email/CreateCustRequestNotification.ftl"/></html></platform-specific>
@@ -528,7 +528,7 @@
<screen name="CompletedCustRequestNotification">
<section>
<actions>
- <set field="title" value="Customer Request Completed Notification Mail #${custRequestId}"/>
+ <set field="title" value="${uiLabelMap.MyPageCustRequestNotificationMailCompleted} #${custRequestId}"/>
</actions>
<widgets>
<platform-specific><html><html-template location="component://mypage/templates/email/CompletedCustRequestNotification.ftl"/></html></platform-specific>

Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml Thu Feb 19 23:08:30 2009
@@ -150,7 +150,7 @@
</row-actions>
<field name="custRequestId"><hidden/></field>
<field name="custRequestName"><hyperlink description="${custRequestName} [${custRequestId}]" target="ViewRequest?custRequestId=${custRequestId}"/></field>
- <field name="custRequestDate" title="Date"><display type="date"/></field>
+ <field name="custRequestDate" title="${uiLabelMap.CommonDate}"><display type="date"/></field>
<field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
<field name="priority">
<drop-down allow-empty="true">

Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml Thu Feb 19 23:08:30 2009
@@ -126,7 +126,7 @@
</condition>
<link target="NewCommunicationEvents?communicationEventTypeId=EMAIL_COMMUNICATION&parentCommEventId=${parameters.communicationEventId}&portalPageId=${parameters.portalPageId}"/>
</menu-item>
- <menu-item name="forward" title="${uiLabelMap.Forward}">
+ <menu-item name="forward" title="${uiLabelMap.PartyForward}">
<condition>
<and>
<not><if-empty field="parameters.communicationEventId"/></not>
@@ -179,15 +179,15 @@
</menu-item>
</menu>
<menu name="RequestTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
- <menu-item name="ViewRequest" title="Overview" >
+ <menu-item name="ViewRequest" title="${uiLabelMap.OrderRequestOverview}" >
<link target="ViewRequest?custRequestId=${custRequest.custRequestId}"/>
</menu-item>
- <menu-item name="custRequestContent" title="Content">
+ <menu-item name="custRequestContent" title="${uiLabelMap.ContentContent}">
<link target="EditCustRequestContent?custRequestId=${custRequest.custRequestId}"/>
</menu-item>
</menu>
<menu name="RequestSubTabBar" type="simple" menu-container-style="button-bar button-style-2">
- <menu-item name="cancelledRequest" title="Cancel request" >
+ <menu-item name="cancelledRequest" title="${uiLabelMap.CommonCancel} ${uiLabelMap.OrderRequest}" >
<condition>
<and>
<not><if-empty field="custRequest"/></not>
@@ -197,7 +197,7 @@
</condition>
<link target="setCustRequestStatus?custRequestId=${custRequestId}&statusId=CRQ_CANCELLED"/>
</menu-item>
- <menu-item name="addContent" title="Add content">
+ <menu-item name="addContent" title="${uiLabelMap.PageTitleAddContent}">
<condition>
<and>
<not><if-empty field="custRequest"/></not>

Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml Thu Feb 19 23:08:30 2009
@@ -260,7 +260,7 @@
</not>
</condition>
<widgets>
- <label style="h2" text="${uiLabelMap.DraftEmails}"></label>
+ <label style="h2" text="${uiLabelMap.MyPageDraftEmails}"></label>
<include-form
location="component://myportal/widget/MyPortalForms.xml"
name="ListDraftEmails" />
@@ -515,7 +515,7 @@
<screen name="CreateCustRequestNotification">
<section>
<actions>
- <set field="title" value="Customer Request Creation Notification Mail #${custRequestId}"/>
+ <set field="title" value="${uiLabelMap.MyPageCustRequestNotificationMailCreation} #${custRequestId}"/>
</actions>
<widgets>
<platform-specific><html><html-template location="component://myportal/templates/email/CreateCustRequestNotification.ftl"/></html></platform-specific>
@@ -525,7 +525,7 @@
<screen name="CompletedCustRequestNotification">
<section>
<actions>
- <set field="title" value="Customer Request Completed Notification Mail #${custRequestId}"/>
+ <set field="title" value="${uiLabelMap.MyPageCustRequestNotificationMailCompleted} #${custRequestId}"/>
</actions>
<widgets>
<platform-specific><html><html-template location="component://myportal/templates/email/CompletedCustRequestNotification.ftl"/></html></platform-specific>
@@ -853,7 +853,7 @@
<widgets>
<section>
<widgets>
- <screenlet title="${uiLabelMap.MyOpenCustomerRequests}" navigation-form-name="ListCustRequests" >
+ <screenlet title="${uiLabelMap.MyPortalOpenCustomerRequests}" navigation-form-name="ListCustRequests" >
<link target="newrequest" text="${uiLabelMap.OrderNewRequest}" style="buttontext"/>
<include-form name="ListCustRequests" location="component://myportal/widget/MyPortalForms.xml"/>
</screenlet>
@@ -1541,7 +1541,7 @@
<screen name="CreateUserNotification">
<section>
<actions>
- <set field="title" value="Myportal Account Creation Notification Mail"/>
+ <set field="title" value="${uiLabelMap.MyPageCustRequestNotificationMailCreation}"/>
</actions>
<widgets>
<platform-specific><html><html-template location="component://party/templates/email/CreatePartyNotification.ftl"/></html></platform-specific>

Modified: ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml Thu Feb 19 23:08:30 2009
@@ -641,6 +641,14 @@
<value xml:lang="th">à¹à¸à¹à¹à¸</value>
<value xml:lang="zh">ç¼è¾</value>
</property>
+ <property key="ProjectMgrEditAssoc">
+ <value xml:lang="en">Edit Assoc</value>
+ <value xml:lang="it">Aggiorna associazione</value>
+ </property>
+ <property key="ProjectMgrEditAssocDetail">
+ <value xml:lang="en">Edit Assoc Detail</value>
+ <value xml:lang="it">Aggiorna dettagli associazione</value>
+ </property>
<property key="ProjectMgrEditPartySkill">
<value xml:lang="en">Edit PartySkill</value>
<value xml:lang="fr">Modifier les compÃ©tences de l'acteur</value>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml Thu Feb 19 23:08:30 2009
@@ -459,7 +459,7 @@
</condition>
<link target="EditRequest?custRequestId=${parameters.custRequestId}"/>
</menu-item>
- <menu-item name="custRequestContent" title="Content">
+ <menu-item name="custRequestContent" title="${uiLabelMap.ContentContent}">
<condition>
<and>
<not><if-empty field="custRequest"/></not>
@@ -480,7 +480,7 @@
</menu>
<menu name="RequestSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
menu-container-style="button-bar button-style-2">
- <menu-item name="cancelledRequest" title="Cancel request" >
+ <menu-item name="cancelledRequest" title="${uiLabelMap.CommonCancel} ${uiLabelMap.OrderRequest}" >
<condition>
<and>
<not><if-empty field="custRequest"/></not>
@@ -490,7 +490,7 @@
</condition>
<link target="setCustRequestStatus?custRequestId=${custRequestId}&statusId=CRQ_CANCELLED"/>
</menu-item>
- <menu-item name="addContent" title="Add content">
+ <menu-item name="addContent" title="${uiLabelMap.PageTitleAddContent}">
<condition>
<and>
<not><if-empty field="custRequest"/></not>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Thu Feb 19 23:08:30 2009
@@ -176,8 +176,8 @@
<section>
<condition><not><if-empty field="workEffortAssoc"/></not></condition>
<widgets>
- <link target="EditProjectAndAssoc?workEffortIdFrom=${workEffortAssoc.workEffortIdFrom}&workEffortIdTo=${workEffortAssoc.workEffortIdTo}&workEffortAssocTypeId=${workEffortAssoc.workEffortAssocTypeId}&fromDate=${workEffortAssoc.fromDate}&DONE_PAGE=${donePage}" text="Edit Assoc" style="buttontext"></link>
- <link target="EditProjectAndAssoc?workEffortIdFrom=${workEffortAssoc.workEffortIdFrom}&workEffortIdTo=${workEffortAssoc.workEffortIdTo}&workEffortAssocTypeId=${workEffortAssoc.workEffortAssocTypeId}&fromDate=${workEffortAssoc.fromDate}&DONE_PAGE=${donePage}" text="Edit Assoc Detail" style="buttontext"></link>
+ <link target="EditProjectAndAssoc?workEffortIdFrom=${workEffortAssoc.workEffortIdFrom}&workEffortIdTo=${workEffortAssoc.workEffortIdTo}&workEffortAssocTypeId=${workEffortAssoc.workEffortAssocTypeId}&fromDate=${workEffortAssoc.fromDate}&DONE_PAGE=${donePage}" text="${uiLabelMap.ProjectMgrEditAssoc}" style="buttontext"></link>
+ <link target="EditProjectAndAssoc?workEffortIdFrom=${workEffortAssoc.workEffortIdFrom}&workEffortIdTo=${workEffortAssoc.workEffortIdTo}&workEffortAssocTypeId=${workEffortAssoc.workEffortAssocTypeId}&fromDate=${workEffortAssoc.fromDate}&DONE_PAGE=${donePage}" text="${uiLabelMap.ProjectMgrEditAssocDetail}" style="buttontext"></link>
</widgets>
</section>
</widgets>

Modified: ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/transaction/WebPosTransaction.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/transaction/WebPosTransaction.java?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/transaction/WebPosTransaction.java (original)
+++ ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/transaction/WebPosTransaction.java Thu Feb 19 23:08:30 2009
@@ -236,8 +236,7 @@
// get the change due
BigDecimal change = grandTotal.subtract(paymentAmt);

- // notify the change due
- //output.print(UtilProperties.getMessage(PosTransaction.resource,"CHANGE",defaultLocale) + " " + UtilFormatOut.formatPrice(this.getTotalDue() * -1));
+ // TODO notify the change due

// threaded drawer/receipt printing
// TODO open the drawer