SIA/CI3_siddharth_application
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

git merge conflict changes:

Browse Source
This commit is contained in:
venbatechnologies 2018-06-05 16:21:48 +05:30
parent 09564d725d
commit 8a861dbc88
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/controllers/purchaseorder.php
View File

@ -4277,13 +4277,9 @@ function addloadfile()
{ {
$pono= $this->input->post('PONO'); $pono= $this->input->post('PONO');
<<<<<<< HEAD
$igr= $this->input->post('igr'); $igr= $this->input->post('igr');
=======
>>>>>>> 2f9b1f114929c7e837953faff4845edd95f3f8b8
$new_file_name =$_FILES['file']['name']; $new_file_name =$_FILES['file']['name'];
//echo $new_file_name;die; //echo $new_file_name;die;
if(!empty($new_file_name)) if(!empty($new_file_name))

9
application/views/editRevenuepurchaseorder.php
View File

@ -6032,21 +6032,14 @@ function fileupload(counter)
var igr =$('#hiddenigrno').val(); var igr =$('#hiddenigrno').val();
//alert(igr); //alert(igr);
<<<<<<< HEAD
formData.append('file',file); formData.append('file',file);
formData.append('PONO',PONO); formData.append('PONO',PONO);
formData.append('count',counter); formData.append('count',counter);
formData.append('igr',igr); formData.append('igr',igr);
=======
formData.append('file',file); formData.append('file',file);
formData.append('PONO',PONO); formData.append('PONO',PONO);
formData.append('count',counter); formData.append('count',counter);
>>>>>>> 2f9b1f114929c7e837953faff4845edd95f3f8b8 $('.content').loader('show');
$('.content').loader('show');
$.ajax({ $.ajax({
data:formData, data:formData,
type:"POST", type:"POST",