svn commit: r762648 [1/11] - in /ofbiz/trunk: applications/accounting/data/ applications/accounting/entity
Locked
svn commit: r762648 [1/11] - in /ofbiz/trunk: applications/accounting/data/ applications/accounting/entity
 
|
Author: jleroux
Date: Tue Apr 7 08:27:15 2009 New Revision: 762648 URL: http://svn.apache.org/viewvc?rev=762648&view=rev Log: 1st part of an effort to remove trailing spaces " +/> => "/> Should be easier when dealing with Eclipse S/R regexp Modified: ofbiz/trunk/applications/accounting/data/AccountingPortletData.xml ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml ofbiz/trunk/applications/accounting/data/DemoGeneralChartOfAccounts.xml ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml ofbiz/trunk/applications/accounting/data/PaymentsInvoices.xml ofbiz/trunk/applications/accounting/entitydef/entitygroup_olap.xml ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/admin/AcctgAdminServices.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.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/GeneralLedgerServices.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/AutoAcctgTransTests.xml ofbiz/trunk/applications/accounting/servicedef/secas.xml ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml ofbiz/trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml ofbiz/trunk/applications/accounting/widget/AccountingPrintScreens.xml ofbiz/trunk/applications/accounting/widget/AccountingTrees.xml ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml ofbiz/trunk/applications/accounting/widget/CostScreens.xml ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml ofbiz/trunk/applications/accounting/widget/GlForms.xml ofbiz/trunk/applications/accounting/widget/GlScreens.xml ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml ofbiz/trunk/applications/accounting/widget/LookupScreens.xml ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml ofbiz/trunk/applications/content/data/CompDocData.xml ofbiz/trunk/applications/content/data/ContentTypeData.xml ofbiz/trunk/applications/content/data/DemoBlogMiscData.xml ofbiz/trunk/applications/content/data/DemoBlogPubPtData.xml ofbiz/trunk/applications/content/data/DemoBlogUsersData.xml ofbiz/trunk/applications/content/data/TemplateData.xml ofbiz/trunk/applications/content/entitydef/entitymodel.xml ofbiz/trunk/applications/content/script/org/ofbiz/content/ContentManagementMapProcessors.xml ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml ofbiz/trunk/applications/content/servicedef/services.xml ofbiz/trunk/applications/content/servicedef/services_data.xml ofbiz/trunk/applications/content/servicedef/services_survey.xml ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml ofbiz/trunk/applications/content/webapp/content/contentsetup/ContentSetupMenus.xml ofbiz/trunk/applications/content/webapp/content/datasetup/DataResourceSetupMenus.xml ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml ofbiz/trunk/applications/content/webapp/content/layout/LayoutMenus.xml ofbiz/trunk/applications/content/webapp/content/lookup/LookupForms.xml ofbiz/trunk/applications/content/widget/CommonScreens.xml ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml ofbiz/trunk/applications/content/widget/content/ContentForms.xml ofbiz/trunk/applications/content/widget/content/ContentMenus.xml ofbiz/trunk/applications/content/widget/content/ContentScreens.xml ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml ofbiz/trunk/applications/content/widget/forum/ForumForms.xml ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml ofbiz/trunk/applications/humanres/widget/EmplLeaveScreens.xml ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml ofbiz/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml ofbiz/trunk/applications/humanres/widget/PartyResumeScreens.xml ofbiz/trunk/applications/humanres/widget/PayGradeScreens.xml ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml ofbiz/trunk/applications/manufacturing/data/ManufacturingData.xml ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostScreens.xml ofbiz/trunk/applications/manufacturing/widget/manufacturing/LookupScreens.xml ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml ofbiz/trunk/applications/marketing/data/MarketingTypeData.xml ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/contact/ContactServices.xml ofbiz/trunk/applications/marketing/servicedef/services.xml ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml ofbiz/trunk/applications/marketing/webapp/marketing/lookup/LookupForms.xml ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml ofbiz/trunk/applications/order/data/OrderPortletData.xml ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestEvents.xml ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml ofbiz/trunk/applications/order/servicedef/secas.xml ofbiz/trunk/applications/order/servicedef/services_request.xml ofbiz/trunk/applications/order/webapp/ordermgr/lookup/FieldLookupForms.xml ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderForms.xml ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderShopListForms.xml ofbiz/trunk/applications/order/webapp/ordermgr/reports/orderitemreport.xml ofbiz/trunk/applications/order/webapp/ordermgr/reports/orderreport.xml ofbiz/trunk/applications/order/widget/ordermgr/LookupScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortScreens.xml ofbiz/trunk/applications/party/data/PartyPortletData.xml ofbiz/trunk/applications/party/data/PartyTypeData.xml ofbiz/trunk/applications/party/entitydef/entitymodel.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/LookupServices.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleEvents.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml ofbiz/trunk/applications/party/servicedef/secas.xml ofbiz/trunk/applications/party/servicedef/services.xml ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml ofbiz/trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml ofbiz/trunk/applications/product/data/ProductTypeData.xml ofbiz/trunk/applications/product/entitydef/entitygroup_olap.xml ofbiz/trunk/applications/product/entitydef/entitymodel.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/StorageServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/TestServices.xml ofbiz/trunk/applications/product/servicedef/services.xml ofbiz/trunk/applications/product/servicedef/services_maint.xml ofbiz/trunk/applications/product/servicedef/services_subscription.xml ofbiz/trunk/applications/product/webapp/catalog/catalog/ProdCatalogForms.xml ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml ofbiz/trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml ofbiz/trunk/applications/product/webapp/facility/labels/InventoryItemLabelForms.xml ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml ofbiz/trunk/applications/product/widget/facility/LookupScreens.xml ofbiz/trunk/applications/workeffort/data/WorkEffortPortletData.xml ofbiz/trunk/applications/workeffort/data/WorkEffortTypeData.xml ofbiz/trunk/applications/workeffort/entitydef/entitymodel_view.xml ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml ofbiz/trunk/applications/workeffort/servicedef/secas.xml ofbiz/trunk/applications/workeffort/servicedef/service_groups.xml ofbiz/trunk/applications/workeffort/servicedef/services.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortShopListForms.xml ofbiz/trunk/framework/appserver/templates/jboss422/build.xml ofbiz/trunk/framework/appserver/templates/orion202/ofbiz-application.xml ofbiz/trunk/framework/appserver/templates/orion202/server.xml ofbiz/trunk/framework/appserver/templates/tomcat55/server.xml ofbiz/trunk/framework/appserver/templates/tomcat6/server.xml ofbiz/trunk/framework/base/config/antisamy-esapi.xml ofbiz/trunk/framework/base/config/log4j.xml ofbiz/trunk/framework/common/data/CommonTypeData.xml ofbiz/trunk/framework/common/data/GeoData_BR.xml ofbiz/trunk/framework/common/data/GeoData_NL.xml ofbiz/trunk/framework/common/entitydef/entitygroup_olap.xml ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageMethods.xml ofbiz/trunk/framework/common/servicedef/services.xml ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml ofbiz/trunk/framework/common/widget/CommonMenus.xml ofbiz/trunk/framework/entity/fieldtype/fieldtypeadvantage.xml ofbiz/trunk/framework/entity/fieldtype/fieldtypeaxion.xml ofbiz/trunk/framework/entity/fieldtype/fieldtypecloudscape.xml ofbiz/trunk/framework/entity/fieldtype/fieldtypedaffodil.xml ofbiz/trunk/framework/entity/fieldtype/fieldtypederby.xml ofbiz/trunk/framework/entity/fieldtype/fieldtypefirebird.xml ofbiz/trunk/framework/entity/fieldtype/fieldtypehsql.xml ofbiz/trunk/framework/entity/fieldtype/fieldtypemssql.xml ofbiz/trunk/framework/entity/fieldtype/fieldtypemysql.xml ofbiz/trunk/framework/entity/fieldtype/fieldtypeoracle.xml ofbiz/trunk/framework/entity/fieldtype/fieldtypepostgres.xml ofbiz/trunk/framework/entity/fieldtype/fieldtypepostnew.xml ofbiz/trunk/framework/entity/fieldtype/fieldtypesapdb.xml ofbiz/trunk/framework/entity/fieldtype/fieldtypesybase.xml ofbiz/trunk/framework/example/data/ExamplePortletData.xml ofbiz/trunk/framework/example/widget/example/FormWidgetExampleScreens.xml ofbiz/trunk/framework/webtools/webapp/webtools/UomReport.xml ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintSeedData.xml ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml ofbiz/trunk/specialpurpose/assetmaint/widget/ProductScreens.xml ofbiz/trunk/specialpurpose/assetmaint/widget/forms/LookupForms.xml ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/LookupScreens.xml ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml ofbiz/trunk/specialpurpose/ecommerce/data/DemoProductCategoriesI18nData.xml ofbiz/trunk/specialpurpose/ecommerce/data/DemoProductI18nData.xml ofbiz/trunk/specialpurpose/ecommerce/data/DemoPurchasing.xml ofbiz/trunk/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml ofbiz/trunk/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/ForumForms.xml ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml ofbiz/trunk/specialpurpose/ecommerce/widget/ForumForms.xml ofbiz/trunk/specialpurpose/ecommerce/widget/ForumScreens.xml ofbiz/trunk/specialpurpose/ecommerce/widget/ForumTrees.xml ofbiz/trunk/specialpurpose/myportal/data/MyPortalDemoData.xml ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/MyPortalServices.xml ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml ofbiz/trunk/specialpurpose/oagis/script/org/ofbiz/oagis/OagisMessageServices.xml ofbiz/trunk/specialpurpose/oagis/webapp/oagis/WEB-INF/controller.xml ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrPortletData.xml ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrTypeData.xml ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml ofbiz/trunk/specialpurpose/shark/webapp/shark/WEB-INF/controller.xml ofbiz/trunk/specialpurpose/webpos/widget/CommonScreens.xml Modified: ofbiz/trunk/applications/accounting/data/AccountingPortletData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/AccountingPortletData.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/data/AccountingPortletData.xml (original) +++ ofbiz/trunk/applications/accounting/data/AccountingPortletData.xml Tue Apr 7 08:27:15 2009 @@ -25,7 +25,7 @@ screenName="ListCustomerInvoices" screenLocation="component://accounting/widget/InvoiceScreens.xml" description="List Invoices for a certain customer who is just logged in" - securityServiceName="portalPermissionIsCustomer" securityMainAction="VIEW" /> + securityServiceName="portalPermissionIsCustomer" securityMainAction="VIEW"/> <PortletPortletCategory portalPortletId="ListCustomerInvoices" portletCategoryId="ACCOUNTING"/> </entity-engine-xml> Modified: ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml (original) +++ ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml Tue Apr 7 08:27:15 2009 @@ -582,18 +582,18 @@ <InvoiceItemType description="Payrol" hasTable="N" invoiceItemTypeId="PAYROL" parentTypeId=""/><!-- to group the itemType parentId's --> <InvoiceItemType description="Earnings and Hours" hasTable="N" invoiceItemTypeId="PAYROL_EARN_HOURS" parentTypeId="PAYROL"/> - <InvoiceItemType description="Hourly Rate" hasTable="N" invoiceItemTypeId="PAYROL_HRLY_RATE" parentTypeId="PAYROL_EARN_HOURS" /> - <InvoiceItemType description="Sick Hourly Rate" hasTable="N" invoiceItemTypeId="PAYROL_HRLY_RATE_SIC" parentTypeId="PAYROL_EARN_HOURS" /> - <InvoiceItemType description="Salary" hasTable="N" invoiceItemTypeId="PAYROL_SALARY" parentTypeId="PAYROL_EARN_HOURS" /> - <InvoiceItemType description="Vacation Salary" hasTable="N" invoiceItemTypeId="PAYROL_SALARY_VAC" parentTypeId="PAYROL_EARN_HOURS" /> - <InvoiceItemType description="Sick Salary" hasTable="N" invoiceItemTypeId="PAYROL_SALARY_SICK" parentTypeId="PAYROL_EARN_HOURS" /> - <InvoiceItemType description="Bonus" hasTable="N" invoiceItemTypeId="PAYROL_BONUS" parentTypeId="PAYROL_EARN_HOURS" /> - <InvoiceItemType description="Commission" hasTable="N" invoiceItemTypeId="PAYROL_COMMISSION" parentTypeId="PAYROL_EARN_HOURS" /> - <InvoiceItemType description="Advance Pay" hasTable="N" invoiceItemTypeId="PAYROL_ADV_PAY" parentTypeId="PAYROL_EARN_HOURS" /> - <InvoiceItemType description="Mileage Reimboursement" hasTable="N" invoiceItemTypeId="PAYROL_MIL_REIMB" parentTypeId="PAYROL_EARN_HOURS" /> - <InvoiceItemType description="Office Exp. reimboursement" hasTable="N" invoiceItemTypeId="PAYROL_OFF_EXP_REIMB" parentTypeId="PAYROL_EARN_HOURS" /> - <InvoiceItemType description="Pay Period adj(over pay)" hasTable="N" invoiceItemTypeId="PAYROL_PAYPER_OVRPAY" parentTypeId="PAYROL_EARN_HOURS" /> - <InvoiceItemType description="Pay Period adj pay" hasTable="N" invoiceItemTypeId="PAYROL_PAYPER_PAY" parentTypeId="PAYROL_EARN_HOURS" /> + <InvoiceItemType description="Hourly Rate" hasTable="N" invoiceItemTypeId="PAYROL_HRLY_RATE" parentTypeId="PAYROL_EARN_HOURS"/> + <InvoiceItemType description="Sick Hourly Rate" hasTable="N" invoiceItemTypeId="PAYROL_HRLY_RATE_SIC" parentTypeId="PAYROL_EARN_HOURS"/> + <InvoiceItemType description="Salary" hasTable="N" invoiceItemTypeId="PAYROL_SALARY" parentTypeId="PAYROL_EARN_HOURS"/> + <InvoiceItemType description="Vacation Salary" hasTable="N" invoiceItemTypeId="PAYROL_SALARY_VAC" parentTypeId="PAYROL_EARN_HOURS"/> + <InvoiceItemType description="Sick Salary" hasTable="N" invoiceItemTypeId="PAYROL_SALARY_SICK" parentTypeId="PAYROL_EARN_HOURS"/> + <InvoiceItemType description="Bonus" hasTable="N" invoiceItemTypeId="PAYROL_BONUS" parentTypeId="PAYROL_EARN_HOURS"/> + <InvoiceItemType description="Commission" hasTable="N" invoiceItemTypeId="PAYROL_COMMISSION" parentTypeId="PAYROL_EARN_HOURS"/> + <InvoiceItemType description="Advance Pay" hasTable="N" invoiceItemTypeId="PAYROL_ADV_PAY" parentTypeId="PAYROL_EARN_HOURS"/> + <InvoiceItemType description="Mileage Reimboursement" hasTable="N" invoiceItemTypeId="PAYROL_MIL_REIMB" parentTypeId="PAYROL_EARN_HOURS"/> + <InvoiceItemType description="Office Exp. reimboursement" hasTable="N" invoiceItemTypeId="PAYROL_OFF_EXP_REIMB" parentTypeId="PAYROL_EARN_HOURS"/> + <InvoiceItemType description="Pay Period adj(over pay)" hasTable="N" invoiceItemTypeId="PAYROL_PAYPER_OVRPAY" parentTypeId="PAYROL_EARN_HOURS"/> + <InvoiceItemType description="Pay Period adj pay" hasTable="N" invoiceItemTypeId="PAYROL_PAYPER_PAY" parentTypeId="PAYROL_EARN_HOURS"/> <InvoiceItemType description="Deductions from Gross" hasTable="N" invoiceItemTypeId="PAYROL_DD_FROM_GROSS" parentTypeId="PAYROL"/> <InvoiceItemType description="125*Compy. Contr Other Prem." hasTable="N" invoiceItemTypeId="PAYROL_DD_125COMPY" parentTypeId="PAYROL_DD_FROM_GROSS" defaultGlAccountId=""/>/> @@ -800,9 +800,9 @@ <WorkEffort workEffortId="_NA_"/> <EmplPositionType emplPositionTypeId="_NA_"/> - <WebSite webSiteId="ACCOUNTING" siteName="Accounting Manager" visualThemeSetId="BACKOFFICE" /> - <WebSite webSiteId="ACCOUNTING_P" siteName="Account Payable Manager" visualThemeSetId="BACKOFFICE" /> - <WebSite webSiteId="ACCOUNTING_R" siteName="Account Receivable Manager" visualThemeSetId="BACKOFFICE" /> + <WebSite webSiteId="ACCOUNTING" siteName="Accounting Manager" visualThemeSetId="BACKOFFICE"/> + <WebSite webSiteId="ACCOUNTING_P" siteName="Account Payable Manager" visualThemeSetId="BACKOFFICE"/> + <WebSite webSiteId="ACCOUNTING_R" siteName="Account Receivable Manager" visualThemeSetId="BACKOFFICE"/> <!-- Points of Title Transfer --> <EnumerationType description="Points of Title Transfer" enumTypeId="PTSOFTTFR" hasTable="N" parentTypeId=""/> Modified: ofbiz/trunk/applications/accounting/data/DemoGeneralChartOfAccounts.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/DemoGeneralChartOfAccounts.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/data/DemoGeneralChartOfAccounts.xml (original) +++ ofbiz/trunk/applications/accounting/data/DemoGeneralChartOfAccounts.xml Tue Apr 7 08:27:15 2009 @@ -23,7 +23,7 @@ <!-- <AcctgTransEntry acctgTransId="10000" acctgTransEntrySeq="1" description="Test AcctgTransEntry" - partyId="ACCOUNTING" glAccountId="700000" organizationPartyId="ACCOUNTING" amount="100" debitCreditFlag="C" /> + partyId="ACCOUNTING" glAccountId="700000" organizationPartyId="ACCOUNTING" amount="100" debitCreditFlag="C"/> --> <GlAccount parentGlAccountId="" glAccountId="100000" accountCode="100000" Modified: ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml (original) +++ ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml Tue Apr 7 08:27:15 2009 @@ -66,7 +66,7 @@ <PartyRelationship partyIdFrom="Company" partyIdTo="TESTING" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="_NA_" roleTypeIdTo="_NA_" fromDate="2001-05-13 00:00:00.000"/> <!-- demo rates --> - <RateAmount rateTypeId="STANDARD" rateCurrencyUomId="USD" periodTypeId="RATE_HOUR" workEffortId="_NA_" partyId="_NA_" emplPositionTypeId="_NA_" fromDate="2000-01-01 00:00:00.000" rateAmount="95.0" /> + <RateAmount rateTypeId="STANDARD" rateCurrencyUomId="USD" periodTypeId="RATE_HOUR" workEffortId="_NA_" partyId="_NA_" emplPositionTypeId="_NA_" fromDate="2000-01-01 00:00:00.000" rateAmount="95.0"/> <RateAmount rateTypeId="DISCOUNTED" rateCurrencyUomId="USD" periodTypeId="RATE_HOUR" workEffortId="_NA_" partyId="_NA_" emplPositionTypeId="_NA_" fromDate="2000-01-01 00:00:00.000" rateAmount="55.0"/> <RateAmount rateTypeId="OVERTIME" rateCurrencyUomId="USD" periodTypeId="RATE_HOUR" workEffortId="_NA_" partyId="_NA_" emplPositionTypeId="_NA_" fromDate="2000-01-01 00:00:00.000" rateAmount="125.0"/> Modified: ofbiz/trunk/applications/accounting/data/PaymentsInvoices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/PaymentsInvoices.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/data/PaymentsInvoices.xml (original) +++ ofbiz/trunk/applications/accounting/data/PaymentsInvoices.xml Tue Apr 7 08:27:15 2009 @@ -60,9 +60,9 @@ <!-- show on customer invoice list when DemoCustomer logs on to myportal --> <Party partyId="DemoCustCompany" partyTypeId="PARTY_GROUP"/> - <Invoice invoiceId="demo1200" invoiceTypeId="SALES_INVOICE" partyIdFrom="Company" partyId="DemoCustCompany" statusId="INVOICE_APPROVED" invoiceDate="2006-04-25 12:46:27.122" description="This is an invoice to DemoCustomer" currencyUomId="USD" /> - <InvoiceItem invoiceId="demo1200" invoiceItemSeqId="00001" invoiceItemTypeId="INV_SPROD_ITEM" uomId="USD" taxableFlag="Y" amount="511.23" description="this was e service for a product" /> - <InvoiceStatus statusId="INVOICE_IN_PROCESS" invoiceId="demo1200" statusDate="2006-04-25 12:46:27.122" /> - <InvoiceStatus statusId="INVOICE_APPROVED" invoiceId="demo1200" statusDate="2006-04-25 12:46:27.122" /> + <Invoice invoiceId="demo1200" invoiceTypeId="SALES_INVOICE" partyIdFrom="Company" partyId="DemoCustCompany" statusId="INVOICE_APPROVED" invoiceDate="2006-04-25 12:46:27.122" description="This is an invoice to DemoCustomer" currencyUomId="USD"/> + <InvoiceItem invoiceId="demo1200" invoiceItemSeqId="00001" invoiceItemTypeId="INV_SPROD_ITEM" uomId="USD" taxableFlag="Y" amount="511.23" description="this was e service for a product"/> + <InvoiceStatus statusId="INVOICE_IN_PROCESS" invoiceId="demo1200" statusDate="2006-04-25 12:46:27.122"/> + <InvoiceStatus statusId="INVOICE_APPROVED" invoiceId="demo1200" statusDate="2006-04-25 12:46:27.122"/> </entity-engine-xml> Modified: ofbiz/trunk/applications/accounting/entitydef/entitygroup_olap.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/entitydef/entitygroup_olap.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/entitydef/entitygroup_olap.xml (original) +++ ofbiz/trunk/applications/accounting/entitydef/entitygroup_olap.xml Tue Apr 7 08:27:15 2009 @@ -24,12 +24,12 @@ <!-- ========================================================= --> <!-- Facts --> <!-- ========================================================= --> - <entity-group group="org.ofbiz.olap" entity="SalesInvoiceItemFact" /> + <entity-group group="org.ofbiz.olap" entity="SalesInvoiceItemFact"/> <!-- ========================================================= --> <!-- Star Schemas --> <!-- ========================================================= --> - <entity-group group="org.ofbiz.olap" entity="SalesInvoiceItemStarSchema" /> + <entity-group group="org.ofbiz.olap" entity="SalesInvoiceItemStarSchema"/> </entitygroup> Modified: ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml (original) +++ ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml Tue Apr 7 08:27:15 2009 @@ -1036,7 +1036,7 @@ <key-map field-name="orderId"/> </relation> <relation type="one-nofk" rel-entity-name="OrderItem"> - <key-map field-name="orderId" /> + <key-map field-name="orderId"/> <key-map field-name="orderItemSeqId"/> </relation> </entity> @@ -1234,12 +1234,12 @@ <key-map field-name="productFeatureId"/> </relation> <relation type="one" fk-name="INVCE_ITM_PINVIT" rel-entity-name="InvoiceItem"> - <key-map field-name="parentInvoiceId" rel-field-name="invoiceId" /> - <key-map field-name="parentInvoiceItemSeqId" rel-field-name="invoiceItemSeqId" /> + <key-map field-name="parentInvoiceId" rel-field-name="invoiceId"/> + <key-map field-name="parentInvoiceItemSeqId" rel-field-name="invoiceItemSeqId"/> </relation> <relation type="many" fk-name="INVCE_ITM_CINVIT" title="Children" rel-entity-name="InvoiceItem"> - <key-map field-name="invoiceId" rel-field-name="parentInvoiceId" /> - <key-map field-name="invoiceItemSeqId" rel-field-name="parentInvoiceItemSeqId" /> + <key-map field-name="invoiceId" rel-field-name="parentInvoiceId"/> + <key-map field-name="invoiceItemSeqId" rel-field-name="parentInvoiceItemSeqId"/> </relation> <relation type="one" fk-name="INVCE_ITM_UOM" rel-entity-name="Uom"> <key-map field-name="uomId"/> @@ -2669,10 +2669,10 @@ <key-map field-name="paymentId"/> </view-link> <relation type="one-nofk" rel-entity-name="Payment"> - <key-map field-name="paymentId" /> + <key-map field-name="paymentId"/> </relation> <relation type="one-nofk" rel-entity-name="PaymentApplication"> - <key-map field-name="paymentApplicationId" /> + <key-map field-name="paymentApplicationId"/> </relation> <relation type="one-nofk" rel-entity-name="StatusItem"> <key-map field-name="statusId"/> @@ -3326,7 +3326,7 @@ <alias entity-alias="ATE" name="organizationPartyId" group-by="true"/> <alias entity-alias="ATE" name="totalAmount" field="amount" function="sum"/> <alias entity-alias="GAO" name="fromDate" group-by="true"/> - <alias entity-alias="GAO" name="thruDate" group-by="true" /> + <alias entity-alias="GAO" name="thruDate" group-by="true"/> <view-link entity-alias="GAO" rel-entity-alias="ATE"> <key-map field-name="glAccountId"/> <key-map field-name="organizationPartyId"/> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/admin/AcctgAdminServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/admin/AcctgAdminServices.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/admin/AcctgAdminServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/admin/AcctgAdminServices.xml Tue Apr 7 08:27:15 2009 @@ -43,7 +43,7 @@ <simple-method method-name="getPartyAccountingPreferences" short-description="Get the accounting preference settings for a party (organization)"> - <make-value entity-name="PartyAcctgPreference" value-field="aggregatedPartyAcctgPref" /> + <make-value entity-name="PartyAcctgPreference" value-field="aggregatedPartyAcctgPref"/> <set field="currentOrganizationPartyId" from-field="parameters.organizationPartyId"/> <set field="containsEmptyFields" type="Boolean" value="true"/> <while> @@ -114,8 +114,8 @@ <!-- find the existing exchange rates for this currency pair --> <entity-condition entity-name="UomConversionDated" list="uomConversions" filter-by-date="true"> <condition-list> - <condition-expr field-name="uomId" operator="equals" from-field="parameters.uomId" /> - <condition-expr field-name="uomIdTo" operator="equals" from-field="parameters.uomIdTo" /> + <condition-expr field-name="uomId" operator="equals" from-field="parameters.uomId"/> + <condition-expr field-name="uomIdTo" operator="equals" from-field="parameters.uomIdTo"/> <condition-expr field-name="purposeEnumId" operator="equals" from-field="parameters.purposeEnumId" ignore-if-empty="true"/> </condition-list> </entity-condition> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml Tue Apr 7 08:27:15 2009 @@ -346,7 +346,7 @@ <!-- VarianceReasonGlAccount methods --> <simple-method method-name="createVarianceReasonGlAccount" short-description="Create a Variance Reason Gl Account"> - <make-value entity-name="VarianceReasonGlAccount" value-field="newEntity" /> + <make-value entity-name="VarianceReasonGlAccount" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> 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=762648&r1=762647&r2=762648&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 Tue Apr 7 08:27:15 2009 @@ -403,11 +403,11 @@ <set field="currencyUomId" from-field="invoice.currencyUomId"/> <!-- if the invoice is already PAID, then set it back to READY and clear out the paidDate --> <if-compare field="invoice.statusId" operator="equals" value="INVOICE_PAID"> - <set field="invoiceStatusMap.invoiceId" value="${paymentApplication.invoiceId}" /> + <set field="invoiceStatusMap.invoiceId" value="${paymentApplication.invoiceId}"/> <set field="invoiceStatusMap.statusId" value="INVOICE_READY"/> <now-timestamp field="nowTimestamp"/> - <set field="invoiceStatusMap.statusDate" from-field="nowTimestamp" /> - <call-service service-name="setInvoiceStatus" in-map-name="invoiceStatusMap" /> + <set field="invoiceStatusMap.statusDate" from-field="nowTimestamp"/> + <call-service service-name="setInvoiceStatus" in-map-name="invoiceStatusMap"/> </if-compare> <check-errors/> <field-to-result field="paymentApplication.invoiceId" result-name="invoiceId"/> @@ -500,7 +500,7 @@ <if-not-empty field="invoice.paidDate"> <if-compare field="parameters.statusId" operator="equals" value="INVOICE_READY"> - <clear-field field="invoice.paidDate" /> + <clear-field field="invoice.paidDate"/> </if-compare> </if-not-empty> @@ -577,7 +577,7 @@ <make-value value-field="invoiceContactMech" entity-name="InvoiceContactMech"/> <set-pk-fields map="parameters" value-field="invoiceContactMech"/> <create-value value-field="invoiceContactMech"/> - <field-to-result field="contactMechId" result-name="invoiceContactMech" /> + <field-to-result field="contactMechId" result-name="invoiceContactMech"/> </simple-method> <simple-method method-name="updateInvoiceItemType" short-description="Updates a InvoiceItemType Record"> 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=762648&r1=762647&r2=762648&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 Tue Apr 7 08:27:15 2009 @@ -369,11 +369,11 @@ <set field="currencyUomId" from-field="invoice.currencyUomId"/> <!-- if the invoice is already PAID, then set it back to READY and clear out the paidDate --> <if-compare field="invoice.statusId" operator="equals" value="INVOICE_PAID"> - <set field="invoiceStatusMap.invoiceId" value="${paymentApplication.invoiceId}" /> + <set field="invoiceStatusMap.invoiceId" value="${paymentApplication.invoiceId}"/> <set field="invoiceStatusMap.statusId" value="INVOICE_READY"/> <now-timestamp field="nowTimestamp"/> - <set field="invoiceStatusMap.statusDate" from-field="nowTimestamp" /> - <call-service service-name="setInvoiceStatus" in-map-name="invoiceStatusMap" /> + <set field="invoiceStatusMap.statusDate" from-field="nowTimestamp"/> + <call-service service-name="setInvoiceStatus" in-map-name="invoiceStatusMap"/> </if-compare> <check-errors/> <field-to-result field="paymentApplication.invoiceId" result-name="invoiceId"/> @@ -466,7 +466,7 @@ <if-not-empty field="invoice.paidDate"> <if-compare field="parameters.statusId" operator="equals" value="INVOICE_READY"> - <clear-field field="invoice.paidDate" /> + <clear-field field="invoice.paidDate"/> </if-compare> </if-not-empty> 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=762648&r1=762647&r2=762648&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 Tue Apr 7 08:27:15 2009 @@ -2038,7 +2038,7 @@ <entity-one entity-name="Invoice" value-field="invoice"/> <if-compare field="invoice.invoiceTypeId" value="SALES_INVOICE" operator="equals"> <entity-and entity-name="InvoiceItem" list="invoiceItems"> - <field-map field-name="invoiceId" from-field="parameters.invoiceId" /> + <field-map field-name="invoiceId" from-field="parameters.invoiceId"/> </entity-and> <iterate list="invoiceItems" entry="invoiceItem"> <!-- TODO: handle serialized inventory --> @@ -2142,7 +2142,7 @@ <else> <if-not-empty field="paymentApplication.taxAuthGeoId"> <entity-one entity-name="TaxAuthorityGlAccount" value-field="taxAuthorityGlAccount"> - <field-map field-name="organizationPartyId" from-field="organizationPartyId" /> + <field-map field-name="organizationPartyId" from-field="organizationPartyId"/> <field-map field-name="taxAuthGeoId" from-field="paymentApplication.taxAuthGeoId"/> <field-map field-name="taxAuthPartyId" from-field="partyId"/> </entity-one> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml Tue Apr 7 08:27:15 2009 @@ -23,21 +23,21 @@ <!-- DEJ20050428 Commenting out for now, does not appear to be used anywhere <simple-method method-name="captureAll" short-description="Capture Payments for Orders" login-required="false"> - <field-to-field field-name="orderStatusId" map-name="parameters" to-map-name="orderLookup" /> - <field-to-field field-name="currency" map-name="parameters" to-map-name="captureParams" /> - <string-to-field string="PAYMENT_AUTHORIZED" field-name="paymentStatusId" map-name="orderLookup" /> - <find-by-and entity-name="OrderHeaderAndPaymentPref" map="orderLookup" list="orderHeaderAndPaymentPrefs" /> + <field-to-field field-name="orderStatusId" map-name="parameters" to-map-name="orderLookup"/> + <field-to-field field-name="currency" map-name="parameters" to-map-name="captureParams"/> + <string-to-field string="PAYMENT_AUTHORIZED" field-name="paymentStatusId" map-name="orderLookup"/> + <find-by-and entity-name="OrderHeaderAndPaymentPref" map="orderLookup" list="orderHeaderAndPaymentPrefs"/> <iterate entry="orderHeaderAndPaymentPref" list="orderHeaderAndPaymentPrefs" > - <field-to-field map-name="orderHeaderAndPaymentPref" field-name="orderId" to-map-name="captureParams" /> + <field-to-field map-name="orderHeaderAndPaymentPref" field-name="orderId" to-map-name="captureParams"/> <call-service service-name="capturePayment" in-map-name="captureParams" error-code="ignore-error"> - <result-to-field map-name="captureResult" result-name="responseMessage" /> + <result-to-field map-name="captureResult" result-name="responseMessage"/> </call-service> <if-compare operator="equals" field="captureResult.responseMessage" value="error"> - <field-to-list map-name="orderHeaderAndPaymentPref" field="orderId" list="badOrders" /> + <field-to-list map-name="orderHeaderAndPaymentPref" field="orderId" list="badOrders"/> </if-compare> </iterate> <if-not-empty field="badOrders"> - <string-to-field string="mail.smtp.host" field-name="sendType" map-name="emailParams" /> + <string-to-field string="mail.smtp.host" field-name="sendType" map-name="emailParams"/> <property-to-field resource="payment" property="mailhost" field="sendVia" map-name="emailParams"/> <property-to-field resource="payment" property="sendTo" field="sendTo" map-name="emailParams"/> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/AutoAcctgTransTests.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/AutoAcctgTransTests.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/AutoAcctgTransTests.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/AutoAcctgTransTests.xml Tue Apr 7 08:27:15 2009 @@ -403,7 +403,7 @@ <if-compare field="workEffortAndInventoryAssign.productId" operator="equals" value="MAT_B_COST"> <calculate field="totalIssuedQty_MAT_B_COST"> <calcop operator="add"> - <calcop operator="get" field="workEffortAndInventoryAssign.quantity" /> + <calcop operator="get" field="workEffortAndInventoryAssign.quantity"/> <calcop operator="get" field="totalIssuedQty_MAT_B_COST"/> </calcop> </calculate> Modified: ofbiz/trunk/applications/accounting/servicedef/secas.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/secas.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/servicedef/secas.xml (original) +++ ofbiz/trunk/applications/accounting/servicedef/secas.xml Tue Apr 7 08:27:15 2009 @@ -159,7 +159,7 @@ <action service="createFixedAssetAndLinkToProduct" mode="sync"/> </eca> <eca service="createPaymentApplication" event="commit"> - <condition field-name="invoiceId" operator="is-not-empty" /> + <condition field-name="invoiceId" operator="is-not-empty"/> <action service="createAcctgTransAndEntriesForPaymentApplication" mode="sync"/> </eca> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Tue Apr 7 08:27:15 2009 @@ -900,33 +900,33 @@ <response name="error" type="view" value="EditFixedAssetMaint"/> </request-map> <request-map uri="LookupWorkEffort"> - <security https="true" auth="true" /> - <response name="success" type="view" value="LookupWorkEffort" /> + <security https="true" auth="true"/> + <response name="success" type="view" value="LookupWorkEffort"/> </request-map> <request-map uri="LookupOrderHeader"> - <security https="true" auth="true" /> - <response name="success" type="view" value="LookupOrderHeader" /> + <security https="true" auth="true"/> + <response name="success" type="view" value="LookupOrderHeader"/> </request-map> <!-- FixedAssetMaintenance Calendar --> <request-map uri="day"> - <security https="true" auth="true" /> - <response name="success" type="view" value="FixedAssetDay" /> + <security https="true" auth="true"/> + <response name="success" type="view" value="FixedAssetDay"/> </request-map> <request-map uri="week"> - <security https="true" auth="true" /> - <response name="success" type="view" value="FixedAssetWeek" /> + <security https="true" auth="true"/> + <response name="success" type="view" value="FixedAssetWeek"/> </request-map> <request-map uri="month"> - <security https="true" auth="true" /> - <response name="success" type="view" value="FixedAssetMonth" /> + <security https="true" auth="true"/> + <response name="success" type="view" value="FixedAssetMonth"/> </request-map> <request-map uri="EditWorkEffort"> - <security https="true" auth="true" /> - <response name="success" type="view" value="EditFixedAssetMaint" /> + <security https="true" auth="true"/> + <response name="success" type="view" value="EditFixedAssetMaint"/> </request-map> <request-map uri="WorkEffortSummary"> - <security https="true" auth="true" /> - <response name="success" type="view" value="WorkEffortSummary" /> + <security https="true" auth="true"/> + <response name="success" type="view" value="WorkEffortSummary"/> </request-map> <!-- FixedAssetMaintenance Order --> <request-map uri="EditFixedAssetMaintOrders"> @@ -2132,8 +2132,8 @@ <view-map name="LookupPayment" page="component://accounting/widget/LookupScreens.xml#LookupPayment" type="screen"/> <view-map name="LookupInvoice" page="component://accounting/widget/LookupScreens.xml#LookupInvoice" type="screen"/> - <view-map name="LookupWorkEffort" type="screen" page="component://workeffort/widget/LookupScreens.xml#LookupWorkEffort" /> - <view-map name="LookupOrderHeader" type="screen" page="component://order/widget/ordermgr/LookupScreens.xml#LookupOrderHeader" /> + <view-map name="LookupWorkEffort" type="screen" page="component://workeffort/widget/LookupScreens.xml#LookupWorkEffort"/> + <view-map name="LookupOrderHeader" type="screen" page="component://order/widget/ordermgr/LookupScreens.xml#LookupOrderHeader"/> <view-map name="LookupFacility" type="screen" page="component://product/widget/facility/LookupScreens.xml#LookupFacility"/> <view-map name="LookupFacilityLocation" type="screen" page="component://product/widget/facility/LookupScreens.xml#LookupFacilityLocation"/> <view-map name="LookupShipment" type="screen" page="component://product/widget/facility/LookupScreens.xml#LookupShipment"/> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml Tue Apr 7 08:27:15 2009 @@ -184,7 +184,7 @@ <display-entity entity-name="TermType"/> </field> <field name="invoiceItemTypeId"> - <display-entity entity-name="InvoiceItemType" /> + <display-entity entity-name="InvoiceItemType"/> </field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="removeAgreementItemTerm" description="${uiLabelMap.CommonRemove}" also-hidden="false"> @@ -203,7 +203,7 @@ <order-by field-name="agreementTermId"/> </entity-and> </actions> - <auto-fields-service service-name="updateAgreementTerm" /> + <auto-fields-service service-name="updateAgreementTerm"/> <field name="agreementId" title="${uiLabelMap.AccountingAgreementId}"><hidden/></field> <field name="agreementTermId" ><hidden/></field> <field name="agreementItemSeqId" title="${uiLabelMap.AccountingAgreementItemSeqId}"><hidden/></field> @@ -567,7 +567,7 @@ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> <entity-and entity-name="AgreementWorkEffortAppl" use-cache="true" list="agreementWorkEffortAppls"> - <field-map from-field="agreementId" field-name="agreementId" /> + <field-map from-field="agreementId" field-name="agreementId"/> </entity-and> </actions> <field name="agreementItemSeqId"><display/></field> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml Tue Apr 7 08:27:15 2009 @@ -213,7 +213,7 @@ <field name="fixedAssetId"><hidden/></field> <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field> <field name="fixedAssetStdCostTypeId" title="${uiLabelMap.AccountingFixedAssetStdCostTypeId}"> - <display-entity entity-name="FixedAssetStdCostType" /> + <display-entity entity-name="FixedAssetStdCostType"/> </field> <field name="amountUomId"> <drop-down allow-empty="true"> @@ -279,7 +279,7 @@ <!-- create a fixed asset Idents--> <form name="AddFixedAssetIdent" type="single" target="createFixedAssetIdent" title="" header-row-style="header-row" default-table-style="basic-table"> - <auto-fields-service service-name="createFixedAssetIdent" /> + <auto-fields-service service-name="createFixedAssetIdent"/> <field name="fixedAssetId"><hidden/></field> <field name="fixedAssetIdentTypeId" title="${uiLabelMap.AccountingFixedAssetIdentType}"> <drop-down allow-empty="false"> @@ -303,8 +303,8 @@ <auto-fields-service service-name="updateFixedAssetRegistration"/> <field name="fixedAssetId"><hidden/></field> <field name="fromDate"><display/></field> - <field name="registrationNumber" title="${uiLabelMap.AccountingFixedAssetRegNumber}"><text size="20" /></field> - <field name="licenseNumber" title="${uiLabelMap.AccountingFixedAssetLicenseNumber}"><text size="20" /></field> + <field name="registrationNumber" title="${uiLabelMap.AccountingFixedAssetRegNumber}"><text size="20"/></field> + <field name="licenseNumber" title="${uiLabelMap.AccountingFixedAssetLicenseNumber}"><text size="20"/></field> <field name="govAgencyPartyId" title="${uiLabelMap.AccountingFixedAssetGovAgencyPartyId}"><lookup target-form-name="LookupPartyName"/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="deleteFixedAssetRegistration" description="${uiLabelMap.CommonDelete}" also-hidden="false"> @@ -318,7 +318,7 @@ <!-- create a fixed asset Registration--> <form name="AddFixedAssetRegistration" type="single" target="createFixedAssetRegistration" title="" header-row-style="header-row" default-table-style="basic-table"> - <auto-fields-service service-name="createFixedAssetRegistration" /> + <auto-fields-service service-name="createFixedAssetRegistration"/> <field name="fixedAssetId"><hidden/></field> <field name="licenseNumber" title="${uiLabelMap.AccountingFixedAssetLicenseNumber}"><text size="20"/></field> <field name="registrationNumber" title="${uiLabelMap.AccountingFixedAssetRegNumber}"><text size="20"/></field> @@ -450,7 +450,7 @@ <!-- create a fixed asset meter reading --> <form name="AddFixedAssetMeter" type="single" target="createFixedAssetMeter" title="" header-row-style="header-row" default-table-style="basic-table"> - <auto-fields-service service-name="createFixedAssetMeter" /> + <auto-fields-service service-name="createFixedAssetMeter"/> <field name="fixedAssetId"><hidden/></field> <field name="maintHistSeqId" use-when="maintHistSeqId != null"><hidden/></field> <field name="maintHistSeqId" use-when="maintHistSeqId == null"><ignored/></field> @@ -461,7 +461,7 @@ </entity-options> </drop-down> </field> - <field name="meterValue" title="${uiLabelMap.AccountingFixedAssetMeterValue}"><text size="20" /></field> + <field name="meterValue" title="${uiLabelMap.AccountingFixedAssetMeterValue}"><text size="20"/></field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <!-- List all fixed asset Maintenance Order --> @@ -499,7 +499,7 @@ <field name="fixedAssetId"><hidden/></field> <field name="maintHistSeqId"><hidden/></field> <field name="orderId"><lookup target-form-name="LookupOrderHeader"/></field> - <field name="orderItemSeqId"><text size="20" /></field> + <field name="orderItemSeqId"><text size="20"/></field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> @@ -509,7 +509,7 @@ <actions> <entity-condition entity-name="PartyFixedAssetAssignment" list="listPartyFixedAssets"> <condition-expr field-name="fixedAssetId" from-field="fixedAssetId"/> - <order-by field-name="fromDate" /> + <order-by field-name="fromDate"/> </entity-condition> </actions> <auto-fields-service service-name="updatePartyFixedAssetAssignment"/> 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=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml Tue Apr 7 08:27:15 2009 @@ -506,7 +506,7 @@ </form> <form name="EditInvoiceRole" type="single" target="createInvoiceRole" title="" header-row-style="header-row" default-table-style="basic-table"> - <auto-fields-entity entity-name="InvoiceRole" /> + <auto-fields-entity entity-name="InvoiceRole"/> <field name="invoiceId"><hidden/></field> <field name="partyId"><lookup target-form-name="LookupPartyName"/></field> <field name="roleTypeId"> 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=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml Tue Apr 7 08:27:15 2009 @@ -52,7 +52,7 @@ </form> <form name="lookupBillingAccount" target="LookupBillingAccount" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> - <auto-fields-entity entity-name="BillingAccount" default-field-type="hidden" /> + <auto-fields-entity entity-name="BillingAccount" default-field-type="hidden"/> <field name="billingAccountId" title="${uiLabelMap.AccountingBillingAccountId}"><text-find/></field> <field name="description" title="${uiLabelMap.CommonDescription}"><text-find/></field> <field name="externalAccountId" title="${uiLabelMap.AccountingExternalAccountId}"><text-find/></field> @@ -115,7 +115,7 @@ </form> <form name="lookupPayment" target="LookupPayment" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> - <auto-fields-entity entity-name="Payment" default-field-type="hidden" /> + <auto-fields-entity entity-name="Payment" default-field-type="hidden"/> <field name="paymentId" title="${uiLabelMap.AccountingPaymentID}"><text-find/></field> <field name="partyIdFrom"><lookup target-form-name="LookupPartyName"/></field> <field name="partyIdTo"><lookup target-form-name="LookupPartyName"/></field> Modified: ofbiz/trunk/applications/accounting/widget/AccountingPrintScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AccountingPrintScreens.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/AccountingPrintScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/AccountingPrintScreens.xml Tue Apr 7 08:27:15 2009 @@ -41,11 +41,11 @@ <or> <if-has-permission permission="ACCOUNTING" action="_VIEW"/> <!-- can always see own invoice --> - <if-compare field="invoice.partyIdFrom" operator="equals" value="${userLogin.partyId}" /> - <if-compare field="invoice.partyId" operator="equals" value="${userLogin.partyId}" /> + <if-compare field="invoice.partyIdFrom" operator="equals" value="${userLogin.partyId}"/> + <if-compare field="invoice.partyId" operator="equals" value="${userLogin.partyId}"/> <!-- or is a contact of a company who owns the invoice--> - <if-compare field="invoice.partyIdFrom" operator="equals" value="${myCompanyId}" /> - <if-compare field="invoice.partyId" operator="equals" value="${myCompanyId}" /> + <if-compare field="invoice.partyIdFrom" operator="equals" value="${myCompanyId}"/> + <if-compare field="invoice.partyId" operator="equals" value="${myCompanyId}"/> </or> </condition> <widgets> Modified: ofbiz/trunk/applications/accounting/widget/AccountingTrees.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AccountingTrees.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/AccountingTrees.xml (original) +++ ofbiz/trunk/applications/accounting/widget/AccountingTrees.xml Tue Apr 7 08:27:15 2009 @@ -55,7 +55,7 @@ </node> <node name="node-body"> <link target="EditFixedAsset" text="${fixedAssetId} ${fixedAssetName ${instanceOfProductId} ${fixedAssetTypeId} "> - <parameter param-name="fixedAssetId" from-field="fixedAssetId}" /> + <parameter param-name="fixedAssetId" from-field="fixedAssetId}"/> </link> <sub-node node-name="node-body"> <entity-and entity-name="FixedAsset"> Modified: ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml Tue Apr 7 08:27:15 2009 @@ -194,7 +194,7 @@ <set field="headerItem" value="agreement"/> <set field="tabButtonItem" value="AgreementItems"/> <set field="buttonBarItem" value="EditAgreementItem"/> - <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD" /> + <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/> <set field="agreementId" from-field="parameters.agreementId"/> <set field="agreementItemSeqId" from-field="parameters.agreementItemSeqId"/> <entity-one entity-name="Agreement" value-field="agreement" auto-field-map="true"/> Modified: ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml Tue Apr 7 08:27:15 2009 @@ -29,7 +29,7 @@ </hyperlink> </field> <field name="accountLimit"> - <display type="currency" currency="${billingAccount.accountCurrencyUomId}" /> + <display type="currency" currency="${billingAccount.accountCurrencyUomId}"/> </field> <field name="description"><display/></field> <field name="fromDate"><display/></field> @@ -44,7 +44,7 @@ </hyperlink> </field> <field name="accountLimit"> - <display type="currency" currency="${billingAccount.accountCurrencyUomId}" /> + <display type="currency" currency="${billingAccount.accountCurrencyUomId}"/> </field> <field name="description"><display/></field> <field name="fromDate"><display/></field> Modified: ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml Tue Apr 7 08:27:15 2009 @@ -109,7 +109,7 @@ <set field="titleProperty" value="PageTitleEditBillingAccount"/> <set field="headerItem" value="billingaccount"/> <set field="tabButtonItem" value="EditBillingAccount"/> - <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD" /> + <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/> <set field="billingAccountId" from-field="parameters.billingAccountId"/> <entity-one entity-name="BillingAccount" value-field="billingAccount"/> <set field="partyId" from-field="parameters.partyId"/> Modified: ofbiz/trunk/applications/accounting/widget/CostScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/CostScreens.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/CostScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/CostScreens.xml Tue Apr 7 08:27:15 2009 @@ -23,7 +23,7 @@ <screen name="EditCostCalcs"> <section> <actions> - <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD" /> + <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/> <set field="tabButtonItem" value="Costs"/> <set field="titleProperty" value="PageTitleEditCostCalcs"/> Modified: ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml Tue Apr 7 08:27:15 2009 @@ -94,7 +94,7 @@ <set field="titleProperty" value="PageTitleEditFinAccount"/> <set field="tabButtonItem" value="EditFinAccount"/> <set field="finAccountId" from-field="parameters.finAccountId"/> - <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD" /> + <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/> <entity-one entity-name="FinAccount" value-field="finAccount"/> </actions> <widgets> @@ -182,7 +182,7 @@ <set field="finAccountId" from-field="parameters.finAccountId"/> <entity-one entity-name="FinAccount" value-field="finAccount"/> <set field="finAccountAuthId" from-field="parameters.finAccountAuthId"/> - <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD" /> + <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/> </actions> <widgets> <decorator-screen name="CommonFinAccountDecorator" location="${parameters.finAccountDecoratorLocation}"> Modified: ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml Tue Apr 7 08:27:15 2009 @@ -274,7 +274,7 @@ <set field="labelTitleProperty" value="PageTitleEditFixedAssetStdCosts"/> <set field="fixedAssetId" from-field="parameters.fixedAssetId"/> - <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD" /> + <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/> <entity-one entity-name="FixedAsset" value-field="fixedAsset" auto-field-map="true"/> </actions> <widgets> @@ -464,7 +464,7 @@ <widgets> <decorator-screen name="CommonFixedAssetDecorator" location="${parameters.fixedAssetDecoratorLocation}"> <decorator-section name="body"> - <include-tree name="TreeFixedAsset" location="component://accounting/widget/AccountingTrees.xml" /> + <include-tree name="TreeFixedAsset" location="component://accounting/widget/AccountingTrees.xml"/> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/applications/accounting/widget/GlForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlForms.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlForms.xml Tue Apr 7 08:27:15 2009 @@ -273,7 +273,7 @@ <display description="${accountCode} ${accountName}"/> </field> <field name="glAccountClassId" position="1" use-when="showPosition1"> - <display-entity entity-name="GlAccountClass" /> + <display-entity entity-name="GlAccountClass"/> </field> <field name="acctgTransId" widget-style="buttontext" position="2"> @@ -367,7 +367,7 @@ <display description="${accountCode} ${accountName}"/> </field> <field name="glAccountClassId"> - <display-entity entity-name="GlAccountClass" /> + <display-entity entity-name="GlAccountClass"/> </field> <field name="invoiceId" use-when="invoiceId!=null" widget-style="buttontext"> <hyperlink also-hidden="false" description="${invoiceId}" target="editInvoice"> Modified: ofbiz/trunk/applications/accounting/widget/GlScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlScreens.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlScreens.xml Tue Apr 7 08:27:15 2009 @@ -29,7 +29,7 @@ <set field="labelTitleProperty" value="AccountingPartyAccountsSummary"/> <set field="organizationPartyId" from-field="parameters.organizationPartyId" global="true"/> <!-- entity-condition entity-name="GlAccountOrganization" list="entityList" use-cache="true" > - <condition-expr field-name="glAccountId" operator="greater" value="0" /> + <condition-expr field-name="glAccountId" operator="greater" value="0"/> </entity-condition --> </actions> <widgets> @@ -415,7 +415,7 @@ <set field="tabButtonItem" value="ChecksTabButton"/> <set field="tabButtonItem2" value="PrintChecksTabButton"/> <set field="labelTitleProperty" value="${uiLabelMap.AccountingPrintChecks}"/> - <set field="organizationPartyId" from-field="parameters.organizationPartyId" /> + <set field="organizationPartyId" from-field="parameters.organizationPartyId"/> <!-- find payments of paymentMethodType PERSONAL_CHECK or COMPANY_CHECK with statusId NOT_PAID --> <entity-condition entity-name="Payment" list="payments"> @@ -464,7 +464,7 @@ <set field="titleProperty" value="AccountingSendChecks"/> <set field="tabButtonItem" value="ChecksTabButton"/> <set field="tabButtonItem2" value="SendChecksTabButton"/> - <set field="organizationPartyId" from-field="parameters.organizationPartyId" /> + <set field="organizationPartyId" from-field="parameters.organizationPartyId"/> <!-- find payments of paymentMethodType PERSONAL_CHECK or COMPANY_CHECK with statusId NOT_PAID --> <entity-condition entity-name="Payment" list="payments"> Modified: ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml Tue Apr 7 08:27:15 2009 @@ -233,7 +233,7 @@ <set field="labelTitleProperty" value="${uiLabelMap.AccountingFX}"/> <set field="tabButtonItem" value="ViewFXConversions"/> <set field="organizationPartyId" from-field="parameters.organizationPartyId" global="true"/> - <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD" /> + <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/> <!-- TODO: If UomConversionDated is ever used for another type of conversion besides currencies or if some currencies are stored in UomConversion, we need to change the logic here --> <entity-condition entity-name="UomConversionDated" list="conversions"> @@ -285,7 +285,7 @@ <set field="labelTitleProperty" value="${uiLabelMap.AccountingGlAccountTypeDefaults}"/> <set field="tabButtonItem" value="GlAccountAssignment"/> <set field="tabButtonItem2" value="GlAccountTypeDefaults"/> - <set field="organizationPartyId" from-field="parameters.organizationPartyId" /> + <set field="organizationPartyId" from-field="parameters.organizationPartyId"/> </actions> <widgets> <decorator-screen name="CommonAdminDecorator"> @@ -307,7 +307,7 @@ <set field="labelTitleProperty" value="${uiLabelMap.AccountingInvoiceSales}"/> <set field="tabButtonItem" value="GlAccountAssignment"/> <set field="tabButtonItem2" value="GlAccountSalInvoice"/> - <set field="organizationPartyId" from-field="parameters.organizationPartyId" /> + <set field="organizationPartyId" from-field="parameters.organizationPartyId"/> </actions> <widgets> <decorator-screen name="CommonAdminDecorator"> @@ -329,7 +329,7 @@ <set field="titleProperty" value="AccountingInvoicePurchase"/> <set field="tabButtonItem" value="GlAccountAssignment"/> <set field="tabButtonItem2" value="GlAccountPurInvoice"/> - <set field="organizationPartyId" from-field="parameters.organizationPartyId" /> + <set field="organizationPartyId" from-field="parameters.organizationPartyId"/> </actions> <widgets> <decorator-screen name="CommonAdminDecorator"> @@ -350,7 +350,7 @@ <set field="titleProperty" value="${uiLabelMap.AccountingPaymentType}/${uiLabelMap.FormFieldTitle_glAccountTypeId}"/> <set field="tabButtonItem" value="GlAccountAssignment"/> <set field="tabButtonItem2" value="GlAccountTypePaymentType"/> - <set field="organizationPartyId" from-field="parameters.organizationPartyId" /> + <set field="organizationPartyId" from-field="parameters.organizationPartyId"/> </actions> <widgets> <decorator-screen name="CommonAdminDecorator"> @@ -371,7 +371,7 @@ <set field="titleProperty" value="${uiLabelMap.AccountingPaymentMethodId}/${uiLabelMap.AccountingGlAccountId}"/> <set field="tabButtonItem" value="GlAccountAssignment"/> <set field="tabButtonItem2" value="GlAccountNrPaymentMethod"/> - <set field="organizationPartyId" from-field="parameters.organizationPartyId" /> + <set field="organizationPartyId" from-field="parameters.organizationPartyId"/> </actions> <widgets> <decorator-screen name="CommonAdminDecorator"> @@ -393,7 +393,7 @@ <set field="labelTitleProperty" value="${uiLabelMap.AccountingProductGlAccount}"/> <set field="tabButtonItem" value="GlAccountAssignment"/> <set field="tabButtonItem2" value="ProductGlAccounts"/> - <set field="organizationPartyId" from-field="parameters.organizationPartyId" /> + <set field="organizationPartyId" from-field="parameters.organizationPartyId"/> <entity-condition entity-name="ProductGlAccount" list="productGlAccounts"> <condition-expr field-name="organizationPartyId" from-field="organizationPartyId"/> @@ -421,7 +421,7 @@ <set field="labelTitleProperty" value="${uiLabelMap.AccountingFinAccountTypeGlAccount}"/> <set field="tabButtonItem" value="GlAccountAssignment"/> <set field="tabButtonItem2" value="FinAccountTypeGlAccounts"/> - <set field="organizationPartyId" from-field="parameters.organizationPartyId" /> + <set field="organizationPartyId" from-field="parameters.organizationPartyId"/> <entity-condition entity-name="FinAccountTypeGlAccount" list="finAccountTypeGlAccounts"> <condition-expr field-name="organizationPartyId" operator="equals" from-field="organizationPartyId"/> @@ -453,7 +453,7 @@ <set field="labelTitleProperty" value="${uiLabelMap.AccountingProductCategoryGlAccount}"/> <set field="tabButtonItem" value="GlAccountAssignment"/> <set field="tabButtonItem2" value="ProductCategoryGlAccounts"/> - <set field="organizationPartyId" from-field="parameters.organizationPartyId" /> + <set field="organizationPartyId" from-field="parameters.organizationPartyId"/> <entity-condition entity-name="ProductCategoryGlAccount" list="productCategoryGlAccounts"> <condition-expr field-name="organizationPartyId" from-field="organizationPartyId"/> @@ -481,7 +481,7 @@ <set field="tabButtonItem" value="GlAccountAssignment"/> <set field="tabButtonItem2" value="VarianceReasonGlAccounts"/> <set field="labelTitleProperty" value="${uiLabelMap.AccountingVarianceReasonGlAccounts}"/> - <set field="organizationPartyId" from-field="parameters.organizationPartyId" /> + <set field="organizationPartyId" from-field="parameters.organizationPartyId"/> <entity-condition entity-name="VarianceReasonGlAccount" list="varianceReasonGlAccounts"> <condition-expr field-name="organizationPartyId" from-field="organizationPartyId"/> @@ -509,7 +509,7 @@ <set field="tabButtonItem" value="GlAccountAssignment"/> <set field="tabButtonItem2" value="CreditCardTypeGlAccount"/> <set field="labelTitleProperty" value="${uiLabelMap.AccountingCreditCardTypeGlAccount}"/> - <set field="organizationPartyId" from-field="parameters.organizationPartyId" /> + <set field="organizationPartyId" from-field="parameters.organizationPartyId"/> <entity-condition entity-name="CreditCardTypeGlAccount" list="creditCardTypeGlAccounts"> <condition-expr field-name="organizationPartyId" from-field="organizationPartyId"/> </entity-condition> @@ -535,7 +535,7 @@ <set field="tabButtonItem" value="GlAccountAssignment"/> <set field="tabButtonItem2" value="TaxAuthorityGlAccounts"/> <set field="labelTitleProperty" value="${uiLabelMap.PageTitleEditTaxAuthorityGlAccounts}"/> - <set field="organizationPartyId" from-field="parameters.organizationPartyId" /> + <set field="organizationPartyId" from-field="parameters.organizationPartyId"/> <entity-condition entity-name="TaxAuthorityGlAccount" list="taxAuthorityGlAccounts"> <condition-expr field-name="organizationPartyId" from-field="organizationPartyId"/> <order-by field-name="taxAuthGeoId"/> Modified: ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml Tue Apr 7 08:27:15 2009 @@ -73,7 +73,7 @@ <field-map field-name="entityName" from-field="entityName"/> <field-map field-name="noConditionFind" value="Y"/> </service> - <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD" /> + <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/> </actions> <!--auto-fields-entity entity-name="GlAccount" default-field-type="display"/--> <field name="glAccountId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext"> @@ -239,7 +239,7 @@ <form name="updateRateAmount" type="single" target="updateRateAmount" default-service-name="updateRateAmount" header-row-style="header-row" default-table-style="basic-table"> <actions> - <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD" /> + <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/> </actions> <field name="rateTypeId"> <drop-down> Modified: ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml Tue Apr 7 08:27:15 2009 @@ -260,7 +260,7 @@ <container style="screenlet-body"> <section> <widgets> - <include-tree name="GlAccountTree" location="component://accounting/widget/AccountingTrees.xml" /> + <include-tree name="GlAccountTree" location="component://accounting/widget/AccountingTrees.xml"/> </widgets> </section> </container> @@ -328,7 +328,7 @@ <set field="labelTitleProperty" value="PageTitleListAccounts"/> <set field="tabButtonItem" value="Chartofaccounts"/> <!-- no longer works requies a fieldMap entity-and entity-name="GlAccount" list="entityList" use-cache="true" > - <limit-range start="0" size="20" /> + <limit-range start="0" size="20"/> </entity-and --> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |