{
$from = date2sql($from);
$to = date2sql($to);
- $sql = "SELECT ".TB_PREF."stock_master.category_id,
- ".TB_PREF."stock_category.description AS cat_description,
- ".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.supp_name AS supplier_name,
- ".TB_PREF."stock_moves.tran_date,
- ".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 OR ".TB_PREF."stock_moves.type=".ST_SUPPRECEIVE.")
- AND ".TB_PREF."stock_moves.trans_no=".TB_PREF."supp_trans.trans_no
- 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_master.mb_flag='B' OR ".TB_PREF."stock_master.mb_flag='M')";
+ $sql = "SELECT item.category_id,
+ category.description AS cat_description,
+ item.stock_id,
+ item.description, item.inactive,
+ move.loc_code,
+ supplier.supplier_id , IF(ISNULL(grn.rate), credit.rate, grn.rate) ex_rate,
+ supplier.supp_name AS supplier_name,
+ move.tran_date,
+ move.qty AS qty,
+ move.price
+ FROM ".TB_PREF."stock_moves move
+ LEFT JOIN ".TB_PREF."supp_trans credit ON credit.trans_no=move.trans_no AND credit.type=move.type
+ LEFT JOIN ".TB_PREF."grn_batch grn ON grn.id=move.trans_no AND 25=move.type
+ LEFT JOIN ".TB_PREF."suppliers supplier ON IFNULL(grn.supplier_id, credit.supplier_id)=supplier.supplier_id,
+ ".TB_PREF."stock_master item,
+ ".TB_PREF."stock_category category
+ WHERE item.stock_id=move.stock_id
+ AND item.category_id=category.category_id
+ AND move.tran_date>='$from'
+ AND move.tran_date<='$to'
+ AND (move.type=".ST_SUPPRECEIVE." OR move.type=".ST_SUPPCREDIT.")
+ AND (item.mb_flag='B' OR item.mb_flag='M')";
if ($category != 0)
- $sql .= " AND ".TB_PREF."stock_master.category_id = ".db_escape($category);
+ $sql .= " AND item.category_id = ".db_escape($category);
if ($location != '')
- $sql .= " AND ".TB_PREF."stock_moves.loc_code = ".db_escape($location);
+ $sql .= " AND move.loc_code = ".db_escape($location);
if ($fromsupp != '')
- $sql .= " AND ".TB_PREF."suppliers.supplier_id = ".db_escape($fromsupp);
+ $sql .= " AND supplier.supplier_id = ".db_escape($fromsupp);
if ($item != '')
- $sql .= " AND ".TB_PREF."stock_master.stock_id = ".db_escape($item);
- $sql .= " ORDER BY ".TB_PREF."stock_master.category_id,
- ".TB_PREF."suppliers.supp_name, ".TB_PREF."stock_master.stock_id, ".TB_PREF."stock_moves.tran_date";
+ $sql .= " AND item.stock_id = ".db_escape($item);
+ $sql .= " ORDER BY item.category_id,
+ supplier.supp_name, item.stock_id, move.tran_date";
return db_query($sql,"No transactions were returned");
}
+function get_supp_inv_reference($supplier_id, $stock_id, $date)
+{
+ $sql = "SELECT trans.supp_reference
+ FROM ".TB_PREF."supp_trans trans,
+ ".TB_PREF."supp_invoice_items line,
+ ".TB_PREF."grn_batch batch,
+ ".TB_PREF."grn_items item
+ WHERE trans.type=line.supp_trans_type
+ AND trans.trans_no=line.supp_trans_no
+ AND item.grn_batch_id=batch.id
+ AND item.item_code=line.stock_id
+ AND trans.supplier_id=".db_escape($supplier_id)."
+ AND line.stock_id=".db_escape($stock_id)."
+ AND 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()
$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)
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 != '')
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 = $total_supp = $grandtotal = 0.0;
$total_qty = 0.0;
- $catt = $stock_description = $supplier_name = '';
+ $catt = $stock_description = $stock_id = $supplier_name = '';
while ($trans=db_fetch($res))
{
if ($stock_description != $trans['description'])
$rep->TextCol(0, 1, _('Total'));
$rep->TextCol(1, 4, $stock_description);
$rep->TextCol(4, 5, $supplier_name);
- $rep->TextCol(5, 7, $total_qty);
+ $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();
$supplier_name = $trans['supplier_name'];
}
}
+ $stock_id = $trans['stock_id'];
$stock_description = $trans['description'];
}
$rep->TextCol(0, 1, _('Total'));
$rep->TextCol(1, 4, $stock_description);
$rep->TextCol(4, 5, $supplier_name);
- $rep->TextCol(5, 7, $total_qty);
+ $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();
}
$curr = get_supplier_currency($trans['supplier_id']);
- $rate = get_exchange_rate_from_home_currency($curr, sql2date($trans['tran_date']));
- $trans['price'] *= $rate;
+ $trans['price'] *= $trans['ex_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']));
$rep->TextCol(0, 1, _('Total'));
$rep->TextCol(1, 4, $stock_description);
$rep->TextCol(4, 5, $supplier_name);
- $rep->TextCol(5, 7, $total_qty);
+ $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();
$total_supp = $total_qty = 0.0;
- $supplier_name = $trans['supplier_name'];
+ $supplier_name = isset($trans['supplier_name']) ? $trans['supplier_name'] : "";
}
}
if ($supplier_name != '')
$rep->TextCol(0, 1, _('Total'));
$rep->TextCol(1, 4, $stock_description);
$rep->TextCol(4, 5, $supplier_name);
- $rep->TextCol(5, 7, $total_qty);
+ $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->End();
}
-?>
\ No newline at end of file
projects / fa-stable.git / blobdiff