Overview
Comment:Accounting export was breaking multi-line transactions in multiple transactions
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk | stable
Files: files | file ages | folders
SHA1: c583021c0304c4c67af54773ca62ca947aa612e4
User & Date: bohwaz on 2020-12-07 19:26:21
Other Links: manifest | tags
Context
2020-12-07
19:43
Add accounting search in more places, with more useful default queries check-in: b5cff0c2a6 user: bohwaz tags: trunk, stable
19:26
Accounting export was breaking multi-line transactions in multiple transactions check-in: c583021c03 user: bohwaz tags: trunk, stable
19:07
Make sure we don't change a transaction from another year check-in: 22085f3be3 user: bohwaz tags: trunk, stable
Changes

Modified src/include/lib/Garradin/Accounting/Transactions.php from [cb3bc58a9a] to [907c89f054].

142
143
144
145
146
147
148

149
150
151
152
153
154
155
156
157
158
159
160
161
						$status[] = $v;
					}
				}

				$row->status = implode(', ', $status);
				$row->date = \DateTime::createFromFormat('Y-m-d', $row->date);
				$row->date = $row->date->format('d/m/Y');

			}

			$row->credit = Utils::money_format($row->credit, ',', '');
			$row->debit = Utils::money_format($row->debit, ',', '');

			$previous_id = $row->id;
			yield $row;
		}
	}

	static public function importCSV(Year $year, array $file, int $user_id)
	{
		if ($year->closed) {







>





<







142
143
144
145
146
147
148
149
150
151
152
153
154

155
156
157
158
159
160
161
						$status[] = $v;
					}
				}

				$row->status = implode(', ', $status);
				$row->date = \DateTime::createFromFormat('Y-m-d', $row->date);
				$row->date = $row->date->format('d/m/Y');
				$previous_id = $row->id;
			}

			$row->credit = Utils::money_format($row->credit, ',', '');
			$row->debit = Utils::money_format($row->debit, ',', '');


			yield $row;
		}
	}

	static public function importCSV(Year $year, array $file, int $user_id)
	{
		if ($year->closed) {