svn commit: r1710566 [1/2] - in /ofbiz/trunk: applications/accounting/data/ applications/content/data/ applications/marketing/data/ applications/order/data/ applications/party/data/ applications/product/data/ applications/workeffort/data/ framework/com...

Mon, 26 Oct 2015 04:10:30 -0700 

Author: deepak
Date: Mon Oct 26 11:09:54 2015
New Revision: 1710566

URL: http://svn.apache.org/viewvc?rev=1710566&view=rev
Log:
(OFBIZ-6699) Removed invalid field condition from StatusValidChange data.

Modified:
    ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml
    ofbiz/trunk/applications/content/data/ContentTypeData.xml
    ofbiz/trunk/applications/marketing/data/MarketingTypeData.xml
    ofbiz/trunk/applications/order/data/OrderTypeData.xml
    ofbiz/trunk/applications/party/data/PartyTypeData.xml
    ofbiz/trunk/applications/product/data/ProductTypeData.xml
    ofbiz/trunk/applications/product/data/ShipmentTypeData.xml
    ofbiz/trunk/applications/workeffort/data/WorkEffortTypeData.xml
    ofbiz/trunk/framework/common/data/CommonTypeData.xml
    ofbiz/trunk/specialpurpose/example/data/ExampleDemoData.xml
    ofbiz/trunk/specialpurpose/oagis/data/OagisTypeData.xml
    ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrTypeData.xml
    ofbiz/trunk/specialpurpose/scrum/data/scrumTypeData.xml

Modified: ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml?rev=1710566&r1=1710565&r2=1710566&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml (original)
+++ ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml Mon Oct 26 
11:09:54 2015
@@ -110,21 +110,21 @@ under the License.
     <!-- This is meant to be set manually by a company representative to 
freeze an account so further transactions are not allowed. Was isFrozen -->
     <StatusItem description="Manually Frozen" sequenceId="03" 
statusCode="MANFROZEN" statusId="FNACT_MANFROZEN" 
statusTypeId="FINACCT_STATUS"/>
     <StatusItem description="Cancelled" sequenceId="09" statusCode="CANCELLED" 
statusId="FNACT_CANCELLED" statusTypeId="FINACCT_STATUS"/>
-    <StatusValidChange condition="" statusId="FNACT_ACTIVE" 
statusIdTo="FNACT_NEGPENDREPL" transitionName="Set Negative Pending 
Replenishment"/>
-    <StatusValidChange condition="" statusId="FNACT_ACTIVE" 
statusIdTo="FNACT_MANFROZEN" transitionName="Set Manually Frozen"/>
-    <StatusValidChange condition="" statusId="FNACT_ACTIVE" 
statusIdTo="FNACT_CANCELLED" transitionName="Cancel"/>
-    <StatusValidChange condition="" statusId="FNACT_NEGPENDREPL" 
statusIdTo="FNACT_ACTIVE" transitionName="Re-activate"/>
-    <StatusValidChange condition="" statusId="FNACT_NEGPENDREPL" 
statusIdTo="FNACT_MANFROZEN" transitionName="Manually Freeze"/>
-    <StatusValidChange condition="" statusId="FNACT_NEGPENDREPL" 
statusIdTo="FNACT_CANCELLED" transitionName="Cancel"/>
-    <StatusValidChange condition="" statusId="FNACT_MANFROZEN" 
statusIdTo="FNACT_ACTIVE" transitionName="Re-activate"/>
-    <StatusValidChange condition="" statusId="FNACT_MANFROZEN" 
statusIdTo="FNACT_CANCELLED" transitionName="Cancel"/>
+    <StatusValidChange statusId="FNACT_ACTIVE" statusIdTo="FNACT_NEGPENDREPL" 
transitionName="Set Negative Pending Replenishment"/>
+    <StatusValidChange statusId="FNACT_ACTIVE" statusIdTo="FNACT_MANFROZEN" 
transitionName="Set Manually Frozen"/>
+    <StatusValidChange statusId="FNACT_ACTIVE" statusIdTo="FNACT_CANCELLED" 
transitionName="Cancel"/>
+    <StatusValidChange statusId="FNACT_NEGPENDREPL" statusIdTo="FNACT_ACTIVE" 
transitionName="Re-activate"/>
+    <StatusValidChange statusId="FNACT_NEGPENDREPL" 
statusIdTo="FNACT_MANFROZEN" transitionName="Manually Freeze"/>
+    <StatusValidChange statusId="FNACT_NEGPENDREPL" 
statusIdTo="FNACT_CANCELLED" transitionName="Cancel"/>
+    <StatusValidChange statusId="FNACT_MANFROZEN" statusIdTo="FNACT_ACTIVE" 
transitionName="Re-activate"/>
+    <StatusValidChange statusId="FNACT_MANFROZEN" statusIdTo="FNACT_CANCELLED" 
transitionName="Cancel"/>
     <StatusType statusTypeId="FINACT_TRNS_STATUS" description="Financial 
Account Trans Status" hasTable="N" parentTypeId=""/>
     <StatusItem statusId="FINACT_TRNS_APPROVED" 
statusTypeId="FINACT_TRNS_STATUS" statusCode="APPROVED" sequenceId="11" 
description="Approved"/>
     <StatusItem statusId="FINACT_TRNS_CREATED" 
statusTypeId="FINACT_TRNS_STATUS" statusCode="CREATED" sequenceId="12" 
description="Created"/>
     <StatusItem statusId="FINACT_TRNS_CANCELED" 
statusTypeId="FINACT_TRNS_STATUS" statusCode="CANCELED" sequenceId="13" 
description="Canceled"/>
-    <StatusValidChange condition="" statusId="FINACT_TRNS_CREATED" 
statusIdTo="FINACT_TRNS_APPROVED" transitionName="Set Created to Approved"/>
-    <StatusValidChange condition="" statusId="FINACT_TRNS_CREATED" 
statusIdTo="FINACT_TRNS_CANCELED" transitionName="Set Created to Canceled"/>
-    <StatusValidChange condition="" statusId="FINACT_TRNS_APPROVED" 
statusIdTo="FINACT_TRNS_CANCELED" transitionName="Set Approved to Canceled"/>
+    <StatusValidChange statusId="FINACT_TRNS_CREATED" 
statusIdTo="FINACT_TRNS_APPROVED" transitionName="Set Created to Approved"/>
+    <StatusValidChange statusId="FINACT_TRNS_CREATED" 
statusIdTo="FINACT_TRNS_CANCELED" transitionName="Set Created to Canceled"/>
+    <StatusValidChange statusId="FINACT_TRNS_APPROVED" 
statusIdTo="FINACT_TRNS_CANCELED" transitionName="Set Approved to Canceled"/>
 
     <!-- FinAccount Reasons for Purchase & Replenish -->
     <EnumerationType description="Service Debit Reasons" 
enumTypeId="FINACCT_TRANS_REASON" parentTypeId="" hasTable="N"/>
@@ -183,12 +183,12 @@ under the License.
     <StatusItem description="In Process" sequenceId="05" 
statusCode="IN_PROCESS" statusId="FAM_IN_PROCESS" 
statusTypeId="FIXEDAST_MNT_STATUS"/>
     <StatusItem description="Completed" sequenceId="10" statusCode="COMPLETED" 
statusId="FAM_COMPLETED" statusTypeId="FIXEDAST_MNT_STATUS"/>
     <StatusItem description="Cancelled" sequenceId="99" statusCode="CANCELLED" 
statusId="FAM_CANCELLED" statusTypeId="FIXEDAST_MNT_STATUS"/>
-    <StatusValidChange condition="" statusId="FAM_CREATED" 
statusIdTo="FAM_SCHEDULED" transitionName="Created Maintenance Scheduled"/>
-    <StatusValidChange condition="" statusId="FAM_CREATED" 
statusIdTo="FAM_IN_PROCESS" transitionName="Created Maintenance In-Process"/>
-    <StatusValidChange condition="" statusId="FAM_CREATED" 
statusIdTo="FAM_CANCELLED" transitionName="Created Maintenace Cancelled"/>
-    <StatusValidChange condition="" statusId="FAM_SCHEDULED" 
statusIdTo="FAM_IN_PROCESS" transitionName="Scheduled Maintenace In-Process"/>
-    <StatusValidChange condition="" statusId="FAM_SCHEDULED" 
statusIdTo="FAM_CANCELLED" transitionName="Scheduled Maintenace Cancelled"/>
-    <StatusValidChange condition="" statusId="FAM_IN_PROCESS" 
statusIdTo="FAM_COMPLETED" transitionName="In-Process Maintenance Completed"/>
+    <StatusValidChange statusId="FAM_CREATED" statusIdTo="FAM_SCHEDULED" 
transitionName="Created Maintenance Scheduled"/>
+    <StatusValidChange statusId="FAM_CREATED" statusIdTo="FAM_IN_PROCESS" 
transitionName="Created Maintenance In-Process"/>
+    <StatusValidChange statusId="FAM_CREATED" statusIdTo="FAM_CANCELLED" 
transitionName="Created Maintenace Cancelled"/>
+    <StatusValidChange statusId="FAM_SCHEDULED" statusIdTo="FAM_IN_PROCESS" 
transitionName="Scheduled Maintenace In-Process"/>
+    <StatusValidChange statusId="FAM_SCHEDULED" statusIdTo="FAM_CANCELLED" 
transitionName="Scheduled Maintenace Cancelled"/>
+    <StatusValidChange statusId="FAM_IN_PROCESS" statusIdTo="FAM_COMPLETED" 
transitionName="In-Process Maintenance Completed"/>
     
     <!-- Fixed Asset Maintenance party roles -->
     <RoleType description="Fixed Asset Maint Assignee" hasTable="N" 
roleTypeId="FAM_ASSIGNEE"/>
@@ -885,32 +885,32 @@ under the License.
     <StatusItem description="Write Off" sequenceId="31" statusCode="WRITE OFF" 
statusId="INVOICE_WRITEOFF" statusTypeId="INVOICE_STATUS"/>
     <StatusItem description="Cancelled" sequenceId="99" statusCode="CANCELLED" 
statusId="INVOICE_CANCELLED" statusTypeId="INVOICE_STATUS"/>
     <!-- this is the simplest process: IN_PROCESS -> READY or CANCELLED -->
-    <StatusValidChange condition="" statusId="INVOICE_IN_PROCESS" 
statusIdTo="INVOICE_READY" transitionName="Mark Ready"/>
-    <StatusValidChange condition="" statusId="INVOICE_IN_PROCESS" 
statusIdTo="INVOICE_CANCELLED" transitionName="Cancel"/>
+    <StatusValidChange statusId="INVOICE_IN_PROCESS" 
statusIdTo="INVOICE_READY" transitionName="Mark Ready"/>
+    <StatusValidChange statusId="INVOICE_IN_PROCESS" 
statusIdTo="INVOICE_CANCELLED" transitionName="Cancel"/>
     <!-- this is a more complicated process: IN_PROCESS -> SENT -> (optionally 
RECEIVED) -> READY or CANCELLED -->
-    <StatusValidChange condition="" statusId="INVOICE_IN_PROCESS" 
statusIdTo="INVOICE_SENT" transitionName="Send"/>
-    <StatusValidChange condition="" statusId="INVOICE_IN_PROCESS" 
statusIdTo="INVOICE_RECEIVED" transitionName="Receive"/>
-    <StatusValidChange condition="" statusId="INVOICE_SENT" 
statusIdTo="INVOICE_APPROVED" transitionName="Mark Approved"/>
-    <StatusValidChange condition="" statusId="INVOICE_SENT" 
statusIdTo="INVOICE_READY" transitionName="Mark Ready"/>
-    <StatusValidChange condition="" statusId="INVOICE_SENT" 
statusIdTo="INVOICE_RECEIVED" transitionName="Receive"/>
-    <StatusValidChange condition="" statusId="INVOICE_RECEIVED" 
statusIdTo="INVOICE_READY" transitionName="Mark Receive"/>
-    <StatusValidChange condition="" statusId="INVOICE_SENT" 
statusIdTo="INVOICE_CANCELLED" transitionName="Cancel"/>
-    <StatusValidChange condition="" statusId="INVOICE_RECEIVED" 
statusIdTo="INVOICE_CANCELLED" transitionName="Cancel"/>
+    <StatusValidChange statusId="INVOICE_IN_PROCESS" statusIdTo="INVOICE_SENT" 
transitionName="Send"/>
+    <StatusValidChange statusId="INVOICE_IN_PROCESS" 
statusIdTo="INVOICE_RECEIVED" transitionName="Receive"/>
+    <StatusValidChange statusId="INVOICE_SENT" statusIdTo="INVOICE_APPROVED" 
transitionName="Mark Approved"/>
+    <StatusValidChange statusId="INVOICE_SENT" statusIdTo="INVOICE_READY" 
transitionName="Mark Ready"/>
+    <StatusValidChange statusId="INVOICE_SENT" statusIdTo="INVOICE_RECEIVED" 
transitionName="Receive"/>
+    <StatusValidChange statusId="INVOICE_RECEIVED" statusIdTo="INVOICE_READY" 
transitionName="Mark Receive"/>
+    <StatusValidChange statusId="INVOICE_SENT" statusIdTo="INVOICE_CANCELLED" 
transitionName="Cancel"/>
+    <StatusValidChange statusId="INVOICE_RECEIVED" 
statusIdTo="INVOICE_CANCELLED" transitionName="Cancel"/>
     <!-- this is a process to enable modification via the Status IN_PROCESS 
when the receiver/sender wants an invoice change or to cancel it -->
-    <StatusValidChange condition="" statusId="INVOICE_SENT" 
statusIdTo="INVOICE_IN_PROCESS" transitionName="Enable sales invoice update"/>
-    <StatusValidChange condition="" statusId="INVOICE_RECEIVED" 
statusIdTo="INVOICE_IN_PROCESS" transitionName="Enable purch.invoice update"/>
+    <StatusValidChange statusId="INVOICE_SENT" statusIdTo="INVOICE_IN_PROCESS" 
transitionName="Enable sales invoice update"/>
+    <StatusValidChange statusId="INVOICE_RECEIVED" 
statusIdTo="INVOICE_IN_PROCESS" transitionName="Enable purch.invoice update"/>
     <!-- an optional approval state is put in before invoice is sent or after 
