From c1231a44dd3ed2dc0f9861ac651285be3d4bab04 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Mon, 4 Sep 2017 13:33:03 +0530 Subject: [PATCH] new field added in add and edit service PO --- application/logs/log-2017-08-31.php | 0 application/logs/log-2017-09-01.php | 0 application/logs/log-2017-09-04.php | 3 + .../views/EditservicePurchaseorder.php | 263 +++++++++++++----- application/views/servicePurchaseorder.php | 229 +++++++++++---- 5 files changed, 379 insertions(+), 116 deletions(-) mode change 100644 => 100755 application/logs/log-2017-08-31.php mode change 100644 => 100755 application/logs/log-2017-09-01.php create mode 100644 application/logs/log-2017-09-04.php diff --git a/application/logs/log-2017-08-31.php b/application/logs/log-2017-08-31.php old mode 100644 new mode 100755 diff --git a/application/logs/log-2017-09-01.php b/application/logs/log-2017-09-01.php old mode 100644 new mode 100755 diff --git a/application/logs/log-2017-09-04.php b/application/logs/log-2017-09-04.php new file mode 100644 index 00000000..33175e81 --- /dev/null +++ b/application/logs/log-2017-09-04.php @@ -0,0 +1,3 @@ + + +ERROR - 2017-09-04 09:18:14 --> Severity: Warning --> mysqli_num_rows() expects parameter 1 to be mysqli_result, boolean given /opt/lampp/htdocs/4sept222/siddharth_application/system/database/drivers/mysqli/mysqli_result.php 38 diff --git a/application/views/EditservicePurchaseorder.php b/application/views/EditservicePurchaseorder.php index 6ee032a6..6230f05d 100755 --- a/application/views/EditservicePurchaseorder.php +++ b/application/views/EditservicePurchaseorder.php @@ -116,13 +116,37 @@ foreach ($PaymentTerms as $TER) @@ -626,7 +650,7 @@ $(document).ready(function () {
-
+
@@ -644,7 +668,7 @@ $(document).ready(function () { ?>
-
+
-
+
-
+
@@ -753,7 +777,7 @@ $(document).ready(function () { ?>
-

+

- -
- Payment Details - -
+ + +
+
+
+
+ + + +
+ + 'editmodeofshipment','value' => set_value('editmodeofshipment'),'id'=>'editmodeofshipment', 'class' => 'form-control'); + echo form_input($data); + ?> +
+ + + +
+
+
+
+
+ +
+ + 'editsupplierreference','value' => set_value('editsupplierreference'),'id'=>'editsupplierreference', 'class' => 'form-control'); + echo form_input($data); + ?> +
+ + + + +
+
+
+
+ +
+ + 'editsupplierofferno','value' => set_value('editsupplierofferno'),'id'=>'editsupplierofferno', 'class' => 'form-control'); + echo form_input($data); + ?> +
+ +
+
+
+
+ + +
+ + 'editotherreference','value' => set_value('editotherreference'),'id'=>'editotherreference', 'class' => 'form-control'); + echo form_input($data); + ?> +
+
+
+ +
+ + 'editfincap','value' => set_value('editfincap'),'id'=>'editfincap', 'class' => 'form-control'); + echo form_input($data); + ?> +
+
+
+
+
+
+ + + +
+ +
- -
-
+
-
+
-
+ + +
+
+ +
-
+
-
+
+ 'AddPer','value' => set_value('AddPer'),'id'=>'AddPer', 'class' => 'form-control'); + echo form_input($data); ?> +
+
- +
+ 'txtSpcialInstruction','value' => set_value('txtSpcialInstruction'),'id'=>'txtSpcialInstruction', 'class' => 'form-control' ,'rows' => '3', 'cols' => '40'); + echo form_textarea($data); + ?> + +
+ + +
-   Add Service + Add Service Cancel
@@ -1174,16 +1286,7 @@ $(document).ready(function () { ?>
-
- 'EdittxtSpcialInstruction','value' => set_value('EdittxtSpcialInstruction',$ServiceDescription),'id'=>'EdittxtSpcialInstruction', 'class' => 'form-control'); - echo form_input($data); - ?> -
- -
-
-
+
-
+
-
+ + +
+
+ +
-
+
-
+
+ 'EditPer','value' => set_value('EditPer'),'id'=>'EditPer', 'class' => 'form-control'); + echo form_input($data); ?> +
+
+
+ 'EdittxtSpcialInstruction','value' => set_value('EdittxtSpcialInstruction',$ServiceDescription),'id'=>'EdittxtSpcialInstruction', 'class' => 'form-control' ,'rows' => '3', 'cols' => '40'); + echo form_textarea($data); + ?> +
+ @@ -1439,16 +1559,7 @@ $(document).ready(function () { ?>
-
- 'ViewtxtSpcialInstruction','value' => set_value('ViewtxtSpcialInstruction'),'id'=>'ViewtxtSpcialInstruction', 'class' => 'form-control','readonly' => 'true'); - echo form_input($data); - ?> -
- -
-
-
+
-
+
-
+ + +
+
+ +
-
+
-
+
+ 'ViewPer','value' => set_value('ViewPer'),'id'=>'ViewPer', 'class' => 'form-control'); + echo form_input($data); ?> +
+
+
+ 'ViewtxtSpcialInstruction','value' => set_value('ViewtxtSpcialInstruction'),'id'=>'ViewtxtSpcialInstruction', 'class' => 'form-control' ,'rows' => '3', 'cols' => '40' ,'readonly' => 'true'); + echo form_textarea($data); + ?> +
+ @@ -1748,7 +1876,7 @@ $(document).ready(function () {
-
+
@@ -1799,9 +1927,18 @@ $(document).ready(function () {
- + +
+ +
+ 'editdescofpo','value' => set_value('editdescofpo'),'id'=>'editdescofpo', 'class' => 'form-control' ,'rows' => '3', 'cols' => '40' ); + echo form_textarea($data); + ?> +
+
-
+
'ScopeofWork','value' => set_value('ScopeofWork',$ServiceDescription),'id'=>'ScopeofWork', 'class' => 'form-control', 'rows' => '10', 'cols' => '40' ); @@ -1880,7 +2017,7 @@ var userid = ''; $('.AddService').click(function(){ - + tinyMCE.triggerSave(); if(validateServiceTax()) { // alert('inside Addservice'); @@ -1967,7 +2104,7 @@ $('.AddService').click(function(){ }); $('.EditService').click(function(){ - + tinyMCE.triggerSave(); if( validateEditServiceTax()) { diff --git a/application/views/servicePurchaseorder.php b/application/views/servicePurchaseorder.php index bea50d5c..d93b063d 100755 --- a/application/views/servicePurchaseorder.php +++ b/application/views/servicePurchaseorder.php @@ -43,12 +43,29 @@ if(!empty($INRSYMBOL)) @@ -576,7 +593,7 @@ function clearEditTaxField()
-
+
@@ -597,7 +614,7 @@ function clearEditTaxField() ?>
-
+
-
+
@@ -642,7 +659,7 @@ function clearEditTaxField()
-
+
@@ -698,7 +715,7 @@ function clearEditTaxField() ?>
-

+

- + + +
+
+
+
+ + + +
+ + 'addmodeofshipment','value' => set_value('addmodeofshipment'),'id'=>'addmodeofshipment', 'class' => 'form-control'); + echo form_input($data); + ?> +
+ + + +
+
+
+
- Payment Details - -
+ +
+ + 'addsupplierreference','value' => set_value('addsupplierreference'),'id'=>'addsupplierreference', 'class' => 'form-control'); + echo form_input($data); + ?> +
+ + + + +
+
+
+
+ +
+ + 'addsupplierofferno','value' => set_value('addsupplierofferno'),'id'=>'addsupplierofferno', 'class' => 'form-control'); + echo form_input($data); + ?> +
+ +
+
+
+
+ + +
+ + 'addotherreference','value' => set_value('addotherreference'),'id'=>'addotherreference', 'class' => 'form-control'); + echo form_input($data); + ?> +
+
+
+ +
+ + 'addfincap','value' => set_value('addfincap'),'id'=>'addfincap', 'class' => 'form-control'); + echo form_input($data); + ?> +
+
+
+
+
+
+ +
+
- -
-
+
-
+
-
+ + +
+
+ +
-
+
-
+ +
+ 'AddPer','value' => set_value('AddPer'),'id'=>'AddPer', 'class' => 'form-control'); + echo form_input($data); ?> +
+
-
+
+ +
@@ -1021,11 +1119,19 @@ function clearEditTaxField()
+ + +
+ + + + 'txtSpcialInstruction','value' => set_value('txtSpcialInstruction'),'id'=>'txtSpcialInstruction', 'class' => 'form-control' ,'rows' => '3', 'cols' => '40' ); + echo form_textarea($data); ?> + +
- - -
-
+
  Add Service @@ -1115,15 +1221,7 @@ function clearEditTaxField() ?>
