X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_invoice.php;h=ec42340284cd6beb9034caa4dcc067dae6bb711e;hb=11109ad9f0e6af3f59d72731a95e473e72fb308b;hp=09d405eb415493cff7b6c09e33ada35ae7538f97;hpb=3faff3b471c0953bc1d11a6c00308779787a55f2;p=fa-stable.git diff --git a/sales/customer_invoice.php b/sales/customer_invoice.php index 09d405eb..ec423402 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,7 +26,7 @@ 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 (user_use_date_picker()) { @@ -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; @@ -540,13 +539,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 +603,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--; } @@ -694,4 +695,3 @@ end_form(); end_page(); -?>