From a7fc1e73a21c3c8e6c26e81b2142198acc66b982 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Thu, 10 Aug 2017 18:31:32 +0530 Subject: [PATCH] UI issues in PO , store req , Po release --- application/controllers/supplier.php | 23 +- application/logs/log-2017-08-10.php | 10 + application/models/assetdetails_model.php | 32 +- application/views/addstorerequisitionslip.php | 18 +- application/views/addsupplier.php | 2 +- application/views/capitalpurchaseorder.php | 194 +- application/views/editCapitalAmendPO.php | 66 +- application/views/editCapitalPo.php | 172 +- application/views/editImportAmendPO.php | 11 +- application/views/editRevenueAmendPO.php | 4643 +++++---- .../views/editRevenuepurchaseorder.php | 9140 ++++++++--------- application/views/editimportpo.php | 91 +- application/views/importpo.php | 28 +- application/views/inwardgateregister.php | 16 +- application/views/porelease_view.php | 51 +- application/views/purchaseorder.php | 7998 +++++++-------- application/views/requisitionlistapproval.php | 2 +- .../datatables/jquery.dataTables.min.js | 320 +- 18 files changed, 11412 insertions(+), 11405 deletions(-) mode change 100755 => 100644 application/controllers/supplier.php create mode 100644 application/logs/log-2017-08-10.php mode change 100755 => 100644 application/models/assetdetails_model.php mode change 100755 => 100644 application/views/capitalpurchaseorder.php mode change 100755 => 100644 application/views/editCapitalPo.php mode change 100755 => 100644 application/views/editRevenueAmendPO.php mode change 100755 => 100644 application/views/editRevenuepurchaseorder.php mode change 100755 => 100644 application/views/purchaseorder.php mode change 100755 => 100644 assets/plugins/datatables/jquery.dataTables.min.js diff --git a/application/controllers/supplier.php b/application/controllers/supplier.php old mode 100755 new mode 100644 index 56422769..da6dd788 --- a/application/controllers/supplier.php +++ b/application/controllers/supplier.php @@ -172,14 +172,21 @@ class supplier extends BaseController function addNewsupplier() { - + $pan = $this->input->post('panno'); $this->form_validation->set_rules('SupplierName','Supplier Name','trim|required'); $this->form_validation->set_rules('Address','Address','trim|required|'); $this->form_validation->set_rules('ContactNumber','Contact Number','trim|required|max_length[13]'); $this->form_validation->set_rules('AlternateContactNumber','Alternate Contact Number','trim|max_length[13]'); $this->form_validation->set_rules('emailid','emailid', 'valid_email|max_length[128]|required'); $this->form_validation->set_rules('TIN','TIN','trim|required|max_length[11]'); - $this->form_validation->set_rules('panno', 'panno', 'trim|required|max_length[10]');//|callback_checkPanValidate'); + if($pan=='') + { + $this->form_validation->set_rules('panno', 'panno', 'trim|max_length[10]'); + } + else + { + $this->form_validation->set_rules('panno', 'panno', 'trim|max_length[10]|callback_checkPanValidate'); + } $this->form_validation->set_rules('GSTNo','GSTNo','trim|requried|max_length[15]|callback_checkGstValidate'); if($this->form_validation->run() == FALSE) @@ -264,7 +271,7 @@ class supplier extends BaseController * This function is used to edit the Supplier information */ function editsupplier() - { + { $pan = $this->input->post('panno'); $this->form_validation->set_rules('SupplierName','Supplier Name','trim|required'); $this->form_validation->set_rules('Address','Address','trim|required|'); $supplierID = $this->input->post('SupplierID'); @@ -273,7 +280,15 @@ class supplier extends BaseController $this->form_validation->set_rules('AlternateContactNumber','Alternate Contact Number','trim|max_length[13]'); $this->form_validation->set_rules('emailid','emailid','valid_email|max_length[128]|required'); $this->form_validation->set_rules('TIN','TIN','trim|required|max_length[11]'); - $this->form_validation->set_rules('panno', 'panno', 'trim|required|max_length[10]|callback_checkPanValidateSupplier'); + if($pan=='') + { + $this->form_validation->set_rules('panno', 'panno', 'trim|max_length[10]'); + } + else + { + $this->form_validation->set_rules('panno', 'panno', 'trim|max_length[10]|callback_checkPanValidateSupplier'); + } + $this->form_validation->set_rules('GSTNo','GSTNo','trim|requried|max_length[15]|callback_checkGstValidateSupplier'); diff --git a/application/logs/log-2017-08-10.php b/application/logs/log-2017-08-10.php new file mode 100644 index 00000000..f4ae9d26 --- /dev/null +++ b/application/logs/log-2017-08-10.php @@ -0,0 +1,10 @@ + + +ERROR - 2017-08-10 14:43:29 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/10done/siddharth_application/application/views/requisitionlistapproval.php 34 +ERROR - 2017-08-10 14:43:29 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/10done/siddharth_application/application/views/requisitionlistapproval.php 34 +ERROR - 2017-08-10 14:43:29 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/10done/siddharth_application/application/views/requisitionlistapproval.php 34 +ERROR - 2017-08-10 14:43:29 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/10done/siddharth_application/application/views/requisitionlistapproval.php 34 +ERROR - 2017-08-10 14:43:29 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/10done/siddharth_application/application/views/requisitionlistapproval.php 34 +ERROR - 2017-08-10 14:43:29 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/10done/siddharth_application/application/views/requisitionlistapproval.php 34 +ERROR - 2017-08-10 14:43:29 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/10done/siddharth_application/application/views/requisitionlistapproval.php 34 +ERROR - 2017-08-10 14:43:29 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/10done/siddharth_application/application/views/requisitionlistapproval.php 34 diff --git a/application/models/assetdetails_model.php b/application/models/assetdetails_model.php old mode 100755 new mode 100644 index 8e225683..99e88001 --- a/application/models/assetdetails_model.php +++ b/application/models/assetdetails_model.php @@ -60,10 +60,11 @@ class assetdetails_model extends CI_Model $this->db->from('T_PurchaseOrder_Master POM'); $this->db->join('T_PurchaseOrder_LineItem POL', 'POL.PONO = POM.PONO'); $this->db->join('T_SupplierDetailsN sup', 'sup.SupplierID = POM.SupplierID'); - $this->db->where('POM.status',PO_RELEASED); - if(!empty($PO)){ - $this->db->where('POM.PONO', $PO); - } + $this->db->where('POM.status','ST026'); + if(!empty($PO)){ + $this->db->where('POM.PONO',$PO); + + } $query = $this->db->get(); //print_r($this->db->last_query()); return $query->result(); @@ -72,19 +73,18 @@ class assetdetails_model extends CI_Model function getPO($PO='') { $this->db->distinct(); - $this->db->select(' POM.PONO,DeliveryDate,PODate,sup.SupplierName,POM.SupplierID'); - $this->db->from('T_PurchaseOrder_Master POM'); - $this->db->join ('T_PurchaseOrder_LineItem POL ',' POL.PONO = POM.PONO'); - $this->db->join ('T_SupplierDetailsN sup ',' sup.SupplierID = POM.SupplierID'); - - if(!empty($PO)){ - $this->db->where('POM.PONO', $PO); - } - $query = $this->db->get(); - //print_r($this->db->last_query()); - return $query->result(); + $this->db->select(' POM.PONO');//,DeliveryDate,PODate,sup.SupplierName,POM.SupplierID'); + $this->db->from('T_PurchaseOrder_Master POM'); + //$this->db->join ('T_PurchaseOrder_LineItem POL ',' POL.PONO = POM.PONO'); + //$this->db->join ('T_SupplierDetailsN sup ',' sup.SupplierID = POM.SupplierID'); + $this->db->where('POM.status','ST026'); + if(!empty($PO)){ + $this->db->where('POM.PONO',$PO); + } + $query = $this->db->get(); + //print_r($this->db->last_query()); + return $query->result(); } - function getlineitemre($line){ $this->db->select('POL.LineItemNo,POL.MaterialCode,MM.MaterialName,MM.UOM,POL.Quantity,POM.POType,re.TotalValue,req.ReqNo,emp.firstname,emp.Departmentcode,dep.DepartmentName,sup.SupplierName,date(POM.DeliveryDate) as DeliveryDate,POM.PODate,POM.SupplierID'); $this->db->from('T_PurchaseOrder_LineItem POL'); diff --git a/application/views/addstorerequisitionslip.php b/application/views/addstorerequisitionslip.php index 48092447..1248328e 100755 --- a/application/views/addstorerequisitionslip.php +++ b/application/views/addstorerequisitionslip.php @@ -127,9 +127,9 @@ $(function() {
-
+
-

Add Requistion

+

Add Line Item

@@ -199,8 +199,8 @@ $(function() {
-   Add - cancel +   Add + Cancel
@@ -214,7 +214,7 @@ $(function() {
-
+

Edit Line Item

@@ -274,8 +274,8 @@ $(function() {
-   Edit - cancel +   Edit + Cancel
@@ -290,7 +290,7 @@ $(function() {
- + @@ -321,7 +321,7 @@ $(function() { - + diff --git a/application/views/addsupplier.php b/application/views/addsupplier.php index 8222ea51..3c26a099 100755 --- a/application/views/addsupplier.php +++ b/application/views/addsupplier.php @@ -298,7 +298,7 @@ $(function() { //}); $(document).ready(function(){ - $("#PaymentTerms").select2(); + $("#Payment").select2(); }); diff --git a/application/views/capitalpurchaseorder.php b/application/views/capitalpurchaseorder.php old mode 100755 new mode 100644 index b38a7c92..c246336a --- a/application/views/capitalpurchaseorder.php +++ b/application/views/capitalpurchaseorder.php @@ -52,8 +52,12 @@ if(!empty($INRSYMBOL)) // echo $INR; ?> - - - - - - - - -
- 'form-label-left CreatePO ','name' => 'CreatePO','id' => 'CreatePO'); - - echo form_open($this->config->base_url().'/purchaseorder/addPO/',$attributes); ?> - -
-
-

Siddharth Industries - Amendment Revenue Purchase Order-

-
-
-
-
-
- - 'Selected Requisition Numbers'); - if(!empty($ReqList)) - { - foreach ($ReqList as $SID): - - $options[$SID->ReqNo] = $SID->ReqNo ; - //$ReqType = $SID->ReqType; - endforeach; - } - echo form_multiselect('RequistionNo', $options,set_value('RequistionNo'),'id="RequistionNo"' ,'required="true"' , 'height="400px"' ); - ?> -
-
- -
- 'PODate','value' => set_value('PODate',$PODate),'id'=>'PODate', 'class' => 'form-control num' ,'required' => 'true','onkeypress'=>'return false;'); - echo form_input($data); - ?> -
-
-
-
-
-
- - 'Select Supplier'); - //print_r( $options); - - if(!empty($Suplist)) - { - foreach ($Suplist as $SID): - - - $options[$SID->SupplierID] = $SID->SupplierID.' '.' - '.' '.$SID->SupplierName; - - endforeach; - } - - echo form_dropdown('drpSupplier', $options,set_value('drpSupplier',$SupId),'id="drpSupplier"' ,'required="true"' ,'class="form-control select2'); - - ?> -
-
- -
- - 'POType','value' => set_value('POType',REVENUE),'id'=>'POType', 'class' => 'form-control' ,'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
-
- Select Tax Range
-
- - - - - - - -
- - Select Delivery By
-
- - - - -
-
- -
- 'SupAddress','value' => set_value('SupAddress',$Address),'id'=>'SupAddress', 'class' => 'form-control' ,'readonly' => 'true' ,'rows' => '3', 'cols' => '40'); - echo Form_textarea($data); - ?> -
-
-
- -
- 'DeliveryAddr','value' => set_value('DeliveryAddr',$DeliveryAddress),'id'=>'DeliveryAddr', 'class' => 'form-control' ,'required' => 'true' ,'rows' => '3', 'cols' => '40'); - echo Form_textarea($data); - ?> -
-
-
- - - -
- - 'Deliverydt','value' => set_value('Deliverydt',$Deliverydt),'id'=>'Deliverydt', 'class' => 'form-control num' ,'required' => 'true','onkeypress'=>'return false;'); - echo form_input($data); - ?> - -
-
- -
- - -
- Payment Details - -
- - - - - PaymentID){ - //echo "$Terms"; - //echo "$pay2->PaymentTerms"; - - ?> - - PaymentID] = $pay2->PaymentTerms; - - } - - foreach ($Payment as $pay1): - - if($Terms!=$pay1->PaymentID){ - - $optionsPay[$pay1->PaymentID] = $pay1->PaymentTerms; - - } - endforeach; - } - - echo form_dropdown('PaymentTerms', $optionsPay,set_value('PaymentTerms'),'id="PaymentTerms"' ,'required="true"' ,'class="form-control select2'); - - ?> - -
- - -
- - - - - - - - - - - - - -
- - - - -
-
SNOS.No Item Code Description UOM
- "Range","id"=>"Local","value"=>"0", 'checked'=>set_radio('Range', '0', TRUE),'onchange'=>'SetVatorCST();')); ?>  "Range","id"=>"Inter_state","value"=>"1", 'checked'=>set_radio('Range', '1', FALSE),'onchange'=>'SetVatorCST();')); ?> -
- 'DateRange', 'value' => '0', 'checked' => ('0' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Date')); ?> - - - 'DateRange', 'value' => '1', 'checked' => ('1' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Schedule')); ?> - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - BasicValue; - $totDiscountAmt = $totDiscountAmt + $record->AfterDiscount; - $totPackagingAmt = $totPackagingAmt + $record->AfterPackagingValue; - $totExciseAmt = $totExciseAmt + $record->AfterExciseDuty; - $totVATAmt = $totVATAmt + $record->AfterSGST; - //$totCSTAmt = $totCSTAmt + $record->AfterCST; - $totGSTAmt = $totGSTAmt +$record->AfterCGST; - - $totOtherTaxAmt = $totOtherTaxAmt + $record->AfterIGST; - $totFreightAmt = $totFreightAmt + $record->AfterFreightValue; - $totInsuranceAmt = $totInsuranceAmt + $record->Insurance; - $totOrderSummaryAmt = $totOrderSummaryAmt +$record->TotalValue; - - } - ?> - - -
SNoRequisition NoItem NameQuantityUOMRateBasic AmountTax AmountTotal Order AmountAction
ReqNo ?>MaterialName ?>Quantity ?>UOM ?>Rate ?>BasicValue,2,'.',''); ?>Taxamount ?>TotalValue ?> - - - -
-
- - -
- - -
-
-
- - - 'txtTotBasicAmount','value' => set_value('txtTotBasicAmount',$totBasicAmt),'id'=>'txtTotBasicAmount', 'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;'); - echo form_input($data); - ?> - - -
-
- - - 'txtTotalDiscount','value' => set_value('txtTotalDiscount',$totDiscountAmt),'id'=>'txtTotalDiscount', 'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;'); - echo form_input($data); - ?> - -
-
- - - 'txtTotalVat','value' => set_value('txtTotalVat',$totVATAmt),'id'=>'txtTotalVat', 'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;'); - echo form_input($data); - ?> - -
- -
- - - 'txtTotalGST','value' => set_value('txtTotalGST',$totGSTAmt),'id'=>'txtTotalGST','readonly' => 'true', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>' calculateGST(0);'); - echo form_input($data); - ?> - -
- -
-
- - -
- - - 'txtTotalPackaing','value' => set_value('txtTotalPackaing',$totPackagingAmt),'id'=>'txtTotalPackaing', 'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;'); - echo form_input($data); - ?> - -
-
- - - 'txtTotalInsurance','value' => set_value('txtTotalInsurance',$totInsuranceAmt),'id'=>'txtTotalInsurance', 'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;'); - echo form_input($data); - ?> - -
-
- - - 'txtTotalFreight','value' => set_value('txtTotalFreight',$totFreightAmt),'id'=>'txtTotalFreight', 'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;'); - echo form_input($data); - ?> - -
-
- - - 'txtTotalOrderValueSummary','value' => set_value('txtTotalOrderValueSummary',$totOrderSummaryAmt),'id'=>'txtTotalOrderValueSummary', 'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;'); - echo form_input($data); - ?> -
-
- -
-
- 'txtSpcialInstruction','id'=>'txtSpcialInstruction','value' => set_value('txtSpcialInstruction',$ServiceDescription), 'rows'=>'8','class' => 'form-control' ); - echo form_textarea($data); - ?> - -
-
-
-

