X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sales%2Fincludes%2Fui%2Fsales_order_ui.inc;h=ae2bd96471b46aa8bf830d7d441d5f667f80da56;hb=b41f81ed2c825462ec293ff11521320606bdeb8e;hp=b9f5e12e205ded2f1317ec3577420ceeab0c2c92;hpb=99730b8d6deb7e81d2f1ebeb2ce7066d27729485;p=fa-stable.git
diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc
index b9f5e12e..ae2bd964 100644
--- a/sales/includes/ui/sales_order_ui.inc
+++ b/sales/includes/ui/sales_order_ui.inc
@@ -34,36 +34,44 @@ function get_customer_details_to_order(&$order, $customer_id, $branch_id)
$deliver = $myrow['address']; // in case no delivery 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)
- {
- $result = get_branch_to_order($customer_id, $branch_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 = $myrow["br_post_address"];
- $order->set_location($myrow["default_location"], $myrow["location_name"]);
- $order->set_delivery($myrow["default_ship_via"], $myrow["br_name"],
+ if (strlen($address) <= 1) // if branch has no address
+ $address = $deliver; // set sales order address
+ $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->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;
}
@@ -71,7 +79,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);
@@ -175,13 +183,15 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
if ($order->customer_id != get_post('customer_id', -1))
{
// customer has changed
- // clear the branch selection
- $_POST['branch_id'] = '';
$Ajax->activate('branch_id');
}
customer_branches_list_row(_("Branch:"),
$_POST['customer_id'], 'branch_id', null, false, true, true);
+ if( ($order->customer_id != get_post('customer_id', -1)) ||
+ ($order->Branch != get_post('branch_id', -1)) ||
+ list_updated('customer_id')) {
+
if (!isset($_POST['branch_id']) || $_POST['branch_id'] == "")
{
// ignore errors on customer search box call
@@ -193,8 +203,6 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
$order->Branch = 0;
} else
{
- if( ($order->customer_id != get_post('customer_id', -1)) ||
- ($order->Branch != get_post('branch_id', -1))) {
$old_order = (PHP_VERSION<5) ? $order : clone( $order );
$customer_error = get_customer_details_to_order($order, $_POST['customer_id'], $_POST['branch_id']);
@@ -203,10 +211,17 @@ 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;
+ $_POST['cash'] = $order->cash;
+ 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('cash');
// change prices if necessary
// what about discount in template case?
if ($old_order->customer_currency != $order->customer_currency) {
@@ -220,8 +235,8 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
}
unset($old_order);
}
- } // changed branch
set_global_customer($_POST['customer_id']);
+ } // changed branch
}
if ($_SESSION['Items']->trans_type!=30) {
@@ -238,7 +253,7 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
echo "
";
label_row(_("Customer Currency:"), $order->customer_currency);
exchange_rate_display($order->customer_currency, get_company_currency(),
- ($editable ? $_POST['OrderDate'] : $order->document_date), $editable);
+ ($editable ? $_POST['OrderDate'] : $order->document_date));
echo "
";
div_end();
echo ""; // outer table
@@ -246,6 +261,26 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
echo "";
+ 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);
+
if($editable) {
$str = sales_types_list_row(_("Price List"), 'sales_type', null, true);
} else {
@@ -254,20 +289,11 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
if ($order->sales_type != $_POST['sales_type']) {
$myrow = get_sales_type($_POST['sales_type']);
$order->set_sales_type($myrow['id'], $myrow['sales_type'],
- $myrow['tax_included'], $myrow['factor']);
+ $myrow['tax_included'], $myrow['factor']);
$Ajax->activate('sales_type');
$change_prices = 1;
}
- 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,
- $order->sales_type, $order->price_factor, $order->document_date);
- // $line->discount_percent = $order->default_discount;
- }
- $Ajax->activate('items_table');
- }
label_row(_("Customer Discount:"), ($order->default_discount * 100) . "%");
echo " ";
@@ -281,7 +307,16 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
$_POST['OrderDate'] = $order->document_date;
date_row($date_text, 'OrderDate',
- _('Date of order receive'));
+ _('Date of order receive'), null, 0, 0, 0, null, true);
+ if (isset($_POST['_OrderDate_changed'])) {
+ $change_prices = 1;
+ $Ajax->activate('currency');
+ if ($order->trans_type == 10) {
+ $_POST['delivery_date'] = get_invoice_duedate(get_post('customer_id'), get_post('OrderDate'));
+ } else
+ $_POST['delivery_date'] = add_days(get_post('OrderDate'), sys_prefs::default_delivery_required_by());
+ $Ajax->activate('delivery_date');
+ }
}
else
{
@@ -300,6 +335,16 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
end_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,
+ $order->sales_type, $order->price_factor, get_post('OrderDate'));
+ // $line->discount_percent = $order->default_discount;
+ }
+ $Ajax->activate('items_table');
+ }
+
return $customer_error;
}
@@ -315,7 +360,8 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1)
if ($line_no!=-1 && $line_no == $id)
{
$_POST['stock_id'] = $order->line_items[$id]->stock_id;
- $_POST['qty'] = qty_format($order->line_items[$id]->qty_dispatched, $_POST['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);
$units = $order->line_items[$id]->units;
@@ -327,29 +373,30 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1)
else
{
stock_items_list_cells(null,'stock_id', null, false, true);
- if(isset($_POST['_stock_id_update'])) {
+ if (list_updated('stock_id')) {
$Ajax->activate('price');
$Ajax->activate('units');
+ $Ajax->activate('qty');
$Ajax->activate('line_total');
}
$item_info = get_item_edit_info($_POST['stock_id']);
$units = $item_info["units"];
-
- $_POST['qty'] = qty_format(1, $_POST['stock_id']);
+ $dec = get_qty_dec($_POST['stock_id']);
+ $_POST['qty'] = number_format2(1, $dec);
$_POST['price'] = price_format(get_price ($_POST['stock_id'],
$order->customer_currency, $order->sales_type,
- $order->price_factor, $order->document_date));
+ $order->price_factor, get_post('OrderDate')));
// default to the customer's discount %
$_POST['Disc'] = percent_format($order->default_discount * 100);
}
- qty_cells(null, 'qty', qty_format($_POST['qty'], $_POST['stock_id'], $dec), null, null, $dec);
+ qty_cells(null, 'qty', $_POST['qty'], null, null, $dec);
if ($order->trans_no!=0) {
- amount_cell($line_no==-1 ? 0 :$order->line_items[$line_no]->qty_done);
+ qty_cell($line_no==-1 ? 0 :$order->line_items[$line_no]->qty_done, false, $dec);
}
label_cell($units, '', 'units');
@@ -358,7 +405,7 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1)
small_amount_cells(null, 'Disc', percent_format($_POST['Disc']), null, null, user_percent_dec());
- $line_total = $_POST['qty'] * $_POST['price'] * (1 - $_POST['Disc'] / 100);
+ $line_total = input_num('qty') * input_num('price') * (1 - input_num('Disc') / 100);
amount_cell($line_total, false, '','line_total');
@@ -370,7 +417,6 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1)
_('Cancel changes'));
hidden('LineNo', $line_no);
set_focus('qty');
- $Ajax->addFocus(true, 'qty');
}
else
{
@@ -385,61 +431,95 @@ 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 "";
-
- locations_list_row(_("Deliver from Location:"), 'Location', $order->Location);
-
- date_row($delname, 'delivery_date',
- _('Enter requested day of delivery'), $order->due_date, 0, 0, 0);
+ global $table_style2, $Ajax;
- text_row(_("Deliver To:"), 'deliver_to', $order->deliver_to, 40, 40,
- _('Additional identifier for delivery e.g. name of receiving person'));
+div_start('delivery');
- 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 (get_post('cash', 0)) { // Direct payment sale
+ display_heading(_('Cash payment'));
+ echo "";
+ label_row(_("Deliver from Location:"), $order->location_name);
- echo " ";
+ hidden('Location', $order->Location);
+ label_row(_("Cash account:"), $order->account_name);
+ textarea_row(_("Comments:"), "Comments", $order->Comments, 31, 5);
+ echo " ";
+ } else {
- echo " | "; // outer table
+ 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 "";
+
+ locations_list_row(_("Deliver from Location:"), 'Location', null,
+ false, true);
+ if (list_updated('Location'))
+ check_qoh($order);
+
+ 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'));
+
+ 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'));
- echo "";
- 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);
+ echo ""; // outer table
- 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);
+ 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);
- echo " ";
+ small_amount_row(_("Shipping Charge:"), 'freight_cost',
+ price_format(get_post('freight_cost',0)));
- echo " | ";
- end_table(1); // outer table
+ shippers_list_row(_("Shipping Company:"), 'ship_via', $order->ship_via);
+ echo " ";
+ echo " |
";
+ end_table(1); // outer table
+ }
+ div_end();
}
+function check_qoh($order)
+{
+ $msg = '';
+ foreach($order->line_items as $line_no => $line) {
+ $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