X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_invoice.php;h=f306c08cdfda41888fa0576fe868f5de8518a706;hb=0b1257cb14406901c17a5d537d606d973ca3115c;hp=35d59fb78a7fff8c205169bb834ca1b7c0fa2aa8;hpb=286cf5800df151d9f31d73d445500b49062d8d7a;p=fa-stable.git diff --git a/sales/customer_invoice.php b/sales/customer_invoice.php index 35d59fb7..f306c08c 100644 --- a/sales/customer_invoice.php +++ b/sales/customer_invoice.php @@ -1,11 +1,21 @@ . +***********************************************************************/ //--------------------------------------------------------------------------- // // 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"); @@ -25,47 +35,60 @@ if ($use_date_picker) { if (isset($_GET['ModifyInvoice'])) { $_SESSION['page_title'] = sprintf(_("Modifying Sales Invoice # %d.") ,$_GET['ModifyInvoice']); - $help_page_title = _("Modifying Sales Invoice"); + $help_context = "Modifying Sales Invoice"; } elseif (isset($_GET['DeliveryNumber'])) { - $_SESSION['page_title'] = _("Issue an Invoice for Delivery Note"); + $_SESSION['page_title'] = _($help_context = "Issue an Invoice for Delivery Note"); } elseif (isset($_GET['BatchInvoice'])) { - $_SESSION['page_title'] = _("Issue Batch Invoice for Delivery Notes"); + $_SESSION['page_title'] = _($help_context = "Issue Batch Invoice for Delivery Notes"); } 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); + $trans_type = ST_SALESINVOICE; 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."-".$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); + 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"); + + $sql = "SELECT trans_type_from, trans_no_from FROM ".TB_PREF."cust_allocations + WHERE trans_type_to=".ST_SALESINVOICE." AND trans_no_to=".db_escape($invoice_no); + $result = db_query($sql, "could not retrieve customer allocation"); + $row = db_fetch($result); + + if ($row === false) + hyperlink_params("$path_to_root/sales/customer_payments.php", _("Entry &customer payment for this invoice"), + "SInvoice=".$invoice_no); + + 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']; - print_hidden_script(10); + $trans_type = ST_SALESINVOICE; 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(ST_SALESINVOICE, $invoice_no, _("&View This Invoice"))); echo '
'; - display_note(print_document_link($invoice_no, _("Print This Invoice"), true, 10)); + 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 A Different Invoice to Modify")); + hyperlink_no_params($path_to_root . "/sales/inquiry/customer_inquiry.php", _("Select Another &Invoice to Modify")); display_footer_exit(); @@ -79,12 +102,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(); @@ -94,8 +121,9 @@ 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(13, $src, true); + $dn = new Cart(ST_CUSTDELIVERY, $src, true); if ($dn->count_items() == 0) { hyperlink_params($path_to_root . "/sales/inquiry/sales_deliveries_view.php", @@ -103,25 +131,19 @@ if ( (isset($_GET['DeliveryNumber']) && ($_GET['DeliveryNumber'] > 0) ) die ("
" . _("There are no delivered items with a quantity left to invoice. There is nothing left to invoice.") . ""); } - $dn->trans_type = 10; - $dn->src_docs = $dn->trans_no; - $dn->trans_no = 0; - $dn->reference = references::get_next(10); - $dn->due_date = get_invoice_duedate($dn->customer_id, $dn->document_date); - $_SESSION['Items'] = $dn; copy_from_cart(); } 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.
+ if ( get_sales_parent_numbers(ST_SALESINVOICE, $_GET['ModifyInvoice']) == 0) { // 1.xx compatibility hack + 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(); } processing_start(); - $_SESSION['Items'] = new Cart(10, $_GET['ModifyInvoice']); + $_SESSION['Items'] = new Cart(ST_SALESINVOICE, $_GET['ModifyInvoice']); if ($_SESSION['Items']->count_items() == 0) { echo"

" . _("All quantities on this invoice has been credited. There is nothing to modify on this invoice") . "
"; @@ -136,17 +158,22 @@ 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']->customer_id, - $_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']); $Ajax->activate('due_date'); } + //----------------------------------------------------------------------------- function check_quantities() { @@ -180,6 +207,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']; @@ -187,7 +232,16 @@ function copy_to_cart() $cart->freight_cost = input_num('ChargeFreightCost'); $cart->document_date = $_POST['InvoiceDate']; $cart->due_date = $_POST['due_date']; + 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']; + } //----------------------------------------------------------------------------- @@ -199,12 +253,19 @@ 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; + $_POST['ref'] = $cart->reference; + $_POST['payment'] = $cart->payment; + $_POST['dimension_id'] = $cart->dimension_id; + $_POST['dimension2_id'] = $cart->dimension2_id; } //----------------------------------------------------------------------------- function check_data() { + global $Refs; + if (!isset($_POST['InvoiceDate']) || !is_date($_POST['InvoiceDate'])) { display_error(_("The entered invoice date is invalid.")); set_focus('InvoiceDate'); @@ -224,17 +285,11 @@ function check_data() } if ($_SESSION['Items']->trans_no == 0) { - if (!references::is_valid($_POST['ref'])) { + if (!$Refs->is_valid($_POST['ref'])) { display_error(_("You must enter a reference.")); set_focus('ref'); return false; } - - if (!is_new_reference($_POST['ref'], 10)) { - display_error(_("The entered reference is already in use.")); - set_focus('ref'); - return false; - } } if ($_POST['ChargeFreightCost'] == "") { @@ -262,19 +317,39 @@ function check_data() //----------------------------------------------------------------------------- if (isset($_POST['process_invoice']) && check_data()) { - $newinvoice= $_SESSION['Items']->trans_no == 0; copy_to_cart(); - $invoice_no = $_SESSION['Items']->write(); + if ($newinvoice) + new_doc_date($_SESSION['Items']->document_date); - processing_end(); - if ($newinvoice) { - meta_forward($_SERVER['PHP_SELF'], "AddedID=$invoice_no"); - } else { - meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$invoice_no"); + $invoice_no = $_SESSION['Items']->write(); + if ($invoice_no == -1) + { + display_error(_("The entered reference is already in use.")); + set_focus('ref'); } + else + { + processing_end(); + + if ($newinvoice) { + meta_forward($_SERVER['PHP_SELF'], "AddedID=$invoice_no"); + } else { + meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$invoice_no"); + } + } } +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; @@ -299,29 +374,54 @@ $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_table("$table_style2 width=80%", 5); +$is_edition = $_SESSION['Items']->trans_type == ST_SALESINVOICE && $_SESSION['Items']->trans_no != 0; +start_form(); +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(); 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'"); } -label_cells(_("Delivery Notes:"), -get_customer_trans_view_str(systypes::cust_dispatch(), 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'"); +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 + hidden('dimension_id', 0); + end_row(); start_row(); @@ -332,27 +432,49 @@ 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']); + $_POST['due_date'] = get_invoice_duedate($_SESSION['Items']->payment, $_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'"); +/* +if ($dim > 1) + label_cells(_("Dimension"). " 2", get_dimension_string($_SESSION['Items']->dimension2_id), "class='tableheader2'"); +else if ($dim > 0) + label_cell(" ", "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(); +$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'); -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")); @@ -406,9 +528,9 @@ foreach ($_SESSION['Items']->line_items as $line=>$ln_itm) { if ($dn_line_cnt == 0) { $dn_line_cnt = $dspans[0]; $dspans = array_slice($dspans, 1); - label_cell($ln_itm->src_no, "rowspan=$dn_line_cnt class=oddrow"); + label_cell($ln_itm->src_no, "rowspan=$dn_line_cnt class='oddrow'"); label_cell("" . _("Remove") . "", "rowspan=$dn_line_cnt class=oddrow"); + $ln_itm->src_no."'>" . _("Remove") . "", "rowspan=$dn_line_cnt class='oddrow'"); } $dn_line_cnt--; } @@ -432,9 +554,14 @@ if (!isset($_POST['ChargeFreightCost']) || $_POST['ChargeFreightCost'] == "") { } } -start_row(); +$accumulate_shipping = get_company_pref('accumulate_shipping'); +if ($is_batch_invoice && $accumulate_shipping) + set_delivery_shipping_sum(array_keys($_SESSION['Items']->src_docs)); -small_amount_cells(_("Shipping Cost"), 'ChargeFreightCost', null, "colspan=9 align=right"); +$colspan = 9; +start_row(); +label_cell(_("Shipping Cost"), "colspan=$colspan align=right"); +small_amount_cells(null, 'ChargeFreightCost', null); if ($is_batch_invoice) { label_cell('', 'colspan=2'); } @@ -444,19 +571,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); @@ -464,7 +591,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();