X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_invoice.php;h=d9196b37e9d897fb5d66d02ee5ccdd243dfa4d54;hb=ca45fa23d2d83705e11007acafd52528718ae5aa;hp=af67283bfcf9eb03a60046a02538d2fc11c51a92;hpb=c6147603044ff0981ed4fa4de419ae77fd3f1ef7;p=fa-stable.git
diff --git a/sales/customer_invoice.php b/sales/customer_invoice.php
index af67283b..d9196b37 100644
--- a/sales/customer_invoice.php
+++ b/sales/customer_invoice.php
@@ -1,11 +1,21 @@
.
+***********************************************************************/
//---------------------------------------------------------------------------
//
// Entry/Modify Sales Invoice against single delivery
// Entry/Modify Batch Sales Invoice against batch of deliveries
//
-$page_security = 2;
-$path_to_root="..";
+$page_security = 'SA_SALESINVOICE';
+$path_to_root = "..";
include_once($path_to_root . "/sales/includes/cart_class.inc");
include_once($path_to_root . "/includes/session.inc");
include_once($path_to_root . "/includes/data_checks.inc");
@@ -25,27 +35,29 @@ if ($use_date_picker) {
if (isset($_GET['ModifyInvoice'])) {
$_SESSION['page_title'] = sprintf(_("Modifying Sales Invoice # %d.") ,$_GET['ModifyInvoice']);
- $help_page_title = _("Modifying Sales Invoice");
+ $help_context = "Modifying Sales Invoice";
} elseif (isset($_GET['DeliveryNumber'])) {
- $_SESSION['page_title'] = _("Issue an Invoice for Delivery Note");
+ $_SESSION['page_title'] = _($help_context = "Issue an Invoice for Delivery Note");
} elseif (isset($_GET['BatchInvoice'])) {
- $_SESSION['page_title'] = _("Issue Batch Invoice for Delivery Notes");
+ $_SESSION['page_title'] = _($help_context = "Issue Batch Invoice for Delivery Notes");
}
page($_SESSION['page_title'], false, false, "", $js);
//-----------------------------------------------------------------------------
+check_edit_conflicts();
if (isset($_GET['AddedID'])) {
$invoice_no = $_GET['AddedID'];
- $trans_type = 10;
+ $trans_type = ST_SALESINVOICE;
display_notification(_("Selected deliveries has been processed"), true);
display_note(get_customer_trans_view_str($trans_type, $invoice_no, _("&View This Invoice")), 0, 1);
- display_note(print_document_link($invoice_no, _("&Print This Invoice"), true, 10));
+ display_note(print_document_link($invoice_no, _("&Print This Invoice"), true, ST_SALESINVOICE));
+ display_note(print_document_link($invoice_no, _("&Email This Invoice"), true, ST_SALESINVOICE, false, "", "", 1),1);
display_note(get_gl_view_str($trans_type, $invoice_no, _("View the GL &Journal Entries for this Invoice")),1);
@@ -59,9 +71,9 @@ if (isset($_GET['AddedID'])) {
display_notification_centered(sprintf(_('Sales Invoice # %d has been updated.'),$invoice_no));
- display_note(get_trans_view_str(10, $invoice_no, _("&View This Invoice")));
+ display_note(get_trans_view_str(ST_SALESINVOICE, $invoice_no, _("&View This Invoice")));
echo '
';
- display_note(print_document_link($invoice_no, _("&Print This Invoice"), true, 10));
+ display_note(print_document_link($invoice_no, _("&Print This Invoice"), true, ST_SALESINVOICE));
hyperlink_no_params($path_to_root . "/sales/inquiry/customer_inquiry.php", _("Select A Different &Invoice to Modify"));
@@ -86,7 +98,7 @@ if (isset($_GET['AddedID'])) {
//-----------------------------------------------------------------------------
if ( (isset($_GET['DeliveryNumber']) && ($_GET['DeliveryNumber'] > 0) )
- || isset($_GET['BatchInvoice'])) {
+|| isset($_GET['BatchInvoice'])) {
processing_start();
@@ -97,7 +109,7 @@ if ( (isset($_GET['DeliveryNumber']) && ($_GET['DeliveryNumber'] > 0) )
$src = array($_GET['DeliveryNumber']);
}
/*read in all the selected deliveries into the Items cart */
- $dn = new Cart(13, $src, true);
+ $dn = new Cart(ST_CUSTDELIVERY, $src, true);
if ($dn->count_items() == 0) {
hyperlink_params($path_to_root . "/sales/inquiry/sales_deliveries_view.php",
@@ -105,10 +117,10 @@ if ( (isset($_GET['DeliveryNumber']) && ($_GET['DeliveryNumber'] > 0) )
die ("
" . _("There are no delivered items with a quantity left to invoice. There is nothing left to invoice.") . "");
}
- $dn->trans_type = 10;
+ $dn->trans_type = ST_SALESINVOICE;
$dn->src_docs = $dn->trans_no;
$dn->trans_no = 0;
- $dn->reference = references::get_next(10);
+ $dn->reference = $Refs->get_next(ST_SALESINVOICE);
$dn->due_date = get_invoice_duedate($dn->customer_id, $dn->document_date);
$_SESSION['Items'] = $dn;
@@ -116,14 +128,14 @@ if ( (isset($_GET['DeliveryNumber']) && ($_GET['DeliveryNumber'] > 0) )
} elseif (isset($_GET['ModifyInvoice']) && $_GET['ModifyInvoice'] > 0) {
- if ( get_parent_trans(10, $_GET['ModifyInvoice']) == 0) { // 1.xx compatibility hack
- echo"
" . _("There in no delivery notes for this invoice.
+ if ( get_parent_trans(ST_SALESINVOICE, $_GET['ModifyInvoice']) == 0) { // 1.xx compatibility hack
+ echo"
" . _("There are no delivery notes for this invoice.
Most likely this invoice was created in Front Accounting version prior to 2.0
and therefore can not be modified.") . "";
display_footer_exit();
}
processing_start();
- $_SESSION['Items'] = new Cart(10, $_GET['ModifyInvoice']);
+ $_SESSION['Items'] = new Cart(ST_SALESINVOICE, $_GET['ModifyInvoice']);
if ($_SESSION['Items']->count_items() == 0) {
echo"
" . _("All quantities on this invoice has been credited. There is nothing to modify on this invoice") . "";
@@ -149,6 +161,7 @@ if (isset($_POST['_InvoiceDate_changed'])) {
$_POST['InvoiceDate']);
$Ajax->activate('due_date');
}
+
//-----------------------------------------------------------------------------
function check_quantities()
{
@@ -208,6 +221,8 @@ function copy_to_cart()
$cart->document_date = $_POST['InvoiceDate'];
$cart->due_date = $_POST['due_date'];
$cart->Comments = $_POST['Comments'];
+ if ($_SESSION['Items']->trans_no == 0)
+ $cart->reference = $_POST['ref'];
}
//-----------------------------------------------------------------------------
@@ -219,12 +234,16 @@ function copy_from_cart()
$_POST['InvoiceDate']= $cart->document_date;
$_POST['due_date'] = $cart->due_date;
$_POST['Comments']= $cart->Comments;
+ $_POST['cart_id'] = $cart->cart_id;
+ $_POST['ref'] = $cart->reference;
}
//-----------------------------------------------------------------------------
function check_data()
{
+ global $Refs;
+
if (!isset($_POST['InvoiceDate']) || !is_date($_POST['InvoiceDate'])) {
display_error(_("The entered invoice date is invalid."));
set_focus('InvoiceDate');
@@ -244,7 +263,7 @@ function check_data()
}
if ($_SESSION['Items']->trans_no == 0) {
- if (!references::is_valid($_POST['ref'])) {
+ if (!$Refs->is_valid($_POST['ref'])) {
display_error(_("You must enter a reference."));
set_focus('ref');
return false;
@@ -285,6 +304,7 @@ if (isset($_POST['process_invoice']) && check_data()) {
$newinvoice= $_SESSION['Items']->trans_no == 0;
copy_to_cart();
+ if ($newinvoice) new_doc_date($_SESSION['Items']->document_date);
$invoice_no = $_SESSION['Items']->write();
processing_end();
@@ -320,8 +340,9 @@ $dspans[] = $spanlen;
$is_batch_invoice = count($_SESSION['Items']->src_docs) > 1;
-$is_edition = $_SESSION['Items']->trans_type == 10 && $_SESSION['Items']->trans_no != 0;
-start_form(false, true);
+$is_edition = $_SESSION['Items']->trans_type == ST_SALESINVOICE && $_SESSION['Items']->trans_no != 0;
+start_form();
+hidden('cart_id');
start_table("$table_style2 width=80%", 5);
@@ -333,13 +354,13 @@ end_row();
start_row();
if ($_SESSION['Items']->trans_no == 0) {
- ref_cells(_("Reference"), 'ref', '', $_SESSION['Items']->reference, "class='tableheader2'");
+ ref_cells(_("Reference"), 'ref', '', null, "class='tableheader2'");
} else {
label_cells(_("Reference"), $_SESSION['Items']->reference, "class='tableheader2'");
}
label_cells(_("Delivery Notes:"),
-get_customer_trans_view_str(systypes::cust_dispatch(), array_keys($_SESSION['Items']->src_docs)), "class='tableheader2'");
+get_customer_trans_view_str(ST_CUSTDELIVERY, array_keys($_SESSION['Items']->src_docs)), "class='tableheader2'");
label_cells(_("Sales Type"), $_SESSION['Items']->sales_type_name, "class='tableheader2'");
@@ -353,23 +374,33 @@ label_cell(_("Shipping Company"), "class='tableheader2'");
shippers_list_cells(null, 'ship_via', $_POST['ship_via']);
if (!isset($_POST['InvoiceDate']) || !is_date($_POST['InvoiceDate'])) {
- $_POST['InvoiceDate'] = Today();
+ $_POST['InvoiceDate'] = new_doc_date();
if (!is_date_in_fiscalyear($_POST['InvoiceDate'])) {
$_POST['InvoiceDate'] = end_fiscalyear();
}
}
-date_cells(_("Date"), 'InvoiceDate', '', $_POST['InvoiceDate'], 0, 0, 0, "class='tableheader2'", true);
+date_cells(_("Date"), 'InvoiceDate', '', $_SESSION['Items']->trans_no == 0,
+ 0, 0, 0, "class='tableheader2'", true);
if (!isset($_POST['due_date']) || !is_date($_POST['due_date'])) {
$_POST['due_date'] = get_invoice_duedate($_SESSION['Items']->customer_id, $_POST['InvoiceDate']);
}
-date_cells(_("Due Date"), 'due_date', '', $_POST['due_date'], 0, 0, 0, "class='tableheader2'");
+date_cells(_("Due Date"), 'due_date', '', null, 0, 0, 0, "class='tableheader2'");
end_row();
end_table();
+$row = get_customer_to_order($_SESSION['Items']->customer_id);
+if ($row['dissallow_invoices'] == 1)
+{
+ display_error(_("The selected customer account is currently on hold. Please contact the credit control personnel to discuss."));
+ end_form();
+ end_page();
+ exit();
+}
+
display_heading(_("Invoice Items"));
div_start('Items');
@@ -489,7 +520,7 @@ end_table(1);
submit_center_first('Update', _("Update"),
_('Refresh document page'), true);
submit_center_last('process_invoice', _("Process Invoice"),
- _('Check entered data and save document'), true);
+ _('Check entered data and save document'), 'default');
end_form();