projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Budget Entry: ajax page reload on params change, added atomic functions for budget...
[fa-stable.git]
/
purchasing
/
includes
/
ui
/
po_ui.inc
diff --git
a/purchasing/includes/ui/po_ui.inc
b/purchasing/includes/ui/po_ui.inc
index 88385649307122e43961df37c0f61557ed92497c..092e801c58952f2df1d07514d5790d49217eedc1 100644
(file)
--- a/
purchasing/includes/ui/po_ui.inc
+++ b/
purchasing/includes/ui/po_ui.inc
@@
-18,7
+18,7
@@
function copy_from_cart()
$cart = &$_SESSION['PO'];
$_POST['supplier_id'] = $cart->supplier_id;
$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;
if ($cart->trans_type == ST_SUPPINVOICE)
$_POST['due_date'] = $cart->due_date;
$_POST['supp_ref'] = $cart->supp_ref;
@@
-40,7
+40,7
@@
function copy_to_cart()
$cart = &$_SESSION['PO'];
$cart->supplier_id = $_POST['supplier_id'];
$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'];
if ($cart->trans_type == ST_SUPPINVOICE)
{
$cart->due_date = $_POST['due_date'];
@@
-85,7
+85,7
@@
function create_cart($trans_type, $trans_no)
$_POST['OrderDate'] = new_doc_date();
if (!is_date_in_fiscalyear($_POST['OrderDate']))
$_POST['OrderDate'] = end_fiscalyear();
$_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->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);
/* read in all the selected order into the Items cart */
if ($trans_no) {
read_po($trans_no, $cart);
@@
-145,7
+145,7
@@
function display_po_header(&$order)
'OrderDate', '', true, 0, 0, 0, null, true);
if (isset($_POST['_OrderDate_changed'])) {
'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');
get_duedate_from_terms($order);
$_POST['due_date'] = $order->due_date;
$Ajax->activate('due_date');
@@
-283,11
+283,11
@@
function display_po_items(&$order, $editable=true)
label_row(_("Sub-total"), $display_sub_total, "colspan=$colspan align=right","align=right", 2);
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);
$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'");
start_row();
label_cells(_("Amount Total"), $display_total, "colspan=$colspan align='right'","align='right'");
@@
-321,7
+321,7
@@
function display_po_summary(&$po, $is_self=false, $editable=false)
}
end_row();
start_row();
}
end_row();
start_row();
- label_cells(_("Date"), $po->
orig_order
_date, "class='tableheader2'");
+ label_cells(_("Date"), $po->
tran
_date, "class='tableheader2'");
if ($editable)
{
if ($editable)
{
@@
-402,7
+402,7
@@
function po_item_controls(&$order, &$rowcounter, $line_no=-1)
if ($order->fixed_asset)
stock_purchasable_fa_list_cells(null, 'stock_id', null, false, true, false, true, $order->line_items);
else
if ($order->fixed_asset)
stock_purchasable_fa_list_cells(null, 'stock_id', null, false, true, false, true, $order->line_items);
else
- stock_items_list_cells(null, 'stock_id', null, false, true, false, true, array('editable' => 30, 'where'=>array("NOT no_purchase")));
+ 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');
if (list_updated('stock_id')) {
$Ajax->activate('price');