X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_invoice.php;h=2e92bc1b929455bcf6df7d033cd051daf3979a91;hb=902f1015d874c33bd7946b17de2ad80b4f2144b6;hp=d935978f202439f181dee5653b6228fe63367e21;hpb=5cb1887da3fa5ee637568ca8bef14427ff69fb27;p=fa-stable.git

diff --git a/sales/customer_invoice.php b/sales/customer_invoice.php
index d935978f..2e92bc1b 100644
--- a/sales/customer_invoice.php
+++ b/sales/customer_invoice.php
@@ -14,8 +14,8 @@
 //	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");
@@ -57,6 +57,7 @@ if (isset($_GET['AddedID'])) {
 	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, _("&Email This Invoice"), true, 10, false, "", "", 1),0, 1);
 
 	display_note(get_gl_view_str($trans_type, $invoice_no, _("View the GL &Journal Entries for this Invoice")),1);
 
@@ -220,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'];
 }
 //-----------------------------------------------------------------------------
 
@@ -232,6 +235,7 @@ function copy_from_cart()
 	$_POST['due_date'] = $cart->due_date;
 	$_POST['Comments']= $cart->Comments;
 	$_POST['cart_id'] = $cart->cart_id;
+	$_POST['ref'] = $cart->reference;
 }
 
 //-----------------------------------------------------------------------------
@@ -298,6 +302,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();
@@ -334,7 +339,7 @@ $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);
+start_form();
 hidden('cart_id');
 
 start_table("$table_style2 width=80%", 5);
@@ -347,7 +352,7 @@ 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'");
 }
@@ -367,19 +372,20 @@ 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();
@@ -512,7 +518,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();