diff --git a/Modules/mip_bulk_load.pck b/Modules/mip_bulk_load.pck
index fa776ba..4b40265 100644
--- a/Modules/mip_bulk_load.pck
+++ b/Modules/mip_bulk_load.pck
@@ -345,7 +345,7 @@ CREATE OR REPLACE PACKAGE BODY mip_bulk_load IS
                  ,qmax
                  ,CASE
                     WHEN valid_from IS NULL THEN
-                     SYSDATE
+                     trunc(SYSDATE)
                     ELSE
                      to_date(valid_from
                             ,'dd/mm/yyyy')
diff --git a/Modules/mip_quotation.pck b/Modules/mip_quotation.pck
index 30a31c7..6383182 100644
--- a/Modules/mip_quotation.pck
+++ b/Modules/mip_quotation.pck
@@ -2148,10 +2148,10 @@ RECEIVED AT THIS ADDRESS CANNOT BE RESPONDED TO.');
     
       cout_assert.istrue(NOT (l_required_mesc_code IS NULL AND
                           l_required_qmax IS NULL)
-                        ,p_message => 'Either required_mesc_code is null OR required_qmax is null');
+                        ,p_message => 'EITHER required_mesc_code must be null OR required_qmax must be null');
       cout_assert.istrue(NOT (l_required_mesc_code IS NOT NULL AND
                           l_required_qmax IS NOT NULL)
-                        ,p_message => 'Either required_mesc_code is null OR required_qmax is null');
+                        ,p_message => 'EITHER required_mesc_code must be null OR required_qmax must be null');
     
       FOR l_rec_module IN (SELECT modu.code AS modu_code
                                  ,modu.selling_price AS modu_selling_price
@@ -2236,14 +2236,20 @@ RECEIVED AT THIS ADDRESS CANNOT BE RESPONDED TO.');
                                             WHERE accuracy <= 1) cost
                                     WHERE modu.code = cost.modu_code(+)
                                       AND modu.inlet_cnor_code = cnor_i.code
-                                      AND modu.outlet_cnor_code = cnor_o.code) modu
+                                      AND modu.outlet_cnor_code = cnor_o.code
+                                      AND SYSDATE BETWEEN modu.valid_from AND
+                                          nvl(modu.valid_to
+                                             ,SYSDATE)) modu
                                  ,(SELECT metr.code
                                          ,metr.qmax
                                          ,metr.qmin
                                          ,metr.qnom
                                          ,metr.mety_code
                                          ,metr.mesc_code
-                                     FROM meters metr) metr
+                                     FROM meters metr
+                                    WHERE SYSDATE BETWEEN metr.valid_from AND
+                                          nvl(metr.valid_to
+                                             ,SYSDATE)) metr
                             WHERE modu.svcp_code = p_enqu.required_svcp_code
                               AND modu.outlet_pressure =
                                   p_enqu.required_metering_pressure