it is received -->
-    <StatusValidChange condition="" statusId="INVOICE_IN_PROCESS" 
statusIdTo="INVOICE_APPROVED" transitionName="Approve"/>
-    <StatusValidChange condition="" statusId="INVOICE_APPROVED" 
statusIdTo="INVOICE_SENT" transitionName="Send"/>
-    <StatusValidChange condition="" statusId="INVOICE_IN_PROCESS" 
statusIdTo="INVOICE_RECEIVED" transitionName="Receive"/>
-    <StatusValidChange condition="" statusId="INVOICE_RECEIVED" 
statusIdTo="INVOICE_APPROVED" transitionName="Approve"/>
-    <StatusValidChange condition="" statusId="INVOICE_APPROVED" 
statusIdTo="INVOICE_READY" transitionName="Mark Ready"/>
+    <StatusValidChange statusId="INVOICE_IN_PROCESS" 
statusIdTo="INVOICE_APPROVED" transitionName="Approve"/>
+    <StatusValidChange statusId="INVOICE_APPROVED" statusIdTo="INVOICE_SENT" 
transitionName="Send"/>
+    <StatusValidChange statusId="INVOICE_IN_PROCESS" 
statusIdTo="INVOICE_RECEIVED" transitionName="Receive"/>
+    <StatusValidChange statusId="INVOICE_RECEIVED" 
statusIdTo="INVOICE_APPROVED" transitionName="Approve"/>
+    <StatusValidChange statusId="INVOICE_APPROVED" statusIdTo="INVOICE_READY" 
transitionName="Mark Ready"/>
     <!-- finally the invoice can be paid or written off.   -->
-    <StatusValidChange condition="" statusId="INVOICE_READY" 
statusIdTo="INVOICE_PAID" transitionName="Pay"/>
-    <StatusValidChange condition="" statusId="INVOICE_READY" 
statusIdTo="INVOICE_WRITEOFF" transitionName="Write Off"/>
-    <StatusValidChange condition="" statusId="INVOICE_PAID" 
statusIdTo="INVOICE_READY" transitionName="Unpay"/>
-    <StatusValidChange condition="" statusId="INVOICE_READY" 
statusIdTo="INVOICE_CANCELLED" transitionName="Cancel"/>
-    <StatusValidChange condition="" statusId="INVOICE_PAID" 
statusIdTo="INVOICE_CANCELLED" transitionName="Cancel"/>
+    <StatusValidChange statusId="INVOICE_READY" statusIdTo="INVOICE_PAID" 
transitionName="Pay"/>
+    <StatusValidChange statusId="INVOICE_READY" statusIdTo="INVOICE_WRITEOFF" 
transitionName="Write Off"/>
+    <StatusValidChange statusId="INVOICE_PAID" statusIdTo="INVOICE_READY" 
transitionName="Unpay"/>
+    <StatusValidChange statusId="INVOICE_READY" statusIdTo="INVOICE_CANCELLED" 
transitionName="Cancel"/>
+    <StatusValidChange statusId="INVOICE_PAID" statusIdTo="INVOICE_CANCELLED" 
transitionName="Cancel"/>
 
     <!-- payment status -->
     <StatusType description="Payment Status" hasTable="N" parentTypeId="" 
statusTypeId="PMNT_STATUS"/>
@@ -920,18 +920,18 @@ under the License.
     <StatusItem description="Confirmed" sequenceId="05" statusCode="CONFIRMED" 
statusId="PMNT_CONFIRMED" statusTypeId="PMNT_STATUS"/>
     <StatusItem description="Cancelled" sequenceId="10" statusCode="CANCELLED" 
statusId="PMNT_CANCELLED" statusTypeId="PMNT_STATUS"/>
     <StatusItem description="Voided" sequenceId="11" statusCode="VOID" 
statusId="PMNT_VOID" statusTypeId="PMNT_STATUS"/>
-    <StatusValidChange condition="" statusId="PMNT_NOT_PAID" 
statusIdTo="PMNT_SENT" transitionName="Payment Send"/>
-    <StatusValidChange condition="" statusId="PMNT_NOT_PAID" 
statusIdTo="PMNT_RECEIVED" transitionName="Payment Received"/>
-    <StatusValidChange condition="" statusId="PMNT_NOT_PAID" 
statusIdTo="PMNT_CANCELLED" transitionName="Payment Cancelled"/>
-    <StatusValidChange condition="" statusId="PMNT_SENT" 
statusIdTo="PMNT_CONFIRMED" transitionName="Payment Confirmed"/>
-    <StatusValidChange condition="" statusId="PMNT_RECEIVED" 
statusIdTo="PMNT_CONFIRMED" transitionName="Payment Confirmed"/>
-    <StatusValidChange condition="" statusId="PMNT_SENT" 
statusIdTo="PMNT_VOID" transitionName="Payment Voided"/>
-    <StatusValidChange condition="" statusId="PMNT_RECEIVED" 
statusIdTo="PMNT_VOID" transitionName="Payment Voided"/>
-    <StatusValidChange condition="" statusId="PMNT_NOT_PAID" 
statusIdTo="PMNT_VOID" transitionName="Payment Voided"/>
-    <StatusValidChange condition="" statusId="PMNT_SENT" 
statusIdTo="PMNT_NOT_PAID" transitionName="Payment Not Paid"/>
-    <StatusValidChange condition="" statusId="PMNT_RECEIVED" 
statusIdTo="PMNT_NOT_PAID" transitionName="Payment Not Paid"/>
-    <StatusValidChange condition="" statusId="PMNT_CONFIRMED" 
statusIdTo="PMNT_SENT" transitionName="Payment Confirmed to Sent"/>
-    <StatusValidChange condition="" statusId="PMNT_CONFIRMED" 
statusIdTo="PMNT_RECEIVED" transitionName="Payment Confirmed to Received"/>
+    <StatusValidChange statusId="PMNT_NOT_PAID" statusIdTo="PMNT_SENT" 
transitionName="Payment Send"/>
+    <StatusValidChange statusId="PMNT_NOT_PAID" statusIdTo="PMNT_RECEIVED" 
transitionName="Payment Received"/>
+    <StatusValidChange statusId="PMNT_NOT_PAID" statusIdTo="PMNT_CANCELLED" 
transitionName="Payment Cancelled"/>
+    <StatusValidChange statusId="PMNT_SENT" statusIdTo="PMNT_CONFIRMED" 
transitionName="Payment Confirmed"/>
+    <StatusValidChange statusId="PMNT_RECEIVED" statusIdTo="PMNT_CONFIRMED" 
transitionName="Payment Confirmed"/>
+    <StatusValidChange statusId="PMNT_SENT" statusIdTo="PMNT_VOID" 
transitionName="Payment Voided"/>
+    <StatusValidChange statusId="PMNT_RECEIVED" statusIdTo="PMNT_VOID" 
transitionName="Payment Voided"/>
+    <StatusValidChange statusId="PMNT_NOT_PAID" statusIdTo="PMNT_VOID" 
transitionName="Payment Voided"/>
+    <StatusValidChange statusId="PMNT_SENT" statusIdTo="PMNT_NOT_PAID" 
transitionName="Payment Not Paid"/>
+    <StatusValidChange statusId="PMNT_RECEIVED" statusIdTo="PMNT_NOT_PAID" 
transitionName="Payment Not Paid"/>
+    <StatusValidChange statusId="PMNT_CONFIRMED" statusIdTo="PMNT_SENT" 
transitionName="Payment Confirmed to Sent"/>
+    <StatusValidChange statusId="PMNT_CONFIRMED" statusIdTo="PMNT_RECEIVED" 
transitionName="Payment Confirmed to Received"/>
 
     <SettlementTerm settlementTermId="COD" termName="Cash Due on Delivery" 
termValue="0" uomId="TF_day"/>
     <SettlementTerm settlementTermId="NET_15" termName="Net Due in 15 Days" 
termValue="15" uomId="TF_day"/>
@@ -1087,7 +1087,7 @@ under the License.
     <StatusType statusTypeId="GLREC_STATUS" description="Gl Reconciliation 
Status" hasTable="N" parentTypeId=""/>
     <StatusItem statusId="GLREC_CREATED" statusTypeId="GLREC_STATUS" 
statusCode="CREATED" sequenceId="11" description="Created"/>
     <StatusItem statusId="GLREC_RECONCILED" statusTypeId="GLREC_STATUS" 
statusCode="RECONCILED" sequenceId="12" description="Reconciled"/>
-    <StatusValidChange condition="" statusId="GLREC_CREATED" 
statusIdTo="GLREC_RECONCILED" transitionName="Set Created to Reconciled"/>
+    <StatusValidChange statusId="GLREC_CREATED" statusIdTo="GLREC_RECONCILED" 
transitionName="Set Created to Reconciled"/>
 
     <!--Depreciation Formulae-->
     <CustomMethodType customMethodTypeId="DEPRECIATION_FORMULA" 
description="Formula for calculating depreciation for fixed asset"/>
@@ -1103,13 +1103,13 @@ under the License.
     <StatusItem description="Reviewed" sequenceId="01" statusCode="REVIEWED" 
statusId="BG_REVIEWED" statusTypeId="BUDGET_STATUS"/>
     <StatusItem description="Approved" sequenceId="02" statusCode="APPROVED" 
statusId="BG_APPROVED" statusTypeId="BUDGET_STATUS"/>
     <StatusItem description="Rejected" sequenceId="03" statusCode="REJECTED" 
statusId="BG_REJECTED" statusTypeId="BUDGET_STATUS"/>
-    <StatusValidChange condition="" statusId="BG_CREATED" 
statusIdTo="BG_REVIEWED" transitionName="Review Budget"/>
-    <StatusValidChange condition="" statusId="BG_CREATED" 
statusIdTo="BG_APPROVED" transitionName="Submit Budget"/>
-    <StatusValidChange condition="" statusId="BG_CREATED" 
statusIdTo="BG_REJECTED" transitionName="Reject Budget"/>
-    <StatusValidChange condition="" statusId="BG_REVIEWED" 
statusIdTo="BG_APPROVED" transitionName="Approved Budget"/>
-    <StatusValidChange condition="" statusId="BG_REVIEWED" 
statusIdTo="BG_REJECTED" transitionName="Reject Budget"/>
-    <StatusValidChange condition="" statusId="BG_APPROVED" 
statusIdTo="BG_CREATED" transitionName="Accept Budget"/>
-    <StatusValidChange condition="" statusId="BG_APPROVED" 
statusIdTo="BG_REJECTED" transitionName="Reject Budget"/>
+    <StatusValidChange statusId="BG_CREATED" statusIdTo="BG_REVIEWED" 
transitionName="Review Budget"/>
+    <StatusValidChange statusId="BG_CREATED" statusIdTo="BG_APPROVED" 
transitionName="Submit Budget"/>
+    <StatusValidChange statusId="BG_CREATED" statusIdTo="BG_REJECTED" 
transitionName="Reject Budget"/>
+    <StatusValidChange statusId="BG_REVIEWED" statusIdTo="BG_APPROVED" 
transitionName="Approved Budget"/>
+    <StatusValidChange statusId="BG_REVIEWED" statusIdTo="BG_REJECTED" 
transitionName="Reject Budget"/>
+    <StatusValidChange statusId="BG_APPROVED" statusIdTo="BG_CREATED" 
transitionName="Accept Budget"/>
+    <StatusValidChange statusId="BG_APPROVED" statusIdTo="BG_REJECTED" 
transitionName="Reject Budget"/>
     
     <BudgetReviewResultType description="Accepted" 
budgetReviewResultTypeId="BGR_ACCEPTED"/>
     <BudgetReviewResultType description="Rejected" 
budgetReviewResultTypeId="BGR_REJECTED"/>

Modified: ofbiz/trunk/applications/content/data/ContentTypeData.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/data/ContentTypeData.xml?rev=1710566&r1=1710565&r2=1710566&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/data/ContentTypeData.xml (original)
+++ ofbiz/trunk/applications/content/data/ContentTypeData.xml Mon Oct 26 
11:09:54 2015
@@ -164,16 +164,16 @@ under the License.
     <StatusItem description="Deactivated" sequenceId="99" 
statusCode="DEACTIVATED" statusId="CTNT_DEACTIVATED" 
statusTypeId="CONTENT_STATUS"/>
     <StatusItem description="Available" sequenceId="10" statusCode="AVAILABLE" 
statusId="CTNT_AVAILABLE" statusTypeId="CONTENT_STATUS"/>
 
-    <StatusValidChange condition="" statusId="CTNT_IN_PROGRESS" 
statusIdTo="CTNT_INITIAL_DRAFT" transitionName="First draft"/>
-    <StatusValidChange condition="" statusId="CTNT_IN_PROGRESS" 
statusIdTo="CTNT_PUBLISHED" transitionName="Publised, not revised"/>
-    <StatusValidChange condition="" statusId="CTNT_IN_PROGRESS" 
statusIdTo="CTNT_AVAILABLE" transitionName="Available"/>
-    <StatusValidChange condition="" statusId="CTNT_INITIAL_DRAFT" 
statusIdTo="CTNT_REVISED_DRAFT" transitionName="Draft revised"/>
-    <StatusValidChange condition="" statusId="CTNT_INITIAL_DRAFT" 
statusIdTo="CTNT_PUBLISHED" transitionName="Initial draft Publised"/>
-    <StatusValidChange condition="" statusId="CTNT_REVISED_DRAFT" 
statusIdTo="CTNT_FINAL_DRAFT" transitionName="Final draft"/>
-    <StatusValidChange condition="" statusId="CTNT_REVISED_DRAFT" 
statusIdTo="CTNT_PUBLISHED" transitionName="Revised draft Publised"/>
-    <StatusValidChange condition="" statusId="CTNT_FINAL_DRAFT" 
statusIdTo="CTNT_PUBLISHED" transitionName="Final draft Published"/>
-    <StatusValidChange condition="" statusId="CTNT_PUBLISHED" 
statusIdTo="CTNT_DEACTIVATED" transitionName="Deactivated"/>
-    <StatusValidChange condition="" statusId="CTNT_AVAILABLE" 
statusIdTo="CTNT_DEACTIVATED" transitionName="Available to Deactivated"/>
+    <StatusValidChange statusId="CTNT_IN_PROGRESS" 
statusIdTo="CTNT_INITIAL_DRAFT" transitionName="First draft"/>
+    <StatusValidChange statusId="CTNT_IN_PROGRESS" statusIdTo="CTNT_PUBLISHED" 
transitionName="Publised, not revised"/>
+    <StatusValidChange statusId="CTNT_IN_PROGRESS" statusIdTo="CTNT_AVAILABLE" 
transitionName="Available"/>
+    <StatusValidChange statusId="CTNT_INITIAL_DRAFT" 
statusIdTo="CTNT_REVISED_DRAFT" transitionName="Draft revised"/>
+    <StatusValidChange statusId="CTNT_INITIAL_DRAFT" 
statusIdTo="CTNT_PUBLISHED" transitionName="Initial draft Publised"/>
+    <StatusValidChange statusId="CTNT_REVISED_DRAFT" 
statusIdTo="CTNT_FINAL_DRAFT" transitionName="Final draft"/>
+    <StatusValidChange statusId="CTNT_REVISED_DRAFT" 
statusIdTo="CTNT_PUBLISHED" transitionName="Revised draft Publised"/>
+    <StatusValidChange statusId="CTNT_FINAL_DRAFT" statusIdTo="CTNT_PUBLISHED" 
transitionName="Final draft Published"/>
+    <StatusValidChange statusId="CTNT_PUBLISHED" statusIdTo="CTNT_DEACTIVATED" 
transitionName="Deactivated"/>
+    <StatusValidChange statusId="CTNT_AVAILABLE" statusIdTo="CTNT_DEACTIVATED" 
transitionName="Available to Deactivated"/>
 
     <SubscriptionType description="Newsgroup" hasTable="N" parentTypeId="" 
