From 06ab1f6f94e0b8dd47de3b4d0c0f2844d9189855 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Wed, 22 Aug 2012 22:59:10 +0200 Subject: [PATCH 01/13] Task 515 : New field added on contact : no_email --- htdocs/contact/class/contact.class.php | 5 ++++- htdocs/contact/fiche.php | 15 ++++++++++----- htdocs/install/mysql/migration/3.2.0-3.3.0.sql | 2 ++ htdocs/install/mysql/tables/llx_socpeople.sql | 1 + htdocs/langs/en_US/companies.lang | 1 + htdocs/langs/fr_FR/companies.lang | 1 + 6 files changed, 19 insertions(+), 6 deletions(-) diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php index 60873f86a32..0cb2d9f7c6e 100644 --- a/htdocs/contact/class/contact.class.php +++ b/htdocs/contact/class/contact.class.php @@ -72,6 +72,7 @@ class Contact extends CommonObject var $birthday; var $default_lang; var $note; // Private note + var $no_email; // 1=Don't send e-mail to this contact, 0=do var $ref_facturation; // Nb de reference facture pour lequel il est contact var $ref_contrat; // Nb de reference contrat pour lequel il est contact @@ -250,6 +251,7 @@ class Contact extends CommonObject $sql .= ", priv = '".$this->priv."'"; $sql .= ", fk_user_modif=".($user->id > 0 ? "'".$user->id."'":"null"); $sql .= ", default_lang=".($this->default_lang?"'".$this->default_lang."'":"null"); + $sql .= ", no_email=".($this->no_email?"'".$this->no_email."'":"null"); $sql .= " WHERE rowid=".$id; dol_syslog(get_class($this)."::update sql=".$sql,LOG_DEBUG); @@ -468,7 +470,7 @@ class Contact extends CommonObject $sql.= " c.fk_departement,"; $sql.= " c.birthday,"; $sql.= " c.poste, c.phone, c.phone_perso, c.phone_mobile, c.fax, c.email, c.jabberid,"; - $sql.= " c.priv, c.note, c.default_lang, c.canvas,"; + $sql.= " c.priv, c.note, c.default_lang, c.no_email, c.canvas,"; $sql.= " c.import_key,"; $sql.= " p.libelle as country, p.code as country_code,"; $sql.= " d.nom as state, d.code_departement as state_code,"; @@ -536,6 +538,7 @@ class Contact extends CommonObject $this->birthday = $this->db->jdate($obj->birthday); $this->note = $obj->note; $this->default_lang = $obj->default_lang; + $this->no_email = $obj->no_email; $this->user_id = $obj->user_id; $this->user_login = $obj->user_login; $this->canvas = $obj->canvas; diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php index f42414a980b..53d7f40d91a 100644 --- a/htdocs/contact/fiche.php +++ b/htdocs/contact/fiche.php @@ -146,6 +146,7 @@ if (empty($reshook)) $object->phone_mobile = $_POST["phone_mobile"]; $object->fax = $_POST["fax"]; $object->jabberid = $_POST["jabberid"]; + $object->no_email = $_POST["no_email"]; $object->priv = $_POST["priv"]; $object->note = $_POST["note"]; @@ -237,6 +238,7 @@ if (empty($reshook)) $object->phone_mobile = $_POST["phone_mobile"]; $object->fax = $_POST["fax"]; $object->jabberid = $_POST["jabberid"]; + $object->no_email = $_POST["no_email"]; $object->priv = $_POST["priv"]; $object->note = $_POST["note"]; @@ -448,8 +450,9 @@ else if (($objsoc->typent_code == 'TE_PRIVATE' || ! empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->email)) == 0) $object->email = $objsoc->email; // Predefined with third party print ''.$langs->trans("Email").'email).'">'; - // Instant message - print ''.$langs->trans("IM").'jabberid).'">'; + // Instant message and no email + print ''.$langs->trans("IM").'jabberid).'">'; + print ''.$langs->trans("No_Email").''.$form->selectyesno('no_email',(isset($_POST["no_email"])?$_POST["no_email"]:$object->no_email)).''; // Visibility print ''.$langs->trans("ContactVisibility").''; @@ -623,7 +626,8 @@ else print ''; // Jabberid - print 'Jabberidjabberid).'">'; + print 'Jabberidjabberid).'">'; + print ''.$langs->trans("No_Email").''.$form->selectyesno('no_email',(isset($_POST["no_email"])?$_POST["no_email"]:$object->no_email)).''; // Visibility print ''.$langs->trans("ContactVisibility").''; @@ -815,8 +819,9 @@ else } print ''; - // Instant message - print ''.$langs->trans("IM").''.$object->jabberid.''; + // Instant message and no email + print ''.$langs->trans("IM").''.$object->jabberid.''; + print ''.$langs->trans("No_Email").''.$object->no_email.''; print ''.$langs->trans("ContactVisibility").''; print $object->LibPubPriv($object->priv); diff --git a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql index e1d124eee8b..57f61c19bdd 100755 --- a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql +++ b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql @@ -71,3 +71,5 @@ ALTER TABLE llx_commande_fournisseur CHANGE fk_methode_commande fk_input_method INSERT INTO llx_const (name, value, type, note, visible) values ('PRODUCT_CODEPRODUCT_ADDON','mod_codeproduct_leopard','yesno','Module to control product codes',0); ALTER TABLE llx_c_barcode_type ADD UNIQUE INDEX uk_c_barcode_type(code, entity); + +ALTER TABLE llx_socpeople ADD column no_email SMALLINT NOT NULL DEFAULT 0 AFTER priv; diff --git a/htdocs/install/mysql/tables/llx_socpeople.sql b/htdocs/install/mysql/tables/llx_socpeople.sql index 534d0abbdd6..532f752d331 100644 --- a/htdocs/install/mysql/tables/llx_socpeople.sql +++ b/htdocs/install/mysql/tables/llx_socpeople.sql @@ -41,6 +41,7 @@ create table llx_socpeople fax varchar(30), email varchar(255), jabberid varchar(255), + no_email smallint NOT NULL DEFAULT 0, priv smallint NOT NULL DEFAULT 0, fk_user_creat integer DEFAULT 0, -- user qui a creel'enregistrement fk_user_modif integer, diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang index b2bf2106f90..d2c6af5167b 100644 --- a/htdocs/langs/en_US/companies.lang +++ b/htdocs/langs/en_US/companies.lang @@ -68,6 +68,7 @@ Phone=Phone PhonePro=Prof. phone PhonePerso=Pers. phone PhoneMobile=Mobile +No_Email=Don't send e-mail Fax=Fax Zip=Zip Code Town=City diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang index ae6b8c44369..2c0144f449e 100644 --- a/htdocs/langs/fr_FR/companies.lang +++ b/htdocs/langs/fr_FR/companies.lang @@ -70,6 +70,7 @@ Phone=Téléphone PhonePro=Tél pro. PhonePerso=Tél perso. PhoneMobile=Tél portable +No_Email=Ne pas envoyer d'e-mail Fax=Fax Zip=Code postal Town=Ville From 5fd10d14be4c2b1a968bd56b97410b2d05f37526 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Thu, 23 Aug 2012 00:00:01 +0200 Subject: [PATCH 02/13] Task 515 : Corrections + target modules modifications --- htdocs/contact/fiche.php | 6 +++--- htdocs/core/modules/mailings/contacts1.modules.php | 3 +++ htdocs/core/modules/mailings/contacts2.modules.php | 3 +++ htdocs/core/modules/mailings/contacts3.modules.php | 3 +++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php index 53d7f40d91a..c7ebc12f56f 100644 --- a/htdocs/contact/fiche.php +++ b/htdocs/contact/fiche.php @@ -452,7 +452,7 @@ else // Instant message and no email print ''.$langs->trans("IM").'jabberid).'">'; - print ''.$langs->trans("No_Email").''.$form->selectyesno('no_email',(isset($_POST["no_email"])?$_POST["no_email"]:$object->no_email)).''; + print ''.$langs->trans("No_Email").''.$form->selectyesno('no_email',(isset($_POST["no_email"])?$_POST["no_email"]:$object->no_email), 1).''; // Visibility print ''.$langs->trans("ContactVisibility").''; @@ -627,7 +627,7 @@ else // Jabberid print 'Jabberidjabberid).'">'; - print ''.$langs->trans("No_Email").''.$form->selectyesno('no_email',(isset($_POST["no_email"])?$_POST["no_email"]:$object->no_email)).''; + print ''.$langs->trans("No_Email").''.$form->selectyesno('no_email',(isset($_POST["no_email"])?$_POST["no_email"]:$object->no_email), 1).''; // Visibility print ''.$langs->trans("ContactVisibility").''; @@ -821,7 +821,7 @@ else // Instant message and no email print ''.$langs->trans("IM").''.$object->jabberid.''; - print ''.$langs->trans("No_Email").''.$object->no_email.''; + print ''.$langs->trans("No_Email").''.yn($object->no_email).''; print ''.$langs->trans("ContactVisibility").''; print $object->LibPubPriv($object->priv); diff --git a/htdocs/core/modules/mailings/contacts1.modules.php b/htdocs/core/modules/mailings/contacts1.modules.php index 5aeed0d784a..e24c09aebe5 100755 --- a/htdocs/core/modules/mailings/contacts1.modules.php +++ b/htdocs/core/modules/mailings/contacts1.modules.php @@ -77,6 +77,7 @@ class mailing_contacts1 extends MailingTargets $statssql[0].= " AND c.entity IN (".getEntity('societe', 1).")"; $statssql[0].= " AND s.client IN (1, 3)"; $statssql[0].= " AND c.email != ''"; // Note that null != '' is false + $statssql[0].= " AND c.no_email = 0"; return $statssql; } @@ -99,6 +100,7 @@ class mailing_contacts1 extends MailingTargets $sql .= " WHERE s.rowid = c.fk_soc"; $sql .= " AND c.entity IN (".getEntity('societe', 1).")"; $sql .= " AND c.email != ''"; // Note that null != '' is false + $sql .= " AND c.no_email = 0"; // La requete doit retourner un champ "nb" pour etre comprise // par parent::getNbOfRecipients @@ -205,6 +207,7 @@ class mailing_contacts1 extends MailingTargets $sql.= " WHERE s.rowid = c.fk_soc"; $sql.= " AND c.entity IN (".getEntity('societe', 1).")"; $sql.= " AND c.email != ''"; + $sql.= " AND c.no_email = 0"; foreach($filtersarray as $key) { if ($key == 'prospects') $sql.= " AND s.client=2"; diff --git a/htdocs/core/modules/mailings/contacts2.modules.php b/htdocs/core/modules/mailings/contacts2.modules.php index ed1905d634e..bb309037f64 100755 --- a/htdocs/core/modules/mailings/contacts2.modules.php +++ b/htdocs/core/modules/mailings/contacts2.modules.php @@ -84,6 +84,7 @@ class mailing_contacts2 extends MailingTargets $sql.= " ".MAIN_DB_PREFIX."societe as s"; $sql.= " WHERE s.rowid = sp.fk_soc"; $sql.= " AND sp.email != ''"; // Note that null != '' is false + $sql.= " AND sp.no_email = 0"; //$sql.= " AND sp.poste != ''"; $sql.= " AND sp.entity IN (".getEntity('societe', 1).")"; if ($filtersarray[0]<>'all') $sql.= " AND sp.poste ='".$filtersarray[0]."'"; @@ -165,6 +166,7 @@ class mailing_contacts2 extends MailingTargets $sql.= " WHERE s.rowid = sp.fk_soc"; $sql.= " AND sp.entity IN (".getEntity('societe', 1).")"; $sql.= " AND sp.email != ''"; // Note that null != '' is false + $sql.= " AND sp.no_email = 0"; //$sql.= " AND sp.poste != ''"; // La requete doit retourner un champ "nb" pour etre comprise // par parent::getNbOfRecipients @@ -189,6 +191,7 @@ class mailing_contacts2 extends MailingTargets $sql.= " WHERE s.rowid = sp.fk_soc"; $sql.= " AND sp.entity IN (".getEntity('societe', 1).")"; $sql.= " AND sp.email != ''"; // Note that null != '' is false + $sql.= " AND sp.email = 0"; $sql.= " AND (sp.poste IS NOT NULL AND sp.poste != '')"; $sql.= " GROUP BY sp.poste"; $sql.= " ORDER BY sp.poste"; diff --git a/htdocs/core/modules/mailings/contacts3.modules.php b/htdocs/core/modules/mailings/contacts3.modules.php index 9f0453ada2f..be2372426fc 100755 --- a/htdocs/core/modules/mailings/contacts3.modules.php +++ b/htdocs/core/modules/mailings/contacts3.modules.php @@ -85,6 +85,7 @@ class mailing_contacts3 extends MailingTargets if ($filtersarray[0] <> 'all') $sql.= " ".MAIN_DB_PREFIX."categorie_societe as cs"; $sql.= " WHERE s.rowid = sp.fk_soc"; $sql.= " AND sp.email != ''"; // Note that null != '' is false + $sql.= " AND sp.no_email = 0"; $sql.= " AND sp.entity IN (".getEntity('societe', 1).")"; if ($filtersarray[0] <> 'all') $sql.= " AND cs.fk_categorie = c.rowid"; if ($filtersarray[0] <> 'all') $sql.= " AND cs.fk_societe = sp.fk_soc"; @@ -171,6 +172,7 @@ class mailing_contacts3 extends MailingTargets $sql.= " WHERE s.rowid = c.fk_soc"; $sql.= " AND c.entity IN (".getEntity('societe', 1).")"; $sql.= " AND c.email != ''"; // Note that null != '' is false + $sql.= " AND c.no_email = 0"; /* $sql = "SELECT count(distinct(sp.email)) as nb"; $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as sp,"; @@ -207,6 +209,7 @@ class mailing_contacts3 extends MailingTargets $sql.= " ".MAIN_DB_PREFIX."categorie_societe as cs"; $sql.= " WHERE s.rowid = sp.fk_soc"; $sql.= " AND sp.email != ''"; // Note that null != '' is false + $sql.= " AND sp.no_email = 0"; $sql.= " AND sp.entity IN (".getEntity('societe', 1).")"; $sql.= " AND cs.fk_categorie = c.rowid"; $sql.= " AND cs.fk_societe = sp.fk_soc"; From 43e4f139d577903a4a86bf77796581a104f5fad4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Thu, 23 Aug 2012 08:21:32 +0200 Subject: [PATCH 03/13] Fixed bug #511 A pagination problem was causing duplicated records https://doliforge.org/tracker/?func=detail&aid=511&group_id=144 --- htdocs/compta/bank/account.php | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index fc293e38130..fe85bad9818 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -5,6 +5,7 @@ * Copyright (C) 2004 Christophe Combelles * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2010-2011 Juanjo Menent + * Copyright (C) 2012 Marcos García * * 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 @@ -210,7 +211,7 @@ if ($id > 0 || ! empty($ref)) $mode_search = 1; } - $sql = "SELECT count(*) as nb"; + $sql = "SELECT count(*) as count"; $sql.= " FROM ".MAIN_DB_PREFIX."bank_account as ba"; $sql.= ", ".MAIN_DB_PREFIX."bank as b"; if ($mode_search) @@ -228,22 +229,22 @@ if ($id > 0 || ! empty($ref)) if ($result) { $obj = $db->fetch_object($result); - $nbline = $obj->nb; + $nbline = $obj->count; $total_lines = $nbline; - if ($nbline > $viewline ) $limit = $nbline - $viewline ; - else $limit = $viewline; - $db->free($result); } else { dol_print_error($db); } + + //Total pages + $totalPages = ceil($total_lines/$viewline); if ($page > 0) { - $limitsql = $nbline - ($page * $viewline); + $limitsql = ($totalPages - $page) * $viewline; if ($limitsql < $viewline) $limitsql = $viewline; $nbline = $limitsql; } @@ -284,21 +285,19 @@ if ($id > 0 || ! empty($ref)) $param.='&account='.$object->id; // Define transaction list navigation string - $navig=''; - $navig.='
'; - $nbpage=floor($total_lines/$viewline)+($total_lines % $viewline > 0?1:0); // Nombre de page total - //print 'nbpage='.$nbpage.' viewline='.$viewline.' limitsql='.$limitsql; + $navig = ''; + //print 'nbpage='.$totalPages.' viewline='.$viewline.' limitsql='.$limitsql; if ($limitsql > $viewline) $navig.=''.img_previous().''; $navig.= $langs->trans("Page")." "; // ' Page '; - $navig.=''; + $navig.=''; $navig.=''; $navig.=''; $navig.=''; $navig.=''; $navig.=''; - $navig.=''; + $navig.=''; $navig.=''; - $navig.='/'.$nbpage.' '; + $navig.='/'.$totalPages.' '; if ($total_lines > $limitsql ) { $navig.= ''.img_next().''; @@ -481,7 +480,7 @@ if ($id > 0 || ! empty($ref)) { $objp = $db->fetch_object($result); $total = price2num($total + $objp->amount,'MT'); - if ($i >= ($nbline - $viewline)) + if ($i >= ($viewline * (($totalPages-$page)-1))) { $var=!$var; From 19bf4ab8df60a573cde8caae63b9ac7bb01dd9b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Thu, 23 Aug 2012 08:29:38 +0200 Subject: [PATCH 04/13] Improvements to translations Some available translations weren't being translated Also corrected wrong translation key Improved es_ES translation string --- htdocs/admin/company.php | 4 ++-- htdocs/admin/dict.php | 7 ++++++- htdocs/core/class/html.formadmin.class.php | 2 +- htdocs/langs/ca_ES/dict.lang | 2 +- htdocs/langs/en_US/dict.lang | 2 +- htdocs/langs/es_ES/admin.lang | 2 +- htdocs/langs/es_ES/dict.lang | 2 +- htdocs/langs/fr_FR/dict.lang | 2 +- 8 files changed, 14 insertions(+), 9 deletions(-) diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php index 03309c31c3b..3cf7e1101ba 100644 --- a/htdocs/admin/company.php +++ b/htdocs/admin/company.php @@ -305,7 +305,7 @@ if ($action == 'edit' || $action == 'updateedit') print ''."\n"; $var=!$var; - print ''.$langs->trans("Tel").''; + print ''.$langs->trans("Phone").''; print ''; print ''."\n"; @@ -315,7 +315,7 @@ if ($action == 'edit' || $action == 'updateedit') print ''."\n"; $var=!$var; - print ''.$langs->trans("Mail").''; + print ''.$langs->trans("EMail").''; print ''; print ''."\n"; diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index 80f6d04921a..3ea5c305c7a 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -385,12 +385,17 @@ if (GETPOST('actionadd') || GETPOST('actionmodify')) $ok=0; $fieldnamekey=$listfield[$f]; // We take translate key of field - if ($fieldnamekey == 'libelle') $fieldnamekey='Label'; + if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label')) $fieldnamekey='Label'; if ($fieldnamekey == 'libelle_facture') $fieldnamekey = 'LabelOnDocuments'; if ($fieldnamekey == 'nbjour') $fieldnamekey='NbOfDays'; if ($fieldnamekey == 'decalage') $fieldnamekey='Offset'; if ($fieldnamekey == 'module') $fieldnamekey='Module'; if ($fieldnamekey == 'code') $fieldnamekey = 'Code'; + if ($fieldnamekey == 'note') $fieldnamekey = 'Note'; + if ($fieldnamekey == 'taux') $fieldnamekey = 'Rate'; + if ($fieldnamekey == 'type') $fieldnamekey = 'Type'; + if ($fieldnamekey == 'position') $fieldnamekey = 'Position'; + if ($fieldnamekey == 'unicode') $fieldnamekey = 'Unicode'; $msg.=$langs->trans("ErrorFieldRequired",$langs->transnoentities($fieldnamekey)).'
'; } diff --git a/htdocs/core/class/html.formadmin.class.php b/htdocs/core/class/html.formadmin.class.php index a3b886af78a..e91c47fbb10 100644 --- a/htdocs/core/class/html.formadmin.class.php +++ b/htdocs/core/class/html.formadmin.class.php @@ -339,7 +339,7 @@ class FormAdmin while ($i < $num) { $obj=$this->db->fetch_object($resql); - $paperformat[$obj->code]=$obj->label.' - '.round($obj->width).'x'.round($obj->height).' '.$obj->unit; + $paperformat[$obj->code]= $langs->trans('PaperFormat'.strtoupper($obj->code)).' - '.round($obj->width).'x'.round($obj->height).' '.$obj->unit; $i++; } diff --git a/htdocs/langs/ca_ES/dict.lang b/htdocs/langs/ca_ES/dict.lang index 0b3ad8ca7bb..30c5c6466e6 100644 --- a/htdocs/langs/ca_ES/dict.lang +++ b/htdocs/langs/ca_ES/dict.lang @@ -305,7 +305,7 @@ DemandReasonTypeSRC_SHOP=Contacte botiga DemandReasonTypeSRC_WOM=Boca a boca DemandReasonTypeSRC_PARTNER=Soci DemandReasonTypeSRC_EMPLOYEE=Empleat -DemandReasonTypeSRC_SPONSORSHIP=Patrocinador +DemandReasonTypeSRC_SPONSORING=Patrocinador #### Paper formats ####= PaperFormatEU4A0=Format 4A0 PaperFormatEU2A0=Format 2A0 diff --git a/htdocs/langs/en_US/dict.lang b/htdocs/langs/en_US/dict.lang index e92698c1335..a49e01acd37 100644 --- a/htdocs/langs/en_US/dict.lang +++ b/htdocs/langs/en_US/dict.lang @@ -305,4 +305,4 @@ DemandReasonTypeSRC_SHOP=Shop contact DemandReasonTypeSRC_WOM=Word of mouth DemandReasonTypeSRC_PARTNER=Partner DemandReasonTypeSRC_EMPLOYEE=Employee -DemandReasonTypeSRC_SPONSORSHIP=Sponsorship \ No newline at end of file +DemandReasonTypeSRC_SPONSORING=Sponsorship \ No newline at end of file diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang index 4294368ffec..b645a43b480 100644 --- a/htdocs/langs/es_ES/admin.lang +++ b/htdocs/langs/es_ES/admin.lang @@ -823,7 +823,7 @@ LogEventDesc=Puede habilitar el registro de eventos de seguridad Dolibarr aquí. AreaForAdminOnly=Estas funciones solo son accesibles a un usuario administrador. SystemInfoDesc=La información del sistema es información técnica accesible solamente en solo lectura a los administradores. SystemAreaForAdminOnly=Esta área solo es accesible a los usuarios de tipo administradores. Ningún permiso Dolibarr permite extender el círculo de usuarios autorizados a esta área. -CompanyFundationDesc=Editar en esta página toda la información conocida sobre la empresa o asociación a administrar (para ello haga clic en el botón "Modificar" a pié de página) +CompanyFundationDesc=Editar en esta página toda la información conocida sobre la empresa o asociación a administrar (para ello haga clic en el botón "Modificar" a pie de página) DisplayDesc=Puede encontrar aquí todos los parámetros relacionados con la apariencia de Dolibarr AvailableModules=Módulos disponibles ToActivateModule=Para activar los módulos, vaya al área de Configuración (Inicio->Configuración->Módulos). diff --git a/htdocs/langs/es_ES/dict.lang b/htdocs/langs/es_ES/dict.lang index a6e34bdf173..bf0b59e3ef1 100644 --- a/htdocs/langs/es_ES/dict.lang +++ b/htdocs/langs/es_ES/dict.lang @@ -308,7 +308,7 @@ DemandReasonTypeSRC_SHOP=Contacto tienda DemandReasonTypeSRC_WOM=Boca a boca DemandReasonTypeSRC_PARTNER=Socio DemandReasonTypeSRC_EMPLOYEE=Empleado -DemandReasonTypeSRC_SPONSORSHIP=Patrocinador +DemandReasonTypeSRC_SPONSORING=Patrocinador #### Paper formats #### PaperFormatEU4A0=Formato 4A0 diff --git a/htdocs/langs/fr_FR/dict.lang b/htdocs/langs/fr_FR/dict.lang index 4d9c7b2736d..7758a917891 100644 --- a/htdocs/langs/fr_FR/dict.lang +++ b/htdocs/langs/fr_FR/dict.lang @@ -309,7 +309,7 @@ DemandReasonTypeSRC_SHOP=Contact en magazin DemandReasonTypeSRC_WOM=Bouche à oreille DemandReasonTypeSRC_PARTNER=Partenaire DemandReasonTypeSRC_EMPLOYEE=Employé -DemandReasonTypeSRC_SPONSORSHIP=Parrainage/Sponsoring +DemandReasonTypeSRC_SPONSORING=Parrainage/Sponsoring #### Paper formats #### PaperFormatEU4A0=Format 4A0 From 66eabbe4a912e91313630fbd0e0a9840718b8eac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Thu, 23 Aug 2012 08:33:18 +0200 Subject: [PATCH 05/13] Improved es_ES translations --- htdocs/langs/es_ES/admin.lang | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang index b645a43b480..f996909aac3 100644 --- a/htdocs/langs/es_ES/admin.lang +++ b/htdocs/langs/es_ES/admin.lang @@ -141,9 +141,9 @@ PurgeNothingToDelete=Ningún directorio a eliminar PurgeNDirectoriesDeleted=%s archivos o directorios eliminados PurgeAuditEvents=Purgar los eventos de seguridad ConfirmPurgeAuditEvents=¿Está seguro de querer purgar la lista de los eventos de auditoría de seguridad (Se borrará toda la lista, pero esto no afecta a sus datos)? -NewBackup=Nueva copia -GenerateBackup=Generar copia -Backup=Copia +NewBackup=Nueva copia de seguridad +GenerateBackup=Generar copia de seguridad +Backup=Copia de seguridad Restore=Restauración RunCommandSummary=La copia será realizada por el comando siguiente RunCommandSummaryToLaunch=La copia puede ser realizada por el comando siguiente From 39de1cb0100b8257263c11ded3901540d43a0f84 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Thu, 23 Aug 2012 08:43:29 +0200 Subject: [PATCH 06/13] Task 515 : Correction on SQL request --- htdocs/core/modules/mailings/contacts2.modules.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/modules/mailings/contacts2.modules.php b/htdocs/core/modules/mailings/contacts2.modules.php index bb309037f64..5332210fe73 100755 --- a/htdocs/core/modules/mailings/contacts2.modules.php +++ b/htdocs/core/modules/mailings/contacts2.modules.php @@ -191,7 +191,7 @@ class mailing_contacts2 extends MailingTargets $sql.= " WHERE s.rowid = sp.fk_soc"; $sql.= " AND sp.entity IN (".getEntity('societe', 1).")"; $sql.= " AND sp.email != ''"; // Note that null != '' is false - $sql.= " AND sp.email = 0"; + $sql.= " AND sp.no_email = 0"; $sql.= " AND (sp.poste IS NOT NULL AND sp.poste != '')"; $sql.= " GROUP BY sp.poste"; $sql.= " ORDER BY sp.poste"; From 332ee652c38899decb7d76a89ed2250c1d36f520 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Thu, 23 Aug 2012 08:45:45 +0200 Subject: [PATCH 07/13] Clear action was called with a rowid instead of id (rowid is for a target of the emailing, id is for the emailing) --- htdocs/comm/mailing/cibles.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index f092d263999..8f4c722f4b6 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -347,7 +347,7 @@ if ($object->fetch($id) >= 0) print ''; print '
'; - print ''; + print ''; print ''; print_titre($langs->trans("ToClearAllRecipientsClickHere")); print ''; From 44cc4ae9499cebe118331481fe193bac3d373433 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Thu, 23 Aug 2012 08:46:22 +0200 Subject: [PATCH 08/13] Some strings weren't being translated Thanks to @grandoc and I.D & L (idl-mp.com) for the french translations --- htdocs/admin/tools/dolibarr_export.php | 10 +++++----- htdocs/admin/tools/dolibarr_import.php | 2 +- htdocs/langs/en_US/admin.lang | 4 ++++ htdocs/langs/es_ES/admin.lang | 4 ++++ htdocs/langs/fr_FR/admin.lang | 4 ++++ 5 files changed, 18 insertions(+), 6 deletions(-) diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php index 18dc96e652c..7934b44a59d 100644 --- a/htdocs/admin/tools/dolibarr_export.php +++ b/htdocs/admin/tools/dolibarr_export.php @@ -141,7 +141,7 @@ print $langs->trans("BackupDescY").'

';
- +
trans("BackupDescY").'

';
trans('ExportStructure') ?>
@@ -268,12 +268,12 @@ print $langs->trans("BackupDescY").'

';
+ for="checkbox_disable_fk"> trans("CommandsToDisableForeignKeysForImport"); ?> trans('CommandsToDisableForeignKeysForImportWarning')); ?>

-
Structure trans('ExportStructure') ?>
@@ -336,7 +336,7 @@ print $langs->trans("BackupDescY").'

';
+ for="checkbox_sql_structure"> trans('ExportStructure') ?>
- Import MySql + trans('RestoreMySQL') ?>
%s) that contains all BackupDesc3=* Save content of your database into a dump file. for this, you can use following assistant. BackupDescX=Archived directory should be stored in a secure place. BackupDescY=The generated dump file should be stored in a secure place. +BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one RestoreDesc=To restore a Dolibarr backup, you must: RestoreDesc2=* Restore archive file (zip file for example) of documents directory to extract tree of files in documents directory of a new Dolibarr installation or into this current documents directoy (%s). RestoreDesc3=* Restore the data, from a backup dump file, into the database of the new Dolibarr installation or into the database of this current installation. Warning, once restore is finished, you must use a login/password, that existed when backup was made, to connect again. To restore a backup database into this current installation, you can follow this assistant. +RestoreMySQL=MySQL import ForcedToByAModule= This rule is forced to %s by an activated module PreviousDumpFiles=Available database backup dump files WeekStartOnDay=First day of week diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang index f996909aac3..d9f1b0661d7 100644 --- a/htdocs/langs/es_ES/admin.lang +++ b/htdocs/langs/es_ES/admin.lang @@ -162,6 +162,7 @@ ImportPostgreSqlCommand=%s %s miarchivobackup.sql FileNameToGenerate=Nombre del archivo a generar Compression=Compresión CommandsToDisableForeignKeysForImport=Comando para desactivar las claves excluyentes a la importación +CommandsToDisableForeignKeysForImportWarning=Obligatorio si quiere poder restaurar más tarde el dump SQL ExportCompatibility=Compatibilidad del archivo de exportación generado MySqlExportParameters=Parámetros de la exportación MySql PostgreSqlExportParameters=Parámetros de la exportación PostgreSQL @@ -171,6 +172,7 @@ FullPathToPostgreSQLdumpCommand=ruta completa hacia el comando pg_dump ExportOptions=Opciones de exportación AddDropDatabase=Añadir órdenes DROP DATABASE AddDropTable=Añadir órdenes DROP TABLE +ExportStructure=Estructura Datas=Datos NameColumn=Nombre las columnas ExtendedInsert=Instrucciones INSERT extendidas @@ -858,9 +860,11 @@ BackupDesc2=* Guardar el contenido del directorio de documentos (%s) que BackupDesc3=* Guardar el contenido de su base de datos en un archivo de volcado. Para ello puede utilizar el asistente a continuación. BackupDescX=El directorio archivado deberá guardarse en un lugar seguro. BackupDescY=El archivo de volcado generado deberá guardarse en un lugar seguro. +BackupPHPWarning=La copia de seguridad no puede ser garantizada con este método. Es preferible utilizar el anterior RestoreDesc=Para restaurar una copia de seguridad de Dolibarr, usted debe: RestoreDesc2=* Tomar el archivo (archivo zip, por ejemplo) del directorio de los documentos y descomprimirlo en el directorio de los documentos de una nueva instalación de Dolibarr directorio o en la carpeta de los documentos de esta instalación (%s). RestoreDesc3=* Recargar el archivo de volcado guardado en la base de datos de una nueva instalación de Dolibarr o de esta instalación. Atención, una vez realizada la restauración, deberá utilizar un login/contraseña de administrador existente en el momento de la copia de seguridad para conectarse. Para restaurar la base de datos en la instalación actual, puede utilizar el asistente a continuación. +RestoreMySQL=Importación MySQL ForcedToByAModule=Esta regla está forzada a %s por uno de los módulos activados PreviousDumpFiles=Archivos de copia de seguridad de la base de datos disponibles WeekStartOnDay=Primer día de la semana diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 908ef4ac331..44087f31352 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -157,6 +157,7 @@ ImportMySqlCommand= %s %s < monfichierbackup.sql ImportPostgreSqlCommand=%s %s monfichierbackup.sql FileNameToGenerate= Nom du fichier à générer CommandsToDisableForeignKeysForImport= Commande pour désactiver les clés étrangères à l'import +CommandsToDisableForeignKeysForImportWarning=Requis si vous voulez être en mesure de restaurer votre dump SQL plus tard ExportCompatibility= Compatibilité du fichier export généré MySqlExportParameters= Paramètres de l'export MySql PostgreSqlExportParameters= Paramètres de l'export PostgreSQL @@ -166,6 +167,7 @@ FullPathToPostgreSQLdumpCommand= Chemin complet vers la commande pg_dump ExportOptions= Options d'exportation AddDropDatabase= Ajouter ordres DROP DATABASE AddDropTable= Ajouter ordres DROP TABLE +Structure=Structure Datas= Données NameColumn= Nomme les colonnes ExtendedInsert= Instructions INSERT étendues @@ -853,9 +855,11 @@ BackupDesc2= * Sauvegarder le contenu du répertoire document (%s) qui co BackupDesc3= * Sauvegarder le contenu de votre base de données dans un fichier dump. Pour cela vous pouvez utiliser l'assistant ci-dessous. BackupDescX= Le répertoire archivé devra être placé en lieu sûr. BackupDescY= Le fichier dump généré devra être placé en lieu sûr. +BackupPHPWarning=La sauvegarde n'est pas garantie avec cette méthode. Préférez la méthode précédente. RestoreDesc= Pour restaurer une sauvegarde de Dolibarr, vous devez: RestoreDesc2= * Reprendre le fichier archive (fichier zip par exemple) du répertoire documents et en extraire l'arborescence dans le répertoire documents d'une nouvelle installation de dolibarr ou dans le répertoire documents de cette installation (%s). RestoreDesc3= * Recharger depuis le fichier dump sauvegardé, la base de données d'une nouvelle installation de Dolibarr ou de cette installation. Attention, une fois la restauration faite, il faudra utiliser un login/mot de passe administrateur existant à l'époque de la sauvegarde pour se connecter. Pour restaurer la base dans l'installation actuelle, vous pouvez utiliser l'assistant suivant. +RestoreMySQL=Importation MySQL ForcedToByAModule= Cette règle est forcée à %s par un des modules activés PreviousDumpFiles=Fichiers disponibles de sauvegarde de la base de données WeekStartOnDay=Premier jour de la semaine From fcb4f5ce673ac8fa50ad564e3701d95e39b60dd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Thu, 23 Aug 2012 09:00:31 +0200 Subject: [PATCH 09/13] Renamed MySQL alias that could cause conflicts --- htdocs/compta/bank/account.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index fe85bad9818..2a4790acbd5 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -211,7 +211,7 @@ if ($id > 0 || ! empty($ref)) $mode_search = 1; } - $sql = "SELECT count(*) as count"; + $sql = "SELECT count(*) as total"; $sql.= " FROM ".MAIN_DB_PREFIX."bank_account as ba"; $sql.= ", ".MAIN_DB_PREFIX."bank as b"; if ($mode_search) @@ -229,7 +229,7 @@ if ($id > 0 || ! empty($ref)) if ($result) { $obj = $db->fetch_object($result); - $nbline = $obj->count; + $nbline = $obj->total; $total_lines = $nbline; $db->free($result); From 0ecfe0465e4866d0e685d8d3cfa916a46225871f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Thu, 23 Aug 2012 09:19:08 +0200 Subject: [PATCH 10/13] Fixed bug #499 The input method of supplier orders wasn't being translated --- ChangeLog | 1 + htdocs/fourn/commande/fiche.php | 20 +++++++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 24c8b2e643c..b0c9002e180 100644 --- a/ChangeLog +++ b/ChangeLog @@ -42,6 +42,7 @@ For users: - Fix: Errors weren't being shown in customer's & supplier's orders - New: Add conditional substitution IF/ELSEIF/ENDIF for ODT templates - New: Basic implementation of hooks and triggers for a lot (most) of core modules: action/calendar, trips and expenses, dons, vat payment, contact/society, contract, product lines, expedition, order supplier and order invoice (lines included), intervention card, project, tasks +- Fix: [ bug #499 ]: Supplier order input method not translated For developers: - New: Add webservice for thirdparty creation and list. diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php index dad9cbd6593..18de50e8c2c 100644 --- a/htdocs/fourn/commande/fiche.php +++ b/htdocs/fourn/commande/fiche.php @@ -1118,7 +1118,25 @@ if ($id > 0 || ! empty($ref)) if ($object->methode_commande) { - print '
'; + $sql = "SELECT rowid, code, libelle"; + $sql.= " FROM ".MAIN_DB_PREFIX.'c_input_method'; + $sql.= " WHERE active=1 AND rowid = ".$db->escape($object->methode_commande_id); + + $resql = $db->query($sql); + + if ($resql && $db->num_rows($resql)) + { + $obj = $db->fetch_object($resql); + + // Si traduction existe, on l'utilise, sinon on prend le libelle par defaut + $methode_commande = ($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->libelle!='-'?$obj->libelle:'')); + } + else + { + dol_print_error($db); + } + + print ''; } } From b015c7799a59557f8e34b642d6d56fc150c47c25 Mon Sep 17 00:00:00 2001 From: Grand Philippe Date: Thu, 23 Aug 2012 09:27:01 +0200 Subject: [PATCH 11/13] fix some language issues --- dev/examples/README | 2 +- dev/examples/create_invoice.php | 6 +++--- dev/examples/create_order.php | 6 +++--- dev/examples/create_product.php | 6 +++--- dev/examples/create_user.php | 4 ++-- dev/examples/get_contracts.php | 6 +++--- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dev/examples/README b/dev/examples/README index d817b6653d5..b7c31558de5 100755 --- a/dev/examples/README +++ b/dev/examples/README @@ -4,5 +4,5 @@ README (English) This directory contains samples of code to use Dolibarr business classes to build external interfaces that need to read/update data from/into Dolibarr. -You can also have a look at the Dolibarr doxygen doc that describe all files and classes: +You can also have a look at the Dolibarr doxygen doc that describes all files and classes: http://www.dolibarr.org/html_doxygen/index.html diff --git a/dev/examples/create_invoice.php b/dev/examples/create_invoice.php index 0f99a5775ff..60f7b8f42b1 100755 --- a/dev/examples/create_invoice.php +++ b/dev/examples/create_invoice.php @@ -17,9 +17,9 @@ */ /** - * \file dev/examples/manage_order.php + * \file dev/examples/create_invoice.php * \brief This file is an example for a command line script - * \author Put author name here + * \author Put author's name here * \remarks Put here some comments */ @@ -29,7 +29,7 @@ $path=dirname(__FILE__).'/'; // Test if batch mode if (substr($sapi_type, 0, 3) == 'cgi') { - echo "Error: You ar usingr PH for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n"; + echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n"; exit; } diff --git a/dev/examples/create_order.php b/dev/examples/create_order.php index 2c5861b6a6e..6e097a3bd89 100755 --- a/dev/examples/create_order.php +++ b/dev/examples/create_order.php @@ -17,9 +17,9 @@ */ /** - * \file dev/examples/manage_order.php + * \file dev/examples/create_order.php * \brief This file is an example for a command line script - * \author Put author name here + * \author Put author's name here * \remarks Put here some comments */ @@ -29,7 +29,7 @@ $path=dirname(__FILE__).'/'; // Test if batch mode if (substr($sapi_type, 0, 3) == 'cgi') { - echo "Error: You ar usingr PH for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n"; + echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n"; exit; } diff --git a/dev/examples/create_product.php b/dev/examples/create_product.php index 5e0d2b0ecac..0bfb3746479 100755 --- a/dev/examples/create_product.php +++ b/dev/examples/create_product.php @@ -19,7 +19,7 @@ /** * \file dev/examples/create_product.php * \brief This file is an example for a command line script - * \author Put author name here + * \author Put author's name here * \remarks Put here some comments */ @@ -29,7 +29,7 @@ $path=dirname(__FILE__).'/'; // Test if batch mode if (substr($sapi_type, 0, 3) == 'cgi') { - echo "Error: You ar usingr PH for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n"; + echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n"; exit; } @@ -64,7 +64,7 @@ require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); // Create instance of object $myproduct=new Product($db); -// Définition des propriétés de l'instance product +// Definition of product instance properties $myproduct->ref = '1234'; $myproduct->libelle = 'libelle'; $myproduct->price = '10'; diff --git a/dev/examples/create_user.php b/dev/examples/create_user.php index 2d77dade81a..4ca6056368f 100755 --- a/dev/examples/create_user.php +++ b/dev/examples/create_user.php @@ -19,7 +19,7 @@ /** * \file dev/examples/create_user.php * \brief This file is an example for a command line script - * \author Put author name here + * \author Put author's name here * \remarks Put here some comments */ @@ -29,7 +29,7 @@ $path=dirname(__FILE__).'/'; // Test if batch mode if (substr($sapi_type, 0, 3) == 'cgi') { - echo "Error: You ar usingr PH for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n"; + echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n"; exit; } diff --git a/dev/examples/get_contracts.php b/dev/examples/get_contracts.php index aad4e2c5415..f1efa42bc04 100755 --- a/dev/examples/get_contracts.php +++ b/dev/examples/get_contracts.php @@ -17,9 +17,9 @@ */ /** - * \file dev/examples/manage_order.php + * \file dev/examples/get_contracts.php * \brief This file is an example for a command line script - * \author Put author name here + * \author Put author's name here * \remarks Put here some comments */ @@ -29,7 +29,7 @@ $path=dirname(__FILE__).'/'; // Test if batch mode if (substr($sapi_type, 0, 3) == 'cgi') { - echo "Error: You ar usingr PH for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n"; + echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n"; exit; } From cb29cfed7b0d19f733de870c345cffaa57269ac9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Thu, 23 Aug 2012 09:43:13 +0200 Subject: [PATCH 12/13] Translations + Little refactor --- htdocs/compta/bank/ligne.php | 22 +++++++++++----------- htdocs/langs/es_ES/main.lang | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php index 7d18abb7de4..c60dec26960 100644 --- a/htdocs/compta/bank/ligne.php +++ b/htdocs/compta/bank/ligne.php @@ -221,19 +221,19 @@ if ($result) } $var=false; -$h=0; +$head = array( + array( + DOL_URL_ROOT.'/compta/bank/ligne.php?rowid='.$rowid, + $langs->trans('Card') + ), + array( + DOL_URL_ROOT.'/compta/bank/info.php?rowid='.$rowid, + $langs->trans('Info') + ) +); -$head[$h][0] = $_SERVER['PHP_SELF'].'?rowid='.$rowid; -$head[$h][1] = $langs->trans('Card'); -$hselected=$h; -$h++; - -$head[$h][0] = DOL_URL_ROOT.'/compta/bank/info.php?rowid='.$rowid; -$head[$h][1] = $langs->trans("Info"); -$h++; - -dol_fiche_head($head, $hselected, $langs->trans('LineRecord'),0,'account'); +dol_fiche_head($head, 0, $langs->trans('LineRecord'), 0, 'account'); dol_htmloutput_mesg($mesg); diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang index 6defc575dbb..185e6421ec4 100644 --- a/htdocs/langs/es_ES/main.lang +++ b/htdocs/langs/es_ES/main.lang @@ -388,8 +388,8 @@ Paid=Pagado Topic=Asunto ByCompanies=Por empresa ByUsers=Por usuario -Links=Links -Link=Link +Links=Enlaces +Link=Enlace Receipts=Recibos Rejects=Devoluciones Preview=Vista previa From 752c867882d259540bf39393848322ad39d67d57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Thu, 23 Aug 2012 09:45:52 +0200 Subject: [PATCH 13/13] I like more this variable name :D --- htdocs/compta/bank/ligne.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php index c60dec26960..584afaa321f 100644 --- a/htdocs/compta/bank/ligne.php +++ b/htdocs/compta/bank/ligne.php @@ -222,7 +222,7 @@ if ($result) $var=false; -$head = array( +$tabs = array( array( DOL_URL_ROOT.'/compta/bank/ligne.php?rowid='.$rowid, $langs->trans('Card') @@ -233,7 +233,7 @@ $head = array( ) ); -dol_fiche_head($head, 0, $langs->trans('LineRecord'), 0, 'account'); +dol_fiche_head($tabs, 0, $langs->trans('LineRecord'), 0, 'account'); dol_htmloutput_mesg($mesg);
'.$langs->trans("Method").''.$object->methode_commande.'
'.$langs->trans("Method").''.$methode_commande.'