X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_invoice.php;h=5bebcb7498ec398b67bc67d25fe315ee9ea3f385;hb=9a98bb3bc7a94f1a8e47f8dab45a87c8b4212080;hp=c4ef21f14f155942d7d682b7fcea2cf082c09ba5;hpb=c356acfd88575bc518efdb9fb77e0a6b6c645eec;p=fa-stable.git

diff --git a/sales/customer_invoice.php b/sales/customer_invoice.php
index c4ef21f1..5bebcb74 100644
--- a/sales/customer_invoice.php
+++ b/sales/customer_invoice.php
@@ -56,24 +56,28 @@ 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, ST_SALESINVOICE));
-	display_note(print_document_link($invoice_no, _("&Email This Invoice"), true, ST_SALESINVOICE, false, "printlink", "", 1),1);
+	display_note(print_document_link($invoice_no."-".$trans_type, _("&Print This Invoice"), true, ST_SALESINVOICE));
+	display_note(print_document_link($invoice_no."-".$trans_type, _("&Email This Invoice"), true, ST_SALESINVOICE, false, "printlink", "", 1),1);
 
 	display_note(get_gl_view_str($trans_type, $invoice_no, _("View the GL &Journal Entries for this Invoice")),1);
 
 	hyperlink_params("$path_to_root/sales/inquiry/sales_deliveries_view.php", _("Select Another &Delivery For Invoicing"), "OutstandingOnly=1");
 
+	hyperlink_params("$path_to_root/admin/attachments.php", _("Add an Attachment"), "filterType=$trans_type&trans_no=$invoice_no");
+
 	display_footer_exit();
 
 } elseif (isset($_GET['UpdatedID']))  {
 
 	$invoice_no = $_GET['UpdatedID'];
+	$trans_type = ST_SALESINVOICE;
 
 	display_notification_centered(sprintf(_('Sales Invoice # %d has been updated.'),$invoice_no));
 
 	display_note(get_trans_view_str(ST_SALESINVOICE, $invoice_no, _("&View This Invoice")));
 	echo '<br>';
-	display_note(print_document_link($invoice_no, _("&Print This Invoice"), true, ST_SALESINVOICE));
+	display_note(print_document_link($invoice_no."-".$trans_type, _("&Print This Invoice"), true, ST_SALESINVOICE));
+	display_note(print_document_link($invoice_no."-".$trans_type, _("&Email This Invoice"), true, ST_SALESINVOICE, false, "printlink", "", 1),1);
 
 	hyperlink_no_params($path_to_root . "/sales/inquiry/customer_inquiry.php", _("Select Another &Invoice to Modify"));
 
@@ -108,6 +112,7 @@ if ( (isset($_GET['DeliveryNumber']) && ($_GET['DeliveryNumber'] > 0) )
 	} else {
 		$src = array($_GET['DeliveryNumber']);
 	}
+
 	/*read in all the selected deliveries into the Items cart  */
 	$dn = new Cart(ST_CUSTDELIVERY, $src, true);
 
@@ -117,18 +122,14 @@ if ( (isset($_GET['DeliveryNumber']) && ($_GET['DeliveryNumber'] > 0) )
 		die ("<br><b>" . _("There are no delivered items with a quantity left to invoice. There is nothing left to invoice.") . "</b>");
 	}
 
-	$dn->trans_type = ST_SALESINVOICE;
-	$dn->src_docs = $dn->trans_no;
-	$dn->trans_no = 0;
-	$dn->reference = $Refs->get_next(ST_SALESINVOICE);
-	$dn->due_date = get_invoice_duedate($dn->payment, $dn->document_date);
-
 	$_SESSION['Items'] = $dn;
 	copy_from_cart();
 
 } elseif (isset($_GET['ModifyInvoice']) && $_GET['ModifyInvoice'] > 0) {
 
-	if ( get_parent_trans(ST_SALESINVOICE, $_GET['ModifyInvoice']) == 0) { // 1.xx compatibility hack
+	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
 		and therefore can not be modified.") . "</b></center>";
@@ -150,21 +151,19 @@ if ( (isset($_GET['DeliveryNumber']) && ($_GET['DeliveryNumber'] > 0) )
 
 	end_page();
 	exit;
-} elseif (!check_quantities()) {
+} elseif (!isset($_POST['process_invoice']) && !check_quantities()) {
 	display_error(_("Selected quantity cannot be less than quantity credited nor more than quantity not invoiced yet."));
 }
 if (isset($_POST['Update'])) {
 	$Ajax->activate('Items');
 }
 if (isset($_POST['_InvoiceDate_changed'])) {
-	$_POST['due_date'] = get_invoice_duedate($_SESSION['Items']->payment, 
-		$_POST['InvoiceDate']);
+	$_POST['due_date'] = get_invoice_duedate($_SESSION['Items']->payment, $_POST['InvoiceDate']);
 	$Ajax->activate('due_date');
 }
 if (list_updated('payment')) {
 	$_SESSION['Items']->payment = get_post('payment');
-	$_POST['due_date'] = get_invoice_duedate($_SESSION['Items']->payment, 
-		$_POST['InvoiceDate']);
+	$_POST['due_date'] = get_invoice_duedate($_SESSION['Items']->payment, $_POST['InvoiceDate']);
 	$Ajax->activate('due_date');
 }
 
@@ -226,11 +225,15 @@ function copy_to_cart()
 	$cart->freight_cost = input_num('ChargeFreightCost');
 	$cart->document_date =  $_POST['InvoiceDate'];
 	$cart->due_date =  $_POST['due_date'];
-	$cart->payment = $_POST['payment'];
-	$cart->payment_terms = get_payment_terms($_POST['payment']);
+	if ($cart->pos['cash_sale'] || $cart->pos['credit_sale']) {
+		$cart->payment = $_POST['payment'];
+		$cart->payment_terms = get_payment_terms($_POST['payment']);
+	}
 	$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'];
 
 }
 //-----------------------------------------------------------------------------
@@ -246,6 +249,8 @@ function copy_from_cart()
 	$_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;
 }
 
 //-----------------------------------------------------------------------------
