You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by er...@apache.org on 2012/06/19 23:36:33 UTC

svn commit: r1351866 [12/48] - in /ofbiz/branches/20120329_portletWidget: ./ applications/accounting/ applications/accounting/config/ applications/accounting/data/ applications/accounting/entitydef/ applications/accounting/script/org/ofbiz/accounting/i...

Modified: ofbiz/branches/20120329_portletWidget/applications/humanres/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/humanres/ofbiz-component.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/humanres/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/humanres/ofbiz-component.xml Tue Jun 19 21:36:11 2012
@@ -28,7 +28,7 @@ under the License.
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_old.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/HumanResTypeData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/HumanResHelpData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/HumanResSecurityData.xml"/>
+    <entity-resource type="data" reader-name="security" loader="main" location="data/HumanResSecurityData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/HumanResPortletData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/HumanResDemoData.xml"/>
     <service-resource type="model" loader="main" location="servicedef/services.xml"/>

Modified: ofbiz/branches/20120329_portletWidget/applications/humanres/webapp/humanres/humanres/findEmployee.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/humanres/webapp/humanres/humanres/findEmployee.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/humanres/webapp/humanres/humanres/findEmployee.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/humanres/webapp/humanres/humanres/findEmployee.ftl Tue Jun 19 21:36:11 2012
@@ -171,13 +171,13 @@ under the License.
             </tr>
             <#assign alt_row = false>
             <#list partyList as partyRow>
-            <#assign partyType = partyRow.getRelatedOne("PartyType")?if_exists>
+            <#assign partyType = partyRow.getRelatedOne("PartyType", false)?if_exists>
             <tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
                 <td><a href="<@o...@ofbizUrl>">${partyRow.partyId}</a></td>
                 <td><#if partyRow.containsKey("userLoginId")>
                         ${partyRow.userLoginId?default("N/A")}
                     <#else>
-                    <#assign userLogins = partyRow.getRelated("UserLogin")>
+                    <#assign userLogins = partyRow.getRelated("UserLogin", null, null, false)>
                     <#if (userLogins.size() > 0)>
                         <#if (userLogins.size() > 1)>
                             (${uiLabelMap.CommonMany})

Modified: ofbiz/branches/20120329_portletWidget/applications/humanres/widget/forms/EmplPositionForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/humanres/widget/forms/EmplPositionForms.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/humanres/widget/forms/EmplPositionForms.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/humanres/widget/forms/EmplPositionForms.xml Tue Jun 19 21:36:11 2012
@@ -345,7 +345,7 @@ under the License.
                 </entity-options>
             </drop-down>
         </field>
-        <field name="dummy1" title="${uiLabelMap.CommonEmptyHeader}" position="1"><display/></field>
+        <field name="dummy1" title=" " position="1"><display/></field>
         <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="buttontext"><submit button-type="text-link"/></field>
     </form>
 </forms>

Modified: ofbiz/branches/20120329_portletWidget/applications/manufacturing/config/ManufacturingEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/manufacturing/config/ManufacturingEntityLabels.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/manufacturing/config/ManufacturingEntityLabels.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/manufacturing/config/ManufacturingEntityLabels.xml Tue Jun 19 21:36:11 2012
@@ -27,6 +27,7 @@
         <value xml:lang="pt_BR">Recibo de pedido de produção</value>
         <value xml:lang="ro">Primit Comanda Productie</value>
         <value xml:lang="th">การสร้างใบเสร็จรับเงิน</value>
+        <value xml:lang="vi">Biên nhận</value>
         <value xml:lang="zh">制造订单收据</value>
         <value xml:lang="zh_TW">制造訂單收據</value>
     </property>
@@ -38,6 +39,7 @@
         <value xml:lang="pt_BR">Requisito do pedido de produção</value>
         <value xml:lang="ro">Necesar Comenzi Productie</value>
         <value xml:lang="th">การสร้างรายการสั่งซื้อตามความต้องการ</value>
+        <value xml:lang="vi">Yêu cầu đặt hàng</value>
         <value xml:lang="zh">制造订单需求</value>
         <value xml:lang="zh_TW">制造訂單需求</value>
     </property>
@@ -49,6 +51,7 @@
         <value xml:lang="pt_BR">Requisito de Mrp</value>
         <value xml:lang="ro">Necesar Mrp</value>
         <value xml:lang="th">ความต้องการตาม Mrp</value>
+        <value xml:lang="vi">Yêu cầu MRP</value>
         <value xml:lang="zh">材料需求计划的需求</value>
         <value xml:lang="zh_TW">材料需求計劃的需求</value>
     </property>
@@ -60,6 +63,7 @@
         <value xml:lang="pt_BR">Recibo de pedido de produção proposto</value>
         <value xml:lang="ro">Primit Offerta Comanda Productie</value>
         <value xml:lang="th">การสร้างใบเสร็จรับเงินตามวัตถุประสงค์</value>
