diff --git a/application/controllers/purchaseorder.php b/application/controllers/purchaseorder.php index 3ae2b2c3..40d1e841 100755 --- a/application/controllers/purchaseorder.php +++ b/application/controllers/purchaseorder.php @@ -234,6 +234,9 @@ class purchaseorder extends BaseController } else if($ReqType == IMPORT) { + + $data['staticspecialinstruction']=$this->purchaseorder_model->getConfigValue('C027'); + $ViewName = 'importpo'; } else if($ReqType == CAPITAL) diff --git a/application/views/EditservicePurchaseorder.php b/application/views/EditservicePurchaseorder.php index 4976aa4c..28dcb9f6 100755 --- a/application/views/EditservicePurchaseorder.php +++ b/application/views/EditservicePurchaseorder.php @@ -2771,9 +2771,9 @@ var txtTotalOrderValueSummary = $('#txtTotBasicAmount').val(); $('#Otherpayment').focus(); return false; } - else if($('#Editdescofpo').val().trim()==''){ + else if($('#editdescofpo').val().trim()==''){ alert('Please Enter Description Of Service'); - $('#Editdescofpo').focus(); + $('#editdescofpo').focus(); return false; } else diff --git a/application/views/editImportAmendPO.php b/application/views/editImportAmendPO.php index e1848e4e..31ebe086 100755 --- a/application/views/editImportAmendPO.php +++ b/application/views/editImportAmendPO.php @@ -872,7 +872,7 @@ if(!empty($RequistionDetails))
- +
'EditAvlBudAmt','value' => set_value('EditAvlBudAmt',),'id'=>'EditAvlBudAmt', 'class' => 'form-control' ,'readonly' => 'true'); @@ -985,8 +985,7 @@ if(!empty($RequistionDetails))
- - +
- +
- purchase rate [Basic]/UOM + purchase rate () [Basic]/UOM
diff --git a/application/views/editimportpo.php b/application/views/editimportpo.php index 906a474e..dd83572c 100755 --- a/application/views/editimportpo.php +++ b/application/views/editimportpo.php @@ -144,7 +144,7 @@ if(!empty($POMaster)) // $PaymentDays=$Req->PaymentDays; $StatusName=$Req->StatusName; $Currency_Type=$Req->CurrencyType; - $parentPO =$Req->ParentPO; + $parentPO =$Req->ParentPO; $DeliverySchedule=$Req->DeliverySchedule; $Import_DispatchDetails=$Req->Import_DispatchDetails; $Import_PlaceofOrgin=$Req->Import_PlaceofOrgin; @@ -1020,8 +1020,9 @@ if($PONOStatus == PO_RELEASED) - + +
- +
@@ -1384,7 +1385,7 @@ if($PONOStatus == PO_RELEASED)
- +
@@ -1654,8 +1655,8 @@ echo form_textarea($data);
- - + +
- +
- +
@@ -2162,7 +2163,7 @@ echo form_textarea($data);
- +
'ViewAvlBudAmt','value' => set_value('ViewAvlBudAmt'),'id'=>'ViewAvlBudAmt', 'class' => 'form-control num' ,'readonly' => 'true'); @@ -2282,9 +2283,9 @@ echo form_textarea($data);
- Exchange Rate : - + +
'ViewExchangeRt','value' => set_value('ViewExchangeRt',$ExchangeRate),'id'=>'ViewExchangeRt', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','readonly'=>'true'); @@ -2298,7 +2299,7 @@ echo form_textarea($data); -

+

- Basic Price: + Basic Price:()
@@ -2646,7 +2647,7 @@ echo form_textarea($data);
- purchase rate [Basic]/UOM + purchase rate () [Basic]/UOM
@@ -3238,6 +3239,7 @@ var NilType = ''; + $('#Insurance').change(function() { var insuree=$('#Insurance').val(); @@ -3343,6 +3345,7 @@ $('#currencytype').change(function() document.getElementById("label2").innerHTML ='Basic Value in '+code+'('+sign+')'; document.getElementById("label3").innerHTML ='Basic Value in '+code+'('+sign+')'; document.getElementById("labelRate").innerHTML ='Rate in '+code+'('+sign+')'; + document.getElementById("labelBasicpriceus").innerHTML ='Basic Value In '+code+'('+sign+')'+' per UOM'; document.getElementById("labelBasicINR").innerHTML ='Basic Price in INR:'+code+'('+sign+')'; document.getElementById("labelEditRate").innerHTML ='Rate in '+sign; diff --git a/application/views/importpo.php b/application/views/importpo.php index 829d40dc..b1c47179 100755 --- a/application/views/importpo.php +++ b/application/views/importpo.php @@ -7,7 +7,18 @@ $Value="៛"; $UOM=''; $Terms=''; -date_default_timezone_set('Australia/Melbourne'); + + + +$t=''; +if(!empty($staticspecialinstruction)) +{ + foreach($staticspecialinstruction as $text) + $t=$text->ConfigValue; +} + + +date_default_timezone_set('Asia/Kolkata'); $date = date('d/m/Y h:i:s a', time()); @@ -85,9 +96,17 @@ $("#PaymentTerms").select2(); tinymce.init({ selector: "textarea#txtSpcialInstruction", - menubar: false, + menubar: false, statusbar: false, - toolbar: false + toolbar: false, + + setup : function(ed) + { + ed.on('init', function(evt) + { + ed.setContent(''); + }); + } }); @@ -212,48 +231,7 @@ function vaildateBeforeOpenModal() } - else if($('#addmodeofshipment').val()=='') - { - alert('Please Enter Mode of Shipment'); - $('#addmodeofshipment').focus(); - return false; - - } - - -else if($('#addsupplierreference').val()=='') - { - alert('Please Enter Supplier Reference'); - $('#addsupplierreference').focus(); - return false; - - } - - else if($('#addsupplierofferno').val()=='') - { - alert('Please Enter Supplier Offer No'); - $('#addsupplierofferno').focus(); - return false; - - } - - - else if($('#addotherreference').val()=='') - { - alert('Please Enter Other Reference'); - $('#addotherreference').focus(); - return false; - - } - - - else if($('#addfincap').val()=='') - { - alert('Please Enter Value In Fincap Field'); - $('#addfincap').focus(); - return false; - - } + else if($('#Importoption').val()== "0") @@ -870,7 +848,7 @@ else if($('#addsupplierreference').val()=='')
- +
@@ -887,7 +865,7 @@ else if($('#addsupplierreference').val()=='') - +
- +
@@ -1502,7 +1480,7 @@ echo form_textarea($data);
- +
@@ -1515,7 +1493,7 @@ echo form_textarea($data);
- + @@ -1865,7 +1843,7 @@ echo form_textarea($data);
- +
@@ -2114,7 +2092,7 @@ echo form_textarea($data);
- Total Order Value 'txtToatlOrder','value' => set_value('txtToatlOrder'),'id'=>'txtToatlOrder', 'class' => 'form-control' ,'required' => 'true','readonly' => 'true','style'=>'text-align:right;'); echo form_input($data); ?> @@ -2483,9 +2461,17 @@ $.each(symbol,function(idx,obj) var sign=obj.FontCode2000; var code=obj.Currency_Code; //console.log(code); - // alert(code); + // alert(code);labeladdexc //alert(sign); document.getElementById("label1").innerHTML ='Exchange Rate in '+code+'('+sign+')'; + document.getElementById("labeltotal").innerHTML ='Total Order Value '+code+'('+sign+')'; + + document.getElementById("labeladdexc").innerHTML ='Exchange Rate '+code+'('+sign+')'; + + document.getElementById("labeleditexc").innerHTML ='Exchange Rate '+code+'('+sign+')'; + + + document.getElementById("label2").innerHTML ='Basic Value in '+code+'('+sign+')'; document.getElementById("label3").innerHTML ='Basic Value in '+code+'('+sign+')'; document.getElementById("labelRate").innerHTML ='Rate in '+code+'('+sign+')'; @@ -2493,7 +2479,7 @@ $.each(symbol,function(idx,obj) //document.getElementById("labelBasicINR").innerHTML ='Basic Price INR'; document.getElementById("labelEditRate").innerHTML ='Rate in '+sign; document.getElementById("labelEditBasicPriceUs").innerHTML ='Basic Value In '+code+'('+sign+')'; - document.getElementById("labelEditBasicINR").innerHTML ='Basic Price in INR'; + //document.getElementById("labelEditBasicINR").innerHTML ='Basic Price in INR'; document.getElementById("labelTotalAmount").innerHTML ='Total Amount '+code+'('+sign+')'; document.getElementById("labelEditTotalAmount").innerHTML ='Total Amount '+code+'('+sign+')';