lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Qual: Uniformize labels

Browse Source
This commit is contained in:
Laurent Destailleur 2010-02-21 12:12:14 +00:00
parent b4c9331461
commit d04578f966
5 changed files with 182 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
htdocs/compta/bank/fiche.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2003 Jean-Louis Bergamo <jlb@j1b.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> * Copytight (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -22,7 +22,7 @@
/** /**
* \file htdocs/compta/bank/fiche.php * \file htdocs/compta/bank/fiche.php
* \ingroup banque * \ingroup banque
* \brief Fiche creation compte bancaire * \brief Page to create/view a bank account
* \version $Id$ * \version $Id$
*/ */
@ -176,21 +176,21 @@ if ($_GET["action"] == 'create')
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
// Ref // 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 '<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 '<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 '<td colspan="3">';
print $form->select_type_comptes_financiers(isset($_POST["type"])?$_POST["type"]:1,"type"); print $form->select_type_comptes_financiers(isset($_POST["type"])?$_POST["type"]:1,"type");
print '</td></tr>'; print '</td></tr>';
// Code compta // 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>'; print '<td colspan="3"><input type="text" name="account_number" value="'.$account->account_number.'"></td></tr>';
} }
else else
@ -199,7 +199,7 @@ if ($_GET["action"] == 'create')
} }
// Currency // 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">'; print '<td colspan="3">';
$selectedcode=$account->account_currency_code; $selectedcode=$account->account_currency_code;
@ -211,7 +211,7 @@ if ($_GET["action"] == 'create')
print '</td></tr>'; print '</td></tr>';
// Pays // 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">'; print '<td colspan="3">';
$selectedcode=$account->account_country_code; $selectedcode=$account->account_country_code;
if (! $selectedcode) $selectedcode=$mysoc->pays_code; if (! $selectedcode) $selectedcode=$mysoc->pays_code;

2
htdocs/compta/charges/index.php
View File

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

13
htdocs/compta/tva/fiche.php
View File

@ -31,6 +31,7 @@ require_once(DOL_DOCUMENT_ROOT."/compta/bank/account.class.php");
$langs->load("compta"); $langs->load("compta");
$langs->load("banks"); $langs->load("banks");
$langs->load("bills");
$id=$_REQUEST["id"]; $id=$_REQUEST["id"];
@ -154,27 +155,27 @@ if ($_GET["action"] == 'create')
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print "<tr>"; 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 $html->select_date($datep,"datep",'','','','add');
print '</td></tr>'; 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 $html->select_date($datev,"datev",'','','','add');
print '</td></tr>'; print '</td></tr>';
// Label // 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 // 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) 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 $html->select_comptes($_POST["accountid"],"accountid",0,"courant=1",1); // Affiche liste des comptes courant
print '</td></tr>'; 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"); $html->select_types_paiements($_POST["paiementtype"], "paiementtype");
print "</td>\n"; print "</td>\n";
} }

6
htdocs/compta/tva/reglement.php
View File

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

321
htdocs/includes/modules/modAccounting.class.php
View File

@ -1,159 +1,162 @@
<?php <?php
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org> * Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org>
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be> * Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
/** \defgroup accounting Module accounting /** \defgroup accounting Module accounting
* \brief Module to include accounting features * \brief Module to include accounting features
* \version $Id$ * \version $Id$
*/ */
/** /**
* \file htdocs/includes/modules/modAccounting.class.php * \file htdocs/includes/modules/modAccounting.class.php
* \ingroup accounting * \ingroup accounting
* \brief Fichier de description et activation du module Comptabilite Expert * \brief Fichier de description et activation du module Comptabilite Expert
*/ */
include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
/** /**
* \class modAccounting * \class modAccounting
* \brief Classe de description et activation du module Comptabilite Expert * \brief Classe de description et activation du module Comptabilite Expert
*/ */
class modAccounting extends DolibarrModules class modAccounting extends DolibarrModules
{ {
/** /**
* \brief Constructeur. Definit les noms, constantes et boites * \brief Constructeur. Definit les noms, constantes et boites
* \param DB handler d'acces base * \param DB handler d'acces base
*/ */
function modAccounting($DB) function modAccounting($DB)
{ {
global $conf; global $conf;
$this->db = $DB ; $this->db = $DB ;
$this->numero = 1400 ; $this->numero = 1400 ;
$this->family = "financial"; $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) // 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->name = preg_replace('/^mod/i','',get_class($this));
$this->description = "Gestion complete de comptabilite (doubles parties)"; $this->description = "Gestion complete de comptabilite (doubles parties)";
// Possible values for version are: 'development', 'experimental', 'dolibarr' or version // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
//$this->version = 'dolibarr'; //$this->version = 'dolibarr';
$this->version = "development"; $this->version = "development";
$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name); $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
$this->special = 0; $this->special = 0;
// Config pages // Config pages
$this->config_page_url = array("accounting.php"); $this->config_page_url = array("accounting.php");
// Dependancies // Dependancies
$this->depends = array("modFacture","modBanque","modTax"); $this->depends = array("modFacture","modBanque","modTax");
$this->requiredby = array(); $this->requiredby = array();
$this->conflictwith = array("modComptabilite"); $this->conflictwith = array("modComptabilite");
$this->langfiles = array("compta"); $this->langfiles = array("compta");
// Constants // 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),
// Data directories to create when module is enabled
$this->dirs = array("/accounting/temp"); ); // List of particular constants to add when module is enabled
// Boxes // Data directories to create when module is enabled
$this->boxes = array(); $this->dirs = array("/accounting/temp");
// Permissions // Boxes
$this->rights = array(); $this->boxes = array();
$this->rights_class = 'accounting';
// Permissions
$this->rights[1][0] = 1401; $this->rights = array();
$this->rights[1][1] = 'Lire le plan de compte'; $this->rights_class = 'accounting';
$this->rights[1][2] = 'r';
$this->rights[1][3] = 1; $this->rights[1][0] = 1401;
$this->rights[1][4] = 'plancompte'; $this->rights[1][1] = 'Lire le plan de compte';
$this->rights[1][5] = 'lire'; $this->rights[1][2] = 'r';
$this->rights[1][3] = 1;
$this->rights[2][0] = 1402; $this->rights[1][4] = 'plancompte';
$this->rights[2][1] = 'Creer/modifier un plan de compte'; $this->rights[1][5] = 'lire';
$this->rights[2][2] = 'w';
$this->rights[2][3] = 0; $this->rights[2][0] = 1402;
$this->rights[2][4] = 'plancompte'; $this->rights[2][1] = 'Creer/modifier un plan de compte';
$this->rights[2][5] = 'creer'; $this->rights[2][2] = 'w';
$this->rights[2][3] = 0;
$this->rights[3][0] = 1403; $this->rights[2][4] = 'plancompte';
$this->rights[3][1] = 'Cloturer plan de compte'; $this->rights[2][5] = 'creer';
$this->rights[3][2] = 'w';
$this->rights[3][3] = 0; $this->rights[3][0] = 1403;
$this->rights[3][4] = 'plancompte'; $this->rights[3][1] = 'Cloturer plan de compte';
$this->rights[3][5] = 'cloturer'; $this->rights[3][2] = 'w';
$this->rights[3][3] = 0;
$this->rights[4][0] = 1411; $this->rights[3][4] = 'plancompte';
$this->rights[4][1] = 'Lire les mouvements comptables'; $this->rights[3][5] = 'cloturer';
$this->rights[4][2] = 'r';
$this->rights[4][3] = 1; $this->rights[4][0] = 1411;
$this->rights[4][4] = 'mouvements'; $this->rights[4][1] = 'Lire les mouvements comptables';
$this->rights[4][5] = 'lire'; $this->rights[4][2] = 'r';
$this->rights[4][3] = 1;
$this->rights[5][0] = 1412; $this->rights[4][4] = 'mouvements';
$this->rights[5][1] = 'Creer/modifier/annuler les mouvements comptables'; $this->rights[4][5] = 'lire';
$this->rights[5][2] = 'w';
$this->rights[5][3] = 0; $this->rights[5][0] = 1412;
$this->rights[5][4] = 'mouvements'; $this->rights[5][1] = 'Creer/modifier/annuler les mouvements comptables';
$this->rights[5][5] = 'creer'; $this->rights[5][2] = 'w';
$this->rights[5][3] = 0;
$this->rights[6][0] = 1415; $this->rights[5][4] = 'mouvements';
$this->rights[6][1] = 'Lire CA, bilans, resultats, journaux, grands livres'; $this->rights[5][5] = 'creer';
$this->rights[6][2] = 'r';
$this->rights[6][3] = 0; $this->rights[6][0] = 1415;
$this->rights[6][4] = 'comptarapport'; $this->rights[6][1] = 'Lire CA, bilans, resultats, journaux, grands livres';
$this->rights[6][5] = 'lire'; $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='') * \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.
// Prevent pb of modules not correctly disabled */
//$this->remove($options); function init($options='')
{
$sql = array(); // Prevent pb of modules not correctly disabled
//$this->remove($options);
return $this->_init($sql,$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='') * \brief Fonction appelee lors de la desactivation d'un module.
{ * Supprime de la base les constantes, boites et permissions du module.
global $conf; */
function remove($options='')
$sql = array("DELETE FROM ".MAIN_DB_PREFIX."const where name='MAIN_COMPANY_CODE_ALWAYS_REQUIRED' and entity IN ('0','".$conf->entity."')"); {
global $conf;
return $this->_remove($sql,$options);
} $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);
}
}
?>