$_POST['Comments'] = $cart->Comments;
$_POST['StkLocation'] = $cart->Location;
$_POST['delivery_address'] = $cart->delivery_address;
- $_POST['tax_algorithm'] = $cart->tax_algorithm;
$_POST['prep_amount'] = price_format($cart->prep_amount);
$_POST['_ex_rate'] = $cart->ex_rate;
$_POST['cash_account'] = $cart->cash_account;
+ $_POST['dimension'] = $cart->dimension;
+ $_POST['dimension2'] = $cart->dimension2;
foreach($cart->tax_overrides as $id => $value)
$_POST['mantax'][$id] = price_format($value);
}
$cart->Comments = $_POST['Comments'];
$cart->Location = $_POST['StkLocation'];
$cart->delivery_address = $_POST['delivery_address'];
- if (isset($_POST['tax_algorithm']))
- $cart->tax_algorithm = $_POST['tax_algorithm'];
+ $cart->dimension = @$_POST['dimension'];
+ $cart->dimension2 = @$_POST['dimension2'];
$cart->prep_amount = input_num('prep_amount', 0);
$cart->ex_rate = input_num('_ex_rate', null);
$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.tax_algorithm,
- supp.credit_limit - Sum(IFNULL(IF(trans.type=".ST_SUPPCREDIT.", -1, 1)
- * (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
- LEFT JOIN ".TB_PREF."payment_terms terms ON supp.payment_terms=terms.terms_indicator
- WHERE supp.supplier_id = ".db_escape($supplier_id)."
- GROUP BY
- supp.supp_name";
-
- $result = db_query($sql, "The supplier details could not be retreived");
-
- $myrow = db_fetch($result);
- $order->credit = $myrow["cur_credit"];
- $order->terms = array(
- 'description' => $myrow['terms'],
- 'days_before_due' => $myrow['days_before_due'],
- 'day_in_following_month' => $myrow['day_in_following_month'] );
-
- $_POST['supplier_id'] = $supplier_id;
- $_POST['supplier_name'] = $myrow["supp_name"];
- $_POST['curr_code'] = $myrow["curr_code"];
-
- $order->set_supplier($supplier_id, $myrow["supp_name"], $myrow["curr_code"],
- $myrow["tax_group_id"], $myrow["tax_included"], $myrow["tax_algorithm"]);
-}
//---------------------------------------------------------------------------------------------------
read_po($trans_no, $cart);
$cart->order_no = $trans_no;
} else
- $cart->reference = $Refs->get_next($trans_type);
+ $cart->reference = $Refs->get_next($trans_type, null,
+ array('supplier_id' => $cart->supplier_id, 'date' => get_post('OrderDate')));
$_SESSION['PO'] = &$cart;
}
$editable = ($order->order_no == 0);
- start_outer_table(TABLESTYLE2, 'width=80%');
+ start_outer_table(TABLESTYLE2, "width='80%'");
table_section(1);
if ($editable)
get_supplier_details_to_order($order, $_POST['supplier_id']);
get_duedate_from_terms($order);
$_POST['due_date'] = $order->due_date;
- $_POST['tax_algorithm'] = $order->tax_algorithm;
// supplier default price update
foreach ($order->line_items as $line_no=>$item) {
}
$Ajax->activate('items_table');
$Ajax->activate('due_date');
- $Ajax->activate('tax_algorithm');
}
set_global_supplier($_POST['supplier_id']);
$_POST['OrderDate']);
}
-
if ($editable)
{
ref_row(_("Reference:"), 'ref');
date_row(_("Due Date:"), 'due_date', '', false, 0, 0, 0, null, true);
text_row(_("Supplier's Reference:"), 'supp_ref', null, 16, 15);
+
+ 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);
table_section(3);
{
/*If this is the first time the form loaded set up defaults */
- //$_POST['StkLocation'] = $_SESSION['UserStockLocation'];
- $sql = "SELECT delivery_address, phone FROM ".TB_PREF."locations WHERE loc_code=".db_escape($_POST['StkLocation']);
- $result = db_query($sql,"could not get location info");
-
- if (db_num_rows($result) == 1)
+ $loc_row = get_item_location(get_post('StkLocation'));
+ if ($loc_row)
{
- $loc_row = db_fetch($result);
$_POST['delivery_address'] = $loc_row["delivery_address"];
$Ajax->activate('delivery_address');
$_SESSION['PO']->Location = $_POST['StkLocation'];
display_heading(_("Order Items"));
div_start('items_table');
- start_table(TABLESTYLE, "width=80%");
+ start_table(TABLESTYLE, "width='80%'");
$th = array(_("Item Code"), _("Item Description"), _("Quantity"),
_("Received"), _("Unit"),
start_row();
label_cells(_("Amount Total"), $display_total, "colspan=$colspan align='right'","align='right'");
- $order->order_no ? submit_cells('update', _("Update"), "colspan=2 align='center'", _("Refresh"), true)
+ $order->trans_type == ST_SUPPINVOICE
+ ? submit_cells('update', _("Update"), "colspan=2 align='center'", _("Refresh"), true)
: label_cell('', "colspan=2");
end_row();
function display_po_summary(&$po, $is_self=false, $editable=false)
{
- start_table(TABLESTYLE, "width=90%");
+ start_table(TABLESTYLE, "width='90%'");
start_row();
label_cells(_("Reference"), $po->reference, "class='tableheader2'");
start_table(TABLESTYLE2);
-if (list_updated('tax_algorithm')) {
- $trans->tax_algorithm = $_POST['tax_algorithm'];
- $Ajax->activate('items_table');
-}
-
if ($trans->trans_type == ST_SUPPINVOICE) {
- tax_algorithm_list_row(_("Tax algorithm:"), 'tax_algorithm', null, true);
cash_accounts_list_row(_("Payment:"), 'cash_account', null, false, _('Delayed'));
} elseif ($trans->trans_type == ST_PURCHORDER)
amount_row(_("Pre-Payment Required:"), 'prep_amount');
-?>
\ No newline at end of file
projects / fa-stable.git / blobdiff