X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fgl_journal.php;h=e8af7d23dbea6d68e4ce5def5e0484a13c35284c;hb=da7df35c61205d0b1af47d286be591b8a3194b0c;hp=063dd8aed39165f77e39d3f3ac6088cb69f27f31;hpb=0b63d898491b6577a5a5bf90e771dca0dcbbcf1f;p=fa-stable.git

diff --git a/gl/gl_journal.php b/gl/gl_journal.php
index 063dd8ae..e8af7d23 100644
--- a/gl/gl_journal.php
+++ b/gl/gl_journal.php
@@ -21,12 +21,11 @@ include_once($path_to_root . "/includes/data_checks.inc");
 include_once($path_to_root . "/gl/includes/ui/gl_journal_ui.inc");
 include_once($path_to_root . "/gl/includes/gl_db.inc");
 include_once($path_to_root . "/gl/includes/gl_ui.inc");
-include_once($path_to_root . "/taxes/db/tax_types_db.inc");
 
 $js = '';
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(800, 500);
-if ($use_date_picker)
+if (user_use_date_picker())
 	$js .= get_js_date_picker();
 
 if (isset($_GET['ModifyGL'])) {
@@ -37,14 +36,15 @@ if (isset($_GET['ModifyGL'])) {
 	$_SESSION['page_title'] = _($help_context = "Journal Entry");
 
 page($_SESSION['page_title'], false, false,'', $js);
-
 //--------------------------------------------------------------------------------------------------
 
 function line_start_focus() {
   global 	$Ajax;
 
   unset($_POST['Index']);
-  $Ajax->activate('items_table');
+  $Ajax->activate('tabs');
+  unset($_POST['_code_id_edit'], $_POST['code_id'], $_POST['AmountDebit'], 
+  	$_POST['AmountCredit'], $_POST['dimension_id'], $_POST['dimension2_id']);
   set_focus('_code_id_edit');
 }
 //-----------------------------------------------------------------------------------------------
@@ -92,7 +92,6 @@ elseif (isset($_GET['ModifyGL']))
 		hyperlink_params("$path_to_root/gl/gl_journal.php", _("Entry &New Journal Entry"), "NewJournal=Yes");
 		display_footer_exit();
 	}
-
 	create_cart($_GET['trans_type'], $_GET['trans_no']);
 }
 
@@ -105,44 +104,99 @@ function create_cart($type=0, $trans_no=0)
 		unset ($_SESSION['journal_items']);
 	}
 
+	check_is_closed($type, $trans_no);
 	$cart = new items_cart($type);
     $cart->order_id = $trans_no;
 
 	if ($trans_no) {
+		$header = get_journal($type, $trans_no);
+		$cart->event_date = sql2date($header['event_date']);
+		$cart->doc_date = sql2date($header['doc_date']);
+		$cart->tran_date = sql2date($header['tran_date']);
+		$cart->currency = $header['currency'];
+		$cart->rate = $header['rate'];
+		$cart->source_ref = $header['source_ref'];
+
 		$result = get_gl_trans($type, $trans_no);
 
 		if ($result) {
 			while ($row = db_fetch($result)) {
-				if ($row['amount'] == 0) continue;
-				$date = $row['tran_date'];
-				$cart->add_gl_item($row['account'], $row['dimension_id'], 
-					$row['dimension2_id'], $row['amount'], $row['memo_'], '', $row['person_id']);
+				$curr_amount = $cart->rate ? round($row['amount']/$cart->rate, $_SESSION["wa_current_user"]->prefs->price_dec()) : $row['amount'];
+				if ($curr_amount)
+					$cart->add_gl_item($row['account'], $row['dimension_id'], $row['dimension2_id'], 
+						$curr_amount, $row['memo_'], '', $row['person_id']);
 			}
 		}
 		$cart->memo_ = get_comments_string($type, $trans_no);
-		$cart->tran_date = sql2date($date);
-		$cart->reference = $Refs->get($type, $trans_no);
-		$_POST['ref_original'] = $cart->reference; // Store for comparison when updating
+		$cart->reference = $header['reference'];
+		// update net_amounts from tax register
+
+		// retrieve tax details
+		$tax_info = $cart->collect_tax_info(); // tax amounts in reg are always consistent with GL, so we can read them from GL lines
+
+		$taxes = get_trans_tax_details($type, $trans_no);
+		while ($detail = db_fetch($taxes))
+		{
+			$tax_id = $detail['tax_type_id'];
+			$tax_info['net_amount'][$tax_id] = $detail['net_amount']; // we can two records for the same tax_id, but in this case net_amount is the same
+			$tax_info['tax_date'] = sql2date($detail['tran_date']);
+			//$tax_info['tax_group'] = $detail['tax_group_id'];
+
+		}
+		if (isset($tax_info['net_amount']))	// guess exempt sales/purchase if any tax has been found
+		{
+			$net_sum = 0;
+			foreach($cart->gl_items as $gl)
+				if (!is_tax_account($gl->code_id) && !is_subledger_account($gl->code_id, $gl->person_id))
+					$net_sum += $gl->amount;
+
+			$ex_net = abs($net_sum) - array_sum($tax_info['net_amount']);
+			if ($ex_net > 0)
+				$tax_info['net_amount_ex'] = $ex_net;
+		}
+		$cart->tax_info = $tax_info;
+
 	} else {
-		$cart->reference = $Refs->get_next(0);
-		$cart->tran_date = new_doc_date();
+		$cart->tran_date = $cart->doc_date = $cart->event_date = new_doc_date();
 		if (!is_date_in_fiscalyear($cart->tran_date))
 			$cart->tran_date = end_fiscalyear();
-		$_POST['ref_original'] = -1;
+		$cart->reference = $Refs->get_next(ST_JOURNAL, null, $cart->tran_date);
 	}
 
 	$_POST['memo_'] = $cart->memo_;
 	$_POST['ref'] = $cart->reference;
 	$_POST['date_'] = $cart->tran_date;
-
+	$_POST['event_date'] = $cart->event_date;
+	$_POST['doc_date'] = $cart->doc_date;
+	$_POST['currency'] = $cart->currency;
+	$_POST['_ex_rate'] = exrate_format($cart->rate);
+	$_POST['source_ref'] = $cart->source_ref;
+	if (isset($cart->tax_info['net_amount']) || (!$trans_no && get_company_pref('default_gl_vat')))
+		$_POST['taxable_trans'] = true;
 	$_SESSION['journal_items'] = &$cart;
 }
 
-//-----------------------------------------------------------------------------------------------
+function update_tax_info()
+{
 
+	if (!isset($_SESSION['journal_items']->tax_info) || list_updated('tax_category'))
+		$_SESSION['journal_items']->tax_info = $_SESSION['journal_items']->collect_tax_info();
+
+	foreach ($_SESSION['journal_items']->tax_info as $name => $value)
+		if (is_array($value))
+		{
+			foreach ($value as $id => $amount)
+			{
+				$_POST[$name.'_'.$id] = price_format($amount);
+			}
+		} else
+			$_POST[$name] = $value;
+	$_POST['tax_date'] = $_SESSION['journal_items']->order_id ? $_SESSION['journal_items']->tax_info['tax_date'] : $_POST['date_'];
+}
+
+//-----------------------------------------------------------------------------------------------
 if (isset($_POST['Process']))
 {
-
 	$input_error = 0;
 
 	if ($_SESSION['journal_items']->count_gl_items() < 1) {
@@ -150,7 +204,7 @@ if (isset($_POST['Process']))
 		set_focus('code_id');
 		$input_error = 1;
 	}
-	if (abs($_SESSION['journal_items']->gl_items_total()) > 0.0001)
+	if (abs($_SESSION['journal_items']->gl_items_total()) > 0.001)
 	{
 		display_error(_("The journal must balance (debits equal to credits) before it can be processed."));
 		set_focus('code_id');
@@ -169,21 +223,73 @@ if (isset($_POST['Process']))
 		set_focus('date_');
 		$input_error = 1;
 	} 
-	if (!$Refs->is_valid($_POST['ref'])) 
+	if (!is_date($_POST['event_date'])) 
 	{
-		display_error( _("You must enter a reference."));
-		set_focus('ref');
+		display_error(_("The entered date is invalid."));
+		set_focus('event_date');
 		$input_error = 1;
-	} 
-	elseif ($Refs->exists(ST_JOURNAL, $_POST['ref'])) 
+	}
+	if (!is_date($_POST['doc_date'])) 
 	{
-	    // The reference can exist already so long as it's the same as the original (when modifying) 
-	    if ($_POST['ref'] != $_POST['ref_original']) {
-    		display_error( _("The entered reference is already in use."));
-    		set_focus('ref');
+		display_error(_("The entered date is invalid."));
+		set_focus('doc_date');
+		$input_error = 1;
+	}
+	if (!check_reference($_POST['ref'], ST_JOURNAL, $_SESSION['journal_items']->order_id))
+	{
+   		set_focus('ref');
+   		$input_error = 1;
+	}
+	if (get_post('currency') != get_company_pref('curr_default'))
+		if (isset($_POST['_ex_rate']) && !check_num('_ex_rate', 0.000001))
+		{
+			display_error(_("The exchange rate must be numeric and greater than zero."));
+			set_focus('_ex_rate');
     		$input_error = 1;
-	    }
+		}
+
+	if (get_post('_tabs_sel') == 'tax')
+	{
+		if (!is_date($_POST['tax_date']))
+		{
+			display_error(_("The entered date is invalid."));
+			set_focus('tax_date');
+			$input_error = 1;
+		} 
+		elseif (!is_date_in_fiscalyear($_POST['tax_date']))
+		{
+			display_error(_("The entered date is out of fiscal year or is closed for further data entry."));
+			set_focus('tax_date');
+			$input_error = 1;
+		}
+		// FIXME: check proper tax net input values, check sum of net values against total GL an issue warning
+	}
+
+	if (check_value('taxable_trans'))
+	{
+	 	if (!tab_visible('tabs', 'tax'))
+	 	{
+			display_warning(_("Check tax register records before processing transaction or switch off 'Include in tax register' option."));
+			$_POST['tabs_tax'] = true; // force tax tab select
+   			$input_error = 1;
+		} else {
+			$taxes = get_all_tax_types();
+			$net_amount = 0;
+			while ($tax = db_fetch($taxes))
+			{
+				$tax_id = $tax['id'];
+				$net_amount += input_num('net_amount_'.$tax_id);
+			}
+			// in case no tax account used we have to guss tax register on customer/supplier used.
+			if ($net_amount && !$_SESSION['journal_items']->has_taxes() && !$_SESSION['journal_items']->has_sub_accounts())
+			{
+				display_error(_("Cannot determine tax register to be used. You have to make at least one posting either to tax or customer/supplier account to use tax register."));
+				$_POST['tabs_gl'] = true; // force gl tab select
+   				$input_error = 1;
+			}
+		}
 	}
+
 	if ($input_error == 1)
 		unset($_POST['Process']);
 }
@@ -194,10 +300,41 @@ if (isset($_POST['Process']))
 	$new = $cart->order_id == 0;
 
 	$cart->reference = $_POST['ref'];
-	$cart->memo_ = $_POST['memo_'];
 	$cart->tran_date = $_POST['date_'];
+	$cart->doc_date = $_POST['doc_date'];
+	$cart->event_date = $_POST['event_date'];
+	$cart->source_ref = $_POST['source_ref'];
+	if (isset($_POST['memo_']))
+		$cart->memo_ = $_POST['memo_'];
+
+	$cart->currency = $_POST['currency'];
+	if ($cart->currency != get_company_pref('curr_default'))
+		$cart->rate = input_num('_ex_rate');
+
+	if (check_value('taxable_trans'))
+	{
+		// complete tax register data
+		$cart->tax_info['tax_date'] = $_POST['tax_date'];
+		//$cart->tax_info['tax_group'] = $_POST['tax_group'];
+		$taxes = get_all_tax_types();
+		while ($tax = db_fetch($taxes))
+		{
+			$tax_id = $tax['id'];
+			$cart->tax_info['net_amount'][$tax_id] = input_num('net_amount_'.$tax_id);
+			$cart->tax_info['rate'][$tax_id] = $tax['rate'];
+		}
+	} else
+		$cart->tax_info = false;
+	$trans_no = write_journal_entries($cart);
 
-	$trans_no = write_journal_entries($cart, check_value('Reverse'));
+        // retain the reconciled status if desired by user
+        if (isset($_POST['reconciled'])
+            && $_POST['reconciled'] == 1) {
+            $sql = "UPDATE ".TB_PREF."bank_trans SET reconciled=".db_escape($_POST['reconciled_date'])
+                ." WHERE type=" . ST_JOURNAL . " AND trans_no=".db_escape($trans_no);
+
+            db_query($sql, "Can't change reconciliation status");
+        }
 
 	$cart->clear_items();
 	new_doc_date($_POST['date_']);
@@ -212,6 +349,21 @@ if (isset($_POST['Process']))
 
 function check_item_data()
 {
+	global $Ajax;
+
+	if (!get_post('code_id')) {
+   		display_error(_("You must select GL account."));
+		set_focus('code_id');
+   		return false;
+	}
+	if (is_subledger_account(get_post('code_id'))) {
+		if(!get_post('person_id')) {
+	   		display_error(_("You must select subledger account."));
+   			$Ajax->activate('items_table');
+			set_focus('person_id');
+	   		return false;
+	   	}
+	}
 	if (isset($_POST['dimension_id']) && $_POST['dimension_id'] != 0 && dimension_is_closed($_POST['dimension_id'])) 
 	{
 		display_error(_("Dimension is closed."));
@@ -274,8 +426,9 @@ function handle_update_item()
 
     	$_SESSION['journal_items']->update_gl_item($_POST['Index'], $_POST['code_id'], 
     	    $_POST['dimension_id'], $_POST['dimension2_id'], $amount, $_POST['LineMemo'], '', get_post('person_id'));
+    	unset($_SESSION['journal_items']->tax_info);
+		line_start_focus();
     }
-	line_start_focus();
 }
 
 //-----------------------------------------------------------------------------------------------
@@ -283,6 +436,7 @@ function handle_update_item()
 function handle_delete_item($id)
 {
 	$_SESSION['journal_items']->remove_gl_item($id);
+   	unset($_SESSION['journal_items']->tax_info);
 	line_start_focus();
 }
 
@@ -300,10 +454,45 @@ function handle_new_item()
 	
 	$_SESSION['journal_items']->add_gl_item($_POST['code_id'], $_POST['dimension_id'],
 		$_POST['dimension2_id'], $amount, $_POST['LineMemo'], '', get_post('person_id'));
+  	unset($_SESSION['journal_items']->tax_info);
 	line_start_focus();
 }
 
 //-----------------------------------------------------------------------------------------------
