Overview
Comment: | Accounting: Add import of analytical ID in custom CSV import |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk | stable |
Files: | files | file ages | folders |
SHA3-256: |
1356ecfd9f902b889ca28a0cc0d83296 |
User & Date: | bohwaz on 2022-01-27 19:11:58 |
Other Links: | manifest | tags |
Context
2022-01-27
| ||
19:16 | Fix list of mandatory CSV columns in CSV help check-in: e866ced787 user: bohwaz tags: trunk, stable | |
19:11 | Accounting: Add import of analytical ID in custom CSV import check-in: 1356ecfd9f user: bohwaz tags: trunk, stable | |
2022-01-25
| ||
23:24 | Fix issue with backups and old SQLite versions check-in: 5ab4b7ba12 user: bohwaz tags: trunk, stable | |
Changes
Modified src/include/lib/Garradin/Accounting/Transactions.php from [105d30cebc] to [28a4940bb4].
︙ | ︙ | |||
29 30 31 32 33 34 35 36 37 38 39 40 41 42 | 'date' => 'Date', 'notes' => 'Remarques', 'reference' => 'Numéro pièce comptable', 'p_reference' => 'Référence paiement', 'debit_account' => 'Compte de débit', 'credit_account' => 'Compte de crédit', 'amount' => 'Montant', ]; const MANDATORY_CSV_COLUMNS = ['label', 'date', 'credit_account', 'debit_account', 'amount']; static public function get(int $id) { return EntityManager::findOneById(Transaction::class, $id); | > | 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 | 'date' => 'Date', 'notes' => 'Remarques', 'reference' => 'Numéro pièce comptable', 'p_reference' => 'Référence paiement', 'debit_account' => 'Compte de débit', 'credit_account' => 'Compte de crédit', 'amount' => 'Montant', 'analytical' => 'Compte analytique', ]; const MANDATORY_CSV_COLUMNS = ['label', 'date', 'credit_account', 'debit_account', 'amount']; static public function get(int $id) { return EntityManager::findOneById(Transaction::class, $id); |
︙ | ︙ | |||
118 119 120 121 122 123 124 | * Return all transactions from year */ static public function export(Year $year, string $format, string $type = self::EXPORT_RAW): void { $header = null; if (self::EXPORT_FULL == $type) { | | | 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 | * Return all transactions from year */ static public function export(Year $year, string $format, string $type = self::EXPORT_RAW): void { $header = null; if (self::EXPORT_FULL == $type) { $header = ['Numéro d\'écriture', 'Type', 'Statut', 'Libellé', 'Date', 'Remarques', 'Numéro pièce comptable', 'Numéro ligne', 'Compte', 'Débit', 'Crédit', 'Référence ligne', 'Libellé ligne', 'Rapprochement', 'Compte analytique', 'Membres associés']; } CSV::export( $format, sprintf('Export comptable - %s - %s', Config::getInstance()->get('nom_asso'), $year->label), self::iterateExport($year->id(), $type), $header |
︙ | ︙ | |||
362 363 364 365 366 367 368 369 370 371 372 373 374 375 | if (!$credit_account) { throw new UserException(sprintf('Compte de crédit "%s" inconnu dans le plan comptable', $row->credit_account)); } if (!$debit_account) { throw new UserException(sprintf('Compte de débit "%s" inconnu dans le plan comptable', $row->debit_account)); } $line = new Line; $line->importForm([ 'credit' => $row->amount, 'debit' => 0, 'id_account' => $credit_account, 'reference' => isset($row->p_reference) ? $row->p_reference : null, | > > > > > > > > > > > > > > | 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 | if (!$credit_account) { throw new UserException(sprintf('Compte de crédit "%s" inconnu dans le plan comptable', $row->credit_account)); } if (!$debit_account) { throw new UserException(sprintf('Compte de débit "%s" inconnu dans le plan comptable', $row->debit_account)); } if (!empty($row->analytical)) { $id_analytical = $accounts->getIdFromCode($row->analytical); if (!$id_analytical) { throw new UserException(sprintf('le compte analytique "%s" n\'existe pas dans le plan comptable', $row->analytical)); } $transaction->id_analytical = $id_analytical; } elseif (property_exists($row, 'analytical')) { $transaction->id_analytical = null; } $line = new Line; $line->importForm([ 'credit' => $row->amount, 'debit' => 0, 'id_account' => $credit_account, 'reference' => isset($row->p_reference) ? $row->p_reference : null, |
︙ | ︙ |