task #9916 : Add FREE text for interventions card
This commit is contained in:
parent
382150b774
commit
9fc276d03b
@ -11,7 +11,8 @@ For users:
|
|||||||
with third party type.
|
with third party type.
|
||||||
- New: VAT number is stored in one field. This is more "international".
|
- New: VAT number is stored in one field. This is more "international".
|
||||||
- New: task #9782 : Add possibility to delete a warehouse.
|
- New: task #9782 : Add possibility to delete a warehouse.
|
||||||
- New: Add label for stock movements.
|
- New: task #9640 : Add label for stock movements.
|
||||||
|
- New: task #9916 : Add FREE text for interventions card
|
||||||
- Fix: bug #28055 : Unable to modify the date of a cloned command.
|
- Fix: bug #28055 : Unable to modify the date of a cloned command.
|
||||||
- Fix: bug #27891.
|
- Fix: bug #27891.
|
||||||
- Fix: Change of numbering module was not effective.
|
- Fix: Change of numbering module was not effective.
|
||||||
|
|||||||
@ -23,10 +23,10 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
\file htdocs/admin/commande.php
|
* \file htdocs/admin/commande.php
|
||||||
\ingroup commande
|
* \ingroup commande
|
||||||
\brief Page d'administration-configuration du module Commande
|
* \brief Setup page of module Order
|
||||||
\version $Id$
|
* \version $Id$
|
||||||
*/
|
*/
|
||||||
|
|
||||||
require("./pre.inc.php");
|
require("./pre.inc.php");
|
||||||
|
|||||||
@ -24,7 +24,7 @@
|
|||||||
/**
|
/**
|
||||||
* \file htdocs/admin/fichinter.php
|
* \file htdocs/admin/fichinter.php
|
||||||
* \ingroup fichinter
|
* \ingroup fichinter
|
||||||
* \brief Page d'administration/configuration du module FicheInter
|
* \brief Setup page of module Interventions
|
||||||
* \version $Id$
|
* \version $Id$
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@ -51,6 +51,11 @@ if ($_POST["action"] == 'updateMask')
|
|||||||
if ($maskconst) dolibarr_set_const($db,$maskconst,$maskvalue,'chaine',0,'',$conf->entity);
|
if ($maskconst) dolibarr_set_const($db,$maskconst,$maskvalue,'chaine',0,'',$conf->entity);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($_POST["action"] == 'set_FICHINTER_FREE_TEXT')
|
||||||
|
{
|
||||||
|
dolibarr_set_const($db, "FICHINTER_FREE_TEXT",$_POST["FICHINTER_FREE_TEXT"],'chaine',0,'',$conf->entity);
|
||||||
|
}
|
||||||
|
|
||||||
if ($_POST["action"] == 'set_FICHINTER_DRAFT_WATERMARK')
|
if ($_POST["action"] == 'set_FICHINTER_DRAFT_WATERMARK')
|
||||||
{
|
{
|
||||||
dolibarr_set_const($db, "FICHINTER_DRAFT_WATERMARK",trim($_POST["FICHINTER_DRAFT_WATERMARK"]),'chaine',0,'',$conf->entity);
|
dolibarr_set_const($db, "FICHINTER_DRAFT_WATERMARK",trim($_POST["FICHINTER_DRAFT_WATERMARK"]),'chaine',0,'',$conf->entity);
|
||||||
@ -387,6 +392,18 @@ print "<td> </td>\n";
|
|||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
$var=true;
|
$var=true;
|
||||||
|
|
||||||
|
$var=! $var;
|
||||||
|
print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
|
||||||
|
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
|
||||||
|
print '<input type="hidden" name="action" value="set_FICHINTER_FREE_TEXT">';
|
||||||
|
print '<tr '.$bc[$var].'><td colspan="2">';
|
||||||
|
print $langs->trans("FreeLegalTextOnInterventions").' ('.$langs->trans("AddCRIfTooLong").')<br>';
|
||||||
|
print '<textarea name="FICHINTER_FREE_TEXT" class="flat" cols="120">'.$conf->global->FICHINTER_FREE_TEXT.'</textarea>';
|
||||||
|
print '</td><td align="right">';
|
||||||
|
print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
|
||||||
|
print "</td></tr>\n";
|
||||||
|
print '</form>';
|
||||||
|
|
||||||
//Use draft Watermark
|
//Use draft Watermark
|
||||||
$var=!$var;
|
$var=!$var;
|
||||||
print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
|
print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
|
||||||
|
|||||||
@ -381,7 +381,7 @@ class pdf_soleil extends ModelePDFFicheinter
|
|||||||
*/
|
*/
|
||||||
function _pagefoot(&$pdf,$object,$outputlangs)
|
function _pagefoot(&$pdf,$object,$outputlangs)
|
||||||
{
|
{
|
||||||
return pdf_pagefoot($pdf,$outputlangs,'FICHEINTER_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object);
|
return pdf_pagefoot($pdf,$outputlangs,'FICHINTER_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -828,6 +828,7 @@ ClickToDialUrlDesc = Url appelée lors dun clic sur le picto téléphone. Dans l
|
|||||||
Bookmark4uSetup = Configuration du module Bookmark4u
|
Bookmark4uSetup = Configuration du module Bookmark4u
|
||||||
##### Interventions ##### = undefined
|
##### Interventions ##### = undefined
|
||||||
InterventionsSetup = Configuration du module Interventions
|
InterventionsSetup = Configuration du module Interventions
|
||||||
|
FreeLegalTextOnInterventions = Mention complémentaire sur les fiches d'intervention
|
||||||
##### Members ##### = undefined
|
##### Members ##### = undefined
|
||||||
MembersSetup = Configuration du module Adhérents
|
MembersSetup = Configuration du module Adhérents
|
||||||
MemberMainOptions = Options principales
|
MemberMainOptions = Options principales
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user