-
- 'EdittxtSpcialInstruction','value' => set_value('EdittxtSpcialInstruction'),'id'=>'EdittxtSpcialInstruction', 'class' => 'form-control'); - echo form_input($data); ?> -
- -
-
-
+
-
+
-
+ + +
+
+ +
-
+
-
+
+ + 'EditPer','value' => set_value('EditPer'),'id'=>'EditPer', 'class' => 'form-control'); + echo form_input($data); ?> +
+
- + +
+ + 'EdittxtSpcialInstruction','value' => set_value('EdittxtSpcialInstruction'),'id'=>'EdittxtSpcialInstruction', 'class' => 'form-control' ,'rows' => '3', 'cols' => '40' ); + echo form_textarea($data); ?> + +
+ @@ -1328,7 +1445,7 @@ function clearEditTaxField()
-
+
@@ -1378,17 +1495,23 @@ function clearEditTaxField()
-
+ +
+ +
+ 'descofpo','value' => set_value('descofpo'),'id'=>'descofpo', 'class' => 'form-control' ,'rows' => '3', 'cols' => '40' ); + echo form_textarea($data); + ?> +
+
+
'ScopeOfWork','value' => set_value('ScopeOfWork'),'id'=>'ScopeOfWork', 'class' => 'form-control' ,'rows' => '10', 'cols' => '40' ); echo form_textarea($data); ?>
- +
@@ -1524,7 +1647,7 @@ $("#EDITSERVICE").on("shown.bs.modal", function(e) { $('.AddService').click(function(){ - + tinyMCE.triggerSave(); if(validateServiceTax()) { // alert('inside Addservice'); @@ -1616,7 +1739,7 @@ $('.AddService').click(function(){ }); $('.EditService').click(function(){ - + tinyMCE.triggerSave(); if( validateEditServiceTax()) {