X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_invoice.php;h=bd0e2d2bd9bfa6429fe827f2e917ea655a480de6;hb=f58466eea31b624deacaf5e5cd4b9de7995e0373;hp=e795a30f4dc2b3e33f30490dd4ab7f140f0e90b5;hpb=68372f2a08f5a862375c04862c8ccb56df830b4b;p=fa-stable.git
diff --git a/sales/customer_invoice.php b/sales/customer_invoice.php
index e795a30f..bd0e2d2b 100644
--- a/sales/customer_invoice.php
+++ b/sales/customer_invoice.php
@@ -1,4 +1,14 @@
.
+***********************************************************************/
//---------------------------------------------------------------------------
//
// Entry/Modify Sales Invoice against single delivery
@@ -35,6 +45,7 @@ if (isset($_GET['ModifyInvoice'])) {
page($_SESSION['page_title'], false, false, "", $js);
//-----------------------------------------------------------------------------
+check_edit_conflicts();
if (isset($_GET['AddedID'])) {
@@ -77,12 +88,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();
@@ -113,7 +128,7 @@ 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.
+ 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();
@@ -145,6 +160,7 @@ if (isset($_POST['_InvoiceDate_changed'])) {
$_POST['InvoiceDate']);
$Ajax->activate('due_date');
}
+
//-----------------------------------------------------------------------------
function check_quantities()
{
@@ -178,6 +194,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'];
@@ -197,6 +231,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;
}
//-----------------------------------------------------------------------------
@@ -263,6 +298,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();
@@ -297,8 +333,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);
+start_form();
+hidden('cart_id');
start_table("$table_style2 width=80%", 5);
@@ -330,23 +368,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');
@@ -430,6 +478,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");
@@ -462,7 +514,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();