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 |
|
Deepesh Garg
|
30f771b26c
|
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into payment_entry_taxes_v12
|
2021-07-12 23:34:13 +05:30 |
|
Deepesh Garg
|
855e9030f2
|
fix: Deduct included taxes from unallocated amount
|
2021-07-12 22:11:57 +05:30 |
|
Saqib
|
7fb64d1645
|
fix: exchange gain loss not set for advances linked with invoices (#26436)
|
2021-07-12 18:33:16 +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
|
bf03671a33
|
fix(report): iterate on accounts only when accounts exist (#26391)
|
2021-07-12 11:10:28 +05:30 |
|
Afshan
|
4b4ac7c051
|
fix(report): iterate on accounts only when accounts exist (#26390)
|
2021-07-12 11:10:00 +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 |
|
Deepesh Garg
|
eae7c1891f
|
fix: Remove unintentional changes
|
2021-07-09 20:08:29 +05:30 |
|
Deepesh Garg
|
c13ac4ab11
|
fix: Remove unintentional changes
|
2021-07-09 20:00:55 +05:30 |
|
GangaManoj
|
ef42e80065
|
fix: Sider issues
|
2021-07-09 19:25:54 +05:30 |
|
Deepesh Garg
|
171ee51507
|
fix: Hide amount after tax fields
|
2021-07-09 18:52:39 +05:30 |
|
Deepesh Garg
|
38fa3a3f89
|
fix: Unallocated amount in Payment Entry after taxes
|
2021-07-09 18:04:24 +05:30 |
|
Saqib
|
13d7043451
|
fix: column 'outstanding_amount' cannot be null (#26404)
|
2021-07-09 15:33:14 +05:30 |
|
Saqib
|
47ccfd6c9d
|
fix: column 'outstanding_amount' cannot be null (#26371)
|
2021-07-09 14:36:13 +05:30 |
|
Subin Tom
|
d53991857c
|
fix: Fixed Budget Variance Graph color from all black to default (#26368)
|
2021-07-09 14:33:00 +05:30 |
|
Saqib
|
f6f924b340
|
Merge branch 'develop' into asset-credit-note
|
2021-07-09 10:38:50 +05:30 |
|
Saqib
|
8f3c7ab402
|
fix: escape quotes while fetching customer emails (#26329) (#26376)
|
2021-07-09 10:35:55 +05:30 |
|
GangaManoj
|
bf245e5e39
|
fix: Clear Payment Schedule if PI has default Payment Schedule, but linked PO doensn't
|
2021-07-09 01:44:34 +05:30 |
|
GangaManoj
|
5a62467a3e
|
feat: Fetch Payment Terms from linked Purchase Order
|
2021-07-09 00:53:42 +05:30 |
|
Rucha Mahabal
|
3888488b36
|
fix: precision for expected values in payment entry test
|
2021-07-08 23:21:48 +05:30 |
|
Rucha Mahabal
|
88929b055c
|
fix: precision for expected values in payment entry test
|
2021-07-08 19:27:53 +05:30 |
|
Saqib
|
eaef371585
|
fix: escape quotes while fetching customer emails (#26329)
|
2021-07-08 10:52:41 +05:30 |
|
GangaManoj
|
cfff3b8726
|
fix: Test GL Entries made when an Asset is returned
|
2021-07-07 21:04:20 +05:30 |
|
GangaManoj
|
3a7f25b218
|
fix: Make functions more readable
|
2021-07-07 15:59:52 +05:30 |
|
Saqib
|
9910968398
|
Merge branch 'develop' into enable-discount-accounting
|
2021-07-07 12:56:11 +05:30 |
|
GangaManoj
|
ca87745be1
|
fix: Rename get_gl_entries_on_asset_movement to get_gl_entries_on_asset_disposal_and_regain
|
2021-07-06 23:43:08 +05:30 |
|
Nabin Hait
|
11d56903e7
|
Merge pull request #25415 from deepeshgarg007/bootstraped_gst_setup
feat(India): Bootstrapped GST Setup
|
2021-07-06 21:44:30 +05:30 |
|
Deepesh Garg
|
bd40669dab
|
Merge pull request #26289 from nemesis189/fixed-budget-variance-report-color
fix: Fixed Budget Variance Graph color from all black to default
|
2021-07-06 20:36:00 +05:30 |
|
GangaManoj
|
3ea4f993b7
|
feat: Toggle display for discount accounting fields according to enable_discount_accounting
|
2021-07-06 20:22:13 +05:30 |
|
Deepesh Garg
|
3636efd7e6
|
Merge pull request #26355 from deepeshgarg007/flaky_test
test: Purchase Invoice advance test case
|
2021-07-06 18:22:26 +05:30 |
|
Deepesh Garg
|
7f794cc0ea
|
fix: Purchase Invoice advance test case
|
2021-07-06 17:58:44 +05:30 |
|
Deepesh Garg
|
a62f94379b
|
Merge pull request #26324 from deepeshgarg007/bank_statement_import_fix_develop
fix: Bank statement import
|
2021-07-06 17:25:21 +05:30 |
|
GangaManoj
|
b08bb1f1a2
|
feat: Filter list for Discount Account field in Items table
|
2021-07-06 16:28:19 +05:30 |
|
Deepesh Garg
|
2f3f87dc66
|
Merge branch 'develop' into multi-company-deferred-revenue_develop
|
2021-07-06 16:14:25 +05:30 |
|
Deepesh Garg
|
26dc02aa38
|
Merge branch 'develop' into bank_statement_import_fix_develop
|
2021-07-06 16:14:13 +05:30 |
|
Deepesh Garg
|
381c05eb87
|
Merge pull request #26322 from deepeshgarg007/party_dashboard_develop
fix: Do not consider cancelled entries in party dashboard
|
2021-07-06 16:13:49 +05:30 |
|
Deepesh Garg
|
8985231a96
|
fix: Rewrite tests
|
2021-07-06 15:34:47 +05:30 |
|
Afshan
|
c8eca8a448
|
fix: remove cancelled entries in consolidated financial statements (#26331)
|
2021-07-06 14:37:57 +05:30 |
|
Afshan
|
53e3435770
|
fix: remove cancelled entries in consolidated financial statements (#26330)
|
2021-07-06 14:37:21 +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 |
|