Code

feat: Enable discount accounting#26579

Code

Merged

deepeshgarg007 merged 51 commits intofrappe:version-13-hotfixfrappe/erpnext:version-13-hotfixfrom deepeshgarg007:discount_accounting_v13deepeshgarg007/erpnext:discount_accounting_v13Copy head branch name to clipboardAug 10, 2021

+458-473

Commits

Commits on Jul 21, 2021

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

  

  GangaManoj

  authored and

  deepeshgarg007

  committed
  e1dc698

  Copy full SHA for e1dc698

• feat(Sales Invoice): Add 'Discount Account' field in Items table

  

  GangaManoj

  authored and

  deepeshgarg007

  committed
  a6690a8

  Copy full SHA for a6690a8

• feat: Create GL Entries for discount accounting

  

  GangaManoj

  authored and

  deepeshgarg007

  committed
  f6a9374

  Copy full SHA for f6a9374

• feat: Filter list for Discount Account field in Items table

  

  GangaManoj

  authored and

  deepeshgarg007

  committed
  c4e5429

  Copy full SHA for c4e5429

• feat: Add Default Discount Account field

  

  GangaManoj

  authored and

  deepeshgarg007

  committed
  acb9e20

  Copy full SHA for acb9e20

• feat: Assign Item's Default Discount Account if present

  

  GangaManoj

  authored and

  deepeshgarg007

  committed
  cdfefa2

  Copy full SHA for cdfefa2

• feat: Toggle display for discount accounting fields according to enable_discount_accounting

  

  GangaManoj

  authored and

  deepeshgarg007

  committed
  f48fa2e

  Copy full SHA for f48fa2e

• fix: Add description for Enable Discount Accounting checkbox

  

  GangaManoj

  authored and

  deepeshgarg007

  committed
  d24b5f7

  Copy full SHA for d24b5f7

• fix: Filter Discount Account list

  

  GangaManoj

  authored and

  deepeshgarg007

  committed
  cfb9417

  Copy full SHA for cfb9417

• fix: Copy discount account from first row to all Items

  

  GangaManoj

  authored and

  deepeshgarg007

  committed
  613d08f

  Copy full SHA for 613d08f

• fix: Move Default Discount Account field to Item Defaults

  

  GangaManoj

  authored and

  deepeshgarg007

  committed
  546c8d1

  Copy full SHA for 546c8d1

• fix: Filter options for Default Discount Account

  

  GangaManoj

  authored and

  deepeshgarg007

  committed
  ee025b5

  Copy full SHA for ee025b5

• fix: Add Discount Account field

  

  GangaManoj

  authored and

  deepeshgarg007

  committed
  bde5c61

  Copy full SHA for bde5c61

• fix: Display Discount Account only if Enable Discount Accounting is checked

  

  GangaManoj

  authored and

  deepeshgarg007

  committed
  e2c83c3

  Copy full SHA for e2c83c3

• fix: Copy Discount Account from first row

  

  GangaManoj

  authored and

  deepeshgarg007

  committed
  377775a

  Copy full SHA for 377775a

• fix: Filter options for Discount Account

  

  GangaManoj

  authored and

  deepeshgarg007

  committed
  e06eb8e

  Copy full SHA for e06eb8e

• fix: Create common function for discount accounting

  

  GangaManoj

  authored and

  deepeshgarg007

  committed
  fd2852e

  Copy full SHA for fd2852e

• fix: Add tests for discount accounting

  

  GangaManoj

  authored and

  deepeshgarg007

  committed
  38e87fc

  Copy full SHA for 38e87fc

• fix: Add Additional Discount Account field

  

  GangaManoj

  authored and

  deepeshgarg007

  committed
  9e788cf

  Copy full SHA for 9e788cf

• fix: Filter options for Additional Discount Account

  

  GangaManoj

  authored and

  deepeshgarg007

  committed
  c1d65cf

  Copy full SHA for c1d65cf

• fix: Only display Additional Discount Account if Enable Discount Accounting is checked

  

  GangaManoj

  authored and

  deepeshgarg007

  committed
  b64787e

  Copy full SHA for b64787e

• fix: Make additional GL Entries for discount applied on taxes

  

  GangaManoj

  authored and

  deepeshgarg007

  committed
  38327fc

  Copy full SHA for 38327fc

• fix: Sider issues

  

  GangaManoj

  authored and

  deepeshgarg007

  committed
  d6f409a

  Copy full SHA for d6f409a

• fix: Check all expected GL Entries

  

  GangaManoj

  authored and

  deepeshgarg007

  committed
  d0d9e83

  Copy full SHA for d0d9e83

