From d04578f9660da9eb4f24970bf32902bfd88525d0 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 21 Feb 2010 12:12:14 +0000 Subject: [PATCH] Qual: Uniformize labels --- htdocs/compta/bank/fiche.php | 18 +- htdocs/compta/charges/index.php | 2 +- htdocs/compta/tva/fiche.php | 13 +- htdocs/compta/tva/reglement.php | 6 +- .../includes/modules/modAccounting.class.php | 321 +++++++++--------- 5 files changed, 182 insertions(+), 178 deletions(-) diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php index f72d5adbdde..03664485cd1 100644 --- a/htdocs/compta/bank/fiche.php +++ b/htdocs/compta/bank/fiche.php @@ -1,7 +1,7 @@ * Copyright (C) 2003 Jean-Louis Bergamo - * Copyright (C) 2004-2008 Laurent Destailleur + * Copyright (C) 2004-2010 Laurent Destailleur * Copytight (C) 2005-2009 Regis Houssin * * 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 ''; // Ref - print ''; + print ''; print ''; - print ''; + print ''; print ''; - print ''; + print ''; print ''; // Code compta - if ($conf->accounting->enabled) + if ($conf->global->MAIN_BANCK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED) { - print ''; + print ''; print ''; } else @@ -199,7 +199,7 @@ if ($_GET["action"] == 'create') } // Currency - print ''; + print ''; print ''; // Pays - print ''; + print ''; print '
'.$langs->trans("Ref").'
'.$langs->trans("Ref").'
'.$langs->trans("LabelBankCashAccount").'
'.$langs->trans("LabelBankCashAccount").'
'.$langs->trans("AccountType").'
'.$langs->trans("AccountType").''; print $form->select_type_comptes_financiers(isset($_POST["type"])?$_POST["type"]:1,"type"); print '
'.$langs->trans("AccountancyCode").'
'.$langs->trans("AccountancyCode").'
'.$langs->trans("Currency").'
'.$langs->trans("Currency").''; $selectedcode=$account->account_currency_code; @@ -211,7 +211,7 @@ if ($_GET["action"] == 'create') print '
'.$langs->trans("Country").'
'.$langs->trans("Country").''; $selectedcode=$account->account_country_code; if (! $selectedcode) $selectedcode=$mysoc->pays_code; diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php index f41c9c4072e..2c7ea8b7617 100644 --- a/htdocs/compta/charges/index.php +++ b/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$ */ diff --git a/htdocs/compta/tva/fiche.php b/htdocs/compta/tva/fiche.php index 76fcf7a0b82..316be47c1c9 100644 --- a/htdocs/compta/tva/fiche.php +++ b/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 ''; print ""; - print ''; - print ''; // Label - print ''; + print ''; // Amount - print ''; + print ''; if ($conf->banque->enabled) { - print ''; - print '\n"; } diff --git a/htdocs/compta/tva/reglement.php b/htdocs/compta/tva/reglement.php index 3421bcaf812..0b6d99cdc2d 100644 --- a/htdocs/compta/tva/reglement.php +++ b/htdocs/compta/tva/reglement.php @@ -63,9 +63,9 @@ if ($result) print '
'.$langs->trans("DatePayment").''; + print ''.$langs->trans("DatePayment").''; print $html->select_date($datep,"datep",'','','','add'); print '
'.$langs->trans("DateValue").''; + print '
'.$langs->trans("DateValue").''; print $html->select_date($datev,"datev",'','','','add'); print '
'.$langs->trans("Label").'trans("VATPayment")).'">
'.$langs->trans("Label").'trans("VATPayment")).'">
'.$langs->trans("Amount").'
'.$langs->trans("Amount").'
'.$langs->trans("Account").''; + print '
'.$langs->trans("Account").''; $html->select_comptes($_POST["accountid"],"accountid",0,"courant=1",1); // Affiche liste des comptes courant print '
'.$langs->trans("PaymentMode").''; + print '
'.$langs->trans("PaymentMode").''; $html->select_types_paiements($_POST["paiementtype"], "paiementtype"); print "
'; print ''; print ''; - print ''; print ""; - print ""; + print ''; + print ""; print "\n"; $var=1; while ($i < $num) @@ -77,8 +77,8 @@ if ($result) $tva_static->id=$obj->rowid; $tva_static->ref=$obj->rowid; print "\n"; + print "\n"; print '\n"; - print "\n"; $total = $total + $obj->amount; print ""; diff --git a/htdocs/includes/modules/modAccounting.class.php b/htdocs/includes/modules/modAccounting.class.php index eb792821dd0..bd524a126fc 100644 --- a/htdocs/includes/modules/modAccounting.class.php +++ b/htdocs/includes/modules/modAccounting.class.php @@ -1,159 +1,162 @@ - - * Copyright (C) 2004-2009 Laurent Destailleur - * Copyright (C) 2004 Sebastien Di Cintio - * Copyright (C) 2004 Benoit Mortier - * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -/** \defgroup accounting Module accounting - * \brief Module to include accounting features - * \version $Id$ - */ - -/** - * \file htdocs/includes/modules/modAccounting.class.php - * \ingroup accounting - * \brief Fichier de description et activation du module Comptabilite Expert - */ - -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); - - -/** - * \class modAccounting - * \brief Classe de description et activation du module Comptabilite Expert - */ -class modAccounting extends DolibarrModules -{ - - /** - * \brief Constructeur. Definit les noms, constantes et boites - * \param DB handler d'acces base - */ - function modAccounting($DB) - { - global $conf; - - $this->db = $DB ; - $this->numero = 1400 ; - - $this->family = "financial"; - // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module) - $this->name = preg_replace('/^mod/i','',get_class($this)); - $this->description = "Gestion complete de comptabilite (doubles parties)"; - - // Possible values for version are: 'development', 'experimental', 'dolibarr' or version - //$this->version = 'dolibarr'; - $this->version = "development"; - - $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name); - $this->special = 0; - - // Config pages - $this->config_page_url = array("accounting.php"); - - // Dependancies - $this->depends = array("modFacture","modBanque","modTax"); - $this->requiredby = array(); - $this->conflictwith = array("modComptabilite"); - $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 - - // Data directories to create when module is enabled - $this->dirs = array("/accounting/temp"); - - // Boxes - $this->boxes = array(); - - // Permissions - $this->rights = array(); - $this->rights_class = 'accounting'; - - $this->rights[1][0] = 1401; - $this->rights[1][1] = 'Lire le plan de compte'; - $this->rights[1][2] = 'r'; - $this->rights[1][3] = 1; - $this->rights[1][4] = 'plancompte'; - $this->rights[1][5] = 'lire'; - - $this->rights[2][0] = 1402; - $this->rights[2][1] = 'Creer/modifier un plan de compte'; - $this->rights[2][2] = 'w'; - $this->rights[2][3] = 0; - $this->rights[2][4] = 'plancompte'; - $this->rights[2][5] = 'creer'; - - $this->rights[3][0] = 1403; - $this->rights[3][1] = 'Cloturer plan de compte'; - $this->rights[3][2] = 'w'; - $this->rights[3][3] = 0; - $this->rights[3][4] = 'plancompte'; - $this->rights[3][5] = 'cloturer'; - - $this->rights[4][0] = 1411; - $this->rights[4][1] = 'Lire les mouvements comptables'; - $this->rights[4][2] = 'r'; - $this->rights[4][3] = 1; - $this->rights[4][4] = 'mouvements'; - $this->rights[4][5] = 'lire'; - - $this->rights[5][0] = 1412; - $this->rights[5][1] = 'Creer/modifier/annuler les mouvements comptables'; - $this->rights[5][2] = 'w'; - $this->rights[5][3] = 0; - $this->rights[5][4] = 'mouvements'; - $this->rights[5][5] = 'creer'; - - $this->rights[6][0] = 1415; - $this->rights[6][1] = 'Lire CA, bilans, resultats, journaux, grands livres'; - $this->rights[6][2] = 'r'; - $this->rights[6][3] = 0; - $this->rights[6][4] = 'comptarapport'; - $this->rights[6][5] = 'lire'; - } - - - /** - * \brief Fonction appelee lors de l'activation du module. Insere en base les constantes, boites, permissions du module. - * Definit egalement les repertoires de donnees e creer pour ce module. - */ - function init($options='') - { - // Prevent pb of modules not correctly disabled - //$this->remove($options); - - $sql = array(); - - return $this->_init($sql,$options); - } - - /** - * \brief Fonction appelee lors de la desactivation d'un module. - * Supprime de la base les constantes, boites et permissions du module. - */ - function remove($options='') - { - global $conf; - - $sql = array("DELETE FROM ".MAIN_DB_PREFIX."const where name='MAIN_COMPANY_CODE_ALWAYS_REQUIRED' and entity IN ('0','".$conf->entity."')"); - - return $this->_remove($sql,$options); - } -} -?> + + * Copyright (C) 2004-2009 Laurent Destailleur + * Copyright (C) 2004 Sebastien Di Cintio + * Copyright (C) 2004 Benoit Mortier + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +/** \defgroup accounting Module accounting + * \brief Module to include accounting features + * \version $Id$ + */ + +/** + * \file htdocs/includes/modules/modAccounting.class.php + * \ingroup accounting + * \brief Fichier de description et activation du module Comptabilite Expert + */ + +include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); + + +/** + * \class modAccounting + * \brief Classe de description et activation du module Comptabilite Expert + */ +class modAccounting extends DolibarrModules +{ + + /** + * \brief Constructeur. Definit les noms, constantes et boites + * \param DB handler d'acces base + */ + function modAccounting($DB) + { + global $conf; + + $this->db = $DB ; + $this->numero = 1400 ; + + $this->family = "financial"; + // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module) + $this->name = preg_replace('/^mod/i','',get_class($this)); + $this->description = "Gestion complete de comptabilite (doubles parties)"; + + // Possible values for version are: 'development', 'experimental', 'dolibarr' or version + //$this->version = 'dolibarr'; + $this->version = "development"; + + $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name); + $this->special = 0; + + // Config pages + $this->config_page_url = array("accounting.php"); + + // Dependancies + $this->depends = array("modFacture","modBanque","modTax"); + $this->requiredby = array(); + $this->conflictwith = array("modComptabilite"); + $this->langfiles = array("compta"); + + // Constants + $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"); + + // Boxes + $this->boxes = array(); + + // Permissions + $this->rights = array(); + $this->rights_class = 'accounting'; + + $this->rights[1][0] = 1401; + $this->rights[1][1] = 'Lire le plan de compte'; + $this->rights[1][2] = 'r'; + $this->rights[1][3] = 1; + $this->rights[1][4] = 'plancompte'; + $this->rights[1][5] = 'lire'; + + $this->rights[2][0] = 1402; + $this->rights[2][1] = 'Creer/modifier un plan de compte'; + $this->rights[2][2] = 'w'; + $this->rights[2][3] = 0; + $this->rights[2][4] = 'plancompte'; + $this->rights[2][5] = 'creer'; + + $this->rights[3][0] = 1403; + $this->rights[3][1] = 'Cloturer plan de compte'; + $this->rights[3][2] = 'w'; + $this->rights[3][3] = 0; + $this->rights[3][4] = 'plancompte'; + $this->rights[3][5] = 'cloturer'; + + $this->rights[4][0] = 1411; + $this->rights[4][1] = 'Lire les mouvements comptables'; + $this->rights[4][2] = 'r'; + $this->rights[4][3] = 1; + $this->rights[4][4] = 'mouvements'; + $this->rights[4][5] = 'lire'; + + $this->rights[5][0] = 1412; + $this->rights[5][1] = 'Creer/modifier/annuler les mouvements comptables'; + $this->rights[5][2] = 'w'; + $this->rights[5][3] = 0; + $this->rights[5][4] = 'mouvements'; + $this->rights[5][5] = 'creer'; + + $this->rights[6][0] = 1415; + $this->rights[6][1] = 'Lire CA, bilans, resultats, journaux, grands livres'; + $this->rights[6][2] = 'r'; + $this->rights[6][3] = 0; + $this->rights[6][4] = 'comptarapport'; + $this->rights[6][5] = 'lire'; + } + + + /** + * \brief Fonction appelee lors de l'activation du module. Insere en base les constantes, boites, permissions du module. + * Definit egalement les repertoires de donnees e creer pour ce module. + */ + function init($options='') + { + // Prevent pb of modules not correctly disabled + //$this->remove($options); + + $sql = array(); + + return $this->_init($sql,$options); + } + + /** + * \brief Fonction appelee lors de la desactivation d'un module. + * Supprime de la base les constantes, boites et permissions du module. + */ + function remove($options='') + { + global $conf; + + $sql = array("DELETE FROM ".MAIN_DB_PREFIX."const where name='MAIN_COMPANY_CODE_ALWAYS_REQUIRED' and entity IN ('0','".$conf->entity."')"); + + return $this->_remove($sql,$options); + } +} +?>
'.$langs->trans("Ref").''.$langs->trans("Date").'".$langs->trans("Label")."".$langs->trans("Amount")."'.$langs->trans("DatePayment").'".$langs->trans("PayedByThisPayment")."
".$tva_static->getNomUrl(1)."".dol_trunc($obj->label,40)."'.dol_print_date($obj->dm,'day')."".$obj->label."".price($obj->amount)."