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

85 error while submitting old sales order #43471

Closed
wants to merge 2,688 commits into from
Closed

85 error while submitting old sales order #43471

wants to merge 2,688 commits into from

Conversation

hrishikesh8848
Copy link

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

ruthra-kumar and others added 30 commits August 9, 2024 12:44
@ruthra-kumar
Merge pull request frappe#42695 from frappe/mergify/bp/version-15-hot…
38d80aa 
…fix/pr-42428

fix: Sort lists before calling itertools.groupby (backport frappe#42428)
@mergify @rohitwaghchaure
fix: delivery note creation issue (backport frappe#42696) (frappe#42697)
6f16ae3 
fix: delivery note creation issue (frappe#42696)

(cherry picked from commit b65072c)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
@mergify @rohitwaghchaure
fix: warning message for negative stock (backport frappe#42683) (frap…
a990577 
…pe#42710)

fix: warning message for negative stock (frappe#42683)

(cherry picked from commit deccb00)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
@mergify @rohitwaghchaure
fix: currency changing while making PR from the PO (backport frappe#4…
50b1fa5 
…2718) (frappe#42721)

fix: currency changing while making PR from the PO (frappe#42718)

(cherry picked from commit 17ba0cf)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
@ruthra-kumar @mergify
fix: update 'Paid Amount' on forex payment request
c71f06b 
(cherry picked from commit 7b0dfb2)
@ruthra-kumar @mergify
test: make use of test fixture
47bf2d4 
(cherry picked from commit d6d0a1b)

# Conflicts:
#	erpnext/accounts/doctype/payment_request/test_payment_request.py
@ruthra-kumar @mergify
test: currency conversion on foreign currency account
44745a7 
(cherry picked from commit f913c0f)
@ruthra-kumar
chore: resolve conflict
b41f10c
@ruthra-kumar
Merge pull request frappe#42725 from frappe/mergify/bp/version-15-hot…
dfbc7e8 
…fix/pr-42672

fix: update 'Paid Amount' on forex payment request (backport frappe#42672)
@khushi8112 @mergify
fix: cancel Journal Entry on cancellation of asset value adjustment
a429f2f 
(cherry picked from commit 4b7f1f2)
@khushi8112
Merge pull request frappe#42730 from frappe/mergify/bp/version-15-hot…
d15c535 
…fix/pr-42729

fix: cancel Journal Entry on cancellation of asset value adjustment (backport frappe#42729)
@ruthra-kumar @mergify
refactor: combine vouchers from both ignore
774db56 
(cherry picked from commit 4cc5cd5)
@ruthra-kumar @mergify
refactor: cr and dr note filter in Statement of Accounts
19dfeca 
(cherry picked from commit 0cf478c)

# Conflicts:
#	erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
@ruthra-kumar @mergify
refactor: pass filter to General Ledger
f340124 
(cherry picked from commit 90880c8)
@ruthra-kumar
chore: resolve conflict
70d5593
@vorasmit
Merge pull request frappe#42489 from frappe/mergify/bp/version-15-hot…
91a5c56 
…fix/pr-42050

fix: Update Rate as per Valuation Rate for Internal Transfers only if Setting is Enabled (backport frappe#42050)
@ruthra-kumar
Merge pull request frappe#42735 from frappe/mergify/bp/version-15-hot…
6eaad90 
…fix/pr-42733

refactor: add a new filter flag in Process Statement of Accounts (backport frappe#42733)
@ljain112 @mergify
fix: error message in coa importer
20c1bcd 
(cherry picked from commit 5d0a38d)
@ljain112 @mergify
fix: text color in sales funnel report based on theme
a8de8ae 
(cherry picked from commit 61bc092)
@khushi8112 @mergify
fix: fetch months last date to avoid miscalculation
765c110 
(cherry picked from commit 70ff4e7)
@ruthra-kumar
Merge pull request frappe#42739 from frappe/mergify/bp/version-15-hot…
f109164 
…fix/pr-42590

fix: error message in coa importer (backport frappe#42590)
@ruthra-kumar
Merge pull request frappe#42741 from frappe/mergify/bp/version-15-hot…
0d5ac07 
…fix/pr-42726

fix: text color in sales funnel report based on theme (backport frappe#42726)
@khushi8112
Merge pull request frappe#42742 from frappe/mergify/bp/version-15-hot…
e9b3a24 
…fix/pr-42689

fix: fetch month's last date to avoid miscalculation (backport frappe#42689)
@ruthra-kumar @mergify
fix: force fetch updates for subcription
582fffc 
(cherry picked from commit 1ef890d)
@ruthra-kumar @mergify
refactor: don't process future subscriptions
1f1e934 
(cherry picked from commit 3a11577)
@ruthra-kumar @mergify
chore: minor naming change
ab59b33 
(cherry picked from commit d8b6767)
@ruthra-kumar @mergify
refactor: test for force-fetch on future subscription
a1f9860 
(cherry picked from commit fd68038)
@ruthra-kumar
Merge pull request frappe#42749 from frappe/mergify/bp/version-15-hot…
2258432 
…fix/pr-42221

fix: Force Fetching updates on Subscriptions (backport frappe#42221)
@Nihantra-Patel @mergify
fix: price list when invoice created from timesheet
536dc47 
(cherry picked from commit 39d6df7)
@Nihantra-Patel @mergify
fix: price list when invoice created from timesheet
2926915 
(cherry picked from commit 882227a)
vinod-8848digital and others added 18 commits October 1, 2024 16:29
@vinod-8848digital
fix: sales pipeline analytics
2fb68de
@nilesh8848
fix: resolved issue for delivery note and purchase receipt on submit …
c2e5a82 
…issue
@aasif-patel
Merge pull request #143 from 8848digital/serial_and_batch_number_issue
a04991f 
fix: resolved issue for delivery note and purchase receipt on submit …
@VishvParikh
fix: fix the Sales Funnel page
bece518
@Gopal8848
fix: procurement tracker report fix
dce11d9
@VishvParikh
fix: fix the Opportunity Summary by Sales Stage Report
e843d0e
@Gopal8848
fix: bom stock entry fix
aab2af3
@aasif-patel
Merge pull request #140 from 8848digital/83-sales-person-wise-transac…
a594543 
…tion-summary-report-issue

fix: updated syntax in query
@aasif-patel
Merge pull request #141 from 8848digital/requested_items_to_order_and…
834fc8d 
…_receive_report

fix: requested_items_to_order_and_receive_report
@aasif-patel
Merge pull request #142 from 8848digital/sales_pipeline
8a0b822 
fix: sales pipeline analytics
@aasif-patel
Merge pull request #144 from 8848digital/58-Sales-Funnel-report
d45f45c 
fix: fix the Sales Funnel page
@aasif-patel
Merge pull request #148 from 8848digital/procurement_tracker
9b1801c 
fix: Procurement tracker
@aasif-patel
Merge pull request #149 from 8848digital/63-Opportunity-Summary-by-Sa…
667ec92 
…les-Stage-Report

fix: fix the Opportunity Summary by Sales Stage Report
@aasif-patel
Merge pull request #152 from 8848digital/bom_stock_entry
669a45b 
fix: Bom stock entry report
@aasif-patel
Merge pull request #138 from 8848digital/97-asset-after-submission-of…
a72a35d 
…-asset-maintenance-showing-error

fix:97-asset-after-submission-of-asset-maintenance-showing-error
@tohidmalik002
fix: job card get_current_operation_data api error
629d299
@aasif-patel
Merge pull request #155 from 8848digital/79-job_card
8ccd26d 
fix: job card get_current_operation_data api error
fix:Error while submitting Old Sales Order #85
0f434a8
@s-aga-r s-aga-r closed this Oct 1, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@deepeshgarg007 deepeshgarg007 Awaiting requested review from deepeshgarg007 deepeshgarg007 is a code owner

@rohitwaghchaure rohitwaghchaure Awaiting requested review from rohitwaghchaure rohitwaghchaure is a code owner

@s-aga-r s-aga-r Awaiting requested review from s-aga-r s-aga-r is a code owner

@ruthra-kumar ruthra-kumar Awaiting requested review from ruthra-kumar ruthra-kumar is a code owner

Assignees
No one assigned
Labels
accounts assets buying CRM projects projects module related issue / PR selling stock
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.