From d23e6d7ab9537dd3300b1122ff3e9200227d5c86 Mon Sep 17 00:00:00 2001 From: vgreb Date: Sat, 10 Jan 2026 21:54:59 +0100 Subject: [PATCH] =?UTF-8?q?Refonte=20-=20Tr=C3=A9sorerie=20>=20Journal=20>?= =?UTF-8?q?=20Ajout/Edition?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/config/packages/backoffice_menu.yaml | 3 + .../routing/admin_accounting/journal.yml | 12 + .../pages/administration/compta_journal.php | 191 -------------- .../administration/compta_journal.html | 4 +- sources/Afup/Comptabilite/Comptabilite.php | 17 -- .../Accounting/Form/TransactionType.php | 234 ++++++++++++++++++ .../Model/Repository/AccountRepository.php | 9 + .../Model/Repository/EventRepository.php | 9 +- .../Repository/TransactionRepository.php | 13 + .../Accounting/Model/Transaction.php | 12 +- .../Journal/AddTransactionAction.php | 42 ++++ .../Journal/EditTransactionAction.php | 60 +++++ .../admin/accounting/journal/add.html.twig | 8 + .../admin/accounting/journal/edit.html.twig | 8 + .../admin/accounting/journal/form.html.twig | 118 +++++++++ .../features/Admin/Tresorerie/Journal.feature | 66 ++--- .../Admin/Tresorerie/JournalImport.feature | 8 +- 17 files changed, 567 insertions(+), 247 deletions(-) create mode 100644 sources/AppBundle/Accounting/Form/TransactionType.php create mode 100644 sources/AppBundle/Controller/Admin/Accounting/Journal/AddTransactionAction.php create mode 100644 sources/AppBundle/Controller/Admin/Accounting/Journal/EditTransactionAction.php create mode 100644 templates/admin/accounting/journal/add.html.twig create mode 100644 templates/admin/accounting/journal/edit.html.twig create mode 100644 templates/admin/accounting/journal/form.html.twig diff --git a/app/config/packages/backoffice_menu.yaml b/app/config/packages/backoffice_menu.yaml index f2fff241c..5cd733b90 100644 --- a/app/config/packages/backoffice_menu.yaml +++ b/app/config/packages/backoffice_menu.yaml @@ -224,6 +224,9 @@ parameters: compta_journal: nom: 'Journal' niveau: 'ROLE_ADMIN' + extra_routes: + - admin_accounting_journal_add + - admin_accounting_journal_edit compta_conf_evenement: nom: 'Configuration' niveau: 'ROLE_ADMIN' diff --git a/app/config/routing/admin_accounting/journal.yml b/app/config/routing/admin_accounting/journal.yml index d825c4268..7ae104d17 100644 --- a/app/config/routing/admin_accounting/journal.yml +++ b/app/config/routing/admin_accounting/journal.yml @@ -28,3 +28,15 @@ admin_accounting_journal_import: path: /import defaults: _controller: AppBundle\Controller\Admin\Accounting\Journal\ImportAction + +admin_accounting_journal_add: + path: /add + defaults: + _controller: AppBundle\Controller\Admin\Accounting\Journal\AddTransactionAction + +admin_accounting_journal_edit: + path: /edit/{id} + requirements: + id: '\d+' + defaults: + _controller: AppBundle\Controller\Admin\Accounting\Journal\EditTransactionAction diff --git a/htdocs/pages/administration/compta_journal.php b/htdocs/pages/administration/compta_journal.php index 264cdf1e2..0400273c8 100755 --- a/htdocs/pages/administration/compta_journal.php +++ b/htdocs/pages/administration/compta_journal.php @@ -4,7 +4,6 @@ // Impossible to access the file itself use Afup\Site\Comptabilite\Comptabilite; -use Afup\Site\Utils\Logs; if (!defined('PAGE_LOADED_USING_INDEX')) { trigger_error("Direct access forbidden.", E_USER_ERROR); @@ -61,196 +60,6 @@ } elseif ($action == 'credit') { $journal = $compta->obtenirJournal('2',$periode_debut,$periode_fin, !$alsoDisplayClassifed); $smarty->assign('journal', $journal); -} elseif ($action == 'ajouter' || $action == 'modifier') { - $formulaire = instancierFormulaire(); - - if ($action === 'modifier') { - $champsRecup = $compta->obtenir((int) $_GET['id']); - - $champs['idcompte'] = $champsRecup['idcompte']; - $champs['date_saisie'] = $champsRecup['date_ecriture']; - $champs['idoperation'] = $champsRecup['idoperation']; - $champs['idcategorie'] = $champsRecup['idcategorie']; - $champs['nom_frs'] = $champsRecup['nom_frs']; - $champs['tva_intra'] = $champsRecup['tva_intra']; - $champs['montant'] = $champsRecup['montant']; - $champs['description'] = $champsRecup['description']; - $champs['numero'] = $champsRecup['numero']; - $champs['idmode_regl'] = $champsRecup['idmode_regl']; - $champs['date_reglement'] = $champsRecup['date_regl']; - $champs['obs_regl'] = $champsRecup['obs_regl']; - $champs['idevenement'] = $champsRecup['idevenement']; - $champs['comment'] = $champsRecup['comment']; - $champs['montant_ht_soumis_tva_0'] = $champsRecup['montant_ht_soumis_tva_0']; - $champs['montant_ht_soumis_tva_5_5'] = $champsRecup['montant_ht_soumis_tva_5_5']; - $champs['montant_ht_soumis_tva_10'] = $champsRecup['montant_ht_soumis_tva_10']; - $champs['montant_ht_soumis_tva_20'] = $champsRecup['montant_ht_soumis_tva_20']; - $champs['tva_zone'] = $champsRecup['tva_zone']; - - - - //$formulaire->setDefaults($champsRecup); - $formulaire->addElement('hidden', 'id', $_GET['id']); - } else { - $champs['idcompte'] = 1; - $champs['date_saisie'] = date('Y-m-d'); - $champs['date_reglement'] = date('Y-m-d'); - } - $formulaire->setDefaults($champs); - - // facture associé à un évènement - $formulaire->addElement('header' , '' , 'Sélectionner un Journal'); - $formulaire->addElement('select' , 'idoperation', 'Type d\'opération', $compta->obtenirListOperations()); - $formulaire->addElement('select' , 'idcompte' , 'Compte', $compta->obtenirListComptes()); - $formulaire->addElement('select' , 'idevenement', 'Evenement', $compta->obtenirListEvenements()); - - //detail facture - $formulaire->addElement('header' , '' , 'Détail Facture'); - - //$mois=10; - $formulaire->addElement('date' , 'date_saisie' , 'Date saisie', ['language' => 'fr', - 'format' => 'd F Y', - 'minYear' => date('Y') - 5, - 'maxYear' => date('Y') + 1]); - - $formulaire->addElement('select' , 'idcategorie', 'Type de compte', $compta->obtenirListCategories()); - $formulaire->addElement('text', 'nom_frs', 'Nom fournisseurs' , ['size' => 30, 'maxlength' => 40]); - $formulaire->addElement('text' , 'tva_intra' , 'TVA intracommunautaire (facture)', ['size' => 30, 'maxlength' => 100]); - $formulaire->addElement('text', 'numero', 'Numero facture' , ['size' => 30, 'maxlength' => 40]); - $formulaire->addElement('textarea', 'description', 'Description', ['cols' => 42, 'rows' => 5]); - $formulaire->addElement('text', 'montant', 'Montant' , ['size' => 30, 'maxlength' => 40, 'id' => 'compta_journal_montant']); - $formulaire->addElement('text', 'comment', 'Commentaire' , ['size' => 30, 'maxlength' => 255]); - - $formulaire->addElement('header' , '' , 'TVA'); - $formulaire->addElement('text', 'montant_ht_soumis_tva_5_5', 'Montant HT soumis à TVA 5.5%' , ['size' => 30, 'maxlength' => 40, 'id' => 'compta_journal_ht_5_5']); - $formulaire->addElement('static' , 'note', '', 'Calculer le montant HT soumis à TVA 5.5% sur la base de l\'intégralité du montant TTC

'); - $formulaire->addElement('text', 'montant_ht_soumis_tva_10', 'Montant HT soumis à TVA 10%' , ['size' => 30, 'maxlength' => 40, 'id' => 'compta_journal_ht_10']); - $formulaire->addElement('static' , 'note', '', 'Calculer le montant HT soumis à TVA 10% sur la base de l\'intégralité du montant TTC

'); - $formulaire->addElement('text', 'montant_ht_soumis_tva_20', 'Montant HT soumis à TVA 20%' , ['size' => 30, 'maxlength' => 40, 'id' => 'compta_journal_ht_20']); - $formulaire->addElement('static' , 'note', '', 'Calculer le montant HT soumis à TVA 20% sur la base de l\'intégralité du montant TTC

'); - $formulaire->addElement('text', 'montant_ht_soumis_tva_0', 'Montant HT non soumis à TVA' , ['size' => 30, 'maxlength' => 40, 'id' => 'compta_journal_ht_0']); - $formulaire->addElement('static' , 'note', '', 'Calculer le montant non soumis à TVA sur la base de l\'intégralité du montant TTC

'); - - $formulaire->addElement('select' , 'tva_zone', 'Zone TVA', array_merge(['' => 'Non définie'], Comptabilite::TVA_ZONES)); - - //reglement - $formulaire->addElement('header' , '' , 'Réglement'); - $formulaire->addElement('select' , 'idmode_regl', 'Réglement', $compta->obtenirListReglements()); - $formulaire->addElement('date' , 'date_reglement' , 'Date', ['language' => 'fr', - 'format' => 'd F Y', - 'minYear' => date('Y') - 5, - 'maxYear' => date('Y') + 1]); - $formulaire->addElement('text', 'obs_regl', 'Info reglement' , ['size' => 30, 'maxlength' => 40]); - - - // boutons - $formulaire->addElement('header' , 'boutons' , ''); - $formulaire->addElement('submit' , 'soumettre' , ucfirst($action)); - - // 2012-02-18 A. Gendre - $passer = null; - if ($action !== 'ajouter') { - $res = $compta->obtenirSuivantADeterminer($_GET['id']); - if (is_array($res)) { - $passer = $res['id']; - $formulaire->addElement('submit', 'soumettrepasser' , 'Soumettre & passer'); - $formulaire->addElement('submit', 'passer' , 'Passer'); - } - } - - // ajoute des regles - $formulaire->addRule('idoperation' , 'Type d\'opération manquant' , 'required'); - $formulaire->addRule('idcompte' , 'Compte manquant' , 'required'); - $formulaire->addRule('idoperation' , 'Type d\'opération manquant' , 'nonzero'); - $formulaire->addRule('idevenement' , 'Evenement manquant' , 'required'); - $formulaire->addRule('idevenement' , 'Evenement manquant' , 'nonzero'); - $formulaire->addRule('idcategorie' , 'Type de compte manquant' , 'required'); - $formulaire->addRule('idcategorie' , 'Type de compte manquant' , 'nonzero'); - $formulaire->addRule('montant' , 'Montant manquant' , 'required'); - - - // 2012-02-18 A. Gendre - if (isset($_POST['passer']) && isset($passer)) { - afficherMessage('L\'écriture n\'a pas été ' . (($action === 'ajouter') ? 'ajoutée' : 'modifiée'), 'index.php?page=compta_journal&action=modifier&id=' . $passer); - return; - } - - if ($formulaire->validate()) { - $valeur = $formulaire->exportValues(); - - $date_ecriture = $valeur['date_saisie']['Y'] . "-" . $valeur['date_saisie']['F'] . "-" . $valeur['date_saisie']['d'] ; - $date_regl = $valeur['date_reglement']['Y'] . "-" . $valeur['date_reglement']['F'] . "-" . $valeur['date_reglement']['d'] ; - - if ($action === 'ajouter') { - $ok = $compta->ajouter( - $valeur['idoperation'], - $valeur['idcompte'], - $valeur['idcategorie'], - $date_ecriture, - $valeur['nom_frs'], - $valeur['tva_intra'], - $valeur['montant'], - $valeur['description'], - $valeur['numero'], - $valeur['idmode_regl'], - $date_regl, - $valeur['obs_regl'], - $valeur['idevenement'], - $valeur['comment'], - 0, - $valeur['montant_ht_soumis_tva_0'], - $valeur['montant_ht_soumis_tva_5_5'], - $valeur['montant_ht_soumis_tva_10'], - $valeur['montant_ht_soumis_tva_20'], - $valeur['tva_zone'], - - ); - } else { - $ok = $compta->modifier( - $valeur['id'], - $valeur['idoperation'], - $valeur['idcompte'], - $valeur['idcategorie'], - $date_ecriture, - $valeur['nom_frs'], - $valeur['tva_intra'], - $valeur['montant'], - $valeur['description'], - $valeur['numero'], - $valeur['idmode_regl'], - $date_regl, - $valeur['obs_regl'], - $valeur['idevenement'], - $valeur['comment'], - null, - 0, - $valeur['montant_ht_soumis_tva_0'], - $valeur['montant_ht_soumis_tva_5_5'], - $valeur['montant_ht_soumis_tva_10'], - $valeur['montant_ht_soumis_tva_20'], - $valeur['tva_zone'], - ); - } - if ($ok) { - if ($action === 'ajouter') { - Logs::log('Ajout une écriture ' . $formulaire->exportValue('titre')); - } else { - Logs::log('Modification une écriture ' . $formulaire->exportValue('titre') . ' (' . $_GET['id'] . ')'); - } - // 2012-02-18 A. Gendre - if (isset($_POST['soumettrepasser']) && isset($passer)) { - $urlredirect = 'index.php?page=compta_journal&action=modifier&id=' . $passer; - } else { - $urlredirect = 'index.php?page=compta_journal&action=lister#L' . $valeur['id']; - } - afficherMessage('L\'écriture a été ' . (($action === 'ajouter') ? 'ajoutée' : 'modifiée'), $urlredirect); - } else { - $smarty->assign('erreur', 'Une erreur est survenue lors de ' . (($action === 'ajouter') ? "l'ajout" : 'la modification') . ' de l\'écriture'); - } - } - - - $smarty->assign('formulaire', genererFormulaire($formulaire)); } elseif ($action === 'export') { /* * This action allows the admin to export the full period in a CSV file. diff --git a/htdocs/templates/administration/compta_journal.html b/htdocs/templates/administration/compta_journal.html index 199e8aae5..7467cdca0 100644 --- a/htdocs/templates/administration/compta_journal.html +++ b/htdocs/templates/administration/compta_journal.html @@ -3,7 +3,7 @@

Journal

- +
Ajouter @@ -181,7 +181,7 @@

Journal

 - _bdd->obtenirEnregistrement($requete); } - public function obtenirSuivantADeterminer($numero_operation) - { - $requete = 'SELECT'; - $requete .= ' id '; - $requete .= 'FROM'; - $requete .= ' compta '; - $requete .= 'WHERE '; - $requete .= ' ('; - $requete .= ' idcategorie = 26 '; - $requete .= ' OR '; - $requete .= ' idevenement = 8'; - $requete .= ' )'; - $requete .= ' AND id > ' . $this->_bdd->echapper($numero_operation); - $requete .= ' LIMIT 1;'; - return $this->_bdd->obtenirEnregistrement($requete); - } - public function obtenirTous() { $requete = 'SELECT'; diff --git a/sources/AppBundle/Accounting/Form/TransactionType.php b/sources/AppBundle/Accounting/Form/TransactionType.php new file mode 100644 index 000000000..f55721951 --- /dev/null +++ b/sources/AppBundle/Accounting/Form/TransactionType.php @@ -0,0 +1,234 @@ +add('operationId', ChoiceType::class, [ + 'label' => 'Type d\'opération', + 'choices' => $this->buildOperationTypeChoice(), + 'placeholder' => '', + 'constraints' => [ + new Assert\NotBlank(message: "Type d'opération manquant"), + ], + ]) + ->add('accountId', ChoiceType::class, [ + 'label' => 'Compte', + 'choices' => $this->buildAccountChoice(), + 'placeholder' => '', + 'constraints' => [ + new Assert\NotBlank(), + ], + ]) + ->add('eventId', ChoiceType::class, [ + 'label' => 'Évènement', + 'choices' => $this->buildEventChoice(), + 'placeholder' => '', + 'constraints' => [ + new Assert\NotBlank(message: "Évènement manquant"), + ], + ]) + ->add('accountingDate', DateType::class, [ + 'label' => 'Date saisie', + 'widget' => 'single_text', + 'required' => false, + ]) + ->add('categoryId', ChoiceType::class, [ + 'label' => 'categorie', + 'placeholder' => '', + 'choices' => $this->buildCategoryChoice(), + 'constraints' => [ + new Assert\NotBlank(message: "Catégorie manquante"), + ], + ]) + ->add('vendorName', TextType::class, [ + 'label' => 'Nom fournisseurs ', + 'required' => false, + 'empty_data' => '', + ]) + ->add('tvaIntra', TextType::class, [ + 'label' => 'TVA intracommunautaire (facture)', + 'required' => false, + ]) + ->add('number', TextType::class, [ + 'label' => 'Numero facture', + 'required' => false, + 'empty_data' => '', + ]) + ->add('description', TextareaType::class, [ + 'label' => 'Description', + 'required' => false, + 'empty_data' => '', + ]) + ->add('amount', MoneyType::class, [ + 'label' => 'Montant', + 'currency' => '', + 'constraints' => [ + new Assert\NotBlank(message: "Montant manquant"), + new Assert\NotEqualTo(value: 0, message: "Montant manquant"), + ], + ]) + ->add('comment', TextType::class, [ + 'label' => 'Commentaire', + 'required' => false, + ]) + ->add('amountTva5_5', MoneyType::class, [ + 'label' => 'Montant HT soumis à TVA 5.5%', + 'required' => false, + 'currency' => '', + ]) + ->add('amountTva10', MoneyType::class, [ + 'label' => 'Montant HT soumis à TVA 10%', + 'required' => false, + 'currency' => '', + ]) + ->add('amountTva20', MoneyType::class, [ + 'label' => 'Montant HT soumis à TVA 20%', + 'required' => false, + 'currency' => '', + ]) + ->add('amountTva0', MoneyType::class, [ + 'label' => 'Montant HT non soumis à TVA', + 'required' => false, + 'currency' => '', + ]) + ->add('tvaZone', ChoiceType::class, [ + 'label' => 'Zone TVA', + 'required' => false, + 'choices' => array_flip(Comptabilite::TVA_ZONES), + 'placeholder' => 'Non définie', + + ]) + ->add('paymentTypeId', ChoiceType::class, [ + 'label' => 'Réglement', + 'required' => false, + 'choices' => $this->buildPaymentTypeChoice(), + ]) + ->add('paymentDate', DateType::class, [ + 'label' => 'Date', + 'widget' => 'single_text', + 'required' => false, + ]) + ->add('paymentComment', TextType::class, [ + 'label' => 'Info réglement', + 'required' => false, + 'empty_data' => '', + ]) + ->add('submit', SubmitType::class, [ + 'label' => $options['operation'] === 'add' ? 'Ajouter' : 'Modifier', + 'attr' => [ + 'class' => 'ui primary button', + ], + ]); + + if ($options['operation'] === 'edit' && $options['nextTransaction'] instanceof Transaction) { + $builder->add('submitAndPass', SubmitType::class, [ + 'label' => 'Soumettre et passer', + 'attr' => [ + 'class' => 'ui primary button', + ], + ]) + ->add('pass', SubmitType::class, [ + 'label' => 'Passer', + 'attr' => [ + 'class' => 'ui primary button', + ], + ]); + } + } + + public function configureOptions(OptionsResolver $resolver): void + { + $resolver->setDefaults([ + 'operation' => 'add', + 'data_class' => Transaction::class, + 'attr' => [ + 'novalidate' => 'novalidate', + ], + 'nextTransaction' => null, + ]); + } + + private function buildOperationTypeChoice(): array + { + $choices = []; + foreach ($this->operationRepository->getAll() as $operation) { + $choices[$operation->getName()] = $operation->getId(); + } + + return $choices; + } + + private function buildAccountChoice(): array + { + $choices = []; + foreach ($this->accountRepository->getAllSortedByName() as $account) { + $choices[$account->getName()] = $account->getId(); + } + + return $choices; + } + + private function buildEventChoice(): array + { + $choices = []; + /** @var Event $event */ + foreach ($this->eventRepository->getAllSortedByName(true) as $event) { + $choices[$event->getName()] = $event->getId(); + } + + return $choices; + } + + private function buildCategoryChoice(): array + { + $choices = []; + foreach ($this->categoryRepository->getAllSortedByName() as $category) { + $choices[$category->getName()] = $category->getId(); + } + + return $choices; + } + + private function buildPaymentTypeChoice(): array + { + $choices = []; + $choices[''] = 0; + foreach ($this->paymentRepository->getAllSortedByName() as $paymentType) { + $choices[$paymentType->getName()] = $paymentType->getId(); + } + + return $choices; + } +} diff --git a/sources/AppBundle/Accounting/Model/Repository/AccountRepository.php b/sources/AppBundle/Accounting/Model/Repository/AccountRepository.php index a87cf78c7..e8f435a45 100644 --- a/sources/AppBundle/Accounting/Model/Repository/AccountRepository.php +++ b/sources/AppBundle/Accounting/Model/Repository/AccountRepository.php @@ -34,6 +34,15 @@ public function getActiveAccounts(): CollectionInterface return $this->getQuery($builder->getStatement())->query($this->getCollection(new HydratorSingleObject())); } + /** + * @return Collection + */ + public function getAllSortedByName(): CollectionInterface + { + $query = $this->getQuery('SELECT * FROM compta_compte ORDER BY nom_compte asc'); + return $query->query($this->getCollection(new HydratorSingleObject())); + } + public static function initMetadata(SerializerFactoryInterface $serializerFactory, array $options = []) { $metadata = new Metadata($serializerFactory); diff --git a/sources/AppBundle/Accounting/Model/Repository/EventRepository.php b/sources/AppBundle/Accounting/Model/Repository/EventRepository.php index f18ff2050..4d4ac09a0 100644 --- a/sources/AppBundle/Accounting/Model/Repository/EventRepository.php +++ b/sources/AppBundle/Accounting/Model/Repository/EventRepository.php @@ -20,9 +20,14 @@ class EventRepository extends Repository implements MetadataInitializer /** * @return CollectionInterface */ - public function getAllSortedByName(): CollectionInterface + public function getAllSortedByName($usedInAccountingJournal = false): CollectionInterface { - $query = $this->getQuery('SELECT * FROM compta_evenement ORDER BY evenement asc'); + $sql = 'SELECT * FROM compta_evenement '; + if ($usedInAccountingJournal) { + $sql .= 'WHERE hide_in_accounting_journal_at IS NULL '; + } + $sql .= 'ORDER BY evenement asc'; + $query = $this->getQuery($sql); return $query->query($this->getCollection(new HydratorSingleObject())); } diff --git a/sources/AppBundle/Accounting/Model/Repository/TransactionRepository.php b/sources/AppBundle/Accounting/Model/Repository/TransactionRepository.php index a231ad09a..3383ac4b8 100644 --- a/sources/AppBundle/Accounting/Model/Repository/TransactionRepository.php +++ b/sources/AppBundle/Accounting/Model/Repository/TransactionRepository.php @@ -7,6 +7,7 @@ use AppBundle\Accounting\Model\Transaction; use AppBundle\Accounting\Model\InvoicingPeriod; use CCMBenchmark\Ting\Repository\HydratorArray; +use CCMBenchmark\Ting\Repository\HydratorSingleObject; use CCMBenchmark\Ting\Repository\Metadata; use CCMBenchmark\Ting\Repository\MetadataInitializer; use CCMBenchmark\Ting\Repository\Repository; @@ -18,6 +19,18 @@ */ class TransactionRepository extends Repository implements MetadataInitializer { + public function getNextTransaction(int $transactionId): ?Transaction + { + $query = $this->getQuery('SELECT * FROM compta WHERE (idcategorie = :undeterminedCategoryId OR idevenement = :undeterminedEventId) AND id > :transactionId ORDER BY id ASC LIMIT 1'); + $query->setParams(['transactionId' => $transactionId, 'undeterminedCategoryId' => 26, 'undeterminedEventId' => 8]); + $collection = $query->query($this->getCollection(new HydratorSingleObject())); + if ($collection->count() > 0) { + return $collection->first(); + } + + return null; + } + public function getEntriesPerInvoicingPeriod(InvoicingPeriod $period, bool $onlyUnclasifedEntries, int $operationType = 0) { diff --git a/sources/AppBundle/Accounting/Model/Transaction.php b/sources/AppBundle/Accounting/Model/Transaction.php index ec67107f3..166457592 100644 --- a/sources/AppBundle/Accounting/Model/Transaction.php +++ b/sources/AppBundle/Accounting/Model/Transaction.php @@ -27,9 +27,9 @@ class Transaction implements NotifyPropertyInterface private bool $attachmentRequired = false; private ?string $attachmentFilename = null; private string $number = ''; - private ?int $paymentTypeId = null; + private ?int $paymentTypeId = 0; private ?DateTime $paymentDate = null; - private string $paymentComment = ''; + private ?string $paymentComment = ''; private ?int $eventId = null; private ?int $accountId = 1; private ?float $amountTva20 = null; @@ -37,6 +37,12 @@ class Transaction implements NotifyPropertyInterface private ?float $amountTva5_5 = null; private ?float $amountTva0 = null; + public function __construct() + { + $this->accountingDate = new DateTime(); + $this->paymentDate = new DateTime(); + } + public function getId(): ?int { return $this->id; @@ -262,7 +268,7 @@ public function getPaymentComment(): string return $this->paymentComment; } - public function setPaymentComment(string $paymentComment): self + public function setPaymentComment(?string $paymentComment): self { $this->propertyChanged('paymentComment', $this->paymentComment, $paymentComment); $this->paymentComment = $paymentComment; diff --git a/sources/AppBundle/Controller/Admin/Accounting/Journal/AddTransactionAction.php b/sources/AppBundle/Controller/Admin/Accounting/Journal/AddTransactionAction.php new file mode 100644 index 000000000..6577566af --- /dev/null +++ b/sources/AppBundle/Controller/Admin/Accounting/Journal/AddTransactionAction.php @@ -0,0 +1,42 @@ +setAccountId(1); // Compte courant + $form = $this->createForm(TransactionType::class, $transaction); + $form->handleRequest($request); + if ($form->isSubmitted() && $form->isValid()) { + $this->transactionRepository->save($transaction); + $this->audit->log("Ajout d'une écriture"); + $_SESSION['flash']['message'] = "l'écriture a été ajoutée"; + $_SESSION['flash']['error'] = false; + $this->addFlash('notice', "l'écriture a été ajoutée"); + return $this->redirect('/pages/administration/index.php?page=compta_journal&action=lister#L' . $transaction->getId()); + } + + return $this->render('admin/accounting/journal/add.html.twig', [ + 'form' => $form->createView(), + 'operation' => 'add', + ]); + } +} diff --git a/sources/AppBundle/Controller/Admin/Accounting/Journal/EditTransactionAction.php b/sources/AppBundle/Controller/Admin/Accounting/Journal/EditTransactionAction.php new file mode 100644 index 000000000..22cbb6bfc --- /dev/null +++ b/sources/AppBundle/Controller/Admin/Accounting/Journal/EditTransactionAction.php @@ -0,0 +1,60 @@ +transactionRepository->get($id); + if (!$transaction instanceof \AppBundle\Accounting\Model\Transaction) { + throw new NotFoundHttpException(); + } + $nextTransaction = $this->transactionRepository->getNextTransaction($transaction->getId()); + + + $form = $this->createForm(TransactionType::class, $transaction, ['operation' => 'edit', 'nextTransaction' => $nextTransaction]); + $form->handleRequest($request); + if ($form->isSubmitted() && $form->isValid()) { + /** @var SubmitButton|null $passButton */ + $passButton = $form->has('pass') ? $form->get('pass') : null; + if ($passButton instanceof SubmitButton && $passButton->isClicked()) { + $this->addFlash('notice', 'L\'écriture n\'a pas été modifiée'); + return $this->redirectToRoute('admin_accounting_journal_edit', ['id' => $nextTransaction->getId()]); + } + + $this->transactionRepository->save($transaction); + $this->audit->log("Modification d'une écriture ({$transaction->getId()})"); + $this->addFlash('notice', 'L\'écriture a été modifiée'); + + /** @var SubmitButton|null $submitAndPassButton */ + $submitAndPassButton = $form->has('submitAndPass') ? $form->get('submitAndPass') : null; + if ($submitAndPassButton instanceof SubmitButton && $submitAndPassButton->isClicked()) { + return $this->redirectToRoute('admin_accounting_journal_edit', ['id' => $nextTransaction->getId()]); + } else { + return $this->redirect('/pages/administration/index.php?page=compta_journal&action=lister#L' . $transaction->getId()); + } + } + return $this->render('admin/accounting/journal/edit.html.twig', [ + 'form' => $form->createView(), + 'operation' => 'edit', + 'nextTransaction' => $nextTransaction, + ]); + } +} diff --git a/templates/admin/accounting/journal/add.html.twig b/templates/admin/accounting/journal/add.html.twig new file mode 100644 index 000000000..42bb527f8 --- /dev/null +++ b/templates/admin/accounting/journal/add.html.twig @@ -0,0 +1,8 @@ +{% extends 'admin/base_with_header.html.twig' %} + +{% block content %} +

Ajouter une écriture (facture)

+ + {% include 'admin/accounting/journal/form.html.twig' %} + +{% endblock %} diff --git a/templates/admin/accounting/journal/edit.html.twig b/templates/admin/accounting/journal/edit.html.twig new file mode 100644 index 000000000..991202da4 --- /dev/null +++ b/templates/admin/accounting/journal/edit.html.twig @@ -0,0 +1,8 @@ +{% extends 'admin/base_with_header.html.twig' %} + +{% block content %} +

Modifier une écriture (facture)

+ + {% include 'admin/accounting/journal/form.html.twig' %} + +{% endblock %} diff --git a/templates/admin/accounting/journal/form.html.twig b/templates/admin/accounting/journal/form.html.twig new file mode 100644 index 000000000..d2b5d5e72 --- /dev/null +++ b/templates/admin/accounting/journal/form.html.twig @@ -0,0 +1,118 @@ +{% form_theme form 'form_theme_admin.html.twig' %} + +{{ form_start(form) }} + +
+

Sélectionner un Journal

+
+
+ {{ form_row(form.operationId) }} + {{ form_row(form.accountId) }} + {{ form_row(form.eventId) }} +
+
+ +
+

Détail Facture

+
+
+ {{ form_row(form.accountingDate) }} + {{ form_row(form.categoryId) }} + {{ form_row(form.vendorName) }} + {{ form_row(form.tvaIntra) }} + {{ form_row(form.number) }} + {{ form_row(form.description) }} + {{ form_row(form.amount) }} + {{ form_row(form.comment) }} +
+
+ +
+

TVA

+
+
+ {{ form_row(form.amountTva5_5) }} +
+ +
+ Calculer le montant HT soumis à TVA 5,5% sur la base de l'intégralité du montant TTC +
+
+ {{ form_row(form.amountTva10) }} +
+ +
+ Calculer le montant HT soumis à TVA 10% sur la base de l'intégralité du montant TTC +
+
+ {{ form_row(form.amountTva20) }} +
+ +
+ Calculer le montant HT soumis à TVA 20% sur la base de l'intégralité du montant TTC +
+
+ {{ form_row(form.amountTva0) }} +
+ +
+ Calculer le montant non soumis à TVA sur la base de l'intégralité du montant TTC +
+
+ {{ form_row(form.tvaZone) }} +
+
+ +
+

Réglement

+
+
+ {{ form_row(form.paymentTypeId) }} + {{ form_row(form.paymentDate) }} + {{ form_row(form.paymentComment) }} +
+
+ +
+
+
+ {{ form_errors(form) }} + +
+
+
+
+ {{ form_row(form.submit) }} +
+
+ {% if operation == 'edit' and nextTransaction is defined and nextTransaction is not null %} +
+
+
+
+ {{ form_row(form.submitAndPass) }} +
+
+
+
+
+
+ {{ form_row(form.pass) }} +
+
+ {% endif %} + {{ form_rest(form) }} +
+
+
+
+

+ * indique un champ obligatoire +

+
+ +{{ form_end(form) }} diff --git a/tests/behat/features/Admin/Tresorerie/Journal.feature b/tests/behat/features/Admin/Tresorerie/Journal.feature index 5d180166e..5ae977835 100644 --- a/tests/behat/features/Admin/Tresorerie/Journal.feature +++ b/tests/behat/features/Admin/Tresorerie/Journal.feature @@ -8,8 +8,8 @@ Feature: Administration - Trésorerie - Journal When I follow "Ajouter" And I press "Ajouter" Then I should see "Type d'opération manquant" - And I should see "Evenement manquant" - And I should see "Type de compte manquant" + And I should see "Évènement manquant" + And I should see "Catégorie manquante" And I should see "Montant manquant" Scenario: Journal dépense/recette @@ -18,18 +18,17 @@ Feature: Administration - Trésorerie - Journal # Ajout d'une dépense When I follow "Ajouter" - And I select "1" from "idoperation" - And I select "1" from "idcompte" - And I select "5" from "idevenement" - And I select "1" from "date_saisie[d]" - And I select "1" from "date_saisie[F]" - And I select "26" from "idcategorie" - And I fill in "nom_frs" with "Fournisseur" - And I fill in "tva_intra" with "FR4412345" - And I fill in "numero" with "001" - And I fill in "description" with "Description dépense 001" - And I fill in "montant" with "12000" - And I fill in "comment" with "Commentaire dépense 001" + And I select "1" from "transaction[operationId]" + And I select "1" from "transaction[accountId]" + And I select "5" from "transaction[eventId]" + And I fill in "transaction[accountingDate]" with "2026-01-01" + And I select "26" from "transaction[categoryId]" + And I fill in "transaction[vendorName]" with "Fournisseur" + And I fill in "transaction[tvaIntra]" with "FR4412345" + And I fill in "transaction[number]" with "001" + And I fill in "transaction[description]" with "Description dépense 001" + And I fill in "transaction[amount]" with "12000" + And I fill in "transaction[comment]" with "Commentaire dépense 001" And I press "Ajouter" Then I should see "L'écriture a été ajoutée" And I should see "01/01/" @@ -38,25 +37,24 @@ Feature: Administration - Trésorerie - Journal And I should see "-12 000,00" And I should see "Description dépense 001" And I follow the button of tooltip "Modifier la ligne Description dépense 001" - And I fill in "montant" with "12001" + And I fill in "transaction[amount]" with "12001" When I press "Modifier" Then I should see "L'écriture a été modifiée" And I should see "-12 001,00" # Ajout d'une recette When I follow "Ajouter" - And I select "2" from "idoperation" - And I select "1" from "idcompte" - And I select "5" from "idevenement" - And I select "2" from "date_saisie[d]" - And I select "1" from "date_saisie[F]" - And I select "26" from "idcategorie" - And I fill in "nom_frs" with "Fournisseur" - And I fill in "tva_intra" with "FR6612345" - And I fill in "numero" with "001" - And I fill in "description" with "Description recette 001" - And I fill in "montant" with "12000" - And I fill in "comment" with "Commentaire recette 001" + And I select "2" from "transaction[operationId]" + And I select "1" from "transaction[accountId]" + And I select "5" from "transaction[eventId]" + And I fill in "transaction[accountingDate]" with "2026-01-02" + And I select "26" from "transaction[categoryId]" + And I fill in "transaction[vendorName]" with "Fournisseur" + And I fill in "transaction[tvaIntra]" with "FR6612345" + And I fill in "transaction[number]" with "001" + And I fill in "transaction[description]" with "Description recette 001" + And I fill in "transaction[amount]" with "12000" + And I fill in "transaction[comment]" with "Commentaire recette 001" And I press "Ajouter" Then I should see "L'écriture a été ajoutée" And I should see "02/01/" @@ -65,7 +63,7 @@ Feature: Administration - Trésorerie - Journal And I should see "12 000,00" And I should see "Description recette 001" And I follow the button of tooltip "Modifier la ligne Description recette 001" - And I fill in "montant" with "12002" + And I fill in "transaction[amount]" with "12002" When I press "Modifier" Then I should see "L'écriture a été modifiée" And I should see "12 002,00" @@ -80,6 +78,18 @@ Feature: Administration - Trésorerie - Journal Then I should see "12 001,00" And I should not see "-12 002,00" + # Onglet Dépenses + When I follow "Dépenses/Recettes" + Then I follow the button of tooltip "Modifier la ligne Description dépense 001" + Then the "transaction[description]" field should contain "Description dépense 001" + And I should see "Soumettre et passer" + And I should see "Passer" + When I press "Passer" + Then I should see "L'écriture n'a pas été modifiée" + Then the "transaction[description]" field should contain "Description recette 001" + When I press "Modifier" + Then I should see "L'écriture a été modifiée" + # Export Excel When I follow "Exporter la période en CSV" Then the response header "Content-disposition" should match '#^attachment; filename="AFUP_(.*)_journal_from(.*).csv"#' diff --git a/tests/behat/features/Admin/Tresorerie/JournalImport.feature b/tests/behat/features/Admin/Tresorerie/JournalImport.feature index 0cd4ebe3b..802857094 100644 --- a/tests/behat/features/Admin/Tresorerie/JournalImport.feature +++ b/tests/behat/features/Admin/Tresorerie/JournalImport.feature @@ -33,11 +33,11 @@ Feature: Administration - Trésorerie - Journal import # Test meetup When I follow the button of tooltip "Modifier la ligne CB MEETUP ORG SUB FACT 190323 DONT FRAIS DE COMM. 1,89 EUR" Then I should see "Modifier une écriture" - Then The "idevenement" field should have the following selected text "Association AFUP" - Then The "idcategorie" field should have the following selected text "Meetup" + Then The "transaction[eventId]" field should have the following selected text "Association AFUP" + Then The "transaction[categoryId]" field should have the following selected text "Meetup" # Test Twilio When I move backward one page When I follow the button of tooltip "Modifier la ligne CB Twilio SZ5KZ54M FACT 090223 DONT FRAIS DE COMM. 0,26 EUR" Then I should see "Modifier une écriture" - Then The "idevenement" field should have the following selected text "Association AFUP" - Then The "idcategorie" field should have the following selected text "Outils" + Then The "transaction[eventId]" field should have the following selected text "Association AFUP" + Then The "transaction[categoryId]" field should have the following selected text "Outils"