svn commit: r737003 [1/11] - in /ofbiz/trunk: ./ applications/accounting/entity
Locked
svn commit: r737003 [1/11] - in /ofbiz/trunk: ./ applications/accounting/entity
 
|
Author: jleroux
Date: Fri Jan 23 03:08:47 2009 New Revision: 737003 URL: http://svn.apache.org/viewvc?rev=737003&view=rev Log: All tabs to 4 spaces in *.groovy, *.java, *.xml : less problems in future with that aspect... Modified: ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceEvents.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml ofbiz/trunk/applications/accounting/servicedef/services_ledger.xml ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/EditInvoice.groovy ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/ListNotAppliedPayments.groovy ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/ListNotAppliedInvoices.groovy ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/SalesInvoiceByProductCategorySummary.groovy ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml ofbiz/trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml ofbiz/trunk/applications/content/config/ContentEntityLabels.xml ofbiz/trunk/applications/content/data/CompDocData.xml ofbiz/trunk/applications/content/data/DemoBlogUsersData.xml ofbiz/trunk/applications/content/data/MimeTypeData.xml ofbiz/trunk/applications/content/entitydef/entitymodel.xml ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml ofbiz/trunk/applications/content/script/org/ofbiz/content/permission/ContentPermissionServices.xml ofbiz/trunk/applications/content/servicedef/services_commevent.xml ofbiz/trunk/applications/content/servicedef/services_email.xml ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementWorker.java ofbiz/trunk/applications/content/src/org/ofbiz/content/cms/CmsEvents.java ofbiz/trunk/applications/content/src/org/ofbiz/content/email/EmailWorker.java ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutWorker.java ofbiz/trunk/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeByteArrayInputStream.java ofbiz/trunk/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeByteArrayOutputStream.java ofbiz/trunk/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeWorker.java ofbiz/trunk/applications/content/src/org/ofbiz/content/search/ContentDocument.java ofbiz/trunk/applications/content/src/org/ofbiz/content/search/DataResourceDocument.java ofbiz/trunk/applications/content/src/org/ofbiz/content/search/SearchEvents.java ofbiz/trunk/applications/content/src/org/ofbiz/content/search/SearchWorker.java ofbiz/trunk/applications/content/src/org/ofbiz/content/view/SimpleContentViewHandler.java ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml ofbiz/trunk/applications/content/widget/CommonScreens.xml ofbiz/trunk/applications/content/widget/SurveyScreens.xml ofbiz/trunk/applications/ecommerce/data/DemoFinAccount.xml ofbiz/trunk/applications/ecommerce/data/DemoPurchasing.xml ofbiz/trunk/applications/ecommerce/data/DemoStoreGiftCertificateSettings.xml ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/cart/ShowCart.groovy ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditEmailAndTelecomNumber.groovy ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditShippingAddress.groovy ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/PermPrep.groovy ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/ShipSettings.groovy ofbiz/trunk/applications/ecommerce/widget/CartScreens.xml ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml ofbiz/trunk/applications/ecommerce/widget/ContentScreens.xml ofbiz/trunk/applications/ecommerce/widget/ForumScreens.xml ofbiz/trunk/applications/ecommerce/widget/ForumTrees.xml ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/bom/FindProductBom.groovy ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/productionRunAllFixedAssets.groovy ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml ofbiz/trunk/applications/order/build.xml ofbiz/trunk/applications/order/config/OrderEntityLabels.xml ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml ofbiz/trunk/applications/order/entitydef/entitymodel.xml ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml ofbiz/trunk/applications/order/servicedef/orderProcessXPDL.xml ofbiz/trunk/applications/order/servicedef/services_cart.xml ofbiz/trunk/applications/order/servicedef/services_requirement.xml ofbiz/trunk/applications/order/servicedef/services_return.xml ofbiz/trunk/applications/order/src/org/ofbiz/order/OrderManagerEvents.java ofbiz/trunk/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListServices.java ofbiz/trunk/applications/order/src/org/ofbiz/order/test/OrderTestServices.java ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/taxware/TaxwareUTL.java ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/request/GetNextSequenceNum.groovy ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/request/SetRequestQuote.groovy ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/requirement/ApprovedProductRequirements.groovy ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/task/OrderTaskList.groovy ofbiz/trunk/applications/order/webapp/ordermgr/reports/orderitemreport.xml ofbiz/trunk/applications/order/webapp/ordermgr/reports/orderreport.xml ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyPermissionServices.xml ofbiz/trunk/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/communication/PrepCommEventForward.groovy ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/FindLookUp.groovy ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/GetMyCompany.groovy ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/SetRoleVars.groovy ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/UnAppliedInvoicesForParty.groovy ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/UnAppliedPaymentsForParty.groovy ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml ofbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryWorker.java ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductWorker.java ofbiz/trunk/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContentContent.groovy ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/FindFacility.groovy ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml ofbiz/trunk/build.xml ofbiz/trunk/framework/appserver/src/org/ofbiz/appservers/GenerateContainer.java ofbiz/trunk/framework/appserver/templates/orion202/ofbiz-application.xml ofbiz/trunk/framework/appserver/templates/tomcat55/server.xml ofbiz/trunk/framework/appserver/templates/tomcat6/server.xml ofbiz/trunk/framework/appserver/templates/weblogic81/config.xml ofbiz/trunk/framework/base/build.xml ofbiz/trunk/framework/base/config/jndiservers.xml ofbiz/trunk/framework/base/src/org/ofbiz/base/component/ComponentConfig.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/HttpClient.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ObjectType.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/OfbizBshBsfEngine.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilHttp.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilURL.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilValidate.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/XslTransform.java ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CrossSubdomainSessionValve.java ofbiz/trunk/framework/common/data/GeoData.xml ofbiz/trunk/framework/common/data/GeoData_IRL.xml ofbiz/trunk/framework/common/data/GeoData_UK.xml ofbiz/trunk/framework/common/entitydef/entitymodel.xml ofbiz/trunk/framework/common/script/org/ofbiz/common/LookupServices.xml ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml ofbiz/trunk/framework/common/servicedef/services_test.xml ofbiz/trunk/framework/common/src/org/ofbiz/common/Captcha.java ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonWorkers.java ofbiz/trunk/framework/common/src/org/ofbiz/common/FindServices.java ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/ListPortalPages.groovy ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/ListPortalPortlets.groovy ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/ShowPortalPage.groovy ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionFunction.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionListBase.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityDateFilterCondition.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFieldMap.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityWhereString.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/SQLProcessor.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/SqlJdbcUtil.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/transaction/TransactionUtil.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityUtil.java ofbiz/trunk/framework/entityext/entitydef/entitymodel.xml ofbiz/trunk/framework/entityext/servicedef/services.xml ofbiz/trunk/framework/example/src/org/ofbiz/example/ExamplePrintServices.java ofbiz/trunk/framework/example/webapp/example/WEB-INF/actions/includes/FindExampleFeatures.groovy ofbiz/trunk/framework/example/widget/example/ExampleFeatureScreens.xml ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethodBsfEngine.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/OrderMapList.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/RequestParametersToList.java ofbiz/trunk/framework/security/entitydef/entitymodel.xml ofbiz/trunk/framework/security/src/org/ofbiz/security/Security.java ofbiz/trunk/framework/service/servicedef/services.xml ofbiz/trunk/framework/service/servicedef/services_test_se.xml ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceInfo.java ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceRule.java ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/EntityAutoEngine.java ofbiz/trunk/framework/service/src/org/ofbiz/service/group/ServiceGroupReader.java ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobInvoker.java ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobManager.java ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobPoller.java ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/ServiceMcaUtil.java ofbiz/trunk/framework/start/build.xml ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/XmlRpcEventHandler.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JPublishViewHandler.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ViewFactory.java ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java ofbiz/trunk/framework/webtools/webapp/webtools/UomReport.xml ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/EntityMaint.groovy ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/EntityPerformanceTest.groovy ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/service/AvailableServices.groovy ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/workflow/ReadXpdl.groovy ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/workflow/WorkflowMonitor.groovy ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuAction.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuCondition.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenCondition.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTreeAction.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTreeCondition.java ofbiz/trunk/specialpurpose/build.xml ofbiz/trunk/specialpurpose/mypage/data/MyPageDemoData.xml ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/MyPageServices.xml ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/actions/GetMyCommunicationEventRole.groovy ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml ofbiz/trunk/specialpurpose/myportal/data/MyPortalDemoData.xml ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/MyPortalServices.xml ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/actions/GetMyCommunicationEventRole.groovy ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Journal.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/MenuEvents.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/KeyboardService.java ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml ofbiz/trunk/specialpurpose/projectmgr/src/org/ofbiz/project/Various.java ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListCurrentProjects.groovy ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListResourceBillingHours.groovy ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ProjectBilling.groovy ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/ManagerEvents.xml ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/PaymentEvents.xml ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/WebPosEvents.java ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/transaction/WebPosTransaction.java ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/Login.groovy ofbiz/trunk/specialpurpose/webpos/widget/WebPosScreens.xml ofbiz/trunk/specialpurpose/workflow/servicedef/services.xml Modified: ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml (original) +++ ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml Fri Jan 23 03:08:47 2009 @@ -3258,7 +3258,7 @@ <prim-key field="county"/> <prim-key field="fromDate"/> </entity> - + <entity entity-name="PartyGlAccount" package-name="org.ofbiz.accounting.ledger" title="Party Gl Account Entity"> <field name="organizationPartyId" type="id-ne"/> <field name="partyId" type="id-ne"/> @@ -3284,7 +3284,7 @@ </relation> <relation type="one" fk-name="PRTYGLACCT_GLAT" rel-entity-name="GlAccountType"> <key-map field-name="glAccountTypeId"/> - </relation> + </relation> <relation type="one" fk-name="PRTYGLACCT_GLACCT" rel-entity-name="GlAccount"> <key-map field-name="glAccountId"/> </relation> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceEvents.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceEvents.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceEvents.xml Fri Jan 23 03:08:47 2009 @@ -226,12 +226,12 @@ <!-- check if there is a requested status change if yes call invoice status update service --> <if-not-empty field="parameters.statusId"> - <if-compare-field field="parameters.statusId" to-field="savedValue.statusId" operator="not-equals"> - <set from-field="parameters.invoiceId" field="inputMap.invoiceId"/> - <set from-field="parameters.statusId" field="inputMap.statusId"/> - <now-timestamp field="inputMap.statusDate"/> - <call-service service-name="setInvoiceStatus" in-map-name="inputMap"/> - </if-compare-field> + <if-compare-field field="parameters.statusId" to-field="savedValue.statusId" operator="not-equals"> + <set from-field="parameters.invoiceId" field="inputMap.invoiceId"/> + <set from-field="parameters.statusId" field="inputMap.statusId"/> + <now-timestamp field="inputMap.statusDate"/> + <call-service service-name="setInvoiceStatus" in-map-name="inputMap"/> + </if-compare-field> </if-not-empty> </simple-method> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml Fri Jan 23 03:08:47 2009 @@ -226,12 +226,12 @@ <!-- check if there is a requested status change if yes call invoice status update service --> <if-not-empty field="parameters.statusId"> - <if-compare-field field="parameters.statusId" to-field="savedValue.statusId" operator="not-equals"> - <set from-field="parameters.invoiceId" field="inputMap.invoiceId"/> - <set from-field="parameters.statusId" field="inputMap.statusId"/> - <now-timestamp field="inputMap.statusDate"/> - <call-service service-name="setInvoiceStatus" in-map-name="inputMap"/> - </if-compare-field> + <if-compare-field field="parameters.statusId" to-field="savedValue.statusId" operator="not-equals"> + <set from-field="parameters.invoiceId" field="inputMap.invoiceId"/> + <set from-field="parameters.statusId" field="inputMap.statusId"/> + <now-timestamp field="inputMap.statusDate"/> + <call-service service-name="setInvoiceStatus" in-map-name="inputMap"/> + </if-compare-field> </if-not-empty> </simple-method> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml Fri Jan 23 03:08:47 2009 @@ -294,9 +294,9 @@ <if-not-empty field="error_list"> <iterate list="acctgTransEntryList" entry="acctgTransEntry"> <set field="partyAccountingPreferencesCallMap.organizationPartyId" from-field="acctgTransEntry.organizationPartyId"/> - <call-service service-name="getPartyAccountingPreferences" in-map-name="partyAccountingPreferencesCallMap"> - <result-to-field result-name="partyAccountingPreference" field="partyAcctgPreference"/> - </call-service> + <call-service service-name="getPartyAccountingPreferences" in-map-name="partyAccountingPreferencesCallMap"> + <result-to-field result-name="partyAccountingPreference" field="partyAcctgPreference"/> + </call-service> <if-empty field="partyAcctgPreference.errorGlJournalId"> <!-- if no error journal is set, then return the error messages --> <check-errors/> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml Fri Jan 23 03:08:47 2009 @@ -316,10 +316,10 @@ <if-empty field="partyRole"> <log level="warning" message="The party with id [${acctgTransEntry.organizationPartyId}] is not an internal organization; the following accounting transaction will be ignored: ${acctgTransEntry}"/> <else> - <set field="partyAccountingPreferencesCallMap.organizationPartyId" from-field="acctgTransEntry.organizationPartyId"/> - <call-service service-name="getPartyAccountingPreferences" in-map-name="partyAccountingPreferencesCallMap"> - <result-to-field result-name="partyAccountingPreference" field="partyAcctgPreference"/> - </call-service> + <set field="partyAccountingPreferencesCallMap.organizationPartyId" from-field="acctgTransEntry.organizationPartyId"/> + <call-service service-name="getPartyAccountingPreferences" in-map-name="partyAccountingPreferencesCallMap"> + <result-to-field result-name="partyAccountingPreference" field="partyAcctgPreference"/> + </call-service> <if-empty field="partyAcctgPreference"> <log level="warning" message="The internal organization with id [${acctgTransEntry.organizationPartyId}] has no PartyAcctgPreference setting; the following accounting transaction will be ignored: ${acctgTransEntry}"/> <else> @@ -2323,7 +2323,7 @@ <field-to-result field="acctgTransId" result-name="acctgTransId"/> </simple-method> - <!-- Party GlAccount services --> + <!-- Party GlAccount services --> <simple-method method-name="createPartyGlAccount" short-description="Associate a party to a General Ledger Account"> <make-value entity-name="PartyGlAccount" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> @@ -2341,7 +2341,7 @@ <entity-one entity-name="PartyGlAccount" value-field="lookedUpValue"/> <remove-value value-field="lookedUpValue"/> </simple-method> - + <!-- Entity Specific Inline Methods --> <simple-method method-name="getVarianceReasonGlAccountInline" short-description="Gets VarianceReasonGlAccount on the basis of primary key"> <entity-one entity-name="VarianceReasonGlAccount" value-field="varianceReasonGlAccount"> Modified: ofbiz/trunk/applications/accounting/servicedef/services_ledger.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_ledger.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/servicedef/services_ledger.xml (original) +++ ofbiz/trunk/applications/accounting/servicedef/services_ledger.xml Fri Jan 23 03:08:47 2009 @@ -524,7 +524,7 @@ <attribute name="acctgTransId" type="String" mode="OUT" optional="true"/> </service> - <!-- Party GlAccount services --> + <!-- Party GlAccount services --> <service name="createPartyGlAccount" default-entity-name="PartyGlAccount" engine="simple" location="org/ofbiz/accounting/ledger/GeneralLedgerServices.xml" invoke="createPartyGlAccount" auth="true"> <description>Associate a party to a General Ledger Account</description> @@ -542,6 +542,6 @@ <service name="deletePartyGlAccount" default-entity-name="PartyGlAccount" engine="simple" location="org/ofbiz/accounting/ledger/GeneralLedgerServices.xml" invoke="deletePartyGlAccount" auth="true"> <description>Delete an existing General Ledger Account of a Party</description> - <auto-attributes include="pk" mode="IN" optional="false"/> + <auto-attributes include="pk" mode="IN" optional="false"/> </service> </services> \ No newline at end of file Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java (original) +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java Fri Jan 23 03:08:47 2009 @@ -2333,30 +2333,30 @@ if (paymentId == null || paymentId.equals("")) { errorMessageList.add(UtilProperties.getMessage(resource, "AccountingPaymentIdBlankNotSupplied",locale)); } else { - try { - payment = delegator.findByPrimaryKey("Payment", UtilMisc.toMap("paymentId", paymentId)); - } catch (GenericEntityException e) { - ServiceUtil.returnError(e.getMessage()); - } - if (payment == null) { - errorMessageList.add(UtilProperties.getMessage(resource, "AccountingPaymentRecordNotFound",UtilMisc.toMap("paymentId",paymentId),locale)); - } - paymentApplyAvailable = payment.getBigDecimal("amount").subtract(PaymentWorker.getPaymentApplied(payment)).setScale(decimals,rounding); - - if (payment.getString("statusId").equals("PMNT_CANCELLED")) { - errorMessageList.add(UtilProperties.getMessage(resource, "AccountingPaymentCancelled", UtilMisc.toMap("paymentId",paymentId), locale)); - } - if (payment.getString("statusId").equals("PMNT_CONFIRMED")) { - errorMessageList.add(UtilProperties.getMessage(resource, "AccountingPaymentConfirmed", UtilMisc.toMap("paymentId",paymentId), locale)); - } - - currencyUomId = payment.getString("currencyUomId"); - - // if the amount to apply is 0 give it amount the payment still need - // to apply - if (amountApplied.signum() == 0) { - amountAppliedMax = paymentApplyAvailable; - } + try { + payment = delegator.findByPrimaryKey("Payment", UtilMisc.toMap("paymentId", paymentId)); + } catch (GenericEntityException e) { + ServiceUtil.returnError(e.getMessage()); + } + if (payment == null) { + errorMessageList.add(UtilProperties.getMessage(resource, "AccountingPaymentRecordNotFound",UtilMisc.toMap("paymentId",paymentId),locale)); + } + paymentApplyAvailable = payment.getBigDecimal("amount").subtract(PaymentWorker.getPaymentApplied(payment)).setScale(decimals,rounding); + + if (payment.getString("statusId").equals("PMNT_CANCELLED")) { + errorMessageList.add(UtilProperties.getMessage(resource, "AccountingPaymentCancelled", UtilMisc.toMap("paymentId",paymentId), locale)); + } + if (payment.getString("statusId").equals("PMNT_CONFIRMED")) { + errorMessageList.add(UtilProperties.getMessage(resource, "AccountingPaymentConfirmed", UtilMisc.toMap("paymentId",paymentId), locale)); + } + + currencyUomId = payment.getString("currencyUomId"); + + // if the amount to apply is 0 give it amount the payment still need + // to apply + if (amountApplied.signum() == 0) { + amountAppliedMax = paymentApplyAvailable; + } } @@ -2484,10 +2484,10 @@ if (payment.get("actualCurrencyAmount") == null || payment.get("actualCurrencyUomId") == null) { errorMessageList.add("Actual amounts are required in the currency of the invoice to make this work...."); } else { - currencyUomId = payment.getString("actualCurrencyUomId"); - if (!currencyUomId.equals(invoice.getString("currencyUomId"))) { + currencyUomId = payment.getString("actualCurrencyUomId"); + if (!currencyUomId.equals(invoice.getString("currencyUomId"))) { errorMessageList.add("actual currency on payment (" + currencyUomId + ") not the same as original invoice currency (" + invoice.getString("currencyUomId") + ")"); - } + } } paymentApplyAvailable = payment.getBigDecimal("actualCurrencyAmount").subtract(PaymentWorker.getPaymentApplied(payment)).setScale(decimals,rounding); if (amountApplied.signum() == 0) { @@ -2638,11 +2638,11 @@ // check if the payment for too much application if an existing // application record is changed - if (paymentApplyAvailable.compareTo(ZERO) == 0) { - newPaymentApplyAvailable = paymentApplyAvailable.add(paymentApplication.getBigDecimal("amountApplied")).subtract(amountApplied).setScale(decimals, rounding); - } else { - newPaymentApplyAvailable = paymentApplyAvailable.add(paymentApplyAvailable).subtract(amountApplied).setScale(decimals, rounding); - } + if (paymentApplyAvailable.compareTo(ZERO) == 0) { + newPaymentApplyAvailable = paymentApplyAvailable.add(paymentApplication.getBigDecimal("amountApplied")).subtract(amountApplied).setScale(decimals, rounding); + } else { + newPaymentApplyAvailable = paymentApplyAvailable.add(paymentApplyAvailable).subtract(amountApplied).setScale(decimals, rounding); + } if (newPaymentApplyAvailable.compareTo(ZERO) < 0) { errorMessageList.add(UtilProperties.getMessage(resource, "AccountingPaymentNotEnough", UtilMisc.<String, Object>toMap("paymentId",paymentId,"paymentApplyAvailable",paymentApplyAvailable.add(paymentApplication.getBigDecimal("amountApplied")),"amountApplied",amountApplied),locale)); } Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java (original) +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java Fri Jan 23 03:08:47 2009 @@ -289,7 +289,7 @@ * @return the applied total as BigDecimal in the currency of the payment */ public static BigDecimal getPaymentApplied(GenericValue payment) { - return getPaymentApplied(payment, false); + return getPaymentApplied(payment, false); } /** @@ -303,9 +303,9 @@ List paymentApplications = null; try { List cond = UtilMisc.toList( - EntityCondition.makeCondition("paymentId", EntityOperator.EQUALS, payment.getString("paymentId")), - EntityCondition.makeCondition("toPaymentId", EntityOperator.EQUALS, payment.getString("paymentId")) - ); + EntityCondition.makeCondition("paymentId", EntityOperator.EQUALS, payment.getString("paymentId")), + EntityCondition.makeCondition("toPaymentId", EntityOperator.EQUALS, payment.getString("paymentId")) + ); EntityCondition partyCond = EntityCondition.makeCondition(cond, EntityOperator.OR); paymentApplications = payment.getDelegator().findList("PaymentApplication", partyCond, null, UtilMisc.toList("invoiceId", "billingAccountId"), null, false); if (UtilValidate.isNotEmpty(paymentApplications)) { @@ -332,10 +332,10 @@ return payment.getBigDecimal("amount").subtract(getPaymentApplied(payment)).setScale(decimals,rounding); } public static BigDecimal getPaymentNotApplied(GenericValue payment, Boolean actual) { - if (actual.equals(Boolean.TRUE) && UtilValidate.isNotEmpty(payment.getBigDecimal("actualCurrencyAmount"))) { - return payment.getBigDecimal("actualCurrencyAmount").subtract(getPaymentApplied(payment, actual)).setScale(decimals,rounding); - } - return payment.getBigDecimal("amount").subtract(getPaymentApplied(payment)).setScale(decimals,rounding); + if (actual.equals(Boolean.TRUE) && UtilValidate.isNotEmpty(payment.getBigDecimal("actualCurrencyAmount"))) { + return payment.getBigDecimal("actualCurrencyAmount").subtract(getPaymentApplied(payment, actual)).setScale(decimals,rounding); + } + return payment.getBigDecimal("amount").subtract(getPaymentApplied(payment)).setScale(decimals,rounding); } public static BigDecimal getPaymentNotApplied(GenericDelegator delegator, String paymentId) { return getPaymentNotApplied(delegator,paymentId, false); Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/EditInvoice.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/EditInvoice.groovy?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/EditInvoice.groovy (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/EditInvoice.groovy Fri Jan 23 03:08:47 2009 @@ -42,13 +42,13 @@ rounding = UtilNumber.getBigDecimalRoundingMode("invoice.rounding"); if (invoice) { - if (currency && !invoice.getString("currencyUomId").equals(currency)) { - conversionRate = InvoiceWorker.getInvoiceCurrencyConversionRate(invoice); - invoice.currencyUomId = currency; - invoice.invoiceMessage = " converted from original with a rate of: " + conversionRate.setScale(8, rounding); - } - - invoiceItems = invoice.getRelatedOrderBy("InvoiceItem", ["invoiceItemSeqId"]); + if (currency && !invoice.getString("currencyUomId").equals(currency)) { + conversionRate = InvoiceWorker.getInvoiceCurrencyConversionRate(invoice); + invoice.currencyUomId = currency; + invoice.invoiceMessage = " converted from original with a rate of: " + conversionRate.setScale(8, rounding); + } + + invoiceItems = invoice.getRelatedOrderBy("InvoiceItem", ["invoiceItemSeqId"]); invoiceItemsConv = FastList.newInstance(); invoiceItems.each { invoiceItem -> invoiceItem.amount = invoiceItem.getBigDecimal("amount").multiply(conversionRate).setScale(decimals, rounding); Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/ListNotAppliedPayments.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/ListNotAppliedPayments.groovy?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/ListNotAppliedPayments.groovy (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/ListNotAppliedPayments.groovy Fri Jan 23 03:08:47 2009 @@ -57,34 +57,34 @@ context.paymentsActualCurrency = getPayments(payments, true); List getPayments(List payments, boolean actual) { - if (payments) { - paymentList = []; // to pass back to the screeen list of unapplied payments - invoiceApplied = InvoiceWorker.getInvoiceApplied(invoice); - invoiceAmount = InvoiceWorker.getInvoiceTotal(invoice); - invoiceToApply = InvoiceWorker.getInvoiceNotApplied(invoice); - payments.each { payment -> - paymentMap = [:]; + if (payments) { + paymentList = []; // to pass back to the screeen list of unapplied payments + invoiceApplied = InvoiceWorker.getInvoiceApplied(invoice); + invoiceAmount = InvoiceWorker.getInvoiceTotal(invoice); + invoiceToApply = InvoiceWorker.getInvoiceNotApplied(invoice); + payments.each { payment -> + paymentMap = [:]; paymentApplied = PaymentWorker.getPaymentApplied(payment, true); - if (actual) { - paymentMap.amount = payment.actualCurrencyAmount; - paymentMap.currencyUomId = payment.actualCurrencyUomId; - paymentToApply = payment.getBigDecimal("actualCurrencyAmount").setScale(decimals,rounding).subtract(paymentApplied); - } else { - paymentMap.amount = payment.amount; - paymentMap.currencyUomId = payment.currencyUomId; - paymentToApply = payment.getBigDecimal("amount").setScale(decimals,rounding).subtract(paymentApplied); - } - if (paymentToApply.signum() == 1) { - paymentMap.paymentId = payment.paymentId; - paymentMap.effectiveDate = payment.effectiveDate; - if (paymentToApply.compareTo(invoiceToApply) < 0 ) { - paymentMap.amountToApply = paymentToApply; - } else { - paymentMap.amountToApply = invoiceToApply; - } - paymentList.add(paymentMap); - } - } - return paymentList; - } + if (actual) { + paymentMap.amount = payment.actualCurrencyAmount; + paymentMap.currencyUomId = payment.actualCurrencyUomId; + paymentToApply = payment.getBigDecimal("actualCurrencyAmount").setScale(decimals,rounding).subtract(paymentApplied); + } else { + paymentMap.amount = payment.amount; + paymentMap.currencyUomId = payment.currencyUomId; + paymentToApply = payment.getBigDecimal("amount").setScale(decimals,rounding).subtract(paymentApplied); + } + if (paymentToApply.signum() == 1) { + paymentMap.paymentId = payment.paymentId; + paymentMap.effectiveDate = payment.effectiveDate; + if (paymentToApply.compareTo(invoiceToApply) < 0 ) { + paymentMap.amountToApply = paymentToApply; + } else { + paymentMap.amountToApply = invoiceToApply; + } + paymentList.add(paymentMap); + } + } + return paymentList; + } } Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/ListNotAppliedInvoices.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/ListNotAppliedInvoices.groovy?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/ListNotAppliedInvoices.groovy (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/ListNotAppliedInvoices.groovy Fri Jan 23 03:08:47 2009 @@ -61,31 +61,31 @@ context.invoicesOtherCurrency = getInvoices(invoices, true); List getInvoices(List invoices, boolean actual) { - if (invoices) { - invoicesList = []; // to pass back to the screeen list of unapplied invoices - paymentApplied = PaymentWorker.getPaymentApplied(payment); - paymentToApply = payment.getBigDecimal("amount").setScale(decimals,rounding).subtract(paymentApplied); - if (actual) { - paymentToApply = payment.getBigDecimal("actualCurrencyAmount").setScale(decimals,rounding).subtract(paymentApplied); - } - invoices.each { invoice -> - invoiceAmount = InvoiceWorker.getInvoiceTotal(invoice).setScale(decimals,rounding); - invoiceApplied = InvoiceWorker.getInvoiceApplied(invoice).setScale(decimals,rounding); - invoiceToApply = invoiceAmount.subtract(invoiceApplied); - if (invoiceToApply.signum() == 1) { - invoiceMap = [:]; - invoiceMap.putAll(invoice); - invoiceMap.amount = invoiceAmount; - invoiceMap.description = invoice.description; - invoiceMap.amountApplied = invoiceApplied; - if (paymentToApply.compareTo(invoiceToApply) < 0 ) { - invoiceMap.amountToApply = paymentToApply; - } else { - invoiceMap.amountToApply = invoiceToApply; - } - invoicesList.add(invoiceMap); - } - } - return invoicesList; - } + if (invoices) { + invoicesList = []; // to pass back to the screeen list of unapplied invoices + paymentApplied = PaymentWorker.getPaymentApplied(payment); + paymentToApply = payment.getBigDecimal("amount").setScale(decimals,rounding).subtract(paymentApplied); + if (actual) { + paymentToApply = payment.getBigDecimal("actualCurrencyAmount").setScale(decimals,rounding).subtract(paymentApplied); + } + invoices.each { invoice -> + invoiceAmount = InvoiceWorker.getInvoiceTotal(invoice).setScale(decimals,rounding); + invoiceApplied = InvoiceWorker.getInvoiceApplied(invoice).setScale(decimals,rounding); + invoiceToApply = invoiceAmount.subtract(invoiceApplied); + if (invoiceToApply.signum() == 1) { + invoiceMap = [:]; + invoiceMap.putAll(invoice); + invoiceMap.amount = invoiceAmount; + invoiceMap.description = invoice.description; + invoiceMap.amountApplied = invoiceApplied; + if (paymentToApply.compareTo(invoiceToApply) < 0 ) { + invoiceMap.amountToApply = paymentToApply; + } else { + invoiceMap.amountToApply = invoiceToApply; + } + invoicesList.add(invoiceMap); + } + } + return invoicesList; + } } Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/SalesInvoiceByProductCategorySummary.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/SalesInvoiceByProductCategorySummary.groovy?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/SalesInvoiceByProductCategorySummary.groovy (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/SalesInvoiceByProductCategorySummary.groovy Fri Jan 23 03:08:47 2009 @@ -100,10 +100,10 @@ currentDayCal = Calendar.getInstance(); currentDayCal.setTimeInMillis(monthCal.getTimeInMillis()); currentDayCal.set(Calendar.DAY_OF_MONTH, currentDay); - currentDayBegin = new java.sql.Timestamp(currentDayCal.getTimeInMillis()); + currentDayBegin = new java.sql.Timestamp(currentDayCal.getTimeInMillis()); currentDayCal.add(Calendar.DAY_OF_MONTH, 1); - nextDayBegin = new java.sql.Timestamp(currentDayCal.getTimeInMillis()); - + nextDayBegin = new java.sql.Timestamp(currentDayCal.getTimeInMillis()); + findOpts = new EntityFindOptions(true, EntityFindOptions.TYPE_SCROLL_INSENSITIVE, EntityFindOptions.CONCUR_READ_ONLY, true); // do the product find @@ -152,12 +152,12 @@ productNullResult = productNullResultListIterator.next(); productNullResultListIterator.close(); if (productNullResult) { - productNullResultByDayList.add(productNullResult); + productNullResultByDayList.add(productNullResult); UtilMisc.addToBigDecimalInMap(monthProductNullResult, "quantityTotal", productNullResult.getBigDecimal("quantityTotal")); UtilMisc.addToBigDecimalInMap(monthProductNullResult, "amountTotal", productNullResult.getBigDecimal("amountTotal")); } else { // no result, add an empty Map place holder - productNullResultByDayList.add(FastMap.newInstance()); + productNullResultByDayList.add(FastMap.newInstance()); } } Modified: ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml Fri Jan 23 03:08:47 2009 @@ -500,9 +500,9 @@ <form name="ListTimeEntries" type="list" list-name="timeEntries" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <row-actions> - <entity-one entity-name="Timesheet" value-name="timesheet"> - <field-map field-name="timesheetId" env-name="timesheetId"/> - </entity-one> + <entity-one entity-name="Timesheet" value-name="timesheet"> + <field-map field-name="timesheetId" env-name="timesheetId"/> + </entity-one> </row-actions> <field name="invoiceId"><hidden/></field> <field name="invoiceItemSeqId"><display/></field> @@ -510,20 +510,20 @@ <field name="timesheetId" entry-name="timesheet.timesheetId"><hyperlink target="/workeffort/control/EditTimesheet?timesheetId=${timesheetId}" target-type="inter-app" description="${timesheetId}"/></field> <field name="partyId" entry-name="partyId"> <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName} ${firstName} ${middleName} ${lastName}"> - <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${partyId}" target-type="inter-app" description=" [${partyId}]"/> + <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${partyId}" target-type="inter-app" description=" [${partyId}]"/> </display-entity> </field> <field name="timesheetPartyId" entry-name="timesheet.partyId"> <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName} ${firstName} ${middleName} ${lastName}"> - <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${timesheet.partyId}" target-type="inter-app" description=" [${timesheet.partyId}]"/> + <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${timesheet.partyId}" target-type="inter-app" description=" [${timesheet.partyId}]"/> </display-entity> </field> <field name="hours"><display/></field> <field name="rateTypeId"><display-entity entity-name="RateType" description="${description}"/></field> <field name="workEffortId"> - <display-entity entity-name="WorkEffort" description="${workEffortName} [${workEffortId}]"> - <sub-hyperlink description=" [${workEffortId}]" target="/workeffort/control/WorkEffortSummary?workEffortId=${workEffortId}" target-type="inter-app"/> - </display-entity> + <display-entity entity-name="WorkEffort" description="${workEffortName} [${workEffortId}]"> + <sub-hyperlink description=" [${workEffortId}]" target="/workeffort/control/WorkEffortSummary?workEffortId=${workEffortId}" target-type="inter-app"/> + </display-entity> </field> <field name="fromDate"><display type="date"/></field> <field name="thruDate"><display type="date"/></field> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml Fri Jan 23 03:08:47 2009 @@ -185,7 +185,7 @@ <field name="amount"><display/></field> <field name="currencyUomId"><display/></field> </form> - + <form name="lookupAgreement" target="LookupAgreement" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <field name="agreementId" ><text-find/></field> @@ -214,7 +214,7 @@ <field name="agreementTypeId"><display/></field> <field name="description"><display/></field> </form> - + <form name="lookupAgreementItem" target="LookupAgreementItem" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <field name="agreementId"><text-find/></field> @@ -240,6 +240,6 @@ <hyperlink also-hidden="false" target-type="plain" description="${agreementItemSeqId}" target="javascript:set_value('${agreementItemSeqId}')"/> </field> <field name="agreementItemTypeId"><display/></field> - <field name="currencyUomId"><display/></field> + <field name="currencyUomId"><display/></field> </form> </forms> \ No newline at end of file Modified: ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml Fri Jan 23 03:08:47 2009 @@ -66,14 +66,14 @@ <field name="statusId"><display-entity entity-name="StatusItem"/></field> <field name="comments"><display/></field> <field name="partyIdFrom"> - <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${lastName},${firstName}"> - <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${partyIdFrom}" target-type="inter-app" description="[${partyIdFrom}]" /> - </display-entity> + <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${lastName},${firstName}"> + <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${partyIdFrom}" target-type="inter-app" description="[${partyIdFrom}]" /> + </display-entity> </field> <field name="partyIdTo"> - <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${lastName},${firstName}"> - <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${partyIdTo}" target-type="inter-app" description="[${partyIdTo}]" /> - </display-entity> + <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${lastName},${firstName}"> + <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${partyIdTo}" target-type="inter-app" description="[${partyIdTo}]" /> + </display-entity> </field> <field name="effectiveDate"><display/></field> <field name="currencyUomId"><hidden/></field> @@ -168,10 +168,10 @@ <form name="EditPayment" type="single" target="updatePayment" default-map-name="payment"> <actions> - <entity-one entity-name="Party" value-field="partyFrom"> - <field-map field-name="partyId" from-field="payment.partyIdFrom"/> - </entity-one> - <set field="uomId" from-field="partyFrom.preferredCurrencyUomId" default-value="${defaultCurrencyUomId}"/> + <entity-one entity-name="Party" value-field="partyFrom"> + <field-map field-name="partyId" from-field="payment.partyIdFrom"/> + </entity-one> + <set field="uomId" from-field="partyFrom.preferredCurrencyUomId" default-value="${defaultCurrencyUomId}"/> <entity-one entity-name="StatusItem" value-field="currentStatus"> <field-map field-name="statusId" from-field="payment.statusId"/> </entity-one> @@ -252,9 +252,9 @@ <field name="paymentApplicationId"><hidden/></field> <field name="paymentId"><hidden/></field> <field name="invoiceId"> - <display-entity entity-name="Invoice" description="${description}"> - <sub-hyperlink target="invoiceOverview?invoiceId=${invoiceId}" description="[${invoiceId}]"/> - </display-entity> + <display-entity entity-name="Invoice" description="${description}"> + <sub-hyperlink target="invoiceOverview?invoiceId=${invoiceId}" description="[${invoiceId}]"/> + </display-entity> </field> <field name="invoiceItemSeqId"><display/></field> <field name="amountApplied"><text size="15"/></field> Modified: ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml Fri Jan 23 03:08:47 2009 @@ -34,8 +34,8 @@ <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="menu-bar"> <container style="button-bar"> - <link target="newPayment" text="${uiLabelMap.CommonCreateNew} ${uiLabelMap.AccountingPayment}" style="buttontext"/> - <link target="FindSalesInvoicesByDueDate" text="${uiLabelMap.AccountingFindSalesInvoicesByDueDate}" style="buttontext"/> + <link target="newPayment" text="${uiLabelMap.CommonCreateNew} ${uiLabelMap.AccountingPayment}" style="buttontext"/> + <link target="FindSalesInvoicesByDueDate" text="${uiLabelMap.AccountingFindSalesInvoicesByDueDate}" style="buttontext"/> <link target="FindPurchaseInvoicesByDueDate" text="${uiLabelMap.AccountingFindPurchaseInvoicesByDueDate}" style="buttontext"/> </container> </decorator-section> @@ -43,7 +43,7 @@ <include-form name="FindPayments" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="ListPayments" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> + <include-form name="ListPayments" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -227,30 +227,30 @@ </condition> <widgets> <screenlet title="${uiLabelMap.CommonAmount} ${uiLabelMap.CommonTotal} ${payment.amount?currency(${payment.currencyUomId})} ${uiLabelMap.AccountingAmountNotApplied} ${notAppliedAmount?currency(${payment.currencyUomId})}"> - <section> - <condition> - <not><if-empty field="paymentApplicationsPay"/></not> - </condition> - <widgets> - <include-form name="editPaymentApplicationsPay" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> - </widgets> - </section> - <section> - <condition> - <not><if-empty field="paymentApplicationsBil"/></not> - </condition> - <widgets> - <include-form name="editPaymentApplicationsBil" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> - </widgets> - </section> - <section> - <condition> - <not><if-empty field="paymentApplicationsTax"/></not> - </condition> - <widgets> - <include-form name="editPaymentApplicationsTax" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> - </widgets> - </section> + <section> + <condition> + <not><if-empty field="paymentApplicationsPay"/></not> + </condition> + <widgets> + <include-form name="editPaymentApplicationsPay" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> + </widgets> + </section> + <section> + <condition> + <not><if-empty field="paymentApplicationsBil"/></not> + </condition> + <widgets> + <include-form name="editPaymentApplicationsBil" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> + </widgets> + </section> + <section> + <condition> + <not><if-empty field="paymentApplicationsTax"/></not> + </condition> + <widgets> + <include-form name="editPaymentApplicationsTax" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> + </widgets> + </section> </screenlet> </widgets> </section> @@ -338,38 +338,38 @@ </condition> <widgets> <container style="lefthalf"> - <screenlet title="${uiLabelMap.AccountingPaymentHeader}"> - <link target="editPayment?paymentId=${paymentId}" text="${uiLabelMap.CommonUpdate}" style="buttontext"/> - <include-form name="paymentHeader" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> - </screenlet> + <screenlet title="${uiLabelMap.AccountingPaymentHeader}"> + <link target="editPayment?paymentId=${paymentId}" text="${uiLabelMap.CommonUpdate}" style="buttontext"/> + <include-form name="paymentHeader" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> + </screenlet> </container> <container style="righthalf"> - <screenlet title="${uiLabelMap.AccountingPaymentsApplied} ${appliedAmount?currency(${payment.currencyUomId})} ${uiLabelMap.AccountingOpenPayments} ${notAppliedAmount?currency(${payment.currencyUomId})}"> - <link target="editPaymentApplications?paymentId=${paymentId}" text="${uiLabelMap.CommonUpdate}" style="buttontext"/> + <screenlet title="${uiLabelMap.AccountingPaymentsApplied} ${appliedAmount?currency(${payment.currencyUomId})} ${uiLabelMap.AccountingOpenPayments} ${notAppliedAmount?currency(${payment.currencyUomId})}"> + <link target="editPaymentApplications?paymentId=${paymentId}" text="${uiLabelMap.CommonUpdate}" style="buttontext"/> <include-form name="paymentApplications" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> - </screenlet> + </screenlet> </container> <container style="screenlet clear"> - <screenlet title="${uiLabelMap.AccountingTransactions}" navigation-form-name="AcctgTransAndEntries"> + <screenlet title="${uiLabelMap.AccountingTransactions}" navigation-form-name="AcctgTransAndEntries"> <include-form name="AcctgTransAndEntries" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> - </screenlet> + </screenlet> </container> </widgets> <fail-widgets> <container style="lefthalf"> - <screenlet title="${uiLabelMap.AccountingPaymentHeader}"> - <include-form name="paymentHeader" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> - </screenlet> + <screenlet title="${uiLabelMap.AccountingPaymentHeader}"> + <include-form name="paymentHeader" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> + </screenlet> </container> <container style="righthalf"> - <screenlet title="${uiLabelMap.AccountingPaymentsApplied} ${appliedAmount?currency(${payment.currencyUomId})} ${uiLabelMap.AccountingOpenPayments} ${notAppliedAmount?currency(${payment.currencyUomId})}"> + <screenlet title="${uiLabelMap.AccountingPaymentsApplied} ${appliedAmount?currency(${payment.currencyUomId})} ${uiLabelMap.AccountingOpenPayments} ${notAppliedAmount?currency(${payment.currencyUomId})}"> <include-form name="paymentApplications" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> - </screenlet> + </screenlet> </container> <container style="screenlet clear"> - <screenlet title="${uiLabelMap.AccountingTransactions}" navigation-form-name="AcctgTransAndEntries"> + <screenlet title="${uiLabelMap.AccountingTransactions}" navigation-form-name="AcctgTransAndEntries"> <include-form name="AcctgTransAndEntries" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> - </screenlet> + </screenlet> </container> </fail-widgets> </section> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |