diff --git a/application/controllers/purchaseorder.php b/application/controllers/purchaseorder.php index dc1d6fd7..b878b512 100755 --- a/application/controllers/purchaseorder.php +++ b/application/controllers/purchaseorder.php @@ -1840,7 +1840,8 @@ function addNewImportPurchaseOrder() else{ $CapitalRange = '0'; - $ExchangeRateOn = $this->input->post('ExchangeRateOn'); + $ExchangeRateBeforeFormat = $this->input->post('Exchangerateon'); + $ExchangeRateOn =$this->getDateformat($ExchangeRateBeforeFormat); $ExchangeRate=$this->input->post('ExchangeRt'); $Palaceoforigin=$this->input->post('PlaceOforigin'); } @@ -2067,7 +2068,8 @@ function addNewImportPurchaseOrder() else{ $CapitalRange = '0'; - $ExchangeRateOn = $this->input->post('ExchangeRateOn'); + $ExchangeRateBeforeFormat = $this->input->post('Exchangerateon'); + $ExchangeRateOn =$this->getDateformat($ExchangeRateBeforeFormat); $ExchangeRate=$this->input->post('ExchangeRt'); } $PaymentMethod = $this->input->post('PaymentMethod'); diff --git a/application/views/EditservicePurchaseorder.php b/application/views/EditservicePurchaseorder.php index c36ba7fb..a0e13d52 100755 --- a/application/views/EditservicePurchaseorder.php +++ b/application/views/EditservicePurchaseorder.php @@ -171,16 +171,16 @@ var AvilBudAmt = ''; $("#PODate").datepicker({ minDate : d, maxDate : 'now', - dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' + dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' }); $("#Deliverydt").datepicker({ minDate : 'now', - dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '0:+10' + dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '0:+10' }); /* $("#Requeston").datepicker({ //minDate : d, maxDate : 'now', - dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' + dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' }); */ $('#drpSupplier').change(function() { diff --git a/application/views/alterpurchaseorder.php b/application/views/alterpurchaseorder.php index 6f7dec65..2e9cd205 100755 --- a/application/views/alterpurchaseorder.php +++ b/application/views/alterpurchaseorder.php @@ -120,11 +120,11 @@ if(!empty($INRSYMBOL)) $("#PODate").datepicker({ minDate : 'now', maxDate : 'now', - dateFormat: 'dd/mm/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' + dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' }); $("#Deliverydt").datepicker({ minDate : 'now', - dateFormat: 'dd/mm/yy',changeMonth: true, changeYear: true,yearRange: '0:+10' + dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '0:+10' }); diff --git a/application/views/capitalpurchaseorder.php b/application/views/capitalpurchaseorder.php index 3ccc05ba..2b54e837 100755 --- a/application/views/capitalpurchaseorder.php +++ b/application/views/capitalpurchaseorder.php @@ -109,11 +109,16 @@ $('#CapitalToatlOrder').val(0); $("#PODate").datepicker({ //minDate : d, maxDate : 'now', - dateFormat: 'dd/mm/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' + dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' }); $("#Deliverydt").datepicker({ minDate : 'now', - dateFormat: 'dd/mm/yy',changeMonth: true, changeYear: true,yearRange: '0:+10' + dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '0:+10' + }); + $("#Exchangerateon").datepicker({ + //minDate : d, + maxDate : 'now', + dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' }); $('#Date').click(function () { diff --git a/application/views/createPOfromRequistion.php b/application/views/createPOfromRequistion.php index aee62756..c368fdec 100755 --- a/application/views/createPOfromRequistion.php +++ b/application/views/createPOfromRequistion.php @@ -117,7 +117,7 @@
- +
format('d-m-y'); +$CurrentDate = $dt->format('d-m-Y'); //echo $CurrentDate; $MaxPoDate = ''; if(!empty($MaxPODate)) @@ -99,14 +99,14 @@ $("#PaymentTerms").select2(); $("#PODate").datepicker({ minDate : d, maxDate : 'now', - dateFormat: 'dd/mm/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' + dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' }); $("#Exchangerateon").datepicker({ minDate : m, //maxDate : 'now', - dateFormat: 'dd/mm/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' + dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' }); // $("#Deliverydt").datepicker({ // minDate : 'now', diff --git a/application/views/purchaseorder.php b/application/views/purchaseorder.php index 776d3c56..e59cf9fe 100755 --- a/application/views/purchaseorder.php +++ b/application/views/purchaseorder.php @@ -175,11 +175,11 @@ $(function() $("#PODate").datepicker({ minDate : d, maxDate : 'now', - dateFormat: 'dd/mm/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' + dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' }); $("#Deliverydt").datepicker({ minDate : 'now', - dateFormat: 'dd/mm/yy',changeMonth: true, changeYear: true,yearRange: '0:+10' + dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '0:+10' }); $('#drpSupplier').change(function() { diff --git a/application/views/servicePurchaseorder.php b/application/views/servicePurchaseorder.php index 474b65d6..6770b1ed 100755 --- a/application/views/servicePurchaseorder.php +++ b/application/views/servicePurchaseorder.php @@ -68,11 +68,11 @@ var AvilBudAmt = ''; $("#PODate").datepicker({ minDate : d, maxDate : 'now', - dateFormat: 'dd/mm/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' + dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' }); $("#Deliverydt").datepicker({ minDate : 'now', - dateFormat: 'dd/mm/yy',changeMonth: true, changeYear: true,yearRange: '0:+10' + dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '0:+10' });