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

Fix: Solve conflict of translation key

Browse Source
This commit is contained in:
Laurent Destailleur 2014-09-18 08:58:47 +02:00
parent dfa071e093
commit bfb923f54b
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/fichinter/class/fichinter.class.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2014 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2011-2013 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2011-2013 Juanjo Menent <jmenent@2byte.es>
* *
@ -28,7 +28,7 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobjectline.class.php';
/** /**
* Classe des gestion des fiches interventions * Class to manage interventions
*/ */
class Fichinter extends CommonObject class Fichinter extends CommonObject
{ {

4
htdocs/fichinter/fiche.php
View File

@ -1682,11 +1682,11 @@ else if ($id > 0 || ! empty($ref))
{ {
if ($object->statut != 2) if ($object->statut != 2)
{ {
print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifybilled">'.$langs->trans("ClassifyBilled").'</a></div>'; print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifybilled">'.$langs->trans("InterventionClassifyBilled").'</a></div>';
} }
else else
{ {
print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifyunbilled">'.$langs->trans("ClassifyUnBilled").'</a></div>'; print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifyunbilled">'.$langs->trans("InterventionClassifyUnBilled").'</a></div>';
} }
} }
} }

4
htdocs/langs/en_US/interventions.lang
View File

@ -24,8 +24,8 @@ NameAndSignatureOfInternalContact=Name and signature of intervening :
NameAndSignatureOfExternalContact=Name and signature of customer : NameAndSignatureOfExternalContact=Name and signature of customer :
DocumentModelStandard=Standard document model for interventions DocumentModelStandard=Standard document model for interventions
InterventionCardsAndInterventionLines=Interventions and lines of interventions InterventionCardsAndInterventionLines=Interventions and lines of interventions
ClassifyBilled=Classify "Billed" InterventionClassifyBilled=Classify "Billed"
ClassifyUnBilled=Classify "Unbilled" InterventionClassifyUnBilled=Classify "Unbilled"
StatusInterInvoiced=Billed StatusInterInvoiced=Billed
RelatedInterventions=Related interventions RelatedInterventions=Related interventions
ShowIntervention=Show intervention ShowIntervention=Show intervention