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
37,931 Commits 459 Branches 1,746 Tags
fa944382c53bdeeb92f2dcc876e2c11ed03e20cc
Commit Graph

37931 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Saqib
d4ae1febe3 fix: gl entries for exchange gain loss (#26734) 2021-07-30 11:21:49 +05:30
Saqib
2d6f2fea5b fix: gl entries for exchange gain loss (#26728) 2021-07-30 10:55:53 +05:30
rohitwaghchaure
50b4b70589 Merge pull request #26727 from deepeshgarg007/pricing_rule_item_group_v13 
fix: Parent condition in pricing rules
 2021-07-29 20:06:47 +05:30
Deepesh Garg
9c7a9f3a13 fix: Parent condition in pricing rules 2021-07-29 20:02:49 +05:30
rohitwaghchaure
bd33bdf210 Merge pull request #26717 from deepeshgarg007/pricing_rule_item_group 
fix: Parent condition in pricing rules
 2021-07-29 19:51:53 +05:30
rohitwaghchaure
b7bbefee15 Merge pull request #26722 from rohitwaghchaure/skip-cancelled-entries-in-report 
fix: remove cancelled entries from Stock and Account Value comparison report
 2021-07-29 19:49:42 +05:30
Ankush
57cd273f7c fix: empty "against account" in Purchase Receipt GLE bp #26712 (#26719) 
* fix: correct field for GLE against account in PR

* fix: remove incorrect field check from reposting
 2021-07-29 19:49:36 +05:30
Ankush
c7df759324 fix: empty "against account" in Purchase Receipt GLE bp #26712 (#26718) 
* fix: correct field for GLE against account in PR

* fix: remove incorrect field check from reposting
 2021-07-29 19:49:12 +05:30
Deepesh Garg
c02e42ff84 fix: Multiple fixes in payment entry 2021-07-29 19:46:17 +05:30
GangaManoj
01ab63189a fix: Check if Purchase Order has Payment Terms Template 2021-07-29 19:28:14 +05:30
GangaManoj
6343950d82 fix: Sider issues 2021-07-29 19:27:54 +05:30
GangaManoj
57df4a3aa1 fix: Rename tests 2021-07-29 19:27:54 +05:30
GangaManoj
0413a5aafd fix: Add test to check if payment terms are fetched when creating a Purchase Invoice 2021-07-29 19:27:52 +05:30
GangaManoj
e94604f517 fix: Add test to check if payment terms are fetched when creating a Purchase Invoice 2021-07-29 19:26:39 +05:30
GangaManoj
293c5e10c3 fix: Add test to check if payment terms are fetched when creating a Sales Invoice 2021-07-29 19:26:39 +05:30
GangaManoj
59d1cc02c5 fix: Add test to check if payment terms are fetched when creating a Sales Invoice 2021-07-29 19:26:39 +05:30
GangaManoj
def7cc6cb3 fix: Modify set_payment_schedule() to include fetch_payment_terms_from_order() 2021-07-29 19:26:39 +05:30
GangaManoj
6333c3bee5 fix: Remove unused imports 2021-07-29 19:26:00 +05:30
GangaManoj
b389c9e375 fix: Fetch Payment Terms from Sales/Purchase Orders 2021-07-29 19:25:29 +05:30
GangaManoj
1011c1b01a fix: Clear Payment Schedule if PI has default Payment Schedule, but linked PO doensn't 2021-07-29 19:24:29 +05:30
rohitwaghchaure
020b8ae110 Merge pull request #26721 from rohitwaghchaure/skip-cancelled-entries-in-report-pre 
fix: remove cancelled entries from Stock and Account Value comparison report
 2021-07-29 19:18:58 +05:30
Rohit Waghchaure
a6d276a06f fix: remove cancelled entries from Stock and Account Value comparison report 2021-07-29 19:16:20 +05:30
Deepesh Garg
19a6d80927 fix: Parent condition in pricing rules 2021-07-29 18:47:16 +05:30
Rohit Waghchaure
379ce70126 fix: remove cancelled entries from Stock and Account Value comparison report 2021-07-29 18:06:17 +05:30
Deepesh Garg
e014d7a00e Merge pull request #26710 from deepeshgarg007/tds_194q_calculations 
fix: TDS calculation for first threshold breach for TDS category 194Q
 2021-07-29 15:55:16 +05:30
Saqib
e39bbc85e1 fix: cannot cancel payment entry if linked with invoices (#26703) 2021-07-29 15:46:25 +05:30
Nabin Hait
237150d1f4 Merge pull request #26630 from rohitwaghchaure/show-progress-completion-status-in-repost-item-valuation 
fix: added progress bar in repost item valuation to check the status
 2021-07-29 15:37:35 +05:30
Deepesh Garg
4c681592bf fix: TDS calculation for first threshold breach for TDS category 194Q 2021-07-29 15:26:19 +05:30
Frappe PR Bot
6a71955b99 chore: change location of backport action (#26705) (#26707) 
(cherry picked from commit e906acdc49)

Co-authored-by: Ankush <ankush@iwebnotes.com>
 2021-07-29 14:28:13 +05:30
Jannat Patel
285463b031 Merge pull request #23129 from anupamvs/email-digest 
fix: multiselect recipients in Email Digest
 2021-07-29 12:36:49 +05:30
Ankush
f8343890b9 feat: don't recompute taxes (#26695) 2021-07-29 11:09:34 +05:30
Ankush
8859574aab feat: don't recompute taxes (#26694) 2021-07-29 11:09:22 +05:30
Anupam
e5fea372af fix: frappe linter 2021-07-29 11:05:38 +05:30
Anupam
b1350af1f6 fix: setup wizard 2021-07-28 23:54:46 +05:30
Deepesh Garg
c6fe601efa Merge pull request #26677 from deepeshgarg007/tds_enhancements_v13 
feat: Enhancements in TDS
 2021-07-28 20:58:42 +05:30
Anupam Kumar
89f2138fbc Merge branch 'version-13-hotfix' into email-digest 2021-07-28 18:24:29 +05:30
Frappe PR Bot
1b6dd84c0a fix(bom): remove manual permission checking (#26689) (#26690) 
get_list does the permission checking.

(cherry picked from commit d95f16ac8f)

Co-authored-by: Ankush <ankush@iwebnotes.com>
 2021-07-28 18:11:11 +05:30
rohitwaghchaure
bfd824c56e Merge pull request #26691 from frappe-pr-bot/backport/version-13-pre-release/26689 
fix(bom): remove manual permission checking
 2021-07-28 18:01:58 +05:30
Deepesh Garg
6ac68f3bc7 fix: Patch 2021-07-28 17:19:00 +05:30
Deepesh Garg
8c7d9efa9d fix: Chnage fieldtype from data to check 2021-07-28 17:18:50 +05:30
Ankush
8ed7a21cd5 fix(bom): remove manual permission checking (#26689) 
get_list does the permission checking.

(cherry picked from commit d95f16ac8f)
 2021-07-28 11:12:27 +00:00
Deepesh Garg
4c0dfdb398 Merge pull request #26687 from deepeshgarg007/fieldtype_fix 
fix: Change fieldtype from data to check
 2021-07-28 15:59:08 +05:30
Deepesh Garg
fa8e6ac7cd fix: Patch 2021-07-28 15:30:05 +05:30
Afshan
90c5cb0a31 fix: documentation link for E Invoicing (#26685) 2021-07-28 13:42:33 +05:30
Afshan
868a6cb26d fix: documentation link for E Invoicing (#26686) 2021-07-28 13:42:13 +05:30
Deepesh Garg
9350249941 fix: Chnage fieldtype from data to check 2021-07-28 12:57:59 +05:30
Deepesh Garg
7365e9704f Merge pull request #26683 from deepeshgarg007/tds_194q_fix 
fix(minor): Consider grand total for threshold check
 2021-07-28 11:56:29 +05:30
Deepesh Garg
1c9e516092 fix: GL Entries for discount amount with item qty greater than 1 2021-07-28 11:38:44 +05:30
Deepesh Garg
441adf763f fix(minor): Consider grand total for threshold check 2021-07-28 10:51:50 +05:30
Deepesh Garg
64af124f88 fix(minor): Consider grand total for threshold check 2021-07-28 10:43:02 +05:30