X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fui%2Fpo_ui.inc;h=885af754583cc8d9beae75bb86fb57735c415c7a;hb=84e2f869630484bd9380e5c30647a483bce14d1e;hp=f9f1b3f4b2c569634c27203ff159f83a741f9af2;hpb=de320b43ef41373a90d9061483b6e8970947fdfa;p=fa-stable.git
diff --git a/purchasing/includes/ui/po_ui.inc b/purchasing/includes/ui/po_ui.inc
index f9f1b3f4..885af754 100644
--- a/purchasing/includes/ui/po_ui.inc
+++ b/purchasing/includes/ui/po_ui.inc
@@ -1,7 +1,43 @@
.
+***********************************************************************/
include_once($path_to_root . "/purchasing/includes/purchasing_db.inc");
+//--------------------------------------------------------------------------------------------------
+
+function copy_from_cart()
+{
+ $cart = &$_SESSION['PO'];
+
+ $_POST['supplier_id'] = $cart->supplier_id;
+ $_POST['OrderDate'] = $cart->orig_order_date;
+ $_POST['supp_ref'] = $cart->supp_ref;
+ $_POST['ref'] = $cart->reference;
+ $_POST['Comments'] = $cart->Comments;
+ $_POST['StkLocation'] = $cart->Location;
+ $_POST['delivery_address'] = $cart->delivery_address;
+}
+
+function copy_to_cart()
+{
+ $cart = &$_SESSION['PO'];
+
+ $cart->supplier_id = $_POST['supplier_id'];
+ $cart->orig_order_date = $_POST['OrderDate'];
+ $cart->reference = $_POST['ref'];
+ $cart->supp_ref = $_POST['supp_ref'];
+ $cart->Comments = $_POST['Comments'];
+ $cart->Location = $_POST['StkLocation'];
+ $cart->delivery_address = $_POST['delivery_address'];
+}
// ------------------------------------------------------------------------------
function get_supplier_details_to_order(&$order, $supplier_id)
@@ -19,51 +55,47 @@ function get_supplier_details_to_order(&$order, $supplier_id)
//---------------------------------------------------------------------------------------------------
-function create_new_po()
+function create_new_po($trans_type, $trans_no)
{
- if (isset($_SESSION['PO']))
- {
- unset ($_SESSION['PO']->line_items);
- $_SESSION['PO']->lines_on_order = 0;
- unset ($_SESSION['PO']);
- }
+ global $Refs;
- session_register("PO");
+ if (isset($_SESSION['PO']))
+ unset ($_SESSION['PO']->line_items, $_SESSION['PO']);
- $_SESSION['PO'] = new purch_order;
- $_POST['OrderDate'] = Today();
+ $cart = new purch_order;
+ $_POST['OrderDate'] = new_doc_date();
if (!is_date_in_fiscalyear($_POST['OrderDate']))
$_POST['OrderDate'] = end_fiscalyear();
- $_SESSION['PO']->orig_order_date = $_POST['OrderDate'];
+ $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 */
+ if ($trans_no) {
+ read_po($trans_no, $cart);
+ $cart->order_no = $trans_no;
+ } else
+ $cart->reference = $Refs->get_next($trans_type);
+ $_SESSION['PO'] = &$cart;
}
//---------------------------------------------------------------------------------------------------
function display_po_header(&$order)
{
- global $table_style2, $Ajax;
+ global $table_style2, $Ajax, $Refs;
$editable = ($order->order_no == 0);
- start_table("width=80% $table_style2");
- echo "
"; // outer table
- echo "";
+ start_outer_table("width=80% $table_style2");
+ table_section(1);
if ($editable)
{
- if (!isset($_POST['supplier_id']) && (get_global_supplier() != reserved_words::get_all()))
+ if (!isset($_POST['supplier_id']) && (get_global_supplier() != ALL_TEXT))
$_POST['supplier_id'] = get_global_supplier();
- supplier_list_row(_("Supplier:"), 'supplier_id', null, false, true);
-
- if ($order->supplier_id != $_POST['supplier_id'])
- {
- // supplier has changed
- // delete all the order items - drastic but necessary because of
- // change of currency, etc
- $order->clear_items();
- // FIX
- }
+ supplier_list_row(_("Supplier:"), 'supplier_id', null, false, true, false, true);
}
else
{
@@ -77,6 +109,7 @@ function display_po_header(&$order)
foreach ($order->line_items as $line_no=>$item) {
$line = &$order->line_items[$line_no];
$line->price = get_purchase_price ($order->supplier_id, $_POST['stock_id']);
+ $line->quantity = get_purchase_conversion_factor ($order->supplier_id, $_POST['stock_id']);
}
$Ajax->activate('items_table');
}
@@ -84,16 +117,14 @@ function display_po_header(&$order)
if (!is_company_currency($order->curr_code))
{
-//FIX div currency ?
label_row(_("Supplier Currency:"), $order->curr_code);
exchange_rate_display($order->curr_code, get_company_currency(),
$_POST['OrderDate']);
-
}
if ($editable)
{
- ref_row(_("Reference:"), 'ref', '', references::get_next(systypes::po()));
+ ref_row(_("Reference:"), 'ref');
}
else
{
@@ -101,11 +132,8 @@ function display_po_header(&$order)
label_row(_("Reference:"), $order->reference);
}
- echo " ";
-
- echo " | "; // outer table
+ table_section(2);
- echo "";
// check this out?????????
//if (!isset($_POST['OrderDate']) || $_POST['OrderDate'] == "")
// $_POST['OrderDate'] = $order->orig_order_date;
@@ -115,21 +143,20 @@ function display_po_header(&$order)
// if (!is_date_in_fiscalyear($_POST['OrderDate']))
// $_POST['OrderDate'] = end_fiscalyear();
//}
- date_row(_("Order Date:"), 'OrderDate', '', $_POST['OrderDate'], 0, 0, 0);
-
- text_row(_("Supplier's Reference:"), 'Requisition', null, 16, 15);
-
- echo " ";
-
- echo " | "; // outer table
+ date_row(_("Order Date:"), 'OrderDate', '', true, 0, 0, 0, null, true);
+ if (isset($_POST['_OrderDate_changed'])) {
+ $Ajax->activate('_ex_rate');
+ }
- echo "";
+ text_row(_("Supplier's Reference:"), 'supp_ref', null, 16, 15);
echo "" . _("Receive Into:") . " | ";
echo "";
- locations_list('StkLocation', null, false, true);
+ echo locations_list('StkLocation', null, false, true);
echo " | ";
+ table_section(3);
+
if (!isset($_POST['StkLocation']) || $_POST['StkLocation'] == "" ||
isset($_POST['_StkLocation_update']) || !isset($_POST['delivery_address']) ||
$_POST['delivery_address'] == "")
@@ -156,10 +183,8 @@ function display_po_header(&$order)
}
textarea_row(_("Deliver to:"), 'delivery_address', $_POST['delivery_address'], 35, 4);
- echo " ";
- echo " |
";
- end_table(); // outer table
+ end_outer_table(); // outer table
}
//---------------------------------------------------------------------------------------------------
@@ -173,9 +198,12 @@ function display_po_items(&$order, $editable=true)
div_start('items_table');
start_table("$table_style width=80%");
- $th = array(_("Item Code"), _("Item Description"), _("Quantity"), _("Unit"),
- _("Required Delivery Date"), _("Price"), _("Line Total"));
-
+ $th = array(_("Item Code"), _("Item Description"), _("Quantity"),
+ _("Received"), _("Unit"),
+ _("Required Delivery Date"), _("Price"), _("Line Total"), "");
+ if ($order->trans_type != ST_PURCHORDER)
+ array_remove($th, 5);
+
if (count($order->line_items)) $th[] = '';
table_header($th);
@@ -184,47 +212,43 @@ function display_po_items(&$order, $editable=true)
$k = 0;
foreach ($order->line_items as $line_no => $po_line)
{
-
- if ($po_line->Deleted == false)
+ $line_total = round($po_line->quantity * $po_line->price, user_price_dec());
+ if (!$editable || ($id != $line_no))
{
- $line_total = round($po_line->quantity * $po_line->price, user_price_dec());
-// if (!$editable || ($id != $po_line->line_no))
- if (!$editable || ($id != $line_no))
+ alt_table_row_color($k);
+ label_cell($po_line->stock_id);
+ label_cell($po_line->item_description);
+ qty_cell($po_line->quantity, false, get_qty_dec($po_line->stock_id));
+ qty_cell($po_line->qty_received, false, get_qty_dec($po_line->stock_id));
+ label_cell($po_line->units);
+ if ($order->trans_type == ST_PURCHORDER)
+ label_cell($po_line->req_del_date);
+ amount_decimal_cell($po_line->price);
+ amount_cell($line_total);
+
+ if ($editable)
{
- alt_table_row_color($k);
- label_cell($po_line->stock_id);
- label_cell($po_line->item_description);
- qty_cell($po_line->quantity, false, get_qty_dec($po_line->stock_id));
- label_cell($po_line->units);
- label_cell($po_line->req_del_date);
- amount_cell($po_line->price);
- amount_cell($line_total);
-
- if ($editable)
- {
edit_button_cell("Edit$line_no", _("Edit"),
_('Edit document line'));
- edit_button_cell("Delete$line_no", _("Delete"),
- _('Remove line from document'));
-// edit_link_cell(SID."Edit=" . $po_line->line_no);
-// delete_link_cell(SID."Delete=" . $po_line->line_no);
- }
- end_row();
- }
- else
- {
- po_item_controls($order, $po_line->stock_id);
+ delete_button_cell("Delete$line_no", _("Delete"),
+ _('Remove line from document'));
}
- $total += $line_total;
+ end_row();
}
+ else
+ {
+ po_item_controls($order, $k, $line_no);
+ }
+ $total += $line_total;
}
if ($id==-1 && $editable)
- po_item_controls($order);
+ po_item_controls($order, $k);
$display_total = price_format($total);
- label_row(_("Total Excluding Shipping/Tax"), $display_total, "colspan=6 align=right",
- "nowrap align=right");
+ label_row(_("Total Excluding Shipping/Tax"), $display_total, "colspan="
+ .(count($order->line_items) ? 7:6)." align=right",
+ "nowrap align=right", 2);
end_table(1);
div_end();
@@ -247,7 +271,7 @@ function display_po_summary(&$po, $is_self=false, $editable=false)
if (!$is_self)
{
- label_cells(_("Purchase Order"), get_trans_view_str(systypes::po(), $po->order_no),
+ label_cells(_("Purchase Order"), get_trans_view_str(ST_PURCHORDER, $po->order_no),
"class='tableheader2'");
}
end_row();
@@ -267,8 +291,8 @@ function display_po_summary(&$po, $is_self=false, $editable=false)
"class='tableheader2'");
}
- if ($po->requisition_no != "")
- label_cells(_("Supplier's Reference"), $po->requisition_no, "class='tableheader2'");
+ if ($po->supp_ref != "")
+ label_cells(_("Supplier's Reference"), $po->supp_ref, "class='tableheader2'");
end_row();
if (!$editable)
@@ -283,39 +307,49 @@ function display_po_summary(&$po, $is_self=false, $editable=false)
//--------------------------------------------------------------------------------
-function po_item_controls(&$order, $stock_id=null)
+function po_item_controls(&$order, &$rowcounter, $line_no=-1)
{
global $Ajax;
- start_row();
+ alt_table_row_color($rowcounter);
+
+ $dec2 = 0;
$id = find_submit('Edit');
- if ($id && $stock_id != null)
+ if (($id != -1) && $line_no == $id)
{
- hidden('line_no', $id);
+// hidden('line_no', $id);
- if (!isset($_POST['stock_id']))
- $_POST['stock_id'] = $order->line_items[$id]->stock_id;
+ $_POST['stock_id'] = $order->line_items[$id]->stock_id;
$dec = get_qty_dec($_POST['stock_id']);
- if (!isset($_POST['qty']) || ($_POST['qty'] == ""))
- $_POST['qty'] = qty_format($order->line_items[$id]->quantity, $_POST['stock_id'], $dec);
- if (!isset($_POST['price']) || ($_POST['price'] == ""))
- $_POST['price'] = price_format($order->line_items[$id]->price);
- if (!isset($_POST['req_del_date']) || ($_POST['req_del_date'] == ""))
+ $_POST['qty'] = qty_format($order->line_items[$id]->quantity, $_POST['stock_id'], $dec);
+ //$_POST['price'] = price_format($order->line_items[$id]->price);
+ $_POST['price'] = price_decimal_format($order->line_items[$id]->price, $dec2);
+ if ($order->trans_type == ST_PURCHORDER)
$_POST['req_del_date'] = $order->line_items[$id]->req_del_date;
$_POST['units'] = $order->line_items[$id]->units;
+ $_POST['item_description'] = $order->line_items[$id]->item_description;
hidden('stock_id', $_POST['stock_id']);
label_cell($_POST['stock_id']);
- label_cell($order->line_items[$id]->item_description);
+
+ if ($order->line_items[$id]->descr_editable)
+ text_cells(null,'item_description', null, 45, 150);
+ else {
+ hidden('item_description', $_POST['item_description']);
+// label_cell($_POST['item_description']);
+ label_cell($order->line_items[$id]->item_description);
+ }
+
$Ajax->activate('items_table');
+ $qty_rcvd = $order->line_items[$id]->qty_received;
}
else
{
- hidden('line_no', ($_SESSION['PO']->lines_on_order + 1));
+// hidden('line_no', ($_SESSION['PO']->lines_on_order + 1));
- stock_purchasable_items_list_cells(null, 'stock_id', null, false, true);
- if(isset($_POST['_stock_id_update'])) {
+ stock_purchasable_items_list_cells(null, 'stock_id', null, false, true, true);
+ if (list_updated('stock_id')) {
$Ajax->activate('price');
$Ajax->activate('units');
$Ajax->activate('qty');
@@ -325,17 +359,22 @@ function po_item_controls(&$order, $stock_id=null)
$item_info = get_item_edit_info($_POST['stock_id']);
$_POST['units'] = $item_info["units"];
- $dec = get_qty_dec($_POST['stock_id']);
- $_POST['qty'] = qty_format(1, $_POST['stock_id'], $dec);
- $_POST['price'] = price_format(get_purchase_price ($order->supplier_id, $_POST['stock_id']));
- $_POST['req_del_date'] = add_days(Today(), 10);
+ $dec = $item_info["decimals"];
+ $_POST['qty'] = number_format2(get_purchase_conversion_factor ($order->supplier_id, $_POST['stock_id']), $dec);
+ //$_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);
+ $qty_rcvd = '';
}
qty_cells(null, 'qty', null, null, null, $dec);
+ qty_cell($qty_rcvd, false, $dec);
label_cell($_POST['units'], '', 'units');
- date_cells(null, 'req_del_date', '', null, 0, 0, 0);
- amount_cells(null, 'price', null);
+ if ($order->trans_type == ST_PURCHORDER)
+ date_cells(null, 'req_del_date', '', null, 0, 0, 0);
+ 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());
@@ -343,10 +382,11 @@ function po_item_controls(&$order, $stock_id=null)
if ($id!=-1)
{
- edit_button_cell('UpdateLine', _("Update"),
- _('Confirm changes'));
- edit_button_cell('CancelUpdate', _("Cancel"),
- _('Cancel changes'));
+ button_cell('UpdateLine', _("Update"),
+ _('Confirm changes'), ICON_UPDATE);
+ button_cell('CancelUpdate', _("Cancel"),
+ _('Cancel changes'), ICON_CANCEL);
+ hidden('line_no', $line_no);
set_focus('qty');
}
else