subscriptionTypeId="NEWSGROUP_SUBSCR"/>
     <SubscriptionType description="Other" hasTable="N" parentTypeId="" 
subscriptionTypeId="OTHER_SUBSCR"/>

Modified: ofbiz/trunk/applications/marketing/data/MarketingTypeData.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/data/MarketingTypeData.xml?rev=1710566&r1=1710565&r2=1710566&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/data/MarketingTypeData.xml (original)
+++ ofbiz/trunk/applications/marketing/data/MarketingTypeData.xml Mon Oct 26 
11:09:54 2015
@@ -25,12 +25,12 @@ under the License.
     <StatusItem description="In Progress" sequenceId="03" 
statusCode="INPROGRESS" statusId="MKTG_CAMP_INPROGRESS" 
statusTypeId="MKTG_CAMP_STATUS"/>
     <StatusItem description="Completed" sequenceId="04" statusCode="COMPLETED" 
statusId="MKTG_CAMP_COMPLETED" statusTypeId="MKTG_CAMP_STATUS"/>
     <StatusItem description="Cancelled" sequenceId="05" statusCode="CANCELLED" 
statusId="MKTG_CAMP_CANCELLED" statusTypeId="MKTG_CAMP_STATUS"/>
-    <StatusValidChange condition="" statusId="MKTG_CAMP_PLANNED" 
statusIdTo="MKTG_CAMP_APPROVED" transitionName="Approve Marketing Campaign"/>
-    <StatusValidChange condition="" statusId="MKTG_CAMP_APPROVED" 
statusIdTo="MKTG_CAMP_INPROGRESS" transitionName="Marketing Campaign In 
Progress"/>
-    <StatusValidChange condition="" statusId="MKTG_CAMP_INPROGRESS" 
statusIdTo="MKTG_CAMP_COMPLETED" transitionName="Complete Marketing Campaign"/>
-    <StatusValidChange condition="" statusId="MKTG_CAMP_PLANNED" 
statusIdTo="MKTG_CAMP_CANCELLED" transitionName="Cancel Marketing Campaign"/>
-    <StatusValidChange condition="" statusId="MKTG_CAMP_APPROVED" 
statusIdTo="MKTG_CAMP_CANCELLED" transitionName="Cancel Marketing Campaign"/>
-    <StatusValidChange condition="" statusId="MKTG_CAMP_INPROGRESS" 
statusIdTo="MKTG_CAMP_CANCELLED" transitionName="Cancel Marketing Campaign"/>
+    <StatusValidChange statusId="MKTG_CAMP_PLANNED" 
statusIdTo="MKTG_CAMP_APPROVED" transitionName="Approve Marketing Campaign"/>
+    <StatusValidChange statusId="MKTG_CAMP_APPROVED" 
statusIdTo="MKTG_CAMP_INPROGRESS" transitionName="Marketing Campaign In 
Progress"/>
+    <StatusValidChange statusId="MKTG_CAMP_INPROGRESS" 
statusIdTo="MKTG_CAMP_COMPLETED" transitionName="Complete Marketing Campaign"/>
+    <StatusValidChange statusId="MKTG_CAMP_PLANNED" 
statusIdTo="MKTG_CAMP_CANCELLED" transitionName="Cancel Marketing Campaign"/>
+    <StatusValidChange statusId="MKTG_CAMP_APPROVED" 
statusIdTo="MKTG_CAMP_CANCELLED" transitionName="Cancel Marketing Campaign"/>
+    <StatusValidChange statusId="MKTG_CAMP_INPROGRESS" 
statusIdTo="MKTG_CAMP_CANCELLED" transitionName="Cancel Marketing Campaign"/>
 
     <ContactListType contactListTypeId="MARKETING" description="Marketing"/>
     <ContactListType contactListTypeId="NEWSLETTER" description="Newsletter"/>
@@ -44,21 +44,21 @@ under the License.
     <StatusItem description="Invalid" sequenceId="05" statusCode="INVALID" 
statusId="CLPT_INVALID" statusTypeId="CONTACTLST_PARTY"/>
     <StatusItem description="Unsubscription pending" sequenceId="06" 
statusCode="UNSUBS_PENDING" statusId="CLPT_UNSUBS_PENDING" 
statusTypeId="CONTACTLST_PARTY"/>
     <StatusItem description="Unsubscribed" sequenceId="07" 
statusCode="UNSUBSCRIBED" statusId="CLPT_UNSUBSCRIBED" 
statusTypeId="CONTACTLST_PARTY"/>
-    <StatusValidChange condition="" statusId="CLPT_PENDING" 
statusIdTo="CLPT_ACCEPTED" transitionName="Accept"/>
-    <StatusValidChange condition="" statusId="CLPT_PENDING" 
statusIdTo="CLPT_REJECTED" transitionName="Reject"/>
-    <StatusValidChange condition="" statusId="CLPT_ACCEPTED" 
statusIdTo="CLPT_REJECTED" transitionName="Reject"/>
-    <StatusValidChange condition="" statusId="CLPT_REJECTED" 
statusIdTo="CLPT_ACCEPTED" transitionName="Accept"/>
-    <StatusValidChange condition="" statusId="CLPT_REJECTED" 
statusIdTo="CLPT_PENDING" transitionName="Pending Accept"/>
-    <StatusValidChange condition="" statusId="CLPT_ACCEPTED" 
statusIdTo="CLPT_IN_USE" transitionName="Locked - In Use"/>
-    <StatusValidChange condition="" statusId="CLPT_ACCEPTED" 
statusIdTo="CLPT_INVALID" transitionName="Invalid"/>
-    <StatusValidChange condition="" statusId="CLPT_ACCEPTED" 
statusIdTo="CLPT_UNSUBS_PENDING" transitionName="Subscription Accepted - 
Unsubscription Pending"/>
-    <StatusValidChange condition="" statusId="CLPT_PENDING" 
statusIdTo="CLPT_UNSUBS_PENDING" transitionName="Subscription Pending - 
Unsubscription Pending"/>
-    <StatusValidChange condition="" statusId="CLPT_IN_USE" 
statusIdTo="CLPT_UNSUBS_PENDING" transitionName="Subscription In Use - 
Unsubscription Pending"/>
-    <StatusValidChange condition="" statusId="CLPT_INVALID" 
statusIdTo="CLPT_UNSUBS_PENDING" transitionName="Subscription Invalid - 
Unsubscription Pending"/>
-    <StatusValidChange condition="" statusId="CLPT_ACCEPTED" 
statusIdTo="CLPT_UNSUBSCRIBED" transitionName="Subscription Accepted - 
Unsubscribed"/>
-    <StatusValidChange condition="" statusId="CLPT_PENDING" 
statusIdTo="CLPT_UNSUBSCRIBED" transitionName="Subscription Accepted - 
Unsubscribed"/>
-    <StatusValidChange condition="" statusId="CLPT_IN_USE" 
statusIdTo="CLPT_UNSUBSCRIBED" transitionName="Subscription In Use - 
Unsubscribed"/>
-    <StatusValidChange condition="" statusId="CLPT_INVALID" 
statusIdTo="CLPT_UNSUBSCRIBED" transitionName="Subscription Invalid - 
Unsubscribed"/>
+    <StatusValidChange statusId="CLPT_PENDING" statusIdTo="CLPT_ACCEPTED" 
transitionName="Accept"/>
+    <StatusValidChange statusId="CLPT_PENDING" statusIdTo="CLPT_REJECTED" 
transitionName="Reject"/>
+    <StatusValidChange statusId="CLPT_ACCEPTED" statusIdTo="CLPT_REJECTED" 
transitionName="Reject"/>
+    <StatusValidChange statusId="CLPT_REJECTED" statusIdTo="CLPT_ACCEPTED" 
transitionName="Accept"/>
+    <StatusValidChange statusId="CLPT_REJECTED" statusIdTo="CLPT_PENDING" 
transitionName="Pending Accept"/>
+    <StatusValidChange statusId="CLPT_ACCEPTED" statusIdTo="CLPT_IN_USE" 
transitionName="Locked - In Use"/>
+    <StatusValidChange statusId="CLPT_ACCEPTED" statusIdTo="CLPT_INVALID" 
transitionName="Invalid"/>
+    <StatusValidChange statusId="CLPT_ACCEPTED" 
statusIdTo="CLPT_UNSUBS_PENDING" transitionName="Subscription Accepted - 
Unsubscription Pending"/>
+    <StatusValidChange statusId="CLPT_PENDING" 
statusIdTo="CLPT_UNSUBS_PENDING" transitionName="Subscription Pending - 
Unsubscription Pending"/>
+    <StatusValidChange statusId="CLPT_IN_USE" statusIdTo="CLPT_UNSUBS_PENDING" 
transitionName="Subscription In Use - Unsubscription Pending"/>
+    <StatusValidChange statusId="CLPT_INVALID" 
statusIdTo="CLPT_UNSUBS_PENDING" transitionName="Subscription Invalid - 
Unsubscription Pending"/>
+    <StatusValidChange statusId="CLPT_ACCEPTED" statusIdTo="CLPT_UNSUBSCRIBED" 
transitionName="Subscription Accepted - Unsubscribed"/>
+    <StatusValidChange statusId="CLPT_PENDING" statusIdTo="CLPT_UNSUBSCRIBED" 
transitionName="Subscription Accepted - Unsubscribed"/>
+    <StatusValidChange statusId="CLPT_IN_USE" statusIdTo="CLPT_UNSUBSCRIBED" 
transitionName="Subscription In Use - Unsubscribed"/>
+    <StatusValidChange statusId="CLPT_INVALID" statusIdTo="CLPT_UNSUBSCRIBED" 
transitionName="Subscription Invalid - Unsubscribed"/>
 
     <SegmentGroupType segmentGroupTypeId="MARKET_SEGMENT" description="Market 
Segment"/>
     <SegmentGroupType segmentGroupTypeId="SALES_SEGMENT" description="Sales 
Segment"/>
@@ -93,10 +93,10 @@ under the License.
     <StatusItem description="Converted" sequenceId="02" statusCode="CONVERTED" 
statusId="LEAD_CONVERTED" statusTypeId="LEAD_STATUS"/>
     <StatusItem description="Qualified" sequenceId="03" statusCode="QUALIFIED" 
statusId="LEAD_QUALIFIED" statusTypeId="LEAD_STATUS"/>
 
-    <StatusValidChange condition="" statusId="PARTY_ENABLED" 
statusIdTo="LEAD_ASSIGNED" transitionName="Assigned"/>
-    <StatusValidChange condition="" statusId="LEAD_ASSIGNED" 
statusIdTo="LEAD_CONVERTED" transitionName="Converted"/>
-    <StatusValidChange condition="" statusId="LEAD_ASSIGNED" 
statusIdTo="LEAD_QUALIFIED" transitionName="Qualified"/>
-    <StatusValidChange condition="" statusId="LEAD_ASSIGNED" 
statusIdTo="PARTY_DISABLED" transitionName="Disabled"/>
+    <StatusValidChange statusId="PARTY_ENABLED" statusIdTo="LEAD_ASSIGNED" 
transitionName="Assigned"/>
+    <StatusValidChange statusId="LEAD_ASSIGNED" statusIdTo="LEAD_CONVERTED" 
transitionName="Converted"/>
+    <StatusValidChange statusId="LEAD_ASSIGNED" statusIdTo="LEAD_QUALIFIED" 
transitionName="Qualified"/>
+    <StatusValidChange statusId="LEAD_ASSIGNED" statusIdTo="PARTY_DISABLED" 
transitionName="Disabled"/>
 
     <EnumerationType enumTypeId="SLSOPP_TYP_ENUM" description="Sales 
Opportunity Type"/>
     

Modified: ofbiz/trunk/applications/order/data/OrderTypeData.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/data/OrderTypeData.xml?rev=1710566&r1=1710565&r2=1710566&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/data/OrderTypeData.xml (original)
+++ ofbiz/trunk/applications/order/data/OrderTypeData.xml Mon Oct 26 11:09:54 
2015
@@ -125,32 +125,32 @@ under the License.
     <StatusItem description="Rejected" sequenceId="98" statusCode="REJECTED" 
statusId="ITEM_REJECTED" statusTypeId="ORDER_ITEM_STATUS"/>
     <StatusItem description="Cancelled" sequenceId="99" statusCode="CANCELLED" 
statusId="ITEM_CANCELLED" statusTypeId="ORDER_ITEM_STATUS"/>
 
