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 = '';
page($_SESSION['page_title'], false, false, "", $js);
if (isset($_GET['ModifyOrderNumber']))
- check_is_closed(ST_PURCHORDER, $_GET['ModifyOrderNumber']);
+ check_is_editable(ST_PURCHORDER, $_GET['ModifyOrderNumber']);
//---------------------------------------------------------------------------------------------------
set_focus('supplier_id');
return false;
}
-
+
if (!is_date($_POST['OrderDate']))
{
display_error(_("The entered order date is invalid."));
set_focus('OrderDate');
return false;
}
-
+ if (($_SESSION['PO']->trans_type == ST_SUPPRECEIVE || $_SESSION['PO']->trans_type == ST_SUPPINVOICE)
+ && !is_date_in_fiscalyear($_POST['OrderDate'])) {
+ display_error(_("The entered date is out of fiscal year or is closed for further data entry."));
+ 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('due_date');
return false;
}
-
+
if (!$_SESSION['PO']->order_no)
{
if (!$Refs->is_valid(get_post('ref')))
set_focus('ref');
return false;
}
-
+
if (!is_new_reference(get_post('ref'), $_SESSION['PO']->trans_type))
{
display_error(_("The entered reference is already in use."));
return false;
}
}
-
+
if ($_SESSION['PO']->trans_type == ST_SUPPINVOICE && !$Refs->is_valid(get_post('supp_ref')))
{
display_error(_("You must enter a supplier's invoice reference."));
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."));
return false;
}
-
+ if (floatcmp(input_num('prep_amount'), $_SESSION['PO']->get_trans_total()) > 0)
+ {
+ display_error(_("Required prepayment is greater than total invoice value."));
+ set_focus('prep_amount');
+ return false;
+ }
+
return true;
}
}
$order_no = add_po($cart);
new_doc_date($cart->orig_order_date);
+ $cart->order_no = $order_no;
if ($cart->trans_type == ST_PURCHORDER) {
unset($_SESSION['PO']);
//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->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;
+
$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->price, $line->price, true, get_standard_cost($line->stock_id), '');
$total += round2(($line->receive_qty * $line->price), user_price_dec());
}
+ $inv->tax_overrides = $cart->tax_overrides;
if (!$inv->tax_included) {
$taxes = $inv->get_taxes($inv->tax_group_id, 0, false, $inv->tax_algorithm);
foreach( $taxes as $taxitem) {
- $total += $taxitem['Value'];
+ $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
$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, $total);
- update_supp_trans_allocation(ST_SUPPAYMENT, $pmt_no, $total);
+ update_supp_trans_allocation(ST_SUPPINVOICE, $inv_no);
+ update_supp_trans_allocation(ST_SUPPAYMENT, $pmt_no);
}
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");