svn commit: r1715065 [2/2] - in /ofbiz/branches/release14.12: applications/accounting/data/ applications/content/data/ applications/humanres/data/ applications/marketing/data/ applications/order/data/ applications/party/data/ applications/product/data/...
Locked
svn commit: r1715065 [2/2] - in /ofbiz/branches/release14.12: applications/accounting/data/ applications/content/data/ applications/humanres/data/ applications/marketing/data/ applications/order/data/ applications/party/data/ applications/product/data/...
 
|
Modified: ofbiz/branches/release14.12/applications/product/data/ShipmentTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/product/data/ShipmentTypeData.xml?rev=1715065&r1=1715064&r2=1715065&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/product/data/ShipmentTypeData.xml (original) +++ ofbiz/branches/release14.12/applications/product/data/ShipmentTypeData.xml Wed Nov 18 20:56:13 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"/> Modified: ofbiz/branches/release14.12/applications/workeffort/data/WorkEffortTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/workeffort/data/WorkEffortTypeData.xml?rev=1715065&r1=1715064&r2=1715065&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/workeffort/data/WorkEffortTypeData.xml (original) +++ ofbiz/branches/release14.12/applications/workeffort/data/WorkEffortTypeData.xml Wed Nov 18 20:56:13 2015 @@ -55,42 +55,42 @@ under the License. <StatusItem description="Declined" sequenceId="10" statusCode="DECLINED" statusId="CAL_DECLINED" statusTypeId="CALENDAR_STATUS"/> <StatusItem description="Delegated" sequenceId="11" statusCode="DELEGATED" statusId="CAL_DELEGATED" statusTypeId="CALENDAR_STATUS"/> <StatusItem description="Cancelled" sequenceId="99" statusCode="CANCELLED" statusId="CAL_CANCELLED" statusTypeId="CALENDAR_STATUS"/> - <StatusValidChange condition="" statusId="CAL_IN_PLANNING" statusIdTo="CAL_PLANNED" transitionName="Send"/> - <StatusValidChange condition="" statusId="CAL_IN_PLANNING" statusIdTo="CAL_NEEDS_ACTION" transitionName="Send"/> - <StatusValidChange condition="" statusId="CAL_PLANNED" statusIdTo="CAL_NEEDS_ACTION" transitionName="Send"/> - <StatusValidChange condition="" statusId="CAL_NEEDS_ACTION" statusIdTo="CAL_SENT" transitionName="Send"/> - <StatusValidChange condition="" statusId="CAL_NEEDS_ACTION" statusIdTo="CAL_CANCELLED" transitionName="Cancel"/> - <StatusValidChange condition="" statusId="CAL_SENT" statusIdTo="CAL_DECLINED" transitionName="Decline"/> - <StatusValidChange condition="" statusId="CAL_SENT" statusIdTo="CAL_DELEGATED" transitionName="Delegate"/> - <StatusValidChange condition="" statusId="CAL_SENT" statusIdTo="CAL_CANCELLED" transitionName="Cancel"/> + <StatusValidChange statusId="CAL_IN_PLANNING" statusIdTo="CAL_PLANNED" transitionName="Send"/> + <StatusValidChange statusId="CAL_IN_PLANNING" statusIdTo="CAL_NEEDS_ACTION" transitionName="Send"/> + <StatusValidChange statusId="CAL_PLANNED" statusIdTo="CAL_NEEDS_ACTION" transitionName="Send"/> + <StatusValidChange statusId="CAL_NEEDS_ACTION" statusIdTo="CAL_SENT" transitionName="Send"/> + <StatusValidChange statusId="CAL_NEEDS_ACTION" statusIdTo="CAL_CANCELLED" transitionName="Cancel"/> + <StatusValidChange statusId="CAL_SENT" statusIdTo="CAL_DECLINED" transitionName="Decline"/> + <StatusValidChange statusId="CAL_SENT" statusIdTo="CAL_DELEGATED" transitionName="Delegate"/> + <StatusValidChange statusId="CAL_SENT" statusIdTo="CAL_CANCELLED" transitionName="Cancel"/> <StatusType description="Task" hasTable="N" parentTypeId="CALENDAR_STATUS" statusTypeId="TASK_STATUS"/> <StatusItem description="Accepted" sequenceId="01" statusCode="ACCEPTED" statusId="CAL_ACCEPTED" statusTypeId="TASK_STATUS"/> <StatusItem description="Completed" sequenceId="02" statusCode="COMPLETED" statusId="CAL_COMPLETED" statusTypeId="TASK_STATUS"/> - <StatusValidChange condition="" statusId="CAL_NEEDS_ACTION" statusIdTo="CAL_COMPLETED" transitionName="Complete"/> - <StatusValidChange condition="" statusId="CAL_SENT" statusIdTo="CAL_ACCEPTED" transitionName="Accept"/> - <StatusValidChange condition="" statusId="CAL_ACCEPTED" statusIdTo="CAL_COMPLETED" transitionName="Complete"/> - <StatusValidChange condition="" statusId="CAL_ACCEPTED" statusIdTo="CAL_CANCELLED" transitionName="Cancel"/> - <StatusValidChange condition="" statusId="CAL_ACCEPTED" statusIdTo="CAL_DELEGATED" transitionName="Delegate"/> + <StatusValidChange statusId="CAL_NEEDS_ACTION" statusIdTo="CAL_COMPLETED" transitionName="Complete"/> + <StatusValidChange statusId="CAL_SENT" statusIdTo="CAL_ACCEPTED" transitionName="Accept"/> + <StatusValidChange statusId="CAL_ACCEPTED" statusIdTo="CAL_COMPLETED" transitionName="Complete"/> + <StatusValidChange statusId="CAL_ACCEPTED" statusIdTo="CAL_CANCELLED" transitionName="Cancel"/> + <StatusValidChange statusId="CAL_ACCEPTED" statusIdTo="CAL_DELEGATED" transitionName="Delegate"/> <StatusType description="Event" hasTable="N" parentTypeId="CALENDAR_STATUS" statusTypeId="EVENT_STATUS"/> <StatusItem description="Tentative" sequenceId="01" statusCode="TENTATIVE" statusId="CAL_TENTATIVE" statusTypeId="EVENT_STATUS"/> <StatusItem description="Confirmed" sequenceId="02" statusCode="CONFIRMED" statusId="CAL_CONFIRMED" statusTypeId="EVENT_STATUS"/> - <StatusValidChange condition="" statusId="CAL_NEEDS_ACTION" statusIdTo="CAL_TENTATIVE" transitionName="Tentatively Plan"/> - <StatusValidChange condition="" statusId="CAL_NEEDS_ACTION" statusIdTo="CAL_CONFIRMED" transitionName="Confirm"/> - <StatusValidChange condition="" statusId="CAL_TENTATIVE" statusIdTo="CAL_ACCEPTED" transitionName="Accept"/> - <StatusValidChange condition="" statusId="CAL_TENTATIVE" statusIdTo="CAL_DECLINED" transitionName="Decline"/> - <StatusValidChange condition="" statusId="CAL_TENTATIVE" statusIdTo="CAL_DELEGATED" transitionName="Delegate"/> - <StatusValidChange condition="" statusId="CAL_TENTATIVE" statusIdTo="CAL_CANCELLED" transitionName="Cancel"/> - <StatusValidChange condition="" statusId="CAL_TENTATIVE" statusIdTo="CAL_CONFIRMED" transitionName="Confirm"/> - <StatusValidChange condition="" statusId="CAL_CONFIRMED" statusIdTo="CAL_COMPLETED" transitionName="Complete"/> + <StatusValidChange statusId="CAL_NEEDS_ACTION" statusIdTo="CAL_TENTATIVE" transitionName="Tentatively Plan"/> + <StatusValidChange statusId="CAL_NEEDS_ACTION" statusIdTo="CAL_CONFIRMED" transitionName="Confirm"/> + <StatusValidChange statusId="CAL_TENTATIVE" statusIdTo="CAL_ACCEPTED" transitionName="Accept"/> + <StatusValidChange statusId="CAL_TENTATIVE" statusIdTo="CAL_DECLINED" transitionName="Decline"/> + <StatusValidChange statusId="CAL_TENTATIVE" statusIdTo="CAL_DELEGATED" transitionName="Delegate"/> + <StatusValidChange statusId="CAL_TENTATIVE" statusIdTo="CAL_CANCELLED" transitionName="Cancel"/> + <StatusValidChange statusId="CAL_TENTATIVE" statusIdTo="CAL_CONFIRMED" transitionName="Confirm"/> + <StatusValidChange statusId="CAL_CONFIRMED" statusIdTo="CAL_COMPLETED" transitionName="Complete"/> <StatusType description="Timesheet" hasTable="N" parentTypeId="" statusTypeId="TIMESHEET_STATUS"/> <StatusItem description="In-Process" sequenceId="01" statusCode="IN_PROCESS" statusId="TIMESHEET_IN_PROCESS" statusTypeId="TIMESHEET_STATUS"/> <StatusItem description="Completed" sequenceId="02" statusCode="COMPLETED" statusId="TIMESHEET_COMPLETED" statusTypeId="TIMESHEET_STATUS"/> <StatusItem description="Approved" sequenceId="03" statusCode="APPROVED" statusId="TIMESHEET_APPROVED" statusTypeId="TIMESHEET_STATUS"/> - <StatusValidChange condition="" statusId="TIMESHEET_IN_PROCESS" statusIdTo="TIMESHEET_COMPLETED" transitionName="Confirm complete"/> - <StatusValidChange condition="" statusId="TIMESHEET_COMPLETED" statusIdTo="TIMESHEET_APPROVED" transitionName="Approve"/> + <StatusValidChange statusId="TIMESHEET_IN_PROCESS" statusIdTo="TIMESHEET_COMPLETED" transitionName="Confirm complete"/> + <StatusValidChange statusId="TIMESHEET_COMPLETED" statusIdTo="TIMESHEET_APPROVED" transitionName="Approve"/> <!-- Project Statuses --> <StatusType description="Project" hasTable="N" parentTypeId="WORK_EFFORT_STATUS" statusTypeId="WE_PROJECT_STATUS"/> @@ -99,11 +99,11 @@ under the License. <StatusItem description="Complete" sequenceId="05" statusCode="COMPLETE" statusId="WEPR_COMPLETE" statusTypeId="WE_PROJECT_STATUS"/> <StatusItem description="On Hold" sequenceId="98" statusCode="ON_HOLD" statusId="WEPR_ON_HOLD" statusTypeId="WE_PROJECT_STATUS"/> <StatusItem description="Cancelled" sequenceId="99" statusCode="CANCELLED" statusId="WEPR_CANCELLED" statusTypeId="WE_PROJECT_STATUS"/> - <StatusValidChange condition="" statusId="WEPR_PLANNING" statusIdTo="WEPR_IN_PROGRESS" transitionName="Begin Project"/> - <StatusValidChange condition="" statusId="WEPR_IN_PROGRESS" statusIdTo="WEPR_ON_HOLD" transitionName="Begin Project"/> - <StatusValidChange condition="" statusId="WEPR_ON_HOLD" statusIdTo="WEPR_IN_PROGRESS" transitionName="Resume Project"/> - <StatusValidChange condition="" statusId="WEPR_IN_PROGRESS" statusIdTo="WEPR_CANCELLED" transitionName="Cancel"/> - <StatusValidChange condition="" statusId="WEPR_ON_HOLD" statusIdTo="WEPR_CANCELLED" transitionName="Cancel"/> + <StatusValidChange statusId="WEPR_PLANNING" statusIdTo="WEPR_IN_PROGRESS" transitionName="Begin Project"/> + <StatusValidChange statusId="WEPR_IN_PROGRESS" statusIdTo="WEPR_ON_HOLD" transitionName="Begin Project"/> + <StatusValidChange statusId="WEPR_ON_HOLD" statusIdTo="WEPR_IN_PROGRESS" transitionName="Resume Project"/> + <StatusValidChange statusId="WEPR_IN_PROGRESS" statusIdTo="WEPR_CANCELLED" transitionName="Cancel"/> + <StatusValidChange statusId="WEPR_ON_HOLD" statusIdTo="WEPR_CANCELLED" transitionName="Cancel"/> <!-- Status items for WorkEffortPartyAssignment.statusId --> <StatusType description="Party Assignment Status" hasTable="N" parentTypeId="WORK_EFFORT_STATUS" statusTypeId="PRTYASGN_STATUS"/> @@ -227,9 +227,9 @@ under the License. <StatusItem description="Pending" sequenceId="01" statusCode="PENDING" statusId="WERV_PENDING" statusTypeId="WEFF_REVIEW_STTS"/> <StatusItem description="Approved" sequenceId="02" statusCode="APPROVED" statusId="WERV_APPROVED" statusTypeId="WEFF_REVIEW_STTS"/> <StatusItem description="Deleted" sequenceId="99" statusCode="DELETED" statusId="WERV_DELETED" statusTypeId="WEFF_REVIEW_STTS"/> - <StatusValidChange condition="" statusId="WERV_PENDING" statusIdTo="WERV_APPROVED" transitionName="Review Approved"/> - <StatusValidChange condition="" statusId="WERV_PENDING" statusIdTo="WERV_DELETED" transitionName="Review Deleted"/> - <StatusValidChange condition="" statusId="WERV_APPROVED" statusIdTo="WERV_DELETED" transitionName="Review Deleted"/> + <StatusValidChange statusId="WERV_PENDING" statusIdTo="WERV_APPROVED" transitionName="Review Approved"/> + <StatusValidChange statusId="WERV_PENDING" statusIdTo="WERV_DELETED" transitionName="Review Deleted"/> + <StatusValidChange statusId="WERV_APPROVED" statusIdTo="WERV_DELETED" transitionName="Review Deleted"/> <!-- iCalendar Data --> <RoleType description="Calendar Member" hasTable="N" parentTypeId="CALENDAR_ROLE" roleTypeId="ICAL_MEMBER"/> Modified: ofbiz/branches/release14.12/framework/common/data/CommonTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/common/data/CommonTypeData.xml?rev=1715065&r1=1715064&r2=1715065&view=diff ============================================================================== --- ofbiz/branches/release14.12/framework/common/data/CommonTypeData.xml (original) +++ ofbiz/branches/release14.12/framework/common/data/CommonTypeData.xml Wed Nov 18 20:56:13 2015 @@ -131,7 +131,7 @@ under the License. <StatusItem statusId="KW_APPROVED" statusTypeId="KEYWORD_STATUS" statusCode="APPROVED" sequenceId="01" description="Approved"/> <StatusItem statusId="KW_PENDING" statusTypeId="KEYWORD_STATUS" statusCode="PENDING" sequenceId="02" description="Pending"/> <StatusItem statusId="KW_DISAPPROVED" statusTypeId="KEYWORD_STATUS" statusCode="DISAPPROVED" sequenceId="03" description="Disapproved"/> - <StatusValidChange condition="" statusId="KW_PENDING" statusIdTo="KW_APPROVED" transitionName="Review Approved"/> - <StatusValidChange condition="" statusId="KW_PENDING" statusIdTo="KW_DISAPPROVED" transitionName="Review Disapproved"/> + <StatusValidChange statusId="KW_PENDING" statusIdTo="KW_APPROVED" transitionName="Review Approved"/> + <StatusValidChange statusId="KW_PENDING" statusIdTo="KW_DISAPPROVED" transitionName="Review Disapproved"/> </entity-engine-xml> Modified: ofbiz/branches/release14.12/specialpurpose/example/data/ExampleDemoData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/specialpurpose/example/data/ExampleDemoData.xml?rev=1715065&r1=1715064&r2=1715065&view=diff ============================================================================== --- ofbiz/branches/release14.12/specialpurpose/example/data/ExampleDemoData.xml (original) +++ ofbiz/branches/release14.12/specialpurpose/example/data/ExampleDemoData.xml Wed Nov 18 20:56:13 2015 @@ -35,16 +35,16 @@ under the License. <StatusItem description="Tested" sequenceId="05" statusCode="TESTED" statusId="EXST_TESTED" statusTypeId="EXAMPLE_STATUS"/> <StatusItem description="Complete" sequenceId="06" statusCode="COMPLETE" statusId="EXST_COMPLETE" statusTypeId="EXAMPLE_STATUS"/> <StatusItem description="Cancelled" sequenceId="99" statusCode="CANCELLED" statusId="EXST_CANCELLED" statusTypeId="EXAMPLE_STATUS"/> - <StatusValidChange condition="" statusId="EXST_IN_DESIGN" statusIdTo="EXST_DEFINED" transitionName="Definition Complete"/> - <StatusValidChange condition="" statusId="EXST_DEFINED" statusIdTo="EXST_APPROVED" transitionName="Approve"/> - <StatusValidChange condition="" statusId="EXST_APPROVED" statusIdTo="EXST_IMPLEMENTED" transitionName="Implementation Complete"/> - <StatusValidChange condition="" statusId="EXST_IMPLEMENTED" statusIdTo="EXST_TESTED" transitionName="Testing Complete"/> - <StatusValidChange condition="" statusId="EXST_TESTED" statusIdTo="EXST_COMPLETE" transitionName="Example Completed"/> - <StatusValidChange condition="" statusId="EXST_IN_DESIGN" statusIdTo="EXST_CANCELLED" transitionName="Cancel Example"/> - <StatusValidChange condition="" statusId="EXST_DEFINED" statusIdTo="EXST_CANCELLED" transitionName="Cancel Example"/> - <StatusValidChange condition="" statusId="EXST_APPROVED" statusIdTo="EXST_CANCELLED" transitionName="Cancel Example"/> - <StatusValidChange condition="" statusId="EXST_IMPLEMENTED" statusIdTo="EXST_CANCELLED" transitionName="Cancel Example"/> - <StatusValidChange condition="" statusId="EXST_TESTED" statusIdTo="EXST_CANCELLED" transitionName="Cancel Example"/> + <StatusValidChange statusId="EXST_IN_DESIGN" statusIdTo="EXST_DEFINED" transitionName="Definition Complete"/> + <StatusValidChange statusId="EXST_DEFINED" statusIdTo="EXST_APPROVED" transitionName="Approve"/> + <StatusValidChange statusId="EXST_APPROVED" statusIdTo="EXST_IMPLEMENTED" transitionName="Implementation Complete"/> + <StatusValidChange statusId="EXST_IMPLEMENTED" statusIdTo="EXST_TESTED" transitionName="Testing Complete"/> + <StatusValidChange statusId="EXST_TESTED" statusIdTo="EXST_COMPLETE" transitionName="Example Completed"/> + <StatusValidChange statusId="EXST_IN_DESIGN" statusIdTo="EXST_CANCELLED" transitionName="Cancel Example"/> + <StatusValidChange statusId="EXST_DEFINED" statusIdTo="EXST_CANCELLED" transitionName="Cancel Example"/> + <StatusValidChange statusId="EXST_APPROVED" statusIdTo="EXST_CANCELLED" transitionName="Cancel Example"/> + <StatusValidChange statusId="EXST_IMPLEMENTED" statusIdTo="EXST_CANCELLED" transitionName="Cancel Example"/> + <StatusValidChange statusId="EXST_TESTED" statusIdTo="EXST_CANCELLED" transitionName="Cancel Example"/> <EnumerationType description="Example Feature Source" enumTypeId="EXMPL_FEAT_SOURCE" hasTable="N" parentTypeId=""/> <Enumeration description="Customer" enumCode="CUSTOMER" enumId="EXFTSRC_CUSTOMER" sequenceId="01" enumTypeId="EXMPL_FEAT_SOURCE"/> Modified: ofbiz/branches/release14.12/specialpurpose/oagis/data/OagisTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/specialpurpose/oagis/data/OagisTypeData.xml?rev=1715065&r1=1715064&r2=1715065&view=diff ============================================================================== --- ofbiz/branches/release14.12/specialpurpose/oagis/data/OagisTypeData.xml (original) +++ ofbiz/branches/release14.12/specialpurpose/oagis/data/OagisTypeData.xml Wed Nov 18 20:56:13 2015 @@ -36,20 +36,20 @@ under the License. <StatusItem description="Received Success Confirm" sequenceId="28" statusCode="REC_SUC_CON" statusId="OAGMP_REC_SUC_CON" statusTypeId="OAGIS_MP_STATUS"/> <StatusItem description="Received Error Confirm" sequenceId="29" statusCode="REC_ERR_CON" statusId="OAGMP_REC_ERR_CON" statusTypeId="OAGIS_MP_STATUS"/> - <StatusValidChange condition="" statusId="OAGMP_RECEIVED" statusIdTo="OAGMP_PROC_SUCCESS" transitionName="Processing Succeeded"/> - <StatusValidChange condition="" statusId="OAGMP_RECEIVED" statusIdTo="OAGMP_PROC_ERROR" transitionName="Processing Errored"/> - <StatusValidChange condition="" statusId="OAGMP_RECEIVED" statusIdTo="OAGMP_SYS_ERROR" transitionName="Processing System Error"/> - <StatusValidChange condition="" statusId="OAGMP_PROC_ERROR" statusIdTo="OAGMP_ERRCONFSENT" transitionName="Error Confirm Sent"/> + <StatusValidChange statusId="OAGMP_RECEIVED" statusIdTo="OAGMP_PROC_SUCCESS" transitionName="Processing Succeeded"/> + <StatusValidChange statusId="OAGMP_RECEIVED" statusIdTo="OAGMP_PROC_ERROR" transitionName="Processing Errored"/> + <StatusValidChange statusId="OAGMP_RECEIVED" statusIdTo="OAGMP_SYS_ERROR" transitionName="Processing System Error"/> + <StatusValidChange statusId="OAGMP_PROC_ERROR" statusIdTo="OAGMP_ERRCONFSENT" transitionName="Error Confirm Sent"/> <!-- this transition is to restart and re-process failed incoming messages --> - <StatusValidChange condition="" statusId="OAGMP_PROC_ERROR" statusIdTo="OAGMP_RECEIVED" transitionName="Error Recoved to Received"/> - <StatusValidChange condition="" statusId="OAGMP_SYS_ERROR" statusIdTo="OAGMP_RECEIVED" transitionName="Error Recoved to Received"/> - <StatusValidChange condition="" statusId="OAGMP_ERRCONFSENT" statusIdTo="OAGMP_RECEIVED" transitionName="Error Recoved to Received"/> + <StatusValidChange statusId="OAGMP_PROC_ERROR" statusIdTo="OAGMP_RECEIVED" transitionName="Error Recoved to Received"/> + <StatusValidChange statusId="OAGMP_SYS_ERROR" statusIdTo="OAGMP_RECEIVED" transitionName="Error Recoved to Received"/> + <StatusValidChange statusId="OAGMP_ERRCONFSENT" statusIdTo="OAGMP_RECEIVED" transitionName="Error Recoved to Received"/> - <StatusValidChange condition="" statusId="OAGMP_TRIGGERED" statusIdTo="OAGMP_OGEN_SUCCESS" transitionName="Out Generation Succeeded"/> - <StatusValidChange condition="" statusId="OAGMP_TRIGGERED" statusIdTo="OAGMP_OGEN_ERROR" transitionName="Out Generation Errored"/> - <StatusValidChange condition="" statusId="OAGMP_OGEN_SUCCESS" statusIdTo="OAGMP_SENT" transitionName="Out Message Sent"/> - <StatusValidChange condition="" statusId="OAGMP_OGEN_SUCCESS" statusIdTo="OAGMP_SEND_ERROR" transitionName="Out Message Send Error"/> + <StatusValidChange statusId="OAGMP_TRIGGERED" statusIdTo="OAGMP_OGEN_SUCCESS" transitionName="Out Generation Succeeded"/> + <StatusValidChange statusId="OAGMP_TRIGGERED" statusIdTo="OAGMP_OGEN_ERROR" transitionName="Out Generation Errored"/> + <StatusValidChange statusId="OAGMP_OGEN_SUCCESS" statusIdTo="OAGMP_SENT" transitionName="Out Message Sent"/> + <StatusValidChange statusId="OAGMP_OGEN_SUCCESS" statusIdTo="OAGMP_SEND_ERROR" transitionName="Out Message Send Error"/> - <StatusValidChange condition="" statusId="OAGMP_SENT" statusIdTo="OAGMP_REC_SUC_CON" transitionName="Success Confirm Received"/> - <StatusValidChange condition="" statusId="OAGMP_SENT" statusIdTo="OAGMP_REC_ERR_CON" transitionName="Error Confirm Received"/> + <StatusValidChange statusId="OAGMP_SENT" statusIdTo="OAGMP_REC_SUC_CON" transitionName="Success Confirm Received"/> + <StatusValidChange statusId="OAGMP_SENT" statusIdTo="OAGMP_REC_ERR_CON" transitionName="Error Confirm Received"/> </entity-engine-xml> Modified: ofbiz/branches/release14.12/specialpurpose/projectmgr/data/ProjectMgrTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/specialpurpose/projectmgr/data/ProjectMgrTypeData.xml?rev=1715065&r1=1715064&r2=1715065&view=diff ============================================================================== --- ofbiz/branches/release14.12/specialpurpose/projectmgr/data/ProjectMgrTypeData.xml (original) +++ ofbiz/branches/release14.12/specialpurpose/projectmgr/data/ProjectMgrTypeData.xml Wed Nov 18 20:56:13 2015 @@ -53,7 +53,7 @@ under the License. <!-- assignment status on a task --> <StatusItem description="Assigned" sequenceId="01" statusCode="ASSIGNED" statusId="PAS_ASSIGNED" statusTypeId="PROJECT_ASSGN_STATUS"/> <StatusItem description="Completed" sequenceId="02" statusCode="COMPLETED" statusId="PAS_COMPLETED" statusTypeId="PROJECT_ASSGN_STATUS"/> - <StatusValidChange condition="" statusId="PAS_ASSIGNED" statusIdTo="PAS_COMPLETED" transitionName="Assignment Complete"/> + <StatusValidChange statusId="PAS_ASSIGNED" statusIdTo="PAS_COMPLETED" transitionName="Assignment Complete"/> <!-- status of the task itself --> <StatusItem description="Created" sequenceId="01" statusCode="CREATED" statusId="PTS_CREATED" statusTypeId="PROJECT_TASK_STATUS"/> @@ -63,17 +63,17 @@ under the License. <StatusItem description="Completed" sequenceId="05" statusCode="COMPLETED" statusId="PTS_COMPLETED" statusTypeId="PROJECT_TASK_STATUS"/> <StatusItem description="On Hold" sequenceId="07" statusCode="ON_HOLD" statusId="PTS_ON_HOLD" statusTypeId="PROJECT_TASK_STATUS"/> <StatusItem description="Cancelled" sequenceId="09" statusCode="CANCELLED" statusId="PTS_CANCELLED" statusTypeId="PROJECT_TASK_STATUS"/> - <StatusValidChange condition="" statusId="PTS_CREATED" statusIdTo="PTS_COMPLETED" transitionName="Task Complete"/> - <StatusValidChange condition="" statusId="PTS_CREATED" statusIdTo="PTS_ON_HOLD" transitionName="Task On Hold"/> - <StatusValidChange condition="" statusId="PTS_CREATED" statusIdTo="PTS_CANCELLED" transitionName="Task On Hold"/> - <StatusValidChange condition="" statusId="PTS_ON_HOLD" statusIdTo="PTS_CREATED" transitionName="Activated"/> + <StatusValidChange statusId="PTS_CREATED" statusIdTo="PTS_COMPLETED" transitionName="Task Complete"/> + <StatusValidChange statusId="PTS_CREATED" statusIdTo="PTS_ON_HOLD" transitionName="Task On Hold"/> + <StatusValidChange statusId="PTS_CREATED" statusIdTo="PTS_CANCELLED" transitionName="Task On Hold"/> + <StatusValidChange statusId="PTS_ON_HOLD" statusIdTo="PTS_CREATED" transitionName="Activated"/> <!-- status of project and phase is defined by the underlying task status. however to remove the project from current lists the closed status is introduced --> <StatusItem description="Active" sequenceId="01" statusCode="ACTIVE" statusId="PRJ_ACTIVE" statusTypeId="PROJECT_STATUS"/> <StatusItem description="Closed" sequenceId="09" statusCode="CLOSED" statusId="PRJ_CLOSED" statusTypeId="PROJECT_STATUS"/> - <StatusValidChange condition="" statusId="PRJ_ACTIVE" statusIdTo="PRJ_CLOSED" transitionName="Close project"/> + <StatusValidChange statusId="PRJ_ACTIVE" statusIdTo="PRJ_CLOSED" transitionName="Close project"/> <!-- for current installations --> - <StatusValidChange condition="" statusId="_NA_" statusIdTo="PRJ_CLOSED" transitionName="Close project"/> + <StatusValidChange statusId="_NA_" statusIdTo="PRJ_CLOSED" transitionName="Close project"/> </entity-engine-xml> Modified: ofbiz/branches/release14.12/specialpurpose/scrum/data/scrumTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/specialpurpose/scrum/data/scrumTypeData.xml?rev=1715065&r1=1715064&r2=1715065&view=diff ============================================================================== --- ofbiz/branches/release14.12/specialpurpose/scrum/data/scrumTypeData.xml (original) +++ ofbiz/branches/release14.12/specialpurpose/scrum/data/scrumTypeData.xml Wed Nov 18 20:56:13 2015 @@ -50,10 +50,10 @@ under the License. however to remove the project from current lists the closed status is introduced --> <StatusItem description="Active" sequenceId="01" statusCode="ACTIVE" statusId="SPJ_ACTIVE" statusTypeId="SCRUM_PROJECT_STATUS"/> <StatusItem description="Closed" sequenceId="09" statusCode="CLOSED" statusId="SPJ_CLOSED" statusTypeId="SCRUM_PROJECT_STATUS"/> - <StatusValidChange condition="" statusId="SPJ_ACTIVE" statusIdTo="SPJ_CLOSED" transitionName="Close project"/> - <StatusValidChange condition="" statusId="SPJ_CLOSED" statusIdTo="SPJ_ACTIVE" transitionName="Re-Open project"/> + <StatusValidChange statusId="SPJ_ACTIVE" statusIdTo="SPJ_CLOSED" transitionName="Close project"/> + <StatusValidChange statusId="SPJ_CLOSED" statusIdTo="SPJ_ACTIVE" transitionName="Re-Open project"/> <!-- for current installations --> - <StatusValidChange condition="" statusId="_NA_" statusIdTo="SPJ_CLOSED" transitionName="Close project"/> + <StatusValidChange statusId="_NA_" statusIdTo="SPJ_CLOSED" transitionName="Close project"/> <StatusItem statusId="SPRINT_ACTIVE" statusTypeId="SPRINT_STATUS" description="Active" sequenceId="01" statusCode="ACTIVE"/> <StatusItem statusId="SPRINT_CLOSED" statusTypeId="SPRINT_STATUS" description="Closed" sequenceId="02" statusCode="CLOSED"/> @@ -70,7 +70,7 @@ under the License. <!-- assignment status on a task --> <StatusItem description="Assigned" sequenceId="01" statusCode="ASSIGNED" statusId="SCAS_ASSIGNED" statusTypeId="SCRUM_ASSGN_STATUS"/> <StatusItem description="Completed" sequenceId="02" statusCode="COMPLETED" statusId="SCAS_COMPLETED" statusTypeId="SCRUM_ASSGN_STATUS"/> - <StatusValidChange condition="" statusId="SCAS_ASSIGNED" statusIdTo="SCAS_COMPLETED" transitionName="Assignment Complete"/> + <StatusValidChange statusId="SCAS_ASSIGNED" statusIdTo="SCAS_COMPLETED" transitionName="Assignment Complete"/> <!-- status of the task itself --> <StatusItem description="Created" sequenceId="01" statusCode="CREATED" statusId="STS_CREATED" statusTypeId="SCRUM_TASK_STATUS"/> @@ -80,12 +80,12 @@ under the License. <StatusItem description="Completed" sequenceId="05" statusCode="COMPLETED" statusId="STS_COMPLETED" statusTypeId="SCRUM_TASK_STATUS"/> <StatusItem description="On Hold" sequenceId="07" statusCode="ON_HOLD" statusId="STS_ON_HOLD" statusTypeId="SCRUM_TASK_STATUS"/> <StatusItem description="Cancelled" sequenceId="09" statusCode="CANCELLED" statusId="STS_CANCELLED" statusTypeId="SCRUM_TASK_STATUS"/> - <StatusValidChange condition="" statusId="STS_CREATED" statusIdTo="STS_COMPLETED" transitionName="Task Complete"/> - <StatusValidChange condition="" statusId="STS_CREATED" statusIdTo="STS_ON_HOLD" transitionName="Task On Hold"/> - <StatusValidChange condition="" statusId="STS_CREATED" statusIdTo="STS_CANCELLED" transitionName="Task On Hold"/> - <StatusValidChange condition="" statusId="STS_ON_HOLD" statusIdTo="STS_CREATED" transitionName="Activated"/> - <StatusValidChange condition="" statusId="STS_COMPLETED" statusIdTo="STS_CREATED" transitionName="Task Re-Open"/> - <StatusValidChange condition="" statusId="STS_CREATED" statusIdTo="SPJ_CLOSED" transitionName="Task Complete with Project Complete"/> + <StatusValidChange statusId="STS_CREATED" statusIdTo="STS_COMPLETED" transitionName="Task Complete"/> + <StatusValidChange statusId="STS_CREATED" statusIdTo="STS_ON_HOLD" transitionName="Task On Hold"/> + <StatusValidChange statusId="STS_CREATED" statusIdTo="STS_CANCELLED" transitionName="Task On Hold"/> + <StatusValidChange statusId="STS_ON_HOLD" statusIdTo="STS_CREATED" transitionName="Activated"/> + <StatusValidChange statusId="STS_COMPLETED" statusIdTo="STS_CREATED" transitionName="Task Re-Open"/> + <StatusValidChange statusId="STS_CREATED" statusIdTo="SPJ_CLOSED" transitionName="Task Complete with Project Complete"/> <StatusItem description="Open" sequenceId="02" statusCode="ACCEPTED" statusId="CRQ_ACCEPTED" statusTypeId="CUSTREQ_STTS"/> <StatusItem description="Being implemented" sequenceId="03" statusCode="REVIEWED" statusId="CRQ_REVIEWED" statusTypeId="CUSTREQ_STTS"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |