Archivage plusieurs documents et interdiction modifier doc archivé
This commit is contained in:
Jean-Christophe Engel
parent
a80bebcc4e
commit
79b3a72cca
7 changed files with 60 additions and 17 deletions
|
|
@ -69,7 +69,10 @@ if ( !$target ) {
|
|||
throw new UserException("Ce document n'existe pas.");
|
||||
}
|
||||
}
|
||||
|
||||
if ($f->archivee)
|
||||
{
|
||||
throw new UserException("Ce document est archivé, vous n'avez pas le droit de le modifier");
|
||||
}
|
||||
// Traitement
|
||||
$data=[];
|
||||
$form->runIf(f('save') && !$form->hasErrors(),
|
||||
|
|
@ -227,7 +230,6 @@ if (! $form->hasErrors())
|
|||
}
|
||||
|
||||
// Affichage
|
||||
|
||||
if ($target)
|
||||
{
|
||||
$doc = null;
|
||||
|
|
@ -274,6 +276,7 @@ else
|
|||
$doc['type'] = $f->type_facture;
|
||||
$doc['numero_facture'] = $f->numero;
|
||||
$doc['reglee'] = $f->reglee;
|
||||
$doc['archivee'] = $f->archivee;
|
||||
$doc['base_receveur'] = $f->receveur_membre?'membre':'client';
|
||||
$doc['client'] = $f->receveur_id;
|
||||
$doc['membre'] = $f->receveur_id;
|
||||
|
|
@ -294,6 +297,7 @@ else
|
|||
|
||||
$radio['type'] = f('type')??$doc['type'];
|
||||
}
|
||||
|
||||
$tpl->assign('types_details', $facture->types);
|
||||
|
||||
$tpl->assign('client_id', f('client') ?: -1);
|
||||
|
|
|
|||
|
|
@ -20,10 +20,12 @@ if (!$f)
|
|||
throw new UserException("Ce document n'existe pas.");
|
||||
}
|
||||
|
||||
$archive = $f->archivee;
|
||||
$tpl->assign('type', $f->type_facture);
|
||||
$tpl->assign('facture', $f);
|
||||
$tpl->assign('id', $id);
|
||||
$tpl->assign('footer', $plugin->getConfig('footer')?:'');
|
||||
$tpl->assign('siret_asso', $plugin->getConfig('siret_asso')?:'');
|
||||
$tpl->assign('archive', $archive);
|
||||
|
||||
$tpl->display(PLUGIN_ROOT . '/templates/facture.tpl');
|
||||
|
|
|
|||
|
|
@ -8,8 +8,18 @@ if ($plugin->needUpgrade()) {
|
|||
require_once __DIR__ . '/_inc.php';
|
||||
|
||||
$session->requireAccess($session::SECTION_ACCOUNTING, $session::ACCESS_READ);
|
||||
$archive = isset($_GET['archive']) && $_GET['archive'] == 1;
|
||||
|
||||
$form->runIf(f('archiver') && !$form->hasErrors(),
|
||||
function () use($facture)
|
||||
{
|
||||
foreach(f('selected') as $f) {
|
||||
$facture->archiver($f);
|
||||
}
|
||||
|
||||
}, 'archiver_factures');
|
||||
|
||||
|
||||
$archive = isset($_GET['archive']) && $_GET['archive'] == 1;
|
||||
$list = $facture->list(! $archive);
|
||||
$list->loadFromQueryString();
|
||||
$list->setPageSize(50);
|
||||
|
|
|
|||
|
|
@ -343,6 +343,9 @@ class Facture
|
|||
'receveur_id' => [
|
||||
],
|
||||
// Créer une colonne virtuelle
|
||||
'select' => [
|
||||
'label' => '',
|
||||
],
|
||||
'type' => [
|
||||
'label' => 'Type',
|
||||
'select' => null,
|
||||
|
|
@ -376,9 +379,6 @@ class Facture
|
|||
'reglee' => [
|
||||
'label' => 'Réglée',
|
||||
],
|
||||
'archivee' => [
|
||||
'label' => 'Archivée',
|
||||
],
|
||||
'moyen_paiement' => [
|
||||
'label' => 'Moyen de paiement',
|
||||
'select' => 'mp.nom',
|
||||
|
|
@ -410,7 +410,6 @@ class Facture
|
|||
// Remplir la colonne virtuelle
|
||||
$row->type = self::TYPES_NAMES[$row->type_facture] ?? null;
|
||||
$row->reglee = $row->reglee ? 'Réglée' : 'Non';
|
||||
$row->archivee = $row->archivee ? 'Archivée' : 'Non';
|
||||
|
||||
// Remplir le contenu
|
||||
$content = json_decode((string)$row->contenu);
|
||||
|
|
@ -559,4 +558,19 @@ class Facture
|
|||
{
|
||||
return DB::getInstance()->delete('plugin_facturation_factures', 'id = '. (int)$id);
|
||||
}
|
||||
|
||||
public function archiver($id)
|
||||
{
|
||||
$f = $this->get($id);
|
||||
$f->archivee = 1;
|
||||
$f->date_emission = $f->date_emission->format('d/m/Y');
|
||||
$f->date_echeance = $f->date_echeance->format('d/m/Y');
|
||||
$id = $f->id;
|
||||
unset($f->id);
|
||||
$datas = (array)$f;
|
||||
$this->_checkFields($datas);
|
||||
$datas["id"] = $id;
|
||||
$db = DB::getInstance();
|
||||
return $db->update('plugin_facturation_factures', $datas, $db->where('id', (int)$id));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
name="Facturation"
|
||||
description="Permet d'éditer des factures et devis à ses membres ainsi qu'à une base de clients supplémentaire."
|
||||
author="zou ; adapté par jce"
|
||||
url="https://git.roflcopter.fr/lesanges/paheko-plugin-facturation"
|
||||
version="0.16"
|
||||
author="zou ; adapté par Jean-Christophe Engel"
|
||||
url="https://gitea.zaclys.com/lesanges/facturation"
|
||||
version="0.17"
|
||||
menu=true
|
||||
restrict_section="accounting"
|
||||
restrict_level="read"
|
||||
|
|
|
|||
|
|
@ -1,10 +1,16 @@
|
|||
{include file="_head.tpl" title="Document — %s"|args:$plugin.name current="plugin_%s"|args:$plugin.name}
|
||||
{include file="%s/templates/_menu.tpl"|args:$plugin_root current="index"}
|
||||
{if $archive}
|
||||
{include file="%s/templates/_menu.tpl"|args:$plugin_root current="archives"}
|
||||
{else}
|
||||
{include file="%s/templates/_menu.tpl"|args:$plugin_root current="index"}
|
||||
{/if}
|
||||
|
||||
{form_errors}
|
||||
|
||||
{if $session->canAccess($session::SECTION_ACCOUNTING, $session::ACCESS_WRITE)}
|
||||
{linkbutton shape="edit" href="%sfacture_modifier.php?id=%d"|args:$plugin_admin_url,$facture.id label="Modifier ce document"}
|
||||
{if ! $archive}
|
||||
{linkbutton shape="edit" href="%sfacture_modifier.php?id=%d"|args:$plugin_admin_url,$facture.id label="Modifier ce document"}
|
||||
{/if}
|
||||
{linkbutton shape="plus" href="%sfacture_ajouter.php?copy=%d"|args:$plugin_admin_url,$facture.id label="Dupliquer ce document"}
|
||||
{/if}
|
||||
|
||||
|
|
|
|||
|
|
@ -7,13 +7,15 @@
|
|||
|
||||
{form_errors}
|
||||
|
||||
<form method="post" action="{$self_url}">
|
||||
{if $list->count()}
|
||||
{include file="common/dynamic_list_head.tpl"}
|
||||
|
||||
{foreach from=$list->iterate() item="facture"}
|
||||
<tr>
|
||||
<td>{$facture.type}</td>
|
||||
<th><a href="facture.php?id={$facture.id}">{$facture.numero}</a></th>
|
||||
<tr>
|
||||
<td>{if ! $archive}{input type="checkbox" name="selected[]" value=$facture.id}{/if}</td>
|
||||
<td>{$facture.type}</td>
|
||||
<th><a href="facture.php?id={$facture.id}&archive={$archive}">{$facture.numero}</a></th>
|
||||
{if $facture.receveur_membre}
|
||||
<td>{link href="!users/details.php?id=%d"|args:$facture.receveur_id label=$facture.receveur}</td>
|
||||
{else}
|
||||
|
|
@ -24,7 +26,6 @@
|
|||
<td>{$facture.date_emission|date:'d/m/Y'}</td>
|
||||
<td>{$facture.date_echeance|date:'d/m/Y'}</td>
|
||||
<td>{$facture.reglee}</td>
|
||||
<td>{$facture.archivee}</td>
|
||||
<td>{$facture.moyen_paiement}</td>
|
||||
<td>{$facture.contenu|escape|nl2br}</td>
|
||||
<td>{$facture.total|escape|money_currency}</td>
|
||||
|
|
@ -44,8 +45,14 @@
|
|||
{linkbutton href="?export=csv" label="Export CSV" shape="download"}
|
||||
{linkbutton href="?export=ods" label="Export tableur" shape="download"}
|
||||
</p>
|
||||
{if !$archive}
|
||||
<p class="submit">
|
||||
{csrf_field key="archiver_factures"}
|
||||
{button type="submit" name="archiver" label="Archiver les factures sélectionnées" shape="right" class="main"}
|
||||
</p>
|
||||
{/if}
|
||||
{else}
|
||||
<p class="help">Aucun document, vous pouvez commencer par {link href="facture_ajouter.php" label="créer un nouveau document"}.</p>
|
||||
{/if}
|
||||
|
||||
</form>
|
||||
{include file="_foot.tpl"}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue