diff --git a/Data/BulkLoad/DATAITEM_ROLES.csv b/Data/BulkLoad/DATAITEM_ROLES.csv index 983bde7..2465644 100644 --- a/Data/BulkLoad/DATAITEM_ROLES.csv +++ b/Data/BulkLoad/DATAITEM_ROLES.csv @@ -9,6 +9,7 @@ ANNUAL_QUANTITY,Job Information.Annual Quantity,O,O,O,O,O,H,H,H,O,O,O,O,if > 732 ASSET_LOCATION_NOTES,Site Detail.Asset Location Notes,O,O,O,O,O,O,O,O,O,O,O,O,,65 BASE_REQUIRED,Job Information.Additional Services.Base,M,M,H,M,M,H,H,H,M,M,H,M,,26 BYPASS_REQUIRED,Job Information.Additional Services.By-pass,O,O,H,O,O,H,H,H,O,O,O,O,"If yes, warn user if twin stream is no",27 +BYPASS_OTHER,Job Information.Additional Services.By-pass Other,O-M7,O-M7,H,O-M7,O-M7,H,H,H,O-M7,O-M7,O-M7,O-M7,, CACA_CODE,Site Detail.Care Category,O,O,O,O,O,O,O,O,O,O,O,O,,66 CONVERTOR_REQUIRED,Job Information.Additional Services.Convertor,M,M,H,M,M,H,H,H,M,M,M,M,this can be an add-on for removals,28 CREATED_ON,,,,,,,,,,,,,,, @@ -85,3 +86,4 @@ UPDATED_ON,,,,,,,,,,,,,,, ,O-M4: IF MPRN IS NOT COMPLETED THEN MPRN_ALT MUST BE COMPLETED,,,,,,,,,,,,,, ,O-M5: AMR AVAILABILITY IS DETERMINED BY TRIPARTITE AGREEMENT,,,,,,,,,,,,,, ,O-M6: IF EXISTING_METR_CODE IS 'OTHER' THEN EXISTING_MESC_CODE AND EXISTING_METY_CODE MUST BE COMPLETED,,,,,,,,,,,,,, +,O-M7: IF BY_PASS IS 'OTHER' THEN BYPASS_OTHER MUST BE COMPLETED,,,,,,,,,,,,,, diff --git a/Documentation/Design/DATAITEM_ROLES.xls b/Documentation/Design/DATAITEM_ROLES.xls index 80e4118..c54b4c8 100644 Binary files a/Documentation/Design/DATAITEM_ROLES.xls and b/Documentation/Design/DATAITEM_ROLES.xls differ diff --git a/Modules/mip_helper_special_cases.pck b/Modules/mip_helper_special_cases.pck index ab1a81d..d9100b9 100644 --- a/Modules/mip_helper_special_cases.pck +++ b/Modules/mip_helper_special_cases.pck @@ -80,6 +80,15 @@ CREATE OR REPLACE PACKAGE BODY mip_helper_special_cases IS ,p_error_message => 'Either Existing Meter Model OR Existing Meter Size and Meter Type information must be completed.'); END IF; + -- O-M7 + IF p_rec.enty_code IN + ('INSTALL', 'STD INSTALL', 'EXCHANGE', 'STD EXCHANGE', 'ALTERATION', + 'CHANGE CAPACITY', 'ADDON', 'OTHER') + AND (p_rec.bypass_required = '7' AND p_rec.bypass_other IS NULL) THEN + mip_mandatory.add_error(p_mandatory_checks => p_mandatory_checks + ,p_field_name => 'BYPASS_OTHER' + ,p_error_message => '''Other'' reason must be completed.'); + END IF; END table_enquiries; BEGIN -- Initialization