-    <StatusValidChange condition="" statusId="ORDER_CREATED" 
statusIdTo="ORDER_PROCESSING" transitionName="Process Order"/>
-    <StatusValidChange condition="" statusId="ORDER_CREATED" 
statusIdTo="ORDER_APPROVED" transitionName="Approve Order"/>
-    <StatusValidChange condition="" statusId="ORDER_CREATED" 
statusIdTo="ORDER_HOLD" transitionName="Hold Order"/>
-    <StatusValidChange condition="" statusId="ORDER_CREATED" 
statusIdTo="ORDER_REJECTED" transitionName="Reject Order"/>
-    <StatusValidChange condition="" statusId="ORDER_CREATED" 
statusIdTo="ORDER_CANCELLED" transitionName="Cancel Order"/>
-    <StatusValidChange condition="" statusId="ORDER_PROCESSING" 
statusIdTo="ORDER_HOLD" transitionName="Hold Order"/>
-    <StatusValidChange condition="" statusId="ORDER_PROCESSING" 
statusIdTo="ORDER_APPROVED" transitionName="Approve Order"/>
-    <StatusValidChange condition="" statusId="ORDER_PROCESSING" 
statusIdTo="ORDER_REJECTED" transitionName="Reject Order"/>
-    <StatusValidChange condition="" statusId="ORDER_PROCESSING" 
statusIdTo="ORDER_CANCELLED" transitionName="Cancel Order"/>
-    <StatusValidChange condition="" statusId="ORDER_APPROVED" 
statusIdTo="ORDER_SENT" transitionName="Send Order"/>
-    <StatusValidChange condition="" statusId="ORDER_APPROVED" 
statusIdTo="ORDER_PROCESSING" transitionName="Process Order"/>
-    <StatusValidChange condition="" statusId="ORDER_APPROVED" 
statusIdTo="ORDER_COMPLETED" transitionName="Complete Order"/>
-    <StatusValidChange condition="" statusId="ORDER_APPROVED" 
statusIdTo="ORDER_CANCELLED" transitionName="Cancel Order"/>
-    <StatusValidChange condition="" statusId="ORDER_APPROVED" 
statusIdTo="ORDER_HOLD" transitionName="Hold Order"/>
-    <StatusValidChange condition="" statusId="ORDER_HOLD" 
statusIdTo="ORDER_PROCESSING" transitionName="Process Order"/>
-    <StatusValidChange condition="" statusId="ORDER_HOLD" 
statusIdTo="ORDER_APPROVED" transitionName="Approve Order"/>
-    <StatusValidChange condition="" statusId="ORDER_HOLD" 
statusIdTo="ORDER_CANCELLED" transitionName="Cancel Order"/>
-    <StatusValidChange condition="" statusId="ORDER_SENT" 
statusIdTo="ORDER_COMPLETED" transitionName="Order Completed"/>
-    <StatusValidChange condition="" statusId="ORDER_SENT" 
statusIdTo="ORDER_CANCELLED" transitionName="Order Cancelled"/>
-    <StatusValidChange condition="" statusId="ORDER_COMPLETED" 
statusIdTo="ORDER_APPROVED" transitionName="Approve Order"/>
-    <StatusValidChange condition="" statusId="ITEM_CREATED" 
statusIdTo="ITEM_APPROVED" transitionName="Approve Item"/>
-    <StatusValidChange condition="" statusId="ITEM_CREATED" 
statusIdTo="ITEM_REJECTED" transitionName="Reject Item"/>
-    <StatusValidChange condition="" statusId="ITEM_CREATED" 
statusIdTo="ITEM_CANCELLED" transitionName="Cancel Item"/>
-    <StatusValidChange condition="" statusId="ITEM_APPROVED" 
statusIdTo="ITEM_COMPLETED" transitionName="Complete Item"/>
-    <StatusValidChange condition="" statusId="ITEM_APPROVED" 
statusIdTo="ITEM_CANCELLED" transitionName="Cancel Item"/>
-    <StatusValidChange condition="" statusId="ITEM_COMPLETED" 
statusIdTo="ITEM_APPROVED" transitionName="Approve Item"/>
+    <StatusValidChange statusId="ORDER_CREATED" statusIdTo="ORDER_PROCESSING" 
transitionName="Process Order"/>
+    <StatusValidChange statusId="ORDER_CREATED" statusIdTo="ORDER_APPROVED" 
transitionName="Approve Order"/>
+    <StatusValidChange statusId="ORDER_CREATED" statusIdTo="ORDER_HOLD" 
transitionName="Hold Order"/>
+    <StatusValidChange statusId="ORDER_CREATED" statusIdTo="ORDER_REJECTED" 
transitionName="Reject Order"/>
+    <StatusValidChange statusId="ORDER_CREATED" statusIdTo="ORDER_CANCELLED" 
transitionName="Cancel Order"/>
+    <StatusValidChange statusId="ORDER_PROCESSING" statusIdTo="ORDER_HOLD" 
transitionName="Hold Order"/>
+    <StatusValidChange statusId="ORDER_PROCESSING" statusIdTo="ORDER_APPROVED" 
transitionName="Approve Order"/>
+    <StatusValidChange statusId="ORDER_PROCESSING" statusIdTo="ORDER_REJECTED" 
transitionName="Reject Order"/>
+    <StatusValidChange statusId="ORDER_PROCESSING" 
statusIdTo="ORDER_CANCELLED" transitionName="Cancel Order"/>
+    <StatusValidChange statusId="ORDER_APPROVED" statusIdTo="ORDER_SENT" 
transitionName="Send Order"/>
+    <StatusValidChange statusId="ORDER_APPROVED" statusIdTo="ORDER_PROCESSING" 
transitionName="Process Order"/>
+    <StatusValidChange statusId="ORDER_APPROVED" statusIdTo="ORDER_COMPLETED" 
transitionName="Complete Order"/>
+    <StatusValidChange statusId="ORDER_APPROVED" statusIdTo="ORDER_CANCELLED" 
transitionName="Cancel Order"/>
+    <StatusValidChange statusId="ORDER_APPROVED" statusIdTo="ORDER_HOLD" 
transitionName="Hold Order"/>
+    <StatusValidChange statusId="ORDER_HOLD" statusIdTo="ORDER_PROCESSING" 
transitionName="Process Order"/>
+    <StatusValidChange statusId="ORDER_HOLD" statusIdTo="ORDER_APPROVED" 
transitionName="Approve Order"/>
+    <StatusValidChange statusId="ORDER_HOLD" statusIdTo="ORDER_CANCELLED" 
transitionName="Cancel Order"/>
+    <StatusValidChange statusId="ORDER_SENT" statusIdTo="ORDER_COMPLETED" 
transitionName="Order Completed"/>
+    <StatusValidChange statusId="ORDER_SENT" statusIdTo="ORDER_CANCELLED" 
transitionName="Order Cancelled"/>
+    <StatusValidChange statusId="ORDER_COMPLETED" statusIdTo="ORDER_APPROVED" 
transitionName="Approve Order"/>
+    <StatusValidChange statusId="ITEM_CREATED" statusIdTo="ITEM_APPROVED" 
transitionName="Approve Item"/>
+    <StatusValidChange statusId="ITEM_CREATED" statusIdTo="ITEM_REJECTED" 
transitionName="Reject Item"/>
+    <StatusValidChange statusId="ITEM_CREATED" statusIdTo="ITEM_CANCELLED" 
transitionName="Cancel Item"/>
+    <StatusValidChange statusId="ITEM_APPROVED" statusIdTo="ITEM_COMPLETED" 
transitionName="Complete Item"/>
+    <StatusValidChange statusId="ITEM_APPROVED" statusIdTo="ITEM_CANCELLED" 
transitionName="Cancel Item"/>
+    <StatusValidChange statusId="ITEM_COMPLETED" statusIdTo="ITEM_APPROVED" 
transitionName="Approve Item"/>
 
     <!-- order payment pref status -->
     <StatusType description="Payment Preference" hasTable="N" parentTypeId="" 
statusTypeId="PAYMENT_PREF_STATUS"/>
@@ -162,13 +162,13 @@ under the License.
     <StatusItem description="Declined" sequenceId="04" statusCode="DECLINED" 
statusId="PAYMENT_DECLINED" statusTypeId="PAYMENT_PREF_STATUS"/>
     <StatusItem description="Refunded" sequenceId="05" statusCode="REFUNDED" 
statusId="PAYMENT_REFUNDED" statusTypeId="PAYMENT_PREF_STATUS"/>
     <StatusItem description="Cancelled" sequenceId="99" statusCode="CANCELLED" 
statusId="PAYMENT_CANCELLED" statusTypeId="PAYMENT_PREF_STATUS"/>
-    <StatusValidChange condition="" statusId="PAYMENT_NOT_RECEIVED" 
statusIdTo="PAYMENT_RECEIVED" transitionName="Payment Received"/>
-    <StatusValidChange condition="" statusId="PAYMENT_NOT_RECEIVED" 
statusIdTo="PAYMENT_CANCELLED" transitionName="Payment Cancelled"/>
-    <StatusValidChange condition="" statusId="PAYMENT_NOT_AUTH" 
statusIdTo="PAYMENT_AUTHORIZED" transitionName="Payment Authorized"/>
-    <StatusValidChange condition="" statusId="PAYMENT_NOT_AUTH" 
statusIdTo="PAYMENT_CANCELLED" transitionName="Payment Cancelled"/>
-    <StatusValidChange condition="" statusId="PAYMENT_AUTHORIZED" 
statusIdTo="PAYMENT_SETTLED" transitionName="Payment Settled"/>
-    <StatusValidChange condition="" statusId="PAYMENT_AUTHORIZED" 
statusIdTo="PAYMENT_CANCELLED" transitionName="Payment Cancelled"/>
-    <StatusValidChange condition="" statusId="PAYMENT_SETTLED" 
statusIdTo="PAYMENT_REFUNDED" transitionName="Payment Refunded"/>
+    <StatusValidChange statusId="PAYMENT_NOT_RECEIVED" 
statusIdTo="PAYMENT_RECEIVED" transitionName="Payment Received"/>
+    <StatusValidChange statusId="PAYMENT_NOT_RECEIVED" 
statusIdTo="PAYMENT_CANCELLED" transitionName="Payment Cancelled"/>
+    <StatusValidChange statusId="PAYMENT_NOT_AUTH" 
statusIdTo="PAYMENT_AUTHORIZED" transitionName="Payment Authorized"/>
+    <StatusValidChange statusId="PAYMENT_NOT_AUTH" 
statusIdTo="PAYMENT_CANCELLED" transitionName="Payment Cancelled"/>
+    <StatusValidChange statusId="PAYMENT_AUTHORIZED" 
statusIdTo="PAYMENT_SETTLED" transitionName="Payment Settled"/>
+    <StatusValidChange statusId="PAYMENT_AUTHORIZED" 
statusIdTo="PAYMENT_CANCELLED" transitionName="Payment Cancelled"/>
+    <StatusValidChange statusId="PAYMENT_SETTLED" 
statusIdTo="PAYMENT_REFUNDED" transitionName="Payment Refunded"/>
 
     <!-- order delivery schedule status -->
     <StatusType description="Order Delivery Schedule" hasTable="N" 
parentTypeId="" statusTypeId="ORDER_DEL_SCH"/>
@@ -177,13 +177,13 @@ under the License.
     <StatusItem description="Schedule Approved" sequenceId="03" 
statusCode="APPROVED" statusId="ODS_APPROVED" statusTypeId="ORDER_DEL_SCH"/>
     <StatusItem description="Delivery Arranged" sequenceId="04" 
statusCode="ARRANGED" statusId="ODS_ARRANGED" statusTypeId="ORDER_DEL_SCH"/>
     <StatusItem description="Delivery Cancelled" sequenceId="99" 
statusCode="CANCELLED" statusId="ODS_CANCELLED" statusTypeId="ORDER_DEL_SCH"/>
-    <StatusValidChange condition="" statusId="ODS_SUBMITTED" 
statusIdTo="ODS_ACCEPTED" transitionName="Accept Delivery Information"/>
-    <StatusValidChange condition="" statusId="ODS_ACCEPTED" 
statusIdTo="ODS_APPROVED" transitionName="Approve Delivery Schedule"/>
-    <StatusValidChange condition="" statusId="ODS_APPROVED" 
statusIdTo="ODS_ARRANGED" transitionName="Arrange Delivery"/>
-    <StatusValidChange condition="" statusId="ODS_SUBMITTED" 
statusIdTo="ODS_CANCELLED" transitionName="Cancel Delivery"/>
-    <StatusValidChange condition="" statusId="ODS_ACCEPTED" 
statusIdTo="ODS_CANCELLED" transitionName="Cancel Delivery"/>
-    <StatusValidChange condition="" statusId="ODS_APPROVED" 
statusIdTo="ODS_CANCELLED" transitionName="Cancel Delivery"/>
-    <StatusValidChange condition="" statusId="ODS_ARRANGED" 
statusIdTo="ODS_CANCELLED" transitionName="Cancel Delivery"/>
+    <StatusValidChange statusId="ODS_SUBMITTED" statusIdTo="ODS_ACCEPTED" 
transitionName="Accept Delivery Information"/>
+    <StatusValidChange statusId="ODS_ACCEPTED" statusIdTo="ODS_APPROVED" 
transitionName="Approve Delivery Schedule"/>
+    <StatusValidChange statusId="ODS_APPROVED" statusIdTo="ODS_ARRANGED" 
transitionName="Arrange Delivery"/>
+    <StatusValidChange statusId="ODS_SUBMITTED" statusIdTo="ODS_CANCELLED" 
transitionName="Cancel Delivery"/>
+    <StatusValidChange statusId="ODS_ACCEPTED" statusIdTo="ODS_CANCELLED" 
transitionName="Cancel Delivery"/>
+    <StatusValidChange statusId="ODS_APPROVED" statusIdTo="ODS_CANCELLED" 
transitionName="Cancel Delivery"/>
+    <StatusValidChange statusId="ODS_ARRANGED" statusIdTo="ODS_CANCELLED" 
transitionName="Cancel Delivery"/>
 
     <!-- order return status for returns to customers -->
     <StatusType description="Order Return Status For Customer Returns" 
hasTable="N" parentTypeId="" statusTypeId="ORDER_RETURN_STTS"/>
@@ -193,13 +193,13 @@ under the License.
     <StatusItem description="Completed" sequenceId="10" statusCode="COMPLETED" 
statusId="RETURN_COMPLETED" statusTypeId="ORDER_RETURN_STTS"/>
     <StatusItem description="Manual Refund Required" sequenceId="11" 
statusCode="MANUAL_REFUND" statusId="RETURN_MAN_REFUND" 
statusTypeId="ORDER_RETURN_STTS"/>
     <StatusItem description="Cancelled" sequenceId="99" statusCode="CANCELLED" 
