ST_SUPPINVOICE => 'SA_SUPPLIERINVOICE'),
array( 'NewOrder' => 'SA_PURCHASEORDER',
'ModifyOrderNumber' => 'SA_PURCHASEORDER',
+ 'AddedID' => 'SA_PURCHASEORDER',
'NewGRN' => 'SA_GRN',
- 'NewInvoice' => 'SA_SUPPLIERINVOICE')
+ 'AddedGRN' => 'SA_GRN',
+ 'NewInvoice' => 'SA_SUPPLIERINVOICE',
+ 'AddedPI' => 'SA_SUPPLIERINVOICE')
);
$js = '';
display_note(get_trans_view_str($trans_type, $trans_no, _("&View this GRN")), 0);
+ $clearing_act = get_company_pref('grn_clearing_act');
+ if ($clearing_act)
+ display_note(get_gl_view_str($trans_type, $trans_no, _("View the GL Journal Entries for this Delivery")), 1);
// not yet
// display_note(print_document_link($trans_no, _("&Print This GRN"), true, $trans_type), 0, 1);
return false;
}
+ if ($_SESSION['PO']->trans_type != ST_PURCHORDER && !is_date_in_fiscalyear($_POST['OrderDate']))
+ {
+ display_error(_("The entered date is not in fiscal year"));
+ set_focus('OrderDate');
+ return false;
+ }
+
if (($_SESSION['PO']->trans_type==ST_SUPPINVOICE) && !is_date($_POST['due_date']))
{
display_error(_("The entered due date is invalid."));
set_focus('supp_ref');
return false;
}
+ if ($_SESSION['PO']->trans_type==ST_SUPPINVOICE
+ && is_reference_already_there($_SESSION['PO']->supplier_id, get_post('supp_ref'), $_SESSION['PO']->order_no))
+ {
+ display_error(_("This invoice number has already been entered. It cannot be entered again.") . " (" . get_post('supp_ref') . ")");
+ set_focus('supp_ref');
+ return false;
+ }
if ($_SESSION['PO']->trans_type == ST_PURCHORDER && get_post('delivery_address') == '')
{
display_error(_("There is no delivery address specified."));
set_focus('StkLocation');
return false;
}
-
+ if (!db_has_currency_rates($_SESSION['PO']->curr_code, $_POST['OrderDate']))
+ return false;
if ($_SESSION['PO']->order_has_items() == false)
{
display_error (_("The order cannot be placed because there are no lines entered on this order."));
//Direct GRN
if ($cart->trans_type == ST_SUPPRECEIVE)
$cart->reference = $ref;
- $cart->Comments = $cart->reference; //grn does not hold supp_ref
+ if ($cart->trans_type != ST_SUPPINVOICE)
+ $cart->Comments = $cart->reference; //grn does not hold supp_ref
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->ov_discount 'this isn't used at all'
- $inv->ov_amount = $inv->ov_gst = 0;
-
+
+ $inv->ov_amount = $inv->ov_gst = $inv->ov_discount = 0;
+
+ $total = 0;
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->ex_rate = $cart->ex_rate;
+
$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
-
+
$order_no = update_po($cart);
unset($_SESSION['PO']);
meta_forward($_SERVER['PHP_SELF'], "AddedID=$order_no&Updated=1");