X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=purchasing%2Fincludes%2Fui%2Fpo_ui.inc;h=728d2e7ce190b57f404e72b9f8984e4cdcf174f9;hb=2e570d1c62dd7775213cfffe3cf1ab186b94117f;hp=d5ae6fc1e3b6f50ef3fe83a0c700bb15b5aa13d9;hpb=80d37cd52c249559dfb4439595ca8a9b83e9874a;p=fa-stable.git diff --git a/purchasing/includes/ui/po_ui.inc b/purchasing/includes/ui/po_ui.inc index d5ae6fc1..728d2e7c 100644 --- a/purchasing/includes/ui/po_ui.inc +++ b/purchasing/includes/ui/po_ui.inc @@ -26,6 +26,9 @@ function copy_from_cart() $_POST['Comments'] = $cart->Comments; $_POST['StkLocation'] = $cart->Location; $_POST['delivery_address'] = $cart->delivery_address; + $_POST['_ex_rate'] = $cart->ex_rate; + foreach($cart->tax_overrides as $id => $value) + $_POST['mantax'][$id] = price_format($value); } function copy_to_cart() @@ -41,14 +44,19 @@ function copy_to_cart() $cart->Comments = $_POST['Comments']; $cart->Location = $_POST['StkLocation']; $cart->delivery_address = $_POST['delivery_address']; + $cart->ex_rate = input_num('_ex_rate', null); + + if (isset($_POST['mantax'])) { + foreach($_POST['mantax'] as $id => $tax) { + $cart->tax_overrides[$id] = user_numeric($_POST['mantax'][$id]); } + } } // ------------------------------------------------------------------------------ function get_supplier_details_to_order(&$order, $supplier_id) { $sql = "SELECT curr_code, supp_name, tax_group_id, supp.tax_included, - supp.credit_limit - Sum(IFNULL(IF(trans.type=".ST_SUPPCREDIT.", -1, 1) - * (ov_amount + ov_gst + ov_discount),0)) as cur_credit, + supp.credit_limit - Sum(IFNULL(ov_amount + ov_gst + ov_discount,0)) as cur_credit, terms.terms, terms.days_before_due, terms.day_in_following_month FROM ".TB_PREF."suppliers supp LEFT JOIN ".TB_PREF."supp_trans trans ON supp.supplier_id = trans.supplier_id @@ -89,7 +97,6 @@ function create_new_po($trans_type, $trans_no) $_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 */ @@ -109,7 +116,7 @@ function display_po_header(&$order) $editable = ($order->order_no == 0); - start_outer_table(TABLESTYLE2, "width=80%"); + start_outer_table(TABLESTYLE2, 'width=80%'); table_section(1); if ($editable) @@ -144,15 +151,25 @@ function display_po_header(&$order) } set_global_supplier($_POST['supplier_id']); + date_row($order->trans_type==ST_PURCHORDER ? _("Order Date:") : + ($order->trans_type==ST_SUPPRECEIVE ? _("Delivery Date:") : _("Invoice Date:")), + 'OrderDate', '', true, 0, 0, 0, null, true); + + if (isset($_POST['_OrderDate_changed'])) { + $order->orig_order_date = $_POST['OrderDate']; + get_duedate_from_terms($order); + $_POST['due_date'] = $order->due_date; + $Ajax->activate('due_date'); + } + supplier_credit_row($order->supplier_id, $order->credit); + if (!is_company_currency($order->curr_code)) { label_row(_("Supplier Currency:"), $order->curr_code); - exchange_rate_display($order->curr_code, get_company_currency(), + exchange_rate_display(get_company_currency(), $order->curr_code, $_POST['OrderDate']); } - supplier_credit_row($order->supplier_id, $order->credit); - if ($editable) { @@ -166,26 +183,6 @@ function display_po_header(&$order) table_section(2); - // check this out????????? - //if (!isset($_POST['OrderDate']) || $_POST['OrderDate'] == "") - // $_POST['OrderDate'] = $order->orig_order_date; - //if (!isset($_POST['OrderDate']) || $_POST['OrderDate'] == "") - //{ - // $_POST['OrderDate'] = Today(); - // if (!is_date_in_fiscalyear($_POST['OrderDate'])) - // $_POST['OrderDate'] = end_fiscalyear(); - //} - date_row($order->trans_type==ST_PURCHORDER ? _("Order Date:") : - ($order->trans_type==ST_SUPPRECEIVE ? _("Delivery Date:") : _("Invoice Date:")), - 'OrderDate', '', true, 0, 0, 0, null, true); - - if (isset($_POST['_OrderDate_changed'])) { - $order->orig_order_date = $_POST['OrderDate']; - get_duedate_from_terms($order); - $_POST['due_date'] = $order->due_date; - $Ajax->activate('_ex_rate'); - $Ajax->activate('due_date'); - } if ($order->trans_type==ST_SUPPINVOICE) date_row(_("Due Date:"), 'due_date', '', false, 0, 0, 0, null, true); @@ -290,7 +287,7 @@ function display_po_items(&$order, $editable=true) $taxes = $order->get_taxes(input_num('freight_cost')); - $tax_total = display_edit_tax_items($taxes, $colspan, $order->tax_included, 2); + $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)); @@ -358,7 +355,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); @@ -397,7 +394,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, false, true); + //stock_purchasable_items_list_cells(null, 'stock_id', null, false, true, true); if (list_updated('stock_id')) { $Ajax->activate('price'); $Ajax->activate('units'); @@ -413,7 +412,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_delivery_required_by()); $qty_rcvd = ''; } @@ -423,7 +422,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());