X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fpurchasing_db.inc;h=149b42d9d6f70b1399cab3c82f578e434c5fcd92;hb=7561718ee5113232ce917f63085d272884b0929c;hp=8e49f5902710c6937b1d2724ecae4fe1d3bd41d7;hpb=aabfdb8beae99d9a77cddca60e225cc959253bed;p=fa-stable.git diff --git a/purchasing/includes/purchasing_db.inc b/purchasing/includes/purchasing_db.inc index 8e49f590..149b42d9 100644 --- a/purchasing/includes/purchasing_db.inc +++ b/purchasing/includes/purchasing_db.inc @@ -184,6 +184,8 @@ function add_direct_supp_trans($cart) $inv->supplier_id = $cart->supplier_id; $inv->tran_date = $cart->orig_order_date; $inv->due_date = $cart->due_date; + $inv->dimension = $cart->dimension; + $inv->dimension2 = $cart->dimension2; $inv->reference = $ref; $inv->supp_reference = $cart->supp_ref; $inv->tax_included = $cart->tax_included; @@ -209,15 +211,14 @@ function add_direct_supp_trans($cart) $inv->ex_rate = $cart->ex_rate; $inv_no = add_supp_invoice($inv); + // presume supplier data need correction if ($inv->stored_algorithm != $inv->tax_algorithm) update_supp_tax_algorithm($inv->supplier_id, $inv->tax_algorithm); if ($cart->cash_account) { - - $pmt_no = add_supp_payment($inv->supplier_id, $inv->tran_date, $cart->cash_account, - $total, 0, $Refs->get_next(ST_SUPPAYMENT), - _('Payment for:').$inv->supp_reference .' ('.$type_shortcuts[ST_SUPPINVOICE].$inv_no.')'); + $pmt_no = write_supp_payment(0, $inv->supplier_id, $cart->cash_account, $inv->tran_date, $Refs->get_next(ST_SUPPAYMENT), + $total, 0, _('Payment for:').$inv->supp_reference .' ('.$type_shortcuts[ST_SUPPINVOICE].$inv_no.')'); add_supp_allocation($total, ST_SUPPAYMENT, $pmt_no, ST_SUPPINVOICE, $inv_no, $inv->tran_date); update_supp_trans_allocation(ST_SUPPINVOICE, $inv_no); update_supp_trans_allocation(ST_SUPPAYMENT, $pmt_no);