statusId="RETURN_CANCELLED" statusTypeId="ORDER_RETURN_STTS"/>
-    <StatusValidChange condition="" statusId="RETURN_REQUESTED" 
statusIdTo="RETURN_ACCEPTED" transitionName="Requested Return Accepted"/>
-    <StatusValidChange condition="" statusId="RETURN_REQUESTED" 
statusIdTo="RETURN_CANCELLED" transitionName="Requested Return Cancelled"/>
-    <StatusValidChange condition="" statusId="RETURN_ACCEPTED" 
statusIdTo="RETURN_RECEIVED" transitionName="Accepted Return Received"/>
-    <StatusValidChange condition="" statusId="RETURN_ACCEPTED" 
statusIdTo="RETURN_CANCELLED" transitionName="Accepted Return Cancelled"/>
-    <StatusValidChange condition="" statusId="RETURN_RECEIVED" 
statusIdTo="RETURN_COMPLETED" transitionName="Received Return Completed"/>
-    <StatusValidChange condition="" statusId="RETURN_RECEIVED" 
statusIdTo="RETURN_CANCELLED" transitionName="Received Return Cancelled"/>
-    <StatusValidChange condition="" statusId="RETURN_RECEIVED" 
statusIdTo="RETURN_MAN_REFUND" transitionName="Received Return Requires Manual 
Refund"/>
+    <StatusValidChange statusId="RETURN_REQUESTED" 
statusIdTo="RETURN_ACCEPTED" transitionName="Requested Return Accepted"/>
+    <StatusValidChange statusId="RETURN_REQUESTED" 
statusIdTo="RETURN_CANCELLED" transitionName="Requested Return Cancelled"/>
+    <StatusValidChange statusId="RETURN_ACCEPTED" statusIdTo="RETURN_RECEIVED" 
transitionName="Accepted Return Received"/>
+    <StatusValidChange statusId="RETURN_ACCEPTED" 
statusIdTo="RETURN_CANCELLED" transitionName="Accepted Return Cancelled"/>
+    <StatusValidChange statusId="RETURN_RECEIVED" 
statusIdTo="RETURN_COMPLETED" transitionName="Received Return Completed"/>
+    <StatusValidChange statusId="RETURN_RECEIVED" 
statusIdTo="RETURN_CANCELLED" transitionName="Received Return Cancelled"/>
+    <StatusValidChange statusId="RETURN_RECEIVED" 
statusIdTo="RETURN_MAN_REFUND" transitionName="Received Return Requires Manual 
Refund"/>
     <!-- order return status for returns to suppliers -->
     <StatusType description="Order Return Status For Supplier Returns" 
hasTable="N" parentTypeId="" statusTypeId="PORDER_RETURN_STTS"/>
     <StatusItem description="Requested" sequenceId="01" statusCode="REQUESTED" 
statusId="SUP_RETURN_REQUESTED" statusTypeId="PORDER_RETURN_STTS"/>
@@ -207,12 +207,12 @@ under the License.
     <StatusItem description="Shipped" sequenceId="03" statusCode="SHIPPED" 
statusId="SUP_RETURN_SHIPPED" statusTypeId="PORDER_RETURN_STTS"/>
     <StatusItem description="Completed" sequenceId="10" statusCode="COMPLETED" 
statusId="SUP_RETURN_COMPLETED" statusTypeId="PORDER_RETURN_STTS"/>
     <StatusItem description="Cancelled" sequenceId="99" statusCode="CANCELLED" 
statusId="SUP_RETURN_CANCELLED" statusTypeId="PORDER_RETURN_STTS"/>
-    <StatusValidChange condition="" statusId="SUP_RETURN_REQUESTED" 
statusIdTo="SUP_RETURN_ACCEPTED" transitionName="Requested Return Accepted"/>
-    <StatusValidChange condition="" statusId="SUP_RETURN_REQUESTED" 
statusIdTo="SUP_RETURN_CANCELLED" transitionName="Requested Return Cancelled"/>
-    <StatusValidChange condition="" statusId="SUP_RETURN_ACCEPTED" 
statusIdTo="SUP_RETURN_SHIPPED" transitionName="Accepted Return Shipped"/>
-    <StatusValidChange condition="" statusId="SUP_RETURN_ACCEPTED" 
statusIdTo="SUP_RETURN_CANCELLED" transitionName="Accepted Return Cancelled"/>
-    <StatusValidChange condition="" statusId="SUP_RETURN_SHIPPED" 
statusIdTo="SUP_RETURN_COMPLETED" transitionName="Shipped Return Completed"/>
-    <StatusValidChange condition="" statusId="SUP_RETURN_SHIPPED" 
statusIdTo="SUP_RETURN_CANCELLED" transitionName="Shipped Return Cancelled"/>
+    <StatusValidChange statusId="SUP_RETURN_REQUESTED" 
statusIdTo="SUP_RETURN_ACCEPTED" transitionName="Requested Return Accepted"/>
+    <StatusValidChange statusId="SUP_RETURN_REQUESTED" 
statusIdTo="SUP_RETURN_CANCELLED" transitionName="Requested Return Cancelled"/>
+    <StatusValidChange statusId="SUP_RETURN_ACCEPTED" 
statusIdTo="SUP_RETURN_SHIPPED" transitionName="Accepted Return Shipped"/>
+    <StatusValidChange statusId="SUP_RETURN_ACCEPTED" 
statusIdTo="SUP_RETURN_CANCELLED" transitionName="Accepted Return Cancelled"/>
+    <StatusValidChange statusId="SUP_RETURN_SHIPPED" 
statusIdTo="SUP_RETURN_COMPLETED" transitionName="Shipped Return Completed"/>
+    <StatusValidChange statusId="SUP_RETURN_SHIPPED" 
statusIdTo="SUP_RETURN_CANCELLED" transitionName="Shipped Return Cancelled"/>
 
     <!-- CustRequest statuses -->
     <StatusType description="Custom Request Status" hasTable="N" 
parentTypeId="" statusTypeId="CUSTREQ_STTS"/>
@@ -224,26 +224,26 @@ under the License.
     <StatusItem description="Completed" sequenceId="04" statusCode="COMPLETED" 
statusId="CRQ_COMPLETED" statusTypeId="CUSTREQ_STTS"/>
     <StatusItem description="Rejected" sequenceId="98" statusCode="REJECTED" 
statusId="CRQ_REJECTED" statusTypeId="CUSTREQ_STTS"/>
     <StatusItem description="Cancelled" sequenceId="99" statusCode="CANCELLED" 
statusId="CRQ_CANCELLED" statusTypeId="CUSTREQ_STTS"/>
-    <StatusValidChange condition="" statusId="CRQ_DRAFT" 
statusIdTo="CRQ_ACCEPTED" transitionName="Accept Request"/>
-    <StatusValidChange condition="" statusId="CRQ_DRAFT" 
statusIdTo="CRQ_SUBMITTED" transitionName="Submit Request"/>
-    <StatusValidChange condition="" statusId="CRQ_DRAFT" 
statusIdTo="CRQ_CANCELLED" transitionName="Cancel Request"/>
-    <StatusValidChange condition="" statusId="CRQ_SUBMITTED" 
statusIdTo="CRQ_ACCEPTED" transitionName="Accept Request"/>
-    <StatusValidChange condition="" statusId="CRQ_SUBMITTED" 
statusIdTo="CRQ_COMPLETED" transitionName="Complete Request"/>
-    <StatusValidChange condition="" statusId="CRQ_SUBMITTED" 
statusIdTo="CRQ_REJECTED" transitionName="Reject Request"/>
-    <StatusValidChange condition="" statusId="CRQ_SUBMITTED" 
statusIdTo="CRQ_CANCELLED" transitionName="Cancel Request"/>
-    <StatusValidChange condition="" statusId="CRQ_SUBMITTED" 
statusIdTo="CRQ_PENDING" transitionName="Pending customer"/>
-    <StatusValidChange condition="" statusId="CRQ_PENDING" 
statusIdTo="CRQ_SUBMITTED" transitionName="Submit Request"/>
-    <StatusValidChange condition="" statusId="CRQ_PENDING" 
statusIdTo="CRQ_ACCEPTED" transitionName="Accept Request"/>
-    <StatusValidChange condition="" statusId="CRQ_PENDING" 
statusIdTo="CRQ_REVIEWED" transitionName="Review Request"/>
-    <StatusValidChange condition="" statusId="CRQ_PENDING" 
statusIdTo="CRQ_CANCELLED" transitionName="Cancel Request"/>
-    <StatusValidChange condition="" statusId="CRQ_ACCEPTED" 
statusIdTo="CRQ_REVIEWED" transitionName="Review Request"/>
-    <StatusValidChange condition="" statusId="CRQ_ACCEPTED" 
statusIdTo="CRQ_COMPLETED" transitionName="Complete Request"/>
-    <StatusValidChange condition="" statusId="CRQ_ACCEPTED" 
statusIdTo="CRQ_CANCELLED" transitionName="Cancel Request"/>
-    <StatusValidChange condition="" statusId="CRQ_ACCEPTED" 
statusIdTo="CRQ_PENDING" transitionName="Pending Customer"/>
-    <StatusValidChange condition="" statusId="CRQ_REVIEWED" 
statusIdTo="CRQ_COMPLETED" transitionName="Complete Request"/>
-    <StatusValidChange condition="" statusId="CRQ_REVIEWED" 
statusIdTo="CRQ_CANCELLED" transitionName="Cancel Request"/>
-    <StatusValidChange condition="" statusId="CRQ_REVIEWED" 
statusIdTo="CRQ_PENDING" transitionName="Pending Customer"/>
-    <StatusValidChange condition="" statusId="CRQ_COMPLETED" 
statusIdTo="CRQ_REVIEWED" transitionName="Re-open Request"/>
+    <StatusValidChange statusId="CRQ_DRAFT" statusIdTo="CRQ_ACCEPTED" 
transitionName="Accept Request"/>
+    <StatusValidChange statusId="CRQ_DRAFT" statusIdTo="CRQ_SUBMITTED" 
transitionName="Submit Request"/>
+    <StatusValidChange statusId="CRQ_DRAFT" statusIdTo="CRQ_CANCELLED" 
transitionName="Cancel Request"/>
+    <StatusValidChange statusId="CRQ_SUBMITTED" statusIdTo="CRQ_ACCEPTED" 
transitionName="Accept Request"/>
+    <StatusValidChange statusId="CRQ_SUBMITTED" statusIdTo="CRQ_COMPLETED" 
transitionName="Complete Request"/>
+    <StatusValidChange statusId="CRQ_SUBMITTED" statusIdTo="CRQ_REJECTED" 
transitionName="Reject Request"/>
+    <StatusValidChange statusId="CRQ_SUBMITTED" statusIdTo="CRQ_CANCELLED" 
transitionName="Cancel Request"/>
+    <StatusValidChange statusId="CRQ_SUBMITTED" statusIdTo="CRQ_PENDING" 
transitionName="Pending customer"/>
+    <StatusValidChange statusId="CRQ_PENDING" statusIdTo="CRQ_SUBMITTED" 
transitionName="Submit Request"/>
+    <StatusValidChange statusId="CRQ_PENDING" statusIdTo="CRQ_ACCEPTED" 
transitionName="Accept Request"/>
+    <StatusValidChange statusId="CRQ_PENDING" statusIdTo="CRQ_REVIEWED" 
transitionName="Review Request"/>
+    <StatusValidChange statusId="CRQ_PENDING" statusIdTo="CRQ_CANCELLED" 
transitionName="Cancel Request"/>
+    <StatusValidChange statusId="CRQ_ACCEPTED" statusIdTo="CRQ_REVIEWED" 
transitionName="Review Request"/>
+    <StatusValidChange statusId="CRQ_ACCEPTED" statusIdTo="CRQ_COMPLETED" 
transitionName="Complete Request"/>
+    <StatusValidChange statusId="CRQ_ACCEPTED" statusIdTo="CRQ_CANCELLED" 
transitionName="Cancel Request"/>
+    <StatusValidChange statusId="CRQ_ACCEPTED" statusIdTo="CRQ_PENDING" 
transitionName="Pending Customer"/>
+    <StatusValidChange statusId="CRQ_REVIEWED" statusIdTo="CRQ_COMPLETED" 
transitionName="Complete Request"/>
+    <StatusValidChange statusId="CRQ_REVIEWED" statusIdTo="CRQ_CANCELLED" 
transitionName="Cancel Request"/>
+    <StatusValidChange statusId="CRQ_REVIEWED" statusIdTo="CRQ_PENDING" 
transitionName="Pending Customer"/>
+    <StatusValidChange statusId="CRQ_COMPLETED" statusIdTo="CRQ_REVIEWED" 
transitionName="Re-open Request"/>
 
     <!-- Requirement statuses -->
     <StatusType description="Requirement Status" hasTable="N" parentTypeId="" 
statusTypeId="REQUIREMENT_STATUS"/>
@@ -252,12 +252,12 @@ under the License.
     <StatusItem description="Approved" sequenceId="02" statusCode="APPROVED" 
statusId="REQ_APPROVED" statusTypeId="REQUIREMENT_STATUS"/>
     <StatusItem description="Ordered" sequenceId="03" statusCode="ORDERED" 
statusId="REQ_ORDERED" statusTypeId="REQUIREMENT_STATUS"/>
     <StatusItem description="Rejected" sequenceId="98" statusCode="REJECTED" 
statusId="REQ_REJECTED" statusTypeId="REQUIREMENT_STATUS"/>
-    <StatusValidChange condition="" statusId="REQ_PROPOSED" 
statusIdTo="REQ_APPROVED" transitionName="Accept Requirement"/>
-    <StatusValidChange condition="" statusId="REQ_PROPOSED" 
statusIdTo="REQ_REJECTED" transitionName="Reject Requirement"/>
-    <StatusValidChange condition="" statusId="REQ_CREATED" 
statusIdTo="REQ_APPROVED" transitionName="Accept Requirement"/>
-    <StatusValidChange condition="" statusId="REQ_CREATED" 
statusIdTo="REQ_REJECTED" transitionName="Reject Requirement"/>
-    <StatusValidChange condition="" statusId="REQ_APPROVED" 
statusIdTo="REQ_ORDERED" transitionName="Order Requirement"/>
-    <StatusValidChange condition="" statusId="REQ_APPROVED" 
statusIdTo="REQ_REJECTED" transitionName="Reject Requirement"/>
+    <StatusValidChange statusId="REQ_PROPOSED" statusIdTo="REQ_APPROVED" 
transitionName="Accept Requirement"/>
+    <StatusValidChange statusId="REQ_PROPOSED" statusIdTo="REQ_REJECTED" 
transitionName="Reject Requirement"/>
+    <StatusValidChange statusId="REQ_CREATED" statusIdTo="REQ_APPROVED" 
transitionName="Accept Requirement"/>
+    <StatusValidChange statusId="REQ_CREATED" statusIdTo="REQ_REJECTED" 
transitionName="Reject Requirement"/>
+    <StatusValidChange statusId="REQ_APPROVED" statusIdTo="REQ_ORDERED" 
transitionName="Order Requirement"/>
+    <StatusValidChange statusId="REQ_APPROVED" statusIdTo="REQ_REJECTED" 
transitionName="Reject Requirement"/>
 
     <!-- Quote statuses -->
     <StatusType description="Quote Status" hasTable="N" parentTypeId="" 
