diff --git a/application/config/constants.php b/application/config/constants.php index a8047847..ea0074f4 100755 --- a/application/config/constants.php +++ b/application/config/constants.php @@ -204,8 +204,8 @@ define('ADDTNL_EXCISEDUTY', '(totaddtnlexcise*add define('GROSS_EXP', '(txtgrossdutypayable-txtmodvat)'); define('AVL_MODVAT', 'txtexciseduty1+txtexciseedcess+txtexciseshcess+txtaddtnlexcise'); define('GROSS_DUTY', 'landingcha+highsesssalless+customcha+excisecha+exciseedcha+exciseshcha+customed+customsh+txtaddtnexciseduty'); -define('PURCHASE_RATE', 'txtbasicinrprice/txtCtablequantity'); -define('CUSTOMDUTY_EXP', 'txtgrossexp/txtCtablequantity'); +define('PURCHASE_RATE', 'txtbasicinrprice/quantity'); +define('CUSTOMDUTY_EXP', 'txtgrossexp/quantity'); define('RMC_CAL', 'txtpurchaserate+txtcustomdutyexp'); define('CALCULATE_TOTAL', '(txtrmc*quantity)+basicprice'); /* Capital Po Calculations */ diff --git a/application/views/editimportpo.php b/application/views/editimportpo.php index 705b1c83..ac7c32bd 100644 --- a/application/views/editimportpo.php +++ b/application/views/editimportpo.php @@ -3693,11 +3693,12 @@ function CalculateCtable() var total=0; var basicamt=0; basicprice=parseFloat($('#txtBasicValue').val()); - + console.log(basicprice); quantity=parseFloat($('#PurQuantity').val()); txtbasicinrprice=parseFloat($('#AfterBasicPriceTax').val()); //txtpurchaserate=txtbasicinrprice/txtCtablequantity; txtpurchaserate=; + console.log(txtpurchaserate); if(isNaN(txtpurchaserate)) { $('#purchaserate').val(''); @@ -3731,7 +3732,8 @@ function CalculateCtable() } //total=; - $('#TotalExp').val(Math.round(basicprice)); + $('#TotalExp').val(Math.round(basicprice)); + // $('#TotalExp').val(Math.round(basicprice)); }