From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Fri, 10 Jul 2009 21:54:12 +0000 (+0000)
Subject: Purchase Order use the same header as Sales Order
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=2cf89296aede0b7dd915ba0665ac9627784a4bba;p=textcart.git

Purchase Order use the same header as Sales Order
---

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index c75217a..fa84db2 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,13 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+10-Jul-2009 Joe Hunt
+# [0000142] Purchase Order use the same header as Sales Order
+$ /reporting/includes/doctext.inc
+  /reporting/includes/doctext2.inc
+# Bug in demand qty
+$ /includes/db/manufacturing.inc
+
 10-Jul-2009 Janusz Dobrowolski
 # [0000141] Attachment view/download bug.
 $ /admin/attachments.php
diff --git a/includes/db/manufacturing_db.inc b/includes/db/manufacturing_db.inc
index c2f34d9..1153010 100644
--- a/includes/db/manufacturing_db.inc
+++ b/includes/db/manufacturing_db.inc
@@ -60,7 +60,7 @@ function stock_demand_manufacture($stock_id, $qty, $demand_id, $location, $level
 	}
 	$stock_qty = $qoh_stock[$stock_id];
 	if ($stock_qty == NULL) $stock_qty = 0;
-	if ($qty < $stock_qty) return $demand;
+	if ($qty <= $stock_qty) return $demand;
 	$bom = $bom_list[$stock_id];
 	if ($bom == NULL) {
 		$sql = "SELECT parent, component, quantity FROM ".TB_PREF."bom WHERE parent = '$stock_id'";
diff --git a/reporting/includes/doctext.inc b/reporting/includes/doctext.inc
index b28bb90..fdcd548 100644
--- a/reporting/includes/doctext.inc
+++ b/reporting/includes/doctext.inc
@@ -13,8 +13,16 @@ if (isset($header2type))
 {
 	$doc_Cust_no = _("Cust no");
 	$doc_Date = _("Date");
-	$doc_Charge_To = _("Charge To");
-	$doc_Delivered_To = _("Delivered To");
+	if ($doctype == 8) // Purchase Order
+	{
+		$doc_Charge_To = _("Order To");
+		$doc_Delivered_To = _("Charge To");
+	}
+	else
+	{
+		$doc_Charge_To = _("Charge To");
+		$doc_Delivered_To = _("Delivered To");
+	}	
 	$doc_Shipping_Company = _("Shipping Company");
 	if ($doctype == 9)
 		$doc_Due_Date = _("Delivery Date");
diff --git a/reporting/includes/doctext2.inc b/reporting/includes/doctext2.inc
index 689cbb5..1b70eee 100644
--- a/reporting/includes/doctext2.inc
+++ b/reporting/includes/doctext2.inc
@@ -13,8 +13,16 @@ if (isset($header2type))
 {
 	$doc_Cust_no = "Cust no";
 	$doc_Date = "Date";
-	$doc_Charge_To = "Charge To";
-	$doc_Delivered_To = "Delivered To";
+	if ($doctype == 8) // Purchase Order
+	{
+		$doc_Charge_To = "Order To";
+		$doc_Delivered_To = "Charge To";
+	}
+	else
+	{
+		$doc_Charge_To = "Charge To";
+		$doc_Delivered_To = "Delivered To";
+	}	
 	$doc_Shipping_Company = "Shipping Company";
 	if ($doctype == 9)
 		$doc_Due_Date = "Delivery Date";