OFBiz › OFBiz - Commits

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

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
erwan
Reply | Threaded
Open this post in threaded view
♦
♦
|

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

erwan
Modified: ofbiz/branches/20120329_portletWidget/applications/accounting/widget/GlForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/accounting/widget/GlForms.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/accounting/widget/GlForms.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/accounting/widget/GlForms.xml Tue Jun 19 21:36:11 2012
@@ -144,7 +144,7 @@ under the License.
                 <parameter param-name="acctgTransId"/>
             </hyperlink>
         </field>
-        <field name="postAcctgTrans" title="${uiLabelMap.CommonEmptyHeader}" use-when="!&quot;N&quot;.equals(isPosted)"><display/></field>
+        <field name="postAcctgTrans" title=" " use-when="!&quot;N&quot;.equals(isPosted)"><display/></field>
     </form>
 
     <form name="ListUnpostedAcctgTrans" type="list" title="Unposted Accounting Transactions" list-name="transactions"

Modified: ofbiz/branches/20120329_portletWidget/applications/accounting/widget/GlobalGlAccountsForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/accounting/widget/GlobalGlAccountsForms.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/accounting/widget/GlobalGlAccountsForms.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/accounting/widget/GlobalGlAccountsForms.xml Tue Jun 19 21:36:11 2012
@@ -181,7 +181,7 @@ under the License.
 
     <form name="GlAccountsNavForm" type="single" target="" title="GL Accounts" default-map-name="journal"
         header-row-style="header-row" default-table-style="basic-table">
-        <field name="backToAdmin" title="${uiLabelMap.CommonEmptyHeader}">
+        <field name="backToAdmin" title=" ">
             <hyperlink also-hidden="false" description="${uiLabelMap.AccountingBackToAdmin}" target="AdminMain">
                 <parameter param-name="organizationPartyId"/>
             </hyperlink>

Modified: ofbiz/branches/20120329_portletWidget/applications/commonext/config/CommonExtUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/commonext/config/CommonExtUiLabels.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/commonext/config/CommonExtUiLabels.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/commonext/config/CommonExtUiLabels.xml Tue Jun 19 21:36:11 2012
@@ -25,6 +25,7 @@
         <value xml:lang="fr">Créer un message public</value>
         <value xml:lang="it">Crea messaggio pubblico</value>
         <value xml:lang="pt_BR">Criar Mensagem Pública</value>
+        <value xml:lang="vi">Tạo thông điệp công khai</value>
         <value xml:lang="zh">新建公共消息</value>
     </property>
     <property key="CommonExtDateInfoCreated">
@@ -33,6 +34,7 @@
         <value xml:lang="fr">Date de création</value>
         <value xml:lang="it">Data di creazione</value>
         <value xml:lang="pt_BR">Data da informação criada</value>
+        <value xml:lang="vi">Ngày tạo thông tin</value>
         <value xml:lang="zh">已创建日期信息</value>
     </property>
     <property key="CommonExtDateLastChanged">
@@ -41,6 +43,7 @@
         <value xml:lang="fr">Dernière date de changement</value>
         <value xml:lang="it">Data ultimo cambiamento</value>
         <value xml:lang="pt_BR">Data da última modificação</value>
+        <value xml:lang="vi">Ngày thay đổi thông tin</value>
         <value xml:lang="zh">最后修改日期</value>
     </property>
     <property key="CommonExtSystemInfoNote">
@@ -49,6 +52,7 @@
         <value xml:lang="fr">Message d'information système</value>
         <value xml:lang="it">Messaggio di sistema</value>
         <value xml:lang="pt_BR">Nota de Informação do Sistema</value>
+        <value xml:lang="vi">Thông tin lÆ°u ý mức hệ thống</value>
         <value xml:lang="zh">系统信息便笺</value>
     </property>
     <property key="CommonExtSystemInfoNoteForUser">
@@ -57,6 +61,7 @@
         <value xml:lang="fr">Message d'information système pour l'utilisateur :</value>
         <value xml:lang="it">Messaggio di sistema per l'utente:</value>
         <value xml:lang="pt_BR">Nota de Informação do Sistema para o usuário:</value>
+        <value xml:lang="vi">Thông tin lÆ°u ý mức hệ thống tới Người dùng:</value>
         <value xml:lang="zh">系统信息便笺致用户：</value>
     </property>
     <property key="CommonExtSystemInfoStatus">
