Merged changes form main trunk since 2.1RC

[fa-stable.git] / sales / allocations / customer_allocate.php

diff --git a/sales/allocations/customer_allocate.php b/sales/allocations/customer_allocate.php
index c0785cb1a80d71f88cdb510d750eb2d306296a6e..f32db9616270d6c6dc9545ed5035ae3ba251458d 100644 (file)
--- a/sales/allocations/customer_allocate.php
+++ b/sales/allocations/customer_allocate.php
@@ -195,7 +195,7 @@ function edit_allocations_for_transaction($type, $trans_no)
 
     echo "<br>";
 
-       start_form(false, true);
+       start_form();
        div_start('alloc_tbl');
     if (count($_SESSION['alloc']->allocs) > 0)
     {
@@ -236,7 +236,7 @@ function edit_allocations_for_transaction($type, $trans_no)
                }
 
                label_row(_("Total Allocated"), price_format($total_allocated),
-                       "colspan=6 align=right", "nowrap align=right id='total_allocated'");
+                       "colspan=6 align=right", "nowrap align=right id='total_allocated'", 3);
         if ($_SESSION['alloc']->amount - $total_allocated < 0)
         {
                $font1 = "<font color=red>";
@@ -247,20 +247,20 @@ function edit_allocations_for_transaction($type, $trans_no)
                $left_to_allocate = $_SESSION['alloc']->amount - $total_allocated;
                $left_to_allocate = price_format($left_to_allocate);
         label_row(_("Left to Allocate"), $font1 . $left_to_allocate . $font2,
-               "colspan=6 align=right ", "nowrap align=right id='left_to_allocate'");
+               "colspan=6 align=right ", "nowrap align=right id='left_to_allocate'", 3);
         end_table(1);
 
                hidden('TotalNumberOfAllocs', $counter);
                submit_center_first('UpdateDisplay', _("Refresh"), _('Start again allocation of selected amount'), true);
-               submit('Process', _("Process"), true, _('Process allocations'), true);
-               submit_center_last('Cancel', _("Back to Allocations"),_('Abandon allocations and return to selection of allocatable amounts'), true);
+               submit('Process', _("Process"), true, _('Process allocations'), 'default');
+               submit_center_last('Cancel', _("Back to Allocations"),_('Abandon allocations and return to selection of allocatable amounts'), 'cancel');
        }
        else
        {
        display_note(_("There are no unsettled transactions to allocate."), 0, 1);
 
                submit_center('Cancel', _("Back to Allocations"), true,
-                       _('Abandon allocations and return to selection of allocatable amounts'), true);
+                       _('Abandon allocations and return to selection of allocatable amounts'), 'cancel');
     }
        div_end();
        end_form();