accounting/books
2
0
Fork 0
mirror of https://github.com/frappe/books.git synced 2025-01-10 02:07:12 +00:00
Code Issues Releases Activity
3,340 Commits 60 Branches 70 Tags 18 MiB
af55219ddd
Commit Graph

685 Commits

Author SHA1 Message Date
akshayitzme
99b1b08cb8 fix: hide pricelist field when its empty and doc is submitted/cancelled 2024-02-07 11:20:02 +05:30
Isaac GC
dd7cb43abc fixing reports/ledger issues 2024-02-06 16:29:44 -08:00
Isaac GC
64ad73b390 Changed how datetime was fixed for various timezones 2024-02-01 15:54:46 -08:00
Isaac GC
9b2382a1a8 UTC Datetime inconsistency for LedgerPostings/Reports 2024-01-30 21:12:33 -08:00
Mildred Ki'Lya
4dfeb98e4a chore: validate and lint typescript 2024-01-08 21:56:03 +01:00
Mildred Ki'Lya
c10edc7132 feat: #151 Add quote object and allow create invoice from it 
Also allow changing a print template type, necessary to create a custom
print template for this.
 2024-01-08 21:56:03 +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
akshayitzme
7ed2a0841e fix: expectedAmount calculation 2023-12-04 14:42:57 +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
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
b072253755 fix: enable POS only if discounts enabled 2023-12-04 14:38:13 +05:30
akshayitzme
79ef11bb23 incr: pos shift models 2023-12-04 14:38:12 +05:30
akshayitzme
b9b2f3d49e fix: added closingAmounts in posShift 2023-12-04 14:38:12 +05:30
akshayitzme
9930a15e6e feat: pos shift models 2023-12-04 14:38:12 +05:30
akshayitzme
b8518c6c7d feat: cash denomination models 2023-12-04 14:38:12 +05:30
Akshay
f5304b1331
Merge pull request #743 from akshayitzme/invoice-return 
feat: invoice return
 2023-11-18 15:21:14 +05:30
akshayitzme
8c46a93b13 fix: paymentType formula for return 2023-11-18 15:10:44 +05:30
akshayitzme
74fcbe6dfd fix(ux): unhide paymentType condition 2023-11-17 12:12:35 +05:30
akshayitzme
67f9232160 fix: show return payments in the belonged list 2023-10-11 11:43:43 +05:30
18alantom
e0b010554c chore: remove removed field from test 2023-09-25 23:59:34 -07:00
18alantom
034d612d29 fix: remove valuation selection 
- book COGS according to FIFO valuation on Shipment
 2023-09-25 23:59:34 -07:00
akshayitzme
04faff1f6f feat: create manual return 2023-09-25 15:45:20 +05:30
akshayitzme
d291b27d30 test: invoice returns 2023-09-23 16:46:40 +05:30
akshayitzme
ca3256bf20 fix: code cleanup 2023-09-23 16:45:40 +05:30
akshayitzme
a1fc203e8b feat: invoice returns 2023-09-23 16:45:22 +05:30
akshayitzme
8cac1ef45f feat: schema changes for invoice return 2023-09-23 16:42:21 +05:30
18alantom
f91e2e89df fix: order in address quick view 2023-08-28 12:48:11 +05:30
18alantom
6bbee25dd5 fix: allow multiple rows of same item in invoice 
- this is to allow for different rates
 2023-08-28 12:03:37 +05:30
akshayitzme
dad0729aae fix: moved _validateHasReturnDocs to validations 2023-08-19 10:33:04 +05:30
akshayitzme
f332b7153b fix: redundant exit cdn for updateItemsReturned 2023-08-19 10:21:41 +05:30
akshayitzme
d41530b654 fix: removed extra condition that checks isReturn 2023-08-19 10:15:58 +05:30
akshayitzme
861493ed90 fix: returnAgainst hiding rule 2023-08-19 10:12:54 +05:30
Alan
1a93ab04a5
Merge pull request #682 from akshayitzme/feat-stock-return 
feat: stock return
 2023-08-18 03:11:25 -07:00
akshayitzme
312f78ff73 fix: validation: cant cancel doc if return is made 2023-08-01 11:15:06 +05:30
akshayitzme
3349f1af10 fix: return status colors 2023-08-01 11:12:13 +05:30
akshayitzme
28ba237aba test: batched & serialized item transfer returns 2023-07-31 17:52:58 +05:30
akshayitzme
8f95e9098c fix: move enable stock returns to inventory 2023-07-31 17:51:59 +05:30
akshayitzme
1cd03aed34 fix: get return balance serial number & batches 2023-07-31 17:51:16 +05:30
18alantom
e840b5bb7c incr: add customization schemas and models 2023-07-31 12:38:32 +05:30
18alantom
202612b57a incr: add feature flag for custom fields 
- also add page and sidebar item
 2023-07-28 12:32:27 +05:30
