svn commit: r1452030 [1/10] - in /ofbiz/branches/webhelp-2012-1
Locked
svn commit: r1452030 [1/10] - in /ofbiz/branches/webhelp-2012-1
 
|
Author: jleroux
Date: Sun Mar 3 12:00:12 2013 New Revision: 1452030 URL: http://svn.apache.org/r1452030 Log: Merge trunk HEAD It's the last time I Merge. At Olivier's request, I just tested the webhelp addon. It works like a charm :) To test I used: ofbiz trunk svn release 1442197 (as Olivier requested, I guess HEAD would have worked as well) last addon manager (I used addonmanager-20130225.jar taken at http://code.google.com/a/apache-extras.org/p/ofbiz-adm/downloads/list) adm install org.ofbizextra.content.webhelp (following http://markmail.org/message/p4k4yvwct4rql5js) ant load-demo (or seed, ... data have to be loaded) ant webhelp Then test on localhost (with FF you need to allow popups for localhost ) humanres et manufacturing (en de ou nl) and accounting editTaxAutorityAssoc to see a specific redirection message It's great to see it working OOTB without any issues. I believe the tool (addons in general, webhelp addon is still a WIP) is ready for a wide spread use :) Added: ofbiz/branches/webhelp-2012-12-07/applications/accounting/script/org/ofbiz/accounting/test/TaxAuthorityTests.xml - copied unchanged from r1452029, ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/TaxAuthorityTests.xml ofbiz/branches/webhelp-2012-12-07/applications/accounting/testdef/taxauthoritytests.xml - copied unchanged from r1452029, ofbiz/trunk/applications/accounting/testdef/taxauthoritytests.xml Modified: ofbiz/branches/webhelp-2012-12-07/ (props changed) ofbiz/branches/webhelp-2012-12-07/applications/accounting/ofbiz-component.xml ofbiz/branches/webhelp-2012-12-07/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java ofbiz/branches/webhelp-2012-12-07/applications/commonext/widget/ofbizsetup/SetupForms.xml ofbiz/branches/webhelp-2012-12-07/applications/content/script/org/ofbiz/content/data/DataServices.xml ofbiz/branches/webhelp-2012-12-07/applications/humanres/webapp/humanres/humanres/findEmployee.ftl ofbiz/branches/webhelp-2012-12-07/applications/humanres/widget/forms/EmployeeForms.xml ofbiz/branches/webhelp-2012-12-07/applications/marketing/webapp/sfa/contact/mergeContacts.ftl ofbiz/branches/webhelp-2012-12-07/applications/marketing/webapp/sfa/lead/mergeLeads.ftl ofbiz/branches/webhelp-2012-12-07/applications/marketing/widget/ContactListForms.xml ofbiz/branches/webhelp-2012-12-07/applications/marketing/widget/sfa/forms/AccountForms.xml ofbiz/branches/webhelp-2012-12-07/applications/marketing/widget/sfa/forms/ContactForms.xml ofbiz/branches/webhelp-2012-12-07/applications/marketing/widget/sfa/forms/LeadForms.xml ofbiz/branches/webhelp-2012-12-07/applications/order/config/OrderEntityLabels.xml ofbiz/branches/webhelp-2012-12-07/applications/order/config/OrderErrorUiLabels.xml ofbiz/branches/webhelp-2012-12-07/applications/order/config/OrderUiLabels.xml ofbiz/branches/webhelp-2012-12-07/applications/order/webapp/ordermgr/images/js/OrderShippingInfo.js ofbiz/branches/webhelp-2012-12-07/applications/order/webapp/ordermgr/images/js/geoAutoCompleter.js ofbiz/branches/webhelp-2012-12-07/applications/party/config/PartyEntityLabels.xml ofbiz/branches/webhelp-2012-12-07/applications/party/config/PartyErrorUiLabels.xml ofbiz/branches/webhelp-2012-12-07/applications/party/config/PartyUiLabels.xml ofbiz/branches/webhelp-2012-12-07/applications/party/entitydef/entitymodel.xml ofbiz/branches/webhelp-2012-12-07/applications/party/script/org/ofbiz/party/party/PartySimpleMethods.xml ofbiz/branches/webhelp-2012-12-07/applications/party/webapp/partymgr/party/editcontactmech.ftl ofbiz/branches/webhelp-2012-12-07/applications/party/webapp/partymgr/party/findparty.ftl ofbiz/branches/webhelp-2012-12-07/applications/party/widget/partymgr/PartyForms.xml ofbiz/branches/webhelp-2012-12-07/applications/product/config/ProductEntityLabels.xml ofbiz/branches/webhelp-2012-12-07/applications/product/config/ProductErrorUiLabels.xml ofbiz/branches/webhelp-2012-12-07/applications/product/config/ProductUiLabels.xml ofbiz/branches/webhelp-2012-12-07/applications/product/entitydef/entitymodel.xml ofbiz/branches/webhelp-2012-12-07/applications/product/src/org/ofbiz/product/category/CatalogUrlFilter.java ofbiz/branches/webhelp-2012-12-07/applications/product/src/org/ofbiz/product/category/OfbizCatalogUrlTransform.java ofbiz/branches/webhelp-2012-12-07/applications/product/webapp/facility/facility/EditContactMech.ftl ofbiz/branches/webhelp-2012-12-07/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl ofbiz/branches/webhelp-2012-12-07/applications/product/widget/catalog/ProductStoreForms.xml ofbiz/branches/webhelp-2012-12-07/framework/common/config/CommonUiLabels.xml ofbiz/branches/webhelp-2012-12-07/framework/entity/src/org/ofbiz/entity/test/EntityTestSuite.java ofbiz/branches/webhelp-2012-12-07/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaAction.java ofbiz/branches/webhelp-2012-12-07/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaCondition.java ofbiz/branches/webhelp-2012-12-07/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaRule.java ofbiz/branches/webhelp-2012-12-07/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaSetField.java ofbiz/branches/webhelp-2012-12-07/framework/service/config/ServiceErrorUiLabels.xml ofbiz/branches/webhelp-2012-12-07/framework/service/src/org/ofbiz/service/ServiceUtil.java ofbiz/branches/webhelp-2012-12-07/framework/start/src/org/ofbiz/base/start/both.properties ofbiz/branches/webhelp-2012-12-07/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java ofbiz/branches/webhelp-2012-12-07/framework/webtools/config/WebtoolsUiLabels.xml ofbiz/branches/webhelp-2012-12-07/framework/webtools/webapp/webtools/WEB-INF/actions/service/AvailableServices.groovy ofbiz/branches/webhelp-2012-12-07/framework/webtools/webapp/webtools/service/availableservices.ftl ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl ofbiz/branches/webhelp-2012-12-07/specialpurpose/oagis/config/OagisUiLabels.xml ofbiz/branches/webhelp-2012-12-07/specialpurpose/pos/config/PosUiLabels.xml ofbiz/branches/webhelp-2012-12-07/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml ofbiz/branches/webhelp-2012-12-07/specialpurpose/scrum/config/scrumUiLabels.xml ofbiz/branches/webhelp-2012-12-07/specialpurpose/webpos/config/WebPosUiLabels.xml Propchange: ofbiz/branches/webhelp-2012-12-07/ ------------------------------------------------------------------------------ Merged /ofbiz/trunk:r1446858-1452029 Modified: ofbiz/branches/webhelp-2012-12-07/applications/accounting/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/accounting/ofbiz-component.xml?rev=1452030&r1=1452029&r2=1452030&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/accounting/ofbiz-component.xml (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/accounting/ofbiz-component.xml Sun Mar 3 12:00:12 2013 @@ -101,6 +101,7 @@ under the License. <test-suite loader="main" location="testdef/paymentappltests.xml"/> <test-suite loader="main" location="testdef/invoicetests.xml"/> <test-suite loader="main" location="testdef/fixedassettests.xml"/> + <test-suite loader="main" location="testdef/taxauthoritytests.xml"/> <webapp name="accounting" title="Accounting" Modified: ofbiz/branches/webhelp-2012-12-07/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java?rev=1452030&r1=1452029&r2=1452030&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java Sun Mar 3 12:00:12 2013 @@ -212,6 +212,11 @@ public class TaxAuthorityServices { BigDecimal shippingAmount = itemShippingList.get(i); List<GenericValue> taxList = null; if (shippingAddress != null) { + if ("Y".equals(productStore.getString("calcTaxAfterPromotion")) && itemAmount.compareTo(BigDecimal.ZERO) != 0) { + if (itemQuantity.compareTo(new BigDecimal("1.00")) == 0) { + itemPrice = itemAmount; + } + } taxList = getTaxAdjustments(delegator, product, productStore, payToPartyId, billToPartyId, taxAuthoritySet, itemPrice, itemQuantity, itemAmount, shippingAmount, ZERO_BASE); } // this is an add and not an addAll because we want a List of Lists of GenericValues, one List of Adjustments per item Modified: ofbiz/branches/webhelp-2012-12-07/applications/commonext/widget/ofbizsetup/SetupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/commonext/widget/ofbizsetup/SetupForms.xml?rev=1452030&r1=1452029&r2=1452030&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/commonext/widget/ofbizsetup/SetupForms.xml (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/commonext/widget/ofbizsetup/SetupForms.xml Sun Mar 3 12:00:12 2013 @@ -43,13 +43,13 @@ </field> <field name="USER_ADDRESS_ALLOW_SOL"><hidden value="Y"/></field> <field name="WorkPhoneTitle" title="${uiLabelMap.PartyContactWorkPhoneNumber}" title-area-style="group-label" widget-style="tooltip"><display description="${uiLabelMap.PartyPhoneNumberRequired}" also-hidden="false"/></field> - <field name="USER_WORK_COUNTRY" title="${uiLabelMap.PartyCountryCode}"><text size="4" maxlength="10"/></field> + <field name="USER_WORK_COUNTRY" title="${uiLabelMap.CommonCountryCode}"><text size="4" maxlength="10"/></field> <field name="USER_WORK_AREA" title="${uiLabelMap.PartyAreaCode}"><text size="4" maxlength="10"/></field> <field name="USER_WORK_CONTACT" title="${uiLabelMap.PartyPhoneNumber}"><text size="15" maxlength="15"/></field> <field name="USER_WORK_EXT" title="${uiLabelMap.PartyContactExt}"><text size="6" maxlength="10"/></field> <field name="USER_WORK_ALLOW_SOL"><hidden value="Y"/></field> <field name="FaxPhoneTitle" title="${uiLabelMap.PartyContactFaxPhoneNumber}" title-area-style="group-label"><display description=" " also-hidden="false"/></field> - <field name="USER_FAX_COUNTRY" title="${uiLabelMap.PartyCountryCode}"><text size="4" maxlength="10"/></field> + <field name="USER_FAX_COUNTRY" title="${uiLabelMap.CommonCountryCode}"><text size="4" maxlength="10"/></field> <field name="USER_FAX_AREA" title="${uiLabelMap.PartyAreaCode}"><text size="4" maxlength="10"/></field> <field name="USER_FAX_CONTACT" title="${uiLabelMap.PartyPhoneNumber}"><text size="15" maxlength="15"/></field> <field name="USER_FAX_EXT" title="${uiLabelMap.PartyContactExt}"><text size="6" maxlength="10"/></field> Modified: ofbiz/branches/webhelp-2012-12-07/applications/content/script/org/ofbiz/content/data/DataServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/content/script/org/ofbiz/content/data/DataServices.xml?rev=1452030&r1=1452029&r2=1452030&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/content/script/org/ofbiz/content/data/DataServices.xml (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/content/script/org/ofbiz/content/data/DataServices.xml Sun Mar 3 12:00:12 2013 @@ -180,16 +180,16 @@ under the License. <!-- Methods for DataResourceRole --> <simple-method method-name="createDataResourceRole" short-description="Create Data Resource Role"> - <make-value entity-name="DataResourceRole" value-field="newEntity"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - <set-pk-fields map="parameters" value-field="newEntity"/> - - <if-empty field="newEntity.fromDate"> - <now-timestamp field="nowTimestamp"/> - <set field="newEntity.fromDate" from-field="nowTimestamp"/> - </if-empty> - - <create-value value-field="newEntity"/> + <if-not-empty field="parameters.partyId"> + <make-value entity-name="DataResourceRole" value-field="newEntity"/> + <set-nonpk-fields map="parameters" value-field="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> + <if-empty field="newEntity.fromDate"> + <now-timestamp field="nowTimestamp"/> + <set field="newEntity.fromDate" from-field="nowTimestamp"/> + </if-empty> + <create-value value-field="newEntity"/> + </if-not-empty> </simple-method> <simple-method method-name="updateDataResourceRole" short-description="Update Data Resource Role"> <make-value entity-name="DataResourceRole" value-field="lookupKeyValue"/> Modified: ofbiz/branches/webhelp-2012-12-07/applications/humanres/webapp/humanres/humanres/findEmployee.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/humanres/webapp/humanres/humanres/findEmployee.ftl?rev=1452030&r1=1452029&r2=1452030&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/humanres/webapp/humanres/humanres/findEmployee.ftl (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/humanres/webapp/humanres/humanres/findEmployee.ftl Sun Mar 3 12:00:12 2013 @@ -94,7 +94,7 @@ under the License. </#if> <#if extInfo == "T"> <tr><td colspan="3"><hr /></td></tr> - <tr><td class="label">${uiLabelMap.PartyCountryCode}</td> + <tr><td class="label">${uiLabelMap.CommonCountryCode}</td> <td><input type="text" name="countryCode" value="${parameters.countryCode?if_exists}"/></td> </tr> <tr><td class="label">${uiLabelMap.PartyAreaCode}</td> Modified: ofbiz/branches/webhelp-2012-12-07/applications/humanres/widget/forms/EmployeeForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/humanres/widget/forms/EmployeeForms.xml?rev=1452030&r1=1452029&r2=1452030&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/humanres/widget/forms/EmployeeForms.xml (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/humanres/widget/forms/EmployeeForms.xml Sun Mar 3 12:00:12 2013 @@ -58,7 +58,7 @@ </drop-down> </field> <field name="phoneTitle" title="${uiLabelMap.PartyPrimaryPhone}" title-area-style="group-label"><display/></field> - <field name="countryCode" title="${uiLabelMap.PartyCountryCode}"><text size="4" maxlength="10"/></field> + <field name="countryCode" title="${uiLabelMap.CommonCountryCode}"><text size="4" maxlength="10"/></field> <field name="areaCode" title="${uiLabelMap.PartyAreaCode}"><text size="4" maxlength="10"/></field> <field name="contactNumber" title="${uiLabelMap.PartyPhoneNumber}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="15" maxlength="15"/></field> <field name="extension" title="${uiLabelMap.PartyContactExt}"><text size="6" maxlength="10"/></field> Modified: ofbiz/branches/webhelp-2012-12-07/applications/marketing/webapp/sfa/contact/mergeContacts.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/marketing/webapp/sfa/contact/mergeContacts.ftl?rev=1452030&r1=1452029&r2=1452030&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/marketing/webapp/sfa/contact/mergeContacts.ftl (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/marketing/webapp/sfa/contact/mergeContacts.ftl Sun Mar 3 12:00:12 2013 @@ -97,7 +97,7 @@ under the License. </tr> <tr><td><br /><h3>${uiLabelMap.PartyPrimaryPhone}</h3></td></tr> <tr> - <td width="20%">${uiLabelMap.PartyCountryCode}</td> + <td width="20%">${uiLabelMap.CommonCountryCode}</td> <td width="30%">${contactInfo1.countryCode?if_exists}</td> <td width="30%">${contactInfo2.countryCode?if_exists}</td> <td width="10%"><input type="checkbox" name="useContactNum2" value="Y"/></td> Modified: ofbiz/branches/webhelp-2012-12-07/applications/marketing/webapp/sfa/lead/mergeLeads.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/marketing/webapp/sfa/lead/mergeLeads.ftl?rev=1452030&r1=1452029&r2=1452030&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/marketing/webapp/sfa/lead/mergeLeads.ftl (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/marketing/webapp/sfa/lead/mergeLeads.ftl Sun Mar 3 12:00:12 2013 @@ -101,7 +101,7 @@ under the License. </tr> <tr><td><br /><h3>${uiLabelMap.PartyPrimaryPhone}</h3></td></tr> <tr> - <td width="20%">${uiLabelMap.PartyCountryCode}</td> + <td width="20%">${uiLabelMap.CommonCountryCode}</td> <td width="30%">${contactInfo1.countryCode?if_exists}</td> <td width="30%">${contactInfo2.countryCode?if_exists}</td> <td width="10%"><input type="checkbox" name="useContactNum2" value="Y"/></td> Modified: ofbiz/branches/webhelp-2012-12-07/applications/marketing/widget/ContactListForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/marketing/widget/ContactListForms.xml?rev=1452030&r1=1452029&r2=1452030&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/marketing/widget/ContactListForms.xml (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/marketing/widget/ContactListForms.xml Sun Mar 3 12:00:12 2013 @@ -321,12 +321,18 @@ under the License. <field name="submitButton" title="${uiLabel.CommonSubmit}"><submit/></field> </form> - <form name="EditContactListCommEvent" default-map-name="communicationEvent" target="updateContactListCommEvent" title="" type="single" + <form name="EditContactListCommEvent" default-map-name="communicationEvent" target="updateContactListCommEvent" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> + <actions> + <set field="contentMimeTypeId" from-field="communicationEvent.contentMimeTypeId" default-value="text/html"/> + <entity-one entity-name="CommunicationEventType" value-field="communicationEventType"> + <field-map field-name="communicationEventTypeId" from-field="communicationEventTypes[0].communicationEventTypeId"/> + </entity-one> + </actions> <alt-target target="createContactListCommEvent" use-when="communicationEvent==null"/> <field name="communicationEventId" use-when="communicationEvent!=null" title="${uiLabelMap.MarketingContactListCommEventId}"><display/></field> - <field name="communicationEventTypeId"><hidden value="${communicationEventTypes[0].communicationEventTypeId}"/></field> + <field name="communicationEventTypeId" map-name="communicationEventType"><hidden/></field> <field name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}"><lookup target-form-name="LookupPartyName"/></field> <field name="statusId" use-when="communicationEvent==null" title="${uiLabelMap.CommonStatus}"> <drop-down allow-empty="false" no-current-selected-key="COM_PENDING"> @@ -392,15 +398,15 @@ under the License. <field name="contactListId"><lookup size="20" target-form-name="LookupContactList"/></field> <field name="datetimeStarted" title="${uiLabelMap.CommonStartDate}"><date-time/></field> <field name="datetimeEnded" title="${uiLabelMap.CommonFinishDate}"><date-time/></field> - <field name="subject" title="${uiLabelMap.PartySubject}"><text size="30"/></field> - <field name="contentMimeTypeId"> + <field name="subject" title="${uiLabelMap.PartySubject}"><text size="50"/></field> + <field name="contentMimeTypeId" position="2"> <drop-down no-current-selected-key="text/html" allow-empty="false"> <entity-options description="${mimeTypeId}" entity-name="MimeType" key-field-name="mimeTypeId"> <entity-order-by field-name="mimeTypeId"/> </entity-options> </drop-down> </field> - <field name="content" title="${uiLabelMap.CommonContent} --${communicationEventTypes[0].communicationEventTypeId}"><textarea cols="60" rows="10"/></field> + <field name="content" title="${uiLabelMap.CommonContent} -- ${communicationEventType.description}"><textarea cols="60" rows="10" visual-editor-enable="true"/></field> <field name="note" title="${uiLabelMap.CommonNote}"><textarea cols="60" rows="3"/></field> <field name="submitButton" title=" ${uiLabelMap.CommonSave} "><submit button-type="button"/></field> <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field> Modified: ofbiz/branches/webhelp-2012-12-07/applications/marketing/widget/sfa/forms/AccountForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/marketing/widget/sfa/forms/AccountForms.xml?rev=1452030&r1=1452029&r2=1452030&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/marketing/widget/sfa/forms/AccountForms.xml (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/marketing/widget/sfa/forms/AccountForms.xml Sun Mar 3 12:00:12 2013 @@ -62,7 +62,7 @@ under the License. <field name="phoneTitle" title="${uiLabelMap.PartyPrimaryPhone}" title-area-style="group-label"><display/></field> - <field name="countryCode" title="${uiLabelMap.PartyCountryCode}"><text size="4" maxlength="10"/></field> + <field name="countryCode" title="${uiLabelMap.CommonCountryCode}"><text size="4" maxlength="10"/></field> <field name="areaCode" title="${uiLabelMap.PartyAreaCode}"><text size="4" maxlength="10"/></field> <field name="contactNumber" title="${uiLabelMap.PartyPhoneNumber}"><text size="15" maxlength="15"/></field> <field name="extension" title="${uiLabelMap.PartyContactExt}"><text size="6" maxlength="10"/></field> @@ -229,7 +229,7 @@ under the License. </field> </form> <form name="FindTelecomNumber" type="single"> - <field name="tnCountryCode" title="${uiLabelMap.PartyCountryCode}"><text-find/></field> + <field name="tnCountryCode" title="${uiLabelMap.CommonCountryCode}"><text-find/></field> <field name="tnAreaCode" title="${uiLabelMap.PartyAreaCode}"><text-find/></field> <field name="tnContactNumber" title="${uiLabelMap.PartyContactNumber}"><text-find/></field> <field name="tnExtension" title="${uiLabelMap.PartyExtension}"><text-find/></field> Modified: ofbiz/branches/webhelp-2012-12-07/applications/marketing/widget/sfa/forms/ContactForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/marketing/widget/sfa/forms/ContactForms.xml?rev=1452030&r1=1452029&r2=1452030&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/marketing/widget/sfa/forms/ContactForms.xml (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/marketing/widget/sfa/forms/ContactForms.xml Sun Mar 3 12:00:12 2013 @@ -136,7 +136,7 @@ under the License. </drop-down> </field> <field name="phoneTitle" title="${uiLabelMap.PartyPrimaryPhone}" title-area-style="group-label"><display/></field> - <field name="countryCode" title="${uiLabelMap.PartyCountryCode}"><text size="4" maxlength="10"/></field> + <field name="countryCode" title="${uiLabelMap.CommonCountryCode}"><text size="4" maxlength="10"/></field> <field name="areaCode" title="${uiLabelMap.PartyAreaCode}"><text size="4" maxlength="10"/></field> <field name="contactNumber" title="${uiLabelMap.PartyPhoneNumber}"><text size="15" maxlength="15"/></field> <field name="extension" title="${uiLabelMap.PartyContactExt}"><text size="6" maxlength="10"/></field> Modified: ofbiz/branches/webhelp-2012-12-07/applications/marketing/widget/sfa/forms/LeadForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/marketing/widget/sfa/forms/LeadForms.xml?rev=1452030&r1=1452029&r2=1452030&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/marketing/widget/sfa/forms/LeadForms.xml (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/marketing/widget/sfa/forms/LeadForms.xml Sun Mar 3 12:00:12 2013 @@ -51,7 +51,7 @@ under the License. </drop-down> </field> <field name="phoneTitle" title="${uiLabelMap.PartyPrimaryPhone}" title-area-style="group-label"><display/></field> - <field name="countryCode" title="${uiLabelMap.PartyCountryCode}"><text size="4" maxlength="10"/></field> + <field name="countryCode" title="${uiLabelMap.CommonCountryCode}"><text size="4" maxlength="10"/></field> <field name="areaCode" title="${uiLabelMap.PartyAreaCode}"><text size="4" maxlength="10"/></field> <field name="contactNumber" title="${uiLabelMap.PartyPhoneNumber}"><text size="15" maxlength="15"/></field> <field name="extension" title="${uiLabelMap.PartyContactExt}"><text size="6" maxlength="10"/></field> Modified: ofbiz/branches/webhelp-2012-12-07/applications/order/config/OrderEntityLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/order/config/OrderEntityLabels.xml?rev=1452030&r1=1452029&r2=1452030&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/order/config/OrderEntityLabels.xml (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/order/config/OrderEntityLabels.xml Sun Mar 3 12:00:12 2013 @@ -921,6 +921,7 @@ <value xml:lang="ja">ãµã¤ãºäº¤æ</value> <value xml:lang="pt_BR">Troca de tamanho</value> <value xml:lang="vi">Chuyá»n Äá»i cỡ</value> + <value xml:lang="zh">æ´æ¢å°ºå¯¸</value> </property> <property key="ReturnType.description.RTN_CREDIT"> <value xml:lang="de">Guthaben</value> Modified: ofbiz/branches/webhelp-2012-12-07/applications/order/config/OrderErrorUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/order/config/OrderErrorUiLabels.xml?rev=1452030&r1=1452029&r2=1452030&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/order/config/OrderErrorUiLabels.xml (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/order/config/OrderErrorUiLabels.xml Sun Mar 3 12:00:12 2013 @@ -291,6 +291,7 @@ <value xml:lang="nl">Kan alleen een klantvraag aanpassen wanneer de status 'onder handen' is ... status is nu: ${custRequest.statusId}</value> <value xml:lang="pt_BR">Não se pode apenas atualizar CustRequest, quando o estado está "em processamento"... é agora: ${custRequest.statusId}</value> <value xml:lang="vi">Chá» có thá» cáºp nháºt Yêu cầu từ Khách hà ng khi trạng thái là Äang xá» lý (in-process)... hiá»n tại là ${custRequest.statusId}</value> + <value xml:lang="zh">å½ç¶ææ¯æ§è¡ä¸æ¶ï¼æ æ³æ´æ°å®¢æ·è¯·æ±...ç°å¨æ¯ï¼${custRequest.statusId}</value> </property> <property key="OrderCheckCustRequestDraftStatusForDelete"> <value xml:lang="de">Kundenanfrage kann nur im Status 'Entwurf' gelöscht werden...ist jetzt: ${custRequest.statusId}</value> @@ -299,6 +300,7 @@ <value xml:lang="ja">ã¹ãã¼ã¿ã¹ã'åæ'ã®é¡§å®¢ãªã¯ã¨ã¹ãã®ã¿åé¤ã§ãã¾ã...ç¾å¨: ${custRequest.statusId}</value> <value xml:lang="nl">Kan alleen een klantvraag verwijderen wanneer de status 'draft' is ... status is nu: ${custRequest.statusId}</value> <value xml:lang="vi">Chá» có thá» xóa Yêu cầu từ Khách hà ng khi trạng thái là Tạm (Draft), trạng thái hiá»n tại là ${custRequest.statusId}</value> + <value xml:lang="zh">åªæå¨è稿ç¶ææ¶æè½å é¤å®¢æ·è¯·æ±ï¼ç°å¨ç¶ææ¯ï¼${custRequest.statusId}</value> </property> <property key="OrderCouldNotFindOrderHeaderForOrderIdInGetProductStoreFromOrderReturningNull"> <value xml:lang="de">Auftragskopf für Auftrag [ ${orderId} ] konnte nicht gefunden werden, liefere null zurück</value> @@ -553,6 +555,7 @@ <value xml:lang="nl">Fout: Alle regels van de bestelling met nummer #${orderId} zijn al gevalideerd</value> <value xml:lang="pt_BR">ERRO: Todos os itens do pedido #${orderId} já foram verificados</value> <value xml:lang="vi">Lá»i xảy ra: Tất cả hạng mục hà ng hóa trong ÄÆ¡n hà ng #${orderId} Äã Äược thẩm Äá»nh</value> + <value xml:lang="zh">é误ï¼å·²ç»éªè¯äºè®¢å#${orderId}çå ¨é¨æç»</value> </property> <property key="OrderErrorAttemptToVerifyOrderFailed"> <value xml:lang="de">FEHLER: Der Versuch Auftrag #${orderId} zu prüfen schlug fehl</value> @@ -562,6 +565,7 @@ <value xml:lang="nl">Fout Poging om bestelling met nummer #${orderId} te controleren is mislukt</value> <value xml:lang="pt_BR">ERRO: Tentativa de verificar pedido #${orderId} falhou</value> <value xml:lang="vi">Lá»i xảy ra: Quá trình thẩm Äá»nh ÄÆ¡n hà ng #${orderId} không thà nh công</value> + <value xml:lang="zh">é误ï¼éªè¯è®¢å#${orderId}æ¶å¤±è´¥</value> </property> <property key="OrderErrorCallingCountProductQuantityOrderedService"> <value xml:lang="de">Fehler beim Aufruf des countProductQuantityOrdered Service : </value> @@ -834,6 +838,7 @@ <value xml:lang="fr">Le changement de statut de ${custRequest.statusId} à ${parameters.statusId} n'est pas autorisé</value> <value xml:lang="it">Cambio di stato non è valido: da ${custRequest.statusId} a ${parameters.statusId}</value> <value xml:lang="ja">ã¹ãã¼ã¿ã¹ã®å¤æ´ãæå¹ã§ã¯ããã¾ãã: ${custRequest.statusId} ãã ${parameters.statusId}</value> + <value xml:lang="zh">ç¶æååæ æï¼ä» ${custRequest.statusId} å为 ${parameters.statusId}</value> </property> <property key="OrderErrorCouldNotChangeOrderStatusOrderCannotBeFound"> <value xml:lang="de">FEHLER: Auftragsstatus konnte nicht geändert werden, Auftrag nicht gefunden</value> @@ -975,6 +980,7 @@ <value xml:lang="it">Creazione testata reso non ha ristituito in numero di reso</value> <value xml:lang="ja">è¿åä½æãæå¹ãªè¿åIDãæ»ãã¾ããã§ãã</value> <value xml:lang="vi">Quá trình tạo má»i không trả vá» ID hợp lá»</value> + <value xml:lang="zh">æ°å»ºé货没æè¿åä¸ä¸ªææçéè´§æ è¯</value> </property> <property key="OrderErrorCreateReturnItemWithoutId"> <value xml:lang="de">Bei der Erstellung der Retourenposition wurde keine gültige Sequenz-Id zurückgegeben</value> @@ -983,6 +989,7 @@ <value xml:lang="it">Creazione riga reso non ha ristituito un numero di riga reso</value> <value xml:lang="ja">è¿åã¢ã¤ãã ä½æãæå¹ãªé£çªIDãæ»ãã¾ããã§ãã</value> <value xml:lang="vi">Quá trình tạo má»i hạng mục hà ng hóa không trả vá» ID sá» thứ tá»± hợp lá»</value> + <value xml:lang="zh">æ°å»ºéè´§æç»æ²¡æè¿åä¸ä¸ªææçåºå·æ è¯</value> </property> <property key="OrderErrorCreatePermissionError"> <value xml:lang="de">Berechtigungsfehler: Um ${resourceDescription} auszuführen muss man ORDERMGR_CREATE oder ORDERMGR_ADMIN Berechtigungen haben</value> @@ -991,6 +998,7 @@ <value xml:lang="it">Errore di sicurezza: per eseguire ${resourceDescription} devi avere il permesso ORDERMGR_CREATE o ORDERMGR_ADMIN</value> <value xml:lang="ja">ã»ãã¥ãªãã£ã¨ã©ã¼: ${resourceDescription} ãå®è¡ããã«ã¯ ORDERMGR_CREATE ã¾ã㯠ORDERMGR_ADMIN 権éãå¿ è¦ã§ã</value> <value xml:lang="vi">Lá»i phân quyá»n: Äá» thá»±c thi ${resourceDescription} bạn cần có quyá»n ORDERMGR_CREATE hoặc ORDERMGR_ADMIN</value> + <value xml:lang="zh">ç³»ç»é误ï¼è¦è¿è¡${resourceDescription}ï¼ä½ å¿ é¡»æ ORDERMGR_CREATE æ ORDERMGR_ADMIN æé</value> </property> <property key="OrderErrorUpdatePermissionError"> <value xml:lang="de">Berechtigungsfehler: Um ${resourceDescription} auszuführen muss man ORDERMGR_UPDATE oder ORDERMGR_ADMIN Berechtigungen haben</value> @@ -999,6 +1007,7 @@ <value xml:lang="it">Errore di sicurezza: per eseguire ${resourceDescription} devi avere il permesso ORDERMGR_UPDATE o ORDERMGR_ADMIN</value> <value xml:lang="ja">ã»ãã¥ãªãã£ã¨ã©ã¼: ${resourceDescription} ãå®è¡ããã«ã¯ ORDERMGR_UPDATE ã¾ã㯠ORDERMGR_ADMIN 権éãå¿ è¦ã§ã</value> <value xml:lang="vi">Lá»i phân quyá»n: Äá» thá»±c thi ${resourceDescription} bạn cần có quyá»n ORDERMGR_UPDATE hoặc ORDERMGR_ADMIN</value> + <value xml:lang="zh">ç³»ç»é误ï¼è¦è¿è¡${resourceDescription}ï¼ä½ å¿ é¡»æ ORDERMGR_UPDATE æ ORDERMGR_ADMIN æé</value> </property> <property key="OrderErrorDeletePermissionError"> <value xml:lang="de">Berechtigungsfehler: Um ${resourceDescription} auszuführen muss man ORDERMGR_DELETE oder ORDERMGR_ADMIN Berechtigungen haben</value> @@ -1007,6 +1016,7 @@ <value xml:lang="it">Errore di sicurezza: per eseguire ${resourceDescription} devi avere il permesso ORDERMGR_DELETE o ORDERMGR_ADMIN</value> <value xml:lang="ja">ã»ãã¥ãªãã£ã¨ã©ã¼: ${resourceDescription} ãå®è¡ããã«ã¯ ORDERMGR_DELETE ã¾ã㯠ORDERMGR_ADMIN 権éãå¿ è¦ã§ã</value> <value xml:lang="vi">Lá»i phân quyá»n: Äá» thá»±c thi ${resourceDescription} bạn cần có quyá»n ORDERMGR_DELETE hoặc ORDERMGR_ADMIN</value> + <value xml:lang="zh">ç³»ç»é误ï¼è¦è¿è¡${resourceDescription}ï¼ä½ å¿ é¡»æ ORDERMGR_DELETE æ ORDERMGR_ADMIN æé</value> </property> <property key="OrderErrorCustRequestWithIdDoesntExist"> <value xml:lang="de">Fehler : Kundenanfrage mit Id [ ${custRequestId} ] existiert nicht. </value> @@ -1030,6 +1040,7 @@ <value xml:lang="it">Richiesta non trovata, lo stato è : ${custRequest.statusId}</value> <value xml:lang="ja">顧客ãªã¯ã¨ã¹ããè¦ã¤ããã¾ãããã¹ãã¼ã¿ã¹ID: ${custRequest.statusId}</value> <value xml:lang="vi">Yêu cầu khách hà ng không tìm thấy, trạng thái ID: ${custRequest.statusId}</value> + <value xml:lang="zh">没ææ¾å°å®¢æ·è¯·æ±ï¼CustRequestï¼ï¼ç¶ææ è¯æ¯ï¼${custRequest.statusId}</value> </property> <property key="OrderErrorGettingNextOrderIdWhileCreatingOrder"> <value xml:lang="de">Fehler beim Ermitteln der nächsten Order-Id</value> @@ -1123,6 +1134,7 @@ <value xml:lang="ja">ã¨ã©ã¼: 注æNo ${orderId} ã¯ãã§ã«ç¢ºèªããã¦ãã¾ããã次ã®ããã±ã¼ã¸ã®è¨éå¦çã«ç§»åãã¦ãã ãã</value> <value xml:lang="pt_BR">ERRO: Pedido #${orderId} já foi verificado, acesse a tela Pesar Pacote Apenas para mais processamento</value> <value xml:lang="vi">Lá»i xảy ra : ÄÆ¡n hà ng #${orderId} Äã Äược xem xét, bạn hãy và o mà n hình Äóng gói cân nặng (Weigh Package Onlys) Äá» tiếp tục xá» lý</value> + <value xml:lang="zh">é误ï¼å·²ç»éªè¯è¿è®¢å${orderId}äºï¼è¯·è½¬å°âä» ä¸ºå 裹称éâ页é¢ä»¥è¿ä¸æ¥å¤ç</value> </property> <property key="OrderErrorOrderIdNotFound"> <value xml:lang="de">FEHLER: Auftrag mit ID [${orderId}] nicht gefunden</value> @@ -1187,6 +1199,7 @@ <value xml:lang="ja">ã¨ã©ã¼: 注æNo ${orderId} ã¯æ¢±å ã®æ¿èªãããã¦ãã¾ãã</value> <value xml:lang="pt_BR">ERRO: Pedido #${orderId} não está liberado para empacotamento</value> <value xml:lang="vi">Lá»i xảy ra : ÄÆ¡n hà ng [${orderId}] chÆ°a Äược duyá»t Äá» Äóng gói (packing)</value> + <value xml:lang="zh">é误ï¼æ²¡ææ¹å订å#${orderId}è¿è¡å è£ </value> </property> <property key="OrderErrorOrderNotApprovedForPicking"> <value xml:lang="de">FEHLER: Auftrag ${orderId} nicht zum Kommisionieren freigegeben</value> @@ -1195,6 +1208,7 @@ <value xml:lang="ja">ã¨ã©ã¼: 注æNo ${orderId} ã¯ãããã³ã°ã®æ¿èªãããã¦ãã¾ãã</value> <value xml:lang="pt_BR">ERRO: Pedido #${orderId} não está liberado para recolhimento</value> <value xml:lang="vi">Lá»i xảy ra : ÄÆ¡n hà ng [${orderId}] chÆ°a Äược duyá»t Äá» chuyá»n Äi (picking)</value> + <value xml:lang="zh">é误ï¼æ²¡ææ¹å订å#${orderId}è¿è¡åæ£</value> </property> <property key="OrderErrorOrderNotPurchaseOrder"> <value xml:lang="de">Auftrag ${orderId} ist kein Einkaufsauftrag</value> @@ -1216,6 +1230,7 @@ <value xml:lang="fr">ERREUR : La commande ${orderId} n'est pas vérifiée, effectuez le colisage à la place de la pesée</value> <value xml:lang="ja">ã¨ã©ã¼: 注æNo ${orderId} ã¯ç¢ºèªããã¦ãã¾ãããããã±ã¼ã¸ã®è¨éã§ã¯ãªãã次ã®å¦çã¯æ³¨æã梱å ãã¿ã³ãã¯ãªãã¯ãã¦ãã ããã</value> <value xml:lang="pt_BR">ERRO: Pedido #${orderId} não foi verificado, clique no botão Empacotar Pedido ao invés de Apenas Pesar Pacote para mais processamento</value> + <value xml:lang="zh">é误ï¼æ²¡æéªè¯è®¢å#${orderId}ï¼è¯·ç¹å»âå è£ è®¢åâæé®ãèä¸æ¯âä» å 裹称éâæ¥è¿ä¸æ¥å¤ç</value> </property> <property key="OrderErrorOrderNotVerifiedForPacking"> <value xml:lang="de">FEHLER: Auftrag ${orderId} wurde nicht für die Kommissionierung grprüft</value> @@ -1224,6 +1239,7 @@ <value xml:lang="ja">ã¨ã©ã¼: 注æNo ${orderId} ã¯æ¢±å ã®ç¢ºèªãããã¦ãã¾ãã</value> <value xml:lang="pt_BR">ERRO: Pedido #${orderId} não foi verificado para empacotamento</value> <value xml:lang="vi">Lá»i xảy ra : ÄÆ¡n hà ng #${orderId} chÆ°a Äược kiá»m tra Äá» Äóng gói (packing)</value> + <value xml:lang="zh">é误ï¼æ²¡æ为å è£ éªè¯è®¢å#${orderId}</value> </property> <property key="OrderErrorOrderTypeLookupFailed"> <value xml:lang="de">FEHLER : Suche nach Auftragsart fehlgeschlagen : </value> @@ -1290,6 +1306,7 @@ <value xml:lang="it">Non è possibile creare la testata del reso</value> <value xml:lang="ja">è¿åããããä½æã§ãã¾ãã</value> <value xml:lang="vi">Không thá» tạo phần Äầu hoà n trả (return header)</value> + <value xml:lang="zh">æ æ³å建é货头</value> </property> <property key="OrderErrorUnableToCreateReturnItem"> <value xml:lang="de">Fehler beim Erstellen der Retouren-Position</value> @@ -1298,6 +1315,7 @@ <value xml:lang="it">Non è possibile creare la riga del reso</value> <value xml:lang="ja">è¿åã¢ã¤ãã ãä½æã§ãã¾ãã</value> <value xml:lang="vi">Không thá» tạo hạng mục hà ng hóa hoà n trả (return item)</value> + <value xml:lang="zh">æ æ³å建éè´§æç»</value> </property> <property key="OrderErrorUnableToCreateReturnStatusHistory"> <value xml:lang="de">Fehler beim Erstellen des Retouren-Status-Verlaufes</value> @@ -1512,6 +1530,7 @@ <value xml:lang="it">Non è possibile trovare l'utente dal database</value> <value xml:lang="ja">ã¨ã©ã¼: ãã¼ã¿ãã¼ã¹ããã¦ã¼ã¶ãã°ã¤ã³ãè¦ã¤ãããã¨ãã§ãã¾ãã</value> <value xml:lang="vi">Không thá» tìm thấy tà i khoản ÄÄng nháºp từ cÆ¡ sá» dữ liá»u</value> + <value xml:lang="zh">æ æ³ä»æ°æ®åºæ¥æ¾ç¨æ·ç»å½ï¼UserLoginï¼</value> </property> <property key="OrderErrorUnableToUpdateReturnHeaderStatus"> <value xml:lang="de">Status des Retourenkopfes konnte nicht geändert werden</value> @@ -1520,6 +1539,7 @@ <value xml:lang="it">Non è possibile aggiornare lo stato della testata del reso</value> <value xml:lang="ja">ã¨ã©ã¼: è¿åãããã¹ãã¼ã¿ã¹ãæ´æ°ã§ãã¾ããã</value> <value xml:lang="vi">Không thá» cáºp nháºt trạng thái phần Äầu trả vá» (return header status)</value> + <value xml:lang="zh">æ æ³æ´æ°é货头ç¶æ</value> </property> <property key="OrderErrorWithCreateBillingAccount"> <value xml:lang="de">Fehler bei Erstellung des Rechnungskontos: </value> @@ -1821,6 +1841,7 @@ <value xml:lang="en">No available fin account</value> <value xml:lang="fr">Pas de compte financier disponible</value> <value xml:lang="pt_BR">Nenhuma conta de financiamento disponÃvel</value> + <value xml:lang="zh">没æå¯ç¨çè´¢å¡è´¦æ·</value> </property> <property key="OrderNoCategorySpecifiedToAddFrom"> <value xml:lang="de">Keine Kategorie zum hinzufügen ausgewählt. </value> @@ -2110,6 +2131,7 @@ <value xml:lang="it">Ordine ${parameters.orderId} non esiste.</value> <value xml:lang="ja">ID ${parameters.orderId} ã®æ³¨æãåå¨ãã¾ããã</value> <value xml:lang="vi">ÄÆ¡n hà ng vá»i id ${parameters.orderId} không tá»n tại.</value> + <value xml:lang="zh">ä¸åå¨æ è¯ä¸º${parameters.orderId}ç订åã</value> </property> <property key="OrderOrderItemIdDoesNotExists"> <value xml:lang="de">Auftragsposition ${orderItem.orderItemSeqId} ist nicht vorhanden.</value> @@ -2118,6 +2140,7 @@ <value xml:lang="it">Riga ordine ${orderItem.orderItemSeqId} non esiste.</value> <value xml:lang="ja">ID ${orderItem.orderItemSeqId} ã®æ³¨æã¢ã¤ãã ãåå¨ãã¾ããã</value> <value xml:lang="vi">hạng mục hà ng hóa trong ÄÆ¡n hà ng vá»i id ${orderItem.orderItemSeqId} không tá»n tại.</value> + <value xml:lang="zh">ä¸åå¨æ è¯ä¸º${orderItem.orderItemSeqId}ç订åæç»ã</value> </property> <property key="OrderOrderItemTypeNotExist"> <value xml:lang="de">Auftragsposition-Art ist nicht vorhanden</value> @@ -2156,6 +2179,7 @@ <value xml:lang="ja">ãã®æ¡ä»¶ã®ç¨®é¡ã«æ³¨ææ¡ä»¶æ¥æ°ã¯å¿ è¦ã§ãã</value> <value xml:lang="pt_BR">Dias de prazo para pedido é necessário para esse tipo de prazo.</value> <value xml:lang="vi">Sá» ngà y của Äiá»u khoản ÄÆ¡n hà ng bắt buá»c phải nháºp cho loại Äiá»u khoản nà y.</value> + <value xml:lang="zh">è¿ä¸ªæ¡æ¬¾ç±»åéè¦æ订åæ¡ä»¶å¤©æ°ã </value> </property> <property key="OrderOrderTermTypeIsRequired"> <value xml:lang="de">Auftragskonditions-Typ wird benötigt. </value> @@ -2254,6 +2278,7 @@ <value xml:lang="ja">éèã¢ã«ã¦ã³ããã¼ã«ã¬ã³ã¼ãä½æä¸ã«ã¨ã©ã¼</value> <value xml:lang="pt_BR">Problema ao criar registro para FinAccountRole (Papel de conta de financiamento)</value> <value xml:lang="vi">Tạo vai trò tà i khoản kế toán (FinAccountRole) không thà nh công</value> + <value xml:lang="zh">å建财å¡è´¦æ·è§è²ï¼FinAccountRoleï¼è®°å½æ¶åºé</value> </property> <property key="OrderProblemCreatingFinAccountTransRecord"> <value xml:lang="de">Problem bei der Erstellung Finanzkonten-Rolle</value> @@ -2262,6 +2287,7 @@ <value xml:lang="ja">éèã¢ã«ã¦ã³ããã©ã³ã¶ã¯ã·ã§ã³ã¬ã³ã¼ãä½æä¸ã«ã¨ã©ã¼</value> <value xml:lang="pt_BR">Problema ao criar registro FinAccountTrans</value> <value xml:lang="vi">Tạo tà i khoản giao dá»ch kế toán (FinAccountTrans) không thà nh công</value> + <value xml:lang="zh">å建财å¡è´¦æ·äº¤æï¼FinAccountTransï¼è®°å½æ¶åºé</value> </property> <property key="OrderProblemCreatingPaymentApplicationRecord"> <value xml:lang="de">Problem beim erstellen der Zahlungszuweisung</value> @@ -2580,6 +2606,7 @@ <value xml:lang="ja">åºèã«å¯¾ããéèã¢ã«ã¦ã³ãä½æä¸ã«ã¨ã©ã¼</value> <value xml:lang="pt_BR">Problemas ao criar FinAccount (Conta de financiamento) para loja</value> <value xml:lang="vi">Tạo tà i khoản tà i chÃnh (FinAccount) cho kho hà ng (Store) không thà nh công</value> + <value xml:lang="zh">为åºéºå建财å¡è´¦æ·æ¶åºç°é®é¢</value> </property> <property key="OrderProblemsCreatingReturnItemResponseEntity"> <value xml:lang="de">Problem bei der Erstellung einer Retouren-Positions-Antwort</value> @@ -2723,6 +2750,7 @@ <value xml:lang="it">Errore durante la lettura informazioni della riga ordine: ${errorString}</value> <value xml:lang="ja"> 注æã¢ã¤ãã ${errorString} èªã¿è¾¼ã¿ä¸ã«ã¨ã©ã¼ã</value> <value xml:lang="vi">Lá»i khi Äá»c hạng mục hà ng hóa của ÄÆ¡n hà ng: ${errorString}</value> + <value xml:lang="zh">读å订åæç»ï¼OrderItemï¼æ¶åºéï¼${errorString}</value> </property> <property key="OrderProblemsStoringOrderEmailContactInformation"> <value xml:lang="de">Problem beim speichern der Email-Kontaktinformationen</value> @@ -2881,6 +2909,7 @@ <value xml:lang="it">Il cambio di stato da ${quote.statusId} a ${parameters.statusId} non è consentito</value> <value xml:lang="ja">${quote.statusId} ãã ${parameters.statusId} ã¸ã®ã¹ãã¼ã¿ã¹ã®å¤æ´ã¯æå¹ãªå¤æ´ã§ã¯ããã¾ãã</value> <value xml:lang="vi">Trạng thái thay Äá»i từ ${quote.statusId} Äến ${parameters.statusId} là không hợp lá»</value> + <value xml:lang="zh">ç¶æä¸è½ä» ${quote.statusId} å为 ${parameters.statusId}</value> </property> <property key="OrderQuoteNotARequest"> <value xml:lang="de">FEHLER: Kundenanfrage ${custRequest.custRequestId} ist keine Angebotsanfrage.</value> @@ -2889,6 +2918,7 @@ <value xml:lang="it">ERRORE: Richiesta ${custRequest.custRequestId} non è richiesta di preventivo.</value> <value xml:lang="ja">ã¨ã©ã¼: 顧客ãªã¯ã¨ã¹ã ${custRequest.custRequestId} ã¯è¦ç©ã«å¯¾ãããªã¯ã¨ã¹ãã§ã¯ããã¾ããã</value> <value xml:lang="vi">Lá»i xảy ra: Yêu cầu khách hà ng ${custRequest.custRequestId} không phải là yêu cầu cho báo giá (quote).</value> + <value xml:lang="zh">é误ï¼å®¢æ·è¯·æ±ï¼CustRequestï¼${custRequest.custRequestId}ä¸æ¯ä¸ä¸ªè¯¢ä»·è¯·æ±ã</value> </property> <property key="OrderQuoteNotAWorkEffort"> <value xml:lang="de">FEHLER: Arbeitsaufwand für Angebot ${parameters.quoteId} ${parameters.workEffortId} ist schon vorhanden.</value> @@ -2897,6 +2927,7 @@ <value xml:lang="it">ERRORE: Impegno di lavoro ${parameters.quoteId} ${parameters.workEffortId} non è preventivo di impegno di lavoro.</value> <value xml:lang="ja">ã¨ã©ã¼: è¦ç©ä½æ¥ææ ${parameters.quoteId} ${parameters.workEffortId} ã¯ãã§ã«åå¨ãã¾ãã</value> <value xml:lang="vi">Lá»i xảy ra : Công viá»c báo giá ${parameters.quoteId} ${parameters.workEffortId} Äã tá»n tại.</value> + <value xml:lang="zh">é误ï¼å·²åå¨è¯¢ä»·äººå·¥æå¡ï¼QuoteWorkEffortï¼${parameters.quoteId}ã${parameters.workEffortId}ã</value> </property> <property key="OrderQuoteWorkEffortDoesNotExists"> <value xml:lang="de">FEHLER: Arbeitsaufwand für Angebot ${parameters.quoteId} ${parameters.workEffortId} ist nicht vorhanden.</value> @@ -2905,6 +2936,7 @@ <value xml:lang="it">ERRORE: Impegno di lavoro ${parameters.quoteId} ${parameters.workEffortId} non esiste.</value> <value xml:lang="ja">ã¨ã©ã¼: è¦ç©ä½æ¥ææ ${parameters.quoteId} ${parameters.workEffortId} ã¯åå¨ãã¾ããã</value> <value xml:lang="vi">Lá»i xảy ra : Công viá»c báo giá ${parameters.quoteId} ${parameters.workEffortId} chÆ°a tá»n tại.</value> + <value xml:lang="zh">é误ï¼ä¸åå¨è¯¢ä»·äººå·¥æå¡ï¼QuoteWorkEffortï¼${parameters.quoteId}ã${parameters.workEffortId}ã</value> </property> <property key="OrderReceivedNullForOrderItemRecordsOrderId"> <value xml:lang="de">Angebotsposition zu Auftrag ${orderId} ist NULL</value> @@ -2995,6 +3027,7 @@ <value xml:lang="it">Tipo riga reso non è definita per questa riga.</value> <value xml:lang="ja">ãã®ã¢ã¤ãã ã«å¯¾ãã¦è¿åã¢ã¤ãã 種é¡ãå®ç¾©ããã¦ããªããããããã³ã°ãè¦ã¤ããã¾ããã</value> <value xml:lang="vi">Loại hà ng hóa hoà n trả không Äược Äá»nh nghÄ©a cho hà ng hóa nà y; hoặc không có ánh xạ nà o Äược tìm thấy.</value> + <value xml:lang="zh">没æ为è¿ä¸ªæç»å®ä¹éè´§æç»ç±»åï¼æè 没ææ¾å°æ å°ã</value> </property> <property key="OrderReturnItemTypeOrderItemNoMatching"> <value xml:lang="de">Keine Zuordnung der Retourenpositionsart für diese Auftragsposition gefunden: ${orderItem}</value> @@ -3003,6 +3036,7 @@ <value xml:lang="it">Nessuna corrispondenza trovata fra il tipo riga reso e la riga ordine: ${orderItem}</value> <value xml:lang="ja">注æã¢ã¤ãã ${orderItem} ã«å¯¾ãã¦ä¸è´ããè¿åã¢ã¤ãã 種é¡ãè¦ã¤ããã¾ããã</value> <value xml:lang="vi">Không có bản ÄỠánh xạ loại hà ng hóa hoà n trả (return item type map) Äược tìm thấy cho hà ng hóa: ${orderItem}</value> + <value xml:lang="zh">没ææ¾å°ç¬¦åéè´§æç»ç±»åé®å¼è¡¨ç订åæç»ï¼${orderItem}</value> </property> <property key="OrderReturnPaymentMethodNeededForThisTypeOfReturn"> <value xml:lang="de">Es muss eine Zahlungsart für diese Retourenart festgelegt werden</value> @@ -3070,6 +3104,7 @@ <value xml:lang="it">Errore: un reso deve avere un soggetto con ruolo organizzazione interna</value> <value xml:lang="ja">ã¨ã©ã¼: è¿åã¯å é¨çµç¹ã®ãã¼ã«ã«å«ã¾ããåå¼å ã«å¯¾ãã¦è¡ãå¿ è¦ãããã¾ã</value> <value xml:lang="vi">Lá»i xảy ra: giá trá» trả vá» phải là ÄÆ¡n vá» (party) vá»i vai trò tá» chức ná»i bá» (internal organization)</value> + <value xml:lang="zh">é误ï¼éè´§å¿ é¡»æ¯å°ä¸ä¸ªæå é¨æºæè§è²çä¼å</value> </property> <property key="OrderReturnRequestPartyRoleSupplier"> <value xml:lang="de">Fehler: eine Retoure muss an einen Akteur in der Rolle 'Lieferant' gehen</value> @@ -3078,6 +3113,7 @@ <value xml:lang="it">Errore: un reso deve avere un soggetto con ruolo fornitore</value> <value xml:lang="ja">ã¨ã©ã¼: è¿åã¯ãµãã©ã¤ã¤ã®ãã¼ã«ã«å«ã¾ããåå¼å ã«å¯¾ãã¦è¡ãå¿ è¦ãããã¾ã</value> <value xml:lang="vi">Lá»i xảy ra: giá trá» trả vá» phải là ÄÆ¡n vá» (party) vá»i vai trò nhà cung cấp (supplier)</value> + <value xml:lang="zh">é误ï¼éè´§å¿ é¡»æ¯å°æä¾è´§åè§è²çä¼å</value> </property> <property key="OrderReturnTotalCannotLessThanZero"> <value xml:lang="de">Der Gesamtbetrag der Retoure [${returnTotalAmount}] kann nicht kleiner Null sein.</value> @@ -5898,6 +5934,7 @@ <value xml:lang="ja">ããã¢ã¼ã·ã§ã³ã³ã¼ã [${productPromoCodeId}] ã¯ãã§ã«ç»é²ããã¦ãã¾ãã</value> <value xml:lang="pt_BR">O código da promoção [${productPromoCodeId}] já foi utilizado.</value> <value xml:lang="vi">Mã khuyến mãi [${productPromoCodeId}] Äã Äược sá» dụng.</value> + <value xml:lang="zh">å·²ç»è¾å ¥è¿ä¿é代ç [${productPromoCodeId}]ã</value> </property> <property key="productpromoworker.promotion_code_error_lookup"> <value xml:lang="de">Fehler beim Prüfen des Aktionscode [${productPromoCodeId}]: {errorMsg}</value> @@ -5906,6 +5943,7 @@ <value xml:lang="ja">ããã¢ã¼ã·ã§ã³ã³ã¼ã [${productPromoCodeId}] ã®æ¤ç´¢æã«ã¨ã©ã¼ãçºçãã¾ãã: {errorMsg}</value> <value xml:lang="pt_BR">Erro ao procurar pelo código da promoção [${productPromoCodeId}]: {errorMsg}</value> <value xml:lang="vi">Lá»i xảy ra khi tìm mã khuyến mãi [${productPromoCodeId}]: {errorMsg}</value> + <value xml:lang="zh">æ¥æ¾ä¿é代ç [${productPromoCodeId}]æ¶åºéï¼{errorMsg}</value> </property> <property key="productpromoworker.promotion_code_is_expired_at"> <value xml:lang="de">Der Aktionscode [${productPromoCodeId}] ist am ${thruDate} abgelaufen.</value> @@ -5914,6 +5952,7 @@ <value xml:lang="ja">ããã¢ã¼ã·ã§ã³ã³ã¼ã [${productPromoCodeId}] 㯠${thruDate} ã§çµäºãã¦ãã¾ãã</value> <value xml:lang="pt_BR">O código da promoção [${productPromoCodeId}] expirou em ${thruDate}</value> <value xml:lang="vi">Mã khuyến mãi [${productPromoCodeId}] Äã hết hạn tại thá»i Äiá»m: ${thruDate}</value> + <value xml:lang="zh">ä¿é代ç [${productPromoCodeId}] å·²ç»è¿æäºï¼${thruDate}</value> </property> <property key="productpromoworker.promotion_code_maximum_limit"> <value xml:lang="de">Diser Aktionscode [${productPromoCodeId}] hat sein Nutzungslimit erreicht und kann nicht länger verwendet werden.</value> @@ -5921,6 +5960,7 @@ <value xml:lang="fr">Ce code de promotion (${productPromoCodeId}) a atteint sa limite d'usage pour vous et ne plus être utilisé.</value> <value xml:lang="ja">ãã®ããã¢ã¼ã·ã§ã³ã³ã¼ã (${productPromoCodeId}) ã¯ä½¿ç¨åæ°ã®é度ã«éãã¦ãã¾ãããã使ç¨ãããã¨ãã§ãã¾ããã</value> <value xml:lang="pt_BR">Esse código de promoção (${productPromoCodeId}) atingiu seu número máximo de utilização por você, portanto não pode mais ser utilizado.</value> + <value xml:lang="zh">ä¿é代ç (${productPromoCodeId})å·²ç»è¾¾å°äºä½ çæ大使ç¨æ¬¡æ°éå¶ï¼ä¸è½åç¨äºã</value> </property> <property key="productpromoworker.promotion_code_no_account_or_email"> <value xml:lang="de">Diser Aktionscode [${productPromoCodeId}] muss mit Ihrem Konto oder der Email-Adresse verknüpft sein.</value> @@ -5929,6 +5969,7 @@ <value xml:lang="ja">ãã®ããã¢ã¼ã·ã§ã³ã³ã¼ã [${productPromoCodeId}] ã¯ããªãã®ã¢ã«ã¦ã³ãã¾ãã¯Eã¡ã¼ã«ã¢ãã¬ã¹ã¨é¢é£ä»ãããã¦ããªããã使ç¨ã§ãã¾ããã</value> <value xml:lang="pt_BR">O código de promoção [${productPromoCodeId}] necessita que você esteja associado a ele por sua conta ou endereço de email e você não está.</value> <value xml:lang="vi">Mã khuyến mãi [${productPromoCodeId}] yêu cầu bạn cần liên kết mã nà y vá»i tà i khoản hoặc Äá»a chá» thÆ° Äiá»n tá» nhÆ°ng bạn không liên kết thà nh công vá»i các thông tin nà y.</value> + <value xml:lang="zh">ä¿é代ç [${productPromoCodeId}]å¿ é¡»ä¸ä½ çè´¦æ·æçµåé®ä»¶å ³èï¼ä½æ¯ä½ ç®å没æä¸å®å ³èã</value> </property> <property key="productpromoworker.promotion_code_not_valid"> <value xml:lang="de">Der eingegebene Aktionscode [${productPromoCodeId}] ist ungültig.</value> @@ -5937,6 +5978,7 @@ <value xml:lang="ja">ãã®ããã¢ã¼ã·ã§ã³ã³ã¼ã [${productPromoCodeId}] ã¯æå¹ã§ã¯ããã¾ããã</value> <value xml:lang="pt_BR">O código de promoção [${productPromoCodeId}] não existe.</value> <value xml:lang="vi">Mã khuyến mãi [${productPromoCodeId}] không hợp lá».</value> + <value xml:lang="zh">ä¿é代ç [${productPromoCodeId}]æ æã</value> </property> <property key="productpromoworker.promotion_code_will_be_activated_at"> <value xml:lang="de">Dieser Aktionscode [${productPromoCodeId}] wird am {fromDate} aktiviert.</value> @@ -5945,6 +5987,7 @@ <value xml:lang="ja">ãã®ããã¢ã¼ã·ã§ã³ã³ã¼ã [${productPromoCodeId}] 㯠{fromDate} ããæå¹ã«ãªãã¾ãã</value> <value xml:lang="pt_BR">O código de promoção [${productPromoCodeId}] será ativado em ${fromDate}</value> <value xml:lang="vi">Mã khuyến mãi [${productPromoCodeId}] sẽ Äược kÃch hoạt tại thá»i Äiá»m: {fromDate}</value> + <value xml:lang="zh">ä¿é代ç [${productPromoCodeId}]æ¿æ´»æ¥æ为ï¼{fromDate}</value> </property> <property key="shoppingCartEvents.invalid_alternateGwpLine"> <value xml:lang="de">Alternatives Geschenk konnte nicht gewählt werden, alternateGwpLine ist keine gültige Nummer</value> @@ -6218,5 +6261,6 @@ <value xml:lang="en">You cannot add a 'Virtual' product here, select one of the related variants.</value> <value xml:lang="ja">'ä»®æ³'製åãããã§è¿½å ã§ãã¾ãããé¢é£ããå¥åãé¸æãã¦ãã ããã</value> <value xml:lang="vi">Bạn không thá» thêm sản phẩm ảo ('Virtual' product) tại Äây, bạn hãy chá»n trong các hà ng hóa liên quan (related variants).</value> + <value xml:lang="zh">å¨è¿éä½ ä¸è½æ·»å ä¸ä¸ªèæ产åï¼è¯·éæ©ä¸ä¸ªç¸å ³çååã</value> </property> </resource> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |