Skip to content

Commit 6727f46

Browse files
JacquesLeRouxJacquesLeRoux
committed
Reverted: work related to PartyRole handling initiated with (OFBIZ-5980)
Currently OFBiz is broken and hard to fix. You can't even create an order ! Revert "Improved: visibility of expire button (OFBIZ-12362) (#331)" This reverts commit e3b125e. Revert "(OFBIZ-5980) Improvement: PartyRole record(s) expiration/revocation (#330)" This reverts commit a8ab2be. Revert "Improved: seed data (OFBIZ-12355) (#328)" This reverts commit b204b86. Revert "Reverted: Have the ability to revoke (expire) roles of a party (OFBIZ-5980)" This reverts commit 85e066d. Revert "Reverted: damn I did not revert the right push :/" This reverts commit b867b2a. Revert "(OFBIZ-5980) Improvement: PartyRole record(s) expiration/revocation (#325)" This reverts commit 8ed2252. Revert "Reverted: Have the ability to revoke (expire) roles of a party (OFBIZ-5980)" This reverts commit 5b5e03f. Revert "Improved: Have the ability to revoke (expire) roles of a party (OFBIZ-5980)" This reverts commit 46f7ee9. Revert "Improved: seed data (OFBIZ-12353) (#324)" This reverts commit fade92b.
1 parent dfc7ee4 commit 6727f46

File tree

23 files changed

+321
-371
lines changed

23 files changed

+321
-371
lines changed

‎applications/accounting/testdef/data/AccountingTestsData.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ under the License.
2828

2929
<!-- For Testing service createPartyAcctgPreference -->
3030
<Party partyId="DEMO_COMPANY" partyTypeId="PARTY_GROUP"/>
31-
<PartyRole partyId="DEMO_COMPANY" roleTypeId="INTERNAL_ORGANIZATIO" fromDate="2000-01-01 00:00:00.000"/>
31+
<PartyRole partyId="DEMO_COMPANY" roleTypeId="INTERNAL_ORGANIZATIO"/>
3232
<PaymentMethod fromDate="2001-05-13 00:00:00.0" partyId="DEMO_COMPANY" paymentMethodId="9020" paymentMethodTypeId="CREDIT_CARD"/>
3333
<!-- For Testing service updatePartyAcctgPreference / getPartyAccountingPreferences-->
3434
<Party partyId="DEMO_COMPANY1" partyTypeId="PARTY_GROUP"/>
35-
<PartyRole partyId="DEMO_COMPANY1" roleTypeId="INTERNAL_ORGANIZATIO" fromDate="2000-01-01 00:00:00.000"/>
35+
<PartyRole partyId="DEMO_COMPANY1" roleTypeId="INTERNAL_ORGANIZATIO"/>
3636
<PartyAcctgPreference partyId="DEMO_COMPANY1"/>
3737
<!-- For Testing service updateFXConversion-->
3838
<UomConversionDated uomId="EUR" uomIdTo="USD" fromDate="2001-01-01 00:00:00.0" conversionFactor="1.5"/>
@@ -49,8 +49,8 @@ under the License.
4949
<PaymentMethodTypeGlAccount paymentMethodTypeId="CASH" glAccountId="999999" organizationPartyId="DEMO_COMPANY1"/>
5050

5151
<!-- For Testing service cancelAgreement -->
52-
<PartyRole partyId="DEMO_COMPANY" roleTypeId="SUPPLIER" fromDate="2000-01-01 00:00:00.000"/>
53-
<PartyRole partyId="DEMO_COMPANY1" roleTypeId="DISTRIBUTOR" fromDate="2000-01-01 00:00:00.000"/>
52+
<PartyRole partyId="DEMO_COMPANY" roleTypeId="SUPPLIER"/>
53+
<PartyRole partyId="DEMO_COMPANY1" roleTypeId="DISTRIBUTOR"/>
5454
<Agreement agreementId="1000" agreementTypeId="COMMISSION_AGREEMENT" description="Commission Agreement" partyIdFrom="DEMO_COMPANY" partyIdTo="DEMO_COMPANY1" roleTypeIdFrom="SUPPLIER" roleTypeIdTo="DISTRIBUTOR" fromDate="2016-09-29 00:00:00"/>
5555
<!-- For Testing service copyAgreement -->
5656
<Product productId="TestProduct2" productName="Test Product 2" internalName="Test Product 2" description="Test Product For Testing getCommissionForProduct services"/>
@@ -65,7 +65,7 @@ under the License.
6565
<Product productId="TestProduct3" productName="Test Product 3" internalName="Test Product 3" description="Test Product For Testing updateProductAverageCostOnReceiveInventory services"/>
6666
<Facility facilityId="DemoFacility1" facilityTypeId="WAREHOUSE" facilityName="Demo Facility" />
6767
<Party partyId="DEMO_COMPANY2" partyTypeId="PARTY_GROUP"/>
68-
<PartyRole partyId="DEMO_COMPANY2" roleTypeId="INTERNAL_ORGANIZATIO" fromDate="2000-01-01 00:00:00.000"/>
68+
<PartyRole partyId="DEMO_COMPANY2" roleTypeId="INTERNAL_ORGANIZATIO"/>
6969
<InventoryItem facilityId="DemoFacility1" inventoryItemId="9999" inventoryItemTypeId="NON_SERIAL_INV_ITEM" productId="TestProduct3" ownerPartyId="DEMO_COMPANY2" currencyUomId="USD" unitCost="9"/>
7070
<PartyAcctgPreference partyId="DEMO_COMPANY2" cogsMethodId="COGS_LIFO"/>
7171
<!-- For Testing service updateFinAccount -->

‎applications/commonext/data/OfbizSetupShippingData.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@
3131
<PartyGroup partyId="DHL" groupName="DHL"/>
3232
<PartyGroup partyId="FEDEX" groupName="Federal Express"/>
3333

34-
<PartyRole partyId="USPS" roleTypeId="CARRIER" fromDate="2000-01-01 00:00:00.000"/>
35-
<PartyRole partyId="UPS" roleTypeId="CARRIER" fromDate="2000-01-01 00:00:00.000"/>
36-
<PartyRole partyId="DHL" roleTypeId="CARRIER" fromDate="2000-01-01 00:00:00.000"/>
37-
<PartyRole partyId="_NA_" roleTypeId="CARRIER" fromDate="2000-01-01 00:00:00.000"/>
38-
<PartyRole partyId="FEDEX" roleTypeId="CARRIER" fromDate="2000-01-01 00:00:00.000"/>
34+
<PartyRole partyId="USPS" roleTypeId="CARRIER"/>
35+
<PartyRole partyId="UPS" roleTypeId="CARRIER"/>
36+
<PartyRole partyId="DHL" roleTypeId="CARRIER"/>
37+
<PartyRole partyId="_NA_" roleTypeId="CARRIER"/>
38+
<PartyRole partyId="FEDEX" roleTypeId="CARRIER"/>
3939

4040
<PartyStatus partyId="USPS" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
4141
<PartyStatus partyId="UPS" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>

‎applications/datamodel/data/demo/AccountingDemoData.xml‎

Lines changed: 132 additions & 131 deletions
Large diffs are not rendered by default.

‎applications/datamodel/data/demo/ContentDemoData.xml‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -40,34 +40,34 @@ under the License.
4040
<Party partyId="BLOG_GUEST" partyTypeId="PERSON" statusId="PARTY_ENABLED"/>
4141
<Person partyId="BLOG_GUEST" lastName="Guest" firstName="Blog"/>
4242
<UserLogin userLoginId="blog_guest" partyId="BLOG_GUEST"/>
43-
<PartyRole partyId="BLOG_GUEST" roleTypeId="_NA_" fromDate="2000-01-01 00:00:00.000"/>
43+
<PartyRole partyId="BLOG_GUEST" roleTypeId="_NA_"/>
4444
<PartyStatus partyId="BLOG_GUEST" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
4545

4646
<Party partyId="BLOG_ADMIN" partyTypeId="PERSON" statusId="PARTY_ENABLED"/>
4747
<Person partyId="BLOG_ADMIN" lastName="Admin" firstName="Blog"/>
4848
<UserLogin userLoginId="blog_admin" partyId="BLOG_ADMIN"/>
49-
<PartyRole partyId="BLOG_ADMIN" roleTypeId="CONTENT_ADMIN" fromDate="2000-01-01 00:00:00.000"/>
50-
<PartyRole partyId="BLOG_ADMIN" roleTypeId="CONTENT_AUTHOR" fromDate="2000-01-01 00:00:00.000"/>
51-
<PartyRole partyId="BLOG_ADMIN" roleTypeId="CONTENT_EDITOR" fromDate="2000-01-01 00:00:00.000"/>
52-
<PartyRole partyId="BLOG_ADMIN" roleTypeId="CONTENT_PUBLISHER" fromDate="2000-01-01 00:00:00.000"/>
53-
<PartyRole partyId="BLOG_ADMIN" roleTypeId="_NA_" fromDate="2000-01-01 00:00:00.000"/>
49+
<PartyRole partyId="BLOG_ADMIN" roleTypeId="CONTENT_ADMIN"/>
50+
<PartyRole partyId="BLOG_ADMIN" roleTypeId="CONTENT_AUTHOR"/>
51+
<PartyRole partyId="BLOG_ADMIN" roleTypeId="CONTENT_EDITOR"/>
52+
<PartyRole partyId="BLOG_ADMIN" roleTypeId="CONTENT_PUBLISHER"/>
53+
<PartyRole partyId="BLOG_ADMIN" roleTypeId="_NA_"/>
5454
<PartyStatus partyId="BLOG_ADMIN" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
5555

5656
<Party partyId="BLOG_AUTHOR" partyTypeId="PERSON" statusId="PARTY_ENABLED"/>
5757
<Person partyId="BLOG_AUTHOR" lastName="Author" firstName="Blog"/>
5858
<UserLogin userLoginId="blog_author" partyId="BLOG_AUTHOR"/>
59-
<PartyRole partyId="BLOG_AUTHOR" roleTypeId="CONTENT_AUTHOR" fromDate="2000-01-01 00:00:00.000"/>
60-
<PartyRole partyId="BLOG_AUTHOR" roleTypeId="CONTENT_PUBLISHER" fromDate="2000-01-01 00:00:00.000"/>
61-
<PartyRole partyId="BLOG_AUTHOR" roleTypeId="_NA_" fromDate="2000-01-01 00:00:00.000"/>
59+
<PartyRole partyId="BLOG_AUTHOR" roleTypeId="CONTENT_AUTHOR"/>
60+
<PartyRole partyId="BLOG_AUTHOR" roleTypeId="CONTENT_PUBLISHER"/>
61+
<PartyRole partyId="BLOG_AUTHOR" roleTypeId="_NA_"/>
6262
<PartyStatus partyId="BLOG_AUTHOR" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
6363

6464
<Party partyId="BLOG_EDITOR" partyTypeId="PERSON" statusId="PARTY_ENABLED"/>
6565
<Person partyId="BLOG_EDITOR" lastName="Editor" firstName="Blog"/>
6666
<UserLogin userLoginId="blog_editor" partyId="BLOG_EDITOR"/>
67-
<PartyRole partyId="BLOG_EDITOR" roleTypeId="CONTENT_EDITOR" fromDate="2000-01-01 00:00:00.000"/>
68-
<PartyRole partyId="BLOG_EDITOR" roleTypeId="CONTENT_EDITOR" fromDate="2000-01-01 00:00:00.000"/>
69-
<PartyRole partyId="BLOG_EDITOR" roleTypeId="CONTENT_PUBLISHER" fromDate="2000-01-01 00:00:00.000"/>
70-
<PartyRole partyId="BLOG_EDITOR" roleTypeId="_NA_" fromDate="2000-01-01 00:00:00.000"/>
67+
<PartyRole partyId="BLOG_EDITOR" roleTypeId="CONTENT_EDITOR"/>
68+
<PartyRole partyId="BLOG_EDITOR" roleTypeId="CONTENT_EDITOR"/>
69+
<PartyRole partyId="BLOG_EDITOR" roleTypeId="CONTENT_PUBLISHER"/>
70+
<PartyRole partyId="BLOG_EDITOR" roleTypeId="_NA_"/>
7171
<PartyStatus partyId="BLOG_EDITOR" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
7272

7373
<ContactMech contactMechId="ADMIN_CONTACT" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@example.com"/>
@@ -133,24 +133,24 @@ under the License.
133133
<Party partyId="BLOGUSER_ADMIN" partyTypeId="PERSON" statusId="PARTY_ENABLED" createdDate="2004-03-27 09:37:40.989" createdByUserLogin="admin" lastModifiedDate="2004-03-27 09:37:40.989" lastModifiedByUserLogin="admin"/>
134134
<Person partyId="BLOGUSER_ADMIN" lastName="Blog" firstName="Admin"/>
135135
<UserLogin userLoginId="blog_admin" partyId="BLOGUSER_ADMIN" currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"/>
136-
<PartyRole partyId="BLOGUSER_ADMIN" roleTypeId="CONTENT_ADMIN" fromDate="2000-01-01 00:00:00.000"/>
136+
<PartyRole partyId="BLOGUSER_ADMIN" roleTypeId="CONTENT_ADMIN"/>
137137
<PartyStatus partyId="BLOGUSER_ADMIN" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
138138
<ContentRole partyId="BLOGUSER_ADMIN" roleTypeId="CONTENT_ADMIN" contentId="BLOGROOT" fromDate="2004-03-27 09:37:40.989"/>
139139
<UserLoginSecurityGroup userLoginId="blog_admin" groupId="FULLADMIN" fromDate="2004-09-15 00:00:00.000"/>
140140

