Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41,813 Commits 3 Branches 0 Tags
Commit Graph

41813 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
GangaManoj
c7c90244fe fix: Check if Purchase Order has Payment Terms Template 2021-07-29 19:19:46 +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
Rohit Waghchaure
c1c5a4ae17 fix: remove cancelled entries from Stock and Account Value comparison report 2021-07-29 19:15:34 +05:30
Deepesh Garg
8b7e3775c2
Merge pull request #26712 from ankush/against_acc_pr 
fix: empty "against account" in Purchase Receipt GLE
 2021-07-29 19:10:38 +05:30
Deepesh Garg
19a6d80927 fix: Parent condition in pricing rules 2021-07-29 18:47:16 +05:30
Jannat Patel
e99f68fd7e
fix: expense claim semgrep issue (#26709) 
* fix: expense claim semgrep issue

* fix: sider
 2021-07-29 18:31:38 +05:30
Rohit Waghchaure
379ce70126 fix: remove cancelled entries from Stock and Account Value comparison report 2021-07-29 18:06:17 +05:30
Saqib
bbb96899a5
Merge branch 'develop' into po-payment-terms 2021-07-29 17:23:09 +05:30
Ankush
0bb60b37df
chore: add timeout to GHA workflows (#26714) 2021-07-29 17:15:12 +05:30
Dany Robert
2833a02e0e
Merge branch 'develop' into patch-5 2021-07-29 16:47:28 +05:30
Dany Robert
909995a441
fix: issue with cache.setex 2021-07-29 15:58:27 +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
Ankush Menat
5764b49767
fix: remove incorrect field check from reposting 2021-07-29 15:41:22 +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
Ankush Menat
c3e739caf8
fix: correct field for GLE against account in PR 2021-07-29 15:34:18 +05:30
Deepesh Garg
4c681592bf fix: TDS calculation for first threshold breach for TDS category 194Q 2021-07-29 15:26:19 +05:30
Nabin Hait
ebbabf11e9
Merge pull request #25944 from ruchamahabal/fix-employee-onboarding-status 
fix: boarding status in Employee Onboarding and Separation
 2021-07-29 15:24:54 +05:30
Frappe PR Bot
6a71955b99
chore: change location of backport action (#26705) (#26707) 
(cherry picked from commit e906acdc49a5131680301eb056f16c7821b0b539)

Co-authored-by: Ankush <ankush@iwebnotes.com>
 2021-07-29 14:28:13 +05:30
Ankush
e906acdc49
chore: change location of backport action (#26705) 2021-07-29 13:56:21 +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
rohitwaghchaure
04ff0bc40d
Merge pull request #26264 from noahjacob/mr_allowance_feat 
feat: over transfer allowance for material transfers
 2021-07-29 11:18:37 +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
a6ce1244a0 fix: sider issues 2021-07-29 10:43:21 +05:30
Anuja
5dcd5e48e7 fix: fixed zero tax rate issue by adding custom field 2021-07-29 00:54:48 +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
Deepesh Garg
e79bfbb104
Merge pull request #26665 from ankush/dont_recompute_taxes 
feat: don't recompute taxes
 2021-07-28 19:36:27 +05:30
Anupam Kumar
89f2138fbc
Merge branch 'version-13-hotfix' into email-digest 2021-07-28 18:24:29 +05:30
Anupam
47a651a80f fix: removing depends_on for contact fields 2021-07-28 18:21:19 +05:30
Frappe PR Bot
1b6dd84c0a
fix(bom): remove manual permission checking (#26689) (#26690) 
get_list does the permission checking.

(cherry picked from commit d95f16ac8fb084e33ab936545fc60acd6a4ff618)

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
Anupam
49cfac0ef0 feat: added basic info. of lead in header part 2021-07-28 17:51:35 +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 d95f16ac8fb084e33ab936545fc60acd6a4ff618)
 2021-07-28 11:12:27 +00:00
Ankush
d95f16ac8f
fix(bom): remove manual permission checking (#26689) 
get_list does the permission checking.
 2021-07-28 16:38:59 +05:30
Anupam
f4f0dde838 feat: unlinking dynamic links on trash 2021-07-28 16:16:52 +05:30
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
Anuja
4571fb6635 Merge remote-tracking branch 'origin/sa-vat-report' into sa-vat-report 2021-07-28 15:44:19 +05:30