From ec58402529d7c61843274582de9174cbb2e56679 Mon Sep 17 00:00:00 2001
From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Wed, 27 Sep 2017 23:53:16 +0200
Subject: [PATCH] Better wrapping on comments in documents.

---
 reporting/rep107.php        | 2 +-
 reporting/rep109.php        | 2 +-
 reporting/rep110.php        | 2 +-
 reporting/rep111.php        | 2 +-
 reporting/rep113.php        | 2 +-
 reporting/rep209.php        | 2 +-
 sales/includes/sales_ui.inc | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/reporting/rep107.php b/reporting/rep107.php
index 9334de19..7982f8a1 100644
--- 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 8660e09a..739348d4 100644
--- 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 6b083097..18ed866a 100644
--- 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 241d7edd..cf3e8d20 100644
--- 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 468fdffb..cbc99d1f 100644
--- 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 0e83fc01..452fddfe 100644
--- 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 73b99ca6..5873c3eb 100644
--- 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();
-- 
2.30.2