Skip to content

Trésorerie : bascule du journal sur Doctrine #2425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vgreb wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Trésorerie : bascule du journal sur Doctrine #2425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
372 changes: 21 additions & 351 deletions phpstan-baseline.php
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 3 additions & 5 deletions sources/AppBundle/Accounting/Form/InvoicingPeriodType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@

namespace AppBundle\Accounting\Form;

use AppBundle\Accounting\Model\InvoicingPeriod;
use AppBundle\Accounting\Model\Repository\InvoicingPeriodRepository;
use AppBundle\Accounting\Entity\Repository\InvoicingPeriodRepository;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
use Symfony\Component\Form\FormBuilderInterface;
Expand All @@ -18,9 +17,8 @@ public function __construct(private readonly InvoicingPeriodRepository $invoicin
public function buildForm(FormBuilderInterface $builder, array $options): void
{
$periods = [];
/** @var InvoicingPeriod $period */
foreach ($this->invoicingPeriodRepository->getAll() as $period) {
$periods["{$period->getStartDate()->format('d/m/Y')} - {$period->getEndDate()->format('d/m/Y')}"] = $period->getId();
foreach ($this->invoicingPeriodRepository->findAll() as $period) {
$periods["{$period->dateDebut->format('d/m/Y')} - {$period->dateFin->format('d/m/Y')}"] = $period->id;
}

$builder->add('periodId', ChoiceType::class, [
Expand Down
133 changes: 48 additions & 85 deletions sources/AppBundle/Accounting/Form/TransactionType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,21 @@

namespace AppBundle\Accounting\Form;

use AppBundle\Accounting\Entity\Account;
use AppBundle\Accounting\Entity\Category;
use AppBundle\Accounting\Entity\Event;
use AppBundle\Accounting\Entity\Operation;
use AppBundle\Accounting\Entity\Payment;
use AppBundle\Accounting\Entity\Repository\AccountRepository;
use AppBundle\Accounting\Entity\Repository\CategoryRepository;
use AppBundle\Accounting\Entity\Repository\EventRepository;
use AppBundle\Accounting\Entity\Repository\OperationRepository;
use AppBundle\Accounting\Entity\Repository\PaymentRepository;
use AppBundle\Accounting\Model\Transaction;
use AppBundle\Accounting\Entity\Transaction;
use AppBundle\Accounting\TvaZone;
use Symfony\Bridge\Doctrine\Form\Type\EntityType;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\DataTransformer\MoneyToLocalizedStringTransformer;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
use Symfony\Component\Form\Extension\Core\Type\DateType;
use Symfony\Component\Form\Extension\Core\Type\EnumType;
use Symfony\Component\Form\Extension\Core\Type\MoneyType;
Expand All @@ -37,44 +41,52 @@ public function __construct(

public function buildForm(FormBuilderInterface $builder, array $options): void
{
$builder->add('operationId', ChoiceType::class, [
$builder->add('operation', EntityType::class, [
'label' => 'Type d\'opération',
'choices' => $this->buildOperationTypeChoice(),
'class' => Operation::class,
'choices' => $this->operationRepository->findAll(),
'choice_label' => 'name',
'placeholder' => '',
'constraints' => [
new Assert\NotBlank(message: "Type d'opération manquant"),
],
])
->add('accountId', ChoiceType::class, [
->add('compte', EntityType::class, [
'label' => 'Compte',
'choices' => $this->buildAccountChoice(),
'class' => Account::class,
'choices' => $this->accountRepository->getAllSortedByName(),
'choice_label' => 'name',
'placeholder' => '',
'constraints' => [
new Assert\NotBlank(),
],
])
->add('eventId', ChoiceType::class, [
->add('evenement', EntityType::class, [
'label' => 'Évènement',
'choices' => $this->buildEventChoice(),
'class' => Event::class,
'choices' => $this->eventRepository->getAllSortedByName(),
'choice_label' => 'name',
'placeholder' => '',
'constraints' => [
new Assert\NotBlank(message: "Évènement manquant"),
],
])
->add('accountingDate', DateType::class, [
->add('dateEcriture', DateType::class, [
'label' => 'Date saisie',
'widget' => 'single_text',
'required' => false,
])
->add('categoryId', ChoiceType::class, [
->add('categorie', EntityType::class, [
'label' => 'categorie',
'class' => Category::class,
'placeholder' => '',
'choices' => $this->buildCategoryChoice(),
'choices' => $this->categoryRepository->getAllSortedByName(),
'choice_label' => 'name',
'constraints' => [
new Assert\NotBlank(message: "Catégorie manquante"),
],
])
->add('vendorName', TextType::class, [
->add('nomFournisseur', TextType::class, [
'label' => 'Nom fournisseurs ',
'required' => false,
'empty_data' => '',
Expand All @@ -83,7 +95,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
'label' => 'TVA intracommunautaire (facture)',
'required' => false,
])
->add('number', TextType::class, [
->add('numero', TextType::class, [
'label' => 'Numero facture',
'required' => false,
'empty_data' => '',
Expand All @@ -93,34 +105,34 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
'required' => false,
'empty_data' => '',
])
->add('amount', MoneyType::class, [
->add('montant', MoneyType::class, [
'label' => 'Montant',
'currency' => '',
'constraints' => [
new Assert\NotBlank(message: "Montant manquant"),
new Assert\NotEqualTo(value: 0, message: "Montant manquant"),
],
])
->add('comment', TextType::class, [
->add('commentaire', TextType::class, [
'label' => 'Commentaire',
'required' => false,
])
->add('amountTva5_5', MoneyType::class, [
->add('montantTva5_5', MoneyType::class, [
'label' => 'Montant HT soumis à TVA 5.5%',
'required' => false,
'currency' => '',
])
->add('amountTva10', MoneyType::class, [
->add('montantTva10', MoneyType::class, [
'label' => 'Montant HT soumis à TVA 10%',
'required' => false,
'currency' => '',
])
->add('amountTva20', MoneyType::class, [
->add('montantTva20', MoneyType::class, [
'label' => 'Montant HT soumis à TVA 20%',
'required' => false,
'currency' => '',
])
->add('amountTva0', MoneyType::class, [
->add('montantTva0', MoneyType::class, [
'label' => 'Montant HT non soumis à TVA',
'required' => false,
'currency' => '',
Expand All @@ -134,17 +146,20 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
'choice_label' => fn(TvaZone $choice, string $key, mixed $value): string => $choice->getLabel(),

])
->add('paymentTypeId', ChoiceType::class, [
->add('modeReglement', EntityType::class, [
'label' => 'Réglement',
'class' => Payment::class,
'required' => false,
'choices' => $this->buildPaymentTypeChoice(),
'placeholder' => '',
'choices' => $this->paymentRepository->getAllSortedByName(),
'choice_label' => 'name',
])
->add('paymentDate', DateType::class, [
->add('dateReglement', DateType::class, [
'label' => 'Date',
'widget' => 'single_text',
'required' => false,
])
->add('paymentComment', TextType::class, [
->add('commentaireReglement', TextType::class, [
'label' => 'Info réglement',
'required' => false,
'empty_data' => '',
Expand All @@ -171,24 +186,24 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
]);
}

$builder->get('amount')->resetViewTransformers();
$builder->get('amount')->addViewTransformer(
$builder->get('montant')->resetViewTransformers();
$builder->get('montant')->addViewTransformer(
new MoneyToLocalizedStringTransformer(2, false, null, null, 'en'),
);
$builder->get('amountTva0')->resetViewTransformers();
$builder->get('amountTva0')->addViewTransformer(
$builder->get('montantTva0')->resetViewTransformers();
$builder->get('montantTva0')->addViewTransformer(
new MoneyToLocalizedStringTransformer(2, false, null, null, 'en'),
);
$builder->get('amountTva5_5')->resetViewTransformers();
$builder->get('amountTva5_5')->addViewTransformer(
$builder->get('montantTva5_5')->resetViewTransformers();
$builder->get('montantTva5_5')->addViewTransformer(
new MoneyToLocalizedStringTransformer(2, false, null, null, 'en'),
);
$builder->get('amountTva10')->resetViewTransformers();
$builder->get('amountTva10')->addViewTransformer(
$builder->get('montantTva10')->resetViewTransformers();
$builder->get('montantTva10')->addViewTransformer(
new MoneyToLocalizedStringTransformer(2, false, null, null, 'en'),
);
$builder->get('amountTva20')->resetViewTransformers();
$builder->get('amountTva20')->addViewTransformer(
$builder->get('montantTva20')->resetViewTransformers();
$builder->get('montantTva20')->addViewTransformer(
new MoneyToLocalizedStringTransformer(2, false, null, null, 'en'),
);
}
Expand All @@ -204,56 +219,4 @@ public function configureOptions(OptionsResolver $resolver): void
'nextTransaction' => null,
]);
}

private function buildOperationTypeChoice(): array
{
$choices = [];
foreach ($this->operationRepository->findAll() as $operation) {
$choices[$operation->name] = $operation->id;
}

return $choices;
}

private function buildAccountChoice(): array
{
$choices = [];
foreach ($this->accountRepository->getAllSortedByName() as $account) {
$choices[$account->name] = $account->id;
}

return $choices;
}

private function buildEventChoice(): array
{
$choices = [];
/** @var Event $event */
foreach ($this->eventRepository->getAllSortedByName() as $event) {
$choices[$event->name] = $event->id;
}

return $choices;
}

private function buildCategoryChoice(): array
{
$choices = [];
foreach ($this->categoryRepository->getAllSortedByName() as $category) {
$choices[$category->name] = $category->id;
}

return $choices;
}

private function buildPaymentTypeChoice(): array
{
$choices = [];
$choices[''] = 0;
foreach ($this->paymentRepository->getAllSortedByName() as $paymentType) {
$choices[$paymentType->name] = $paymentType->id;
}

return $choices;
}
}
72 changes: 0 additions & 72 deletions sources/AppBundle/Accounting/Model/InvoicingPeriod.php
View file
Open in desktop

This file was deleted.

Loading
Loading