X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fui%2Fsales_order_ui.inc;h=28b079cd3ff3192a8a2a15cd07e1ef44237ab970;hb=d567a10b7925c8bb97c734e213d6651a979af29d;hp=29459dc816aaa6b8be907b9d1ad63606e60035e2;hpb=231b2de9031a927156a58998fdb5601447732b38;p=fa-stable.git
diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc
index 29459dc8..28b079cd 100644
--- a/sales/includes/ui/sales_order_ui.inc
+++ b/sales/includes/ui/sales_order_ui.inc
@@ -1,24 +1,72 @@
.
+***********************************************************************/
include_once($path_to_root . "/sales/includes/cart_class.inc");
include_once($path_to_root . "/includes/manufacturing.inc");
//--------------------------------------------------------------------------------
function add_to_order(&$order, $new_item, $new_item_qty, $price, $discount)
{
+ // calculate item price to sum of kit element prices factor for
+ // value distribution over all exploded kit items
+ $std_price = get_kit_price($new_item, $order->customer_currency,
+ $order->sales_type, $order->price_factor, get_post('OrderDate'), true);
- foreach ($order->line_items AS $order_item)
- {
- if (strcasecmp($order_item->stock_id, $new_item) == 0)
+ if ($std_price == 0)
+ $price_factor = 0;
+ else
+ $price_factor = $price/$std_price;
+
+ $kit = get_item_kit($new_item);
+ $item_num = db_num_rows($kit);
+
+ while($item = db_fetch($kit)) {
+ $std_price = get_kit_price($item['stock_id'], $order->customer_currency,
+ $order->sales_type, $order->price_factor, get_post('OrderDate'), true);
+
+ // rounding differences are included in last price item in kit
+ $item_num--;
+ if ($item_num) {
+ $price -= $item['quantity']*$std_price*$price_factor;
+ $item_price = $std_price*$price_factor;
+ } else {
+ if ($item['quantity'])
+ $price = $price/$item['quantity'];
+ $item_price = $price;
+ }
+ $item_price = round($item_price, user_price_dec());
+
+ if (!$item['is_foreign'] && $item['item_code'] != $item['stock_id'])
+ { // this is sales kit - recurse
+ add_to_order($order, $item['stock_id'], $new_item_qty*$item['quantity'],
+ $item_price, $discount, $std_price);
+ }
+ else
+ { // stock item record eventually with foreign code
+
+ // check duplicate stock item
+ foreach ($order->line_items as $order_item)
{
- display_notification(_("For Part :") . $new_item . " " . _("This item is already on this order. You have been warned."));
- break;
+ if (strcasecmp($order_item->stock_id, $item['stock_id']) == 0)
+ {
+ display_warning(_("For Part :").$item['stock_id']. " "
+ . _("This item is already on this order. You have been warned."));
+ break;
+ }
}
+ $order->add_to_cart (count($order->line_items), $item['stock_id'],
+ $new_item_qty*$item['quantity'], $item_price, $discount);
+ }
}
-
- $order->add_to_cart (count($order->line_items),$new_item, $new_item_qty, $price, $discount);
}
-
//---------------------------------------------------------------------------------
function get_customer_details_to_order(&$order, $customer_id, $branch_id)
@@ -32,40 +80,50 @@ function get_customer_details_to_order(&$order, $customer_id, $branch_id)
if ($myrow['dissallow_invoices'] == 1)
$ret_error = _("The selected customer account is currently on hold. Please contact the credit control personnel to discuss.");
- $deliver = $myrow['address']; // in case no delivery address.
+ $deliver = $myrow['address']; // in case no branch address use company address
- $order->set_customer($customer_id, $name, $myrow['curr_code'], $myrow['discount']);
+ $order->set_customer($customer_id, $name, $myrow['curr_code'],
+ $myrow['discount'], $myrow['pymt_discount']);
// the sales type determines the price list to be used by default
$order->set_sales_type($myrow['salestype'], $myrow['sales_type'], $myrow['tax_included'],
$myrow['factor']);
-// if ($order->Branch != 0)
+ if ($order->trans_type != 30)
{
- $result = get_branch_to_order($customer_id, $branch_id);
+ $order->dimension_id = $myrow['dimension_id'];
+ $order->dimension2_id = $myrow['dimension2_id'];
+ }
+ $result = get_branch_to_order($customer_id, $branch_id);
- if (db_num_rows($result) == 0)
- {
+ if (db_num_rows($result) == 0)
+ {
return _("The selected customer and branch are not valid, or the customer does not have any branches.");
- }
-
- $myrow = db_fetch($result);
+ }
- $order->set_branch($branch_id, $myrow["tax_group_id"],
- $myrow["tax_group_name"], $myrow["phone"], $myrow["email"]);
+ $myrow = db_fetch($result);
- $address = $myrow["br_post_address"];
+ $order->set_branch($branch_id, $myrow["tax_group_id"],
+ $myrow["tax_group_name"], $myrow["phone"], $myrow["email"]);
- if (strlen($address) <= 1) // if branch has no address
- $address = $deliver; // set sales order address
+ $address = trim($myrow["br_post_address"]) != '' ? $myrow["br_post_address"]
+ : (trim($myrow["br_address"]) != '' ? $myrow["br_address"]:$deliver);
- $order->set_location($myrow["default_location"], $myrow["location_name"]);
- $order->set_delivery($myrow["default_ship_via"], $myrow["br_name"],
+ $order->set_delivery($myrow["default_ship_via"], $myrow["br_name"],
$address);
- if ($order->trans_type == 10)
- $order->due_date = get_invoice_duedate($customer_id, $order->document_date);
+ if ($order->trans_type == 10) {
+ $order->due_date = get_invoice_duedate($customer_id, $order->document_date);
+ if ($order->pos != -1)
+ $order->cash = date_diff($order->due_date, Today(), 'd')<2;
}
-
+ if($order->cash ) {
+ if($order->pos != -1) {
+ $paym = get_sales_point($order->pos);
+ $order->set_location($paym["pos_location"], $paym["location_name"]);
+ }
+ } else
+ $order->set_location($myrow["default_location"], $myrow["location_name"]);
+
return $ret_error;
}
@@ -73,7 +131,7 @@ function get_customer_details_to_order(&$order, $customer_id, $branch_id)
function display_order_summary($title, &$order, $editable_items=false)
{
- global $table_style, $path_to_root, $Ajax;
+ global $table_style, $path_to_root;
display_heading($title);
@@ -109,7 +167,8 @@ function display_order_summary($title, &$order, $editable_items=false)
view_stock_status_cell($stock_item->stock_id);
- label_cell($stock_item->item_description, "nowrap" );
+ //label_cell($stock_item->item_description, "nowrap" );
+ label_cell($stock_item->item_description );
qty_cell($stock_item->qty_dispatched, false, get_qty_dec($stock_item->stock_id));
if ($order->trans_no!=0)
@@ -125,7 +184,7 @@ function display_order_summary($title, &$order, $editable_items=false)
{
edit_button_cell("Edit$line_no", _("Edit"),
_('Edit document line'));
- edit_button_cell("Delete$line_no", _("Delete"),
+ delete_button_cell("Delete$line_no", _("Delete"),
_('Remove line from document'));
}
end_row();
@@ -155,10 +214,10 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
{
global $table_style, $Ajax;
- start_table("width=80% $table_style");
- echo ""; // outer table
- echo "";
+ start_outer_table("width=80% $table_style");
+ table_section(1);
+
$customer_error = "";
$change_prices = 0;
@@ -169,6 +228,10 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
hidden('customer_id', $order->customer_id);
hidden('branch_id', $order->Branch);
hidden('sales_type', $order->sales_type);
+ if ($order->trans_type != 30) {
+ hidden('dimension_id', $order->dimension_id); // 2008-11-12 Joe Hunt
+ hidden('dimension2_id', $order->dimension2_id);
+ }
}
else
{
@@ -207,15 +270,21 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
$_POST['deliver_to'] = $order->deliver_to;
$_POST['delivery_address'] = $order->delivery_address;
$_POST['phone'] = $order->phone;
- if ($order->trans_type == 10)
- {
- $_POST['delivery_date'] = $order->due_date;
- $Ajax->activate('delivery_date');
+ if (get_post('cash') !== $order->cash) {
+ $_POST['cash'] = $order->cash;
+ $Ajax->activate('delivery');
+ $Ajax->activate('cash');
+ } else {
+ if ($order->trans_type == 10)
+ {
+ $_POST['delivery_date'] = $order->due_date;
+ $Ajax->activate('delivery_date');
+ }
+ $Ajax->activate('Location');
+ $Ajax->activate('deliver_to');
+ $Ajax->activate('phone');
+ $Ajax->activate('delivery_address');
}
- $Ajax->activate('Location');
- $Ajax->activate('deliver_to');
- $Ajax->activate('phone');
- $Ajax->activate('delivery_address');
// change prices if necessary
// what about discount in template case?
if ($old_order->customer_currency != $order->customer_currency) {
@@ -227,6 +296,14 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
$Ajax->activate('sales_type');
$change_prices = 1;
}
+ if ($old_order->dimension_id != $order->dimension_id) {
+ $_POST['dimension_id'] = $order->dimension_id;
+ $Ajax->activate('dimension_id');
+ }
+ if ($old_order->dimension2_id != $order->dimension2_id) {
+ $_POST['dimension2_id'] = $order->dimension2_id;
+ $Ajax->activate('dimension2_id');
+ }
unset($old_order);
}
set_global_customer($_POST['customer_id']);
@@ -240,28 +317,42 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
}
}
- if ($_SESSION['Items']->trans_type!=30) {
+ if ($order->trans_type != 30) {
ref_cells(_("Reference").':', 'ref', _('Reference number unique for this document type'), null, '');
}
- echo " ";
-
- echo " | "; // outer table
-
if (!is_company_currency($order->customer_currency))
{
+ table_section(2);
+
div_start('currency');
- echo "";
label_row(_("Customer Currency:"), $order->customer_currency);
exchange_rate_display($order->customer_currency, get_company_currency(),
($editable ? $_POST['OrderDate'] : $order->document_date));
- echo " ";
div_end();
- echo " | "; // outer table
}
+ table_section(3);
+
+ if ($order->trans_type == 10 && $order->pos != -1) {
+ sale_payment_list_cells(_('Payment:'), 'cash', null, true);
+ $cash_payment = get_post('cash', 0);
+ // current user can issue both credit and cash invoices
+ if ($order->cash != $cash_payment) {
+ $order->cash = $cash_payment;
+ if ($cash_payment) {
+ $paym = get_sales_point(user_pos());
+ $order->cash_account = $paym['pos_account'];
+ $order->account_name = $paym['bank_account_name'];
+ $_POST['Location'] = $order->Location = $paym['pos_location'];
+ $order->location_name = $paym['location_name'];
+ }
+ check_qoh($order);
+ $Ajax->activate('delivery');
+ set_focus($order->pos == -1 ? 'delivery_date' : 'account');
+ }
+ } else
+ hidden('cash', $order->cash);
-
- echo "";
if($editable) {
$str = sales_types_list_row(_("Price List"), 'sales_type', null, true);
} else {
@@ -276,11 +367,8 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
}
label_row(_("Customer Discount:"), ($order->default_discount * 100) . "%");
- echo " ";
-
- echo " | "; // outer table
-
- echo "";
+
+ table_section(4);
if ($editable)
{
@@ -301,6 +389,20 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
$_POST['delivery_date'] = add_days(get_post('OrderDate'), sys_prefs::default_delivery_required_by());
$Ajax->activate('delivery_date');
}
+ if ($order->trans_type != 30)
+ { // 2008-11-12 Joe Hunt added dimensions
+ $dim = get_company_pref('use_dimension');
+ if ($dim > 0)
+ dimensions_list_row(_("Dimension").":", 'dimension_id',
+ null, true, ' ', false, 1, false);
+ else
+ hidden('dimension_id', 0);
+ if ($dim > 1)
+ dimensions_list_row(_("Dimension")." 2:", 'dimension2_id',
+ null, true, ' ', false, 2, false);
+ else
+ hidden('dimension2_id', 0);
+ }
}
else
{
@@ -311,18 +413,15 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
if ($display_tax_group)
{
label_row(_("Tax Group:"), $order->tax_group_name);
- hidden('tax_group_id', $_SESSION['Items']->tax_group_id);
+ hidden('tax_group_id', $order->tax_group_id);
}
- echo " ";
-
- echo " |
";
- end_table(1); // outer table
+ end_outer_table(1); // outer table
if ($change_prices != 0) {
foreach ($order->line_items as $line_no=>$item) {
$line = &$order->line_items[$line_no];
- $line->price = get_price($line->stock_id, $order->customer_currency,
+ $line->price = get_kit_price($line->stock_id, $order->customer_currency,
$order->sales_type, $order->price_factor, get_post('OrderDate'));
// $line->discount_percent = $order->default_discount;
}
@@ -341,22 +440,24 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1)
alt_table_row_color($rowcounter);
$id = find_submit('Edit');
- if ($line_no!=-1 && $line_no == $id)
+ if ($line_no!=-1 && $line_no == $id) // edit old line
{
$_POST['stock_id'] = $order->line_items[$id]->stock_id;
$dec = get_qty_dec($_POST['stock_id']);
$_POST['qty'] = number_format2($order->line_items[$id]->qty_dispatched, $dec);
$_POST['price'] = price_format($order->line_items[$id]->price);
$_POST['Disc'] = percent_format($order->line_items[$id]->discount_percent*100);
+ $_POST['item_description'] = $order->line_items[$id]->item_description;
$units = $order->line_items[$id]->units;
hidden('stock_id', $_POST['stock_id']);
label_cell($_POST['stock_id']);
- label_cell($order->line_items[$line_no]->item_description, "nowrap");
+ text_cells(null,'item_description', null, 45, 150);
+ //label_cell($order->line_items[$line_no]->item_description, "nowrap");
$Ajax->activate('items_table');
}
- else
+ else // prepare new line
{
- stock_items_list_cells(null,'stock_id', null, false, true);
+ sales_items_list_cells(null,'stock_id', null, false, true);
if (list_updated('stock_id')) {
$Ajax->activate('price');
$Ajax->activate('units');
@@ -366,15 +467,14 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1)
$item_info = get_item_edit_info($_POST['stock_id']);
$units = $item_info["units"];
- $dec = get_qty_dec($_POST['stock_id']);
+ $dec = $item_info['decimals'];
$_POST['qty'] = number_format2(1, $dec);
-
- $_POST['price'] = price_format(get_price ($_POST['stock_id'],
+ $price = get_kit_price($_POST['stock_id'],
$order->customer_currency, $order->sales_type,
- $order->price_factor, get_post('OrderDate')));
+ $order->price_factor, get_post('OrderDate'));
+ $_POST['price'] = price_format($price);
// default to the customer's discount %
$_POST['Disc'] = percent_format($order->default_discount * 100);
-
}
qty_cells(null, 'qty', $_POST['qty'], null, null, $dec);
@@ -395,10 +495,10 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1)
if ($id!=-1)
{
- edit_button_cell('UpdateItem', _("Update"),
- _('Confirm changes'));
- edit_button_cell('CancelItemChanges', _("Cancel"),
- _('Cancel changes'));
+ button_cell('UpdateItem', _("Update"),
+ _('Confirm changes'), ICON_UPDATE);
+ button_cell('CancelItemChanges', _("Cancel"),
+ _('Cancel changes'), ICON_CANCEL);
hidden('LineNo', $line_no);
set_focus('qty');
}
@@ -415,61 +515,89 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1)
function display_delivery_details(&$order)
{
- global $table_style2;
- if ($order->trans_type==10)
- {
- $title = _("Delivery Details");
- $delname = _("Due Date").':';
- }
- elseif ($order->trans_type==13)
- {
- $title = _("Invoice Delivery Details");
- $delname = _("Invoice before").':';
- }
- else
- {
- $title = _("Order Delivery Details");
- $delname = _("Required Delivery Date").':';
- }
- display_heading($title);
- echo "
";
- start_table("$table_style2 width=90%");
- echo ""; // outer table
-
- echo "";
+ global $table_style2, $Ajax;
- locations_list_row(_("Deliver from Location:"), 'Location', $order->Location);
+ div_start('delivery');
- date_row($delname, 'delivery_date',
- _('Enter requested day of delivery'), $order->due_date, 0, 0, 0);
+ if (get_post('cash', 0)) { // Direct payment sale
+ display_heading(_('Cash payment'));
+ start_table("$table_style2 width=60%");
+ label_row(_("Deliver from Location:"), $order->location_name);
- text_row(_("Deliver To:"), 'deliver_to', $order->deliver_to, 40, 40,
- _('Additional identifier for delivery e.g. name of receiving person'));
+ hidden('Location', $order->Location);
+ label_row(_("Cash account:"), $order->account_name);
+ textarea_row(_("Comments:"), "Comments", $order->Comments, 31, 5);
+ end_table();
+ } else {
- textarea_row(_("Address:"), 'delivery_address', $order->delivery_address, 35, 5,
- _('Delivery address. Default is address of customer branch'));
- text_row(_("Contact Phone Number:"), 'phone', $order->phone, 25, 25,
- _('Phone number of ordering person. Defaults to branch phone number'));
+ if ($order->trans_type==10)
+ {
+ $title = _("Delivery Details");
+ $delname = _("Due Date").':';
+ }
+ elseif ($order->trans_type==13)
+ {
+ $title = _("Invoice Delivery Details");
+ $delname = _("Invoice before").':';
+ }
+ else
+ {
+ $title = _("Order Delivery Details");
+ $delname = _("Required Delivery Date").':';
+ }
+ display_heading($title);
+ start_outer_table("$table_style2 width=90%");
+ table_section(1);
- echo " ";
+ locations_list_row(_("Deliver from Location:"), 'Location', null,
+ false, true);
+ if (list_updated('Location'))
+ check_qoh($order);
- echo " | "; // outer table
+ date_row($delname, 'delivery_date',
+ $order->trans_type==30 ? _('Enter requested day of delivery') : '',
+ $order->due_date, 0, 0, 0);
+ text_row(_("Deliver To:"), 'deliver_to', $order->deliver_to, 40, 40,
+ _('Additional identifier for delivery e.g. name of receiving person'));
- echo "";
+ textarea_row(_("Address:"), 'delivery_address', $order->delivery_address, 35, 5,
+ _('Delivery address. Default is address of customer branch'));
+ text_row(_("Contact Phone Number:"), 'phone', $order->phone, 25, 25,
+ _('Phone number of ordering person. Defaults to branch phone number'));
- text_row(_("Customer Reference:"), 'cust_ref', $order->cust_ref, 25, 25,
- _('Customer reference number for this order (if any)'));
- textarea_row(_("Comments:"), "Comments", $order->Comments, 31, 5);
+ table_section(2);
- small_amount_row(_("Shipping Charge:"), 'freight_cost',
- price_format(get_post('freight_cost',0)));
+ text_row(_("Customer Reference:"), 'cust_ref', $order->cust_ref, 25, 25,
+ _('Customer reference number for this order (if any)'));
+ textarea_row(_("Comments:"), "Comments", $order->Comments, 31, 5);
- shippers_list_row(_("Shipping Company:"), 'ship_via', $order->ship_via);
+ small_amount_row(_("Shipping Charge:"), 'freight_cost',
+ price_format(get_post('freight_cost',0)));
- echo " ";
+ shippers_list_row(_("Shipping Company:"), 'ship_via', $order->ship_via);
- echo " |
";
- end_table(1); // outer table
+ end_outer_table(1);
+ }
+ div_end();
}
+function check_qoh($order)
+{
+ $msg = '';
+ foreach($order->line_items as $line_no => $line) {
+ if (!is_inventory_item($line['stock_id'])) continue;
+ $qoh = get_qoh_on_date($line->stock_id, $_POST['Location'], $_POST['OrderDate']);
+ if ($line->qty_dispatched > $qoh) {
+ $msg .= $line->stock_id . " - " . $line->item_description . ": " .
+ _("Quantity On Hand") . " = "
+ . number_format2($qoh, get_qty_dec($line->stock_id)) . '
';
+ }
+ }
+ if (strlen($msg)) {
+ display_error(_("The delivery cannot be processed because there is an insufficient quantity for item:")
+ . '
'. $msg);
+ return false;
+ }
+ return true;
+}
?>
\ No newline at end of file