From: Janusz Dobrowolski Date: Wed, 5 Nov 2008 22:31:21 +0000 (+0000) Subject: Rewrite to use db_pager. X-Git-Tag: v2.4.2~19^2~1795 X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=348062667e6a96e9849bf25de0f2a426b4f0b9c6;p=fa-stable.git Rewrite to use db_pager. --- diff --git a/sales/inquiry/customer_allocation_inquiry.php b/sales/inquiry/customer_allocation_inquiry.php index 2770fb22..c16cb253 100644 --- a/sales/inquiry/customer_allocation_inquiry.php +++ b/sales/inquiry/customer_allocation_inquiry.php @@ -2,6 +2,7 @@ $page_security = 1; $path_to_root="../.."; +include($path_to_root . "/includes/db_pager.inc"); include_once($path_to_root . "/includes/session.inc"); include_once($path_to_root . "/sales/includes/sales_ui.inc"); @@ -47,181 +48,191 @@ end_table(); end_form(); //------------------------------------------------------------------------------------------------ +function check_overdue($row) +{ + return ($row['OverDue'] == 1 + && (abs($row["TotalAmount"]) - $row["Allocated"] != 0)); +} + +function order_link($row) +{ + return $row['order_']>0 ? + get_customer_trans_view_str(systypes::sales_order(), $row['order_']) + : ""; +} + +function systype_name($dummy, $type) +{ + return systypes::name($type); +} + +function view_link($trans) +{ + return get_trans_view_str($trans["type"], $trans["trans_no"]); +} -function get_transactions() +function due_date($row) { - $data_after = date2sql($_POST['TransAfterDate']); - $date_to = date2sql($_POST['TransToDate']); - - $sql = "SELECT ".TB_PREF."debtor_trans.*, - ".TB_PREF."debtors_master.name AS CustName, ".TB_PREF."debtors_master.curr_code AS CustCurrCode, - (".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + " - .TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount) - AS TotalAmount, - ".TB_PREF."debtor_trans.alloc AS Allocated, - ((".TB_PREF."debtor_trans.type = 10) - AND ".TB_PREF."debtor_trans.due_date < '" . date2sql(Today()) . "') AS OverDue - FROM ".TB_PREF."debtor_trans, ".TB_PREF."debtors_master - WHERE ".TB_PREF."debtors_master.debtor_no = ".TB_PREF."debtor_trans.debtor_no - AND (".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + " - .TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount != 0) - AND ".TB_PREF."debtor_trans.tran_date >= '$data_after' - AND ".TB_PREF."debtor_trans.tran_date <= '$date_to'"; + return $row["type"] == 10 ? sql2date($row["due_date"]) : ''; +} + +function fmt_balance($row) +{ + return price_format($row["TotalAmount"] - $row["Allocated"]); +} + +function alloc_link($row) +{ + $link = + pager_link(_("Allocation"), + "/sales/allocations/customer_allocate.php?trans_no=" . $row["trans_no"] + ."&trans_type=" . $row["type"]); + + if ($row["type"] == 11 && $row['TotalAmount'] > 0) + { + /*its a credit note which could have an allocation */ + return $link; + } + elseif (($row["type"] == systypes::cust_payment() || $row["type"] == systypes::bank_deposit()) && + ($row['TotalAmount'] - $row['Allocated']) > 0) + { + /*its a receipt which could have an allocation*/ + return $link; + } + elseif ($row["type"] == systypes::cust_payment() && $row['TotalAmount'] < 0) + { + /*its a negative receipt */ + return ''; + } +} + +function fmt_debit($row) +{ + $value = + $row['type']==11 || $row['type']==12 || $row['type']==2 ? + -$row["TotalAmount"] : $row["TotalAmount"]; + return $value>=0 ? price_format($value) : ''; + +} + +function fmt_credit($row) +{ + $value = + !($row['type']==11 || $row['type']==12 || $row['type']==2) ? + -$row["TotalAmount"] : $row["TotalAmount"]; + return $value>0 ? price_format($value) : ''; +} +//------------------------------------------------------------------------------------------------ + + $data_after = date2sql($_POST['TransAfterDate']); + $date_to = date2sql($_POST['TransToDate']); + + $sql = "SELECT + trans.type, + trans.order_, + trans.trans_no, + trans.reference, + trans.tran_date, + trans.due_date, + debtor.name, + debtor.curr_code, + (trans.ov_amount + trans.ov_gst + trans.ov_freight + + trans.ov_freight_tax + trans.ov_discount) AS TotalAmount, + trans.alloc AS Allocated, + ((trans.type = 10) + AND trans.due_date < '" . date2sql(Today()) . "') AS OverDue + FROM " + .TB_PREF."debtor_trans as trans, " + .TB_PREF."debtors_master as debtor + WHERE debtor.debtor_no = trans.debtor_no + AND (trans.ov_amount + trans.ov_gst + trans.ov_freight + + trans.ov_freight_tax + trans.ov_discount != 0) + AND trans.tran_date >= '$data_after' + AND trans.tran_date <= '$date_to'"; if ($_POST['customer_id'] != reserved_words::get_all()) - $sql .= " AND ".TB_PREF."debtor_trans.debtor_no = '" . $_POST['customer_id'] . "'"; + $sql .= " AND trans.debtor_no = '" . $_POST['customer_id'] . "'"; if (isset($_POST['filterType']) && $_POST['filterType'] != reserved_words::get_all()) { if ($_POST['filterType'] == '1' || $_POST['filterType'] == '2') { - $sql .= " AND ".TB_PREF."debtor_trans.type = 10 "; + $sql .= " AND trans.type = 10 "; } elseif ($_POST['filterType'] == '3') { - $sql .= " AND ".TB_PREF."debtor_trans.type = " . systypes::cust_payment(); + $sql .= " AND trans.type = " . systypes::cust_payment(); } elseif ($_POST['filterType'] == '4') { - $sql .= " AND ".TB_PREF."debtor_trans.type = 11 "; + $sql .= " AND trans.type = 11 "; } if ($_POST['filterType'] == '2') { $today = date2sql(Today()); - $sql .= " AND ".TB_PREF."debtor_trans.due_date < '$today' - AND (round(abs(".TB_PREF."debtor_trans.ov_amount + " - .TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight + " - .TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount) - ".TB_PREF."debtor_trans.alloc,6) > 0) "; + $sql .= " AND trans.due_date < '$today' + AND (round(abs(trans.ov_amount + " + ."trans.ov_gst + trans.ov_freight + " + ."trans.ov_freight_tax + trans.ov_discount) - trans.alloc,6) > 0) "; } }else { - $sql .= " AND ".TB_PREF."debtor_trans.type != 13 "; + $sql .= " AND trans.type != 13 "; } if (!check_value('showSettled')) { - $sql .= " AND (round(abs(".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + " - .TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_freight_tax + " - .TB_PREF."debtor_trans.ov_discount) - ".TB_PREF."debtor_trans.alloc,6) != 0) "; + $sql .= " AND (round(abs(trans.ov_amount + trans.ov_gst + " + ."trans.ov_freight + trans.ov_freight_tax + " + ."trans.ov_discount) - trans.alloc,6) != 0) "; } - $sql .= " ORDER BY ".TB_PREF."debtor_trans.tran_date"; - - return db_query($sql,"No transactions were returned"); -} - -//------------------------------------------------------------------------------------------------ +// $sql .= " ORDER BY trans.tran_date"; -$result = get_transactions(); - -//------------------------------------------------------------------------------------------------ -if(get_post('RefreshInquiry')) -{ - $Ajax->activate('doc_tbl'); -} -//------------------------------------------------------------------------------------------------ -div_start('doc_tbl'); +/* if (db_num_rows($result) == 0) { display_note(_("The selected customer has no transactions for the given dates."), 1, 1); } else { +*/ +// start_table("$table_style width='80%'"); +//------------------------------------------------------------------------------------------------ +$cols = array( + _("Type") => array('type'=>'spec', 'fun'=>'systype_name'), + _("Number") => array('type'=>'spec', 'fun'=>'view_link'), + _("Reference"), + _("Order") => array('type'=>'spec', 'fun'=>'order_link'), + _("Date") => array('type'=>'date', 'ord'=>'asc'), + _("Due Date") => array('type'=>'spec', 'fun'=>'due_date'), + _("Customer"), + _("Currency"), + _("Debit") => array('type'=>'spec', 'fun'=>'fmt_debit'), + _("Credit") => array('type'=>'insert', 'fun'=>'fmt_credit'), + _("Allocated") => 'amount', + _("Balance") => array('type'=>'insert', 'fun'=>'fmt_balance'), + array('type'=>'insert', 'fun'=>'alloc_link') + ); + +if ($_POST['customer_id'] != reserved_words::get_all()) { + array_remove($cols, 6, 2); +} - start_table("$table_style width='80%'"); - -if ($_POST['customer_id'] == reserved_words::get_all()) - $th = array(_("Type"), _("Number"), _("Reference"), _("Order"), _("Date"), _("Due Date"), - _("Customer"), _("Currency"), _("Debit"), _("Credit"), _("Allocated"), _("Balance"), ""); -else - $th = array(_("Type"), _("Number"), _("Reference"), _("Order"), _("Date"), _("Due Date"), - _("Debit"), _("Credit"), _("Allocated"), _("Balance"), ""); - -table_header($th); +$table =& new_db_pager('doc_tbl', $sql, $cols); +$table->set_marker('check_overdue', _("Marked items are overdue.")); -$j = 1; -$k = 0; //row colour counter -$over_due = false; -while ($myrow = db_fetch($result)) +if(get_post('RefreshInquiry')) { - - if ($myrow['OverDue'] == 1 && (abs($myrow["TotalAmount"]) - $myrow["Allocated"] != 0)) - { - start_row("class='overduebg'"); - $over_due = true; - } - else - alt_table_row_color($k); - - $date = sql2date($myrow["tran_date"]); - - if ($myrow["order_"] > 0) - $preview_order_str = get_customer_trans_view_str(systypes::sales_order(), $myrow["order_"]); - else - $preview_order_str = ""; - - $allocations_str = ""; - - $allocations = "" . _("Allocation") . ""; - - $due_date_str = ""; - - if ($myrow["type"] == 10) - $due_date_str = sql2date($myrow["due_date"]); - elseif ($myrow["type"] == 11 && $myrow['TotalAmount'] > 0) - { - /*its a credit note which could have an allocation */ - $allocations_str = $allocations; - - } - elseif (($myrow["type"] == systypes::cust_payment() || $myrow["type"] == systypes::bank_deposit()) && - ($myrow['TotalAmount'] - $myrow['Allocated']) > 0) - { - /*its a receipt which could have an allocation*/ - $allocations_str = $allocations; - - } - elseif ($myrow["type"] == systypes::cust_payment() && $myrow['TotalAmount'] < 0) - { - /*its a negative receipt */ - } - - label_cell(systypes::name($myrow["type"])); - label_cell(get_trans_view_str($myrow["type"], $myrow["trans_no"])); - label_cell($myrow["reference"]); - label_cell($preview_order_str); - label_cell(sql2date($myrow["tran_date"]), "nowrap"); - label_cell($due_date_str, "nowrap"); - if ($_POST['customer_id'] == reserved_words::get_all()) - { - label_cell($myrow["CustName"]); - label_cell($myrow["CustCurrCode"]); - } - display_debit_or_credit_cells( - $myrow['type']==11 || $myrow['type']==12 || $myrow['type']==2 ? - -$myrow["TotalAmount"] : $myrow["TotalAmount"]); - amount_cell(abs($myrow["Allocated"])); - amount_cell(abs($myrow["TotalAmount"]) - $myrow["Allocated"]); - label_cell($allocations_str); - - - end_row(); - - $j++; - If ($j == 12) - { - $j = 1; - table_header($th); - } -//end of page full new headings if -} -//end of while loop -end_table(1); -if ($over_due) - display_note(_("Marked items are overdue."), 0, 1, "class='overduefg'"); + $table->set_sql($sql); + $Ajax->activate('doc_tbl'); } -div_end(); + + start_form(); + display_db_pager($table); + end_form(); end_page(); + ?> diff --git a/sales/inquiry/customer_inquiry.php b/sales/inquiry/customer_inquiry.php index bbe6f9a8..e104b682 100644 --- a/sales/inquiry/customer_inquiry.php +++ b/sales/inquiry/customer_inquiry.php @@ -2,6 +2,7 @@ $page_security = 1; $path_to_root="../.."; +include($path_to_root . "/includes/db_pager.inc"); include_once($path_to_root . "/includes/session.inc"); include_once($path_to_root . "/sales/includes/sales_ui.inc"); @@ -83,212 +84,224 @@ function display_customer_summary($customer_record) end_table();; } +//------------------------------------------------------------------------------------------------ + +div_start('totals_tbl'); +if ($_POST['customer_id'] != "" && $_POST['customer_id'] != reserved_words::get_all()) +{ + $customer_record = get_customer_details($_POST['customer_id'], $_POST['TransToDate']); + display_customer_summary($customer_record); + echo "
"; +} +div_end(); + //------------------------------------------------------------------------------------------------ +function systype_name($dummy, $type) +{ + return systypes::name($type); +} + +function order_view($row) +{ + return $row['order_']>0 ? + get_customer_trans_view_str(systypes::sales_order(), $row['order_']) + : ""; +} + +function trans_view($trans) +{ + return get_trans_view_str($trans["type"], $trans["trans_no"]); +} + +function due_date($row) +{ + return $row["type"] == 10 ? sql2date($row["due_date"]) : ''; +} + +function fmt_balance($row) +{ + return price_format($row["TotalAmount"] - $row["Allocated"]); +} -function get_transactions() +function gl_view($row) { + return get_gl_view_str($row["type"], $row["trans_no"]); +} + +function fmt_debit($row) +{ + $value = + $row['type']==11 || $row['type']==12 || $row['type']==2 ? + -$row["TotalAmount"] : $row["TotalAmount"]; + return $value>=0 ? price_format($value) : ''; + +} + +function fmt_credit($row) +{ + $value = + !($row['type']==11 || $row['type']==12 || $row['type']==2) ? + -$row["TotalAmount"] : $row["TotalAmount"]; + return $value>0 ? price_format($value) : ''; +} + +function alloc_link($row) +{ + if ($row['type'] == 10) + if ($row["TotalAmount"] - $row["Allocated"] > 0) + return pager_link(_("Allocation"), + "/sales/allocations/customer_allocate.php" + ."?trans_no={$row['trans_no']}&trans_type=" + .$row['type']); + return ''; +} + +function credit_link($row) +{ + return $row['type'] == 10 ? + pager_link(_("Credit This"), + "/sales/customer_credit_invoice.php?InvoiceNumber=". + $row['trans_no']) + : ''; +} + +function edit_link($row) +{ + $str = ''; + + switch($row['type']) { + case 10: + $str = "/sales/customer_invoice.php?ModifyInvoice=".$row['trans_no']; + break; + case 11: + if ($row['order_']==0) // free-hand credit note + $str = "/sales/credit_note_entry.php?ModifyCredit=".$row['trans_no']; + else // credit invoice + $str = "/sales/customer_credit_invoice.php?ModifyCredit=".$row['trans_no']; + break; + case 13: + $str = "/sales/customer_delivery.php?ModifyDelivery=".$row['trans_no']; + break; + } + return pager_link(_('Edit'), $str); +} + +function prt_link($row) +{ + if ($row['type'] != 12) // customer payment printout not defined yet. + return print_document_link($row['trans_no'], _("Print"), true, $row['type']); +} + +function check_overdue($row) +{ + return $row['OverDue'] == 1 + && (abs($row["TotalAmount"]) - $row["Allocated"] != 0); +} +//------------------------------------------------------------------------------------------------ $date_after = date2sql($_POST['TransAfterDate']); $date_to = date2sql($_POST['TransToDate']); - $sql = "SELECT ".TB_PREF."debtor_trans.*, - ".TB_PREF."debtors_master.name AS CustName, ".TB_PREF."debtors_master.curr_code AS CustCurrCode, - (".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + " - .TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount) - AS TotalAmount, ".TB_PREF."debtor_trans.alloc AS Allocated, - ((".TB_PREF."debtor_trans.type = 10) - AND ".TB_PREF."debtor_trans.due_date < '" . date2sql(Today()) . "') AS OverDue - FROM ".TB_PREF."debtor_trans, ".TB_PREF."debtors_master - WHERE ".TB_PREF."debtors_master.debtor_no = ".TB_PREF."debtor_trans.debtor_no - AND ".TB_PREF."debtor_trans.tran_date >= '$date_after' - AND ".TB_PREF."debtor_trans.tran_date <= '$date_to'"; + $sql = "SELECT + trans.type, + trans.trans_no, + trans.order_, + trans.reference, + trans.tran_date, + trans.due_date, + debtor.name, + branch.br_name, + debtor.curr_code, + (trans.ov_amount + trans.ov_gst + trans.ov_freight + + trans.ov_freight_tax + trans.ov_discount) AS TotalAmount, + trans.alloc AS Allocated, + ((trans.type = 10) + AND trans.due_date < '" . date2sql(Today()) . "') AS OverDue + FROM " + .TB_PREF."debtor_trans as trans, " + .TB_PREF."debtors_master as debtor, " + .TB_PREF."cust_branch as branch + WHERE debtor.debtor_no = trans.debtor_no + AND trans.tran_date >= '$date_after' + AND trans.tran_date <= '$date_to'"; if ($_POST['customer_id'] != reserved_words::get_all()) - $sql .= " AND ".TB_PREF."debtor_trans.debtor_no = '" . $_POST['customer_id'] . "'"; + $sql .= " AND trans.debtor_no = '" . $_POST['customer_id'] . "'"; if ($_POST['filterType'] != reserved_words::get_all()) { if ($_POST['filterType'] == '1') { - $sql .= " AND (".TB_PREF."debtor_trans.type = 10 OR ".TB_PREF."debtor_trans.type = 1) "; + $sql .= " AND (trans.type = 10 OR trans.type = 1) "; } elseif ($_POST['filterType'] == '2') { - $sql .= " AND (".TB_PREF."debtor_trans.type = 10) "; + $sql .= " AND (trans.type = 10) "; } elseif ($_POST['filterType'] == '3') { - $sql .= " AND (".TB_PREF."debtor_trans.type = " . systypes::cust_payment() . " OR ".TB_PREF."debtor_trans.type = 2) "; + $sql .= " AND (trans.type = " . systypes::cust_payment() + ." OR trans.type = 2) "; } elseif ($_POST['filterType'] == '4') { - $sql .= " AND ".TB_PREF."debtor_trans.type = 11 "; + $sql .= " AND trans.type = 11 "; } elseif ($_POST['filterType'] == '5') { - $sql .= " AND ".TB_PREF."debtor_trans.type = 13 "; + $sql .= " AND trans.type = 13 "; } if ($_POST['filterType'] == '2') { $today = date2sql(Today()); - $sql .= " AND ".TB_PREF."debtor_trans.due_date < '$today' - AND (".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + " - .TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_freight + " - .TB_PREF."debtor_trans.ov_discount - ".TB_PREF."debtor_trans.alloc > 0) "; + $sql .= " AND trans.due_date < '$today' + AND (trans.ov_amount + trans.ov_gst + trans.ov_freight_tax + + trans.ov_freight + trans.ov_discount - trans.alloc > 0) "; } } - $sql .= " ORDER BY ".TB_PREF."debtor_trans.tran_date DESC, - ".TB_PREF."debtor_trans.type,".TB_PREF."debtor_trans.trans_no "; +//------------------------------------------------------------------------------------------------ - return db_query($sql,"No transactions were returned"); +$cols = array( + _("Type") => array('type'=>'spec', 'fun'=>'systype_name', 'ord'=>''), + _("#") => array('type'=>'spec', 'fun'=>'trans_view', 'ord'=>''), + _("Order") => array('type'=>'spec', 'fun'=>'order_view'), + _("Reference"), + _("Date") => array('type'=>'date', 'ord'=>'desc'), + _("Due Date") => array('type'=>'spec', 'fun'=>'due_date'), + _("Customer"), + _("Branch"), + _("Currency"), + _("Debit") => array('type'=>'spec', 'fun'=>'fmt_debit'), + _("Credit") => array('type'=>'insert', 'fun'=>'fmt_credit'), + array('type'=>'insert', 'fun'=>'alloc_link'), + array('type'=>'insert', 'fun'=>'credit_link'), + array('type'=>'insert', 'fun'=>'edit_link'), + array('type'=>'insert', 'fun'=>'prt_link') + ); + +if ($_POST['customer_id'] != reserved_words::get_all()) { + array_remove($cols, 6); + array_remove($cols, 8); } -//------------------------------------------------------------------------------------------------ -div_start('totals_tbl'); -if ($_POST['customer_id'] != "" && $_POST['customer_id'] != reserved_words::get_all()) -{ - $customer_record = get_customer_details($_POST['customer_id'], $_POST['TransToDate']); - display_customer_summary($customer_record); - echo "
"; -} -div_end(); -//------------------------------------------------------------------------------------------------ +$table =& new_db_pager('trans_tbl', $sql, $cols); +$table->set_marker('check_overdue', _("Marked items are overdue.")); -$result = get_transactions(); -//------------------------------------------------------------------------------------------------ if(get_post('RefreshInquiry')) { + $table->set_sql($sql); $Ajax->activate('trans_tbl'); $Ajax->activate('totals_tbl'); } -//------------------------------------------------------------------------------------------------ - -div_start('trans_tbl'); -if (db_num_rows($result) == 0) -{ - display_note(_("The selected customer has no transactions for the given dates."), 0, 2); -} else { - - start_table("$table_style width='80%'"); - - $th = array(_("Type"), _("#"), _("Order"), _("Reference"), _("Date"), _("Due Date"), - _("Customer"), _("Branch"), _("Currency"), _("Debit"), _("Credit"), "", "","",""); - - if ($_POST['customer_id'] != reserved_words::get_all()) { - unset($th[6], $th[8]); - } - table_header($th); - - - $j = 1; - $k = 0; //row colour counter - $over_due = false; - while ($myrow = db_fetch($result)) - { - - if ($myrow['OverDue'] == 1) - { - start_row("class='overduebg'"); - $over_due = true; - } - else - alt_table_row_color($k); - - $edit_page=''; - $due_date_str = ''; - $credit_me_str = ''; - - switch($myrow['type']) { - case 10: - $due_date_str = sql2date($myrow["due_date"]); - /*Show a link to allow an invoice to be credited */ - // only allow crediting if it's not been totally allocated - if ($myrow["TotalAmount"] - $myrow["Allocated"] > 0) - $credit_me_str = "" . _("Credit This") . ""; - $edit_page= $path_to_root.'/sales/customer_invoice.php?ModifyInvoice=' - . $myrow['trans_no']; - break; - - case 11: - if ($myrow['order_']==0) // free-hand credit note - $edit_page= $path_to_root.'/sales/credit_note_entry.php?ModifyCredit=' - . $myrow['trans_no']; - else // credit invoice - $edit_page= $path_to_root.'/sales/customer_credit_invoice.php?ModifyCredit=' - . $myrow['trans_no']; - break; - - case 13: - $edit_page= $path_to_root.'/sales/customer_delivery.php?ModifyDelivery=' - . $myrow['trans_no']; break; - } - - $date = sql2date($myrow["tran_date"]); - - if ($myrow["order_"] > 0) - $preview_order_str = get_customer_trans_view_str(systypes::sales_order(), $myrow["order_"]); - else - $preview_order_str = ""; - - $gl_trans_str = get_gl_view_str_cell($myrow["type"], $myrow["trans_no"]); - - $branch_name = ""; - if ($myrow["branch_code"] > 0) - { - $branch_name = get_branch_name($myrow["branch_code"]); - } - - $preview_trans_str = get_trans_view_str($myrow["type"], $myrow["trans_no"]); - - label_cell(systypes::name($myrow["type"])); - - label_cell($preview_trans_str); - label_cell($preview_order_str); - label_cell($myrow["reference"]); - label_cell($date, "nowrap"); - label_cell($due_date_str, "nowrap"); - if ($_POST['customer_id'] == reserved_words::get_all()) - label_cell($myrow["CustName"]); - label_cell($branch_name); - if ($_POST['customer_id'] == reserved_words::get_all()) - label_cell($myrow["CustCurrCode"]); - display_debit_or_credit_cells( - $myrow['type']==11 || $myrow['type']==12 || $myrow['type']==2 ? - -$myrow["TotalAmount"] : $myrow["TotalAmount"]); - - echo $gl_trans_str; - - label_cell($edit_page=='' ? '' : "" . _('Edit') . ''); - if ($myrow['type'] != 12) // customer payment printout not defined yet. - label_cell(print_document_link($myrow['trans_no'], _("Print"), true, $myrow['type'])); - else - label_cell(""); - - if ($credit_me_str != "") - label_cell($credit_me_str, "nowrap"); - else - label_cell(''); - end_row(); - - $j++; - if ($j == 12) - { - $j = 1; - table_header($th); - } //end of page full new headings if - } //end of transaction while loop - - end_table(1); - - if ($over_due) - display_note(_("Marked items are overdue."), 0, 1, "class='overduefg'"); -} -div_end(); + start_form(); + display_db_pager($table); + end_form(); end_page(); + ?> diff --git a/sales/inquiry/sales_deliveries_view.php b/sales/inquiry/sales_deliveries_view.php index ce039d12..7362010f 100644 --- a/sales/inquiry/sales_deliveries_view.php +++ b/sales/inquiry/sales_deliveries_view.php @@ -2,6 +2,7 @@ $page_security = 2; $path_to_root="../.."; +include($path_to_root . "/includes/db_pager.inc"); include($path_to_root . "/includes/session.inc"); include($path_to_root . "/sales/includes/sales_ui.inc"); @@ -37,50 +38,37 @@ else if (isset($_POST['BatchInvoice'])) { - // checking batch integrity $del_count = 0; - foreach($_SESSION['Batch'] as $delivery) - { - $checkbox = 'Sel_'.$delivery['trans']; - if (check_value($checkbox)) - { - if (!$del_count) - { - $del_customer = $delivery['cust']; - $del_branch = $delivery['branch']; + foreach($_POST['Sel_'] as $delivery => $branch) { + $checkbox = 'Sel_'.$delivery; + if (check_value($checkbox)) { + if (!$del_count) { + $del_branch = $branch; } - else - { - if ($del_customer!=$delivery['cust'] || $del_branch != $delivery['branch']) - { + else { + if ($del_branch != $branch) { $del_count=0; break; } } - $selected[] = $delivery['trans']; + $selected[] = $delivery; $del_count++; } } - if (!$del_count) - { + if (!$del_count) { display_error(_('For batch invoicing you should select at least one delivery. All items must be dispatched to the same customer branch.')); - } - else - { + } else { $_SESSION['DeliveryBatch'] = $selected; meta_forward($path_to_root . '/sales/customer_invoice.php','BatchInvoice=Yes'); } } //----------------------------------------------------------------------------------- -if (get_post('SearchOrders')) -{ - $Ajax->activate('deliveries_tbl'); -} elseif (get_post('_DeliveryNumber_changed')) +if (get_post('_DeliveryNumber_changed')) { $disable = get_post('DeliveryNumber') !== ''; @@ -132,71 +120,120 @@ else } //--------------------------------------------------------------------------------------------- -$sql = "SELECT ".TB_PREF."debtor_trans.trans_no, " - .TB_PREF."debtors_master.curr_code, " - .TB_PREF."debtors_master.name, " - .TB_PREF."cust_branch.br_name, " - .TB_PREF."debtor_trans.reference, " - .TB_PREF."debtor_trans.tran_date, " - .TB_PREF."debtor_trans.due_date, " - .TB_PREF."sales_orders.customer_ref, " - .TB_PREF."sales_orders.deliver_to, "; - -$sql .= " Sum(".TB_PREF."debtor_trans_details.quantity-" - .TB_PREF."debtor_trans_details.qty_done) AS Outstanding, "; - -$sql .= " Sum(".TB_PREF."debtor_trans_details.qty_done) AS Done, "; - -$sql .= "(ov_amount+ov_gst+ov_freight+ov_freight_tax) AS DeliveryValue"; -$sql .=" FROM " - .TB_PREF."sales_orders, " - .TB_PREF."debtor_trans, " - .TB_PREF."debtor_trans_details, " - .TB_PREF."debtors_master, " - .TB_PREF."cust_branch - WHERE " - .TB_PREF."sales_orders.order_no = ".TB_PREF."debtor_trans.order_ AND " - .TB_PREF."debtor_trans.debtor_no = ".TB_PREF."debtors_master.debtor_no - AND ".TB_PREF."debtor_trans.type = 13 - AND ".TB_PREF."debtor_trans_details.debtor_trans_no = ".TB_PREF."debtor_trans.trans_no - AND ".TB_PREF."debtor_trans_details.debtor_trans_type = ".TB_PREF."debtor_trans.type - AND ".TB_PREF."debtor_trans.branch_code = ".TB_PREF."cust_branch.branch_code - AND ".TB_PREF."debtor_trans.debtor_no = ".TB_PREF."cust_branch.debtor_no "; - - if ($_POST['OutstandingOnly'] == true) { - $sql .= " AND ".TB_PREF."debtor_trans_details.qty_done < ".TB_PREF."debtor_trans_details.quantity "; - } +function trans_view($trans, $trans_no) +{ + return get_customer_trans_view_str(13, $trans['trans_no']); +} + +function batch_checkbox($row) +{ + $name = "Sel_" .$row['trans_no']; + return $row['Done'] ? '' : + "
" +// add also trans_no => branch code for checking after 'Batch' submit + ."\n"; +} + +function edit_link($row) +{ + return $row["Outstanding"]==0 ? '' : + pager_link(_('Edit'), "/sales/customer_delivery.php?ModifyDelivery=" + .$row['trans_no']); +} + +function prt_link($row) +{ + return print_document_link($row['trans_no'], _("Print"), true, 13); +} + +function invoice_link($row) +{ + return $row["Outstanding"]==0 ? '' : + pager_link(_('Invoice'), "/sales/customer_invoice.php?DeliveryNumber=" + .$row['trans_no']); +} + +function check_overdue($row) +{ + return date1_greater_date2(Today(), sql2date($row["due_date"])) && + $row["Outstanding"]!=0; +} +//------------------------------------------------------------------------------------------------ +$sql = "SELECT trans.trans_no, + debtor.name, + branch.branch_code, + branch.br_name, + sorder.deliver_to, + trans.reference, + sorder.customer_ref, + trans.tran_date, + trans.due_date, + (ov_amount+ov_gst+ov_freight+ov_freight_tax) AS DeliveryValue, + debtor.curr_code, + Sum(line.quantity-line.qty_done) AS Outstanding, + Sum(line.qty_done) AS Done + FROM " + .TB_PREF."sales_orders as sorder, " + .TB_PREF."debtor_trans as trans, " + .TB_PREF."debtor_trans_details as line, " + .TB_PREF."debtors_master as debtor, " + .TB_PREF."cust_branch as branch + WHERE + sorder.order_no = trans.order_ AND + trans.debtor_no = debtor.debtor_no + AND trans.type = 13 + AND line.debtor_trans_no = trans.trans_no + AND line.debtor_trans_type = trans.type + AND trans.branch_code = branch.branch_code + AND trans.debtor_no = branch.debtor_no "; + +if ($_POST['OutstandingOnly'] == true) { + $sql .= " AND line.qty_done < line.quantity "; +} //figure out the sql required from the inputs available if (isset($_POST['DeliveryNumber']) && $_POST['DeliveryNumber'] != "") { -// if ($_POST['DeliveryNumber'] != '*') // TODO paged table - $sql .= " AND ".TB_PREF."debtor_trans.trans_no LIKE '%". $_POST['DeliveryNumber'] ."'"; - $sql .= " GROUP BY ".TB_PREF."debtor_trans.trans_no"; + $sql .= " AND trans.trans_no LIKE '%". $_POST['DeliveryNumber'] ."'"; + $sql .= " GROUP BY trans.trans_no"; } else { - - $date_after = date2sql($_POST['DeliveryAfterDate']); - $date_before = date2sql($_POST['DeliveryToDate']); - - $sql .= " AND ".TB_PREF."debtor_trans.tran_date >= '$date_after'"; - $sql .= " AND ".TB_PREF."debtor_trans.tran_date <= '$date_before'"; + $sql .= " AND trans.tran_date >= '".date2sql($_POST['DeliveryAfterDate'])."'"; + $sql .= " AND trans.tran_date <= '".date2sql($_POST['DeliveryToDate'])."'"; if ($selected_customer != -1) - $sql .= " AND ".TB_PREF."debtor_trans.debtor_no='" . $selected_customer . "' "; + $sql .= " AND trans.debtor_no='" . $selected_customer . "' "; if (isset($selected_stock_item)) - $sql .= " AND ".TB_PREF."debtor_trans_details.stock_id='". $selected_stock_item ."' "; + $sql .= " AND line.stock_id='". $selected_stock_item ."' "; if (isset($_POST['StockLocation']) && $_POST['StockLocation'] != reserved_words::get_all()) - $sql .= " AND ".TB_PREF."sales_orders.from_stk_loc = '". $_POST['StockLocation'] . "' "; + $sql .= " AND sorder.from_stk_loc = '". $_POST['StockLocation'] . "' "; - $sql .= " GROUP BY ".TB_PREF."debtor_trans.trans_no "; + $sql .= " GROUP BY trans.trans_no "; } //end no delivery number selected -$result = db_query($sql,"No deliveries were returned"); +$cols = array( + _("Delivery #") => array('type'=>'spec', 'fun'=>'trans_view'), + _("Customer"), + 'branch_code' => 'skip', + _("Branch"), + _("Contact"), + _("Reference"), + _("Cust Ref"), + _("Delivery Date") => 'date', + _("Due By") => 'date', + _("Delivery Total") => 'amount', + _("Currency"), + submit('BatchInvoice','Batch Inv', false) + => array('type'=>'insert', 'fun'=>'batch_checkbox'), + array('type'=>'insert', 'fun'=>'edit_link'), + array('type'=>'insert', 'fun'=>'invoice_link'), + array('type'=>'insert', 'fun'=>'prt_link') +); //----------------------------------------------------------------------------------- if (isset($_SESSION['Batch'])) @@ -205,93 +242,27 @@ if (isset($_SESSION['Batch'])) unset($_SESSION['Batch'][$trans]); unset($_SESSION['Batch']); } -if ($result) + +/* +dla ka¿dego rz±dku + $_SESSION['Batch'][] = array('trans'=>$myrow["trans_no"], + 'cust'=>$myrow["name"],'branch'=>$myrow["br_name"] ); +*/ + +$table =& new_db_pager('deliveries_tbl', $sql, $cols); +$table->set_marker('check_overdue', _("Marked items are overdue.")); + + +if(get_post('SearchOrders')) { - /*show a table of the deliveries returned by the sql */ - - div_start('deliveries_tbl'); - - start_table("$table_style colspan=7 width=95%"); - $th = array(_("Delivery #"), _("Customer"), _("Branch"), _("Reference"), _("Delivery Date"), - _("Due By"), _("Delivery Total"), _("Currency"), submit('BatchInvoice','Batch Inv', false), - "", "", ""); - table_header($th); - - $j = 1; - $k = 0; //row colour counter - $overdue_items = false; - while ($myrow = db_fetch($result)) - { - $_SESSION['Batch'][] = array('trans'=>$myrow["trans_no"], - 'cust'=>$myrow["name"],'branch'=>$myrow["br_name"] ); - - $view_page = get_customer_trans_view_str(13, $myrow["trans_no"]); - $formated_del_date = sql2date($myrow["tran_date"]); - $formated_due_date = sql2date($myrow["due_date"]); - $not_closed = $myrow["Outstanding"]!=0; - - // if overdue orders, then highlight as so - - if (date1_greater_date2(Today(), $formated_due_date) && $not_closed ) - { - start_row("class='overduebg'"); - $overdue_items = true; - } - else - { - alt_table_row_color($k); - } - - label_cell($view_page); - label_cell($myrow["name"]); - label_cell($myrow["br_name"]); - label_cell($myrow["reference"]); - label_cell($formated_del_date); - label_cell($formated_due_date); - amount_cell($myrow["DeliveryValue"]); - label_cell($myrow["curr_code"]); - if (!$myrow['Done']) - check_cells(null,'Sel_'. $myrow['trans_no'],0,false); - else - label_cell(""); - if ($_POST['OutstandingOnly'] == true || $not_closed) - { - $modify_page = $path_to_root . "/sales/customer_delivery.php?" . SID . "ModifyDelivery=" . $myrow["trans_no"]; - $invoice_page = $path_to_root . "/sales/customer_invoice.php?" . SID . "DeliveryNumber=" .$myrow["trans_no"]; - label_cell("" . _("Edit") . ""); - label_cell(print_document_link($myrow['trans_no'], _("Print"), true, 13)); - - label_cell($not_closed ? "" . _("Invoice") . "" : ''); - - } - else - { - label_cell(""); - label_cell(""); - label_cell(""); - } - end_row();; - - $j++; - If ($j == 12) - { - $j = 1; - table_header($th); - } - //end of page full new headings if - } - //end of while loop - - end_table(); - - if ($overdue_items) - display_note(_("Marked items are overdue."), 0, 1, "class='overduefg'"); -div_end(); + $table->set_sql($sql); + $Ajax->activate('doc_tbl'); } -echo "
"; -end_form(); - + start_form(); + display_db_pager($table); + end_form(); end_page(); + ?>