Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions app/config/routing/admin_accounting/journal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,10 @@ admin_accounting_journal_download_attachments:
path: /download-attachments
defaults:
_controller: AppBundle\Controller\Admin\Accounting\Journal\DownloadAttachmentsAction

admin_accounting_journal_allocate:
path: /allocate/{id}
defaults:
_controller: AppBundle\Controller\Admin\Accounting\Journal\AllocateAction
requirements:
id: \d+
42 changes: 0 additions & 42 deletions htdocs/pages/administration/compta_journal.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
'ajouter',
'modifier',
'importer',
'ventiler',
'modifier_colonne',
'export',
'upload_attachment',
Expand Down Expand Up @@ -573,45 +572,4 @@
}
}
$smarty->assign('formulaire', genererFormulaire($formulaire));
} elseif ($action == 'ventiler') {
$idCompta = (int) $_GET['id'];
$ligneCompta = $compta->obtenir($idCompta);
$montantTotal = 0;

foreach (explode(';', (string) $_GET['montant']) as $montant) {
$montant = (float) $montant;
$compta->ajouter($ligneCompta['idoperation'],
$ligneCompta['idcompte'],
26, // A déterminer
$ligneCompta['date_ecriture'],
$ligneCompta['nom_frs'],
$ligneCompta['tva_intra'],
$montant,
$ligneCompta['description'],
$ligneCompta['numero'],
$ligneCompta['idmode_regl'],
$ligneCompta['date_regl'],
$ligneCompta['obs_regl'],
8, // A déterminer
$ligneCompta['numero_operation'],
);
$montantTotal += $montant;
}

$compta->modifier($ligneCompta['id'],
$ligneCompta['idoperation'],
$ligneCompta['idcompte'],
$ligneCompta['idcategorie'],
$ligneCompta['date_ecriture'],
$ligneCompta['nom_frs'],
$ligneCompta['tva_intra'],
$ligneCompta['montant'] - $montantTotal,
$ligneCompta['description'],
$ligneCompta['numero'],
$ligneCompta['idmode_regl'],
$ligneCompta['date_regl'],
$ligneCompta['obs_regl'],
$ligneCompta['idevenement'],
$ligneCompta['numero_operation']);
afficherMessage('L\'écriture a été ventilée', 'index.php?page=compta_journal#journal-ligne-' . $compta->lastId);
}
2 changes: 1 addition & 1 deletion htdocs/templates/administration/compta_journal.js.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
if (ventilation >= montant) {
alert('Vous ne pouvez pas saisir une valeur égale ou supérieur à la valeur initiale !')
} else {
window.location='index.php?page=compta_journal&action=ventiler&id=' + idLigne + '&montant=' + ventilation;
window.location='/admin/accounting/journal/allocate/' + idLigne + '?amount=' + ventilation;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion sources/AppBundle/Accounting/Model/Transaction.php
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ public function setPaymentTypeId(?int $paymentTypeId): self
return $this;
}

public function getPaymentDate(): DateTime
public function getPaymentDate(): ?DateTime
{
return $this->paymentDate;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
<?php

declare(strict_types=1);

namespace AppBundle\Controller\Admin\Accounting\Journal;

use AppBundle\Accounting\Model\Repository\TransactionRepository;
use AppBundle\Accounting\Model\Transaction;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;

class AllocateAction extends AbstractController
{
public function __construct(
private readonly TransactionRepository $transactionRepository,
) {}

public function __invoke(Request $request, int $id): RedirectResponse
{
$transaction = $this->transactionRepository->get($id);
$amountToallocate = $request->query->get('amount');
$totalAmount = 0;

$lastId = null;
foreach (explode(';', $amountToallocate) as $amount) {
$amount = (float) $amount;

$newTransaction = new Transaction();
$newTransaction->setOperationId($transaction->getOperationId())
->setAccountId($transaction->getAccountId())
->setCategoryId(26) // A déterminer
->setAmount($amount)
->setAccountingDate($transaction->getAccountingDate())
->setVendorName($transaction->getVendorName())
->setTvaIntra($transaction->getTvaIntra())
->setAmount($amount)
->setDescription($transaction->getDescription())
->setNumber($transaction->getNumber())
->setPaymentTypeId($transaction->getPaymentTypeId())
->setPaymentDate($transaction->getPaymentDate())
->setComment($transaction->getComment())
->setEventId(8) // A déterminer
->setOperationNumber($transaction->getOperationNumber());
$this->transactionRepository->save($newTransaction);
$lastId = $newTransaction->getId();
$totalAmount += $amount;
}

$transaction->setAmount($transaction->getAmount() - $totalAmount);
$this->transactionRepository->save($transaction);

$_SESSION['flash'] = "L'écriture a été ventilée";
$_SESSION['erreur'] = false;
$this->addFlash('notice', "L'écriture a été ventilée");
return $this->redirect('/pages/administration/index.php?page=compta_journal#journal-ligne-' . $lastId);
}
}