+        <value xml:lang="vi">Biên nhận đề xuất sản xuất</value>
         <value xml:lang="zh">已提交的制造订单收据</value>
         <value xml:lang="zh_TW">已提交的制造訂單收據</value>
     </property>
@@ -71,6 +75,7 @@
         <value xml:lang="pt_BR">Recibo de pedido de compra proposto</value>
         <value xml:lang="ro">Primit Oferta Comanda Cumparare</value>
         <value xml:lang="th">ใบสั่งซื้อสินค้าตามวัตถุประสงค์</value>
+        <value xml:lang="vi">Biên nhận đề xuất bán</value>
         <value xml:lang="zh">已提交的购物订单收据</value>
         <value xml:lang="zh_TW">已提交的購物訂單收據</value>
     </property>
@@ -82,6 +87,7 @@
         <value xml:lang="pt_BR">Recibo de pedido de compra</value>
         <value xml:lang="ro">Primit Comanda Cumparare</value>
         <value xml:lang="th">ใบสั่งซื้อสินค้า</value>
+        <value xml:lang="vi">Biên nhận bán</value>
         <value xml:lang="zh">购物订单收据</value>
         <value xml:lang="zh_TW">購物訂單收據</value>
     </property>
@@ -93,6 +99,7 @@
         <value xml:lang="pt_BR">Envio de pedido de vendas</value>
         <value xml:lang="ro">Expediere Comenzi Vanzare</value>
         <value xml:lang="th">การขนส่งสินค้าตามรายการขาย</value>
+        <value xml:lang="vi">Đơn đặt hàng vận chuyển</value>
         <value xml:lang="zh">销售订单运输</value>
         <value xml:lang="zh_TW">銷售訂單運輸</value>
     </property>
@@ -104,6 +111,7 @@
         <value xml:lang="pt_BR">Calendário padrão utilizado quando não há um calendário específico definido</value>
         <value xml:lang="ro">Calendar de Default folosit atunci cand nici-un calendar specific nu este definit</value>
         <value xml:lang="th">ปฏิทินมาตรฐานใช้เมื่อไม่มีการระบุปฏิทินโดยเฉพาะ</value>
+        <value xml:lang="vi">Lịch mặc định áp dụng khi không có Lịch nào được định nghĩa</value>
         <value xml:lang="zh">当没有指定日历时所用的缺省日历</value>
         <value xml:lang="zh_TW">當沒有指定日歷時所用的缺省日歷</value>
     </property>
@@ -111,6 +119,7 @@
         <value xml:lang="en">Demo Workcenter Calendar</value>
         <value xml:lang="it">Calendario demo</value>
         <value xml:lang="pt_BR">Calendário de demonstração</value>
+        <value xml:lang="vi">Lịch ví dụ</value>
         <value xml:lang="zh">演示作业中心日历</value>
         <value xml:lang="zh_TW">演示作業中心日歷</value>
     </property>
@@ -122,6 +131,7 @@
         <value xml:lang="pt_BR">Calendários do escritório de secagem</value>
         <value xml:lang="ro">Calendar Atelier Uscatorie</value>
         <value xml:lang="th">ปฏิทิน</value>
+        <value xml:lang="vi">SẤY KHÔ</value>
         <value xml:lang="zh">烘干车间日历</value>
         <value xml:lang="zh_TW">烘幹車間日歷</value>
     </property>
@@ -133,6 +143,7 @@
         <value xml:lang="pt_BR">Calendário do escritório de maquinário</value>
         <value xml:lang="ro">Calendar Atelier Masini</value>
         <value xml:lang="th">ปฏิทินของระบบการปฎิบัติงาน</value>
+        <value xml:lang="vi">GIA CÔNG</value>
         <value xml:lang="zh">加工车间日历</value>
         <value xml:lang="zh_TW">加工車間日歷</value>
     </property>
@@ -144,6 +155,7 @@
         <value xml:lang="pt_BR">Calendário usado para refazer pedidos de produtos já comprados</value>
         <value xml:lang="ro">Calendar folosit pentru Re-Ordonarea datelor de calcul a produselor cumparate</value>
         <value xml:lang="th">ปฏิทินใช้สำหรับวันที่มีการคำนวณรายการสั่งสินค้าสำหรับซื้อสินค้า</value>
+        <value xml:lang="vi">Lịch sử dụng cho 'tính toàn ngày Đặt hàng lại' để mua sản phẩm</value>
         <value xml:lang="zh">购买产品时计算重新排订单日期所用的日历</value>
         <value xml:lang="zh_TW">購買產品時計算重新排訂單日期所用的日歷</value>
     </property>
@@ -155,6 +167,7 @@
         <value xml:lang="pt_BR">8 horas/dia</value>
         <value xml:lang="ro">8 ore/zi</value>
         <value xml:lang="th">8 ชั่วโมง/วัน</value>
+        <value xml:lang="vi">8 giờ/ngày</value>
         <value xml:lang="zh">8小时/天</value>
         <value xml:lang="zh_TW">8小時/天</value>
     </property>
