Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
37,448 Commits 3 Branches 0 Tags 1 GiB
4105e27138
Commit Graph

37448 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ganga Manoj
8fc9c13734
fix: Filter for additional_discount_account 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-07-19 23:46:38 +05:30
Ganga Manoj
0ea2934cd5
fix: GL Entry creation 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-07-19 23:44:55 +05:30
Ganga Manoj
63b7ecd0fe
fix: Use the item's project instead of the invoice's 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-07-19 23:44:21 +05:30
Ganga Manoj
980798c6fd
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-19 23:43:36 +05:30
Ganga Manoj
bfb7256143
Merge branch 'develop' into enable-discount-accounting 2021-07-17 20:01:09 +05:30
GangaManoj
d6956ff075 fix: Add test for additional discount applied on taxes 2021-07-17 19:49:42 +05:30
GangaManoj
228499369c fix: Switch debit and credit for ledger entries for discount applied on taxes for Purchase Invoice 2021-07-17 19:49:16 +05:30
GangaManoj
99551e9b7f fix: Add test for additional discount applied on taxes 2021-07-17 18:45:21 +05:30
GangaManoj
c4d2dc0da3 fix: Remove unnecessary condition 2021-07-17 17:47:20 +05:30
GangaManoj
c2ba6897b0 fix: Only display Additional Discount Account if Enable Discount Accounting is checked 2021-07-17 17:45:35 +05:30
GangaManoj
fa4c03e7a1 fix: Create ledger entries for discount applied on taxes in make_tax_gl_entries 2021-07-17 17:42:36 +05:30
GangaManoj
7bbc9a886d fix: Filter options for Additional Discount Account 2021-07-17 17:41:06 +05:30
GangaManoj
87d448e039 fix: Add Additional Discount Account field 2021-07-17 17:40:43 +05:30
GangaManoj
b0f21824bc fix: Check all expected GL Entries 2021-07-17 17:34:50 +05:30
Ankush
70a7252469
chore: update CODEOWNERS (#26536) 2021-07-17 12:48:40 +05:30
Nabin Hait
11475487fb fix: merge conflict 2021-07-16 15:58:50 +05:30
Nabin Hait
4e6f49209f Merge branch 'version-13-pre-release' into version-13 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
rohitwaghchaure
ad12fd75a8
Merge pull request #26529 from rohitwaghchaure/patch-to-fix-missing-fg-item-develop 
fix: added patch to fix missing FG item
 2021-07-16 15:12:46 +05:30
Rohit Waghchaure
56e4a88956 fix: added patch to fix missing FG item 2021-07-16 15:06:57 +05:30
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
Ankush
a6d80dcc2a
chore: disable semgrep on push events (#26523) 2021-07-16 13:01:57 +05:30
rohitwaghchaure
9ed36627d2
Merge pull request #26521 from rohitwaghchaure/fixed-fg-items-not-added-for-batch-item-develop 
fix: FG item not fetched in manufacture entry
 2021-07-16 11:40:23 +05:30
Rohit Waghchaure
df5c2b9aaf fix: FG item not fetched in manufacture entry 2021-07-16 11:35:14 +05:30
rohitwaghchaure
bae2890389
Merge pull request #26514 from ankush/backport/develop/pr-26240 
feat: provision to make subcontracted purchase order from the production plan (#26240)
 2021-07-16 11:29:34 +05:30
GangaManoj
6bff653cf0 fix: Sider issues 2021-07-16 02:18:45 +05:30
GangaManoj
857501cbe1 fix: Make additional GL Entries for discount applied on taxes 2021-07-15 22:03:46 +05:30
GangaManoj
40412f7e61 fix: Only display Additional Discount Account if Enable Discount Accounting is checked 2021-07-15 22:02:43 +05:30
GangaManoj
8e96e2d5a2 fix: Filter options for Additional Discount Account 2021-07-15 22:01:38 +05:30
GangaManoj
4f2bf98966 fix: Add Additional Discount Account field 2021-07-15 22:01:02 +05:30
Ankush
1b5f3cf605
ci: make semgrep ignore existing errors (#26516) 2021-07-15 19:30:05 +05:30
Rohit Waghchaure
a748dd9261
feat: provision to make subcontracted purchase order from the production plan 2021-07-15 19:01:36 +05:30
Noah Jacob
d8668f78f4
fix: validation check when no conversion_factor (#26219) 2021-07-15 18:32:15 +05:30
Afshan
c66277e06b
fix: improving ux for additional discount field (#26495) 2021-07-15 18:10:17 +05:30
Noah Jacob
6442b5df11
fix: set default operation time to 0 (#26510) 2021-07-15 16:47:50 +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
Noah Jacob
eeecb25a02
fix: WIP needs to be set before submit on skip_transfer (#26499) 2021-07-15 15:31:42 +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
Deepesh Garg
5ad759897f
Merge pull request #26471 from deepeshgarg007/payment_entry_taxes_unallocated_amount 
fix: Unallocated amount in Payment Entry after taxes
 2021-07-15 12:38:32 +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
Marica
0394c8679c
Merge pull request #26496 from marination/paging-btns 
fix: Paging buttons not working on item group portal page
 2021-07-14 20:51:29 +05:30
marination
f40da4ac4c fix: Paging buttons not working on item group portal page 2021-07-14 20:48:06 +05:30
Marica
dbf835ced3
Merge branch 'develop' into paging-btns 2021-07-14 20:15:22 +05:30