- - - - - - - - -   Submit - - - - - - -
-
- - -
-
-
-
-
- - format('Y-m-d'); - $data = array('name' => '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', $Requestedby),'id'=>'RequestBy', 'class' => 'form-control' ,'required' => 'true','readonly' => 'true'); - echo form_input($data); - ?> -
-

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

-
-
-
- -
- - - - - - - + + + + + + + +
+ 'form-label-left CreatePO ','name' => 'CreatePO','id' => 'CreatePO'); + + echo form_open($this->config->base_url().'/purchaseorder/addPO/',$attributes); ?> + +
+
+

Siddharth Industries - Amendment Revenue Purchase Order-

+
+
+
+
+
+ + 'Selected Requisition Numbers'); + if(!empty($ReqList)) + { + foreach ($ReqList as $SID): + + $options[$SID->ReqNo] = $SID->ReqNo ; + //$ReqType = $SID->ReqType; + endforeach; + } + echo form_multiselect('RequistionNo', $options,set_value('RequistionNo'),'id="RequistionNo"' ,'required="true"' , 'height="400px"' ); + ?> +
+
+ +
+ 'PODate','value' => set_value('PODate',$PODate),'id'=>'PODate', 'class' => 'form-control num' ,'required' => 'true','onkeypress'=>'return false;'); + echo form_input($data); + ?> +
+
+
+
+
+
+ + 'Select Supplier'); + //print_r( $options); + + if(!empty($Suplist)) + { + foreach ($Suplist as $SID): + + + $options[$SID->SupplierID] = $SID->SupplierID.' '.' - '.' '.$SID->SupplierName; + + endforeach; + } + + echo form_dropdown('drpSupplier', $options,set_value('drpSupplier',$SupId),'id="drpSupplier"' ,'required="true"' ,'class="form-control select2'); + + ?> +
+
+ +
+ + 'POType','value' => set_value('POType',REVENUE),'id'=>'POType', 'class' => 'form-control' ,'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+
+ Select Tax Range
+ + + "Range","id"=>"Local","value"=>"0", 'checked'=>set_radio('Range', '0', TRUE),'onchange'=>'SetVatorCST();')); ?>   + "Range","id"=>"Inter_state","value"=>"1", 'checked'=>set_radio('Range', '1', FALSE),'onchange'=>'SetVatorCST();')); ?> + + +
+ + +
+
+ + Select Delivery By
+ + + 'DateRange', 'value' => '0', 'checked' => ('0' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Date')); ?> + + + 'DateRange', 'value' => '1', 'checked' => ('1' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Schedule')); ?> + + + + +
+
+
+
+ +
+ 'SupAddress','value' => set_value('SupAddress',$Address),'id'=>'SupAddress', 'class' => 'form-control' ,'readonly' => 'true' ,'rows' => '3', 'cols' => '40'); + echo Form_textarea($data); + ?> +
+
+
+ +
+ 'DeliveryAddr','value' => set_value('DeliveryAddr',$DeliveryAddress),'id'=>'DeliveryAddr', 'class' => 'form-control' ,'required' => 'true' ,'rows' => '3', 'cols' => '40'); + echo Form_textarea($data); + ?> +
+
+
+ + + +
+ + 'Deliverydt','value' => set_value('Deliverydt',$Deliverydt),'id'=>'Deliverydt', 'class' => 'form-control num' ,'required' => 'true','onkeypress'=>'return false;'); + echo form_input($data); + ?> + +
+
+ +
+
+ +
+ Payment Details + +
+ + + + + PaymentID){ + //echo "$Terms"; + //echo "$pay2->PaymentTerms"; + + ?> + + PaymentID] = $pay2->PaymentTerms; + + } + + foreach ($Payment as $pay1): + + if($Terms!=$pay1->PaymentID){ + + $optionsPay[$pay1->PaymentID] = $pay1->PaymentTerms; + + } + endforeach; + } + + echo form_dropdown('PaymentTerms', $optionsPay,set_value('PaymentTerms'),'id="PaymentTerms"' ,'required="true"' ,'class="form-control select2'); + + ?> + +
+ + +
+
+
+ + + + + + + + + + + +
+ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + BasicValue; + $totDiscountAmt = $totDiscountAmt + $record->AfterDiscount; + $totPackagingAmt = $totPackagingAmt + $record->AfterPackagingValue; + $totExciseAmt = $totExciseAmt + $record->AfterExciseDuty; + $totVATAmt = $totVATAmt + $record->AfterSGST; + //$totCSTAmt = $totCSTAmt + $record->AfterCST; + $totGSTAmt = $totGSTAmt +$record->AfterCGST; + + $totOtherTaxAmt = $totOtherTaxAmt + $record->AfterIGST; + $totFreightAmt = $totFreightAmt + $record->AfterFreightValue; + $totInsuranceAmt = $totInsuranceAmt + $record->Insurance; + $totOrderSummaryAmt = $totOrderSummaryAmt +$record->TotalValue; + + } + ?> + + +
SNoRequisition NoItem NameQuantityUOMRateBasic AmountTax AmountTotal Order AmountAction
ReqNo ?>MaterialName ?>Quantity ?>UOM ?>Rate ?>BasicValue ?>Taxamount ?>TotalValue ?> + + + +
+
+ + +
+ + +
+
+
+ + + 'txtTotBasicAmount','value' => set_value('txtTotBasicAmount',$totBasicAmt),'id'=>'txtTotBasicAmount', 'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;'); + echo form_input($data); + ?> + + +
+
+ + + 'txtTotalDiscount','value' => set_value('txtTotalDiscount',$totDiscountAmt),'id'=>'txtTotalDiscount', 'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;'); + echo form_input($data); + ?> + +
+
+ + + 'txtTotalVat','value' => set_value('txtTotalVat',$totVATAmt),'id'=>'txtTotalVat', 'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;'); + echo form_input($data); + ?> + +
+ +
+ + + 'txtTotalGST','value' => set_value('txtTotalGST',$totGSTAmt),'id'=>'txtTotalGST','readonly' => 'true', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>' calculateGST(0);'); + echo form_input($data); + ?> + +
+ +
+
+ + +
+ + + 'txtTotalPackaing','value' => set_value('txtTotalPackaing',$totPackagingAmt),'id'=>'txtTotalPackaing', 'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;'); + echo form_input($data); + ?> + +
+
+ + + 'txtTotalInsurance','value' => set_value('txtTotalInsurance',$totInsuranceAmt),'id'=>'txtTotalInsurance', 'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;'); + echo form_input($data); + ?> + +
+
+ + + 'txtTotalFreight','value' => set_value('txtTotalFreight',$totFreightAmt),'id'=>'txtTotalFreight', 'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;'); + echo form_input($data); + ?> + +
+
+ + + 'txtTotalOrderValueSummary','value' => set_value('txtTotalOrderValueSummary',$totOrderSummaryAmt),'id'=>'txtTotalOrderValueSummary', 'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;'); + echo form_input($data); + ?> +
+
+ +
+
+ 'txtSpcialInstruction','id'=>'txtSpcialInstruction','value' => set_value('txtSpcialInstruction',$ServiceDescription), 'rows'=>'8','class' => 'form-control' ); + echo form_textarea($data); + ?> + +
+
+
+

