|
@@ -1488,8 +1488,8 @@
|
|
|
ipii.update_by,
|
|
ipii.update_by,
|
|
|
eic.name as company_name,
|
|
eic.name as company_name,
|
|
|
eic.name_simple as companyNameSimple,
|
|
eic.name_simple as companyNameSimple,
|
|
|
- sum( ipiis.actual_received_amount ) AS actual_received_amount,
|
|
|
|
|
- GROUP_CONCAT(DISTINCT ipiis.settlement_payment_reason SEPARATOR ',') AS paymentReason,
|
|
|
|
|
|
|
+ ipii.payment_reason ,
|
|
|
|
|
+ sum(ipiis.actual_received_amount) AS actual_received_amount, GROUP_CONCAT(DISTINCT ipiis.settlement_payment_reason SEPARATOR ',') AS settlementPaymentReason,
|
|
|
ipii.status
|
|
ipii.status
|
|
|
FROM
|
|
FROM
|
|
|
ins_ply_income_invoice ipii
|
|
ins_ply_income_invoice ipii
|
|
@@ -1562,7 +1562,8 @@
|
|
|
eic.name_simple as companyNameSimple,
|
|
eic.name_simple as companyNameSimple,
|
|
|
sum( ipiis.actual_received_amount ) AS actual_received_amount,
|
|
sum( ipiis.actual_received_amount ) AS actual_received_amount,
|
|
|
ipii.status,
|
|
ipii.status,
|
|
|
- GROUP_CONCAT(DISTINCT ipiis.settlement_payment_reason SEPARATOR ',') as paymentReason,
|
|
|
|
|
|
|
+ ipii.payment_reason,
|
|
|
|
|
+ GROUP_CONCAT(DISTINCT ipiis.settlement_payment_reason SEPARATOR ',') as settlementPaymentReason,
|
|
|
GROUP_CONCAT(DISTINCT iffo.year SEPARATOR ',') AS year,
|
|
GROUP_CONCAT(DISTINCT iffo.year SEPARATOR ',') AS year,
|
|
|
GROUP_CONCAT(DISTINCT iffo.month SEPARATOR ',') AS month,
|
|
GROUP_CONCAT(DISTINCT iffo.month SEPARATOR ',') AS month,
|
|
|
iffo.partner_company_id,
|
|
iffo.partner_company_id,
|