Merge branch 'aspangaro-develop-accounting' into develop

Dolibarr · Jun 29, 2014 · 61ff1d2 · 61ff1d2
2 parents 25ce734 + b985dc3
commit 61ff1d2
Show file tree

Hide file tree

Showing 5 changed files with 107 additions and 70 deletions.
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
@@ -74,6 +74,7 @@ class Account extends CommonObject
     var $type_lib=array();
 
     var $account_number;
+	var $accountancy_journal;
 
     var $currency_code;
     var $min_allowed;
@@ -382,6 +383,7 @@ function create()
         $sql.= ", label";
         $sql.= ", entity";
         $sql.= ", account_number";
+		$sql.= ", accountancy_journal";
         $sql.= ", currency_code";
         $sql.= ", rappro";
         $sql.= ", min_allowed";
@@ -395,6 +397,7 @@ function create()
         $sql.= ", '".$this->db->escape($this->label)."'";
         $sql.= ", ".$conf->entity;
         $sql.= ", '".$this->db->escape($this->account_number)."'";
+		$sql.= ", '".$this->db->escape($this->accountancy_journal)."'";
         $sql.= ", '".$this->currency_code."'";
         $sql.= ", ".$this->rappro;
         $sql.= ", ".price2num($this->min_allowed);
@@ -500,6 +503,7 @@ function update($user='')
         $sql.= ",rappro = ".$this->rappro;
         $sql.= ",url = ".($this->url?"'".$this->url."'":"null");
         $sql.= ",account_number = '".$this->account_number."'";
+		$sql.= ",accountancy_journal = '".$this->accountancy_journal."'";
 
         $sql.= ",currency_code = '".$this->currency_code."'";
 
@@ -606,7 +610,7 @@ function fetch($id,$ref='')
         $sql = "SELECT ba.rowid, ba.ref, ba.label, ba.bank, ba.number, ba.courant, ba.clos, ba.rappro, ba.url,";
         $sql.= " ba.code_banque, ba.code_guichet, ba.cle_rib, ba.bic, ba.iban_prefix as iban,";
         $sql.= " ba.domiciliation, ba.proprio, ba.owner_address, ba.state_id, ba.fk_pays as country_id,";
-        $sql.= " ba.account_number, ba.currency_code,";
+        $sql.= " ba.account_number, ba.accountancy_journal, ba.currency_code,";
         $sql.= " ba.min_allowed, ba.min_desired, ba.comment,";
         $sql.= ' p.code as country_code, p.libelle as country,';
         $sql.= ' d.code_departement as state_code, d.nom as state';
@@ -656,6 +660,7 @@ function fetch($id,$ref='')
                 $this->country       = $obj->country;
 
                 $this->account_number = $obj->account_number;
+				$this->accountancy_journal = $obj->accountancy_journal;
 
                 $this->currency_code  = $obj->currency_code;
                 $this->account_currency_code  = $obj->currency_code;

diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php
@@ -1,8 +1,9 @@
 <?php
-/* Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2003      Jean-Louis Bergamo   <jlb@j1b.org>
- * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copytight (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
+/* Copyright (C) 2002-2003	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2003		Jean-Louis Bergamo		<jlb@j1b.org>
+ * Copyright (C) 2004-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copytight (C) 2005-2009	Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copytight (C) 2014		Alexandre Spangaro		<alexandre.spangaro@gmail.com> 
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,6 +35,7 @@
 $langs->load("banks");
 $langs->load("categories");
 $langs->load("companies");
+$langs->load("compta");
 
 $action=GETPOST("action");
 
@@ -65,6 +67,7 @@
     $account->url           = $_POST["url"];
 
     $account->account_number  = trim($_POST["account_number"]);
+	$account->accountancy_journal  = trim($_POST["accountancy_journal"]);
 
     $account->solde           = $_POST["solde"];
     $account->date_solde      = dol_mktime(12,0,0,$_POST["remonth"],$_POST["reday"],$_POST["reyear"]);
@@ -139,6 +142,7 @@
     $account->owner_address   = trim($_POST["owner_address"]);
 
     $account->account_number  = trim($_POST["account_number"]);
+	$account->accountancy_journal = trim($_POST["accountancy_journal"]);
 
     $account->currency_code   = trim($_POST["account_currency_code"]);
 
@@ -292,18 +296,6 @@
 	}
 	print '</td></tr>';
 
-	// Accountancy code
-    if (! empty($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED))
-    {
-        print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("AccountancyCode").'</td>';
-        print '<td colspan="3"><input type="text" name="account_number" value="'.$account->account_number.'"></td></tr>';
-    }
-    else
-    {
-        print '<tr><td valign="top">'.$langs->trans("AccountancyCode").'</td>';
-        print '<td colspan="3"><input type="text" name="account_number" value="'.$account->account_number.'"></td></tr>';
-    }
-
 	// Web
 	print '<tr><td valign="top">'.$langs->trans("Web").'</td>';
 	print '<td colspan="3"><input size="50" type="text" class="flat" name="url" value="'.$_POST["url"].'"></td></tr>';
@@ -334,6 +326,27 @@
 	print '<tr><td valign="top">'.$langs->trans("BalanceMinimalDesired").'</td>';
 	print '<td colspan="3"><input size="12" type="text" class="flat" name="account_min_desired" value="'.($_POST["account_min_desired"]?$_POST["account_min_desired"]:$account->account_min_desired).'"></td></tr>';
 
+	print '</table>';
+
+	print '<br>';
+
+	print '<table class="border" width="100%">';
+	// Accountancy code
+    if (! empty($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED))
+    {
+        print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("AccountancyCode").'</td>';
+        print '<td colspan="3"><input type="text" name="account_number" value="'.$account->account_number.'"></td></tr>';
+    }
+    else
+    {
+        print '<tr><td valign="top">'.$langs->trans("AccountancyCode").'</td>';
+        print '<td colspan="3"><input type="text" name="account_number" value="'.$account->account_number.'"></td></tr>';
+    }
+
+	// Accountancy journal
+	print '<tr><td valign="top">'.$langs->trans("AccountancyJournal").'</td>';
+    print '<td colspan="3"><input type="text" name="accountancy_journal" value="'.$account->accountancy_journal.'"></td></tr>';
+
 	print '</table>';
 
 	print '<center><br><input value="'.$langs->trans("CreateAccount").'" type="submit" class="button"></center>';
@@ -431,10 +444,6 @@
 		else print ($account->rappro==1 ? $langs->trans("Yes") : ($langs->trans("No").' ('.$langs->trans("ConciliationDisabled").')'));
 		print '</td></tr>';
 
-		// Accountancy code
-		print '<tr><td valign="top">'.$langs->trans("AccountancyCode").'</td>';
-		print '<td colspan="3">'.$account->account_number.'</td></tr>';
-
 		print '<tr><td valign="top">'.$langs->trans("BalanceMinimalAllowed").'</td>';
 		print '<td colspan="3">'.$account->min_allowed.'</td></tr>';
 
@@ -451,7 +460,19 @@
 		print '<td colspan="3">'.$account->comment.'</td></tr>';
 
 		print '</table>';
-
+
+		print '<br>';
+		print '<table class="border" width="100%">';
+		// Accountancy code
+		print '<tr><td valign="top" width="25%">'.$langs->trans("AccountancyCode").'</td>';
+		print '<td colspan="3">'.$account->account_number.'</td></tr>';
+
+		// Accountancy journal
+		print '<tr><td valign="top">'.$langs->trans("AccountancyJournal").'</td>';
+		print '<td colspan="3">'.$account->accountancy_journal.'</td></tr>';
+
+		print '</table>';
+
 		print '</div>';
 
 
@@ -574,19 +595,7 @@
         else print '<input type="checkbox" class="flat" name="norappro"'.($account->rappro?'':' checked="checked"').'"> '.$langs->trans("DisableConciliation");
         print '</td></tr>';
 
-        // Accountancy code
-        if (! empty($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED))
-        {
-            print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("AccountancyCode").'</td>';
-            print '<td colspan="3"><input type="text" name="account_number" value="'.(isset($_POST["account_number"])?$_POST["account_number"]:$account->account_number).'"></td></tr>';
-        }
-        else
-        {
-            print '<tr><td valign="top">'.$langs->trans("AccountancyCode").'</td>';
-            print '<td colspan="3"><input type="text" name="account_number" value="'.(isset($_POST["account_number"])?$_POST["account_number"]:$account->account_number).'"></td></tr>';
-        }
-
-		// Balance
+        // Balance
 		print '<tr><td valign="top">'.$langs->trans("BalanceMinimalAllowed").'</td>';
 		print '<td colspan="3"><input size="12" type="text" class="flat" name="account_min_allowed" value="'.(isset($_POST["account_min_allowed"])?$_POST["account_min_allowed"]:$account->min_allowed).'"></td></tr>';
 
@@ -606,6 +615,22 @@
 		$doleditor=new DolEditor('account_comment',(isset($_POST["account_comment"])?$_POST["account_comment"]:$account->comment),'',200,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_SOCIETE,10,70);
 		$doleditor->Create();
 		print '</td></tr>';
+
+		// Accountancy code
+        if (! empty($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED))
+        {
+            print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("AccountancyCode").'</td>';
+            print '<td colspan="3"><input type="text" name="account_number" value="'.(isset($_POST["account_number"])?$_POST["account_number"]:$account->account_number).'"></td></tr>';
+        }
+        else
+        {
+            print '<tr><td valign="top">'.$langs->trans("AccountancyCode").'</td>';
+            print '<td colspan="3"><input type="text" name="account_number" value="'.(isset($_POST["account_number"])?$_POST["account_number"]:$account->account_number).'"></td></tr>';
+        }
+
+		// Accountancy journal
+        print '<tr><td valign="top">'.$langs->trans("AccountancyJournalCode").'</td>';
+        print '<td colspan="3"><input type="text" name="accountancy_journal" value="'.(isset($_POST["accountancy_journal"])?$_POST["accountancy_journal"]:$account->accountancy_journal).'"></td></tr>';
 
         print '<tr><td align="center" colspan="4"><input value="'.$langs->trans("Modify").'" type="submit" class="button">';
         print ' &nbsp; <input name="cancel" value="'.$langs->trans("Cancel").'" type="submit" class="button">';

diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
@@ -20,12 +20,14 @@
 
 ALTER TABLE llx_c_paiement ADD COLUMN accountancy_code varchar(32) DEFAULT NULL AFTER active;
 
+
 ALTER TABLE llx_accountingaccount add column entity integer DEFAULT 1 NOT NULL AFTER rowid;
 ALTER TABLE llx_accountingaccount add column datec datetime NOT NULL AFTER entity;
 ALTER TABLE llx_accountingaccount add column tms timestamp DEFAULT NULL AFTER datec;
 ALTER TABLE llx_accountingaccount add column fk_user_author integer DEFAULT NULL AFTER label;
 ALTER TABLE llx_accountingaccount add column fk_user_modif integer DEFAULT NULL AFTER fk_user_author;
 
+
 -- Drop old table
 DROP TABLE llx_compta;
 DROP TABLE llx_compta_account;
@@ -44,3 +46,6 @@ ALTER TABLE llx_c_tva MODIFY COLUMN accountancy_code_buy varchar(32);
 ALTER TABLE llx_c_product MODIFY COLUMN accountancy_code_sell varchar(32);
 ALTER TABLE llx_c_product MODIFY COLUMN accountancy_code_buy varchar(32);
 ALTER TABLE llx_user MODIFY COLUMN accountancy_code varchar(32);
+
+
+ALTER TABLE llx_bank_account ADD COLUMN accountancy_journal varchar(3) DEFAULT NULL AFTER account_number;
diff --git a/htdocs/install/mysql/tables/llx_bank_account.sql b/htdocs/install/mysql/tables/llx_bank_account.sql
@@ -1,7 +1,8 @@
 -- =============================================================================
--- Copyright (C) 2000-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
--- Copyright (C) 2004-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
--- Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+-- Copyright (C) 2000-2004	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+-- Copyright (C) 2004-2014	Laurent Destailleur 	<eldy@users.sourceforge.net>
+-- Copyright (C) 2005-2012	Regis Houssin       	<regis.houssin@capnetworks.com>
+-- Copyright (C) 2014		Alexandre Spangaro		<alexandre.spangaro@gmail.com>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -18,39 +19,39 @@
 --
 -- =============================================================================
 
--- courant : type de compte: 0 epargne, 1 courant, 2 caisse
--- clos : le compte est-il clos ou encore ouvert
+-- courant : type of account: 0 epargne, 1 curent/card/cheque, 2 cash
+-- clos : is account opened or closed
 
 create table llx_bank_account
 (
-  rowid				integer AUTO_INCREMENT PRIMARY KEY,
-  datec				datetime,
-  tms				timestamp,
-  ref				varchar(12) NOT NULL,
-  label				varchar(30) NOT NULL,
-  entity			integer DEFAULT 1 NOT NULL,	-- multi company id
-  bank				varchar(60),
-  code_banque		varchar(8),
-  code_guichet		varchar(6),
-  number			varchar(255),
-  cle_rib			varchar(5),
-  bic				varchar(11),
-  iban_prefix		varchar(34),				-- 34 according to ISO 13616
-  country_iban		varchar(2),					-- deprecated
-  cle_iban			varchar(2),
-  domiciliation		varchar(255),
-  state_id			integer        DEFAULT NULL,
-  fk_pays			integer        NOT NULL,
-  proprio			varchar(60),
-  owner_address     varchar(255),
-  courant			smallint DEFAULT 0 NOT NULL,
-  clos				smallint DEFAULT 0 NOT NULL,
-  rappro			smallint DEFAULT 1,
-  url				varchar(128),
-  account_number	varchar(32),				-- bank accountancy number
-  currency_code		varchar(3) NOT NULL,
-  min_allowed		integer DEFAULT 0,
-  min_desired		integer DEFAULT 0,
-  comment			text
-
+  rowid					integer AUTO_INCREMENT PRIMARY KEY,
+  datec					datetime,
+  tms					timestamp,
+  ref					varchar(12) NOT NULL,
+  label					varchar(30) NOT NULL,
+  entity				integer DEFAULT 1 NOT NULL,	-- multi company id
+  bank					varchar(60),
+  code_banque			varchar(8),
+  code_guichet			varchar(6),
+  number				varchar(255),
+  cle_rib				varchar(5),
+  bic					varchar(11),
+  iban_prefix			varchar(34),				-- 34 according to ISO 13616
+  country_iban			varchar(2),					-- deprecated
+  cle_iban				varchar(2),
+  domiciliation			varchar(255),
+  state_id				integer        DEFAULT NULL,
+  fk_pays				integer        NOT NULL,
+  proprio				varchar(60),
+  owner_address     	varchar(255),
+  courant				smallint DEFAULT 0 NOT NULL,
+  clos					smallint DEFAULT 0 NOT NULL,
+  rappro				smallint DEFAULT 1,
+  url					varchar(128),
+  account_number		varchar(32),				-- bank accountancy number
+  accountancy_journal	varchar(3) DEFAULT NULL,	-- bank accountancy journal
+  currency_code			varchar(3) NOT NULL,
+  min_allowed			integer DEFAULT 0,
+  min_desired			integer DEFAULT 0,
+  comment				text
 )ENGINE=innodb;
diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang
@@ -175,6 +175,7 @@ CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is
 CalculationRuleDescSupplier=according to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
+AccountancyJournal=Accountancy code journal
 COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
 COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
 COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services