From 695459c34126bdb9ee897986b692177d3bdf22f8 Mon Sep 17 00:00:00 2001 From: saravanakumar_kandasami Date: Fri, 11 Aug 2017 13:30:28 +0530 Subject: [PATCH] Po UI issues and Mrirrevenuepopdf --- application/logs/log-2017-08-11.php | Bin 0 -> 535368 bytes .../views/EditservicePurchaseorder.php | 38 +--- application/views/alterpurchaseorder.php | 45 +++-- application/views/editCapitalAmendPO.php | 57 ++---- application/views/editCapitalPo.php | 106 +++------- application/views/editImportAmendPO.php | 87 +++------ application/views/editRevenueAmendPO.php | 47 +---- .../views/editRevenuepurchaseorder.php | 37 +--- application/views/editServiceAmendPO.php | 41 +--- application/views/editimportpo.php | 94 ++++----- application/views/importpo.php | 12 +- application/views/mrirrevenuepopdf.php | 182 ++++++------------ application/views/servicePurchaseorder.php | 2 +- 13 files changed, 231 insertions(+), 517 deletions(-) create mode 100644 application/logs/log-2017-08-11.php diff --git a/application/logs/log-2017-08-11.php b/application/logs/log-2017-08-11.php new file mode 100644 index 0000000000000000000000000000000000000000..26b99d33591d9378c065d3d01ebb1e501070c69d GIT binary patch literal 535368 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 CW!b_2 literal 0 HcmV?d00001 diff --git a/application/views/EditservicePurchaseorder.php b/application/views/EditservicePurchaseorder.php index 68fbc346..3f146757 100755 --- a/application/views/EditservicePurchaseorder.php +++ b/application/views/EditservicePurchaseorder.php @@ -1944,40 +1944,10 @@ $(document).ready(function () { -
-
-
-
-
- - 'Requeston','value' => set_value('Requeston',$Reqon),'id'=>'Requeston', 'class' => 'form-control num' ,'required' => 'true','readonly' => 'true'); - echo form_input($data); - ?> -
-

-
-
-
- 'RequestBy','value' => set_value('RequestBy', $RequesterName),'id'=>'RequestBy', 'class' => 'form-control' ,'required' => 'true','readonly' => 'true'); - echo form_input($data); - ?> -
-

- -
-
- 'Status','value' => set_value('Status',$StatusName),'id'=>'Status', 'class' => 'form-control' ,'readonly' => 'true'); - echo form_input($data); - ?> -

-
-
-
- + +
+
+ diff --git a/application/views/alterpurchaseorder.php b/application/views/alterpurchaseorder.php index 15fcbe8d..47a88740 100755 --- a/application/views/alterpurchaseorder.php +++ b/application/views/alterpurchaseorder.php @@ -57,6 +57,9 @@ if(!empty($INRSYMBOL)) .nopad { padding:0px; } + .select2 { + width:100% ! important; + } @@ -1869,10 +1872,15 @@ function SetExciseCalculationCancel() $("#PaymentMethod").select2(); - //Initialize Select2 Elements + //Initialize Select2 Elements $("#purpose").select2(); $("#DepartmentName").select2(); $("#CostCenterName").select2(); + + $("#EditMaterialCode").select2(); + $("#EditRevenueMaterialCode").select2(); + $("#MaterialCode").select2(); + $("#ServiceMaterialCode").select2(); }); function DeleteRevenueRow(rowid) { @@ -2302,8 +2310,7 @@ function populateValueMainFormForDeleteItem(rowid) - -
+
Payment Details @@ -2334,7 +2341,7 @@ function populateValueMainFormForDeleteItem(rowid) ?>
- +
@@ -2638,7 +2645,7 @@ function populateValueMainFormForDeleteItem(rowid)
- +
'EditRate','value' => set_value('EditRate'),'id'=>'EditRate', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'EditRatechange()' ); @@ -2877,7 +2884,7 @@ function populateValueMainFormForDeleteItem(rowid)
- +
'EditRevenueRate','value' => set_value('EditRate'),'id'=>'EditRevenueRate', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Editchange()','style'=>'text-align:right;' ); @@ -2886,7 +2893,7 @@ function populateValueMainFormForDeleteItem(rowid)
- +
'txtEditRevenueBasicValue','value' => set_value('txtEditBasicValue'),'id'=>'txtEditRevenueBasicValue', 'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;'); @@ -3108,7 +3115,7 @@ function populateValueMainFormForDeleteItem(rowid)
- + 'txtEditRevenueTotalOrderValue','value' => set_value('txtEditTotalOrderValue'),'id'=>'txtEditRevenueTotalOrderValue', 'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;'); echo form_input($data); @@ -3116,7 +3123,7 @@ function populateValueMainFormForDeleteItem(rowid)

-   Edit Revenue +   Edit Revenue

Cancel @@ -3194,7 +3201,7 @@ function populateValueMainFormForDeleteItem(rowid)
- +
'Rate','value' => set_value('Rate'),'id'=>'Rate', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'change()' ); @@ -3203,7 +3210,7 @@ function populateValueMainFormForDeleteItem(rowid)
- +
'txtBasicValue','value' => set_value('txtBasicValue'),'id'=>'txtBasicValue', 'class' => 'form-control num' ,'readonly' => 'true'); @@ -3429,7 +3436,7 @@ function populateValueMainFormForDeleteItem(rowid)
- +
'txtTotalOrderValue','value' => set_value('txtTotalOrderValue'),'id'=>'txtTotalOrderValue', 'class' => 'form-control num' ,'readonly' => 'true'); @@ -3438,7 +3445,7 @@ function populateValueMainFormForDeleteItem(rowid)

-   Add Revenue +   Add Revenue

Cancel @@ -3594,7 +3601,7 @@ function populateValueMainFormForDeleteItem(rowid)
- +
'ServiceRate','value' => set_value('ServiceRate'),'id'=>'ServiceRate', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'Ratechange()'); @@ -3738,7 +3745,7 @@ function populateValueMainFormForDeleteItem(rowid)
-   Add Service +   Add Service Cancel
@@ -3855,7 +3862,7 @@ function populateValueMainFormForDeleteItem(rowid)
- +
'imRate','value' => set_value('imRate'),'id'=>'imRate', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ); @@ -4241,7 +4248,7 @@ function populateValueMainFormForDeleteItem(rowid)
-   Add Import +   Add Import Cancel
@@ -4314,7 +4321,7 @@ function populateValueMainFormForDeleteItem(rowid)
- +
'imRate','value' => set_value('imRate'),'id'=>'imRate', 'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);' ); @@ -4700,7 +4707,7 @@ function populateValueMainFormForDeleteItem(rowid)
-   Add Capital +   Add Capital Cancel
diff --git a/application/views/editCapitalAmendPO.php b/application/views/editCapitalAmendPO.php index ce176157..cfbbc8f7 100755 --- a/application/views/editCapitalAmendPO.php +++ b/application/views/editCapitalAmendPO.php @@ -145,7 +145,7 @@ if(!empty($AvlBudAmt)) } ?>