Modified: ofbiz/ofbiz-framework/trunk/applications/order/testdef/data/OrderTestData.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/testdef/data/OrderTestData.xml?rev=1830545&r1=1830544&r2=1830545&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/testdef/data/OrderTestData.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/testdef/data/OrderTestData.xml Mon Apr 30 10:52:55 2018 @@ -30,8 +30,8 @@ under the License. <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_CONFIRM" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNotice" xslfoAttachScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNoticePdf" subject="OFBiz Demo - Order Confirmation #${orderId}" bccAddress="[email protected]" fromAddress="[email protected]"/> <!--Demo data for a sales order --> - <OrderHeader orderId="TEST_DEMO10090" orderTypeId="SALES_ORDER" orderName="" salesChannelEnumId="WEB_SALES_CHANNEL" orderDate="2008-04-23 16:49:27.392" entryDate="2008-04-23 16:49:27.392" priority="2" visitId="10002" statusId="ORDER_APPROVED" currencyUom="USD" productStoreId="9000" remainingSubTotal="38.40" grandTotal="50.85" invoicePerShipment="Y"/> - <OrderItem orderId="TEST_DEMO10090" orderItemSeqId="00001" orderItemTypeId="PRODUCT_ORDER_ITEM" productId="GZ-2644" prodCatalogId="DemoCatalog" isPromo="N" quantity="2.0" selectedAmount="0.0" unitPrice="38.4" unitListPrice="48.0" isModifiedPrice="N" itemDescription="Round Gizmo" correspondingPoId="" statusId="ITEM_APPROVED"/> + <OrderHeader orderId="TEST_DEMO10090" orderTypeId="SALES_ORDER" salesChannelEnumId="WEB_SALES_CHANNEL" orderDate="2008-04-23 16:49:27.392" entryDate="2008-04-23 16:49:27.392" priority="2" visitId="10002" statusId="ORDER_APPROVED" currencyUom="USD" productStoreId="9000" remainingSubTotal="38.40" grandTotal="50.85" invoicePerShipment="Y"/> + <OrderItem orderId="TEST_DEMO10090" orderItemSeqId="00001" orderItemTypeId="PRODUCT_ORDER_ITEM" productId="GZ-2644" prodCatalogId="DemoCatalog" isPromo="N" quantity="2.0" selectedAmount="0.0" unitPrice="38.4" unitListPrice="48.0" isModifiedPrice="N" itemDescription="Round Gizmo" statusId="ITEM_APPROVED"/> <Party partyId="TestDemoCustomer" partyTypeId="PERSON" statusId="PARTY_ENABLED"/> <Person partyId="TestDemoCustomer" firstName="Test" lastName="Customer"/>
Modified: ofbiz/ofbiz-framework/trunk/applications/party/data/PartyPortletData.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/data/PartyPortletData.xml?rev=1830545&r1=1830544&r2=1830545&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/party/data/PartyPortletData.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/party/data/PartyPortletData.xml Mon Apr 30 10:52:55 2018 @@ -40,8 +40,7 @@ under the License. <PortalPortlet portalPortletId="PartyIdentifications" portletName="Party Identification" screenName="PartyIdentifications" screenLocation="component://party/widget/partymgr/ProfileScreens.xml" - description="Identification associate to a party" - screenshot=""/> + description="Identification associate to a party"/> <PortletPortletCategory portalPortletId="PartyIdentifications" portletCategoryId="PARTY_PROFILE"/> <PortalPortlet portalPortletId="AvsSettings" portletName="Avs Settings" Modified: ofbiz/ofbiz-framework/trunk/applications/party/data/PartyTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/data/PartyTypeData.xml?rev=1830545&r1=1830544&r2=1830545&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/party/data/PartyTypeData.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/party/data/PartyTypeData.xml Mon Apr 30 10:52:55 2018 @@ -19,21 +19,21 @@ under the License. --> <entity-engine-xml> - <AgreementItemType agreementItemTypeId="SUBAGREEMENT" description="Sub-Agreement" hasTable="N" parentTypeId=""/> - <AgreementItemType agreementItemTypeId="AGREEMENT_EXHIBIT" description="Exhibit" hasTable="N" parentTypeId=""/> - <AgreementItemType agreementItemTypeId="AGREEMENT_PRICING_PR" description="Pricing" hasTable="N" parentTypeId=""/> - <AgreementItemType agreementItemTypeId="AGREEMENT_SECTION" description="Section" hasTable="N" parentTypeId=""/> - <AgreementItemType agreementItemTypeId="AGREEMENT_COMMISSION" description="Commission Rate" hasTable="N" parentTypeId=""/> + <AgreementItemType agreementItemTypeId="SUBAGREEMENT" description="Sub-Agreement" hasTable="N"/> + <AgreementItemType agreementItemTypeId="AGREEMENT_EXHIBIT" description="Exhibit" hasTable="N"/> + <AgreementItemType agreementItemTypeId="AGREEMENT_PRICING_PR" description="Pricing" hasTable="N"/> + <AgreementItemType agreementItemTypeId="AGREEMENT_SECTION" description="Section" hasTable="N"/> + <AgreementItemType agreementItemTypeId="AGREEMENT_COMMISSION" description="Commission Rate" hasTable="N"/> - <AgreementType agreementTypeId="PRODUCT_AGREEMENT" description="Product" hasTable="N" parentTypeId=""/> + <AgreementType agreementTypeId="PRODUCT_AGREEMENT" description="Product" hasTable="N"/> <AgreementType agreementTypeId="PURCHASE_AGREEMENT" description="Purchase" hasTable="N" parentTypeId="PRODUCT_AGREEMENT"/> <AgreementType agreementTypeId="SALES_AGREEMENT" description="Sales" hasTable="N" parentTypeId="PRODUCT_AGREEMENT"/> - <AgreementType agreementTypeId="EMPLOYMENT_AGREEMENT" description="Employment" hasTable="N" parentTypeId=""/> - <AgreementType agreementTypeId="OTHER_AGREEMENT" description="Other" hasTable="N" parentTypeId=""/> - <AgreementType agreementTypeId="COMMISSION_AGREEMENT" description="Commission" hasTable="N" parentTypeId=""/> - <AgreementType agreementTypeId="EULA" description="End User License Agreement" hasTable="N" parentTypeId=""/> + <AgreementType agreementTypeId="EMPLOYMENT_AGREEMENT" description="Employment" hasTable="N"/> + <AgreementType agreementTypeId="OTHER_AGREEMENT" description="Other" hasTable="N"/> + <AgreementType agreementTypeId="COMMISSION_AGREEMENT" description="Commission" hasTable="N"/> + <AgreementType agreementTypeId="EULA" description="End User License Agreement" hasTable="N"/> <!-- Agreement content type--> - <AgreementContentType agreementContentTypeId="CONTRACT" description="Contract" hasTable="N" parentTypeId=""/> + <AgreementContentType agreementContentTypeId="CONTRACT" description="Contract" hasTable="N"/> </entity-engine-xml> Modified: ofbiz/ofbiz-framework/trunk/applications/product/testdef/data/IssuanceTestData.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/testdef/data/IssuanceTestData.xml?rev=1830545&r1=1830544&r2=1830545&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/testdef/data/IssuanceTestData.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/testdef/data/IssuanceTestData.xml Mon Apr 30 10:52:55 2018 @@ -21,9 +21,9 @@ under the License. <entity-engine-xml> <!-- An order that needs stock from two inventory items --> - <OrderHeader createdBy="admin" currencyUom="USD" entryDate="2011-08-12 23:17:11.507" grandTotal="105.14" orderId="DEMO81015" orderName="" orderTypeId="SALES_ORDER" priority="2" productStoreId="9000" remainingSubTotal="79.56" salesChannelEnumId="WEB_SALES_CHANNEL" statusId="ORDER_APPROVED" visitId="10043"/> + <OrderHeader createdBy="admin" currencyUom="USD" entryDate="2011-08-12 23:17:11.507" grandTotal="105.14" orderId="DEMO81015" orderTypeId="SALES_ORDER" priority="2" productStoreId="9000" remainingSubTotal="79.56" salesChannelEnumId="WEB_SALES_CHANNEL" statusId="ORDER_APPROVED" visitId="10043"/> - <OrderItem changeByUserLoginId="admin" correspondingPoId="" isModifiedPrice="N" isPromo="N" itemDescription="Round Gizmo" orderId="DEMO81015" orderItemSeqId="00001" orderItemTypeId="PRODUCT_ORDER_ITEM" prodCatalogId="DemoCatalog" productId="GZ-2644" quantity="6.000000" selectedAmount="0.000000" statusId="ITEM_APPROVED" unitListPrice="48.000" unitPrice="38.400"/> + <OrderItem changeByUserLoginId="admin" isModifiedPrice="N" isPromo="N" itemDescription="Round Gizmo" orderId="DEMO81015" orderItemSeqId="00001" orderItemTypeId="PRODUCT_ORDER_ITEM" prodCatalogId="DemoCatalog" productId="GZ-2644" quantity="6.000000" selectedAmount="0.000000" statusId="ITEM_APPROVED" unitListPrice="48.000" unitPrice="38.400"/> <OrderContactMech contactMechId="9021" contactMechPurposeTypeId="ORDER_EMAIL" orderId="DEMO81015"/> <OrderContactMech contactMechId="9010" contactMechPurposeTypeId="SHIPPING_LOCATION" orderId="DEMO81015"/> @@ -36,7 +36,7 @@ under the License. <OrderPaymentPreference createdByUserLogin="admin" createdDate="2011-08-12 23:17:11.789" maxAmount="105.14" orderId="DEMO81015" orderPaymentPreferenceId="10020" overflowFlag="N" paymentMethodTypeId="EXT_OFFLINE" presentFlag="N" statusId="PAYMENT_NOT_RECEIVED" swipedFlag="N"/> - <OrderItemShipGroup carrierPartyId="UPS" carrierRoleTypeId="CARRIER" contactMechId="9010" giftMessage="" isGift="N" maySplit="N" orderId="DEMO81015" shipGroupSeqId="00001" shipmentMethodTypeId="NEXT_DAY" shippingInstructions=""/> + <OrderItemShipGroup carrierPartyId="UPS" carrierRoleTypeId="CARRIER" contactMechId="9010" isGift="N" maySplit="N" orderId="DEMO81015" shipGroupSeqId="00001" shipmentMethodTypeId="NEXT_DAY"/> <OrderItemShipGroupAssoc orderId="DEMO81015" orderItemSeqId="00001" quantity="6.000000" shipGroupSeqId="00001"/> Modified: ofbiz/ofbiz-framework/trunk/applications/product/testdef/data/ProductPriceTestData.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/testdef/data/ProductPriceTestData.xml?rev=1830545&r1=1830544&r2=1830545&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/testdef/data/ProductPriceTestData.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/testdef/data/ProductPriceTestData.xml Mon Apr 30 10:52:55 2018 @@ -25,9 +25,9 @@ under the License. <Product productId="DemoProduct-2" productTypeId="FINISHED_GOOD" productName="Demo Product 2" isVirtual="N" isVariant="Y" createdDate="2006-03-23 23:05:32.915" salesDiscontinuationDate="2007-03-23 23:05:32.915"/> <Product productId="DemoProduct-3" productTypeId="FINISHED_GOOD" productName="Demo Product 3" isVirtual="N" isVariant="Y" createdDate="2006-03-23 23:05:32.915" /> - <ProductAssoc fromDate="2006-05-13 12:00:00.0" productAssocTypeId="PRODUCT_VARIANT" productId="DemoProduct" productIdTo="DemoProduct-2" quantity="1.0" reason=""/> - <ProductAssoc fromDate="2006-05-13 12:00:00.0" productAssocTypeId="PRODUCT_VARIANT" productId="DemoProduct" productIdTo="DemoProduct-2" quantity="1.0" reason=""/> - <ProductAssoc fromDate="2006-05-13 12:00:00.0" productAssocTypeId="PRODUCT_VARIANT" productId="DemoProduct" productIdTo="DemoProduct-3" quantity="1.0" reason=""/> + <ProductAssoc fromDate="2006-05-13 12:00:00.0" productAssocTypeId="PRODUCT_VARIANT" productId="DemoProduct" productIdTo="DemoProduct-2" quantity="1.0"/> + <ProductAssoc fromDate="2006-05-13 12:00:00.0" productAssocTypeId="PRODUCT_VARIANT" productId="DemoProduct" productIdTo="DemoProduct-2" quantity="1.0"/> + <ProductAssoc fromDate="2006-05-13 12:00:00.0" productAssocTypeId="PRODUCT_VARIANT" productId="DemoProduct" productIdTo="DemoProduct-3" quantity="1.0"/> <ProductPrice productId="DemoProduct-1" productPricePurposeId="PURCHASE" productPriceTypeId="DEFAULT_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2006-05-13 12:00:00.0" price="15.00" createdDate="2006-05-13 12:00:00.0" lastModifiedDate="2006-05-13 12:00:00.0"/> <ProductPrice productId="DemoProduct-2" productPricePurposeId="PURCHASE" productPriceTypeId="DEFAULT_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2006-05-13 12:00:00.0" price="5.00" createdDate="2006-05-13 12:00:00.0" lastModifiedDate="2006-05-13 12:00:00.0"/> Modified: ofbiz/ofbiz-framework/trunk/applications/workeffort/data/WorkEffortTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/data/WorkEffortTypeData.xml?rev=1830545&r1=1830544&r2=1830545&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/workeffort/data/WorkEffortTypeData.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/workeffort/data/WorkEffortTypeData.xml Mon Apr 30 10:52:55 2018 @@ -39,7 +39,7 @@ under the License. <StatusItem description="Unassigned" sequenceId="03" statusCode="UNASSIGNED" statusId="PRTYASGN_UNASSIGNED" statusTypeId="PRTYASGN_STATUS"/> <!-- Status items for WorkEffortPartyAssignment.availabilityStatusId --> - <StatusType description="Work Effort Party Availability" hasTable="N" parentTypeId="" statusTypeId="WEPA_AVAILABILITY"/> + <StatusType description="Work Effort Party Availability" hasTable="N" statusTypeId="WEPA_AVAILABILITY"/> <StatusItem description="Available" sequenceId="01" statusCode="AVAILABLE" statusId="WEPA_AV_AVAILABLE" statusTypeId="WEPA_AVAILABILITY"/> <StatusItem description="Busy" sequenceId="02" statusCode="BUSY" statusId="WEPA_AV_BUSY" statusTypeId="WEPA_AVAILABILITY"/> <StatusItem description="Away" sequenceId="03" statusCode="AWAY" statusId="WEPA_AV_AWAY" statusTypeId="WEPA_AVAILABILITY"/> @@ -55,23 +55,23 @@ under the License. <StatusItem description="Available" sequenceId="01" statusCode="AVAILABLE" statusId="WEFA_AVAILABLE" statusTypeId="WEFA_AVAILABILITY"/> <StatusItem description="In Use" sequenceId="02" statusCode="BUSY" statusId="WEFA_IN_USE" statusTypeId="WEFA_AVAILABILITY"/> - <WorkEffortContentType workEffortContentTypeId="PROJECT_DISCUSSION" description="Project Discussion" parentTypeId=""/> - <WorkEffortContentType workEffortContentTypeId="PROJECT_UPDATE" description="Project Update" parentTypeId=""/> - <WorkEffortContentType workEffortContentTypeId="PROJECT_SPEC" description="Project Specification" parentTypeId=""/> + <WorkEffortContentType workEffortContentTypeId="PROJECT_DISCUSSION" description="Project Discussion"/> + <WorkEffortContentType workEffortContentTypeId="PROJECT_UPDATE" description="Project Update"/> + <WorkEffortContentType workEffortContentTypeId="PROJECT_SPEC" description="Project Specification"/> <WorkEffortPurposeType description="Project" workEffortPurposeTypeId="WEPT_PROJECT"/> <WorkEffortPurposeType description="Phase" workEffortPurposeTypeId="WEPT_PHASE"/> - <WorkEffortType description="Workflow Process" hasTable="N" parentTypeId="" workEffortTypeId="WORK_FLOW"/> - <WorkEffortType description="Workflow Activity" hasTable="N" parentTypeId="" workEffortTypeId="ACTIVITY"/> - <WorkEffortType description="Task" hasTable="N" parentTypeId="" workEffortTypeId="TASK"/> - <WorkEffortType description="Milestone" hasTable="N" parentTypeId="" workEffortTypeId="MILESTONE"/> - <WorkEffortType description="Available" hasTable="N" parentTypeId="" workEffortTypeId="AVAILABLE"/> - <WorkEffortType description="Program" hasTable="N" parentTypeId="" workEffortTypeId="PROGRAM"/> - <WorkEffortType description="Project" hasTable="N" parentTypeId="" workEffortTypeId="PROJECT"/> - <WorkEffortType description="Project Phase" hasTable="N" parentTypeId="" workEffortTypeId="PHASE"/> + <WorkEffortType description="Workflow Process" hasTable="N" workEffortTypeId="WORK_FLOW"/> + <WorkEffortType description="Workflow Activity" hasTable="N" workEffortTypeId="ACTIVITY"/> + <WorkEffortType description="Task" hasTable="N" workEffortTypeId="TASK"/> + <WorkEffortType description="Milestone" hasTable="N" workEffortTypeId="MILESTONE"/> + <WorkEffortType description="Available" hasTable="N" workEffortTypeId="AVAILABLE"/> + <WorkEffortType description="Program" hasTable="N" workEffortTypeId="PROGRAM"/> + <WorkEffortType description="Project" hasTable="N" workEffortTypeId="PROJECT"/> + <WorkEffortType description="Project Phase" hasTable="N" workEffortTypeId="PHASE"/> <!-- WorkEffort Email Template Settings --> - <EmailTemplateSetting emailTemplateSettingId="WEFF_EVENT_REMINDER" description="" fromAddress="[email protected]" subject="Event Reminder" + <EmailTemplateSetting emailTemplateSettingId="WEFF_EVENT_REMINDER" fromAddress="[email protected]" subject="Event Reminder" bodyScreenLocation="component://workeffort/widget/WorkEffortScreens.xml#WorkEffortEventReminderEmail"/> </entity-engine-xml> Modified: ofbiz/ofbiz-framework/trunk/framework/common/data/CommonPortletData.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/data/CommonPortletData.xml?rev=1830545&r1=1830544&r2=1830545&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/common/data/CommonPortletData.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/common/data/CommonPortletData.xml Mon Apr 30 10:52:55 2018 @@ -19,15 +19,15 @@ --> <entity-engine-xml> <PortletCategory portletCategoryId="GENERIC_PORTLET" description="Generics portlets usable for easily parametrize portalPages"/> - <PortalPortlet portalPortletId="GenericPortalPage" portletName="Sub PortalPage" screenName="GenericPortalPage" screenLocation="component://common/widget/PortalPageScreens.xml" editFormName="GenericPortalPageParam" editFormLocation="component://common/widget/PortletEditForms.xml" description="a portlet which included a portalPage to be able to have multiple line, each line being a sub page. This portlet has 1 mandatory parameters." securityServiceName="" securityMainAction="VIEW"/> + <PortalPortlet portalPortletId="GenericPortalPage" portletName="Sub PortalPage" screenName="GenericPortalPage" screenLocation="component://common/widget/PortalPageScreens.xml" editFormName="GenericPortalPageParam" editFormLocation="component://common/widget/PortletEditForms.xml" description="a portlet which included a portalPage to be able to have multiple line, each line being a sub page. This portlet has 1 mandatory parameters." securityMainAction="VIEW"/> <PortletPortletCategory portalPortletId="GenericPortalPage" portletCategoryId="GENERIC_PORTLET"/> - <PortalPortlet portalPortletId="FindGenericEntity" portletName="Entity List simple search criteria" screenName="FindGenericEntity" screenLocation="component://common/widget/PortalPageScreens.xml" editFormName="FindGenericEntityParam" editFormLocation="component://common/widget/PortletEditForms.xml" description="Simple search criteria, only Id (param idName) and description for entityList, result is sent to List${Entity}Area (FindGenericEntityPrtl define this area). This portel has 3 mandatory parameters." securityServiceName="" securityMainAction="VIEW"/> + <PortalPortlet portalPortletId="FindGenericEntity" portletName="Entity List simple search criteria" screenName="FindGenericEntity" screenLocation="component://common/widget/PortalPageScreens.xml" editFormName="FindGenericEntityParam" editFormLocation="component://common/widget/PortletEditForms.xml" description="Simple search criteria, only Id (param idName) and description for entityList, result is sent to List${Entity}Area (FindGenericEntityPrtl define this area). This portel has 3 mandatory parameters." securityMainAction="VIEW"/> <PortletPortletCategory portalPortletId="FindGenericEntity" portletCategoryId="GENERIC_PORTLET"/> - <PortalPortlet portalPortletId="GenericScreenlet" portletName="Screenlet with one screen" screenName="GenericScreenlet" screenLocation="component://common/widget/PortalPageScreens.xml" editFormName="GenericScreenletParam" editFormLocation="component://common/widget/PortletEditForms.xml" description="Simple portlet using screenlet, with one screen. This portlet has 3 mandatory parameters." securityServiceName="" securityMainAction="VIEW"/> + <PortalPortlet portalPortletId="GenericScreenlet" portletName="Screenlet with one screen" screenName="GenericScreenlet" screenLocation="component://common/widget/PortalPageScreens.xml" editFormName="GenericScreenletParam" editFormLocation="component://common/widget/PortletEditForms.xml" description="Simple portlet using screenlet, with one screen. This portlet has 3 mandatory parameters." securityMainAction="VIEW"/> <PortletPortletCategory portalPortletId="GenericScreenlet" portletCategoryId="GENERIC_PORTLET"/> - <PortalPortlet portalPortletId="GenericScreenletAjax" portletName="Screenlet with one screen called by ajax" screenName="GenericScreenletAjax" screenLocation="component://common/widget/PortalPageScreens.xml" editFormName="GenericScreenletAjaxParam" editFormLocation="component://common/widget/PortletEditForms.xml" description="Simple portlet using screenlet, with one screen which was update by ajax process, so with a div. This portlet has 4 mandatory parameters." securityServiceName="" securityMainAction="VIEW"/> + <PortalPortlet portalPortletId="GenericScreenletAjax" portletName="Screenlet with one screen called by ajax" screenName="GenericScreenletAjax" screenLocation="component://common/widget/PortalPageScreens.xml" editFormName="GenericScreenletAjaxParam" editFormLocation="component://common/widget/PortletEditForms.xml" description="Simple portlet using screenlet, with one screen which was update by ajax process, so with a div. This portlet has 4 mandatory parameters." securityMainAction="VIEW"/> <PortletPortletCategory portalPortletId="GenericScreenletAjax" portletCategoryId="GENERIC_PORTLET"/> - <PortalPortlet portalPortletId="GricScltAjaxWithMenu" portletName="Screenlet with one screen, and one menu called by ajax" screenName="GenericScreenletAjaxWithMenu" screenLocation="component://common/widget/PortalPageScreens.xml" editFormName="GenericScreenletAjaxWithMenuParam" editFormLocation="component://common/widget/PortletEditForms.xml" description="Simple portlet using screenlet with a menu, with one screen which was update by ajax process, so with a div. This portlet has 6 mandatory parameters." securityServiceName="" securityMainAction="VIEW"/> + <PortalPortlet portalPortletId="GricScltAjaxWithMenu" portletName="Screenlet with one screen, and one menu called by ajax" screenName="GenericScreenletAjaxWithMenu" screenLocation="component://common/widget/PortalPageScreens.xml" editFormName="GenericScreenletAjaxWithMenuParam" editFormLocation="component://common/widget/PortletEditForms.xml" description="Simple portlet using screenlet with a menu, with one screen which was update by ajax process, so with a div. This portlet has 6 mandatory parameters." securityMainAction="VIEW"/> <PortletPortletCategory portalPortletId="GricScltAjaxWithMenu" portletCategoryId="GENERIC_PORTLET"/> <PortalPage portalPageId="_NA_" sequenceNum="000" portalPageName="For using genericPortletScreen" description="To be able to have parameters at the portlet level, not PortletPage level" ownerUserLoginId="_NA_"/> </entity-engine-xml> Modified: ofbiz/ofbiz-framework/trunk/framework/common/data/CommonSystemPropertyData.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/data/CommonSystemPropertyData.xml?rev=1830545&r1=1830544&r2=1830545&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/common/data/CommonSystemPropertyData.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/common/data/CommonSystemPropertyData.xml Mon Apr 30 10:52:55 2018 @@ -22,12 +22,12 @@ <SystemProperty systemResourceId="general" systemPropertyId="VISUAL_THEME" systemPropertyValue="RAINBOWSTONE_SAPHIR" description="ID of the VisualTheme to use if there is no VISUAL_THEME UserPreference record for the current user (ie default value)"/> <SystemProperty systemResourceId="general" systemPropertyId="currency.uom.id.default" systemPropertyValue="USD" description="The default currency to use for prices, etc"/> <SystemProperty systemResourceId="general" systemPropertyId="country.geo.id.default" systemPropertyValue="USA" description="the default country for drop downs"/> - <SystemProperty systemResourceId="general" systemPropertyId="partner.trackingCodeId.default" systemPropertyValue="" description="the default trackingCodeId to use for Partner Managed Tracking Codes"/> + <SystemProperty systemResourceId="general" systemPropertyId="partner.trackingCodeId.default" description="the default trackingCodeId to use for Partner Managed Tracking Codes"/> <SystemProperty systemResourceId="general" systemPropertyId="defaultFromEmailAddress" systemPropertyValue="[email protected]" description="general default 'fromEmailAddress' can be overridden in: EmailTemplateSetting"/> <SystemProperty systemResourceId="general" systemPropertyId="mail.notifications.enabled" systemPropertyValue="N" description="mail notifications enabled (Y|N)"/> - <SystemProperty systemResourceId="general" systemPropertyId="mail.smtp.relay.host" systemPropertyValue="" description="the default mail server to use"/> - <SystemProperty systemResourceId="general" systemPropertyId="mail.smtp.auth.user" systemPropertyValue="" description="SMTP Auth username setting"/> - <SystemProperty systemResourceId="general" systemPropertyId="mail.smtp.auth.password" systemPropertyValue="" description="SMTP Auth password setting"/> + <SystemProperty systemResourceId="general" systemPropertyId="mail.smtp.relay.host" description="the default mail server to use"/> + <SystemProperty systemResourceId="general" systemPropertyId="mail.smtp.auth.user" description="SMTP Auth username setting"/> + <SystemProperty systemResourceId="general" systemPropertyId="mail.smtp.auth.password" description="SMTP Auth password setting"/> <SystemProperty systemResourceId="general" systemPropertyId="mail.smtp.port" systemPropertyValue="465" description="Gmail smtp port can be either 465 or 587"/> <SystemProperty systemResourceId="general" systemPropertyId="mail.smtp.starttls.enable" systemPropertyValue="true" description="Gmail requires StartTLS"/> <SystemProperty systemResourceId="general" systemPropertyId="mail.smtp.socketFactory.port" systemPropertyValue="465" description="Port needs to be the same as mail.smtp.port"/> Modified: ofbiz/ofbiz-framework/trunk/framework/common/data/CommonTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/data/CommonTypeData.xml?rev=1830545&r1=1830544&r2=1830545&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/common/data/CommonTypeData.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/common/data/CommonTypeData.xml Mon Apr 30 10:52:55 2018 @@ -52,7 +52,7 @@ under the License. <Enumeration enumId="_NA_" enumTypeId="_NA_" enumCode="_NA_" sequenceId="0" description="Not Applicable"/> <Enumeration enumId="_00_" enumTypeId="_NA_" enumCode="_00_" sequenceId="0" description="Not Applicable"/> - <EnumerationType description="Thesaurus Relationship Type" enumTypeId="KW_THES_REL" hasTable="N" parentTypeId=""/> + <EnumerationType description="Thesaurus Relationship Type" enumTypeId="KW_THES_REL" hasTable="N"/> <Enumeration description="Used For" enumCode="UF" enumId="KWTR_UF" sequenceId="01" enumTypeId="KW_THES_REL"/> <Enumeration description="Use Instead" enumCode="USE" enumId="KWTR_USE" sequenceId="02" enumTypeId="KW_THES_REL"/> <Enumeration description="Correct Spelling" enumCode="CS" enumId="KWTR_CS" sequenceId="03" enumTypeId="KW_THES_REL"/> @@ -65,22 +65,22 @@ under the License. <Enumeration description="Lang: French" enumCode="LANG_FR" enumId="KWTR_LANG_FR" sequenceId="22" enumTypeId="KW_THES_REL"/> <!-- sync status --> - <StatusType description="Synchronize" hasTable="N" parentTypeId="" statusTypeId="SYNCHRONIZE_STATUS"/> + <StatusType description="Synchronize" hasTable="N" statusTypeId="SYNCHRONIZE_STATUS"/> <StatusItem description="Not-Synchronized" sequenceId="01" statusCode="NOT_SYNCHRONIZED" statusId="NOT_SYNCHRONIZED" statusTypeId="SYNCHRONIZE_STATUS"/> <StatusItem description="Synchronized" sequenceId="02" statusCode="SYNCHRONIZED" statusId="SYNCHRONIZED" statusTypeId="SYNCHRONIZE_STATUS"/> - <UomType description="Currency" hasTable="N" parentTypeId="" uomTypeId="CURRENCY_MEASURE"/> - <UomType description="Data Size" hasTable="N" parentTypeId="" uomTypeId="DATA_MEASURE"/> - <UomType description="Data Speed" hasTable="N" parentTypeId="" uomTypeId="DATASPD_MEASURE"/> - <UomType description="Time/Frequency" hasTable="N" parentTypeId="" uomTypeId="TIME_FREQ_MEASURE"/> - <UomType description="Length" hasTable="N" parentTypeId="" uomTypeId="LENGTH_MEASURE"/> - <UomType description="Area" hasTable="N" parentTypeId="" uomTypeId="AREA_MEASURE"/> - <UomType description="Liquid Volume" hasTable="N" parentTypeId="" uomTypeId="VOLUME_LIQ_MEASURE"/> - <UomType description="Dry Volume" hasTable="N" parentTypeId="" uomTypeId="VOLUME_DRY_MEASURE"/> - <UomType description="Weight" hasTable="N" parentTypeId="" uomTypeId="WEIGHT_MEASURE"/> - <UomType description="Energy" hasTable="N" parentTypeId="" uomTypeId="ENERGY_MEASURE"/> - <UomType description="Temperature" hasTable="N" parentTypeId="" uomTypeId="TEMP_MEASURE"/> - <UomType description="Other" hasTable="N" parentTypeId="" uomTypeId="OTHER_MEASURE"/> + <UomType description="Currency" hasTable="N" uomTypeId="CURRENCY_MEASURE"/> + <UomType description="Data Size" hasTable="N" uomTypeId="DATA_MEASURE"/> + <UomType description="Data Speed" hasTable="N" uomTypeId="DATASPD_MEASURE"/> + <UomType description="Time/Frequency" hasTable="N" uomTypeId="TIME_FREQ_MEASURE"/> + <UomType description="Length" hasTable="N" uomTypeId="LENGTH_MEASURE"/> + <UomType description="Area" hasTable="N" uomTypeId="AREA_MEASURE"/> + <UomType description="Liquid Volume" hasTable="N" uomTypeId="VOLUME_LIQ_MEASURE"/> + <UomType description="Dry Volume" hasTable="N" uomTypeId="VOLUME_DRY_MEASURE"/> + <UomType description="Weight" hasTable="N" uomTypeId="WEIGHT_MEASURE"/> + <UomType description="Energy" hasTable="N" uomTypeId="ENERGY_MEASURE"/> + <UomType description="Temperature" hasTable="N" uomTypeId="TEMP_MEASURE"/> + <UomType description="Other" hasTable="N" uomTypeId="OTHER_MEASURE"/> <!-- User preferences seed data --> <UserPrefGroupType userPrefGroupTypeId="GLOBAL_PREFERENCES" description="Global preferences"/> Modified: ofbiz/ofbiz-framework/trunk/framework/common/data/CountryCodeData.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/data/CountryCodeData.xml?rev=1830545&r1=1830544&r2=1830545&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/common/data/CountryCodeData.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/common/data/CountryCodeData.xml Mon Apr 30 10:52:55 2018 @@ -556,7 +556,7 @@ under the License. <CountryTeleCode countryCode="BR" teleCode="55"/> <CountryTeleCode countryCode="BS" teleCode="1-242"/> <CountryTeleCode countryCode="BT" teleCode="975"/> - <CountryTeleCode countryCode="BV" teleCode=""/> + <CountryTeleCode countryCode="BV"/> <CountryTeleCode countryCode="BW" teleCode="267"/> <CountryTeleCode countryCode="BY" teleCode="375"/> <CountryTeleCode countryCode="BZ" teleCode="501"/> @@ -587,7 +587,7 @@ under the License. <CountryTeleCode countryCode="EC" teleCode="593"/> <CountryTeleCode countryCode="EE" teleCode="372"/> <CountryTeleCode countryCode="EG" teleCode="20"/> - <CountryTeleCode countryCode="EH" teleCode=""/> + <CountryTeleCode countryCode="EH"/> <CountryTeleCode countryCode="ER" teleCode="291"/> <CountryTeleCode countryCode="ES" teleCode="34"/> <CountryTeleCode countryCode="ET" teleCode="251"/> @@ -610,13 +610,13 @@ under the License. <CountryTeleCode countryCode="GP" teleCode="590"/> <CountryTeleCode countryCode="GQ" teleCode="240"/> <CountryTeleCode countryCode="GR" teleCode="30"/> - <CountryTeleCode countryCode="GS" teleCode=""/> + <CountryTeleCode countryCode="GS"/> <CountryTeleCode countryCode="GT" teleCode="502"/> <CountryTeleCode countryCode="GU" teleCode="1-671"/> <CountryTeleCode countryCode="GW" teleCode="245"/> <CountryTeleCode countryCode="GY" teleCode="592"/> <CountryTeleCode countryCode="HK" teleCode="852"/> - <CountryTeleCode countryCode="HM" teleCode=""/> + <CountryTeleCode countryCode="HM"/> <CountryTeleCode countryCode="HN" teleCode="504"/> <CountryTeleCode countryCode="HR" teleCode="385"/> <CountryTeleCode countryCode="HT" teleCode="509"/> @@ -625,7 +625,7 @@ under the License. <CountryTeleCode countryCode="IE" teleCode="353"/> <CountryTeleCode countryCode="IL" teleCode="972"/> <CountryTeleCode countryCode="IN" teleCode="91"/> - <CountryTeleCode countryCode="IO" teleCode=""/> + <CountryTeleCode countryCode="IO"/> <CountryTeleCode countryCode="IQ" teleCode="964"/> <CountryTeleCode countryCode="IR" teleCode="98"/> <CountryTeleCode countryCode="IS" teleCode="354"/> @@ -697,7 +697,7 @@ under the License. <CountryTeleCode countryCode="PK" teleCode="92"/> <CountryTeleCode countryCode="PL" teleCode="48"/> <CountryTeleCode countryCode="PM" teleCode="508"/> - <CountryTeleCode countryCode="PN" teleCode=""/> + <CountryTeleCode countryCode="PN"/> <CountryTeleCode countryCode="PR" teleCode="1-787"/> <CountryTeleCode countryCode="PT" teleCode="351"/> <CountryTeleCode countryCode="PW" teleCode="680"/> @@ -715,7 +715,7 @@ under the License. <CountryTeleCode countryCode="SG" teleCode="65"/> <CountryTeleCode countryCode="SH" teleCode="290"/> <CountryTeleCode countryCode="SI" teleCode="386"/> - <CountryTeleCode countryCode="SJ" teleCode=""/> + <CountryTeleCode countryCode="SJ"/> <CountryTeleCode countryCode="SK" teleCode="421"/> <CountryTeleCode countryCode="SL" teleCode="232"/> <CountryTeleCode countryCode="SM" teleCode="378"/> @@ -728,7 +728,7 @@ under the License. <CountryTeleCode countryCode="SZ" teleCode="268"/> <CountryTeleCode countryCode="TC" teleCode="1-649"/> <CountryTeleCode countryCode="TD" teleCode="235"/> - <CountryTeleCode countryCode="TF" teleCode=""/> + <CountryTeleCode countryCode="TF"/> <CountryTeleCode countryCode="TG" teleCode="228"/> <CountryTeleCode countryCode="TH" teleCode="66"/> <CountryTeleCode countryCode="TJ" teleCode="992"/> @@ -744,7 +744,7 @@ under the License. <CountryTeleCode countryCode="TZ" teleCode="255"/> <CountryTeleCode countryCode="UA" teleCode="380"/> <CountryTeleCode countryCode="UG" teleCode="256"/> - <CountryTeleCode countryCode="UM" teleCode=""/> + <CountryTeleCode countryCode="UM"/> <CountryTeleCode countryCode="US" teleCode="1"/> <CountryTeleCode countryCode="UY" teleCode="598"/> <CountryTeleCode countryCode="UZ" teleCode="998"/> Modified: ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData.xml?rev=1830545&r1=1830544&r2=1830545&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData.xml Mon Apr 30 10:52:55 2018 @@ -20,17 +20,17 @@ under the License. <entity-engine-xml> - <GeoType description="City" geoTypeId="CITY" hasTable="N" parentTypeId=""/> - <GeoType description="Group" geoTypeId="GROUP" hasTable="N" parentTypeId=""/> - <GeoType description="State" geoTypeId="STATE" hasTable="N" parentTypeId=""/> - <GeoType description="Postal Code" geoTypeId="POSTAL_CODE" hasTable="N" parentTypeId=""/> - <GeoType description="Country" geoTypeId="COUNTRY" hasTable="N" parentTypeId=""/> - <GeoType description="County" geoTypeId="COUNTY" hasTable="N" parentTypeId=""/> - <GeoType description="County-City" geoTypeId="COUNTY_CITY" hasTable="N" parentTypeId=""/> - <GeoType description="Municipality" geoTypeId="MUNICIPALITY" hasTable="N" parentTypeId=""/> - <GeoType description="Province" geoTypeId="PROVINCE" hasTable="N" parentTypeId=""/> - <GeoType description="Region" geoTypeId="REGION" hasTable="N" parentTypeId=""/> - <GeoType description="Territory" geoTypeId="TERRITORY" hasTable="N" parentTypeId=""/> + <GeoType description="City" geoTypeId="CITY" hasTable="N"/> + <GeoType description="Group" geoTypeId="GROUP" hasTable="N"/> + <GeoType description="State" geoTypeId="STATE" hasTable="N"/> + <GeoType description="Postal Code" geoTypeId="POSTAL_CODE" hasTable="N"/> + <GeoType description="Country" geoTypeId="COUNTRY" hasTable="N"/> + <GeoType description="County" geoTypeId="COUNTY" hasTable="N"/> + <GeoType description="County-City" geoTypeId="COUNTY_CITY" hasTable="N"/> + <GeoType description="Municipality" geoTypeId="MUNICIPALITY" hasTable="N"/> + <GeoType description="Province" geoTypeId="PROVINCE" hasTable="N"/> + <GeoType description="Region" geoTypeId="REGION" hasTable="N"/> + <GeoType description="Territory" geoTypeId="TERRITORY" hasTable="N"/> <GeoType description="Sales Territory" geoTypeId="SALES_TERRITORY" hasTable="N" parentTypeId="TERRITORY"/> <GeoType description="Service Territory" geoTypeId="SERVICE_TERRITORY" hasTable="N" parentTypeId="TERRITORY"/> @@ -340,31 +340,31 @@ under the License. <GeoAssoc geoAssocTypeId="GROUP_MEMBER" geoIdTo="GBR" geoId="NIRL"/> <GeoAssoc geoAssocTypeId="GROUP_MEMBER" geoIdTo="GBR" geoId="WALS"/> - <CountryAddressFormat geoId="DEU" geoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> - <CountryAddressFormat geoId="GBR" geoAssocTypeId="GROUP_MEMBER" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> - <CountryAddressFormat geoId="ENGL" geoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> - <CountryAddressFormat geoId="NIRL" geoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> - <CountryAddressFormat geoId="WALS" geoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> - <CountryAddressFormat geoId="SCOT" geoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> - <CountryAddressFormat geoId="USA" geoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> - <CountryAddressFormat geoId="CAN" geoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> - <CountryAddressFormat geoId="AUS" geoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> - <CountryAddressFormat geoId="BGR" geoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> - <CountryAddressFormat geoId="BRA" geoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> - <CountryAddressFormat geoId="CHN" geoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> - <CountryAddressFormat geoId="COL" geoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> - <CountryAddressFormat geoId="MEX" geoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> - <CountryAddressFormat geoId="NLD" geoAssocTypeId="REGIONS" requireStateProvinceId="N" requirePostalCode="Y" postalCodeRegex="^[1-9][\d]{3}\s?(?!(sa|sd|ss|SA|SD|SS))([a-eghj-opr-tv-xzA-EGHJ-OPR-TV-XZ]{2})?$ " hasPostalCodeExt="N" requirePostalCodeExt="N" addressFormat=""/> - <CountryAddressFormat geoId="POL" geoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> - <CountryAddressFormat geoId="IND" geoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> - <CountryAddressFormat geoId="ITA" geoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> - <CountryAddressFormat geoId="CHE" geoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> - <CountryAddressFormat geoId="FRA" geoAssocTypeId="" requireStateProvinceId="N" requirePostalCode="Y" postalCodeRegex="^(([0-8][0-9])|(9[0-5]))[0-9]{3}$" hasPostalCodeExt="N" requirePostalCodeExt="N" addressFormat=""/> - <CountryAddressFormat geoId="MYS" geoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> - <CountryAddressFormat geoId="THA" geoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> - <CountryAddressFormat geoId="ISR" geoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> - <CountryAddressFormat geoId="CHL" geoAssocTypeId="" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> - <CountryAddressFormat geoId="TUR" geoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> - <CountryAddressFormat geoId="ZAF" geoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> - <CountryAddressFormat geoId="JPN" geoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="\d{3}-\d{4}" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> + <CountryAddressFormat geoId="DEU" geoAssocTypeId="REGIONS"/> + <CountryAddressFormat geoId="GBR" geoAssocTypeId="GROUP_MEMBER"/> + <CountryAddressFormat geoId="ENGL" geoAssocTypeId="REGIONS"/> + <CountryAddressFormat geoId="NIRL" geoAssocTypeId="REGIONS"/> + <CountryAddressFormat geoId="WALS" geoAssocTypeId="REGIONS"/> + <CountryAddressFormat geoId="SCOT" geoAssocTypeId="REGIONS"/> + <CountryAddressFormat geoId="USA" geoAssocTypeId="REGIONS"/> + <CountryAddressFormat geoId="CAN" geoAssocTypeId="REGIONS"/> + <CountryAddressFormat geoId="AUS" geoAssocTypeId="REGIONS"/> + <CountryAddressFormat geoId="BGR" geoAssocTypeId="REGIONS"/> + <CountryAddressFormat geoId="BRA" geoAssocTypeId="REGIONS"/> + <CountryAddressFormat geoId="CHN" geoAssocTypeId="REGIONS"/> + <CountryAddressFormat geoId="COL" geoAssocTypeId="REGIONS"/> + <CountryAddressFormat geoId="MEX" geoAssocTypeId="REGIONS"/> + <CountryAddressFormat geoId="NLD" geoAssocTypeId="REGIONS" requireStateProvinceId="N" requirePostalCode="Y" postalCodeRegex="^[1-9][\d]{3}\s?(?!(sa|sd|ss|SA|SD|SS))([a-eghj-opr-tv-xzA-EGHJ-OPR-TV-XZ]{2})?$ " hasPostalCodeExt="N" requirePostalCodeExt="N"/> + <CountryAddressFormat geoId="POL" geoAssocTypeId="REGIONS"/> + <CountryAddressFormat geoId="IND" geoAssocTypeId="REGIONS"/> + <CountryAddressFormat geoId="ITA" geoAssocTypeId="REGIONS"/> + <CountryAddressFormat geoId="CHE" geoAssocTypeId="REGIONS"/> + <CountryAddressFormat geoId="FRA" requireStateProvinceId="N" requirePostalCode="Y" postalCodeRegex="^(([0-8][0-9])|(9[0-5]))[0-9]{3}$" hasPostalCodeExt="N" requirePostalCodeExt="N"/> + <CountryAddressFormat geoId="MYS" geoAssocTypeId="REGIONS"/> + <CountryAddressFormat geoId="THA" geoAssocTypeId="REGIONS"/> + <CountryAddressFormat geoId="ISR" geoAssocTypeId="REGIONS"/> + <CountryAddressFormat geoId="CHL"/> + <CountryAddressFormat geoId="TUR" geoAssocTypeId="REGIONS"/> + <CountryAddressFormat geoId="ZAF" geoAssocTypeId="REGIONS"/> + <CountryAddressFormat geoId="JPN" geoAssocTypeId="REGIONS" postalCodeRegex="\d{3}-\d{4}"/> </entity-engine-xml> Modified: ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_IL.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_IL.xml?rev=1830545&r1=1830544&r2=1830545&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_IL.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_IL.xml Mon Apr 30 10:52:55 2018 @@ -19,12 +19,12 @@ under the License. --> <entity-engine-xml> - <Geo abbreviation="" geoCode="D" geoId="IL-D" geoName="HaDarom" geoTypeId="PROVINCE"/> - <Geo abbreviation="" geoCode="M" geoId="IL-M" geoName="HaMerkaz" geoTypeId="PROVINCE"/> - <Geo abbreviation="" geoCode="Z" geoId="IL-Z" geoName="HaZafon" geoTypeId="PROVINCE"/> - <Geo abbreviation="" geoCode="HA" geoId="IL-HA" geoName="Haifa" geoTypeId="PROVINCE"/> - <Geo abbreviation="" geoCode="TA" geoId="IL-TA" geoName="Tel Aviv" geoTypeId="PROVINCE"/> - <Geo abbreviation="" geoCode="JM" geoId="IL-JM" geoName="Jerusalem" geoTypeId="PROVINCE"/> + <Geo geoCode="D" geoId="IL-D" geoName="HaDarom" geoTypeId="PROVINCE"/> + <Geo geoCode="M" geoId="IL-M" geoName="HaMerkaz" geoTypeId="PROVINCE"/> + <Geo geoCode="Z" geoId="IL-Z" geoName="HaZafon" geoTypeId="PROVINCE"/> + <Geo geoCode="HA" geoId="IL-HA" geoName="Haifa" geoTypeId="PROVINCE"/> + <Geo geoCode="TA" geoId="IL-TA" geoName="Tel Aviv" geoTypeId="PROVINCE"/> + <Geo geoCode="JM" geoId="IL-JM" geoName="Jerusalem" geoTypeId="PROVINCE"/> <GeoAssoc geoId="ISR" geoIdTo="IL-D" geoAssocTypeId="REGIONS"/> <GeoAssoc geoId="ISR" geoIdTo="IL-M" geoAssocTypeId="REGIONS"/> Modified: ofbiz/ofbiz-framework/trunk/framework/entityext/data/EntityExtTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entityext/data/EntityExtTypeData.xml?rev=1830545&r1=1830544&r2=1830545&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entityext/data/EntityExtTypeData.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/entityext/data/EntityExtTypeData.xml Mon Apr 30 10:52:55 2018 @@ -18,13 +18,13 @@ specific language governing permissions under the License. --> <entity-engine-xml> - <EnumerationType description="Entity Sync Include Application Type" enumTypeId="ENTSYNC_INC_APPL" hasTable="N" parentTypeId=""/> + <EnumerationType description="Entity Sync Include Application Type" enumTypeId="ENTSYNC_INC_APPL" hasTable="N"/> <Enumeration description="Include" enumCode="INCLUDE" enumId="ESIA_INCLUDE" sequenceId="01" enumTypeId="ENTSYNC_INC_APPL"/> <Enumeration description="Exclude" enumCode="EXCLUDE" enumId="ESIA_EXCLUDE" sequenceId="02" enumTypeId="ENTSYNC_INC_APPL"/> <Enumeration description="Always Include" enumCode="ALWAYS" enumId="ESIA_ALWAYS" sequenceId="03" enumTypeId="ENTSYNC_INC_APPL"/> <!-- Entity Sync Run Status --> - <StatusType description="Entity Sync Run" hasTable="N" parentTypeId="" statusTypeId="ENTSYNC_RUN"/> + <StatusType description="Entity Sync Run" hasTable="N" statusTypeId="ENTSYNC_RUN"/> <StatusItem description="Not Started" sequenceId="01" statusCode="NOT_STARTED" statusId="ESR_NOT_STARTED" statusTypeId="ENTSYNC_RUN"/> <StatusItem description="Running" sequenceId="02" statusCode="RUNNING" statusId="ESR_RUNNING" statusTypeId="ENTSYNC_RUN"/> <StatusItem description="Offline Pending" sequenceId="03" statusCode="PENDING" statusId="ESR_PENDING" statusTypeId="ENTSYNC_RUN"/> Modified: ofbiz/ofbiz-framework/trunk/framework/security/data/PasswordSecurityDemoData.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/security/data/PasswordSecurityDemoData.xml?rev=1830545&r1=1830544&r2=1830545&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/security/data/PasswordSecurityDemoData.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/security/data/PasswordSecurityDemoData.xml Mon Apr 30 10:52:55 2018 @@ -20,19 +20,19 @@ under the License. <entity-engine-xml> <!-- from the securityext component: SecurityExtData.xml --> - <UserLogin userLoginId="admin" currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a" passwordHint=""/> + <UserLogin userLoginId="admin" currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"/> <!-- PBKDF2-SHA1 - <UserLogin userLoginId="flexadmin" currentPassword="{PBKDF2-SHA1}10000$W0JAMTY4ZTNlZjA=$HkbaHQBTdUbfDuL3tJ1eeyqouQ+66qqIj8Axx9vbHPQ=" passwordHint=""/> + <UserLogin userLoginId="flexadmin" currentPassword="{PBKDF2-SHA1}10000$W0JAMTY4ZTNlZjA=$HkbaHQBTdUbfDuL3tJ1eeyqouQ+66qqIj8Axx9vbHPQ="/> PBKDF2-SHA256 - <UserLogin userLoginId="flexadmin" currentPassword="{PBKDF2-SHA256}10000$W0JAMTRjMzI4YmE=$vWXmPPjyVlvPjN/7v7heWXRPW5ZBWEQTeYv/vxDT5L8=" passwordHint=""/> + <UserLogin userLoginId="flexadmin" currentPassword="{PBKDF2-SHA256}10000$W0JAMTRjMzI4YmE=$vWXmPPjyVlvPjN/7v7heWXRPW5ZBWEQTeYv/vxDT5L8="/> PBKDF2-SHA384 - <UserLogin userLoginId="flexadmin" currentPassword="{PBKDF2-SHA384}10000$W0JANWVhMDNjYzE=$H+ouAKild4PCvzFaBxZDbsH2kU1yGJFoCofklWa7YZE=" passwordHint=""/> + <UserLogin userLoginId="flexadmin" currentPassword="{PBKDF2-SHA384}10000$W0JANWVhMDNjYzE=$H+ouAKild4PCvzFaBxZDbsH2kU1yGJFoCofklWa7YZE="/> PBKDF2-SHA512 - <UserLogin userLoginId="flexadmin" currentPassword="{PBKDF2-SHA512}10000$W0JANTAwZGIwZDY=$M1ZJMdOEjE8bo5E7s5qfza6SZ3dVKwIiwZ8LyKL+2ns=" passwordHint=""/> + <UserLogin userLoginId="flexadmin" currentPassword="{PBKDF2-SHA512}10000$W0JANTAwZGIwZDY=$M1ZJMdOEjE8bo5E7s5qfza6SZ3dVKwIiwZ8LyKL+2ns="/> --> - <UserLogin userLoginId="flexadmin" currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a" passwordHint=""/> - <UserLogin userLoginId="demoadmin" currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a" passwordHint=""/> - <UserLogin userLoginId="ltdadmin" currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a" passwordHint=""/> - <UserLogin userLoginId="ltdadmin1" currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a" passwordHint=""/> - <UserLogin userLoginId="bizadmin" currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a" passwordHint=""/> + <UserLogin userLoginId="flexadmin" currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"/> + <UserLogin userLoginId="demoadmin" currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"/> + <UserLogin userLoginId="ltdadmin" currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"/> + <UserLogin userLoginId="ltdadmin1" currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"/> + <UserLogin userLoginId="bizadmin" currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"/> </entity-engine-xml> Modified: ofbiz/ofbiz-framework/trunk/framework/security/data/SecurityTypeDemoData.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/security/data/SecurityTypeDemoData.xml?rev=1830545&r1=1830544&r2=1830545&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/security/data/SecurityTypeDemoData.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/security/data/SecurityTypeDemoData.xml Mon Apr 30 10:52:55 2018 @@ -23,9 +23,9 @@ under the License. <EnumerationType enumTypeId="SECURITY_QUESTION" description="Security Question"/> <EnumerationType enumTypeId="SQ_CUSTOM" parentTypeId="SECURITY_QUESTION" description="Custom Security Question"/> <EnumerationType enumTypeId="SQ_STANDARD" parentTypeId="SECURITY_QUESTION" description="Standard Security Question"/> - <Enumeration enumId="SQ_STD_NCKNM" enumTypeId="SQ_STANDARD" enumCode="" sequenceId="0" description="What is your nick name"/> - <Enumeration enumId="SQ_STD_MOTNM" enumTypeId="SQ_STANDARD" enumCode="" sequenceId="1" description="What is your mother's maiden name"/> - <Enumeration enumId="SQ_STD_FAVTCH" enumTypeId="SQ_STANDARD" enumCode="" sequenceId="2" description="What is your favorite teacher's name"/> - <Enumeration enumId="SQ_STD_PETNM" enumTypeId="SQ_STANDARD" enumCode="" sequenceId="2" description="What is your pet's name"/> - <Enumeration enumId="SQ_STD_BSTFRND" enumTypeId="SQ_STANDARD" enumCode="" sequenceId="3" description="Who is your best childhood friend"/> + <Enumeration enumId="SQ_STD_NCKNM" enumTypeId="SQ_STANDARD" sequenceId="0" description="What is your nick name"/> + <Enumeration enumId="SQ_STD_MOTNM" enumTypeId="SQ_STANDARD" sequenceId="1" description="What is your mother's maiden name"/> + <Enumeration enumId="SQ_STD_FAVTCH" enumTypeId="SQ_STANDARD" sequenceId="2" description="What is your favorite teacher's name"/> + <Enumeration enumId="SQ_STD_PETNM" enumTypeId="SQ_STANDARD" sequenceId="2" description="What is your pet's name"/> + <Enumeration enumId="SQ_STD_BSTFRND" enumTypeId="SQ_STANDARD" sequenceId="3" description="Who is your best childhood friend"/> </entity-engine-xml> Modified: ofbiz/ofbiz-framework/trunk/framework/service/data/ScheduledServiceData.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/data/ScheduledServiceData.xml?rev=1830545&r1=1830544&r2=1830545&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/data/ScheduledServiceData.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/data/ScheduledServiceData.xml Mon Apr 30 10:52:55 2018 @@ -19,7 +19,7 @@ under the License. --> <entity-engine-xml> <!-- scheduled service status codes --> - <StatusType description="Scheduled Service" hasTable="N" parentTypeId="" statusTypeId="SERVICE_STATUS"/> + <StatusType description="Scheduled Service" hasTable="N" statusTypeId="SERVICE_STATUS"/> <StatusItem description="Pending" sequenceId="01" statusCode="PENDING" statusId="SERVICE_PENDING" statusTypeId="SERVICE_STATUS"/> <StatusItem description="Queued" sequenceId="02" statusCode="QUEUED" statusId="SERVICE_QUEUED" statusTypeId="SERVICE_STATUS"/> <StatusItem description="Running" sequenceId="05" statusCode="RUNNING" statusId="SERVICE_RUNNING" statusTypeId="SERVICE_STATUS"/>