141141
<Party partyId="BLOGUSER_EDITOR" partyTypeId="PERSON" statusId="PARTY_ENABLED" createdDate="2004-03-27 09:37:40.989" createdByUserLogin="admin" lastModifiedDate="2004-03-27 09:37:40.989" lastModifiedByUserLogin="admin"/>
142142
<Person partyId="BLOGUSER_EDITOR" lastName="Blog" firstName="Editor"/>
143143
<UserLogin userLoginId="blog_editor" partyId="BLOGUSER_EDITOR" currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"/>
144-
<PartyRole partyId="BLOGUSER_EDITOR" roleTypeId="CONTENT_ADMIN" fromDate="2000-01-01 00:00:00.000"/>
144+
<PartyRole partyId="BLOGUSER_EDITOR" roleTypeId="CONTENT_ADMIN"/>
145145
<PartyStatus partyId="BLOGUSER_EDITOR" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
146146
<ContentRole partyId="BLOGUSER_EDITOR" roleTypeId="CONTENT_ADMIN" contentId="BLOGROOT" fromDate="2004-03-27 09:37:40.989"/>
147147
<UserLoginSecurityGroup userLoginId="blog_editor" groupId="FULLADMIN" fromDate="2004-09-15 00:00:00.000"/>
148148

149149
<Party partyId="BLOGUSER_USER" partyTypeId="PERSON" statusId="PARTY_ENABLED" createdDate="2004-03-27 09:37:40.989" createdByUserLogin="admin" lastModifiedDate="2004-03-27 09:37:40.989" lastModifiedByUserLogin="admin"/>
150150
<Person partyId="BLOGUSER_USER" lastName="Blog" firstName="User"/>
151151
<UserLogin userLoginId="blog_user" partyId="BLOGUSER_USER" currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"/>
152-
<PartyRole partyId="BLOGUSER_USER" roleTypeId="CONTENT_ADMIN" fromDate="2000-01-01 00:00:00.000"/>
153-
<PartyRole partyId="BLOGUSER_USER" roleTypeId="CONTENT_AUTHOR" fromDate="2000-01-01 00:00:00.000"/>
152+
<PartyRole partyId="BLOGUSER_USER" roleTypeId="CONTENT_ADMIN"/>
153+
<PartyRole partyId="BLOGUSER_USER" roleTypeId="CONTENT_AUTHOR"/>
154154
<PartyStatus partyId="BLOGUSER_USER" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
155155

156156
<Party partyId="BLOGUSER_GUEST" partyTypeId="PERSON" statusId="PARTY_ENABLED" createdDate="2004-10-20 09:37:40.989" createdByUserLogin="admin" lastModifiedDate="2004-10-20 09:37:40.989" lastModifiedByUserLogin="admin"/>
@@ -161,7 +161,7 @@ under the License.
161161
<Party partyId="AUTHOR_BIGAL" partyTypeId="PERSON" statusId="PARTY_ENABLED" createdDate="2004-03-27 09:37:40.989" createdByUserLogin="admin" lastModifiedDate="2004-03-27 09:37:40.989" lastModifiedByUserLogin="admin"/>
162162
<Person partyId="AUTHOR_BIGAL" lastName="Al" firstName="Big"/>
163163
<UserLogin userLoginId="bigal" partyId="AUTHOR_BIGAL" currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"/>
164-
<PartyRole partyId="AUTHOR_BIGAL" roleTypeId="CONTENT_AUTHOR" fromDate="2000-01-01 00:00:00.000"/>
164+
<PartyRole partyId="AUTHOR_BIGAL" roleTypeId="CONTENT_AUTHOR"/>
165165
<PartyStatus partyId="AUTHOR_BIGAL" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
166166
<ContentRole partyId="AUTHOR_BIGAL" roleTypeId="CONTENT_AUTHOR" contentId="BLOGROOTBIGAL" fromDate="2004-03-27 09:37:40.989"/>
167167
<ContentPurpose contentId="BLOGROOTBIGAL" contentPurposeTypeId="ARTICLE"/>
@@ -177,11 +177,11 @@ under the License.
177177

178178
<DataSource dataSourceId="BLOG_SITE" dataSourceTypeId="WEBSITE_ENTRY" description="Blog Site"/>
179179