statusTypeId="QUOTE_STATUS"/>
@@ -265,10 +265,10 @@ under the License.
     <StatusItem description="Approved" sequenceId="02" statusCode="APPROVED" 
statusId="QUO_APPROVED" statusTypeId="QUOTE_STATUS"/>
     <StatusItem description="Ordered" sequenceId="03" statusCode="ORDERED" 
statusId="QUO_ORDERED" statusTypeId="QUOTE_STATUS"/>
     <StatusItem description="Rejected" sequenceId="98" statusCode="REJECTED" 
statusId="QUO_REJECTED" statusTypeId="QUOTE_STATUS"/>
-    <StatusValidChange condition="" statusId="QUO_CREATED" 
statusIdTo="QUO_APPROVED" transitionName="Accept Quote"/>
-    <StatusValidChange condition="" statusId="QUO_CREATED" 
statusIdTo="QUO_REJECTED" transitionName="Reject Quote"/>
-    <StatusValidChange condition="" statusId="QUO_APPROVED" 
statusIdTo="QUO_ORDERED" transitionName="Order Quote"/>
-    <StatusValidChange condition="" statusId="QUO_APPROVED" 
statusIdTo="QUO_REJECTED" transitionName="Reject Quote"/>
+    <StatusValidChange statusId="QUO_CREATED" statusIdTo="QUO_APPROVED" 
transitionName="Accept Quote"/>
+    <StatusValidChange statusId="QUO_CREATED" statusIdTo="QUO_REJECTED" 
transitionName="Reject Quote"/>
+    <StatusValidChange statusId="QUO_APPROVED" statusIdTo="QUO_ORDERED" 
transitionName="Order Quote"/>
+    <StatusValidChange statusId="QUO_APPROVED" statusIdTo="QUO_REJECTED" 
transitionName="Reject Quote"/>
 
     <!-- Return Adjustment Types-->
     <ReturnAdjustmentType description="Return Promotion" hasTable="N" 
returnAdjustmentTypeId="RET_PROMOTION_ADJ" parentTypeId=""/>

Modified: ofbiz/trunk/applications/party/data/PartyTypeData.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/data/PartyTypeData.xml?rev=1710566&r1=1710565&r2=1710566&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/data/PartyTypeData.xml (original)
+++ ofbiz/trunk/applications/party/data/PartyTypeData.xml Mon Oct 26 11:09:54 
2015
@@ -325,8 +325,8 @@ under the License.
     <StatusType description="Party" hasTable="N" parentTypeId="" 
statusTypeId="PARTY_STATUS"/>
     <StatusItem description="Enabled" sequenceId="01" statusCode="ENABLED" 
statusId="PARTY_ENABLED" statusTypeId="PARTY_STATUS"/>
     <StatusItem description="Disabled" sequenceId="99" statusCode="DISABLED" 
statusId="PARTY_DISABLED" statusTypeId="PARTY_STATUS"/>
-    <StatusValidChange condition="" statusId="PARTY_ENABLED" 
statusIdTo="PARTY_DISABLED" transitionName="Disable"/>
-    <StatusValidChange condition="" statusId="PARTY_DISABLED" 
statusIdTo="PARTY_ENABLED" transitionName="Re-Enable"/>
+    <StatusValidChange statusId="PARTY_ENABLED" statusIdTo="PARTY_DISABLED" 
transitionName="Disable"/>
+    <StatusValidChange statusId="PARTY_DISABLED" statusIdTo="PARTY_ENABLED" 
transitionName="Re-Enable"/>
     
     <StatusType description="Case" hasTable="N" parentTypeId="" 
statusTypeId="CASE_STATUS"/>
 
@@ -341,40 +341,40 @@ under the License.
     <StatusItem description="Referred" sequenceId="22" statusCode="REFERRED" 
statusId="COM_REFERRED" statusTypeId="COM_EVENT_STATUS"/>
     <StatusItem description="Bounced" sequenceId="50" statusCode="BOUNCED" 
statusId="COM_BOUNCED" statusTypeId="COM_EVENT_STATUS"/>
     <StatusItem description="Cancelled" sequenceId="99" statusCode="CANCELLED" 
statusId="COM_CANCELLED" statusTypeId="COM_EVENT_STATUS"/>
-    <StatusValidChange condition="" statusId="COM_ENTERED" 
statusIdTo="COM_PENDING" transitionName="Set Pending, only visible to 
originator"/>
-    <StatusValidChange condition="" statusId="COM_ENTERED" 
statusIdTo="COM_IN_PROGRESS" transitionName="Set In Progress, waiting to be 
send"/>
-    <StatusValidChange condition="" statusId="COM_ENTERED" 
statusIdTo="COM_COMPLETE" transitionName="Complete"/>
-    <StatusValidChange condition="" statusId="COM_PENDING" 
statusIdTo="COM_ENTERED" transitionName="Entered,visible to all participants"/>
-    <StatusValidChange condition="" statusId="COM_PENDING" 
statusIdTo="COM_IN_PROGRESS" transitionName="Set In Progress, waiting to be 
send"/>
-    <StatusValidChange condition="" statusId="COM_IN_PROGRESS" 
statusIdTo="COM_COMPLETE" transitionName="Complete"/>
-    <StatusValidChange condition="" statusId="COM_IN_PROGRESS" 
statusIdTo="COM_BOUNCED" transitionName="Bounced"/>
-    <StatusValidChange condition="" statusId="COM_COMPLETE" 
statusIdTo="COM_RESOLVED" transitionName="Resolve"/>
-    <StatusValidChange condition="" statusId="COM_COMPLETE" 
statusIdTo="COM_REFERRED" transitionName="Refer"/>
-    <StatusValidChange condition="" statusId="COM_COMPLETE" 
statusIdTo="COM_BOUNCED" transitionName="Bounced"/>
-    <StatusValidChange condition="" statusId="COM_UNKNOWN_PARTY" 
statusIdTo="COM_COMPLETE" transitionName="Complete"/>
-    <StatusValidChange condition="" statusId="COM_UNKNOWN_PARTY" 
statusIdTo="COM_ENTERED" transitionName="Corrected"/>
-    <StatusValidChange condition="" statusId="COM_PENDING" 
statusIdTo="COM_COMPLETE" transitionName="Complete"/>
+    <StatusValidChange statusId="COM_ENTERED" statusIdTo="COM_PENDING" 
transitionName="Set Pending, only visible to originator"/>
+    <StatusValidChange statusId="COM_ENTERED" statusIdTo="COM_IN_PROGRESS" 
transitionName="Set In Progress, waiting to be send"/>
+    <StatusValidChange statusId="COM_ENTERED" statusIdTo="COM_COMPLETE" 
transitionName="Complete"/>
+    <StatusValidChange statusId="COM_PENDING" statusIdTo="COM_ENTERED" 
transitionName="Entered,visible to all participants"/>
+    <StatusValidChange statusId="COM_PENDING" statusIdTo="COM_IN_PROGRESS" 
transitionName="Set In Progress, waiting to be send"/>
+    <StatusValidChange statusId="COM_IN_PROGRESS" statusIdTo="COM_COMPLETE" 
transitionName="Complete"/>
+    <StatusValidChange statusId="COM_IN_PROGRESS" statusIdTo="COM_BOUNCED" 
transitionName="Bounced"/>
+    <StatusValidChange statusId="COM_COMPLETE" statusIdTo="COM_RESOLVED" 
transitionName="Resolve"/>
+    <StatusValidChange statusId="COM_COMPLETE" statusIdTo="COM_REFERRED" 
transitionName="Refer"/>
+    <StatusValidChange statusId="COM_COMPLETE" statusIdTo="COM_BOUNCED" 
transitionName="Bounced"/>
+    <StatusValidChange statusId="COM_UNKNOWN_PARTY" statusIdTo="COM_COMPLETE" 
transitionName="Complete"/>
+    <StatusValidChange statusId="COM_UNKNOWN_PARTY" statusIdTo="COM_ENTERED" 
transitionName="Corrected"/>
+    <StatusValidChange statusId="COM_PENDING" statusIdTo="COM_COMPLETE" 
transitionName="Complete"/>
 
-    <StatusValidChange condition="" statusId="COM_ENTERED" 
statusIdTo="COM_CANCELLED" transitionName="Cancel"/>
-    <StatusValidChange condition="" statusId="COM_PENDING" 
statusIdTo="COM_CANCELLED" transitionName="Cancel"/>
-    <StatusValidChange condition="" statusId="COM_IN_PROGRESS" 
statusIdTo="COM_CANCELLED" transitionName="Cancel"/>
-    <StatusValidChange condition="" statusId="COM_COMPLETE" 
statusIdTo="COM_CANCELLED" transitionName="Cancel"/>
-    <StatusValidChange condition="" statusId="COM_RESOLVED" 
statusIdTo="COM_CANCELLED" transitionName="Cancel"/>
-    <StatusValidChange condition="" statusId="COM_REFERRED" 
statusIdTo="COM_CANCELLED" transitionName="Cancel"/>
-    <StatusValidChange condition="" statusId="COM_UNKNOWN_PARTY" 
statusIdTo="COM_CANCELLED" transitionName="Cancel"/>
+    <StatusValidChange statusId="COM_ENTERED" statusIdTo="COM_CANCELLED" 
transitionName="Cancel"/>
+    <StatusValidChange statusId="COM_PENDING" statusIdTo="COM_CANCELLED" 
transitionName="Cancel"/>
+    <StatusValidChange statusId="COM_IN_PROGRESS" statusIdTo="COM_CANCELLED" 
transitionName="Cancel"/>
+    <StatusValidChange statusId="COM_COMPLETE" statusIdTo="COM_CANCELLED" 
transitionName="Cancel"/>
+    <StatusValidChange statusId="COM_RESOLVED" statusIdTo="COM_CANCELLED" 
transitionName="Cancel"/>
+    <StatusValidChange statusId="COM_REFERRED" statusIdTo="COM_CANCELLED" 
transitionName="Cancel"/>
+    <StatusValidChange statusId="COM_UNKNOWN_PARTY" statusIdTo="COM_CANCELLED" 
transitionName="Cancel"/>
 
     <StatusType description="Communication Event Role" hasTable="N" 
parentTypeId="COM_EVENT_STATUS" statusTypeId="COM_EVENT_ROL_STATUS"/>
     <StatusItem description="Created" sequenceId="01" statusCode="ENTERED" 
statusId="COM_ROLE_CREATED" statusTypeId="COM_EVENT_ROL_STATUS"/>
     <StatusItem description="Read" sequenceId="02" statusCode="PENDING" 
statusId="COM_ROLE_READ" statusTypeId="COM_EVENT_ROL_STATUS"/>
     <StatusItem description="Closed" sequenceId="03" statusCode="READ" 
statusId="COM_ROLE_COMPLETED" statusTypeId="COM_EVENT_ROL_STATUS"/>
-    <StatusValidChange condition="" statusId="COM_ROLE_CREATED" 
statusIdTo="COM_ROLE_READ" transitionName="Read"/>
-    <StatusValidChange condition="" statusId="COM_ROLE_CREATED" 
statusIdTo="COM_ROLE_COMPLETED" transitionName="Completed"/>
-    <StatusValidChange condition="" statusId="COM_ROLE_READ" 
statusIdTo="COM_ROLE_COMPLETED" transitionName="Completed"/>
+    <StatusValidChange statusId="COM_ROLE_CREATED" statusIdTo="COM_ROLE_READ" 
transitionName="Read"/>
+    <StatusValidChange statusId="COM_ROLE_CREATED" 
statusIdTo="COM_ROLE_COMPLETED" transitionName="Completed"/>
+    <StatusValidChange statusId="COM_ROLE_READ" 
statusIdTo="COM_ROLE_COMPLETED" transitionName="Completed"/>
 
     <StatusType description="Party Relationship" hasTable="N" parentTypeId="" 
statusTypeId="PARTY_REL_STATUS"/>
     <StatusItem description="Created" sequenceId="01" statusCode="CREATED" 
statusId="PARTYREL_CREATED" statusTypeId="PARTY_REL_STATUS"/>
     <StatusItem description="Expired" sequenceId="02" statusCode="EXPIRED" 
statusId="PARTYREL_EXPIRED" statusTypeId="PARTY_REL_STATUS"/>
-    <StatusValidChange condition="" statusId="PARTYREL_CREATED" 
statusIdTo="PARTYREL_EXPIRED" transitionName="Expired"/>
+    <StatusValidChange statusId="PARTYREL_CREATED" 
statusIdTo="PARTYREL_EXPIRED" transitionName="Expired"/>
     
     <StatusType description="Party Invitation" hasTable="N" parentTypeId="" 
statusTypeId="PARTY_INV_STATUS"/>
     <StatusItem description="Invitation Sent" sequenceId="01" 
statusCode="SENT" statusId="PARTYINV_SENT" statusTypeId="PARTY_INV_STATUS"/>
@@ -382,12 +382,12 @@ under the License.
     <StatusItem description="Invitation Accepted" sequenceId="05" 
statusCode="ACCEPTED" statusId="PARTYINV_ACCEPTED" 
statusTypeId="PARTY_INV_STATUS"/>
     <StatusItem description="Invitation Declined" sequenceId="06" 
statusCode="DECLINED" statusId="PARTYINV_DECLINED" 
statusTypeId="PARTY_INV_STATUS"/>
     <StatusItem description="Invitation Cancelled" sequenceId="10" 
