svn commit: r1590573 - in /ofbiz/branches/OFBIZ-5312-ofb
Locked
svn commit: r1590573 - in /ofbiz/branches/OFBIZ-5312-ofb
 
|
Author: jleroux
Date: Mon Apr 28 08:02:07 2014 New Revision: 1590573 URL: http://svn.apache.org/r1590573 Log: Merges trunk HEAD in SEO branch Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ (props changed) ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/data/AccountingTypeData.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/entitydef/entitymodel.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/servicedef/services_ledger.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/AccountingTrees.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/GlForms.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/GlobalGlAccountsForms.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/data/MimeTypeData.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/entitydef/entitymodel.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/config/ManufacturingUiLabels.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/ManufacturingData.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/servicedef/services_production_run.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/widget/manufacturing/JobshopScreens.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/widget/manufacturing/ManufacturingMenus.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/orderReportConditions.fo.ftl ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/orderReportHeaderInfo.fo.ftl ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/conversion/DateTimeConverters.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/conversion/test/DateTimeTests.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/test/ObjectTypeTests.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/data/GeoData.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/error.fo.ftl ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/simple.fo.ftl ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/widget/CommonScreens.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/GenericDelegator.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/start/src/org/ofbiz/base/start/Config.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/WEB-INF/actions/entity/EntityMaint.groovy ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/data/scrumDemoData.xml Propchange: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ ------------------------------------------------------------------------------ Merged /ofbiz/trunk:r1588858-1590572 Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/data/AccountingTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/data/AccountingTypeData.xml?rev=1590573&r1=1590572&r2=1590573&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/data/AccountingTypeData.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/data/AccountingTypeData.xml Mon Apr 28 08:02:07 2014 @@ -18,6 +18,7 @@ specific language governing permissions under the License. --> <entity-engine-xml> + <AcctgTransType acctgTransTypeId="_NA_" description="Not Applicable" hasTable="N" parentTypeId=""/> <AcctgTransType acctgTransTypeId="INTERNAL_ACCTG_TRANS" description="Internal" hasTable="Y" parentTypeId=""/> <AcctgTransType acctgTransTypeId="AMORTIZATION" description="Amortization" hasTable="N" parentTypeId="INTERNAL_ACCTG_TRANS"/> <AcctgTransType acctgTransTypeId="DEPRECIATION" description="Depreciation" hasTable="Y" parentTypeId="INTERNAL_ACCTG_TRANS"/> @@ -301,6 +302,7 @@ under the License. <GlAccountClass description="Accumulated Amortization" glAccountClassId="ACCUM_AMORTIZATION" parentClassId="CONTRA_ASSET"/> <GlAccountClass description="Non-Posting" glAccountClassId="NON_POSTING" parentClassId="DEBIT"/> + <GlAccountType description="Not Applicable" glAccountTypeId="_NA_" hasTable="N" parentTypeId=""/> <GlAccountType description="Accounts Receivable" glAccountTypeId="ACCOUNTS_RECEIVABLE" hasTable="N" parentTypeId=""/> <GlAccountType description="Accounts Payable" glAccountTypeId="ACCOUNTS_PAYABLE" hasTable="N" parentTypeId=""/> <GlAccountType description="Balance" glAccountTypeId="BALANCE_ACCOUNT" hasTable="N" parentTypeId=""/> @@ -368,6 +370,7 @@ under the License. <GlAccountType description="Foreign Exchange Gain" glAccountTypeId="FX_GAIN_ACCOUNT" hasTable="N" parentTypeId="FX_GAIN_LOSS_ACCT"/> <GlAccountType description="Foreign Exchange Loss" glAccountTypeId="FX_LOSS_ACCOUNT" hasTable="N" parentTypeId="FX_GAIN_LOSS_ACCT"/> + <GlResourceType description="Not Applicable" glResourceTypeId="_NA_"/> <GlResourceType description="Money" glResourceTypeId="MONEY"/> <GlResourceType description="Raw Materials" glResourceTypeId="RAW_MATERIALS"/> <GlResourceType description="Labor" glResourceTypeId="LABOR"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/entitydef/entitymodel.xml?rev=1590573&r1=1590572&r2=1590573&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/entitydef/entitymodel.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/entitydef/entitymodel.xml Mon Apr 28 08:02:07 2014 @@ -1917,6 +1917,7 @@ under the License. <alias entity-alias="ATR" name="workEffortId"/> <alias entity-alias="ATR" name="fixedAssetId"/> <alias entity-alias="ATR" name="physicalInventoryId"/> + <alias entity-alias="ATR" name="description"/> <alias entity-alias="ATE" name="acctgTransId"/> <alias entity-alias="ATE" name="acctgTransEntrySeqId"/> <alias entity-alias="ATE" name="glAccountId"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/servicedef/services_ledger.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/servicedef/services_ledger.xml?rev=1590573&r1=1590572&r2=1590573&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/servicedef/services_ledger.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/servicedef/services_ledger.xml Mon Apr 28 08:02:07 2014 @@ -31,8 +31,8 @@ under the License. location="component://accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml" invoke="createGlAccount" auth="true"> <description>Create a GlAccount record</description> <permission-service service-name="basicGeneralLedgerPermissionCheck" main-action="CREATE"/> - <auto-attributes include="pk" mode="INOUT" optional="false"/> - <auto-attributes include="nonpk" mode="IN" optional="true"/> + <auto-attributes include="pk" mode="OUT" optional="false"/> + <auto-attributes include="all" mode="IN" optional="true"/> <override name="glAccountTypeId" optional="false"/> <override name="glAccountClassId" optional="false"/> <override name="glResourceTypeId" optional="false"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/AccountingTrees.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/AccountingTrees.xml?rev=1590573&r1=1590572&r2=1590573&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/AccountingTrees.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/AccountingTrees.xml Mon Apr 28 08:02:07 2014 @@ -25,20 +25,20 @@ under the License. <sub-node node-name="node-body"> <entity-and entity-name="GlAccount"> <field-map field-name="parentGlAccountId" from-field="null"/> - <order-by field-name="glAccountId"/> + <order-by field-name="accountCode"/> </entity-and> </sub-node> </node> <node name="node-body"> <entity-one entity-name="GlAccount" value-field="glAccount"></entity-one> - <link target="GlAccountNavigate" text="${glAccountId} ${glAccount.accountName}"> + <link target="GlAccountNavigate" text="${glAccount.accountCode} ${glAccount.accountName}"> <parameter param-name="glAccountId"/> <parameter param-name="trail"/> </link> <sub-node node-name="node-body"> <entity-and entity-name="GlAccount"> <field-map field-name="parentGlAccountId" from-field="glAccountId"/> - <order-by field-name="glAccountId"/> + <order-by field-name="accountCode"/> </entity-and> </sub-node> </node> @@ -48,20 +48,20 @@ under the License. <sub-node node-name="node-body"> <entity-and entity-name="GlAccount"> <field-map field-name="parentGlAccountId" from-field="null"/> - <order-by field-name="glAccountId"/> + <order-by field-name="accountCode"/> </entity-and> </sub-node> </node> <node name="node-body"> <entity-one entity-name="GlAccount" value-field="glAccount"></entity-one> - <link target="GlAccountNavigate" text="${glAccountId} ${glAccount.accountName}"> + <link target="GlAccountNavigate" text="${glAccount.accountCode} ${glAccount.accountName}"> <parameter param-name="glAccountId"/> <parameter param-name="trail"/> </link> <sub-node node-name="node-body"> <entity-and entity-name="GlAccount"> <field-map field-name="parentGlAccountId" from-field="glAccountId"/> - <order-by field-name="glAccountId"/> + <order-by field-name="accountCode"/> </entity-and> </sub-node> </node> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/GlForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/GlForms.xml?rev=1590573&r1=1590572&r2=1590573&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/GlForms.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/GlForms.xml Mon Apr 28 08:02:07 2014 @@ -88,6 +88,7 @@ under the License. <select-field field-name="acctgTransId"/> <select-field field-name="transactionDate"/> <select-field field-name="acctgTransTypeId"/> + <select-field field-name="description"/> <select-field field-name="glFiscalTypeId"/> <select-field field-name="invoiceId"/> <select-field field-name="paymentId"/> @@ -107,6 +108,7 @@ under the License. </field> <field name="transactionDate"><display/></field> <field name="acctgTransTypeId" title="${uiLabelMap.FormFieldTitle_acctgTransType}"><display-entity entity-name="AcctgTransType"/></field> + <field name="description"><display/></field> <field name="glFiscalTypeId" title="${uiLabelMap.FormFieldTitle_glFiscalType}"><display-entity entity-name="GlFiscalType"/></field> <field name="invoiceId" use-when="invoiceId!=null" widget-style="buttontext"> <hyperlink also-hidden="false" description="${invoiceId}" target="editInvoice"> @@ -563,8 +565,7 @@ under the License. <field name="updateButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> </form> - <form name="EditAcctgTransEntry" type="single" target="updateAcctgTransEntry" default-map-name="acctgTransEntry" default-entity-name="AcctgTransEntry"> - <alt-target use-when="acctgTransEntry==null" target="createAcctgTransEntry"/> + <form name="EditAcctgTransEntry" type="single" target="createAcctgTransEntry" default-entity-name="AcctgTransEntry"> <field name="organizationPartyId"><hidden/></field> <field name="acctgTransId"><hidden/></field> <field name="acctgTransEntrySeqId"><hidden/></field> @@ -576,7 +577,7 @@ under the License. </entity-options> </drop-down> </field> - <field name="glAccountId" position="2"> + <field name="glAccountId" position="2" entry-name="resetFieldValue"> <drop-down allow-empty="true"> <entity-options entity-name="GlAccountOrganizationAndClass" key-field-name="glAccountId" description="${accountCode} - ${accountName} [${glAccountId}]"> <entity-constraint name="organizationPartyId" operator="equals" env-name="parameters.organizationPartyId"/> @@ -584,14 +585,14 @@ under the License. </entity-options> </drop-down> </field> - <field name="debitCreditFlag" position="1"> + <field name="debitCreditFlag" position="1" entry-name="resetFieldValue"> <drop-down current="selected"> <option description="${uiLabelMap.FormFieldTitle_credit}" key="C"/> <option description="${uiLabelMap.FormFieldTitle_debit}" key="D"/> </drop-down> </field> <field name="partyId" position="2"><text size="30"/></field> - <field name="origAmount" position="1"><text size="30"/></field> + <field name="origAmount" position="1" entry-name="resetFieldValue"><text size="30"/></field> <field name="origCurrencyUomId" position="2"> <drop-down allow-empty="true" no-current-selected-key="${defaultOrganizationPartyCurrencyUomId}"> <entity-options key-field-name="uomId" description="${description} - ${abbreviation}" entity-name="Uom"> @@ -610,12 +611,18 @@ under the License. </field> <field name="voucherRef" position="2"><text size="30"/></field> <field name="productId" position="1"><text size="20"/></field> - <field name="reconcileStatusId" position="2"><text size="30"/></field> + <field name="reconcileStatusId" position="2" title="${uiLabelMap.FormFieldTitle_reconcileStatus}"> + <drop-down allow-empty="true"> + <entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}"> + <entity-constraint name="statusTypeId" operator="equals" value="ACCTG_ENREC_STATUS"/> + <entity-order-by field-name="statusId"/> + </entity-options> + </drop-down> + </field> <field name="settlementTermId" position="1"><text size="20"/></field> <field name="isSummary" position="2"><text size="10"/></field> - <field name="description" position="1"><text size="30"/></field> - <field use-when="acctgTransEntry!=null" name="updateButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext" ><submit button-type="text-link"/></field> - <field use-when="acctgTransEntry==null" name="createButton" title="${uiLabelMap.CommonCreate}" widget-style="buttontext" ><submit button-type="text-link"/></field> + <field name="description" position="1" entry-name="resetFieldValue"><text size="30"/></field> + <field name="createButton" title="${uiLabelMap.CommonCreate}" widget-style="buttontext" ><submit button-type="text-link"/></field> </form> <form name="ListAcctgTransEntries" type="list" list-name="acctgTransEntries" default-entity-name="AcctgTransEntry" target="updateAcctgTransEntry" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> @@ -686,7 +693,7 @@ under the License. <auto-fields-service service-name="createAcctgTrans"/> <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field> <field name="acctgTransTypeId" title="${uiLabelMap.FormFieldTitle_acctgTransType}" position="1"> - <drop-down> + <drop-down no-current-selected-key="_NA_"> <entity-options entity-name="AcctgTransType" description="${description}"> <entity-order-by field-name="description"/> </entity-options> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/GlobalGlAccountsForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/GlobalGlAccountsForms.xml?rev=1590573&r1=1590572&r2=1590573&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/GlobalGlAccountsForms.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/GlobalGlAccountsForms.xml Mon Apr 28 08:02:07 2014 @@ -104,13 +104,12 @@ under the License. <alt-target use-when="glAccount==null" target="createGlAccount"/> <auto-fields-service service-name="updateGlAccount" map-name=""/> - <field use-when="glAccount!=null" name="glAccountId" tooltip="${uiLabelMap.AccountingNotModificationRecrationGlAccount}"><display/></field> - <field use-when="glAccount==null&&glAccountId!=null" name="glAccountId" tooltip="${uiLabelMap.AccountingCouldNotFindGlAccount} [${glAccountId}]"><text size="20" maxlength="20"/></field> + <field name="glAccountId"><display/></field> + <field use-when="glAccount==null&&glAccountId!=null" name="glAccountId" tooltip="${uiLabelMap.AccountingCouldNotFindGlAccount} [${glAccountId}]"><display/></field> <!-- this to be taken care of with auto-fields-service as soon as it uses entity field info too --> - <field use-when="glAccount==null&&glAccountId==null" name="glAccountId"><text size="20" maxlength="20"/></field> <field name="glAccountTypeId"> - <drop-down allow-empty="false"> + <drop-down allow-empty="false" no-current-selected-key="_NA_"> <entity-options entity-name="GlAccountType" description="${description}"> <entity-order-by field-name="description"/> </entity-options> @@ -124,7 +123,7 @@ under the License. </drop-down> </field> <field name="glResourceTypeId"> - <drop-down allow-empty="false"> + <drop-down allow-empty="false" no-current-selected-key="_NA_"> <entity-options entity-name="GlResourceType" description="${description}"> <entity-order-by field-name="description"/> </entity-options> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/data/MimeTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/data/MimeTypeData.xml?rev=1590573&r1=1590572&r2=1590573&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/data/MimeTypeData.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/data/MimeTypeData.xml Mon Apr 28 08:02:07 2014 @@ -115,7 +115,6 @@ under the License. <FileExtension fileExtensionId="css" mimeTypeId="text/css"/> <FileExtension fileExtensionId="flv" mimeTypeId="video/x-flv"/> <FileExtension fileExtensionId="jpg" mimeTypeId="image/jpeg"/> - <FileExtension fileExtensionId="jpg" mimeTypeId="image/jpeg"/> <FileExtension fileExtensionId="jpeg" mimeTypeId="image/jpeg"/> <FileExtension fileExtensionId="tif" mimeTypeId="image/tiff"/> <FileExtension fileExtensionId="tiff" mimeTypeId="image/tiff"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/entitydef/entitymodel.xml?rev=1590573&r1=1590572&r2=1590573&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/entitydef/entitymodel.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/entitydef/entitymodel.xml Mon Apr 28 08:02:07 2014 @@ -1004,7 +1004,7 @@ under the License. package-name="org.ofbiz.content.data" title="Image Data Object Entity"> <field name="dataResourceId" type="id-ne"></field> - <field name="imageData" type="blob"></field> + <field name="imageData" type="byte-array"></field> <prim-key field="dataResourceId"/> <relation type="one" fk-name="DATA_REC_IMAGE" rel-entity-name="DataResource"> <key-map field-name="dataResourceId"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/config/ManufacturingUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/config/ManufacturingUiLabels.xml?rev=1590573&r1=1590572&r2=1590573&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/config/ManufacturingUiLabels.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/config/ManufacturingUiLabels.xml Mon Apr 28 08:02:07 2014 @@ -2359,6 +2359,10 @@ <value xml:lang="zh">åå§åä½çº§å«ä»£ç </value> <value xml:lang="zh_TW">åå§åä½ç´å¥ä»£ç¢¼</value> </property> + <property key="ManufacturingLinkProductionRun"> + <value xml:lang="en">Link to Production Run</value> + <value xml:lang="nl">Aan productierun koppelen</value> + </property> <property key="ManufacturingListCalendarWeek"> <value xml:lang="de">Kalenderwochen anzeigen</value> <value xml:lang="en">List of weeks</value> @@ -2699,7 +2703,7 @@ </property> <property key="ManufacturingMaterialsNotAvailable"> <value xml:lang="de">Materialien nicht im Lager vorhanden ${productId}: ${parameters.quantityNotIssued}</value> - <value xml:lang="en">Materials Not Available in Warehouse ${productId}: ${parameters.quantityNotIssued}</value> + <value xml:lang="en">Materials Not Available in Warehouse: ID ${productId} - ${internalName}: ${parameters.quantityNotIssued}</value> <value xml:lang="es">Materiales no disponibles en almacén ${productId}: ${parameters.quantityNotIssued}</value> <value xml:lang="fr">Matériaux non disponibles dans l'entrepôt ${productId}: ${parameters.quantityNotIssued}</value> <value xml:lang="it">Materiali non disponibili a magazzino ${productId}: ${parameters.quantityNotIssued}</value> @@ -3666,6 +3670,7 @@ <value xml:lang="fr">Réf. de l'ordre de fabrication</value> <value xml:lang="it">Ordine di produzione</value> <value xml:lang="ja">çç£å®è¡ID</value> + <value xml:lang="nl">ID Productierun</value> <value xml:lang="pt_BR">Id de execução de produção</value> <value xml:lang="ro">Cod Comanda de Productie</value> <value xml:lang="th">รหัสà¸à¸²à¸£à¸à¸¥à¸´à¸</value> @@ -5666,4 +5671,8 @@ <value xml:lang="zh">æ¥æ¾èæ产å</value> <value xml:lang="zh_TW">æ¥æ¾èæ¬ç¢å</value> </property> + <property key="PagetitleProductionRunLink"> + <value xml:lang="en">Link Production Run</value> + <value xml:lang="nl">Productierun koppelen</value> + </property> </resource> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/ManufacturingData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/ManufacturingData.xml?rev=1590573&r1=1590572&r2=1590573&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/ManufacturingData.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/ManufacturingData.xml Mon Apr 28 08:02:07 2014 @@ -46,5 +46,9 @@ under the License. <!-- Formulae --> <CustomMethodType customMethodTypeId="TASK_FORMULA" description="Formula for calculating time estimates for tasks"/> <CustomMethodType customMethodTypeId="BOM_FORMULA" description="Formula for calculating material estimates for boms"/> + + <!-- ProductionRun sequence type --> + <Enumeration description="Predecessor" enumCode="PREDECESSOR" enumId="WF_PREDECESSOR" enumTypeId="WORKFLOW" sequenceId="1"/> + <Enumeration description="Successor" enumCode="SUCCESSOR" enumId="WF_SUCCESSOR" enumTypeId="WORKFLOW" sequenceId="2"/> </entity-engine-xml> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml?rev=1590573&r1=1590572&r2=1590573&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml Mon Apr 28 08:02:07 2014 @@ -21,6 +21,21 @@ under the License. <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods-v2.xsd"> + <simple-method method-name="createProductionRunAssoc" short-description="Associate the production run to another production run"> + + <if-compare field="parameters.workFlowSequenceTypeId" operator="equals" value="WF_PREDECESSOR"> + <set field="ctx.workEffortIdFrom" from-field="parameters.productionRunIdTo"/> + <set field="ctx.workEffortIdTo" from-field="parameters.productionRunId"/> + </if-compare> + <if-compare field="parameters.workFlowSequenceTypeId" operator="equals" value="WF_SUCCESSOR"> + <set field="ctx.workEffortIdFrom" from-field="parameters.productionRunId"/> + <set field="ctx.workEffortIdTo" from-field="parameters.productionRunIdTo"/> + </if-compare> + + <set field="ctx.workEffortAssocTypeId" value="WORK_EFF_PRECEDENCY"/> + <call-service service-name="createWorkEffortAssoc" in-map-name="ctx"/> + </simple-method> + <!-- Warehouse --> <simple-method method-name="issueProductionRunTask" short-description="Issues the Inventory for a Production Run Task" login-required="false"> <entity-one entity-name="WorkEffort" value-field="workEffort"/> @@ -159,8 +174,8 @@ under the License. <if> <condition> <or> + <if-compare field="parameters.failIfItemsAreNotAvailable" operator="equals" value="Y" type="String"/> <if-empty field="parameters.failIfItemsAreNotOnHand"/> - <if-compare field="parameters.failIfItemsAreNotOnHand" operator="equals" value="Y" type="String"/> </or> </condition> <then> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/servicedef/services_production_run.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/servicedef/services_production_run.xml?rev=1590573&r1=1590572&r2=1590573&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/servicedef/services_production_run.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/servicedef/services_production_run.xml Mon Apr 28 08:02:07 2014 @@ -38,6 +38,15 @@ under the License. <attribute name="productionRunId" type="String" mode="OUT" optional="false"/> <attribute name="estimatedCompletionDate" type="java.sql.Timestamp" mode="OUT" optional="true"/> </service> + <service name="createProductionRunAssoc" engine="simple" + location="component://manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml" invoke="createProductionRunAssoc" auth="false"> + <description> + Associate the production run to another production run + </description> + <attribute name="productionRunId" type="String" mode="IN" optional="false"/> + <attribute name="productionRunIdTo" type="String" mode="IN" optional="false"/> + <attribute name="workFlowSequenceTypeId" type="String" mode="IN" optional="false"/> + </service> <service name="createProductionRunsForProductBom" engine="java" location="org.ofbiz.manufacturing.jobshopmgt.ProductionRunServices" invoke="createProductionRunsForProductBom" auth="true"> <description>Explodes a product id and creates all the needed production runs.</description> @@ -233,6 +242,7 @@ under the License. <attribute name="quantityUomId" type="String" mode="IN" optional="true"/> <attribute name="inventoryItemTypeId" type="String" mode="IN" optional="true"/> <attribute name="lotId" type="String" mode="IN" optional="true"/> + <attribute name="locationSeqId" type="String" mode="IN" optional="true"/> <attribute name="createLotIfNeeded" type="Boolean" mode="IN" optional="true"/> <attribute name="autoCreateLot" type="Boolean" mode="IN" optional="true"/> </service> @@ -246,6 +256,7 @@ under the License. <attribute name="quantity" type="BigDecimal" mode="INOUT" optional="false"/> <attribute name="quantityUomId" type="String" mode="IN" optional="true"/> <attribute name="inventoryItemTypeId" type="String" mode="IN" optional="true"/> + <attribute name="locationSeqId" type="String" mode="IN" optional="true"/> <attribute name="lotId" type="String" mode="IN" optional="true"/> <attribute name="createLotIfNeeded" type="Boolean" mode="IN" optional="true"/> <attribute name="autoCreateLot" type="Boolean" mode="IN" optional="true"/> @@ -260,6 +271,7 @@ under the License. <attribute name="productId" type="String" mode="IN" optional="false"/> <attribute name="quantity" type="BigDecimal" mode="IN" optional="false"/> <attribute name="facilityId" type="String" mode="IN" optional="true"/> + <attribute name="locationSeqId" type="String" mode="IN" optional="true"/> <attribute name="unitCost" type="BigDecimal" mode="IN" optional="true"/> <attribute name="currencyUomId" type="String" mode="IN" optional="true"/> <attribute name="inventoryItemTypeId" type="String" mode="IN" optional="true"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml?rev=1590573&r1=1590572&r2=1590573&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml Mon Apr 28 08:02:07 2014 @@ -432,7 +432,7 @@ under the License. </request-map> <request-map uri="createProductionRun"> <security https="true" auth="true"/> - <event type="simple" path="component://manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunSimpleEvents.xml" invoke="createProductionRun"/> + <event type="simple" path="component://manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunSimpleEvents.xml" invoke="createProductionRun"/> <response name="createProductionRunsForProductBom" type="request" value="createProductionRunsForProductBom"/> <response name="createProductionRunSingle" type="request" value="createProductionRunSingle"/> </request-map> @@ -463,6 +463,15 @@ under the License. <security https="true" auth="true"/> <response name="success" type="view" value="PrintProductionRun"/> </request-map> + <request-map uri="LinkProductionRun"> + <security https="true" auth="true"/> + <response name="success" type="view" value="LinkProductionRun"/> + </request-map> + <request-map uri="createProductionRunAssoc"> + <security https="true" auth="true"/> + <event type="service" invoke="createProductionRunAssoc"/> + <response name="success" type="view" value="ProductionRunAssocs"/> + </request-map> <request-map uri="ManufacturingReports"> <security https="true" auth="true"/> <response name="success" type="view" value="ManufacturingReports"/> @@ -800,6 +809,7 @@ under the License. <view-map name="CreateProductionRun" page="component://manufacturing/widget/manufacturing/JobshopScreens.xml#CreateProductionRun" type="screen"/> <view-map name="FindProductionRun" page="component://manufacturing/widget/manufacturing/JobshopScreens.xml#FindProductionRun" type="screen"/> <view-map name="EditProductionRun" page="component://manufacturing/widget/manufacturing/JobshopScreens.xml#EditProductionRun" type="screen"/> + <view-map name="LinkProductionRun" page="component://manufacturing/widget/manufacturing/JobshopScreens.xml#LinkProductionRun" type="screen"/> <view-map name="PrintProductionRun" type="screenfop" page="component://manufacturing/widget/manufacturing/JobshopScreens.xml#ProductionRunPdf" content-type="application/pdf" encoding="none"/> <view-map name="ProductionRunDeclaration" page="component://manufacturing/widget/manufacturing/JobshopScreens.xml#ProductionRunDeclaration" type="screen"/> <view-map name="ProductionRunCosts" page="component://manufacturing/widget/manufacturing/JobshopScreens.xml#ProductionRunCosts" type="screen"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/widget/manufacturing/JobshopScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/widget/manufacturing/JobshopScreens.xml?rev=1590573&r1=1590572&r2=1590573&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/widget/manufacturing/JobshopScreens.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/widget/manufacturing/JobshopScreens.xml Mon Apr 28 08:02:07 2014 @@ -156,7 +156,6 @@ under the License. <actions> <set field="titleProperty" value="ManufacturingProductionRunDeclaration"/> <set field="tabButtonItem" value="declaration"/> - <!--<set field="labelTitleProperty" value="ProductProductBom"/>--> <set field="headerItem" value="jobshop"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> @@ -527,6 +526,28 @@ under the License. </widgets> </section> </screen> + <screen name="LinkProductionRun"> + <section> + <actions> + <set field="titleProperty" value="PageTitleProductionRunLink"/> + <set field="tabButtonItem" value="assocs"/> + <set field="headerItem" value="jobshop"/> + <set field="productionRunId" from-field="parameters.productionRunId"/> + <entity-one entity-name="WorkEffort" value-field="productionRun"> + <field-map field-name="workEffortId" from-field="productionRunId"/> + </entity-one> + </actions> + <widgets> + <decorator-screen name="CommonJobshopDecorator" location="${parameters.commonJobshopDecorator}"> + <decorator-section name="body"> + <screenlet title="${uiLabelMap.PageTitleProductionRunLink}"> + <include-form name="linkProductionRun" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> <screen name="FindProductionRun"> <section> <actions> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/widget/manufacturing/ManufacturingMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/widget/manufacturing/ManufacturingMenus.xml?rev=1590573&r1=1590572&r2=1590573&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/widget/manufacturing/ManufacturingMenus.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/widget/manufacturing/ManufacturingMenus.xml Mon Apr 28 08:02:07 2014 @@ -274,6 +274,11 @@ under the License. <parameter param-name="statusId" value="PRUN_SCHEDULED"/> </link> </menu-item> + <menu-item name="link" title="${uiLabelMap.ManufacturingLinkProductionRun}"> + <link target="LinkProductionRun"> + <parameter param-name="productionRunId"/> + </link> + </menu-item> <menu-item name="print" title="${uiLabelMap.CommonPrint}"> <link target="PrintProductionRun" target-window="_BLANK"> <parameter param-name="productionRunId"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml?rev=1590573&r1=1590572&r2=1590573&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml Mon Apr 28 08:02:07 2014 @@ -829,7 +829,7 @@ under the License. header-row-style="header-row" default-table-style="basic-table"> <field name="productionRunId"><hidden/></field> <field name="workEffortAssocTypeId"><hidden value="WORK_EFF_PRECEDENCY"/></field> - <field name="productionRunIdTo"> + <field name="productionRunIdTo" title="${uiLabelMap.ManufacturingProductionRunId}"> <drop-down allow-empty="false"> <entity-options entity-name="WorkEffort" key-field-name="workEffortId" description="[ID: ${workEffortId}] - ${workEffortName}"> <entity-constraint name="workEffortPurposeTypeId" value="WEPT_PRODUCTION_RUN"/> @@ -837,12 +837,7 @@ under the License. </entity-options> </drop-down> </field> - <!-- - <field name="productionRunLookup"> - <lookup target-form-name="LookupProductRun"/> - </field> - --> - <field name="workFlowSequenceTypeId"> + <field name="workFlowSequenceTypeId" title="${uiLabelMap.CommonType}"> <drop-down allow-empty="false"> <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}"> <entity-constraint name="enumTypeId" value="WORKFLOW"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml?rev=1590573&r1=1590572&r2=1590573&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml Mon Apr 28 08:02:07 2014 @@ -52,6 +52,7 @@ under the License. <simple-method method-name="deleteRequirement" short-description="Delete a requirement"> <entity-one entity-name="Requirement" value-field="requirement" auto-field-map="true"/> <check-errors/> + <remove-related value-field="requirement" relation-name="RequirementRole"/> <remove-related value-field="requirement" relation-name="RequirementCustRequest"/> <remove-value value-field="requirement"/> </simple-method> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy?rev=1590573&r1=1590572&r2=1590573&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy Mon Apr 28 08:02:07 2014 @@ -130,7 +130,10 @@ if (partyGroup) { } } } -context.logoImageUrl = logoImageUrl; +//If logoImageUrl not null then only set it to context else it will override the default value "/images/ofbiz_powered.gif" +if (logoImageUrl) { + context.logoImageUrl = logoImageUrl; +} // the company name companyName = "Default Company"; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl?rev=1590573&r1=1590572&r2=1590573&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl Mon Apr 28 08:02:07 2014 @@ -19,7 +19,7 @@ under the License. <#escape x as x?xml> <fo:block text-align="left"> - <#if logoImageUrl?has_content><fo:external-graphic src="<@ofbizContentUrl>${logoImageUrl}</@ofbizContentUrl>" overflow="hidden" height="40px" content-height="scale-to-fit"/></#if> + <#if logoImageUrl?has_content><fo:external-graphic src="<@ofbizContentUrl>${logoImageUrl}</@ofbizContentUrl>" overflow="hidden" height="40px" content-height="scale-to-fit" content-width="2.00in"/></#if> </fo:block> <fo:block font-size="8pt"> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl?rev=1590573&r1=1590572&r2=1590573&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl Mon Apr 28 08:02:07 2014 @@ -18,7 +18,7 @@ under the License. --> <#escape x as x?xml> <#if orderHeader?has_content> - <fo:table border-spacing="3pt"> + <fo:table table-layout="fixed" border-spacing="3pt"> <fo:table-column column-width="3in"/> <fo:table-column column-width="1in"/> <fo:table-column column-width="1in"/> @@ -29,7 +29,7 @@ under the License. <fo:table-cell> <fo:block font-weight="bold">${uiLabelMap.OrderProduct}</fo:block> </fo:table-cell> - <fo:table-cell></fo:table-cell> + <fo:table-cell><fo:block></fo:block></fo:table-cell> <fo:table-cell text-align="right"> <fo:block font-weight="bold">${uiLabelMap.OrderQuantity}</fo:block> </fo:table-cell> @@ -103,8 +103,8 @@ under the License. <#assign adjustmentAmount = Static["org.ofbiz.order.order.OrderReadHelper"].calcOrderAdjustment(orderHeaderAdjustment, orderSubTotal)> <#if adjustmentAmount != 0> <fo:table-row> - <fo:table-cell></fo:table-cell> - <fo:table-cell></fo:table-cell> + <fo:table-cell><fo:block></fo:block></fo:table-cell> + <fo:table-cell><fo:block></fo:block></fo:table-cell> <fo:table-cell number-columns-spanned="2"> <fo:block font-weight="bold"> ${adjustmentType.get("description",locale)} : @@ -121,8 +121,8 @@ under the License. </#list> <#-- summary of order amounts --> <fo:table-row> - <fo:table-cell></fo:table-cell> - <fo:table-cell></fo:table-cell> + <fo:table-cell><fo:block></fo:block></fo:table-cell> + <fo:table-cell><fo:block></fo:block></fo:table-cell> <fo:table-cell number-columns-spanned="2"> <fo:block font-weight="bold">${uiLabelMap.OrderItemsSubTotal}</fo:block> </fo:table-cell> @@ -132,8 +132,8 @@ under the License. </fo:table-row> <#if otherAdjAmount != 0> <fo:table-row> - <fo:table-cell></fo:table-cell> - <fo:table-cell></fo:table-cell> + <fo:table-cell><fo:block></fo:block></fo:table-cell> + <fo:table-cell><fo:block></fo:block></fo:table-cell> <fo:table-cell number-columns-spanned="2"> <fo:block font-weight="bold">${uiLabelMap.OrderTotalOtherOrderAdjustments}</fo:block> </fo:table-cell> @@ -144,8 +144,8 @@ under the License. </#if> <#if shippingAmount != 0> <fo:table-row> - <fo:table-cell></fo:table-cell> - <fo:table-cell></fo:table-cell> + <fo:table-cell><fo:block></fo:block></fo:table-cell> + <fo:table-cell><fo:block></fo:block></fo:table-cell> <fo:table-cell number-columns-spanned="2"> <fo:block font-weight="bold">${uiLabelMap.OrderTotalShippingAndHandling}</fo:block> </fo:table-cell> @@ -156,8 +156,8 @@ under the License. </#if> <#if taxAmount != 0> <fo:table-row> - <fo:table-cell></fo:table-cell> - <fo:table-cell></fo:table-cell> + <fo:table-cell><fo:block></fo:block></fo:table-cell> + <fo:table-cell><fo:block></fo:block></fo:table-cell> <fo:table-cell number-columns-spanned="2"> <fo:block font-weight="bold">${uiLabelMap.OrderTotalSalesTax}</fo:block> </fo:table-cell> @@ -168,8 +168,8 @@ under the License. </#if> <#if grandTotal != 0> <fo:table-row> - <fo:table-cell></fo:table-cell> - <fo:table-cell></fo:table-cell> + <fo:table-cell><fo:block></fo:block></fo:table-cell> + <fo:table-cell><fo:block></fo:block></fo:table-cell> <fo:table-cell number-columns-spanned="2" background-color="#EEEEEE"> <fo:block font-weight="bold">${uiLabelMap.OrderTotalDue}</fo:block> </fo:table-cell> @@ -197,10 +197,12 @@ under the License. <fo:block>${note.noteInfo?if_exists}</fo:block> </fo:table-cell> <fo:table-cell number-columns-spanned="2"> + <fo:block> <#if note.noteParty?has_content> <#assign notePartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", note.noteParty, "compareDate", note.noteDateTime, "lastNameFirst", "Y", "userLogin", userLogin))/> - <fo:block>${uiLabelMap.CommonBy}: ${notePartyNameResult.fullName?default("${uiLabelMap.OrderPartyNameNotFound}")}</fo:block> + ${uiLabelMap.CommonBy}: ${notePartyNameResult.fullName?default("${uiLabelMap.OrderPartyNameNotFound}")} </#if> + </fo:block> </fo:table-cell> <fo:table-cell number-columns-spanned="1"> <fo:block>${uiLabelMap.CommonAt}: ${note.noteDateTime?string?if_exists}</fo:block> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/orderReportConditions.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/orderReportConditions.fo.ftl?rev=1590573&r1=1590572&r2=1590573&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/orderReportConditions.fo.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/orderReportConditions.fo.ftl Mon Apr 28 08:02:07 2014 @@ -19,7 +19,7 @@ under the License. <#escape x as x?xml> <#if shipGroups?exists && shipGroups.size() gt 1> - <fo:table border-spacing="3pt" space-before="0.3in" font-size="9pt"> + <fo:table table-layout="fixed" border-spacing="3pt" space-before="0.3in" font-size="9pt"> <fo:table-column column-width="1in"/> <fo:table-column column-width="1in"/> <fo:table-column column-width="0.5in"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/orderReportHeaderInfo.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/orderReportHeaderInfo.fo.ftl?rev=1590573&r1=1590572&r2=1590573&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/orderReportHeaderInfo.fo.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/orderReportHeaderInfo.fo.ftl Mon Apr 28 08:02:07 2014 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> <#escape x as x?xml> - <fo:table> + <fo:table table-layout="fixed"> <fo:table-column column-width="2.0in"/> <fo:table-column column-width="2.0in"/> <fo:table-body> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/conversion/DateTimeConverters.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/conversion/DateTimeConverters.java?rev=1590573&r1=1590572&r2=1590573&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/conversion/DateTimeConverters.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/conversion/DateTimeConverters.java Mon Apr 28 08:02:07 2014 @@ -119,7 +119,11 @@ public class DateTimeConverters implemen } public java.sql.Date convert(java.util.Date obj) throws ConversionException { - return new java.sql.Date(obj.getTime()); + Calendar cal = Calendar.getInstance(); + cal.setTime(obj); + cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), cal.get(Calendar.DAY_OF_MONTH), 0, 0, 0); + cal.set(Calendar.MILLISECOND, 0); + return new java.sql.Date(cal.getTimeInMillis()); } } @@ -304,7 +308,11 @@ public class DateTimeConverters implemen } public java.sql.Date convert(Number obj) throws ConversionException { - return new java.sql.Date(obj.longValue()); + Calendar cal = Calendar.getInstance(); + cal.setTimeInMillis(obj.longValue()); + cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), cal.get(Calendar.DAY_OF_MONTH), 0, 0, 0); + cal.set(Calendar.MILLISECOND, 0); + return new java.sql.Date(cal.getTimeInMillis()); } } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/conversion/test/DateTimeTests.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/conversion/test/DateTimeTests.java?rev=1590573&r1=1590572&r2=1590573&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/conversion/test/DateTimeTests.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/conversion/test/DateTimeTests.java Mon Apr 28 08:02:07 2014 @@ -23,6 +23,8 @@ import org.ofbiz.base.conversion.DateTim import org.ofbiz.base.lang.SourceMonitored; import org.ofbiz.base.test.GenericTestCaseBase; +import com.ibm.icu.util.Calendar; + @SourceMonitored public class DateTimeTests extends GenericTestCaseBase { @@ -36,24 +38,38 @@ public class DateTimeTests extends Gener } public void testDateTimeConverters() throws Exception { + Calendar cal = Calendar.getInstance(); + long currentTime = cal.getTimeInMillis(); + cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), cal.get(Calendar.DAY_OF_MONTH), 0, 0, 0); + cal.set(Calendar.MILLISECOND, 0); + long longTime = cal.getTimeInMillis(); // Start of day today + assertNotEquals("currentTime and longTime are not equal", currentTime, longTime); + java.util.Date utilDate = new java.util.Date(longTime); + java.sql.Date sqlDate = new java.sql.Date(longTime); + java.sql.Timestamp timestamp = new java.sql.Timestamp(longTime); // Source class = java.util.Date - long currentTime = System.currentTimeMillis(); - java.util.Date utilDate = new java.util.Date(currentTime); - assertConversion("DateToLong", new DateTimeConverters.DateToLong(), utilDate, currentTime); - assertConversion("DateToSqlDate", new DateTimeConverters.DateToSqlDate(), utilDate, new java.sql.Date(currentTime)); + assertConversion("DateToLong", new DateTimeConverters.DateToLong(), utilDate, longTime); + assertConversion("DateToSqlDate", new DateTimeConverters.DateToSqlDate(), utilDate, new java.sql.Date(longTime)); assertConversion("DateToString", new DateTimeConverters.DateToString(), utilDate, utilDate.toString()); - //assertConversion("StringToDate", new DateTimeConverters.StringToDate(), utilDate.toString(), utilDate); - assertConversion("DateToTimestamp", new DateTimeConverters.DateToTimestamp(), utilDate, new java.sql.Timestamp(currentTime)); + assertConversion("DateToTimestamp", new DateTimeConverters.DateToTimestamp(), utilDate, timestamp); // Source class = java.sql.Date - java.sql.Date sqlDate = new java.sql.Date(currentTime); + assertConversion("SqlDateToLong", new DateTimeConverters.DateToLong(), sqlDate, longTime); assertConversion("SqlDateToDate", new DateTimeConverters.SqlDateToDate(), sqlDate, utilDate); assertConversion("SqlDateToString", new DateTimeConverters.SqlDateToString(), sqlDate, sqlDate.toString()); - //assertConversion("StringToSqlDate", new DateTimeConverters.StringToSqlDate(), sqlDate.toString(), sqlDate); - java.sql.Timestamp timestamp = new java.sql.Timestamp(currentTime); assertConversion("SqlDateToTimestamp", new DateTimeConverters.SqlDateToTimestamp(), sqlDate, timestamp); - assertConversion("StringToTimestamp", new DateTimeConverters.StringToTimestamp(), timestamp.toString(), timestamp); + // Source class = java.sql.Timestamp + assertConversion("TimestampToLong", new DateTimeConverters.DateToLong(), timestamp, longTime); assertConversion("TimestampToDate", new DateTimeConverters.TimestampToDate(), timestamp, utilDate); assertConversion("TimestampToSqlDate", new DateTimeConverters.TimestampToSqlDate(), timestamp, sqlDate); - //assertConversion("TimestampToString", new DateTimeConverters.TimestampToString(), timestamp, timestamp.toString()); + assertConversion("TimestampToString", new DateTimeConverters.TimestampToString(), timestamp, timestamp.toString()); + // Source class = java.lang.Long + assertConversion("LongToDate", new DateTimeConverters.NumberToDate(), longTime, utilDate); + assertConversion("LongToSqlDate", new DateTimeConverters.NumberToSqlDate(), longTime, sqlDate); + assertConversion("LongToSqlDate", new DateTimeConverters.NumberToSqlDate(), currentTime, sqlDate); //Test conversion to start of day + assertConversion("LongToTimestamp", new DateTimeConverters.NumberToTimestamp(), longTime, timestamp); + // Source class = java.lang.String + assertConversion("StringToTimestamp", new DateTimeConverters.StringToTimestamp(), timestamp.toString(), timestamp); + //assertConversion("StringToDate", new DateTimeConverters.StringToDate(), utilDate.toString(), utilDate); + //assertConversion("StringToSqlDate", new DateTimeConverters.StringToSqlDate(), sqlDate.toString(), sqlDate); } } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/test/ObjectTypeTests.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/test/ObjectTypeTests.java?rev=1590573&r1=1590572&r2=1590573&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/test/ObjectTypeTests.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/test/ObjectTypeTests.java Mon Apr 28 08:02:07 2014 @@ -297,7 +297,7 @@ public class ObjectTypeTests extends Gen simpleTypeConvertTestSingleMulti("Long->Integer", lng, new String[] {"Integer", "java.lang.Integer"}, intg); simpleTypeConvertTestSingleMulti("Long->List", lng, new String[] {"List", "List<java.lang.Long>", "java.util.List"}, list(lng)); simpleTypeConvertTestSingleMulti("Long->Set", lng, new String[] {"Set", "Set<java.lang.Long>", "java.util.Set"}, set(lng)); - simpleTypeConvertTestSingleMulti("Long->util.Date", 781L, new String[] {"Date", "java.util.Date"}, utlDt); + simpleTypeConvertTestSingleMulti("Long->java.util.Date", 781L, new String[] {"java.util.Date"}, utlDt); simpleTypeConvertTestSingleMulti("Long->Timestamp", lng, new String[] {"Timestamp", "java.sql.Timestamp"}, tstmp); simpleTypeConvertTestSingleMulti("Long->TimeDuration", Long.valueOf("3661001"), new String[] {"TimeDuration", "org.ofbiz.base.util.TimeDuration"}, duration); simpleTypeConvertTestError("Long->error", lng, new String[] {}); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/data/GeoData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/data/GeoData.xml?rev=1590573&r1=1590572&r2=1590573&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/data/GeoData.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/data/GeoData.xml Mon Apr 28 08:02:07 2014 @@ -42,7 +42,6 @@ under the License. <!-- Based on: ISO 3166 https://www.iso.org/obp/ui/#search - and http://www.iso.org/iso/home/standards/country_codes/country_names_and_code_elements.htm. See also: http://en.wikipedia.org/wiki/ISO_3166-1_alpha-3 http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2 http://en.wikipedia.org/wiki/ISO_3166-1_numeric Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/error.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/error.fo.ftl?rev=1590573&r1=1590572&r2=1590573&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/error.fo.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/error.fo.ftl Mon Apr 28 08:02:07 2014 @@ -56,7 +56,7 @@ under the License. <fo:table-cell> <#if logoImageUrl?exists> <fo:block> - <fo:external-graphic src="${logoImageUrl}" overflow="hidden" height="40px"/> + <fo:external-graphic src="${logoImageUrl}" overflow="hidden" height="40px" content-height="scale-to-fit"/> </fo:block> </#if> </fo:table-cell> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/simple.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/simple.fo.ftl?rev=1590573&r1=1590572&r2=1590573&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/simple.fo.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/simple.fo.ftl Mon Apr 28 08:02:07 2014 @@ -56,7 +56,7 @@ under the License. <fo:table-cell> <fo:block> <#if logoImageUrl?exists> - <fo:external-graphic src="${logoImageUrl}" overflow="hidden" height="40px"/> + <fo:external-graphic src="${logoImageUrl}" overflow="hidden" height="40px" content-height="scale-to-fit"/> </#if> </fo:block> </fo:table-cell> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/widget/CommonScreens.xml?rev=1590573&r1=1590572&r2=1590573&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/widget/CommonScreens.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/widget/CommonScreens.xml Mon Apr 28 08:02:07 2014 @@ -511,7 +511,7 @@ under the License. <section> <actions> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> - <set field="logoImageUrl" value="/images/ofbiz_logo.gif"/> + <set field="logoImageUrl" value="/images/ofbiz_logo.gif" global="true"/> <property-to-field resource="fop.properties" field="defaultFontFamily" property="fop.font.family" default="Arial"/> </actions> <widgets> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/GenericDelegator.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/GenericDelegator.java?rev=1590573&r1=1590572&r2=1590573&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/GenericDelegator.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/GenericDelegator.java Mon Apr 28 08:02:07 2014 @@ -261,6 +261,12 @@ public class GenericDelegator implements private void initializeOneGenericHelper(String groupName) { GenericHelperInfo helperInfo = this.getGroupHelperInfo(groupName); + if (helperInfo == null) { + if (Debug.infoOn()) { + Debug.logInfo("Delegator \"" + delegatorFullName + "\" NOT initializing helper for entity group \"" + groupName + "\" because the group is not associated to this delegator.", module); + } + return; + } String helperBaseName = helperInfo.getHelperBaseName(); if (Debug.infoOn()) { @@ -476,9 +482,7 @@ public class GenericDelegator implements GenericHelperInfo helperInfo = new GenericHelperInfo(entityGroupName, helperBaseName); // to avoid infinite recursion, and to behave right for shared org.ofbiz.tenant entities, do nothing with the tenantId if the entityGroupName=org.ofbiz.tenant - if (UtilValidate.isNotEmpty(this.delegatorTenantId) && !"org.ofbiz.tenant".equals(entityGroupName)) { - helperInfo.setTenantId(this.delegatorTenantId); - + if (UtilValidate.isNotEmpty(this.delegatorTenantId)) { // get the JDBC parameters from the DB for the entityGroupName and tenantId try { // NOTE: instead of caching the GenericHelpInfo object do a cached query here and create a new object each time, will avoid issues when the database data changes during run time @@ -486,15 +490,12 @@ public class GenericDelegator implements Delegator baseDelegator = DelegatorFactory.getDelegator(this.delegatorBaseName); GenericValue tenantDataSource = baseDelegator.findOne("TenantDataSource", true, "tenantId", this.delegatorTenantId, "entityGroupName", entityGroupName); if (tenantDataSource != null) { + helperInfo.setTenantId(this.delegatorTenantId); helperInfo.setOverrideJdbcUri(tenantDataSource.getString("jdbcUri")); helperInfo.setOverrideUsername(tenantDataSource.getString("jdbcUsername")); helperInfo.setOverridePassword(tenantDataSource.getString("jdbcPassword")); } else { - /* don't log this, happens too many times: - if (Debug.warningOn()) { - Debug.logWarning("Could not find TenantDataSource information for tenantId=[" + this.delegatorTenantId + "] and entityGroupName=[" + entityGroupName + "] in delegator [" + this.delegatorFullName + "]; will be defaulting to settings for the base delegator name [" + this.delegatorBaseName + "]", module); - } - */ + return null; } } catch (GenericEntityException e) { // don't complain about this too much, just log the error if there is one @@ -538,7 +539,7 @@ public class GenericDelegator implements if (helperInfo != null) { return GenericHelperFactory.getHelper(helperInfo); } else { - throw new GenericEntityException("There is no datasource (Helper) configured for the entity-group [" + this.getEntityGroupName(entityName) + "]; was trying to find datesource (helper) for entity [" + entityName + "]"); + throw new GenericEntityException("There is no datasource (Helper) configured for the entity-group [" + this.getEntityGroupName(entityName) + "]; was trying to find datasource (helper) for entity [" + entityName + "]"); } } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java?rev=1590573&r1=1590572&r2=1590573&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java Mon Apr 28 08:02:07 2014 @@ -273,6 +273,12 @@ public class EntityDataLoadContainer imp String delegatorNameToUse = overrideDelegator != null ? overrideDelegator : delegatorName; String groupNameToUse = overrideGroup != null ? overrideGroup : entityGroupName; Delegator delegator = DelegatorFactory.getDelegator(delegatorNameToUse); + Delegator baseDelegator = null; + if (delegator.getDelegatorTenantId() != null) { + baseDelegator = DelegatorFactory.getDelegator(delegator.getDelegatorBaseName()); + } else { + baseDelegator = delegator; + } if (delegator == null) { throw new ContainerException("Invalid delegator name!"); } @@ -295,11 +301,11 @@ public class EntityDataLoadContainer imp Collection<ComponentConfig> allComponents = ComponentConfig.getAllComponents(); for (ComponentConfig config : allComponents) { //Debug.logInfo("- Stored component : " + config.getComponentName(), module); - GenericValue componentEntry = delegator.makeValue("Component"); + GenericValue componentEntry = baseDelegator.makeValue("Component"); componentEntry.set("componentName", config.getComponentName()); componentEntry.set("rootLocation", config.getRootLocation()); try { - GenericValue componentCheck = delegator.findOne("Component", UtilMisc.toMap("componentName", config.getComponentName()), false); + GenericValue componentCheck = baseDelegator.findOne("Component", UtilMisc.toMap("componentName", config.getComponentName()), false); if (UtilValidate.isEmpty(componentCheck)) { componentEntry.create(); } else { @@ -316,7 +322,7 @@ public class EntityDataLoadContainer imp List<EntityExpr> exprs = new ArrayList<EntityExpr>(); exprs.add(EntityCondition.makeCondition("rootLocation", EntityOperator.NOT_LIKE, "%hot-deploy%")); EntityCondition cond = EntityCondition.makeCondition(exprs); - List<GenericValue> components = delegator.findList("Component", cond , null, UtilMisc.toList("lastUpdatedStamp"), null, false); + List<GenericValue> components = baseDelegator.findList("Component", cond , null, UtilMisc.toList("lastUpdatedStamp"), null, false); Debug.logInfo("===== Begin load specify components", module); if (UtilValidate.isEmpty(this.component)) { for (GenericValue component : components) { @@ -324,14 +330,14 @@ public class EntityDataLoadContainer imp //Debug.logInfo("- loaded default component : " + component.getString("componentName"), module); } Debug.logInfo("- Loaded components by default : " + components.size() + " components", module); - List<GenericValue> tenantComponents = delegator.findByAnd("TenantComponent", UtilMisc.toMap("tenantId", delegator.getDelegatorTenantId()), UtilMisc.toList("sequenceNum"), false); + List<GenericValue> tenantComponents = baseDelegator.findByAnd("TenantComponent", UtilMisc.toMap("tenantId", delegator.getDelegatorTenantId()), UtilMisc.toList("sequenceNum"), false); for (GenericValue tenantComponent : tenantComponents) { loadComponents.add(tenantComponent.getString("componentName")); //Debug.logInfo("- loaded component by tenantId : " + tenantComponent.getString("tenantId") +", component : " + tenantComponent.getString("componentName"), module); } Debug.logInfo("- Loaded components by tenantId : " + delegator.getDelegatorTenantId() + ", " + tenantComponents.size() + " components", module); } else { - List<GenericValue> tenantComponents = delegator.findByAnd("TenantComponent", UtilMisc.toMap("tenantId", delegator.getDelegatorTenantId(), "componentName", this.component), + List<GenericValue> tenantComponents = baseDelegator.findByAnd("TenantComponent", UtilMisc.toMap("tenantId", delegator.getDelegatorTenantId(), "componentName", this.component), UtilMisc.toList("sequenceNum"), false); for (GenericValue tenantComponent : tenantComponents) { loadComponents.add(tenantComponent.getString("componentName")); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/start/src/org/ofbiz/base/start/Config.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/start/src/org/ofbiz/base/start/Config.java?rev=1590573&r1=1590572&r2=1590573&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/start/src/org/ofbiz/base/start/Config.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/start/src/org/ofbiz/base/start/Config.java Mon Apr 28 08:02:07 2014 @@ -353,7 +353,7 @@ public class Config { if (args.length > 0) { for (String arg : args) { if (arg.toLowerCase().contains("portoffset=") && !arg.toLowerCase().contains("${portoffset}")) { - adminPort = adminPort != 0 ? adminPort : 10523; // This is necessary because the ASF machines don't allow ports 1 to 3, see INFRA-6790 + adminPort = adminPort == 0 ? adminPort : 10523; // This is necessary because the ASF machines don't allow ports 1 to 3, see INFRA-6790 adminPort += Integer.parseInt(arg.split("=")[1]); } } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/WEB-INF/actions/entity/EntityMaint.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/WEB-INF/actions/entity/EntityMaint.groovy?rev=1590573&r1=1590572&r2=1590573&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/WEB-INF/actions/entity/EntityMaint.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/WEB-INF/actions/entity/EntityMaint.groovy Mon Apr 28 08:02:07 2014 @@ -19,14 +19,24 @@ import javolution.util.FastList; import org.ofbiz.base.util.UtilValidate; -import org.ofbiz.entity.Delegator; +import org.ofbiz.entity.Delegator +import org.ofbiz.entity.DelegatorFactory +import org.ofbiz.entity.GenericValue +import org.ofbiz.entity.condition.EntityComparisonOperator +import org.ofbiz.entity.condition.EntityCondition; import org.ofbiz.entity.model.ModelGroupReader; import org.ofbiz.entity.model.ModelReader; import org.ofbiz.entity.model.ModelEntity; -import org.ofbiz.entity.model.ModelViewEntity; +import org.ofbiz.entity.model.ModelViewEntity +import org.ofbiz.entity.util.EntityUtil; -mgr = delegator.getModelGroupReader(); -entityGroups = mgr.getGroupNames(delegator.getDelegatorBaseName()).iterator(); +if (delegator.getDelegatorTenantId() == null) { + mgr = delegator.getModelGroupReader(); + entityGroups = mgr.getGroupNames(delegator.getDelegatorName()).toArray().sort(); +} else { + Delegator baseDelegator = DelegatorFactory.getDelegator(delegator.getDelegatorBaseName()); + entityGroups = EntityUtil.getFieldListFromEntityList(baseDelegator.findList("TenantDataSource", EntityCondition.makeCondition("tenantId", EntityComparisonOperator.EQUALS, delegator.getDelegatorTenantId()), ['entityGroupName'] as Set, ['entityGroupName'], null, false), 'entityGroupName', false); +} filterByGroupName = parameters.filterByGroupName; context.filterByGroupName = filterByGroupName; @@ -42,14 +52,17 @@ int kIdx = 0; entitiesList = []; entities.each { entityName -> entity = reader.getModelEntity(entityName); + entityGroupName = delegator.getEntityGroupName(entity.getEntityName()); - if (filterByGroupName && !filterByGroupName.equals(delegator.getEntityGroupName(entity.getEntityName()))) { + if (!entityGroups.contains(entityGroupName)) { + return; + } + if (filterByGroupName && !filterByGroupName.equals(entityGroupName)) { return; } if (filterByEntityName && !((String)entity.getEntityName()).toUpperCase().contains(filterByEntityName.toUpperCase())) { return; } - viewEntity = "N"; if (entity instanceof ModelViewEntity) { viewEntity = "Y"; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/data/scrumDemoData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/data/scrumDemoData.xml?rev=1590573&r1=1590572&r2=1590573&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/data/scrumDemoData.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/data/scrumDemoData.xml Mon Apr 28 08:02:07 2014 @@ -100,11 +100,11 @@ under the License. <UserLoginSecurityGroup userLoginId="scrumadmin" groupId="SCRUM_ADMIN" fromDate="2010-08-09 11:44:08.418"/> <!-- ContactMech Password of all E-mails are "aws12345"--> - <ContactMech contactMechId="SCRUM_CONTACT01" contactMechTypeId="EMAIL_ADDRESS" infoString="[hidden email]"/> - <ContactMech contactMechId="SCRUM_CONTACT02" contactMechTypeId="EMAIL_ADDRESS" infoString="[hidden email]"/> - <ContactMech contactMechId="SCRUM_CONTACT03" contactMechTypeId="EMAIL_ADDRESS" infoString="[hidden email]"/> - <ContactMech contactMechId="SCRUM_CONTACT04" contactMechTypeId="EMAIL_ADDRESS" infoString="[hidden email]"/> - <ContactMech contactMechId="SCRUM_CONTACT06" contactMechTypeId="EMAIL_ADDRESS" infoString="[hidden email]"/> + <ContactMech contactMechId="SCRUM_CONTACT01" contactMechTypeId="EMAIL_ADDRESS" infoString="[hidden email]"/> + <ContactMech contactMechId="SCRUM_CONTACT02" contactMechTypeId="EMAIL_ADDRESS" infoString="[hidden email]"/> + <ContactMech contactMechId="SCRUM_CONTACT03" contactMechTypeId="EMAIL_ADDRESS" infoString="[hidden email]"/> + <ContactMech contactMechId="SCRUM_CONTACT04" contactMechTypeId="EMAIL_ADDRESS" infoString="[hidden email]"/> + <ContactMech contactMechId="SCRUM_CONTACT06" contactMechTypeId="EMAIL_ADDRESS" infoString="[hidden email]"/> <PartyContactMech contactMechId="SCRUM_CONTACT01" fromDate="2010-09-24 00:00:00.0" partyId="DemoCustomer-1"/> <PartyContactMech contactMechId="SCRUM_CONTACT01" fromDate="2010-09-24 00:00:00.0" partyId="DemoCustomer-2"/> @@ -126,7 +126,7 @@ under the License. <PartyRole partyId="DemoScrumCompany" roleTypeId="PRODUCT_OWNER_COMP" lastUpdatedStamp="2010-11-17 14:50:12.197" lastUpdatedTxStamp="2010-11-17 14:50:11.775" createdStamp="2010-11-17 14:50:12.197" createdTxStamp="2010-11-17 14:50:11.775"/> <PartyGroup partyId="DemoScrumCompany" groupName="Demo Scrum Company"/> - <ContactMech contactMechId="SCRUM_CONTACT07" contactMechTypeId="EMAIL_ADDRESS" infoString="[hidden email]"/> + <ContactMech contactMechId="SCRUM_CONTACT07" contactMechTypeId="EMAIL_ADDRESS" infoString="[hidden email]"/> <PartyContactMech contactMechId="SCRUM_CONTACT07" fromDate="2010-09-24 00:00:00.0" partyId="DemoScrumCompany"/> <PartyContactMechPurpose partyId="DemoScrumCompany" contactMechId="SCRUM_CONTACT07" contactMechPurposeTypeId="SUPPORT_EMAIL" fromDate="2010-07-23 00:00:00.000"/> @@ -150,7 +150,7 @@ under the License. <PartyGroup partyId="DemoScrumCompany2" groupName="Demo Scrum Company 2"/> <PartyRelationship partyIdFrom="DemoScrumCompany2" roleTypeIdFrom="ACCOUNT" partyIdTo="DemoCustomer-2" roleTypeIdTo="CONTACT" fromDate="2010-07-23 00:00:00.000" partyRelationshipTypeId="EMPLOYMENT"/> - <ContactMech contactMechId="SCRUM_CONTACT08" contactMechTypeId="EMAIL_ADDRESS" infoString="[hidden email]"/> + <ContactMech contactMechId="SCRUM_CONTACT08" contactMechTypeId="EMAIL_ADDRESS" infoString="[hidden email]"/> <PartyContactMech contactMechId="SCRUM_CONTACT08" fromDate="2010-09-24 00:00:00.0" partyId="DemoScrumCompany2"/> <PartyContactMechPurpose partyId="DemoScrumCompany2" contactMechId="SCRUM_CONTACT08" contactMechPurposeTypeId="SUPPORT_EMAIL" fromDate="2010-07-23 00:00:00.000"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |