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 [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...
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="!"N".equals(isPosted)"><display/></field>
+ <field name="postAcctgTrans" title=" " use-when="!"N".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"/>