ST_SUPPINVOICE => 'SA_SUPPLIERINVOICE'),
array( 'NewOrder' => 'SA_PURCHASEORDER',
'ModifyOrderNumber' => 'SA_PURCHASEORDER',
ST_SUPPINVOICE => 'SA_SUPPLIERINVOICE'),
array( 'NewOrder' => 'SA_PURCHASEORDER',
'ModifyOrderNumber' => 'SA_PURCHASEORDER',
- 'NewInvoice' => 'SA_SUPPLIERINVOICE')
+ 'AddedGRN' => 'SA_GRN',
+ 'NewInvoice' => 'SA_SUPPLIERINVOICE',
+ 'AddedPI' => 'SA_SUPPLIERINVOICE')
- && is_reference_already_there($_SESSION['PO']->supplier_id, get_post('supp_ref'), $_SESSION['PO']->trans_no))
+ && is_reference_already_there($_SESSION['PO']->supplier_id, get_post('supp_ref'), $_SESSION['PO']->order_no))
if ($_SESSION['PO']->order_has_items() == false)
{
display_error (_("The order cannot be placed because there are no lines entered on this order."));
if ($_SESSION['PO']->order_has_items() == false)
{
display_error (_("The order cannot be placed because there are no lines entered on this order."));
foreach($cart->line_items as $key => $line)
$cart->line_items[$key]->receive_qty = $line->quantity;
$grn_no = add_grn($cart);
foreach($cart->line_items as $key => $line)
$cart->line_items[$key]->receive_qty = $line->quantity;
$grn_no = add_grn($cart);
$inv->tax_included = $cart->tax_included;
$supp = get_supplier($cart->supplier_id);
$inv->tax_group_id = $supp['tax_group_id'];
$inv->tax_included = $cart->tax_included;
$supp = get_supplier($cart->supplier_id);
$inv->tax_group_id = $supp['tax_group_id'];
foreach($cart->line_items as $key => $line) {
$inv->add_grn_to_trans($line->grn_item_id, $line->po_detail_rec, $line->stock_id,
$line->item_description, $line->receive_qty, 0, $line->receive_qty,
$line->price, $line->price, true, get_standard_cost($line->stock_id), '');
$inv->ov_amount += round2(($line->receive_qty * $line->price), user_price_dec());
}
foreach($cart->line_items as $key => $line) {
$inv->add_grn_to_trans($line->grn_item_id, $line->po_detail_rec, $line->stock_id,
$line->item_description, $line->receive_qty, 0, $line->receive_qty,
$line->price, $line->price, true, get_standard_cost($line->stock_id), '');
$inv->ov_amount += round2(($line->receive_qty * $line->price), user_price_dec());
}
- $taxes = $inv->get_taxes($inv->tax_group_id, 0, false);
- foreach( $taxes as $taxitem) {
- $inv->ov_gst += round2($taxitem['Value'], user_price_dec());
+ $inv->tax_overrides = $cart->tax_overrides;
+ if (!$inv->tax_included) {
+ $taxes = $inv->get_taxes($inv->tax_group_id, 0, false);
+ foreach( $taxes as $taxitem) {
+ $total += isset($taxitem['Override']) ? $taxitem['Override'] : $taxitem['Value'];
+ }
$inv_no = add_supp_invoice($inv);
commit_transaction(); // save PO+GRN+PI
// FIXME payment for cash terms. (Needs cash account selection)
$inv_no = add_supp_invoice($inv);
commit_transaction(); // save PO+GRN+PI
// FIXME payment for cash terms. (Needs cash account selection)
meta_forward($_SERVER['PHP_SELF'], "AddedPI=$inv_no");
}
else { // order modification
meta_forward($_SERVER['PHP_SELF'], "AddedPI=$inv_no");
}
else { // order modification
$order_no = update_po($cart);
unset($_SESSION['PO']);
meta_forward($_SERVER['PHP_SELF'], "AddedID=$order_no&Updated=1");
$order_no = update_po($cart);
unset($_SESSION['PO']);
meta_forward($_SERVER['PHP_SELF'], "AddedID=$order_no&Updated=1");