page($_SESSION['page_title'], false, false, "", $js);
+if (isset($_GET['ModifyOrderNumber']))
+ check_is_closed(ST_PURCHORDER, $_GET['ModifyOrderNumber']);
+
//---------------------------------------------------------------------------------------------------
check_db_has_suppliers(_("There are no suppliers defined in the system."));
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_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')))
}
}
+ 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_PURCHORDER && get_post('delivery_address') == '')
{
display_error(_("There is no delivery address specified."));
function handle_commit_order()
{
+ global $Refs, $type_shortcuts;
+
$cart = &$_SESSION['PO'];
if (can_commit()) {
}
$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']);
$inv->Comments = $cart->Comments;
$inv->supplier_id = $cart->supplier_id;
$inv->tran_date = $cart->orig_order_date;
+ $inv->due_date = $cart->due_date;
$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_discount 'this isn't used at all'
-// $inv->terms = not used, TODO
- $terms = $supp['payment_terms'];
- $inv->ov_amount = $inv->ov_gst = 0;
- $inv->due_date = get_invoice_duedate($terms, $inv->tran_date);
+ $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());
+ $total += 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());
+ if (!$inv->tax_included) {
+ $taxes = $inv->get_taxes($inv->tax_group_id, 0, false, $inv->tax_algorithm);
+ foreach( $taxes as $taxitem) {
+ $total += $taxitem['Value'];
+ }
}
+
$inv_no = add_supp_invoice($inv);
- commit_transaction(); // save PO+GRN+PI
- // payment for cash terms...
+ // presume supplier data need correction
+ if ($inv->stored_algorithm != $inv->tax_algorithm)
+ update_supp_tax_algorithm($inv->supplier_id, $inv->tax_algorithm);
+
+ if (get_post('cash_account')) {
+
+ $pmt_no = add_supp_payment($inv->supplier_id, $inv->tran_date, get_post('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, $total);
+ update_supp_trans_allocation(ST_SUPPAYMENT, $pmt_no, $total);
+
+ }
+
+ commit_transaction(); // save PO+GRN+PI(+SP)
+
unset($_SESSION['PO']);
meta_forward($_SERVER['PHP_SELF'], "AddedPI=$inv_no");
}
display_po_items($_SESSION['PO']);
start_table(TABLESTYLE2);
+
+if (list_updated('tax_algorithm')) {
+ $_SESSION['PO']->tax_algorithm = $_POST['tax_algorithm'];
+ $Ajax->activate('items_table');
+}
+
+if ($_SESSION['PO']->trans_type == ST_SUPPINVOICE) {
+ tax_algorithm_list_row(_("Tax algorithm:"), 'tax_algorithm', null, true);
+ cash_accounts_list_row(_("Payment:"), 'cash_account', null, false, _('Delayed'));
+}
+
textarea_row(_("Memo:"), 'Comments', null, 70, 4);
end_table(1);
div_start('controls', 'items_table');
+$process_txt = _("Place Order");
+$update_txt = _("Update Order");
+$cancel_txt = _("Cancel Order");
+if ($_SESSION['PO']->trans_type == ST_SUPPRECEIVE) {
+ $process_txt = _("Process GRN");
+ $update_txt = _("Update GRN");
+ $cancel_txt = _("Cancel GRN");
+}
+elseif ($_SESSION['PO']->trans_type == ST_SUPPINVOICE) {
+ $process_txt = _("Process Invoice");
+ $update_txt = _("Update Invoice");
+ $cancel_txt = _("Cancel Invoice");
+}
if ($_SESSION['PO']->order_has_items())
{
if ($_SESSION['PO']->order_no)
- submit_center_first('Commit', _("Update Order"), '', 'default');
+ submit_center_first('Commit', $update_txt, '', 'default');
else
- submit_center_first('Commit', _("Place Order"), '', 'default');
- submit_center_last('CancelOrder', _("Cancel Order"));
+ submit_center_first('Commit', $process_txt, '', 'default');
+ submit_center_last('CancelOrder', $cancel_txt);
}
else
- submit_center('CancelOrder', _("Cancel Order"), true, false, 'cancel');
+ submit_center('CancelOrder', $cancel_txt, true, false, 'cancel');
div_end();
//---------------------------------------------------------------------------------------------------
projects / fa-stable.git / blobdiff