Qual: Uniformize labels

htdocs/compta/bank/fiche.php

 <?php
 /* Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2003      Jean-Louis Bergamo   <jlb@j1b.org>
- * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copytight (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -22,7 +22,7 @@
 /**
  *	    \file       htdocs/compta/bank/fiche.php
  *      \ingroup    banque
- *		\brief      Fiche creation compte bancaire
+ *		\brief      Page to create/view a bank account
  *		\version    $Id$
  */
 
@@ -176,21 +176,21 @@ if ($_GET["action"] == 'create')
 	print '<table class="border" width="100%">';
 
 	// Ref
-	print '<tr><td valign="top">'.$langs->trans("Ref").'</td>';
+	print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("Ref").'</td>';
 	print '<td colspan="3"><input size="8" type="text" class="flat" name="ref" value="'.$account->ref.'"></td></tr>';
 
-	print '<tr><td valign="top">'.$langs->trans("LabelBankCashAccount").'</td>';
+	print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("LabelBankCashAccount").'</td>';
 	print '<td colspan="3"><input size="30" type="text" class="flat" name="label" value="'.$_POST["label"].'"></td></tr>';
 
-	print '<tr><td valign="top">'.$langs->trans("AccountType").'</td>';
+	print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("AccountType").'</td>';
 	print '<td colspan="3">';
 	print $form->select_type_comptes_financiers(isset($_POST["type"])?$_POST["type"]:1,"type");
 	print '</td></tr>';
 
 	// Code compta
-	if ($conf->accounting->enabled)
+	if ($conf->global->MAIN_BANCK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED)
 	{
-		print '<tr><td valign="top">'.$langs->trans("AccountancyCode").'</td>';
+		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
@@ -199,7 +199,7 @@ if ($_GET["action"] == 'create')
 	}
 
 	// Currency
-	print '<tr><td valign="top">'.$langs->trans("Currency").'</td>';
+	print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("Currency").'</td>';
 	print '<td colspan="3">';
 
 	$selectedcode=$account->account_currency_code;
@@ -211,7 +211,7 @@ if ($_GET["action"] == 'create')
 	print '</td></tr>';
 
 	// Pays
-	print '<tr><td valign="top">'.$langs->trans("Country").'</td>';
+	print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("Country").'</td>';
 	print '<td colspan="3">';
 	$selectedcode=$account->account_country_code;
 	if (! $selectedcode) $selectedcode=$mysoc->pays_code;

htdocs/compta/charges/index.php

@@ -21,7 +21,7 @@
 /**
  *      \file       htdocs/compta/charges/index.php
  *      \ingroup    compta
- *		\brief      Page liste des charges
+ *		\brief      Page to list social contributions
  *		\version    $Id$
  */
 

htdocs/compta/tva/fiche.php

@@ -31,6 +31,7 @@ require_once(DOL_DOCUMENT_ROOT."/compta/bank/account.class.php");
 
 $langs->load("compta");
 $langs->load("banks");
+$langs->load("bills");
 
 $id=$_REQUEST["id"];
 
@@ -154,27 +155,27 @@ if ($_GET["action"] == 'create')
     print '<table class="border" width="100%">';
 
     print "<tr>";
-    print '<td>'.$langs->trans("DatePayment").'</td><td>';
+    print '<td class="fieldrequired">'.$langs->trans("DatePayment").'</td><td>';
     print $html->select_date($datep,"datep",'','','','add');
     print '</td></tr>';
 
-    print '<tr><td>'.$langs->trans("DateValue").'</td><td>';
+    print '<tr><td class="fieldrequired">'.$langs->trans("DateValue").'</td><td>';
     print $html->select_date($datev,"datev",'','','','add');
     print '</td></tr>';
 
 	// Label
-	print '<tr><td>'.$langs->trans("Label").'</td><td><input name="label" size="40" value="'.($_POST["label"]?$_POST["label"]:$langs->trans("VATPayment")).'"></td></tr>';
+	print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input name="label" size="40" value="'.($_POST["label"]?$_POST["label"]:$langs->trans("VATPayment")).'"></td></tr>';
 
 	// Amount
-	print '<tr><td>'.$langs->trans("Amount").'</td><td><input name="amount" size="10" value="'.$_POST["amount"].'"></td></tr>';
+	print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input name="amount" size="10" value="'.$_POST["amount"].'"></td></tr>';
 
     if ($conf->banque->enabled)
     {
-		print '<tr><td>'.$langs->trans("Account").'</td><td>';
+		print '<tr><td class="fieldrequired">'.$langs->trans("Account").'</td><td>';
         $html->select_comptes($_POST["accountid"],"accountid",0,"courant=1",1);  // Affiche liste des comptes courant
         print '</td></tr>';
 
-	    print '<tr><td>'.$langs->trans("PaymentMode").'</td><td>';
+	    print '<tr><td class="fieldrequired">'.$langs->trans("PaymentMode").'</td><td>';
 	    $html->select_types_paiements($_POST["paiementtype"], "paiementtype");
 	    print "</td>\n";
 	}

htdocs/compta/tva/reglement.php

@@ -63,9 +63,9 @@ if ($result)
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre">';
     print '<td nowrap align="left">'.$langs->trans("Ref").'</td>';
-    print '<td nowrap align="left">'.$langs->trans("Date").'</td>';
     print "<td>".$langs->trans("Label")."</td>";
-    print "<td align=\"right\">".$langs->trans("Amount")."</td>";
+    print '<td nowrap align="left">'.$langs->trans("DatePayment").'</td>';
+    print "<td align=\"right\">".$langs->trans("PayedByThisPayment")."</td>";
     print "</tr>\n";
     $var=1;
     while ($i < $num)
@@ -77,8 +77,8 @@ if ($result)
 		$tva_static->id=$obj->rowid;
 		$tva_static->ref=$obj->rowid;
 		print "<td>".$tva_static->getNomUrl(1)."</td>\n";
+        print "<td>".dol_trunc($obj->label,40)."</td>\n";
         print '<td align="left">'.dol_print_date($obj->dm,'day')."</td>\n";
-        print "<td>".$obj->label."</td>\n";
         $total = $total + $obj->amount;
 
         print "<td align=\"right\">".price($obj->amount)."</td>";

htdocs/includes/modules/modAccounting.class.php

@@ -73,7 +73,10 @@ class modAccounting extends DolibarrModules
 		$this->langfiles = array("compta");
 
 		// Constants
-		$this->const = array(0=>array('MAIN_COMPANY_CODE_ALWAYS_REQUIRED','chaine','1','With this constants on, third party codes are always required whatever is numbering module behaviour',0));			// List of particular constants to add when module is enabled
+		$this->const = array(0=>array('MAIN_COMPANY_CODE_ALWAYS_REQUIRED','chaine','1','With this constants on, third party code is always required whatever is numbering module behaviour',0),
+							 1=>array('MAIN_BANCK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED','chaine','1','With this constants on, bank account number is always required',0),
+
+		);			// List of particular constants to add when module is enabled
 
 		// Data directories to create when module is enabled
 		$this->dirs = array("/accounting/temp");