diff --git a/application/views/editImportAmendPO.php b/application/views/editImportAmendPO.php index 98c3d634..db0190bd 100755 --- a/application/views/editImportAmendPO.php +++ b/application/views/editImportAmendPO.php @@ -2865,9 +2865,14 @@ function EditCalculateCtable() $('#EditCustomDutyExpenses').val(0); } + else if (isFinite(txtcustomdutyexp)) + { + $('#EditCustomDutyExpenses').val(txtpurchaserate.toFixed(2)); + } + else { - $('#EditCustomDutyExpenses').val(txtcustomdutyexp.toFixed(2)); + $('#EditCustomDutyExpenses').val(0); } //$('#EditCustomDutyExpenses').val(txtcustomdutyexp); @@ -2878,9 +2883,15 @@ function EditCalculateCtable() { $('#EditRMCIncludingCustomers').val(0); } + + else if (isFinite(txtrmc)) + { + $('#EditRMCIncludingCustomers').val(txtrmc.toFixed(2)); + } + else{ - $('#EditRMCIncludingCustomers').val(txtrmc.toFixed(2)); + $('#EditRMCIncludingCustomers').val(0); } diff --git a/application/views/editimportpo.php b/application/views/editimportpo.php index 8279ccf9..6057dbec 100755 --- a/application/views/editimportpo.php +++ b/application/views/editimportpo.php @@ -3955,9 +3955,14 @@ function EditCalculateCtable() $('#EditCustomDutyExpenses').val(0); } + else if (isFinite(txtcustomdutyexp)) + { + $('#EditCustomDutyExpenses').val(txtpurchaserate.toFixed(2)); + } + else { - $('#EditCustomDutyExpenses').val(txtcustomdutyexp.toFixed(2)); + $('#EditCustomDutyExpenses').val(0); } //txtrmc=txtpurchaserate+txtcustomdutyexp; txtrmc=; @@ -3966,9 +3971,14 @@ function EditCalculateCtable() { $('#EditRMCIncludingCustomers').val(0); } + + else if (isFinite(txtrmc)) + { + $('#EditRMCIncludingCustomers').val(txtrmc.toFixed(2)); + } else{ - $('#EditRMCIncludingCustomers').val(txtrmc.toFixed(2)); + $('#EditRMCIncludingCustomers').val(0); } total=; $('#EditTotalExp').val(basicprice); diff --git a/application/views/importpopdf.php b/application/views/importpopdf.php index c2b8a00d..64d1427e 100755 --- a/application/views/importpopdf.php +++ b/application/views/importpopdf.php @@ -13,9 +13,9 @@ $DeliverySchedule=''; $ServiceDescription = ''; $ReqBy=''; - $PaymentTerms=''; - $advance=0; - + $PaymentTerms=''; + $advance=0; + $ReqDate=''; $index=0; if(!empty($CompanyDetails)) @@ -35,6 +35,8 @@ foreach ($POItem as $PO) { $ReqNo=$PO->ReqNo; + $Rdt=new DateTime($PO->ReqDate,new DateTimeZone('Asia/Kolkata')); + $ReqDate=$Rdt->format('d-m-Y'); $PONO = $PO->PONO; $postatus= $PO->Status; $SuplierName = $PO->SupplierName; @@ -178,7 +180,7 @@