18alantom
090f309a80 fix(ux): add is group to Account list 
- prevent undefined error in search
 2023-07-16 23:13:12 -07:00
akshayitzme
9a3a14bd51 test: stock return 2023-07-01 15:33:34 +05:30
akshayitzme
3577a8fab0 feat: stock return 2023-07-01 13:01:00 +05:30
18alantom
826a72e1e5 incr: route to lastRoute on open 
- add file Misc singles doc
 2023-06-30 11:57:43 +05:30
Alan
dc053f22c8
Merge pull request #669 from Nahiiko/better-french-version 
Fix #666 : correction of french chart of accounts
 2023-06-26 03:38:06 -07:00
18alantom
d42d0841aa chore: config eslint with vue-eslint and prettier 
- fix prettier issues
 2023-06-23 10:40:16 +05:30
Nahiko
248670e626
Fix #666 : correction of french chart of accounts 2023-06-22 14:18:20 +02:00
18alantom
d0571a2450 chore: fix all fixable eslint errors in remaining non vue files 
- update files to ignore
- delete babel.config.js
 2023-06-22 14:22:54 +05:30
18alantom
d3d5d56f09 feat: report to pdf 2023-06-13 13:37:39 +05:30
Abdallah A. Zaqout
494e25e3d6 if item has discount use it as amount 
its help wen add item first time and discount is zero
 2023-06-11 23:46:21 -07:00
akshayitzme
bef87b0afa chore: remove redundant console.log 2023-06-11 23:44:56 -07:00
18alantom
9a53e9c648 fix: update and fix failing tests 2023-06-06 22:11:54 -07:00
18alantom
b97bbc293d fix: item rate fetch logic 2023-06-06 22:11:54 -07:00
18alantom
7d10951316 fix: ItemPrice -> PriceListItem 
- update and remove fields
 2023-06-06 22:11:54 -07:00
zaqoutabed
bed66cb67a add enabeld state in listview 2023-06-06 20:46:30 -07:00
zaqoutabed
ff61e1b4c7 make it translatable 2023-06-06 20:46:30 -07:00
zaqoutabed
d84a531c96 fix: getItemPrice logic 2023-06-06 20:46:30 -07:00
akshayitzme
fd0fba6ed7 test: price list 2023-06-06 14:29:19 +05:30
akshayitzme
3862fe1006 feat: price list 2023-06-06 14:29:08 +05:30
18alantom
96cad8a3d5 incr: fix default fieldname 
- fix passed date
 2023-06-06 13:49:59 +05:30
18alantom
ce4481b609 feat: add auto stock transfer 2023-06-06 13:14:26 +05:30
18alantom
b3209b8083 feat: create invoice from stock transfer 2023-06-05 11:39:40 +05:30
18alantom
5ec0270540 feat: modal to selct print size 2023-06-02 16:21:27 +05:30
18alantom
fba3fb76c6 fix: prevent cannot read prop rootType 2023-05-30 05:04:08 -07:00
18alantom
5ea8a09615 fix: stock validation issue 
- future stock check was incorrect
 2023-05-10 22:46:01 -07:00
18alantom
f7bd588a02 chore(test): add status change tests 2023-05-09 00:01:18 -07:00
akshayitzme
f2bbe5479e fix: serial number validation 2023-05-09 00:01:18 -07:00
18alantom
2007e4339d fix: Print View sync issue 
- hide multi currency fields cause widget is sufficient
- exchange rate update issue
 2023-05-08 12:00:14 +05:30
18alantom
6a73bf4745 chore(test): check quantity after serial number issued 2023-05-05 11:56:41 +05:30
18alantom
41ed88742f fix: use Delivered as unusable status 
- fix and add status change tests
 2023-05-05 11:55:09 +05:30
18alantom
6869ca9652 fix: shift serial number creation to Transfer 2023-05-05 11:13:04 +05:30
18alantom
4384e32706 fix: serial number validation 
- add serial number creation for strictly incoming
 2023-05-05 10:37:00 +05:30
18alantom
0d80548c36 fix issues in e5a854c 2023-05-04 16:15:12 +05:30
akshayitzme
dbddd73cf3 test: serial number 2023-04-25 12:38:05 +05:30
akshayitzme
17c36f9adb feat: serialNo 2023-04-25 12:37:29 +05:30
18alantom
19aa0d949a chore: rename Quick Payment to Auto Payment 
- ∵ more semantically correct
 2023-04-20 13:12:29 +05:30
18alantom
759bedf764 incr: complete quick payment function 
- fix quick view display update
 2023-04-20 11:55:48 +05:30
18alantom
bc909f630a feat: add default fields for Quick Payments 
- fix punctuation
- improve submit dialog if quick payment
 2023-04-20 11:40:23 +05:30
18alantom
ef3f23bf2b fix: make payment flow 2023-04-19 13:13:46 +05:30
18alantom
0c369309e3 fix(ux): use CommonForm for all entries 
- update search routing, listConfigs
 2023-04-14 13:22:13 +05:30
18alantom
202ddf829b incr: add shortcuts for linked entries 
- fix quickedit shortcut
- most settings to tab
- fix coa auto select in SetupWizard
- remove sections and tabs if empty
 2023-04-14 10:43:18 +05:30
18alantom
f0a6e7bf9e fix(ui): propagate row changes 
- type ExchangeRate.vue
- add BarCode and ExchangeRate widgets to CommonForm
- create (not complete) with LinkedEntries.vue
 2023-04-13 11:46:51 +05:30
18alantom
95e5447d79 refactor: simplify and improve #591 2023-04-10 17:09:07 +05:30
Abdallah A. Zaqout
920d97e52e handle currency for AutoComplete 2023-04-10 02:28:37 -07:00
18alantom
754a1a8e50 fix: capture patch fail errors 
- dont notify user
- catch uncaught promise in migration
- prevent unable to acquire conn error
 2023-04-04 22:10:32 -07:00
18alantom
b460e96c97 fix: StockTransfer item filter 2023-04-04 22:10:32 -07:00
18alantom
4e22ac1d8c fix: backReference filter 
- test manual setting of backReference
 2023-03-29 12:15:47 +05:30
18alantom
0ce9507a4a fix(ux): allow setting of Stock Transfer backref 2023-03-29 11:44:59 +05:30
18alantom
708d172f7c fix(ux): toasts on sync, submit, delete and cancel 
- dont route back on cancel
- dont show dialog on duplicate
- simplify two column form
 2023-03-15 14:03:22 +05:30
18alantom
8ff4a97790 incr: remove redudant print settings 2023-03-13 21:14:10 +05:30
18alantom
dced1ed559 fix(ux): display template compilation errors 
- fix failing tests due vue imports on ts-node compile
- prevent fyo access in templates
- update default template
- change outline colour
 2023-03-13 15:42:19 +05:30
18alantom
f061108565 fix(ui): transition for hints 
- remove fix scrollbar jump on edit toggle
- remove toggle edit toast
- (unrelated) add formula for root type
 2023-03-11 10:31:40 +05:30
18alantom
dabcbcd2ce fix: PrintTemplate list view 
- type ListCell
- improve ListViewConfig types, update where required
 2023-03-07 12:39:49 +05:30
18alantom
f9fbefad0e incr: add Print button to common form 
- remove template setting from print settings
- allow setting default templates
 2023-03-06 15:13:54 +05:30
18alantom
0d3541fcb7 fix: templatebuilder readonly 
- rename variable in evaluateFieldMeta
- add action to templatebuilder
 2023-03-06 14:35:13 +05:30
18alantom
be999269e2 incr: rebase master 
- clearout PrintView
- move doc status and barcode to the left
- fix color field display
 2023-03-06 11:56:54 +05:30
18alantom
44f172316f incr: convert other templates to template.html files 
- delete old invoice template files
 2023-03-06 10:42:55 +05:30
18alantom
f398e190e6 incr: convert Minimal.vue to a template.html file 2023-03-06 10:42:41 +05:30
18alantom
c04098a3eb incr: add scaled container 
- allow changing the scale of the print view
- prevent deletion of non custom templates
 2023-03-06 10:40:03 +05:30
18alantom
e33ca5c313 incr: functions to get hint and values 2023-03-06 10:40:03 +05:30
18alantom
28aa0f135e incr: update routing 
- update PrintTemplate UI code
 2023-03-06 10:40:02 +05:30
18alantom
2e0eb654e9 incr: scaffold template builder 2023-03-06 10:39:13 +05:30
18alantom
539157d122 feat: add link navigation 
- getCreateRoute -> getFormRoute
- update formRoute listconfig
 2023-03-03 17:53:03 +05:30
18alantom
48e9f1b668 fix(ui): Link fieldtype, show display field 
- make address a manually named entry type
- make a few more entry types searchable
- fix dropdown filter undefined issue
- reset settings docs if not saved
- fix ux dropdown toggle on click
 2023-03-02 11:58:08 +05:30
18alantom
e1920bd55e incr: update dynamic hidden 
- delete unused settings tab files
 2023-03-01 13:43:04 +05:30
18alantom
469a7c932b fix(ui): make settings use common form format 2023-03-01 12:23:20 +05:30
18alantom
487f0498a8 refactor: rename Batch Number to Batch 2023-02-28 11:31:04 +05:30
18alantom
71aabec935 refactor: shift batch tests to new file 
- remove redundant code from batch tests
- update settings show reload toast trigger
 2023-02-28 11:25:48 +05:30
18alantom
9a8e423b72 fix: batch quantity validations 2023-02-27 19:16:04 +05:30
18alantom
7029fa79ae fix: valuation calculation when batches 
- use InvoiceItem batch on getStockTransfer
 2023-02-27 18:54:49 +05:30
18alantom
9646580b38 incr: make flags readonly once set 
- remove redundant validation
 2023-02-27 18:44:50 +05:30
18alantom
7ae697849e incr: validate if batch no set 2023-02-27 18:39:18 +05:30
18alantom
869cdebed7 fix: hide UOM conversion and batches behind flags 
- add enable uom conversions flag
- add enable batches flag
- remove batch no from table fields and move to quick edit
 2023-02-27 18:11:35 +05:30
Akshay
fafd7aaddd
Merge branch 'master' into batch-wise-item 2023-02-21 17:59:05 +05:30
18alantom
52bf777d8d fix: update display order, fix formulas 2023-02-21 16:10:06 +05:30
18alantom
140b99a401 incr: update items hidden 
- rebase master add uomConversions
 2023-02-21 15:25:50 +05:30
18alantom
ff061d21ea fix: unit conversion related model props 2023-02-21 15:22:06 +05:30
18alantom
ef073ec770 fix: unit conversion related schema names 2023-02-21 15:22:03 +05:30
akshayitzme
a132705545 feat: uom conversion factor 2023-02-21 15:21:46 +05:30
18alantom
d946c960a0 incr: move Shipments and PRec to common form 
- remove GeneralForm.vue
 2023-02-21 12:12:06 +05:30
akshayitzme
a665313e80 test: batchNumber transactions 2023-02-21 11:55:23 +05:30
18alantom
332307bdd1 incr: user common form for journal entries 2023-02-21 11:51:32 +05:30
akshayitzme
306372db1c test: batchNumber transactions 2023-02-21 11:37:55 +05:30
18alantom
e0141b70d8 incr: use CommonForm for a few docs 
- show errors
- shit setName to after validation
 2023-02-21 11:04:35 +05:30
akshayitzme
09591703e4 refactor: validateStockAvailability 2023-02-17 16:04:46 +05:30
akshayitzme
4fc6c3cf1b refactor: validateBatchWiseStockAvailability 2023-02-17 15:45:36 +05:30
akshayitzme
ec31a3ba65 refactor: batch-wise stock availability validation 2023-02-17 15:30:44 +05:30
akshayitzme
1d188151e8 Merge branch 'batch-wise-item' of https://github.com/wahni-green/books into batch-wise-item 2023-02-17 15:14:17 +05:30
akshayitzme
7cecf4e8df refactor: removed hasBatchNumber validation 2023-02-17 15:09:57 +05:30
akshayitzme
f10399074f refactor: hasBatchNumber validation 2023-02-17 14:56:42 +05:30
akshayitzme
261a3df48d chore: remove code comments 2023-02-17 12:25:47 +05:30
Akshay
961ad62a18 chore: typo in StockMovementItem validations 2023-02-16 21:32:56 -08:00
Akshay
915c1d2e5c
Merge branch 'frappe:master' into batch-wise-item 2023-02-17 10:58:05 +05:30
18alantom
c0ea8d6edc fix: create number series patch bug 
- test manufacture stock movement
 2023-01-31 14:42:54 +05:30
18alantom
39d92038a5 feat: add manufacture stock movement type 2023-01-31 13:36:03 +05:30
akshayitzme
622a4cccd3 fix: hasBatchNumber checkbox validation 2023-01-27 16:06:04 +05:30
akshayitzme
0ac24bfe77 Merge branch 'master' of https://github.com/frappe/books into batch-wise-item 2023-01-18 17:50:04 +05:30
akshayitzme
a8d5d9d7ef fix: batch-wise stock validations 2023-01-18 17:37:31 +05:30
akshayitzme
81d84f4220 fix: item-batch validation 2023-01-18 17:32:26 +05:30
akshayitzme
fc75a8b536 rem: batchNumber from listView 2023-01-17 14:08:26 +05:30
akshayitzme
454e62793e rem: batchNumber hiding rule 2023-01-17 14:04:12 +05:30
18alantom
7656476b6a incr: update item docs with addItem 
- start with barcode widget
 2023-01-16 15:08:02 +05:30
akshayitzme
fef8a0af65 feat: batch-wise stock validation 2023-01-16 14:57:40 +05:30
18alantom
cf4f8d368c feat: add enable barcode 2023-01-16 11:01:12 +05:30
akshayitzme
8a4e1e4f41 feat: BatchNumber schema & batch-wise validation 2023-01-14 16:58:16 +05:30
akshayitzme
08e46592a9 feat: batch transactions 2023-01-13 18:46:52 +05:30
18alantom
4aa92457c7 fix(ui): a few route issues with common docs 2023-01-09 12:33:26 +05:30