+ + + + + + + + +   Submit + + + + + + +
+
+ + +
+
+
+
+
+ + format('Y-m-d'); + $data = array('name' => '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', $Requestedby),'id'=>'RequestBy', 'class' => 'form-control' ,'required' => 'true','readonly' => 'true'); + echo form_input($data); + ?> +
+

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

+
+
+
+ +
+ +
+ +
+ + + \ No newline at end of file diff --git a/application/views/editRevenuepurchaseorder.php b/application/views/editRevenuepurchaseorder.php old mode 100755 new mode 100644 index 8a736913..1691e8e2 --- a/application/views/editRevenuepurchaseorder.php +++ b/application/views/editRevenuepurchaseorder.php @@ -1,4571 +1,4571 @@ -format('Y-m-d'); -$MaxPoDate = ''; -$AvlAmount = 0; -$DeliverSchedule=''; -$DeliverOption=''; -$StatusName=''; - -if(!empty($MaxPODate)) -{ - foreach ($MaxPODate as $date) - { - $MaxPoDate = $date->PODate; - } -} -if(!empty($CompanyDetails)) -{ - foreach ($CompanyDetails as $Req) - { - $CompanyAddress = $Req->Address; - } -} -if(!empty($AvlBudAmt)) -{ - - $AvlAmount = number_format($AvlBudAmt, 2, '.', ''); - -} - -if(!empty($INRSYMBOL)) -{ - - foreach($INRSYMBOL as $INRS) - { - $INRSYM=$INRS->FontCode2000; - - } -} - -foreach ($PaymentTerms as $TER) -{ - $Terms=$TER->PaymentTerms; -} - - $SupId = ''; - $SupName = ''; - $Address = ''; - $PODate = ''; - $Deliverydt =''; - $DeliveryAddress =''; - $PONOStatus = ''; - $PONO = ''; - $totBasicAmt = 0; - $totDiscountAmt = 0.0; - $totPackagingAmt = 0.0; - $totCgst = 0.0; - $totSgst = 0.0; - $totIgst = 0.0; - $totFreightAmt = 0.0; - $totInsuranceAmt = 0.0; - $totOrderSummaryAmt = 0.0; - - $ServiceDescription = ''; - $CapitalRange = ''; - $otherPayment=''; -if(!empty($POMaster)) -{ - foreach ($POMaster as $Req) - { - $SupId = $Req->SupplierID; - $SupName = $Req->SupplierName; - $Address = $Req->Address; - - $Pdt = new DateTime($Req->PODate); - $PODate = $Pdt->format('Y-m-d'); - $DeliverOption = $Req->DeliveryOption; - $DeliverSchedule = $Req->DeliverySchedule; - - $Ddt = new DateTime($Req->DeliveryDate); - $Deliverydt = $Ddt->format('Y-m-d'); - - $DeliveryAddress =$Req->DeliveryAddress; - $PONOStatus = $Req->StatusCode; - $PONO = $Req->PONO; - $ServiceDescription = $Req->ServiceDescription; - $CapitalRange = $Req->CapitalRange; - $StatusName=$Req->StatusName; - $otherPayment = $Req->PaymentOtherDescription; - } -} - - - - -if(!empty($RequistionDetails)) -{ - - foreach ($RequistionDetails as $ReqDet) - { - $Reqonn=new DateTime($ReqDet->ReqDate); - $Reqon=$Reqonn->format('Y-m-d'); - - // $Pdt = new DateTime($Req->PODate); - // $PODate = $Pdt->format('Y-m-d'); - $Requestedby=$ReqDet->Requestedby; - $RequesterName=$ReqDet->FirstName; - //$Status=$ReqDet->Status; - } -} - - -// foreach ($POSTATUS as $PST ) -// { -// $POStatus=$PST->StatusName; -// } - -?> - - - - - - - - -
- 'form-label-left CreatePO ','name' => 'CreatePO','id' => 'CreatePO'); - - echo form_open($this->config->base_url().'/purchaseorder/addPO/',$attributes); ?> - -
-
-
-
-

Siddharth Industries - Edit Revenue Purchase Order -

-
-
-
-
-
- - 'Selected Requisition Numbers'); - if(!empty($ReqList)) - { - foreach ($ReqList as $SID): - - $options[$SID->ReqNo] = $SID->ReqNo ; - //$ReqType = $SID->ReqType; - endforeach; - } - echo form_multiselect('RequistionNo', $options,set_value('RequistionNo'),'id="RequistionNo"' ,'required="true"' , 'height="400px"' ); - ?> -
-
- -
- 'PODate','value' => set_value('PODate',$PODate),'id'=>'PODate', 'class' => 'form-control num' ,'required' => 'true','onkeypress'=>'return false;'); - echo form_input($data); - ?> -
-
-
-
-
-
- - 'Select Supplier'); - //print_r( $options); - - if(!empty($Suplist)) - { - foreach ($Suplist as $SID): - - - $options[$SID->SupplierID] = $SID->SupplierID.' '.' - '.' '.$SID->SupplierName; - - endforeach; - } - - echo form_dropdown('drpSupplier', $options,set_value('drpSupplier',$SupId),'id="drpSupplier"' ,'required="true"' ,'class="form-control select2'); - - ?> -
-
- -
- - 'POType','value' => set_value('POType',REVENUE),'id'=>'POType', 'class' => 'form-control' ,'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
-
- Select Tax Range
- - - - 'Range', 'value' => '0', 'checked' => ('0' == $CapitalRange) ? TRUE : FALSE, 'id' => 'Local','onchange'=>'SetVatorCST();')); ?> - - - - 'Range', 'value' => '1', 'checked' => ('1' == $CapitalRange) ? TRUE : FALSE, 'id' => 'Inter_state','onchange'=>'SetVatorCST();')); ?> - - - -
- - -
-
- - Select Delivery By
- - - 'DateRange', 'value' => '0', 'checked' => ('0' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Date')); ?> - - - 'DateRange', 'value' => '1', 'checked' => ('1' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Schedule')); ?> - - - - -
-
-
-
- -
- 'SupAddress','value' => set_value('SupAddress',$Address),'id'=>'SupAddress', 'class' => 'form-control' ,'readonly' => 'true' ,'rows' => '3', 'cols' => '40'); - echo Form_textarea($data); - ?> -
-
-
- -
- 'DeliveryAddr','value' => set_value('DeliveryAddr',$DeliveryAddress),'id'=>'DeliveryAddr', 'class' => 'form-control' ,'required' => 'true' ,'rows' => '3', 'cols' => '40'); - echo Form_textarea($data); - ?> -
-
-
- -
- 'Deliverydt','value' => set_value('Deliverydt',$Deliverydt),'id'=>'Deliverydt', 'class' => 'form-control num' ,'required' => 'true','onkeypress'=>'return false;'); - echo form_input($data); - ?> - -
-
- -
-
-
- -
- Payment Details - - -
- - - PaymentID] = $pay->PaymentTerms; - - - endforeach; - } - - echo form_dropdown('PaymentTerms', $options6,set_value('PaymentTerms',$Terms),'id="PaymentTerms"' ,'required="true"' ,'class="form-control select2'); - - ?> - - - - -
- - -
-
-
- - - - - - - - - - - -
- -
- - - - - -
- -
-
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - BasicValue; - $totDiscountAmt = $totDiscountAmt + $record->AfterDiscount; - $totPackagingAmt = $totPackagingAmt + $record->AfterPackagingValue; - $totCgst = $totCgst + $record->AfterCGST; - $totSgst = $totSgst + $record->AfterSGST; - $totIgst = $totIgst + $record->AfterIGST; - - $totFreightAmt = $totFreightAmt + $record->AfterFreightValue; - $totInsuranceAmt = $totInsuranceAmt + $record->Insurance; - $totOrderSummaryAmt = $totOrderSummaryAmt +$record->TotalValue; - - } - ?> - - -
SNoRequisition NoItem CodeItem DescriptionQuantityUOMRateIn INRBasic Amount In INRTax Amount In INRTotal Order Amount In INRActual QuantityReceived QuantityPending QuantityAction
ReqNo ?>MaterialCode ?>MaterialName ?>Quantity ?>UOM ?>Rate ?>BasicValue, 2, '.', ''); ?>Taxamount ?>TotalValue ?>Quantity ?>ReceivedQuantity ?>Quantity - $record->ReceivedQuantity, 2, '.', ''); ?>     - -    
-
- - - - -
-
-
- - - 'txtTotBasicAmount','value' => set_value('txtTotBasicAmount',number_format($totBasicAmt, 2, '.', '')),'id'=>'txtTotBasicAmount', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;'); - echo form_input($data); - ?> - - -
-
- - - 'txtTotalDiscount','value' => set_value('txtTotalDiscount',number_format($totDiscountAmt, 2, '.', '')),'id'=>'txtTotalDiscount', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;'); - echo form_input($data); - ?> - -
-
- - - 'txtTotalSGST','value' => set_value('txtTotalSGST',number_format($totSgst, 2, '.', '')),'id'=>'txtTotalSGST', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;'); - echo form_input($data); - ?> - -
- -
- - - 'txtTotalCGST','value' => set_value('txtTotalCGST',number_format($totCgst, 2, '.', '')),'id'=>'txtTotalCGST', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;'); - echo form_input($data); - ?> - -
-
-
- - -
- - - 'txtTotalPackaing','value' => set_value('txtTotalPackaing',number_format($totPackagingAmt, 2, '.', '')),'id'=>'txtTotalPackaing', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;'); - echo form_input($data); - ?> - -
-
- - - 'txtTotalInsurance','value' => set_value('txtTotalInsurance',number_format($totInsuranceAmt, 2, '.', '')),'id'=>'txtTotalInsurance', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;'); - echo form_input($data); - ?> - - -
-
- - - 'txtTotalFreight','value' => set_value('txtTotalFreight',number_format($totFreightAmt, 2, '.', '')),'id'=>'txtTotalFreight', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;'); - echo form_input($data); - ?> - -
-
- - 'txtTotalOrderValueSummary','value' => set_value('txtTotalOrderValueSummary',number_format($totOrderSummaryAmt, 2, '.', '')),'id'=>'txtTotalOrderValueSummary', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;'); - echo form_input($data); - ?> -
-
- -
-
- 'txtSpcialInstruction','value' => set_value('txtSpcialInstruction',$ServiceDescription),'id'=>'txtSpcialInstruction', 'class' => 'form-control' ); - echo form_textarea($data); - ?> - -
-
-
-

