From 13521ee60b94be04657ae73afeca1b4fe2b08bba Mon Sep 17 00:00:00 2001 From: gandhimathi Bharathirajan Date: Fri, 16 Jun 2017 13:26:09 +0530 Subject: [PATCH] Defect fixed for Revenue PO screen --- application/views/capitalpurchaseorder.php | 136 +++++++++--------- .../views/editRevenuepurchaseorder.php | 1 + 2 files changed, 72 insertions(+), 65 deletions(-) diff --git a/application/views/capitalpurchaseorder.php b/application/views/capitalpurchaseorder.php index 323fea22..f08e7c7b 100755 --- a/application/views/capitalpurchaseorder.php +++ b/application/views/capitalpurchaseorder.php @@ -23,6 +23,7 @@ $("#Reqnumber").select2(); $("#CapitalCostCenter").select2(); $("#MaterialCode").select2(); + $("#currencytype").select2(); $("#PODate").datepicker({ //minDate : d, @@ -33,6 +34,16 @@ minDate : 'now', dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '0:+10' }); + $('#Date').click(function () { + //for Date range selection + $('#Schedulediv').hide(); + $('#Deliverydtdiv').show(); + }); + $('#Schedule').click(function () { + //for schedule range selection + $('#Deliverydtdiv').hide(); + $('#Schedulediv').show(); + }); }); @@ -47,12 +58,12 @@
-
+

Siddharth Industries - Capital Purchase Order

-
-

+ +
@@ -77,13 +88,16 @@ ?>
- Basic Price in US $ per Ton : -
- 'imBasicPrice','value' => set_value('imBasicPrice'),'id'=>'imBasicPrice', 'class' => 'form-control' ,'placeholder '=>'basic price','onkeypress'=>'return isNumberKey(event);'); - echo form_input($data); - ?> -
+ +
+ 'Select Currency Type '); + + echo form_dropdown('currencytype', $options,set_value('currencytype'),'id="currencytype"' ,'class="form-control select2"' , 'required="true"' ); + + ?> + +
Click here to check Today's Foreign Exchange value @@ -123,7 +137,7 @@
- Exchange Rate : +
'ExchangeRt','value' => set_value('ExchangeRt'),'id'=>'ExchangeRt', 'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);'); @@ -153,17 +167,6 @@ ?>
-
- Basic value in INR : -
- 'INRBasicvalue','value' => set_value('INRBasicvalue'),'id'=>'INRBasicvalue', 'class' => 'form-control' ,'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
-
@@ -173,15 +176,40 @@ ?>
+
+
- -
- 'Deliverydt','value' => set_value('Deliverydt'),'id'=>'Deliverydt', 'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;'); - echo form_input($data); - ?> -
-
+ + Select Delivery By
+ + + "DateRange", "id"=>"Date", "value"=>"0", 'checked'=>set_radio('DateRange', '0', TRUE))); ?>     + + "DateRange", "id"=>"Schedule", "value"=>"1", 'checked'=>set_radio('DateRange', '1', FALSE))); ?> + + + +
+ + +

+ + + 'Deliverydt','value' => set_value('Deliverydt'),'id'=>'Deliverydt', 'class' => 'form-control' ,'required' => 'true'); + echo form_input($data); + ?> + +
+
@@ -193,7 +221,7 @@
- Add Line Item + Select Line Item
- +
'CPRate','value' => set_value('CPRate'),'id'=>'CPRate', 'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);' ); @@ -303,7 +331,7 @@
- +
'CPTotalAmount','value' => set_value('CPTotalAmount'),'id'=>'CPTotalAmount', 'class' => 'form-control' ,'readonly' => 'true'); @@ -315,18 +343,7 @@
-
- - Basic Price in US $ per Ton : - - -
- 'CPBasicPrice','value' => set_value('CPBasicPrice'),'id'=>'CPBasicPrice', 'class' => 'form-control' ,'placeholder '=>'basic price','onkeypress'=>'return isNumberKey(event);'); - echo form_input($data); - ?> -
-
+
@@ -335,26 +352,14 @@
'ExchangeRt','value' => set_value('ExchangeRt'),'id'=>'ExchangeRt', 'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);'); + $data = array('name' => 'ExchangeRt','value' => set_value('ExchangeRt'),'id'=>'ExchangeRt', 'class' => 'form-control' ,'readonly' => 'true'); echo form_input($data); ?>
-
- - Basic value in INR : - - - -
- 'INRBasicvalue','value' => set_value('INRBasicvalue'),'id'=>'INRBasicvalue', 'class' => 'form-control' ,'readonly' => 'true'); - echo form_input($data); - ?> -
-
+
Service Tax @14% : @@ -777,8 +782,9 @@
- - +   Save +  Submit +

diff --git a/application/views/editRevenuepurchaseorder.php b/application/views/editRevenuepurchaseorder.php index 6de3db6d..f85906fe 100755 --- a/application/views/editRevenuepurchaseorder.php +++ b/application/views/editRevenuepurchaseorder.php @@ -1628,6 +1628,7 @@ function validateEditExceedLimit() $('#txtEditTotalOrderValue').val(tot); validateEditExceedLimit(); + ExceedEditQuantityCheck(); } function calculateEditTaxValue() {