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,850 Commits 459 Branches 1,746 Tags
def7183979a90955bdd8953b7e9ecd91fe0d8663
Commit Graph

36850 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
rohitwaghchaure
a51e230f4a Merge pull request #26509 from rohitwaghchaure/fixed-fg-items-not-added-for-batch-item-pre 
fix: FG item not fetched in manufacture entry
 2021-07-15 15:32:59 +05:30
Rohit Waghchaure
9997cce1ea fix: FG item not fetched in manufacture entry 2021-07-15 15:32:21 +05:30
Deepesh Garg
cc73e7d6fa Merge pull request #26472 from deepeshgarg007/payment_entry_taxes_unallocated_amount_v13 
fix: Unallocated amount in Payment Entry after taxes
 2021-07-15 12:38:45 +05:30
Marica
f225196028 Merge pull request #26497 from marination/paging-btns-pre-release 
fix: Paging buttons not working on item group portal page
 2021-07-14 21:19:59 +05:30
marination
f40da4ac4c fix: Paging buttons not working on item group portal page 2021-07-14 20:48:06 +05:30
Deepesh Garg
fd197a3aab fix: Remove unwanted changes 2021-07-14 19:50:28 +05:30
Marica
683d18dd95 Merge pull request #26493 from 18alantom/bp-pr-fix-item-group-portal-issues 
fix: item group portal issues (backport)
 2021-07-14 18:01:19 +05:30
18alantom
9ea5072c52 fix: set item group as a persistent filter 2021-07-14 17:41:38 +05:30
18alantom
b24c0bfbf9 fix: show child item group items on portal 2021-07-14 17:41:32 +05:30
Noah Jacob
03f4db0606 fix: validation check for batch for stock reconciliation type in stock entry(bp #26370 ) (#26488) 
* fix(ux): added filter for valid batch nos.

* fix: not validating batch no if entry type stock reconciliation

* test: validate batch_no
 2021-07-14 16:28:54 +05:30
Saqib
72715956f1 fix: tds computation summary shows cancelled invoices (#26486) 2021-07-14 15:56:20 +05:30
Saqib
59bf2df28e fix: pos item cart dom updates (#26461) 2021-07-14 11:40:58 +05:30
Deepesh Garg
7ff6865817 Merge pull request #26470 from deepeshgarg007/new_company_error_v13 
fix: Errors on parallel requests creation of company for India
 2021-07-13 20:30:06 +05:30
Deepesh Garg
c00d851a88 fix: Unallocated amount for inclusive charges 2021-07-13 16:42:21 +05:30
Deepesh Garg
740d5c6c53 fix: Deduct included taxes from unallocated amount 2021-07-13 16:42:10 +05:30