diff --git a/app/Controllers/Sales.php b/app/Controllers/Sales.php index 977b468f..e1233086 100755 --- a/app/Controllers/Sales.php +++ b/app/Controllers/Sales.php @@ -95,7 +95,6 @@ class Sales extends BaseController - // echo "
";
// print_r($data);
// die;
diff --git a/app/Models/Ipinvoice_model.php b/app/Models/Ipinvoice_model.php
index 149afec2..5780ed04 100755
--- a/app/Models/Ipinvoice_model.php
+++ b/app/Models/Ipinvoice_model.php
@@ -616,7 +616,7 @@ class Ipinvoice_model extends Model
$builder = $this->db->table('t_bagstockdetails tbd')
- ->select('tbd.balanceStock, tmm.MaterialName ,tmm.MaterialCode')
+ ->select('tbd.balanceStock, tmm.MaterialName ,tmm.MaterialCode ,tmm.UOM')
->join('t_materialmaster tmm', 'tmm.MaterialCode = tbd.materialCode')
->where('tbd.date', $lastDateOfCurrentMonth)
->get()
@@ -626,7 +626,9 @@ class Ipinvoice_model extends Model
$materialCode =array_column($builder,'MaterialCode');
- $body =array_column($builder,'balanceStock');
+ $body = array_column($builder,'balanceStock');
+
+ $uom = array_column($builder,'UOM');
$result [] = ['header' => $header];
@@ -635,6 +637,7 @@ class Ipinvoice_model extends Model
$result [] = ['body' => $body ?? "Not Opened Yet" ] ;
+ $result [] = ['uom' => $uom ?? "No Units Pecified" ] ;
break;
@@ -643,7 +646,7 @@ class Ipinvoice_model extends Model
case "resin":
$builder = $this->db->table('t_resinStockDetails trd')
- ->select('trd.balanceStock, tmm.MaterialName ,tmm.MaterialCode')
+ ->select('trd.balanceStock, tmm.MaterialName ,tmm.MaterialCode ,tmm.UOM')
->join('t_materialmaster tmm', 'tmm.MaterialCode = trd.materialCode')
->where('trd.date', $lastDateOfCurrentMonth)
->get()
@@ -654,6 +657,8 @@ class Ipinvoice_model extends Model
$materialCode =array_column($builder,'MaterialCode');
$body =array_column($builder,'balanceStock');
+
+ $uom =array_column($builder,'UOM');
$result [] = ['header' => $header];
@@ -662,6 +667,8 @@ class Ipinvoice_model extends Model
$result [] = ['body' => $body ?? "Not Opened Yet" ] ;
+ $result [] = ['uom' => $uom ?? "No Units Pecified" ] ;
+
@@ -673,7 +680,7 @@ class Ipinvoice_model extends Model
$builder = $this->db->table('t_resinStockDetails trd')
- ->select('trd.balanceStock, tmm.MaterialName ,tmm.MaterialCode')
+ ->select('trd.balanceStock, tmm.MaterialName ,tmm.MaterialCode , tmm.UOM')
->join('t_materialmaster tmm', 'tmm.MaterialCode = trd.materialCode')
->where('trd.date', $lastDateOfCurrentMonth)
->get()
@@ -684,6 +691,8 @@ class Ipinvoice_model extends Model
$materialCode =array_column($builder,'MaterialCode');
$body =array_column($builder,'balanceStock');
+
+ $uom =array_column($builder,'UOM');
$result [] = ['header' => $header];
@@ -692,6 +701,10 @@ class Ipinvoice_model extends Model
$result [] = ['body' => $body ?? "Not Opened Yet" ] ;
+ $result [] = ['uom' => $uom ?? "No Units Pecified" ] ;
+
+ break;
+
}
return $result;
diff --git a/app/Views/Report_HSNCreditNoteRegister.php b/app/Views/Report_HSNCreditNoteRegister.php
index 0253b54d..f80678cf 100644
--- a/app/Views/Report_HSNCreditNoteRegister.php
+++ b/app/Views/Report_HSNCreditNoteRegister.php
@@ -142,31 +142,48 @@
- HSN NO
- Quantity
- Total Taxable Amount
- CGST
- SGST
- IGST
- Net Invoice Amount
- Rate Of Tax
+ HSN NO
+ Quantity
+ Total Taxable Amount
+ CGST
+ SGST
+ IGST
+ Net Invoice Amount
+ Rate Of Tax
-
+
- $hcn) { ?>
+ $hcn) {
+
+ $totalQuantity += $hcn['quantity'];
+ $totalTaxableAmount += $hcn['totalTaxableAmount'];
+ $totalCgst += $hcn['cgst'];
+ $totalSgst += $hcn['sgst'];
+ $totalIgst += $hcn['igst'];
+ $totalNetInvoiceAmount += $hcn['netInvoiceAmount'];
+
+
+ ?>
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -179,6 +196,17 @@
+
+ Total:
+
+
+
+
+
+
+
+
+
@@ -201,31 +229,32 @@