X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fpayment_terms.php;h=8200241a8c56ddc4af9d67f66790aa9f73e87a93;hb=ff3ad68ec5da00d6e906fdaad3a4df3658709ff3;hp=3a4daf1fe2b0ba9ad3caf8d02c238d11afd99b87;hpb=54d84ff9a67620ab38c676cdbcf87853632724f0;p=fa-stable.git

diff --git a/admin/payment_terms.php b/admin/payment_terms.php
index 3a4daf1f..8200241a 100644
--- a/admin/payment_terms.php
+++ b/admin/payment_terms.php
@@ -9,11 +9,11 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$page_security = 10;
+$page_security = 'SA_PAYTERMS';
 $path_to_root="..";
 include($path_to_root . "/includes/session.inc");
 
-page(_("Payment Terms"));
+page(_($help_context = "Payment Terms"));
 
 include($path_to_root . "/includes/ui.inc");
 
@@ -36,19 +36,20 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
 		$inpug_error = 1;
 		display_error( _("The Terms description must be entered."));
 		set_focus('terms');
-	} 
-	elseif ($_POST['DayNumber'] > 30 && !check_value('DaysOrFoll')) 
-	{
-		$inpug_error = 1;
-		display_error( _("When the check box to indicate a day in the following month is the due date, the due date cannot be a day after the 30th. A number between 1 and 30 is expected."));
-		set_focus('DayNumber');
-	} 
-	elseif ($_POST['DayNumber'] > 500 && check_value('DaysOrFoll')) 
-	{
-		$inpug_error = 1;
-		display_error( _("When the check box is not checked to indicate that the term expects a number of days after which accounts are due, the number entered should be less than 500 days."));
-		set_focus('DayNumber');
-	}
+	} // there should be no limits by 30 here if they want longer payment terms. Joe Hunt 2010-05-31
+	//elseif ($_POST['DayNumber'] > 30 && !check_value('DaysOrFoll')) 
+	//{
+	//	$inpug_error = 1;
+	//	display_error( _("When the check box to indicate a day in the following month is the due date, the due date cannot be a day after the 30th. A number between 1 and 30 is expected."));
+	//	set_focus('DayNumber');
+	//} 
+	// No constrain on day values, Joe Hunt 2010-06-18.
+	//elseif ($_POST['DayNumber'] > 500 && check_value('DaysOrFoll')) 
+	//{
+	//	$inpug_error = 1;
+	//	display_error( _("When the check box is not checked to indicate that the term expects a number of days after which accounts are due, the number entered should be less than 500 days."));
+	//	set_focus('DayNumber');
+	//}
 
 	if ($_POST['DayNumber'] == '')
 		$_POST['DayNumber'] = 0;
@@ -135,15 +136,20 @@ if ($Mode == 'Delete')
 if ($Mode == 'RESET')
 {
 	$selected_id = -1;
+	$sav = get_post('show_inactive');
 	unset($_POST);
+	$_POST['show_inactive'] = $sav;
 }
 //-------------------------------------------------------------------------------------------------
 
 $sql = "SELECT * FROM ".TB_PREF."payment_terms";
+if (!check_value('show_inactive')) $sql .= " WHERE !inactive";
 $result = db_query($sql,"could not get payment terms");
+
 start_form();
 start_table($table_style);
 $th = array(_("Description"), _("Following Month On"), _("Due After (Days)"), "", "");
+inactive_control_column($th);
 table_header($th);
 
 $k = 0; //row colour counter
@@ -172,6 +178,7 @@ while ($myrow = db_fetch($result))
     label_cell($myrow["terms"]);
     label_cell($full_text);
     label_cell($after_text);
+	inactive_control_cell($myrow["terms_indicator"], $myrow["inactive"], 'payment_terms', "terms_indicator");
  	edit_button_cell("Edit".$myrow["terms_indicator"], _("Edit"));
  	delete_button_cell("Delete".$myrow["terms_indicator"], _("Delete"));
     end_row();
@@ -179,14 +186,11 @@ while ($myrow = db_fetch($result))
 
 } //END WHILE LIST LOOP
 
-end_table();
-end_form();
-echo '<br>';
+inactive_control_row($th);
+end_table(1);
 
 //-------------------------------------------------------------------------------------------------
 
-start_form();
-
 start_table($table_style2);
 
 $day_in_following_month = $days_before_due = 0;
@@ -203,6 +207,7 @@ if ($selected_id != -1)
 		$_POST['terms']  = $myrow["terms"];
 		$days_before_due  = $myrow["days_before_due"];
 		$day_in_following_month  = $myrow["day_in_following_month"];
+		unset($_POST['DayNumber']);
 	}
 	hidden('selected_id', $selected_id);
 }
@@ -222,7 +227,7 @@ text_row_ex(_("Days (Or Day In Following Month):"), 'DayNumber', 3);
 
 end_table(1);
 
-submit_add_or_update_center($selected_id == -1, '', true);
+submit_add_or_update_center($selected_id == -1, '', 'both');
 
 end_form();