$cart = &$_SESSION['PO'];
$_POST['supplier_id'] = $cart->supplier_id;
- $_POST['OrderDate'] = $cart->orig_order_date;
+ $_POST['OrderDate'] = $cart->tran_date;
if ($cart->trans_type == ST_SUPPINVOICE)
$_POST['due_date'] = $cart->due_date;
$_POST['supp_ref'] = $cart->supp_ref;
$cart = &$_SESSION['PO'];
$cart->supplier_id = $_POST['supplier_id'];
- $cart->orig_order_date = $_POST['OrderDate'];
+ $cart->tran_date = $_POST['OrderDate'];
if ($cart->trans_type == ST_SUPPINVOICE)
{
$cart->due_date = $_POST['due_date'];
//---------------------------------------------------------------------------------------------------
-function create_new_po($trans_type, $trans_no)
+function create_cart($trans_type, $trans_no)
{
global $Refs;
unset ($_SESSION['PO']->line_items, $_SESSION['PO']);
$cart = new purch_order;
- $_POST['OrderDate'] = new_doc_date();
- if (!is_date_in_fiscalyear($_POST['OrderDate']))
- $_POST['OrderDate'] = end_fiscalyear();
- $cart->due_date = $cart->orig_order_date = $_POST['OrderDate'];
-
$cart->trans_type = $trans_type;
- $cart->order_no = $trans_no;
- /*read in all the selected order into the Items cart */
- if ($trans_no) {
- read_po($trans_no, $cart);
+
+ if ($trans_type == ST_SUPPRECEIVE && $trans_no != 0) {
+ read_grn($trans_no, $cart);
+ foreach($cart->line_items as &$line) {
+ $line->qty_old = $line->quantity; // for concurrency checks
+ $line->qty_received -= $line->quantity;
+ }
+ } else {
$cart->order_no = $trans_no;
- } else
- $cart->reference = $Refs->get_next($trans_type, null,
- array('supplier_id' => $cart->supplier_id, 'date' => get_post('OrderDate')));
+ $_POST['OrderDate'] = new_doc_date();
+ if (!is_date_in_fiscalyear($_POST['OrderDate']))
+ $_POST['OrderDate'] = end_fiscalyear();
+ $cart->due_date = $cart->tran_date = $_POST['OrderDate'];
+ /* read in all the selected order into the Items cart */
+ if ($trans_no) {
+ read_po($trans_no, $cart);
+ $cart->order_no = $trans_no;
+ } else
+ $cart->reference = $Refs->get_next($trans_type, null,
+ array('supplier_id' => $cart->supplier_id, 'date' => get_post('OrderDate')));
+ }
$_SESSION['PO'] = &$cart;
}
'OrderDate', '', true, 0, 0, 0, null, true);
if (isset($_POST['_OrderDate_changed'])) {
- $order->orig_order_date = $_POST['OrderDate'];
+ $order->tran_date = $_POST['OrderDate'];
get_duedate_from_terms($order);
$_POST['due_date'] = $order->due_date;
$Ajax->activate('due_date');
if ($editable)
{
- ref_row(_("Reference:"), 'ref');
+ ref_row(_("Reference:"), 'ref', '', null, false, $order->trans_type, array('date'=> @$_POST['OrderDate']));
}
else
{
if ($order->trans_type==ST_SUPPINVOICE)
date_row(_("Due Date:"), 'due_date', '', false, 0, 0, 0, null, true);
- text_row(_("Supplier's Reference:"), 'supp_ref', null, 16, 15);
+ text_row(_("Supplier's Reference:"), 'supp_ref', null, 20, 60);
if (get_company_pref('use_dimension'))
dimensions_list_row(_('Dimension').':', 'dimension', null, true, _('Default'), false, 1);
if (get_company_pref('use_dimension') == 2)
dimensions_list_row(_('Dimension 2').':', 'dimension2', null, true, _('Default'), false, 2);
- locations_list_row(_("Receive Into:"), 'StkLocation', null, false, true);
+ locations_list_row(_("Receive Into:"), 'StkLocation', null, false, true, $order->fixed_asset);
table_section(3);
div_start('items_table');
start_table(TABLESTYLE, "width='80%'");
- $th = array(_("Item Code"), _("Item Description"), _("Quantity"),
- _("Received"), _("Unit"),
- _("Required Delivery Date"), $order->tax_included ? _("Price after Tax") : _("Price before Tax"), _("Line Total"), "");
+ $new = $order->order_no == 0;
+
+ $th = array(_("Item Code"), _("Item Description"), _("Quantity"), _("Received"),
+ _("Unit"), _("Required Delivery Date"), $order->tax_included ? _("Price after Tax") : _("Price before Tax"), _("Line Total"), "");
+
if ($order->trans_type != ST_PURCHORDER)
array_remove($th, 5);
-
+ if ($new)
+ array_remove($th, 3);
+
if (count($order->line_items)) $th[] = '';
+
table_header($th);
$id = find_submit('Edit');
alt_table_row_color($k);
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));
+ if ($order->fixed_asset)
+ label_cell(1);
+ else
+ qty_cell($po_line->quantity, false, get_qty_dec($po_line->stock_id));
+ if (!$new)
+ qty_cell($po_line->qty_received, false, get_qty_dec($po_line->stock_id));
label_cell($po_line->units);
if ($order->trans_type == ST_PURCHORDER)
label_cell($po_line->req_del_date);
label_row(_("Sub-total"), $display_sub_total, "colspan=$colspan align=right","align=right", 2);
- $taxes = $order->get_taxes(input_num('freight_cost'));
+ $taxes = $order->get_taxes();
$tax_total = display_edit_tax_items($taxes, $colspan, $order->tax_included, 2, $order->trans_type==ST_SUPPINVOICE);
- $display_total = price_format(($total + input_num('freight_cost') + $tax_total));
+ $display_total = price_format(($total + $tax_total));
start_row();
label_cells(_("Amount Total"), $display_total, "colspan=$colspan align='right'","align='right'");
}
end_row();
start_row();
- label_cells(_("Date"), $po->orig_order_date, "class='tableheader2'");
+ label_cells(_("Date"), $po->tran_date, "class='tableheader2'");
if ($editable)
{
global $Ajax, $SysPrefs;
alt_table_row_color($rowcounter);
+ $new = $order->order_no == 0;
$dec2 = 0;
$id = find_submit('Edit');
if (($id != -1) && $line_no == $id)
{
-// hidden('line_no', $id);
$_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_decimal_format($order->line_items[$id]->price, $dec2);
if ($order->trans_type == ST_PURCHORDER)
$_POST['req_del_date'] = $order->line_items[$id]->req_del_date;
text_cells(null,'item_description', null, 45, 150);
else {
hidden('item_description', $_POST['item_description']);
-// label_cell($_POST['item_description']);
label_cell($order->line_items[$id]->item_description);
}
}
else
{
-// hidden('line_no', ($_SESSION['PO']->lines_on_order + 1));
- //Chaitanya : Manufcatured item can be purchased
- stock_items_list_cells(null, 'stock_id', null, false, true, false, true, array('editable' => 30));
- //stock_purchasable_items_list_cells(null, 'stock_id', null, false, true, true);
+ // Manufactured item can be purchased
+ if ($order->fixed_asset)
+ stock_purchasable_fa_list_cells(null, 'stock_id', null, false, true, false, true, $order->line_items);
+ else
+ stock_purchasable_items_list_cells(null, 'stock_id', null, false, true, false, true, array('editable' => 30, 'where'=>array("NOT no_purchase")));
+
if (list_updated('stock_id')) {
$Ajax->activate('price');
$Ajax->activate('units');
$dec = $item_info["decimals"];
$_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);
if ($order->trans_type == ST_PURCHORDER)
$_POST['req_del_date'] = add_days(Today(), $SysPrefs->default_receival_required_by());
$qty_rcvd = '';
}
- qty_cells(null, 'qty', null, null, null, $dec);
- qty_cell($qty_rcvd, false, $dec);
+ if ($order->fixed_asset) {
+ label_cell(1, '', 'qty');
+ hidden('qty', 1);
+ } else
+ qty_cells(null, 'qty', null, null, null, $dec);
+
+ if (!$new)
+ qty_cell($qty_rcvd, false, $dec);
label_cell($_POST['units'], '', 'units');
if ($order->trans_type == ST_PURCHORDER)
else
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());
amount_cell($line_total, false, '','line_total');
projects / fa-stable.git / blobdiff