180-
<PartyRole partyId="BLOG_USERS" roleTypeId="CONTENT_USER" fromDate="2000-01-01 00:00:00.000"/>
181-
<PartyRole partyId="BLOG_EDITORS" roleTypeId="CONTENT_EDITOR" fromDate="2000-01-01 00:00:00.000"/>
182-
<PartyRole partyId="BLOG_AUTHORS" roleTypeId="CONTENT_AUTHOR" fromDate="2000-01-01 00:00:00.000"/>
183-
<PartyRole partyId="BLOG_ADMINS" roleTypeId="CONTENT_ADMIN" fromDate="2000-01-01 00:00:00.000"/>
184-
<PartyRole partyId="BLOG_PUBLISHERS" roleTypeId="CONTENT_ADMIN" fromDate="2000-01-01 00:00:00.000"/>
180+
<PartyRole partyId="BLOG_USERS" roleTypeId="CONTENT_USER"/>
181+
<PartyRole partyId="BLOG_EDITORS" roleTypeId="CONTENT_EDITOR"/>
182+
<PartyRole partyId="BLOG_AUTHORS" roleTypeId="CONTENT_AUTHOR"/>
183+
<PartyRole partyId="BLOG_ADMINS" roleTypeId="CONTENT_ADMIN"/>
184+
<PartyRole partyId="BLOG_PUBLISHERS" roleTypeId="CONTENT_ADMIN"/>
185185

186186
<PartyStatus partyId="BLOG_USERS" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
187187
<PartyStatus partyId="BLOG_EDITORS" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
@@ -203,7 +203,7 @@ under the License.
203203
<Party partyId="AUTHOR_MADMAX" partyTypeId="PERSON" statusId="PARTY_ENABLED" createdDate="2004-03-27 09:37:40.989" createdByUserLogin="admin" lastModifiedDate="2004-03-27 09:37:40.989" lastModifiedByUserLogin="admin"/>
204204
<Person partyId="AUTHOR_MADMAX" lastName="Max" firstName="Mad"/>
205205
<UserLogin userLoginId="madmax" partyId="AUTHOR_MADMAX" currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"/>
206-
<PartyRole partyId="AUTHOR_MADMAX" roleTypeId="CONTENT_AUTHOR" fromDate="2000-01-01 00:00:00.000"/>
206+
<PartyRole partyId="AUTHOR_MADMAX" roleTypeId="CONTENT_AUTHOR"/>
207207
<PartyStatus partyId="AUTHOR_MADMAX" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
208208
<ContentRole partyId="AUTHOR_MADMAX" roleTypeId="CONTENT_AUTHOR" contentId="BLOGROOTMADMAX" fromDate="2004-03-27 09:37:40.989"/>
209209
<ContentPurpose contentId="BLOGROOTMADMAX" contentPurposeTypeId="ARTICLE"/>
@@ -350,9 +350,9 @@ David won't like it. He will probably delete this seed data from the DB, but it
350350
<RoleType roleTypeId="REVIEWER" description="Reviewer"/>
351351
<Party partyId="approver" partyTypeId="PERSON" statusId="PARTY_ENABLED"/>
352352
<Person firstName="Robert" lastName="Smith" partyId="approver" personalTitle="Captain"/>
353-
<PartyRole partyId="approver" roleTypeId="APPROVER" fromDate="2000-01-01 00:00:00.000"/>
354-
<PartyRole partyId="approver" roleTypeId="REVIEWER" fromDate="2000-01-01 00:00:00.000"/>
355-
<PartyRole partyId="admin" roleTypeId="APPROVER" fromDate="2000-01-01 00:00:00.000"/>
353+
<PartyRole partyId="approver" roleTypeId="APPROVER"/>
354+
<PartyRole partyId="approver" roleTypeId="REVIEWER"/>
355+
<PartyRole partyId="admin" roleTypeId="APPROVER"/>
356356
<PartyStatus partyId="approver" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
357357
<UserLogin userLoginId="approver" partyId="approver"/>
358358

‎applications/datamodel/data/demo/HumanresDemoData.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ under the License.
4646

4747
<!-- Humanres Demo Data -->
4848
<Party partyId="DemoEmployee" statusId="PARTY_ENABLED"/>
49-
<PartyRole partyId="DemoEmployee" roleTypeId="EMPLOYEE" fromDate="2000-01-01 00:00:00.000"/>
49+
<PartyRole partyId="DemoEmployee" roleTypeId="EMPLOYEE"/><!-- data completed by components loaded later -->
5050
<PartyStatus partyId="DemoEmployee" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
5151

5252
<RateAmount rateTypeId="AVERAGE_PAY_RATE" rateCurrencyUomId="USD" periodTypeId="RATE_MONTH" workEffortId="_NA_" partyId="DemoEmployee" emplPositionTypeId="_NA_" fromDate="2000-01-30 17:58:56.038" rateAmount="2300"/>

0 commit comments

Comments
 (0)