@@ -162,6 +175,7 @@
         <value xml:lang="en">Demo calendar week of 8hours/days 5days/week starting at 8h30 from monday to friday</value>
         <value xml:lang="it">Calendario settimanale demo di 8 ore/giorno 5 giorni/settimana iniziando alle 8:30 dal lunedì al venerdì</value>
         <value xml:lang="pt_BR">Calendário semanal de demonstração de 8 horas/dia 5 dias/semana começando às 8:30h de segunda à sexta-feira</value>
+        <value xml:lang="vi">Lịch ví dụ 1 tuần gồm 8 giờ/ngày và 5 ngày/tuần, bắt đầu từ 8 giờ 30 sáng từ thứ Hai đến thứ Sáu</value>
         <value xml:lang="zh">演示每周5天、每天8小时、周一至周五从8:30开始的日历周</value>
         <value xml:lang="zh_TW">演示每周5天、每天8小時、周一至周五從8:30開始的日歷周</value>
     </property>
@@ -173,6 +187,7 @@
         <value xml:lang="pt_BR">Calendário de feriados, 0 horas/dia, 0 dias/semana</value>
         <value xml:lang="ro">Calendar pentru perioada de vacanza, 0 ore/zi 0 zile/saptamana</value>
         <value xml:lang="th">ปฏิทินวันหยุด</value>
+        <value xml:lang="vi">NGÀY NGHỈ</value>
         <value xml:lang="zh">节假日日历—— 0小时/天、0天/周</value>
         <value xml:lang="zh_TW">節假日日歷—— 0小時/天、0天/周</value>
     </property>
@@ -184,6 +199,7 @@
         <value xml:lang="pt_BR">Calendário padrão de 24 horas e 7 dias por semana</value>
         <value xml:lang="ro">Calendar Standard deschis 24 ore pe zi 7 zile pe saptamana</value>
         <value xml:lang="th">ปฏิทินมาตรฐานกำหนดให้เป็น 24 ชั่วโมงหรือ 7 วัน</value>
+        <value xml:lang="vi">24 Giờ / 7 Ngày</value>
         <value xml:lang="zh">标准日历——24小时/天、7天/周</value>
         <value xml:lang="zh_TW">標准日歷——24小時/天、7天/周</value>
     </property>
@@ -195,6 +211,7 @@
         <value xml:lang="pt_BR">Calendário padrão de 8 horas/dia, 5 dias/semana.</value>
         <value xml:lang="ro">Calendar Standard 8 ore/zi 5 zile /saptamana de la orele 8:30 de Luni pana Vineri</value>
         <value xml:lang="th">ปฏิทินมาตรฐาน 8 ชั่วโมง/5 วัน/กำหนดให้เริ่ม 8:30</value>
+        <value xml:lang="vi">8 Giờ / 5 Ngày</value>
         <value xml:lang="zh">标准日历——8小时/天、5天/周、周一至周五8:30开始</value>
         <value xml:lang="zh_TW">標准日歷——8小時/天、5天/周、周一至周五8:30開始</value>
     </property>
@@ -206,6 +223,7 @@
         <value xml:lang="pt_BR">8 horas/dia, atualmente o processo de refazer pedidos converte dia para mms.</value>
         <value xml:lang="ro">8 ore/zi, in prezent Procesul de Re-Ordinare converteste ziua in mms cu  8h/zi" mondayStartTime="08:30:00"</value>
         <value xml:lang="th">8 ชั่วโมง/วัน, ขณะนี้รายการสั่งซื้อกำลังประมวลผลในการเปลี่ยนวันไปเป็น mms ด้วย 8 ชั่วโมง/วัน</value>
+        <value xml:lang="vi">8 Giờ / Ngày, tiến trình Đặt hàng lại (Re-Order Process) chuyển đổi ngày sang mms với 8 giờ / ngày</value>
         <value xml:lang="zh">8小时/天，目前重新排订单过程会把天按8小时/天转换为百万毫秒" mondayStartTime="08:30:00" mondayCapacity="2.88E7" tuesdayStartTime="08:30:00" tuesdayCapacity="2.88E7" wednesdayStartTime="08:30:00" wednesdayCapacity="2.88E7" thursdayStartTime="08:30:00" thursdayCapacity="2.88E7" fridayStartTime="08:30:00" fridayCapacity="2.88E7"/&gt;</value>
         <value xml:lang="zh_TW">8小時/天，目前重新排訂單過程會把天按8小時/天轉換為百萬毫秒" mondayStartTime="08:30:00" mondayCapacity="2.88E7" tuesdayStartTime="08:30:00" tuesdayCapacity="2.88E7" wednesdayStartTime="08:30:00" wednesdayCapacity="2.88E7" thursdayStartTime="08:30:00" thursdayCapacity="2.88E7" fridayStartTime="08:30:00" fridayCapacity="2.88E7"/&gt;</value>
     </property>