<?php
/**********************************************************************
Copyright (C) FrontAccounting, LLC.
- Released under the terms of the GNU Affero General Public License,
- AGPL, as published by the Free Software Foundation, either version
- 3 of the License, or (at your option) any later version.
+ Released under the terms of the GNU General Public License, GPL,
+ as published by the Free Software Foundation, either version 3
+ of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+ See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
***********************************************************************/
include_once($path_to_root . "/purchasing/includes/purchasing_db.inc");
session_register("PO");
$_SESSION['PO'] = new purch_order;
- $_POST['OrderDate'] = Today();
+ $_POST['OrderDate'] = new_doc_date();
if (!is_date_in_fiscalyear($_POST['OrderDate']))
$_POST['OrderDate'] = end_fiscalyear();
$_SESSION['PO']->orig_order_date = $_POST['OrderDate'];
if (!isset($_POST['supplier_id']) && (get_global_supplier() != reserved_words::get_all()))
$_POST['supplier_id'] = get_global_supplier();
- supplier_list_row(_("Supplier:"), 'supplier_id', null, false, true);
+ supplier_list_row(_("Supplier:"), 'supplier_id', null, false, true, false, true);
}
else
{
foreach ($order->line_items as $line_no=>$item) {
$line = &$order->line_items[$line_no];
$line->price = get_purchase_price ($order->supplier_id, $_POST['stock_id']);
+ $line->quantity = get_purchase_conversion_factor ($order->supplier_id, $_POST['stock_id']);
}
$Ajax->activate('items_table');
}
// if (!is_date_in_fiscalyear($_POST['OrderDate']))
// $_POST['OrderDate'] = end_fiscalyear();
//}
- date_row(_("Order Date:"), 'OrderDate', '', $_POST['OrderDate'], 0, 0, 0, null, true);
+ date_row(_("Order Date:"), 'OrderDate', '', true, 0, 0, 0, null, true);
if (isset($_POST['_OrderDate_changed'])) {
$Ajax->activate('_ex_rate');
}
div_start('items_table');
start_table("$table_style width=80%");
- $th = array(_("Item Code"), _("Item Description"), _("Quantity"), _("Unit"),
+ $th = array(_("Item Code"), _("Item Description"), _("Quantity"),
+ _("Received"), _("Unit"),
_("Required Delivery Date"), _("Price"), _("Line Total"), "");
if (count($order->line_items)) $th[] = '';
label_cell($po_line->stock_id);
label_cell($po_line->item_description);
qty_cell($po_line->quantity, false, get_qty_dec($po_line->stock_id));
+ qty_cell($po_line->qty_received, false, get_qty_dec($po_line->stock_id));
label_cell($po_line->units);
label_cell($po_line->req_del_date);
- amount_cell($po_line->price);
+ amount_decimal_cell($po_line->price);
amount_cell($line_total);
if ($editable)
global $Ajax;
start_row();
+ $dec2 = 0;
$id = find_submit('Edit');
if (($id != -1) && $stock_id != null)
{
$_POST['stock_id'] = $order->line_items[$id]->stock_id;
$dec = get_qty_dec($_POST['stock_id']);
$_POST['qty'] = qty_format($order->line_items[$id]->quantity, $_POST['stock_id'], $dec);
- $_POST['price'] = price_format($order->line_items[$id]->price);
+ //$_POST['price'] = price_format($order->line_items[$id]->price);
+ $_POST['price'] = price_decimal_format($order->line_items[$id]->price, $dec2);
$_POST['req_del_date'] = $order->line_items[$id]->req_del_date;
$_POST['units'] = $order->line_items[$id]->units;
label_cell($_POST['stock_id']);
label_cell($order->line_items[$id]->item_description);
$Ajax->activate('items_table');
+ $qty_rcvd = $order->line_items[$id]->qty_received;
}
else
{
hidden('line_no', ($_SESSION['PO']->lines_on_order + 1));
- stock_purchasable_items_list_cells(null, 'stock_id', null, false, true);
+ stock_purchasable_items_list_cells(null, 'stock_id', null, false, false, true);
if (list_updated('stock_id')) {
$Ajax->activate('price');
$Ajax->activate('units');
$_POST['units'] = $item_info["units"];
$dec = $item_info["decimals"];
- $_POST['qty'] = number_format2(1, $dec);
- $_POST['price'] = price_format(get_purchase_price ($order->supplier_id, $_POST['stock_id']));
+ $_POST['qty'] = number_format2(get_purchase_conversion_factor ($order->supplier_id, $_POST['stock_id']), $dec);
+ //$_POST['price'] = price_format(get_purchase_price ($order->supplier_id, $_POST['stock_id']));
+ $_POST['price'] = price_decimal_format(get_purchase_price ($order->supplier_id, $_POST['stock_id']), $dec2);
$_POST['req_del_date'] = add_days(Today(), 10);
+ $qty_rcvd = '';
}
qty_cells(null, 'qty', null, null, null, $dec);
+ qty_cell($qty_rcvd, false, $dec);
label_cell($_POST['units'], '', 'units');
date_cells(null, 'req_del_date', '', null, 0, 0, 0);
- amount_cells(null, 'price', null);
+ amount_cells(null, 'price', null, null, null, $dec2);
//$line_total = $_POST['qty'] * $_POST['price'] * (1 - $_POST['Disc'] / 100);
$line_total = round(input_num('qty') * input_num('price'), user_price_dec());