adib/be-accone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix insert date downpayment dan branchcode receive order asset

Browse Source
This commit is contained in:
adibwp
2026-07-22 13:37:35 +07:00
parent 8d8a5e48d5
commit 5347d89acb
4 changed files with 58 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/controllers/mockup/purchase/order/PurchaseOrderAset.php
View File

@@ -786,8 +786,8 @@ class PurchaseOrderAset extends MY_Controller {
$PurchaseOrderID, $PurchaseOrderID,
$para['supplierID'], $para['supplierID'],
$summary_downpayment ?: 0.00, $summary_downpayment ?: 0.00,
$para['contractStart'], $para['contractDate'],
$para['contractStart'], $para['contractDate'],
'Draft', 'Draft',
$user['M_UserID'], $user['M_UserID'],
$user['M_UserID'] $user['M_UserID']

67
application/controllers/mockup/receive-item-po/ReceiveItemPOAsset.php
View File

@@ -791,26 +791,28 @@ class ReceiveItemPOAsset extends MY_Controller
// insert table ro # // insert table ro #
$sqlInsRO = 'INSERT INTO receive_order_po ( $sqlInsRO = 'INSERT INTO receive_order_po (
ReceiveOrderPoNumber, ReceiveOrderPoNumber,
ReceiveOrderPoSupplierID, ReceiveOrderPoSupplierID,
ReceiveOrderPoIDate, ReceiveOrderPoIDate,
ReceiveOrderPoWarehouseID, ReceiveOrderPoWarehouseID,
ReceiveOrderPoM_BranchCode, ReceiveOrderPoM_BranchCode,
ReceiveOrderPoS_RegionalID, ReceiveOrderPoS_RegionalID,
ReceiveOrderShippingCostAmount, ReceiveOrderShippingCostAmount,
ReceiveOrderShippingCostIsPaid, ReceiveOrderShippingCostIsPaid,
ReceiveOrderPoNote, ReceiveOrderPoNote,
ReceiveOrderPoRefNumber, ReceiveOrderPoRefNumber,
ReceiveOrderPoDONumber, ReceiveOrderPoDONumber,
ReceiveOrderPoTypePurchase, ReceiveOrderPoTypePurchase,
ReceiveOrderPoCreatedUserID ReceiveOrderPoCreatedUserID
) VALUE (?,?,?,?,?,?,?,?,?,?,?,?,?)'; )
SELECT ?, ?, ?, ?, b.M_BranchCode, ?, ?, ?, ?, ?, ?, ?, ?
FROM branch b
WHERE b.M_BranchID = ?';
$queInsRO = $this->db->query($sqlInsRO, [ $queInsRO = $this->db->query($sqlInsRO, [
$numGR, $numGR,
$param['supplier'], $param['supplier'],
$param['date'], $param['date'],
$param['gudangID'], $param['gudangID'],
$user['M_BranchCode'],
$user['S_RegionalID'], $user['S_RegionalID'],
$param['shipping'], $param['shipping'],
$param['shippingIsPaid'], $param['shippingIsPaid'],
@@ -819,6 +821,7 @@ class ReceiveItemPOAsset extends MY_Controller
$param['reference'], $param['reference'],
'aset', 'aset',
$user['M_UserID'], $user['M_UserID'],
$param['branchID']
]); ]);
if (!$queInsRO) { if (!$queInsRO) {
$this->db->trans_rollback(); $this->db->trans_rollback();
@@ -958,26 +961,28 @@ class ReceiveItemPOAsset extends MY_Controller
$roID = $param['ReceiveOrderPoID']; $roID = $param['ReceiveOrderPoID'];
// update receive order header # // update receive order header #
$sqlHeader = "UPDATE receive_order_po SET $sqlHeader = "UPDATE receive_order_po r
ReceiveOrderPoNumber = ?, JOIN branch b ON b.M_BranchID = ?
ReceiveOrderPoSupplierID = ?, SET
ReceiveOrderPoIDate = ?, r.ReceiveOrderPoNumber = ?,
ReceiveOrderPoWarehouseID = ?, r.ReceiveOrderPoSupplierID = ?,
ReceiveOrderPoM_BranchCode = ?, r.ReceiveOrderPoIDate = ?,
ReceiveOrderPoS_RegionalID = ?, r.ReceiveOrderPoWarehouseID = ?,
ReceiveOrderShippingCostAmount = ?, r.ReceiveOrderPoM_BranchCode = b.M_BranchCode,
ReceiveOrderShippingCostIsPaid = ?, r.ReceiveOrderPoS_RegionalID = ?,
ReceiveOrderPoNote = ?, r.ReceiveOrderShippingCostAmount = ?,
ReceiveOrderPoRefNumber = ?, r.ReceiveOrderShippingCostIsPaid = ?,
ReceiveOrderPoDONumber = ? r.ReceiveOrderPoNote = ?,
WHERE ReceiveOrderPoID = ? r.ReceiveOrderPoRefNumber = ?,
AND ReceiveOrderPoIsActive = 'Y'"; r.ReceiveOrderPoDONumber = ?
WHERE r.ReceiveOrderPoID = ?
AND r.ReceiveOrderPoIsActive = 'Y'";
$queHeader = $this->db->query($sqlHeader, [ $queHeader = $this->db->query($sqlHeader, [
$param['branchID'],
$param['ReceiveOrderPoNumber'], $param['ReceiveOrderPoNumber'],
$param['supplier'], $param['supplier'],
$param['date'], $param['date'],
$param['gudangID'], $param['gudangID'],
$user['M_BranchCode'],
$user['S_RegionalID'], $user['S_RegionalID'],
$param['shipping'], $param['shipping'],
$param['shippingIsPaid'], $param['shippingIsPaid'],
@@ -1460,7 +1465,7 @@ class ReceiveItemPOAsset extends MY_Controller
$diskon_proratapo = $besarDiskonPO / doubleval($data_po['totalAllPricePO']); $diskon_proratapo = $besarDiskonPO / doubleval($data_po['totalAllPricePO']);
$ratioQty = (intval($elem['ReceiveOrderPoDetailQty']) / intval($elem['QtyAllPO'])); $ratioQty = (intval($elem['ReceiveOrderPoDetailQty']) / intval($elem['QtyAllPO']));
$diskon_prorata_item = round($ratioQty * $diskon_proratapo,2); $diskon_prorata_item = round($ratioQty * $diskon_proratapo, 2);
$total_diskonpo = round($total_diskonpo + $diskon_prorata_item, 2); $total_diskonpo = round($total_diskonpo + $diskon_prorata_item, 2);
$input_diskon = [$diskon, $diskon_prorata_item]; $input_diskon = [$diskon, $diskon_prorata_item];

2
application/controllers/mockup/scheduler/PurchaseInvoiceInstallment.php
View File

@@ -98,7 +98,7 @@ class PurchaseInvoiceInstallment extends MY_Controller
$row["SupplierInvoiceID"], $row["SupplierInvoiceID"],
$amount, $amount,
$installDate, $installDate,
$dueDate, $installDate,
$createdBy $createdBy
]); ]);

42
application/controllers/mockup/supplierpaymentcashierv5/PaymentV2.php
View File

@@ -361,25 +361,25 @@ class PaymentV2 extends MY_Controller
// GET data bayar # // GET data bayar #
$sql_databayar = "SELECT $sql_databayar = "SELECT
CONCAT('Jurnal Payment Invoice Nomor : ', CONCAT('Jurnal Payment Invoice Nomor : ',
SupplierPaymentNumber, DATE_FORMAT(now(), SupplierPaymentNumber, DATE_FORMAT(now(),
', Tanggal : %d-%m-%Y ') ', Tanggal : %d-%m-%Y ')
) AS jurnaltitle, ) AS jurnaltitle,
CONCAT('Nomor pembayaran kasir : ', CONCAT('Nomor pembayaran kasir : ',
SupplierPaymentCashierNumber, SupplierPaymentCashierNumber,
' dan Nomor grup pembayaran : ', ' dan Nomor grup pembayaran : ',
SupplierPaymentGroupNumber SupplierPaymentGroupNumber
) AS jurnaldesc, ) AS jurnaldesc,
SupplierPaymentNumber AS no_payinv, SupplierPaymentNumber AS no_payinv,
SupplierPaymentCashierNumber AS addonvalue, SupplierPaymentCashierNumber AS addonvalue,
SupplierPaymentCoaID AS coaID, SupplierPaymentCoaID AS coaID,
coaDescription, coaDescription,
SupplierPaymentAmount AS amount, SupplierPaymentAmount AS amount,
SupplierPaymentRounding AS rounding, SupplierPaymentRounding AS rounding,
(SupplierPaymentAmount + SupplierPaymentRounding) AS bayar (SupplierPaymentAmount + SupplierPaymentRounding) AS bayar
FROM supplier_payment FROM supplier_payment
JOIN coa ON coaID = SupplierPaymentCoaID JOIN coa ON coaID = SupplierPaymentCoaID
WHERE SupplierPaymentID = ?"; WHERE SupplierPaymentID = ?";
$que_databayar = $this->db->query($sql_databayar, [$param['orderid']]); $que_databayar = $this->db->query($sql_databayar, [$param['orderid']]);
if (!$que_databayar) { if (!$que_databayar) {
$this->db->trans_rollback(); $this->db->trans_rollback();
@@ -441,10 +441,6 @@ class PaymentV2 extends MY_Controller
]; ];
} }
// "PI Cicilan Aset - {$invoiceNumber}";
$description = '';
// "Jurnal cicilan ke-{$cicilanKe} dari {$totalCicilan} | {$namaKontrak} | PO: {$nomorPO} | Periode {$periode}";
switch ($param['type']) { switch ($param['type']) {
case 'DP': case 'DP':
$data_bayar['jurnaltitle'] .= " | Pembayaran Uang Muka Aset - {$param['dpkode']}"; $data_bayar['jurnaltitle'] .= " | Pembayaran Uang Muka Aset - {$param['dpkode']}";