Overview
Comment: | Fix reset of analytical in import |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | dev |
Files: | files | file ages | folders |
SHA1: |
47fcf7c0d9a5b028dc3080de442c2a91 |
User & Date: | bohwaz on 2020-11-26 12:53:26 |
Other Links: | branch diff | manifest | tags |
Context
2020-11-26
| ||
13:05 | Improve reconcile: fix reconcile sum, improve form UI for small screens check-in: c9518cd0c7 user: bohwaz tags: dev | |
12:53 | Fix reset of analytical in import check-in: 47fcf7c0d9 user: bohwaz tags: dev | |
12:52 | Use a shorter label check-in: cd7c68df7b user: bohwaz tags: dev | |
Changes
Modified src/include/lib/Garradin/Accounting/Transactions.php from [f37ddc1d1c] to [12105c65f5].
︙ | |||
217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 | 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 | + + + + + + + + + + + + + - + - - - - - - - - | if (!$id_account) { throw new UserException(sprintf('le compte "%s" n\'existe pas dans le plan comptable', $row->account)); } $row->line_id = trim($row->line_id); $id_analytical = null; $data = [ 'credit' => $row->credit ?: 0, 'debit' => $row->debit ?: 0, 'id_account' => $id_account, 'reference' => $row->line_reference, 'label' => $row->line_label, 'reconciled' => $row->reconciled, ]; 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)); } $row['id_analytical'] = $id_analytical; } elseif (property_exists($row, 'analytical')) { $row['id_analytical'] = null; } if ($row->line_id) { $line = $transaction->getLine((int)$row->line_id); if (!$line) { throw new UserException(sprintf('le numéro de ligne "%s" n\'existe pas dans l\'écriture "%s"', $row->line_id, $transaction->id ?: 'à créer')); } } else { $line = new Line; } |
︙ |
Modified src/include/lib/Garradin/Entities/Accounting/Line.php from [88a4270d57] to [0fde672e4f].
︙ | |||
52 53 54 55 56 57 58 | 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 | - - - - - - - - - - - - - | } $value = parent::filterUserValue($type, $value, $key); return $value; } |