X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep306.php;h=94bca60ab18f1515dd9143fa8860bef09cf574c5;hb=13367be8aaf5175295f7aab7160370458dad1824;hp=f43a608351b1cf95a5af889a392d6ccd7a7e1f19;hpb=367dd78454169cb866bfd8b3134a73458cfa6588;p=fa-stable.git diff --git a/reporting/rep306.php b/reporting/rep306.php index f43a6083..94bca60a 100644 --- a/reporting/rep306.php +++ b/reporting/rep306.php @@ -38,25 +38,21 @@ function getTransactions($category, $location, $fromsupp, $item, $from, $to) ".TB_PREF."stock_master.stock_id, ".TB_PREF."stock_master.description, ".TB_PREF."stock_master.inactive, ".TB_PREF."stock_moves.loc_code, - ".TB_PREF."supp_trans.supplier_id, - ".TB_PREF."supp_trans.supp_reference, + ".TB_PREF."suppliers.supplier_id, ".TB_PREF."suppliers.supp_name AS supplier_name, ".TB_PREF."stock_moves.tran_date, - -".TB_PREF."stock_moves.qty AS qty, + ".TB_PREF."stock_moves.qty AS qty, ".TB_PREF."stock_moves.price*(1-".TB_PREF."stock_moves.discount_percent) AS price FROM ".TB_PREF."stock_master, ".TB_PREF."stock_category, - ".TB_PREF."supp_trans, ".TB_PREF."suppliers, ".TB_PREF."stock_moves WHERE ".TB_PREF."stock_master.stock_id=".TB_PREF."stock_moves.stock_id AND ".TB_PREF."stock_master.category_id=".TB_PREF."stock_category.category_id - AND ".TB_PREF."supp_trans.supplier_id=".TB_PREF."suppliers.supplier_id - AND ".TB_PREF."stock_moves.type=".TB_PREF."supp_trans.type - AND ".TB_PREF."stock_moves.trans_no=".TB_PREF."supp_trans.trans_no + AND ".TB_PREF."stock_moves.person_id=".TB_PREF."suppliers.supplier_id AND ".TB_PREF."stock_moves.tran_date>='$from' AND ".TB_PREF."stock_moves.tran_date<='$to' - AND (".TB_PREF."supp_trans.type=".ST_SUPPINVOICE." OR ".TB_PREF."stock_moves.type=".ST_SUPPCREDIT.") + AND (".TB_PREF."stock_moves.type=".ST_SUPPRECEIVE." OR ".TB_PREF."stock_moves.type=".ST_SUPPCREDIT.") AND (".TB_PREF."stock_master.mb_flag='B' OR ".TB_PREF."stock_master.mb_flag='M')"; if ($category != 0) $sql .= " AND ".TB_PREF."stock_master.category_id = ".db_escape($category); @@ -72,6 +68,29 @@ function getTransactions($category, $location, $fromsupp, $item, $from, $to) } +function get_supp_inv_reference($supplier_id, $stock_id, $date) +{ + $sql = "SELECT ".TB_PREF."supp_trans.supp_reference + FROM ".TB_PREF."supp_trans, + ".TB_PREF."supp_invoice_items, + ".TB_PREF."grn_batch, + ".TB_PREF."grn_items + WHERE ".TB_PREF."supp_trans.type=".TB_PREF."supp_invoice_items.supp_trans_type + AND ".TB_PREF."supp_trans.trans_no=".TB_PREF."supp_invoice_items.supp_trans_no + AND ".TB_PREF."grn_items.grn_batch_id=".TB_PREF."grn_batch.id + AND ".TB_PREF."grn_items.item_code=".TB_PREF."supp_invoice_items.stock_id + AND ".TB_PREF."supp_trans.supplier_id=".db_escape($supplier_id)." + AND ".TB_PREF."supp_invoice_items.stock_id=".db_escape($stock_id)." + AND ".TB_PREF."supp_trans.tran_date=".db_escape($date); + $result = db_query($sql,"No transactions were returned"); + $row = db_fetch_row($result); + if (isset($row[0])) + return $row[0]; + else + return ''; +} + + //---------------------------------------------------------------------------------------------------- function print_inventory_purchase() @@ -85,12 +104,14 @@ function print_inventory_purchase() $fromsupp = $_POST['PARAM_4']; $item = $_POST['PARAM_5']; $comments = $_POST['PARAM_6']; - $destination = $_POST['PARAM_7']; + $orientation = $_POST['PARAM_7']; + $destination = $_POST['PARAM_8']; if ($destination) include_once($path_to_root . "/reporting/includes/excel_report.inc"); else include_once($path_to_root . "/reporting/includes/pdf_report.inc"); + $orientation = ($orientation ? 'L' : 'P'); $dec = user_price_dec(); if ($category == ALL_NUMERIC) @@ -115,7 +136,7 @@ function print_inventory_purchase() else $itm = $item; - $cols = array(0, 75, 175, 220, 270, 370, 390, 470, 535); + $cols = array(0, 60, 180, 225, 275, 400, 420, 465, 520); $headers = array(_('Category'), _('Description'), _('Date'), _('#'), _('Supplier'), _('Qty'), _('Unit Price'), _('Total')); if ($fromsupp != '') @@ -130,36 +151,21 @@ function print_inventory_purchase() 4 => array('text' => _('Supplier'), 'from' => $froms, 'to' => ''), 5 => array('text' => _('Item'), 'from' => $itm, 'to' => '')); - $rep = new FrontReport(_('Inventory Purchasing Report'), "InventoryPurchasingReport", user_pagesize()); + $rep = new FrontReport(_('Inventory Purchasing Report'), "InventoryPurchasingReport", user_pagesize(), 9, $orientation); + if ($orientation == 'L') + recalculate_cols($cols); $rep->Font(); $rep->Info($params, $cols, $headers, $aligns); $rep->NewPage(); $res = getTransactions($category, $location, $fromsupp, $item, $from, $to); - $total = $total2 = $total3 = $grandtotal = 0.0; - $total_qty2 = $total_qty3 = 0.0; - $catt = $stock_description = $supplier_name = ''; + + $total = $total_supp = $grandtotal = 0.0; + $total_qty = 0.0; + $catt = $stock_description = $stock_id = $supplier_name = ''; while ($trans=db_fetch($res)) { - if ($catt != $trans['cat_description']) - { - if ($catt != '') - { - $rep->NewLine(2, 3); - $rep->TextCol(0, 7, _('Total')); - $rep->AmountCol(7, 8, $total, $dec); - $rep->Line($rep->row - 2); - $rep->NewLine(); - $rep->NewLine(); - $total = 0.0; - } - $rep->TextCol(0, 1, $trans['category_id']); - $rep->TextCol(1, 6, $trans['cat_description']); - $catt = $trans['cat_description']; - $rep->NewLine(); - } - if ($stock_description != $trans['description']) { if ($stock_description != '') @@ -170,24 +176,15 @@ function print_inventory_purchase() $rep->TextCol(0, 1, _('Total')); $rep->TextCol(1, 4, $stock_description); $rep->TextCol(4, 5, $supplier_name); - $rep->TextCol(5, 7, $total_qty3); - $rep->AmountCol(7, 8, $total3, $dec); + $rep->AmountCol(5, 7, $total_qty, get_qty_dec($stock_id)); + $rep->AmountCol(7, 8, $total_supp, $dec); $rep->Line($rep->row - 2); $rep->NewLine(); - $rep->NewLine(); - $total3 = $total_qty3 = 0.0; + $total_supp = $total_qty = 0.0; $supplier_name = $trans['supplier_name']; } - //$rep->NewLine(2, 3); - $rep->TextCol(0, 1, _('Total')); - $rep->TextCol(1, 5, $stock_description); - $rep->TextCol(5, 7, $total_qty2); - $rep->AmountCol(7, 8, $total2, $dec); - $rep->Line($rep->row - 2); - $rep->NewLine(); - //$rep->NewLine(); - $total2 = $total_qty2 = 0.0; } + $stock_id = $trans['stock_id']; $stock_description = $trans['description']; } @@ -199,34 +196,51 @@ function print_inventory_purchase() $rep->TextCol(0, 1, _('Total')); $rep->TextCol(1, 4, $stock_description); $rep->TextCol(4, 5, $supplier_name); - $rep->TextCol(5, 7, $total_qty3); - $rep->AmountCol(7, 8, $total3, $dec); + $rep->AmountCol(5, 7, $total_qty, get_qty_dec($stock_id)); + $rep->AmountCol(7, 8, $total_supp, $dec); $rep->Line($rep->row - 2); $rep->NewLine(); - $rep->NewLine(); - $total3 = $total_qty3 = 0.0; + $total_supp = $total_qty = 0.0; } $supplier_name = $trans['supplier_name']; } - + if ($catt != $trans['cat_description']) + { + if ($catt != '') + { + $rep->NewLine(2, 3); + $rep->TextCol(0, 1, _('Total')); + $rep->TextCol(1, 7, $catt); + $rep->AmountCol(7, 8, $total, $dec); + $rep->Line($rep->row - 2); + $rep->NewLine(); + $rep->NewLine(); + $total = 0.0; + } + $rep->TextCol(0, 1, $trans['category_id']); + $rep->TextCol(1, 6, $trans['cat_description']); + $catt = $trans['cat_description']; + $rep->NewLine(); + } $curr = get_supplier_currency($trans['supplier_id']); $rate = get_exchange_rate_from_home_currency($curr, sql2date($trans['tran_date'])); $trans['price'] *= $rate; $rep->NewLine(); + $trans['supp_reference'] = get_supp_inv_reference($trans['supplier_id'], $trans['stock_id'], $trans['tran_date']); $rep->fontSize -= 2; $rep->TextCol(0, 1, $trans['stock_id']); if ($fromsupp == ALL_TEXT) { $rep->TextCol(1, 2, $trans['description'].($trans['inactive']==1 ? " ("._("Inactive").")" : ""), -1); - $rep->TextCol(2, 3, $trans['tran_date']); + $rep->TextCol(2, 3, sql2date($trans['tran_date'])); $rep->TextCol(3, 4, $trans['supp_reference']); $rep->TextCol(4, 5, $trans['supplier_name']); } else { $rep->TextCol(1, 2, $trans['description'].($trans['inactive']==1 ? " ("._("Inactive").")" : ""), -1); - $rep->TextCol(2, 3, $trans['tran_date']); + $rep->TextCol(2, 3, sql2date($trans['tran_date'])); $rep->TextCol(3, 4, $trans['supp_reference']); } $rep->AmountCol(5, 6, $trans['qty'], get_qty_dec($trans['stock_id'])); @@ -235,11 +249,9 @@ function print_inventory_purchase() $rep->AmountCol(7, 8, $amt, $dec); $rep->fontSize += 2; $total += $amt; - $total2 += $amt; - $total3 += $amt; - $total_qty2 += $trans['qty']; - $total_qty3 += $trans['qty']; + $total_supp += $amt; $grandtotal += $amt; + $total_qty += $trans['qty']; } if ($stock_description != '') { @@ -249,23 +261,14 @@ function print_inventory_purchase() $rep->TextCol(0, 1, _('Total')); $rep->TextCol(1, 4, $stock_description); $rep->TextCol(4, 5, $supplier_name); - $rep->TextCol(5, 7, $total_qty3); - $rep->AmountCol(7, 8, $total3, $dec); + $rep->AmountCol(5, 7, $total_qty, get_qty_dec($stock_id)); + $rep->AmountCol(7, 8, $total_supp, $dec); $rep->Line($rep->row - 2); $rep->NewLine(); $rep->NewLine(); - $total3 = $total_qty3 = 0.0; + $total_supp = $total_qty = 0.0; $supplier_name = $trans['supplier_name']; } - //$rep->NewLine(2, 3); - $rep->TextCol(0, 1, _('Total')); - $rep->TextCol(1, 5, $stock_description); - $rep->TextCol(5, 7, $total_qty2); - $rep->AmountCol(7, 8, $total2, $dec); - $rep->Line($rep->row - 2); - $rep->NewLine(); - //$rep->NewLine(); - $total2 = 0.0; } if ($supplier_name != '') { @@ -273,22 +276,21 @@ function print_inventory_purchase() $rep->TextCol(0, 1, _('Total')); $rep->TextCol(1, 4, $stock_description); $rep->TextCol(4, 5, $supplier_name); - $rep->TextCol(5, 7, $total_qty3); - $rep->AmountCol(7, 8, $total3, $dec); + $rep->AmountCol(5, 7, $total_qty, get_qty_dec($stock_id)); + $rep->AmountCol(7, 8, $total_supp, $dec); $rep->Line($rep->row - 2); $rep->NewLine(); $rep->NewLine(); - $total3 = 0.0; } $rep->NewLine(2, 3); $rep->TextCol(0, 1, _('Total')); - $rep->TextCol(1, 3, $catt); + $rep->TextCol(1, 7, $catt); $rep->AmountCol(7, 8, $total, $dec); $rep->Line($rep->row - 2); $rep->NewLine(); $rep->NewLine(2, 1); - $rep->TextCol(0, 6, _('Grand Total')); + $rep->TextCol(0, 7, _('Grand Total')); $rep->AmountCol(7, 8, $grandtotal, $dec); $rep->Line($rep->row - 4);