barredterra ba55d0ede7 chore: resolve conflicts

2024-01-31 13:19:19 +01:00

..

accounts.js

refactor: remove extraneous disabled filters (backport #37732) (#37749)

2023-10-30 09:57:32 +05:30

buying.js

fix: serial and batch bundle return not working (backport #38754) (#38806)

2023-12-17 18:02:31 +05:30

stock_controller.js

fix(UX): Ignore prepared report

2023-08-16 19:10:39 +05:30

taxes_and_totals.js

fix: wrong round off and rounded total

2023-11-19 13:49:19 +00:00

transaction.js

chore: resolve conflicts

2024-01-31 13:19:19 +01:00