} elseif (isset($_GET['ModifyInvoice']) && $_GET['ModifyInvoice'] > 0) {
+ check_is_closed(ST_SALESINVOICE, $_GET['ModifyInvoice']);
+
if ( get_sales_parent_numbers(ST_SALESINVOICE, $_GET['ModifyInvoice']) == 0) { // 1.xx compatibility hack
echo"<center><br><b>" . _("There are no delivery notes for this invoice.<br>
Most likely this invoice was created in Front Accounting version prior to 2.0
$cart->Comments = $_POST['Comments'];
if ($_SESSION['Items']->trans_no == 0)
$cart->reference = $_POST['ref'];
+ $cart->dimension_id = $_POST['dimension_id'];
+ $cart->dimension2_id = $_POST['dimension2_id'];
}
//-----------------------------------------------------------------------------
$_POST['cart_id'] = $cart->cart_id;
$_POST['ref'] = $cart->reference;
$_POST['payment'] = $cart->payment;
+ $_POST['dimension_id'] = $cart->dimension_id;
+ $_POST['dimension2_id'] = $cart->dimension2_id;
}
//-----------------------------------------------------------------------------
}
if (!is_date_in_fiscalyear($_POST['InvoiceDate'])) {
- display_error(_("The entered invoice date is not in fiscal year."));
+ display_error(_("The entered date is out of fiscal year or is closed for further data entry."));
set_focus('InvoiceDate');
return false;
}
label_cells(_("Currency"), $_SESSION['Items']->customer_currency, "class='tableheader2'");
// 2010-09-03 Joe Hunt
-if ($dim > 0)
- label_cells(_("Dimension"), get_dimension_string($_SESSION['Items']->dimension_id), "class='tableheader2'");
+//if ($dim > 0)
+// label_cells(_("Dimension"), get_dimension_string($_SESSION['Items']->dimension_id), "class='tableheader2'");
+if ($dim > 0) {
+ label_cell(_("Dimension").":", "class='tableheader2'");
+ $_POST['dimension_id'] = $_SESSION['Items']->dimension_id;
+ dimensions_list_cells(null, 'dimension_id', null, true, ' ', false, 1, false);
+}
+else
+ hidden('dimension_id', 0);
end_row();
start_row();
}
date_cells(_("Due Date"), 'due_date', '', null, 0, 0, 0, "class='tableheader2'");
+/*
if ($dim > 1)
label_cells(_("Dimension"). " 2", get_dimension_string($_SESSION['Items']->dimension2_id), "class='tableheader2'");
else if ($dim > 0)
label_cell(" ", "colspan=2");
-
+*/
+if ($dim > 1) {
+ label_cell(_("Dimension")." 2:", "class='tableheader2'");
+ $_POST['dimension2_id'] = $_SESSION['Items']->dimension2_id;
+ dimensions_list_cells(null, 'dimension2_id', null, true, ' ', false, 2, false);
+}
+else
+ hidden('dimension2_id', 0);
end_row();
end_table();