X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_view.inc;h=8e2591c3a9328ae619354dfa38a25e2e2e361369;hb=9478a0cdeaf9201d2f3947e11e58d90354050025;hp=48ef063e43dd65850e8ed1df704604331ea983ec;hpb=21694d93663dd2c41c7020c6a646baf00cdaa4ed;p=fa-stable.git

diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index 48ef063e..8e2591c3 100644
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -432,7 +432,7 @@ function display_edit_tax_items($taxes, $columns, $tax_included, $leftspan=0)
 function display_footer_exit()
 {
 	br(2);
-	end_page();
+	end_page(false, false, true);
 	exit;
 }
 
@@ -523,8 +523,27 @@ function display_quick_entries(&$cart, $id, $base, $type, $descr='')
 		if ($type != QE_SUPPINV)	// only one quick entry on journal/bank transaction
 			$cart->clear_items();
 		$qe = get_quick_entry($id);
+		if ($qe['bal_type'] == 1)
+		{
+			if ($qe['base_amount'] == 1.0) // monthly
+				$begin = begin_month($cart->tran_date);
+			else
+			{
+				if (is_account_balancesheet($qe['base_desc'])) // total
+					$begin = "";
+				else
+					$begin = begin_fiscalyear(); // from fiscalyear begin
+			}		
+			$base = get_gl_trans_from_to($begin, $cart->tran_date, $qe['base_desc']);
+				
+		}
 		if ($descr != '') $qe['description'] .= ': '.$descr;
 		$result = get_quick_entry_lines($id);
+		if (db_num_rows($result) == 0)
+		{
+			display_error( _("No Quick Entry lines are defined."));
+			set_focus('totamount');
+		}	
 		$totrate = 0;
 		while ($row = db_fetch($result))
 		{
@@ -708,7 +727,7 @@ function get_js_date_picker()
 
 	$how = user_date_format();				// 0 = us/ca, 1 = eu, au, nz, 2 = jp, sw
 	$sep = $dateseps[user_date_sep()];		// date separator
-	$wstart = (($date_system == 1 || $date_system == 2) ? 6 : ($how == 0 ? 0 : 1));			// weekstart (sun = 0, mon = 1)
+	$wstart = (($date_system == 1 || $date_system == 2 || $date_system == 3) ? 6 : ($how == 0 ? 0 : 1));	// weekstart (sun = 0, mon = 1)
 	$months = array(_("January"),_("February"),_("March"),_("April"),_("May"),_("June"),_("July"),_("August"),_("September"),_("October"),_("November"),_("December"));
 	$wdays = array(_("Su"),_("Mo"),_("Tu"),_("We"),_("Th"),_("Fr"),_("Sa"));
 	$wno = _("W"); // week no
@@ -1005,7 +1024,7 @@ function CC() {
           if (dayOfMonth == selectedDay && currentYear == selectedYear && currentMonth == selectedMonth) {
             css_class = 'current';
 ";
-	if ($date_system == 1 || $date_system == 2)
+	if ($date_system == 1 || $date_system == 2 || $date_system == 3)
 		$js .= "
           } else if (dayOfWeek == 5) {
 ";