include_once($path_to_root . "/purchasing/includes/supp_trans_class.inc");
include_once($path_to_root . "/includes/banking.inc");
+include_once($path_to_root . "/includes/inventory.inc");
include_once($path_to_root . "/includes/date_functions.inc");
-include_once($path_to_root . "/includes/db/inventory_db.inc");
include_once($path_to_root . "/includes/db/allocations_db.inc");
include_once($path_to_root . "/purchasing/includes/db/supp_trans_db.inc");
$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;
- $inv->tax_algorithm = $cart->tax_algorithm;
- $inv->stored_algorithm = $cart->stored_algorithm;
$supp = get_supplier($cart->supplier_id);
$inv->tax_group_id = $supp['tax_group_id'];
$inv->ov_amount = $inv->ov_gst = $inv->ov_discount = 0;
}
$inv->tax_overrides = $cart->tax_overrides;
if (!$inv->tax_included) {
- $taxes = $inv->get_taxes($inv->tax_group_id, 0, false, $inv->tax_algorithm);
+ $taxes = $inv->get_taxes($inv->tax_group_id, 0, false);
foreach( $taxes as $taxitem) {
$total += isset($taxitem['Override']) ? $taxitem['Override'] : $taxitem['Value'];
}
$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.')');
- 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);
+ $pmt_no = write_supp_payment(0, $inv->supplier_id, $cart->cash_account, $inv->tran_date, $Refs->get_next(ST_SUPPAYMENT, null, $inv->tran_date),
+ $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->supplier_id, $inv->tran_date);
+ update_supp_trans_allocation(ST_SUPPINVOICE, $inv_no, $inv->supplier_id);
+ update_supp_trans_allocation(ST_SUPPAYMENT, $pmt_no, $inv->supplier_id);
}
commit_transaction(); // save PO+GRN+PI(+SP)
return $inv_no;