You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2010/10/28 14:11:25 UTC
svn commit: r1028269 [1/4] - in /ofbiz/branches/jquery: ./
applications/accounting/config/ applications/accounting/data/
applications/accounting/src/org/ofbiz/accounting/tax/
applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/
applicati...
Author: jleroux
Date: Thu Oct 28 12:11:23 2010
New Revision: 1028269
URL: http://svn.apache.org/viewvc?rev=1028269&view=rev
Log:
Merges the trunk at r1028265
Added:
ofbiz/branches/jquery/themes/tomahawk/webapp/tomahawk/images/login_bkgd.jpg
- copied unchanged from r1028265, ofbiz/trunk/themes/tomahawk/webapp/tomahawk/images/login_bkgd.jpg
Removed:
ofbiz/branches/jquery/applications/product/webapp/facility/group/
Modified:
ofbiz/branches/jquery/ (props changed)
ofbiz/branches/jquery/applications/accounting/config/AccountingUiLabels.xml
ofbiz/branches/jquery/applications/accounting/data/AccountingTypeData.xml
ofbiz/branches/jquery/applications/accounting/data/DemoGeneralChartOfAccounts.xml
ofbiz/branches/jquery/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java
ofbiz/branches/jquery/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java
ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign
ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/BalanceSheet.rptdesign
ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/IncomeStatement.rptdesign
ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign
ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign
ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/TrialBalance.rptdesign
ofbiz/branches/jquery/applications/accounting/widget/AccountingMenus.xml
ofbiz/branches/jquery/applications/accounting/widget/FixedAssetForms.xml
ofbiz/branches/jquery/applications/accounting/widget/FixedAssetScreens.xml
ofbiz/branches/jquery/applications/accounting/widget/PaymentScreens.xml
ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/content/ContentWorker.java
ofbiz/branches/jquery/applications/content/widget/forum/BlogScreens.xml
ofbiz/branches/jquery/applications/marketing/widget/ContactListScreens.xml
ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml (props changed)
ofbiz/branches/jquery/applications/order/servicedef/services.xml
ofbiz/branches/jquery/applications/order/servicedef/services_request.xml
ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/order/OrderServices.java
ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java
ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java
ofbiz/branches/jquery/applications/party/config/PartyUiLabels.xml
ofbiz/branches/jquery/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml
ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy (props changed)
ofbiz/branches/jquery/applications/party/widget/partymgr/CommunicationEventForms.xml
ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml
ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml
ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml (props changed)
ofbiz/branches/jquery/applications/product/src/org/ofbiz/product/product/ProductContentWrapper.java
ofbiz/branches/jquery/applications/product/src/org/ofbiz/product/product/ProductPromoContentWrapper.java
ofbiz/branches/jquery/applications/product/webapp/facility/facility/FindFacilityLocation.ftl
ofbiz/branches/jquery/applications/product/webapp/facility/inventory/receiveInventory.ftl
ofbiz/branches/jquery/applications/product/widget/facility/FacilityGroupScreens.xml
ofbiz/branches/jquery/applications/product/widget/facility/FacilityMenus.xml
ofbiz/branches/jquery/applications/product/widget/facility/FacilityScreens.xml
ofbiz/branches/jquery/applications/product/widget/facility/InventoryItemLabelScreens.xml
ofbiz/branches/jquery/applications/product/widget/facility/ShipmentGatewayConfigScreens.xml
ofbiz/branches/jquery/applications/workeffort/config/WorkEffortUiLabels.xml
ofbiz/branches/jquery/applications/workeffort/servicedef/services.xml
ofbiz/branches/jquery/framework/common/config/CommonEntityLabels.xml
ofbiz/branches/jquery/framework/common/entitydef/entitymodel.xml
ofbiz/branches/jquery/framework/common/src/org/ofbiz/common/geo/GeoWorker.java
ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml (props changed)
ofbiz/branches/jquery/framework/entity/lib/jdbc/ (props changed)
ofbiz/branches/jquery/framework/example/config/ExampleEntityLabels.xml
ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
ofbiz/branches/jquery/specialpurpose/assetmaint/config/AssetMaintUiLabels.xml
ofbiz/branches/jquery/specialpurpose/ebaystore/lib/ (props changed)
ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy (props changed)
ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy (props changed)
ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy (props changed)
ofbiz/branches/jquery/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml
ofbiz/branches/jquery/themes/multiflex/includes/header.ftl
ofbiz/branches/jquery/themes/tomahawk/webapp/tomahawk/css/style.css
Propchange: ofbiz/branches/jquery/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 28 12:11:23 2010
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:951708-1024561
+/ofbiz/trunk:951708-1028265
Modified: ofbiz/branches/jquery/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/config/AccountingUiLabels.xml?rev=1028269&r1=1028268&r2=1028269&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/branches/jquery/applications/accounting/config/AccountingUiLabels.xml Thu Oct 28 12:11:23 2010
@@ -274,7 +274,7 @@
<value xml:lang="es">Editar Indents de Activo Fijo</value>
<value xml:lang="fr">Ajouter une identification d'immobilisation</value>
<value xml:lang="hi_IN">à¤
à¤à¤² सà¤à¤ªà¤¤à¥à¤¤à¤¿ à¤à¥ पहà¤à¤¾à¤¨ à¤à¥à¤¡à¤¼à¥à¤</value>
- <value xml:lang="it">Aggiorna Identità Cespite</value>
+ <value xml:lang="it">Nuova identificazione cespite</value>
<value xml:lang="nl">Voeg vaste activa-identificatie toe</value>
<value xml:lang="ro">Actualizeaza Identitate Mijloc Fix</value>
<value xml:lang="ru">РедакÑиÑование иденÑиÑикаÑоÑов ÐС</value>
@@ -286,7 +286,7 @@
<value xml:lang="en">Add Fixed Asset Maintenance Order</value>
<value xml:lang="fr">Ajouter une commande de maintenance d'immobilisation</value>
<value xml:lang="hi_IN">à¤
à¤à¤² सà¤à¤ªà¤¤à¥à¤¤à¤¿ रà¤à¤°à¤à¤¾à¤µ à¤à¥ à¤à¤¦à¥à¤¶ à¤à¥à¤¡à¤¼à¥à¤</value>
- <value xml:lang="it">Aggiorna Manutenzione Cespite Ordine</value>
+ <value xml:lang="it">Nuovo ordine di manutenzione cespite</value>
<value xml:lang="th">à¹à¸à¹à¹à¸à¸£à¸²à¸¢à¸à¸²à¸£à¸à¸³à¸£à¸¸à¸à¸£à¸±à¸à¸©à¸²à¸à¸£à¸±à¸à¸¢à¹à¸ªà¸´à¸à¹à¸¡à¹à¸«à¸¡à¸¸à¸à¹à¸§à¸µà¸¢à¸</value>
<value xml:lang="zh">æ·»å åºå®èµäº§ç»´ä¿®ä¿å
»è®¢å</value>
</property>
@@ -296,7 +296,7 @@
<value xml:lang="es">Editar Mantenimiento de Activo Fijo</value>
<value xml:lang="fr">Ajouter une maintenance d'immobilisation</value>
<value xml:lang="hi_IN">à¤
à¤à¤² सà¤à¤ªà¤¤à¥à¤¤à¤¿ रà¤à¤°à¤à¤¾à¤µ à¤à¥à¤¡à¤¼à¥à¤</value>
- <value xml:lang="it">Aggiorna Manutenzione Cespite</value>
+ <value xml:lang="it">Nuova manutenzione cespite</value>
<value xml:lang="nl">Voeg onderhoud vaste activa toe</value>
<value xml:lang="ro">Actualizeaza Intretinere Mijloc Fix</value>
<value xml:lang="ru">ÐзмениÑÑ Ð¾Ð±ÑлÑживание ÐС</value>
@@ -308,7 +308,7 @@
<value xml:lang="en">Add Fixed Asset Meter Reading</value>
<value xml:lang="fr">Ajouter une mesure de la maintenance d'immobilisation</value>
<value xml:lang="hi_IN">à¤
à¤à¤² सà¤à¤ªà¤¤à¥à¤¤à¤¿ मापठरà¥à¤¡à¤¿à¤à¤ à¤à¥à¤¡à¤¼à¥à¤</value>
- <value xml:lang="it">Aggiorna Manutenzione Cespite Contatori</value>
+ <value xml:lang="it">Nuova misura contatori cespite</value>
<value xml:lang="nl">Voeg meterwaarde vaste activa toe</value>
<value xml:lang="th">Add Fixed Asset Maintenance Meter</value>
<value xml:lang="zh">æ·»å åºå®èµäº§ä»ªè¡¨è¯»æ°</value>
@@ -318,7 +318,7 @@
<value xml:lang="en">Add Party Fixed Asset Assignment</value>
<value xml:lang="fr">Ajouter une tâche d'un acteur à une immobilisation</value>
<value xml:lang="hi_IN">à¤
à¤à¤² सà¤à¤ªà¤¤à¥à¤¤à¤¿ मà¥à¤ नियत à¤à¤¾à¤°à¥à¤¯ à¤à¤°à¤¨à¥ à¤à¥ लिठपारà¥à¤à¥ à¤à¥à¤¡à¤¼à¥à¤</value>
- <value xml:lang="it">Aggiorna Assegnamenti Cespiti Soggetto</value>
+ <value xml:lang="it">Nuova assegnazione cespite a soggetto</value>
<value xml:lang="th">à¹à¸à¹à¹à¸à¸à¸¥à¸¸à¹à¸¡à¸à¸£à¸±à¸à¸¢à¹à¸ªà¸´à¸à¹à¸¡à¹à¸«à¸¡à¸¸à¸à¹à¸§à¸µà¸¢à¸</value>
<value xml:lang="zh">æ·»å ä¼ååºå®èµäº§åé
</value>
</property>
@@ -328,7 +328,7 @@
<value xml:lang="es">Editar Registros de Activo Fijo</value>
<value xml:lang="fr">Ajouter l'enregistrement d'immobilisation</value>
<value xml:lang="hi_IN">à¤
à¤à¤² सà¤à¤ªà¤¤à¥à¤¤à¤¿ à¤à¥ लिठपà¤à¤à¥à¤¯à¤¨ à¤à¥à¤¡à¤¼à¥à¤</value>
- <value xml:lang="it">Aggiorna Registrazioni Cespite</value>
+ <value xml:lang="it">Nuova registrazione cespite</value>
<value xml:lang="ro">Actualizeaza Inregistrare Mijloc Fix</value>
<value xml:lang="ru">ÐзмениÑÑ ÑегиÑÑÑаÑий ÐС</value>
<value xml:lang="th">à¹à¸à¹à¹à¸à¸à¸²à¸£à¸¥à¸à¸à¸°à¹à¸à¸µà¸¢à¸à¸à¸£à¸±à¸à¸¢à¹à¸ªà¸´à¸à¹à¸¡à¹à¸«à¸¡à¸¸à¸à¹à¸§à¸µà¸¢à¸</value>
@@ -340,7 +340,7 @@
<value xml:lang="es">Editar Costo Estandar de Activo Fijo</value>
<value xml:lang="fr">Ajouter un coût standard d'immobilisation</value>
<value xml:lang="hi_IN">à¤
à¤à¤² सà¤à¤ªà¤¤à¥à¤¤à¤¿ à¤à¥ लिठमानठलाà¤à¤¤</value>
- <value xml:lang="it">Aggiorna Costi Standard Cespiti</value>
+ <value xml:lang="it">Nuovo costo standard del cespite</value>
<value xml:lang="nl">Aanpassen vaste kosten vaste activa</value>
<value xml:lang="ro">Actualizeaza Costuri Standard Mijloace Fixe</value>
<value xml:lang="ru">ÐзмениÑÑ ÑÑанд. ÑÑоимоÑÑÑ ÐС</value>
@@ -1967,12 +1967,14 @@
<value xml:lang="en">Commission Run</value>
<value xml:lang="fr">Traitement Commission</value>
<value xml:lang="hi_IN">दलालॠà¤à¥à¤à¤¤à¤¾à¤¨</value>
+ <value xml:lang="it">Commissioni correnti</value>
</property>
<property key="AccountingCommissionReport">
<value xml:lang="de">Provisionsbericht</value>
<value xml:lang="en">Commission Report</value>
<value xml:lang="fr">Journal Commission</value>
<value xml:lang="hi_IN">दलालॠविवरण</value>
+ <value xml:lang="it">Report commissioni</value>
</property>
<property key="AccountingCompanies">
<value xml:lang="ar">شرÙات</value>
@@ -2350,7 +2352,7 @@
<value xml:lang="en">Create New Invoice</value>
<value xml:lang="fr">Créer une nouvelle facture</value>
<value xml:lang="hi_IN">नया à¤à¤²à¤¾à¤¨à¤¾ बनाà¤à¤</value>
- <value xml:lang="it">Creare nuova fattura</value>
+ <value xml:lang="it">Nuova fattura</value>
<value xml:lang="nl">Maak nieuwe factuur</value>
<value xml:lang="th">สรà¹à¸²à¸à¹à¸à¸à¸³à¸à¸±à¸à¸ªà¸´à¸à¸à¹à¸²à¹à¸«à¸¡à¹</value>
<value xml:lang="zh">æ°å»ºå票</value>
@@ -3511,6 +3513,7 @@
<property key="AccountingFindSalesInvoicesForCommissionRun">
<value xml:lang="en">Find Sales Invoices For Commission Run</value>
<value xml:lang="hi_IN">दलालॠà¤à¥à¤à¤¤à¤¾à¤¨ à¤à¥ लिठबिà¤à¥à¤°à¥ à¤à¤¾à¤²à¤¾à¤¨ à¤à¥à¤à¥à¤</value>
+ <value xml:lang="it">Ricerca fatture di vendita per commissione</value>
</property>
<property key="AccountingFirstNameCard">
<value xml:lang="ar">اÙإسÙ
عÙ٠اÙبطاÙØ©</value>
@@ -4156,7 +4159,7 @@
<value xml:lang="es">Vincular nuevo producto a activo fijo</value>
<value xml:lang="fr">Relier le nouveau produit à l'immobilisation</value>
<value xml:lang="hi_IN">à¤
à¤à¤² सà¤à¤ªà¤¤à¥à¤¤à¤¿ à¤à¥ लिठनठà¤à¤¤à¥à¤ªà¤¾à¤¦ à¤à¥ लिà¤à¤ à¤à¥à¤¡à¤¼à¥à¤</value>
- <value xml:lang="it">Link Nuovo prodotto per Cespite</value>
+ <value xml:lang="it">Associa nuovo prodotto al cespite</value>
<value xml:lang="nl">Verbind nieuw product aan vaste activa</value>
<value xml:lang="ro">Link Noul produs - Mijloc Fix</value>
<value xml:lang="ru">СвÑзаÑÑ Ð½Ð¾Ð²Ñй пÑодÑÐºÑ Ñ ÐС</value>
@@ -4170,7 +4173,7 @@
<value xml:lang="es">Tipo de producto de activo fijo</value>
<value xml:lang="fr">Type de produit lié à l'immobilisation</value>
<value xml:lang="hi_IN">à¤
à¤à¤² सà¤à¤ªà¤¤à¥à¤¤à¤¿ à¤à¥ à¤à¤¤à¥à¤ªà¤¾à¤¦ à¤à¤¾ पà¥à¤°à¤à¤¾à¤°</value>
- <value xml:lang="it">Tipo Prodotto Cespite</value>
+ <value xml:lang="it">Tipo di prodotto associato al cespite</value>
<value xml:lang="nl">Produkttype Vaste activa </value>
<value xml:lang="ro">Tip Produs Mijloc Fix</value>
<value xml:lang="ru">Тип пÑодÑкÑа ÐС</value>
@@ -4197,7 +4200,7 @@
<value xml:lang="es">Actualizar un enlace a un activo fijo</value>
<value xml:lang="fr">Mettre à jour un lien vers une immobilisation</value>
<value xml:lang="hi_IN">à¤
à¤à¤² सà¤à¤ªà¤¤à¥à¤¤à¤¿ à¤à¥ लिठलिà¤à¤ à¤à¤¨à¥à¤¨à¤¤ à¤à¤°à¥</value>
- <value xml:lang="it">Aggiorna un link ad un Cespite</value>
+ <value xml:lang="it">Aggiorna una associazione al cespite</value>
<value xml:lang="ro">Actualizeaza un link la un Mijloc Fix</value>
<value xml:lang="ru">ÐбновиÑÑ ÑÑÑÐ»ÐºÑ Ðº ÐС</value>
<value xml:lang="th">à¸à¸±à¸à¹à¸à¸à¸à¸²à¸£à¹à¸à¸·à¹à¸à¸¡à¸à¹à¸à¹à¸à¸¢à¸±à¸à¸à¸£à¸±à¸à¸¢à¹à¸ªà¸´à¸à¹à¸¡à¹à¸«à¸¡à¸¸à¸à¹à¸§à¸µà¸¢à¸</value>
@@ -4224,7 +4227,7 @@
<value xml:lang="es">Número de Registro</value>
<value xml:lang="fr">Numéro d'enregistrement</value>
<value xml:lang="hi_IN">पà¤à¤à¥à¤à¤°à¤£ सà¤à¤à¥à¤¯à¤¾</value>
- <value xml:lang="it">Numero Registrazione</value>
+ <value xml:lang="it">Numero di registrazione</value>
<value xml:lang="nl">Registratienummer</value>
<value xml:lang="ro">Nr.Inreg</value>
<value xml:lang="ru">РегиÑÑÑаÑионнÑй номеÑ</value>
@@ -10774,7 +10777,7 @@
<value xml:lang="es">Código Activo fijo</value>
<value xml:lang="fr">Réf. immobilisation</value>
<value xml:lang="hi_IN">à¤
à¤à¤² सà¤à¤ªà¤¤à¥à¤¤à¤¿ à¤à¥à¤°à¤®à¤¾à¤à¤</value>
- <value xml:lang="it">Codice Cespite</value>
+ <value xml:lang="it">Codice cespite</value>
<value xml:lang="nl">Vast gestelde waarde Id</value>
<value xml:lang="ro">Cod Mijloc Fix</value>
<value xml:lang="ru">Ðод оÑновнÑÑ
Ñондов</value>
@@ -10788,7 +10791,7 @@
<value xml:lang="es">Nombre de activo fijo</value>
<value xml:lang="fr">Nom de l'immobilisation</value>
<value xml:lang="hi_IN">à¤
à¤à¤² सà¤à¤ªà¤¤à¥à¤¤à¤¿ नाम</value>
- <value xml:lang="it">Nome Cespite</value>
+ <value xml:lang="it">Nome cespite</value>
<value xml:lang="nl">Naam vaste activa</value>
<value xml:lang="ro">Nume Mijloc Fix</value>
<value xml:lang="ru">Ðазвание ÐС</value>
@@ -13122,7 +13125,7 @@
<value xml:lang="es">Editar Mantenimiento de Activo Fijo</value>
<value xml:lang="fr">Modifier la maintenance de l'immobilisation</value>
<value xml:lang="hi_IN">à¤
à¤à¤² सà¤à¤ªà¤¤à¥à¤¤à¤¿ रà¤à¤°à¤à¤¾à¤µ सà¤à¤ªà¤¾à¤¦à¤¿à¤¤ à¤à¤°à¥à¤</value>
- <value xml:lang="it">Aggiorna Manutenzione Cespite</value>
+ <value xml:lang="it">Aggiorna manutenzione cespite</value>
<value xml:lang="nl">Onderhoud vaste activa aanpassen</value>
<value xml:lang="ro">Actualizeaza Intretinere Mijloc Fix</value>
<value xml:lang="ru">ÐзмениÑÑ Ð¾Ð±ÑлÑживание ÐС</value>
@@ -13133,7 +13136,7 @@
<value xml:lang="en">Fixed Asset Meter Readings</value>
<value xml:lang="fr">Lectures de compteur d'immobilisation</value>
<value xml:lang="hi_IN">à¤
à¤à¤² सà¤à¤ªà¤¤à¥à¤¤à¤¿ मापठपठन(MeterReadings) सà¤à¤ªà¤¾à¤¦à¤¿à¤¤ à¤à¤°à¥à¤</value>
- <value xml:lang="it">Aggiorna Manutenzione Cespite Contatori</value>
+ <value xml:lang="it">Letture dei contatori cespite</value>
<value xml:lang="nl">Meterwaarden vaste activa</value>
<value xml:lang="th">Edit Fixed Asset Maint Meters</value>
<value xml:lang="zh">åºå®èµäº§ä»ªè¡¨è¯»æ°</value>
@@ -13683,7 +13686,7 @@
<value xml:lang="es">Activo Fijo Hijo</value>
<value xml:lang="fr">Descendants de l'immobilisation</value>
<value xml:lang="hi_IN">à¤
à¤à¤² सà¤à¤ªà¤¤à¥à¤¤à¤¿ à¤à¤¿à¤²à¥à¤¡à¥à¤°à¥à¤¨</value>
- <value xml:lang="it">Figli Cespiti</value>
+ <value xml:lang="it">Cespiti figli</value>
<value xml:lang="nl">Kinderen vaste activa</value>
<value xml:lang="ro">Copii Mijloace Fixe</value>
<value xml:lang="ru">ÐодÑиненнÑе ÐС</value>
Modified: ofbiz/branches/jquery/applications/accounting/data/AccountingTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/data/AccountingTypeData.xml?rev=1028269&r1=1028268&r2=1028269&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/accounting/data/AccountingTypeData.xml (original)
+++ ofbiz/branches/jquery/applications/accounting/data/AccountingTypeData.xml Thu Oct 28 12:11:23 2010
@@ -283,6 +283,7 @@ under the License.
<GlAccountClass description="Return of Capital" glAccountClassId="RETURN_OF_CAPITAL" parentClassId="DISTRIBUTION"/>
<GlAccountClass description="Dividends" glAccountClassId="DIVIDEND" parentClassId="DISTRIBUTION"/>
<GlAccountClass description="Revenue" glAccountClassId="REVENUE" parentClassId="CREDIT"/>
+ <GlAccountClass description="Contra Revenue" glAccountClassId="CONTRA_REVENUE" parentClassId="DEBIT"/>
<GlAccountClass description="Income" glAccountClassId="INCOME" parentClassId="CREDIT"/>
<GlAccountClass description="Cash Income" glAccountClassId="CASH_INCOME" parentClassId="INCOME"/>
<GlAccountClass description="Non-Cash Income" glAccountClassId="NON_CASH_INCOME" parentClassId="INCOME"/>
Modified: ofbiz/branches/jquery/applications/accounting/data/DemoGeneralChartOfAccounts.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/data/DemoGeneralChartOfAccounts.xml?rev=1028269&r1=1028268&r2=1028269&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/accounting/data/DemoGeneralChartOfAccounts.xml (original)
+++ ofbiz/branches/jquery/applications/accounting/data/DemoGeneralChartOfAccounts.xml Thu Oct 28 12:11:23 2010
@@ -724,19 +724,19 @@ according to which type of entity.
accountName="DISCOUNTS ON SALES" description="" postedBalance="0.0"/>
<GlAccount parentGlAccountId="400000" glAccountId="420000" accountCode="420000"
- glAccountClassId="REVENUE" glAccountTypeId="" glResourceTypeId="MONEY"
+ glAccountClassId="CONTRA_REVENUE" glAccountTypeId="" glResourceTypeId="MONEY"
accountName="CUSTOMER RETURNS" description="" postedBalance="0.0"/>
<GlAccount parentGlAccountId="420000" glAccountId="421000" accountCode="421000"
- glAccountClassId="REVENUE" glAccountTypeId="" glResourceTypeId="MONEY"
+ glAccountClassId="CONTRA_REVENUE" glAccountTypeId="" glResourceTypeId="MONEY"
accountName="CUSTOMER RETURNS - PRODUCTS" description="" postedBalance="0.0"/>
<GlAccount parentGlAccountId="420000" glAccountId="422000" accountCode="422000"
- glAccountClassId="REVENUE" glAccountTypeId="" glResourceTypeId="MONEY"
+ glAccountClassId="CONTRA_REVENUE" glAccountTypeId="" glResourceTypeId="MONEY"
accountName="CUSTOMER RETURNS - PROMOTIONS" description="" postedBalance="0.0"/>
<GlAccount parentGlAccountId="420000" glAccountId="423000" accountCode="423000"
- glAccountClassId="REVENUE" glAccountTypeId="" glResourceTypeId="MONEY"
+ glAccountClassId="CONTRA_REVENUE" glAccountTypeId="" glResourceTypeId="MONEY"
accountName="CUSTOMER RETURNS - ADJUSTMENTS" description="" postedBalance="0.0"/>
<GlAccount parentGlAccountId="420000" glAccountId="424000" accountCode="424000"
- glAccountClassId="REVENUE" glAccountTypeId="" glResourceTypeId="MONEY"
+ glAccountClassId="CONTRA_REVENUE" glAccountTypeId="" glResourceTypeId="MONEY"
accountName="CUSTOMER RETURNS - WORK OR TIME ENTRY" description="" postedBalance="0.0"/>
<!-- COST OF GOODS SOLD -->
Modified: ofbiz/branches/jquery/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java?rev=1028269&r1=1028268&r2=1028269&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java (original)
+++ ofbiz/branches/jquery/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java Thu Oct 28 12:11:23 2010
@@ -27,6 +27,7 @@ import java.util.Map;
import java.util.Set;
import javolution.util.FastList;
+import javolution.util.FastMap;
import javolution.util.FastSet;
import org.ofbiz.base.util.Debug;
@@ -181,7 +182,12 @@ public class TaxAuthorityServices {
}
}
if (shippingAddress == null || (shippingAddress.get("countryGeoId") == null && shippingAddress.get("stateProvinceGeoId") == null && shippingAddress.get("postalCodeGeoId") == null)) {
- return ServiceUtil.returnError("The address(es) used for tax calculation did not have State/Province or Country or other tax jurisdiction values set, so we cannot determine the taxes to charge.");
+ String errMsg = "The address(es) used for tax calculation did not have State/Province or Country or other tax jurisdiction values set, so we cannot determine the taxes to charge.";
+ if (shippingAddress != null) {
+ errMsg += " [ID:" + shippingAddress.getString("contactMechId") + ", Address 1: " + shippingAddress.get("address1") + ", Postal Code/ID: " + shippingAddress.get("postalCodeGeoId") + "/" + shippingAddress.get("postalCodeGeoId") + ", State/Province: " + shippingAddress.get("stateProvinceGeoId") + ", Country: " + shippingAddress.get("countryGeoId") + "]";
+ Debug.logError(errMsg, module);
+ }
+ return ServiceUtil.returnError(errMsg);
}
// without knowing the TaxAuthority parties, just find all TaxAuthories for the set of IDs...
@@ -228,31 +234,31 @@ public class TaxAuthorityServices {
}
private static void getTaxAuthorities(Delegator delegator, GenericValue shippingAddress, Set taxAuthoritySet) throws GenericEntityException {
- Set geoIdSet = FastSet.newInstance();
+ Map geoIdByTypeMap = FastMap.newInstance();
if (shippingAddress != null) {
if (UtilValidate.isNotEmpty(shippingAddress.getString("countryGeoId"))) {
- geoIdSet.add(shippingAddress.getString("countryGeoId"));
+ geoIdByTypeMap.put("COUNTRY", shippingAddress.getString("countryGeoId"));
}
if (UtilValidate.isNotEmpty(shippingAddress.getString("stateProvinceGeoId"))) {
- geoIdSet.add(shippingAddress.getString("stateProvinceGeoId"));
+ geoIdByTypeMap.put("STATE", shippingAddress.getString("stateProvinceGeoId"));
}
if (UtilValidate.isNotEmpty(shippingAddress.getString("countyGeoId"))) {
- geoIdSet.add(shippingAddress.getString("countyGeoId"));
+ geoIdByTypeMap.put("COUNTY", shippingAddress.getString("countyGeoId"));
}
String postalCodeGeoId = ContactMechWorker.getPostalAddressPostalCodeGeoId(shippingAddress, delegator);
if (UtilValidate.isNotEmpty(postalCodeGeoId)) {
- geoIdSet.add(postalCodeGeoId);
+ geoIdByTypeMap.put("POSTAL_CODE", postalCodeGeoId);
}
} else {
Debug.logWarning("shippingAddress was null, adding nothing to taxAuthoritySet", module);
}
- //Debug.logInfo("Tax calc geoIdSet before expand:" + geoIdSet + "; this is for shippingAddress=" + shippingAddress, module);
+ //Debug.logInfo("Tax calc geoIdByTypeMap before expand:" + geoIdByTypeMap + "; this is for shippingAddress=" + shippingAddress, module);
// get the most granular, or all available, geoIds and then find parents by GeoAssoc with geoAssocTypeId="REGIONS" and geoIdTo=<granular geoId> and find the GeoAssoc.geoId
- geoIdSet = GeoWorker.expandGeoRegionDeep(geoIdSet, delegator);
- //Debug.logInfo("Tax calc geoIdSet after expand:" + geoIdSet, module);
+ geoIdByTypeMap = GeoWorker.expandGeoRegionDeep(geoIdByTypeMap, delegator);
+ //Debug.logInfo("Tax calc geoIdByTypeMap after expand:" + geoIdByTypeMap, module);
- List taxAuthorityRawList = delegator.findList("TaxAuthority", EntityCondition.makeCondition("taxAuthGeoId", EntityOperator.IN, geoIdSet), null, null, null, true);
+ List taxAuthorityRawList = delegator.findList("TaxAuthority", EntityCondition.makeCondition("taxAuthGeoId", EntityOperator.IN, geoIdByTypeMap.values()), null, null, null, true);
taxAuthoritySet.addAll(taxAuthorityRawList);
//Debug.logInfo("Tax calc taxAuthoritySet after expand:" + taxAuthoritySet, module);
}
Modified: ofbiz/branches/jquery/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java?rev=1028269&r1=1028268&r2=1028269&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java (original)
+++ ofbiz/branches/jquery/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java Thu Oct 28 12:11:23 2010
@@ -1020,6 +1020,7 @@ public class PayPalServices {
conditionList.add(EntityCondition.makeCondition("geoTypeId", geoTypeId));
lookupField = "geoCode";
}
+ conditionList.add(EntityCondition.makeCondition("geoIdFrom", countryGeoId));
conditionList.add(EntityCondition.makeCondition(lookupField, payPalShipToState));
EntityCondition cond = EntityCondition.makeCondition(conditionList);
GenericValue geoAssocAndGeoTo = null;
Modified: ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign?rev=1028269&r1=1028268&r2=1028269&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign (original)
+++ ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign Thu Oct 28 12:11:23 2010
@@ -13,6 +13,11 @@ module = "AcctgTransEntriesSearchResults
organizationPartyId = params["organizationPartyId"].value;
userLoginId = params["userLoginId"].value;
+organizationPartyGroup = delegator.findOne("PartyGroup", UtilMisc.toMap("partyId", organizationPartyId), false);
+
+// set logo image url
+logoImageUrl = organizationPartyGroup.getString("logoImageUrl");
+
dateFormatter = new java.text.SimpleDateFormat("dd MMMMM yyyy");
// prepare uiLabelMap
@@ -925,19 +930,8 @@ return true;
<image id="28">
<property name="height">43px</property>
<property name="width">238px</property>
- <method name="onCreate"><![CDATA[// get organization logo
-partyContents = delegator.findByAnd("PartyContent", UtilMisc.toMap("partyId", organizationPartyId, "partyContentTypeId", "LGOIMGURL"));
-partyContents = EntityUtil.filterByDate(partyContents);
-if (partyContents != null && partyContents.size() > 0) {
- var dataResource = partyContents.get(0).getRelatedOne("Content").getRelatedOne("DataResource");
- var dataResourceTypeId = dataResource.getString("dataResourceTypeId");
- if ("LOCAL_FILE".equals(dataResourceTypeId)) {
- this.file = dataResource.get("objectInfo");
- } else {
- this.URL = dataResource.get("objectInfo");
- }
-} else {
- this.URL = "http://localhost:8080/images/ofbiz_logo.gif";
+ <method name="onCreate"><![CDATA[if (logoImageUrl) {
+ this.URL = logoImageUrl;
}]]></method>
<property name="source">url</property>
<property name="fitToContainer">false</property>
Modified: ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/BalanceSheet.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/BalanceSheet.rptdesign?rev=1028269&r1=1028268&r2=1028269&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/BalanceSheet.rptdesign (original)
+++ ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/BalanceSheet.rptdesign Thu Oct 28 12:11:23 2010
@@ -21,9 +21,13 @@ glFiscalTypeId = null;
// prepare parameters
organizationPartyId = params["organizationPartyId"].value;
+organizationPartyGroup = delegator.findOne("PartyGroup", UtilMisc.toMap("partyId", organizationPartyId), false);
userLogin = delegator.findOne("UserLogin", UtilMisc.toMap("userLoginId", params["userLoginId"].value), false);
partyNameView = delegator.findOne("PartyNameView", UtilMisc.toMap("partyId", userLogin.getString("partyId")), false);
+// set logo image url
+logoImageUrl = organizationPartyGroup.getString("logoImageUrl");
+
fromDate = null;
if (params["fromDate"].value) {
fromDate = params["fromDate"].value;
@@ -481,19 +485,8 @@ return true;]]></method>
<image id="28">
<property name="height">43px</property>
<property name="width">238px</property>
- <method name="onCreate"><![CDATA[// get organization logo
-partyContents = delegator.findByAnd("PartyContent", UtilMisc.toMap("partyId", organizationPartyId, "partyContentTypeId", "LGOIMGURL"));
-partyContents = EntityUtil.filterByDate(partyContents);
-if (partyContents != null && partyContents.size() > 0) {
- var dataResource = partyContents.get(0).getRelatedOne("Content").getRelatedOne("DataResource");
- var dataResourceTypeId = dataResource.getString("dataResourceTypeId");
- if ("LOCAL_FILE".equals(dataResourceTypeId)) {
- this.file = dataResource.get("objectInfo");
- } else {
- this.URL = dataResource.get("objectInfo");
- }
-} else {
- this.URL = "http://localhost:8080/images/ofbiz_logo.gif";
+ <method name="onCreate"><![CDATA[if (logoImageUrl) {
+ this.URL = logoImageUrl;
}]]></method>
<property name="source">url</property>
<property name="fitToContainer">false</property>
Modified: ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/IncomeStatement.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/IncomeStatement.rptdesign?rev=1028269&r1=1028268&r2=1028269&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/IncomeStatement.rptdesign (original)
+++ ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/IncomeStatement.rptdesign Thu Oct 28 12:11:23 2010
@@ -21,9 +21,13 @@ glFiscalTypeId = null;
// prepare parameters
organizationPartyId = params["organizationPartyId"].value;
+organizationPartyGroup = delegator.findOne("PartyGroup", UtilMisc.toMap("partyId", organizationPartyId), false);
userLogin = delegator.findOne("UserLogin", UtilMisc.toMap("userLoginId", params["userLoginId"].value), false);
partyNameView = delegator.findOne("PartyNameView", UtilMisc.toMap("partyId", userLogin.getString("partyId")), false);
+// set logo image url
+logoImageUrl = organizationPartyGroup.getString("logoImageUrl");
+
fromDate = null;
if (params["fromDate"].value) {
fromDate = params["fromDate"].value;
@@ -432,19 +436,8 @@ return true;]]></method>
<image id="28">
<property name="height">43px</property>
<property name="width">238px</property>
- <method name="onCreate"><![CDATA[// get organization logo
-partyContents = delegator.findByAnd("PartyContent", UtilMisc.toMap("partyId", organizationPartyId, "partyContentTypeId", "LGOIMGURL"));
-partyContents = EntityUtil.filterByDate(partyContents);
-if (partyContents != null && partyContents.size() > 0) {
- var dataResource = partyContents.get(0).getRelatedOne("Content").getRelatedOne("DataResource");
- var dataResourceTypeId = dataResource.getString("dataResourceTypeId");
- if ("LOCAL_FILE".equals(dataResourceTypeId)) {
- this.file = dataResource.get("objectInfo");
- } else {
- this.URL = dataResource.get("objectInfo");
- }
-} else {
- this.URL = "http://localhost:8080/images/ofbiz_logo.gif";
+ <method name="onCreate"><![CDATA[if (logoImageUrl) {
+ this.URL = logoImageUrl;
}]]></method>
<property name="source">url</property>
<property name="fitToContainer">false</property>
Modified: ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign?rev=1028269&r1=1028268&r2=1028269&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign (original)
+++ ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign Thu Oct 28 12:11:23 2010
@@ -17,6 +17,10 @@ uiLabelMap.putAll(UtilProperties.getReso
invoiceId = params["invoiceId"].value;
userLoginId = params["userLoginId"].value;
+parameters = FastMap.newInstance();
+parameters.put("invoiceId", invoiceId);
+parameters.put("userLoginId", userLoginId);
+
userLogin = delegator.findOne("UserLogin", UtilMisc.toMap("userLoginId", userLoginId), false);
userLoginNameView = delegator.findOne("PartyNameView", UtilMisc.toMap("partyId", userLogin.get("partyId")), false);
dateFormatter = new java.text.SimpleDateFormat("dd MMMMM yyyy");
@@ -30,6 +34,16 @@ if ("PURCHASE_INVOICE".equals(invoice.ge
organizationPartyId = invoice.get("partyIdFrom");
}
+// get company header
+var companyLogoCtx = FastMap.newInstance();
+companyLogoCtx.put("invoice", invoice);
+companyLogoCtx.put("nowTimestamp", UtilDateTime.nowTimestamp());
+companyLogoCtx.put("locale", reportContext.getLocale());
+companyLogoCtx.put("parameters", parameters);
+companyLogoCtx.put("delegator", delegator);
+GroovyUtil.runScriptAtLocation("component://order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy", companyLogoCtx);
+logoImageUrl = companyLogoCtx.get("logoImageUrl");
+
// create application list
var context = FastMap.newInstance();
context.put("invoice", invoice);
@@ -584,19 +598,8 @@ return true;]]></method>
<image id="28">
<property name="height">43px</property>
<property name="width">238px</property>
- <method name="onCreate"><![CDATA[// get organization logo
-partyContents = delegator.findByAnd("PartyContent", UtilMisc.toMap("partyId", organizationPartyId, "partyContentTypeId", "LGOIMGURL"));
-partyContents = EntityUtil.filterByDate(partyContents);
-if (partyContents != null && partyContents.size() > 0) {
- var dataResource = partyContents.get(0).getRelatedOne("Content").getRelatedOne("DataResource");
- var dataResourceTypeId = dataResource.getString("dataResourceTypeId");
- if ("LOCAL_FILE".equals(dataResourceTypeId)) {
- this.file = dataResource.get("objectInfo");
- } else {
- this.URL = dataResource.get("objectInfo");
- }
-} else {
- this.URL = "http://localhost:8080/images/ofbiz_logo.gif";
+ <method name="onCreate"><![CDATA[if (logoImageUrl) {
+ this.URL = logoImageUrl;
}]]></method>
<property name="source">url</property>
<property name="fitToContainer">false</property>
Modified: ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign?rev=1028269&r1=1028268&r2=1028269&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign (original)
+++ ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign Thu Oct 28 12:11:23 2010
@@ -29,6 +29,10 @@ if ("DISBURSEMENT".equals(payment.get("p
} else {
organizationPartyId = payment.get("partyIdTo");
}
+organizationPartyGroup = delegator.findOne("PartyGroup", UtilMisc.toMap("partyId", organizationPartyId), false);
+
+// set logo image url
+logoImageUrl = organizationPartyGroup.getString("logoImageUrl");
// create debit/credit total variable
debitTotal = 0;
@@ -571,19 +575,8 @@ return true;]]></method>
<image id="28">
<property name="height">43px</property>
<property name="width">238px</property>
- <method name="onCreate"><![CDATA[// get organization logo
-partyContents = delegator.findByAnd("PartyContent", UtilMisc.toMap("partyId", organizationPartyId, "partyContentTypeId", "LGOIMGURL"));
-partyContents = EntityUtil.filterByDate(partyContents);
-if (partyContents != null && partyContents.size() > 0) {
- var dataResource = partyContents.get(0).getRelatedOne("Content").getRelatedOne("DataResource");
- var dataResourceTypeId = dataResource.getString("dataResourceTypeId");
- if ("LOCAL_FILE".equals(dataResourceTypeId)) {
- this.file = dataResource.get("objectInfo");
- } else {
- this.URL = dataResource.get("objectInfo");
- }
-} else {
- this.URL = "http://localhost:8080/images/ofbiz_logo.gif";
+ <method name="onCreate"><![CDATA[if (logoImageUrl) {
+ this.URL = logoImageUrl;
}]]></method>
<property name="source">url</property>
<property name="fitToContainer">false</property>
Modified: ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/TrialBalance.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/TrialBalance.rptdesign?rev=1028269&r1=1028268&r2=1028269&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/TrialBalance.rptdesign (original)
+++ ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/TrialBalance.rptdesign Thu Oct 28 12:11:23 2010
@@ -18,11 +18,15 @@ dateFormatter = new java.text.SimpleDate
// prepare parameters
organizationPartyId = params["organizationPartyId"].value;
+organizationPartyGroup = delegator.findOne("PartyGroup", UtilMisc.toMap("partyId", organizationPartyId), false);
userLogin = delegator.findOne("UserLogin", UtilMisc.toMap("userLoginId", params["userLoginId"].value), false);
partyNameView = delegator.findOne("PartyNameView", UtilMisc.toMap("partyId", userLogin.getString("partyId")), false);
customTimePeriodId = params["customTimePeriodId"].value;
customerTimePeriod = delegator.findOne("CustomTimePeriod", UtilMisc.toMap("customTimePeriodId", customTimePeriodId), false);
+// set logo image url
+logoImageUrl = organizationPartyGroup.getString("logoImageUrl");
+
// prepare parties list
partyIds = org.ofbiz.party.party.PartyWorker.getAssociatedPartyIdsByRelationshipType(delegator, organizationPartyId, "GROUP_ROLLUP");
parties = FastList.newInstance();
@@ -294,19 +298,8 @@ return true;]]></method>
<image id="28">
<property name="height">43px</property>
<property name="width">238px</property>
- <method name="onCreate"><![CDATA[// get organization logo
-partyContents = delegator.findByAnd("PartyContent", UtilMisc.toMap("partyId", organizationPartyId, "partyContentTypeId", "LGOIMGURL"));
-partyContents = EntityUtil.filterByDate(partyContents);
-if (partyContents != null && partyContents.size() > 0) {
- var dataResource = partyContents.get(0).getRelatedOne("Content").getRelatedOne("DataResource");
- var dataResourceTypeId = dataResource.getString("dataResourceTypeId");
- if ("LOCAL_FILE".equals(dataResourceTypeId)) {
- this.file = dataResource.get("objectInfo");
- } else {
- this.URL = dataResource.get("objectInfo");
- }
-} else {
- this.URL = "http://localhost:8080/images/ofbiz_logo.gif";
+ <method name="onCreate"><![CDATA[if (logoImageUrl) {
+ this.URL = logoImageUrl;
}]]></method>
<property name="source">url</property>
<property name="fitToContainer">false</property>
Modified: ofbiz/branches/jquery/applications/accounting/widget/AccountingMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/widget/AccountingMenus.xml?rev=1028269&r1=1028268&r2=1028269&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/accounting/widget/AccountingMenus.xml (original)
+++ ofbiz/branches/jquery/applications/accounting/widget/AccountingMenus.xml Thu Oct 28 12:11:23 2010
@@ -152,7 +152,7 @@ under the License.
</menu>
<menu name="InvoiceSubTabBar" menu-container-style="button-bar button-style-2" default-selected-style="selected">
- <menu-item name="createNew" title="${uiLabelMap.CommonCreateNew}" widget-style="buttontext create">
+ <menu-item name="createNew" title="${uiLabelMap.AccountingCreateNewInvoice}" widget-style="buttontext create">
<link target="newInvoice"/>
</menu-item>
<menu-item name="copyInvoice" title="${uiLabelMap.CommonCopy}">
Modified: ofbiz/branches/jquery/applications/accounting/widget/FixedAssetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/widget/FixedAssetForms.xml?rev=1028269&r1=1028268&r2=1028269&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/accounting/widget/FixedAssetForms.xml (original)
+++ ofbiz/branches/jquery/applications/accounting/widget/FixedAssetForms.xml Thu Oct 28 12:11:23 2010
@@ -27,6 +27,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" value="FixedAsset"/>
+ <field-map field-name="orderBy" from-field="parameters.sortField"/>
<field-map field-name="viewIndex" from-field="viewIndex"/>
<field-map field-name="viewSize" from-field="viewSize"/>
</service>
@@ -36,27 +37,27 @@ under the License.
<field-map field-name="fixedAssetId" from-field="fixedAssetId"/>
</service>
</row-actions>
- <field name="fixedAssetId" widget-style="linktext">
+ <field name="fixedAssetId" widget-style="linktext" sort-field="true">
<hyperlink also-hidden="false" description="${fixedAssetId}" target="EditFixedAsset">
<parameter param-name="fixedAssetId"/>
</hyperlink>
</field>
- <field name="fixedAssetName" title="${uiLabelMap.AccountingFixedAssetName}">
+ <field name="fixedAssetName" title="${uiLabelMap.AccountingFixedAssetName}" sort-field="true">
<display/>
</field>
- <field name="fixedAssetTypeId"><display-entity entity-name="FixedAssetType"/></field>
- <field name="parentFixedAssetId">
+ <field name="fixedAssetTypeId" sort-field="true"><display-entity entity-name="FixedAssetType"/></field>
+ <field name="parentFixedAssetId" sort-field="true">
<display-entity entity-name="FixedAsset" key-field-name="fixedAssetId" description="${fixedAssetName}">
<sub-hyperlink target="EditFixedAsset" description="${parentFixedAssetId}">
<parameter param-name="fixedAssetId" from-field="parentFixedAssetId"/>
</sub-hyperlink>
</display-entity>
</field>
- <field name="dateAcquired"><display/></field>
- <field name="expectedEndOfLife"><display/></field>
- <field name="purchaseCost"><display type="currency" currency="${purchaseCostUomId}"/></field>
- <field name="salvageValue"><display type="currency" currency="${purchaseCostUomId}"/></field>
- <field name="depreciation"><display type="currency" currency="${purchaseCostUomId}"/></field>
+ <field name="dateAcquired" sort-field="true"><display/></field>
+ <field name="expectedEndOfLife" sort-field="true"><display/></field>
+ <field name="purchaseCost" sort-field="true"><display type="currency" currency="${purchaseCostUomId}"/></field>
+ <field name="salvageValue" sort-field="true"><display type="currency" currency="${purchaseCostUomId}"/></field>
+ <field name="depreciation" sort-field="true"><display type="currency" currency="${purchaseCostUomId}"/></field>
<field name="plannedPastDepreciationTotal"><display description="${assetDepreciationResultMap.plannedPastDepreciationTotal}"/></field>
<on-event-update-area event-type="paginate" area-id="search-results" area-target="FixedAssetSearchResults"/>
</form>
Modified: ofbiz/branches/jquery/applications/accounting/widget/FixedAssetScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/widget/FixedAssetScreens.xml?rev=1028269&r1=1028268&r2=1028269&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/accounting/widget/FixedAssetScreens.xml (original)
+++ ofbiz/branches/jquery/applications/accounting/widget/FixedAssetScreens.xml Thu Oct 28 12:11:23 2010
@@ -139,7 +139,7 @@ under the License.
<if-service-permission service-name="fixedAssetPermissionCheck" main-action="CREATE"/>
</condition>
<widgets>
- <container style="button-bar"><link target="EditFixedAsset" text="${uiLabelMap.AccountingNewFixedAsset}" style="buttontext"/></container>
+ <container style="button-bar"><link target="EditFixedAsset" text="${uiLabelMap.AccountingNewFixedAsset}" style="buttontext create"/></container>
</widgets>
</section>
<include-form name="EditFixedAsset" location="component://accounting/widget/FixedAssetForms.xml"/>
@@ -355,7 +355,7 @@ under the License.
<decorator-screen name="CommonFixedAssetDecorator" location="${parameters.fixedAssetDecoratorLocation}">
<decorator-section name="body">
<container style="button-bar">
- <link target="EditFixedAssetMaint" text="${uiLabelMap.AccountingNewFixedAssetMaint}" style="buttontext">
+ <link target="EditFixedAssetMaint" text="${uiLabelMap.AccountingNewFixedAssetMaint}" style="buttontext create">
<parameter param-name="fixedAssetId"/>
</link>
</container>
Modified: ofbiz/branches/jquery/applications/accounting/widget/PaymentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/widget/PaymentScreens.xml?rev=1028269&r1=1028268&r2=1028269&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/accounting/widget/PaymentScreens.xml (original)
+++ ofbiz/branches/jquery/applications/accounting/widget/PaymentScreens.xml Thu Oct 28 12:11:23 2010
@@ -76,8 +76,8 @@ under the License.
<decorator-section name="menu-bar">
<container style="button-bar">
<link target="newPayment" text="${uiLabelMap.CommonCreateNew} ${uiLabelMap.AccountingPayment}" style="buttontext create"/>
- <link target="FindSalesInvoicesByDueDate" text="${uiLabelMap.AccountingFindSalesInvoicesByDueDate}" style="buttontext"/>
- <link target="FindPurchaseInvoicesByDueDate" text="${uiLabelMap.AccountingFindPurchaseInvoicesByDueDate}" style="buttontext"/>
+ <link target="FindSalesInvoicesByDueDate" text="${uiLabelMap.AccountingFindSalesInvoicesByDueDate}" style="buttontext search"/>
+ <link target="FindPurchaseInvoicesByDueDate" text="${uiLabelMap.AccountingFindPurchaseInvoicesByDueDate}" style="buttontext search"/>
</container>
</decorator-section>
<decorator-section name="search-options">
Modified: ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/content/ContentWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/content/ContentWorker.java?rev=1028269&r1=1028268&r2=1028269&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/content/ContentWorker.java (original)
+++ ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/content/ContentWorker.java Thu Oct 28 12:11:23 2010
@@ -124,7 +124,7 @@ public class ContentWorker implements or
// if the content is a PUBLISH_POINT and the data resource is not defined; get the related content
if ("WEB_SITE_PUB_PT".equals(content.get("contentTypeId")) && content.get("dataResourceId") == null) {
- List<GenericValue> relContentIds = delegator.findByAnd("ContentAssocDataResourceViewTo",
+ List<GenericValue> relContentIds = delegator.findByAndCache("ContentAssocDataResourceViewTo",
UtilMisc.toMap("contentIdStart", content.get("contentId"),"statusId","CTNT_PUBLISHED",
"caContentAssocTypeId", "PUBLISH_LINK"), UtilMisc.toList("caFromDate"));
@@ -165,10 +165,10 @@ public class ContentWorker implements or
Iterator<GenericValue> alternateViewIter = alternateViews.iterator();
while (alternateViewIter.hasNext()) {
GenericValue thisView = alternateViewIter.next();
- GenericValue altContentRole = EntityUtil.getFirst(EntityUtil.filterByDate(thisView.getRelatedByAnd("ContentRole", UtilMisc.toMap("partyId", partyId, "roleTypeId", roleTypeId))));
+ GenericValue altContentRole = EntityUtil.getFirst(EntityUtil.filterByDate(thisView.getRelatedByAndCache("ContentRole", UtilMisc.toMap("partyId", partyId, "roleTypeId", roleTypeId))));
GenericValue altContent = null;
if (UtilValidate.isNotEmpty(altContentRole)) {
- altContent = altContentRole.getRelatedOne("Content");
+ altContent = altContentRole.getRelatedOneCache("Content");
if (altContent != null) {
content = altContent;
}
@@ -288,8 +288,8 @@ public class ContentWorker implements or
// This part is using an xml file as the input data and an ftl or xsl file to present it.
if (UtilValidate.isNotEmpty(mimeType)) {
if (mimeType.toLowerCase().indexOf("xml") >= 0) {
- GenericValue dataResource = delegator.findByPrimaryKey("DataResource", UtilMisc.toMap("dataResourceId", dataResourceId));
- GenericValue templateDataResource = delegator.findByPrimaryKey("DataResource", UtilMisc.toMap("dataResourceId", templateDataResourceId));
+ GenericValue dataResource = delegator.findByPrimaryKeyCache("DataResource", UtilMisc.toMap("dataResourceId", dataResourceId));
+ GenericValue templateDataResource = delegator.findByPrimaryKeyCache("DataResource", UtilMisc.toMap("dataResourceId", templateDataResourceId));
if ("FTL".equals(templateDataResource.getString("dataTemplateTypeId"))) {
StringReader sr = new StringReader(textData);
try {
@@ -373,7 +373,7 @@ public class ContentWorker implements or
List<GenericValue> alternateViews = null;
try {
- alternateViews = view.getRelated("ContentAssocDataResourceViewTo", UtilMisc.toMap("caContentAssocTypeId", "ALTERNATE_LOCALE"), UtilMisc.toList("-caFromDate"));
+ alternateViews = view.getRelatedCache("ContentAssocDataResourceViewTo", UtilMisc.toMap("caContentAssocTypeId", "ALTERNATE_LOCALE"), UtilMisc.toList("-caFromDate"));
} catch (GenericEntityException e) {
Debug.logError(e, "Error finding alternate locale content: " + e.toString(), module);
return contentAssocDataResourceViewFrom;
Modified: ofbiz/branches/jquery/applications/content/widget/forum/BlogScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/widget/forum/BlogScreens.xml?rev=1028269&r1=1028268&r2=1028269&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/content/widget/forum/BlogScreens.xml (original)
+++ ofbiz/branches/jquery/applications/content/widget/forum/BlogScreens.xml Thu Oct 28 12:11:23 2010
@@ -26,7 +26,6 @@ under the License.
<actions>
<set field="headerItem" value="Blog"/>
<property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
- <set field="pageTitle" value="${uiLabelMap.${titleProperty}}"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -208,7 +207,7 @@ under the License.
</decorator-screen>
</widgets>
<fail-widgets>
- <label text="${uiLabelMap.PageTitleEditBlogArticlePermissionError}: ${contentId} ${uiLabelMap.ContentBlog} ${blogContentId}"></label>
+ <label text="${uiLabelMap.EditBlogArticlePermissionError}: ${contentId} ${uiLabelMap.ContentBlog} ${blogContentId}"></label>
</fail-widgets>
</section>
</widgets>
@@ -243,7 +242,7 @@ under the License.
<horizontal-separator/>
<label style="h3" text="${uiLabelMap.ContentBlogArticle}"/>
<container>
- <sub-content content-id="${contentId}" map-key="MAIN"/>
+ <sub-content content-id="${contentId}" map-key="ARTICLE"/>
</container>
<horizontal-separator/>
</decorator-section>
Modified: ofbiz/branches/jquery/applications/marketing/widget/ContactListScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/marketing/widget/ContactListScreens.xml?rev=1028269&r1=1028268&r2=1028269&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/marketing/widget/ContactListScreens.xml (original)
+++ ofbiz/branches/jquery/applications/marketing/widget/ContactListScreens.xml Thu Oct 28 12:11:23 2010
@@ -373,7 +373,7 @@ under the License.
<set field="labelTitleProperty" value="PageTitlePreferredContactMech"/>
<set field="title" value="${uiLabelMap.PageTitlePreferredContactMech}"/>
<set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/ListContactLists"/>
- <set field="partyId" from-field="parameters.parm0"/>
+ <set field="partyId" from-field="parameters.parm1"/>
<set field="entityName" value="PartyAndContactMech"/>
<set field="searchFields" value="[contactMechId, partyId, infoString, paToName, paAddress1]"/>
</actions>
Propchange: ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 28 12:11:23 2010
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CheckoutMapProcs.xml:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:921280-927264
-/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-1024561
+/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-1028265
Modified: ofbiz/branches/jquery/applications/order/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/servicedef/services.xml?rev=1028269&r1=1028268&r2=1028269&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/order/servicedef/services.xml (original)
+++ ofbiz/branches/jquery/applications/order/servicedef/services.xml Thu Oct 28 12:11:23 2010
@@ -305,6 +305,7 @@ under the License.
<attribute name="orderId" type="String" mode="INOUT" optional="false"/>
<attribute name="supplierPartyId" type="String" mode="IN" optional="true"/>
<attribute name="orderTypeId" type="String" mode="IN" optional="true"/>
+ <attribute name="calcTax" type="Boolean" mode="IN" optional="true" default-value="true"/>
<attribute name="itemDescriptionMap" type="Map" mode="IN" string-map-prefix="idm_" optional="true"/>
<attribute name="itemQtyMap" type="Map" mode="IN" string-map-prefix="iqm_" optional="false"/>
<attribute name="itemPriceMap" type="Map" mode="IN" string-map-prefix="ipm_" optional="false"/>
@@ -328,6 +329,7 @@ under the License.
<description>Update the quantities/prices for an existing order</description>
<attribute name="orderId" type="String" mode="INOUT" optional="false"/>
<attribute name="shoppingCart" type="org.ofbiz.order.shoppingcart.ShoppingCart" mode="IN" optional="false"/>
+ <attribute name="calcTax" type="Boolean" mode="IN" optional="true" default-value="true"/>
<!-- <attribute name="locale" type="" mode="IN" optional="false"/> -->
<attribute name="changeMap" type="Map" mode="IN" optional="false"/>
</service>
@@ -346,6 +348,7 @@ under the License.
<attribute name="changeComments" type="String" mode="IN" optional="true"/>
<attribute name="itemDesiredDeliveryDate" type="Timestamp" mode="IN" optional="true"/>
<attribute name="itemAttributesMap" type="Map" mode="IN" optional="true"/>
+ <attribute name="calcTax" type="Boolean" mode="IN" optional="true" default-value="true"/>
<attribute name="shoppingCart" type="org.ofbiz.order.shoppingcart.ShoppingCart" mode="OUT" optional="false"/>
</service>
Modified: ofbiz/branches/jquery/applications/order/servicedef/services_request.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/servicedef/services_request.xml?rev=1028269&r1=1028268&r2=1028269&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/order/servicedef/services_request.xml (original)
+++ ofbiz/branches/jquery/applications/order/servicedef/services_request.xml Thu Oct 28 12:11:23 2010
@@ -85,6 +85,7 @@ under the License.
<auto-attributes include="nonpk" mode="IN" optional="true"/>
<override name="custRequestItemSeqId" optional="true"/>
<override name="story" allow-html="safe"/>
+ <override name="description" allow-html="safe"/>
</service>
<service name="updateCustRequestItem" engine="simple" default-entity-name="CustRequestItem"
location="component://order/script/org/ofbiz/order/request/CustRequestServices.xml" invoke="updateCustRequestItem" auth="true">
Modified: ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/order/OrderServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=1028269&r1=1028268&r2=1028269&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/order/OrderServices.java (original)
+++ ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/order/OrderServices.java Thu Oct 28 12:11:23 2010
@@ -1781,7 +1781,9 @@ public class OrderServices {
// find the next status to set to (if any)
String newStatus = null;
if (allCanceled) {
- newStatus = "ORDER_CANCELLED";
+ if (!"PURCHASE_ORDER".equals(orderTypeId)) {
+ newStatus = "ORDER_CANCELLED";
+ }
} else if (allComplete) {
newStatus = "ORDER_COMPLETED";
} else if (allApproved) {
@@ -3303,6 +3305,10 @@ public class OrderServices {
Map itemAttributesMap = (Map) context.get("itemAttributesMap");
String reasonEnumId = (String) context.get("reasonEnumId");
String changeComments = (String) context.get("changeComments");
+ Boolean calcTax = (Boolean) context.get("calcTax");
+ if (calcTax == null) {
+ calcTax = Boolean.TRUE;
+ }
if (amount == null) {
amount = BigDecimal.ZERO;
@@ -3377,7 +3383,7 @@ public class OrderServices {
"itemCommentMap", UtilMisc.toMap("changeComments", changeComments));
// save all the updated information
try {
- saveUpdatedCartToOrder(dispatcher, delegator, cart, locale, userLogin, orderId, changeMap);
+ saveUpdatedCartToOrder(dispatcher, delegator, cart, locale, userLogin, orderId, changeMap, calcTax);
} catch (GeneralException e) {
return ServiceUtil.returnError(e.getMessage());
}
@@ -3412,6 +3418,10 @@ public class OrderServices {
Map itemAttributesMap = (Map) context.get("itemAttributesMap");
Map<String,String> itemEstimatedShipDateMap = (Map) context.get("itemShipDateMap");
Map<String, String> itemEstimatedDeliveryDateMap = (Map) context.get("itemDeliveryDateMap");
+ Boolean calcTax = (Boolean) context.get("calcTax");
+ if (calcTax == null) {
+ calcTax = Boolean.TRUE;
+ }
// obtain a shopping cart object for updating
ShoppingCart cart = null;
@@ -3578,7 +3588,7 @@ public class OrderServices {
// save all the updated information
try {
- saveUpdatedCartToOrder(dispatcher, delegator, cart, locale, userLogin, orderId, UtilMisc.toMap("itemReasonMap", itemReasonMap, "itemCommentMap", itemCommentMap));
+ saveUpdatedCartToOrder(dispatcher, delegator, cart, locale, userLogin, orderId, UtilMisc.toMap("itemReasonMap", itemReasonMap, "itemCommentMap", itemCommentMap), calcTax);
} catch (GeneralException e) {
return ServiceUtil.returnError(e.getMessage());
}
@@ -3797,10 +3807,14 @@ public class OrderServices {
ShoppingCart cart = (ShoppingCart) context.get("shoppingCart");
Map changeMap = (Map) context.get("changeMap");
Locale locale = (Locale) context.get("locale");
+ Boolean calcTax = (Boolean) context.get("calcTax");
+ if (calcTax == null) {
+ calcTax = Boolean.TRUE;
+ }
Map result = null;
try {
- saveUpdatedCartToOrder(dispatcher, delegator, cart, locale, userLogin, orderId, changeMap);
+ saveUpdatedCartToOrder(dispatcher, delegator, cart, locale, userLogin, orderId, changeMap, calcTax);
result = ServiceUtil.returnSuccess();
//result.put("shoppingCart", cart);
} catch (GeneralException e) {
@@ -3812,7 +3826,7 @@ public class OrderServices {
return result;
}
- private static void saveUpdatedCartToOrder(LocalDispatcher dispatcher, Delegator delegator, ShoppingCart cart, Locale locale, GenericValue userLogin, String orderId, Map changeMap) throws GeneralException {
+ private static void saveUpdatedCartToOrder(LocalDispatcher dispatcher, Delegator delegator, ShoppingCart cart, Locale locale, GenericValue userLogin, String orderId, Map changeMap, boolean calcTax) throws GeneralException {
// get/set the shipping estimates. if it's a SALES ORDER, then return an error if there are no ship estimates
int shipGroups = cart.getShipGroupSize();
for (int gi = 0; gi < shipGroups; gi++) {
@@ -3832,13 +3846,15 @@ public class OrderServices {
cart.setItemShipGroupEstimate(shippingTotal, gi);
}
- // calc the sales tax
+ // calc the sales tax
CheckOutHelper coh = new CheckOutHelper(dispatcher, delegator, cart);
- try {
- coh.calcAndAddTax();
- } catch (GeneralException e) {
- Debug.logError(e, module);
- throw new GeneralException(e.getMessage());
+ if (calcTax) {
+ try {
+ coh.calcAndAddTax();
+ } catch (GeneralException e) {
+ Debug.logError(e, module);
+ throw new GeneralException(e.getMessage());
+ }
}
// get the new orderItems, adjustments, shipping info, payments and order item atrributes from the cart
Modified: ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java?rev=1028269&r1=1028268&r2=1028269&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java (original)
+++ ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java Thu Oct 28 12:11:23 2010
@@ -1546,9 +1546,11 @@ public class CheckOutHelper {
// verify the selected payment method amounts will cover the total
BigDecimal reqAmtPreParse = cart.getGrandTotal().subtract(cart.getBillingAccountAmount());
- BigDecimal selectedPaymentTotal = cart.getPaymentTotal();
+ BigDecimal selectedPmnt = cart.getPaymentTotal();
+ BigDecimal selectedPaymentTotal = selectedPmnt.setScale(scale, rounding);
BigDecimal requiredAmount = reqAmtPreParse.setScale(scale, rounding);
+
if (UtilValidate.isNotEmpty(paymentMethods) && requiredAmount.compareTo(selectedPaymentTotal) > 0) {
Debug.logError("Required Amount : " + requiredAmount + " / Selected Amount : " + selectedPaymentTotal, module);
errMsg = UtilProperties.getMessage(resource_error, "checkevents.payment_not_cover_this_order", (cart != null ? cart.getLocale() : Locale.getDefault()));
Modified: ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java?rev=1028269&r1=1028268&r2=1028269&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java (original)
+++ ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java Thu Oct 28 12:11:23 2010
@@ -46,6 +46,7 @@ import org.ofbiz.entity.condition.Entity
import org.ofbiz.entity.util.EntityUtil;
import org.ofbiz.order.order.OrderReadHelper;
import org.ofbiz.order.shoppingcart.ShoppingCart.CartShipInfo;
+import org.ofbiz.order.shoppingcart.ShoppingCart.CartShipInfo.CartShipItemInfo;
import org.ofbiz.product.config.ProductConfigWorker;
import org.ofbiz.product.config.ProductConfigWrapper;
import org.ofbiz.service.DispatchContext;
@@ -200,6 +201,7 @@ public class ShoppingCartServices {
cart.setOrderName(orderHeader.getString("orderName"));
cart.setOrderStatusId(orderHeader.getString("statusId"));
cart.setOrderStatusString(currentStatusString);
+ cart.setFacilityId(orderHeader.getString("originFacilityId"));
try {
cart.setUserLogin(userLogin, dispatcher);
@@ -577,11 +579,16 @@ public class ShoppingCartServices {
if (cartItem == null) {
Debug.logWarning("In loadCartFromOrder could not find cart item for itemIndex=" + itemIndex + ", for orderId=" + orderId, module);
} else {
- List itemTaxAdj = csi.getShipItemInfo(cartItem).itemTaxAdj;
- for(GenericValue shipGroupItemAdjustment : shipGroupItemAdjustments) {
- if ("SALES_TAX".equals(shipGroupItemAdjustment.get("orderAdjustmentTypeId"))) {
- itemTaxAdj.add(shipGroupItemAdjustment);
- continue;
+ CartShipItemInfo cartShipItemInfo = csi.getShipItemInfo(cartItem);
+ if (cartShipItemInfo == null) {
+ Debug.logWarning("In loadCartFromOrder could not find CartShipItemInfo for itemIndex=" + itemIndex + ", for orderId=" + orderId, module);
+ } else {
+ List itemTaxAdj = cartShipItemInfo.itemTaxAdj;
+ for(GenericValue shipGroupItemAdjustment : shipGroupItemAdjustments) {
+ if ("SALES_TAX".equals(shipGroupItemAdjustment.get("orderAdjustmentTypeId"))) {
+ itemTaxAdj.add(shipGroupItemAdjustment);
+ continue;
+ }
}
}
}
Modified: ofbiz/branches/jquery/applications/party/config/PartyUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/config/PartyUiLabels.xml?rev=1028269&r1=1028268&r2=1028269&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/party/config/PartyUiLabels.xml (original)
+++ ofbiz/branches/jquery/applications/party/config/PartyUiLabels.xml Thu Oct 28 12:11:23 2010
@@ -307,7 +307,7 @@
<value xml:lang="de">Ausgeschaltet Zeitpunkt</value>
<value xml:lang="en">Disabled Date Time</value>
<value xml:lang="es">Fecha/hora deshabilitado</value>
- <value xml:lang="fr">Invalide depuis</value>
+ <value xml:lang="fr">Désactivé depuis</value>
<value xml:lang="hi_IN">निषà¥à¤à¥à¤°à¤¿à¤¯ दिनाà¤à¤ समय</value>
<value xml:lang="it">Data Ora Disabilitazione</value>
<value xml:lang="nl">Uitgeschakelde datum-tijd</value>
@@ -4924,7 +4924,7 @@
<value xml:lang="de">Ausgeschaltet</value>
<value xml:lang="en">DISABLED</value>
<value xml:lang="es">DESHABILITADO</value>
- <value xml:lang="fr">INVALIDE</value>
+ <value xml:lang="fr">DESACTIVE</value>
<value xml:lang="hi_IN">निषà¥à¤à¥à¤°à¤¿à¤¯</value>
<value xml:lang="it">DISABILITATO</value>
<value xml:lang="nl">UITGESCHAKELD</value>
Modified: ofbiz/branches/jquery/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml?rev=1028269&r1=1028268&r2=1028269&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml (original)
+++ ofbiz/branches/jquery/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml Thu Oct 28 12:11:23 2010
@@ -36,6 +36,9 @@ under the License.
</simple-method>
<simple-method method-name="updateContactMech" short-description="Update Contact Mechanism">
+ <!-- NOTE DEJ20101020: commenting these out becuase they make NO sense... the problem is that
+ updatePostalAddress below in this file calls updateContactMech, so it must be allowed...
+ This was "fixed" by JLR in rev 1023842, so undoing part of that to get things working again.
<if-compare field="parameters.contactMechTypeId" operator="equals" value="POSTAL_ADDRESS">
<add-error><fail-property resource="PartyUiLabels" property="PartyServiceNotForPostalAddress"/></add-error>
</if-compare>
@@ -43,6 +46,7 @@ under the License.
<add-error><fail-property resource="PartyUiLabels" property="PartyServiceNotForTelecomNumber"/></add-error>
</if-compare>
<check-errors/>
+ -->
<set field="successMessageProperty" value="PartyContactMechanismSuccessfullyUpdated"/>
<if-compare field="parameters.contactMechTypeId" operator="equals" value="EMAIL_ADDRESS">
Propchange: ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 28 12:11:23 2010
@@ -1,3 +1,3 @@
/incubator/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:418499-490456
/ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:921280-927264
-/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-1024561
+/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-1028265
Modified: ofbiz/branches/jquery/applications/party/widget/partymgr/CommunicationEventForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/widget/partymgr/CommunicationEventForms.xml?rev=1028269&r1=1028268&r2=1028269&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/party/widget/partymgr/CommunicationEventForms.xml (original)
+++ ofbiz/branches/jquery/applications/party/widget/partymgr/CommunicationEventForms.xml Thu Oct 28 12:11:23 2010
@@ -65,10 +65,10 @@ under the License.
<!-- this is an example of how to display different types of contact mech to the user -->
<field name="contactMechIdFrom" title="${uiLabelMap.PartyFromContactMech}" position="1">
- <lookup target-form-name="LookupPreferredContactMech" target-parameter="partyIdFrom"/>
+ <lookup target-form-name="LookupPreferredContactMech" description-field-name="partyIdFrom" target-parameter="partyIdFrom"/>
</field>
<field name="contactMechIdTo" title="${uiLabelMap.PartyToContactMech}" position="2">
- <lookup target-form-name="LookupPreferredContactMech" target-parameter="partyIdTo"/>
+ <lookup target-form-name="LookupPreferredContactMech" description-field-name="partyIdTo" target-parameter="partyIdTo"/>
</field>
<field name="roleTypeIdFrom" position="1">
@@ -236,7 +236,7 @@ under the License.
<field name="partyIdFrom" use-when="communicationEvent.get("partyIdFrom")!=null">
<display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName} (${contactMechFrom.infoString})">
<sub-hyperlink description=" [${communicationEvent.partyIdFrom}]" target="/partymgr/control/viewprofile" target-type="inter-app">
- <parameter param-name="partyId" from-field="partyIdFrom"/>
+ <parameter param-name="partyId" from-field="communicationEvent.partyIdFrom"/>
</sub-hyperlink>
</display-entity>
</field>
Modified: ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml?rev=1028269&r1=1028268&r2=1028269&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml Thu Oct 28 12:11:23 2010
@@ -4974,7 +4974,7 @@
<value xml:lang="en">Edit Facility Groups for ${facility.facilityName} [${facility.facilityId}]</value>
<value xml:lang="es">Editar Grupos de Almacén</value>
<value xml:lang="fr">Modification des groupes de lieux de stockage pour ${facility.facilityName} [${facility.facilityId}]</value>
- <value xml:lang="it">Aggiorna Gruppi Stabilimento</value>
+ <value xml:lang="it">Aggiorna i gruppi di stabilimenti</value>
<value xml:lang="ro">Actualizeaza Grupuri Compartimente</value>
<value xml:lang="ru">ÐзмениÑÑ Ð³ÑÑÐ¿Ð¿Ñ Ð¾Ð±ÑекÑов</value>
<value xml:lang="th">à¹à¸à¹à¹à¸à¸à¸¥à¸¸à¹à¸¡à¸à¸¥à¸±à¸à¸ªà¸´à¸à¸à¹à¸²</value>
@@ -5940,7 +5940,7 @@
<value xml:lang="en">Find Inventory Item Labels</value>
<value xml:lang="es">Buscar etiquetas de Ãtems</value>
<value xml:lang="fr">Rechercher les étiquettes de lignes de stock</value>
- <value xml:lang="it">Ricerca Etichette Riga Inventario</value>
+ <value xml:lang="it">Ricerca etichette riga inventario</value>
<value xml:lang="th">Find Inventory Item Labels</value>
<value xml:lang="zh">æ¥æ¾åºåæç»æ ç¾</value>
</property>
@@ -10736,7 +10736,7 @@
<value xml:lang="en">Facility Children for ${facility.facilityName} [${facility.facilityId}]</value>
<value xml:lang="es">Sucesores de almacén para ${facility.facilityName} [${facility.facilityId}]</value>
<value xml:lang="fr">Lieu de stockage descendant pour ${facility.facilityName} [${facility.facilityId}]</value>
- <value xml:lang="it">Stabilimento figlio per ${facility.facilityName} [${facility.facilityId}]</value>
+ <value xml:lang="it">Stabilimenti figli di ${facility.facilityName} [${facility.facilityId}]</value>
<value xml:lang="zh">${facility.facilityName} [${facility.facilityId}]çä¸çº§åºæ</value>
</property>
<property key="ProductFacilityContainer">
@@ -10882,7 +10882,7 @@
<value xml:lang="en">Facility Groups</value>
<value xml:lang="es">Grupos de Almacén</value>
<value xml:lang="fr">Groupes de lieux de stockage</value>
- <value xml:lang="it">Gruppi Stabilimento</value>
+ <value xml:lang="it">Gruppi di stabilimenti</value>
<value xml:lang="ro">Grup Compartiment</value>
<value xml:lang="ru">ÐÑÑÐ¿Ð¿Ñ Ð¾Ð±ÑекÑов</value>
<value xml:lang="th">à¸à¸¥à¸¸à¹à¸¡à¸à¸¥à¸±à¸à¸ªà¸´à¸à¸à¹à¸²</value>
@@ -12323,7 +12323,7 @@
<value xml:lang="en">Inventory Item Labels</value>
<value xml:lang="es">Etiquetas de Ãtem de inventario</value>
<value xml:lang="fr">Etiquettes de ligne de stock</value>
- <value xml:lang="it">Etichette Riga Inventario</value>
+ <value xml:lang="it">Etichette riga inventario</value>
<value xml:lang="th">à¹à¸à¹à¸à¹à¸à¹à¸à¸à¸£à¸°à¹à¸ à¸à¸£à¸²à¸¢à¸à¸²à¸£à¸ªà¸´à¸à¸à¹à¸²à¸à¸à¹à¸«à¸¥à¸·à¸</value>
<value xml:lang="zh">åºåæç»æ ç¾</value>
</property>
Modified: ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml?rev=1028269&r1=1028268&r2=1028269&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml (original)
+++ ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml Thu Oct 28 12:11:23 2010
@@ -65,13 +65,13 @@ under the License.
<!-- Find old value -->
- <make-value entity-name="FacilityContactMech" value-field="facilityContactMechMap"/>
- <set-pk-fields value-field="facilityContactMechMap" map="parameters"/>
- <find-by-and entity-name="FacilityContactMech" list="facilityContactMechs" map="facilityContactMechMap"/>
- <filter-list-by-date list="facilityContactMechs" to-list="validFacilityContactMechs"/>
- <first-from-list entry="facilityContactMech" list="validFacilityContactMechs"/>
+ <entity-and entity-name="FacilityContactMech" list="facilityContactMechs" filter-by-date="true">
+ <field-map field-name="facilityId" from-field="parameters.facilityId"/>
+ <field-map field-name="contactMechId" from-field="parameters.contactMechId"/>
+ </entity-and>
+ <first-from-list entry="facilityContactMech" list="facilityContactMechs"/>
<if-empty field="facilityContactMech">
- <add-error><fail-message message="ERROR: Cannot update specified contact info because it does not correspond to the specified facility"/></add-error>
+ <add-error><fail-message message="ERROR: Cannot update specified contact info because it does not correspond to the specified facility; query map was: ${facilityContactMechMap}"/></add-error>
</if-empty>
<check-errors/>