diff --git a/app/Models/Inwardgateregister_model.php b/app/Models/Inwardgateregister_model.php index ee8cc2cc..74ab8b73 100755 --- a/app/Models/Inwardgateregister_model.php +++ b/app/Models/Inwardgateregister_model.php @@ -408,7 +408,7 @@ class Inwardgateregister_model extends Model FROM t_igr_details IGRD LEFT JOIN t_purchaseorder_lineitem POL ON PONO = POL.PONO AND IGRD.MaterialCode = POL.MaterialCode LEFT JOIN t_revenue_tax tax ON tax.LineItemNo = POL.LineItemNo - WHERE IGRD.IGRNO = igr.IGRNO AND IGRD.QuantityAsPerInvoice != 0 + WHERE IGRD.IGRNO = igr.IGRNO AND IGRD.QuantityAsPerInvoice != 0 and igr.PONO = POL.PONO GROUP BY POL.PONO LIMIT 1 ) @@ -420,7 +420,7 @@ class Inwardgateregister_model extends Model FROM t_igr_details IGRD LEFT JOIN t_purchaseorder_lineitem POL ON PONO = POL.PONO AND IGRD.MaterialCode = POL.MaterialCode LEFT JOIN t_service_tax tax ON tax.LineItemNo = POL.LineItemNo - WHERE IGRD.IGRNO = igr.IGRNO AND IGRD.QuantityAsPerInvoice != 0 + WHERE IGRD.IGRNO = igr.IGRNO AND IGRD.QuantityAsPerInvoice != 0 and igr.PONO = POL.PONO GROUP BY POL.PONO LIMIT 1 ) diff --git a/app/Views/viewinwardgateregister.php b/app/Views/viewinwardgateregister.php index 5e08615a..adebd413 100755 --- a/app/Views/viewinwardgateregister.php +++ b/app/Views/viewinwardgateregister.php @@ -226,9 +226,9 @@ Invoice Qty Net weight - + Total Amt Vechicle No Driver Transporter @@ -281,9 +281,9 @@ ReceivedQuantity ?> NetWeight ?> - + taxable_value + (int)$record->gst_amount) ?> VehicleNo ?> DriverName ?>