svn commit: r807412 [1/2] - in /ofbiz/branches/executionconte
Locked
svn commit: r807412 [1/2] - in /ofbiz/branches/executionconte
 
|
Author: adrianc
Date: Mon Aug 24 22:15:46 2009 New Revision: 807412 URL: http://svn.apache.org/viewvc?rev=807412&view=rev Log: Synchronized branch with trunk, more seed data, extracted inner class. Added: ofbiz/branches/executioncontext20090812/applications/accounting/config/linehandler.properties - copied unchanged from r807293, ofbiz/trunk/applications/accounting/config/linehandler.properties ofbiz/branches/executioncontext20090812/applications/accounting/servicedef/services_orbital.xml - copied unchanged from r807293, ofbiz/trunk/applications/accounting/servicedef/services_orbital.xml ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/thirdparty/orbital/ - copied from r807293, ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/orbital/ ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/thirdparty/orbital/OrbitalPaymentServices.java - copied unchanged from r807293, ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/orbital/OrbitalPaymentServices.java ofbiz/branches/executioncontext20090812/framework/context/src/org/ofbiz/context/AccessControllerImpl.java (with props) ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/request/requestInfo.ftl - copied unchanged from r807293, ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/request/requestInfo.ftl ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/request/requestRoles.ftl - copied unchanged from r807293, ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/request/requestRoles.ftl ofbiz/branches/executioncontext20090812/specialpurpose/hhfacility/data/ ofbiz/branches/executioncontext20090812/specialpurpose/hhfacility/data/HhFacilitySecurityData.xml (with props) Modified: ofbiz/branches/executioncontext20090812/ (props changed) ofbiz/branches/executioncontext20090812/.classpath ofbiz/branches/executioncontext20090812/applications/accounting/build.xml ofbiz/branches/executioncontext20090812/applications/accounting/config/AccountingUiLabels.xml ofbiz/branches/executioncontext20090812/applications/accounting/data/AccountingSecurityData.xml ofbiz/branches/executioncontext20090812/applications/accounting/data/AccountingTypeData.xml ofbiz/branches/executioncontext20090812/applications/accounting/entitydef/entitymodel.xml ofbiz/branches/executioncontext20090812/applications/accounting/ofbiz-component.xml ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml ofbiz/branches/executioncontext20090812/applications/accounting/servicedef/services_finaccount.xml ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/WEB-INF/controller.xml ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl ofbiz/branches/executioncontext20090812/applications/accounting/widget/FinAccountForms.xml ofbiz/branches/executioncontext20090812/applications/accounting/widget/FinAccountScreens.xml ofbiz/branches/executioncontext20090812/applications/content/data/CompDocData.xml ofbiz/branches/executioncontext20090812/applications/content/data/ContentSecurityData.xml ofbiz/branches/executioncontext20090812/applications/content/data/DemoBlogUsersData.xml ofbiz/branches/executioncontext20090812/applications/humanres/data/HumanResDemoData.xml ofbiz/branches/executioncontext20090812/applications/humanres/data/HumanResSecurityData.xml ofbiz/branches/executioncontext20090812/applications/manufacturing/data/ManufacturingSecurityData.xml ofbiz/branches/executioncontext20090812/applications/marketing/data/MarketingSecurityData.xml ofbiz/branches/executioncontext20090812/applications/marketing/data/sfaDemoData.xml ofbiz/branches/executioncontext20090812/applications/marketing/webapp/sfa/lead/mergeLeads.ftl ofbiz/branches/executioncontext20090812/applications/order/data/OrderDemoUser.xml ofbiz/branches/executioncontext20090812/applications/order/data/OrderSecurityData.xml ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/WEB-INF/controller.xml ofbiz/branches/executioncontext20090812/applications/party/data/PartySecurityData.xml ofbiz/branches/executioncontext20090812/applications/party/data/ScheduledJobs.xml ofbiz/branches/executioncontext20090812/applications/product/data/ProductSecurityData.xml ofbiz/branches/executioncontext20090812/applications/securityext/data/UserDemoData.xml ofbiz/branches/executioncontext20090812/applications/workeffort/data/WorkEffortSecurityData.xml ofbiz/branches/executioncontext20090812/framework/common/data/CommonSecurityData.xml ofbiz/branches/executioncontext20090812/framework/context/src/org/ofbiz/context/AuthorizationManagerImpl.java ofbiz/branches/executioncontext20090812/framework/context/src/org/ofbiz/context/ExecutionContextImpl.java ofbiz/branches/executioncontext20090812/framework/example/data/ExampleSecurityData.xml ofbiz/branches/executioncontext20090812/framework/example/script/org/ofbiz/example/ExamplePermissionServices.xml ofbiz/branches/executioncontext20090812/framework/images/webapp/images/ecommain.css ofbiz/branches/executioncontext20090812/framework/security/data/SecurityData.xml ofbiz/branches/executioncontext20090812/framework/security/entitydef/entitymodel.xml ofbiz/branches/executioncontext20090812/framework/webslinger/data/WebslingerSeedData.xml ofbiz/branches/executioncontext20090812/framework/webtools/data/WebtoolsSecurityData.xml ofbiz/branches/executioncontext20090812/specialpurpose/assetmaint/data/AssetMaintSecurityData.xml ofbiz/branches/executioncontext20090812/specialpurpose/cmssite/data/CmsSiteDemoData.xml ofbiz/branches/executioncontext20090812/specialpurpose/ebay/data/EbaySecurityData.xml ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/data/DemoProduct.xml ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/data/DemoPurchasing.xml ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/data/EcommerceTypeData.xml ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/blog/menubar.ftl ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditProfile.ftl ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ViewProfile.ftl ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/images/blog.css ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/images/productAdditionalView.js ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/images/profile.js ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/images/quickAnonCustSettings.js ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/widget/CustRequestScreens.xml ofbiz/branches/executioncontext20090812/specialpurpose/googlebase/data/GoogleBaseSecurityData.xml ofbiz/branches/executioncontext20090812/specialpurpose/googlecheckout/data/GoogleCheckoutSecurityData.xml ofbiz/branches/executioncontext20090812/specialpurpose/hhfacility/ofbiz-component.xml ofbiz/branches/executioncontext20090812/specialpurpose/myportal/data/MyPortalSecurityData.xml ofbiz/branches/executioncontext20090812/specialpurpose/myportal/widget/reloadCaptchaCode.ftl ofbiz/branches/executioncontext20090812/specialpurpose/myportal/widget/reloadCaptchaImage.ftl ofbiz/branches/executioncontext20090812/specialpurpose/oagis/data/OagisSecurityData.xml ofbiz/branches/executioncontext20090812/specialpurpose/pos/data/DemoRetail.xml ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/data/ProjectMgrDemoPasswordData.xml ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/data/ProjectMgrSecurityData.xml ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/main.ftl ofbiz/branches/executioncontext20090812/specialpurpose/webpos/data/DemoPosData.xml ofbiz/branches/executioncontext20090812/specialpurpose/webpos/webapp/webpos/images/js/SearchProducts.js ofbiz/branches/executioncontext20090812/themes/bizznesstime/data/BizznessTimeThemeData.xml ofbiz/branches/executioncontext20090812/themes/bizznesstime/webapp/bizznesstime/css/links.css ofbiz/branches/executioncontext20090812/themes/bluelight/data/BlueLightThemeData.xml ofbiz/branches/executioncontext20090812/themes/bluelight/webapp/bluelight/dropdown.js ofbiz/branches/executioncontext20090812/themes/flatgrey/data/FlatGreyThemeData.xml ofbiz/branches/executioncontext20090812/themes/multiflex/data/MultiflexThemeData.xml Propchange: ofbiz/branches/executioncontext20090812/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Aug 24 22:15:46 2009 @@ -1 +1 @@ -/ofbiz/trunk:803908-805009,805456-806576 +/ofbiz/trunk:803908-805009,805456-807293 Modified: ofbiz/branches/executioncontext20090812/.classpath URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/.classpath?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/.classpath (original) +++ ofbiz/branches/executioncontext20090812/.classpath Mon Aug 24 22:15:46 2009 @@ -17,7 +17,7 @@ <classpathentry kind="src" path="framework/base/src"/> <classpathentry kind="src" path="framework/start/src"/> <classpathentry kind="src" path="framework/geronimo/src"/> - <classpathentry excluding="org/ofbiz/accounting/thirdparty/cybersource/**|org/ofbiz/accounting/thirdparty/verisign/**|org/ofbiz/accounting/thirdparty/worldpay/**|org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java" kind="src" path="applications/accounting/src"/> + <classpathentry excluding="org/ofbiz/accounting/thirdparty/cybersource/**|org/ofbiz/accounting/thirdparty/verisign/**|org/ofbiz/accounting/thirdparty/worldpay/**|org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java|org/ofbiz/accounting/thirdparty/orbital/**" kind="src" path="applications/accounting/src"/> <classpathentry excluding="org/ofbiz/content/openoffice/|org/ofbiz/content/report/" kind="src" path="applications/content/src"/> <classpathentry kind="src" path="specialpurpose/ecommerce/src"/> <classpathentry kind="src" path="applications/manufacturing/src"/> Modified: ofbiz/branches/executioncontext20090812/applications/accounting/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/build.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/accounting/build.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/accounting/build.xml Mon Aug 24 22:15:46 2009 @@ -62,6 +62,7 @@ <exclude name="org/ofbiz/accounting/thirdparty/verisign/**"/> <exclude name="org/ofbiz/accounting/thirdparty/cybersource/**"/> <exclude name="org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java"/> + <exclude name="org/ofbiz/accounting/thirdparty/orbital/**"/> </javac15> </target> Modified: ofbiz/branches/executioncontext20090812/applications/accounting/config/AccountingUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/config/AccountingUiLabels.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/accounting/config/AccountingUiLabels.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/accounting/config/AccountingUiLabels.xml Mon Aug 24 22:15:46 2009 @@ -1665,6 +1665,10 @@ <value xml:lang="th">à¹à¸à¸¢à¸§à¸±à¸à¸à¸µà¹</value> <value xml:lang="zh">ææ¥æ</value> </property> + <property key="AccountingCancelBankReconciliation"> + <value xml:lang="en">Cancel Bank Reconciliation</value> + <value xml:lang="hi_IN">बà¥à¤¨à¥à¤ पà¥à¤¨à¤°à¥à¤®à¤¿à¤²à¤¾à¤¨ रदà¥à¤¦ à¤à¤°à¥à¤</value> + </property> <property key="AccountingCancelBatchPayments"> <value xml:lang="en">Cancel Batch Payments</value> <value xml:lang="hi_IN">à¤à¥à¤à¤¤à¤¾à¤¨ à¤à¤¾ बà¥à¤ रदà¥à¤¦ à¤à¤°à¥</value> @@ -4560,6 +4564,10 @@ <value xml:lang="it">Istanza del prodotto</value> <value xml:lang="zh">产åæ è¯å®ä¾</value> </property> + <property key="AccountingInvalidGlReconciliation"> + <value xml:lang="en">GlReconciliation [${glReconciliationId}] is already reconciled</value> + <value xml:lang="hi_IN">GlReconciliation [${glReconciliationId}] पहलॠहॠपà¥à¤¨à¤°à¥à¤®à¤¿à¤²à¤¿à¤¤ हà¥</value> + </property> <property key="AccountingInvalidGlReconciliationAssignment"> <value xml:lang="en">Invalid Gl Reconciliation Assignement: You can not assign FinAccountTrans in Approved or Cancel Status. FinAccount Transaction need to be in Created status only.</value> </property> Modified: ofbiz/branches/executioncontext20090812/applications/accounting/data/AccountingSecurityData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/data/AccountingSecurityData.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/accounting/data/AccountingSecurityData.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/accounting/data/AccountingSecurityData.xml Mon Aug 24 22:15:46 2009 @@ -112,4 +112,16 @@ <SecurityGroupPermission groupId="BIZADMIN" permissionId="ACCTG_ATX_UPDATE"/> <SecurityGroupPermission groupId="BIZADMIN" permissionId="ACCTG_ATX_DELETE"/> + <ArtifactPath artifactPath="ofbiz/accounting" description="Accounting Application"/> + <ArtifactPath artifactPath="ofbiz/ap" description="Accounts Payable Application"/> + <ArtifactPath artifactPath="ofbiz/ar" description="Accounts Receivable Application"/> + + <!-- Data needed for the transition to security-aware artifacts. As each webapp + is converted over to the new security design, the corresponding admin + permission should be removed. --> + + <UserGroupToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/accounting" permissionValue="admin=true"/> + <UserGroupToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/ap" permissionValue="admin=true"/> + <UserGroupToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/ar" permissionValue="admin=true"/> + </entity-engine-xml> Modified: ofbiz/branches/executioncontext20090812/applications/accounting/data/AccountingTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/data/AccountingTypeData.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/accounting/data/AccountingTypeData.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/accounting/data/AccountingTypeData.xml Mon Aug 24 22:15:46 2009 @@ -181,7 +181,7 @@ <!-- The following three elements set up a regularly scheduled job that will automatically create fixed asset maintenances from ProductMaint time intervals. --> - <TemporalExpression tempExprId="FAM_AUTO_CREATE" tempExprTypeId="FREQUENCY" integer1="12" integer2="5"/> + <TemporalExpression tempExprId="FAM_AUTO_CREATE" tempExprTypeId="FREQUENCY" integer1="12" integer2="60"/> <JobSandbox jobId="FAM_AUTO_CREATE" jobName="Auto-create Fixed Asset Maintenances" runTime="2000-01-01 00:00:00.000" serviceName="createMaintsFromTimeInterval" poolId="pool" runAsUser="system" tempExprId="FAM_AUTO_CREATE" maxRecurrenceCount="-1"/> <!-- Fixed Asset Maintenance party roles --> @@ -508,7 +508,7 @@ <InvoiceType description="Invoice Template" hasTable="N" invoiceTypeId="TEMPLATE"/> <InvoiceType description="Sales Invoice Template" hasTable="N" invoiceTypeId="SALES_INV_TEMPLATE" parentTypeId="TEMPLATE"/> <InvoiceType description="Purchase Invoice Template" hasTable="N" invoiceTypeId="PUR_INV_TEMPLATE" parentTypeId="TEMPLATE"/> - + <!-- InvoiceItemAssocType records can be used in InvoiceItemAssoc entity. This will help to distinguish the record in searching for the commission invoice or withdraw invoice. More assoc types can be added later on. --> <InvoiceItemAssocType description="Commission" hasTable="N" invoiceItemAssocTypeId="COMMISSION_INVOICE" parentTypeId=""/> <InvoiceItemAssocType description="Withdraw" hasTable="N" invoiceItemAssocTypeId="WITHDRAW_INVOICE" parentTypeId=""/> @@ -678,7 +678,7 @@ <!-- payment types for POS PAID IN/OUT --> <PaymentType description="POS Paid Out" hasTable="N" parentTypeId="DISBURSEMENT" paymentTypeId="POS_PAID_OUT"/> <PaymentType description="POS Paid In" hasTable="N" parentTypeId="RECEIPT" paymentTypeId="POS_PAID_IN"/> - + <!-- Payment Group Type --> <PaymentGroupType paymentGroupTypeId="CHECK_RUN" parentTypeId="" hasTable="N" description="Check Run"/> <PaymentGroupType paymentGroupTypeId="BATCH_PAYMENT" parentTypeId="" hasTable="N" description="Batch of Payments"/> @@ -687,48 +687,52 @@ <PaymentGatewayConfigType paymentGatewayConfigTypeId="AUTHORIZE_NET" hasTable="N" description="Authorize Dot Net Payment Gateway"/> <PaymentGatewayConfig paymentGatewayConfigId="AUTHORIZE_NET_CONFIG" paymentGatewayConfigTypeId="AUTHORIZE_NET" description="Authorize Dot Net Config"/> <PaymentGatewayAuthorizeNet paymentGatewayConfigId="AUTHORIZE_NET_CONFIG" transactionUrl="https://certification.authorize.net/gateway/transact.dll" certificateAlias="certification.authorize.net-1" apiVersion="3.1" delimitedData="TRUE" delimiterChar="|" method="CC" emailCustomer="FALSE" emailMerchant="FALSE" testMode="TRUE" relayResponse="FALSE" tranKey="" userId="" pwd="" transDescription="OFBizAuthNet"/> - + <PaymentGatewayConfigType paymentGatewayConfigTypeId="CYBERSOURCE" hasTable="N" description="CyberSource Payment Gateway"/> <PaymentGatewayConfig paymentGatewayConfigId="CYBERSOURCE_CONFIG" paymentGatewayConfigTypeId="CYBERSOURCE" description="CyberSource Config"/> <PaymentGatewayCyberSource paymentGatewayConfigId="CYBERSOURCE_CONFIG" merchantId="[MerchantID]" apiVersion="1.43" production="false" keysDir="${sys:getProperty('ofbiz.home')}/applications/accounting/icskeys" keysFile="merchantID.p12" logEnabled="true" logDir="${sys:getProperty('ofbiz.home')}/runtime/logs" logFile="cybersource.log" logSize="10" merchantDescr="Some Nice Web Store" merchantContact="" autoBill="false" enableDav="N" fraudScore="N" ignoreAvs="false" disableBillAvs="Y" avsDeclineCodes=""/> - + <PaymentGatewayConfigType paymentGatewayConfigTypeId="PAYFLOWPRO" hasTable="N" description="Payflow Pro Payment Gateway"/> <PaymentGatewayConfig paymentGatewayConfigId="PAYFLOWPRO_CONFIG" paymentGatewayConfigTypeId="PAYFLOWPRO" description="Payflow Pro Config"/> - <PaymentGatewayPayflowPro paymentGatewayConfigId="PAYFLOWPRO_CONFIG" certsPath="${sys:getProperty('ofbiz.home')}/applications/accounting/pfcerts" hostAddress="pilot-payflowpro.paypal.com" hostPort="443" timeout="80" proxyAddress="" proxyPort="80" proxyLogon="" proxyPassword="" + <PaymentGatewayPayflowPro paymentGatewayConfigId="PAYFLOWPRO_CONFIG" certsPath="${sys:getProperty('ofbiz.home')}/applications/accounting/pfcerts" hostAddress="pilot-payflowpro.paypal.com" hostPort="443" timeout="80" proxyAddress="" proxyPort="80" proxyLogon="" proxyPassword="" vendor="[Vendor]" userId="[PayFlow UserID]" pwd="[PayFlow Password]" partner="[PayFlow Partner]" checkAvs="Y" checkCvv2="Y" preAuth="Y" enableTransmit="true" logFileName="${sys:getProperty('ofbiz.home')}/runtime/logs/payflow_java.log" loggingLevel="6" maxLogFileSize="1000000" stackTraceOn="N" returnUrl="[Express Checkout Return URL]" cancelReturnUrl="[Express Checkout Cancel Return URL]" redirectUrl="[Express Checkout Customer Redirect URL]"/> - + <PaymentGatewayConfigType paymentGatewayConfigTypeId="PAYPAL" hasTable="N" description="PayPal Payment Gateway"/> <PaymentGatewayConfig paymentGatewayConfigId="PAYPAL_CONFIG" paymentGatewayConfigTypeId="PAYPAL" description="PayPal Config"/> <PaymentGatewayPayPal paymentGatewayConfigId="PAYPAL_CONFIG" businessEmail="" apiUserName="" apiPassword="" apiSignature="" apiEnvironment="" notifyUrl="" returnUrl="" cancelReturnUrl="" imageUrl="" confirmTemplate="/order/emailconfirmation.ftl" redirectUrl="https://www.sandbox.paypal.com/webscr" confirmUrl="https://www.sandbox.paypal.com/us/cgi-bin/webscr" shippingCallbackUrl="" requireConfirmedShipping="N"/> - + <PaymentGatewayConfigType paymentGatewayConfigTypeId="CLEARCOMMERCE" hasTable="N" description="Clear Commerce Payment Gateway"/> <PaymentGatewayConfig paymentGatewayConfigId="CLEARCOMMERCE_CONFIG" paymentGatewayConfigTypeId="CLEARCOMMERCE" description="Clear Commerce Config"/> <PaymentGatewayClearCommerce paymentGatewayConfigId="CLEARCOMMERCE_CONFIG" sourceId="mySource" groupId="myGroup" clientId="[ClearCommerce clientId]" username="[ClearCommerce username]" pwd="[ClearCommerce password]" userAlias="[ClearCommerce alias]" effectiveAlias="" processMode="P" serverURL="https://test5x.clearcommerce.com:11500" enableCVM="N"/> - + <PaymentGatewayConfigType paymentGatewayConfigTypeId="WORLDPAY" hasTable="N" description="RBS WorldPay Payment Gateway"/> <PaymentGatewayConfig paymentGatewayConfigId="WORLDPAY_CONFIG" paymentGatewayConfigTypeId="WORLDPAY" description="RBS WorldPay Config"/> <PaymentGatewayWorldPay paymentGatewayConfigId="WORLDPAY_CONFIG" redirectUrl="https://select-test.worldpay.com/wcc/purchase" instId="" authMode="A" fixContact="N" hideContact="N" hideCurrency="N" langId="" noLanguageMenu="N" withDelivery="N" testMode="100"/> - + + <PaymentGatewayConfigType paymentGatewayConfigTypeId="ORBITAL" hasTable="N" description="Orbital Payment Gateway"/> + <PaymentGatewayConfig paymentGatewayConfigId="ORBITAL_CONFIG" paymentGatewayConfigTypeId="ORBITAL" description="Orbital Config"/> + <PaymentGatewayOrbital paymentGatewayConfigId="ORBITAL_CONFIG" username="ofbizuser" password="ofbizpwd" merchantId="785240009879" class="com.paymentech.orbital.sdk.engine.https.HttpsEngine" hostName="orbitalvar1.paymentech.net" port="443" hostNameFailover="orbitalvar2.paymentech.net" portFailover="443" connectionTimeoutSeconds="90" readTimeoutSeconds="90" authorizationURI="/authorize" sdkVersion="PaymentechSDK_6.3.0" sslSocketFactory="default" responseType="gateway"/> + <!-- Credit Card methods by type --> <CustomMethodType customMethodTypeId="CC_AUTH" parentTypeId="" hasTable="N" description="Credit Card authorize methods"/> <CustomMethodType customMethodTypeId="CC_CAPTURE" parentTypeId="" hasTable="N" description="Credit Card capture methods"/> <CustomMethodType customMethodTypeId="CC_REFUND" parentTypeId="" hasTable="N" description="Credit Card refund methods"/> <CustomMethodType customMethodTypeId="CC_RELEASE" parentTypeId="" hasTable="N" description="Credit Card release methods"/> <CustomMethodType customMethodTypeId="CC_CREDIT" parentTypeId="" hasTable="N" description="Credit Card credit methods"/> - + <CustomMethodType customMethodTypeId="EFT_AUTH" parentTypeId="" hasTable="N" description="EFT authorize methods"/> <CustomMethodType customMethodTypeId="EFT_RELEASE" parentTypeId="" hasTable="N" description="EFT release methods"/> - + <CustomMethodType customMethodTypeId="FIN_AUTH" parentTypeId="" hasTable="N" description="FIN account authorize methods"/> <CustomMethodType customMethodTypeId="FIN_CAPTURE" parentTypeId="" hasTable="N" description="FIN account capture methods"/> <CustomMethodType customMethodTypeId="FIN_REFUND" parentTypeId="" hasTable="N" description="FIN account refund methods"/> <CustomMethodType customMethodTypeId="FIN_RELEASE" parentTypeId="" hasTable="N" description="FIN account release methods"/> - + <CustomMethodType customMethodTypeId="GIFT_AUTH" parentTypeId="" hasTable="N" description="GIFT card authorize methods"/> <CustomMethodType customMethodTypeId="GIFT_CAPTURE" parentTypeId="" hasTable="N" description="GIFT card capture methods"/> <CustomMethodType customMethodTypeId="GIFT_REFUND" parentTypeId="" hasTable="N" description="GIFT card refund methods"/> <CustomMethodType customMethodTypeId="GIFT_RELEASE" parentTypeId="" hasTable="N" description="GIFT card release methods"/> - + <CustomMethodType customMethodTypeId="PAYPAL_AUTH" parentTypeId="" hasTable="N" description="PayPal authorize methods"/> <CustomMethodType customMethodTypeId="PAYPAL_CAPTURE" parentTypeId="" hasTable="N" description="PayPal capture methods"/> <CustomMethodType customMethodTypeId="PAYPAL_REFUND" parentTypeId="" hasTable="N" description="PayPal refund methods"/> @@ -754,7 +758,9 @@ <CustomMethod customMethodId="CC_AUTH_ALWAYSBADNUM" customMethodTypeId="CC_AUTH" customMethodName="alwaysBadCardNumberCCProcessor" description="CC Always decline for bad card number"/> <CustomMethod customMethodId="CC_AUTH_ALWAYSFAIL" customMethodTypeId="CC_AUTH" customMethodName="alwaysBadCardNumberCCProcessor" description="CC Always fail"/> <CustomMethod customMethodId="CC_AUTH_CAPTURE_ALWA" customMethodTypeId="CC_AUTH" customMethodName="alwaysApproveWithCaptureCCProcessor" description="CC Always authorize and capture"/> - + <CustomMethod customMethodId="CC_AUTH_ORBITAL" customMethodTypeId="CC_AUTH" customMethodName="orbitalCCAuth" description="CC Orbital authorize"/> + <CustomMethod customMethodId="CC_AUTH_CAPTR_ORBTL" customMethodTypeId="CC_AUTH" customMethodName="orbitalCCAuthCapture" description="CC Orbital authorize and capture"/> + <CustomMethod customMethodId="CC_CAPTURE_TEST" customMethodTypeId="CC_CAPTURE" customMethodName="testCCCapture" description="CC Test capture"/> <CustomMethod customMethodId="CC_CAPTURE_REAUTH" customMethodTypeId="CC_CAPTURE" customMethodName="testCCCaptureWithReAuth" description="CC Test reauth capture"/> <CustomMethod customMethodId="CC_CAPTURE_ALWAYSDEC" customMethodTypeId="CC_CAPTURE" customMethodName="testCCProcessorCaptureAlwaysDecline" description="CC Always decline capture"/> @@ -765,7 +771,8 @@ <CustomMethod customMethodId="CC_CAPTURE_PCCHARGE" customMethodTypeId="CC_CAPTURE" customMethodName="pcChargeCCCapture" description="CC PCCharge capture"/> <CustomMethod customMethodId="CC_CAPTURE_RITA" customMethodTypeId="CC_CAPTURE" customMethodName="ritaCCCapture" description="CC RiTA capture"/> <CustomMethod customMethodId="CC_CAPTURE_RITA_REMO" customMethodTypeId="CC_CAPTURE" customMethodName="ritaCCCaptureRemote" description="CC RiTA remote capture"/> - + <CustomMethod customMethodId="CC_CAPTURE_ORBITAL" customMethodTypeId="CC_CAPTURE" customMethodName="orbitalCCCapture" description="CC Orbital capture"/> + <CustomMethod customMethodId="CC_REFUND_TEST" customMethodTypeId="CC_REFUND" customMethodName="testCCRefund" description="CC Test refund"/> <CustomMethod customMethodId="CC_REFUND_TEST_FAIL" customMethodTypeId="CC_REFUND" customMethodName="testCCRefundFailure" description="CC Test refund failure"/> <CustomMethod customMethodId="CC_REFUND_AIM" customMethodTypeId="CC_REFUND" customMethodName="aimCCRefund" description="CC Authorize dot net refund"/> @@ -775,7 +782,8 @@ <CustomMethod customMethodId="CC_REFUND_PCCHARGE" customMethodTypeId="CC_REFUND" customMethodName="pcChargeCCRefund" description="CC PCCharge refund"/> <CustomMethod customMethodId="CC_REFUND_RITA" customMethodTypeId="CC_REFUND" customMethodName="ritaCCRefund" description="CC RiTA refund"/> <CustomMethod customMethodId="CC_REFUND_RITA_REMOT" customMethodTypeId="CC_REFUND" customMethodName="ritaCCRefundRemote" description="CC RiTA remote refund"/> - + <CustomMethod customMethodId="CC_REFUND_ORBITAL" customMethodTypeId="CC_REFUND" customMethodName="orbitalCCRefund" description="CC Orbital refund"/> + <CustomMethod customMethodId="CC_RELEASE_TEST" customMethodTypeId="CC_RELEASE" customMethodName="testCCRelease" description="CC Test release"/> <CustomMethod customMethodId="CC_RELEASE_AIM" customMethodTypeId="CC_RELEASE" customMethodName="aimCCRelease" description="CC Authorize dot net release"/> <CustomMethod customMethodId="CC_RELEASE_CLEARCOMM" customMethodTypeId="CC_RELEASE" customMethodName="clearCommerceCCRelease" description="CC Clear Commerce release"/> @@ -784,22 +792,23 @@ <CustomMethod customMethodId="CC_RELEASE_PCCHARGE" customMethodTypeId="CC_RELEASE" customMethodName="pcChargeCCRelease" description="CC PCCharge release"/> <CustomMethod customMethodId="CC_RELEASE_RITA" customMethodTypeId="CC_RELEASE" customMethodName="ritaCCRelease" description="CC RiTA release"/> <CustomMethod customMethodId="CC_RELEASE_RITA_REMO" customMethodTypeId="CC_RELEASE" customMethodName="ritaCCReleaseRemote" description="CC RiTA remote release"/> - + <CustomMethod customMethodId="CC_RELEASE_ORBITAL" customMethodTypeId="CC_RELEASE" customMethodName="orbitalCCRelease" description="CC Orbital release"/> + <CustomMethod customMethodId="CC_CREDIT_AIM" customMethodTypeId="CC_CREDIT" customMethodName="aimCCCredit" description="CC Authorize dot net credit"/> <CustomMethod customMethodId="CC_CREDIT_CLEARCOMME" customMethodTypeId="CC_CREDIT" customMethodName="clearCommerceCCCredit" description="CC Clear Commerce credit"/> <CustomMethod customMethodId="CC_CREDIT_CYBERSOURC" customMethodTypeId="CC_CREDIT" customMethodName="cyberSourceCCCredit" description="CC CyberSource credit"/> <CustomMethod customMethodId="CC_CREDIT_RITA" customMethodTypeId="CC_CREDIT" customMethodName="ritaCCCreditRefund" description="CC RiTA credit"/> - + <CustomMethod customMethodId="EFT_AUTH_TEST" customMethodTypeId="EFT_AUTH" customMethodName="testEFTProcessor" description="EFT test authorize"/> <CustomMethod customMethodId="EFT_AUTH_ALWAYSAPPRO" customMethodTypeId="EFT_AUTH" customMethodName="alwaysApproveEFTProcessor" description="EFT always authorize"/> <CustomMethod customMethodId="EFT_AUTH_ALWAYSDECLI" customMethodTypeId="EFT_AUTH" customMethodName="alwaysDeclineEFTProcessor" description="EFT always decline"/> <CustomMethod customMethodId="EFT_RELEASE_TEST" customMethodTypeId="EFT_RELEASE" customMethodName="testEFTRelease" description="EFT test release"/> - + <CustomMethod customMethodId="FIN_AUTH_OFBIZ" customMethodTypeId="FIN_AUTH" customMethodName="ofbFaAuthorize" description="FIN account authorize"/> <CustomMethod customMethodId="FIN_CAPTURE_OFBIZ" customMethodTypeId="FIN_CAPTURE" customMethodName="ofbFaCapture" description="FIN account capture"/> <CustomMethod customMethodId="FIN_REFUND_OFBIZ" customMethodTypeId="FIN_REFUND" customMethodName="ofbFaRefund" description="FIN account refund"/> <CustomMethod customMethodId="FIN_RELEASE_OFBIZ" customMethodTypeId="FIN_RELEASE" customMethodName="ofbFaRelease" description="FIN account release"/> - + <CustomMethod customMethodId="GIFT_AUTH_OFBIZ" customMethodTypeId="GIFT_AUTH" customMethodName="ofbGcAuthorize" description="GIFT card authorize"/> <CustomMethod customMethodId="GIFT_AUTH_ALWAYSAPPR" customMethodTypeId="GIFT_AUTH" customMethodName="alwaysApproveGCProcessor" description="GIFT card always authorize"/> <CustomMethod customMethodId="GIFT_AUTH_ALWAYSDECL" customMethodTypeId="GIFT_AUTH" customMethodName="alwaysDeclineGCProcessor" description="GIFT card always decline"/> @@ -810,7 +819,7 @@ <CustomMethod customMethodId="GIFT_RELEASE_OFBIZ" customMethodTypeId="GIFT_RELEASE" customMethodName="ofbGcRelease" description="GIFT card release"/> <CustomMethod customMethodId="GIFT_RELEASE_TEST" customMethodTypeId="GIFT_RELEASE" customMethodName="testGCRelease" description="GIFT card test release"/> <CustomMethod customMethodId="GIFT_RELEASE_VALUEL" customMethodTypeId="GIFT_RELEASE" customMethodName="valueLinkRelease" description="GIFT card ValueLink release"/> - + <CustomMethod customMethodId="PAYPAL_AUTH_PFP" customMethodTypeId="PAYPAL_AUTH" customMethodName="payflowPayPalProcessor" description="Payflow PayPal payment authorize"/> <CustomMethod customMethodId="PAYPAL_AUTH" customMethodTypeId="PAYPAL_AUTH" customMethodName="payPalProcessor" description="PayPal payment authorize"/> @@ -1037,7 +1046,7 @@ DDQ (Delivered Duty Unpaid) This arrangement is basically the same as with DDP, except for the fact that the buyer is responsible for the duty, fees and taxes. --> - + <!-- Store Credit Account Type Data, to be set in Product Store --> <EnumerationType description="Store Credit Account" enumTypeId="STR_CRDT_ACT" hasTable="N" parentTypeId=""/> <Enumeration description="Financial Account" enumCode="FINACCOUNT" enumId="FIN_ACCOUNT" sequenceId="01" enumTypeId="STR_CRDT_ACT"/> Modified: ofbiz/branches/executioncontext20090812/applications/accounting/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/entitydef/entitymodel.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/accounting/entitydef/entitymodel.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/accounting/entitydef/entitymodel.xml Mon Aug 24 22:15:46 2009 @@ -3223,6 +3223,30 @@ <key-map field-name="paymentGatewayConfigId"/> </relation> </entity> + <entity entity-name="PaymentGatewayOrbital" + package-name="org.ofbiz.accounting.payment" + title="Orbital Payment Gateway Config"> + <field name="paymentGatewayConfigId" type="id-ne"></field> + <field name="username" type="short-varchar"><description>Orbital Username of account information</description></field> + <field name="password" type="value" encrypt="true"><description>Orbital Password of account information</description></field> + <field name="merchantId" type="value"><description>You merchant ID</description></field> + <field name="class" type="value"><description>Class for the Orbital Gateway - Default should be used - HttpsEngine</description></field> + <field name="hostName" type="value"><description>Address of the payment processor</description></field> + <field name="port" type="numeric"><description>Port of the payment processor</description></field> + <field name="hostNameFailover" type="value"><description>Failover Address of the payment processor</description></field> + <field name="portFailover" type="numeric"><description>Failover Port of the payment processor</description></field> + <field name="connectionTimeoutSeconds" type="numeric"><description>Timeout</description></field> + <field name="readTimeoutSeconds" type="numeric"><description>Read Timeout</description></field> + <field name="authorizationURI" type="value"><description>Authorization URI</description></field> + <field name="sdkVersion" type="short-varchar"><description>Target Orbital Gateway API version</description></field> + <field name="sslSocketFactory" type="short-varchar"><description>SSL Socket Factory (default|strict)</description></field> + <field name="responseType" type="short-varchar"><description>Response Type (gateway|host)</description></field> + <prim-key field="paymentGatewayConfigId"/> + <relation type="one" fk-name="PGORB_PGC" rel-entity-name="PaymentGatewayConfig"> + <key-map field-name="paymentGatewayConfigId"/> + </relation> + </entity> + <entity entity-name="PaymentGatewayRespMsg" package-name="org.ofbiz.accounting.payment" title="Payment Gateway Response Message"> Modified: ofbiz/branches/executioncontext20090812/applications/accounting/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/ofbiz-component.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/accounting/ofbiz-component.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/accounting/ofbiz-component.xml Mon Aug 24 22:15:46 2009 @@ -74,6 +74,7 @@ <service-resource type="model" loader="main" location="servicedef/services_rita.xml"/> <service-resource type="model" loader="main" location="servicedef/services_valuelink.xml"/> <service-resource type="model" loader="main" location="servicedef/services_verisign.xml"/> + <service-resource type="model" loader="main" location="servicedef/services_orbital.xml"/> <service-resource type="group" loader="main" location="servicedef/groups.xml"/> <service-resource type="eca" loader="main" location="servicedef/secas.xml"/> Modified: ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml Mon Aug 24 22:15:46 2009 @@ -685,6 +685,15 @@ <set field="setFinAccountTransStatusMap.statusId" value="FINACT_TRNS_APPROVED"/> <call-service service-name="setFinAccountTransStatus" in-map-name="setFinAccountTransStatusMap"/> <if-not-empty field="finAccountTrans.glReconciliationId"> + <set field="isGlReconciliationReconciledMap.glReconciliationId" from-field="finAccountTrans.glReconciliationId"/> + <call-service service-name="isGlReconciliationReconciled" in-map-name="isGlReconciliationReconciledMap"> + <result-to-field result-name="isReconciled"/> + </call-service> + <if-compare field="isReconciled" operator="equals" value="true" type="Boolean"> + <if-empty field="updateGlReconciliationMap.reconciledDate"> + <set field="updateGlReconciliationMap.reconciledDate" from-field="nowTimestamp"/> + </if-empty> + </if-compare> <call-service service-name="updateGlReconciliation" in-map-name="updateGlReconciliationMap"/> </if-not-empty> </simple-method> @@ -926,41 +935,84 @@ <simple-method method-name="assignGlRecToFinAccTrans" short-description="Assignment of Gl Reconciliation to Fin Account Trans"> <entity-one entity-name="FinAccountTrans" value-field="finAccountTrans"/> - <if-compare field="finAccountTrans.statusId" operator="not-equals" value="FINACT_TRNS_CREATED"> - <add-error><fail-property resource="AccountingUiLabels" property="AccountingInvalidGlReconciliationAssignment"/></add-error> - <check-errors/> - <else> - <set field="finAccountTrans.glReconciliationId" from-field="parameters.glReconciliationId"/> - <store-value value-field="finAccountTrans"/> - </else> - </if-compare> - <if-empty field="finAccountTrans.paymentId"> - <entity-and entity-name="Payment" list="payments"> - <field-map field-name="finAccountTransId" from-field="finAccountTrans.finAccountTransId"/> - </entity-and> + <set field="glReconciliationId" from-field="parameters.glReconciliationId"/> + <entity-one entity-name="GlReconciliation" value-field="glReconciliation"/> + <if-empty field="glReconciliation.reconciledBalance"> + <if-compare field="finAccountTrans.statusId" operator="not-equals" value="FINACT_TRNS_CREATED"> + <add-error><fail-property resource="AccountingUiLabels" property="AccountingInvalidGlReconciliationAssignment"/></add-error> + <check-errors/> + <else> + <set field="finAccountTrans.glReconciliationId" from-field="glReconciliationId"/> + <store-value value-field="finAccountTrans"/> + </else> + </if-compare> + <if-empty field="finAccountTrans.paymentId"> + <entity-and entity-name="Payment" list="payments"> + <field-map field-name="finAccountTransId" from-field="finAccountTrans.finAccountTransId"/> + </entity-and> + <else> + <entity-one entity-name="Payment" value-field="payment"> + <field-map field-name="paymentId" from-field="finAccountTrans.paymentId"/> + </entity-one> + <field-to-list field="payment" list="payments"/> + </else> + </if-empty> + <iterate list="payments" entry="payment"> + <if-compare field="${payment.statusId == 'PMNT_SENT' @or payment.statusId == 'PMNT_RECEIVED' @or payment.statusId == 'PMNT_CONFIRMED'}" operator="equals" value="false"> + <add-error><fail-property resource="AccountingUiLabels" property="AccountingPaymentsAssociateWithFinAccountHasInvalidStatusError"/></add-error> + <check-errors/> + </if-compare> + </iterate> <else> - <entity-one entity-name="Payment" value-field="payment"> - <field-map field-name="paymentId" from-field="finAccountTrans.paymentId"/> - </entity-one> - <field-to-list field="payment" list="payments"/> + <add-error><fail-property resource="AccountingUiLabels" property="AccountingInvalidGlReconciliation"/></add-error> + <check-errors/> </else> </if-empty> - <iterate list="payments" entry="payment"> - <if-compare field="${payment.statusId == 'PMNT_SENT' @or payment.statusId == 'PMNT_RECEIVED' @or payment.statusId == 'PMNT_CONFIRMED'}" operator="equals" value="false"> - <add-error><fail-property resource="AccountingUiLabels" property="AccountingPaymentsAssociateWithFinAccountHasInvalidStatusError"/></add-error> - <check-errors/> - </if-compare> - </iterate> </simple-method> + <simple-method method-name="removeFinAccountTransFromReconciliation" short-description="Remove finAccountTrans from reconciliation"> <entity-one entity-name="FinAccountTrans" value-field="finAccountTrans"/> <if-compare field="finAccountTrans.statusId" operator="equals" value="FINACT_TRNS_CREATED"> <clear-field field="finAccountTrans.glReconciliationId"/> <store-value value-field="finAccountTrans"/> <else> - <add-error><fail-property resource="AccountingUiLabel" property="AccountingFinAccountTransInvalidStatusError"/></add-error> + <add-error><fail-property resource="AccountingUiLabels" property="AccountingFinAccountTransInvalidStatusError"/></add-error> <check-errors/> </else> </if-compare> </simple-method> + + <simple-method method-name="isGlReconciliationReconciled" short-description="Check GlReconciliation is Reconciled or not"> + <set field="glReconciliationId" from-field="parameters.glReconciliationId"/> + <entity-and entity-name="FinAccountTrans" list="finAccountTransList"> + <field-map field-name="glReconciliationId"/> + </entity-and> + <set field="finAccountTransIds" value="${groovy:org.ofbiz.entity.util.EntityUtil.getFieldListFromEntityList(finAccountTransList, 'finAccountTransId', true);}" type="List"/> + <entity-condition entity-name="FinAccountTrans" list="finAccountTransactions"> + <condition-list> + <condition-expr field-name="finAccountTransId" operator="in" from-field="finAccountTransIds"/> + <condition-expr field-name="statusId" value="FINACT_TRNS_CREATED"/> + </condition-list> + </entity-condition> + <if-not-empty field="finAccountTransactions"> + <set field="isReconciled" value="false" type="Boolean"/> + <else> + <set field="isReconciled" value="true" type="Boolean"/> + </else> + </if-not-empty> + <field-to-result field="isReconciled"/> + </simple-method> + + <simple-method method-name="cancelBankReconciliation" short-description="Cancel bank reconciliation."> + <entity-and entity-name="FinAccountTrans" list="finAccountTransList"> + <field-map field-name="glReconciliationId" from-field="parameters.glReconciliationId"/> + <field-map field-name="statusId" value="FINACT_TRNS_CREATED"/> + </entity-and> + <if-not-empty field="finAccountTransList"> + <iterate list="finAccountTransList" entry="finAccountTrans"> + <set field="removeFinAccountTransFromReconciliationMap.finAccountTransId" from-field="finAccountTrans.finAccountTransId"/> + <call-service service-name="removeFinAccountTransFromReconciliation" in-map-name="removeFinAccountTransFromReconciliationMap"/> + </iterate> + </if-not-empty> + </simple-method> </simple-methods> Modified: ofbiz/branches/executioncontext20090812/applications/accounting/servicedef/services_finaccount.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/servicedef/services_finaccount.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/accounting/servicedef/services_finaccount.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/accounting/servicedef/services_finaccount.xml Mon Aug 24 22:15:46 2009 @@ -497,9 +497,23 @@ <attribute name="finAccountTransId" type="String" mode="IN" optional="false"/> <attribute name="glReconciliationId" type="String" mode="IN" optional="false"/> </service> + <service name="removeFinAccountTransFromReconciliation" engine="simple" location="component://accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml" invoke="removeFinAccountTransFromReconciliation"> <description>Remove finaAccountTrans association with gl reconciliation</description> <attribute name="finAccountTransId" type="String" mode="IN" optional="false"/> </service> + + <service name="isGlReconciliationReconciled" engine="simple" + location="component://accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml" invoke="isGlReconciliationReconciled"> + <description>Check GlReconciliation is Reconciled or not</description> + <attribute name="glReconciliationId" type="String" mode="IN" optional="false"/> + <attribute name="isReconciled" type="Boolean" mode="OUT" optional="false"/> + </service> + + <service name="cancelBankReconciliation" engine="simple" + location="component://accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml" invoke="cancelBankReconciliation"> + <description>Cancel bank reconciliation.</description> + <attribute name="glReconciliationId" type="String" mode="IN" optional="false"/> + </service> </services> Modified: ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/WEB-INF/controller.xml Mon Aug 24 22:15:46 2009 @@ -1993,6 +1993,12 @@ <response name="success" type="view" value="ViewGlReconciliationWithTransaction"/> <response name="error" type="view" value="ViewGlReconciliationWithTransaction"/> </request-map> + <request-map uri="cancelBankReconciliation"> + <security https="true" auth="true"/> + <event type="service" invoke="cancelBankReconciliation"/> + <response name="success" type="view" value="ViewGlReconciliationWithTransaction"/> + <response name="error" type="view" value="ViewGlReconciliationWithTransaction"/> + </request-map> <!-- Fin Account Authority--> <request-map uri="EditFinAccountAuths"> <security https="true" auth="true"/> Modified: ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl (original) +++ ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl Mon Aug 24 22:15:46 2009 @@ -31,6 +31,10 @@ </div> <div class="screenlet-body"> <a href="<@ofbizUrl>EditFinAccountReconciliations?finAccountId=${finAccountId}&glReconciliationId=${glReconciliationId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit}</a> + <#assign finAcctTransCondList = delegator.findByAnd("FinAccountTrans", {"glReconciliationId" : glReconciliationId, "statusId" : "FINACT_TRNS_CREATED"})> + <#if finAcctTransCondList?has_content> + <a href="javascript:document.CancelBankReconciliationForm.submit();" class="buttontext">${uiLabelMap.AccountingCancelBankReconciliation}</a> + </#if> <#if currentGlReconciliation?has_content> <table> <tr> @@ -95,7 +99,7 @@ <th>${uiLabelMap.FormFieldTitle_paymentMethodTypeId}</th> <th>${uiLabelMap.CommonStatus}</th> <th>${uiLabelMap.CommonComments}</th> - <#if FinAccountTranstions?has_content> + <#if finAccountTransactions?has_content> <th>${uiLabelMap.AccountingRemoveFromGlReconciliation}</th> </#if> </tr> @@ -155,16 +159,20 @@ </div> <div class="right"> <span class="label">${uiLabelMap.AccountingTotalCapital} </span><@ofbizCurrency amount=transactionTotalAmount.grandTotal isoCode=defaultOrganizationPartyCurrencyUomId/> - <#if !currentGlReconciliation.reconciledBalance?has_content> + <#if isReconciled == false> <input type="submit" value="${uiLabelMap.AccountingReconcile}"/> </#if> </div> </div> </form> +<form name="CancelBankReconciliationForm" method="post" action="<@ofbizUrl>cancelBankReconciliation</@ofbizUrl>"> + <input name="finAccountId" type="hidden" value="${finAccountId}"/> + <input name="glReconciliationId" type="hidden" value="${glReconciliationId}"/> +</form> <#list finAccountTransList as finAccountTrans> <form name="reomveFinAccountTransAssociation_${finAccountTrans.finAccountTransId}" method="post" action="<@ofbizUrl>reomveFinAccountTransAssociation</@ofbizUrl>"> <input name="finAccountTransId" type="hidden" value="${finAccountTrans.finAccountTransId}"/> <input name="finAccountId" type="hidden" value="${finAccountTrans.finAccountId}"/> <input name="glReconciliationId" type="hidden" value="${glReconciliationId}"/> </form> -</#list> \ No newline at end of file +</#list> Modified: ofbiz/branches/executioncontext20090812/applications/accounting/widget/FinAccountForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/widget/FinAccountForms.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/accounting/widget/FinAccountForms.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/accounting/widget/FinAccountForms.xml Mon Aug 24 22:15:46 2009 @@ -179,6 +179,9 @@ <form name="AddFinAccountTrans" type="single" target="createFinAccountTrans" header-row-style="header-row" default-table-style="basic-table"> + <actions> + <set field="statusId" value="FINACT_TRNS_CREATED"/> + </actions> <auto-fields-service service-name="createFinAccountTrans"/> <field name="finAccountId"><hidden/></field> <field name="finAccountTransId"><hidden/></field> Modified: ofbiz/branches/executioncontext20090812/applications/accounting/widget/FinAccountScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/widget/FinAccountScreens.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/accounting/widget/FinAccountScreens.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/accounting/widget/FinAccountScreens.xml Mon Aug 24 22:15:46 2009 @@ -631,12 +631,14 @@ <service service-name="getFinAccountTransListAndTotals" result-map="transactionTotalAmount"/> <set field="finAccountTransList" from-field="transactionTotalAmount.finAccountTransList" type="List"/> <set field="finAccountTransIds" value="${groovy:org.ofbiz.entity.util.EntityUtil.getFieldListFromEntityList(finAccountTransList, 'finAccountTransId', true);}" type="List"/> - <entity-condition entity-name="FinAccountTrans" list="FinAccountTranstions"> + <entity-condition entity-name="FinAccountTrans" list="finAccountTransactions"> <condition-list> <condition-expr field-name="finAccountTransId" operator="in" from-field="finAccountTransIds"/> <condition-expr field-name="statusId" value="FINACT_TRNS_CREATED"/> </condition-list> </entity-condition> + <service service-name="isGlReconciliationReconciled" result-map="reconciledMap"/> + <set field="isReconciled" from-field="reconciledMap.isReconciled"/> </actions> <widgets> <decorator-screen name="CommonFinAccountDecorator" location="${parameters.finAccountDecoratorLocation}"> Modified: ofbiz/branches/executioncontext20090812/applications/content/data/CompDocData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/data/CompDocData.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/content/data/CompDocData.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/content/data/CompDocData.xml Mon Aug 24 22:15:46 2009 @@ -34,6 +34,7 @@ <PartyRole partyId="admin" roleTypeId="APPROVER"/> <UserLogin userLoginId="approver" partyId="approver"/> <UserLoginSecurityGroup groupId="COMPDOCADMIN" userLoginId="approver" fromDate="2006-01-01 12:00:00.0"/> + <UserToUserGroupRelationship userLoginId="approver" groupId="OFBIZ_USERS"/> <DataResource dataResourceId="DR1103b" dataResourceTypeId="OFBIZ_FILE_BIN" objectInfo="/applications/content/data/pdftest2.pdf" mimeTypeId="application/pdf" dataResourceName="Personal Profile"/> Modified: ofbiz/branches/executioncontext20090812/applications/content/data/ContentSecurityData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/data/ContentSecurityData.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/content/data/ContentSecurityData.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/content/data/ContentSecurityData.xml Mon Aug 24 22:15:46 2009 @@ -47,4 +47,13 @@ <SecurityPermission description="Send to the Control Applet." permissionId="SEND_CONTROL_APPLET"/> <SecurityGroupPermission groupId="FULLADMIN" permissionId="SEND_CONTROL_APPLET"/> <SecurityGroupPermission groupId="FLEXADMIN" permissionId="SEND_CONTROL_APPLET"/> + + <ArtifactPath artifactPath="ofbiz/content" description="Content Manager Application"/> + + <!-- Data needed for the transition to security-aware artifacts. As each webapp + is converted over to the new security design, the corresponding admin + permission should be removed. --> + + <UserGroupToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/content" permissionValue="admin=true"/> + </entity-engine-xml> Modified: ofbiz/branches/executioncontext20090812/applications/content/data/DemoBlogUsersData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/data/DemoBlogUsersData.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/content/data/DemoBlogUsersData.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/content/data/DemoBlogUsersData.xml Mon Aug 24 22:15:46 2009 @@ -25,6 +25,7 @@ <PartyRole partyId="BLOGUSER_ADMIN" roleTypeId="CONTENT_ADMIN"/> <ContentRole partyId="BLOGUSER_ADMIN" roleTypeId="CONTENT_ADMIN" contentId="BLOGROOT" fromDate="2004-03-27 09:37:40.989"/> <UserLoginSecurityGroup userLoginId="blog_admin" groupId="FULLADMIN" fromDate="2004-09-15 00:00:00.000"/> + <UserToUserGroupRelationship userLoginId="blog_admin" groupId="OFBIZ_USERS"/> <Party partyId="BLOGUSER_EDITOR" partyTypeId="PERSON" createdDate="2004-03-27 09:37:40.989" createdByUserLogin="admin" lastModifiedDate="2004-03-27 09:37:40.989" lastModifiedByUserLogin="admin"/> <Person partyId="BLOGUSER_EDITOR" lastName="Blog" firstName="Editor"/> @@ -32,16 +33,19 @@ <PartyRole partyId="BLOGUSER_EDITOR" roleTypeId="CONTENT_ADMIN"/> <ContentRole partyId="BLOGUSER_EDITOR" roleTypeId="CONTENT_ADMIN" contentId="BLOGROOT" fromDate="2004-03-27 09:37:40.989"/> <UserLoginSecurityGroup userLoginId="blog_editor" groupId="FULLADMIN" fromDate="2004-09-15 00:00:00.000"/> + <UserToUserGroupRelationship userLoginId="blog_editor" groupId="OFBIZ_USERS"/> <Party partyId="BLOGUSER_USER" partyTypeId="PERSON" createdDate="2004-03-27 09:37:40.989" createdByUserLogin="admin" lastModifiedDate="2004-03-27 09:37:40.989" lastModifiedByUserLogin="admin"/> <Person partyId="BLOGUSER_USER" lastName="Blog" firstName="User"/> <UserLogin userLoginId="blog_user" partyId="BLOGUSER_USER" currentPassword="{SHA}47ca69ebb4bdc9ae0adec130880165d2cc05db1a"/> <PartyRole partyId="BLOGUSER_USER" roleTypeId="CONTENT_ADMIN"/> <PartyRole partyId="BLOGUSER_USER" roleTypeId="CONTENT_AUTHOR"/> + <UserToUserGroupRelationship userLoginId="blog_user" groupId="OFBIZ_USERS"/> <Party partyId="BLOGUSER_GUEST" partyTypeId="PERSON" createdDate="2004-10-20 09:37:40.989" createdByUserLogin="admin" lastModifiedDate="2004-10-20 09:37:40.989" lastModifiedByUserLogin="admin"/> <Person partyId="BLOGUSER_GUEST" lastName="Blog" firstName="Guest"/> <UserLogin userLoginId="blog_guest" partyId="BLOGUSER_GUEST" currentPassword="{SHA}47ca69ebb4bdc9ae0adec130880165d2cc05db1a"/> + <UserToUserGroupRelationship userLoginId="blog_guest" groupId="OFBIZ_USERS"/> <Party partyId="AUTHOR_BIGAL" partyTypeId="PERSON" createdDate="2004-03-27 09:37:40.989" createdByUserLogin="admin" lastModifiedDate="2004-03-27 09:37:40.989" lastModifiedByUserLogin="admin"/> <Person partyId="AUTHOR_BIGAL" lastName="Al" firstName="Big"/> @@ -50,6 +54,7 @@ <ContentRole partyId="AUTHOR_BIGAL" roleTypeId="CONTENT_AUTHOR" contentId="BLOGROOTBIGAL" fromDate="2004-03-27 09:37:40.989"/> <ContentPurpose contentId="BLOGROOTBIGAL" contentPurposeTypeId="ARTICLE"/> <UserLoginSecurityGroup userLoginId="bigal" groupId="CONTENT_USER" fromDate="2004-09-15 00:00:00.000"/> + <UserToUserGroupRelationship userLoginId="bigal" groupId="OFBIZ_USERS"/> <!-- Updating BLOGROOTBIGAL with bigal as creator so that he will be found as "owner" for subrecords. This is used in a screen permission test. --> @@ -85,6 +90,7 @@ <ContentRole partyId="AUTHOR_MADMAX" roleTypeId="CONTENT_AUTHOR" contentId="BLOGROOTMADMAX" fromDate="2004-03-27 09:37:40.989"/> <ContentPurpose contentId="BLOGROOTMADMAX" contentPurposeTypeId="ARTICLE"/> <UserLoginSecurityGroup userLoginId="madmax" groupId="CONTENT_USER" fromDate="2004-09-15 00:00:00.000"/> + <UserToUserGroupRelationship userLoginId="madmax" groupId="OFBIZ_USERS"/> <!-- Updating biBLOGROOTMADMAXgal with madmax as creator so that he will be found as "owner" for subrecords. This is used in a screen permission test. --> Modified: ofbiz/branches/executioncontext20090812/applications/humanres/data/HumanResDemoData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/humanres/data/HumanResDemoData.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/humanres/data/HumanResDemoData.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/humanres/data/HumanResDemoData.xml Mon Aug 24 22:15:46 2009 @@ -54,9 +54,11 @@ <UserLogin userLoginId="demoapprover" currentPassword="{SHA}47ca69ebb4bdc9ae0adec130880165d2cc05db1a" requirePasswordChange="N" partyId="DemoApprover"/> <UserLoginSecurityGroup groupId="HUMANRES_APPROVER" userLoginId="demoapprover" fromDate="2001-01-01 12:00:00.0"/> + <UserToUserGroupRelationship userLoginId="demoapprover" groupId="OFBIZ_USERS"/> <UserLogin userLoginId="demoemployee" currentPassword="{SHA}47ca69ebb4bdc9ae0adec130880165d2cc05db1a" requirePasswordChange="N" partyId="DemoEmployee"/> <UserLoginSecurityGroup groupId="HUMANRES_EMPLOYEE" userLoginId="demoemployee" fromDate="2001-01-01 12:00:00.0"/> + <UserToUserGroupRelationship userLoginId="demoemployee" groupId="OFBIZ_USERS"/> <JobInterviewType jobInterviewTypeId="JOB_INTERVW" description="It is a process in which an employee is evaluated by an employer for prospective employment in their company"/> <JobInterviewType jobInterviewTypeId="EXIT_INTERVW" description="It is conducted by an employer of a departing employee"/> Modified: ofbiz/branches/executioncontext20090812/applications/humanres/data/HumanResSecurityData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/humanres/data/HumanResSecurityData.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/humanres/data/HumanResSecurityData.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/humanres/data/HumanResSecurityData.xml Mon Aug 24 22:15:46 2009 @@ -30,4 +30,13 @@ <SecurityGroupPermission groupId="FLEXADMIN" permissionId="HUMANRES_VIEW"/> <SecurityGroupPermission groupId="VIEWADMIN" permissionId="HUMANRES_VIEW"/> <SecurityGroupPermission groupId="BIZADMIN" permissionId="HUMANRES_ADMIN"/> + + <ArtifactPath artifactPath="ofbiz/humanres" description="Human Resources Application"/> + + <!-- Data needed for the transition to security-aware artifacts. As each webapp + is converted over to the new security design, the corresponding admin + permission should be removed. --> + + <UserGroupToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/humanres" permissionValue="admin=true"/> + </entity-engine-xml> Modified: ofbiz/branches/executioncontext20090812/applications/manufacturing/data/ManufacturingSecurityData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/manufacturing/data/ManufacturingSecurityData.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/manufacturing/data/ManufacturingSecurityData.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/manufacturing/data/ManufacturingSecurityData.xml Mon Aug 24 22:15:46 2009 @@ -32,4 +32,13 @@ <SecurityGroupPermission groupId="FLEXADMIN" permissionId="MANUFACTURING_VIEW"/> <SecurityGroupPermission groupId="VIEWADMIN" permissionId="MANUFACTURING_VIEW"/> <SecurityGroupPermission groupId="BIZADMIN" permissionId="MANUFACTURING_ADMIN"/> + + <ArtifactPath artifactPath="ofbiz/manufacturing" description="Manufacturing Application"/> + + <!-- Data needed for the transition to security-aware artifacts. As each webapp + is converted over to the new security design, the corresponding admin + permission should be removed. --> + + <UserGroupToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/manufacturing" permissionValue="admin=true"/> + </entity-engine-xml> Modified: ofbiz/branches/executioncontext20090812/applications/marketing/data/MarketingSecurityData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/marketing/data/MarketingSecurityData.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/marketing/data/MarketingSecurityData.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/marketing/data/MarketingSecurityData.xml Mon Aug 24 22:15:46 2009 @@ -34,4 +34,15 @@ <SecurityGroupPermission groupId="FLEXADMIN" permissionId="MARKETING_VIEW"/> <SecurityGroupPermission groupId="VIEWADMIN" permissionId="MARKETING_VIEW"/> <SecurityGroupPermission groupId="BIZADMIN" permissionId="MARKETING_ADMIN"/> + + <ArtifactPath artifactPath="ofbiz/marketing" description="Marketing Application"/> + <ArtifactPath artifactPath="ofbiz/SalesForceAutomation" description="Sales Force Automation Application"/> + + <!-- Data needed for the transition to security-aware artifacts. As each webapp + is converted over to the new security design, the corresponding admin + permission should be removed. --> + + <UserGroupToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/marketing" permissionValue="admin=true"/> + <UserGroupToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/SalesForceAutomation" permissionValue="admin=true"/> + </entity-engine-xml> Modified: ofbiz/branches/executioncontext20090812/applications/marketing/data/sfaDemoData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/marketing/data/sfaDemoData.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/marketing/data/sfaDemoData.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/marketing/data/sfaDemoData.xml Mon Aug 24 22:15:46 2009 @@ -42,7 +42,8 @@ <UserLogin userLoginId="DemoLeadOwner" currentPassword="{SHA}47ca69ebb4bdc9ae0adec130880165d2cc05db1a" partyId="DemoLeadOwner" enabled="Y"/> <!-- FIXME: Establish SecurityGroup for SFA. This user should have access only to SFA --> <UserLoginSecurityGroup groupId="FULLADMIN" userLoginId="DemoLeadOwner" fromDate="2001-05-13 00:00:00.000"/> - + <UserToUserGroupRelationship userLoginId="DemoLeadOwner" groupId="OFBIZ_USERS"/> + <Party partyId="DemoLeadOwner1" partyTypeId="PERSON" statusId="PARTY_ENABLED"/> <Person partyId="DemoLeadOwner1" firstName="Demo" lastName="LeadOwner1"/> <PartyRole partyId="DemoLeadOwner1" roleTypeId="_NA_"/> @@ -51,6 +52,7 @@ <UserLogin userLoginId="DemoLeadOwner1" currentPassword="{SHA}47ca69ebb4bdc9ae0adec130880165d2cc05db1a" partyId="DemoLeadOwner1" enabled="Y"/> <!-- FIXME: Establish SecurityGroup for SFA. This user should have access only to SFA --> <UserLoginSecurityGroup groupId="FULLADMIN" userLoginId="DemoLeadOwner1" fromDate="2001-05-13 00:00:00.000"/> + <UserToUserGroupRelationship userLoginId="DemoLeadOwner1" groupId="OFBIZ_USERS"/> <!-- Demo Leads --> <Party partyId="sfa102" partyTypeId="PARTY_GROUP" statusId="PARTY_ENABLED"/> Modified: ofbiz/branches/executioncontext20090812/applications/marketing/webapp/sfa/lead/mergeLeads.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/marketing/webapp/sfa/lead/mergeLeads.ftl?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/marketing/webapp/sfa/lead/mergeLeads.ftl (original) +++ ofbiz/branches/executioncontext20090812/applications/marketing/webapp/sfa/lead/mergeLeads.ftl Mon Aug 24 22:15:46 2009 @@ -1,3 +1,22 @@ +<#-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + <div class="screenlet"> <div class="screenlet-title-bar"><h3>${uiLabelMap.SfaMergingFollowing} ${uiLabelMap.SfaMergeLeads}</h3></div> <div class="screenlet-body"> Modified: ofbiz/branches/executioncontext20090812/applications/order/data/OrderDemoUser.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/order/data/OrderDemoUser.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/order/data/OrderDemoUser.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/order/data/OrderDemoUser.xml Mon Aug 24 22:15:46 2009 @@ -27,4 +27,11 @@ <UserLogin userLoginId="DemoCustomer" currentPassword="{SHA}47ca69ebb4bdc9ae0adec130880165d2cc05db1a" passwordHint=""/> <UserLogin userLoginId="supplier" partyId="externaluser" currentPassword="{SHA}47ca69ebb4bdc9ae0adec130880165d2cc05db1a" passwordHint=""/> <UserLoginSecurityGroup groupId="ORDERSUPPLIER_LTD" userLoginId="supplier" fromDate="2001-01-01 12:00:00.0"/> + <UserToUserGroupRelationship userLoginId="DemoBuyer" groupId="OFBIZ_USERS"/> + <UserToUserGroupRelationship userLoginId="DemoRepAll" groupId="OFBIZ_USERS"/> + <UserToUserGroupRelationship userLoginId="DemoRepStore" groupId="OFBIZ_USERS"/> + <UserToUserGroupRelationship userLoginId="DemoCustCompany" groupId="OFBIZ_USERS"/> + <UserToUserGroupRelationship userLoginId="DemoCustAgent" groupId="OFBIZ_USERS"/> + <UserToUserGroupRelationship userLoginId="DemoCustomer" groupId="OFBIZ_USERS"/> + <UserToUserGroupRelationship userLoginId="supplier" groupId="OFBIZ_USERS"/> </entity-engine-xml> Modified: ofbiz/branches/executioncontext20090812/applications/order/data/OrderSecurityData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/order/data/OrderSecurityData.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/order/data/OrderSecurityData.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/order/data/OrderSecurityData.xml Mon Aug 24 22:15:46 2009 @@ -145,4 +145,13 @@ <SecurityGroupPermission groupId="ORDERENTRY_ALL" permissionId="ORDERMGR_SEND_CONFIRMATION"/> <SecurityGroupPermission groupId="ORDERENTRY_ALL" permissionId="OFBTOOLS_VIEW"/> <SecurityGroupPermission groupId="ORDERENTRY_ALL" permissionId="ORDERMGR_CRQ_CREATE"/> + + <ArtifactPath artifactPath="ofbiz/order" description="Order Application"/> + + <!-- Data needed for the transition to security-aware artifacts. As each webapp + is converted over to the new security design, the corresponding admin + permission should be removed. --> + + <UserGroupToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/order" permissionValue="admin=true"/> + </entity-engine-xml> Modified: ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/WEB-INF/controller.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/WEB-INF/controller.xml Mon Aug 24 22:15:46 2009 @@ -1594,6 +1594,11 @@ <response name="error" type="view" value="orderview"/> </request-map> + <request-map uri="crosssell"> + <security https="false" auth="false"/> + <response name="success" type="view" value="product"/> + </request-map> + <!-- Lookup request mappings --> <request-map uri="LookupPerson"><security https="true" auth="true"/><response name="success" type="view" value="LookupPerson"/></request-map> <request-map uri="LookupPartyGroup"><security https="true" auth="true"/><response name="success" type="view" value="LookupPartyGroup"/></request-map> Modified: ofbiz/branches/executioncontext20090812/applications/party/data/PartySecurityData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/party/data/PartySecurityData.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/party/data/PartySecurityData.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/party/data/PartySecurityData.xml Mon Aug 24 22:15:46 2009 @@ -92,4 +92,12 @@ <SecurityGroup description="Security Admin group, has all permissions to modify security settings in party manager." groupId="SECURITYADMIN"/> <SecurityGroupPermission groupId="SECURITYADMIN" permissionId="SECURITY_ADMIN"/> + <ArtifactPath artifactPath="ofbiz/party" description="Party Manager Application"/> + + <!-- Data needed for the transition to security-aware artifacts. As each webapp + is converted over to the new security design, the corresponding admin + permission should be removed. --> + + <UserGroupToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/party" permissionValue="admin=true"/> + </entity-engine-xml> Modified: ofbiz/branches/executioncontext20090812/applications/party/data/ScheduledJobs.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/party/data/ScheduledJobs.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/party/data/ScheduledJobs.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/party/data/ScheduledJobs.xml Mon Aug 24 22:15:46 2009 @@ -21,6 +21,6 @@ <!-- This is a recurring job with will check for communication events which need to be send as emails. --> <entity-engine-xml> <!-- create recurring job to check email communication events with the status COM_IN_PROGRESS to send these emails.. --> - <TemporalExpression tempExprId="SENDEMAIL" tempExprTypeId="FREQUENCY" integer1="12" integer2="5"/> + <TemporalExpression tempExprId="SENDEMAIL" tempExprTypeId="FREQUENCY" integer1="12" integer2="15"/> <JobSandbox jobId="SENDEMAIL" jobName="Send Email" runTime="2000-01-01 00:00:00.000" serviceName="sendEmailDated" poolId="pool" runAsUser="system" tempExprId="SENDEMAIL" maxRecurrenceCount="-1"/> </entity-engine-xml> Modified: ofbiz/branches/executioncontext20090812/applications/product/data/ProductSecurityData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/product/data/ProductSecurityData.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/product/data/ProductSecurityData.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/product/data/ProductSecurityData.xml Mon Aug 24 22:15:46 2009 @@ -92,4 +92,14 @@ <SecurityGroupPermission groupId="FLEXADMIN" permissionId="FACILITY_VIEW"/> <SecurityGroupPermission groupId="VIEWADMIN" permissionId="FACILITY_VIEW"/> <SecurityGroupPermission groupId="BIZADMIN" permissionId="FACILITY_ADMIN"/> + + <ArtifactPath artifactPath="ofbiz/catalog" description="Catalog Manager Application"/> + <ArtifactPath artifactPath="ofbiz/facility" description="Facility Manager Application"/> + + <!-- Data needed for the transition to security-aware artifacts. As each webapp + is converted over to the new security design, the corresponding admin + permission should be removed. --> + + <UserGroupToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/catalog" permissionValue="admin=true"/> + <UserGroupToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/facility" permissionValue="admin=true"/> </entity-engine-xml> Modified: ofbiz/branches/executioncontext20090812/applications/securityext/data/UserDemoData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/securityext/data/UserDemoData.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/securityext/data/UserDemoData.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/securityext/data/UserDemoData.xml Mon Aug 24 22:15:46 2009 @@ -87,4 +87,13 @@ <UserLoginSecurityGroup groupId="VIEWADMIN" userLoginId="ltdadmin1" fromDate="2001-01-01 12:00:00.0"/> <UserLoginSecurityGroup groupId="BIZADMIN" userLoginId="bizadmin" fromDate="2001-01-01 12:00:00.0"/> + <UserToUserGroupRelationship userLoginId="anonymous" groupId="OFBIZ_USERS"/> + <UserToUserGroupRelationship userLoginId="system" groupId="OFBIZ_USERS"/> + <UserToUserGroupRelationship userLoginId="admin" groupId="OFBIZ_USERS"/> + <UserToUserGroupRelationship userLoginId="flexadmin" groupId="OFBIZ_USERS"/> + <UserToUserGroupRelationship userLoginId="demoadmin" groupId="OFBIZ_USERS"/> + <UserToUserGroupRelationship userLoginId="ltdadmin" groupId="OFBIZ_USERS"/> + <UserToUserGroupRelationship userLoginId="ltdadmin1" groupId="OFBIZ_USERS"/> + <UserToUserGroupRelationship userLoginId="bizadmin" groupId="OFBIZ_USERS"/> + </entity-engine-xml> Modified: ofbiz/branches/executioncontext20090812/applications/workeffort/data/WorkEffortSecurityData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/workeffort/data/WorkEffortSecurityData.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/workeffort/data/WorkEffortSecurityData.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/workeffort/data/WorkEffortSecurityData.xml Mon Aug 24 22:15:46 2009 @@ -48,4 +48,15 @@ <SecurityGroupPermission groupId="WORKEFFORT_USER" permissionId="WORKEFFORTMGR_ROLE_UPDATE"/> <SecurityGroupPermission groupId="WORKEFFORT_USER" permissionId="WORKEFFORTMGR_ROLE_DELETE"/> + <ArtifactPath artifactPath="ofbiz/workeffort" description="Work Effort Application"/> + <ArtifactPath artifactPath="ofbiz/ical" description="iCalendar Public URL"/> + <UserToArtifactPermRel userLoginId="NOT_LOGGED_IN" artifactPath="ofbiz/ical" permissionValue="view=true"/> + + <!-- Data needed for the transition to security-aware artifacts. As each webapp + is converted over to the new security design, the corresponding admin + permission should be removed. --> + + <UserGroupToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/workeffort" permissionValue="admin=true"/> + <UserGroupToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/ical" permissionValue="admin=true"/> + </entity-engine-xml> Modified: ofbiz/branches/executioncontext20090812/framework/common/data/CommonSecurityData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/common/data/CommonSecurityData.xml?rev=807412&r1=807411&r2=807412&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/framework/common/data/CommonSecurityData.xml (original) +++ ofbiz/branches/executioncontext20090812/framework/common/data/CommonSecurityData.xml Mon Aug 24 22:15:46 2009 @@ -50,4 +50,19 @@ <!-- Temporal expression security --> <SecurityPermission description="Temporal expression admin" permissionId="TEMPEXPR_ADMIN"/> <SecurityGroupPermission groupId="FULLADMIN" permissionId="TEMPEXPR_ADMIN"/> + + <ArtifactPath artifactPath="ofbiz/bi" description="Business Intelligence Application"/> + <ArtifactPath artifactPath="ofbiz/images" description="Public Static Images URL"/> + <ArtifactPath artifactPath="ofbiz/tempfiles" description="Temporary Files URL"/> + <UserToArtifactPermRel userLoginId="NOT_LOGGED_IN" artifactPath="ofbiz/bi" permissionValue="view=true"/> + + <!-- Data needed for the transition to security-aware artifacts. As each webapp + is converted over to the new security design, the corresponding admin + permission should be removed. --> + + <UserGroupToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/bi" permissionValue="admin=true"/> + <UserGroupToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/images" permissionValue="admin=true"/> + <UserGroupToArtifactPermRel groupId="OFBIZ_USERS" artifactPath="ofbiz/tempfiles" permissionValue="admin=true"/> + + </entity-engine-xml> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |