X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fgl_journal.php;h=6d1fd90a034f19056827ffcabcaaacb0f8f45431;hb=d5618f84e921515fa6ce6ec05180f0651119c297;hp=77ba76b4ee1b4ba7761f90cf1264bf8772dd2fdf;hpb=93a920d7c98e55be77d2ea84e6c457f681b7a4e4;p=fa-stable.git

diff --git a/gl/gl_journal.php b/gl/gl_journal.php
index 77ba76b4..6d1fd90a 100644
--- a/gl/gl_journal.php
+++ b/gl/gl_journal.php
@@ -9,8 +9,8 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$page_security = 3;
-$path_to_root="..";
+$page_security = 'SA_JOURNALENTRY';
+$path_to_root = "..";
 include_once($path_to_root . "/includes/ui/items_cart.inc");
 
 include_once($path_to_root . "/includes/session.inc");
@@ -28,9 +28,16 @@ if ($use_popup_windows)
 if ($use_date_picker)
 	$js .= get_js_date_picker();
 
-page(_("Journal Entry"), false, false,'', $js);
+if (isset($_GET['ModifyGL'])) {
+	$_SESSION['page_title'] = sprintf(_("Modifying Journal Transaction # %d."), 
+		$_GET['trans_no']);
+	$help_context = "Modifying Journal Entry";
+} else
+	$_SESSION['page_title'] = _($help_context = "Journal Entry");
 
+page($_SESSION['page_title'], false, false,'', $js);
 //--------------------------------------------------------------------------------------------------
+
 function line_start_focus() {
   global 	$Ajax;
 
@@ -42,34 +49,87 @@ function line_start_focus() {
 if (isset($_GET['AddedID'])) 
 {
 	$trans_no = $_GET['AddedID'];
-	$trans_type = systypes::journal_entry();
+	$trans_type = ST_JOURNAL;
 
    	display_notification_centered( _("Journal entry has been entered") . " #$trans_no");
 
     display_note(get_gl_view_str($trans_type, $trans_no, _("&View this Journal Entry")));
 
-   	hyperlink_no_params($_SERVER['PHP_SELF'], _("Enter &Another Journal Entry"));
+	reset_focus();
+	hyperlink_params($_SERVER['PHP_SELF'], _("Enter &New Journal Entry"), "NewJournal=Yes");
+
+	hyperlink_params("$path_to_root/admin/attachments.php", _("Add an Attachment"), "filterType=$trans_type&trans_no=$trans_no");
+
+	display_footer_exit();
+} elseif (isset($_GET['UpdatedID'])) 
+{
+	$trans_no = $_GET['UpdatedID'];
+	$trans_type = ST_JOURNAL;
+
+   	display_notification_centered( _("Journal entry has been updated") . " #$trans_no");
+
+    display_note(get_gl_view_str($trans_type, $trans_no, _("&View this Journal Entry")));
+
+   	hyperlink_no_params($path_to_root."/gl/inquiry/journal_inquiry.php", _("Return to Journal &Inquiry"));
 
 	display_footer_exit();
 }
 //--------------------------------------------------------------------------------------------------
 
-function handle_new_order()
+if (isset($_GET['NewJournal']))
+{
+	create_cart(0,0);
+} 
+elseif (isset($_GET['ModifyGL']))
+{
+	if (!isset($_GET['trans_type']) || $_GET['trans_type']!= 0) {
+		display_error(_("You can edit directly only journal entries created via Journal Entry page."));
+		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']);
+}
+
+function create_cart($type=0, $trans_no=0)
 {
+	global $Refs;
+
 	if (isset($_SESSION['journal_items']))
 	{
-		$_SESSION['journal_items']->clear_items();
 		unset ($_SESSION['journal_items']);
 	}
 
-    session_register("journal_items");
+	$cart = new items_cart($type);
+    $cart->order_id = $trans_no;
+
+	if ($trans_no) {
+		$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_']);
+			}
+		}
+		$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
+	} else {
+		$cart->reference = $Refs->get_next(0);
+		$cart->tran_date = new_doc_date();
+		if (!is_date_in_fiscalyear($cart->tran_date))
+			$cart->tran_date = end_fiscalyear();
+		$_POST['ref_original'] = -1;
+	}
 
-    $_SESSION['journal_items'] = new items_cart(systypes::journal_entry());
+	$_POST['memo_'] = $cart->memo_;
+	$_POST['ref'] = $cart->reference;
+	$_POST['date_'] = $cart->tran_date;
 
-	$_POST['date_'] = Today();
-	if (!is_date_in_fiscalyear($_POST['date_']))
-		$_POST['date_'] = end_fiscalyear();
-	$_SESSION['journal_items']->tran_date = $_POST['date_'];	
+	$_SESSION['journal_items'] = &$cart;
 }
 
 //-----------------------------------------------------------------------------------------------
@@ -103,34 +163,44 @@ if (isset($_POST['Process']))
 		set_focus('date_');
 		$input_error = 1;
 	} 
-	if (!references::is_valid($_POST['ref'])) 
+	if (!$Refs->is_valid($_POST['ref'])) 
 	{
 		display_error( _("You must enter a reference."));
 		set_focus('ref');
 		$input_error = 1;
 	} 
-	elseif (references::exists(systypes::journal_entry(), $_POST['ref'])) 
+	elseif ($Refs->exists(ST_JOURNAL, $_POST['ref'])) 
 	{
-		display_error( _("The entered reference is already in use."));
-		set_focus('ref');
-		$input_error = 1;
+	    // 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');
+    		$input_error = 1;
+	    }
 	}
-
 	if ($input_error == 1)
 		unset($_POST['Process']);
 }
 
 if (isset($_POST['Process']))
 {
+	$cart = &$_SESSION['journal_items'];
+	$new = $cart->order_id == 0;
 
-	$trans_no = add_journal_entries($_SESSION['journal_items']->gl_items,
-		$_POST['date_'], $_POST['ref'], check_value('Reverse'), $_POST['memo_']);
+	$cart->reference = $_POST['ref'];
+	$cart->memo_ = $_POST['memo_'];
+	$cart->tran_date = $_POST['date_'];
 
-	$_SESSION['journal_items']->clear_items();
-	unset($_SESSION['journal_items']);
+	$trans_no = write_journal_entries($cart, check_value('Reverse'));
 
-	meta_forward($_SERVER['PHP_SELF'], "AddedID=$trans_no");
-} /*end of process credit note */
+	$cart->clear_items();
+	new_doc_date($_POST['date_']);
+	unset($_SESSION['journal_items']);
+	if($new)
+		meta_forward($_SERVER['PHP_SELF'], "AddedID=$trans_no");
+	else
+		meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$trans_no");
+}
 
 //-----------------------------------------------------------------------------------------------
 
@@ -175,7 +245,7 @@ function check_item_data()
    		return false;
 	}
 
-	if ($_SESSION["wa_current_user"]->access != 2 && is_bank_account($_POST['code_id'])) 
+	if (!$_SESSION["wa_current_user"]->can_access('SA_BANKJOURNAL') && is_bank_account($_POST['code_id'])) 
 	{
 		display_error(_("You cannot make a journal entry for a bank account. Please use one of the banking functions for bank transactions."));
 		set_focus('code_id');
@@ -196,8 +266,8 @@ function handle_update_item()
     	else
     		$amount = -input_num('AmountCredit');
 
-    	$_SESSION['journal_items']->update_gl_item($_POST['Index'], $_POST['dimension_id'],
-    		$_POST['dimension2_id'], $amount, $_POST['LineMemo']);
+    	$_SESSION['journal_items']->update_gl_item($_POST['Index'], $_POST['code_id'], 
+    	    $_POST['dimension_id'], $_POST['dimension2_id'], $amount, $_POST['LineMemo']);
     }
 	line_start_focus();
 }
@@ -249,18 +319,11 @@ if (isset($_POST['go']))
 }	
 //-----------------------------------------------------------------------------------------------
 
-if (isset($_GET['NewJournal']) || !isset($_SESSION['journal_items']))
-{
-	handle_new_order();
-}
-
-//-----------------------------------------------------------------------------------------------
-
 start_form();
 
 display_order_header($_SESSION['journal_items']);
 
-start_table("$table_style2 width=90%", 10);
+start_table(TABLESTYLE2, "width='90%'", 10);
 start_row();
 echo "<td>";
 display_gl_items(_("Rows"), $_SESSION['journal_items']);
@@ -270,7 +333,7 @@ end_row();
 end_table(1);
 
 submit_center('Process', _("Process Journal Entry"), true , 
-	_('Process journal entry only if debits equal to credits'), true);
+	_('Process journal entry only if debits equal to credits'), 'default');
 
 end_form();
 //------------------------------------------------------------------------------------------------