feat: Enable discount accounting - #26579

Merged

deepeshgarg007 merged 51 commits into

frappe:version-13-hotfixfrom

deepeshgarg007:discount_accounting_v13

Aug 10, 2021

Commits on Jul 21, 2021

feat(Accounts Settings): Add 'Enable Discount Accounting' checkbox

GangaManoj
authored and
deepeshgarg007
committed
feat(Sales Invoice): Add 'Discount Account' field in Items table

GangaManoj
authored and
deepeshgarg007
committed
feat: Create GL Entries for discount accounting

GangaManoj
authored and
deepeshgarg007
committed
feat: Filter list for Discount Account field in Items table

GangaManoj
authored and
deepeshgarg007
committed
feat: Add Default Discount Account field

GangaManoj
authored and
deepeshgarg007
committed
feat: Assign Item's Default Discount Account if present

GangaManoj
authored and
deepeshgarg007
committed
feat: Toggle display for discount accounting fields according to enable_discount_accounting

GangaManoj
authored and
deepeshgarg007
committed
fix: Add description for Enable Discount Accounting checkbox

GangaManoj
authored and
deepeshgarg007
committed
fix: Filter Discount Account list

GangaManoj
authored and
deepeshgarg007
committed
fix: Copy discount account from first row to all Items

GangaManoj
authored and
deepeshgarg007
committed
fix: Move Default Discount Account field to Item Defaults

GangaManoj
authored and
deepeshgarg007
committed
fix: Filter options for Default Discount Account

GangaManoj
authored and
deepeshgarg007
committed
fix: Add Discount Account field

GangaManoj
authored and
deepeshgarg007
committed
fix: Display Discount Account only if Enable Discount Accounting is checked

GangaManoj
authored and
deepeshgarg007
committed
fix: Copy Discount Account from first row

GangaManoj
authored and
deepeshgarg007
committed
fix: Filter options for Discount Account

GangaManoj
authored and
deepeshgarg007
committed
fix: Create common function for discount accounting

GangaManoj
authored and
deepeshgarg007
committed
fix: Add tests for discount accounting

GangaManoj
authored and
deepeshgarg007
committed
fix: Add Additional Discount Account field

GangaManoj
authored and
deepeshgarg007
committed
fix: Filter options for Additional Discount Account

GangaManoj
authored and
deepeshgarg007
committed
fix: Only display Additional Discount Account if Enable Discount Accounting is checked

GangaManoj
authored and
deepeshgarg007
committed
fix: Make additional GL Entries for discount applied on taxes

GangaManoj
authored and
deepeshgarg007
committed
fix: Sider issues

GangaManoj
authored and
deepeshgarg007
committed
fix: Check all expected GL Entries

GangaManoj
authored and
deepeshgarg007
committed
fix: Add Additional Discount Account field

GangaManoj
authored and
deepeshgarg007
committed
fix: Filter options for Additional Discount Account

GangaManoj
authored and
deepeshgarg007
committed
fix: Create ledger entries for discount applied on taxes in make_tax_gl_entries

GangaManoj
authored and
deepeshgarg007
committed
fix: Only display Additional Discount Account if Enable Discount Accounting is checked

GangaManoj
authored and
deepeshgarg007
committed
fix: Remove unnecessary condition

GangaManoj
authored and
deepeshgarg007
committed
fix: Add test for additional discount applied on taxes

GangaManoj
authored and
deepeshgarg007
committed
fix: Switch debit and credit for ledger entries for discount applied on taxes for Purchase Invoice

GangaManoj
authored and
deepeshgarg007
committed
fix: Add test for additional discount applied on taxes

GangaManoj
authored and
deepeshgarg007
committed
fix: Use the item's cost centre instead of the Invoice's

GangaManoj
and
deepeshgarg007
committed
fix: Use the item's project instead of the invoice's

GangaManoj
and
deepeshgarg007
committed
fix: GL Entry creation

GangaManoj
and
deepeshgarg007
committed
fix: Filter for additional_discount_account

GangaManoj
and
deepeshgarg007
committed
fix: Filter for additional_discount_account

GangaManoj
and
deepeshgarg007
committed
fix: Create GL Entries for Additional Discount Account

GangaManoj
authored and
deepeshgarg007
committed
fix: Make discount_account mandatory if discount accounting is enabled

GangaManoj
authored and
deepeshgarg007
committed
fix: Tests

GangaManoj
authored and
deepeshgarg007
committed
fix: Add mandatory_depends_on property for Discount Account

GangaManoj
authored and
deepeshgarg007
committed
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into discount_accounting_v13
deepeshgarg007
committed
fix: Syntax Error
deepeshgarg007
committed
fix: GL For taxes if discount applied on Grand Total
deepeshgarg007
committed
fix: Tests
deepeshgarg007
committed

Commits on Jul 22, 2021

fix: Test Cases
deepeshgarg007
committed

Commits on Jul 28, 2021

fix: GL Entries for discount amount with item qty greater than 1
deepeshgarg007
committed