nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-09 00:01:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,865 Commits 459 Branches 1,746 Tags
f229e627035f3e0071ddf81f339e37da3414f42f
Commit Graph

36865 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
GangaManoj
f229e62703 fix: Tests 2021-07-22 10:44:08 +05:30
GangaManoj
da72b9b840 fix: Make discount_account mandatory if discount accounting is enabled 2021-07-22 10:44:08 +05:30
GangaManoj
94c492c085 fix: Create GL Entries for Additional Discount Account 2021-07-22 10:44:08 +05:30
Ganga Manoj
bc187c4b84 fix: Filter for additional_discount_account 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-07-22 10:44:08 +05:30
Ganga Manoj
8e108473c2 fix: Filter for additional_discount_account 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-07-22 10:44:08 +05:30
Ganga Manoj
b965bcc6e8 fix: GL Entry creation 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-07-22 10:44:08 +05:30
Ganga Manoj
8387613fdf fix: Use the item's project instead of the invoice's 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-07-22 10:44:08 +05:30
Ganga Manoj
c03f8c9e3f fix: Use the item's cost centre instead of the Invoice's 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-07-22 10:44:08 +05:30
GangaManoj
20691f0ba2 fix: Add test for additional discount applied on taxes 2021-07-22 10:44:08 +05:30
GangaManoj
3c83691353 fix: Switch debit and credit for ledger entries for discount applied on taxes for Purchase Invoice 2021-07-22 10:44:08 +05:30
GangaManoj
f1ebe4ef8b fix: Add test for additional discount applied on taxes 2021-07-22 10:44:08 +05:30
GangaManoj
86c2cf5ab9 fix: Remove unnecessary condition 2021-07-22 10:44:08 +05:30
GangaManoj
2725e61087 fix: Only display Additional Discount Account if Enable Discount Accounting is checked 2021-07-22 10:44:08 +05:30
GangaManoj
d1f1345a7f fix: Create ledger entries for discount applied on taxes in make_tax_gl_entries 2021-07-22 10:44:08 +05:30
GangaManoj
d82fd8ded1 fix: Filter options for Additional Discount Account 2021-07-22 10:44:08 +05:30
GangaManoj
def7183979 fix: Add Additional Discount Account field 2021-07-22 10:44:08 +05:30
GangaManoj
d2541caded fix: Check all expected GL Entries 2021-07-22 10:44:08 +05:30
GangaManoj
fe515321f2 fix: Sider issues 2021-07-22 10:44:08 +05:30
GangaManoj
02e7de0e45 fix: Make additional GL Entries for discount applied on taxes 2021-07-22 10:44:08 +05:30
GangaManoj
4a294bead2 fix: Only display Additional Discount Account if Enable Discount Accounting is checked 2021-07-22 10:44:08 +05:30
GangaManoj
f7c73a3069 fix: Filter options for Additional Discount Account 2021-07-22 10:44:08 +05:30
GangaManoj
e042ed69a1 fix: Add Additional Discount Account field 2021-07-22 10:44:08 +05:30
GangaManoj
8635d39865 fix: Add tests for discount accounting 2021-07-22 10:44:08 +05:30
GangaManoj
beeaf0b04a fix: Create common function for discount accounting 2021-07-22 10:44:08 +05:30
GangaManoj
96812893f1 fix: Filter options for Discount Account 2021-07-22 10:44:08 +05:30
GangaManoj
a2595a0931 fix: Copy Discount Account from first row 2021-07-22 10:44:08 +05:30
GangaManoj
509d507d6e fix: Display Discount Account only if Enable Discount Accounting is checked 2021-07-22 10:44:08 +05:30
GangaManoj
e33be287b9 fix: Add Discount Account field 2021-07-22 10:44:08 +05:30
GangaManoj
31256698a9 fix: Filter options for Default Discount Account 2021-07-22 10:44:08 +05:30
GangaManoj
78f7c92549 fix: Move Default Discount Account field to Item Defaults 2021-07-22 10:44:08 +05:30
GangaManoj
9e1de9c206 fix: Copy discount account from first row to all Items 2021-07-22 10:44:08 +05:30
GangaManoj
6fab603a23 fix: Filter Discount Account list 2021-07-22 10:44:08 +05:30
GangaManoj
fa4d314f7b fix: Add description for Enable Discount Accounting checkbox 2021-07-22 10:44:08 +05:30
GangaManoj
55690c8165 feat: Toggle display for discount accounting fields according to enable_discount_accounting 2021-07-22 10:44:08 +05:30
GangaManoj
cb65c6ce64 feat: Assign Item's Default Discount Account if present 2021-07-22 10:44:08 +05:30
GangaManoj
9871e124d0 feat: Add Default Discount Account field 2021-07-22 10:44:08 +05:30
GangaManoj
08fddac884 feat: Filter list for Discount Account field in Items table 2021-07-22 10:44:08 +05:30
GangaManoj
d1b396637c feat: Create GL Entries for discount accounting 2021-07-22 10:44:08 +05:30
GangaManoj
27bbb7002d feat(Sales Invoice): Add 'Discount Account' field in Items table 2021-07-22 10:44:08 +05:30
GangaManoj
2d7f04dd1a feat(Accounts Settings): Add 'Enable Discount Accounting' checkbox 2021-07-22 10:44:08 +05:30
Deepesh Garg
d99d56b0e8 Merge branch 'version-13' of https://github.com/frappe/erpnext into enterprise-staging 2021-07-20 11:36:36 +05:30
Nabin Hait
4e6f49209f Merge branch 'version-13-pre-release' into version-13 v13.7.0 2021-07-16 15:21:33 +05:30
Nabin Hait
e079a1bb33 bumped to version 13.7.0 2021-07-16 15:41:33 +05:50
Nabin Hait
e8abb201c1 Merge pull request #26526 from rohitwaghchaure/patch-to-fix-missing-fg-item-pre 
fix: added patch to fix missing FG item
 2021-07-16 15:05:16 +05:30
Rohit Waghchaure
0c6ca09e06 fix: added patch to fix missing FG item 2021-07-16 14:33:25 +05:30
Nabin Hait
f6d6897f34 Merge pull request #26525 from nabinhait/change-log-v13-7-0 
chore: Added change log for v13.7.0
 2021-07-16 13:09:31 +05:30
Nabin Hait
a0df79ee8c chore: Added change log for v13.7.0 2021-07-16 13:07:39 +05:30
Deepesh Garg
958edc7b83 fix: Use update flag for company dependant fixtures 2021-07-15 19:18:54 +05:30
Deepesh Garg
2ac0a1a1a0 fix: Error on creation of company for India 2021-07-15 19:17:55 +05:30
Noah Jacob
2f775ee53c fix: WIP needs to be set before submit on skip_transfer (#26507) 2021-07-15 16:29:28 +05:30