Merged changes from master branch up to current state.

[fa-stable.git] / sales / sales_order_entry.php

diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php
index 7dbf471b2bc40e1412c1661853b2c021eb54bf42..f3e84af7aeca494dc06d25e2a938c6e7f9796047 100644 (file)
--- a/sales/sales_order_entry.php
+++ b/sales/sales_order_entry.php
@@ -51,7 +51,7 @@ set_page_security( @$_SESSION['Items']->trans_type,
 
 $js = '';
 
-if ($use_popup_windows) {
+if ($SysPrefs->use_popup_windows) {
        $js .= get_js_open_window(900, 500);
 }
 
@@ -220,13 +220,10 @@ if (isset($_GET['AddedID'])) {
        submenu_print(_("&Print Sales Invoice"), ST_SALESINVOICE, $invoice."-".ST_SALESINVOICE, 'prtopt');
        submenu_print(_("&Email Sales Invoice"), ST_SALESINVOICE, $invoice."-".ST_SALESINVOICE, null, 1);
        set_focus('prtopt');
-       
-       $sql = "SELECT trans_type_from, trans_no_from FROM ".TB_PREF."cust_allocations
-                       WHERE trans_type_to=".ST_SALESINVOICE." AND trans_no_to=".db_escape($invoice);
-       $result = db_query($sql, "could not retrieve customer allocation");
-       $row = db_fetch($result);
+
+       $row = db_fetch(get_allocatable_from_cust_transactions(null, $invoice, ST_SALESINVOICE));
        if ($row !== false)
-               submenu_print(_("Print &Receipt"), $row['trans_type_from'], $row['trans_no_from']."-".$row['trans_type_from'], 'prtopt');
+               submenu_print(_("Print &Receipt"), $row['type'], $row['trans_no']."-".$row['type'], 'prtopt');
 
        display_note(get_gl_view_str(ST_SALESINVOICE, $invoice, _("View the GL &Journal Entries for this Invoice")),0, 1);
 
@@ -244,7 +241,7 @@ if (isset($_GET['AddedID'])) {
 
        display_footer_exit();
 } else
-       check_edit_conflicts();
+       check_edit_conflicts(get_post('cart_id'));
 //-----------------------------------------------------------------------------
 
 function copy_to_cart()
@@ -434,7 +431,7 @@ function can_process() {
                        return false;
                }       
        }       
-       if (!$Refs->is_valid($_POST['ref'])) {
+       if (!$Refs->is_valid($_POST['ref'], $_SESSION['Items']->trans_type)) {
                display_error(_("You must enter a reference."));
                set_focus('ref');
                return false;
@@ -465,7 +462,7 @@ if (isset($_POST['ProcessOrder']) && can_process()) {
        if ($ret == -1)
        {
                display_error(_("The entered reference is already in use."));
-               $ref = get_next_reference($_SESSION['Items']->trans_type);
+               $ref = $Refs->get_next($_SESSION['Items']->trans_type, null, array('date' => Today()));
                if ($ref != $_SESSION['Items']->reference)
                {
                        display_error(_("The reference number field has been increased. Please save the document again."));
@@ -517,7 +514,7 @@ function check_item_data()
                display_error( _("The item could not be updated because you are attempting to set the quantity ordered to less than 0, or the discount percent to more than 100."));
                set_focus('qty');
                return false;
-       } elseif (!check_num('price', 0) && (!$SysPrefs->$allow_negative_prices() || $is_inventory_item)) {
+       } elseif (!check_num('price', 0) && (!$SysPrefs->allow_negative_prices() || $is_inventory_item)) {
                display_error( _("Price for inventory item must be entered and can not be less than 0"));
                set_focus('price');
                return false;
@@ -636,9 +633,9 @@ function  handle_cancel_order()
 
 function create_cart($type, $trans_no)
 { 
-       global $Refs;
+       global $Refs, $SysPrefs;
 
-       if (!$_SESSION['SysPrefs']->db_ok) // create_cart is called before page() where the check is done
+       if (!$SysPrefs->db_ok) // create_cart is called before page() where the check is done
                return;
 
        processing_start();
@@ -661,7 +658,7 @@ function create_cart($type, $trans_no)
                        $doc->pos = get_sales_point(user_pos());
                } else
                        $doc->due_date = $doc->document_date;
-               $doc->reference = $Refs->get_next($doc->trans_type);
+               $doc->reference = $Refs->get_next($doc->trans_type, null, array('date' => Today()));
                //$doc->Comments='';
                foreach($doc->line_items as $line_no => $line) {
                        $doc->line_items[$line_no]->qty_done = 0;
@@ -729,7 +726,7 @@ hidden('cart_id');
 $customer_error = display_order_header($_SESSION['Items'], !$_SESSION['Items']->is_started(), $idate);
 
 if ($customer_error == "") {
-       start_table(TABLESTYLE, "width=80%", 10);
+       start_table(TABLESTYLE, "width='80%'", 10);
        echo "<tr><td>";
        display_order_summary($orderitems, $_SESSION['Items'], true);
        echo "</td></tr>";
@@ -762,4 +759,3 @@ if ($customer_error == "") {
 
 end_form();
 end_page();
-?>
\ No newline at end of file