X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_invoice.php;h=bd7ee681da3a7897fecc597d80b5e8eb82ff73e5;hb=29e68a1b8dcbe7c7ecb797396945e0cccf2d6cd8;hp=d9196b37e9d897fb5d66d02ee5ccdd243dfa4d54;hpb=d2cc0860eccf02eaefcd90731ac3af141a841529;p=fa-stable.git

diff --git a/sales/customer_invoice.php b/sales/customer_invoice.php
index d9196b37..bd7ee681 100644
--- a/sales/customer_invoice.php
+++ b/sales/customer_invoice.php
@@ -57,7 +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, ST_SALESINVOICE));
-	display_note(print_document_link($invoice_no, _("&Email This Invoice"), true, ST_SALESINVOICE, false, "", "", 1),1);
+	display_note(print_document_link($invoice_no, _("&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);
 
@@ -121,7 +121,7 @@ if ( (isset($_GET['DeliveryNumber']) && ($_GET['DeliveryNumber'] > 0) )
 	$dn->src_docs = $dn->trans_no;
 	$dn->trans_no = 0;
 	$dn->reference = $Refs->get_next(ST_SALESINVOICE);
-	$dn->due_date = get_invoice_duedate($dn->customer_id, $dn->document_date);
+	$dn->due_date = get_invoice_duedate($dn->payment, $dn->document_date);
 
 	$_SESSION['Items'] = $dn;
 	copy_from_cart();
@@ -157,7 +157,13 @@ if (isset($_POST['Update'])) {
 	$Ajax->activate('Items');
 }
 if (isset($_POST['_InvoiceDate_changed'])) {
-	$_POST['due_date'] = get_invoice_duedate($_SESSION['Items']->customer_id, 
+	$_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']);
 	$Ajax->activate('due_date');
 }
@@ -220,9 +226,12 @@ 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']);
 	$cart->Comments = $_POST['Comments'];
 	if ($_SESSION['Items']->trans_no == 0)
 		$cart->reference = $_POST['ref'];
+
 }
 //-----------------------------------------------------------------------------
 
@@ -236,6 +245,7 @@ function copy_from_cart()
 	$_POST['Comments']= $cart->Comments;
 	$_POST['cart_id'] = $cart->cart_id;
 	$_POST['ref'] = $cart->reference;
+	$_POST['payment'] = $cart->payment;
 }
 
 //-----------------------------------------------------------------------------
@@ -305,9 +315,10 @@ 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();
 
+	$invoice_no = $_SESSION['Items']->write();
 	processing_end();
+
 	if ($newinvoice) {
 		meta_forward($_SERVER['PHP_SELF'], "AddedID=$invoice_no");
 	} else {
@@ -344,7 +355,7 @@ $is_edition = $_SESSION['Items']->trans_type == ST_SALESINVOICE && $_SESSION['It
 start_form();
 hidden('cart_id');
 
-start_table("$table_style2 width=80%", 5);
+start_table(TABLESTYLE2, "width=80%", 5);
 
 start_row();
 label_cells(_("Customer"), $_SESSION['Items']->customer_name, "class='tableheader2'");
@@ -359,11 +370,16 @@ if ($_SESSION['Items']->trans_no == 0) {
 	label_cells(_("Reference"), $_SESSION['Items']->reference, "class='tableheader2'");
 }
 
-label_cells(_("Delivery Notes:"),
-get_customer_trans_view_str(ST_CUSTDELIVERY, array_keys($_SESSION['Items']->src_docs)), "class='tableheader2'");
+//label_cells(_("Delivery Notes:"),
+//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'");
 
+if ($_SESSION['Items']->pos != -1) // editable payment type
+	label_cells(_("Payment terms:"), sale_payment_list('payment'), "class='tableheader2'");
+else
+	label_cells(_('Payment:'), $_SESSION['Items']->payment_terms['terms'], "class='tableheader2'");
+
 end_row();
 start_row();
 
@@ -384,7 +400,7 @@ 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']);
+	$_POST['due_date'] = get_invoice_duedate($_SESSION['Items']->payment, $_POST['InvoiceDate']);
 }
 
 date_cells(_("Due Date"), 'due_date', '', null, 0, 0, 0, "class='tableheader2'");
@@ -404,7 +420,7 @@ if ($row['dissallow_invoices'] == 1)
 display_heading(_("Invoice Items"));
 
 div_start('Items');
-start_table("$table_style width=80%");
+start_table(TABLESTYLE, "width=80%");
 $th = array(_("Item Code"), _("Item Description"), _("Delivered"), _("Units"), _("Invoiced"),
 	_("This Invoice"), _("Price"), _("Tax Type"), _("Discount"), _("Total"));
 
@@ -488,9 +504,10 @@ $accumulate_shipping = get_company_pref('accumulate_shipping');
 if ($is_batch_invoice && $accumulate_shipping)
 	set_delivery_shipping_sum(array_keys($_SESSION['Items']->src_docs));
 
+$colspan = 9;
 start_row();
-
-small_amount_cells(_("Shipping Cost"), 'ChargeFreightCost', null, "colspan=9 align=right");
+label_cell(_("Shipping Cost"), "colspan=$colspan align=right");
+small_amount_cells(null, 'ChargeFreightCost', null);
 if ($is_batch_invoice) {
 label_cell('', 'colspan=2');
 }
@@ -500,19 +517,19 @@ $inv_items_total = $_SESSION['Items']->get_items_total_dispatch();
 
 $display_sub_total = price_format($inv_items_total + input_num('ChargeFreightCost'));
 
-label_row(_("Sub-total"), $display_sub_total, "colspan=9 align=right","align=right", $is_batch_invoice ? 2 : 0);
+label_row(_("Sub-total"), $display_sub_total, "colspan=$colspan align=right","align=right", $is_batch_invoice ? 2 : 0);
 
 $taxes = $_SESSION['Items']->get_taxes(input_num('ChargeFreightCost'));
-$tax_total = display_edit_tax_items($taxes, 9, $_SESSION['Items']->tax_included, $is_batch_invoice ? 2:0);
+$tax_total = display_edit_tax_items($taxes, $colspan, $_SESSION['Items']->tax_included, $is_batch_invoice ? 2:0);
 
 $display_total = price_format(($inv_items_total + input_num('ChargeFreightCost') + $tax_total));
 
-label_row(_("Invoice Total"), $display_total, "colspan=9 align=right","align=right", $is_batch_invoice ? 2 : 0);
+label_row(_("Invoice Total"), $display_total, "colspan=$colspan align=right","align=right", $is_batch_invoice ? 2 : 0);
 
 end_table(1);
 div_end();
 
-start_table($table_style2);
+start_table(TABLESTYLE2);
 textarea_row(_("Memo"), 'Comments', null, 50, 4);
 
 end_table(1);