X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_invoice.php;h=e4ab5158322f95ef6fffea1a7f20fdf724a76317;hb=a31195793c023906ab5da62f06ab84aefed445c3;hp=d71084785717cbc44a37521e08eddb744925a97c;hpb=7e830126b96477e969fe3b48d9fc0e78f6c1fe00;p=fa-stable.git diff --git a/sales/customer_invoice.php b/sales/customer_invoice.php index d7108478..e4ab5158 100644 --- a/sales/customer_invoice.php +++ b/sales/customer_invoice.php @@ -19,7 +19,6 @@ $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"); -include_once($path_to_root . "/includes/manufacturing.inc"); include_once($path_to_root . "/sales/includes/sales_db.inc"); include_once($path_to_root . "/sales/includes/sales_ui.inc"); include_once($path_to_root . "/reporting/includes/reporting.inc"); @@ -27,10 +26,10 @@ include_once($path_to_root . "/taxes/tax_calc.inc"); include_once($path_to_root . "/admin/db/shipping_db.inc"); $js = ""; -if ($use_popup_windows) { +if ($SysPrefs->use_popup_windows) { $js .= get_js_open_window(900, 500); } -if ($use_date_picker) { +if (user_use_date_picker()) { $js .= get_js_date_picker(); } @@ -47,7 +46,8 @@ if (isset($_GET['ModifyInvoice'])) { page($_SESSION['page_title'], false, false, "", $js); //----------------------------------------------------------------------------- -check_edit_conflicts(); + +check_edit_conflicts(get_post('cart_id')); if (isset($_GET['AddedID'])) { @@ -65,6 +65,10 @@ if (isset($_GET['AddedID'])) { hyperlink_params("$path_to_root/sales/inquiry/sales_deliveries_view.php", _("Select Another &Delivery For Invoicing"), "OutstandingOnly=1"); + if (!db_num_rows(get_allocatable_from_cust_transactions(null, $invoice_no, $trans_type))) + 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(); @@ -104,7 +108,7 @@ if (isset($_GET['AddedID'])) { //----------------------------------------------------------------------------- if ( (isset($_GET['DeliveryNumber']) && ($_GET['DeliveryNumber'] > 0) ) -|| isset($_GET['BatchInvoice'])) { + || isset($_GET['BatchInvoice'])) { processing_start(); @@ -129,16 +133,8 @@ if ( (isset($_GET['DeliveryNumber']) && ($_GET['DeliveryNumber'] > 0) ) } elseif (isset($_GET['ModifyInvoice']) && $_GET['ModifyInvoice'] > 0) { - check_is_closed(ST_SALESINVOICE, $_GET['ModifyInvoice']); -/* - 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(); - } -*/ - check_is_closed(ST_SALESINVOICE, $_GET['ModifyInvoice']); + check_is_editable(ST_SALESINVOICE, $_GET['ModifyInvoice']); + processing_start(); $_SESSION['Items'] = new Cart(ST_SALESINVOICE, $_GET['ModifyInvoice']); @@ -149,44 +145,35 @@ if ( (isset($_GET['DeliveryNumber']) && ($_GET['DeliveryNumber'] > 0) ) copy_from_cart(); } elseif (isset($_GET['AllocationNumber']) || isset($_GET['InvoicePrepayments'])) { - check_deferred_income_act(_("You have to set Deferred Income Account in GL Setup to entry prepayment invoices.")); + check_deferred_income_act(_("You have to set Deferred Income Account in GL Setup to entry prepayment invoices.")); - if (isset($_GET['AllocationNumber'])) - { - $payments = array(get_cust_allocation($_GET['AllocationNumber'])); + if (isset($_GET['AllocationNumber'])) + { + $payments = array(get_cust_allocation($_GET['AllocationNumber'])); - if (!$payments || ($payments[0]['trans_type_to'] != ST_SALESORDER)) - { - display_error(_("Please select correct Sales Order Prepayment to be invoiced and try again.")); - display_footer_exit(); - } - $order_no = $payments[0]['trans_no_to']; - } - else { - $order_no = $_GET['InvoicePrepayments']; - $payments = get_payments_for($_GET['InvoicePrepayments'], ST_SALESORDER); + if (!$payments || ($payments[0]['trans_type_to'] != ST_SALESORDER)) + { + display_error(_("Please select correct Sales Order Prepayment to be invoiced and try again.")); + display_footer_exit(); } - processing_start(); - - $_SESSION['Items'] = new Cart(ST_SALESORDER, $order_no, ST_SALESINVOICE); - $_SESSION['Items']->order_no = $order_no; - $_SESSION['Items']->src_docs = array($order_no); - $_SESSION['Items']->trans_no = 0; - $_SESSION['Items']->trans_type = ST_SALESINVOICE; - $_SESSION['Items']->prepayments = $payments; - // prepayment invoice has all line quantities as stated on order. -// foreach($_SESSION['Items']->line_items as &$line) -// { -// $line->src_id = $line_id; -// $line->qty_dispatched = $line->quantity; -// } -// unset($line); - $_SESSION['Items']->update_payments(); - -// $_SESSION['Items']->alloc = $this_amount; - copy_from_cart(); + $order_no = $payments[0]['trans_no_to']; + } + else { + $order_no = $_GET['InvoicePrepayments']; + } + processing_start(); + + $_SESSION['Items'] = new cart(ST_SALESORDER, $order_no, ST_SALESINVOICE); + $_SESSION['Items']->order_no = $order_no; + $_SESSION['Items']->src_docs = array($order_no); + $_SESSION['Items']->trans_no = 0; + $_SESSION['Items']->trans_type = ST_SALESINVOICE; + + $_SESSION['Items']->update_payments(); + + copy_from_cart(); } - elseif (!processing_active()) { +elseif (!processing_active()) { /* This page can only be called with a delivery for invoicing or invoice no for edit */ display_error(_("This page can only be opened after delivery selection. Please select delivery to invoicing first.")); @@ -246,11 +233,8 @@ function set_delivery_shipping_sum($delivery_notes) 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']; + $myrow = get_customer_trans($delivery_num, ST_CUSTDELIVERY); + $shipping += $myrow['ov_freight']; } $_POST['ChargeFreightCost'] = price_format($shipping); @@ -328,17 +312,11 @@ function check_data() } if ($_SESSION['Items']->trans_no == 0) { - if (!$Refs->is_valid($_POST['ref'])) { + if (!$Refs->is_valid($_POST['ref'], ST_SALESINVOICE)) { 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(!$prepaid) @@ -363,7 +341,7 @@ function check_data() return false; } } else { - if (($_SESSION['Items']->payment_terms['days_before_due'] < 0) && !count($_SESSION['Items']->prepayments)) { + if (($_SESSION['Items']->payment_terms['days_before_due'] == -1) && !count($_SESSION['Items']->prepayments)) { display_error(_("There is no non-invoiced payments for this order. If you want to issue final invoice, select delayed or cash payment terms.")); return false; } @@ -374,19 +352,28 @@ function check_data() //----------------------------------------------------------------------------- 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(); + if ($newinvoice) + new_doc_date($_SESSION['Items']->document_date); - 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')) { @@ -434,7 +421,7 @@ $is_edition = $_SESSION['Items']->trans_type == ST_SALESINVOICE && $_SESSION['It start_form(); hidden('cart_id'); -start_table(TABLESTYLE2, "width=80%", 5); +start_table(TABLESTYLE2, "width='80%'", 5); start_row(); $colspan = 1; @@ -455,20 +442,17 @@ end_row(); start_row(); if ($_SESSION['Items']->trans_no == 0) { - ref_cells(_("Reference"), 'ref', '', null, "class='tableheader2'"); + ref_cells(_("Reference"), 'ref', '', null, "class='tableheader2'", false, ST_SALESINVOICE, + array('customer' => $_SESSION['Items']->customer_id, + 'branch' => $_SESSION['Items']->Branch, + 'date' => get_post('InvoiceDate'))); } else { 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(_("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; @@ -506,12 +490,6 @@ 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(" ", "colspan=2"); -*/ if ($dim > 1) { label_cell(_("Dimension")." 2:", "class='tableheader2'"); $_POST['dimension2_id'] = $_SESSION['Items']->dimension2_id; @@ -534,13 +512,15 @@ if ($row['dissallow_invoices'] == 1) display_heading($prepaid ? _("Sales Order Items") : _("Invoice Items")); div_start('Items'); -start_table(TABLESTYLE, "width=80%"); + +start_table(TABLESTYLE, "width='80%'"); if ($prepaid) $th = array(_("Item Code"), _("Item Description"), _("Units"), _("Quantity"), _("Price"), _("Tax Type"), _("Discount"), _("Total")); else $th = array(_("Item Code"), _("Item Description"), _("Delivered"), _("Units"), _("Invoiced"), _("This Invoice"), _("Price"), _("Tax Type"), _("Discount"), _("Total")); + if ($is_batch_invoice) { $th[] = _("DN"); $th[] = ""; @@ -596,9 +576,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--; } @@ -688,4 +668,3 @@ end_form(); end_page(); -?>