You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by sa...@apache.org on 2011/11/15 13:40:17 UTC
svn commit: r1202159 [1/3] - in /ofbiz/branches/jackrabbit20100709: ./
applications/accounting/config/
applications/accounting/webapp/accounting/finaccounttrans/
applications/accounting/webapp/accounting/payment/
applications/accounting/widget/ applica...
Author: sascharodekamp
Date: Tue Nov 15 12:40:15 2011
New Revision: 1202159
URL: http://svn.apache.org/viewvc?rev=1202159&view=rev
Log:
Update the Jackrabbit branch with the current trunk version to keep the branch up to date
Added:
ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js
- copied unchanged from r1202158, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js
ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-zh-CN.js
- copied unchanged from r1202158, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-zh-CN.js
ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-zh-HK.js
- copied unchanged from r1202158, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-zh-HK.js
ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-zh-TW.js
- copied unchanged from r1202158, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-zh-TW.js
Modified:
ofbiz/branches/jackrabbit20100709/ (props changed)
ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingEntityLabels.xml
ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingUiLabels.xml
ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl
ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl
ofbiz/branches/jackrabbit20100709/applications/accounting/widget/GlobalGlAccountsForms.xml
ofbiz/branches/jackrabbit20100709/applications/commonext/widget/CommonScreens.xml
ofbiz/branches/jackrabbit20100709/applications/content/script/org/ofbiz/content/content/ContentServices.xml
ofbiz/branches/jackrabbit20100709/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml
ofbiz/branches/jackrabbit20100709/applications/content/servicedef/services_content.xml
ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/website/WebSiteCMSContent.ftl
ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/website/WebSiteCMSNav.ftl
ofbiz/branches/jackrabbit20100709/applications/content/widget/WebSiteScreens.xml
ofbiz/branches/jackrabbit20100709/applications/order/config/OrderUiLabels.xml
ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/CategoryDetail.groovy
ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy
ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy
ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy
ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl
ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl
ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl
ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/orderinfo.ftl
ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/orderitems.ftl
ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/orderlist.ftl
ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/ordernotes.ftl
ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl
ofbiz/branches/jackrabbit20100709/applications/party/config/PartyEntityLabels.xml
ofbiz/branches/jackrabbit20100709/applications/party/script/org/ofbiz/party/party/PartySimpleEvents.xml
ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/PartyForms.xml
ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/ProfileScreens.xml
ofbiz/branches/jackrabbit20100709/applications/product/config/ProductUiLabels.xml
ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/category/CategoryServices.java
ofbiz/branches/jackrabbit20100709/build.xml
ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/UtilDateTime.java
ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/UtilFormatOut.java
ofbiz/branches/jackrabbit20100709/framework/common/config/CommonUiLabels.xml
ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java
ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/model/ModelViewEntity.java
ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/data/DemoProduct.xml
ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl
ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl
ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/order/ordercomplete.ftl
ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/CatalogScreens.xml
ofbiz/branches/jackrabbit20100709/themes/tomahawk/webapp/tomahawk/css/style.css
Propchange: ofbiz/branches/jackrabbit20100709/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 15 12:40:15 2011
@@ -2,4 +2,4 @@
/ofbiz/branches/dojo1.4:951708-952957
/ofbiz/branches/jquery:952958-1044489
/ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:962442-1199246
+/ofbiz/trunk:962442-1202158
Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingEntityLabels.xml?rev=1202159&r1=1202158&r2=1202159&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingEntityLabels.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingEntityLabels.xml Tue Nov 15 12:40:15 2011
@@ -187,7 +187,7 @@
<value xml:lang="fr">Note</value>
<value xml:lang="hi_IN">à¤à¤¿à¤ªà¥à¤ªà¤£à¥</value>
<value xml:lang="it">Nota</value>
- <value xml:lang="nl">Nota</value>
+ <value xml:lang="nl">Notitie</value>
<value xml:lang="pt_BR">Nota</value>
<value xml:lang="ro">Nota</value>
<value xml:lang="ru">ÐакладнаÑ</value>
@@ -309,6 +309,7 @@
<value xml:lang="fr">Ventes</value>
<value xml:lang="hi_IN">बिà¤à¥à¤°à¥</value>
<value xml:lang="it">Vendite</value>
+ <value xml:lang="nl">Verkopen</value>
<value xml:lang="pt_BR">Vendas</value>
<value xml:lang="ro">Vanzari</value>
<value xml:lang="ru">ÐÑодажи</value>
@@ -351,6 +352,7 @@
<value xml:lang="fr">Impôts dûs</value>
<value xml:lang="hi_IN">दà¥à¤¯ à¤à¤°</value>
<value xml:lang="it">Tasse Dovute</value>
+ <value xml:lang="nl">Verschuldigde belasting</value>
<value xml:lang="pt_BR">Imposto devido</value>
<value xml:lang="ro">Taxe Expirate</value>
<value xml:lang="ru">ÐалоговÑе ÑбоÑÑ</value>
@@ -413,6 +415,7 @@
<value xml:lang="fr">Dépôt sur compte</value>
<value xml:lang="hi_IN">à¤à¤®à¤¾ à¤à¤¾à¤¤à¤¾</value>
<value xml:lang="it">Conto Deposito</value>
+ <value xml:lang="nl">Spaarrekening</value>
<value xml:lang="pt_BR">Conta de depósito</value>
<value xml:lang="ru">ÐепозиÑнÑй ÑÑеÑ</value>
<value xml:lang="th">à¸à¸±à¸à¸à¸µà¹à¸à¸´à¸à¸à¸²à¸à¸à¸£à¸°à¸à¸³</value>
@@ -451,6 +454,7 @@
<value xml:lang="fr">Renflouer le compte</value>
<value xml:lang="hi_IN">रà¥à¤ªà¥à¤²à¥à¤¨à¤¿à¤¶(Replenish) à¤à¤¾à¤¤à¤¾</value>
<value xml:lang="it">Conto Rifornimento</value>
+ <value xml:lang="nl">Rekening aanvullen</value>
<value xml:lang="pt_BR">Conta de estoque</value>
<value xml:lang="ru">ÐополнÑемÑй ÑÑеÑ</value>
<value xml:lang="th">à¹à¸à¸´à¸¡à¸à¸±à¸à¸à¸µ</value>
@@ -514,6 +518,7 @@
<value xml:lang="fr">No de série (fabrication)</value>
<value xml:lang="hi_IN">Mfg à¤à¥à¤°à¤® सà¤à¤à¥à¤¯à¤¾</value>
<value xml:lang="it">Numero Seriale Mfg</value>
+ <value xml:lang="nl">Serienummer</value>
<value xml:lang="pt_BR">Número de Série Mfg</value>
<value xml:lang="ro">Nr.Serial Mfg</value>
<value xml:lang="ru">СеÑийнÑй Ð½Ð¾Ð¼ÐµÑ Ð¿ÑоизводиÑелÑ</value>
@@ -539,6 +544,7 @@
<value xml:lang="fr">Traçage fournisseur/Numéro d'inventaire</value>
<value xml:lang="hi_IN">विà¤à¥à¤°à¥à¤¤à¤¾ à¤à¥à¤°à¥à¤à¤¿à¤à¤/सà¥à¤à¥ सà¤à¤à¥à¤¯à¤¾</value>
<value xml:lang="it">Numero Tracciatura/Inventario Fornitore</value>
+ <value xml:lang="nl">Extern volgnummer</value>
<value xml:lang="pt_BR">Controle de fornecedor/Número de Inventário</value>
<value xml:lang="ro">Traseu Vanzare/Nr.Inventar</value>
<value xml:lang="ru">Vendor Tracking/Inventory Number</value>
@@ -649,6 +655,7 @@
<value xml:lang="fr">Groupe de machines, utilisé pour la définition de tâches et de gamme de fabrication</value>
<value xml:lang="hi_IN">मशà¥à¤¨à¥à¤ à¤à¤¾ समà¥à¤¹ à¤à¤¾à¤°à¥à¤¯ à¤à¤° परिà¤à¤¾à¤·à¤¾ à¤
नà¥à¤®à¤¾à¤°à¥à¤à¤£ à¤à¥ लिठपà¥à¤°à¤¯à¥à¤ à¤à¤¿à¤¯à¤¾ à¤à¤¾à¤¤à¤¾ हà¥</value>
<value xml:lang="it">Gruppo di macchine, usato nelle operazioni e cicli di produzione</value>
+ <value xml:lang="nl">Groep machines, gebruikt voor task- en routing definities</value>
<value xml:lang="pt_BR">Grupo de Máquinas, usado para definição de tarefas e rota</value>
<value xml:lang="ro">Grupuri de masini, folosite in sarcini cotidiene</value>
<value xml:lang="ru">ÐÑÑппа маÑин, иÑполÑзÑеÑÑÑ Ð² пÑоизводÑÑвенной деÑÑелÑноÑÑи</value>
@@ -674,6 +681,7 @@
<value xml:lang="fr">Actif immobilisé utilisé dans la définition de gammes et tâches</value>
<value xml:lang="hi_IN">à¤à¤ªà¤°à¥à¤¶à¤¨-परिà¤à¤¾à¤·à¤¾ à¤
नà¥à¤®à¤¾à¤°à¥à¤à¤£ मà¥à¤ à¤
à¤à¤² सà¤à¤ªà¤¤à¥à¤¤à¤¿ à¤à¤¾ à¤à¤ªà¤¯à¥à¤</value>
<value xml:lang="it">Attrezzature usate nelle operazioni e cicli di produzione</value>
+ <value xml:lang="nl">De vaste activa in gebruik voor operation-routing definities</value>
<value xml:lang="pt_BR">Ativo fixo usado na definição de rota operacional</value>
<value xml:lang="ro">Mijloace fixe utilizzate in operatti uzuale</value>
<value xml:lang="ru">ÐÑновнÑе ÑÑедÑÑва иÑполÑзÑемÑе в пÑоизводÑÑвенной деÑÑелÑноÑÑи</value>
@@ -777,6 +785,7 @@
<value xml:lang="fr">Caisse et équivalent</value>
<value xml:lang="hi_IN">नà¤à¤¦ à¤à¤° समतà¥à¤²à¥à¤¯</value>
<value xml:lang="it">Cassa e Banca</value>
+ <value xml:lang="nl">Liquide middelen</value>
<value xml:lang="pt_BR">Caixa e equivalente</value>
<value xml:lang="ro">Casa si Echivalente</value>
<value xml:lang="ru">ÐалиÑнÑе и иÑ
ÑквиваленÑ</value>
@@ -828,7 +837,7 @@
<value xml:lang="fr">Crédit</value>
<value xml:lang="hi_IN">à¤à¤®à¤¾</value>
<value xml:lang="it">Avere</value>
- <value xml:lang="nl">Krediet</value>
+ <value xml:lang="nl">Credit</value>
<value xml:lang="pt_BR">Crédito</value>
<value xml:lang="ro">Credit</value>
<value xml:lang="ru">ÐÑедиÑ</value>
@@ -907,6 +916,7 @@
<value xml:lang="fr">Dividendes</value>
<value xml:lang="hi_IN">लाà¤à¤¾à¤à¤¶</value>
<value xml:lang="it">Dividendi</value>
+ <value xml:lang="nl">Dividenden</value>
<value xml:lang="pt_BR">Dividendos</value>
<value xml:lang="ro">Dividente</value>
<value xml:lang="ru">ÐевиденÑÑ</value>
@@ -1020,7 +1030,7 @@
<value xml:lang="fr">Dette à long terme</value>
<value xml:lang="hi_IN">दà¥à¤°à¥à¤à¤à¤¾à¤²à¤¿à¤ दायितà¥à¤µ</value>
<value xml:lang="it">Finanziamenti e Altri Debiti a Lungo Termine</value>
- <value xml:lang="nl">Langlopende schuld</value>
+ <value xml:lang="nl">Langlopende schulden</value>
<value xml:lang="pt_BR">Passivo ExigÃvel a Londo Prazo</value>
<value xml:lang="ro">Pasivitati pe Termen Lung</value>
<value xml:lang="ru">ÐолгоÑÑоÑнÑе обÑзаÑелÑÑÑва</value>
@@ -1069,6 +1079,7 @@
<value xml:lang="fr">Capitaux propres</value>
<value xml:lang="hi_IN">सà¥à¤µà¤¾à¤®à¥ à¤à¥ à¤à¤à¥à¤µà¤¿à¤à¥</value>
<value xml:lang="it">Capitale Sociale</value>
+ <value xml:lang="nl">Eigen vermogen</value>
<value xml:lang="pt">Proprietários de bens</value>
<value xml:lang="ro">Actiuni Proprii</value>
<value xml:lang="ru">ÐÑибÑÐ»Ñ Ð²Ð»Ð°Ð´ÐµÐ»ÑÑев</value>
@@ -1820,6 +1831,7 @@
<value xml:lang="fr">Produits livrés</value>
<value xml:lang="hi_IN">वितरित सामà¤à¥à¤°à¥</value>
<value xml:lang="it">Beni Consegnabili</value>
+ <value xml:lang="nl">Geleverde goederen</value>
<value xml:lang="pt">Mercadorias entregues</value>
<value xml:lang="ro">Bunuri Livrabile</value>
<value xml:lang="ru">ÐоÑÑавленнÑе ÑоваÑÑ</value>
@@ -1832,6 +1844,7 @@
<value xml:lang="fr">Produits finis</value>
<value xml:lang="hi_IN">सà¤à¤ªà¥à¤°à¥à¤£ माल</value>
<value xml:lang="it">Beni Finiti</value>
+ <value xml:lang="nl">Gereed product</value>
<value xml:lang="pt">Produtos Acabados</value>
<value xml:lang="ro">Bunuri Finite</value>
<value xml:lang="ru">ÐоÑовÑе ÑоваÑÑ</value>
@@ -1844,6 +1857,7 @@
<value xml:lang="fr">Personnel</value>
<value xml:lang="hi_IN">परिशà¥à¤°à¤®</value>
<value xml:lang="it">Manodopera</value>
+ <value xml:lang="nl">Arbeid</value>
<value xml:lang="pt">Trabalho</value>
<value xml:lang="ro">Manopera</value>
<value xml:lang="ru">ТÑÑдозаÑÑаÑÑ</value>
@@ -1856,6 +1870,7 @@
<value xml:lang="fr">Finance</value>
<value xml:lang="hi_IN">धन</value>
<value xml:lang="it">Soldi</value>
+ <value xml:lang="nl">Geld</value>
<value xml:lang="pt">Dinheiro</value>
<value xml:lang="ro">Bani</value>
<value xml:lang="ru">ÐенÑги</value>
@@ -1868,6 +1883,7 @@
<value xml:lang="fr">Matières premières</value>
<value xml:lang="hi_IN">à¤à¤à¥à¤à¥ माल</value>
<value xml:lang="it">Materie Prime</value>
+ <value xml:lang="nl">Grondstoffen</value>
<value xml:lang="pt">Matérias-primas</value>
<value xml:lang="ro">Materii Prime</value>
<value xml:lang="ru">СÑÑÑе</value>
@@ -1880,6 +1896,7 @@
<value xml:lang="fr">Services</value>
<value xml:lang="hi_IN">सà¥à¤µà¤¾à¤à¤</value>
<value xml:lang="it">Servizi</value>
+ <value xml:lang="nl">Diensten</value>
<value xml:lang="pt">Serviços</value>
<value xml:lang="ro">Servicii</value>
<value xml:lang="ru">УÑлÑги</value>
@@ -2593,6 +2610,7 @@
<value xml:lang="en">Advance Repayment</value>
<value xml:lang="hi_IN">à¤
à¤à¥à¤°à¤¿à¤® à¤à¥à¤à¥à¤¤à¥</value>
<value xml:lang="it">Anticipo rimborso</value>
+ <value xml:lang="nl">Vooruitbetaling</value>
<value xml:lang="pt">Reembolso antecipado</value>
<value xml:lang="zh">é¢ä»å·¥èµ</value>
<value xml:lang="zh_TW">é ä»å·¥è³</value>
Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingUiLabels.xml?rev=1202159&r1=1202158&r2=1202159&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingUiLabels.xml Tue Nov 15 12:40:15 2011
@@ -27,7 +27,7 @@
<value xml:lang="hi_IN">EFT à¤à¤¼à¤¾à¤¤à¤¾: AHC/ Electronic à¤à¤¾à¤¨à¥à¤</value>
<value xml:lang="it">Conto EFT: AHC/Assegni elettronici</value>
<value xml:lang="ja">EFT Account: AHC/Electronic Check </value>
- <value xml:lang="nl">Bankrekening: AHC/Electronic Check </value>
+ <value xml:lang="nl">Bankrekening: AHC/Electronic Check</value>
<value xml:lang="pt">Conta de EFT: AHC/cheques eletrônicos</value>
<value xml:lang="ro">Cont EFT : AHC/Cecuri Electronice</value>
<value xml:lang="ru">ТекÑÑий ÑÑеÑ</value>
@@ -110,12 +110,14 @@
<property key="AccountingAccountNumberMissing">
<value xml:lang="de">Kontonummer fehlt</value>
<value xml:lang="en">Account Number is missing</value>
+ <value xml:lang="nl">Rekeningnummer ontbreekt</value>
<value xml:lang="pt">Número de Conta está vazio</value>
<value xml:lang="zh_TW">æ²æç§ç®è碼</value>
</property>
<property key="AccountingAccountTransactionId">
<value xml:lang="en">Account Transaction Id</value>
<value xml:lang="hi_IN">लà¥à¤à¤¾ à¤à¤¤à¤¿à¤µà¤¿à¤§à¤¿ à¤à¥à¤°à¤®à¤¾à¤à¤</value>
+ <value xml:lang="nl">Transactie Id</value>
<value xml:lang="pt">Id da transação de Conta</value>
<value xml:lang="zh_TW">ç§ç®äº¤æID</value>
</property>
@@ -141,6 +143,7 @@
<property key="AccountingAccountTypeMissing">
<value xml:lang="de">Kontotyp fehlt</value>
<value xml:lang="en">Account Type is missing</value>
+ <value xml:lang="nl">Rekening type ontbreekt</value>
<value xml:lang="pt">Tipo de Conta está vazio</value>
<value xml:lang="zh_TW">æ²æç§ç®é¡å</value>
</property>
@@ -223,12 +226,14 @@
<property key="AccountingAcctgTransEntriesFor">
<value xml:lang="en">Accounting Transaction Entries For</value>
<value xml:lang="hi_IN">लà¥à¤à¤¾ à¤à¤¤à¤¿à¤µà¤¿à¤§à¤¿ पà¥à¤°à¤µà¤¿à¤·à¥à¤à¤¿à¤¯à¥à¤ à¤à¥ लिà¤</value>
+ <value xml:lang="nl">Boekingsregels voor</value>
<value xml:lang="pt">Entradas de transações Contábeis para</value>
<value xml:lang="zh_TW">交æè¨å¸³å¸³ç®: </value>
</property>
<property key="AccountingAcctgTransFor">
<value xml:lang="en">Accounting Transactions For</value>
<value xml:lang="hi_IN">लà¥à¤à¤¾ à¤à¤¤à¤¿à¤µà¤¿à¤§à¤¿ à¤à¥ लिà¤</value>
+ <value xml:lang="nl">Boekhoudtransacties voor</value>
<value xml:lang="pt">Transações Contábeis para</value>
<value xml:lang="zh_TW">交æè¨å¸³: </value>
</property>
@@ -6352,6 +6357,10 @@
<value xml:lang="zh">æ¯ä»</value>
<value xml:lang="zh_TW">æ¯ä»</value>
</property>
+ <property key="AccountingInvoicePerShipment">
+ <value xml:lang="de">Rechnung pro Lieferung</value>
+ <value xml:lang="en">Invoice Per Shipment</value>
+ </property>
<property key="AccountingInvoicePurchase">
<value xml:lang="ar">ÙاتÙرة اÙشراء</value>
<value xml:lang="de">Einkaufsrechnung</value>
Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl?rev=1202159&r1=1202158&r2=1202159&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl Tue Nov 15 12:40:15 2011
@@ -18,7 +18,6 @@ under the License.
-->
<script language="JavaScript" type="text/javascript">
-<!--
function togglefinAccountTransId(master) {
var form = document.selectAllForm;
var finAccountTransList = form.elements.length;
@@ -38,7 +37,7 @@ function getFinAccountTransRunningTotalA
var isAllSelected = true;
for (var i = 0; i < finAccountTransList; i++) {
var element = form.elements[i];
- if (element.name.startsWith("_rowSubmit_o_")) {
+ if (jQuery(element[name^="_rowSubmit_o_"])) {
if (element.checked) {
isSingle = false;
} else {
@@ -52,7 +51,7 @@ function getFinAccountTransRunningTotalA
jQuery('#checkAllTransactions').attr('checked', false);
}
if (!isSingle) {
- jQuery('#submitButton').attr('disabled', '');
+ jQuery('#submitButton').removeAttr('disabled');
if (jQuery('#showFinAccountTransRunningTotal').length) {
jQuery.ajax({
url: 'getFinAccountTransRunningTotalAndBalances',
@@ -75,10 +74,9 @@ function getFinAccountTransRunningTotalA
jQuery('#endingBalance').html(jQuery('#endingBalanceInput').val());
}
- jQuery('#submitButton').attr('disabled', '');
+ jQuery('#submitButton').attr('disabled', 'disabled');
}
}
--->
</script>
<div class="screenlet screenlet-body">
@@ -323,7 +321,7 @@ function getFinAccountTransRunningTotalA
</tr>
<tr>
<td>
- <span id="finAccountTransRunningTotal"></span> /
+ <span id="finAccountTransRunningTotal"></span> /
<span id="numberOfFinAccountTransaction"></span>
</td>
<td><@ofbizCurrency amount=glReconciliation.openingBalance?default('0')/></td>
@@ -334,6 +332,6 @@ function getFinAccountTransRunningTotalA
</table>
</#if>
<#else>
- <h2>${uiLabelMap.CommonNoRecordFound}</h2>
+ <h2>${uiLabelMap.CommonNoRecordFound}</h2>
</#if>
</div>
Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl?rev=1202159&r1=1202158&r2=1202159&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl Tue Nov 15 12:40:15 2011
@@ -18,7 +18,6 @@ under the License.
-->
<script language="JavaScript" type="text/javascript">
-<!-- //
function togglePaymentId(master) {
var form = document.depositWithdrawPaymentsForm;
var payments = form.elements.length;
@@ -45,13 +44,14 @@ function getPaymentRunningTotal() {
}
}
}
+
if (isAllSelected) {
jQuery('#checkAllPayments').attr('checked', true);
} else {
jQuery('#checkAllPayments').attr('checked', false);
}
if (!isSingle) {
- jQuery('#submitButton').attr('disabled', '');
+ jQuery('#submitButton').removeAttr('disabled');
jQuery.ajax({
url: 'getPaymentRunningTotal',
async: false,
@@ -63,10 +63,10 @@ function getPaymentRunningTotal() {
});
} else {
jQuery('#showPaymentRunningTotal').html("");
- jQuery('#submitButton').attr('disabled', '');
+ jQuery('#submitButton').attr('disabled', 'disabled');
}
}
-// -->
+
</script>
<div class="screenlet">
Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/widget/GlobalGlAccountsForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/widget/GlobalGlAccountsForms.xml?rev=1202159&r1=1202158&r2=1202159&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/accounting/widget/GlobalGlAccountsForms.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/accounting/widget/GlobalGlAccountsForms.xml Tue Nov 15 12:40:15 2011
@@ -73,6 +73,7 @@ under the License.
<service service-name="performFind" result-map="result" result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" from-field="entityName"/>
+ <field-map field-name="orderBy" value="glAccountId"/>
<field-map field-name="noConditionFind" value="Y"/>
</service>
<property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/>
Modified: ofbiz/branches/jackrabbit20100709/applications/commonext/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/commonext/widget/CommonScreens.xml?rev=1202159&r1=1202158&r2=1202159&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/commonext/widget/CommonScreens.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/commonext/widget/CommonScreens.xml Tue Nov 15 12:40:15 2011
@@ -68,7 +68,7 @@ under the License.
<order-by field-name="-fromDate"/>
</entity-and>
<set field="orgContentId" from-field="orgPartyContentMap[0].contentId"/>
- <set field="orgPartyContent" value="${groovy: orgContentId!=null?"stream?contentId=" + orgContentId : ""}"/>
+ <set field="orgPartyContent" value="${groovy: orgContentId!=null?"/content/control/stream?contentId=" + orgContentId : ""}"/>
<set field="layoutSettings.organizationLogoLinkUrl" from-field="orgPartyContent" default-value="${orgPartyLogoMap.logoImageUrl}" global="true"/>
<set field="defaultOrganizationPartyCurrencyUomId" from-field="orgParty.baseCurrencyUomId" default-value="${defaultCurrencyUomId}" global="true"/>
<set field="defaultOrganizationPartyGroupName" from-field="orgParty.groupName" global="true"/>
Modified: ofbiz/branches/jackrabbit20100709/applications/content/script/org/ofbiz/content/content/ContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/script/org/ofbiz/content/content/ContentServices.xml?rev=1202159&r1=1202158&r2=1202159&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/content/script/org/ofbiz/content/content/ContentServices.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/content/script/org/ofbiz/content/content/ContentServices.xml Tue Nov 15 12:40:15 2011
@@ -1414,70 +1414,34 @@
<now-timestamp field="now"/>
<set field="contentsNotUpdated" value="0" type="Integer"/>
<set field="contentsUpdated" value="0" type="Integer"/>
- <entity-and list="prodCatalogCategoryList" entity-name="ProdCatalogCategory" filter-by-date="false">
- <field-map field-name="prodCatalogId" from-field="parameters.prodCatalogId"/>
- </entity-and>
-
- <!-- Get all categories -->
- <call-class-method method-name="newInstance" class-name="javolution.util.FastList" ret-field="parameters.productCategories"/>
- <iterate entry="prodCatalogCategory" list="prodCatalogCategoryList">
- <set field="rootProductCategoryId" from-field="prodCatalogCategory.productCategoryId"/>
- <entity-and list="productCategoryRollupList" entity-name="ProductCategoryRollup" filter-by-date="true">
- <field-map field-name="parentProductCategoryId" from-field="rootProductCategoryId"/>
+ <if-not-empty field="parameters.prodCatalogId">
+ <entity-and list="prodCatalogCategoryList" entity-name="ProdCatalogCategory" filter-by-date="false">
+ <field-map field-name="prodCatalogId" from-field="parameters.prodCatalogId"/>
</entity-and>
- <set field="parameters.parentProductCategoryId" from-field="rootProductCategoryId"/>
- <call-simple-method method-name="createMissingCategoryContentAltUrlInline"/>
- </iterate>
-
- <iterate entry="productCategoryList" list="parameters.productCategories">
- <!-- Create Content Alternative URLs for Product Category Content -->
- <entity-condition list="productCategoryContentAndInfoList" entity-name="ProductCategoryContentAndInfo" filter-by-date="true" use-cache="true">
- <condition-list combine="and">
- <condition-expr field-name="productCategoryId" from-field="productCategoryList.productCategoryId"/>
- <condition-expr field-name="prodCatContentTypeId" operator="not-equals" value="ALTERNATIVE_URL"/>
- </condition-list>
- <order-by field-name="-fromDate"/>
- </entity-condition>
- <iterate entry="productCategoryContentAndInfo" list="productCategoryContentAndInfoList">
- <set field="createMissingCategoryContentAltUrlsMap.contentId" from-field="productCategoryContentAndInfo.contentId"/>
- <call-service service-name="createContentAlternativeUrl" in-map-name="createMissingCategoryContentAltUrlsMap">
- <result-to-field result-name="contentCreated" field="contentCreated"/>
- </call-service>
- <if-compare operator="equals" value="Y" field="contentCreated">
- <calculate field="contentsUpdated" type="Integer">
- <calcop operator="add" field="contentsUpdated">
- <number value="1"/>
- </calcop>
- </calculate>
- </if-compare>
- <if-compare operator="equals" value="N" field="contentCreated">
- <calculate field="contentsNotUpdated" type="Integer">
- <calcop operator="add" field="contentsNotUpdated">
- <number value="1"/>
- </calcop>
- </calculate>
- </if-compare>
+
+ <!-- Get all categories -->
+ <call-class-method method-name="newInstance" class-name="javolution.util.FastList" ret-field="parameters.productCategories"/>
+ <iterate entry="prodCatalogCategory" list="prodCatalogCategoryList">
+ <set field="rootProductCategoryId" from-field="prodCatalogCategory.productCategoryId"/>
+ <entity-and list="productCategoryRollupList" entity-name="ProductCategoryRollup" filter-by-date="true">
+ <field-map field-name="parentProductCategoryId" from-field="rootProductCategoryId"/>
+ </entity-and>
+ <set field="parameters.parentProductCategoryId" from-field="rootProductCategoryId"/>
+ <call-simple-method method-name="createMissingCategoryContentAltUrlInline"/>
</iterate>
- <!-- Create Content Alternative URLs for Product Content -->
- <entity-condition list="productCategoryMemberList" entity-name="ProductCategoryMember" filter-by-date="true" use-cache="true">
- <condition-list combine="and">
- <condition-expr field-name="productCategoryId" from-field="productCategoryList.productCategoryId"/>
- </condition-list>
- <order-by field-name="-fromDate"/>
- </entity-condition>
- <iterate entry="productCategoryMember" list="productCategoryMemberList">
- <set field="product.productId" from-field="productCategoryMember.productId"/>
- <entity-condition list="productContentAndInfoList" entity-name="ProductContentAndInfo" filter-by-date="true" use-cache="true">
+ <iterate entry="productCategoryList" list="parameters.productCategories">
+ <!-- Create Content Alternative URLs for Product Category Content -->
+ <entity-condition list="productCategoryContentAndInfoList" entity-name="ProductCategoryContentAndInfo" filter-by-date="true" use-cache="true">
<condition-list combine="and">
- <condition-expr field-name="productId" from-field="product.productId"/>
- <condition-expr field-name="productContentTypeId" operator="not-equals" value="ALTERNATIVE_URL"/>
+ <condition-expr field-name="productCategoryId" from-field="productCategoryList.productCategoryId"/>
+ <condition-expr field-name="prodCatContentTypeId" operator="not-equals" value="ALTERNATIVE_URL"/>
</condition-list>
<order-by field-name="-fromDate"/>
</entity-condition>
- <iterate entry="productContentAndInfo" list="productContentAndInfoList">
- <set field="createMissingProductContentAltUrlsMap.contentId" from-field="productContentAndInfo.contentId"/>
- <call-service service-name="createContentAlternativeUrl" in-map-name="createMissingProductContentAltUrlsMap">
+ <iterate entry="productCategoryContentAndInfo" list="productCategoryContentAndInfoList">
+ <set field="createMissingCategoryContentAltUrlsMap.contentId" from-field="productCategoryContentAndInfo.contentId"/>
+ <call-service service-name="createContentAlternativeUrl" in-map-name="createMissingCategoryContentAltUrlsMap">
<result-to-field result-name="contentCreated" field="contentCreated"/>
</call-service>
<if-compare operator="equals" value="Y" field="contentCreated">
@@ -1495,24 +1459,76 @@
</calculate>
</if-compare>
</iterate>
+
+ <!-- Create Content Alternative URLs for Product Content -->
+ <entity-condition list="productCategoryMemberList" entity-name="ProductCategoryMember" filter-by-date="true" use-cache="true">
+ <condition-list combine="and">
+ <condition-expr field-name="productCategoryId" from-field="productCategoryList.productCategoryId"/>
+ </condition-list>
+ <order-by field-name="-fromDate"/>
+ </entity-condition>
+ <iterate entry="productCategoryMember" list="productCategoryMemberList">
+ <set field="product.productId" from-field="productCategoryMember.productId"/>
+ <entity-condition list="productContentAndInfoList" entity-name="ProductContentAndInfo" filter-by-date="true" use-cache="true">
+ <condition-list combine="and">
+ <condition-expr field-name="productId" from-field="product.productId"/>
+ <condition-expr field-name="productContentTypeId" operator="not-equals" value="ALTERNATIVE_URL"/>
+ </condition-list>
+ <order-by field-name="-fromDate"/>
+ </entity-condition>
+ <iterate entry="productContentAndInfo" list="productContentAndInfoList">
+ <set field="createMissingProductContentAltUrlsMap.contentId" from-field="productContentAndInfo.contentId"/>
+ <call-service service-name="createContentAlternativeUrl" in-map-name="createMissingProductContentAltUrlsMap">
+ <result-to-field result-name="contentCreated" field="contentCreated"/>
+ </call-service>
+ <if-compare operator="equals" value="Y" field="contentCreated">
+ <calculate field="contentsUpdated" type="Integer">
+ <calcop operator="add" field="contentsUpdated">
+ <number value="1"/>
+ </calcop>
+ </calculate>
+ </if-compare>
+ <if-compare operator="equals" value="N" field="contentCreated">
+ <calculate field="contentsNotUpdated" type="Integer">
+ <calcop operator="add" field="contentsNotUpdated">
+ <number value="1"/>
+ </calcop>
+ </calculate>
+ </if-compare>
+ </iterate>
+ </iterate>
</iterate>
- </iterate>
+ </if-not-empty>
- <!-- Create Content Alternative URLs for Website Content (webSiteContentTypeId=BLOG_ROOT) -->
+ <!-- Create Content Alternative URLs for Website Content -->
<entity-and list="webSiteContents" entity-name="WebSiteContent" filter-by-date="true">
<field-map field-name="webSiteId" from-field="parameters.webSiteId"/>
- <field-map field-name="webSiteContentTypeId" value="BLOG_ROOT"/>
</entity-and>
- <first-from-list entry="webSiteContent" list="webSiteContents"/>
- <if-not-empty field="webSiteContent">
- <entity-and list="blogContents" entity-name="ContentAssoc" filter-by-date="true">
+ <iterate entry="webSiteContent" list="webSiteContents">
+ <entity-and list="subContents" entity-name="ContentAssoc" filter-by-date="true">
<field-map field-name="contentId" from-field="webSiteContent.contentId"/>
- <field-map field-name="contentAssocTypeId" value="SUB_CONTENT"/>
</entity-and>
- <iterate entry="blogContent" list="blogContents">
+ <iterate entry="subContent" list="subContents">
+ <set field="createMissingContentAltUrlsMap.contentId" from-field="subContent.contentIdTo"/>
+ <call-service service-name="createContentAlternativeUrl" in-map-name="createMissingContentAltUrlsMap">
+ <result-to-field result-name="contentCreated" field="contentCreated"/>
+ </call-service>
+ <if-compare operator="equals" value="Y" field="contentCreated">
+ <calculate field="contentsUpdated" type="Integer">
+ <calcop operator="add" field="contentsUpdated">
+ <number value="1"/>
+ </calcop>
+ </calculate>
+ </if-compare>
+ <if-compare operator="equals" value="N" field="contentCreated">
+ <calculate field="contentsNotUpdated" type="Integer">
+ <calcop operator="add" field="contentsNotUpdated">
+ <number value="1"/>
+ </calcop>
+ </calculate>
+ </if-compare>
<entity-and list="contentAssocs" entity-name="ContentAssoc" filter-by-date="true">
- <field-map field-name="contentId" from-field="blogContent.contentIdTo"/>
- <field-map field-name="contentAssocTypeId" value="PUBLISH_LINK"/>
+ <field-map field-name="contentId" from-field="subContent.contentIdTo"/>
</entity-and>
<iterate entry="contentAssoc" list="contentAssocs">
<set field="createMissingContentAltUrlsMap.contentId" from-field="contentAssoc.contentIdTo"/>
@@ -1535,7 +1551,7 @@
</if-compare>
</iterate>
</iterate>
- </if-not-empty>
+ </iterate>
<field-to-result field="contentsNotUpdated" result-name="contentsNotUpdated"/>
<field-to-result field="contentsUpdated" result-name="contentsUpdated"/>
</simple-method>
Modified: ofbiz/branches/jackrabbit20100709/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml?rev=1202159&r1=1202158&r2=1202159&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml Tue Nov 15 12:40:15 2011
@@ -209,47 +209,69 @@ under the License.
<entity-and list="productStoreCatalogs" entity-name="ProductStoreCatalog" filter-by-date="true">
<field-map field-name="productStoreId" from-field="webSite.productStoreId"/>
</entity-and>
- <iterate entry="productStoreCatalog" list="productStoreCatalogs">
+ <if-not-empty field="productStoreCatalogs">
+ <iterate entry="productStoreCatalog" list="productStoreCatalogs">
+ <iterate entry="typeGenerate" list="parameters.typeGenerate">
+ <if-compare operator="equals" value="category" field="typeGenerate">
+ <set field="createMissingCategoryAltUrlsMap.prodCatalogId" from-field="productStoreCatalog.prodCatalogId"/>
+ <set field="createMissingCategoryAltUrlsMap.category" value="category"/>
+ <call-service service-name="createMissingCategoryAndProductAltUrls" in-map-name="createMissingCategoryAltUrlsMap">
+ <result-to-field result-name="categoriesNotUpdated" field="categoriesNotUpdated"/>
+ <result-to-field result-name="categoriesUpdated" field="categoriesUpdated"/>
+ </call-service>
+ <calculate field="totalCategoriesNotUpdated" type="Integer">
+ <calcop operator="add" field="totalCategoriesNotUpdated">
+ <calcop operator="get" field="categoriesNotUpdated"/>
+ </calcop>
+ </calculate>
+ <calculate field="totalCategoriesUpdated" type="Integer">
+ <calcop operator="add" field="totalCategoriesUpdated">
+ <calcop operator="get" field="categoriesUpdated"/>
+ </calcop>
+ </calculate>
+ </if-compare>
+ <if-compare operator="equals" value="product" field="typeGenerate">
+ <set field="createMissingProductAltUrlsMap.prodCatalogId" from-field="productStoreCatalog.prodCatalogId"/>
+ <set field="createMissingProductAltUrlsMap.product" value="product"/>
+ <call-service service-name="createMissingCategoryAndProductAltUrls" in-map-name="createMissingProductAltUrlsMap">
+ <result-to-field result-name="productsNotUpdated" field="productsNotUpdated"/>
+ <result-to-field result-name="productsUpdated" field="productsUpdated"/>
+ </call-service>
+ <calculate field="totalProductsNotUpdated" type="Integer">
+ <calcop operator="add" field="totalProductsNotUpdated">
+ <calcop operator="get" field="productsNotUpdated"/>
+ </calcop>
+ </calculate>
+ <calculate field="totalProductsUpdated" type="Integer">
+ <calcop operator="add" field="totalProductsUpdated">
+ <calcop operator="get" field="productsUpdated"/>
+ </calcop>
+ </calculate>
+ </if-compare>
+ <if-compare operator="equals" value="content" field="typeGenerate">
+ <set field="createMissingContentAltUrlsMap.webSiteId" from-field="parameters.webSiteId"/>
+ <set field="createMissingContentAltUrlsMap.prodCatalogId" from-field="productStoreCatalog.prodCatalogId"/>
+ <call-service service-name="createMissingContentAltUrls" in-map-name="createMissingContentAltUrlsMap">
+ <result-to-field result-name="contentsNotUpdated" field="contentsNotUpdated"/>
+ <result-to-field result-name="contentsUpdated" field="contentsUpdated"/>
+ </call-service>
+ <calculate field="totalContentsNotUpdated" type="Integer">
+ <calcop operator="add" field="contentsNotUpdated">
+ <calcop operator="get" field="productsNotUpdated"/>
+ </calcop>
+ </calculate>
+ <calculate field="totalContentsUpdated" type="Integer">
+ <calcop operator="add" field="totalContentsUpdated">
+ <calcop operator="get" field="contentsUpdated"/>
+ </calcop>
+ </calculate>
+ </if-compare>
+ </iterate>
+ </iterate>
+ <else>
<iterate entry="typeGenerate" list="parameters.typeGenerate">
- <if-compare operator="equals" value="category" field="typeGenerate">
- <set field="createMissingCategoryAltUrlsMap.prodCatalogId" from-field="productStoreCatalog.prodCatalogId"/>
- <set field="createMissingCategoryAltUrlsMap.category" value="category"/>
- <call-service service-name="createMissingCategoryAndProductAltUrls" in-map-name="createMissingCategoryAltUrlsMap">
- <result-to-field result-name="categoriesNotUpdated" field="categoriesNotUpdated"/>
- <result-to-field result-name="categoriesUpdated" field="categoriesUpdated"/>
- </call-service>
- <calculate field="totalCategoriesNotUpdated" type="Integer">
- <calcop operator="add" field="totalCategoriesNotUpdated">
- <calcop operator="get" field="categoriesNotUpdated"/>
- </calcop>
- </calculate>
- <calculate field="totalCategoriesUpdated" type="Integer">
- <calcop operator="add" field="totalCategoriesUpdated">
- <calcop operator="get" field="categoriesUpdated"/>
- </calcop>
- </calculate>
- </if-compare>
- <if-compare operator="equals" value="product" field="typeGenerate">
- <set field="createMissingProductAltUrlsMap.prodCatalogId" from-field="productStoreCatalog.prodCatalogId"/>
- <set field="createMissingProductAltUrlsMap.product" value="product"/>
- <call-service service-name="createMissingCategoryAndProductAltUrls" in-map-name="createMissingProductAltUrlsMap">
- <result-to-field result-name="productsNotUpdated" field="productsNotUpdated"/>
- <result-to-field result-name="productsUpdated" field="productsUpdated"/>
- </call-service>
- <calculate field="totalProductsNotUpdated" type="Integer">
- <calcop operator="add" field="totalProductsNotUpdated">
- <calcop operator="get" field="productsNotUpdated"/>
- </calcop>
- </calculate>
- <calculate field="totalProductsUpdated" type="Integer">
- <calcop operator="add" field="totalProductsUpdated">
- <calcop operator="get" field="productsUpdated"/>
- </calcop>
- </calculate>
- </if-compare>
<if-compare operator="equals" value="content" field="typeGenerate">
<set field="createMissingContentAltUrlsMap.webSiteId" from-field="parameters.webSiteId"/>
- <set field="createMissingContentAltUrlsMap.prodCatalogId" from-field="productStoreCatalog.prodCatalogId"/>
<call-service service-name="createMissingContentAltUrls" in-map-name="createMissingContentAltUrlsMap">
<result-to-field result-name="contentsNotUpdated" field="contentsNotUpdated"/>
<result-to-field result-name="contentsUpdated" field="contentsUpdated"/>
@@ -266,7 +288,8 @@ under the License.
</calculate>
</if-compare>
</iterate>
- </iterate>
+ </else>
+ </if-not-empty>
<else>
<iterate entry="typeGenerate" list="parameters.typeGenerate">
<if-compare operator="equals" value="category" field="typeGenerate">
Modified: ofbiz/branches/jackrabbit20100709/applications/content/servicedef/services_content.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/servicedef/services_content.xml?rev=1202159&r1=1202158&r2=1202159&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/content/servicedef/services_content.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/content/servicedef/services_content.xml Tue Nov 15 12:40:15 2011
@@ -344,7 +344,7 @@
<service name="createMissingContentAltUrls" engine="simple"
location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="createMissingContentAltUrls" auth="true" use-transaction="false">
<description>Create missing Content Alternative URLs</description>
- <attribute name="prodCatalogId" mode="IN" type="String" optional="false"/>
+ <attribute name="prodCatalogId" mode="IN" type="String" optional="true"/>
<attribute name="webSiteId" mode="IN" type="String" optional="true"/>
<attribute name="contentsNotUpdated" mode="OUT" type="Integer" optional="true"/>
<attribute name="contentsUpdated" mode="OUT" type="Integer" optional="true"/>
Modified: ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/website/WebSiteCMSContent.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/website/WebSiteCMSContent.ftl?rev=1202159&r1=1202158&r2=1202159&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/website/WebSiteCMSContent.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/website/WebSiteCMSContent.ftl Tue Nov 15 12:40:15 2011
@@ -164,7 +164,6 @@
<form name="cmsform" enctype="multipart/form-data" method="post" action="<@o...@ofbizUrl>" style="margin: 0;">
<#if (content?has_content)>
<input type="hidden" name="dataResourceId" value="${(dataResource.dataResourceId)?if_exists}"/>
- <input type="hidden" name="mimeTypeId" value="${content.mimeTypeId?default(mimeTypeId)}"/>
<input type="hidden" name="contentId" value="${content.contentId}"/>
<#list requestParameters.keySet() as paramName>
@@ -176,11 +175,19 @@
<input type="hidden" name="contentAssocTypeId" value="${contentAssocTypeId?default('SUBSITE')}"/>
<input type="hidden" name="ownerContentId" value="${contentIdFrom?default(contentRoot)}"/>
<input type="hidden" name="contentIdFrom" value="${contentIdFrom?default(contentRoot)}"/>
+ </#if>
+ <#if (dataResourceTypeId != 'IMAGE_OBJECT' && dataResourceTypeId != 'OTHER_OBJECT' && dataResourceTypeId != 'LOCAL_FILE' &&
+ dataResourceTypeId != 'OFBIZ_FILE' && dataResourceTypeId != 'VIDEO_OBJECT' && dataResourceTypeId != 'AUDIO_OBJECT')>
<input type="hidden" name="mimeTypeId" value="${mimeTypeId}"/>
</#if>
<#if (dataResourceTypeId != 'NONE')>
+ <#if (dataResourceTypeId == 'IMAGE_OBJECT' || dataResourceTypeId == 'OTHER_OBJECT' || dataResourceTypeId == 'LOCAL_FILE' ||
+ dataResourceTypeId == 'OFBIZ_FILE' || dataResourceTypeId == 'VIDEO_OBJECT' || dataResourceTypeId == 'AUDIO_OBJECT')>
+ <input type="hidden" name="dataResourceTypeId" value="IMAGE_OBJECT"/>
+ <#else>
<input type="hidden" name="dataResourceTypeId" value="${dataResourceTypeId}"/>
</#if>
+ </#if>
<input type="hidden" name="webSiteId" value="${webSiteId}"/>
<input type="hidden" name="dataResourceName" value="${(dataResource.dataResourceName)?if_exists}"/>
@@ -331,10 +338,11 @@
</tr>
<#-- this all depends on the dataResourceTypeId which was selected -->
- <#if (dataResourceTypeId == 'IMAGE_OBJECT' || dataResourceTypeId == 'OTHER_OBJECT' ||
- dataResourceTypeId == 'VIDEO_OBJECT' || dataResourceTypeId == 'AUDIO_OBJECT')>
+ <#if (dataResourceTypeId == 'IMAGE_OBJECT' || dataResourceTypeId == 'OTHER_OBJECT' || dataResourceTypeId == 'LOCAL_FILE' ||
+ dataResourceTypeId == 'OFBIZ_FILE' || dataResourceTypeId == 'VIDEO_OBJECT' || dataResourceTypeId == 'AUDIO_OBJECT')>
<tr>
- <td colspan="2" align="right">
+ <td class="label"></td>
+ <td>
<#if ((content.contentId)?has_content)>
<@renderContentAsText contentId="${content.contentId}" ignoreTemplate="true"/>
</#if>
Modified: ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/website/WebSiteCMSNav.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/website/WebSiteCMSNav.ftl?rev=1202159&r1=1202158&r2=1202159&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/website/WebSiteCMSNav.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/website/WebSiteCMSNav.ftl Tue Nov 15 12:40:15 2011
@@ -46,84 +46,87 @@
}
<#-- creating the JSON Data -->
+<#macro fillTreeSubsites assocList>
+ <#if (assocList?has_content)>
+ <#list assocList as assoc>
+ <#assign content = assoc.getRelatedOne("ToContent")/>
+ {
+ "data": {"title" : cutNameLength("${content.contentName!assoc.contentIdTo}"), "attr": {"href": "javascript:void(0);", "onClick" : "callDocument('', '${assoc.contentIdTo}', jQuery('#${assoc.contentIdTo}'), '');"}},
+
+ <#assign assocChilds = content.getRelated("FromContentAssoc")?if_exists/>
+ "attr": {"id" : "${assoc.contentIdTo}", "contentId" : "${assoc.contentId}", "fromDate" : "${assoc.fromDate}", "contentAssocTypeId" : "${assoc.contentAssocTypeId}"}
+ <#if assocChilds?has_content>
+ ,"children": [
+ <@fillTreeSubsites assocList = assocChilds/>
+ ]
+ </#if>
+ <#if assoc_has_next>
+ },
+ <#else>
+ }
+ </#if>
+ </#list>
+ </#if>
+</#macro>
+<#macro fillTreeMenus assocList>
+ <#if (assocList?has_content)>
+ <#list assocList as assoc>
+ <#assign content = assoc.getRelatedOne("ToContent")/>
+ {
+ "data": {"title" : cutNameLength("${content.contentName!assoc.contentIdTo}"), "attr": {"href": "javascript:void(0);", "onClick" : "callDocument('${assoc.contentIdTo}');"}},
+ <#assign assocChilds = content.getRelated("FromContentAssoc")?if_exists/>
+ "attr": {"id" : "${assoc.contentIdTo}", "contentId" : "${assoc.contentId}", "fromDate" : "${assoc.fromDate}"}
+ <#if assocChilds?has_content>
+ ,"children": [
+ <@fillTreeMenus assocList = assocChilds/>
+ ]
+ </#if>
+ <#if assoc_has_next>
+ },
+ <#else>
+ }
+ </#if>
+ </#list>
+ </#if>
+</#macro>
+
+<#macro fillTreeError assocList>
+ <#if (assocList?has_content)>
+ <#list assocList as assoc>
+ <#assign content = assoc.getRelatedOne("ToContent")/>
+ {
+ "data": {"title" : cutNameLength("${content.contentName!assoc.contentIdTo}"), "attr": {"href": "javascript:void(0);", "onClick" : "callDocument('', '${assoc.contentIdTo}', '', '');"}},
+ <#assign assocChilds = content.getRelated("FromContentAssoc")?if_exists/>
+ "attr": {"id" : "${assoc.contentIdTo}", "contentId" : "${assoc.contentId}", "fromDate" : "${assoc.fromDate}"}
+ <#if assocChilds?has_content>
+ ,"children": [
+ <@fillTreeError assocList = assocChilds/>
+ ]
+ </#if>
+ <#if assoc_has_next>
+ },
+ <#else>
+ }
+ </#if>
+ </#list>
+ </#if>
+</#macro>
+
var rawdata_subsites = [
<#if (subsites?has_content)>
- <@fillTree assocList = subsites/>
- <#macro fillTree assocList>
- <#if (assocList?has_content)>
- <#list assocList as assoc>
- <#assign content = assoc.getRelatedOne("ToContent")/>
- {
- "data": {"title" : cutNameLength("${content.contentName!assoc.contentIdTo}"), "attr": {"href": "javascript:void(0);", "onClick" : "callDocument('', '${assoc.contentIdTo}', '', '');"}},
- <#assign assocChilds = content.getRelated("FromContentAssoc")?if_exists/>
- "attr": {"id" : "${assoc.contentIdTo}", "contentId" : "${assoc.contentId}", "fromDate" : "${assoc.fromDate}"}
- <#if assocChilds?has_content>
- ,"children": [
- <@fillTree assocList = assocChilds/>
- ]
- </#if>
- <#if assoc_has_next>
- },
- <#else>
- }
- </#if>
- </#list>
- </#if>
- </#macro>
+ <@fillTreeSubsites assocList = subsites/>
</#if>
];
var rawdata_menus = [
<#if (menus?has_content)>
- <@fillTree assocList = menus/>
- <#macro fillTree assocList>
- <#if (assocList?has_content)>
- <#list assocList as assoc>
- <#assign content = assoc.getRelatedOne("ToContent")/>
- {
- "data": {"title" : cutNameLength("${content.contentName!assoc.contentIdTo}"), "attr": {"href": "javascript:void(0);", "onClick" : "callDocument('${assoc.contentIdTo}');"}},
- <#assign assocChilds = content.getRelated("FromContentAssoc")?if_exists/>
- "attr": {"id" : "${assoc.contentIdTo}", "contentId" : "${assoc.contentId}", "fromDate" : "${assoc.fromDate}"}
- <#if assocChilds?has_content>
- ,"children": [
- <@fillTree assocList = assocChilds/>
- ]
- </#if>
- <#if assoc_has_next>
- },
- <#else>
- }
- </#if>
- </#list>
- </#if>
- </#macro>
+ <@fillTreeMenus assocList = menus/>
</#if>
];
var rawdata_errors = [
<#if (errors?has_content)>
- <@fillTree assocList = errors/>
- <#macro fillTree assocList>
- <#if (assocList?has_content)>
- <#list assocList as assoc>
- <#assign content = assoc.getRelatedOne("ToContent")/>
- {
- "data": {"title" : cutNameLength("${content.contentName!assoc.contentIdTo}"), "attr": {"href": "javascript:void(0);", "onClick" : "callDocument('', '${assoc.contentIdTo}', '', '');"}},
- <#assign assocChilds = content.getRelated("FromContentAssoc")?if_exists/>
- "attr": {"id" : "${assoc.contentIdTo}", "contentId" : "${assoc.contentId}", "fromDate" : "${assoc.fromDate}"}
- <#if assocChilds?has_content>
- ,"children": [
- <@fillTree assocList = assocChilds/>
- ]
- </#if>
- <#if assoc_has_next>
- },
- <#else>
- }
- </#if>
- </#list>
- </#if>
- </#macro>
+ <@fillTreeError assocList = errors/>
</#if>
];
@@ -343,6 +346,11 @@ var rawdata_errors = [
if (contentId != null && contentId.length) {
ctx['contentId'] = contentId;
}
+ if (objstr) {
+ ctx['contentIdFrom'] = objstr.attr('contentid');
+ ctx['fromDate'] = objstr.attr('fromdate');
+ ctx['contentAssocTypeId'] = objstr.attr('contentassoctypeid');
+ }
}
//jQuerry Ajax Request
Modified: ofbiz/branches/jackrabbit20100709/applications/content/widget/WebSiteScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/widget/WebSiteScreens.xml?rev=1202159&r1=1202158&r2=1202159&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/content/widget/WebSiteScreens.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/content/widget/WebSiteScreens.xml Tue Nov 15 12:40:15 2011
@@ -219,12 +219,16 @@ under the License.
</entity-one>
<set field="parameters.fromDate" type="Timestamp" from-field="parameters.fromDate"/>
- <entity-one entity-name="ContentAssoc" value-field="assoc">
- <field-map field-name="contentId" from-field="parameters.contentIdFrom"/>
- <field-map field-name="contentIdTo" from-field="parameters.contentId"/>
- <field-map field-name="contentAssocTypeId" from-field="parameters.contentAssocTypeId"/>
- <field-map field-name="fromDate" from-field="parameters.fromDate"/>
- </entity-one>
+ <entity-condition list="assocs" entity-name="ContentAssoc">
+ <condition-list>
+ <condition-expr field-name="contentId" from-field="parameters.contentIdFrom"/>
+ <condition-expr field-name="contentIdTo" from-field="parameters.contentId"/>
+ <condition-expr field-name="fromDate" from-field="parameters.fromDate" ignore-if-empty="true"/>
+ <condition-expr field-name="contentAssocTypeId" from-field="parameters.contentAssocTypeId" ignore-if-empty="true"/>
+ </condition-list>
+ <order-by field-name="-fromDate"/>
+ </entity-condition>
+ <set field="assoc" value="${assocs[0]}"/>
<entity-and entity-name="ContentPurpose" list="currentPurposes">
<field-map field-name="contentId" from-field="contentId"/>
</entity-and>