svn commit: r1001173 - in /ofbiz/branches/jquery: ./ applications/accounting/config
Locked
svn commit: r1001173 - in /ofbiz/branches/jquery: ./ applications/accounting/config
 
|
Author: jleroux
Date: Sat Sep 25 09:39:18 2010 New Revision: 1001173 URL: http://svn.apache.org/viewvc?rev=1001173&view=rev Log: Merges the trunk at r1001131 Modified: ofbiz/branches/jquery/ (props changed) ofbiz/branches/jquery/applications/accounting/config/AccountingUiLabels.xml ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMapProcs.xml ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml (props changed) ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy (props changed) ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml (props changed) ofbiz/branches/jquery/applications/product/widget/facility/FacilityForms.xml ofbiz/branches/jquery/framework/common/servicedef/services_email.xml ofbiz/branches/jquery/framework/common/src/org/ofbiz/common/email/EmailServices.java ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml (props changed) ofbiz/branches/jquery/framework/example/data/ExamplePortalSeedData.xml ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java ofbiz/branches/jquery/specialpurpose/ebaystore/lib/ (props changed) ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy (props changed) ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy (props changed) ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy (props changed) Propchange: ofbiz/branches/jquery/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Sep 25 09:39:18 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310:921280-927264 -/ofbiz/trunk:951708-1000653 +/ofbiz/trunk:951708-1001171 Modified: ofbiz/branches/jquery/applications/accounting/config/AccountingUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/config/AccountingUiLabels.xml?rev=1001173&r1=1001172&r2=1001173&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/config/AccountingUiLabels.xml (original) +++ ofbiz/branches/jquery/applications/accounting/config/AccountingUiLabels.xml Sat Sep 25 09:39:18 2010 @@ -108,6 +108,10 @@ <value xml:lang="en">Account Transaction Id</value> <value xml:lang="hi_IN">लà¥à¤à¤¾ à¤à¤¤à¤¿à¤µà¤¿à¤§à¤¿ à¤à¥à¤°à¤®à¤¾à¤à¤</value> </property> + <property key="AccountingCardNumberIncorrect"> + <value xml:lang="de">Kartennummer fehlerhaft</value> + <value xml:lang="en">Card Number is erroneous</value> + </property> <property key="AccountingAccountType"> <value xml:lang="ar">ÙÙع اÙØساب</value> <value xml:lang="cs">Typ úÄtu</value> Modified: ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml?rev=1001173&r1=1001172&r2=1001173&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml (original) +++ ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml Sat Sep 25 09:39:18 2010 @@ -1899,8 +1899,8 @@ under the License. <set field="acctgTransTypeId" value="CUST_RTN_INVOICE"/> <entity-condition entity-name="InvoiceItem" list="invoiceItems" use-cache="true"> <condition-list> - <condition-expr field-name="invoiceItemTypeId" operator="not-equals" value="PINV_SALES_TAX"/> - <condition-expr field-name="invoiceItemTypeId" operator="not-equals" value="PITM_SALES_TAX"/> + <condition-expr field-name="invoiceItemTypeId" operator="not-equals" value="INV_SALES_TAX"/> + <condition-expr field-name="invoiceItemTypeId" operator="not-equals" value="ITM_SALES_TAX"/> <condition-expr field-name="invoiceId" operator="equals" from-field="parameters.invoiceId"/> </condition-list> </entity-condition> @@ -1948,7 +1948,7 @@ under the License. <clear-field field="debitEntry"/> <make-value entity-name="AcctgTransEntry" value-field="debitEntry"/> <set field="debitEntry.debitCreditFlag" value="D"/> - <set field="debitEntry.organizationPartyId" from-field="invoice.partyIdFrom"/> + <set field="debitEntry.organizationPartyId" from-field="invoice.partyIdTo"/> <call-class-method method-name="getInvoiceTaxTotalForTaxAuthPartyAndGeo" class-name="org.ofbiz.accounting.invoice.InvoiceWorker" ret-field="taxAmount"> <field field="invoice" type="GenericValue"/> @@ -1979,7 +1979,7 @@ under the License. <make-value entity-name="AcctgTransEntry" value-field="creditEntry"/> <set field="creditEntry.debitCreditFlag" value="C"/> <set field="creditEntry.organizationPartyId" from-field="invoice.partyId"/> - <set field="creditEntry.glAccountTypeId" value="ACCOUNTS_PAYABLE"/> + <set field="creditEntry.glAccountTypeId" value="ACCOUNTS_RECEIVABLE"/> <calculate field="totalAmountFromInvoice" type="BigDecimal" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}"> <calcop operator="add"> <calcop operator="get" field="totalAmountFromInvoice"/> @@ -1997,7 +1997,7 @@ under the License. <set field="createAcctgTransAndEntriesInMap.acctgTransTypeId" from-field="acctgTransTypeId"/> <set field="createAcctgTransAndEntriesInMap.invoiceId" from-field="invoice.invoiceId"/> <set field="createAcctgTransAndEntriesInMap.partyId" from-field="invoice.partyIdFrom"/> - <set field="createAcctgTransAndEntriesInMap.roleTypeId" value="BILL_FROM_VENDOR"/> + <set field="createAcctgTransAndEntriesInMap.roleTypeId" value="BILL_TO_CUSTOMER"/> <set field="createAcctgTransAndEntriesInMap.acctgTransEntries" from-field="acctgTransEntries"/> <call-service service-name="createAcctgTransAndEntries" in-map-name="createAcctgTransAndEntriesInMap"> <result-to-field result-name="acctgTransId"/> Modified: ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMapProcs.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMapProcs.xml?rev=1001173&r1=1001172&r2=1001173&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMapProcs.xml (original) +++ ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMapProcs.xml Sat Sep 25 09:39:18 2010 @@ -39,7 +39,15 @@ under the License. <process field="lastNameOnCard"><copy/><not-empty><fail-property resource="AccountingUiLabels" property="AccountingLastNameOnCardMissing"/></not-empty></process> <process field="suffixOnCard"><copy/></process> <process field="cardType"><copy/><not-empty><fail-property resource="AccountingUiLabels" property="AccountingCardTypeMissing"/></not-empty></process> - <process field="cardNumber"><copy/><not-empty><fail-property resource="AccountingUiLabels" property="AccountingCardNumberMissing"/></not-empty></process> + <process field="cardNumber"> + <copy/> + <not-empty> + <fail-property resource="AccountingUiLabels" property="AccountingCardNumberMissing"/> + </not-empty> + <validate-method method="isAnyCard" class="org.ofbiz.base.util.UtilValidate"> + <fail-property resource="AccountingUiLabels" property="AccountingCardNumberIncorrect"/> + </validate-method> + </process> <process field="contactMechId"><copy/></process> <process field="description"><copy/></process> <process field="expMonth"><not-empty><fail-property resource="AccountingUiLabels" property="AccountingExpirationMonthMissing"/></not-empty></process> Propchange: ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Sep 25 09:39:18 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CheckoutMapProcs.xml:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:921280-927264 -/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-1000653 +/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-1001171 Propchange: ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Sep 25 09:39:18 2010 @@ -1,3 +1,3 @@ /incubator/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:418499-490456 /ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:921280-927264 -/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-1000653 +/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-1001171 Propchange: ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Sep 25 09:39:18 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt/applications/product/script/org/ofbiz/shipment/test/FacilityTests.xml:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:921280-927264 -/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-1000653 +/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-1001171 Modified: ofbiz/branches/jquery/applications/product/widget/facility/FacilityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/widget/facility/FacilityForms.xml?rev=1001173&r1=1001172&r2=1001173&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/widget/facility/FacilityForms.xml (original) +++ ofbiz/branches/jquery/applications/product/widget/facility/FacilityForms.xml Sat Sep 25 09:39:18 2010 @@ -84,7 +84,7 @@ under the License. </field> <field name="serialNumber"><text-find/></field> <field name="softIdentifier"><text/></field> - <field name="manufacturerPartyId"> + <field name="partyId" title="${uiLabelMap.FormFieldTitle_manufacturerPartyId}"> <lookup target-form-name="LookupPartyName"/> </field> <field name="lotId" title="${uiLabelMap.ProductLotId}"><text/></field> Modified: ofbiz/branches/jquery/framework/common/servicedef/services_email.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/servicedef/services_email.xml?rev=1001173&r1=1001172&r2=1001173&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/common/servicedef/services_email.xml (original) +++ ofbiz/branches/jquery/framework/common/servicedef/services_email.xml Sat Sep 25 09:39:18 2010 @@ -83,6 +83,8 @@ under the License. <attribute name="bodyScreenUri" type="String" mode="IN" optional="true"/> <attribute name="xslfoAttachScreenLocation" type="String" mode="IN" optional="true"/> <attribute name="attachmentName" type="String" mode="IN" optional="true"/> + <attribute name="xslfoAttachScreenLocationList" type="List" mode="IN" optional="true"/> + <attribute name="attachmentNameList" type="List" mode="IN" optional="true"/> <attribute name="bodyParameters" type="Map" mode="IN" optional="true"/> <attribute name="webSiteId" type="String" mode="IN" optional="true"/> <attribute name="subject" type="String" mode="OUT" optional="true"/> Modified: ofbiz/branches/jquery/framework/common/src/org/ofbiz/common/email/EmailServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/src/org/ofbiz/common/email/EmailServices.java?rev=1001173&r1=1001172&r2=1001173&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/common/src/org/ofbiz/common/email/EmailServices.java (original) +++ ofbiz/branches/jquery/framework/common/src/org/ofbiz/common/email/EmailServices.java Sat Sep 25 09:39:18 2010 @@ -414,8 +414,18 @@ public class EmailServices { String webSiteId = (String) serviceContext.remove("webSiteId"); String bodyText = (String) serviceContext.remove("bodyText"); String bodyScreenUri = (String) serviceContext.remove("bodyScreenUri"); - String xslfoAttachScreenLocation = (String) serviceContext.remove("xslfoAttachScreenLocation"); - String attachmentName = (String) serviceContext.remove("attachmentName"); + String xslfoAttachScreenLocationParam = (String) serviceContext.remove("xslfoAttachScreenLocation"); + String attachmentNameParam = (String) serviceContext.remove("attachmentName"); + List<String> xslfoAttachScreenLocationListParam = (List) serviceContext.remove("xslfoAttachScreenLocationList"); + List<String> attachmentNameListParam = (List) serviceContext.remove("attachmentNameList"); + + List<String> xslfoAttachScreenLocationList = FastList.newInstance(); + List<String> attachmentNameList = FastList.newInstance(); + if (UtilValidate.isNotEmpty(xslfoAttachScreenLocationParam)) xslfoAttachScreenLocationList.add(xslfoAttachScreenLocationParam); + if (UtilValidate.isNotEmpty(attachmentNameParam)) attachmentNameList.add(attachmentNameParam); + if (UtilValidate.isNotEmpty(xslfoAttachScreenLocationListParam)) xslfoAttachScreenLocationList.addAll(xslfoAttachScreenLocationListParam); + if (UtilValidate.isNotEmpty(attachmentNameListParam)) attachmentNameList.addAll(attachmentNameListParam); + Locale locale = (Locale) serviceContext.get("locale"); Map<String, Object> bodyParameters = UtilGenerics.checkMap(serviceContext.remove("bodyParameters")); if (bodyParameters == null) { @@ -437,9 +447,6 @@ public class EmailServices { NotificationServices.setBaseUrl(dctx.getDelegator(), webSiteId, bodyParameters); String contentType = (String) serviceContext.remove("contentType"); - if (UtilValidate.isEmpty(attachmentName)) { - attachmentName = "Details.pdf"; - } StringWriter bodyWriter = new StringWriter(); MapStack<String> screenContext = MapStack.create(); @@ -473,72 +480,82 @@ public class EmailServices { boolean isMultiPart = false; // check if attachment screen location passed in - if (UtilValidate.isNotEmpty(xslfoAttachScreenLocation)) { - isMultiPart = true; - // start processing fo pdf attachment - try { - Writer writer = new StringWriter(); - MapStack<String> screenContextAtt = MapStack.create(); - // substitute the freemarker variables... - ScreenRenderer screensAtt = new ScreenRenderer(writer, screenContext, foScreenRenderer); - screensAtt.populateContextForService(dctx, bodyParameters); - screenContextAtt.putAll(bodyParameters); - screensAtt.render(xslfoAttachScreenLocation); - - /* - try { // save generated fo file for debugging - String buf = writer.toString(); - java.io.FileWriter fw = new java.io.FileWriter(new java.io.File("/tmp/file1.xml")); - fw.write(buf.toString()); - fw.close(); - } catch (IOException e) { - Debug.logError(e, "Couldn't save xsl-fo xml debug file: " + e.toString(), module); + if (UtilValidate.isNotEmpty(xslfoAttachScreenLocationList)) { + List<Map<String, ? extends Object>> bodyParts = FastList.newInstance(); + if (bodyText != null) { + bodyText = FlexibleStringExpander.expandString(bodyText, screenContext, locale); + bodyParts.add(UtilMisc.<String, Object>toMap("content", bodyText, "type", "text/html")); + } else { + bodyParts.add(UtilMisc.<String, Object>toMap("content", bodyWriter.toString(), "type", "text/html")); + } + + for (int i = 0; i < xslfoAttachScreenLocationList.size(); i++) { + String xslfoAttachScreenLocation = xslfoAttachScreenLocationList.get(i); + String attachmentName = attachmentNameList.get(i); + if (UtilValidate.isEmpty(attachmentName)) { + attachmentName = "Details" + i + ".pdf"; } - */ - // create the input stream for the generation - StreamSource src = new StreamSource(new StringReader(writer.toString())); - - // create the output stream for the generation - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - - Fop fop = ApacheFopWorker.createFopInstance(baos, MimeConstants.MIME_PDF); - ApacheFopWorker.transform(src, null, fop); - - // and generate the PDF - baos.flush(); - baos.close(); - - // store in the list of maps for sendmail.... - List<Map<String, ? extends Object>> bodyParts = FastList.newInstance(); - if (bodyText != null) { - bodyText = FlexibleStringExpander.expandString(bodyText, screenContext, locale); - bodyParts.add(UtilMisc.<String, Object>toMap("content", bodyText, "type", "text/html")); - } else { - bodyParts.add(UtilMisc.<String, Object>toMap("content", bodyWriter.toString(), "type", "text/html")); + isMultiPart = true; + // start processing fo pdf attachment + try { + Writer writer = new StringWriter(); + MapStack<String> screenContextAtt = MapStack.create(); + // substitute the freemarker variables... + ScreenRenderer screensAtt = new ScreenRenderer(writer, screenContext, foScreenRenderer); + screensAtt.populateContextForService(dctx, bodyParameters); + screenContextAtt.putAll(bodyParameters); + screensAtt.render(xslfoAttachScreenLocation); + + /* + try { // save generated fo file for debugging + String buf = writer.toString(); + java.io.FileWriter fw = new java.io.FileWriter(new java.io.File("/tmp/file1.xml")); + fw.write(buf.toString()); + fw.close(); + } catch (IOException e) { + Debug.logError(e, "Couldn't save xsl-fo xml debug file: " + e.toString(), module); + } + */ + + // create the input stream for the generation + StreamSource src = new StreamSource(new StringReader(writer.toString())); + + // create the output stream for the generation + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + + Fop fop = ApacheFopWorker.createFopInstance(baos, MimeConstants.MIME_PDF); + ApacheFopWorker.transform(src, null, fop); + + // and generate the PDF + baos.flush(); + baos.close(); + + // store in the list of maps for sendmail.... + bodyParts.add(UtilMisc.<String, Object>toMap("content", baos.toByteArray(), "type", "application/pdf", "filename", attachmentName)); + } catch (GeneralException ge) { + String errMsg = "Error rendering PDF attachment for email: " + ge.toString(); + Debug.logError(ge, errMsg, module); + return ServiceUtil.returnError(errMsg); + } catch (IOException ie) { + String errMsg = "Error rendering PDF attachment for email: " + ie.toString(); + Debug.logError(ie, errMsg, module); + return ServiceUtil.returnError(errMsg); + } catch (FOPException fe) { + String errMsg = "Error rendering PDF attachment for email: " + fe.toString(); + Debug.logError(fe, errMsg, module); + return ServiceUtil.returnError(errMsg); + } catch (SAXException se) { + String errMsg = "Error rendering PDF attachment for email: " + se.toString(); + Debug.logError(se, errMsg, module); + return ServiceUtil.returnError(errMsg); + } catch (ParserConfigurationException pe) { + String errMsg = "Error rendering PDF attachment for email: " + pe.toString(); + Debug.logError(pe, errMsg, module); + return ServiceUtil.returnError(errMsg); } - bodyParts.add(UtilMisc.<String, Object>toMap("content", baos.toByteArray(), "type", "application/pdf", "filename", attachmentName)); + serviceContext.put("bodyParts", bodyParts); - } catch (GeneralException ge) { - String errMsg = "Error rendering PDF attachment for email: " + ge.toString(); - Debug.logError(ge, errMsg, module); - return ServiceUtil.returnError(errMsg); - } catch (IOException ie) { - String errMsg = "Error rendering PDF attachment for email: " + ie.toString(); - Debug.logError(ie, errMsg, module); - return ServiceUtil.returnError(errMsg); - } catch (FOPException fe) { - String errMsg = "Error rendering PDF attachment for email: " + fe.toString(); - Debug.logError(fe, errMsg, module); - return ServiceUtil.returnError(errMsg); - } catch (SAXException se) { - String errMsg = "Error rendering PDF attachment for email: " + se.toString(); - Debug.logError(se, errMsg, module); - return ServiceUtil.returnError(errMsg); - } catch (ParserConfigurationException pe) { - String errMsg = "Error rendering PDF attachment for email: " + pe.toString(); - Debug.logError(pe, errMsg, module); - return ServiceUtil.returnError(errMsg); } } else { isMultiPart = false; Propchange: ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Sep 25 09:39:18 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt/applications/commonext/widget/HelpScreens.xml:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310/framework/common/widget/HelpScreens.xml:921280-927264 -/ofbiz/trunk/framework/common/widget/HelpScreens.xml:951708-1000653 +/ofbiz/trunk/framework/common/widget/HelpScreens.xml:951708-1001171 Modified: ofbiz/branches/jquery/framework/example/data/ExamplePortalSeedData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/example/data/ExamplePortalSeedData.xml?rev=1001173&r1=1001172&r2=1001173&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/example/data/ExamplePortalSeedData.xml (original) +++ ofbiz/branches/jquery/framework/example/data/ExamplePortalSeedData.xml Sat Sep 25 09:39:18 2010 @@ -25,12 +25,6 @@ under the License. <PortalPageColumn portalPageId="EXAMPLE" columnSeqId="00002"/><!-- no width in pixels or percent, use the rest of the space available --> <PortalPagePortlet portalPageId="EXAMPLE" portalPortletId="EXAMPLE_1" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/> <PortalPagePortlet portalPageId="EXAMPLE" portalPortletId="EXAMPLE_3" portletSeqId="00001" columnSeqId="00002" sequenceNum="1"/> - <PortalPagePortlet portalPageId="EXAMPLE" portalPortletId="showContent" portletSeqId="00001" columnSeqId="00001"/> - <PortletAttribute portalPageId="EXAMPLE" portalPortletId="showContent" portletSeqId="00001" attrName="contentId" attrValue="HELP_BIRT"/> - <PortalPagePortlet portalPageId="EXAMPLE" portalPortletId="showContent" portletSeqId="00002" columnSeqId="00002"/> - <PortletAttribute portalPageId="EXAMPLE" portalPortletId="showContent" portletSeqId="00002" attrName="contentId" attrValue="SETUP_firstCatalog"/> - <PortalPagePortlet portalPageId="EXAMPLE" portalPortletId="showContent" portletSeqId="00003" columnSeqId="00002"/> - <PortletAttribute portalPageId="EXAMPLE" portalPortletId="showContent" portletSeqId="00003" attrName="contentId" attrValue="HELP_ACCOUNTING"/> <PortalPage portalPageId="EXAMPLE1" sequenceNum="100" parentPortalPageId="EXAMPLE" portalPageName="Example Portal Page 1" description="Portal page 1" ownerUserLoginId="_NA_"/> <PortalPageColumn portalPageId="EXAMPLE1" columnSeqId="00001"/> Modified: ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java?rev=1001173&r1=1001172&r2=1001173&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java (original) +++ ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java Sat Sep 25 09:39:18 2010 @@ -927,6 +927,17 @@ public class LoginWorker { GenericValue userLogin = (GenericValue) LoginWorker.externalLoginKeys.get(externalKey); if (userLogin != null) { + //to check it's the right tenant + //in case username and password are the same in different tenants + LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher"); + Delegator delegator = (Delegator) request.getAttribute("delegator"); + String oldDelegatorName = delegator.getDelegatorName(); + ServletContext servletContext = session.getServletContext(); + if (!oldDelegatorName.equals(userLogin.getDelegator().getDelegatorName())) { + delegator = DelegatorFactory.getDelegator(userLogin.getDelegator().getDelegatorName()); + dispatcher = ContextFilter.makeWebappDispatcher(servletContext, delegator); + setWebContextObjects(request, response, delegator, dispatcher); + } // found userLogin, do the external login... // if the user is already logged in and the login is different, logout the other user Propchange: ofbiz/branches/jquery/specialpurpose/ebaystore/lib/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Sep 25 09:39:18 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt/specialpurpose/ebay/lib:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/lib:921280-927264 -/ofbiz/trunk/specialpurpose/ebaystore/lib:951708-1000653 +/ofbiz/trunk/specialpurpose/ebaystore/lib:951708-1001171 Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Sep 25 09:39:18 2010 @@ -1,3 +1,3 @@ /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:418499-490456 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:921280-927264 -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-1000653 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-1001171 Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Sep 25 09:39:18 2010 @@ -1,3 +1,3 @@ /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:418499-490456 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:921280-927264 -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-1000653 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-1001171 Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Sep 25 09:39:18 2010 @@ -1,3 +1,3 @@ /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:418499-490456 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:921280-927264 -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-1000653 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-1001171 |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |