Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

merge1 #1

Merged
merged 62 commits into from
May 4, 2022
Merged

merge1 #1

merged 62 commits into from
May 4, 2022

Conversation

rootsec1
Copy link
Owner

@rootsec1 rootsec1 commented May 4, 2022

Please provide enough information so that others can review your pull request:

Explain the details for making this change. What existing problem does the pull request solve?

Screenshots/GIFs

deepeshgarg007 and others added 30 commits April 25, 2022 18:18
@deepeshgarg007
fix: Allow multi-currency opening invoices
d3582ea
@ruthra-kumar
feat: add payment terms status rpr to Selling homepage
b0ead45
@deepeshgarg007
fix: Consistent accounting dimensions across Sales and Purchase docs
82a0635
@deepeshgarg007
Merge branch 'develop' into accounting_dimension_consistency
00ace8f
@deepeshgarg007
fix: Ignore custom field validation while setup
67bb290
@deepeshgarg007
chore: Remove domains from Setup
429361c
@deepeshgarg007
refactor: Remove education domain from ERPNext
69d369d
@deepeshgarg007
chore: remove files related to LMS
41e2959
@deepeshgarg007
chore: clean up hooks
60b693f
@deepeshgarg007
chore: Remove course links from training doctypes
8dcbbf1
@deepeshgarg007
chore: Remove references for Assessment Group
848827c
@deepeshgarg007
chore: Remove Fees Doctype
cc867fd
@deepeshgarg007
chore: Remove references for Student doctype
44c54f6
@deepeshgarg007
chore: Add patch to delete education doctypes
3c578a3
@deepeshgarg007
Merge branch 'develop' of https://github.com/frappe/erpnext into educ…
2ee20d3 
…ation_sepration
@deepeshgarg007
Merge branch 'develop' into payment_term_rpt_on_selling
0cb36cc
@deepeshgarg007
Merge pull request #30816 from ruthra-kumar/payment_term_rpt_on_selling
55b2930 
refactor: add payment terms status rpt to Selling homepage
@deepeshgarg007
chore: Clean up patches
f25251b
@deepeshgarg007
Merge pull request #30802 from deepeshgarg007/multi_currency_opening
1622faa 
fix: Allow multi-currency opening invoices
@deepeshgarg007
fix: Multi currency opening invoices
a8452c2
@deepeshgarg007
Merge pull request #30843 from deepeshgarg007/opening_tool_multi_curr…
dafdc9b 
…ency

fix: Multi currency opening invoices
@ruchamahabal
fix(UX): record reason for skipping attendance or marking absent for …
6574294 
…auto attendance (#30844)
@deepeshgarg007
fix: Cost center filter on payment reconciliation
ab94b73
@deepeshgarg007
Merge branch 'develop' into uae_setup_cleaup
bfd053e
@deepeshgarg007
Merge pull request #30815 from deepeshgarg007/uae_setup_cleaup
54d16de 
fix: Ignore custom field validation while setup
@deepeshgarg007
Merge branch 'develop' of https://github.com/frappe/erpnext into cost…
c7edc29 
…_center_filter_p_r
@deepeshgarg007
Merge branch 'develop' of https://github.com/frappe/erpnext into acco…
19d66e5 
…unting_dimension_consistency
@rmehta
fix(minor): discount accounting patch
d746db5
@deepeshgarg007
Merge pull request #30854 from rmehta/fix-discount-accounting-patch
15237fd 
fix(minor): discount accounting patch
@deepeshgarg007
Merge branch 'develop' into accounting_dimension_consistency
fc09c90
sersaber and others added 29 commits May 2, 2022 10:29
@sersaber @ruchamahabal
feat: Copy task color from project template (#30857)
b8a9f82 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
@ankush
Merge branch 'develop' into education_sepration
bae8ab2
@ankush
chore: correct link
f0049da
@ankush
Merge pull request #30830 from deepeshgarg007/education_sepration
bdd55f0 
refactor!: Remove education domain from ERPNext
@ankush
fix: convert default_item_manufacturer to link field (#30835)
dcda556
@rmehta @ankush
fix(minor): update frappe.error_log to new API (#30864)
548afba 
* fix(minor): update frappe.error_log to new API

* refactor: changes for updated log_error api

Co-authored-by: Ankush Menat <ankush@frappe.io>
@ankush @marination
fix(UX): misleading stock entry lables (#30870)
59a5090 
* fix(UX): misleading stock entry lables

* chore: field labels

[skip ci]

Co-authored-by: Marica <maricadsouza221197@gmail.com>

Co-authored-by: Marica <maricadsouza221197@gmail.com>
@deepeshgarg007
test: Add test for payment reconciliation
b440dab
@deepeshgarg007 @mergify
fix: Vat Audit report fixes
a31f577 
(cherry picked from commit d5319a4)
@deepeshgarg007
Merge pull request #30848 from deepeshgarg007/cost_center_filter_p_r
e0fd980 
fix: Cost center filter in payment reconciliation
@deepeshgarg007
Merge pull request #30872 from frappe/mergify/bp/develop/pr-30852
f8db6f0 
fix: Vat Audit report fixes (backport #30852)
@deepeshgarg007
fix: Supply type for overseas invoices with payment of tax
d7cb269
@nextchamp-saqib
fix: supply type for sez invoices with payment of tax
c8aa772
@nextchamp-saqib
Merge pull request #30875 from deepeshgarg007/supply_type_einvoice
2b35427 
fix(India): Supply type for overseas invoices with payment of tax
@maharshivpatel
fix(india): e-invoice generation for registered composition gst categ…
80a13c3 
…ory type (#30814)
@fproldan
Merge pull request #174 from frappe/develop
62225e0 
Fetch upstream
@fproldan
fix: supplier quotation comparission report button
26654e5
@ruchamahabal
fix: payment days calculation for employees joining/leaving mid-month (…
924cf77 
…#30863)
@fproldan
Merge branch 'develop' into issue_25414
288e225
@deepeshgarg007
Merge branch 'develop' of https://github.com/frappe/erpnext into erpn…
2e3e666 
…ext_setup_cleanup
@deepeshgarg007
chore: Resolve conflicts
322f0db
@deepeshgarg007
Merge pull request #30820 from deepeshgarg007/erpnext_setup_cleanup
1b285cf 
chore: Remove domains from setup wizard
@fproldan
Merge branch 'develop' into issue_25414
5604dcc
@deepeshgarg007 @mergify
fix: Ignore loan repayments made from salary slip
e8d6eb2 
(cherry picked from commit b7e1d40)
@deepeshgarg007
Merge pull request #30890 from frappe/mergify/bp/develop/pr-30884
564f5b2 
fix: Ignore loan repayments made from salary slip (backport #30884)
@ankush
fix: show group warehouse in Sales Order (#30891)
91cd5f5
@deepeshgarg007
Merge pull request #30882 from fproldan/issue_25414
8535ad4 
fix: "Supplier Quotation Comparison" - Tools - Select Default Supplier
@deepeshgarg007
fix: Show linked time sheets in sales invoice dashboard
3e38dc7
@deepeshgarg007
Merge pull request #30899 from deepeshgarg007/timesheet_link
826c3f5 
fix: Show linked time sheets in sales invoice dashboard
@rootsec1 rootsec1 merged commit 3b7efd6 into rootsec1:develop May 4, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@rootsec1 @deepeshgarg007 @ruthra-kumar @ruchamahabal @rmehta @sersaber @ankush @nextchamp-saqib @maharshivpatel @fproldan