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 |
|
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 |
|
GangaManoj
|
2f4c607fc8
|
fix: Add tests for discount accounting
|
2021-07-13 17:41:29 +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
|
9910968398
|
Merge branch 'develop' into enable-discount-accounting
|
2021-07-07 12:56:11 +05:30 |
|
GangaManoj
|
3ea4f993b7
|
feat: Toggle display for discount accounting fields according to enable_discount_accounting
|
2021-07-06 20:22:13 +05:30 |
|
GangaManoj
|
b08bb1f1a2
|
feat: Filter list for Discount Account field in Items table
|
2021-07-06 16:28:19 +05:30 |
|
Deepesh Garg
|
26dc02aa38
|
Merge branch 'develop' into bank_statement_import_fix_develop
|
2021-07-06 16:14:13 +05:30 |
|
Deepesh Garg
|
8985231a96
|
fix: Rewrite tests
|
2021-07-06 15:34:47 +05:30 |
|
GangaManoj
|
cf7579e29f
|
feat: Create GL Entries for discount accounting
|
2021-07-06 00:36:06 +05:30 |
|
Deepesh Garg
|
8c1b764a90
|
fix: Debug tests
|
2021-07-05 21:49:10 +05:30 |
|
GangaManoj
|
6e0d83d925
|
feat(Sales Invoice): Add 'Discount Account' field in Items table
|
2021-07-05 15:09:05 +05:30 |
|
GangaManoj
|
be15e16b84
|
feat(Accounts Settings): Add 'Enable Discount Accounting' checkbox
|
2021-07-05 14:58:32 +05:30 |
|
Deepesh Garg
|
9d295ca939
|
fix: Bank statement import
|
2021-07-04 20:33:36 +05:30 |
|
Nabin Hait
|
fa006402b8
|
fix: merge conflict
|
2021-07-01 12:47:28 +05:30 |
|
Deepesh Garg
|
cf7af62b05
|
fix: Code cleanup
|
2021-06-30 14:14:32 +05:30 |
|
GangaManoj
|
d748e7f49c
|
fix: Create common function for fetching conversion rate details of linked docs
|
2021-06-28 22:39:43 +05:30 |
|
GangaManoj
|
506d5ac3d5
|
fix: Make exchange rate handling more efficient
|
2021-06-28 22:39:43 +05:30 |
|
GangaManoj
|
8f52db788a
|
fix(Purchase Invoice): Improve test for exchange rate difference handling
|
2021-06-28 22:39:41 +05:30 |
|
GangaManoj
|
3f5e7bf6d7
|
fix(Purchase Invoice): Fetch Purchase Receipt details using a function
|
2021-06-28 22:38:59 +05:30 |
|
GangaManoj
|
206313d69b
|
fix(Purchase Invoice): Add test for exchange rate difference handling
|
2021-06-28 22:02:20 +05:30 |
|
GangaManoj
|
6233eaa3bb
|
fix(Purchase Invoice): Fix condition
|
2021-06-28 22:00:49 +05:30 |
|
GangaManoj
|
785a71dcd2
|
fix(Purchase Invoice): Resolve difference caused by change in exchange rate
|
2021-06-28 22:00:49 +05:30 |
|
Saqib
|
4277e4c94b
|
fix: unreachable test case (#26234)
|
2021-06-28 19:10:46 +05:30 |
|
Deepesh Garg
|
dce2676f7a
|
Merge branch 'develop' of https://github.com/frappe/erpnext into internal_transfer_payment_tax
|
2021-06-24 21:08:57 +05:30 |
|
Deepesh Garg
|
c151c67d97
|
fix: Flaky test
|
2021-06-24 21:08:19 +05:30 |
|
Deepesh Garg
|
970d2af7ad
|
Merge pull request #26211 from deepeshgarg007/include_dimension_filter
fix: Account filter not working with accounting dimension filter
|
2021-06-24 19:55:12 +05:30 |
|
Deepesh Garg
|
1564d39bf4
|
Merge pull request #26188 from deepeshgarg007/internal_transfer_payment_tax_v13
fix: Taxes on Internal Transfer payment entry
|
2021-06-24 19:51:48 +05:30 |
|
Deepesh Garg
|
bdba29bab5
|
fix: Account filter not working with accounting dimension filter
|
2021-06-24 19:48:11 +05:30 |
|
Deepesh Garg
|
9382b1f154
|
fix: Flaky test
|
2021-06-24 19:03:22 +05:30 |
|
Anuja Pawar
|
a50196bcd9
|
fix: dunning permission error in payment entry (#26204)
|
2021-06-24 18:25:16 +05:30 |
|
Deepesh Garg
|
ab7a16a952
|
Merge pull request #26180 from deepeshgarg007/pi_billing_address_develop
fix: Billing address not fetched in Purchase Invoice
|
2021-06-24 12:13:17 +05:30 |
|
Deepesh Garg
|
9d8e8f8bdf
|
fix: Do not show received amount after tax for internal tarnsfers
|
2021-06-24 12:02:39 +05:30 |
|
Deepesh Garg
|
bd9317956b
|
fix: Taxes on Internal Transfer payment entry
|
2021-06-24 12:02:32 +05:30 |
|