6987 Commits

Author SHA1 Message Date
Deepesh Garg
fb72df7dce fix: Exchange rate revaluation posting date and precision fixes 2021-07-26 19:06:40 +05:30
Subin Tom
50b76d04bf fix:Ignore mandatory fields while creating payment reconciliation Journal Entry 2021-07-26 16:52:05 +05:30
Deepesh Garg
67273b9551 fix: Convert null values to empty string on grouping 2021-07-25 21:26:22 +05:30
Deepesh Garg
a8bf61c14e Merge branch 'develop' of https://github.com/frappe/erpnext into exchange_rate_reval_fixes 2021-07-25 19:58:04 +05:30
Deepesh Garg
c485d5c3b7 fix: Ignore GL Entry on cancel 2021-07-25 19:46:50 +05:30
Deepesh Garg
f4701c174a fix: Exchange rate revaluation posting date and precision fixes 2021-07-25 19:46:20 +05:30
Devin Slauenwhite
0d968fabfe fix: missing parameter 'country' 2021-07-22 13:44:09 +05:30
Deepesh Garg
2ff0d3e0eb fix: Test Cases 2021-07-22 10:43:16 +05:30
Deepesh Garg
c765073c2a fix: Tests 2021-07-21 22:28:32 +05:30
Rohit Waghchaure
f3158ea448 fix: removed Remarks column from AR/AP report 2021-07-21 19:47:41 +05:30
Deepesh Garg
5a06019440 fix: GL For taxes if discount applied on Grand Total 2021-07-21 15:25:40 +05:30
Deepesh Garg
fc09d845c5 fix: Syntax Error 2021-07-21 15:25:09 +05:30
GangaManoj
4fa409e019 fix: Add mandatory_depends_on property for Discount Account 2021-07-21 14:26:52 +05:30
GangaManoj
45327e04db fix: Tests 2021-07-21 14:26:52 +05:30
GangaManoj
1f6c05f013 fix: Make discount_account mandatory if discount accounting is enabled 2021-07-21 14:26:52 +05:30
GangaManoj
566e8f8499 fix: Create GL Entries for Additional Discount Account 2021-07-21 14:26:51 +05:30
Ganga Manoj
ed6ebdf5ed fix: Filter for additional_discount_account
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-07-21 14:24:21 +05:30
Ganga Manoj
821b75f1b1 fix: Filter for additional_discount_account
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-07-21 14:24:21 +05:30
GangaManoj
251f229601 fix: Add test for additional discount applied on taxes 2021-07-21 14:23:53 +05:30
GangaManoj
99652876d0 fix: Add test for additional discount applied on taxes 2021-07-21 14:23:53 +05:30
GangaManoj
d62af77ca8 fix: Remove unnecessary condition 2021-07-21 14:23:52 +05:30
GangaManoj
4da7c5882b fix: Only display Additional Discount Account if Enable Discount Accounting is checked 2021-07-21 14:23:52 +05:30
GangaManoj
9dd2a9e897 fix: Create ledger entries for discount applied on taxes in make_tax_gl_entries 2021-07-21 14:23:52 +05:30
GangaManoj
ff25683378 fix: Filter options for Additional Discount Account 2021-07-21 14:23:52 +05:30
GangaManoj
03f2706971 fix: Add Additional Discount Account field 2021-07-21 14:23:52 +05:30
GangaManoj
d0d9e83ad2 fix: Check all expected GL Entries 2021-07-21 14:23:52 +05:30
GangaManoj
b64787ee9c fix: Only display Additional Discount Account if Enable Discount Accounting is checked 2021-07-21 14:23:52 +05:30
GangaManoj
c1d65cfa8d fix: Filter options for Additional Discount Account 2021-07-21 14:23:52 +05:30
GangaManoj
9e788cfdcd fix: Add Additional Discount Account field 2021-07-21 14:23:52 +05:30
GangaManoj
38e87fce09 fix: Add tests for discount accounting 2021-07-21 14:23:51 +05:30
GangaManoj
fd2852e87e fix: Create common function for discount accounting 2021-07-21 14:23:15 +05:30
GangaManoj
e06eb8e6a9 fix: Filter options for Discount Account 2021-07-21 14:22:26 +05:30
GangaManoj
377775ad8e fix: Copy Discount Account from first row 2021-07-21 14:22:25 +05:30
GangaManoj
e2c83c3baf fix: Display Discount Account only if Enable Discount Accounting is checked 2021-07-21 14:21:32 +05:30
GangaManoj
bde5c619db fix: Add Discount Account field 2021-07-21 14:21:31 +05:30
GangaManoj
613d08faad fix: Copy discount account from first row to all Items 2021-07-21 14:21:15 +05:30
GangaManoj
cfb94175a2 fix: Filter Discount Account list 2021-07-21 14:20:32 +05:30
GangaManoj
d24b5f707a fix: Add description for Enable Discount Accounting checkbox 2021-07-21 14:20:32 +05:30
GangaManoj
f48fa2e7f3 feat: Toggle display for discount accounting fields according to enable_discount_accounting 2021-07-21 14:20:06 +05:30
GangaManoj
c4e5429560 feat: Filter list for Discount Account field in Items table 2021-07-21 14:20:06 +05:30
GangaManoj
f6a9374356 feat: Create GL Entries for discount accounting 2021-07-21 14:20:06 +05:30
GangaManoj
a6690a8a3d feat(Sales Invoice): Add 'Discount Account' field in Items table 2021-07-21 14:20:06 +05:30
GangaManoj
e1dc6980d0 feat(Accounts Settings): Add 'Enable Discount Accounting' checkbox 2021-07-21 14:20:06 +05:30
Deepesh Garg
3e109840f9
Merge pull request #26464 from nemesis189/added-dispatch-address-to-sales
feat: Added dispatch address fields in Sales Ord, Sales Inv, Delivery Note for Eway Bill
2021-07-21 10:52:10 +05:30
GangaManoj
46bed5e6cc fix: Add mandatory_depends_on property for Discount Account 2021-07-20 22:03:44 +05:30
Rohit Waghchaure
c14aa45720 fix: incorrect valuation rate calculation in gross profit report 2021-07-20 18:19:15 +05:30
GangaManoj
82d147ea62 fix: Tests 2021-07-20 05:16:33 +05:30
GangaManoj
59ee6958aa fix: Make discount_account mandatory if discount accounting is enabled 2021-07-20 03:52:39 +05:30
GangaManoj
4105e27138 fix: Create GL Entries for Additional Discount Account 2021-07-20 03:46:02 +05:30
Ganga Manoj
1d830dfd92
fix: Filter for additional_discount_account
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-07-19 23:47:58 +05:30