{
if (strcasecmp($order_item->stock_id, $item['stock_id']) == 0)
{
- display_notification(_("For Part :").$item['stock_id']. " "
+ display_warning(_("For Part :").$item['stock_id']. " "
. _("This item is already on this order. You have been warned."));
break;
}
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'], $myrow['pymt_discount']);
$order->set_branch($branch_id, $myrow["tax_group_id"],
$myrow["tax_group_name"], $myrow["phone"], $myrow["email"]);
- $address = $myrow["br_post_address"];
+ $address = trim($myrow["br_post_address"]) != '' ? $myrow["br_post_address"]
+ : (trim($myrow["br_address"]) != '' ? $myrow["br_address"]:$deliver);
- 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) {
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)
{
global $table_style, $Ajax;
- start_table("width=80% $table_style");
- echo "<tr><td valign=top>"; // outer table
- echo "<table>";
+ start_outer_table("width=80% $table_style");
+ table_section(1);
+
$customer_error = "";
$change_prices = 0;
} // changed branch
}
- if ($_SESSION['Items']->trans_type!=30) {
+ if ($order->trans_type != 30) {
ref_cells(_("Reference").':', 'ref', _('Reference number unique for this document type'), null, '');
}
- echo "</table>";
-
- echo "</td><td>"; // outer table
-
if (!is_company_currency($order->customer_currency))
{
+ table_section(2);
+
div_start('currency');
- echo "<table height='5'>";
label_row(_("Customer Currency:"), $order->customer_currency);
exchange_rate_display($order->customer_currency, get_company_currency(),
($editable ? $_POST['OrderDate'] : $order->document_date));
- echo "</table>";
div_end();
- echo "</td><td>"; // outer table
}
+ table_section(3);
-
- echo "<table height='5'>";
if ($order->trans_type == 10 && $order->pos != -1) {
sale_payment_list_cells(_('Payment:'), 'cash', null, true);
$cash_payment = get_post('cash', 0);
}
label_row(_("Customer Discount:"), ($order->default_discount * 100) . "%");
- echo "</table>";
-
- echo "</td><td>"; // outer table
-
- echo "<table height='5'>";
+
+ table_section(4);
if ($editable)
{
date_row($date_text, 'OrderDate',
_('Date of order receive'), null, 0, 0, 0, null, true);
if (isset($_POST['_OrderDate_changed'])) {
- $change_prices = 1;
+ if (!is_company_currency($order->customer_currency)
+ && (get_base_sales_type()>0)) {
+ $change_prices = 1;
+ }
$Ajax->activate('currency');
if ($order->trans_type == 10) {
$_POST['delivery_date'] = get_invoice_duedate(get_post('customer_id'), get_post('OrderDate'));
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 "</table>";
-
- echo "</td></tr>";
- end_table(1); // outer table
+ end_outer_table(1); // outer table
if ($change_prices != 0) {
foreach ($order->line_items as $line_no=>$item) {
$_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 // prepare new line
{
global $table_style2, $Ajax;
-div_start('delivery');
+ div_start('delivery');
if (get_post('cash', 0)) { // Direct payment sale
display_heading(_('Cash payment'));
- echo "<table $table_style2 width=60% align=center>";
+ start_table("$table_style2 width=60%");
label_row(_("Deliver from Location:"), $order->location_name);
hidden('Location', $order->Location);
label_row(_("Cash account:"), $order->account_name);
textarea_row(_("Comments:"), "Comments", $order->Comments, 31, 5);
- echo "</table>";
+ end_table();
} else {
if ($order->trans_type==10)
$delname = _("Required Delivery Date").':';
}
display_heading($title);
- echo "<br>";
- start_table("$table_style2 width=90%");
- echo "<tr valign=top><td>"; // outer table
- echo "<table>";
+ start_outer_table("$table_style2 width=90%");
+ table_section(1);
locations_list_row(_("Deliver from Location:"), 'Location', null,
false, true);
text_row(_("Contact Phone Number:"), 'phone', $order->phone, 25, 25,
_('Phone number of ordering person. Defaults to branch phone number'));
- echo "</table>";
-
- echo "</td><td>"; // outer table
-
- echo "<table>";
+ table_section(2);
text_row(_("Customer Reference:"), 'cust_ref', $order->cust_ref, 25, 25,
_('Customer reference number for this order (if any)'));
price_format(get_post('freight_cost',0)));
shippers_list_row(_("Shipping Company:"), 'ship_via', $order->ship_via);
- echo "</table>";
- echo "</td></tr>";
- end_table(1); // outer table
+
+ end_outer_table(1);
}
div_end();
}
{
$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 . ": " .