@@ -65,6 +70,7 @@
         <value xml:lang="fr">Message d'information d'état</value>
         <value xml:lang="it">Stato messaggi di sistema</value>
         <value xml:lang="pt_BR">Informação de estado do sistema</value>
+        <value xml:lang="vi">Trạng thái mức hệ thống</value>
         <value xml:lang="zh">系统信息状态</value>
     </property>
     <property key="CommonExtSystemInfoStatusForUser">
@@ -73,6 +79,7 @@
         <value xml:lang="fr">Message d'information d'état pour l'utilisateur :</value>
         <value xml:lang="it">Stato messaggi di sistema per l'utente:</value>
         <value xml:lang="pt_BR">Informação de estado do sistema para o usuário:</value>
+        <value xml:lang="vi">Trạng thái mức hệ thống tới Người dùng:</value>
         <value xml:lang="zh">系统信息状态为用户：</value>
     </property>
 </resource>

Modified: ofbiz/branches/20120329_portletWidget/applications/commonext/config/SetupUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/commonext/config/SetupUiLabels.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/commonext/config/SetupUiLabels.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/commonext/config/SetupUiLabels.xml Tue Jun 19 21:36:11 2012
@@ -23,6 +23,7 @@
         <value xml:lang="en">Edit Product Category</value>
         <value xml:lang="it">Aggiorna categoria prodotti</value>
         <value xml:lang="pt_BR">Editar Categoria de Produto</value>
+        <value xml:lang="vi">Sá»­a đổi chuyên mục sản phẩm</value>
         <value xml:lang="zh">编辑产品分类</value>
         <value xml:lang="zh_TW">編輯產品分類</value>
     </property>
@@ -30,6 +31,7 @@
         <value xml:lang="en">Product Infomation</value>
         <value xml:lang="it">Informazione prodotti</value>
         <value xml:lang="pt_BR">Informações do produto</value>
+        <value xml:lang="vi">Thông tin sản phẩm</value>
         <value xml:lang="zh">产品信息</value>
         <value xml:lang="zh_TW">產品資訊</value>
     </property>
@@ -38,6 +40,7 @@
         <value xml:lang="fr">Configuration de l'application</value>
         <value xml:lang="it">Applicazione di configurazione</value>
         <value xml:lang="pt_BR">Aplicativo de configuração</value>
+        <value xml:lang="vi">Cấu hình hệ thống ERP</value>
         <value xml:lang="zh">安装程序</value>
         <value xml:lang="zh_TW">設置應用程式</value>
     </property>
@@ -45,6 +48,7 @@
         <value xml:lang="en">OFBiz: Setup Application </value>
         <value xml:lang="it">OFBiz: componente di configurazione</value>
         <value xml:lang="pt_BR">OFBiz: Aplicativo de instalação</value>
+        <value xml:lang="vi">OFBiz: Khởi tạo Ứng dụng</value>
         <value xml:lang="zh">OFBiz：安装程序</value>
         <value xml:lang="zh_TW">OFBiz: 設置應用程式</value>
     </property>
@@ -69,6 +73,7 @@
         <!--value xml:lang="th">เป็นส่วนหนึ่งของธุรกิจแบบครอบครัวที่เป็นซอฟต์แวร์โอเพนซอส</value-->
         <value xml:lang="th">ส่วนหนึ่งของธุรกิจแบบครอบครัวที่เป็นซอฟต์แวร์โอเพนซอส</value>
         <!--value xml:lang="zh">开源软件OFBiz的组成部分</valuevalue xml:lang="zh">开源软件OFBiz的组成部分</value-->
+        <value xml:lang="vi">Thành viên của gia đình 'Open For Business Family' của 'Open Source Software'</value>
         <value xml:lang="zh">开源软件OFBiz家族的一部分</value>
         <value xml:lang="zh_CN">OFBiz的一部分</value>
         <value xml:lang="zh_TW">開放源碼軟體OFBiz家族一份子</value>
@@ -77,6 +82,7 @@
         <value xml:lang="en">Create New Organization</value>
         <value xml:lang="it">Creare nuova organizzazione</value>
         <value xml:lang="pt_BR">Criar Nova Organização</value>
+        <value xml:lang="vi">Thêm Doanh nghiệp</value>
         <value xml:lang="zh">新建组织</value>
         <value xml:lang="zh_TW">建立新的組織</value>
     </property>
@@ -84,6 +90,7 @@
         <value xml:lang="en">Edit Organization Information</value>
         <value xml:lang="it">Aggiorna informazioni organizzazione</value>
         <value xml:lang="pt_BR">Editar informações da Organização</value>
+        <value xml:lang="vi">Thêm thông tin Doanh nghiệp</value>
         <value xml:lang="zh">编辑组织信息</value>
         <value xml:lang="zh_TW">編輯組織資訊</value>
     </property>
@@ -92,6 +99,7 @@
         <value xml:lang="it">Aggiorna negozio prodotti</value>
         <value xml:lang="nl">Wijzigen winkel</value>
         <value xml:lang="pt_BR">Editar Loja de Produtos</value>
+        <value xml:lang="vi">Cập nhật Cá»­a hàng</value>
         <value xml:lang="zh">编辑产品店铺</value>
         <value xml:lang="zh_TW">編輯產品商店</value>
     </property>
@@ -99,6 +107,7 @@
         <value xml:lang="en">Setup only works if there are no organizations defined yet</value>
         <value xml:lang="it">Configura solo i lavori se non c'è ancora nessuna organizzazione definita</value>
         <value xml:lang="pt_BR">Instalação só funciona se não houver organizações definidas</value>
+        <value xml:lang="vi">Khởi tạo có tác dụng chỉ khi chÆ°a có Doanh nghiệp nào được thiết lập</value>
         <value xml:lang="zh">只有在没有定义组织时才能安装</value>
         <value xml:lang="zh_TW">只有當沒有相關組織時才能設置</value>
     </property>
@@ -106,6 +115,7 @@
         <value xml:lang="en">Facility</value>
         <value xml:lang="it">Stabilimento</value>
         <value xml:lang="pt_BR">Instalação</value>
+        <value xml:lang="vi">CÆ¡ sở (Facility)</value>
         <value xml:lang="zh">场所</value>
         <value xml:lang="zh_TW">場所</value>
     </property>
@@ -113,6 +123,7 @@
         <value xml:lang="en">Description</value>
         <value xml:lang="it">Descrizione stabilimento</value>
         <value xml:lang="pt_BR">Descrição</value>
+        <value xml:lang="vi">Miêu tả</value>
         <value xml:lang="zh">说明</value>
         <value xml:lang="zh_TW">說明</value>
     </property>
@@ -120,12 +131,14 @@
         <value xml:lang="en">Facility Name is missing</value>
         <value xml:lang="it">Stabilimento mancante</value>
         <value xml:lang="pt_BR">Nome da Instalação está faltando</value>
+        <value xml:lang="vi">Bạn chÆ°a nhập tên cÆ¡ sở (Facility Name)</value>
         <value xml:lang="zh">缺少场所名称</value>
     </property>
     <property key="SetupFirstCustomer">
         <value xml:lang="en">First Customer</value>
         <value xml:lang="it">Primo cliente</value>
         <value xml:lang="pt_BR">Primeiro Cliente</value>
+        <value xml:lang="vi">Khách hàng đầu tiên</value>
         <value xml:lang="zh">第一个客户</value>
         <value xml:lang="zh_TW">第一位客戶</value>
     </property>
@@ -133,6 +146,7 @@
         <value xml:lang="en">First Product</value>
         <value xml:lang="it">Primo prodotto</value>
         <value xml:lang="pt_BR">Primeiro produto</value>
+        <value xml:lang="vi">Sản phẩm đầu tiên</value>
         <value xml:lang="zh">第一个产品</value>
         <value xml:lang="zh_TW">第一項產品</value>
     </property>
@@ -140,6 +154,7 @@
         <value xml:lang="en">Initial Setup</value>
         <value xml:lang="it">Configurazione iniziale</value>
         <value xml:lang="pt_BR">Configuração inicial</value>
+        <value xml:lang="vi">Khởi tạo thiết lập</value>
         <value xml:lang="zh">初始设置</value>
         <value xml:lang="zh_TW">初始設置</value>
     </property>
@@ -147,6 +162,7 @@
         <value xml:lang="en">Setup New Component</value>
         <value xml:lang="it">Configura nuovo componente</value>
         <value xml:lang="pt_BR">Configurar novo componente</value>
+        <value xml:lang="vi">Khởi tạo thành phần (component) mới</value>
         <value xml:lang="zh">安装新的组件</value>
         <value xml:lang="zh_TW">設置新的元件</value>
     </property>
@@ -154,6 +170,7 @@
         <value xml:lang="en">Organization</value>
         <value xml:lang="it">Organizzazione</value>
         <value xml:lang="pt_BR">Organização</value>
+        <value xml:lang="vi">Doanh nghiệp</value>
         <value xml:lang="zh">组织</value>
         <value xml:lang="zh_TW">組織</value>
     </property>
@@ -161,6 +178,7 @@
         <value xml:lang="en">Organization Information</value>
         <value xml:lang="it">Informazioni organizzazione</value>
         <value xml:lang="pt_BR">Informação da Organização</value>
+        <value xml:lang="vi">Thông tin Doanh nghiệp</value>
         <value xml:lang="zh">组织信息</value>
         <value xml:lang="zh_TW">組織資訊</value>
     </property>
@@ -168,6 +186,7 @@
         <value xml:lang="en">Organization name</value>
         <value xml:lang="it">Nome organizzazione</value>
         <value xml:lang="pt_BR">Nome da organização</value>
+        <value xml:lang="vi">Tên Doanh nghiệp</value>
         <value xml:lang="zh">组织名称</value>
         <value xml:lang="zh_TW">組織名稱</value>
     </property>
@@ -175,12 +194,14 @@
         <value xml:lang="en">Organization name is missing</value>
         <value xml:lang="it">Nome organizzazione è mancante</value>
         <value xml:lang="pt_BR">Nome da organização está faltando</value>
+        <value xml:lang="vi">Bạn chÆ°a nhập tên doanh nghiệp</value>
         <value xml:lang="zh">缺少组织名称</value>
     </property>
     <property key="SetupOrganizationPartyId">
         <value xml:lang="en">Organization Party Id</value>
         <value xml:lang="it">Soggetto organizzazione</value>
         <value xml:lang="pt_BR">Id da Organização</value>
+        <value xml:lang="vi">Id Doanh nghiệp</value>
         <value xml:lang="zh">组织会员标识</value>
         <value xml:lang="zh_TW">組織成員ID</value>
     </property>
@@ -188,6 +209,7 @@
         <value xml:lang="en">You do not have sufficient data to access this page.</value>
         <value xml:lang="it">Tu non hai sufficienti diritti per accedere a questa pagina.</value>
         <value xml:lang="pt_BR">Você não tem dados suficientes para acessar essa página.</value>
+        <value xml:lang="vi">Bạn chÆ°a có đủ quyền để truy nhập vào trang này.</value>
         <value xml:lang="zh">你没有足够的数据来访问这个页面。</value>
         <value xml:lang="zh_TW">您沒有進入此頁面的權限。</value>
     </property>
@@ -195,6 +217,7 @@
         <value xml:lang="en">Product Catalog</value>
         <value xml:lang="it">Catalogo prodotti</value>
         <value xml:lang="pt_BR">Catálogo de Produtos</value>
+        <value xml:lang="vi">Catalog sản phẩm</value>
         <value xml:lang="zh">产品目录</value>
         <value xml:lang="zh_TW">產品目錄</value>
     </property>
@@ -202,6 +225,7 @@
         <value xml:lang="en">Product Store</value>
         <value xml:lang="it">Negozio prodotti</value>
         <value xml:lang="pt_BR">Loja de Produtos</value>
+        <value xml:lang="vi">Cá»­a hàng sản phẩm</value>
         <value xml:lang="zh">产品店铺</value>
         <value xml:lang="zh_TW">產品商店</value>
     </property>
@@ -209,6 +233,7 @@
         <value xml:lang="en">Product Store name</value>
         <value xml:lang="it">Nome negozio prodotti</value>
         <value xml:lang="pt_BR">Nome da Loja de Produtos</value>
+        <value xml:lang="vi">Tên cá»­a hàng sản phẩm</value>
         <value xml:lang="zh">产品店铺名称</value>
         <value xml:lang="zh_TW">產品商店名稱</value>
     </property>
@@ -216,12 +241,14 @@
         <value xml:lang="en">Store Name is missing</value>
         <value xml:lang="it">Nome negozio è mancante</value>
         <value xml:lang="pt_BR">Nome da loja está faltando</value>
+        <value xml:lang="vi">Bạn chÆ°a nhập tên cá»­a hàng</value>
         <value xml:lang="zh">缺少店铺名称</value>
     </property>
     <property key="SetupResults">
         <value xml:lang="en">Results</value>
         <value xml:lang="it">Risultati</value>
         <value xml:lang="pt_BR">Resultados</value>
+        <value xml:lang="vi">Kết quả</value>
         <value xml:lang="zh">结果</value>
         <value xml:lang="zh_TW">結果</value>
     </property>