@@ -261,7 +266,7 @@ function check_data()
 	}
 
 	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;
 	}
@@ -326,6 +331,16 @@ if (isset($_POST['process_invoice']) && check_data()) {
 	}
 }
 
+if(list_updated('payment')) {
+	$order = &$_SESSION['Items'];
+	$order->payment = get_post('payment');
+	$order->payment_terms = get_payment_terms($order->payment);
+	$order->due_date = get_invoice_duedate($order->payment, $order->document_date);
+	if ($order->payment_terms['cash_sale']) {
+		$_POST['Location'] = $order->Location = $order->pos['pos_location'];
+		$order->location_name = $order->pos['location_name'];
+	}
+}
 // find delivery spans for batch invoice display
 $dspans = array();
 $lastdn = ''; $spanlen=1;
@@ -358,9 +373,20 @@ hidden('cart_id');
 start_table(TABLESTYLE2, "width=80%", 5);
 
 start_row();
+$colspan = 1;
+$dim = get_company_pref('use_dimension');
+if ($dim > 0) 
+	$colspan = 3;
 label_cells(_("Customer"), $_SESSION['Items']->customer_name, "class='tableheader2'");
 label_cells(_("Branch"), get_branch_name($_SESSION['Items']->Branch), "class='tableheader2'");
-label_cells(_("Currency"), $_SESSION['Items']->customer_currency, "class='tableheader2'");
+if ($_SESSION['Items']->pos['credit_sale'] || $_SESSION['Items']->pos['cash_sale']) {
+	$paymcat = !$_SESSION['Items']->pos['cash_sale'] ? PM_CREDIT :
+		(!$_SESSION['Items']->pos['credit_sale'] ? PM_CASH : PM_ANY);
+	label_cells(_("Payment terms:"), sale_payment_list('payment', $paymcat),
+		"class='tableheader2'", "colspan=$colspan");
+} else
+	label_cells(_('Payment:'), $_SESSION['Items']->payment_terms['terms'], "class='tableheader2'", "colspan=$colspan");
+
 end_row();
 start_row();
 
@@ -375,10 +401,17 @@ if ($_SESSION['Items']->trans_no == 0) {
 
 label_cells(_("Sales Type"), $_SESSION['Items']->sales_type_name, "class='tableheader2'");
 
-if ($_SESSION['Items']->pos != -1) // editable payment type
-	label_cells(_("Payment terms:"), sale_payment_list('payment'), "class='tableheader2'");
+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_cell(_("Dimension").":", "class='tableheader2'");
+	$_POST['dimension_id'] = $_SESSION['Items']->dimension_id;
+	dimensions_list_cells(null, 'dimension_id', null, true, ' ', false, 1, false);
+}		
 else
-	label_cells(_('Payment:'), $_SESSION['Items']->payment_terms['terms'], "class='tableheader2'");
+	hidden('dimension_id', 0);
 
 end_row();
 start_row();
@@ -404,7 +437,19 @@ if (!isset($_POST['due_date']) || !is_date($_POST['due_date'])) {
 }
 
 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("&nbsp;", "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();