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

update with html5 compliant code

Browse Source
This commit is contained in:
Philippe GRAND 2019-02-10 10:10:41 +01:00
parent 7d20321b3b
commit c071e488cf
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/compta/facture/fiche-rec.php
View File

@ -1171,7 +1171,7 @@ if ($action == 'create')
if ($flag_price_may_change) if ($flag_price_may_change)
{ {
print '<tr><td colspan="3" align="left">'; print '<tr><td colspan="3" class="left">';
print '<select name="usenewprice" class="flat">'; print '<select name="usenewprice" class="flat">';
print '<option value="0">'.$langs->trans("AlwaysUseFixedPrice").'</option>'; print '<option value="0">'.$langs->trans("AlwaysUseFixedPrice").'</option>';
print '<option value="1" disabled>'.$langs->trans("AlwaysUseNewPrice").'</option>'; print '<option value="1" disabled>'.$langs->trans("AlwaysUseNewPrice").'</option>';
@ -1306,7 +1306,7 @@ else
print $langs->trans('PaymentConditionsShort'); print $langs->trans('PaymentConditionsShort');
print '</td>'; print '</td>';
if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editconditions' && ! empty($object->brouillon) && $user->rights->facture->creer) if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editconditions' && ! empty($object->brouillon) && $user->rights->facture->creer)
print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editconditions&amp;facid=' . $object->id . '">' . img_edit($langs->trans('SetConditions'), 1) . '</a></td>'; print '<td class="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editconditions&amp;facid=' . $object->id . '">' . img_edit($langs->trans('SetConditions'), 1) . '</a></td>';
print '</tr></table>'; print '</tr></table>';
print '</td><td>'; print '</td><td>';
if ($object->type != Facture::TYPE_CREDIT_NOTE) if ($object->type != Facture::TYPE_CREDIT_NOTE)
@ -1330,7 +1330,7 @@ else
print $langs->trans('PaymentMode'); print $langs->trans('PaymentMode');
print '</td>'; print '</td>';
if ($action != 'editmode' && ! empty($object->brouillon) && $user->rights->facture->creer) if ($action != 'editmode' && ! empty($object->brouillon) && $user->rights->facture->creer)
print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editmode&amp;facid=' . $object->id . '">' . img_edit($langs->trans('SetMode'), 1) . '</a></td>'; print '<td class="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editmode&amp;facid=' . $object->id . '">' . img_edit($langs->trans('SetMode'), 1) . '</a></td>';
print '</tr></table>'; print '</tr></table>';
print '</td><td>'; print '</td><td>';
if ($action == 'editmode') if ($action == 'editmode')
@ -1393,7 +1393,7 @@ else
print $langs->trans('RIB'); print $langs->trans('RIB');
print '<td>'; print '<td>';
if (($action != 'editbankaccount') && $user->rights->facture->creer && ! empty($object->brouillon)) if (($action != 'editbankaccount') && $user->rights->facture->creer && ! empty($object->brouillon))
print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>'; print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
print '</tr></table>'; print '</tr></table>';
print '</td><td>'; print '</td><td>';
if ($action == 'editbankaccount') if ($action == 'editbankaccount')
@ -1415,7 +1415,7 @@ else
print $langs->trans('Model'); print $langs->trans('Model');
print '<td>'; print '<td>';
if (($action != 'editmodelpdf') && $user->rights->facture->creer && ! empty($object->brouillon)) if (($action != 'editmodelpdf') && $user->rights->facture->creer && ! empty($object->brouillon))
print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editmodelpdf&amp;id='.$object->id.'">'.img_edit($langs->trans('SetModel'), 1).'</a></td>'; print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editmodelpdf&amp;id='.$object->id.'">'.img_edit($langs->trans('SetModel'), 1).'</a></td>';
print '</tr></table>'; print '</tr></table>';
print '</td><td>'; print '</td><td>';
if ($action == 'editmodelpdf') if ($action == 'editmodelpdf')
@ -1464,7 +1464,7 @@ else
print $langs->trans('Frequency'); print $langs->trans('Frequency');
print '</td>'; print '</td>';
if ($action != 'editfrequency' && ! empty($object->brouillon) && $user->rights->facture->creer) if ($action != 'editfrequency' && ! empty($object->brouillon) && $user->rights->facture->creer)
print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editfrequency&amp;facid=' . $object->id . '">' . img_edit($langs->trans('Edit'), 1) . '</a></td>'; print '<td class="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editfrequency&amp;facid=' . $object->id . '">' . img_edit($langs->trans('Edit'), 1) . '</a></td>';
print '</tr></table>'; print '</tr></table>';
print '</td><td>'; print '</td><td>';
if ($action == 'editfrequency') if ($action == 'editfrequency')

32
htdocs/core/modules/fichinter/modules_fichinter.php
View File

@ -2,7 +2,7 @@
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@inodbox.com> * Copyright (C) 2005-2012 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2011-2012 Philippe Grand <philippe.grand@atoo-net.com> * Copyright (C) 2011-2019 Philippe Grand <philippe.grand@atoo-net.com>
* *
* 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
@ -22,8 +22,8 @@
/** /**
* \file htdocs/core/modules/fichinter/modules_fichinter.php * \file htdocs/core/modules/fichinter/modules_fichinter.php
* \ingroup ficheinter * \ingroup ficheinter
* \brief Fichier contenant la classe mere de generation des fiches interventions en PDF * \brief File that contains parent class for PDF interventions models
* et la classe mere de numerotation des fiches interventions * and parent class for interventions numbering models
*/ */
require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
@ -54,18 +54,18 @@ abstract class ModelePDFFicheinter extends CommonDocGenerator
global $conf; global $conf;
$type='ficheinter'; $type='ficheinter';
$liste=array(); $list=array();
include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
$liste=getListOfModels($db, $type, $maxfilenamelength); $list=getListOfModels($db, $type, $maxfilenamelength);
return $liste; return $list;
} }
} }
/** /**
* Classe mere des modeles de numerotation des references de fiches d'intervention * Parent class numbering models of intervention sheet references
*/ */
abstract class ModeleNumRefFicheinter abstract class ModeleNumRefFicheinter
{ {
@ -85,9 +85,9 @@ abstract class ModeleNumRefFicheinter
} }
/** /**
* Renvoi la description par defaut du modele de numerotation * Returns the default description of the numbering template
* *
* @return string Texte descripif * @return string Descriptive text
*/ */
function info() function info()
{ {
@ -97,7 +97,7 @@ abstract class ModeleNumRefFicheinter
} }
/** /**
* Renvoi un exemple de numerotation * Return a numbering example
* *
* @return string Example * @return string Example
*/ */
@ -109,8 +109,8 @@ abstract class ModeleNumRefFicheinter
} }
/** /**
* Test si les numeros deja en vigueur dans la base ne provoquent pas de * Tests if the numbers already in force in the database do not cause conflicts
* de conflits qui empechera cette numerotation de fonctionner. * that would prevent this numbering from working.
* *
* @return boolean false si conflit, true si ok * @return boolean false si conflit, true si ok
*/ */
@ -120,9 +120,9 @@ abstract class ModeleNumRefFicheinter
} }
/** /**
* Renvoi prochaine valeur attribuee * Return the next assigned value
* *
* @return string Valeur * @return string Value
*/ */
function getNextValue() function getNextValue()
{ {
@ -131,9 +131,9 @@ abstract class ModeleNumRefFicheinter
} }
/** /**
* Renvoi version du module numerotation * Return the version of the numbering module
* *
* @return string Valeur * @return string Value
*/ */
function getVersion() function getVersion()
{ {