+if (isset($_POST['_taxable_trans_update']))
+{	if (!check_value('taxable_trans'))
+		$_POST['tabs_gl'] = true; // force tax tab select
+	else
+		set_focus('taxable_trans');
+	$Ajax->activate('tabs');
+}
+
+if (tab_closed('tabs', 'gl'))
+{
+	$_SESSION['journal_items']->memo_ = $_POST['memo_'];
+}
+ elseif (tab_closed('tabs', 'tax'))
+{
+	$cart = &$_SESSION['journal_items'];
+	$cart->tax_info['tax_date'] = $_POST['tax_date'];
+	//$cart->tax_info['tax_group'] = $_POST['tax_group'];
+	$taxes = get_all_tax_types();
+	while ($tax = db_fetch($taxes))
+	{
+		$tax_id = $tax['id'];
+		$cart->tax_info['net_amount'][$tax_id] = input_num('net_amount_'.$tax_id);
+		$cart->tax_info['rate'][$tax_id] = $tax['rate'];
+	}
+}
+if (tab_opened('tabs', 'gl'))
+{
+	$_POST['memo_'] = $_SESSION['journal_items']->memo_;
+} elseif (tab_opened('tabs', 'tax'))
+{
+	set_focus('tax_date');
+}
+
+
 $id = find_submit('Delete');
 if ($id != -1)
 	handle_delete_item($id);
@@ -319,31 +508,71 @@ if (isset($_POST['CancelItemChanges']))
 
 if (isset($_POST['go']))
 {
-	display_quick_entries($_SESSION['journal_items'], $_POST['person_id'], input_num('totamount'), QE_JOURNAL);
+	display_quick_entries($_SESSION['journal_items'], $_POST['quick'], input_num('totamount'), QE_JOURNAL, get_post('aux_info'));
 	$_POST['totamount'] = price_format(0); $Ajax->activate('totamount');
 	line_start_focus();
-}	
+}
+
+if (list_updated('tax_category'))
+{
+	$Ajax->activate('tabs');
+}
+
 //-----------------------------------------------------------------------------------------------
 
 start_form();
 
 display_order_header($_SESSION['journal_items']);
 
-start_table(TABLESTYLE2, "width=90%", 10);
-start_row();
-echo "<td>";
-display_gl_items(_("Rows"), $_SESSION['journal_items']);
-gl_options_controls();
-echo "</td>";
-end_row();
-end_table(1);
-
-submit_center('Process', _("Process Journal Entry"), true , 
-	_('Process journal entry only if debits equal to credits'), 'default');
+tabbed_content_start('tabs', array(
+		'gl' => array(_('&GL postings'), true),
+		'tax' => array(_('&Tax register'), check_value('taxable_trans')),
+	));
+	
+	switch (get_post('_tabs_sel')) {
+		default:
+		case 'gl':
+			start_table(TABLESTYLE2, "width='90%'", 10);
+			start_row();
+			echo "<td>";
+			display_gl_items(_("Rows"), $_SESSION['journal_items']);
+			gl_options_controls();
+			echo "</td>";
+			end_row();
+			end_table(1);
+			break;
+
+		case 'tax':
+			update_tax_info();
+			br();
+			display_heading(_("Tax register record"));
+			br();
+			start_table(TABLESTYLE2, "width=40%");
+			date_row(_("VAT date:"), 'tax_date', '', "colspan='3'");
+			//tax_groups_list_row(_("Tax group:"), 'tax_group');
+			end_table(1);
+
+			start_table(TABLESTYLE2, "width=60%");
+			table_header(array(_('Name'), _('Input Tax'), _('Output Tax'), _('Net amount')));
+			$taxes = get_all_tax_types();
+			while ($tax = db_fetch($taxes))
+			{
+				start_row();
+				label_cell($tax['name'].' '.$tax['rate'].'%');
+				amount_cell(input_num('tax_in_'.$tax['id']));
+				amount_cell(input_num('tax_out_'.$tax['id']));
+
+				amount_cells(null, 'net_amount_'.$tax['id']);
+				end_row();
+			}
+			end_table(1);
+			break;
+	};
+	submit_center('Process', _("Process Journal Entry"), true , 
+		_('Process journal entry only if debits equal to credits'), 'default');
+br();
+tabbed_content_end();
 
 end_form();
-//------------------------------------------------------------------------------------------------
 
 end_page();
-
-?>