svn commit: r1006056 [1/4] - in /ofbiz/branches/jquery: ./ applications/accounting/config
Locked
svn commit: r1006056 [1/4] - in /ofbiz/branches/jquery: ./ applications/accounting/config
 
|
Author: jleroux
Date: Fri Oct 8 22:41:27 2010 New Revision: 1006056 URL: http://svn.apache.org/viewvc?rev=1006056&view=rev Log: Merges the trunk at r1006054 Added: ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/actions/reports/AcctgTransEntriesSearchResultsParameters.groovy - copied unchanged from r1005899, ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/AcctgTransEntriesSearchResultsParameters.groovy ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheetParameters.groovy - copied unchanged from r1005899, ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheetParameters.groovy ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/actions/reports/IncomeStatementParameters.groovy - copied unchanged from r1005899, ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/IncomeStatementParameters.groovy ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/actions/reports/InvoiceAcctgTransEntryParameters.groovy - copied unchanged from r1005899, ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/InvoiceAcctgTransEntryParameters.groovy ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/actions/reports/PaymentAcctgTransEntryParameters.groovy - copied unchanged from r1005899, ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/PaymentAcctgTransEntryParameters.groovy ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TrialBalanceParameters.groovy - copied unchanged from r1005899, ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TrialBalanceParameters.groovy ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign - copied unchanged from r1005899, ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/BalanceSheet.rptdesign - copied unchanged from r1005899, ofbiz/trunk/applications/accounting/webapp/accounting/reports/BalanceSheet.rptdesign ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/IncomeStatement.rptdesign - copied unchanged from r1005899, ofbiz/trunk/applications/accounting/webapp/accounting/reports/IncomeStatement.rptdesign ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign - copied unchanged from r1005899, ofbiz/trunk/applications/accounting/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign - copied unchanged from r1005899, ofbiz/trunk/applications/accounting/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/TrialBalance.rptdesign - copied unchanged from r1005899, ofbiz/trunk/applications/accounting/webapp/accounting/reports/TrialBalance.rptdesign ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/price/EditProductPriceRules_old.groovy - copied unchanged from r1005899, ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/price/EditProductPriceRules_old.groovy ofbiz/branches/jquery/debian/strip-common-licenses.sh - copied unchanged from r1006054, ofbiz/trunk/debian/strip-common-licenses.sh ofbiz/branches/jquery/framework/common/data/GeoData_MX.xml - copied unchanged from r1005899, ofbiz/trunk/framework/common/data/GeoData_MX.xml ofbiz/branches/jquery/framework/common/webcommon/includes/setPriceRulesCondEventJs.ftl - copied unchanged from r1005899, ofbiz/trunk/framework/common/webcommon/includes/setPriceRulesCondEventJs.ftl ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOrder.java - copied unchanged from r1005899, ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOrder.java ofbiz/branches/jquery/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/CheckOrderStatus.groovy - copied unchanged from r1005899, ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/CheckOrderStatus.groovy ofbiz/branches/jquery/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/OrderListParameters.groovy - copied unchanged from r1005899, ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/OrderListParameters.groovy ofbiz/branches/jquery/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/OrderListPrepare.groovy - copied unchanged from r1005899, ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/OrderListPrepare.groovy Removed: ofbiz/branches/jquery/applications/content/data/SeedBlogData.xml Modified: ofbiz/branches/jquery/ (props changed) ofbiz/branches/jquery/.classpath ofbiz/branches/jquery/LICENSE ofbiz/branches/jquery/applications/accounting/config/AccountingUiLabels.xml ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/actions/reports/IncomeStatement.groovy ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/controller.xml ofbiz/branches/jquery/applications/accounting/webapp/accounting/invoice/invoiceReportItems.fo.ftl ofbiz/branches/jquery/applications/accounting/widget/AccountingMenus.xml ofbiz/branches/jquery/applications/accounting/widget/GlScreens.xml ofbiz/branches/jquery/applications/accounting/widget/InvoiceForms.xml ofbiz/branches/jquery/applications/accounting/widget/PaymentMethodTypeForms.xml ofbiz/branches/jquery/applications/accounting/widget/ReportFinancialSummaryForms.xml ofbiz/branches/jquery/applications/content/data/BlogSeedData.xml ofbiz/branches/jquery/applications/content/ofbiz-component.xml ofbiz/branches/jquery/applications/order/config/OrderUiLabels.xml ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml (props changed) ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/shipGroups.fo.ftl ofbiz/branches/jquery/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java ofbiz/branches/jquery/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy (props changed) ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/price/PriceServices.xml ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml (props changed) ofbiz/branches/jquery/applications/product/servicedef/services_pricepromo.xml ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/price/EditProductPriceRules.groovy ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/controller.xml ofbiz/branches/jquery/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl ofbiz/branches/jquery/applications/product/widget/catalog/CatalogMenus.xml ofbiz/branches/jquery/applications/product/widget/catalog/PriceForms.xml ofbiz/branches/jquery/applications/product/widget/catalog/PriceScreens.xml ofbiz/branches/jquery/applications/product/widget/catalog/ProductStoreForms.xml ofbiz/branches/jquery/applications/workeffort/entitydef/entitymodel_view.xml ofbiz/branches/jquery/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml ofbiz/branches/jquery/applications/workeffort/servicedef/services.xml ofbiz/branches/jquery/applications/workeffort/widget/CalendarScreens.xml ofbiz/branches/jquery/debian/changelog ofbiz/branches/jquery/debian/control ofbiz/branches/jquery/debian/move-files.pl ofbiz/branches/jquery/debian/ofbiz-framework.ofbiz.init ofbiz/branches/jquery/debian/rules ofbiz/branches/jquery/framework/base/config/ofbiz-containers.xml ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/UtilNumber.java ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java ofbiz/branches/jquery/framework/common/data/GeoData_FR.xml ofbiz/branches/jquery/framework/common/ofbiz-component.xml ofbiz/branches/jquery/framework/common/servicedef/services.xml ofbiz/branches/jquery/framework/common/webcommon/WEB-INF/actions/includes/ListPortalPages.groovy ofbiz/branches/jquery/framework/common/webcommon/includes/setCountryStatesEventJs.ftl ofbiz/branches/jquery/framework/common/webcommon/includes/setDependentDropdownValuesJs.ftl ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml (props changed) ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java ofbiz/branches/jquery/framework/images/webapp/images/getDependentDropdownValues.js ofbiz/branches/jquery/framework/service/entitydef/entitymodel.xml ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java ofbiz/branches/jquery/framework/widget/templates/csvFormMacroLibrary.ftl ofbiz/branches/jquery/specialpurpose/assetmaint/entitydef/entitymodel.xml ofbiz/branches/jquery/specialpurpose/ebaystore/config/EbayStoreUiLabels.xml ofbiz/branches/jquery/specialpurpose/ebaystore/lib/ (props changed) ofbiz/branches/jquery/specialpurpose/ebaystore/servicedef/services.xml ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreHelper.java ofbiz/branches/jquery/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/controller.xml ofbiz/branches/jquery/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml ofbiz/branches/jquery/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml ofbiz/branches/jquery/specialpurpose/ebaystore/widget/EbayStoreMenus.xml 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) Propchange: ofbiz/branches/jquery/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Oct 8 22:41:27 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310:921280-927264 -/ofbiz/trunk:951708-1002466 +/ofbiz/trunk:951708-1006054 Modified: ofbiz/branches/jquery/.classpath URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/.classpath?rev=1006056&r1=1006055&r2=1006056&view=diff ============================================================================== --- ofbiz/branches/jquery/.classpath (original) +++ ofbiz/branches/jquery/.classpath Fri Oct 8 22:41:27 2010 @@ -135,11 +135,11 @@ <classpathentry kind="lib" path="framework/service/lib/axis.jar"/> <classpathentry kind="lib" path="framework/service/lib/axis-ant.jar"/> <classpathentry kind="lib" path="framework/service/lib/wsdl4j.jar"/> - <classpathentry kind="lib" path="framework/service/lib/axiom-api-1.2.8.jar"/> - <classpathentry kind="lib" path="framework/service/lib/axiom-impl-1.2.8.jar"/> - <classpathentry kind="lib" path="framework/service/lib/axis2-kernel-1.5.1.jar"/> - <classpathentry kind="lib" path="framework/service/lib/axis2-transport-http-1.5.1.jar"/> - <classpathentry kind="lib" path="framework/service/lib/axis2-transport-local-1.5.1.jar"/> + <classpathentry kind="lib" path="framework/service/lib/axiom-api-1.2.9.jar"/> + <classpathentry kind="lib" path="framework/service/lib/axiom-impl-1.2.9.jar"/> + <classpathentry kind="lib" path="framework/service/lib/axis2-kernel-1.5.2.jar"/> + <classpathentry kind="lib" path="framework/service/lib/axis2-transport-http-1.5.2.jar"/> + <classpathentry kind="lib" path="framework/service/lib/axis2-transport-local-1.5.2.jar"/> <classpathentry kind="lib" path="framework/service/lib/commons-httpclient-3.1.jar"/> <classpathentry kind="lib" path="framework/service/lib/neethi-2.0.4.jar"/> <classpathentry kind="lib" path="framework/service/lib/XmlSchema-1.4.3.jar"/> Modified: ofbiz/branches/jquery/LICENSE URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/LICENSE?rev=1006056&r1=1006055&r2=1006056&view=diff ============================================================================== --- ofbiz/branches/jquery/LICENSE (original) +++ ofbiz/branches/jquery/LICENSE Fri Oct 8 22:41:27 2010 @@ -1,4 +1,4 @@ -========================================================================== +========================================================================= The source code that makes up The Apache Open For Business Project (Apache OFBiz) and the majority of the libraries distributed with it are licensed under the Apache License Version 2.0. @@ -9,7 +9,7 @@ OFBiz and the full text of the license u For additional details, see the NOTICE file and: http://cwiki.apache.org/confluence/display/OFBADMIN/Libraries+Included+in+OFBiz -========================================================================== +========================================================================= The following libraries are licensed under the Apache License Version 2.0: ofbiz/trunk/framework/base/lib/ant-launcher-1.7.1.jar ofbiz/trunk/framework/base/lib/ant-1.7.1.jar @@ -93,11 +93,11 @@ ofbiz/trunk/framework/jetty/lib/jetty-ut ofbiz/trunk/framework/jetty/lib/xmlParserAPIs-2.6.2.jar ofbiz/trunk/framework/service/lib/axis-ant.jar ofbiz/trunk/framework/service/lib/axis.jar -ofbiz/trunk/framework/service/lib/axiom-api-1.2.8.jar -ofbiz/trunk/framework/service/lib/axiom-impl-1.2.8.jar -ofbiz/trunk/framework/service/lib/axis2-kernel-1.5.1.jar -ofbiz/trunk/framework/service/lib/axis2-transport-http-1.5.1.jar -ofbiz/trunk/framework/service/lib/axis2-transport-local-1.5.1.jar +ofbiz/trunk/framework/service/lib/axiom-api-1.2.9.jar +ofbiz/trunk/framework/service/lib/axiom-impl-1.2.9.jar +ofbiz/trunk/framework/service/lib/axis2-kernel-1.5.2.jar +ofbiz/trunk/framework/service/lib/axis2-transport-http-1.5.2.jar +ofbiz/trunk/framework/service/lib/axis2-transport-local-1.5.2.jar ofbiz/trunk/framework/service/lib/commons-httpclient-3.1.jar ofbiz/trunk/framework/service/lib/neethi-2.0.4.jar ofbiz/trunk/framework/service/lib/XmlSchema-1.4.3.jar @@ -154,7 +154,7 @@ ofbiz/trunk/framework/webslinger/lib/web ofbiz/trunk/applications/content/lib/lucene-core-2.4.1.jar ofbiz/trunk/applications/content/lib/poi-3.2-FINAL-20081019.jar ofbiz/trunk/specialpurpose/googlecheckout/lib/checkout-sdk-0.8.8.jar -========================================================================== +========================================================================= Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -1830,7 +1830,7 @@ The Jython library is licensed under the ofbiz/trunk/framework/base/lib/scripting/jython-nooro.jar ========================================================================= Jython changes Software License. -================================ +========================================================================= Copyright (c) 2000, Jython Developers All rights reserved. @@ -1863,7 +1863,7 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. JPython Software License. -========================= +========================================================================= ______________________________________________________________________ @@ -2679,11 +2679,11 @@ Agreement will bring a legal action unde after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. -================================================================================== +========================================================================= Apache Ofbiz includes prototype.js from http://www.prototypejs.org licensed under the terms of the MIT License ofbiz/trunk/framework/images/webapp/images/prototype/prototype.js -=================================================================================== +========================================================================= Apache Ofbiz includes Scriptalous javascript lib from http://script.aculo.us licensed under the terms of the MIT License ofbiz/trunk/framework/images/webapp/images/prototype/controls.js @@ -2694,7 +2694,7 @@ ofbiz/trunk/framework/images/webapp/imag ofbiz/trunk/framework/images/webapp/images/prototype/sound.js ofbiz/trunk/framework/images/webapp/images/prototype/unittest.js ofbiz/trunk/framework/images/webapp/images/prototype/builder.js -=================================================================================== +========================================================================= Apache Ofbiz includes flotr javascript lib from http://code.google.com/p/flotr/ licensed under the terms of the MIT License ofbiz/trunk/framework/images/webapp/images/flotr/lib/excanvas.js @@ -2703,17 +2703,17 @@ ofbiz/trunk/framework/images/webapp/imag ofbiz/trunk/framework/images/webapp/images/flotr/lib/canvastext.js ofbiz/trunk/framework/images/webapp/images/flotr/flotr.debug-0.2.0-alpha.js ofbiz/trunk/framework/images/webapp/images/flotr/flotr-0.2.0-alpha.js -=================================================================================== +========================================================================= Apache Ofbiz includes LivePipe Control Suite from http://livepipe.net/projects/control_suite/ licensed under the terms of the MIT License ofbiz/trunk/framework/images/webapp/images/prototype/control.progress_bar.js ofbiz/trunk/framework/images/webapp/images/prototype/progress_bar.css -=================================================================================== +========================================================================= Apache Ofbiz includes validation.js file from http://www.tetlaw.id.au/view/javascript/really-easy-field-validation. ofbiz/trunk/framework/images/webapp/images/prototype/validation.js validation.js is Licensed as follows -=================================================================================== +========================================================================= Really easy field validation with Prototype http://tetlaw.id.au/view/javascript/really-easy-field-validation Andrew Tetlaw @@ -2739,7 +2739,7 @@ validation.js is Licensed as follows ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -==================================================================================== +========================================================================= Apache Ofbiz includes docbook templates in the /applications/content/template/docbook directory with the following licence: Copyright @@ -2789,7 +2789,7 @@ Contacting the Author The DocBook XSL stylesheets are maintained by Norman Walsh, <[hidden email]>, and members of the DocBook Project, <[hidden email]> -=============================================================== +========================================================================= The docbook schemas in the files docbook.xsd, docbook.dtd xlink.xsd and xml.xsd are distributed under the GNU Free Documentation License GNU Free Documentation License Modified: ofbiz/branches/jquery/applications/accounting/config/AccountingUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/config/AccountingUiLabels.xml?rev=1006056&r1=1006055&r2=1006056&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/config/AccountingUiLabels.xml (original) +++ ofbiz/branches/jquery/applications/accounting/config/AccountingUiLabels.xml Fri Oct 8 22:41:27 2010 @@ -3319,6 +3319,9 @@ <value xml:lang="en">Export as PDF</value> <value xml:lang="hi_IN">पà¥à¤¡à¥à¤à¤« à¤à¥ रà¥à¤ª मà¥à¤ à¤à¤°à¥ निरà¥à¤¯à¤¾à¤¤</value> </property> + <property key="AccountingExportWithInvoiceAndPaymentAsPdf"> + <value xml:lang="en">Export with Invoice and Payment as PDF</value> + </property> <property key="AccountingExternalAccountId"> <value xml:lang="ar">دÙÙÙ Øساب Ù Øاسب٠خارجÙ</value> <value xml:lang="de">Externe Konten-Nr.</value> @@ -9118,6 +9121,39 @@ <value xml:lang="en">Total Quantity On Hand</value> <value xml:lang="hi_IN">à¤à¥à¤² मातà¥à¤°à¤¾ हाथ पर</value> </property> + <property key="AccountingCostOfGoodsSold"> + <value xml:lang="en">Cost Of Good Sold</value> + </property> + <property key="AccountingGrossMargin"> + <value xml:lang="en">Gross Margin</value> + </property> + <property key="AccountingOperatingExpenses"> + <value xml:lang="en">Operating Expenses</value> + </property> + <property key="AccountingDepreciation"> + <value xml:lang="en">Depreciation</value> + </property> + <property key="AccountingIncomeFromOperations"> + <value xml:lang="en">Income From Operations</value> + </property> + <property key="AccountingCurrentAssets"> + <value xml:lang="en">Current Assets</value> + </property> + <property key="AccountingLongTermAssets"> + <value xml:lang="en">Long Term Assets</value> + </property> + <property key="AccountingTotalAccumulatedDepreciation"> + <value xml:lang="en">Total Accumulated Depreciation</value> + </property> + <property key="AccountingTotalAssets"> + <value xml:lang="en">Total Assets</value> + </property> + <property key="AccountingCurrentLiabilities"> + <value xml:lang="en">Current Liabilities</value> + </property> + <property key="AccountingTotalLiabilitiesAndEquities"> + <value xml:lang="en">Total Liabilities and Equities</value> + </property> <property key="AccountingTransactionIsAlreadyReconciled"> <value xml:lang="en">Transaction Is already Reconciled</value> <value xml:lang="hi_IN">à¤à¤¤à¤¿à¤µà¤¿à¤§à¤¿ पहलॠसॠहॠसमà¤à¥à¤¤à¤¾ हà¥</value> Modified: ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy?rev=1006056&r1=1006055&r2=1006056&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy (original) +++ ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy Fri Oct 8 22:41:27 2010 @@ -291,7 +291,7 @@ transactionTotals.each { transactionTota BigDecimal debitAmount = (BigDecimal)accountMap.get("D"); BigDecimal creditAmount = (BigDecimal)accountMap.get("C"); // contra assets are accounts of class CREDIT: the balance is given by credits minus debits - BigDecimal balance = creditAmount.subtract(debitAmount); + BigDecimal balance = debitAmount.subtract(creditAmount); accountMap.put("balance", balance); transactionTotalsMap.put(transactionTotal.glAccountId, accountMap); } @@ -303,7 +303,9 @@ accountBalanceList.each { accountBalance context.assetAccountBalanceList.addAll(accountBalanceList); context.assetAccountBalanceList.add(UtilMisc.toMap("accountName", "TOTAL ACCUMULATED DEPRECIATION", "balance", balanceTotal)); context.contraAssetBalanceTotal = balanceTotal; -balanceTotalList.add(UtilMisc.toMap("totalName", "AccountingLongTermAssetsAtCost", "balance", (context.longtermAssetBalanceTotal - context.contraAssetBalanceTotal))); +//balanceTotalList.add(UtilMisc.toMap("totalName", "AccountingLongTermAssetsAtCost", "balance", (context.longtermAssetBalanceTotal - context.contraAssetBalanceTotal))); +balanceTotalList.add(UtilMisc.toMap("totalName", "AccountingTotalAccumulatedDepreciation", "balance", balanceTotal)); +balanceTotalList.add(UtilMisc.toMap("totalName", "AccountingTotalAssets", "balance", (context.currentAssetBalanceTotal + context.longtermAssetBalanceTotal + balanceTotal))); // LIABILITY // account balances @@ -421,6 +423,7 @@ context.equityAccountBalanceList.add(Uti context.equityBalanceTotal = balanceTotal; context.liabilityEquityBalanceTotal = context.liabilityBalanceTotal + context.equityBalanceTotal +balanceTotalList.add(UtilMisc.toMap("totalName", "AccountingEquities", "balance", context.equityBalanceTotal)); balanceTotalList.add(UtilMisc.toMap("totalName", "AccountingTotalLiabilitiesAndEquities", "balance", context.liabilityEquityBalanceTotal)); -context.balanceTotalList = balanceTotalList; +context.balanceTotalList = balanceTotalList; \ No newline at end of file Modified: ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/actions/reports/IncomeStatement.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/actions/reports/IncomeStatement.groovy?rev=1006056&r1=1006055&r2=1006056&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/actions/reports/IncomeStatement.groovy (original) +++ ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/actions/reports/IncomeStatement.groovy Fri Oct 8 22:41:27 2010 @@ -52,6 +52,8 @@ GenericValue cogsExpenseGlAccountClass = List cogsExpenseAccountClassIds = UtilAccounting.getDescendantGlAccountClassIds(cogsExpenseGlAccountClass); GenericValue sgaExpenseGlAccountClass = delegator.findOne("GlAccountClass", UtilMisc.toMap("glAccountClassId", "SGA_EXPENSE"), true); List sgaExpenseAccountClassIds = UtilAccounting.getDescendantGlAccountClassIds(sgaExpenseGlAccountClass); +GenericValue depreciationGlAccountClass = delegator.findOne("GlAccountClass", UtilMisc.toMap("glAccountClassId", "DEPRECIATION"), true); +List depreciationAccountClassIds = UtilAccounting.getDescendantGlAccountClassIds(depreciationGlAccountClass); List mainAndExprs = FastList.newInstance(); mainAndExprs.add(EntityCondition.makeCondition("organizationPartyId", EntityOperator.IN, partyIds)); @@ -105,7 +107,7 @@ if (transactionTotals) { context.revenueAccountBalanceList = accountBalanceList; context.revenueAccountBalanceList.add(UtilMisc.toMap("accountName", "TOTAL REVENUES", "balance", balanceTotal)); context.revenueBalanceTotal = balanceTotal; -balanceTotalList.add(UtilMisc.toMap("totalName", "AccountingNetSales", "balance", balanceTotal)); +balanceTotalList.add(UtilMisc.toMap("totalName", "AccountingTotalNetSales", "balance", balanceTotal)); // EXPENSE // account balances @@ -233,6 +235,47 @@ if (transactionTotals) { } sgaExpense = balanceTotal; +//DEPRECIATION (DEPRECIATION) +//account balances +accountBalanceList = []; +transactionTotals = []; +balanceTotal = BigDecimal.ZERO; +List depreciationAndExprs = FastList.newInstance(mainAndExprs); +depreciationAndExprs.add(EntityCondition.makeCondition("glAccountClassId", EntityOperator.IN, depreciationAccountClassIds)); +transactionTotals = delegator.findList("AcctgTransEntrySums", EntityCondition.makeCondition(depreciationAndExprs, EntityOperator.AND), UtilMisc.toSet("glAccountId", "accountName", "accountCode", "debitCreditFlag", "amount"), UtilMisc.toList("glAccountId"), null, false); +if (transactionTotals) { +Map transactionTotalsMap = [:]; +balanceTotalCredit = BigDecimal.ZERO; +balanceTotalDebit = BigDecimal.ZERO; +transactionTotals.each { transactionTotal -> + Map accountMap = (Map)transactionTotalsMap.get(transactionTotal.glAccountId); + if (!accountMap) { + accountMap = UtilMisc.makeMapWritable(transactionTotal); + accountMap.remove("debitCreditFlag"); + accountMap.remove("amount"); + accountMap.put("D", BigDecimal.ZERO); + accountMap.put("C", BigDecimal.ZERO); + accountMap.put("balance", BigDecimal.ZERO); + } + UtilMisc.addToBigDecimalInMap(accountMap, transactionTotal.debitCreditFlag, transactionTotal.amount); + if ("D".equals(transactionTotal.debitCreditFlag)) { + balanceTotalDebit = balanceTotalDebit.add(transactionTotal.amount); + } else { + balanceTotalCredit = balanceTotalCredit.add(transactionTotal.amount); + } + BigDecimal debitAmount = (BigDecimal)accountMap.get("D"); + BigDecimal creditAmount = (BigDecimal)accountMap.get("C"); + // expenses are accounts of class DEBIT: the balance is given by debits minus credits + BigDecimal balance = debitAmount.subtract(creditAmount); + accountMap.put("balance", balance); + transactionTotalsMap.put(transactionTotal.glAccountId, accountMap); +} +accountBalanceList = UtilMisc.sortMaps(transactionTotalsMap.values().asList(), UtilMisc.toList("accountCode")); +// expenses are accounts of class DEBIT: the balance is given by debits minus credits +balanceTotal = balanceTotalDebit.subtract(balanceTotalCredit); +} +depreciation = balanceTotal; + // INCOME // account balances accountBalanceList = []; @@ -282,6 +325,9 @@ balanceTotalList.add(UtilMisc.toMap("tot // OPERATING EXPENSES context.sgaExpense = sgaExpense; balanceTotalList.add(UtilMisc.toMap("totalName", "AccountingOperatingExpenses", "balance", context.sgaExpense)); +// DEPRECIATION +context.depreciation = depreciation; +balanceTotalList.add(UtilMisc.toMap("totalName", "AccountingDepreciation", "balance", context.depreciation)); // INCOME FROM OPERATIONS = GROSS MARGIN - OPERATING EXPENSES context.incomeFromOperations = (context.grossMargin).subtract(context.sgaExpense); balanceTotalList.add(UtilMisc.toMap("totalName", "AccountingIncomeFromOperations", "balance", context.incomeFromOperations)); Modified: ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=1006056&r1=1006055&r2=1006056&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original) +++ ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/controller.xml Fri Oct 8 22:41:27 2010 @@ -2156,6 +2156,11 @@ under the License. <response name="success" type="view" value="paymentOverview"/> <response name="error" type="view" value="paymentOverview"/> </request-map> + <request-map uri="PaymentAcctgTransEntriesPdf"> + <security https="true" auth="true"/> + <event type="groovy" path="component://accounting/webapp/accounting/WEB-INF/actions/reports/PaymentAcctgTransEntryParameters.groovy"/> + <response name="success" type="view" value="PaymentAcctgTransEntriesPdf"/> + </request-map> <!-- ================ Entity Lookup Requests ================= --> <request-map uri="LookupProduct"><security auth="true" https="true"/><response name="success" type="view" value="LookupProduct"/></request-map> @@ -2201,6 +2206,12 @@ under the License. <response name="success" type="view" value="PrintInvoices"/> </request-map> + <request-map uri="InvoiceAcctgTransEntriesPdf"> + <security https="true" auth="true"/> + <event type="groovy" path="component://accounting/webapp/accounting/WEB-INF/actions/reports/InvoiceAcctgTransEntryParameters.groovy"/> + <response name="success" type="view" value="InvoiceAcctgTransEntriesPdf"/> + </request-map> + <!--Global GL Settings --> <request-map uri="globalGLSettings"> <security auth="true" https="true"/> @@ -2370,6 +2381,12 @@ under the License. <response name="success" type="view" value="AcctgTransEntriesSearchResultsPdf"/> </request-map> + <request-map uri="AcctgTransEntriesSearchResultsInvoiceAndPaymentPdf.pdf"> + <security auth="true" https="true"/> + <event type="groovy" path="component://accounting/webapp/accounting/WEB-INF/actions/reports/AcctgTransEntriesSearchResultsParameters.groovy"/> + <response name="success" type="view" value="AcctgTransEntriesSearchResultsInvoiceAndPaymentPdf"/> + </request-map> + <request-map uri="AcctgTransSearchResultsCsv.csv"> <security https="true" auth="true"/> <response name="success" type="view" value="AcctgTransSearchResultsCsv"/> @@ -2392,6 +2409,7 @@ under the License. <request-map uri="IncomeStatementListPdf.pdf"> <security https="true" auth="true"/> + <event type="groovy" path="component://accounting/webapp/accounting/WEB-INF/actions/reports/IncomeStatementParameters.groovy"/> <response name="success" type="view" value="IncomeStatementListPdf"/> </request-map> @@ -2407,11 +2425,13 @@ under the License. <request-map uri="BalanceSheet.pdf"> <security auth="true" https="true"/> + <event type="groovy" path="component://accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheetParameters.groovy"/> <response name="success" type="view" value="BalanceSheetPdf"/> </request-map> <request-map uri="TrialBalanceSearchResultsPdf.pdf"> <security https="true" auth="true"/> + <event type="groovy" path="component://accounting/webapp/accounting/WEB-INF/actions/reports/TrialBalanceParameters.groovy"/> <response name="success" type="view" value="TrialBalanceSearchResultsPdf"/> </request-map> @@ -2587,6 +2607,7 @@ under the License. <view-map name="PrintChecks" type="screenfop" page="component://accounting/widget/PaymentScreens.xml#PrintChecks" content-type="application/pdf" encoding="none"/> <view-map name="FindSalesInvoicesByDueDate" type="screen" page="component://accounting/widget/PaymentScreens.xml#FindSalesInvoicesByDueDate"/> <view-map name="FindPurchaseInvoicesByDueDate" type="screen" page="component://accounting/widget/PaymentScreens.xml#FindPurchaseInvoicesByDueDate"/> + <view-map name="PaymentAcctgTransEntriesPdf" type="birt" page="component://accounting/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign" content-type="application/pdf" encoding="none"/> <!-- Payment Group --> <view-map name="FindPaymentGroup" type="screen" page="component://accounting/widget/PaymentGroupScreens.xml#FindPaymentGroup"/> @@ -2788,22 +2809,23 @@ under the License. <view-map name="InvoicePDF" type="screenfop" page="component://accounting/widget/AccountingPrintScreens.xml#InvoicePDF" content-type="application/pdf" encoding="none"/> <view-map name="PrintCheckPDF" type="screenfop" page="component://accounting/widget/AccountingPrintScreens.xml#PrintCheckPDF" content-type="application/pdf" encoding="none"/> <view-map name="PrintInvoices" type="screenfop" page="component://accounting/widget/AccountingPrintScreens.xml#PrintInvoices" content-type="application/pdf" encoding="none"/> + <view-map name="InvoiceAcctgTransEntriesPdf" type="birt" page="component://accounting/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign" content-type="application/pdf" encoding="none"/> <!-- Financial Summary Reports --> <view-map name="FinancialSummaryReportOptions" type="screen" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#FinancialSummaryReportOptions"/> <view-map name="SalesInvoiceByProductCategorySummary" type="screen" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#SalesInvoiceByProductCategorySummary"/> <view-map name="TrialBalance" type="screen" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#TrialBalance"/> - <view-map name="TrialBalanceSearchResultsPdf" type="screenfop" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#TrialBalanceSearchResultsPdf" content-type="application/pdf" encoding="none"/> + <view-map name="TrialBalanceSearchResultsPdf" type="birt" page="component://accounting/webapp/accounting/reports/TrialBalance.rptdesign" content-type="application/pdf" encoding="none"/> <view-map name="TrialBalanceSearchResultsCsv" type="screencsv" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#TrialBalanceSearchResultsCsv" content-type="text/csv" encoding="none"/> <view-map name="IncomeStatement" type="screen" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#IncomeStatement"/> - <view-map name="IncomeStatementListPdf" type="screenfop" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#IncomeStatementListPdf" content-type="application/pdf" encoding="none"/> + <view-map name="IncomeStatementListPdf" type="birt" page="component://accounting/webapp/accounting/reports/IncomeStatement.rptdesign" content-type="application/pdf" encoding="none"/> <view-map name="IncomeStatementListCsv" type="screencsv" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#IncomeStatementListCsv" content-type="text/csv" encoding="none"/> <view-map name="ComparativeIncomeStatement" type="screen" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#ComparativeIncomeStatement"/> <view-map name="ComparativeIncomeStatementsPdf" type="screenfop" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#ComparativeIncomeStatementsPdf" content-type="application/pdf" encoding="none"/> <view-map name="ComparativeIncomeStatementsCsv" type="screencsv" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#ComparativeIncomeStatementsCsv" content-type="text/csv" encoding="none"/> <view-map name="BalanceSheet" type="screen" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#BalanceSheet"/> <view-map name="BalanceSheetCsv" type="screencsv" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#BalanceSheetCsv" content-type="text/csv" encoding="none"/> - <view-map name="BalanceSheetPdf" type="screenfop" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#BalanceSheetPdf" content-type="application/pdf" encoding="none"/> + <view-map name="BalanceSheetPdf" type="birt" page="component://accounting/webapp/accounting/reports/BalanceSheet.rptdesign" content-type="application/pdf" encoding="none"/> <view-map name="ComparativeBalanceSheet" type="screen" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#ComparativeBalanceSheet"/> <view-map name="ComparativeBalanceSheetPdf" type="screenfop" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#ComparativeBalanceSheetPdf" content-type="application/pdf" encoding="none"/> <view-map name="ComparativeBalanceSheetCsv" type="screencsv" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#ComparativeBalanceSheetCsv" content-type="text/csv" encoding="none"/> @@ -2842,6 +2864,7 @@ under the License. <view-map name="FixedAssetGeoLocation" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#FixedAssetGeoLocation"/> <view-map name="AcctgTransEntriesSearchResultsCsv" type="screencsv" page="component://accounting/widget/GlScreens.xml#AcctgTransEntriesSearchResultsCsv" content-type="text/csv" encoding="none"/> <view-map name="AcctgTransEntriesSearchResultsPdf" type="screenfop" page="component://accounting/widget/GlScreens.xml#AcctgTransEntriesSearchResultsPdf" content-type="application/pdf" encoding="none"/> + <view-map name="AcctgTransEntriesSearchResultsInvoiceAndPaymentPdf" type="birt" page="component://accounting/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign" content-type="application/pdf" encoding="none"/> <view-map name="AcctgTransSearchResultsCsv" type="screencsv" page="component://accounting/widget/GlScreens.xml#AcctgTransSearchResultsCsv" content-type="text/csv" encoding="none"/> <view-map name="AcctgTransSearchResultPdf" type="screenfop" page="component://accounting/widget/GlScreens.xml#AcctgTransSearchResultPdf" content-type="application/pdf" encoding="none"/> Modified: ofbiz/branches/jquery/applications/accounting/webapp/accounting/invoice/invoiceReportItems.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/webapp/accounting/invoice/invoiceReportItems.fo.ftl?rev=1006056&r1=1006055&r2=1006056&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/webapp/accounting/invoice/invoiceReportItems.fo.ftl (original) +++ ofbiz/branches/jquery/applications/accounting/webapp/accounting/invoice/invoiceReportItems.fo.ftl Fri Oct 8 22:41:27 2010 @@ -70,20 +70,20 @@ under the License. <fo:table-column column-width="25mm"/> <fo:table-header height="14px"> - <fo:table-row> - <fo:table-cell border-bottom-style="solid" border-bottom-width="thin" border-bottom-color="black"> + <fo:table-row border-bottom-style="solid" border-bottom-width="thin" border-bottom-color="black"> + <fo:table-cell> <fo:block font-weight="bold">${uiLabelMap.AccountingProduct}</fo:block> </fo:table-cell> - <fo:table-cell border-bottom-style="solid" border-bottom-width="thin" border-bottom-color="black"> + <fo:table-cell> <fo:block font-weight="bold">${uiLabelMap.CommonDescription}</fo:block> </fo:table-cell> - <fo:table-cell border-bottom-style="solid" border-bottom-width="thin" border-bottom-color="black"> + <fo:table-cell> <fo:block font-weight="bold" text-align="right">${uiLabelMap.CommonQty}</fo:block> </fo:table-cell> - <fo:table-cell border-bottom-style="solid" border-bottom-width="thin" border-bottom-color="black"> + <fo:table-cell> <fo:block font-weight="bold" text-align="right">${uiLabelMap.AccountingUnitPrice}</fo:block> </fo:table-cell> - <fo:table-cell border-bottom-style="solid" border-bottom-width="thin" border-bottom-color="black"> + <fo:table-cell> <fo:block font-weight="bold" text-align="right">${uiLabelMap.CommonAmount}</fo:block> </fo:table-cell> </fo:table-row> Modified: ofbiz/branches/jquery/applications/accounting/widget/AccountingMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/widget/AccountingMenus.xml?rev=1006056&r1=1006055&r2=1006056&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/widget/AccountingMenus.xml (original) +++ ofbiz/branches/jquery/applications/accounting/widget/AccountingMenus.xml Fri Oct 8 22:41:27 2010 @@ -338,6 +338,20 @@ under the License. <parameter param-name="invoiceId" from-field="invoice.invoiceId"/> </link> </menu-item> + <menu-item name="acctgTransEntriesPdf" title="Acctg Trans Entries PDF"> + <condition> + <and> + <not><if-empty field="invoice.invoiceId"/></not> + <or> + <if-compare field="invoice.statusId" operator="equals" value="INVOICE_READY"/> + <if-compare field="invoice.statusId" operator="equals" value="INVOICE_PAID"/> + </or> + </and> + </condition> + <link target="InvoiceAcctgTransEntriesPdf"> + <parameter param-name="invoiceId" from-field="invoice.invoiceId"/> + </link> + </menu-item> </menu> <menu name="PaymentTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> @@ -472,6 +486,20 @@ under the License. <parameter param-name="paymentId" from-field="payment.paymentId"/> </link> </menu-item> + <menu-item name="acctgTransEntriesPDF" title="Acctg Trans Entries PDF"> + <condition> + <and> + <not><if-empty field="payment.paymentId"/></not> + <or> + <if-compare field="payment.statusId" operator="equals" value="PMNT_RECEIVED"/> + <if-compare field="payment.statusId" operator="equals" value="PMNT_SENT"/> + </or> + </and> + </condition> + <link target="PaymentAcctgTransEntriesPdf"> + <parameter param-name="paymentId" from-field="payment.paymentId"/> + </link> + </menu-item> </menu> <menu name="PaymentGroupTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> Modified: ofbiz/branches/jquery/applications/accounting/widget/GlScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/widget/GlScreens.xml?rev=1006056&r1=1006055&r2=1006056&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/widget/GlScreens.xml (original) +++ ofbiz/branches/jquery/applications/accounting/widget/GlScreens.xml Fri Oct 8 22:41:27 2010 @@ -195,6 +195,23 @@ under the License. <parameter param-name="thruDate" from-field="parameters.thruDate"/> <parameter param-name="paymentId" from-field="parameters.paymentId"/> </link> + <link text="${uiLabelMap.AccountingExportWithInvoiceAndPaymentAsPdf}" style="buttontext" target="AcctgTransEntriesSearchResultsInvoiceAndPaymentPdf.pdf"> + <parameter param-name="organizationPartyId"/> + <parameter param-name="produtId" from-field="parameters.produtId"/> + <parameter param-name="isPosted" from-field="parameters.isPosted"/> + <parameter param-name="invoiceId" from-field="parameters.invoiceId"/> + <parameter param-name="acctgTransId" from-field="parameters.acctgTransId"/> + <parameter param-name="glFiscalTypeId" from-field="parameters.glFiscalTypeId"/> + <parameter param-name="glAccountId" from-field="parameters.glAccountId"/> + <parameter param-name="shipmentId" from-field="parameters.shipmentId"/> + <parameter param-name="acctgTransTypeId" from-field="parameters.acctgTransTypeId"/> + <parameter param-name="fromDate" from-field="parameters.fromDate"/> + <parameter param-name="workEffortId" from-field="parameters.workEffortId"/> + <parameter param-name="glJournalId" from-field="parameters.glJournalId"/> + <parameter param-name="partyId" from-field="parameters.partyId"/> + <parameter param-name="thruDate" from-field="parameters.thruDate"/> + <parameter param-name="paymentId" from-field="parameters.paymentId"/> + </link> <include-form name="ListFindAcctgTransEntriesByAccount" location="component://accounting/widget/GlForms.xml"/> </screenlet> </widgets> Modified: ofbiz/branches/jquery/applications/accounting/widget/InvoiceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/widget/InvoiceForms.xml?rev=1006056&r1=1006055&r2=1006056&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/widget/InvoiceForms.xml (original) +++ ofbiz/branches/jquery/applications/accounting/widget/InvoiceForms.xml Fri Oct 8 22:41:27 2010 @@ -42,6 +42,7 @@ under the License. <field position="2" name="partyIdTo" parameter-name="partyId"><lookup target-form-name="LookupPartyName"/></field> <field name="billingAccountId"><lookup target-form-name="LookupBillingAccount"/></field> <field name="invoiceDate"><date-find type="date"/></field> + <field name="referenceNumber"><text-find/></field> <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> @@ -134,6 +135,7 @@ under the License. <field position="2" name="dueDate"><display description="${bsh:if(invoice.get("dueDate")!=null)return(invoice.getString("dueDate").substring(0,10));}"/></field> <field position="1" name="total"><display description="${total}" type="currency" currency="${invoice.currencyUomId}"/></field> <field position="2" name="paidDate"><display description="${bsh:if(invoice.get("paidDate")!=null)return(invoice.getString("paidDate").substring(0,10));}"/></field> + <field position="1" name="referenceNumber"><display/></field> <field name="currencyUomId"><hidden/></field> </form> @@ -338,6 +340,7 @@ under the License. </field> <field position="2" name="recurrenceInfoId"><text size="10"/></field> <field position="1" name="invoiceMessage" encode-output="false"><text size="100"/></field> + <field position="1" name="referenceNumber"><text/></field> <!--field position="2" name="invoiceAmount" use-when="invoiceId!=null"><display/></field--> <field position="1" name="updateButton" widget-style="smallSubmit" use-when="invoice!=null&&invoice.getString("statusId").equals("INVOICE_IN_PROCESS")"> <submit button-type="button"/> Modified: ofbiz/branches/jquery/applications/accounting/widget/PaymentMethodTypeForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/widget/PaymentMethodTypeForms.xml?rev=1006056&r1=1006055&r2=1006056&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/widget/PaymentMethodTypeForms.xml (original) +++ ofbiz/branches/jquery/applications/accounting/widget/PaymentMethodTypeForms.xml Fri Oct 8 22:41:27 2010 @@ -22,7 +22,7 @@ under the License. xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> <form name="ListPaymentMethodType" type="list" target="updatePaymentMethodType" list-name="paymentMethodTypes" - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="editPaymentMethodType"> <field name="paymentMethodTypeId"><display/></field> <field name="description"><display/></field> <field name="defaultGlAccountId" parameter-name="defaultGlAccountId"> Modified: ofbiz/branches/jquery/applications/accounting/widget/ReportFinancialSummaryForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/widget/ReportFinancialSummaryForms.xml?rev=1006056&r1=1006055&r2=1006056&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/widget/ReportFinancialSummaryForms.xml (original) +++ ofbiz/branches/jquery/applications/accounting/widget/ReportFinancialSummaryForms.xml Fri Oct 8 22:41:27 2010 @@ -557,6 +557,9 @@ under the License. <order-by field-name="accountCode"/> </entity-condition> </actions> + <row-actions> + <set field="totalEndingBalance" from-field="totalEndingBalance" default-value="${totalPostedDebits - totalPostedCredits}" type="BigDecimal"/> + </row-actions> <field name="accountCode"> <hyperlink target="FindAcctgTransEntries" description="${accountCode}"> <parameter param-name="glAccountId"/> Modified: ofbiz/branches/jquery/applications/content/data/BlogSeedData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/data/BlogSeedData.xml?rev=1006056&r1=1006055&r2=1006056&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/data/BlogSeedData.xml (original) +++ ofbiz/branches/jquery/applications/content/data/BlogSeedData.xml Fri Oct 8 22:41:27 2010 @@ -19,16 +19,24 @@ under the License. --> <entity-engine-xml> + +<Content contentId="BLOGROOT" contentTypeId="WEB_SITE_PUB_PT" + ownerContentId="" + contentName="Blog Root" + description="Blog Root" + childBranchCount="1" + childLeafCount="1"/> + <ContentPurposeOperation contentPurposeTypeId="_NA_" contentOperationId="CONTENT_ADMIN" roleTypeId="CONTENT_ADMIN" statusId="_NA_" privilegeEnumId="CNT_PRV_NA_"/> <ContentPurposeOperation contentPurposeTypeId="_NA_" contentOperationId="CONTENT_UPDATE" roleTypeId="CONTENT_ADMIN" statusId="_NA_" privilegeEnumId="CNT_PRV_NA_"/> <ContentPurposeOperation contentPurposeTypeId="RESPONSE" contentOperationId="CONTENT_CREATE" roleTypeId="_NA_" statusId="_NA_" privilegeEnumId="CNT_PRV_NA_"/> - <DataResource dataResourceId="BLOG_TPL_TOPLEFT" dataResourceTypeId="URL_RESOURCE" dataTemplateTypeId="SCREEN_COMBINED" dataResourceName="Float left" mimeTypeId="text/html" createdDate="2004-01-16 01:24:06.522" createdByUserLogin="admin" lastModifiedDate="2004-01-16 19:20:58.891" lastModifiedByUserLogin="admin" objectInfo="component://ecommerce/widget/blog/BlogTemplates.xml#FloatLeft"/> - <DataResource dataResourceId="BLOG_TPL_TOPCENTER" dataResourceTypeId="URL_RESOURCE" dataTemplateTypeId="SCREEN_COMBINED" dataResourceName="Top centered" mimeTypeId="text/html" createdDate="2004-01-16 01:24:06.522" createdByUserLogin="admin" lastModifiedDate="2004-01-16 19:20:58.891" lastModifiedByUserLogin="admin" objectInfo="component://ecommerce/widget/blog/BlogTemplates.xml#TopCenter"/> + <DataResource dataResourceId="BLOG_TPL_TOPLEFT" dataResourceTypeId="URL_RESOURCE" dataTemplateTypeId="SCREEN_COMBINED" dataResourceName="Float left" mimeTypeId="text/html" createdDate="2004-01-16 01:24:06.522" lastModifiedDate="2004-01-16 19:20:58.891" objectInfo="component://ecommerce/widget/blog/BlogTemplates.xml#FloatLeft"/> + <DataResource dataResourceId="BLOG_TPL_TOPCENTER" dataResourceTypeId="URL_RESOURCE" dataTemplateTypeId="SCREEN_COMBINED" dataResourceName="Top centered" mimeTypeId="text/html" createdDate="2004-01-16 01:24:06.522" lastModifiedDate="2004-01-16 19:20:58.891" objectInfo="component://ecommerce/widget/blog/BlogTemplates.xml#TopCenter"/> - <DataResource dataResourceId="ECOM_BLANK" dataResourceTypeId="URL_RESOURCE" dataTemplateTypeId="SCREEN_COMBINED" dataResourceName="Plain Decorator" mimeTypeId="text/html" dataCategoryId="TEMPLATE" createdDate="2004-01-16 01:24:06.522" createdByUserLogin="admin" lastModifiedDate="2004-01-16 19:20:58.891" lastModifiedByUserLogin="admin" objectInfo="component://ecommerce/widget/CommonScreens.xml#CommonEmptyDecorator"/> - <DataResource dataResourceId="ECOM_LEFT" dataResourceTypeId="URL_RESOURCE" dataTemplateTypeId="SCREEN_COMBINED" dataResourceName="Left Decorator" mimeTypeId="text/html" dataCategoryId="TEMPLATE" createdDate="2004-01-16 01:24:06.522" createdByUserLogin="admin" lastModifiedDate="2004-01-16 19:20:58.891" lastModifiedByUserLogin="admin" objectInfo="component://ecommerce/widget/CommonScreens.xml#CommonLeftDecorator"/> - <DataResource dataResourceId="ECOM_RIGHT" dataResourceTypeId="URL_RESOURCE" dataTemplateTypeId="SCREEN_COMBINED" dataResourceName="Right Decorator" mimeTypeId="text/html" dataCategoryId="TEMPLATE" createdDate="2004-01-16 01:24:06.522" createdByUserLogin="admin" lastModifiedDate="2004-01-16 19:20:58.891" lastModifiedByUserLogin="admin" objectInfo="component://ecommerce/widget/CommonScreens.xml#CommonRightDecorator"/> - <DataResource dataResourceId="ECOM_LEFTRIGHT" dataResourceTypeId="URL_RESOURCE" dataTemplateTypeId="SCREEN_COMBINED" dataResourceName="Left/Right Decorator" mimeTypeId="text/html" dataCategoryId="TEMPLATE" createdDate="2004-01-16 01:24:06.522" createdByUserLogin="admin" lastModifiedDate="2004-01-16 19:20:58.891" lastModifiedByUserLogin="admin" objectInfo="component://ecommerce/widget/CommonScreens.xml#CommonLeftRightDecorator"/> + <DataResource dataResourceId="ECOM_BLANK" dataResourceTypeId="URL_RESOURCE" dataTemplateTypeId="SCREEN_COMBINED" dataResourceName="Plain Decorator" mimeTypeId="text/html" dataCategoryId="TEMPLATE" createdDate="2004-01-16 01:24:06.522" lastModifiedDate="2004-01-16 19:20:58.891" objectInfo="component://ecommerce/widget/CommonScreens.xml#CommonEmptyDecorator"/> + <DataResource dataResourceId="ECOM_LEFT" dataResourceTypeId="URL_RESOURCE" dataTemplateTypeId="SCREEN_COMBINED" dataResourceName="Left Decorator" mimeTypeId="text/html" dataCategoryId="TEMPLATE" createdDate="2004-01-16 01:24:06.522" lastModifiedDate="2004-01-16 19:20:58.891" objectInfo="component://ecommerce/widget/CommonScreens.xml#CommonLeftDecorator"/> + <DataResource dataResourceId="ECOM_RIGHT" dataResourceTypeId="URL_RESOURCE" dataTemplateTypeId="SCREEN_COMBINED" dataResourceName="Right Decorator" mimeTypeId="text/html" dataCategoryId="TEMPLATE" createdDate="2004-01-16 01:24:06.522" lastModifiedDate="2004-01-16 19:20:58.891" objectInfo="component://ecommerce/widget/CommonScreens.xml#CommonRightDecorator"/> + <DataResource dataResourceId="ECOM_LEFTRIGHT" dataResourceTypeId="URL_RESOURCE" dataTemplateTypeId="SCREEN_COMBINED" dataResourceName="Left/Right Decorator" mimeTypeId="text/html" dataCategoryId="TEMPLATE" createdDate="2004-01-16 01:24:06.522" lastModifiedDate="2004-01-16 19:20:58.891" objectInfo="component://ecommerce/widget/CommonScreens.xml#CommonLeftRightDecorator"/> </entity-engine-xml> Modified: ofbiz/branches/jquery/applications/content/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/ofbiz-component.xml?rev=1006056&r1=1006055&r2=1006056&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/ofbiz-component.xml (original) +++ ofbiz/branches/jquery/applications/content/ofbiz-component.xml Fri Oct 8 22:41:27 2010 @@ -34,7 +34,7 @@ under the License. <entity-resource type="data" reader-name="seed" loader="main" location="data/MimeTypeData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/MimeTypeTemplate.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/DataCategoryData.xml"/> - <entity-resource type="data" reader-name="seed" loader="main" location="data/SeedBlogData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/BlogSeedData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/TemplateData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/ContentSecurityData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/MiscData.xml"/> @@ -46,7 +46,6 @@ under the License. <entity-resource type="data" reader-name="seed" loader="main" location="data/WebtoolsHelpData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/ExampleHelpData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/BirtHelpData.xml"/> - <entity-resource type="data" reader-name="seed" loader="main" location="data/BlogSeedData.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/UsersDemoData.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoBlogPubPtData.xml"/> Modified: ofbiz/branches/jquery/applications/order/config/OrderUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/config/OrderUiLabels.xml?rev=1006056&r1=1006055&r2=1006056&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/config/OrderUiLabels.xml (original) +++ ofbiz/branches/jquery/applications/order/config/OrderUiLabels.xml Fri Oct 8 22:41:27 2010 @@ -8194,7 +8194,7 @@ <value xml:lang="it">Contenuto</value> <value xml:lang="pt_BR">Conteúdo</value> <value xml:lang="zh">å 容</value> - </property> + </property> <property key="OrderRequestCreatedDate"> <value xml:lang="de">Erstellungsdatum</value> <value xml:lang="en">Created Date</value> @@ -8209,6 +8209,10 @@ <value xml:lang="zh">å建æ¥æ</value> <value xml:lang="zh_CN">å建æ¥æ</value> </property> + <property key="OrderRequestCreatedFromShoppingCart"> + <value xml:lang="en">Request created from shopping cart</value> + <value xml:lang="fr">Demande de devis créée depuis le panier</value> + </property> <property key="OrderRequestDate"> <value xml:lang="de">Anfragedatum</value> <value xml:lang="en">Request Date</value> Propchange: ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Oct 8 22:41:27 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-1002466 +/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-1006054 Modified: ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml?rev=1006056&r1=1006055&r2=1006056&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml (original) +++ ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml Fri Oct 8 22:41:27 2010 @@ -341,6 +341,10 @@ under the License. <set value="RF_QUOTE" field="createCustRequestInMap.custRequestTypeId"/> <set value="CRQ_SUBMITTED" field="createCustRequestInMap.statusId"/> <set field="createCustRequestInMap.custRequestName" from-field="parameters.custRequestName"/> + <if-empty field="createCustRequestInMap.custRequestName"> + <property-to-field resource="OrderUiLabels" property="OrderRequestCreatedFromShoppingCart" field="custRequestName"/> + <set field="createCustRequestInMap.custRequestName" from-field="custRequestName"/> + </if-empty> <call-object-method obj-field="parameters.cart" method-name="getCurrency" ret-field="createCustRequestInMap.maximumAmountUomId"/> <call-object-method obj-field="parameters.cart" method-name="getProductStoreId" ret-field="createCustRequestInMap.productStoreId"/> <call-object-method obj-field="parameters.cart" method-name="getChannelType" ret-field="createCustRequestInMap.salesChannelEnumId"/> Modified: ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java?rev=1006056&r1=1006055&r2=1006056&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java (original) +++ ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java Fri Oct 8 22:41:27 2010 @@ -504,7 +504,7 @@ public class ShoppingCart implements Ite if (sci.equals(productId, reservStart, reservLength, reservPersons, accommodationMapId, accommodationSpotId, features, attributes, prodCatalogId,selectedAmount, configWrapper, itemType, itemGroup, false)) { BigDecimal newQuantity = sci.getQuantity().add(quantity); try { - BigDecimal minQuantity = getMinimumOrderQuantity(delegator,sci.getBasePrice(), productId); + BigDecimal minQuantity = getMinimumOrderQuantity(getDelegator(),sci.getBasePrice(), productId); if(newQuantity.compareTo(minQuantity) < 0) { newQuantity = minQuantity; } @@ -549,7 +549,7 @@ public class ShoppingCart implements Ite } } else { try { - BigDecimal minQuantity = getMinimumOrderQuantity(delegator,null, productId); + BigDecimal minQuantity = getMinimumOrderQuantity(getDelegator(),null, productId); if(quantity.compareTo(minQuantity) < 0) { quantity = minQuantity; } @@ -4374,6 +4374,7 @@ public class ShoppingCart implements Ite public List<GenericValue> shipTaxAdj = FastList.newInstance(); public String orderTypeId = null; private String internalContactMechId = null; + public String telecomContactMechId = null; public String shipmentMethodTypeId = null; public String supplierPartyId = null; public String carrierRoleTypeId = null; @@ -4459,6 +4460,7 @@ public class ShoppingCart implements Ite shipGroup.set("shippingInstructions", shippingInstructions); shipGroup.set("giftMessage", giftMessage); shipGroup.set("contactMechId", this.internalContactMechId); + shipGroup.set("telecomContactMechId", this.telecomContactMechId); shipGroup.set("maySplit", maySplit); shipGroup.set("isGift", isGift); shipGroup.set("shipGroupSeqId", shipGroupSeqId); Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/shipGroups.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/shipGroups.fo.ftl?rev=1006056&r1=1006055&r2=1006056&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/shipGroups.fo.ftl (original) +++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/shipGroups.fo.ftl Fri Oct 8 22:41:27 2010 @@ -81,7 +81,7 @@ under the License. </fo:block> <#if data.phoneNumber?exists> - <fo:block>(${data.phoneNumber.areaCode}) ${data.phoneNumber.contactNumber}</fo:block> + <fo:block><#if data.phoneNumber.areaCode?exists>(${data.phoneNumber.areaCode}) </#if>${data.phoneNumber.contactNumber}</fo:block> </#if> </fo:table-cell> </fo:table-row> Modified: ofbiz/branches/jquery/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java?rev=1006056&r1=1006055&r2=1006056&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java (original) +++ ofbiz/branches/jquery/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java Fri Oct 8 22:41:27 2010 @@ -668,7 +668,7 @@ public class CommunicationEventServices Address[] addressesTo = wrapper.getTo(); Address[] addressesCC = wrapper.getCc(); Address[] addressesBCC = wrapper.getBcc(); - String messageId = wrapper.getMessageId(); + String messageId = wrapper.getMessageId().replaceAll("[<>]", "");; String aboutThisEmail = "message [" + messageId + "] from [" + (addressesFrom[0] == null? "not found" : addressesFrom[0].toString()) + "] to [" + @@ -794,7 +794,7 @@ public class CommunicationEventServices if (inReplyTo != null && inReplyTo[0] != null) { GenericValue parentCommEvent = null; try { - List<GenericValue> events = delegator.findByAnd("CommunicationEvent", UtilMisc.toMap("messageId", inReplyTo[0])); + List<GenericValue> events = delegator.findByAnd("CommunicationEvent", UtilMisc.toMap("messageId", inReplyTo[0].replaceAll("[<>]", ""))); parentCommEvent = EntityUtil.getFirst(events); } catch (GenericEntityException e) { Debug.logError(e, module); @@ -854,7 +854,8 @@ public class CommunicationEventServices headerString.append(System.getProperty("line.separator")); headerString.append(headerLines.nextElement()); } - commEventMap.put("headerString", headerString.toString()); + String header = headerString.toString(); + commEventMap.put("headerString", header.replaceAll("[<>]", "")); result = dispatcher.runSync("createCommunicationEvent", commEventMap); communicationEventId = (String)result.get("communicationEventId"); Modified: ofbiz/branches/jquery/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java?rev=1006056&r1=1006055&r2=1006056&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java (original) +++ ofbiz/branches/jquery/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java Fri Oct 8 22:41:27 2010 @@ -907,8 +907,14 @@ public class ContactMechWorker { GenericValue geo = delegator.findByPrimaryKeyCache("Geo", UtilMisc.toMap("geoId", postalAddress.getString("countryGeoId") + "-" + postalAddress.getString("postalCode"))); if (geo != null) { // save the value to the database for quicker future reference - postalAddress.set("postalCodeGeoId", geo.getString("geoId")); - postalAddress.store(); + if (postalAddress.isMutable()) { + postalAddress.set("postalCodeGeoId", geo.getString("geoId")); + postalAddress.store(); + } else { + GenericValue mutablePostalAddress = delegator.findByPrimaryKey("PostalAddress", UtilMisc.toMap("contactMechId", postalAddress.getString("contactMechId"))); + mutablePostalAddress.set("postalCodeGeoId", geo.getString("geoId")); + mutablePostalAddress.store(); + } return geo.getString("geoId"); } @@ -919,8 +925,14 @@ public class ContactMechWorker { GenericValue geoAssocAndGeoTo = EntityUtil.getFirst(geoAssocAndGeoToList); if (geoAssocAndGeoTo != null) { // save the value to the database for quicker future reference - postalAddress.set("postalCodeGeoId", geoAssocAndGeoTo.getString("geoId")); - postalAddress.store(); + if (postalAddress.isMutable()) { + postalAddress.set("postalCodeGeoId", geoAssocAndGeoTo.getString("geoId")); + postalAddress.store(); + } else { + GenericValue mutablePostalAddress = delegator.findByPrimaryKey("PostalAddress", UtilMisc.toMap("contactMechId", postalAddress.getString("contactMechId"))); + mutablePostalAddress.set("postalCodeGeoId", geoAssocAndGeoTo.getString("geoId")); + mutablePostalAddress.store(); + } return geoAssocAndGeoTo.getString("geoId"); } Propchange: ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Oct 8 22:41:27 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-1002466 +/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-1006054 Modified: ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/price/PriceServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/price/PriceServices.xml?rev=1006056&r1=1006055&r2=1006056&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/price/PriceServices.xml (original) +++ ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/price/PriceServices.xml Fri Oct 8 22:41:27 2010 @@ -249,4 +249,116 @@ under the License. <find-by-primary-key entity-name="ProductPriceAction" map="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-field="lookedUpValue"/> </simple-method> + + <simple-method method-name="getAssociatedPriceRulesConds" short-description="Set the Value options for selected Price Rule Condition Input" login-required="false"> + <if> + <condition> + <or> + <if-compare field="parameters.inputParamEnumId" operator="equals" value="PRIP_QUANTITY"/> + <if-compare field="parameters.inputParamEnumId" operator="equals" value="PRIP_LIST_PRICE"/> + </or> + </condition> + <then> + <return/> + </then> + </if> + + <if-compare field="parameters.inputParamEnumId" operator="equals" value="PRIP_PRODUCT_ID"> + <entity-condition entity-name="Product" list="condValues"> + <!-- May prove more useful rather than an entity-and in custom cases--> + </entity-condition> + <iterate list="condValues" entry="condValue"> + <set field="option" value="${condValue.internalName}: ${condValue.productId}"/> + <field-to-list list="productPriceRulesCondValues" field="option"/> + </iterate> + </if-compare> + <if-compare field="parameters.inputParamEnumId" operator="equals" value="PRIP_PROD_CAT_ID"> + <entity-condition entity-name="ProductCategory" list="condValues"> + <!-- May prove more useful rather than an entity-and in custom cases--> + </entity-condition> + <iterate list="condValues" entry="condValue"> + <set field="option" value="${condValue.categoryName} ${condValue.description} ${groovy: condValue?.longDescription?.substring(0,10)} [${condValue.productCategoryId}]: ${condValue.productCategoryId}"/> + <field-to-list list="productPriceRulesCondValues" field="option"/> + </iterate> + </if-compare> + <if-compare field="parameters.inputParamEnumId" operator="equals" value="PRIP_PROD_FEAT_ID"> + <entity-condition entity-name="ProductFeatureType" list="condValues"> + <!-- May prove more useful rather than an entity-and in custom cases--> + </entity-condition> + <iterate list="condValues" entry="condValue"> + <set field="option" value="${condValue.description}: ${condValue.productFeatureTypeId}"/> + <field-to-list list="productPriceRulesCondValues" field="option"/> + </iterate> + </if-compare> + <if> + <condition> + <or> + <if-compare field="parameters.inputParamEnumId" operator="equals" value="PRIP_PARTY_ID"/> + <if-compare field="parameters.inputParamEnumId" operator="equals" value="PRIP_PARTY_GRP_MEM"/> + </or> + </condition> + <then> + <entity-condition entity-name="PartyNameView" list="condValues"/> + <iterate list="condValues" entry="condValue"> + <set field="option" value="${condValue.firstName} ${condValue.lastName}${condValue.groupName}: ${condValue.partyId}"/> + <field-to-list list="productPriceRulesCondValues" field="option"/> + </iterate> + </then> + </if> + <if-compare field="parameters.inputParamEnumId" operator="equals" value="PRIP_PARTY_CLASS"> + <entity-condition entity-name="PartyClassificationGroup" list="condValues"> + <!-- May prove more useful rather than an entity-and in custom cases--> + </entity-condition> + <iterate list="condValues" entry="condValue"> + <set field="option" value="${condValue.description}: ${condValue.partyClassificationGroupId}"/> + <field-to-list list="productPriceRulesCondValues" field="option"/> + </iterate> + </if-compare> + <if-compare field="parameters.inputParamEnumId" operator="equals" value="PRIP_ROLE_TYPE"> + <entity-condition entity-name="RoleType" list="condValues"> + <!-- May prove more useful rather than an entity-and in custom cases--> + </entity-condition> + <iterate list="condValues" entry="condValue"> + <set field="option" value="${condValue.description}: ${condValue.roleTypeId}"/> + <field-to-list list="productPriceRulesCondValues" field="option"/> + </iterate> + </if-compare> + <if-compare field="parameters.inputParamEnumId" operator="equals" value="PRIP_WEBSITE_ID"> + <entity-condition entity-name="WebSite" list="condValues"/> + <iterate list="condValues" entry="condValue"> + <set field="option" value="${condValue.siteName}: ${condValue.webSiteId}"/> + <field-to-list list="productPriceRulesCondValues" field="option"/> + </iterate> + </if-compare> + <if-compare field="parameters.inputParamEnumId" operator="equals" value="PRIP_PROD_SGRP_ID"> + <entity-condition entity-name="ProductStoreGroup" list="condValues"/> + <iterate list="condValues" entry="condValue"> + <set field="option" value="${condValue.productStoreGroupName} (${condValue.description}): ${condValue.productStoreGroupId}"/> + <field-to-list list="productPriceRulesCondValues" field="option"/> + </iterate> + </if-compare> + <if-compare field="parameters.inputParamEnumId" operator="equals" value="PRIP_PROD_CLG_ID"> + <entity-condition entity-name="ProdCatalog" list="condValues"/> + <iterate list="condValues" entry="condValue"> + <set field="option" value="${condValue.catalogName}: ${condValue.prodCatalogId}"/> + <field-to-list list="productPriceRulesCondValues" field="option"/> + </iterate> + </if-compare> + <if-compare field="parameters.inputParamEnumId" operator="equals" value="PRIP_CURRENCY_UOMID"> + <entity-condition entity-name="Uom" list="condValues"> + <condition-expr field-name="uomTypeId" value="CURRENCY_MEASURE"/> + </entity-condition> + <iterate list="condValues" entry="condValue"> + <set field="option" value="${condValue.description}: ${condValue.uomId}"/> + <field-to-list list="productPriceRulesCondValues" field="option"/> + </iterate> + </if-compare> + + <if-empty field="productPriceRulesCondValues"> + <property-to-field resource="CommonUiLabels" property="CommonNoOptions" field="noOptions"/> + <field-to-list list="productPriceRulesCondValues" field="noOptions"/> + </if-empty> + <field-to-result field="productPriceRulesCondValues"/> + </simple-method> + </simple-methods> Propchange: ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Oct 8 22:41:27 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt/applications/product/script/org/ofbiz/shipment/test/FacilityTests.xml:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:921280-927264 -/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-1002466 +/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-1006054 Modified: ofbiz/branches/jquery/applications/product/servicedef/services_pricepromo.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/servicedef/services_pricepromo.xml?rev=1006056&r1=1006055&r2=1006056&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/servicedef/services_pricepromo.xml (original) +++ ofbiz/branches/jquery/applications/product/servicedef/services_pricepromo.xml Fri Oct 8 22:41:27 2010 @@ -340,4 +340,11 @@ under the License. <attribute name="validPriceFound" type="Boolean" mode="OUT" optional="false"/> <attribute name="orderItemPriceInfos" type="java.util.List" mode="OUT" optional="false"/> </service> + + <service name="getAssociatedPriceRulesConds" engine="simple" auth="false" + location="component://product/script/org/ofbiz/product/price/PriceServices.xml" invoke="getAssociatedPriceRulesConds"> + <description>Set the Value options for selected Price Rule Condition Input</description> + <attribute name="inputParamEnumId" mode="IN" type="String"/> + <attribute name="productPriceRulesCondValues" mode="OUT" type="java.util.List" optional="true"/><!-- optional="true" because of quantity or other kind of fiels needing an input --> + </service> </services> Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/price/EditProductPriceRules.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/price/EditProductPriceRules.groovy?rev=1006056&r1=1006055&r2=1006056&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/price/EditProductPriceRules.groovy (original) +++ ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/price/EditProductPriceRules.groovy Fri Oct 8 22:41:27 2010 @@ -18,14 +18,44 @@ */ import org.ofbiz.entity.condition.* - -String priceRuleId = request.getParameter("productPriceRuleId"); -if (priceRuleId) { - context.productPriceRule = delegator.findOne("ProductPriceRule", [productPriceRuleId : priceRuleId], false); -} +import org.ofbiz.entity.util.EntityUtil; +import org.ofbiz.base.util.UtilMisc; context.inputParamEnums = delegator.findList("Enumeration", EntityCondition.makeCondition([enumTypeId : 'PROD_PRICE_IN_PARAM']), null, ['sequenceId'], null, true); - context.condOperEnums = delegator.findList("Enumeration", EntityCondition.makeCondition([enumTypeId : 'PROD_PRICE_COND']), null, ['sequenceId'], null, true); - context.productPriceActionTypes = delegator.findList("ProductPriceActionType", null, null, ['description'], null, true); + +String priceRuleId = request.getParameter("productPriceRuleId"); +if (priceRuleId) { + productPriceRules = []; + productPriceRules.add(delegator.findOne("ProductPriceRule", [productPriceRuleId : priceRuleId], false)); + productPriceConds = productPriceRules[0].getRelatedCache("ProductPriceCond"); + productPriceConds = EntityUtil.orderBy(productPriceConds, UtilMisc.toList("productPriceCondSeqId")); + productPriceActions = productPriceRules[0].getRelatedCache("ProductPriceAction"); + productPriceActions = EntityUtil.orderBy(productPriceActions, UtilMisc.toList("productPriceActionSeqId")); + + productPriceCondAdd = []; + productPriceCondAdd.add(delegator.makeValue("ProductPriceCond")); + productPriceCondAdd[0].productPriceRuleId = priceRuleId; + productPriceCondAdd[0].inputParamEnumId = context.inputParamEnums[0].enumId; + productPriceCondAdd[0].operatorEnumId = context.condOperEnums[0].enumId; + + productPriceActionAdd = []; + productPriceActionAdd.add(delegator.makeValue("ProductPriceAction")); + productPriceActionAdd[0].productPriceRuleId = priceRuleId; + productPriceActionAdd[0].productPriceActionTypeId = context.productPriceActionTypes[0].productPriceActionTypeId; + productPriceActionAdd[0].amount = BigDecimal.ZERO; + + context.productPriceRules = productPriceRules; + context.productPriceConds = productPriceConds; + context.productPriceActions = productPriceActions; + context.productPriceCondAdd = productPriceCondAdd; + context.productPriceActionAdd = productPriceActionAdd; + +} else { + context.productPriceRules = null; + context.productPriceConds = null; + context.productPriceActions = null; + context.productPriceCondsAdd = null; + context.productPriceActionsAdd = null; +} Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/controller.xml?rev=1006056&r1=1006055&r2=1006056&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/controller.xml (original) +++ ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/controller.xml Fri Oct 8 22:41:27 2010 @@ -1844,7 +1844,15 @@ under the License. <response name="success" type="view" value="EditProductPriceRules"/> <response name="error" type="view" value="EditProductPriceRules"/> </request-map> - + + <!-- Get Values options associated with a Price Rule Condition Input --> + <request-map uri="getAssociatedPriceRulesConds"> + <security https="true" auth="false"/> + <event type="service" invoke="getAssociatedPriceRulesConds"/> + <response name="success" type="request" value="json"/> + <response name="error" type="request" value="json"/> + </request-map> + <!-- ================ ProductPromoCode Requests ================= --> <request-map uri="FindProductPromoCode"> <security https="true" auth="true"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |