Afshan
|
9168bb369a
|
fix: filter by accounts with group by accounts (#26439)
|
2021-07-14 13:57:14 +05:30 |
|
Saqib
|
d86cdb4368
|
Merge branch 'develop' into payment_entry_taxes_unallocated_amount
|
2021-07-14 13:55:09 +05:30 |
|
Saqib
|
be773f4052
|
Merge branch 'develop' into bootstrapped_gst_setup_develop
|
2021-07-14 13:55:00 +05:30 |
|
Saqib
|
c978fdf3df
|
fix: test fails due to improper gain loss account set (#26482)
|
2021-07-14 13:53:30 +05:30 |
|
Frappe
|
1dfb5eb535
|
feat: South Africa VAT report
|
2021-07-14 12:33:45 +05:30 |
|
Saqib
|
bb493a0602
|
Merge pull request #26159 from GangaManoj/asset-credit-note
|
2021-07-14 12:02:02 +05:30 |
|
Ganga Manoj
|
05d7c69aa2
|
fix: delete child docs when parent doc is deleted (#26239)
|
2021-07-14 11:54:27 +05:30 |
|
Ganga Manoj
|
f4fc1384a5
|
fix(Issue): Calculate first_response_time based on working hours (#25991)
|
2021-07-14 11:43:10 +05:30 |
|
Saqib
|
59bf2df28e
|
fix: pos item cart dom updates (#26461)
|
2021-07-14 11:40:58 +05:30 |
|
Saqib
|
cbf7e1b676
|
fix: pos item cart dom updates (#26460)
|
2021-07-14 11:40:47 +05:30 |
|
Anurag Mishra
|
adfdc71844
|
fix: Tax calculation for Recurring additional salary (#24206)
* fix: Tax calculation for Recurring additional salary
* fix: conflicts
|
2021-07-14 09:59:41 +05:30 |
|
rohitwaghchaure
|
96eb147bb6
|
Merge pull request #26457 from rohitwaghchaure/fixed-multi-currency-issue
fix: multi-currency issue
|
2021-07-13 23:01:30 +05:30 |
|
GangaManoj
|
6357ffe4a1
|
fix: Create asset data
|
2021-07-13 22:31:01 +05:30 |
|
Deepesh Garg
|
7ff6865817
|
Merge pull request #26470 from deepeshgarg007/new_company_error_v13
fix: Errors on parallel requests creation of company for India
|
2021-07-13 20:30:06 +05:30 |
|
Deepesh Garg
|
75f66f78d7
|
Merge pull request #26420 from deepeshgarg007/new_company_error
fix: Errors on parallel requests creation of company for India
|
2021-07-13 20:29:56 +05:30 |
|
GangaManoj
|
2f4c607fc8
|
fix: Add tests for discount accounting
|
2021-07-13 17:41:29 +05:30 |
|
Deepesh Garg
|
3b68735e25
|
Merge branch 'develop' into payment_entry_taxes_unallocated_amount
|
2021-07-13 17:33:06 +05:30 |
|
Deepesh Garg
|
1ee63f31e5
|
Merge branch 'develop' of https://github.com/frappe/erpnext into bootstrapped_gst_setup_develop
|
2021-07-13 16:51:47 +05:30 |
|
Deepesh Garg
|
2de11fbbc4
|
fix: Test Cases
|
2021-07-13 16:50:35 +05:30 |
|
Deepesh Garg
|
3ef394c556
|
fix: Test cases
|
2021-07-13 16:50:35 +05:30 |
|
Deepesh Garg
|
b2af6b4583
|
fix: Create mode of payment if doesn't exists
|
2021-07-13 16:50:35 +05:30 |
|
Deepesh Garg
|
8f6f86aff4
|
fix: Test cases for M-pesa
|
2021-07-13 16:50:35 +05:30 |
|
Deepesh Garg
|
779d2afa60
|
fix: Update account heads in GST test cases
|
2021-07-13 16:50:04 +05:30 |
|
Deepesh Garg
|
bb679cc036
|
fix: Add validate bank account method back
|
2021-07-13 16:49:21 +05:30 |
|
Deepesh Garg
|
2908f2ee20
|
fix: Revert Changes
|
2021-07-13 16:49:21 +05:30 |
|
Deepesh Garg
|
0dfea4d134
|
fix: Test Cases
|
2021-07-13 16:49:21 +05:30 |
|
Deepesh Garg
|
22683cf19b
|
fix: Tests
|
2021-07-13 16:49:21 +05:30 |
|
Deepesh Garg
|
b71497067d
|
chore: Add comments
|
2021-07-13 16:49:21 +05:30 |
|
Deepesh Garg
|
87f4df80ea
|
fix: Move tax categories up in country wise json
|
2021-07-13 16:49:21 +05:30 |
|
Deepesh Garg
|
ed54e4e276
|
fix: Check for tax category
|
2021-07-13 16:48:44 +05:30 |
|
Deepesh Garg
|
269510b98f
|
fix: Regional settings setup
|
2021-07-13 16:48:22 +05:30 |
|
Deepesh Garg
|
a72589cb7e
|
fix: Add accounts and templates for reverse charge
|
2021-07-13 16:48:06 +05:30 |
|
Deepesh Garg
|
0380cca3b7
|
fix: Add GST accounts to GST Settings
|
2021-07-13 16:47:38 +05:30 |
|
Deepesh Garg
|
96300fa791
|
fix: Add validation for GST Settings
|
2021-07-13 16:47:38 +05:30 |
|
Deepesh Garg
|
1001f29784
|
fix: Gracefully handle duplicate bank account name to make setup faster
|
2021-07-13 16:47:38 +05:30 |
|
Deepesh Garg
|
8ed1afd93d
|
fix: Remove redundant get_doc
|
2021-07-13 16:47:38 +05:30 |
|
Deepesh Garg
|
8fd2d8b5d0
|
fix: Ignore validations for Tax Setup
|
2021-07-13 16:47:38 +05:30 |
|
Deepesh Garg
|
a90e5fd2e1
|
fix: Issues on new company setup
|
2021-07-13 16:47:38 +05:30 |
|
Deepesh Garg
|
e166c264b4
|
fix: Update country-wise-tax JSON and tax setup
|
2021-07-13 16:47:38 +05:30 |
|
Deepesh Garg
|
3031535a24
|
fix: Add tax categories on company setup
|
2021-07-13 16:47:36 +05:30 |
|
Deepesh Garg
|
de8c6eb0da
|
fix: Item Tax templates for GST
|
2021-07-13 16:46:30 +05:30 |
|
Deepesh Garg
|
2a9726b09f
|
feat(India): Separate Input and Output GST tax accounts
|
2021-07-13 16:46:30 +05:30 |
|
Deepesh Garg
|
c00d851a88
|
fix: Unallocated amount for inclusive charges
|
2021-07-13 16:42:21 +05:30 |
|
Deepesh Garg
|
740d5c6c53
|
fix: Deduct included taxes from unallocated amount
|
2021-07-13 16:42:10 +05:30 |
|
Deepesh Garg
|
01c89eaad9
|
fix: Remove unintentional changes
|
2021-07-13 16:42:10 +05:30 |
|
Deepesh Garg
|
2f350bf450
|
fix: Remove unintentional changes
|
2021-07-13 16:42:10 +05:30 |
|
Deepesh Garg
|
9513d61a50
|
fix: Hide amount after tax fields
|
2021-07-13 16:42:10 +05:30 |
|
Deepesh Garg
|
51ae46f0de
|
fix: Unallocated amount in Payment Entry after taxes
|
2021-07-13 16:42:10 +05:30 |
|
Deepesh Garg
|
4478c547bf
|
fix: Unallocated amount for inclusive charges
|
2021-07-13 16:35:58 +05:30 |
|
Deepesh Garg
|
754f432d97
|
fix: Deduct included taxes from unallocated amount
|
2021-07-13 16:35:47 +05:30 |
|