parent
d659cbdf76
commit
17c887a433
7 changed files with 17 additions and 16 deletions
|
|
@ -1647,7 +1647,7 @@ if ($object->id > 0) {
|
|||
}
|
||||
|
||||
if (isModEnabled('intervention') && $user->hasRight('ficheinter', 'creer') && $object->status == 1) {
|
||||
$langs->load("fichinter");
|
||||
$langs->load("interventions");
|
||||
print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/fichinter/card.php?socid='.$object->id.'&action=create">'.$langs->trans("AddIntervention").'</a></div>';
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -599,7 +599,7 @@ class Contrat extends CommonObject
|
|||
}
|
||||
}
|
||||
|
||||
// Set new ref and define current statut
|
||||
// Set new ref and define current status
|
||||
if (!$error) {
|
||||
$this->ref = $num;
|
||||
$this->status = self::STATUS_VALIDATED;
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
<?php
|
||||
/* Copyright (C) 2006-2007 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
* Copyright (C) 2012 Regis Houssin <regis.houssin@inodbox.com>
|
||||
* Copyright (C) 2016 Gilles Poirier <glgpoirier@gmail.com>
|
||||
* Copyright (C) 2018-2024 Charlene Benke <charlene@patas-monkey.com>
|
||||
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
|
||||
|
||||
* Copyright (C) 2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
* Copyright (C) 2012 Regis Houssin <regis.houssin@inodbox.com>
|
||||
* Copyright (C) 2016 Gilles Poirier <glgpoirier@gmail.com>
|
||||
* Copyright (C) 2018-2024 Charlene Benke <charlene@patas-monkey.com>
|
||||
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
|
||||
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
|
||||
*
|
||||
* 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
|
||||
|
|
@ -37,7 +37,7 @@
|
|||
function fichinter_prepare_head($object)
|
||||
{
|
||||
global $db, $langs, $conf, $user;
|
||||
$langs->load("fichinter");
|
||||
$langs->load("interventions");
|
||||
|
||||
$h = 0;
|
||||
$head = array();
|
||||
|
|
|
|||
|
|
@ -709,7 +709,7 @@ class Fichinter extends CommonObject
|
|||
}
|
||||
}
|
||||
|
||||
// Set new ref and define current statut
|
||||
// Set new ref and define current status
|
||||
if (!$error) {
|
||||
$this->ref = $num;
|
||||
$this->status = self::STATUS_VALIDATED;
|
||||
|
|
@ -860,7 +860,7 @@ class Fichinter extends CommonObject
|
|||
// Init/load array of translation of status
|
||||
if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
|
||||
global $langs;
|
||||
$langs->load("fichinter");
|
||||
$langs->load("interventions");
|
||||
|
||||
$this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
|
||||
$this->labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Validated');
|
||||
|
|
@ -890,7 +890,7 @@ class Fichinter extends CommonObject
|
|||
{
|
||||
global $conf, $langs;
|
||||
|
||||
$langs->load('fichinter');
|
||||
$langs->load('interventions');
|
||||
|
||||
$datas = [];
|
||||
$datas['picto'] = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Intervention").'</u>';
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@inodbox.com>
|
||||
* Copyright (C) 2015 Charlene Benke <charlene@patas-monkey.com>
|
||||
* Copyright (C) 2019 Nicolas ZABOURI <info@inovea-conseil.com>
|
||||
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
|
||||
*
|
||||
* 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
|
||||
|
|
@ -195,7 +196,7 @@ if (isModEnabled('intervention')) {
|
|||
print '<table class="noborder centpercent">';
|
||||
print '<tr class="liste_titre">';
|
||||
print '<th colspan="2">'.$langs->trans("DraftFichinter").'</th></tr>';
|
||||
$langs->load("fichinter");
|
||||
$langs->load("interventions");
|
||||
$num = $db->num_rows($resql);
|
||||
if ($num) {
|
||||
$i = 0;
|
||||
|
|
|
|||
|
|
@ -1948,7 +1948,7 @@ class FactureFournisseur extends CommonInvoice
|
|||
}
|
||||
}
|
||||
|
||||
// Set new ref and define current statut
|
||||
// Set new ref and define current status
|
||||
if (!$error) {
|
||||
$this->ref = $this->newref;
|
||||
$this->statut = self::STATUS_VALIDATED;
|
||||
|
|
|
|||
|
|
@ -497,7 +497,7 @@ if ($source == 'proposal') {
|
|||
} elseif ($source == 'fichinter') {
|
||||
// Signature on fichinter
|
||||
$found = true;
|
||||
$langs->load("fichinter");
|
||||
$langs->load("interventions");
|
||||
|
||||
$result = $object->fetch_thirdparty($object->socid);
|
||||
|
||||
|
|
@ -602,7 +602,7 @@ if ($source == 'proposal') {
|
|||
} elseif ($source == 'expedition') {
|
||||
// Signature on expedition
|
||||
$found = true;
|
||||
$langs->load("fichinter");
|
||||
$langs->load("interventions");
|
||||
|
||||
$result = $object->fetch_thirdparty($object->socid);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue