X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fui%2Fpo_ui.inc;h=555737055066fcaa2dc2cda0388ba9031571d05a;hb=9a98bb3bc7a94f1a8e47f8dab45a87c8b4212080;hp=33e7df4c985fc4d1852b33ebbff278cf9651b7f3;hpb=f1612b8d1122d4e0d31d618c3143e2c39d12eea7;p=fa-stable.git diff --git a/purchasing/includes/ui/po_ui.inc b/purchasing/includes/ui/po_ui.inc index 33e7df4c..55573705 100644 --- a/purchasing/includes/ui/po_ui.inc +++ b/purchasing/includes/ui/po_ui.inc @@ -363,7 +363,7 @@ function display_po_summary(&$po, $is_self=false, $editable=false) function po_item_controls(&$order, &$rowcounter, $line_no=-1) { - global $Ajax; + global $Ajax, $SysPrefs; alt_table_row_color($rowcounter); @@ -402,7 +402,9 @@ function po_item_controls(&$order, &$rowcounter, $line_no=-1) { // hidden('line_no', ($_SESSION['PO']->lines_on_order + 1)); - stock_purchasable_items_list_cells(null, 'stock_id', null, false, true, true); + //Chaitanya : Manufcatured item can be purchased + stock_items_list_cells(null, 'stock_id', null, false, true, true); + //stock_purchasable_items_list_cells(null, 'stock_id', null, false, true, true); if (list_updated('stock_id')) { $Ajax->activate('price'); $Ajax->activate('units'); @@ -418,7 +420,7 @@ function po_item_controls(&$order, &$rowcounter, $line_no=-1) //$_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(), 10); + $_POST['req_del_date'] = add_days(Today(), $SysPrefs->default_receival_required_by()); $qty_rcvd = ''; } @@ -428,7 +430,13 @@ function po_item_controls(&$order, &$rowcounter, $line_no=-1) label_cell($_POST['units'], '', 'units'); if ($order->trans_type == ST_PURCHORDER) date_cells(null, 'req_del_date', '', null, 0, 0, 0); - amount_cells(null, 'price', null, null, null, $dec2); + if ($qty_rcvd > 0) + { + amount_decimal_cell($_POST['price']); + hidden('price', $_POST['price']); + } + 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());