Editable sales terms in sales orders and invoices.

[fa-stable.git] / sales / includes / ui / sales_order_ui.inc

diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc
index bb20dce6abf46658ea78a9c7f6d61a88e8385a22..b58436abd2561b448d2c3a7be31a9e79dfa756db 100644 (file)
--- a/sales/includes/ui/sales_order_ui.inc
+++ b/sales/includes/ui/sales_order_ui.inc
@@ -84,7 +84,7 @@ function get_customer_details_to_order(&$order, $customer_id, $branch_id)
        $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'],
@@ -113,14 +113,14 @@ function get_customer_details_to_order(&$order, $customer_id, $branch_id)
        $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"]);
@@ -290,7 +290,7 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
 
                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'] == "")
@@ -313,10 +313,10 @@ 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 (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)
                                        {
@@ -372,13 +372,12 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
        }
        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'];
@@ -389,9 +388,10 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
                        $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 {
@@ -416,14 +416,14 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
 
                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');
@@ -567,7 +567,7 @@ function display_delivery_details(&$order)
 
        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%");
@@ -578,7 +578,6 @@ function display_delivery_details(&$order)
                textarea_row(_("Comments:"), "Comments", $order->Comments, 31, 5);
                end_table();
        } else {
-
                if ($order->trans_type==ST_SALESINVOICE)
                {
                        $title = _("Delivery Details");
@@ -610,7 +609,8 @@ function display_delivery_details(&$order)
 
 
                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'));