• fix: Add Additional Discount Account field

  

  GangaManoj

  authored and

  deepeshgarg007

  committed
  03f2706

  Copy full SHA for 03f2706

• fix: Filter options for Additional Discount Account

  

  GangaManoj

  authored and

  deepeshgarg007

  committed
  ff25683

  Copy full SHA for ff25683

• fix: Create ledger entries for discount applied on taxes in make_tax_gl_entries

  

  GangaManoj

  authored and

  deepeshgarg007

  committed
  9dd2a9e

  Copy full SHA for 9dd2a9e

• fix: Only display Additional Discount Account if Enable Discount Accounting is checked

  

  GangaManoj

  authored and

  deepeshgarg007

  committed
  4da7c58

  Copy full SHA for 4da7c58

• fix: Remove unnecessary condition

  

  GangaManoj

  authored and

  deepeshgarg007

  committed
  d62af77

  Copy full SHA for d62af77

• fix: Add test for additional discount applied on taxes

  

  GangaManoj

  authored and

  deepeshgarg007

  committed
  9965287

  Copy full SHA for 9965287

• fix: Switch debit and credit for ledger entries for discount applied on taxes for Purchase Invoice

  

  GangaManoj

  authored and

  deepeshgarg007

  committed
  99cb89f

  Copy full SHA for 99cb89f

• fix: Add test for additional discount applied on taxes

  

  GangaManoj

  authored and

  deepeshgarg007

  committed
  251f229

  Copy full SHA for 251f229

• fix: Use the item's cost centre instead of the Invoice's

  Show description for b4a8bc8
  

  GangaManoj

  and

  deepeshgarg007

  committed
  b4a8bc8

  Copy full SHA for b4a8bc8

• fix: Use the item's project instead of the invoice's

  Show description for e7e9bda
  

  GangaManoj

  and

  deepeshgarg007

  committed
  e7e9bda

  Copy full SHA for e7e9bda

• fix: GL Entry creation

  Show description for f421dc7
  

  GangaManoj

  and

  deepeshgarg007

  committed
  f421dc7

  Copy full SHA for f421dc7

• fix: Filter for additional_discount_account

  Show description for 821b75f
  

  GangaManoj

  and

  deepeshgarg007

  committed
  821b75f

  Copy full SHA for 821b75f

• fix: Filter for additional_discount_account

  Show description for ed6ebdf
  

  GangaManoj

  and

  deepeshgarg007

  committed
  ed6ebdf

  Copy full SHA for ed6ebdf

• fix: Create GL Entries for Additional Discount Account

  

  GangaManoj

  authored and

  deepeshgarg007

  committed
  566e8f8

  Copy full SHA for 566e8f8

• fix: Make discount_account mandatory if discount accounting is enabled

  

  GangaManoj

  authored and

  deepeshgarg007

  committed
  1f6c05f

  Copy full SHA for 1f6c05f

• fix: Tests

  

  GangaManoj

  authored and

  deepeshgarg007

  committed
  45327e0

  Copy full SHA for 45327e0

• fix: Add mandatory_depends_on property for Discount Account

  

  GangaManoj

  authored and

  deepeshgarg007

  committed
  4fa409e

  Copy full SHA for 4fa409e

• Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into discount_accounting_v13

  deepeshgarg007

  committed
  55325ef

  Copy full SHA for 55325ef

• fix: Syntax Error

  deepeshgarg007

  committed
  fc09d84

  Copy full SHA for fc09d84

• fix: GL For taxes if discount applied on Grand Total

  deepeshgarg007

  committed
  5a06019

  Copy full SHA for 5a06019

• fix: Tests

  deepeshgarg007

  committed
  c765073

  Copy full SHA for c765073

Commits on Jul 22, 2021

• fix: Test Cases

  deepeshgarg007

  committed
  2ff0d3e

  Copy full SHA for 2ff0d3e

Commits on Jul 28, 2021

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

  deepeshgarg007

  committed
  1c9e516

  Copy full SHA for 1c9e516

Commits on Aug 10, 2021

• Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into discount_accounting_v13

  deepeshgarg007

  committed
  9b561ea

  Copy full SHA for 9b561ea

• fix: Add discount account handling in Purchase Invoice

  deepeshgarg007

  committed
  b73bb3e

  Copy full SHA for b73bb3e

• test: Update test cases for discount accounting

  deepeshgarg007

  committed
  428cceb

  Copy full SHA for 428cceb

• fix: Linting issues

  deepeshgarg007

  committed
  797170e

  Copy full SHA for 797170e