Better wrapping on comments in documents.

diff --git a/reporting/rep107.php b/reporting/rep107.php
index 9334de1994cc786a2fb5cef08ad84849d63d112d..7982f8a1175d4857238aad6f986b9d706238bf71 100644 (file)
--- a/reporting/rep107.php
+++ b/reporting/rep107.php
@@ -184,7 +184,7 @@ function print_invoices()
                        if ($memo != "")
                        {
                                $rep->NewLine();
-                               $rep->TextColLines(1, 5, $memo, -2);
+                               $rep->TextColLines(1, 3, $memo, -2);
                        }
 
                        $DisplaySubTot = number_format2($SubTotal,$dec);

diff --git a/reporting/rep109.php b/reporting/rep109.php
index 8660e09a554a79765f290d47e771e92142f6dbb8..739348d4783f9aacd6ffa0334ce1b378482d9ee6 100644 (file)
--- a/reporting/rep109.php
+++ b/reporting/rep109.php
@@ -144,7 +144,7 @@ function print_sales_orders()
                if ($myrow['comments'] != "")
                {
                        $rep->NewLine();
-                       $rep->TextColLines(1, 5, $myrow['comments'], -2);
+                       $rep->TextColLines(1, 3, $myrow['comments'], -2);
                }
                $DisplaySubTot = number_format2($SubTotal,$dec);
 

diff --git a/reporting/rep110.php b/reporting/rep110.php
index 6b0830973dafaace1db2563dfc2927344250d65f..18ed866a00bc685143e356e4ff079d3c60a4608b 100644 (file)
--- a/reporting/rep110.php
+++ b/reporting/rep110.php
@@ -144,7 +144,7 @@ function print_deliveries()
                        if ($memo != "")
                        {
                                $rep->NewLine();
-                               $rep->TextColLines(1, 5, $memo, -2);
+                               $rep->TextColLines(1, 3, $memo, -2);
                        }
 
                        $DisplaySubTot = number_format2($SubTotal,$dec);

diff --git a/reporting/rep111.php b/reporting/rep111.php
index 241d7edd9883a62b925288ea8369d59002cf7027..cf3e8d20253bad2c05cb000450dda35f3e45df64 100644 (file)
--- a/reporting/rep111.php
+++ b/reporting/rep111.php
@@ -141,7 +141,7 @@ function print_sales_quotations()
                if ($myrow['comments'] != "")
                {
                        $rep->NewLine();
-                       $rep->TextColLines(1, 5, $myrow['comments'], -2);
+                       $rep->TextColLines(1, 3, $myrow['comments'], -2);
                }
                $DisplaySubTot = number_format2($SubTotal,$dec);
 

diff --git a/reporting/rep113.php b/reporting/rep113.php
index 468fdffb455622599d028e639d1ae41d089d4873..cbc99d1fb559a07605ad4e4eb03fee17c33304a4 100644 (file)
--- a/reporting/rep113.php
+++ b/reporting/rep113.php
@@ -134,7 +134,7 @@ function print_credits()
                if ($memo != "")
                {
                        $rep->NewLine();
-                       $rep->TextColLines(1, 5, $memo, -2);
+                       $rep->TextColLines(1, 3, $memo, -2);
                }
 
                $DisplaySubTot = number_format2($SubTotal,$dec);

diff --git a/reporting/rep209.php b/reporting/rep209.php
index 0e83fc0103da5d532dc00cbe2cfe9f0532976c2e..452fddfe49884375101c6c925c9b74e0fe042951 100644 (file)
--- a/reporting/rep209.php
+++ b/reporting/rep209.php
@@ -156,7 +156,7 @@ function print_po()
                if ($myrow['comments'] != "")
                {
                        $rep->NewLine();
-                       $rep->TextColLines(1, 5, $myrow['comments'], -2);
+                       $rep->TextColLines(1, 4, $myrow['comments'], -2);
                }
                $DisplaySubTot = number_format2($SubTotal,$dec);
 

diff --git a/sales/includes/sales_ui.inc b/sales/includes/sales_ui.inc
index 73b99ca610bcd6925f1f5782a706a8e245643c51..5873c3eb755f8b2dba6621d58f4a17381944ebf0 100644 (file)
--- a/sales/includes/sales_ui.inc
+++ b/sales/includes/sales_ui.inc
@@ -46,7 +46,7 @@ function check_edit_conflicts($cart_id, $cartname='Items')
 {
        global $Ajax, $SysPrefs;
 
-       if ((!isset($SysPrefs->no_check_edit_conflicts) || $SysPrefs->no_check_edit_conflicts==0) && get_post('cart_id') && $cart_id != $_SESSION[$cartname]->cart_id) {
+       if ((!isset($SysPrefs->no_check_edit_conflicts) || $SysPrefs->no_check_edit_conflicts==0) && $cart_id && $cart_id != $_SESSION[$cartname]->cart_id) {
                display_error(_('This edit session has been abandoned by opening sales document in another browser tab. You cannot edit more than one sales document at once.'));
                $Ajax->activate('_page_body');
                display_footer_exit();