- - - - - - - -   Save -   Submit - - -   OK - - - -

-
-
-
-
-
-
- - 'Requeston','value' => set_value('Requeston',$Reqon),'id'=>'Requeston', 'class' => 'form-control num' ,'required' => 'true', 'onkeypress'=>'return false;','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); - ?> -

-
-
-
-
-
- -
-
- - - + + + + + + +
+ 'form-label-left CreatePO ','name' => 'CreatePO','id' => 'CreatePO'); + + echo form_open($this->config->base_url().'/purchaseorder/addPO/',$attributes); ?> + +
+
+
+
+

Siddharth Industries - Edit Revenue Purchase Order -

+
+
+
+
+
+ + 'Selected Requisition Numbers'); + if(!empty($ReqList)) + { + foreach ($ReqList as $SID): + + $options[$SID->ReqNo] = $SID->ReqNo ; + //$ReqType = $SID->ReqType; + endforeach; + } + echo form_multiselect('RequistionNo', $options,set_value('RequistionNo'),'id="RequistionNo"' ,'required="true"' , 'height="400px"' ); + ?> +
+
+ +
+ 'PODate','value' => set_value('PODate',$PODate),'id'=>'PODate', 'class' => 'form-control num' ,'required' => 'true','onkeypress'=>'return false;'); + echo form_input($data); + ?> +
+
+
+
+
+
+ + 'Select Supplier'); + //print_r( $options); + + if(!empty($Suplist)) + { + foreach ($Suplist as $SID): + + + $options[$SID->SupplierID] = $SID->SupplierID.' '.' - '.' '.$SID->SupplierName; + + endforeach; + } + + echo form_dropdown('drpSupplier', $options,set_value('drpSupplier',$SupId),'id="drpSupplier"' ,'required="true"' ,'class="form-control select2'); + + ?> +
+
+ +
+ + 'POType','value' => set_value('POType',REVENUE),'id'=>'POType', 'class' => 'form-control' ,'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+
+ Select Tax Range
+ + + + 'Range', 'value' => '0', 'checked' => ('0' == $CapitalRange) ? TRUE : FALSE, 'id' => 'Local','onchange'=>'SetVatorCST();')); ?> + + + + 'Range', 'value' => '1', 'checked' => ('1' == $CapitalRange) ? TRUE : FALSE, 'id' => 'Inter_state','onchange'=>'SetVatorCST();')); ?> + + + +
+ + +
+
+ + Select Delivery By
+ + + 'DateRange', 'value' => '0', 'checked' => ('0' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Date')); ?> + + + 'DateRange', 'value' => '1', 'checked' => ('1' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Schedule')); ?> + + + + +
+
+
+
+ +
+ 'SupAddress','value' => set_value('SupAddress',$Address),'id'=>'SupAddress', 'class' => 'form-control' ,'readonly' => 'true' ,'rows' => '3', 'cols' => '40'); + echo Form_textarea($data); + ?> +
+
+
+ +
+ 'DeliveryAddr','value' => set_value('DeliveryAddr',$DeliveryAddress),'id'=>'DeliveryAddr', 'class' => 'form-control' ,'required' => 'true' ,'rows' => '3', 'cols' => '40'); + echo Form_textarea($data); + ?> +
+
+
+ +
+ 'Deliverydt','value' => set_value('Deliverydt',$Deliverydt),'id'=>'Deliverydt', 'class' => 'form-control num' ,'required' => 'true','onkeypress'=>'return false;'); + echo form_input($data); + ?> + +
+
+ +
+
+
+ +
+ Payment Details + + +
+ + + PaymentID] = $pay->PaymentTerms; + + + endforeach; + } + + echo form_dropdown('PaymentTerms', $options6,set_value('PaymentTerms',$Terms),'id="PaymentTerms"' ,'required="true"' ,'class="form-control select2'); + + ?> + + + + +
+ + +
+
+
+ + + + + + + + + + + +
+ +
+ + + + + +
+ +
+
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + BasicValue; + $totDiscountAmt = $totDiscountAmt + $record->AfterDiscount; + $totPackagingAmt = $totPackagingAmt + $record->AfterPackagingValue; + $totCgst = $totCgst + $record->AfterCGST; + $totSgst = $totSgst + $record->AfterSGST; + $totIgst = $totIgst + $record->AfterIGST; + + $totFreightAmt = $totFreightAmt + $record->AfterFreightValue; + $totInsuranceAmt = $totInsuranceAmt + $record->Insurance; + $totOrderSummaryAmt = $totOrderSummaryAmt +$record->TotalValue; + + } + ?> + + +
SNoRequisition NoItem CodeItem DescriptionQuantityUOMRateIn INRBasic Amount In INRTax Amount In INRTotal Order Amount In INRActual QuantityReceived QuantityPending QuantityAction
ReqNo ?>MaterialCode ?>MaterialName ?>Quantity ?>UOM ?>Rate ?>BasicValue, 2, '.', ''); ?>Taxamount ?>TotalValue ?>Quantity ?>ReceivedQuantity ?>Quantity - $record->ReceivedQuantity, 2, '.', ''); ?>     + +    
+
+ + + + +
+
+
+ + + 'txtTotBasicAmount','value' => set_value('txtTotBasicAmount',number_format($totBasicAmt, 2, '.', '')),'id'=>'txtTotBasicAmount', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;'); + echo form_input($data); + ?> + + +
+
+ + + 'txtTotalDiscount','value' => set_value('txtTotalDiscount',number_format($totDiscountAmt, 2, '.', '')),'id'=>'txtTotalDiscount', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;'); + echo form_input($data); + ?> + +
+
+ + + 'txtTotalSGST','value' => set_value('txtTotalSGST',number_format($totSgst, 2, '.', '')),'id'=>'txtTotalSGST', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;'); + echo form_input($data); + ?> + +
+ +
+ + + 'txtTotalCGST','value' => set_value('txtTotalCGST',number_format($totCgst, 2, '.', '')),'id'=>'txtTotalCGST', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;'); + echo form_input($data); + ?> + +
+
+
+ + +
+ + + 'txtTotalPackaing','value' => set_value('txtTotalPackaing',number_format($totPackagingAmt, 2, '.', '')),'id'=>'txtTotalPackaing', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;'); + echo form_input($data); + ?> + +
+
+ + + 'txtTotalInsurance','value' => set_value('txtTotalInsurance',number_format($totInsuranceAmt, 2, '.', '')),'id'=>'txtTotalInsurance', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;'); + echo form_input($data); + ?> + + +
+
+ + + 'txtTotalFreight','value' => set_value('txtTotalFreight',number_format($totFreightAmt, 2, '.', '')),'id'=>'txtTotalFreight', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;'); + echo form_input($data); + ?> + +
+
+ + 'txtTotalOrderValueSummary','value' => set_value('txtTotalOrderValueSummary',number_format($totOrderSummaryAmt, 2, '.', '')),'id'=>'txtTotalOrderValueSummary', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;'); + echo form_input($data); + ?> +
+
+ +
+
+ 'txtSpcialInstruction','value' => set_value('txtSpcialInstruction',$ServiceDescription),'id'=>'txtSpcialInstruction', 'class' => 'form-control' ); + echo form_textarea($data); + ?> + +
+
+
+

+ + + + + + + +   Save +   Submit + + +   OK + + + +

+
+
+
+
+
+
+ + 'Requeston','value' => set_value('Requeston',$Reqon),'id'=>'Requeston', 'class' => 'form-control num' ,'required' => 'true', 'onkeypress'=>'return false;','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); + ?> +

+
+
+
+
+
+ +
+
+ + + \ No newline at end of file diff --git a/application/views/editimportpo.php b/application/views/editimportpo.php index b5427689..05a8dac4 100755 --- a/application/views/editimportpo.php +++ b/application/views/editimportpo.php @@ -189,6 +189,9 @@ if(!empty($RequistionDetails)) .num { text-align:right; } +.select2{ + width:100% ! important; + } @@ -202,6 +205,9 @@ if(!empty($RequistionDetails)) $(document).ready(function(){ $("#PaymentTerms").select2(); + $("#ReqNo").select2(); + $("#MaterialCode").select2(); + $("#EditMaterialCode").select2(); tinymce.init({ selector: "textarea#txtSpcialInstruction", @@ -466,7 +472,7 @@ if(!empty($RequistionDetails)) -