include_once($path_to_root . "/includes/manufacturing.inc");
//--------------------------------------------------------------------------------
-function add_to_order(&$order, $new_item, $new_item_qty, $price, $discount)
+function add_to_order(&$order, $new_item, $new_item_qty, $price, $discount, $description='')
{
// calculate item price to sum of kit element prices factor for
// value distribution over all exploded kit items
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);
+ $item_price, $discount);
}
else
{ // stock item record eventually with foreign code
}
}
$order->add_to_cart (count($order->line_items), $item['stock_id'],
- $new_item_qty*$item['quantity'], $item_price, $discount);
+ $new_item_qty*$item['quantity'], $item_price, $discount, 0,0, $description);
}
}
+
}
//---------------------------------------------------------------------------------
$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']);
+ $myrow['discount'], $myrow['payment_terms'], $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'],
$order->set_delivery($myrow["default_ship_via"], $myrow["br_name"],
$address);
if ($order->trans_type == ST_SALESINVOICE) {
- $order->due_date = get_invoice_duedate($customer_id, $order->document_date);
- if ($order->pos != -1)
- $order->cash = date_diff2($order->due_date, Today(), 'd')<2;
+ $order->due_date = get_invoice_duedate($order->payment, $order->document_date);
+// if ($order->pos != -1)
+// $order->cash = date_diff2($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"]);
+ $pos = get_sales_point($order->pos);
+ $order->set_location($pos["pos_location"], $pos["location_name"]);
}
} else
$order->set_location($myrow["default_location"], $myrow["location_name"]);
sales_order_item_controls($order, $k);
$colspan = 6;
- small_amount_row(_("Shipping Charge"), 'freight_cost', price_format(get_post('freight_cost',0)), "colspan=$colspan align=right");
+ if ($order->trans_no!=0)
+ ++$colspan;
+ start_row();
+ label_cell(_("Shipping Charge"), "colspan=$colspan align=right");
+ small_amount_cells(null, 'freight_cost', price_format(get_post('freight_cost',0)));
+ label_cell('', 'colspan=2');
+ end_row();
$display_sub_total = price_format($total + input_num('freight_cost'));
-
- label_row(_("Sub-total"), $display_sub_total, "colspan=$colspan align=right","align=right");
-
+ label_row(_("Sub-total"), $display_sub_total, "colspan=$colspan align=right","align=right", 2);
$taxes = $order->get_taxes(input_num('freight_cost'));
- $tax_total = display_edit_tax_items($taxes, $colspan, $order->tax_included);
+ $tax_total = display_edit_tax_items($taxes, $colspan, $order->tax_included, 2);
$display_total = price_format(($total + input_num('freight_cost') + $tax_total));
function display_order_header(&$order, $editable, $date_text, $display_tax_group=false)
{
- global $table_style, $Ajax, $SysPrefs;
+ global $table_style2, $Ajax, $SysPrefs;
- start_outer_table("width=80% $table_style");
+ start_outer_table("width=80% $table_style2");
table_section(1);
if( ($order->customer_id != get_post('customer_id', -1)) ||
($order->Branch != get_post('branch_id', -1)) ||
- list_updated('customer_id'))
+ list_updated('customer_id'))
{
if (!isset($_POST['branch_id']) || $_POST['branch_id'] == "")
$_POST['deliver_to'] = $order->deliver_to;
$_POST['delivery_address'] = $order->delivery_address;
$_POST['phone'] = $order->phone;
- if (get_post('cash') !== $order->cash) {
- $_POST['cash'] = $order->cash;
+ if (get_post('payment') !== $order->payment) {
+ $_POST['payment'] = $order->payment;
$Ajax->activate('delivery');
- $Ajax->activate('cash');
+ $Ajax->activate('payment');
} else {
if ($order->trans_type == ST_SALESINVOICE)
{
}
}
- ref_cells(_("Reference").':', 'ref', _('Reference number unique for this document type'), null, '');
+ ref_row(_("Reference").':', 'ref', _('Reference number unique for this document type'), null, '');
if (!is_company_currency($order->customer_currency))
{
}
table_section(3);
- if ($order->trans_type == ST_SALESINVOICE && $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) {
+ if (($order->trans_type != ST_CUSTDELIVERY) && ($order->pos != -1)) { // editable payment type
+ if (get_post('payment') !== $order->payment) {
+ $order->payment = get_post('payment');
+ $order->payment_terms = get_payment_terms($order->payment);
+ $order->cash = $order->payment_terms['cash_sale'];
+ if ($order->cash) {
$paym = get_sales_point(user_pos());
$order->cash_account = $paym['pos_account'];
$order->account_name = $paym['bank_account_name'];
$Ajax->activate('delivery');
set_focus($order->pos == -1 ? 'delivery_date' : 'account');
}
- } else
- hidden('cash', $order->cash);
-
+ sale_payment_list_cells(_('Payment:'), 'payment', null);
+ } else {
+ label_cells(_('Payment:'), $order->payment_terms['terms']);
+ }
if($editable) {
$str = sales_types_list_row(_("Price List"), 'sales_type', null, true);
} else {
date_row($date_text, 'OrderDate', _('Date of order receive'),
$order->trans_no==0, 0, 0, 0, null, true);
- if (isset($_POST['_OrderDate_changed'])) {
+ if (isset($_POST['_OrderDate_changed']) || list_updated('payment')) {
if (!is_company_currency($order->customer_currency)
&& (get_base_sales_type()>0)) {
$change_prices = 1;
}
$Ajax->activate('_ex_rate');
if ($order->trans_type == ST_SALESINVOICE) {
- $_POST['delivery_date'] = get_invoice_duedate(get_post('customer_id'), get_post('OrderDate'));
+ $_POST['delivery_date'] = get_invoice_duedate(get_post('payment'), get_post('OrderDate'));
} else
$_POST['delivery_date'] = add_days(get_post('OrderDate'), $SysPrefs->default_delivery_required_by());
$Ajax->activate('items_table');
$_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;
+ $_POST['item_description'] = $order->line_items[$id]->item_description;
hidden('stock_id', $_POST['stock_id']);
label_cell($_POST['stock_id']);
- text_cells(null,'item_description', null, 45, 150);
+ 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']);
+ }
+// } else {
+// sales_items_list_cells(null,'item_description', null, false, true);
+// }
//label_cell($order->line_items[$line_no]->item_description, "nowrap");
$Ajax->activate('items_table');
}
label_cell($units, '', 'units');
- $str = amount_cells(null, 'price');
+ amount_cells(null, 'price');
small_amount_cells(null, 'Disc', percent_format($_POST['Disc']), null, null, user_percent_dec());
div_start('delivery');
- if (get_post('cash', 0)) { // Direct payment sale
+ if ($order->cash) { // Direct payment sale
$Ajax->activate('items_table');
display_heading(_('Cash payment'));
start_table("$table_style2 width=60%");
textarea_row(_("Comments:"), "Comments", $order->Comments, 31, 5);
end_table();
} else {
-
if ($order->trans_type==ST_SALESINVOICE)
{
$title = _("Delivery Details");
date_row($delname, 'delivery_date',
- $order->trans_type==ST_SALESORDER ? _('Enter requested day of delivery') : $order->trans_type==ST_SALESQUOTE ? _('Enter Valid until Date') : '');
+ $order->trans_type==ST_SALESORDER ? _('Enter requested day of delivery')
+ : $order->trans_type==ST_SALESQUOTE ? _('Enter Valid until Date') : '');
text_row(_("Deliver To:"), 'deliver_to', $order->deliver_to, 40, 40,
_('Additional identifier for delivery e.g. name of receiving person'));
projects / fa-stable.git / blobdiff