statusCode="CANCELLED" statusId="PARTYINV_CANCELLED" 
statusTypeId="PARTY_INV_STATUS"/>
-    <StatusValidChange condition="" statusId="PARTYINV_SENT" 
statusIdTo="PARTYINV_PENDING" transitionName="Pending"/>
-    <StatusValidChange condition="" statusId="PARTYINV_SENT" 
statusIdTo="PARTYINV_ACCEPTED" transitionName="Accepted"/>
-    <StatusValidChange condition="" statusId="PARTYINV_SENT" 
statusIdTo="PARTYINV_DECLINED" transitionName="Declined"/>
-    <StatusValidChange condition="" statusId="PARTYINV_SENT" 
statusIdTo="PARTYINV_CANCELLED" transitionName="Cancelled"/>
-    <StatusValidChange condition="" statusId="PARTYINV_PENDING" 
statusIdTo="PARTYINV_ACCEPTED" transitionName="Accepted"/>
-    <StatusValidChange condition="" statusId="PARTYINV_PENDING" 
statusIdTo="PARTYINV_CANCELLED" transitionName="Cancelled"/>
+    <StatusValidChange statusId="PARTYINV_SENT" statusIdTo="PARTYINV_PENDING" 
transitionName="Pending"/>
+    <StatusValidChange statusId="PARTYINV_SENT" statusIdTo="PARTYINV_ACCEPTED" 
transitionName="Accepted"/>
+    <StatusValidChange statusId="PARTYINV_SENT" statusIdTo="PARTYINV_DECLINED" 
transitionName="Declined"/>
+    <StatusValidChange statusId="PARTYINV_SENT" 
statusIdTo="PARTYINV_CANCELLED" transitionName="Cancelled"/>
+    <StatusValidChange statusId="PARTYINV_PENDING" 
statusIdTo="PARTYINV_ACCEPTED" transitionName="Accepted"/>
+    <StatusValidChange statusId="PARTYINV_PENDING" 
statusIdTo="PARTYINV_CANCELLED" transitionName="Cancelled"/>
 
     <TermType description="Financial" hasTable="N" parentTypeId="" 
termTypeId="FINANCIAL_TERM"/>
     <TermType description="Payment (net days)" hasTable="N" 
parentTypeId="FINANCIAL_TERM" termTypeId="FIN_PAYMENT_TERM"/>

Modified: ofbiz/trunk/applications/product/data/ProductTypeData.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/data/ProductTypeData.xml?rev=1710566&r1=1710565&r2=1710566&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/data/ProductTypeData.xml (original)
+++ ofbiz/trunk/applications/product/data/ProductTypeData.xml Mon Oct 26 
11:09:54 2015
@@ -539,30 +539,30 @@ under the License.
     <StatusItem description="On Hold (Non-Serialized)" sequenceId="01" 
statusCode="ON_HOLD_NS" statusId="INV_NS_ON_HOLD" 
statusTypeId="INV_NON_SER_STTS"/>
     <StatusItem description="Defective (Non-Serialized)" sequenceId="02" 
statusCode="DEFECTIVE_NS" statusId="INV_NS_DEFECTIVE" 
statusTypeId="INV_NON_SER_STTS"/>
     <StatusItem description="Returned (Non-Serialized)" sequenceId="02" 
statusCode="RETURNED_NS" statusId="INV_NS_RETURNED" 
statusTypeId="INV_NON_SER_STTS"/>
-    <StatusValidChange condition="" statusId="INV_ON_ORDER" 
statusIdTo="INV_AVAILABLE" transitionName="Order Arrived"/>
-    <StatusValidChange condition="" statusId="INV_AVAILABLE" 
statusIdTo="INV_PROMISED" transitionName="Promise"/>
-    <StatusValidChange condition="" statusId="INV_AVAILABLE" 
statusIdTo="INV_ON_HOLD" transitionName="Hold"/>
-    <StatusValidChange condition="" statusId="INV_AVAILABLE" 
statusIdTo="INV_DEFECTIVE" transitionName="Mark As Defective"/>
-    <StatusValidChange condition="" statusId="INV_AVAILABLE" 
statusIdTo="INV_BEING_TRANSFERED" transitionName="Being Transfered"/>
-    <StatusValidChange condition="" statusId="INV_ON_HOLD" 
statusIdTo="INV_AVAILABLE" transitionName="Release Hold"/>
-    <StatusValidChange condition="" statusId="INV_ON_HOLD" 
statusIdTo="INV_DEFECTIVE" transitionName="Mark Held Defective"/>
-    <StatusValidChange condition="" statusId="INV_BEING_TRANSFERED" 
statusIdTo="INV_AVAILABLE" transitionName="Transfer Complete"/>
-    <StatusValidChange condition="" statusId="INV_PROMISED" 
statusIdTo="INV_AVAILABLE" transitionName="Cancel Promise"/>
-    <StatusValidChange condition="" statusId="INV_PROMISED" 
statusIdTo="INV_DELIVERED" transitionName="Deliver"/>
-    <StatusValidChange condition="" statusId="INV_PROMISED" 
statusIdTo="INV_DEFECTIVE" transitionName="Mark As Defective"/>
-    <StatusValidChange condition="" statusId="INV_PROMISED" 
statusIdTo="INV_BEING_TRANS_PRM" transitionName="Being Transfered (Promised)"/>
-    <StatusValidChange condition="" statusId="INV_BEING_TRANS_PRM" 
statusIdTo="INV_PROMISED" transitionName="Transfer Complete (Promised)"/>
-    <StatusValidChange condition="" statusId="INV_DELIVERED" 
statusIdTo="INV_RETURNED" transitionName="Return Status Pending"/>
-    <StatusValidChange condition="" statusId="INV_RETURNED" 
statusIdTo="INV_AVAILABLE" transitionName="Make Return Available"/>
-    <StatusValidChange condition="" statusId="INV_RETURNED" 
statusIdTo="INV_ON_HOLD" transitionName="Make Return Held"/>
-    <StatusValidChange condition="" statusId="INV_RETURNED" 
statusIdTo="INV_DEFECTIVE" transitionName="Mark Return Defective"/>
-    <StatusValidChange condition="" statusId="INV_DELIVERED" 
statusIdTo="INV_ACTIVATED" transitionName="Activate"/>
-    <StatusValidChange condition="" statusId="INV_ACTIVATED" 
statusIdTo="INV_DEACTIVATED" transitionName="Deactivate"/>
-    <StatusValidChange condition="" statusId="INV_ACTIVATED" 
statusIdTo="INV_RETURNED" transitionName="Return Status Pending"/>
-    <StatusValidChange condition="" statusId="INV_DEACTIVATED" 
statusIdTo="INV_ON_HOLD" transitionName="Hold Inactive"/>
-    <StatusValidChange condition="" statusId="INV_DEACTIVATED" 
statusIdTo="INV_RETURNED" transitionName="Return Inactive"/>
-    <StatusValidChange condition="" statusId="INV_NS_RETURNED" 
statusIdTo="INV_NS_ON_HOLD" transitionName="Make Return Held"/>
-    <StatusValidChange condition="" statusId="INV_NS_RETURNED" 
statusIdTo="INV_NS_DEFECTIVE" transitionName="Mark Return Defective"/>
+    <StatusValidChange statusId="INV_ON_ORDER" statusIdTo="INV_AVAILABLE" 
transitionName="Order Arrived"/>
+    <StatusValidChange statusId="INV_AVAILABLE" statusIdTo="INV_PROMISED" 
transitionName="Promise"/>
+    <StatusValidChange statusId="INV_AVAILABLE" statusIdTo="INV_ON_HOLD" 
transitionName="Hold"/>
+    <StatusValidChange statusId="INV_AVAILABLE" statusIdTo="INV_DEFECTIVE" 
transitionName="Mark As Defective"/>
+    <StatusValidChange statusId="INV_AVAILABLE" 
statusIdTo="INV_BEING_TRANSFERED" transitionName="Being Transfered"/>
+    <StatusValidChange statusId="INV_ON_HOLD" statusIdTo="INV_AVAILABLE" 
transitionName="Release Hold"/>
+    <StatusValidChange statusId="INV_ON_HOLD" statusIdTo="INV_DEFECTIVE" 
transitionName="Mark Held Defective"/>
+    <StatusValidChange statusId="INV_BEING_TRANSFERED" 
statusIdTo="INV_AVAILABLE" transitionName="Transfer Complete"/>
+    <StatusValidChange statusId="INV_PROMISED" statusIdTo="INV_AVAILABLE" 
transitionName="Cancel Promise"/>
+    <StatusValidChange statusId="INV_PROMISED" statusIdTo="INV_DELIVERED" 
transitionName="Deliver"/>
+    <StatusValidChange statusId="INV_PROMISED" statusIdTo="INV_DEFECTIVE" 
transitionName="Mark As Defective"/>
+    <StatusValidChange statusId="INV_PROMISED" 
statusIdTo="INV_BEING_TRANS_PRM" transitionName="Being Transfered (Promised)"/>
+    <StatusValidChange statusId="INV_BEING_TRANS_PRM" 
statusIdTo="INV_PROMISED" transitionName="Transfer Complete (Promised)"/>
+    <StatusValidChange statusId="INV_DELIVERED" statusIdTo="INV_RETURNED" 
transitionName="Return Status Pending"/>
+    <StatusValidChange statusId="INV_RETURNED" statusIdTo="INV_AVAILABLE" 
transitionName="Make Return Available"/>
+    <StatusValidChange statusId="INV_RETURNED" statusIdTo="INV_ON_HOLD" 
transitionName="Make Return Held"/>
+    <StatusValidChange statusId="INV_RETURNED" statusIdTo="INV_DEFECTIVE" 
transitionName="Mark Return Defective"/>
+    <StatusValidChange statusId="INV_DELIVERED" statusIdTo="INV_ACTIVATED" 
transitionName="Activate"/>
+    <StatusValidChange statusId="INV_ACTIVATED" statusIdTo="INV_DEACTIVATED" 
transitionName="Deactivate"/>
+    <StatusValidChange statusId="INV_ACTIVATED" statusIdTo="INV_RETURNED" 
transitionName="Return Status Pending"/>
+    <StatusValidChange statusId="INV_DEACTIVATED" statusIdTo="INV_ON_HOLD" 
transitionName="Hold Inactive"/>
+    <StatusValidChange statusId="INV_DEACTIVATED" statusIdTo="INV_RETURNED" 
transitionName="Return Inactive"/>
+    <StatusValidChange statusId="INV_NS_RETURNED" statusIdTo="INV_NS_ON_HOLD" 
transitionName="Make Return Held"/>
+    <StatusValidChange statusId="INV_NS_RETURNED" 
statusIdTo="INV_NS_DEFECTIVE" transitionName="Mark Return Defective"/>
 
     <!-- inventory transfer status -->
     <StatusType description="Inventory Transfer" hasTable="N" parentTypeId="" 
statusTypeId="INVENTORY_XFER_STTS"/>
@@ -571,23 +571,23 @@ under the License.
     <StatusItem description="En-Route" sequenceId="03" statusCode="EN_ROUTE" 
statusId="IXF_EN_ROUTE" statusTypeId="INVENTORY_XFER_STTS"/>
     <StatusItem description="Complete" sequenceId="04" statusCode="COMPLETE" 
statusId="IXF_COMPLETE" statusTypeId="INVENTORY_XFER_STTS"/>
     <StatusItem description="Cancelled" sequenceId="99" statusCode="CANCELLED" 
statusId="IXF_CANCELLED" statusTypeId="INVENTORY_XFER_STTS"/>
-    <StatusValidChange condition="" statusId="IXF_REQUESTED" 
statusIdTo="IXF_SCHEDULED" transitionName="Inventory Request Scheduled"/>
-    <StatusValidChange condition="" statusId="IXF_REQUESTED" 
statusIdTo="IXF_EN_ROUTE" transitionName="Inventory Request In Route"/>
-    <StatusValidChange condition="" statusId="IXF_REQUESTED" 
statusIdTo="IXF_COMPLETE" transitionName="Inventory Request Completed"/>
-    <StatusValidChange condition="" statusId="IXF_REQUESTED" 
statusIdTo="IXF_CANCELLED" transitionName="Inventory Request Cancelled"/>
-    <StatusValidChange condition="" statusId="IXF_SCHEDULED" 
statusIdTo="IXF_EN_ROUTE" transitionName="Scheduled Inventory In Route"/>
-    <StatusValidChange condition="" statusId="IXF_SCHEDULED" 
statusIdTo="IXF_COMPLETE" transitionName="Scheduled Inventory Completed"/>
-    <StatusValidChange condition="" statusId="IXF_SCHEDULED" 
statusIdTo="IXF_CANCELLED" transitionName="Scheduled Inventory Cancelled"/>
-    <StatusValidChange condition="" statusId="IXF_EN_ROUTE" 
statusIdTo="IXF_COMPLETE" transitionName="In Route Transfer Completed"/>
+    <StatusValidChange statusId="IXF_REQUESTED" statusIdTo="IXF_SCHEDULED" 
transitionName="Inventory Request Scheduled"/>
+    <StatusValidChange statusId="IXF_REQUESTED" statusIdTo="IXF_EN_ROUTE" 
transitionName="Inventory Request In Route"/>
+    <StatusValidChange statusId="IXF_REQUESTED" statusIdTo="IXF_COMPLETE" 
transitionName="Inventory Request Completed"/>
+    <StatusValidChange statusId="IXF_REQUESTED" statusIdTo="IXF_CANCELLED" 
transitionName="Inventory Request Cancelled"/>
+    <StatusValidChange statusId="IXF_SCHEDULED" statusIdTo="IXF_EN_ROUTE" 
transitionName="Scheduled Inventory In Route"/>
+    <StatusValidChange statusId="IXF_SCHEDULED" statusIdTo="IXF_COMPLETE" 
transitionName="Scheduled Inventory Completed"/>
+    <StatusValidChange statusId="IXF_SCHEDULED" statusIdTo="IXF_CANCELLED" 
transitionName="Scheduled Inventory Cancelled"/>
+    <StatusValidChange statusId="IXF_EN_ROUTE" statusIdTo="IXF_COMPLETE" 
transitionName="In Route Transfer Completed"/>
 
     <!-- product review status -->
     <StatusType description="Product Review" hasTable="N" parentTypeId="" 
statusTypeId="PRODUCT_REVIEW_STTS"/>
     <StatusItem description="Pending" sequenceId="01" statusCode="PENDING" 
statusId="PRR_PENDING" statusTypeId="PRODUCT_REVIEW_STTS"/>
     <StatusItem description="Approved" sequenceId="02" statusCode="APPROVED" 
statusId="PRR_APPROVED" statusTypeId="PRODUCT_REVIEW_STTS"/>
     <StatusItem description="Deleted" sequenceId="99" statusCode="DELETED" 
statusId="PRR_DELETED" statusTypeId="PRODUCT_REVIEW_STTS"/>
-    <StatusValidChange condition="" statusId="PRR_PENDING" 
statusIdTo="PRR_APPROVED" transitionName="Review Approved"/>
-    <StatusValidChange condition="" statusId="PRR_PENDING" 
statusIdTo="PRR_DELETED" transitionName="Review Deleted"/>
-    <StatusValidChange condition="" statusId="PRR_APPROVED" 
statusIdTo="PRR_DELETED" transitionName="Review Deleted"/>
+    <StatusValidChange statusId="PRR_PENDING" statusIdTo="PRR_APPROVED" 
transitionName="Review Approved"/>
+    <StatusValidChange statusId="PRR_PENDING" statusIdTo="PRR_DELETED" 
transitionName="Review Deleted"/>
+    <StatusValidChange statusId="PRR_APPROVED" statusIdTo="PRR_DELETED" 
transitionName="Review Deleted"/>
 
     <VarianceReason varianceReasonId="VAR_LOST" description="Lost"/>
     <VarianceReason varianceReasonId="VAR_STOLEN" description="Stolen"/>

