diff --git a/src/Controller/JobOrderController.php b/src/Controller/JobOrderController.php
index d27e9a0d..f70d5484 100644
--- a/src/Controller/JobOrderController.php
+++ b/src/Controller/JobOrderController.php
@@ -909,7 +909,7 @@ class JobOrderController extends Controller
         $this->denyAccessUnlessGranted('jo_onestep.edit', null, 'No access.');
 
         $error_array = [];
-        $error_array = $jo_handler->generateOneStepJobOrder($req, $id);
+        $error_array = $jo_handler->processOneStepJobOrder($req, $id);
 
         // check if any errors were found
         if (!empty($error_array)) {
diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
index 534b986a..ee23e2ff 100644
--- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
@@ -444,7 +444,8 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
                     ->setColor('')
                     ->setStatusCondition('')
                     ->setFuelType('')
-                    ->setActive();
+                    ->setActive()
+                    ->setWarrantyCode($req->request->get('warranty_code'));
 
                 if (($req->request->get('service_type')) == CMBServiceType::BATTERY_REPLACEMENT_NEW)
                 {
@@ -480,6 +481,11 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
                 {
                     $jo->setCustomerVehicle($cust_vehicle);
                     $jo->setCustomer($cust_vehicle->getCustomer());
+
+                    // save serial into cv
+                    $cust_vehicle->setWarrantyCode($req->request->get('warranty_code'));
+
+                    $em->persist($cust_vehicle);
                 }
             }
         }
@@ -893,8 +899,11 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
             // save to customer vehicle battery record
             $this->updateVehicleBattery($obj);
 
-            // validated! save the entity
-            $em->flush();
+            // save serial to customer vehicle
+            $cust_vehicle = $obj->getCustomerVehicle();
+            $cust_vehicle->setWarrantyCode($req->request->get('warranty_code'));
+
+            $em->persist($cust_vehicle);
 
             // get rider
             $rider = $obj->getRider();
@@ -909,7 +918,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
             // create the warranty if new battery only
             if ($obj->getServiceType () == CMBServiceType::BATTERY_REPLACEMENT_NEW) 
             {
-                $serial = null;
+                $serial = $req->request->get('warranty_code') ;
                 $warranty_class = $obj->getWarrantyClass();
                 $first_name = $obj->getCustomer()->getFirstName();
                 $last_name = $obj->getCustomer()->getLastName();
@@ -945,6 +954,9 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
                     $this->wh->createWarranty($serial, $plate_number, $first_name, $last_name, $mobile_number, $batt_list, $date_purchase, $warranty_class);
                 }
             }
+
+            // validated! save the entity
+            $em->flush();
         }
     }
 
@@ -2301,6 +2313,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
 
         // warranty expiration
         // use GetWarrantyPrivate for passenger warranty
+        $warr_months = 0;
         $warr = $jo->getWarrantyClass();
         if ($warr == CMBWarrantyClass::WTY_PASSENGER)
             $warr_months = $battery->getWarrantyPrivate();
diff --git a/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php b/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php
index fa416e27..4baf1cb7 100644
--- a/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php
+++ b/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php
@@ -526,7 +526,7 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
         // create warranty
         if ($jo->getServiceType() == CMBServiceType::BATTERY_REPLACEMENT_NEW) 
         {
-            $serial = null;
+            $serial = $jo->getCustomerVehicle()->getWarrantyCode();
             $warranty_class = $jo->getWarrantyClass();
             $first_name = $jo->getCustomer()->getFirstName();
             $last_name = $jo->getCustomer()->getLastName();
diff --git a/templates/job-order/cmb.form.onestep.html.twig b/templates/job-order/cmb.form.onestep.html.twig
index d66a6222..b1777b63 100644
--- a/templates/job-order/cmb.form.onestep.html.twig
+++ b/templates/job-order/cmb.form.onestep.html.twig
@@ -211,7 +211,7 @@
                                     </div>
                                     <div class="col-lg-3">
                                         <label data-field="warranty_code">Serial Number</label>
-                                        <input type="text" name="warranty_code" id="warranty-code" class="form-control m-input" value="{{ obj.getCustomerVehicle ? obj.getCustomerVehicle.getWarrantyCode }}" data-vehicle-field="1" disabled>
+                                        <input type="text" name="warranty_code" id="warranty-code" class="form-control m-input" value="{{ obj.getCustomerVehicle ? obj.getCustomerVehicle.getWarrantyCode }}">
                                         <div class="form-control-feedback hide" data-field="warranty_code"></div>
                                     </div>
                                     <div class="col-lg-3">