Merged changes from main branch up to 2.1.3.

[fa-stable.git] / manufacturing / view / work_order_view.php

diff --git a/manufacturing/view/work_order_view.php b/manufacturing/view/work_order_view.php
index d63f2de351d00b1b0c36ed52a6b7d3820197ce17..60daf0280f555559118d2ecb7df5c85e32cf3108 100644 (file)
--- a/manufacturing/view/work_order_view.php
+++ b/manufacturing/view/work_order_view.php
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU General Public License, GPL, 
+       as published by the Free Software Foundation, either version 3 
+       of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 $page_security = 10;
 $path_to_root="../..";
 
@@ -25,6 +34,7 @@ if ($_GET['trans_no'] != "")
 
 display_heading(systypes::name(systypes::work_order()) . " # " . $woid);
 
+br(1);
 $myrow = get_work_order($woid);
 
 if ($myrow["type"]  == wo_types::advanced())
@@ -35,7 +45,7 @@ else
 echo "<center>";
 
 // display the WO requirements
-echo "<br>";
+br(1);
 if ($myrow["released"] == false)
 {
     display_heading2(_("BOM for item:") . " " . $myrow["StockItemName"]);
@@ -54,7 +64,14 @@ else
        display_heading2(_("Productions"));
        display_wo_productions($woid);
        echo "</td><td>";
-       display_heading2(_("Payments"));
+       display_heading2(_("Additional Costs"));
+       display_wo_payments($woid);
+       echo "</td></tr></table>";
+       }
+       else
+       {
+       echo "<br><table cellspacing=7><tr valign=top><td>";
+       display_heading2(_("Additional Costs"));
        display_wo_payments($woid);
        echo "</td></tr></table>";
        }