svn commit: r804274 - in /ofbiz/branches/executionconte
Locked
svn commit: r804274 - in /ofbiz/branches/executionconte
 
|
Author: adrianc
Date: Fri Aug 14 15:58:17 2009 New Revision: 804274 URL: http://svn.apache.org/viewvc?rev=804274&view=rev Log: Synchronized branch with trunk. Added: ofbiz/branches/executioncontext20090812/framework/testtools/config/ - copied from r804271, ofbiz/trunk/framework/testtools/config/ ofbiz/branches/executioncontext20090812/framework/testtools/lib/ - copied from r804271, ofbiz/trunk/framework/testtools/lib/ ofbiz/branches/executioncontext20090812/framework/testtools/src/org/ofbiz/testtools/seleniumxml/ - copied from r804271, ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/ ofbiz/branches/executioncontext20090812/framework/testtools/src/org/ofbiz/testtools/seleniumxml/util/ - copied from r804271, ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/seleniumxml/util/ ofbiz/branches/executioncontext20090812/framework/testtools/testdef/ - copied from r804271, ofbiz/trunk/framework/testtools/testdef/ ofbiz/branches/executioncontext20090812/framework/testtools/testdef/seleniumxml/ - copied from r804271, ofbiz/trunk/framework/testtools/testdef/seleniumxml/ ofbiz/branches/executioncontext20090812/framework/testtools/testdef/seleniumxml/example/ - copied from r804271, ofbiz/trunk/framework/testtools/testdef/seleniumxml/example/ ofbiz/branches/executioncontext20090812/framework/testtools/testdef/seleniumxml/example/recorded/ - copied from r804271, ofbiz/trunk/framework/testtools/testdef/seleniumxml/example/recorded/ Modified: ofbiz/branches/executioncontext20090812/ (props changed) ofbiz/branches/executioncontext20090812/.classpath ofbiz/branches/executioncontext20090812/.gitignore ofbiz/branches/executioncontext20090812/applications/accounting/ofbiz-component.xml ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceEvents.xml ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml ofbiz/branches/executioncontext20090812/applications/accounting/servicedef/services_invoice.xml ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/WEB-INF/controller.xml ofbiz/branches/executioncontext20090812/applications/accounting/webapp/ap/WEB-INF/actions/invoices/CommissionReport.groovy ofbiz/branches/executioncontext20090812/applications/accounting/webapp/ap/invoices/CommissionReport.ftl ofbiz/branches/executioncontext20090812/applications/accounting/widget/Menus.xml ofbiz/branches/executioncontext20090812/applications/accounting/widget/PaymentGatewayConfigForms.xml (props changed) ofbiz/branches/executioncontext20090812/applications/accounting/widget/PaymentGatewayConfigScreens.xml (props changed) ofbiz/branches/executioncontext20090812/applications/order/config/OrderUiLabels.xml ofbiz/branches/executioncontext20090812/applications/order/src/org/ofbiz/order/order/OrderServices.java ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl ofbiz/branches/executioncontext20090812/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy (props changed) ofbiz/branches/executioncontext20090812/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl ofbiz/branches/executioncontext20090812/build.xml ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/config/DelegatorInfo.java ofbiz/branches/executioncontext20090812/framework/resources/templates/build.xml ofbiz/branches/executioncontext20090812/framework/resources/templates/ofbiz-component.xml ofbiz/branches/executioncontext20090812/framework/testtools/build.xml ofbiz/branches/executioncontext20090812/framework/testtools/ofbiz-component.xml ofbiz/branches/executioncontext20090812/framework/webtools/webapp/webtools/WEB-INF/actions/datafile/viewdatafile.groovy (props changed) ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java (props changed) ofbiz/branches/executioncontext20090812/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/EditMaint.groovy (props changed) ofbiz/branches/executioncontext20090812/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/PrintFixedAssetMaint.groovy (props changed) ofbiz/branches/executioncontext20090812/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/workeffort/EditWorkEfforts.groovy (props changed) ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/data/DemoTaxAuthority.xml ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/images/productAdditionalView.js (props changed) ofbiz/branches/executioncontext20090812/specialpurpose/googlecheckout/ (props changed) ofbiz/branches/executioncontext20090812/specialpurpose/googlecheckout/webapp/googlecheckout/ (props changed) ofbiz/branches/executioncontext20090812/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy (props changed) ofbiz/branches/executioncontext20090812/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy (props changed) ofbiz/branches/executioncontext20090812/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy (props changed) ofbiz/branches/executioncontext20090812/specialpurpose/myportal/ofbiz-component.xml Propchange: ofbiz/branches/executioncontext20090812/ ------------------------------------------------------------------------------ svn:mergeinfo = /ofbiz/trunk:803908-804271 Modified: ofbiz/branches/executioncontext20090812/.classpath URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/.classpath?rev=804274&r1=804273&r2=804274&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/.classpath (original) +++ ofbiz/branches/executioncontext20090812/.classpath Fri Aug 14 15:58:17 2009 @@ -183,5 +183,7 @@ <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-velocity-20090630-3606-466aec2fb8ad.jar"/> <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-extension-wiki-20090630-3606-466aec2fb8ad.jar"/> <classpathentry kind="lib" path="framework/webslinger/lib/webslinger-launcher-20090630-3606-466aec2fb8ad.jar"/> + <classpathentry kind="lib" path="framework/testtools/lib/selenium-server.jar"/> + <classpathentry kind="lib" path="framework/testtools/lib/selenium-java-client-driver.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: ofbiz/branches/executioncontext20090812/.gitignore URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/.gitignore?rev=804274&r1=804273&r2=804274&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/.gitignore (original) +++ ofbiz/branches/executioncontext20090812/.gitignore Fri Aug 14 15:58:17 2009 @@ -43,9 +43,11 @@ specialpurpose/webpos/build/ ofbiz.jar runtime/svninfo.ftl +runtime/logs/access_log.* runtime/logs/*.log* runtime/logs/*.html* runtime/data/derby/* +runtime/catalina/work/* debian/EncryptPassword.class debian/copyright debian/files Modified: ofbiz/branches/executioncontext20090812/applications/accounting/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/ofbiz-component.xml?rev=804274&r1=804273&r2=804274&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/accounting/ofbiz-component.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/accounting/ofbiz-component.xml Fri Aug 14 15:58:17 2009 @@ -46,7 +46,8 @@ <entity-resource type="data" reader-name="demo" loader="main" location="data/PaymentsInvoices.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoAcctgTransactionData.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoFinAccountData.xml"/> - + <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoTaxAuthority.xml"/> + <!-- General Payment Service Definitions --> <service-resource type="model" loader="main" location="servicedef/services_agreement.xml"/> <service-resource type="model" loader="main" location="servicedef/services_admin.xml"/> Modified: ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceEvents.xml?rev=804274&r1=804273&r2=804274&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceEvents.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceEvents.xml Fri Aug 14 15:58:17 2009 @@ -315,6 +315,7 @@ </if-empty> <create-value value-field="newEntity"/> </simple-method> + <simple-method method-name="updateInvoiceItem" short-description="Update an existing Invoice Item"> <call-simple-method method-name="InvoiceStatusInProgress"/> @@ -348,6 +349,7 @@ <store-value value-field="lookedUpValue"/> </if-compare-field> </simple-method> + <simple-method method-name="removeInvoiceItem" short-description="Remove an existing Invoice Item"> <call-simple-method method-name="InvoiceStatusInProgress"/> <set field="invoiceId" from-field="parameters.invoiceId"/> @@ -612,4 +614,155 @@ <call-service service-name="updateInvoice" in-map-name="updateInvoiceCtx"/> </iterate> </simple-method> + + <simple-method method-name="addtax" short-description="Set Parameter And Call Tax Calculate Service"> + <entity-one entity-name="Invoice" value-field="invoice"> + <field-map field-name="invoiceId" from-field="parameters.invoiceId"/> + </entity-one> + <entity-and entity-name="InvoiceItem" list="invoiceItems"> + <field-map field-name="invoiceId" from-field="invoice.invoiceId"/> + </entity-and> + <entity-and entity-name="PartyContactMechPurpose" list="contacts"> + <field-map field-name="partyId" from-field="invoice.partyId"/> + <field-map field-name="contactMechPurposeTypeId" value="SHIPPING_LOCATION"/> + </entity-and> + <if-empty field="contacts"> + <entity-and entity-name="PartyContactMechPurpose" list="contacts"> + <field-map field-name="partyId" from-field="invoice.partyId"/> + <field-map field-name="contactMechPurposeTypeId" value="GENERAL_LOCATION"/> + </entity-and> + </if-empty> + <if-empty field="contacts"> + <add-error><fail-message message="cannot calculate tax, no shipping or......."/></add-error> + </if-empty> + <first-from-list entry="contactMech" list="contacts"/> + <entity-one entity-name="PostalAddress" value-field="postalAddress"> + <field-map field-name="contactMechId" from-field="contactMech.contactMechId"/> + </entity-one> + <if-compare field="invoice.invoiceTypeId" value="SALES_INVOICE" operator="equals"> + <set field="addtaxMap.billToPartyId" from-field="invoice.partyId"/> + </if-compare> + <if-compare field="invoice.invoiceTypeId" value="PURCHASE_INVOICE" operator="equals"> + <set field="addtaxMap.billToPartyId" from-field="invoice.partyIdFrom"/> + </if-compare> + <set field="addtaxMap.payToPartyId" from-field="invoice.partyIdFrom"/> + <iterate list="invoiceItems" entry="invoiceItem"> + <entity-and entity-name="Product" list="product"> + <field-map field-name="productId" from-field="invoiceItem.productId"/> + </entity-and> + <first-from-list entry="itemProduct" list="product"/> + <if-not-empty field="invoiceItem.productId"> + <entity-and entity-name="InvoiceItem" list="findinvoiceItems"> + <field-map field-name="invoiceId" from-field="invoice.invoiceId"/> + <field-map field-name="productId" from-field="invoiceItem.productId"/> + <field-map field-name="invoiceItemTypeId" value="ITM_PROMOTION_ADJ"/> + </entity-and> + <if-not-empty field="findinvoiceItems"> + <calculate field="total" decimal-scale="${roundingDecimals}" rounding-mode="${roundingMode}" type="BigDecimal"> + <calcop operator="multiply"> + <calcop operator="get" field="invoiceItem.quantity"/> + <calcop operator="get" field="invoiceItem.amount"/> + </calcop> + </calculate> + <set field="totalAmount" from-field="total" type="BigDecimal"/> + <calculate field="totalAmount" decimal-scale="${roundingDecimals}" rounding-mode="${roundingMode}" type="BigDecimal"> + <calcop operator="subtract"> + <calcop operator="get" field="totalAmount"/> + <calcop operator="get" field="invoiceItem.amount"/> + </calcop> + </calculate> + <else> + <calculate field="total" decimal-scale="${roundingDecimals}" rounding-mode="${roundingMode}" type="BigDecimal"> + <calcop operator="multiply"> + <calcop operator="get" field="invoiceItem.quantity"/> + <calcop operator="get" field="invoiceItem.amount"/> + </calcop> + </calculate> + <set field="totalAmount" from-field="total" type="BigDecimal"/> + </else> + </if-not-empty> + <else> + <set field="totalAmount" value="0" type="BigDecimal"/> + </else> + </if-not-empty> + <set field="itemAmount" from-field="totalAmount" type="BigDecimal"/> + <set field="itemPrice" from-field="invoiceItem.amount"/> + <set field="addtaxMap.itemProductList[]" from-field="itemProduct"/> + <set field="addtaxMap.itemAmountList[]" from-field="itemAmount" type="BigDecimal"/> + <set field="addtaxMap.itemPriceList[]" from-field="itemPrice"/> + <set field="addtaxMap.itemShippingList[]" type="BigDecimal" value="0"/> + </iterate> + <set field="addtaxMap.orderShippingAmount" type="BigDecimal" value="0"/> + <set field="addtaxMap.orderPromotionsAmount" type="BigDecimal" value="0"/> + <set field="addtaxMap.shippingAddress" from-field="postalAddress"/> + <if> + <condition> + <not><if-empty field="addtaxMap.itemProductList"></if-empty></not> + </condition> + <then> + <call-service service-name="calcTax" in-map-name="addtaxMap"> + <result-to-field result-name="itemAdjustments" field="itemAdjustments"/> + <result-to-field result-name="orderAdjustments" field="orderAdjustments"/> + </call-service> + <iterate list="invoiceItems" entry="findItem"> + <if> + <condition> + <not><if-empty field="findItem.productId"></if-empty></not> + </condition> + <then> + <set field="invoiceItemSeqId" from-field="findItem.invoiceItemSeqId"/> + <set field="productId" from-field="findItem.productId"/> + <set field="itemMap.itemSeqIdList[]" from-field="invoiceItemSeqId"/> + <set field="itemMap.productList[]" from-field="productId"/> + </then> + </if> + </iterate> + <set field="countItemId" value="-1" type="Long"/> + <iterate list="itemAdjustments" entry="itemAdjustment"> + <calculate field="countItemId"> + <calcop operator="add" field="countItemId"> + <number value="1"/> + </calcop> + </calculate> + <if-not-empty field="itemAdjustment"> + <iterate list="itemAdjustment" entry="orderAdjustment"> + <set field="createInvoiceItemContext.invoiceId" from-field="invoice.invoiceId"/> + <set field="createInvoiceItemContext.invoiceItemTypeId" value="ITM_SALES_TAX"/> + <set field="createInvoiceItemContext.overrideGlAccountId" from-field="orderAdjustment.overrideGlAccountId"/> + <set field="createInvoiceItemContext.productId" from-field="itemMap.productList[countItemId]"/> + <set field="createInvoiceItemContext.taxAuthPartyId" from-field="orderAdjustment.taxAuthPartyId"/> + <set field="createInvoiceItemContext.taxAuthGeoId" from-field="orderAdjustment.taxAuthGeoId"/> + <set field="createInvoiceItemContext.amount" from-field="orderAdjustment.amount" type="BigDecimal"/> + <set field="createInvoiceItemContext.quantity" value="1"/> + <set field="createInvoiceItemContext.parentInvoiceItemSeqId" from-field="itemMap.itemSeqIdList[countItemId]"/> + <set field="createInvoiceItemContext.taxAuthorityRateSeqId" from-field="orderAdjustment.taxAuthorityRateSeqId"/> + <set field="createInvoiceItemContext.description" from-field="orderAdjustment.comments"/> + <!--call createInvoiceItem service for every ItemAdjustment--> + <call-service service-name="createInvoiceItem" in-map-name="createInvoiceItemContext"></call-service> + </iterate> + </if-not-empty> + </iterate> + <iterate list="orderAdjustments" entry="Adjustment"> + <if-not-empty field="Adjustment"> + <set field="InvoiceItemContext.invoiceId" from-field="invoice.invoiceId"/> + <set field="InvoiceItemContext.invoiceItemTypeId" value="ITM_SALES_TAX"/> + <set field="InvoiceItemContext.overrideGlAccountId" from-field="Adjustment.overrideGlAccountId"/> + <set field="InvoiceItemContext.taxAuthPartyId" from-field="Adjustment.taxAuthPartyId"/> + <set field="InvoiceItemContext.taxAuthGeoId" from-field="Adjustment.taxAuthGeoId"/> + <set field="InvoiceItemContext.amount" from-field="Adjustment.amount" type="BigDecimal"/> + <set field="InvoiceItemContext.quantity" value="1"/> + <set field="InvoiceItemContext.taxAuthorityRateSeqId" from-field="Adjustment.taxAuthorityRateSeqId"/> + <!-- call createInvoiceItem service for every orderAdjustment --> + <call-service service-name="createInvoiceItem" in-map-name="InvoiceItemContext"></call-service> + </if-not-empty> + </iterate> + </then> + <else> + <add-error> + <fail-message message="productId don't have value, cannot call calcTax service."/> + </add-error> + <log level="error" message="Cannot call calcTax service, when don't have productId"/> + </else> + </if> + </simple-method> </simple-methods> Modified: ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml?rev=804274&r1=804273&r2=804274&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml Fri Aug 14 15:58:17 2009 @@ -404,7 +404,8 @@ <add-error><fail-message message="${uiLabelMap.AccountingNoPaymentsfound}"/></add-error> <check-errors/> </if-empty> - <set field="paymentStatusCtx.paymentId" from-field="parameters.paymentId"/> + <set field="paymentId" from-field="parameters.paymentId"/> + <set field="paymentStatusCtx.paymentId" from-field="paymentId"/> <set field="paymentStatusCtx.statusId" value="PMNT_VOID"/> <call-service service-name="setPaymentStatus" in-map-name="paymentStatusCtx"/> <get-related relation-name="PaymentApplication" value-field="payment" list="paymentApplications"/> @@ -418,22 +419,15 @@ </if-compare> <set field="removePaymentApplicationCtx.paymentApplicationId" from-field="paymentApplication.paymentApplicationId"/> <call-service service-name="removePaymentApplication" in-map-name="removePaymentApplicationCtx"/> - <get-related relation-name="AcctgTrans" value-field="updateInvoiceCtx" list="acctgTransInvoiceList"/> - <iterate list="acctgTransInvoiceList" entry="acctgTransInvoice"> - <set field="copyAcctgTransCtx.fromAcctgTransId" from-field="acctgTransInvoice.acctgTransId"/> - <set field="copyAcctgTransCtx.revert" value="Y"/> - <call-service service-name="copyAcctgTransAndEntries" in-map-name="copyAcctgTransCtx"> - <result-to-field field="postAcctgTransMap.acctgTransId" result-name="acctgTransId"/> - </call-service> - <if-compare field="acctgTransInvoice.isPosted" operator="equals" value="Y"> - <call-service service-name="postAcctgTrans" in-map-name="postAcctgTransMap"/> - </if-compare> - <clear-field field="postAcctgTransMap"/> - </iterate> </iterate> - <get-related relation-name="AcctgTrans" value-field="payment" list="acctgTransPaymentList"/> - <clear-field field="copyAcctgTransCtx"/> + <entity-condition entity-name="AcctgTrans" list="acctgTransPaymentList"> + <condition-list combine="and"> + <condition-expr field-name="invoiceId" operator="equals" from-field="nullField"/> + <condition-expr field-name="paymentId" from-field="paymentId"/> + </condition-list> + </entity-condition> <iterate list="acctgTransPaymentList" entry="acctgTransPayment"> + <clear-field field="copyAcctgTransCtx"/> <set field="copyAcctgTransCtx.fromAcctgTransId" from-field="acctgTransPayment.acctgTransId"/> <set field="copyAcctgTransCtx.revert" value="Y"/> <call-service service-name="copyAcctgTransAndEntries" in-map-name="copyAcctgTransCtx"> Modified: ofbiz/branches/executioncontext20090812/applications/accounting/servicedef/services_invoice.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/servicedef/services_invoice.xml?rev=804274&r1=804273&r2=804274&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/accounting/servicedef/services_invoice.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/accounting/servicedef/services_invoice.xml Fri Aug 14 15:58:17 2009 @@ -302,6 +302,12 @@ <attribute name="organizationPartyId" type="String" mode="IN" optional="true"/> <attribute name="invoiceRunningTotal" type="String" mode="OUT" optional="false"/> </service> + + <service name="addtax" engine="simple" + location="component://accounting/script/org/ofbiz/accounting/invoice/InvoiceEvents.xml" invoke="addtax"> + <description>Call Tax Calculate Service</description> + <attribute name="invoiceId" type="String" mode="IN" optional="false"/> + </service> <service name="getInvoicesFilterByAssocType" engine="simple" location="component://accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml" invoke="getInvoicesFilterByAssocType" auth="true"> Modified: ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java?rev=804274&r1=804273&r2=804274&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java (original) +++ ofbiz/branches/executioncontext20090812/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java Fri Aug 14 15:58:17 2009 @@ -45,6 +45,8 @@ import org.ofbiz.entity.util.EntityUtil; import org.ofbiz.party.contact.ContactMechWorker; import org.ofbiz.service.DispatchContext; +import org.ofbiz.service.GenericServiceException; +import org.ofbiz.service.LocalDispatcher; import org.ofbiz.service.ServiceUtil; /** @@ -149,24 +151,39 @@ if (shippingAddress == null || (shippingAddress.get("countryGeoId") == null && shippingAddress.get("stateProvinceGeoId") == null && shippingAddress.get("postalCodeGeoId") == null)) { return ServiceUtil.returnError("The address(es) used for tax calculation did not have State/Province or Country or other tax jurisdiction values set, so we cannot determine the taxes to charge."); } + // without knowing the TaxAuthority parties, just find all TaxAuthories for the set of IDs... Set taxAuthoritySet = FastSet.newInstance(); GenericValue productStore = null; - try { - getTaxAuthorities(delegator, shippingAddress, taxAuthoritySet); - if (productStoreId != null) { - productStore = delegator.findByPrimaryKey("ProductStore", UtilMisc.toMap("productStoreId", productStoreId)); - } - } catch (GenericEntityException e) { - String errMsg = "Data error getting tax settings: " + e.toString(); - Debug.logError(e, errMsg, module); - return ServiceUtil.returnError(errMsg); + // Check value productStore *** New + if (productStoreId!=null){ + try { + getTaxAuthorities(delegator, shippingAddress, taxAuthoritySet); + if (productStoreId != null) { + productStore = delegator.findByPrimaryKey("ProductStore", UtilMisc.toMap("productStoreId", productStoreId)); + } + + } catch (GenericEntityException e) { + String errMsg = "Data error getting tax settings: " + e.toString(); + Debug.logError(e, errMsg, module); + return ServiceUtil.returnError(errMsg); + } + + if (productStore == null && payToPartyId == null) { + throw new IllegalArgumentException("Could not find payToPartyId [" + payToPartyId + "] or ProductStore [" + productStoreId + "] for tax calculation"); + } + } + else + { + try{ + getTaxAuthorities(delegator, shippingAddress, taxAuthoritySet); + }catch (GenericEntityException e){ + String errMsg = "Data error getting tax settings: " + e.toString(); + Debug.logError(e, errMsg, module); + return ServiceUtil.returnError(errMsg); + } } - - if (productStore == null && payToPartyId == null) { - throw new IllegalArgumentException("Could not find payToPartyId [" + payToPartyId + "] or ProductStore [" + productStoreId + "] for tax calculation"); - } - + // Setup the return lists. List orderAdjustments = FastList.newInstance(); List itemAdjustments = FastList.newInstance(); @@ -269,7 +286,7 @@ taxAuthCondOrList.add(taxAuthCond); } EntityCondition taxAuthoritiesCond = EntityCondition.makeCondition(taxAuthCondOrList, EntityOperator.OR); - + try { EntityCondition productCategoryCond = null; if (product != null) { @@ -301,14 +318,14 @@ mainExprs.add(EntityCondition.makeCondition(EntityCondition.makeCondition("minItemPrice", EntityOperator.EQUALS, null), EntityOperator.OR, EntityCondition.makeCondition("minItemPrice", EntityOperator.LESS_THAN_EQUAL_TO, itemPrice))); mainExprs.add(EntityCondition.makeCondition(EntityCondition.makeCondition("minPurchase", EntityOperator.EQUALS, null), EntityOperator.OR, EntityCondition.makeCondition("minPurchase", EntityOperator.LESS_THAN_EQUAL_TO, itemAmount))); EntityCondition mainCondition = EntityCondition.makeCondition(mainExprs, EntityOperator.AND); - + // create the orderby clause List orderList = UtilMisc.toList("minItemPrice", "minPurchase", "fromDate"); // finally ready... do the rate query List lookupList = delegator.findList("TaxAuthorityRateProduct", mainCondition, null, orderList, null, false); List filteredList = EntityUtil.filterByDate(lookupList, true); - + if (filteredList.size() == 0) { Debug.logWarning("In TaxAuthority Product Rate no records were found for condition:" + mainCondition.toString(), module); return adjustments; @@ -318,7 +335,6 @@ Iterator flIt = filteredList.iterator(); while (flIt.hasNext()) { GenericValue taxAuthorityRateProduct = (GenericValue) flIt.next(); - BigDecimal taxRate = taxAuthorityRateProduct.get("taxPercentage") != null ? taxAuthorityRateProduct.getBigDecimal("taxPercentage") : ZERO_BASE; BigDecimal taxable = ZERO_BASE; @@ -376,7 +392,6 @@ GenericValue partyRelationship = (GenericValue) partyRelationshipIter.next(); billToPartyIdSet.add(partyRelationship.get("partyIdFrom")); } - handlePartyTaxExempt(adjValue, billToPartyIdSet, taxAuthGeoId, taxAuthPartyId, taxAmount, nowTimestamp, delegator); } else { Debug.logInfo("NOTE: A tax calculation was done without a billToPartyId or taxAuthGeoId, so no tax exemptions or tax IDs considered; billToPartyId=[" + billToPartyId + "] taxAuthGeoId=[" + taxAuthGeoId + "]", module); 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=804274&r1=804273&r2=804274&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 Fri Aug 14 15:58:17 2009 @@ -2343,6 +2343,14 @@ <security auth="true" https="true"/> <response name="success" type="view" value="MonthlyTrialBalancePdf"/> </request-map> + + <!--Add Tax Settings --> + <request-map uri="addtax"> + <security auth="true" https="true"/> + <event type="service" invoke="addtax"/> + <response name="success" type="view" value="invoiceOverview"/> + <response name="error" type="view" value="invoiceOverview"/> + </request-map> <request-map uri="FindGlAccountCategory"> <security https="true" auth="true"/> Modified: ofbiz/branches/executioncontext20090812/applications/accounting/webapp/ap/WEB-INF/actions/invoices/CommissionReport.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/webapp/ap/WEB-INF/actions/invoices/CommissionReport.groovy?rev=804274&r1=804273&r2=804274&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/accounting/webapp/ap/WEB-INF/actions/invoices/CommissionReport.groovy (original) +++ ofbiz/branches/executioncontext20090812/applications/accounting/webapp/ap/WEB-INF/actions/invoices/CommissionReport.groovy Fri Aug 14 15:58:17 2009 @@ -27,30 +27,30 @@ thruDate = parameters.thruDate; partyId = parameters.partyId; productId = parameters.productId; - invoiceItemAndAssocCond = []; + invoiceItemAndAssocProductCond = []; if (productId) { - invoiceItemAndAssocCond.add(EntityCondition.makeCondition("productId", EntityOperator.EQUALS, productId)); + invoiceItemAndAssocProductCond.add(EntityCondition.makeCondition("productId", EntityOperator.EQUALS, productId)); } if (partyId) { - invoiceItemAndAssocCond.add(EntityCondition.makeCondition("partyIdFrom", EntityOperator.EQUALS, partyId)); + invoiceItemAndAssocProductCond.add(EntityCondition.makeCondition("partyIdFrom", EntityOperator.EQUALS, partyId)); } if (fromDate) { - invoiceItemAndAssocCond.add(EntityCondition.makeCondition("fromDate", EntityOperator.GREATER_THAN_EQUAL_TO, Timestamp.valueOf(fromDate))); + invoiceItemAndAssocProductCond.add(EntityCondition.makeCondition("fromDate", EntityOperator.GREATER_THAN_EQUAL_TO, Timestamp.valueOf(fromDate))); } if (thruDate) { - invoiceItemAndAssocCond.add(EntityCondition.makeCondition("thruDate", EntityOperator.LESS_THAN_EQUAL_TO, Timestamp.valueOf(thruDate))); + invoiceItemAndAssocProductCond.add(EntityCondition.makeCondition("thruDate", EntityOperator.LESS_THAN_EQUAL_TO, Timestamp.valueOf(thruDate))); } - invoiceItemAndAssocList = []; - invoiceItemAndAssocList = delegator.findList("InvoiceItemAndAssocProduct", EntityCondition.makeCondition(invoiceItemAndAssocCond, EntityOperator.AND), null, null, null, false); + invoiceItemAndAssocProductList = []; + invoiceItemAndAssocProductList = delegator.findList("InvoiceItemAndAssocProduct", EntityCondition.makeCondition(invoiceItemAndAssocProductCond, EntityOperator.AND), null, null, null, false); - //filtering invoiceItemAndAssocList for each productId with updating quantity, commission amount and number of order which generated sales invoices. + //filtering invoiceItemAndAssocProductList for each productId with updating quantity, commission amount and number of order which generated sales invoices. totalQuantity = BigDecimal.ZERO; totalNumberOfOrders = BigDecimal.ZERO; totalCommissionAmount = BigDecimal.ZERO; totalNetSales = BigDecimal.ZERO; commissionReportList = []; - if (invoiceItemAndAssocList) { - productIds = EntityUtil.getFieldListFromEntityList(invoiceItemAndAssocList, "productId", true); + if (invoiceItemAndAssocProductList) { + productIds = EntityUtil.getFieldListFromEntityList(invoiceItemAndAssocProductList, "productId", true); productIds.each { productId -> quantity = BigDecimal.ZERO; commissionAmount = BigDecimal.ZERO; @@ -61,23 +61,23 @@ commissionReportMap = [:]; salesAgentAndTermAmtMap = [:]; salesInvoiceIds = []; - invoiceItemAndAssocList.each { invoiceItemAndAssoc -> - if (productId.equals(invoiceItemAndAssoc.productId)) { + invoiceItemAndAssocProductList.each { invoiceItemAndAssocProduct -> + if (productId.equals(invoiceItemAndAssocProduct.productId)) { partyIdTermAmountMap = [:]; partyIdTermAmountKey = null; - assocProductId = invoiceItemAndAssoc.productId; - productName = invoiceItemAndAssoc.productName; - quantity = quantity.add(invoiceItemAndAssoc.quantity); - commissionAmount = commissionAmount.add(invoiceItemAndAssoc.termAmount.multiply(invoiceItemAndAssoc.quantity)); - termAmount = termAmount.add(invoiceItemAndAssoc.termAmount); - partyIdTermAmountMap.partyId = invoiceItemAndAssoc.partyIdFrom; - partyIdTermAmountMap.termAmount = invoiceItemAndAssoc.termAmount; - partyIdTermAmountKey = invoiceItemAndAssoc.partyIdFrom + invoiceItemAndAssoc.termAmount; + assocProductId = invoiceItemAndAssocProduct.productId; + productName = invoiceItemAndAssocProduct.productName; + quantity = quantity.add(invoiceItemAndAssocProduct.quantity); + commissionAmount = commissionAmount.add(invoiceItemAndAssocProduct.termAmount.multiply(invoiceItemAndAssocProduct.quantity)); + termAmount = termAmount.add(invoiceItemAndAssocProduct.termAmount); + partyIdTermAmountMap.partyId = invoiceItemAndAssocProduct.partyIdFrom; + partyIdTermAmountMap.termAmount = invoiceItemAndAssocProduct.termAmount; + partyIdTermAmountKey = invoiceItemAndAssocProduct.partyIdFrom + invoiceItemAndAssocProduct.termAmount; if (!salesAgentAndTermAmtMap.containsKey(partyIdTermAmountKey)) { salesAgentAndTermAmtMap.put(partyIdTermAmountKey, partyIdTermAmountMap); } - salesInvoiceIds.add(invoiceItemAndAssoc.invoiceIdFrom); - invoiceItemProductAmount = invoiceItemAndAssoc.amount; + salesInvoiceIds.add(invoiceItemAndAssocProduct.invoiceIdFrom); + invoiceItemProductAmount = invoiceItemAndAssocProduct.amount; } } commissionReportMap.productId = assocProductId; Modified: ofbiz/branches/executioncontext20090812/applications/accounting/webapp/ap/invoices/CommissionReport.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/webapp/ap/invoices/CommissionReport.ftl?rev=804274&r1=804273&r2=804274&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/accounting/webapp/ap/invoices/CommissionReport.ftl (original) +++ ofbiz/branches/executioncontext20090812/applications/accounting/webapp/ap/invoices/CommissionReport.ftl Fri Aug 14 15:58:17 2009 @@ -18,61 +18,61 @@ --> <#if commissionReportList?has_content> - <div> - <a href="<@ofbizUrl>CommissionReport.pdf?isSearch=Y&productId=${parameters.productId!}&partyId=${parameters.partyId!}&fromDate=${parameters.fromDate!}&thruDate=${parameters.thruDate!}</@ofbizUrl>" class="buttontext">${uiLabelMap.AccountingInvoicePDF}</a> - </div> - <table class="basic-table hover-bar" cellspacing="0"> - <#-- Header Begins --> - <tr class="header-row-2"> - <th>${uiLabelMap.AccountingLicensedProduct}</th> - <th>${uiLabelMap.AccountingQuantity}</th> - <th>${uiLabelMap.AccountingNumberOfOrders} / ${uiLabelMap.AccountingSalesInvoices}</th> - <th>${uiLabelMap.AccountingCommissionAmount}</th> - <th>${uiLabelMap.AccountingNetSale}</th> - <th>${uiLabelMap.AccountingSalesAgents} / ${uiLabelMap.AccountingTermAmount}</th> + <div> + <a href="<@ofbizUrl>CommissionReport.pdf?isSearch=Y&productId=${parameters.productId!}&partyId=${parameters.partyId!}&fromDate=${parameters.fromDate!}&thruDate=${parameters.thruDate!}</@ofbizUrl>" class="buttontext">${uiLabelMap.AccountingInvoicePDF}</a> + </div> + <table class="basic-table hover-bar" cellspacing="0"> + <#-- Header Begins --> + <tr class="header-row-2"> + <th>${uiLabelMap.AccountingLicensedProduct}</th> + <th>${uiLabelMap.AccountingQuantity}</th> + <th>${uiLabelMap.AccountingNumberOfOrders} / ${uiLabelMap.AccountingSalesInvoices}</th> + <th>${uiLabelMap.AccountingCommissionAmount}</th> + <th>${uiLabelMap.AccountingNetSale}</th> + <th>${uiLabelMap.AccountingSalesAgents} / ${uiLabelMap.AccountingTermAmount}</th> + </tr> + <#-- Header Ends--> + <#assign alt_row = false> + <#list commissionReportList as commissionReport> + <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> + <td><a href="/catalog/control/EditProduct?productId=${commissionReport.productId!}">${commissionReport.productName!}</a></td> + <td>${commissionReport.quantity!}</td> + <td> + ${commissionReport.numberOfOrders!} / + <#if commissionReport.salesInvoiceIds?has_content> + <#list commissionReport.salesInvoiceIds as salesInvoiceId> + [<a href="/ap/control/invoiceOverview?invoiceId=${salesInvoiceId!}">${salesInvoiceId!}</a>] + </#list> + </#if> + </td> + <td><@ofbizCurrency amount = commissionReport.commissionAmount!/></td> + <td><@ofbizCurrency amount = commissionReport.netSale!/></td> + <td> + <#if commissionReport.salesAgentAndTermAmtMap?has_content> + <#list commissionReport.salesAgentAndTermAmtMap.values() as partyIdAndTermAmountMap> + <#assign partyName = (delegator.findOne("PartyNameView", {"partyId" : partyIdAndTermAmountMap.partyId}, true))!> + <h6>[${(partyName.firstName)!} ${(partyName.lastName)!} ${(partyName.groupName)!}(<a href="/partymgr/control/viewprofile?partyId=${partyIdAndTermAmountMap.partyId!}">${partyIdAndTermAmountMap.partyId!}</a>)] + / <@ofbizCurrency amount = (partyIdAndTermAmountMap.termAmount)!/> + </h6> + </#list> + </#if> + </td> </tr> - <#-- Header Ends--> - <#assign alt_row = false> - <#list commissionReportList as commissionReport> - <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> - <td><a href="/catalog/control/EditProduct?productId=${commissionReport.productId!}">${commissionReport.productName!}</a></td> - <td>${commissionReport.quantity!}</td> - <td> - ${commissionReport.numberOfOrders!} / - <#if commissionReport.salesInvoiceIds?has_content> - <#list commissionReport.salesInvoiceIds as salesInvoiceId> - [<a href="/ap/control/invoiceOverview?invoiceId=${salesInvoiceId!}">${salesInvoiceId!}</a>] - </#list> - </#if> - </td> - <td><@ofbizCurrency amount = commissionReport.commissionAmount!/></td> - <td><@ofbizCurrency amount = commissionReport.netSale!/></td> - <td> - <#if commissionReport.salesAgentAndTermAmtMap?has_content> - <#list commissionReport.salesAgentAndTermAmtMap.values() as partyIdAndTermAmountMap> - <#assign partyName = (delegator.findOne("PartyNameView", {"partyId" : partyIdAndTermAmountMap.partyId}, true))!> - <h6>[${(partyName.firstName)!} ${(partyName.lastName)!} ${(partyName.groupName)!}(<a href="/partymgr/control/viewprofile?partyId=${partyIdAndTermAmountMap.partyId!}">${partyIdAndTermAmountMap.partyId!}</a>)] - / <@ofbizCurrency amount = (partyIdAndTermAmountMap.termAmount)!/> - </h6> - </#list> - </#if> - </td> - </tr> - <#-- toggle the row color --> - <#assign alt_row = !alt_row> - </#list> - </table> - <div class="screenlet"> - <ul> - <li class="label"></li> - <li class="label"><h3>${uiLabelMap.CommonSummary} :</h3></li> - <li class="label"></li> - <li class="label">${uiLabelMap.ManufacturingTotalQuantity} : ${totalQuantity!}</li> - <li class="label">${uiLabelMap.AccountingTotalCommissionAmount} : <@ofbizCurrency amount = totalCommissionAmount!/></li> - <li class="label">${uiLabelMap.AccountingTotalNetSales} : <@ofbizCurrency amount = totalNetSales!/></li> - <li class="label">${uiLabelMap.AccountingTotalNumberOfOrders} : ${totalNumberOfOrders!}</li> - </ul> - </div> + <#-- toggle the row color --> + <#assign alt_row = !alt_row> + </#list> + </table> + <div class="screenlet"> + <ul> + <li class="label"></li> + <li class="label"><h3>${uiLabelMap.CommonSummary} :</h3></li> + <li class="label"></li> + <li class="label">${uiLabelMap.ManufacturingTotalQuantity} : ${totalQuantity!}</li> + <li class="label">${uiLabelMap.AccountingTotalCommissionAmount} : <@ofbizCurrency amount = totalCommissionAmount!/></li> + <li class="label">${uiLabelMap.AccountingTotalNetSales} : <@ofbizCurrency amount = totalNetSales!/></li> + <li class="label">${uiLabelMap.AccountingTotalNumberOfOrders} : ${totalNumberOfOrders!}</li> + </ul> + </div> <#else> <td colspan='4'><h3>${uiLabelMap.AccountingNoRecordFound}</h3></td> </#if> Modified: ofbiz/branches/executioncontext20090812/applications/accounting/widget/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/widget/Menus.xml?rev=804274&r1=804273&r2=804274&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/accounting/widget/Menus.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/accounting/widget/Menus.xml Fri Aug 14 15:58:17 2009 @@ -145,6 +145,7 @@ </link> </menu-item> </menu> + <menu name="InvoiceSubTabBar" menu-container-style="button-bar button-style-2" default-selected-style="selected"> <menu-item name="createNew" title="${uiLabelMap.CommonCreateNew}" > <link target="newInvoice"/> @@ -320,6 +321,17 @@ <parameter param-name="invoiceTypeId" from-field="invoice.invoiceTypeId"/> </link> </menu-item> + <menu-item name="addtax" title="Add Tax"> + <condition> + <and> + <not><if-empty field="invoice.invoiceId"/></not> + <if-compare field="invoice.statusId" operator="equals" value="INVOICE_IN_PROCESS"/> + </and> + </condition> + <link target="addtax"> + <parameter param-name="invoiceId" from-field="invoice.invoiceId"/> + </link> + </menu-item> </menu> <menu name="PaymentTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> Propchange: ofbiz/branches/executioncontext20090812/applications/accounting/widget/PaymentGatewayConfigForms.xml ('svn:mergeinfo' removed) Propchange: ofbiz/branches/executioncontext20090812/applications/accounting/widget/PaymentGatewayConfigScreens.xml ('svn:mergeinfo' removed) Modified: ofbiz/branches/executioncontext20090812/applications/order/config/OrderUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/order/config/OrderUiLabels.xml?rev=804274&r1=804273&r2=804274&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/order/config/OrderUiLabels.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/order/config/OrderUiLabels.xml Fri Aug 14 15:58:17 2009 @@ -1600,7 +1600,7 @@ <property key="OrderBillUpTo"> <value xml:lang="cs">Faktura na</value> <value xml:lang="de">Abbuchung bis</value> - <value xml:lang="en">Bill To</value> + <value xml:lang="en">Bill Up To</value> <value xml:lang="es">Facturar hasta</value> <value xml:lang="fr">Facturé à </value> <value xml:lang="hi_IN">यहाठतठà¤à¤¾ मà¥à¤²à¥à¤¯</value> Modified: ofbiz/branches/executioncontext20090812/applications/order/src/org/ofbiz/order/order/OrderServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=804274&r1=804273&r2=804274&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/order/src/org/ofbiz/order/order/OrderServices.java (original) +++ ofbiz/branches/executioncontext20090812/applications/order/src/org/ofbiz/order/order/OrderServices.java Fri Aug 14 15:58:17 2009 @@ -4198,7 +4198,7 @@ // set the payToPartyId String payToPartyId = productStore.getString("payToPartyId"); if (payToPartyId == null) { - return ServiceUtil.returnError("Failed to create Payment: Cannot get the ProductStore for the order header"); + return ServiceUtil.returnError("Failed to create Payment: payToPartyId not set in ProductStore"); } // create the payment Modified: ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl?rev=804274&r1=804273&r2=804274&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original) +++ ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Fri Aug 14 15:58:17 2009 @@ -554,16 +554,19 @@ <div> ${uiLabelMap.CommonNbr}<a href="/facility/control/ViewShipment?shipmentId=${shipment.shipmentId}&externalLoginKey=${externalLoginKey}" class="buttontext">${shipment.shipmentId}</a> <a href="/facility/control/PackingSlip.pdf?shipmentId=${shipment.shipmentId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.ProductPackingSlip}</a> - <#if "SALES_ORDER" == orderHeader.orderTypeId> - <#assign shipmentRouteSegment = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(delegator.findByAnd("ShipmentRouteSegment", {"shipmentId":shipment.shipmentId}))> - <#if "UPS" == (shipmentRouteSegment.carrierPartyId)?if_exists && "ORDER_COMPLETED" == orderHeader.statusId> - <a href="javascript:document.upsEmailReturnLabel${shipment_index}.submit();" class="buttontext">${uiLabelMap.ProductEmailReturnShippingLabelUPS}</a> + <#if "SALES_ORDER" == orderHeader.orderTypeId && "ORDER_COMPLETED" == orderHeader.statusId> + <#assign shipmentRouteSegments = delegator.findByAnd("ShipmentRouteSegment", {"shipmentId" : shipment.shipmentId})> + <#if shipmentRouteSegments?has_content> + <#assign shipmentRouteSegment = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(shipmentRouteSegments)> + <#if "UPS" == (shipmentRouteSegment.carrierPartyId)?if_exists> + <a href="javascript:document.upsEmailReturnLabel${shipment_index}.submit();" class="buttontext">${uiLabelMap.ProductEmailReturnShippingLabelUPS}</a> + </#if> + <form name="upsEmailReturnLabel${shipment_index}" method="post" action="<@ofbizUrl>upsEmailReturnLabelOrder</@ofbizUrl>"> + <input type="hidden" name="orderId" value="${orderId}"/> + <input type="hidden" name="shipmentId" value="${shipment.shipmentId}"/> + <input type="hidden" name="shipmentRouteSegmentId" value=${shipmentRouteSegment.shipmentRouteSegmentId}> + </form> </#if> - <form name="upsEmailReturnLabel${shipment_index}" method="post" action="<@ofbizUrl>upsEmailReturnLabelOrder</@ofbizUrl>"> - <input type="hidden" name="orderId" value="${orderId}"/> - <input type="hidden" name="shipmentId" value="${shipment.shipmentId}"/> - <input type="hidden" name="shipmentRouteSegmentId" value=${shipmentRouteSegment.shipmentRouteSegmentId}> - </form> </#if> </div> </#list> Propchange: ofbiz/branches/executioncontext20090812/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy ('svn:mergeinfo' removed) Modified: ofbiz/branches/executioncontext20090812/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl?rev=804274&r1=804273&r2=804274&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl (original) +++ ofbiz/branches/executioncontext20090812/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl Fri Aug 14 15:58:17 2009 @@ -17,6 +17,23 @@ under the License. --> +<#macro maskSensitiveNumber cardNumber> + <#assign cardNumberDisplay = ""> + <#if cardNumber?has_content> + <#assign size = cardNumber?length - 4> + <#if (size > 0)> + <#list 0 .. size-1 as foo> + <#assign cardNumberDisplay = cardNumberDisplay + "*"> + </#list> + <#assign cardNumberDisplay = cardNumberDisplay + cardNumber[size .. size + 3]> + <#else> + <#-- but if the card number has less than four digits (ie, it was entered incorrectly), display it in full --> + <#assign cardNumberDisplay = cardNumber> + </#if> + </#if> + ${cardNumberDisplay?if_exists} +</#macro> + <div id="partyPaymentMethod" class="screenlet"> <div class="screenlet-title-bar"> <ul> @@ -50,7 +67,7 @@ - <#if security.hasEntityPermission("PAY_INFO", "_VIEW", session)> ${creditCard.cardType} - ${creditCard.cardNumber} + <@maskSensitiveNumber cardNumber=creditCard.cardNumber?if_exists/> ${creditCard.expireDate} <#else> ${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)} @@ -77,22 +94,8 @@ <#if security.hasEntityPermission("PAY_INFO", "_VIEW", session)> ${giftCard.cardNumber?default("N/A")} [${giftCard.pinNumber?default("N/A")}] <#else> - <#if giftCard?has_content && giftCard.cardNumber?has_content> - <#assign giftCardNumber = ""> - <#assign pcardNumber = giftCard.cardNumber> - <#if pcardNumber?has_content> - <#assign psize = pcardNumber?length - 4> - <#if 0 < psize> - <#list 0 .. psize-1 as foo> - <#assign giftCardNumber = giftCardNumber + "*"> - </#list> - <#assign giftCardNumber = giftCardNumber + pcardNumber[psize .. psize + 3]> - <#else> - <#assign giftCardNumber = pcardNumber> - </#if> - </#if> - </#if> - ${giftCardNumber?default("N/A")} + <@maskSensitiveNumber cardNumber=giftCard.cardNumber?if_exists/> + <#if !cardNumberDisplay?has_content>N/A</#if> </#if> <#if paymentMethod.description?has_content>(${paymentMethod.description})</#if> <#if paymentMethod.glAccountId?has_content>(for GL Account ${paymentMethod.glAccountId})</#if> Modified: ofbiz/branches/executioncontext20090812/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/build.xml?rev=804274&r1=804273&r2=804274&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/build.xml (original) +++ ofbiz/branches/executioncontext20090812/build.xml Fri Aug 14 15:58:17 2009 @@ -85,6 +85,12 @@ </subant> </target> + <target name="download-selenium" description="Download the selenium files"> + <subant target="install-seleniumxml"> + <filelist dir="." files="framework/testtools/build.xml"/> + </subant> + </target> + <target name="clean-cache" description="Clean the UtilCache file if errors found with old objects in the cache (Java runtime error something like 'local class incompatible')"> <property file="framework/base/config/cache.properties"/> Modified: ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/config/DelegatorInfo.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/config/DelegatorInfo.java?rev=804274&r1=804273&r2=804274&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/config/DelegatorInfo.java (original) +++ ofbiz/branches/executioncontext20090812/framework/entity/src/org/ofbiz/entity/config/DelegatorInfo.java Fri Aug 14 15:58:17 2009 @@ -59,7 +59,7 @@ if (UtilValidate.isEmpty(this.distributedCacheClearClassName)) this.distributedCacheClearClassName = "org.ofbiz.entityext.cache.EntityCacheServices"; this.distributedCacheClearUserLoginId = element.getAttribute("distributed-cache-clear-user-login-id"); - if (UtilValidate.isEmpty(this.distributedCacheClearUserLoginId)) this.distributedCacheClearUserLoginId = "admin"; + if (UtilValidate.isEmpty(this.distributedCacheClearUserLoginId)) this.distributedCacheClearUserLoginId = "system"; this.sequencedIdPrefix = element.getAttribute("sequenced-id-prefix"); Modified: ofbiz/branches/executioncontext20090812/framework/resources/templates/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/resources/templates/build.xml?rev=804274&r1=804273&r2=804274&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/framework/resources/templates/build.xml (original) +++ ofbiz/branches/executioncontext20090812/framework/resources/templates/build.xml Fri Aug 14 15:58:17 2009 @@ -9,6 +9,7 @@ <property environment="env"/> <property name="desc" value="@component-resource-name@ Component"/> + <property name="name" value="ofbiz-@component-name@"/> <property name="component-name" value="ofbiz-@component-name@"/> <property name="ofbiz.home.dir" value="../.."/> <property name="src.dir" value="src"/> Modified: ofbiz/branches/executioncontext20090812/framework/resources/templates/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/resources/templates/ofbiz-component.xml?rev=804274&r1=804273&r2=804274&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/framework/resources/templates/ofbiz-component.xml (original) +++ ofbiz/branches/executioncontext20090812/framework/resources/templates/ofbiz-component.xml Fri Aug 14 15:58:17 2009 @@ -11,6 +11,7 @@ <!-- load single or multiple external libraries --> <classpath type="jar" location="build/lib/*"/> + <classpath type="jar" location="lib/*"/> <!-- entity resources: model(s), eca(s), group, and data definitions --> <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/> Modified: ofbiz/branches/executioncontext20090812/framework/testtools/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/testtools/build.xml?rev=804274&r1=804273&r2=804274&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/framework/testtools/build.xml (original) +++ ofbiz/branches/executioncontext20090812/framework/testtools/build.xml Fri Aug 14 15:58:17 2009 @@ -30,17 +30,24 @@ <property name="ofbiz.home.dir" value="../.."/> <path id="local.class.path"> - <!-- <fileset dir="${lib.dir}" includes="*.jar"/> --> + <fileset dir="${lib.dir}" includes="*.jar"/> <fileset dir="../base/lib" includes="*.jar"/> + <fileset dir="../base/lib/scripting" includes="*.jar"/> <fileset dir="../base/lib/commons" includes="*.jar"/> - <fileset dir="../base/build/lib" includes="*.jar"/> + <fileset dir="../base/build/lib" includes="*.jar"/> <fileset dir="../entity/lib" includes="*.jar"/> <fileset dir="../entity/build/lib" includes="*.jar"/> <fileset dir="../security/build/lib" includes="*.jar"/> <fileset dir="../service/lib" includes="*.jar"/> <fileset dir="../service/build/lib" includes="*.jar"/> <fileset dir="../minilang/build/lib" includes="*.jar"/> + <fileset dir="../webapp/lib" includes="*.jar"/> </path> + + <target name="init"> + <property name="lib.dir" value="lib"/> + <property name="selenium.lib.dir" value="${lib.dir}"/> + </target> <!-- ================================================================== --> <!-- Compilation of the source files --> @@ -50,6 +57,13 @@ <javac15/> </target> + + <target name="install-seleniumxml" depends="init" description="Download the selenium files"> + <!--mkdir dir="${selenium.lib.dir}"/--> + <get src="http://downloads.sourceforge.net/seleniumxml/selenium-server-1.0-SNAPSHOT-20081126.jar?use_mirror=" + dest="${selenium.lib.dir}/selenium-server.jar" usetimestamp="true" /> + </target> + <!-- ================================================================== --> <!-- Build JavaDoc --> <!-- ================================================================== --> Modified: ofbiz/branches/executioncontext20090812/framework/testtools/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/testtools/ofbiz-component.xml?rev=804274&r1=804273&r2=804274&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/framework/testtools/ofbiz-component.xml (original) +++ ofbiz/branches/executioncontext20090812/framework/testtools/ofbiz-component.xml Fri Aug 14 15:58:17 2009 @@ -23,11 +23,13 @@ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd"> <!-- define resource loaders; most common is to use the component resource loader --> <resource-loader name="main" type="component"/> + <classpath type="dir" location="config"/> <!-- place the config directory on the classpath to access configuration files --> <classpath type="dir" location="dtd"/> <!-- load single or multiple external libraries --> + <classpath type="jar" location="lib/*"/> <classpath type="jar" location="build/lib/*"/> <!-- service resources: model(s), eca(s) and group definitions --> Propchange: ofbiz/branches/executioncontext20090812/framework/webtools/webapp/webtools/WEB-INF/actions/datafile/viewdatafile.groovy ('svn:mergeinfo' removed) Propchange: ofbiz/branches/executioncontext20090812/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java ('svn:mergeinfo' removed) Propchange: ofbiz/branches/executioncontext20090812/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/EditMaint.groovy ('svn:mergeinfo' removed) Propchange: ofbiz/branches/executioncontext20090812/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/PrintFixedAssetMaint.groovy ('svn:mergeinfo' removed) Propchange: ofbiz/branches/executioncontext20090812/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/workeffort/EditWorkEfforts.groovy ('svn:mergeinfo' removed) Modified: ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/data/DemoTaxAuthority.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/data/DemoTaxAuthority.xml?rev=804274&r1=804273&r2=804274&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/data/DemoTaxAuthority.xml (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/data/DemoTaxAuthority.xml Fri Aug 14 15:58:17 2009 @@ -19,111 +19,26 @@ --> <entity-engine-xml> - <Party partyId="USA_IRS" partyTypeId="PARTY_GROUP"/> - <PartyGroup partyId="USA_IRS" groupName="United States of America - Internal Revenue Service"/> - <PartyRole partyId="USA_IRS" roleTypeId="TAX_AUTHORITY"/> - - <Party partyId="CA_BOE" partyTypeId="PARTY_GROUP"/> - <PartyGroup partyId="CA_BOE" groupName="State of Calilfornia Board of Equalization"/> - <ContactMech contactMechId="CA_BOE_0" contactMechTypeId="POSTAL_ADDRESS"/> - <PostalAddress contactMechId="CA_BOE_0" toName="Board of Equalization" address1="P O BOX 942879" city="Sacramento" stateProvinceGeoId="CA" postalCode="94279" countryGeoId="USA"/> - <PartyContactMech partyId="CA_BOE" contactMechId="CA_BOE_0" fromDate="2000-01-01 00:00:00.000" allowSolicitation="N"/> - <PartyContactMechPurpose partyId="CA_BOE" contactMechId="CA_BOE_0" contactMechPurposeTypeId="PAYMENT_LOCATION" fromDate="2000-01-01 00:00:00.000"/> - <PartyContactMechPurpose partyId="CA_BOE" contactMechId="CA_BOE_0" contactMechPurposeTypeId="BILLING_LOCATION" fromDate="2000-01-01 00:00:00.000"/> - <PartyRole partyId="CA_BOE" roleTypeId="TAX_AUTHORITY"/> - - <Party partyId="NY_DTF" partyTypeId="PARTY_GROUP"/> - <PartyGroup partyId="NY_DTF" groupName="New York Department of Taxation and Finance"/> - <ContactMech contactMechId="NY_DTF_0" contactMechTypeId="POSTAL_ADDRESS"/> - <PostalAddress contactMechId="NY_DTF_0" toName="NYS Sales Tax Processing" address1="JAF Building" address2="PO BOX 1205" city="New York" stateProvinceGeoId="NY" postalCode="11016" countryGeoId="USA"/> - <PartyContactMech partyId="NY_DTF" contactMechId="NY_DTF_0" fromDate="2000-01-01 00:00:00.000" allowSolicitation="N"/> - <PartyContactMechPurpose partyId="NY_DTF" contactMechId="NY_DTF_0" contactMechPurposeTypeId="PAYMENT_LOCATION" fromDate="2000-01-01 00:00:00.000"/> - <PartyContactMechPurpose partyId="NY_DTF" contactMechId="NY_DTF_0" contactMechPurposeTypeId="BILLING_LOCATION" fromDate="2000-01-01 00:00:00.000"/> - <PartyRole partyId="NY_DTF" roleTypeId="TAX_AUTHORITY"/> - - <Party partyId="TX_TAXMAN" partyTypeId="PARTY_GROUP"/> - <PartyGroup partyId="TX_TAXMAN" groupName="Texas Sales Tax Authority"/> - <PartyRole partyId="TX_TAXMAN" roleTypeId="TAX_AUTHORITY"/> - - <Party partyId="UT_TAXMAN" partyTypeId="PARTY_GROUP"/> - <PartyGroup partyId="UT_TAXMAN" groupName="Utah Sales Tax Authority"/> - <PartyRole partyId="UT_TAXMAN" roleTypeId="TAX_AUTHORITY"/> - <Party partyId="UT_UTAH_TAXMAN" partyTypeId="PARTY_GROUP"/> - <PartyGroup partyId="UT_UTAH_TAXMAN" groupName="Utah County, Utah Sales Tax Authority"/> - <PartyRole partyId="UT_UTAH_TAXMAN" roleTypeId="TAX_AUTHORITY"/> - - <Party partyId="CAN_TAXMAN" partyTypeId="PARTY_GROUP"/> - <PartyGroup partyId="CAN_TAXMAN" groupName="Canada Tax Authority"/> - <PartyRole partyId="CAN_TAXMAN" roleTypeId="TAX_AUTHORITY"/> - <Party partyId="ON_TAXMAN" partyTypeId="PARTY_GROUP"/> - <PartyGroup partyId="ON_TAXMAN" groupName="Ontario Sales Tax (VAT) Authority"/> - <PartyRole partyId="ON_TAXMAN" roleTypeId="TAX_AUTHORITY"/> - - <!-- _NA_ TaxAuthority defs --> - <TaxAuthority taxAuthGeoId="_NA_" taxAuthPartyId="_NA_" includeTaxInPrice="N"/> - <TaxAuthorityGlAccount taxAuthGeoId="_NA_" taxAuthPartyId="_NA_" organizationPartyId="Company" glAccountId="224000"/> - <TaxAuthorityCategory taxAuthGeoId="_NA_" taxAuthPartyId="_NA_" productCategoryId="20111"/> <!-- Micro Widgets, a category to be used to test categorized rates --> - <!-- taxAuthorityRateSeqId left blank to be auto-sequenced during the EE XML import --> - <TaxAuthorityRateProduct taxAuthorityRateSeqId="9000" taxAuthGeoId="_NA_" taxAuthPartyId="_NA_" taxAuthorityRateTypeId="SALES_TAX" productStoreId="9000" + <TaxAuthorityRateProduct taxAuthorityRateSeqId="9000" taxAuthGeoId="_NA_" taxAuthPartyId="_NA_" taxAuthorityRateTypeId="SALES_TAX" productStoreId="" productCategoryId="" titleTransferEnumId="" minItemPrice="25.00" minPurchase="0.00" taxShipping="N" taxPercentage="1" taxPromotions="N" fromDate="2001-05-13 00:00:00.001" thruDate="" description="1% OFB _NA_ Tax"/> - - <!-- USA TaxAuthority defs --> - <TaxAuthority taxAuthGeoId="USA" taxAuthPartyId="USA_IRS" taxIdFormatPattern="\d{2}\-\d{7}|\d{3}\-\d{2}\-\d{4}" includeTaxInPrice="N"/> - <TaxAuthorityGlAccount taxAuthGeoId="USA" taxAuthPartyId="USA_IRS" organizationPartyId="Company" glAccountId="224106"/> - - <TaxAuthority taxAuthGeoId="CA" taxAuthPartyId="CA_BOE" includeTaxInPrice="N"/> - <TaxAuthorityGlAccount taxAuthGeoId="CA" taxAuthPartyId="CA_BOE" organizationPartyId="Company" glAccountId="224106"/> - <TaxAuthorityAssoc taxAuthGeoId="USA" taxAuthPartyId="USA_IRS" toTaxAuthGeoId="CA" toTaxAuthPartyId="CA_BOE" taxAuthorityAssocTypeId="EXEMPT_INHER" fromDate="2001-05-13 00:00:00.001" thruDate=""/> - <TaxAuthorityRateProduct taxAuthorityRateSeqId="9001" taxAuthGeoId="CA" taxAuthPartyId="CA_BOE" taxAuthorityRateTypeId="SALES_TAX" productStoreId="9000" + + <TaxAuthorityRateProduct taxAuthorityRateSeqId="9001" taxAuthGeoId="CA" taxAuthPartyId="CA_BOE" taxAuthorityRateTypeId="SALES_TAX" productStoreId="" productCategoryId="" titleTransferEnumId="" minItemPrice="0.00" minPurchase="0.00" taxShipping="N" taxPercentage="6.25" taxPromotions="N" fromDate="2001-05-13 00:00:00.001" thruDate="" description="California State Sales Tax"/> - <TaxAuthority taxAuthGeoId="NY" taxAuthPartyId="NY_DTF" includeTaxInPrice="N"/> - <TaxAuthorityGlAccount taxAuthGeoId="NY" taxAuthPartyId="NY_DTF" organizationPartyId="Company" glAccountId="224140"/> - <TaxAuthorityAssoc taxAuthGeoId="USA" taxAuthPartyId="USA_IRS" toTaxAuthGeoId="NY" toTaxAuthPartyId="NY_DTF" taxAuthorityAssocTypeId="EXEMPT_INHER" fromDate="2001-05-13 00:00:00.001" thruDate=""/> - <TaxAuthorityRateProduct taxAuthorityRateSeqId="9002" taxAuthGeoId="NY" taxAuthPartyId="NY_DTF" taxAuthorityRateTypeId="SALES_TAX" productStoreId="9000" + <TaxAuthorityRateProduct taxAuthorityRateSeqId="9002" taxAuthGeoId="NY" taxAuthPartyId="NY_DTF" taxAuthorityRateTypeId="SALES_TAX" productStoreId="" productCategoryId="" titleTransferEnumId="" minItemPrice="0.00" minPurchase="0.00" taxShipping="N" taxPercentage="4.25" taxPromotions="N" fromDate="2001-05-13 00:00:00.001" thruDate="" description="New York State Sales Tax"/> - <TaxAuthority taxAuthGeoId="TX" taxAuthPartyId="TX_TAXMAN" includeTaxInPrice="N"/> - <TaxAuthorityGlAccount taxAuthGeoId="TX" taxAuthPartyId="TX_TAXMAN" organizationPartyId="Company" glAccountId="224151"/> - <TaxAuthorityAssoc taxAuthGeoId="USA" taxAuthPartyId="USA_IRS" toTaxAuthGeoId="TX" toTaxAuthPartyId="TX_TAXMAN" taxAuthorityAssocTypeId="EXEMPT_INHER" fromDate="2001-05-13 00:00:00.001" thruDate=""/> - <TaxAuthorityRateProduct taxAuthorityRateSeqId="9003" taxAuthGeoId="TX" taxAuthPartyId="TX_TAXMAN" taxAuthorityRateTypeId="SALES_TAX" productStoreId="9000" + <TaxAuthorityRateProduct taxAuthorityRateSeqId="9003" taxAuthGeoId="TX" taxAuthPartyId="TX_TAXMAN" taxAuthorityRateTypeId="SALES_TAX" productStoreId="" productCategoryId="" titleTransferEnumId="" minItemPrice="0.00" minPurchase="0.00" taxShipping="N" taxPercentage="6.25" taxPromotions="N" fromDate="2001-05-13 00:00:00.001" thruDate="" description="Texas State Sales Tax"/> - <TaxAuthority taxAuthGeoId="UT" taxAuthPartyId="UT_TAXMAN" includeTaxInPrice="N"/> - <TaxAuthorityGlAccount taxAuthGeoId="UT" taxAuthPartyId="UT_TAXMAN" organizationPartyId="Company" glAccountId="224153"/> - <TaxAuthorityAssoc taxAuthGeoId="USA" taxAuthPartyId="USA_IRS" toTaxAuthGeoId="UT" toTaxAuthPartyId="UT_TAXMAN" taxAuthorityAssocTypeId="EXEMPT_INHER" fromDate="2001-05-13 00:00:00.001" thruDate=""/> - <TaxAuthorityRateProduct taxAuthorityRateSeqId="9004" taxAuthGeoId="UT" taxAuthPartyId="UT_TAXMAN" taxAuthorityRateTypeId="SALES_TAX" productStoreId="9000" + <TaxAuthorityRateProduct taxAuthorityRateSeqId="9004" taxAuthGeoId="UT" taxAuthPartyId="UT_TAXMAN" taxAuthorityRateTypeId="SALES_TAX" productStoreId="" productCategoryId="" titleTransferEnumId="" minItemPrice="0.00" minPurchase="0.00" taxShipping="N" taxPercentage="4.75" taxPromotions="N" fromDate="2001-05-13 00:00:00.001" thruDate="" description="Utah State Sales Tax"/> - <!-- An example county; there is some zip code data for testing this; note this is ONLY test data, there isn't really extra sales tax for this county --> - <TaxAuthority taxAuthGeoId="UT-UTAH" taxAuthPartyId="UT_UTAH_TAXMAN" includeTaxInPrice="N"/> - <!-- NOTE: using the state's sales tax GL Account --> - <TaxAuthorityGlAccount taxAuthGeoId="UT-UTAH" taxAuthPartyId="UT_UTAH_TAXMAN" organizationPartyId="Company" glAccountId="224153"/> - <TaxAuthorityAssoc taxAuthGeoId="UT" taxAuthPartyId="UT_TAXMAN" toTaxAuthGeoId="UT-UTAH" toTaxAuthPartyId="UT_UTAH_TAXMAN" taxAuthorityAssocTypeId="EXEMPT_INHER" fromDate="2001-05-13 00:00:00.001" thruDate=""/> - <TaxAuthorityRateProduct taxAuthorityRateSeqId="9005" taxAuthGeoId="UT-UTAH" taxAuthPartyId="UT_UTAH_TAXMAN" taxAuthorityRateTypeId="SALES_TAX" productStoreId="9000" + <TaxAuthorityRateProduct taxAuthorityRateSeqId="9005" taxAuthGeoId="UT-UTAH" taxAuthPartyId="UT_UTAH_TAXMAN" taxAuthorityRateTypeId="SALES_TAX" productStoreId="" productCategoryId="" titleTransferEnumId="" minItemPrice="0.00" minPurchase="0.00" taxShipping="N" taxPercentage="0.1" fromDate="2001-05-13 00:00:00.001" thruDate="" description="Utah County, Utah Sales Tax"/> - - <!-- Canada TaxAuthority defs --> - <TaxAuthority taxAuthGeoId="CAN" taxAuthPartyId="CAN_TAXMAN" includeTaxInPrice="N"/> - <TaxAuthorityGlAccount taxAuthGeoId="CAN" taxAuthPartyId="CAN_TAXMAN" organizationPartyId="Company" glAccountId="224209"/> - <TaxAuthority taxAuthGeoId="ON" taxAuthPartyId="ON_TAXMAN" includeTaxInPrice="Y"/> - <TaxAuthorityGlAccount taxAuthGeoId="ON" taxAuthPartyId="ON_TAXMAN" organizationPartyId="Company" glAccountId="224209"/> - - <!-- Party TaxAuthority info for Company --> - <!-- some interesting information at: http://www.taxadmin.org/fta/rate/tax_stru.html --> - <PartyTaxAuthInfo partyId="Company" taxAuthGeoId="_NA_" taxAuthPartyId="_NA_" fromDate="2001-05-13 00:00:00.001" thruDate="" partyTaxId="" isExempt="" isNexus="Y"/> - <PartyTaxAuthInfo partyId="Company" taxAuthGeoId="USA" taxAuthPartyId="USA_IRS" fromDate="2001-05-13 00:00:00.001" thruDate="" partyTaxId="12-3456789" isExempt="Y" isNexus="N"/> - <PartyTaxAuthInfo partyId="Company" taxAuthGeoId="CA" taxAuthPartyId="CA_BOE" fromDate="2001-05-13 00:00:00.001" thruDate="" partyTaxId="" isExempt="" isNexus="Y"/> - <PartyTaxAuthInfo partyId="Company" taxAuthGeoId="NY" taxAuthPartyId="NY_DTF" fromDate="2001-05-13 00:00:00.001" thruDate="" partyTaxId="" isExempt="" isNexus="Y"/> - <PartyTaxAuthInfo partyId="Company" taxAuthGeoId="TX" taxAuthPartyId="TX_TAXMAN" fromDate="2001-05-13 00:00:00.001" thruDate="" partyTaxId="" isExempt="" isNexus="N"/> <!-- this one is not a nexus to test that feature --> - <PartyTaxAuthInfo partyId="Company" taxAuthGeoId="UT" taxAuthPartyId="UT_TAXMAN" fromDate="2001-05-13 00:00:00.001" thruDate="" partyTaxId="" isExempt="" isNexus="Y"/> - <PartyTaxAuthInfo partyId="Company" taxAuthGeoId="UT-UTAH" taxAuthPartyId="UT_UTAH_TAXMAN" fromDate="2001-05-13 00:00:00.001" thruDate="" partyTaxId="" isExempt="" isNexus="Y"/> - <PartyTaxAuthInfo partyId="Company" taxAuthGeoId="CAN" taxAuthPartyId="CAN_TAXMAN" fromDate="2001-05-13 00:00:00.001" thruDate="" partyTaxId="87654321" isExempt="N" isNexus="Y"/> - <PartyTaxAuthInfo partyId="Company" taxAuthGeoId="ON" taxAuthPartyId="ON_TAXMAN" fromDate="2001-05-13 00:00:00.001" thruDate="" partyTaxId="" isExempt="" isNexus="Y"/> - </entity-engine-xml> Propchange: ofbiz/branches/executioncontext20090812/specialpurpose/ecommerce/webapp/ecommerce/images/productAdditionalView.js ('svn:mergeinfo' removed) Propchange: ofbiz/branches/executioncontext20090812/specialpurpose/googlecheckout/ ('svn:mergeinfo' removed) Propchange: ofbiz/branches/executioncontext20090812/specialpurpose/googlecheckout/webapp/googlecheckout/ ('svn:mergeinfo' removed) Propchange: ofbiz/branches/executioncontext20090812/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy ('svn:mergeinfo' removed) Propchange: ofbiz/branches/executioncontext20090812/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy ('svn:mergeinfo' removed) Propchange: ofbiz/branches/executioncontext20090812/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy ('svn:mergeinfo' removed) Modified: ofbiz/branches/executioncontext20090812/specialpurpose/myportal/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/myportal/ofbiz-component.xml?rev=804274&r1=804273&r2=804274&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/myportal/ofbiz-component.xml (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/myportal/ofbiz-component.xml Fri Aug 14 15:58:17 2009 @@ -26,7 +26,6 @@ <entity-resource type="data" reader-name="seed" loader="main" location="data/MyPortalSecurityData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/MyPortalTypeData.xml"/> - <entity-resource type="data" reader-name="seed" loader="main" location="data/MyPortalHelpData.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/MyPortalDemoData.xml"/> <service-resource type="model" loader="main" location="servicedef/services.xml"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |