SIA/siddharth_application
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revenue po changes

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2017-06-29 16:41:49 +05:30
parent 3974533a8d
commit 71ca4fd272
6 changed files with 7851 additions and 7599 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
application/controllers/purchaseorder.php
View File

@ -300,7 +300,7 @@ class purchaseorder extends BaseController
{
$PAYTERM=$TER->PaymentTerms;
}
//print_r($PAYTERM);
//print_r($exRate);
//$data['MaxPODate'] = $this->purchaseorder_model->getLastCreatedPODate();
$data['MaxPODate'] = $this->purchaseorder_model->getLastReleasedPODate();
@ -317,6 +317,7 @@ class purchaseorder extends BaseController
{
$data['POItem'] = $this->purchaseorder_model->GetRevenuePurchaseOrderDetails($PONO);
$data['PaymentTerms']=$this->purchaseorder_model->GetPaymentTerms($PONO);
$this->global['pageTitle'] = 'Siddharth : Edit Revenue Purchase order form';
$this->loadViews("editRevenuepurchaseorder", $this->global, $data, NULL);
}
@ -575,6 +576,19 @@ $DeliveryOption = $this->input->post('DateRange');
$Deliverydt = $this->getDateformat($dt);
$DeliverySchedule = '';
}
$PaymentDate=$this->input->post('Payment');
if($PaymentDate==1)
{
$PaymentDays='After';
}
else
{
$PaymentDays='Before';
}
$POType = $this->input->post('POType');
$PoRange = $this->input->post('txtPoRange');
@ -590,8 +604,11 @@ $DeliveryOption = $this->input->post('DateRange');
$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
$createddt = $dt->format('Y-m-d H:i:s');
$PaymentTerms=$this->input->post('PaymentTerms');
$Payableat=$this->input->post('PayableAT');
// PO Master
$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'Status'=>$POStatus,'PORange'=>$PoRange,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$createddt );
$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'Status'=>$POStatus,'PORange'=>$PoRange,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$createddt,'PaymentTerms'=>$PaymentTerms,'PayableAT'=>$Payableat,'PaymentDays'=>$PaymentDays);
$POMaster = $this->purchaseorder_model->addPOMaster($POList);
@ -701,6 +718,20 @@ $DeliveryOption = $this->input->post('DateRange');
$Deliverydt = $this->getDateformat($dt);
$DeliverySchedule = '';
}
$PaymentDate=$this->input->post('Payment');
if($PaymentDate==1)
{
$PaymentDays='After';
}
else
{
$PaymentDays='Before';
}
$POType = $this->input->post('POType');
$PoRange = $this->input->post('txtPoRange');
@ -715,9 +746,12 @@ $DeliveryOption = $this->input->post('DateRange');
$comma_separated = explode(':', $DeletedRow);
$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
$updateddt = $dt->format('Y-m-d H:i:s');
$PaymentTerms=$this->input->post('PaymentTerms');
$Payableat=$this->input->post('PayableAT');
// PO Master
// PO Master
$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>$POStatus,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ServiceDescription'=>$SpcialInstruction,'UpdateBY'=>$updatedBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'UpdatedOn'=>$updateddt );
$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>$POStatus,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ServiceDescription'=>$SpcialInstruction,'UpdateBY'=>$updatedBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'UpdatedOn'=>$updateddt,'PaymentTerms'=>$PaymentTerms,'PayableAT'=>$Payableat,'PaymentDays'=>$PaymentDays);
$POMaster = $this->purchaseorder_model->updatePOMaster($PONO,$POList);

7901
application/views/editRevenuepurchaseorder.php
View File

File diff suppressed because it is too large Load Diff

2
application/views/editimportpo.php
View File

@ -441,7 +441,7 @@ foreach ($POSTATUS as $PST )
<span for="payablefrom">Payable Terms</span>
<select class="form-control required" id="PaymentTerms" name="PaymentTerms">
<option value="Date of invoice" ><?php echo $Terms;?></option>
<option value="" ><?php echo $Terms;?></option>
<!-- <option value=<?php echo $Deatail?> > Payment method</option> -->
<?php

2
application/views/importpo.php
View File

@ -345,7 +345,7 @@ function vaildateBeforeOpenModal()
<span for="payablefrom">Payable Terms</span>
<select class="form-control required" id="PaymentTerms" name="PaymentTerms">
<option value="Date of invoice" > Payment method</option>
<option value="" > Payment method</option>
<!-- <option value=<?php echo $Deatail?> > Payment method</option> -->
<?php

1
application/views/importpopdf.php
View File

@ -12,7 +12,6 @@
$DeliveryDate ='';
$ServiceDescription = '';
$index=0;
if(!empty($CompanyDetails))
{
foreach ($CompanyDetails as $CO)

7504
application/views/purchaseorder.php
View File

File diff suppressed because it is too large Load Diff