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

chore: release v14 #37545

Merged
merged 54 commits into from
Oct 19, 2023
Merged

chore: release v14 #37545

merged 54 commits into from
Oct 19, 2023

Conversation

frappe-pr-bot
Copy link
Collaborator

Automated weekly release.

ruthra-kumar and others added 30 commits October 11, 2023 14:34
@ruthra-kumar @mergify
refactor: for non-repost fields, don't validate
8dd2694 
(cherry picked from commit c1782c5)
@ruthra-kumar @mergify
refactor: add validation for Advances in SI/PI
d37a181 
(cherry picked from commit 0cdd643)
@barredterra @mergify
fix: german tranlations of "Is Return"
f9b2355 
(cherry picked from commit 38ca164)
@ruthra-kumar
Merge pull request #37465 from frappe/mergify/bp/version-14-hotfix/pr…
f434548 
…-37459

refactor: add validation for Advances in SI/PI (backport #37459)
@ruthra-kumar
Merge pull request #37464 from frappe/mergify/bp/version-14-hotfix/pr…
020d2e2 
…-37436

refactor: for non-repost fields, don't validate (backport #37436)
@sagarvora
Merge pull request #37468 from frappe/mergify/bp/version-14-hotfix/pr…
bbdf26c 
…-37418

fix: german tranlations of "Is Return" (backport #37418)
@mergify @anandbaburajan
fix: don't set finance books if gross_purchase_amount is not set (bac…
0590f21 
…kport #37480) (#37482)

fix: don't set finance books if gross_purchase_amount is not set (#37480)

(cherry picked from commit 18e3a89)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
@ruthra-kumar @mergify
refactor(patch): ignore links on closing balance patch
cf0ab51 
(cherry picked from commit 17ca875)
@ruthra-kumar
Merge pull request #37488 from frappe/mergify/bp/version-14-hotfix/pr…
c43d0b8 
…-37484

refactor(patch): ignore links on closing balance patch (backport #37484)
@s-aga-r
fix: use flt to ignore TypeError (#37481)
d2b22db
@rtdany10 @mergify
fix(gp): wrong allocated_amount on multi sales person invoice
d266423 
(cherry picked from commit bda82bf)
@ruthra-kumar @mergify
fix: keyerror on gl and pl comparision report
6f143d3 
(cherry picked from commit ad00df0)
@ruthra-kumar
Merge pull request #37501 from frappe/mergify/bp/version-14-hotfix/pr…
cf9acd1 
…-37495

fix: keyerror on gl and pl comparision report (backport #37495)
@ruthra-kumar
Merge pull request #37500 from frappe/mergify/bp/version-14-hotfix/pr…
bae6c5b 
…-37435

fix(gp): wrong `allocated_amount` when grouped by Sales Person (backport #37435)
@s-aga-r
fix: Stock Reconciliation Insufficient Stock Error (#37494)
9406ddb 
* fix: Stock Reconciliation Insufficient Stock Error

* fix: linter

* test: add test case for Stock Reco Batch Item
@s-aga-r
fix: serial and batch no get removed on save of return DN (#37476)
f1814a1 
* fix: serial and batch no get removed on save of return DN

* test: add test case for DN return with product bundle
@ruthra-kumar @mergify
test: use fixtures for sales and purchase invoice
405d152 
(cherry picked from commit c322e5f)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
@ruthra-kumar @mergify
refactor(test): unset accounts frozen date
9d6b434 
(cherry picked from commit fc50b17)
@ruthra-kumar @mergify
refactor(test): use @change_settings in sales invoice
485cb7d 
(cherry picked from commit 58065f3)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
@ruthra-kumar @mergify
refactor(test): fix broken test cases in Sales Invoice
91a5bd8 
(cherry picked from commit 8ebe573)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
@ruthra-kumar @mergify
refactor(test): use @change_settings to fix failing test cases
5699a8d 
(cherry picked from commit de9baef)
@ruthra-kumar @mergify
refactor(test): use test fixture in subscription
b97fdbe 
(cherry picked from commit 3bdf4f6)

# Conflicts:
#	erpnext/accounts/doctype/subscription/test_subscription.py
@ruthra-kumar @mergify
refactor(test): use test fixture in purchase invoice
33becb7 
(cherry picked from commit a2e064d)
@ruthra-kumar @mergify
refactor(test): make use of @change_settings in PI test cases
d783168 
(cherry picked from commit 0207d6e)
@ruthra-kumar @mergify
refactor(test): make sure TDS Payable is available for testing
8d1eac8 
(cherry picked from commit fbabf4a)
@ruthra-kumar
chore: resovle conflicts
7f90353
@ruthra-kumar
fix: inflated total amt in TDS report using back calculation
78e22af
@ruthra-kumar
Merge pull request #37512 from ruthra-kumar/back_calculate_tds
77e7a6c 
fix: inflated total amt in TDS report using back calculation
@ruthra-kumar
chore: fix flaky test case
d1f6d62
@ruthra-kumar
Merge pull request #37511 from frappe/mergify/bp/version-14-hotfix/pr…
65b7fb1 
…-37319

test: use fixtures for sales and purchase invoice (backport #37319)
mergify bot and others added 7 commits October 16, 2023 16:48
@mergify @s-aga-r
perf: index dn_detail in Delivery Note Item (backport #37528) (#3…
001c230 
…7530)

* perf: index `dn_detail` in `Delivery Note Item`

(cherry picked from commit 5b4528e)

# Conflicts:
#	erpnext/stock/doctype/delivery_note_item/delivery_note_item.json

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
@ankush @mergify
fix: keep customer/supplier website role by default
76ef61c 
(cherry picked from commit d2096cf)
@ankush
Merge pull request #37533 from frappe/mergify/bp/version-14-hotfix/pr…
d598dad 
…-37532

fix: keep customer/supplier website role by default (backport #37532)
@deepeshgarg007
Merge pull request #37524 from deepeshgarg007/ksa_vat
5b1016c 
fix: Incorrect vat amount in KSA VAT report
@ruthra-kumar @mergify
refactor: checkbox to toggle exchange rate inheritence in PO->PI
71cb7d3 
(cherry picked from commit 0831552)
@ruthra-kumar
Merge pull request #37540 from frappe/mergify/bp/version-14-hotfix/pr…
4736105 
…-37330

refactor: checkbox to toggle exchange rate inheritence in PO->PI (backport #37330)
@s-aga-r
fix: same Serial No get mapped while creating SO -> DN (#37527)
5025850 
* fix: same Serial No get mapped while creating SO -> DN

* test: add test case for DN with repetitive serial item
mergify bot and others added 14 commits October 17, 2023 15:03
@mergify @s-aga-r
fix(test): project test case (backport #37541) (#37543)
e23710b 
fix(test): project test case

(cherry picked from commit fd6aee1)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
@deepeshgarg007 @mergify
chore: Add accounting dimensions to Sales Order Item table
bfa93cd 
(cherry picked from commit e31db18)

# Conflicts:
#	erpnext/patches.txt
@deepeshgarg007
chore: resolve conflicts
7db6988
@ruthra-kumar @mergify
refactor: use account in key while grouping voucher in ar/ap report
3499089 
(cherry picked from commit 601ab45)
@ruthra-kumar @mergify
test: report output if party is missing
760eab9 
(cherry picked from commit 244cec6)
@ruthra-kumar
Merge pull request #37556 from frappe/mergify/bp/version-14-hotfix/pr…
e2e8949 
…-37549

refactor: use account in key while grouping voucher in ar/ap report (backport #37549)
@mergify @HarryPaulo
fix: billed_qty to show a sum of all invoiced qty from the purchase o…
ac7d6d6 
…rder item. (backport #37539) (#37558)

fix: billed_qty to show a sum of all invoiced qty from the purchase order item.

(cherry picked from commit 8a72f4f)

Co-authored-by: HarryPaulo <paulo_fabris@hotmail.com>
@ruthra-kumar @mergify
refactor: move unreconcile btn inside a drop down
e8d0825 
(cherry picked from commit f2b0ac6)
@ruthra-kumar @mergify
refactor: add unreconcile btn to purchase invoice
54f672e 
(cherry picked from commit 94ce43b)
@ruthra-kumar
Merge pull request #37569 from frappe/mergify/bp/version-14-hotfix/pr…
f6a550f 
…-37105

refactor: move `unreconcile` button into a drop down (backport #37105)
@deepeshgarg007
Merge pull request #37555 from frappe/mergify/bp/version-14-hotfix/pr…
837a6b5 
…-37550

chore: Add accounting dimensions to Sales Order Item table (backport #37550)
@mergify @ankush
fix: e-commerce permissions for address (#37554)
022f85d 
* fix: E-commerce permissions

(cherry picked from commit f4d7499)

# Conflicts:
#	erpnext/controllers/selling_controller.py

* chore: conflicts

---------

Co-authored-by: Ankush Menat <ankush@frappe.io>
@mergify @rohitwaghchaure
fix: payment entry count on supplier dashboard (backport #37571) (#37575
95abd79 
)

fix: payment entry count on supplier dashboard (#37571)

(cherry picked from commit 10311ff)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
@mergify @rohitwaghchaure
fix: Issues related to RFQ and Supplier Quotation on Portal (backport #…
e1504ef 
…37565) (#37577)

* fix: Issues related to RFQ and Supplier Quotation on Portal (#37565)

fix: RFQ and Supplier Quotation for Portal
(cherry picked from commit 2851a41)

* chore: removed backport changes

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
@deepeshgarg007 deepeshgarg007 merged commit fdb2e94 into version-14 Oct 19, 2023
9 of 10 checks passed
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 20, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
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

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

@anandbaburajan anandbaburajan Awaiting requested review from anandbaburajan

Assignees
No one assigned
Labels
accounts stock
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@frappe-pr-bot @deepeshgarg007 @ruthra-kumar @barredterra @sagarvora @s-aga-r @rtdany10 @ankush