Ganga Manoj
|
bfb7256143
|
Merge branch 'develop' into enable-discount-accounting
|
2021-07-17 20:01:09 +05:30 |
|
GangaManoj
|
d6956ff075
|
fix: Add test for additional discount applied on taxes
|
2021-07-17 19:49:42 +05:30 |
|
GangaManoj
|
99551e9b7f
|
fix: Add test for additional discount applied on taxes
|
2021-07-17 18:45:21 +05:30 |
|
GangaManoj
|
c4d2dc0da3
|
fix: Remove unnecessary condition
|
2021-07-17 17:47:20 +05:30 |
|
GangaManoj
|
c2ba6897b0
|
fix: Only display Additional Discount Account if Enable Discount Accounting is checked
|
2021-07-17 17:45:35 +05:30 |
|
GangaManoj
|
fa4c03e7a1
|
fix: Create ledger entries for discount applied on taxes in make_tax_gl_entries
|
2021-07-17 17:42:36 +05:30 |
|
GangaManoj
|
7bbc9a886d
|
fix: Filter options for Additional Discount Account
|
2021-07-17 17:41:06 +05:30 |
|
GangaManoj
|
87d448e039
|
fix: Add Additional Discount Account field
|
2021-07-17 17:40:43 +05:30 |
|
GangaManoj
|
b0f21824bc
|
fix: Check all expected GL Entries
|
2021-07-17 17:34:50 +05:30 |
|
Nabin Hait
|
11475487fb
|
fix: merge conflict
|
2021-07-16 15:58:50 +05:30 |
|
GangaManoj
|
40412f7e61
|
fix: Only display Additional Discount Account if Enable Discount Accounting is checked
|
2021-07-15 22:02:43 +05:30 |
|
GangaManoj
|
8e96e2d5a2
|
fix: Filter options for Additional Discount Account
|
2021-07-15 22:01:38 +05:30 |
|
GangaManoj
|
4f2bf98966
|
fix: Add Additional Discount Account field
|
2021-07-15 22:01:02 +05:30 |
|
Deepesh Garg
|
5ad759897f
|
Merge pull request #26471 from deepeshgarg007/payment_entry_taxes_unallocated_amount
fix: Unallocated amount in Payment Entry after taxes
|
2021-07-15 12:38:32 +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 |
|
Saqib
|
bb493a0602
|
Merge pull request #26159 from GangaManoj/asset-credit-note
|
2021-07-14 12:02:02 +05:30 |
|
GangaManoj
|
6357ffe4a1
|
fix: Create asset data
|
2021-07-13 22:31:01 +05:30 |
|
GangaManoj
|
2f4c607fc8
|
fix: Add tests for discount accounting
|
2021-07-13 17:41:29 +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
|
a72589cb7e
|
fix: Add accounts and templates for reverse charge
|
2021-07-13 16:48:06 +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
|
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 |
|
Deepesh Garg
|
7c634f66ca
|
fix: Remove unintentional changes
|
2021-07-13 16:35:47 +05:30 |
|
Deepesh Garg
|
5179f85e63
|
fix: Remove unintentional changes
|
2021-07-13 16:35:47 +05:30 |
|
Deepesh Garg
|
5cc4a201cb
|
fix: Hide amount after tax fields
|
2021-07-13 16:35:47 +05:30 |
|
Deepesh Garg
|
f661d82c00
|
fix: Unallocated amount in Payment Entry after taxes
|
2021-07-13 16:35:47 +05:30 |
|
GangaManoj
|
8f7b0a1753
|
fix: Create common function for discount accounting
|
2021-07-13 03:01:02 +05:30 |
|
GangaManoj
|
65e2b9fee6
|
fix: Filter options for Discount Account
|
2021-07-13 02:14:18 +05:30 |
|
GangaManoj
|
81375aec1f
|
fix: Copy Discount Account from first row
|
2021-07-13 02:09:40 +05:30 |
|
GangaManoj
|
4b8918e8a7
|
fix: Display Discount Account only if Enable Discount Accounting is checked
|
2021-07-13 02:07:46 +05:30 |
|
GangaManoj
|
555852c5ef
|
fix: Add Discount Account field
|
2021-07-13 02:06:03 +05:30 |
|
GangaManoj
|
4fcdc5d129
|
fix: Copy discount account from first row to all Items
|
2021-07-13 01:45:20 +05:30 |
|
GangaManoj
|
b22dba1146
|
fix: Filter Discount Account list
|
2021-07-13 01:45:20 +05:30 |
|
GangaManoj
|
0d5ad3b1bb
|
fix: Add description for Enable Discount Accounting checkbox
|
2021-07-13 01:45:20 +05:30 |
|
Saqib
|
a20999cfbc
|
fix: exchange gain loss not set for advances linked with invoices (#25369)
|
2021-07-12 14:33:23 +05:30 |
|
Afshan
|
7e05bea6a9
|
fix: dunning calculation of grand total when rate of interest is 0% (#26286)
|
2021-07-12 11:11:58 +05:30 |
|
Afshan
|
10473b1195
|
fix: dunning calculation of grand total when rate of interest is 0% (#26285)
|
2021-07-12 11:11:29 +05:30 |
|
Afshan
|
f60c3f0655
|
fix: error popup for COA errors (#26358)
|
2021-07-12 11:07:30 +05:30 |
|
Afshan
|
6467632f60
|
fix: error popup for COA errors (#26357)
|
2021-07-12 11:07:06 +05:30 |
|
GangaManoj
|
ef42e80065
|
fix: Sider issues
|
2021-07-09 19:25:54 +05:30 |
|