2
0
mirror of https://github.com/frappe/books.git synced 2024-11-15 01:44:04 +00:00
Commit Graph

2972 Commits

Author SHA1 Message Date
Mildred Ki'Lya
b1c94c3246
Merge pull request #794 from akshayitzme/pos-barcode
feat: POS: add items by barcode scan and input
2024-01-08 21:55:15 +01:00
akshayitzme
ecb46d7d92 incr: barcode width correction 2024-01-02 13:12:21 +05:30
akshayitzme
bc118884fb feat: add items by barcode scan and input 2024-01-02 12:51:06 +05:30
akshayitzme
8cb126851e feat: add item through barcode scan 2024-01-02 12:38:31 +05:30
Mildred Ki'Lya
bcb602e299
Merge pull request #790 from frappe/shanti/allow-svg-images
feat: allow inclusion of SVG images
2023-12-27 11:19:47 +01:00
Mildred Ki'Lya
77e4e19998 feat: allow inclusion of SVG images 2023-12-27 11:10:55 +01:00
Mildred Ki'Lya
0da912e324
Merge pull request #789 from frappe/mildred/755-taxes-on-payments
feat: #755 Accounting for taxes on payments
2023-12-27 11:05:42 +01:00
Mildred Ki'Lya
2bffcda8ff feat: #755 Accounting for taxes on payments
When defining taxes, it is possible to define an additional payment
account that will be used during payments to move taxes from the
original tax account to this new payment tax account. This allows to
account for taxes only when payment is received.

Now payments can reference tax summary objects that will reference the
two accounts to move funds between when the payment is committed. Reuse
some of the Invoice code to generate these tax summary objects.
2023-12-22 10:07:47 +01:00
Mildred Ki'Lya
5e4873cda8
Merge pull request #780 from mildred/bug-fixes
Various bug fixes
2023-12-21 21:03:21 +01:00
Mildred Ki'Lya
dd2830530b fix(reports): Allow multiple root account to have the same type
In French accounting, multiple root accounts can be of the same type,
ensure that reports take all accounts and not only the first one.
2023-12-05 21:38:25 +01:00
Mildred Ki'Lya
d04b1561cd fix(reports): correct date calculation in AccountReport
fyo.getValue(*, 'fiscalYear{Start,End}') returns a javascript Date object
that encodes the filcal year as local time (01-01 and 12-31 at midnight).
This date must not be converted to UTC else east timezones will return
the day before (12-31 and 12-30). Use locale time values instead.

When computing the monthly/quaterly/half yearly time periods, correct the
dates in the particular case where the last day of the month is selected
as reference date (yields series 12-31 11-30 10-31 09-30 ...) instead of
(12-31 11-30 10-30 09-30 ...).
2023-12-05 21:37:37 +01:00
Akshay
82a2c5e5b6
Merge pull request #709 from akshayitzme/feat-pos-page
feat: point of sale
2023-12-04 15:05:50 +05:30
akshayitzme
7ed2a0841e fix: expectedAmount calculation 2023-12-04 14:42:57 +05:30
akshayitzme
a76953776b fix(ux): disable Pay, Submit buttons on conditions 2023-12-04 14:38:13 +05:30
akshayitzme
97f9fbb80b feat: toast popus on sinv, shpm, pay submit 2023-12-04 14:38:13 +05:30
akshayitzme
df6c472ca4 chore: refactor sinv validations 2023-12-04 14:38:13 +05:30
akshayitzme
8d1e0ca8c8 fix(ux): disable submit button 2023-12-04 14:38:13 +05:30
akshayitzme
9874d71821 chore: add missing types 2023-12-04 14:38:13 +05:30
akshayitzme
f86275da86 feat: validate serial number count in row 2023-12-04 14:38:13 +05:30
akshayitzme
23f9fc97d6 fix: list only inventory items (trackItem enabled) 2023-12-04 14:38:13 +05:30
akshayitzme
819d88f494 fix: failing test 2023-12-04 14:38:13 +05:30
akshayitzme
81be57be32 feat: pos settings validations 2023-12-04 14:38:13 +05:30
akshayitzme
ffbce23f03 fix: minor fixes 2023-12-04 14:38:13 +05:30
akshayitzme
7e7e3ed3cd chore: code cleanup 2023-12-04 14:38:13 +05:30
akshayitzme
7db0cf5ce9 fix: party creation from POS 2023-12-04 14:38:13 +05:30
akshayitzme
8186f12548 feat: pos settings 2023-12-04 14:38:13 +05:30
akshayitzme
db2a97d01e test: pos transacted amount 2023-12-04 14:38:13 +05:30
akshayitzme
238f477aa3 chore: code cleanup 2023-12-04 14:38:13 +05:30
akshayitzme
f50932c6a3 chore: set additional discount field to readonly 2023-12-04 14:38:13 +05:30
akshayitzme
ebaf110ff2 chore: remove POSSettings as its redundant for now 2023-12-04 14:38:13 +05:30
akshayitzme
83615ea50b chore: rename neupos to pos 2023-12-04 14:38:13 +05:30
akshayitzme
b7e4b3d413 fix(ui): modal sizing 2023-12-04 14:38:13 +05:30
akshayitzme
a3c61e0105 chore: remove redundant comment 2023-12-04 14:38:13 +05:30
akshayitzme
65c472500b fix(ui): table overflowing 2023-12-04 14:38:13 +05:30
akshayitzme
3bbf5294c9 fix: add item triggering multiple times 2023-12-04 14:38:13 +05:30
akshayitzme
c483c4bf73 fix: show item discount amount & percent 2023-12-04 14:38:13 +05:30
akshayitzme
b072253755 fix: enable POS only if discounts enabled 2023-12-04 14:38:13 +05:30
akshayitzme
a04e2af555 feat: payment modal 2023-12-04 14:38:13 +05:30
akshayitzme
5f595501f5 fix: balance quantity not updating after submit 2023-12-04 14:38:13 +05:30
akshayitzme
d3bc03a14c incr: added payment, cancel action buttons 2023-12-04 14:38:13 +05:30
akshayitzme
5b66b98f4e incr: selected item row component 2023-12-04 14:38:13 +05:30
akshayitzme
53955045de feat: floating label float input 2023-12-04 14:38:13 +05:30
akshayitzme
f43161adf7 feat: floating label currency input 2023-12-04 14:38:13 +05:30
akshayitzme
0189e99c9b feat: floating label input base 2023-12-04 14:38:12 +05:30
akshayitzme
c12d9e1fb8 feat: selected items table 2023-12-04 14:38:12 +05:30
akshayitzme
1878f26110 feat: items table 2023-12-04 14:38:12 +05:30
akshayitzme
ab3f1e0542 feat: payment modal init 2023-12-04 14:38:12 +05:30
akshayitzme
e7486db8ad incr: added pos open & close modal 2023-12-04 14:38:12 +05:30
akshayitzme
79ef11bb23 incr: pos shift models 2023-12-04 14:38:12 +05:30
akshayitzme
218547269d feat: get pos transacted amount 2023-12-04 14:38:12 +05:30