X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fsales_credit_db.inc;h=0bdbf7072f2239c0bb5175c3f6d9a6265be5d24f;hb=b2a9c105e368f6e4fdb35477665edeff13fb574b;hp=171c0a7e86a78711039b5c73443d8237966a8998;hpb=6fb8a987e7c3c71a3283370081fa43808b871521;p=fa-stable.git diff --git a/sales/includes/db/sales_credit_db.inc b/sales/includes/db/sales_credit_db.inc index 171c0a7e..0bdbf707 100644 --- a/sales/includes/db/sales_credit_db.inc +++ b/sales/includes/db/sales_credit_db.inc @@ -134,14 +134,14 @@ function write_credit_note(&$credit_note, $write_off_acc) if (($credit_note_total + $credit_note->freight_cost) != 0) { - $total += add_gl_trans_customer(ST_CUSTCREDIT, $credit_no, $credit_date, $branch_data["receivables_account"], 0, 0, + $total += add_gl_trans_customer(ST_CUSTCREDIT, $credit_no, $credit_date, $branch_data["receivables_account"], $credit_note->dimension_id, $credit_note->dimension2_id, -($credit_note_total + $credit_note->freight_cost + $items_added_tax + $freight_added_tax), $credit_note->customer_id, "The total debtor GL posting for the credit note could not be inserted"); } if ($credit_note->freight_cost != 0) { - $total += add_gl_trans_customer(ST_CUSTCREDIT, $credit_no, $credit_date, $company_data["freight_act"], 0, 0, + $total += add_gl_trans_customer(ST_CUSTCREDIT, $credit_no, $credit_date, $company_data["freight_act"], $credit_note->dimension_id, $credit_note->dimension2_id, $credit_note->get_tax_free_shipping(), $credit_note->customer_id, "The freight GL posting for this credit note could not be inserted"); } @@ -154,8 +154,9 @@ function write_credit_note(&$credit_note, $write_off_acc) $taxitem['rate'], $credit_note->tax_included, $taxitem['Value'], $taxitem['Net'], $ex_rate, $credit_note->document_date, $credit_note->reference, TR_OUTPUT); - - $total += add_gl_trans_customer(ST_CUSTCREDIT, $credit_no, $credit_date, $taxitem['sales_gl_code'], 0, 0, + // sales_gl_code is not set for taxexempt + if (isset($taxitem['sales_gl_code'])) + $total += add_gl_trans_customer(ST_CUSTCREDIT, $credit_no, $credit_date, $taxitem['sales_gl_code'], $credit_note->dimension_id, $credit_note->dimension2_id, $taxitem['Value'], $credit_note->customer_id, "A tax GL posting for this credit note could not be inserted"); }