svn commit: r1626688 [24/46] - in /ofbiz/branches/OFBIZ-5312-ofb
Locked
svn commit: r1626688 [24/46] - in /ofbiz/branches/OFBIZ-5312-ofb
 
|
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml?rev=1626688&r1=1626687&r2=1626688&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml Mon Sep 22 08:09:27 2014 @@ -778,137 +778,21 @@ under the License. <field-to-result field="quantityOnHandTotal"/> </simple-method> + <!-- + Code in balanceInventoryItems service was doing same job which reassignInventoryReservations service is doing. Purpose of both the services are same. In fact reassignInventoryReservations service does better job of + reserving items for an order. 1) It takes into account the order priority, currentPromisedDate, reservedDateTime and sequenceId. where as balanceInventoryItems was prioritizing orders + based on reservedDatetime and sequenceId. 2) reassignInventoryReservations excludes items with sufficient inventory, where as balanceInventoryItems also pulls up order items which have sufficient inventory. + + Calling reassignInventoryReservations from balanceInventoryItems. balanceInventoryItems can be deleted, but not deleting it because its used in many places in OFBiz. + To DO: We can delete balanceInventoryItems in future and replace it with reassignInventoryReservations every where. + --> + <simple-method method-name="balanceInventoryItems" short-description="Balances available-to-promise on inventory items"> <entity-one entity-name="InventoryItem" value-field="inventoryItem"/> - - <!-- find all items which have a negative ATP --> - <entity-condition entity-name="BalanceInventoryItemsView" list="inventoryItems"> - <condition-list combine="or"> - <condition-list combine="and"> - <condition-expr field-name="productId" operator="equals" from-field="inventoryItem.productId"/> - <condition-expr field-name="facilityId" operator="equals" from-field="inventoryItem.facilityId"/> - <condition-expr field-name="inventoryItemTypeId" operator="equals" value="NON_SERIAL_INV_ITEM"/> - <condition-list combine="or"> - <condition-expr field-name="availableToPromiseTotal" operator="equals" from-field="nullField"/> - <condition-expr field-name="availableToPromiseTotal" operator="equals" value=""/> - <condition-expr field-name="availableToPromiseTotal" operator="less" value="0"/> - </condition-list> - </condition-list> - <!-- the current item is added to the list, even if its atp is greater than zero, because there could be - negative reservations (backorders) on it, if the atp has been increased by an inventory variance --> - <condition-expr field-name="inventoryItemId" operator="equals" from-field="inventoryItem.inventoryItemId"/> - </condition-list> - <order-by field-name="reservedDatetime"/> - <order-by field-name="sequenceId"/> - </entity-condition> - - <!-- find their current reservations --> - <set field="reserveQtyAccum" value="0" type="Double"/> - <iterate list="inventoryItems" entry="item"> - <!-- If quantityOnHandTotal is not equal to availableToPromiseTotal this means that - there are pending reservations on the item that cause availableToPromiseTotal - to be lower than the quantityOnHandTotal (the opposite can never happen). - In fact, if availableToPromiseTotal is negative, this doesn't mean that there are reservations; - for example, if we have a negative quantityOnHandTotal and quantityOnHandTotal equal to - availableToPromiseTotal, then no reservations are present. - --> - <if> - <condition> - <and> - <if-compare-field field="reserveQtyAccum" operator="less" to-field="inventoryItem.quantityOnHandTotal" type="Double"/> - <if-compare-field field="item.quantityOnHandTotal" operator="not-equals" to-field="item.availableToPromiseTotal"/> - </and> - </condition> - <then> - <entity-condition entity-name="PicklistAndBinAndItem" list="picklistItemList"> - <condition-list combine="and"> - <condition-expr field-name="orderId" from-field="item.orderId"/> - <condition-expr field-name="shipGroupSeqId" from-field="item.shipGroupSeqId"/> - <condition-expr field-name="orderItemSeqId" from-field="item.orderItemSeqId"/> - <condition-expr field-name="inventoryItemId" from-field="item.inventoryItemId"/> - <condition-expr field-name="statusId" operator="not-equals" value="PICKLIST_CANCELLED"/> - <condition-expr field-name="statusId" operator="not-equals" value="PICKLIST_PICKED"/> - </condition-list> - </entity-condition> - <!-- only cancel/re-reserve when there are no picklists associated; this will prevent - orders appearing on duplicate pick lists --> - <if-empty field="picklistItemList"> - <log level="info" message="Order [${item.orderId}] was not found on any picklist for InventoryItem [${item.inventoryItemId}]"/> - <if> - <condition> - <and> - <if-compare-field field="parameters.priorityOrderId" operator="equals" to-field="item.orderId"/> - <if-compare-field field="parameters.priorityOrderItemSeqId" operator="equals" to-field="item.orderItemSeqId"/> - </and> - </condition> - <then> - <field-to-list field="item" list="privilegedReservations"/> - </then> - <else> - <field-to-list field="item" list="reservations"/> - </else> - </if> - <set field="reserveQtyAccum" value="${reserveQtyAccum + item.quantity}" type="BigDecimal"/> - </if-empty> - </then> - </if> - </iterate> - - <list-to-list list="privilegedReservations" to-list="allReservations"/> - <list-to-list list="reservations" to-list="allReservations"/> - - <if-compare field="inventoryItem.inventoryItemTypeId" operator="equals" value="SERIALIZED_INV_ITEM"> - <!-- if the new item is serialized, i.e. qoh is 1, we just need the first reservation --> - <first-from-list entry="inventoryReservation" list="allReservations"/> - <clear-field field="allReservations"/> - <field-to-list field="inventoryReservation" list="allReservations"/> - </if-compare> - - <!-- FIRST, cancel all the reservations --> - <iterate list="allReservations" entry="oisgir"> - <set-service-fields service-name="cancelOrderItemShipGrpInvRes" to-map="cancelOisgirMap" map="oisgir"/> - <call-service service-name="cancelOrderItemShipGrpInvRes" in-map-name="cancelOisgirMap"/> - </iterate> - - <!-- THEN, re-reserve the cancelled items --> - <iterate list="allReservations" entry="oisgir"> - <!-- maintain a Set (in a Map) of orderIds that we have reallocated for, but only if they had some quantityNotReserved --> - <if-not-empty field="oisgir.quantityNotAvailable"> - <if-compare field="oisgir.quantityNotAvailable" operator="greater" value="0" type="BigDecimal"> - <set field="touchedOrderIdMap[oisgir.orderId]" value="Y"/> - <log level="verbose" message="Adding ${oisgir.orderId} to touchedOrderIdMap"/> - </if-compare> - </if-not-empty> - <set-service-fields service-name="reserveProductInventory" to-map="resMap" map="oisgir"/> - <set field="resMap.productId" from-field="inventoryItem.productId"/> - <!-- require inventory is N because it had to be N to begin with to have a negative ATP --> - <set field="resMap.requireInventory" value="N"/> - <log level="info" message="Re-reserving product [${resMap.productId}] for order item [${resMap.orderId}:${resMap.orderItemSeqId}] quantity [${resMap.quantity}]; facility [${inventoryItem.facilityId}]"/> - <if-empty field="inventoryItem.facilityId"> - <log level="warning" message="In balanceInventoryItems there is no facilityId, so reserving from any facility for order item [${resMap.orderId}:${resMap.orderItemSeqId}]"></log> - <call-service service-name="reserveProductInventory" in-map-name="resMap"/> - <else> - <set field="resMap.facilityId" from-field="inventoryItem.facilityId"/> - <call-service service-name="reserveProductInventoryByFacility" in-map-name="resMap"/> - </else> - </if-empty> - </iterate> - - <!-- now go through touchedOrderIdMap keys and make a Set/Map of orderIds that are no longer on back-order --> - <iterate-map key="touchedOrderId" value="throwAwayValue" map="touchedOrderIdMap"> - <set field="checkOrderIsOnBackOrderMap.orderId" from-field="touchedOrderId"/> - <call-service service-name="checkOrderIsOnBackOrder" in-map-name="checkOrderIsOnBackOrderMap"> - <result-to-field result-name="isBackOrder"/> - </call-service> - - <if-compare field="isBackOrder" operator="equals" value="false" type="Boolean"> - <set field="noLongerOnBackOrderIdMap[touchedOrderId]" value="Y"/> - </if-compare> - </iterate-map> - <if-not-empty field="noLongerOnBackOrderIdMap"> - <call-object-method obj-field="noLongerOnBackOrderIdMap" method-name="keySet" ret-field="noLongerOnBackOrderIdSet"/> - <field-to-result field="noLongerOnBackOrderIdSet"/> - </if-not-empty> + <set field="reassignInventoryReservationsCtx.productId" from-field="inventoryItem.productId"/> + <set field="reassignInventoryReservationsCtx.facilityId" from-field="inventoryItem.facilityId"/> + <set field="reassignInventoryReservationsCtx.fromDate" from-field="nowTimestamp"/> + <call-service service-name="reassignInventoryReservations" in-map-name="reassignInventoryReservationsCtx"/> </simple-method> <simple-method method-name="reassignInventoryReservations" short-description="Balances available-to-promise on inventory items"> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml?rev=1626688&r1=1626687&r2=1626688&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml Mon Sep 22 08:09:27 2014 @@ -438,6 +438,17 @@ under the License. <clear-field field="orderHeaderInfo"/> <clear-field field="orderItemShipGroupList"/> <clear-field field="orderItemShipGrpInvResList"/> + <if> + <condition> + <and> + <not><if-empty field="maxNumberOfOrders"/></not> + <if-compare-field field="numberSoFar" type="Long" to-field="maxNumberOfOrders" operator="greater-equals"/> + </and> + </condition> + <then> + <break/> + </then> + </if> </iterate> <!-- find all groupName, for each one get the value from the pickMoveInfoMap and add it to the pickMoveInfoList --> @@ -1202,6 +1213,8 @@ under the License. </check-permission> <check-errors/> + <set field="viewSize" from-field="parameters.viewSize" type="Integer"/> + <set field="viewIndex" from-field="parameters.viewIndex" type="Integer"/> <entity-condition entity-name="Picklist" list="picklistList"> <condition-list combine="and"> <condition-expr field-name="facilityId" operator="equals" from-field="parameters.facilityId"/> @@ -1209,14 +1222,36 @@ under the License. <condition-expr field-name="statusId" operator="not-equals" value="PICKLIST_CANCELLED"/> </condition-list> <order-by field-name="picklistDate"/> + <limit-view view-size="${viewSize}" view-index="${viewIndex+1}"/> </entity-condition> + <entity-count entity-name="Picklist" count-field="picklistCount"> + <condition-list combine="and"> + <condition-expr field-name="facilityId" operator="equals" from-field="parameters.facilityId"/> + <condition-expr field-name="statusId" operator="not-equals" value="PICKLIST_PICKED"/> + <condition-expr field-name="statusId" operator="not-equals" value="PICKLIST_CANCELLED"/> + </condition-list> + </entity-count> <iterate entry="picklist" list="picklistList"> <call-simple-method method-name="getPicklistSingleInfoInline"/> <field-to-list field="picklistInfo" list="picklistInfoList"/> </iterate> + <set field="lowIndex" value="${(viewIndex * viewSize) + 1}" type="Integer"/> + <set field="highIndex" value="${(viewIndex + 1) * viewSize}" type="Integer"/> + <if-compare-field field="highIndex" operator="greater" to-field="picklistCount" type="Integer"> + <set field="highIndex" from-field="picklistCount" type="Integer"/> + </if-compare-field> + <if-compare-field field="viewSize" operator="greater" to-field="picklistCount" type="Integer"> + <set field="highIndex" from-field="picklistCount" type="Integer"/> + </if-compare-field> + <field-to-result field="picklistInfoList"/> + <field-to-result field="viewIndex"/> + <field-to-result field="viewSize"/> + <field-to-result field="lowIndex"/> + <field-to-result field="highIndex"/> + <field-to-result field="picklistCount"/> </simple-method> <simple-method method-name="getPickAndPackReportInfo" short-description="getPickAndPackReportInfo"> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/servicedef/services_picklist.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/servicedef/services_picklist.xml?rev=1626688&r1=1626687&r2=1626688&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/servicedef/services_picklist.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/servicedef/services_picklist.xml Mon Sep 22 08:09:27 2014 @@ -79,6 +79,11 @@ under the License. location="component://product/script/org/ofbiz/shipment/picklist/PicklistServices.xml" invoke="getPicklistDisplayInfo"> <description>Create Picklist From Orders</description> <attribute name="facilityId" type="String" mode="IN" optional="false"/> + <attribute name="viewIndex" mode="INOUT" type="Integer" optional="true"/> + <attribute name="viewSize" mode="INOUT" type="Integer" optional="true"/> + <attribute name="highIndex" mode="OUT" type="Integer" optional="true"/> + <attribute name="lowIndex" mode="OUT" type="Integer" optional="true"/> + <attribute name="picklistCount" mode="OUT" type="Long" optional="true"/> <attribute name="picklistInfoList" type="List" mode="OUT" optional="true"/> </service> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/PicklistManage.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/PicklistManage.ftl?rev=1626688&r1=1626687&r2=1626688&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/PicklistManage.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/PicklistManage.ftl Mon Sep 22 08:09:27 2014 @@ -16,14 +16,41 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> +<script language="JavaScript" type="text/javascript"> + function paginateOrderList(viewSize, viewIndex) { + document.paginationForm.viewSize.value = viewSize; + document.paginationForm.viewIndex.value = viewIndex; + document.paginationForm.submit(); + } +</script> <div class="screenlet"> <div class="screenlet-title-bar"> <ul> <li class="h3">${uiLabelMap.ProductPicklistManage}</li> + <#if (picklistInfoList?has_content && 0 < picklistInfoList?size)> + <#if (picklistCount > highIndex)> + <li><a href="javascript:paginateOrderList('${viewSize}', '${viewIndex+1}')">${uiLabelMap.CommonNext}</a></li> + <#else> + <li><span class="disabled">${uiLabelMap.CommonNext}</span></li> + </#if> + <#if (picklistCount > 0)> + <li><span>${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${picklistCount}</span></li> + </#if> + <#if (viewIndex > 0)> + <li><a href="javascript:paginateOrderList('${viewSize}', '${viewIndex-1}')">${uiLabelMap.CommonPrevious}</a></li> + <#else> + <li><span class="disabled">${uiLabelMap.CommonPrevious}</span></li> + </#if> + </#if> </ul> <br class="clear"/> </div> + <form name="paginationForm" method="post" action="<@ofbizUrl>PicklistManage</@ofbizUrl>"> + <input type="hidden" name="viewSize" value="${viewSize}"/> + <input type="hidden" name="viewIndex" value="${viewIndex}"/> + <input type="hidden" name="facilityId" value="${facilityId}"/> + </form> <div class="screenlet-body"> <#if picklistInfoList?has_content> <#list picklistInfoList as picklistInfo> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/PicklistOptions.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/PicklistOptions.ftl?rev=1626688&r1=1626687&r2=1626688&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/PicklistOptions.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/PicklistOptions.ftl Mon Sep 22 08:09:27 2014 @@ -38,6 +38,8 @@ under the License. <tr><td> </td></tr> </table> <div align ='right'> + <span class="label">${uiLabelMap.FacilityGroupFirst}</span> + <input type="text" size="4" name="maxNumberOfOrders" value="50"/> <input type="submit" value="Submit" class="buttontext" align='right'/> </div> </form> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/ProductForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/ProductForms.xml?rev=1626688&r1=1626687&r2=1626688&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/ProductForms.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/ProductForms.xml Mon Sep 22 08:09:27 2014 @@ -947,7 +947,7 @@ under the License. <field name="availableFromDate" title="${uiLabelMap.ProductAvailableFromDate}" red-when="after-now" sort-field="true"><display/></field> <field name="availableThruDate" title="${uiLabelMap.ProductAvailableThruDate}" red-when="before-now" sort-field="true"><display/></field> <field name="quantityUomId"><display-entity entity-name="Uom" key-field-name="uomId"/></field> - <!-- field name="supplierCommissionPerc"><display/></field--> + <!-- field name="supplierCommissionPerc"><display/></field--><!-- Unused field, better use commission run using agreements in accounting --> <field name="lastPrice" sort-field="true"> <display type="currency" currency="${currencyUomId}"/> </field> @@ -2259,4 +2259,4 @@ under the License. <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><check/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> </form> - </forms> \ No newline at end of file + </forms> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/facility/FacilityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/facility/FacilityScreens.xml?rev=1626688&r1=1626687&r2=1626688&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/facility/FacilityScreens.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/facility/FacilityScreens.xml Mon Sep 22 08:09:27 2014 @@ -1150,6 +1150,7 @@ under the License. <set field="groupByShippingMethod" from-field="parameters.groupByShippingMethod"/> <set field="groupByWarehouseArea" from-field="parameters.groupByWarehouseArea"/> <set field="groupByNoOfOrderItems" from-field="parameters.groupByNoOfOrderItems"/> + <set field="maxNumberOfOrders" from-field="parameters.maxNumberOfOrders" default-value="50"/> <service service-name="findOrdersToPickMove"> <field-map field-name="facilityId"/> <field-map field-name="groupByShippingMethod"/> @@ -1246,6 +1247,8 @@ under the License. <set field="tabButtonItem" value="PicklistManage"/> <set field="facilityId" from-field="parameters.facilityId"/> + <set field="viewIndex" from-field="parameters.viewIndex" default-value="0"/> + <set field="viewSize" from-field="parameters.viewSize" default-value="10"/> <service service-name="getPicklistDisplayInfo"> <field-map field-name="facilityId"/> </service> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/securityext/config/SecurityExtUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/securityext/config/SecurityExtUiLabels.xml?rev=1626688&r1=1626687&r2=1626688&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/securityext/config/SecurityExtUiLabels.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/securityext/config/SecurityExtUiLabels.xml Mon Sep 22 08:09:27 2014 @@ -26,7 +26,7 @@ <value xml:lang="fr">un nouvel</value> <value xml:lang="it">una nuova</value> <value xml:lang="ja">ãç¥ãã</value> - <value xml:lang="nl">een nieuw(e)</value> + <value xml:lang="nl">een nieuw(e)</value> <value xml:lang="pt_BR">uma nova</value> <value xml:lang="th">à¹à¸«à¸¡à¹</value> <value xml:lang="vi">má»i</value> @@ -40,7 +40,7 @@ <value xml:lang="fr">Votre mot de passe est : </value> <value xml:lang="it">La tua password è :- </value> <value xml:lang="ja">ããªãã®ãã¹ã¯ã¼ã㯠:-</value> - <value xml:lang="nl">Uw wachtwoord is :</value> + <value xml:lang="nl">Uw wachtwoord is :</value> <value xml:lang="pt_BR">Sua senha é:</value> <value xml:lang="zh">ä½ çå¯ç æ¯ï¼- </value> <value xml:lang="vi">Máºt khẩu của bạn :-</value> @@ -53,7 +53,7 @@ <value xml:lang="fr">Votre nouveau mot de passe est : </value> <value xml:lang="it">La nuova password è :- </value> <value xml:lang="ja">ããªãã®æ°ãããã¹ã¯ã¼ã㯠:-</value> - <value xml:lang="nl">Uw nieuwe wachtwoord is : </value> + <value xml:lang="nl">Uw nieuwe wachtwoord is : </value> <value xml:lang="pt_BR">Sua nova senha é:</value> <value xml:lang="zh">ä½ çæ°å¯ç æ¯ï¼- </value> <value xml:lang="zh_TW">ä½ çæ°å¯ç¢¼æ¯ :- </value> @@ -66,7 +66,7 @@ <value xml:lang="fr">mot de passe qui vous a été envoyé</value> <value xml:lang="it">password inviata a te</value> <value xml:lang="ja">ãã¹ã¯ã¼ããéä¿¡ãã¾ãã</value> - <value xml:lang="nl">Wachtwoord dat naar u verzonden is</value> + <value xml:lang="nl">Wachtwoord dat naar u verzonden is</value> <value xml:lang="pt_BR">Senha enviada para você</value> <value xml:lang="th">สà¹à¸à¸£à¸«à¸±à¸ªà¸à¹à¸²à¸à¸à¸¶à¸à¸à¸¸à¸</value> <value xml:lang="vi">máºt khẩu Äược gá»i tá»i bạn</value> @@ -80,12 +80,12 @@ <value xml:lang="fr">Ce courriel en réponse à votre demande d'obtenir</value> <value xml:lang="it">Questa email ti è stata inviata in seguito alla tua richiesta.</value> <value xml:lang="ja">ãã®ã¡ã¼ã«ã¯ããªãããªã¯ã¨ã¹ãããããã®ã§ã</value> - <value xml:lang="nl">Deze email is verzonden naar aanleiding van uw verzoek.</value> + <value xml:lang="nl">Deze email is verzonden naar aanleiding van uw verzoek.</value> <value xml:lang="pt_BR">Este e-mail lhe foi enviado devido ao seu pedido</value> <value xml:lang="th">à¸à¸³à¸£à¹à¸à¸à¸à¸à¸à¸à¸¸à¸à¸¡à¸µà¸à¸²à¸£à¸à¸à¸à¹à¸à¸à¸µà¹à¸¡à¸¥à¸à¸µà¹</value> <value xml:lang="vi">ThÆ° Äiá»n tá» nà y Äá» phản há»i viá»c bạn yêu cầu muá»n có</value> <value xml:lang="zh">è¿ä¸ªçµåé®ä»¶æ¯åçä½ è¦æ±ç</value> - <value xml:lang="zh_TW">æ¤é»åéµä»¶æ¯åè¦ä½ çè¦æ±ç</value> + <value xml:lang="zh_TW">æ¤é»åéµä»¶æ¯åæä½ çè«æ±ç</value> </property> <property key="SecurityExtYour"> <value xml:lang="da">Deres</value> @@ -94,7 +94,7 @@ <value xml:lang="fr">Votre</value> <value xml:lang="it">tuo</value> <value xml:lang="ja">ããªãã®</value> - <value xml:lang="nl">uw</value> + <value xml:lang="nl">uw</value> <value xml:lang="pt_BR">seu</value> <value xml:lang="th">à¸à¸à¸à¸à¸¸à¸</value> <value xml:lang="vi">của bạn</value> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/config/WorkEffortEntityLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/config/WorkEffortEntityLabels.xml?rev=1626688&r1=1626687&r2=1626688&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/config/WorkEffortEntityLabels.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/config/WorkEffortEntityLabels.xml Mon Sep 22 08:09:27 2014 @@ -56,7 +56,7 @@ <value xml:lang="th">à¸à¸±à¸à¸£à¸²à¸¡à¸²à¸à¸£à¸à¸²à¸à¸à¸¸à¸ ๠à¸à¸±à¹à¸§à¹à¸¡à¸</value> <value xml:lang="vi">Tá»· lá» trong giá» (hà nh chÃnh)</value> <value xml:lang="zh">æ åå°æ¶ä»·æ ¼</value> - <value xml:lang="zh_TW">æ¨åå°æå¹æ ¼</value> + <value xml:lang="zh_TW">æ¨æºå°æå¹æ ¼</value> </property> <property key="RateType.description.FLC"> <value xml:lang="en">Hourly rate - Fully loaded costprice</value> @@ -72,7 +72,7 @@ <value xml:lang="th">Routing à¹à¸¥à¸° Routing à¸à¸¥à¸¸à¹à¸¡à¸ ารà¸à¸´à¸</value> <value xml:lang="vi">Quy trình và các Tác vụ - Äầu viá»c của quy trình</value> <value xml:lang="zh">路线ä¸è·¯çº¿ä»»å¡å ³è</value> - <value xml:lang="zh_TW">è·¯ç·èè·¯ç·ä»»åéè¯</value> + <value xml:lang="zh_TW">è·¯ç·èè·¯ç·ä»»åçµå</value> </property> <property key="WorkEffortAssocType.description.WORK_EFF_BREAKDOWN"> <value xml:lang="en">Breakdown/Detail</value> @@ -140,7 +140,7 @@ <value xml:lang="th">Precedency</value> <value xml:lang="vi">Quyá»n Æ°u tiên</value> <value xml:lang="zh">ä¼å 级</value> - <value xml:lang="zh_TW">åªå ç´</value> + <value xml:lang="zh_TW">å± å </value> </property> <property key="WorkEffortAssocType.description.WORK_EFF_TASK"> <value xml:lang="en">Task</value> @@ -165,7 +165,7 @@ <value xml:lang="th">à¸à¸à¸à¹à¸à¸¡à¹à¸à¸¥à¸</value> <value xml:lang="vi">Biá»u mẫu dà nh cho</value> <value xml:lang="zh">模æ¿</value> - <value xml:lang="zh_TW">ç¯æ¬</value> + <value xml:lang="zh_TW">模æ¿</value> </property> <property key="WorkEffortPurposeType.description.ROU_ASSEMBLING"> <value xml:lang="en">Assembling</value> @@ -191,7 +191,7 @@ <value xml:lang="th">à¸à¸²à¸£à¸à¸¥à¸´à¸</value> <value xml:lang="vi">Nhà sản xuất</value> <value xml:lang="zh">å¶é </value> - <value xml:lang="zh_TW">å¶é </value> + <value xml:lang="zh_TW">製é </value> </property> <property key="WorkEffortPurposeType.description.ROU_SUBCONTRACTING"> <value xml:lang="en">Sub-contracting</value> @@ -287,7 +287,7 @@ <value xml:lang="th">à¸à¸³à¹à¸à¸´à¸à¸à¸²à¸£à¸à¸¥à¸´à¸</value> <value xml:lang="vi">Khai thác sản phẩm</value> <value xml:lang="zh">å®é è¿è¡</value> - <value xml:lang="zh_TW">實ééè¡</value> + <value xml:lang="zh_TW">çç¢éè¡</value> </property> <property key="WorkEffortPurposeType.description.WEPT_PROJECT"> <value xml:lang="en">Project</value> @@ -367,7 +367,7 @@ <value xml:lang="th">à¸à¸±à¹à¸à¸à¸à¸à¸à¸´à¸à¸à¸£à¸£à¸¡</value> <value xml:lang="vi">Tác vụ - Äầu viá»c theo quy trình</value> <value xml:lang="zh">å·¥ä½æµæ´»å¨</value> - <value xml:lang="zh_TW">å·¥ä½æµæ´»å</value> + <value xml:lang="zh_TW">å·¥ä½æµç¨æ´»å</value> </property> <property key="WorkEffortType.description.ASSET_USAGE"> <value xml:lang="en">Fixed Asset Usage (rental)</value> @@ -447,6 +447,7 @@ <value xml:lang="nl">Mijlpaal</value> <value xml:lang="vi">Má»c thá»i gian</value> <value xml:lang="zh">éç¨ç¢</value> + <value xml:lang="zh_TW">éç¨ç¢</value> </property> <property key="WorkEffortType.description.PERSONAL_TIMEOFF"> <value xml:lang="en">Personal Time Off</value> @@ -479,7 +480,7 @@ <value xml:lang="nl">Fase template</value> <value xml:lang="vi">Mẫu pha dá»± án</value> <value xml:lang="zh">项ç®é¶æ®µæ¨¡æ¿</value> - <value xml:lang="zh_TW">å°æ¡é段ç¯æ¬</value> + <value xml:lang="zh_TW">å°æ¡é段模æ¿</value> </property> <property key="WorkEffortType.description.PROD_ORDER_HEADER"> <value xml:lang="en">Production Run Header</value> @@ -492,7 +493,7 @@ <value xml:lang="th">หัวà¸à¹à¸à¸à¸³à¹à¸à¸´à¸à¸à¸²à¸£à¸à¸²à¸£à¸à¸¥à¸´à¸</value> <value xml:lang="vi">Phần Äầu khai thác sản phẩm</value> <value xml:lang="zh">å®é è¿è¡å¤´</value> - <value xml:lang="zh_TW">實ééè¡é </value> + <value xml:lang="zh_TW">çç¢éè¡é </value> </property> <property key="WorkEffortType.description.PROD_ORDER_TASK"> <value xml:lang="en">Production Run Task</value> @@ -505,7 +506,7 @@ <value xml:lang="th">à¸à¸²à¸à¸à¸³à¹à¸à¸´à¸à¸à¸²à¸£à¸à¸²à¸£à¸à¸¥à¸´à¸</value> <value xml:lang="vi">Tác vụ - Äầu viá»c khai thác sản phẩm</value> <value xml:lang="zh">å®é è¿è¡ä»»å¡</value> - <value xml:lang="zh_TW">實ééè¡ä»»å</value> + <value xml:lang="zh_TW">çç¢éè¡ä»»å</value> </property> <property key="WorkEffortType.description.PROGRAM"> <value xml:lang="en">Program</value> @@ -541,7 +542,7 @@ <value xml:lang="ja">ããã¸ã§ã¯ããã³ãã¬ã¼ã</value> <value xml:lang="vi">Biá»u mẫu dá»± án</value> <value xml:lang="zh">项ç®æ¨¡æ¿</value> - <value xml:lang="zh_TW">å°æ¡ç¯æ¬</value> + <value xml:lang="zh_TW">å°æ¡æ¨¡æ¿</value> </property> <property key="WorkEffortType.description.PUBLISH_PROPS"> <value xml:lang="en">Publish Properties</value> @@ -550,7 +551,7 @@ <value xml:lang="ja">å ¬éããããã£</value> <value xml:lang="vi">Thuá»c tÃnh xuất bản</value> <value xml:lang="zh">åå¸å±æ§</value> - <value xml:lang="zh_TW">ç¼å¸å±¬æ§</value> + <value xml:lang="zh_TW">ç¼è¡å±¬æ§</value> </property> <property key="WorkEffortType.description.ROUTING"> <value xml:lang="en">Routing</value> @@ -600,7 +601,7 @@ <value xml:lang="nl">Taak template</value> <value xml:lang="vi">Biá»u mẫu công viá»c dá»± án</value> <value xml:lang="zh">项ç®ä»»å¡æ¨¡æ¿</value> - <value xml:lang="zh_TW">å°æ¡ä»»åç¯æ¬</value> + <value xml:lang="zh_TW">å°æ¡ä»»å模æ¿</value> </property> <property key="WorkEffortType.description.TEMPLATE"> <value xml:lang="en">Template</value> @@ -609,7 +610,7 @@ <value xml:lang="ja">ãã³ãã¬ã¼ã</value> <value xml:lang="vi">Biá»u mẫu</value> <value xml:lang="zh">模æ¿</value> - <value xml:lang="zh_TW">ç¯æ¬</value> + <value xml:lang="zh_TW">模æ¿</value> </property> <property key="WorkEffortType.description.TRAINING"> <value xml:lang="en">Training</value> @@ -618,6 +619,7 @@ <value xml:lang="ja">æè²è¨ç·´</value> <value xml:lang="vi">Äà o tạo</value> <value xml:lang="zh">å¹è®</value> + <value xml:lang="zh_TW">æè²è¨ç·´</value> </property> <property key="WorkEffortType.description.WORK_FLOW"> <value xml:lang="en">Workflow Process</value> @@ -630,7 +632,7 @@ <value xml:lang="th">วิà¸à¸µà¸à¸²à¸£à¸à¸±à¹à¸à¸à¸à¸à¸à¸²à¸£à¸à¸³à¸à¸²à¸</value> <value xml:lang="vi">Tiến trình của quy trình</value> <value xml:lang="zh">å·¥ä½æµæµç¨</value> - <value xml:lang="zh_TW">å·¥ä½æµæµç¨</value> + <value xml:lang="zh_TW">å·¥ä½æµç¨ç¨åº</value> </property> <property key="WorkflowParticipantType.description.HUMAN"> <value xml:lang="en">HUMAN</value> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |