X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_invoice.php;h=fed8094e05337bdd8035ac7f50f1ab9964569b31;hb=bf65d2ab9bcc2d92a65d7a40763040f3ed9d1ddb;hp=35d59fb78a7fff8c205169bb834ca1b7c0fa2aa8;hpb=f12dbe7523bb1abc6cd69b009ef8f0be838f5348;p=fa-stable.git

diff --git a/sales/customer_invoice.php b/sales/customer_invoice.php
index 35d59fb7..fed8094e 100644
--- a/sales/customer_invoice.php
+++ b/sales/customer_invoice.php
@@ -35,37 +35,36 @@ if (isset($_GET['ModifyInvoice'])) {
 page($_SESSION['page_title'], false, false, "", $js);
 
 //-----------------------------------------------------------------------------
+check_edit_conflicts();
 
 if (isset($_GET['AddedID'])) {
 
 	$invoice_no = $_GET['AddedID'];
 	$trans_type = 10;
-	print_hidden_script(10);
 
 	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(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, 10));
 
-	display_note(get_gl_view_str($trans_type, $invoice_no, _("View the GL Journal Entries for this Invoice")),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/sales/inquiry/sales_deliveries_view.php", _("Select Another &Delivery For Invoicing"), "OutstandingOnly=1");
 
 	display_footer_exit();
 
 } elseif (isset($_GET['UpdatedID']))  {
 
 	$invoice_no = $_GET['UpdatedID'];
-	print_hidden_script(10);
 
 	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(10, $invoice_no, _("&View This Invoice")));
 	echo '<br>';
-	display_note(print_document_link($invoice_no, _("Print This Invoice"), true, 10));
+	display_note(print_document_link($invoice_no, _("&Print This Invoice"), true, 10));
 
-	hyperlink_no_params($path_to_root . "/sales/inquiry/customer_inquiry.php", _("Select A Different Invoice to Modify"));
+	hyperlink_no_params($path_to_root . "/sales/inquiry/customer_inquiry.php", _("Select A Different &Invoice to Modify"));
 
 	display_footer_exit();
 
@@ -79,12 +78,16 @@ if (isset($_GET['AddedID'])) {
 		}
 	}
 	unset($line);
+
+    // Remove also src_doc delivery note
+    $sources = &$_SESSION['Items']->src_docs;
+    unset($sources[$_GET['RemoveDN']]);
 }
 
 //-----------------------------------------------------------------------------
 
 if ( (isset($_GET['DeliveryNumber']) && ($_GET['DeliveryNumber'] > 0) )
-	|| isset($_GET['BatchInvoice'])) {
+|| isset($_GET['BatchInvoice'])) {
 
 	processing_start();
 
@@ -147,6 +150,7 @@ if (isset($_POST['_InvoiceDate_changed'])) {
 		$_POST['InvoiceDate']);
 	$Ajax->activate('due_date');
 }
+
 //-----------------------------------------------------------------------------
 function check_quantities()
 {
@@ -180,6 +184,24 @@ function check_quantities()
  return $ok;
 }
 
+function set_delivery_shipping_sum($delivery_notes) 
+{
+    
+    $shipping = 0;
+    
+    foreach($delivery_notes as $delivery_num) 
+    {
+        $myrow = get_customer_trans($delivery_num, 13);
+        //$branch = get_branch($myrow["branch_code"]);
+        //$sales_order = get_sales_order_header($myrow["order_"]);
+        
+        //$shipping += $sales_order['freight_cost'];
+        $shipping += $myrow['ov_freight'];
+    }
+    $_POST['ChargeFreightCost'] = price_format($shipping);
+}
+
+
 function copy_to_cart()
 {
 	$cart = &$_SESSION['Items'];
@@ -199,6 +221,7 @@ 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;
 }
 
 //-----------------------------------------------------------------------------
@@ -299,8 +322,10 @@ $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);
+hidden('cart_id');
 
 start_table("$table_style2 width=80%", 5);
 
@@ -432,6 +457,10 @@ if (!isset($_POST['ChargeFreightCost']) || $_POST['ChargeFreightCost'] == "") {
 	}
 }
 
+$accumulate_shipping = get_company_pref('accumulate_shipping');
+if ($is_batch_invoice && $accumulate_shipping)
+	set_delivery_shipping_sum(array_keys($_SESSION['Items']->src_docs));
+
 start_row();
 
 small_amount_cells(_("Shipping Cost"), 'ChargeFreightCost', null, "colspan=9 align=right");