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

import issues fix

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2017-07-22 15:57:21 +05:30
parent f8362b8f8b
commit c71b486e2a
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
application/controllers/purchaseorder.php
View File

@ -1458,7 +1458,8 @@ $createddt='';
// } // }
$SpcialInstruction = $this->input->post('txtSpcialInstruction'); $SpcialInstruction = $this->input->post('txtSpcialInstruction');
$TotalOrder = $this->input->post('txtToatlOrder'); //$TotalOrder = $this->input->post('txtToatlOrder');
$TotalOrder = $this->input->post('txttot');
//echo $TotalOrder; //echo $TotalOrder;
//die(); //die();
$POStatus = $this->input->post('txtStatus'); $POStatus = $this->input->post('txtStatus');
@ -1953,8 +1954,7 @@ $createddt='';
function EditCapitalPurchaseOrder() function EditCapitalPurchaseOrder()
{ {
echo "scsdc";
die();
$PONO =$this->input->post('txtPONO'); $PONO =$this->input->post('txtPONO');
$POdt =$this->input->post('PODate'); $POdt =$this->input->post('PODate');
$PODate = $this->getDateformat($POdt); $PODate = $this->getDateformat($POdt);
@ -2032,14 +2032,10 @@ $createddt='';
$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata')); $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
$createddt = $dt->format('Y-m-d H:i:s'); $createddt = $dt->format('Y-m-d H:i:s');
$updateddt = $dt->format('Y-m-d H:i:s'); $updateddt = $dt->format('Y-m-d H:i:s');
$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrder,'PODate'=>$PODate,'Status'=>$POStatus,'PORange'=>$PoRange,'ExchangeRate'=>$ExchangeRate,'ExchangeRateCalculatedon'=>$ExchangeRateOn,'PaymentTerms'=>$PaymentMethod,'PaymentDays'=>$PaymentDate,'PayableAt'=>$PayableAT,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$createddt,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'CurrencyType'=>$currencytypeID,'DeliverySchedule'=>$DeliverySchedule,'Import_PlaceofOrgin'=>$Palaceoforigin,'Import_DispatchDetails'=>$Dispatch); $POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrder,'PODate'=>$PODate,'Status'=>$POStatus,'PORange'=>$PoRange,'ExchangeRate'=>$ExchangeRate,'ExchangeRateCalculatedon'=>$ExchangeRateOn,'PaymentTerms'=>$PaymentMethod,'PaymentDays'=>$PaymentDate,'PayableAt'=>$PayableAT,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$createddt,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'CurrencyType'=>$currencytypeID,'DeliverySchedule'=>$DeliverySchedule,'Import_PlaceofOrgin'=>$Palaceoforigin,'Import_DispatchDetails'=>$Dispatch);
// $POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrder,'PODate'=>$PODate,'Status'=>$POStatus,'PORange'=>$PoRange,'ExchangeRateCalculatedon'=>$ExchangeRateOn,'ExchangeRate'=>$ExchangeRate,'PaymentTerms'=>$PaymentMethod,'PaymentDays'=>$PaymentDate,'PayableAt'=>$PayableAT,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'CreatedDate'=>$createddt,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'CapitalRange'=>$CapitalRange,'POType'=>$POType,'CurrencyType'=>$currencytypeID,'DeliverySchedule'=>$DeliverySchedule,'Import_PlaceofOrgin'=>$Palaceoforigin,'Import_DispatchDetails'=>$Dispatch);
print_r($POList);
die();
$POMaster = $this->purchaseorder_model->updatePOMaster($PONO,$POList); $POMaster = $this->purchaseorder_model->updatePOMaster($PONO,$POList);

2
application/models/purchaseorder_model.php
View File

@ -251,7 +251,7 @@ function purchaseorderListing($forwhat='')
function GetAvailableImportBudgetAmount($CostCode,$Year,$BudgetType) function GetAvailableImportBudgetAmount($CostCode,$Year,$BudgetType)
{ {
$subQuery='select BudgetAmount,(select ifnull(sum((Quantity*Rate*ExchangeRate)),0)as TValue from T_PurchaseOrder_LineItem LineItem $subQuery='select BudgetAmount,(select ifnull(sum((Quantity*Rate)),0)as TValue from T_PurchaseOrder_LineItem LineItem
join T_PurchaseOrder_Master Mast on Mast.PONO=LineItem.PONO where POType=? join T_PurchaseOrder_Master Mast on Mast.PONO=LineItem.PONO where POType=?
and CostCenterCode=?)as TotalValue from T_CostCenter_Budget Bud where Bud.CostCenterCode=? and BudgetYear=? and BudgetType=?'; and CostCenterCode=?)as TotalValue from T_CostCenter_Budget Bud where Bud.CostCenterCode=? and BudgetYear=? and BudgetType=?';
$query = $this->db->query($subQuery,array($BudgetType,$CostCode,$CostCode,$Year,$BudgetType)); $query = $this->db->query($subQuery,array($BudgetType,$CostCode,$CostCode,$Year,$BudgetType));

4
application/views/editCapitalPo.php
View File

@ -4660,7 +4660,7 @@ $('#txtStatus').val(stat);
$('#txtDeliveryAddress').val(''); $('#txtDeliveryAddress').val('');
clearAfterAddLineItemAdd(); clearAfterAddLineItemAdd();
//window.location ="purchaseorderListing"; window.location ="purchaseorderListing";
} }
else else
@ -5009,7 +5009,7 @@ function clearAfterAddLineItemAdd(){
$('#CustomDutyExpenses'+userid).val(CustomDutyExpenses); $('#CustomDutyExpenses'+userid).val(CustomDutyExpenses);
$('#RMCIncludingCustomers'+userid).val(RMCIncludingCustomers); $('#RMCIncludingCustomers'+userid).val(RMCIncludingCustomers);
$('#basicvalInINR'+userid).val(basicvalInINR); $('#basicvalInINR'+userid).val(basicvalInINR);
$('#itemRate'+userid).val(itemRate);
/* get % value */ /* get % value */

2
application/views/editimportpo.php
View File

@ -2635,6 +2635,8 @@ if($PONOStatus == PO_RELEASED)
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
<input type="hidden" name="txttot" id="txtPONO" value=<?php echo "$totalhidden";?>>
</div> </div>
<input type="hidden" name="txttot" id="txttot" value=<?php echo $totalhidden;?> <input type="hidden" name="txttot" id="txttot" value=<?php echo $totalhidden;?>