Modified: ofbiz/trunk/applications/product/data/ShipmentTypeData.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/data/ShipmentTypeData.xml?rev=1710566&r1=1710565&r2=1710566&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/data/ShipmentTypeData.xml (original)
+++ ofbiz/trunk/applications/product/data/ShipmentTypeData.xml Mon Oct 26 
11:09:54 2015
@@ -50,27 +50,27 @@ under the License.
     <StatusItem description="Shipped" sequenceId="05" statusCode="SHIPPED" 
statusId="SHIPMENT_SHIPPED" statusTypeId="SHIPMENT_STATUS"/>
     <StatusItem description="Delivered" sequenceId="06" statusCode="DELIVERED" 
statusId="SHIPMENT_DELIVERED" statusTypeId="SHIPMENT_STATUS"/>
     <StatusItem description="Cancelled" sequenceId="99" statusCode="CANCELLED" 
statusId="SHIPMENT_CANCELLED" statusTypeId="SHIPMENT_STATUS"/>
-    <StatusValidChange condition="" statusId="SHIPMENT_INPUT" 
statusIdTo="SHIPMENT_SCHEDULED" transitionName="Schedule"/>
-    <StatusValidChange condition="" statusId="SHIPMENT_INPUT" 
statusIdTo="SHIPMENT_PICKED" transitionName="Pick"/>
-    <StatusValidChange condition="" statusId="SHIPMENT_INPUT" 
statusIdTo="SHIPMENT_PACKED" transitionName="Pack"/>
-    <StatusValidChange condition="" statusId="SHIPMENT_SCHEDULED" 
statusIdTo="SHIPMENT_PICKED" transitionName="Pick"/>
-    <StatusValidChange condition="" statusId="SHIPMENT_SCHEDULED" 
statusIdTo="SHIPMENT_PACKED" transitionName="Pack"/>
-    <StatusValidChange condition="" statusId="SHIPMENT_PICKED" 
statusIdTo="SHIPMENT_PACKED" transitionName="Pack"/>
-    <StatusValidChange condition="" statusId="SHIPMENT_PACKED" 
statusIdTo="SHIPMENT_SHIPPED" transitionName="Ship"/>
-    <StatusValidChange condition="" statusId="SHIPMENT_SHIPPED" 
statusIdTo="SHIPMENT_DELIVERED" transitionName="Deliver"/>
-    <StatusValidChange condition="" statusId="SHIPMENT_INPUT" 
statusIdTo="SHIPMENT_CANCELLED" transitionName="Cancel"/>
-    <StatusValidChange condition="" statusId="SHIPMENT_SCHEDULED" 
statusIdTo="SHIPMENT_CANCELLED" transitionName="Cancel"/>
-    <StatusValidChange condition="" statusId="SHIPMENT_PICKED" 
statusIdTo="SHIPMENT_CANCELLED" transitionName="Cancel"/>
+    <StatusValidChange statusId="SHIPMENT_INPUT" 
statusIdTo="SHIPMENT_SCHEDULED" transitionName="Schedule"/>
+    <StatusValidChange statusId="SHIPMENT_INPUT" statusIdTo="SHIPMENT_PICKED" 
transitionName="Pick"/>
+    <StatusValidChange statusId="SHIPMENT_INPUT" statusIdTo="SHIPMENT_PACKED" 
transitionName="Pack"/>
+    <StatusValidChange statusId="SHIPMENT_SCHEDULED" 
statusIdTo="SHIPMENT_PICKED" transitionName="Pick"/>
+    <StatusValidChange statusId="SHIPMENT_SCHEDULED" 
statusIdTo="SHIPMENT_PACKED" transitionName="Pack"/>
+    <StatusValidChange statusId="SHIPMENT_PICKED" statusIdTo="SHIPMENT_PACKED" 
transitionName="Pack"/>
+    <StatusValidChange statusId="SHIPMENT_PACKED" 
statusIdTo="SHIPMENT_SHIPPED" transitionName="Ship"/>
+    <StatusValidChange statusId="SHIPMENT_SHIPPED" 
statusIdTo="SHIPMENT_DELIVERED" transitionName="Deliver"/>
+    <StatusValidChange statusId="SHIPMENT_INPUT" 
statusIdTo="SHIPMENT_CANCELLED" transitionName="Cancel"/>
+    <StatusValidChange statusId="SHIPMENT_SCHEDULED" 
statusIdTo="SHIPMENT_CANCELLED" transitionName="Cancel"/>
+    <StatusValidChange statusId="SHIPMENT_PICKED" 
statusIdTo="SHIPMENT_CANCELLED" transitionName="Cancel"/>
 
     <!-- these shipment status are intended for purchase shipments -->
     <StatusType description="Purchase Shipment" hasTable="N" parentTypeId="" 
statusTypeId="PURCH_SHIP_STATUS"/>
     <StatusItem description="Created" sequenceId="01" statusCode="CREATED" 
statusId="PURCH_SHIP_CREATED" statusTypeId="PURCH_SHIP_STATUS"/>
     <StatusItem description="Shipped" sequenceId="02" statusCode="SHIPPED" 
statusId="PURCH_SHIP_SHIPPED" statusTypeId="PURCH_SHIP_STATUS"/>
     <StatusItem description="Received" sequenceId="03" statusCode="RECEIVED" 
statusId="PURCH_SHIP_RECEIVED" statusTypeId="PURCH_SHIP_STATUS"/>
-    <StatusValidChange condition="" statusId="PURCH_SHIP_CREATED" 
statusIdTo="PURCH_SHIP_RECEIVED" transitionName="Receive"/>
-    <StatusValidChange condition="" statusId="PURCH_SHIP_CREATED" 
statusIdTo="PURCH_SHIP_SHIPPED" transitionName="Ship"/>
-    <StatusValidChange condition="" statusId="PURCH_SHIP_SHIPPED" 
statusIdTo="PURCH_SHIP_RECEIVED" transitionName="Receive"/>
-    <StatusValidChange condition="" statusId="PURCH_SHIP_RECEIVED" 
statusIdTo="PURCH_SHIP_SHIPPED" transitionName="Ship"/>
+    <StatusValidChange statusId="PURCH_SHIP_CREATED" 
statusIdTo="PURCH_SHIP_RECEIVED" transitionName="Receive"/>
+    <StatusValidChange statusId="PURCH_SHIP_CREATED" 
statusIdTo="PURCH_SHIP_SHIPPED" transitionName="Ship"/>
+    <StatusValidChange statusId="PURCH_SHIP_SHIPPED" 
statusIdTo="PURCH_SHIP_RECEIVED" transitionName="Receive"/>
+    <StatusValidChange statusId="PURCH_SHIP_RECEIVED" 
statusIdTo="PURCH_SHIP_SHIPPED" transitionName="Ship"/>
 
     <!-- ShipmentRouteSegment CarrierService status -->
     <StatusType description="ShipmentRouteSegment:CarrierService" hasTable="N" 
parentTypeId="" statusTypeId="SHPRTSG_CS_STATUS"/>
@@ -78,10 +78,10 @@ under the License.
     <StatusItem description="Confirmed" sequenceId="02" statusCode="CONFIRMED" 
statusId="SHRSCS_CONFIRMED" statusTypeId="SHPRTSG_CS_STATUS"/>
     <StatusItem description="Accepted" sequenceId="03" statusCode="ACCEPTED" 
statusId="SHRSCS_ACCEPTED" statusTypeId="SHPRTSG_CS_STATUS"/>
     <StatusItem description="Voided" sequenceId="08" statusCode="VOIDED" 
statusId="SHRSCS_VOIDED" statusTypeId="SHPRTSG_CS_STATUS"/>
-    <StatusValidChange condition="" statusId="SHRSCS_NOT_STARTED" 
statusIdTo="SHRSCS_CONFIRMED" transitionName="Confirm"/>
-    <StatusValidChange condition="" statusId="SHRSCS_CONFIRMED" 
statusIdTo="SHRSCS_ACCEPTED" transitionName="Accept"/>
-    <StatusValidChange condition="" statusId="SHRSCS_CONFIRMED" 
statusIdTo="SHRSCS_VOIDED" transitionName="Void"/>
-    <StatusValidChange condition="" statusId="SHRSCS_ACCEPTED" 
statusIdTo="SHRSCS_VOIDED" transitionName="Void"/>
+    <StatusValidChange statusId="SHRSCS_NOT_STARTED" 
statusIdTo="SHRSCS_CONFIRMED" transitionName="Confirm"/>
+    <StatusValidChange statusId="SHRSCS_CONFIRMED" 
statusIdTo="SHRSCS_ACCEPTED" transitionName="Accept"/>
+    <StatusValidChange statusId="SHRSCS_CONFIRMED" statusIdTo="SHRSCS_VOIDED" 
transitionName="Void"/>
+    <StatusValidChange statusId="SHRSCS_ACCEPTED" statusIdTo="SHRSCS_VOIDED" 
transitionName="Void"/>
     <!-- can go from accepted to voided? -->
 
     <RejectionReason rejectionId="SRJ_DAMAGED" description="Damaged"/>
@@ -95,23 +95,23 @@ under the License.
     <StatusItem description="Printed" sequenceId="03" statusCode="PRINTED" 
statusId="PICKLIST_PRINTED" statusTypeId="PICKLIST_STATUS"/>
     <StatusItem description="Picked" sequenceId="10" statusCode="PICKED" 
statusId="PICKLIST_PICKED" statusTypeId="PICKLIST_STATUS"/>
     <StatusItem description="Cancelled" sequenceId="99" statusCode="CANCELLED" 
statusId="PICKLIST_CANCELLED" statusTypeId="PICKLIST_STATUS"/>
-    <StatusValidChange condition="" statusId="PICKLIST_INPUT" 
statusIdTo="PICKLIST_ASSIGNED" transitionName="Assign"/>
-    <StatusValidChange condition="" statusId="PICKLIST_INPUT" 
statusIdTo="PICKLIST_PRINTED" transitionName="Print"/>
-    <StatusValidChange condition="" statusId="PICKLIST_INPUT" 
statusIdTo="PICKLIST_PICKED" transitionName="Pick"/>
-    <StatusValidChange condition="" statusId="PICKLIST_INPUT" 
statusIdTo="PICKLIST_CANCELLED" transitionName="Cancel"/>
-    <StatusValidChange condition="" statusId="PICKLIST_ASSIGNED" 
statusIdTo="PICKLIST_PICKED" transitionName="Pick"/>
-    <StatusValidChange condition="" statusId="PICKLIST_ASSIGNED" 
statusIdTo="PICKLIST_PRINTED" transitionName="Print"/>
-    <StatusValidChange condition="" statusId="PICKLIST_ASSIGNED" 
statusIdTo="PICKLIST_CANCELLED" transitionName="Cancel"/>
-    <StatusValidChange condition="" statusId="PICKLIST_PRINTED" 
statusIdTo="PICKLIST_PICKED" transitionName="Pick"/>
-    <StatusValidChange condition="" statusId="PICKLIST_PRINTED" 
statusIdTo="PICKLIST_CANCELLED" transitionName="Cancel"/>
+    <StatusValidChange statusId="PICKLIST_INPUT" 
statusIdTo="PICKLIST_ASSIGNED" transitionName="Assign"/>
+    <StatusValidChange statusId="PICKLIST_INPUT" statusIdTo="PICKLIST_PRINTED" 
transitionName="Print"/>
+    <StatusValidChange statusId="PICKLIST_INPUT" statusIdTo="PICKLIST_PICKED" 
transitionName="Pick"/>
+    <StatusValidChange statusId="PICKLIST_INPUT" 
statusIdTo="PICKLIST_CANCELLED" transitionName="Cancel"/>
+    <StatusValidChange statusId="PICKLIST_ASSIGNED" 
statusIdTo="PICKLIST_PICKED" transitionName="Pick"/>
+    <StatusValidChange statusId="PICKLIST_ASSIGNED" 
statusIdTo="PICKLIST_PRINTED" transitionName="Print"/>
+    <StatusValidChange statusId="PICKLIST_ASSIGNED" 
statusIdTo="PICKLIST_CANCELLED" transitionName="Cancel"/>
+    <StatusValidChange statusId="PICKLIST_PRINTED" 
statusIdTo="PICKLIST_PICKED" transitionName="Pick"/>
+    <StatusValidChange statusId="PICKLIST_PRINTED" 
statusIdTo="PICKLIST_CANCELLED" transitionName="Cancel"/>
 
     <!-- Picklist item status -->
     <StatusType description="Picklist Item" hasTable="N" parentTypeId="" 
statusTypeId="PICKITEM_STATUS"/>
     <StatusItem description="Pending" sequenceId="01" statusCode="PENDING" 
statusId="PICKITEM_PENDING" statusTypeId="PICKITEM_STATUS"/>
     <StatusItem description="Completed" sequenceId="50" statusCode="COMPLETED" 
statusId="PICKITEM_COMPLETED" statusTypeId="PICKITEM_STATUS"/>
     <StatusItem description="Cancelled" sequenceId="99" statusCode="CANCELLED" 
statusId="PICKITEM_CANCELLED" statusTypeId="PICKITEM_STATUS"/>
-    <StatusValidChange condition="" statusId="PICKITEM_PENDING" 
statusIdTo="PICKITEM_COMPLETED" transitionName="Complete"/>
-    <StatusValidChange condition="" statusId="PICKITEM_PENDING" 
statusIdTo="PICKITEM_CANCELLED" transitionName="Cancel"/>
+    <StatusValidChange statusId="PICKITEM_PENDING" 
statusIdTo="PICKITEM_COMPLETED" transitionName="Complete"/>
+    <StatusValidChange statusId="PICKITEM_PENDING" 
statusIdTo="PICKITEM_CANCELLED" transitionName="Cancel"/>
     
     <!-- Shipment Gateway Config -->
     <ShipmentGatewayConfigType shipmentGatewayConfTypeId="DHL" hasTable="N" 
description="DHL Shipment Gateway"/>

Reply via email to