$_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()
$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
$_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 */
$editable = ($order->order_no == 0);
- start_outer_table(TABLESTYLE2, "width=80%");
+ start_outer_table(TABLESTYLE2, 'width=80%');
table_section(1);
if ($editable)
}
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)
{
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);
$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));
function po_item_controls(&$order, &$rowcounter, $line_no=-1)
{
- global $Ajax;
+ global $Ajax, $SysPrefs;
alt_table_row_color($rowcounter);
{
// 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');
//$_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 = '';
}
label_cell($_POST['units'], '', 'units');
if ($order->trans_type == ST_PURCHORDER)
date_cells(null, 'req_del_date', '', null, 0, 0, 0);
- if ($qty_rcvd > 0)
+ if ($qty_rcvd > 0)
+ {
amount_decimal_cell($_POST['price']);
+ hidden('price', $_POST['price']);
+ }
else
amount_cells(null, 'price', null, null, null, $dec2);