- "DateRange", "id"=>"Date", "value"=>"0", 'checked'=>set_radio('DateRange', '0', TRUE))); ?>
+ "DateRange", "id"=>"Date", "value"=>"0", 'checked'=>'checked')); ?>
"DateRange", "id"=>"Schedule", "value"=>"1", 'checked'=>set_radio('DateRange', '1', FALSE))); ?>
@@ -326,12 +327,11 @@ $paymentCheckDays1='After';
Payment Date
+
+
+ "Payment", "id"=>"Before", "value"=>"Before", 'checked'=>set_radio('Payment', 'Before', TRUE))); ?>
-
- 'Payment', 'value' => 'Before', 'checked' => ('Before'==$paymentCheckDays) ? TRUE : FALSE, 'id' => 'Before')); ?>
-
-
- 'Payment', 'value' => 'After', 'checked' => ('After'==$paymentCheckDays1) ? TRUE : FALSE, 'id' => 'After')); ?>
+ "Payment", "id"=>"After", "value"=>"After", 'checked'=>set_radio('Payment', 'After', FALSE))); ?>
@@ -491,7 +491,7 @@ $paymentCheckDays1='After';
-
Rate(In INR /Ton)
+
Rate(In INR /UOM)
'CPRate','value' => set_value('CPRate'),'id'=>'CPRate', 'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Ratechange();' );
@@ -563,7 +563,7 @@ $paymentCheckDays1='After';
-
+
@@ -1032,7 +1032,7 @@ $paymentCheckDays1='After';
-
Rate(in INR /Ton)
+
Rate(in INR/UOM)
'EditCPRate','value' => set_value('EditCPRate'),'id'=>'EditCPRate', 'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange();' );
@@ -1104,7 +1104,7 @@ $paymentCheckDays1='After';
-
+
@@ -1523,7 +1523,7 @@ $paymentCheckDays1='After';
-
+
Total Landing Charge :
@@ -1786,6 +1786,17 @@ $paymentCheckDays1='After';
supPaymentTerms=obj.PaymentTerms;
supPaymentAT=obj.PayableAT;
subPaymentDate=obj.PaymentDays;
+
+ if (subPaymentDate=="After")
+ {
+ //alert();
+ document.getElementById("After").checked = true;
+
+ }
+ else{
+ document.getElementById("Before").checked = true;
+
+ }
}
@@ -1799,9 +1810,9 @@ $paymentCheckDays1='After';
$.each(paymentList, function(idx1, obj1) {
- if(obj1.PaymentTerms == supPaymentTerms )
+ if(obj1.ConfigValue == supPaymentTerms )
{
- $("#PaymentMethod").append( $('
-
+
@@ -1395,7 +1413,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
-
+
@@ -1804,7 +1822,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
-
+
@@ -2885,7 +2906,7 @@ var myArray = ;
var exchangeRate = $("#ExchangeRtModal").val();
var quantity = $("#CPQuantity").val();
var convertRate = $("#CPRate").val();
- var itemRate = parseFloat(convertRate * exchangeRate).toFixed(2);
+ var itemRate = parseFloat(convertRate).toFixed(2);
var basicval = parseFloat($("#CPTotalAmount").val()).toFixed(2);
var AfterServiceTax = $("#AfterServiceTax").val();
var AfterEduCess = $("#AfterEduCess").val();
@@ -4057,7 +4078,7 @@ function clearAfterAddLineItemAdd(){
var exchangeRate = $("#EditExchangeRtModal").val();
var quantity = $("#EditCPQuantity").val();
var convertRate = $("#EditCPRate").val();
- var itemRate = convertRate * exchangeRate;
+ var itemRate = convertRate;
var basicval = $("#EditCPTotalAmount").val();
var AfterServiceTax = $("#EditAfterServiceTax").val();
var AfterEduCess = $("#EditAfterEduCess").val();
diff --git a/application/views/editCapitalPo.php~ b/application/views/editCapitalPo.php~
index 7e8a06ef..d91007ff 100755
--- a/application/views/editCapitalPo.php~
+++ b/application/views/editCapitalPo.php~
@@ -150,11 +150,16 @@ window.onload = function()
document.getElementById('ExchangeRateOnDiv').style.display = 'none';
document.getElementById('ExchangeRateOnDiv').style.display = 'none';
- document.getElementById('ExchangeRateDiv').style.display = 'none';
-document.getElementById('currencyTypeDiv').style.display = 'none';
-document.getElementById('ExchangeRateModalDiv').style.display = 'none';
-document.getElementById('ExchangeRateModalEditDiv').style.display = 'none';
-
+ document.getElementById('ExchangeRateDiv').style.display = 'none';
+ document.getElementById('currencyTypeDiv').style.display = 'none';
+ document.getElementById('ExchangeRateModalDiv').style.display = 'none';
+ document.getElementById('ExchangeRateModalEditDiv').style.display = 'none';
+ document.getElementById('HideImportTaxTotal').style.display = 'none';
+ document.getElementById('ModalImportTaxHide').style.display = 'none';
+ document.getElementById('EditModalImportTaxHide').style.display = 'none';
+
+
+
capitalType='Domestic';
@@ -429,8 +434,8 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
foreach ($Payment as $rl):
- if($PaymentTerms==$rl->PaymentTerms){
- $options6[$rl->PaymentTerms] = $rl->PaymentTerms;
+ if($PaymentTerms==$rl->ConfigValue){
+ $options6[$rl->ConfigValue] = $rl->ConfigValue;
}
@@ -443,8 +448,8 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
foreach ($Payment as $rl2):
- if($PaymentTerms!=$rl2->PaymentTerms){
- $options6[$rl2->PaymentTerms] = $rl2->PaymentTerms;
+ if($PaymentTerms!=$rl2->ConfigValue){
+ $options6[$rl2->ConfigValue] = $rl2->ConfigValue;
}
endforeach;
@@ -548,23 +553,15 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
@@ -605,6 +602,23 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -629,7 +643,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
$TotalSummary = $TotalSummary+$record->ServiceTaxamount;
$TotalBasicAmount = $TotalBasicAmount+$record->BasicValue;
$ServiceDescription = $ServiceDescription;
-
+ if($CapitalRange=='0'){
$TotalLanding = $TotalLanding + $record->AfterLandingCharge;
$tothighseas = $tothighseas + $record->AfterHighSeasSalesCharge;
$totcustom = $totcustom + $record->AfterCustomDuty;
@@ -646,6 +660,10 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
$totgrossexpense=$totgrossexpense+$record->Grossexpensesduetocustomduty;
$ExchangeRate=$record->ExchangeRate;
+
+ }
+
+
// $totorder=$totorder+$record->TotalOrderValue;
$totalCapitalOrder = $totalCapitalOrder+$record->BasicValue;
@@ -857,7 +875,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
-
+
@@ -1395,7 +1413,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
-
+
@@ -1804,7 +1822,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
-
+
@@ -2081,9 +2102,9 @@ var myArray = ;
$.each(paymentList, function(idx1, obj1) {
- if(obj1.PaymentTerms == supPaymentTerms )
+ if(obj1.ConfigValue == supPaymentTerms )
{
- $("#PaymentMethod").append( $('
').val(obj1.PaymentTerms).html(obj1.PaymentTerms));
+ $("#PaymentMethod").append( $('
').val(obj1.ConfigValue).html(obj1.ConfigValue));
$("#PayableAT").val(supPaymentAT);
@@ -2885,7 +2906,7 @@ var myArray = ;
var exchangeRate = $("#ExchangeRtModal").val();
var quantity = $("#CPQuantity").val();
var convertRate = $("#CPRate").val();
- var itemRate = parseFloat(convertRate * exchangeRate).toFixed(2);
+ var itemRate = parseFloat(convertRate).toFixed(2);
var basicval = parseFloat($("#CPTotalAmount").val()).toFixed(2);
var AfterServiceTax = $("#AfterServiceTax").val();
var AfterEduCess = $("#AfterEduCess").val();
@@ -4057,7 +4078,7 @@ function clearAfterAddLineItemAdd(){
var exchangeRate = $("#EditExchangeRtModal").val();
var quantity = $("#EditCPQuantity").val();
var convertRate = $("#EditCPRate").val();
- var itemRate = convertRate * exchangeRate;
+ var itemRate = convertRate;
var basicval = $("#EditCPTotalAmount").val();
var AfterServiceTax = $("#EditAfterServiceTax").val();
var AfterEduCess = $("#EditAfterEduCess").val();
@@ -4454,4 +4475,4 @@ PaymentDate=$('#After').val();
});
-
\ No newline at end of file
+
diff --git a/application/views/issueStoreRequistion.php b/application/views/issueStoreRequistion.php
old mode 100644
new mode 100755
diff --git a/application/views/revenuepopdf.php b/application/views/revenuepopdf.php
index c6dfc273..f3920316 100755
--- a/application/views/revenuepopdf.php
+++ b/application/views/revenuepopdf.php
@@ -8,9 +8,11 @@
$DeliveryAddress = '';
$Podt = '';
$DeliveryDate ='';
- $PaymentTerms='';
-
+ $postatus='';
$ServiceDescription = '';
+ $PaymentTerms = '';
+ $PaymentDays='';
+ $PayableAT='';
if(!empty($CompanyDetails))
{
foreach ($CompanyDetails as $CO)
@@ -19,7 +21,7 @@
$CompanyAddress = $CO->Address;
}
-}
+ }
if(!empty($POItem))
{
foreach ($POItem as $PO)
@@ -28,91 +30,85 @@
$SuplierName = $PO->SupplierName;
$SuplierAddress = $PO->Address;
$DeliveryAddress = $PO->DeliveryAddress;
-
+ $postatus= $PO->Status;
$dt = new DateTime($PO->PODate, new DateTimeZone('Asia/Kolkata'));
$Podt = $dt->format('d-m-Y');
$dtDe = new DateTime($PO->DeliveryDate, new DateTimeZone('Asia/Kolkata'));
$DeliveryDate = $dtDe->format('d-m-Y');
$ServiceDescription =$PO->ServiceDescription;
- $PaymentTerms=$PO->PaymentTerms;
+ $PaymentTerms = $PO->PaymentTerms;
+ $PaymentDays=$PO->PaymentDays;
+ $PayableAT=$PO->PayableAT;
}
}
+ $currencyName='INR';
+ $currencyCode ='';
+ if(!empty($CurrencySymbol))
+ {
+ foreach ($CurrencySymbol as $Curr)
+ {
+
+ $currencyCode = $Curr->FontCode2000;
+ //$currencyName = $currencyName;
+
+ }
+ }
- if(!empty($Requestername))
-
- {
- foreach ($Requestername as $Reqname)
- {
- $ReqBy=$Reqname->FirstName;
- //$ReqDep=$Reqname->
-
- }
- }
-
- $CurrencyCode='';
- $CurrencyName='';
-
- if(!empty($Currencytype))
- {
- foreach ($Currencytype as $CURRE)
- {
- //$CurrencyCode=$CURRE->Currency_Code;
- $CurrencyName=$CURRE->FontCode2000;
- }
-
- }
- $DEPNAME='';
-
- if(!empty($DEPCODE))
- {
- foreach ($DEPCODE as $DEP)
- {
- $DEPNAME=$DEP->DepartmentName;
- }
- }
-
+
?>
-
-PURCHASE ORDER
-
-
-
PO NO:
-
-
-
-
+
+
+
+
+ This is Draft Version For Internal Purpose
';
+ }
+
+ ?>
+
+
+
+
+Payment Terms :
+
-
Delivery Date :
-
-
+
#
Item Description
Qty
-Rate
-Amount in
-Discount in
-Excise Duty in
-Vat in
-CST in
-GST in
-Other Taxes in
-Insurance in
-Freight in
-Total Amount in
+Rate
+Amount
+Discount
+Excise Duty
+Vat
+CST
+Packaging
+GST
+Other Taxes
+Insurance
+Freight
+Total Amount
AfterExciseDuty ; ?>
AfterVAT ; ?>
AfterCST ; ?>
+AfterPackagingValue ; ?>
AfterGST ; ?>
AfterOtherTaxes ; ?>
Insurance ; ?>
AfterFreightValue ; ?>
BasicValue+$record->AfterExciseDuty
- + $record->AfterVAT+$record->AfterCST+$record->AfterGST + $record->AfterOtherTaxes + $record->Insurance+ $record->AfterFreightValue)- $record->AfterDiscount);
+ + $record->AfterVAT+$record->AfterCST+$record->AfterGST + $record->AfterOtherTaxes + $record->Insurance+ $record->AfterFreightValue+$record->AfterPackagingValue)- $record->AfterDiscount);
echo number_format($TotalAmount,2) ; ?>
@@ -159,8 +158,9 @@ echo number_format($TotalAmount,2) ; ?>
$Insurance =$Insurance + $record->Insurance;
$AfterFreightValue =$AfterFreightValue + $record->AfterFreightValue;
$AfterDiscount = $AfterDiscount + $record->AfterDiscount ;
+ $AfterPackaging=$AfterPackaging+$record->AfterPackagingValue;
}
- $OrderValue = (( $SubTotalAmount + $AfterVAT + $AfterCST+$AfterGST+$AfterOtherTaxes +$Insurance +$AfterFreightValue+$AfterExciseDuty) - $AfterDiscount ) ;
+ $OrderValue = (( $SubTotalAmount + $AfterVAT + $AfterCST+$AfterGST+$AfterOtherTaxes +$Insurance +$AfterFreightValue+$AfterExciseDuty+$AfterPackaging) - $AfterDiscount ) ;
}
?>
@@ -168,59 +168,102 @@ echo number_format($TotalAmount,2) ; ?>
-
-Sub Total Amount :
+
-Total Order Amount :
Total Order Amount :
+
+
+ Total Amount In Words:
+
+
+
+
+ Requistion Number
+ Requested by
+ Requested Department
+ Cost center
+
+
+
+
+
+
+
+
+
+
+
+
Service Description:
-
-
- Requition Number :
- Requested by :
- Requisted Department :
- Cost center :
-
-
+
+ }
+ }
+ else {
+
+ ?>
+
+
+
+
+ Till Release State:
+
+
+
\ No newline at end of file
diff --git a/application/views/revenuepopdf.php~ b/application/views/revenuepopdf.php~
new file mode 100755
index 00000000..f3920316
--- /dev/null
+++ b/application/views/revenuepopdf.php~
@@ -0,0 +1,300 @@
+ CompanyName;
+ $CompanyAddress = $CO->Address;
+
+ }
+ }
+ if(!empty($POItem))
+ {
+ foreach ($POItem as $PO)
+ {
+ $PONO = $PO->PONO;
+ $SuplierName = $PO->SupplierName;
+ $SuplierAddress = $PO->Address;
+ $DeliveryAddress = $PO->DeliveryAddress;
+ $postatus= $PO->Status;
+ $dt = new DateTime($PO->PODate, new DateTimeZone('Asia/Kolkata'));
+ $Podt = $dt->format('d-m-Y');
+ $dtDe = new DateTime($PO->DeliveryDate, new DateTimeZone('Asia/Kolkata'));
+ $DeliveryDate = $dtDe->format('d-m-Y');
+ $ServiceDescription =$PO->ServiceDescription;
+ $PaymentTerms = $PO->PaymentTerms;
+ $PaymentDays=$PO->PaymentDays;
+ $PayableAT=$PO->PayableAT;
+
+ }
+}
+ $currencyName='INR';
+ $currencyCode ='';
+ if(!empty($CurrencySymbol))
+ {
+ foreach ($CurrencySymbol as $Curr)
+ {
+
+ $currencyCode = $Curr->FontCode2000;
+ //$currencyName = $currencyName;
+
+
+ }
+
+ }
+
+
+ ?>
+
+
+
+
+ This is Draft Version For Internal Purpose
';
+ }
+
+ ?>
+
+
+
+
+Payment Terms :
+
+
+#
+Item Description
+Qty
+Rate
+Amount
+Discount
+Excise Duty
+Vat
+CST
+Packaging
+GST
+Other Taxes
+Insurance
+Freight
+Total Amount
+
+
+
+
+MaterialName ; ?>
+Quantity ; ?>
+Rate ; ?>
+BasicValue ; ?>
+AfterDiscount; ?>
+AfterExciseDuty ; ?>
+AfterVAT ; ?>
+AfterCST ; ?>
+AfterPackagingValue ; ?>
+AfterGST ; ?>
+AfterOtherTaxes ; ?>
+Insurance ; ?>
+AfterFreightValue ; ?>
+BasicValue+$record->AfterExciseDuty
+ + $record->AfterVAT+$record->AfterCST+$record->AfterGST + $record->AfterOtherTaxes + $record->Insurance+ $record->AfterFreightValue+$record->AfterPackagingValue)- $record->AfterDiscount);
+echo number_format($TotalAmount,2) ; ?>
+
+
+BasicValue;
+ $AfterExciseDuty =$AfterExciseDuty + $record->AfterExciseDuty;
+ $AfterVAT =$AfterVAT + $record->AfterVAT;
+ $AfterCST = $AfterCST + $record->AfterCST;
+ $AfterGST =$AfterGST + $record->AfterGST;
+ $AfterOtherTaxes =$AfterOtherTaxes + $record->AfterOtherTaxes;
+ $Insurance =$Insurance + $record->Insurance;
+ $AfterFreightValue =$AfterFreightValue + $record->AfterFreightValue;
+ $AfterDiscount = $AfterDiscount + $record->AfterDiscount ;
+ $AfterPackaging=$AfterPackaging+$record->AfterPackagingValue;
+ }
+ $OrderValue = (( $SubTotalAmount + $AfterVAT + $AfterCST+$AfterGST+$AfterOtherTaxes +$Insurance +$AfterFreightValue+$AfterExciseDuty+$AfterPackaging) - $AfterDiscount ) ;
+ }
+
+ ?>
+
+
+
+
+
+
+Total Order Amount :
+
+
+
+ Total Amount In Words:
+
+
+
+
+
+
+ Requistion Number
+ Requested by
+ Requested Department
+ Cost center
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Service Description:
+
+
+
+ReleasedBy: ReleasedOn:
+
+FirstName;?>
+ReleasedOn;?>
+
+
+
+
+
+
+
+ Till Release State:
+
+
+
+
+ Payment Terms :
+
+
+
+
+
+ #
+ Item Description
+ Qty
+ Rate in
+ Amount
+ Service Tax
+ Educess Tax
+ Sec Higher Educess Tax
+ Krishi Kalyan tax
+ Swachh Bharat tax
+ Total Amount
+
+
+ BasicValue + $record->Taxamount
+ ?>
+
+ MaterialName ; ?>
+ Quantity ; ?>
+ Rate ; ?>
+ BasicValue ; ?>
+ ServiceTax ; ?>
+ EducessTax ; ?>
+ SecHigherEducessTax ; ?>
+ KrishiKalyantax ; ?>
+ SwachhBharattax ; ?>
+
+
+ BasicValue;
+ $ServiceTax =$ServiceTax + $record->ServiceTax;
+ $EducessTax =$EducessTax + $record->EducessTax;
+ $SecHigherEducessTax = $SecHigherEducessTax + $record->SecHigherEducessTax;
+ $KrishiKalyantax =$KrishiKalyantax + $record->KrishiKalyantax;
+ $SwachhBharattax =$SwachhBharattax + $record->SwachhBharattax;
+
+ }
+ $OrderValue = $SubTotalAmount + $ServiceTax + $EducessTax+$SecHigherEducessTax+$KrishiKalyantax +$SwachhBharattax;
+ }
+
+ ?>
+
+
+
+
+
+
+
+
+ Total Order Amount :
+
+
+
+
+ Total Amount In Words:
+
+
+
+
+
+
+
+
+
+ Requistion Number
+ Requested by
+ Requested Department
+ Cost center
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Service Description:
+
+
+
+ ReleasedBy: ReleasedOn:
+
+ FirstName;?>
+ ReleasedOn;?>
+
+
+
+
+
+
+
+ Till Release State:
+
+
+
+
+
+