function add_to_order(&$order, $new_item, $new_item_qty, $price, $discount)
{
- foreach ($order->line_items AS $order_item)
+ foreach ($order->line_items AS $order_item)
{
- if (strcasecmp($order_item->stock_id, $new_item) == 0)
- {
- display_notification(_("For Part :") . $new_item . " " . _("This item is already on this order. You have been warned."));
- break;
+ if (strcasecmp($order_item->stock_id, $new_item) == 0)
+ {
+ display_notification(_("For Part :") . $new_item . " " . _("This item is already on this order. You have been warned."));
+ break;
}
}
-
+
$order->add_to_cart (count($order->line_items),$new_item, $new_item_qty, $price, $discount);
}
$ret_error = "";
$myrow = get_customer_to_order($customer_id);
-
+
$name = $myrow['name'];
if ($myrow['dissallow_invoices'] == 1)
$ret_error = _("The selected customer account is currently on hold. Please contact the credit control personnel to discuss.");
-/* if (!isset($_POST['branch_id']) || $_POST['branch_id'] == "")
+/* if (!isset($_POST['branch_id']) || $_POST['branch_id'] == "")
{
$ret_error = _("The selected customer does not have any branches. Please create at least one branch.");
unset($_POST['branch_id']);
$order->set_customer($customer_id, $name, $myrow['curr_code'], $myrow['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']);
+ $order->set_sales_type($myrow['salestype'], $myrow['sales_type'], $myrow['tax_included']);
// if ($order->Branch != 0)
{
$result = get_branch_to_order($customer_id, $branch_id);
- if (db_num_rows($result) == 0)
- {
- return _("The selected customer and branch are not valid, or the customer does not have any branches.");
- }
+ 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);
+ $myrow = db_fetch($result);
$order->set_branch($branch_id, $myrow["tax_group_id"],
- $myrow["tax_group_name"], $myrow["phone"], $myrow["email"]);
+ $myrow["tax_group_name"], $myrow["phone"], $myrow["email"]);
- $address = $myrow["br_post_address"];
+ $address = $myrow["br_post_address"];
- if (strlen($address) <= 1) // if branch has no address
- $address = $deliver; // set sales order address
+ if (strlen($address) <= 1) // if branch has no address
+ $address = $deliver; // set sales order address
$order->set_location($myrow["default_location"], $myrow["location_name"]);
- $order->set_delivery($myrow["default_ship_via"], $myrow["br_name"],
- $address);
+ $order->set_delivery($myrow["default_ship_via"], $myrow["br_name"],
+ $address);
}
return $ret_error;
display_heading($title);
start_table("$table_style colspan=7 width=90%");
$th = array(_("Item Code"), _("Item Description"), _("Quantity"),
- _("Delivered"),
+ _("Delivered"),
_("Unit"), _("Price"), _("Discount %"), _("Total"), "");
if ($order->trans_no==0) {
- unset( $th[3] );
+ unset( $th[3] );
}
if (count($order->line_items)) $th[]= '';
- table_header($th);
+ table_header($th);
$total = 0;
$k = 0; //row colour counter
- foreach ($order->line_items as $line_no=>$stock_item)
+ foreach ($order->line_items as $line_no=>$stock_item)
{
$line_total = $stock_item->qty_dispatched * $stock_item->price * (1 - $stock_item->discount_percent);
-
+
if (!isset($_GET['Edit']))
$id = -1;
else
if (!$editable_items || $id != $line_no)
{
- alt_table_row_color($k);
+ alt_table_row_color($k);
view_stock_status_cell($stock_item->stock_id);
-
- label_cell($stock_item->item_description);
- qty_cell($stock_item->qty_dispatched);
-
- if ($order->trans_no!=0)
- amount_cell($stock_item->qty_done);
-
- label_cell($stock_item->units);
- amount_cell($stock_item->price);
-
- amount_cell($stock_item->discount_percent * 100);
- amount_cell($line_total);
-
- if ($editable_items)
- {
- edit_link_cell(SID . "Edit=$line_no");
- delete_link_cell(SID . "Delete=$line_no");
- }
- end_row();
- }
- else
+
+ label_cell($stock_item->item_description);
+ qty_cell($stock_item->qty_dispatched);
+
+ if ($order->trans_no!=0)
+ amount_cell($stock_item->qty_done);
+
+ label_cell($stock_item->units);
+ amount_cell($stock_item->price);
+
+ percent_cell($stock_item->discount_percent * 100);
+ amount_cell($line_total);
+
+ if ($editable_items)
+ {
+ edit_link_cell(SID . "Edit=$line_no");
+ delete_link_cell(SID . "Delete=$line_no");
+ }
+ end_row();
+ }
+ else
{
sales_order_item_controls($order, $line_no);
}
if (!isset($_GET['Edit']) && $editable_items)
sales_order_item_controls($order);
- $display_total = number_format2($total,user_price_dec());
+ $display_total = price_format($total);
label_row(_("Total Excluding Shipping"), $display_total, "colspan=6 align=right",
"nowrap align=right");
echo "<table>";
$customer_error = "";
- $change_prices = 0;
+ $change_prices = 0;
if (isset($order) && !$editable)
{
// can't change the customer/branch if items already received on this order
echo $order->customer_name . " - " . $order->deliver_to;
- hidden('customer_id', $order->customer_id);
- hidden('branch_id', $order->Branch);
- }
- else
+ hidden('customer_id', $order->customer_id);
+ hidden('branch_id', $order->Branch);
+ hidden('sales_type', $order->sales_type);
+ }
+ else
{
- if (!isset($_POST['customer_id']) && (get_global_customer() != reserved_words::get_all()))
- $_POST['customer_id'] = get_global_customer();
+ if (!isset($_POST['customer_id']) && (get_global_customer() != reserved_words::get_all()))
+ $_POST['customer_id'] = get_global_customer();
- customer_list_row(_("Customer:"), 'customer_id', null, false, true);
+ customer_list_row(_("Customer:"), 'customer_id', null, false, true);
- if (!isset($_POST['delivery_date']))
- {
+ if (!isset($_POST['delivery_date']))
+ {
if ($order->trans_type==10)
- $_POST['delivery_date'] = $_SESSION['Items']->due_date =
+ $_POST['delivery_date'] = $_SESSION['Items']->due_date =
get_invoice_duedate($_POST['customer_id'], $_POST['OrderDate']);
- else
- $_POST['delivery_date'] = $_SESSION['Items']->due_date =
+ else
+ $_POST['delivery_date'] = $_SESSION['Items']->due_date =
add_days($_POST['OrderDate'], 10); // FIX this should be in company prefs
- }
- if ($order->customer_id != $_POST['customer_id'])
- {
+ }
+ if ($order->customer_id != $_POST['customer_id'])
+ {
// customer has changed
// delete all the order items - drastic but necessary because of
// change of currency, sales type, etc
- // $order->clear_items();
+ // $order->clear_items();
// clear the branch selection
unset($_POST['branch_id']);
- }
- if (!isset($_POST['branch_id']))
+ }
+ if (!isset($_POST['branch_id']))
$_POST['branch_id'] = "";
customer_branches_list_row(_("Branch:"), $_POST['customer_id'], 'branch_id', null, false, true, true);
- if (!isset($_POST['branch_id']) || $_POST['branch_id'] == "")
- {
- $customer_error = _("The selected customer does not have any branches. Please create at least one branch.");
- unset($_POST['branch_id']);
- $order->Branch = 0;
- } else
- {
- //set_global_customer($_POST['customer_id']);
- if (($order->customer_id != $_POST['customer_id']) ||
- ($order->Branch != $_POST['branch_id'])) {
-
- $old_order = (PHP_VERSION<5) ? $order : clone( $order );
- $customer_error = get_customer_details_to_order($order, $_POST['customer_id'], $_POST['branch_id']);
- $_POST['Location'] = $order->Location;
- $_POST['deliver_to'] = $order->deliver_to;
- $_POST['delivery_address'] = $order->delivery_address;
- $_POST['phone'] = $order->phone;
- $_POST['sales_type'] = $order->sales_type;
-
- // change prices if necessary
- // what about discount in template case?
- if ( $old_order->customer_currency!=$order->customer_currency
- || $old_order->sales_type!=$order->sales_type
- // || $old_order->default_discount!=$order->default_discount
- ) {
- $change_prices = 1;
- }
-
- }
- } // changed branch
- set_global_customer($_POST['customer_id']);
+ if (!isset($_POST['branch_id']) || $_POST['branch_id'] == "")
+ {
+ $customer_error = _("The selected customer does not have any branches. Please create at least one branch.");
+ unset($_POST['branch_id']);
+ $order->Branch = 0;
+ } else
+ {
+ //set_global_customer($_POST['customer_id']);
+ if (($order->customer_id != $_POST['customer_id']) ||
+ ($order->Branch != $_POST['branch_id'])) {
+
+ $old_order = (PHP_VERSION<5) ? $order : clone( $order );
+ $customer_error = get_customer_details_to_order($order, $_POST['customer_id'], $_POST['branch_id']);
+ $_POST['Location'] = $order->Location;
+ $_POST['deliver_to'] = $order->deliver_to;
+ $_POST['delivery_address'] = $order->delivery_address;
+ $_POST['phone'] = $order->phone;
+ $_POST['sales_type'] = $order->sales_type;
+
+ // change prices if necessary
+ // what about discount in template case?
+ if ( $old_order->customer_currency!=$order->customer_currency
+ || $old_order->sales_type!=$order->sales_type
+ // || $old_order->default_discount!=$order->default_discount
+ ) {
+ $change_prices = 1;
+ }
+
+ }
+ } // changed branch
+ set_global_customer($_POST['customer_id']);
}
if ($_SESSION['Items']->trans_type!=30) {
- ref_cells(_("Reference").':', 'ref', null, "");
+ ref_cells(_("Reference").':', 'ref', null, '');
}
echo "</table>";
{
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), $editable);
+ exchange_rate_display($order->customer_currency, get_company_currency(),
+ ($editable ? $_POST['OrderDate'] : $order->document_date), $editable);
echo "</table>";
echo "</td><td>"; // outer table
}
- if( $order->sales_type != $_POST['sales_type']) {
- $myrow = get_sales_type($_POST['sales_type']);
- $order->set_sales_type($myrow['id'], $myrow['sales_type'],
+ 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']);
- $change_prices = 1;
+ $change_prices = 1;
}
- if($change_prices!=0)
- {
- foreach ($order->line_items as $line_no=>$item) {
+ 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->sales_type);
// $line->discount_percent = $order->default_discount;
- }
+ }
}
echo "<table height='5'>";
if($editable)
- sales_types_list_row(_("Price List"), 'sales_type', $_POST['sales_type'], true);
- else
- label_row(_("Price List:"), $order->sales_type_name);
+ sales_types_list_row(_("Price List"), 'sales_type', $_POST['sales_type'], true);
+ else {
+ label_row(_("Price List:"), $order->sales_type_name);
+ }
label_row(_("Customer Discount:"), ($order->default_discount * 100) . "%");
echo "</table>";
echo "<table height='5'>";
- if ($editable)
+ if ($editable)
{
- if (!isset($_POST['OrderDate']) || $_POST['OrderDate'] == "")
- $_POST['OrderDate'] = $order->document_date;
+ if (!isset($_POST['OrderDate']) || $_POST['OrderDate'] == "")
+ $_POST['OrderDate'] = $order->document_date;
date_row($date_text, 'OrderDate');
}
- else
+ else
{
label_row($date_text, $order->document_date);
hidden('OrderDate', $order->document_date);
}
- if ($display_tax_group)
+ if ($display_tax_group)
{
-/* if ($editable)
+/* if ($editable)
{
- if (!isset($_POST['tax_group_id']))
- $_POST['tax_group_id'] = $_SESSION['Items']->tax_group_id;
- tax_groups_list_row(_("Tax Group:"), 'tax_group_id', $_POST['tax_group_id'], true);
- }
- else
+ if (!isset($_POST['tax_group_id']))
+ $_POST['tax_group_id'] = $_SESSION['Items']->tax_group_id;
+ tax_groups_list_row(_("Tax Group:"), 'tax_group_id', $_POST['tax_group_id'], true);
+ }
+ else
*/ {
label_row(_("Tax Group:"), $order->tax_group_name);
hidden('tax_group_id', $_SESSION['Items']->tax_group_id);
echo "</table>";
echo "</td></tr>";
-
+
end_table(1); // outer table
return $customer_error;
if (!isset($_POST['stock_id']))
$_POST['stock_id'] = $order->line_items[$_GET['Edit']]->stock_id;
if (!isset($_POST['qty']) || ($_POST['qty'] == ""))
- $_POST['qty'] = $order->line_items[$_GET['Edit']]->qty_dispatched;
+ $_POST['qty'] = qty_format($order->line_items[$_GET['Edit']]->qty_dispatched);
if (!isset($_POST['price']) || ($_POST['price'] == ""))
- $_POST['price'] = $order->line_items[$_GET['Edit']]->price;
+ $_POST['price'] = price_format($order->line_items[$_GET['Edit']]->price);
if (!isset($_POST['Disc']) || ($_POST['Disc'] == ""))
- $_POST['Disc'] = ($order->line_items[$_GET['Edit']]->discount_percent)*100;
+ $_POST['Disc'] = percent_format($order->line_items[$_GET['Edit']]->discount_percent*100);
$_POST['units'] = $order->line_items[$_GET['Edit']]->units;
hidden('stock_id', $_POST['stock_id']);
label_cell($_POST['stock_id']);
label_cell($order->line_items[$line_no]->item_description);
- }
- else
+ }
+ else
{
- global $no_item_list;
+ global $no_item_list;
if ($no_item_list)
{
echo "<td colspan=2>\n";
}
else
{
- text_cells(null, "StockID2", "", 12, 10, "", "", "onkeyup='recalcAccounts();' onKeyDown='if (event.keyCode==13) event.keyCode=9;' onblur='return setAccount(0, true);'");
+ text_cells(null, "StockID2", "", 12, 10, "", "", "onkeyup='recalcAccounts();' onKeyDown='if (event.keyCode==13) event.keyCode=9;' onblur='return setAccount(0, true);'");
stock_items_list_cells(null, 'stock_id', null, false, false, "onchange='return setAccount(1, true)'");
}
$item_info = get_item_edit_info($_POST['stock_id']);
$_POST['units'] = $item_info["units"];
- $_POST['qty'] = 1;
- $_POST['price'] = get_price ($_POST['stock_id'],
- $order->customer_currency, $order->sales_type);
+ $_POST['qty'] = qty_format(1);
+ $_POST['price'] = price_format(get_price ($_POST['stock_id'],
+ $order->customer_currency, $order->sales_type));
// default to the customer's discount %
- $_POST['Disc'] = $order->default_discount * 100;
+ $_POST['Disc'] = percent_format($order->default_discount * 100);
}
- text_cells(null, 'qty', $_POST['qty'], 12, 15);
+ amount_cells(null, 'qty', qty_format($_POST['qty']));
if ($order->trans_no!=0) {
- amount_cell($line_no==-1 ? 0 :$order->line_items[$line_no]->qty_done);
+ amount_cell($line_no==-1 ? 0 :$order->line_items[$line_no]->qty_done);
}
label_cell($_POST['units']);
amount_cells(null, 'price');
- text_cells(null, 'Disc', $_POST['Disc'], 7, 5);
+ small_amount_cells(null, 'Disc', percent_format($_POST['Disc']));
$line_total = $_POST['qty'] * $_POST['price'] * (1 - $_POST['Disc'] / 100);
amount_cell($line_total);
- if (isset($_GET['Edit']))
+ if (isset($_GET['Edit']))
{
- submit_cells('UpdateItem', _("Update"));
- submit_cells('CancelItemChanges', _("Cancel"));
+ submit_cells('UpdateItem', _("Update"));
+ submit_cells('CancelItemChanges', _("Cancel"));
hidden('LineNo', $line_no);
- }
- else
+ }
+ else
{
submit_cells('AddItem', _("Add Item"), "colspan=2");
}
function display_delivery_details(&$order)
{
global $table_style2;
- if ($order->trans_type==10)
+ if ($order->trans_type==10)
{
$title = _("Delivery Details");
$delname = _("Due Date").':';
- }
- elseif ($order->trans_type==13)
+ }
+ elseif ($order->trans_type==13)
{
$title = _("Invoice Delivery Details");
$delname = _("Invoice before").':';
- }
- else
+ }
+ else
{
$title = _("Order Delivery Details");
$delname = _("Required Delivery Date").':';
}
display_heading($title);
- echo "<br>";
- start_table("$table_style2 width=90%");
- echo "<tr valign=top><td>"; // outer table
+ echo "<br>";
+ start_table("$table_style2 width=90%");
+ echo "<tr valign=top><td>"; // outer table
- echo "<table>";
// echo $order->Location, $_POST['Location'];
- locations_list_row(_("Deliver from Location:"), 'Location', $_POST['Location']);
+ locations_list_row(_("Deliver from Location:"), 'Location', $_POST['Location']);
- date_row($delname, 'delivery_date', $order->due_date, 0, 0, 0);
+ date_row($delname, 'delivery_date', $order->due_date, 0, 0, 0);
- text_row(_("Deliver To:"), 'deliver_to', $order->deliver_to, 40, 40);
+ text_row(_("Deliver To:"), 'deliver_to', $order->deliver_to, 40, 40);
- textarea_row(_("Address:"), 'delivery_address', $order->delivery_address, 35, 5);
- text_row(_("Contact Phone Number:"), 'phone', $order->phone, 25, 25);
+ textarea_row(_("Address:"), 'delivery_address', $order->delivery_address, 35, 5);
+ text_row(_("Contact Phone Number:"), 'phone', $order->phone, 25, 25);
- echo "</table>";
+ echo "</table>";
- echo "</td><td>"; // outer table
+ echo "</td><td>"; // outer table
- echo "<table>";
- text_row(_("Customer Reference:"), 'cust_ref', $order->cust_ref, 25, 25);
- textarea_row(_("Comments:"), "Comments", $order->Comments, 31, 5);
+ text_row(_("Customer Reference:"), 'cust_ref', $order->cust_ref, 25, 25);
+ textarea_row(_("Comments:"), "Comments", $order->Comments, 31, 5);
- text_row(_("Shipping Charge:"), 'freight_cost', $order->freight_cost, 10, 10);
+ small_amount_row(_("Shipping Charge:"), 'freight_cost',
+ price_format($_POST['freight_cost']));
- shippers_list_row(_("Shipping Company:"), 'ship_via', $order->ship_via);
+ shippers_list_row(_("Shipping Company:"), 'ship_via', $order->ship_via);
- echo "</table>";
+ echo "</table>";
- echo "</td></tr>";
- end_table(1); // outer table
+ echo "</td></tr>";
+ end_table(1); // outer table
}
?>
\ No newline at end of file
projects / fa-stable.git / blobdiff