@@ -229,6 +256,7 @@
         <value xml:lang="en">Set to complete</value>
         <value xml:lang="it">Imposta a completato</value>
         <value xml:lang="pt_BR">Marcar como completo</value>
+        <value xml:lang="vi">Thiết lập để hoàn thành</value>
         <value xml:lang="zh">设置为完成</value>
         <value xml:lang="zh_TW">完成設定</value>
     </property>
@@ -236,12 +264,14 @@
         <value xml:lang="en">The First Customer of</value>
         <value xml:lang="it">Il primo cliente di</value>
         <value xml:lang="pt_BR">O primeiro cliente de</value>
+        <value xml:lang="vi">Khách hàng đầu tiên của</value>
         <value xml:lang="zh">第一个客户属于</value>
     </property>
     <property key="SetupWebSite">
         <value xml:lang="en">Web Site</value>
         <value xml:lang="it">Sito web</value>
         <value xml:lang="pt_BR">Web Site</value>
+        <value xml:lang="vi">Trang thông tin</value>
         <value xml:lang="zh">网站</value>
         <value xml:lang="zh_TW">網站</value>
     </property>

Modified: ofbiz/branches/20120329_portletWidget/applications/commonext/data/helpdata/HELP_SETUP.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/commonext/data/helpdata/HELP_SETUP.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/commonext/data/helpdata/HELP_SETUP.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/commonext/data/helpdata/HELP_SETUP.xml Tue Jun 19 21:36:11 2012
@@ -44,7 +44,7 @@
         <para>1. Open a new terminal.</para>
         <para>2. Go to your ofbiz directory.</para>
         <para>3. Clean out all built classes with : ./ant clean-all </para>
-        <para>4. Load the seed data with : ./ant run-install-extseed </para>
+        <para>4. Load the seed data with : ./ant load-extseed </para>
         <para>5. Create the admin user with : ./ant create-admin-user-login , then enter a user login id that will be created for you (the initial temporary password is "ofbiz")</para>
         <para>6. Start ofbiz with : ./startofbiz.sh </para>
         <para>7. Connect to the OFBiz Setup application with your browser at https://localhost:8443/ofbizsetup.</para>

Modified: ofbiz/branches/20120329_portletWidget/applications/commonext/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/commonext/ofbiz-component.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/commonext/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/commonext/ofbiz-component.xml Tue Jun 19 21:36:11 2012
@@ -26,11 +26,11 @@ under the License.
     
     <entity-resource type="data" reader-name="seed" loader="main" location="data/EntityDiagramGroupData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonExtSeedData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonExtSecurityData.xml"/>
+    <entity-resource type="data" reader-name="security" loader="main" location="data/CommonExtSecurityData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonExtHelpData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/SystemInfoPortletData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/SetupData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/OfbizSetupSecurityData.xml"/>
+    <entity-resource type="data" reader-name="security" loader="main" location="data/OfbizSetupSecurityData.xml"/>
     
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
     

