Fixed accounting date for wages

lillem4n · Jul 15, 2014 · eb0dede · eb0dede
1 parent 570de36
commit eb0dede
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/classes/controller/admin/wages.php b/classes/controller/admin/wages.php
@@ -50,24 +50,19 @@ public function action_index()
 			$this->set_formdata(array('period'=>$_GET['period']));
 		// End of period-stuff
 
-
 		if (count($_POST))
 		{
 			// Data submitted
 			$post = new Validation($_POST);
 			$post->filter('trim');
 
-			$post_array        = $post->as_array();
+			$post_array = $post->as_array();
 			foreach (array_keys($post_array) as $key)
-			{
 				if (substr($key, 0, 13) == 'submit_button')
-				{
 					$employee_id = (int) substr($key, 14);
-				}
-			}
 
 			$transaction_data = array(
-				'accounting_date' => date('Y-m-d', time()),
+				'accounting_date' => date('Y-m-25', strtotime($_GET['period'])),
 				'transfer_date'   => date('Y-m-d', time()),
 				'description'     => 'Social fees period '.$_GET['period'],
 				'journal_id'      => NULL,
@@ -141,7 +136,6 @@ public function action_payouts()
 
 	public function action_payout()
 	{
-
 		// Set employees node
 		$employees_node       = $this->xml_content->appendChild($this->dom->createElement('employees'));
 		$employees            = array();
@@ -223,4 +217,4 @@ public function action_payout()
 		}
 	}
 
-}
+}
diff --git a/xsl/admin/wages.xsl b/xsl/admin/wages.xsl
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
-	<xsl:decimal-format
-   decimal-separator='.'
-   grouping-separator=','
-	/>
+	<xsl:decimal-format decimal-separator='.' grouping-separator=',' />
 
 	<xsl:include href="tpl.default.xsl" />