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

Fix: solves #2644

Browse Source
This commit is contained in:
Juanjo Menent 2015-04-18 19:14:30 +02:00
parent e4656ecfd4
commit c5d8fa4602
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
htdocs/core/lib/date.lib.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2011 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2005-2011 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2011-2015 Juanjo Menent <jmenent@2byte.es>
* *
* 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
@ -836,18 +836,18 @@ function monthArray($outputlangs,$short=0)
if (! empty($short)) if (! empty($short))
{ {
$montharray = array ( $montharray = array (
1 => $outputlangs->trans("Jan"), 1 => $outputlangs->trans("JanuaryMin"),
2 => $outputlangs->trans("Feb"), 2 => $outputlangs->trans("FebruaryMin"),
3 => $outputlangs->trans("Mar"), 3 => $outputlangs->trans("MarchMin"),
4 => $outputlangs->trans("Apr"), 4 => $outputlangs->trans("AprilMin"),
5 => $outputlangs->trans("May"), 5 => $outputlangs->trans("MayMin"),
6 => $outputlangs->trans("Jun"), 6 => $outputlangs->trans("JuneMin"),
7 => $outputlangs->trans("Jul"), 7 => $outputlangs->trans("JulyMin"),
8 => $outputlangs->trans("Aug"), 8 => $outputlangs->trans("AugustMin"),
9 => $outputlangs->trans("Sep"), 9 => $outputlangs->trans("SeptemberMin"),
10 => $outputlangs->trans("Oct"), 10 => $outputlangs->trans("OctoberMin"),
11 => $outputlangs->trans("Nov"), 11 => $outputlangs->trans("NovemberMin"),
12 => $outputlangs->trans("Dec") 12 => $outputlangs->trans("DecemberMin")
); );
} }

5
htdocs/societe/consumption.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* Copyright (C) 2012-2013 Philippe Berthet <berthet@systune.be> /* Copyright (C) 2012-2013 Philippe Berthet <berthet@systune.be>
* Copyright (C) 2004-2014 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2014 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2013 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2013-2015 Juanjo Menent <jmenent@2byte.es>
* *
* Version V1.1 Initial version of Philippe Berthet * Version V1.1 Initial version of Philippe Berthet
* Version V2 Change to be compatible with 3.4 and enhanced to be more generic * Version V2 Change to be compatible with 3.4 and enhanced to be more generic
@ -75,6 +75,7 @@ $langs->load("bills");
$langs->load("orders"); $langs->load("orders");
$langs->load("suppliers"); $langs->load("suppliers");
$langs->load("propal"); $langs->load("propal");
$langs->load("interventions");
// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
$hookmanager->initHooks(array('consumptionthirdparty')); $hookmanager->initHooks(array('consumptionthirdparty'));
@ -98,7 +99,7 @@ $form = new Form($db);
$formother = new FormOther($db); $formother = new FormOther($db);
$productstatic=new Product($db); $productstatic=new Product($db);
$title = $langs->trans("Referer",$object->name); $title = $langs->trans("Referers",$object->name);
if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title; if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas'; $help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
llxHeader('',$title,$help_url); llxHeader('',$title,$help_url);