Modified: ofbiz/branches/20120329_portletWidget/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/FindFacility.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/FindFacility.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/FindFacility.groovy (original)
+++ ofbiz/branches/20120329_portletWidget/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/FindFacility.groovy Tue Jun 19 21:36:11 2012
@@ -52,7 +52,7 @@ if("productstore".equals(tabButtonItemTo
     }
     facility = delegator.findOne("Facility", [facilityId : facilityId], false);
     if(facility){
-        facilityType = facility.getRelatedOne("FacilityType");
+        facilityType = facility.getRelatedOne("FacilityType", false);
         context.facilityType = facilityType;
     }
     context.facility = facility;

Modified: ofbiz/branches/20120329_portletWidget/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/GetProdCatalog.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/GetProdCatalog.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/GetProdCatalog.groovy (original)
+++ ofbiz/branches/20120329_portletWidget/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/GetProdCatalog.groovy Tue Jun 19 21:36:11 2012
@@ -53,7 +53,7 @@
 
  productStoreCatalog = EntityUtil.getFirst(delegator.findByAnd("ProductStoreCatalog", [productStoreId: productStore.productStoreId], null, false));
  if(productStoreCatalog){
-     prodCatalog = productStoreCatalog.getRelatedOne("ProdCatalog");
+     prodCatalog = productStoreCatalog.getRelatedOne("ProdCatalog", false);
      prodCatalogId = prodCatalog.prodCatalogId;
  }
  context.prodCatalog = prodCatalog;
@@ -91,7 +91,7 @@
          /**************** get product from ProductCategory ******************/
          productCategoryMember  = EntityUtil.getFirst(delegator.findByAnd("ProductCategoryMember", [productCategoryId: productCategoryId], null, false));
          if(productCategoryMember){
-             product = productCategoryMember.getRelatedOne("Product");
+             product = productCategoryMember.getRelatedOne("Product", false);
              productId = product.productId;
              // Average cost
              averageCostValues = delegator.findByAnd("ProductPrice", [productId : productId, productPricePurposeId : "PURCHASE", productPriceTypeId : "AVERAGE_COST"], null, false);

Modified: ofbiz/branches/20120329_portletWidget/applications/commonext/webapp/ofbizsetup/organization/viewcontact.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/commonext/webapp/ofbizsetup/organization/viewcontact.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/commonext/webapp/ofbizsetup/organization/viewcontact.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/commonext/webapp/ofbizsetup/organization/viewcontact.ftl Tue Jun 19 21:36:11 2012
@@ -44,7 +44,7 @@ under the License.
               <td class="label align-top">${contactMechMap.contactMechType.get("description",locale)}</td>
               <td>
                 <#list contactMechMap.partyContactMechPurposes as partyContactMechPurpose>
-                  <#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOneCache("ContactMechPurposeType")>
+                  <#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOne("ContactMechPurposeType", true)>
                   <div>
                     <#if contactMechPurposeType?has_content>
                       <b>${contactMechPurposeType.get("description",locale)}</b>
@@ -66,12 +66,12 @@ under the License.
                     <#if postalAddress.address2?has_content>${postalAddress.address2}<br /></#if>
                     ${postalAddress.city?if_exists},
                     <#if postalAddress.stateProvinceGeoId?has_content>
-                      <#assign stateProvince = postalAddress.getRelatedOneCache("StateProvinceGeo")>
+                      <#assign stateProvince = postalAddress.getRelatedOne("StateProvinceGeo", true)>
                       ${stateProvince.abbreviation?default(stateProvince.geoId)}
                     </#if>
                     ${postalAddress.postalCode?if_exists}
                     <#if postalAddress.countryGeoId?has_content><br />
-                      <#assign country = postalAddress.getRelatedOneCache("CountryGeo")>
+                      <#assign country = postalAddress.getRelatedOne("CountryGeo", true)>
                       ${country.geoName?default(country.geoId)}
                     </#if>
                   </div>

Modified: ofbiz/branches/20120329_portletWidget/applications/commonext/widget/ofbizsetup/ProfileScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/commonext/widget/ofbizsetup/ProfileScreens.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/commonext/widget/ofbizsetup/ProfileScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/commonext/widget/ofbizsetup/ProfileScreens.xml Tue Jun 19 21:36:11 2012
@@ -34,7 +34,7 @@
                 </entity-condition>
                 <set field="partyId" from-field="parties[0].partyId"/>
                 <set field="customerPartyId" from-field="customerRel.partyIdFrom"/>
-                <set field="previousParams" from-field="sessionAttributes._PREVIOUS_PARAMS_"/>
+                <set field="previousParams" from-field="_PREVIOUS_PARAMS_" from-scope="user"/>
                 <property-to-field field="defaultCountryGeoId" resource="general" property="country.geo.id.default" default="USA"/>
             </actions>
             <widgets>

Modified: ofbiz/branches/20120329_portletWidget/applications/commonext/widget/ofbizsetup/SetupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/commonext/widget/ofbizsetup/SetupScreens.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/commonext/widget/ofbizsetup/SetupScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/commonext/widget/ofbizsetup/SetupScreens.xml Tue Jun 19 21:36:11 2012
@@ -27,7 +27,7 @@
                 <set field="tabButtonItemTop" value="organization"/>
                 <set field="titleProperty" value="SetupCreateNewOrganization"/>
                 <set field="target" value="createOrganization"/>
-                <set field="previousParams" from-field="sessionAttributes._PREVIOUS_PARAMS_"/>
+                <set field="previousParams" from-field="_PREVIOUS_PARAMS_" from-scope="user"/>
                 <property-to-field field="defaultCountryGeoId" resource="general" property="country.geo.id.default" default="USA"/>
                 <entity-condition entity-name="PartyRole" list="parties">
                     <condition-expr field-name="roleTypeId" operator="equals" value="INTERNAL_ORGANIZATIO"/>


Free forum by Nabble Edit this page