From: Jacques Le Roux <[EMAIL PROTECTED]>
Subject: INTERNAL_ORGANIZATION.patch
To: dev@ofbiz.apache.org
Date: Sunday, August 10, 2008, 7:46 AM
I'd lke to commit this patch (less disturbing) but
before I'd like to know if it's ok for evetybody
Index:
applications/accounting/data/DemoOrganizationData.xml
===================================================================
--- applications/accounting/data/DemoOrganizationData.xml
(revision 684410)
+++ applications/accounting/data/DemoOrganizationData.xml
(working copy)
@@ -23,7 +23,7 @@
<PartyGroup partyId="Company"
groupName="Your Company Name Here"
logoImageUrl="http://ofbiz.apache.org/images/ofbiz_logo.jpg"/>
<PartyRole partyId="Company"
roleTypeId="BILL_FROM_VENDOR"/>
<PartyRole partyId="Company"
roleTypeId="BILL_TO_CUSTOMER"/>
- <PartyRole partyId="Company"
roleTypeId="INTERNAL_ORGANIZATIO"/>
+ <PartyRole partyId="Company"
roleTypeId="INTERNAL_ORGANIZATION"/>
<PartyRole partyId="Company"
roleTypeId="_NA_"/>
<ContactMech contactMechId="9000"
contactMechTypeId="POSTAL_ADDRESS"/>
<PartyContactMech partyId="Company"
contactMechId="9000" fromDate="2000-01-01
00:00:00.000" allowSolicitation="Y"/>
@@ -35,31 +35,31 @@
<!-- Sub-Organizations -->
<Party partyId="MARKETING"
partyTypeId="PARTY_GROUP"
createdDate="2004-03-27 09:37:40.989"
createdByUserLogin="admin"
lastModifiedDate="2004-03-27 09:37:40.989"
lastModifiedByUserLogin="admin"/>
<PartyGroup partyId="MARKETING"
groupName="Marketing department"/>
- <PartyRole partyId="MARKETING"
roleTypeId="INTERNAL_ORGANIZATIO"/>
+ <PartyRole partyId="MARKETING"
roleTypeId="INTERNAL_ORGANIZATION"/>
<PartyRole partyId="MARKETING"
roleTypeId="_NA_"/>
<PartyRelationship partyIdFrom="Company"
partyIdTo="MARKETING"
partyRelationshipTypeId="GROUP_ROLLUP"
roleTypeIdFrom="_NA_"
roleTypeIdTo="_NA_" fromDate="2001-05-13
00:00:00.000"/>
<Party partyId="ACCOUNTING"
partyTypeId="PARTY_GROUP"
createdDate="2004-03-27 09:37:40.989"
createdByUserLogin="admin"
lastModifiedDate="2004-03-27 09:37:40.989"
lastModifiedByUserLogin="admin"/>
<PartyGroup partyId="ACCOUNTING"
groupName="Accounting department"/>
- <PartyRole partyId="ACCOUNTING"
roleTypeId="INTERNAL_ORGANIZATIO"/>
+ <PartyRole partyId="ACCOUNTING"
roleTypeId="INTERNAL_ORGANIZATION"/>
<PartyRole partyId="ACCOUNTING"
roleTypeId="_NA_"/>
<PartyRelationship partyIdFrom="Company"
partyIdTo="ACCOUNTING"
partyRelationshipTypeId="GROUP_ROLLUP"
roleTypeIdFrom="_NA_"
roleTypeIdTo="_NA_" fromDate="2001-05-13
00:00:00.000"/>
<Party partyId="SALES"
partyTypeId="PARTY_GROUP"
createdDate="2004-03-27 09:37:40.989"
createdByUserLogin="admin"
lastModifiedDate="2004-03-27 09:37:40.989"
lastModifiedByUserLogin="admin"/>
<PartyGroup partyId="SALES"
groupName="Sales department"/>
- <PartyRole partyId="SALES"
roleTypeId="INTERNAL_ORGANIZATIO"/>
+ <PartyRole partyId="SALES"
roleTypeId="INTERNAL_ORGANIZATION"/>
<PartyRole partyId="SALES"
roleTypeId="_NA_"/>
<PartyRelationship partyIdFrom="Company"
partyIdTo="SALES"
partyRelationshipTypeId="GROUP_ROLLUP"
roleTypeIdFrom="_NA_"
roleTypeIdTo="_NA_" fromDate="2001-05-13
00:00:00.000"/>
<Party partyId="DEV"
partyTypeId="PARTY_GROUP"
createdDate="2004-03-27 09:37:40.989"
createdByUserLogin="admin"
lastModifiedDate="2004-03-27 09:37:40.989"
lastModifiedByUserLogin="admin"/>
<PartyGroup partyId="DEV"
groupName="Development department"/>
- <PartyRole partyId="DEV"
roleTypeId="INTERNAL_ORGANIZATIO"/>
+ <PartyRole partyId="DEV"
roleTypeId="INTERNAL_ORGANIZATION"/>
<PartyRole partyId="DEV"
roleTypeId="_NA_"/>
<PartyRelationship partyIdFrom="Company"
partyIdTo="DEV"
partyRelationshipTypeId="GROUP_ROLLUP"
roleTypeIdFrom="_NA_"
roleTypeIdTo="_NA_" fromDate="2001-05-13
00:00:00.000"/>
<Party partyId="TESTING"
partyTypeId="PARTY_GROUP"
createdDate="2004-03-27 09:37:40.989"
createdByUserLogin="admin"
lastModifiedDate="2004-03-27 09:37:40.989"
lastModifiedByUserLogin="admin"/>
<PartyGroup partyId="TESTING"
groupName="Testing department"/>
- <PartyRole partyId="TESTING"
roleTypeId="INTERNAL_ORGANIZATIO"/>
+ <PartyRole partyId="TESTING"
roleTypeId="INTERNAL_ORGANIZATION"/>
<PartyRole partyId="TESTING"
roleTypeId="_NA_"/>
<PartyRelationship partyIdFrom="Company"
partyIdTo="TESTING"
partyRelationshipTypeId="GROUP_ROLLUP"
roleTypeIdFrom="_NA_"
roleTypeIdTo="_NA_" fromDate="2001-05-13
00:00:00.000"/>
</entity-engine-xml>
Index:
applications/accounting/script/org/ofbiz/accounting/admin/AcctgAdminServices.xml
===================================================================
---
applications/accounting/script/org/ofbiz/accounting/admin/AcctgAdminServices.xml
(revision 684410)
+++
applications/accounting/script/org/ofbiz/accounting/admin/AcctgAdminServices.xml
(working copy)
@@ -26,7 +26,7 @@
<!-- check that the party is an
INTERNAL_ORGANIZATION, as defined in PartyRole -->
<set from-field="parameters.partyId"
field="lookupParams.partyId"/>
- <set value="INTERNAL_ORGANIZATIO"
field="lookupParams.roleTypeId"/>
+ <set value="INTERNAL_ORGANIZATION"
field="lookupParams.roleTypeId"/>
<find-by-primary-key use-cache="true"
entity-name="PartyRole"
value-name="partyRole"
map-name="lookupParams"/>
<if-empty field="partyRole">
<add-error><fail-property
resource="AccountingUiLabels"
property="AccountingPartyMustBeInternalOrganization"/></add-error>
Index:
applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml
===================================================================
---
applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml
(revision 684410)
+++
applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml
(working copy)
@@ -311,7 +311,7 @@
<!-- the organization party must be an
internal organization -->
<entity-one
entity-name="PartyRole"
value-name="partyRole" use-cache="true"
auto-field-map="false">
<field-map
field-name="partyId"
env-name="acctgTransEntry.organizationPartyId"/>
- <field-map
field-name="roleTypeId"
value="INTERNAL_ORGANIZATIO"/>
+ <field-map
field-name="roleTypeId"
value="INTERNAL_ORGANIZATION"/>
</entity-one>
<if-empty field="partyRole">
<log level="warning"
message="The party with id
[${acctgTransEntry.organizationPartyId}] is not an internal
organization; the following accounting transaction will be
ignored: ${acctgTransEntry}"/>
Index:
applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
===================================================================
---
applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
(revision 684410)
+++
applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
(working copy)
@@ -1125,7 +1125,7 @@
while (itemsIter.hasNext()) {
GenericValue item = (GenericValue)
itemsIter.next();
GenericValue inventoryItem =
item.getRelatedOne("InventoryItem");
- GenericValue ownerPartyRole =
delegator.findByPrimaryKeyCache("PartyRole",
UtilMisc.toMap("partyId",
inventoryItem.getString("ownerPartyId"),
"roleTypeId", "INTERNAL_ORGANIZATIO"));
+ GenericValue ownerPartyRole =
delegator.findByPrimaryKeyCache("PartyRole",
UtilMisc.toMap("partyId",
inventoryItem.getString("ownerPartyId"),
"roleTypeId", "INTERNAL_ORGANIZATION"));
if
(UtilValidate.isEmpty(ownerPartyRole)) {
items.remove(item);
}
Index:
applications/accounting/webapp/accounting/invoice/InvoiceForms.xml
===================================================================
---
applications/accounting/webapp/accounting/invoice/InvoiceForms.xml
(revision 684410)
+++
applications/accounting/webapp/accounting/invoice/InvoiceForms.xml
(working copy)
@@ -198,7 +198,7 @@
<field position="1"
name="organizationPartyId"
parameter-name="partyIdFrom">
<drop-down
allow-empty="false">
<entity-options
description="${partyId}"
entity-name="PartyRole"
key-field-name="partyId">
- <entity-constraint
name="roleTypeId"
value="INTERNAL_ORGANIZATIO"/>
+ <entity-constraint
name="roleTypeId"
value="INTERNAL_ORGANIZATION"/>
<entity-order-by
field-name="partyId"/>
</entity-options>
</drop-down>
@@ -222,7 +222,7 @@
<field position="1"
name="organizationPartyId"
parameter-name="partyId">
<drop-down
allow-empty="false">
<entity-options
description="${partyId}"
entity-name="PartyRole"
key-field-name="partyId">
- <entity-constraint
name="roleTypeId"
value="INTERNAL_ORGANIZATIO"/>
+ <entity-constraint
name="roleTypeId"
value="INTERNAL_ORGANIZATION"/>
<entity-order-by
field-name="partyId"/>
</entity-options>
</drop-down>
Index:
applications/accounting/webapp/accounting/payment/PaymentForms.xml
===================================================================
---
applications/accounting/webapp/accounting/payment/PaymentForms.xml
(revision 684410)
+++
applications/accounting/webapp/accounting/payment/PaymentForms.xml
(working copy)
@@ -81,7 +81,7 @@
<field position="1"
name="organizationPartyId"
parameter-name="partyIdFrom">
<drop-down
allow-empty="false">
<entity-options
description="${partyId}"
entity-name="PartyRole"
key-field-name="partyId">
- <entity-constraint
name="roleTypeId"
value="INTERNAL_ORGANIZATIO"/>
+ <entity-constraint
name="roleTypeId"
value="INTERNAL_ORGANIZATION"/>
<entity-order-by
field-name="partyId"/>
</entity-options>
</drop-down>
@@ -120,7 +120,7 @@
<field position="1"
name="organizationPartyId"
parameter-name="partyIdTo">
<drop-down
allow-empty="false">
<entity-options
description="${partyId}"
entity-name="PartyRole"
key-field-name="partyId">
- <entity-constraint
name="roleTypeId"
value="INTERNAL_ORGANIZATIO"/>
+ <entity-constraint
name="roleTypeId"
value="INTERNAL_ORGANIZATION"/>
<entity-order-by
field-name="partyId"/>
</entity-options>
</drop-down>
@@ -454,7 +454,7 @@
<field name="organizationPartyId"
parameter-name="partyIdFrom">
<drop-down
allow-empty="false">
<entity-options
description="${partyId}"
entity-name="PartyRole"
key-field-name="partyId">
- <entity-constraint
name="roleTypeId"
value="INTERNAL_ORGANIZATIO"/>
+ <entity-constraint
name="roleTypeId"
value="INTERNAL_ORGANIZATION"/>
<entity-order-by
field-name="partyId"/>
</entity-options>
</drop-down>
@@ -471,7 +471,7 @@
<field name="organizationPartyId"
parameter-name="partyId">
<drop-down
allow-empty="false">
<entity-options
description="${partyId}"
entity-name="PartyRole"
key-field-name="partyId">
- <entity-constraint
name="roleTypeId"
value="INTERNAL_ORGANIZATIO"/>
+ <entity-constraint
name="roleTypeId"
value="INTERNAL_ORGANIZATION"/>
<entity-order-by
field-name="partyId"/>
</entity-options>
</drop-down>
Index:
applications/accounting/widget/BillingAccountForms.xml
===================================================================
--- applications/accounting/widget/BillingAccountForms.xml
(revision 684410)
+++ applications/accounting/widget/BillingAccountForms.xml
(working copy)
@@ -266,7 +266,7 @@
<field name="organizationPartyId"
parameter-name="partyIdTo">
<drop-down
allow-empty="false">
<entity-options
description="${partyId}"
entity-name="PartyRole"
key-field-name="partyId">
- <entity-constraint
name="roleTypeId"
value="INTERNAL_ORGANIZATIO"/>
+ <entity-constraint
name="roleTypeId"
value="INTERNAL_ORGANIZATION"/>
<entity-order-by
field-name="partyId"/>
</entity-options>
</drop-down>
Index:
applications/accounting/widget/GlobalGlAccountsForms.xml
===================================================================
---
applications/accounting/widget/GlobalGlAccountsForms.xml
(revision 684410)
+++
applications/accounting/widget/GlobalGlAccountsForms.xml
(working copy)
@@ -53,7 +53,7 @@
<drop-down>
<entity-options
entity-name="PartyRoleAndPartyDetail"
description="${partyId}" >
<!-- entity-options
entity-name="PartyRoleAndPartyDetail"
description="${organizationPartyId}" -->
- <entity-constraint
name="roleTypeId"
value="INTERNAL_ORGANIZATIO"/>
+ <entity-constraint
name="roleTypeId"
value="INTERNAL_ORGANIZATION"/>
<entity-order-by
field-name="partyId"/>
</entity-options>
</drop-down>
Index: applications/accounting/widget/GlSetupScreens.xml
===================================================================
--- applications/accounting/widget/GlSetupScreens.xml
(revision 684410)
+++ applications/accounting/widget/GlSetupScreens.xml
(working copy)
@@ -59,7 +59,7 @@
<set field="headerItem"
value="companies"/>
<set
field="labelTitleProperty"
value="${uiLabelMap.AccountingAvailableInternalOrganizations}"/>
<entity-condition
entity-name="PartyRole"
list-name="parties">
- <condition-expr
field-name="roleTypeId"
operator="equals"
value="INTERNAL_ORGANIZATIO"/>
+ <condition-expr
field-name="roleTypeId"
operator="equals"
value="INTERNAL_ORGANIZATION"/>
</entity-condition>
<service
service-name="acctgPrefPermissionCheck"
result-map-name="permResult">
<field-map
field-name="mainAction"
value="UPDATE"/>
Index:
applications/accounting/widget/ReportFinancialSummaryForms.xml
===================================================================
---
applications/accounting/widget/ReportFinancialSummaryForms.xml
(revision 684410)
+++
applications/accounting/widget/ReportFinancialSummaryForms.xml
(working copy)
@@ -36,7 +36,7 @@
<field name="organizationPartyId"
required-field="false">
<drop-down allow-empty="true"
no-current-selected-key="Company">
<entity-options
entity-name="PartyRoleNameDetail"
description="${groupName} [${partyId}]"
key-field-name="partyId">
- <entity-constraint
name="roleTypeId"
value="INTERNAL_ORGANIZATIO"/>
+ <entity-constraint
name="roleTypeId"
value="INTERNAL_ORGANIZATION"/>
<entity-order-by
field-name="groupName"/>
</entity-options>
</drop-down>
Index:
applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml
===================================================================
---
applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml
(revision 684410)
+++
applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml
(working copy)
@@ -528,7 +528,7 @@
<set
field="partyRelationshipCtx.partyId"
from-field="partyId"/>
<set
field="partyRelationshipCtx.partyIdFrom"
from-field="parameters.partyIdFrom"/>
<set
field="partyRelationshipCtx.partyIdTo"
from-field="partyId"/>
- <set
field="partyRelationshipCtx.roleTypeIdFrom"
value="INTERNAL_ORGANIZATIO"/>
+ <set
field="partyRelationshipCtx.roleTypeIdFrom"
value="INTERNAL_ORGANIZATION"/>
<set
field="partyRelationshipCtx.roleTypeIdTo"
value="EMPLOYEE"/>
<set
field="partyRelationshipCtx.relationshipName"
value="EMPLOYMENT"/>
<set
field="partyRelationshipCtx.fromDate"
from-field="parameters.fromDate"/>
Index: applications/humanres/widget/forms/EmployeeForms.xml
===================================================================
--- applications/humanres/widget/forms/EmployeeForms.xml
(revision 684410)
+++ applications/humanres/widget/forms/EmployeeForms.xml
(working copy)
@@ -29,7 +29,7 @@
<field name="partyIdFrom"
title="${uiLabelMap.OrderOrderEntryInternalOrganization}"
tooltip="${uiLabelMap.CommonRequired}"
widget-style="required">
<drop-down allow-empty="true">
<entity-options
entity-name="PartyRoleNameDetail"
key-field-name="partyId"
description="${groupName}">
- <entity-constraint
name="roleTypeId" operator="equals"
value="INTERNAL_ORGANIZATIO"/>
+ <entity-constraint
name="roleTypeId" operator="equals"
value="INTERNAL_ORGANIZATION"/>
</entity-options>
<option key="null"
description="-----"/>
</drop-down>
Index:
applications/humanres/widget/forms/EmploymentForms.xml
===================================================================
--- applications/humanres/widget/forms/EmploymentForms.xml
(revision 684410)
+++ applications/humanres/widget/forms/EmploymentForms.xml
(working copy)
@@ -23,12 +23,12 @@
<form name="FindEmployments"
type="single" target="FindEmployments"
odd-row-style="header-row"
default-table-style="basic-table">
<auto-fields-entity
entity-name="Employment"
default-field-type="find"/>
- <field
name="roleTypeIdFrom"><hidden
value="INTERNAL_ORGANIZATIO"/></field>
+ <field
name="roleTypeIdFrom"><hidden
value="INTERNAL_ORGANIZATION"/></field>
<field
name="roleTypeIdTo"><hidden
value="EMPLOYEE"/></field>
<field name="partyIdFrom"
title="${uiLabelMap.HumanResPartyIdFrom}"
tooltip="${uiLabelMap.CommonRequired}">
<drop-down
allow-empty="false">
<entity-options
entity-name="PartyRole"
description="${partyId}"
key-field-name="partyId">
- <entity-constraint
name="roleTypeId" operator="equals"
value="INTERNAL_ORGANIZATIO"/>
+ <entity-constraint
name="roleTypeId" operator="equals"
value="INTERNAL_ORGANIZATION"/>
</entity-options>
</drop-down>
</field>
@@ -66,12 +66,12 @@
header-row-style="header-row"
default-table-style="basic-table">
<alt-target
use-when="employment==null"
target="createEmployment"/>
<auto-fields-service
service-name="createEmployment"
default-field-type="hidden"/>
- <field
name="roleTypeIdFrom"><hidden
value="INTERNAL_ORGANIZATIO"/></field>
+ <field
name="roleTypeIdFrom"><hidden
value="INTERNAL_ORGANIZATION"/></field>
<field
name="roleTypeIdTo"><hidden
value="EMPLOYEE"/></field>
<field name="partyIdFrom"
use-when="employment==null"
title="${uiLabelMap.HumanResPartyIdFrom}"
tooltip="${uiLabelMap.CommonRequired}">
<drop-down
allow-empty="false">
<entity-options
entity-name="PartyRole"
description="${partyId}"
key-field-name="partyId">
- <entity-constraint
name="roleTypeId" operator="equals"
value="INTERNAL_ORGANIZATIO"/>
+ <entity-constraint
name="roleTypeId" operator="equals"
value="INTERNAL_ORGANIZATION"/>
</entity-options>
</drop-down>
</field>
Index:
applications/humanres/widget/forms/EmplPositionForms.xml
===================================================================
---
applications/humanres/widget/forms/EmplPositionForms.xml
(revision 684410)
+++
applications/humanres/widget/forms/EmplPositionForms.xml
(working copy)
@@ -51,7 +51,7 @@
<field name="partyId"
parameter-name="partyId">
<drop-down
allow-empty="false">
<entity-options
description="${partyId}"
entity-name="PartyRole"
key-field-name="partyId">
- <entity-constraint
name="roleTypeId"
value="INTERNAL_ORGANIZATIO"/>
+ <entity-constraint
name="roleTypeId"
value="INTERNAL_ORGANIZATION"/>
<entity-order-by
field-name="partyId"/>
</entity-options>
</drop-down>
Index: applications/marketing/entitydef/entitymodel.xml
===================================================================
--- applications/marketing/entitydef/entitymodel.xml
(revision 684410)
+++ applications/marketing/entitydef/entitymodel.xml
(working copy)
@@ -365,7 +365,7 @@
- roleTypeId of User -> sgrRoleTypeId (SGR)
- ex: SALES_REP, MANAGER, etc
- roleTypeId of Customer -> sgrToRoleTypeId
(SGRTO)
NOTE: because not all of these will exist,
each needs to be the given roleTypeId(s) OR null
- - roleTypeId of _Employer_ in
Employee/Employer relationship -> prSgrRoleTypeIdFrom
(PRSGR) AND prPcRoleTypeIdFrom (PRPC) - INTERNAL_ORGANIZATIO
+ - roleTypeId of _Employer_ in
Employee/Employer relationship -> prSgrRoleTypeIdFrom
(PRSGR) AND prPcRoleTypeIdFrom (PRPC) -
INTERNAL_ORGANIZATION
NOTE: constraining these fields is optional
as the EMPLOYEE roleTypeIdTo is often sufficient
NOTE: because not all of these will exist,
each needs to be the given partyId(s) OR null
- roleTypeId of _Employee_ in
Employee/Employer relationship -> prSgrRoleTypeIdTo
(PRSGR) AND prPcRoleTypeIdTo (PRPC) - EMPLOYEE
Index:
applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml
===================================================================
---
applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml
(revision 684410)
+++
applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml
(working copy)
@@ -46,11 +46,11 @@
</if-not-empty>
</if-compare>
<else>
- <!-- make sure that the party to return to
is an INTERNAL_ORGANIZATIO for customer return and SUPPLIER
for vendor return else stop -->
+ <!-- make sure that the party to return to
is an INTERNAL_ORGANIZATION for customer return and SUPPLIER
for vendor return else stop -->
<if-compare
field="returnHeaderTypeId"
operator="equals"
value="CUSTOMER_RETURN">
<entity-one
entity-name="PartyRole"
value-name="partyRole" use-cache="true"
auto-field-map="false">
<field-map
field-name="partyId"
env-name="parameters.toPartyId"/>
- <field-map
field-name="roleTypeId"
value="INTERNAL_ORGANIZATIO"/>
+ <field-map
field-name="roleTypeId"
value="INTERNAL_ORGANIZATION"/>
</entity-one>
<if-empty
field="partyRole">
<add-error><fail-message
message="Error: a return must be to a party in the role
of internal organization"/></add-error>
Index:
applications/order/webapp/ordermgr/requirement/RequirementForms.xml
===================================================================
---
applications/order/webapp/ordermgr/requirement/RequirementForms.xml
(revision 684410)
+++
applications/order/webapp/ordermgr/requirement/RequirementForms.xml
(working copy)
@@ -234,7 +234,7 @@
<field
name="billToCustomerPartyId">
<drop-down
allow-empty="false">
<entity-options
entity-name="PartyRole"
key-field-name="partyId"
description="${partyId}">
- <entity-constraint
name="roleTypeId" operator="equals"
value="INTERNAL_ORGANIZATIO"/>
+ <entity-constraint
name="roleTypeId" operator="equals"
value="INTERNAL_ORGANIZATION"/>
</entity-options>
</drop-down>
</field>
@@ -341,7 +341,7 @@
<field
name="billToCustomerPartyId">
<drop-down
allow-empty="false">
<entity-options
entity-name="PartyRoleAndPartyDetail"
description="${firstName} ${lastName} ${groupName}
(${partyId})" key-field-name="partyId">
- <entity-constraint
name="roleTypeId" operator="equals"
value="INTERNAL_ORGANIZATIO"/>
+ <entity-constraint
name="roleTypeId" operator="equals"
value="INTERNAL_ORGANIZATION"/>
<entity-order-by
field-name="firstName"/>
<entity-order-by
field-name="lastName"/>
<entity-order-by
field-name="groupName"/>
Index:
applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy
===================================================================
---
applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy
(revision 684410)
+++
applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy
(working copy)
@@ -48,5 +48,5 @@
suppliers = delegator.findByAnd("PartyRole",
[roleTypeId : "SUPPLIER"]);
context.suppliers = suppliers;
-organizations = delegator.findByAnd("PartyRole",
[roleTypeId : "INTERNAL_ORGANIZATIO"]);
+organizations = delegator.findByAnd("PartyRole",
[roleTypeId : "INTERNAL_ORGANIZATION"]);
context.organizations = organizations;
Index: applications/order/widget/ordermgr/ReportForms.xml
===================================================================
--- applications/order/widget/ordermgr/ReportForms.xml
(revision 684410)
+++ applications/order/widget/ordermgr/ReportForms.xml
(working copy)
@@ -177,7 +177,7 @@
<field name="toPartyId"
title="${uiLabelMap.AccountingToParty}">
<drop-down
allow-empty="false">
<entity-options
entity-name="PartyRoleAndPartyDetail"
description="${groupName} ${firstName} ${lastName}
[${partyId}]" key-field-name="partyId">
- <entity-constraint
name="roleTypeId" operator="equals"
value="INTERNAL_ORGANIZATIO"/>
+ <entity-constraint
name="roleTypeId" operator="equals"
value="INTERNAL_ORGANIZATION"/>
</entity-options>
</drop-down>
</field>
Index: applications/party/config/PartyEntityLabels.xml
===================================================================
--- applications/party/config/PartyEntityLabels.xml
(revision 684410)
+++ applications/party/config/PartyEntityLabels.xml
(working copy)
@@ -1305,7 +1305,7 @@
<value
xml:lang="th">สมาชิà¸à¹ƒà¸™à¸à¸‡à¸„์à¸à¸£</value>
<value
xml:lang="zh">家åº</value>
</property>
- <property
key="RoleType.description.INTERNAL_ORGANIZATIO">
+ <property
key="RoleType.description.INTERNAL_ORGANIZATION">
<value xml:lang="de">Interne
Organisation</value>
<value xml:lang="en">Internal
Organization</value>
<value xml:lang="fr">Organisation
Interne</value>
Index: applications/party/data/PartyTypeData.xml
===================================================================
--- applications/party/data/PartyTypeData.xml (revision
684410)
+++ applications/party/data/PartyTypeData.xml (working
copy)
@@ -196,7 +196,7 @@
<RoleType description="Employee"
hasTable="N" parentTypeId="PERSON_ROLE"
roleTypeId="EMPLOYEE"/>
<RoleType description="End-User Customer"
hasTable="N" parentTypeId="CUSTOMER"
roleTypeId="END_USER_CUSTOMER"/>
<RoleType description="Household"
hasTable="N"
parentTypeId="ORGANIZATION_ROLE"
roleTypeId="HOUSEHOLD"/>
- <RoleType description="Internal
Organization" hasTable="Y"
parentTypeId="ORGANIZATION_ROLE"
roleTypeId="INTERNAL_ORGANIZATIO"/>
+ <RoleType description="Internal
Organization" hasTable="Y"
parentTypeId="ORGANIZATION_ROLE"
roleTypeId="INTERNAL_ORGANIZATION"/>
<RoleType description="Limited
Administrator" hasTable="N"
parentTypeId="ADMIN"
roleTypeId="LTD_ADMIN"/>
<RoleType description="Organization Unit"
hasTable="N"
parentTypeId="ORGANIZATION_ROLE"
roleTypeId="ORGANIZATION_UNIT"/>
<RoleType description="Partner"
hasTable="N"
parentTypeId="ORGANIZATION_ROLE"
roleTypeId="PARTNER"/>
@@ -222,7 +222,7 @@
<RoleType description="Family Member"
hasTable="N" parentTypeId="PERSON_ROLE"
roleTypeId="FAMILY_MEMBER"/>
<RoleType description="Manager"
hasTable="N" parentTypeId="EMPLOYEE"
roleTypeId="MANAGER"/>
<RoleType description="Order Clerk"
hasTable="N" parentTypeId="EMPLOYEE"
roleTypeId="ORDER_CLERK"/>
- <RoleType description="Other Internal"
hasTable="N"
parentTypeId="INTERNAL_ORGANIZATIO"
roleTypeId="OTHER_INTERNAL_ORGAN"/>
+ <RoleType description="Other Internal"
hasTable="N"
parentTypeId="INTERNAL_ORGANIZATION"
roleTypeId="OTHER_INTERNAL_ORGAN"/>
<RoleType description="Other Organization
Unit" hasTable="N"
parentTypeId="ORGANIZATION_UNIT"
roleTypeId="OTHER_ORGANIZATION_U"/>
<RoleType description="Parent
Organization" hasTable="N"
parentTypeId="ORGANIZATION_UNIT"
roleTypeId="PARENT_ORGANIZATION"/>
<RoleType description="Packer"
hasTable="N" parentTypeId="EMPLOYEE"
roleTypeId="PACKER"/>
Index:
applications/party/webapp/partymgr/party/PartyForms.xml
===================================================================
--- applications/party/webapp/partymgr/party/PartyForms.xml
(revision 684410)
+++ applications/party/webapp/partymgr/party/PartyForms.xml
(working copy)
@@ -618,7 +618,7 @@
<actions>
<entity-condition
entity-name="PartyRelationship">
<condition-list
combine="and">
- <condition-expr
field-name="roleTypeIdFrom"
operator="equals"
value="INTERNAL_ORGANIZATIO"/>
+ <condition-expr
field-name="roleTypeIdFrom"
operator="equals"
value="INTERNAL_ORGANIZATION"/>
<condition-expr
field-name="roleTypeIdTo"
operator="equals" value="EMPLOYEE"/>
<condition-expr
field-name="partyIdTo" operator="equals"
value="${parameters.partyId}"/>
<condition-expr
field-name="relationshipName"
operator="equals"
value="EMPLOYMENT"/>
Index:
applications/product/webapp/catalog/product/ProductForms.xml
===================================================================
---
applications/product/webapp/catalog/product/ProductForms.xml
(revision 684410)
+++
applications/product/webapp/catalog/product/ProductForms.xml
(working copy)
@@ -1682,7 +1682,7 @@
<field name="organizationPartyId"
title="${uiLabelMap.ProductOrganization}">
<drop-down
allow-empty="false">
<entity-options
entity-name="PartyRoleAndPartyDetail"
key-field-name="partyId"
description="${groupName} [${partyId}]">
- <entity-constraint
name="roleTypeId" operator="equals"
value="INTERNAL_ORGANIZATIO" />
+ <entity-constraint
name="roleTypeId" operator="equals"
value="INTERNAL_ORGANIZATION" />
<entity-order-by
field-name="partyId"/>
</entity-options>
</drop-down>
Index:
applications/product/webapp/facility/WEB-INF/actions/facility/CountFacilityInventoryByProduct.groovy
===================================================================
---
applications/product/webapp/facility/WEB-INF/actions/facility/CountFacilityInventoryByProduct.groovy
(revision 684410)
+++
applications/product/webapp/facility/WEB-INF/actions/facility/CountFacilityInventoryByProduct.groovy
(working copy)
@@ -30,6 +30,7 @@
// is not computed; you can use the
ViewFacilityInventoryByProduct.groovy if you
// need it (but it is slower than this one).
+import org.ofbiz.base.util.*
import org.ofbiz.entity.*
import org.ofbiz.entity.condition.*
import org.ofbiz.entity.transaction.*
@@ -138,7 +139,8 @@
discontinuationDateCondition =
EntityCondition.makeCondition(
[
EntityCondition.makeCondition("salesDiscontinuationDate",
EntityOperator.EQUALS, null),
-
EntityCondition.makeCondition("salesDiscontinuationDate",
EntityOperator.GREATER_THAN, productsSoldThruTimestamp)
+
EntityCondition.makeCondition("salesDiscontinuationDate",
EntityOperator.GREATER_THAN,
+
ObjectType.simpleTypeConvert(productsSoldThruTimestamp,
"Timestamp", null, null, false))
],
EntityOperator.OR);
whereConditionsList.add(discontinuationDateCondition);
Thanks
Jacques
![http://ofbiz.apache.org/images/ofbiz_logo.jpg"/](http://ofbiz.apache.org/images/ofbiz_logo.jpg"/){kind=link}