X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_invoice.php;h=10993cc040cd73cf76e91f54e3f59c8abf97f2d9;hb=f44132511cc91b83f20f91af0625d4b112b4c26e;hp=7f46f16968f61aea38bf28f7c13bd701422fcae5;hpb=5e63c6ace55729bbb5ee3b060035a25a4426eb0a;p=fa-stable.git diff --git a/sales/customer_invoice.php b/sales/customer_invoice.php index 7f46f169..10993cc0 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"); @@ -332,7 +331,7 @@ 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; @@ -440,7 +439,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; @@ -461,7 +460,10 @@ 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'"); } @@ -540,13 +542,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[] = ""; @@ -602,9 +606,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--; }