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.

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

chore: release v15 #44640

Merged
merged 64 commits into from
Dec 12, 2024
Merged

chore: release v15 #44640

merged 64 commits into from
Dec 12, 2024

Conversation

frappe-pr-bot
Copy link
Collaborator

Automated weekly release.

mahsem and others added 30 commits December 4, 2024 07:36
…-44496

fix: add strings for translation in timesheet.js (backport #44496)
* fix: duplicate required items in the CSV (#44498)

(cherry picked from commit b4534e5)

# Conflicts:
#	erpnext/manufacturing/doctype/production_plan/production_plan.json

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <[email protected]>
… (#44509)

fix: required by date in the reorder material request (#44497)

(cherry picked from commit 4001166)

Co-authored-by: rohitwaghchaure <[email protected]>
…#44504) (#44515)

fix: inv dimensions fields not creating for standard doctype (#44504)

(cherry picked from commit 353610c)

Co-authored-by: rohitwaghchaure <[email protected]>
* Use better description in pos_payment.js

Use Change Amount instead of Change and To Be Paid in pos_payment.js and be consistent with other strings

* change_amount_pos_payment.js

(cherry picked from commit 138ffc4)
…-44500

fix: add labels for translation in sales_order.js (backport #44500)
…-42081

Use better description in pos_payment.js (backport #42081)
…-44501

fix: strings for translation in pos_past_order_summary.js (backport #44501)
…-44512

fix: add label strings for translation in pos_controller.js (backport #44512)
(cherry picked from commit 31efaf6)
…-44503

fix: add strings for translation in pos_item_cart.js (backport #44503)
)

fix: incorrect stock UOM for BOM raw materials (#44528)

fix: incorrect stock uom for BOM raw materials
(cherry picked from commit 5413cf9)

Co-authored-by: rohitwaghchaure <[email protected]>
…44534)

fix: consider zero valuation rate for serial nos (#44532)

(cherry picked from commit 14f2b0a)

Co-authored-by: rohitwaghchaure <[email protected]>
…-44537

fix: add title for translation in  asset.js (backport #44537)
#44546)

fix: update qty in SABB if qty changed in stock reco (#44542)

(cherry picked from commit 7249cf0)

Co-authored-by: rohitwaghchaure <[email protected]>
…port #44540) (#44547)

fix: not able to make PO for returned qty from material request (#44540)

(cherry picked from commit 024c442)

Co-authored-by: rohitwaghchaure <[email protected]>
…44551)

fix: variant qty while making work order from BOM (#44548)

(cherry picked from commit 1571dff)

Co-authored-by: rohitwaghchaure <[email protected]>
… (#44554)

chore: Ignore stock validation for non stock invoices (#44549)

* chore: Ignore stock validation for non stock invoices

* chore: Ignore stock validation for non stock invoices

(cherry picked from commit 1ac2922)

Co-authored-by: Deepesh Garg <[email protected]>
…-44560

fix: add labels for translation in sales_order_analysis.py (backport #44560)
…-44559

fix: add strings for translation payment_terms_status_for_sales_order.py (backport #44559)
mergify bot and others added 13 commits December 8, 2024 16:07
* fix: currency symbol in SCO and SCR (#44577)

(cherry picked from commit 8806d17)

# Conflicts:
#	erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json
#	erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json
#	erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
#	erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json

* chore: fix conflicts

* chore: fix conflicts

* chore: fix conflicts

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <[email protected]>
(cherry picked from commit dda2722)
…-44582

fix: add doc.status for translation (backport #44582)
fix: prevent set_payment_schedule on return documents
…-44513

fix: correct color for draft in list view (backport #44513)
fix: description overwrite on qty change (#44606)

(cherry picked from commit 9ad7962)

Co-authored-by: rohitwaghchaure <[email protected]>
fix: not able to make sales return entry (#44605)

(cherry picked from commit 314c7b8)

Co-authored-by: rohitwaghchaure <[email protected]>
…44617) (#44619)

* fix: do not allow to inward same serial nos multiple times (#44617)

(cherry picked from commit 616bb38)

# Conflicts:
#	erpnext/patches.txt

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <[email protected]>
where "book_advance_payments_in_separate_party_account" is true
fix: only show advance payment entries where "book_advance_payments_in_separate_party_account" is true (backport #44545)
…44620)

fix: 'Use Multi-Level BOM' checkbox default value (#44618)

(cherry picked from commit f5c038c)

Co-authored-by: rohitwaghchaure <[email protected]>
khushi8112 and others added 10 commits December 10, 2024 15:17
fix: precision check for salvage value (backport #44631)
refactor: consider against_voucher_no when voucher_no is filtered (backport 44533)
fix: update free item qty while adding same item in seperate row
… (#44664)

fix: valuation rate for batch in stock reconciliation  (#44657)

fix: valuation rate for batch in stock reco
(cherry picked from commit 15c7d26)

Co-authored-by: rohitwaghchaure <[email protected]>
* fix: make projected qty editable after submit (#44670)

(cherry picked from commit 9ef9ff3)

# Conflicts:
#	erpnext/selling/doctype/quotation_item/quotation_item.json

* chore: fix conflicts

---------

Co-authored-by: Venkatesh <[email protected]>
Co-authored-by: rohitwaghchaure <[email protected]>
fix: validate returned serial nos and batches (#44669)

(cherry picked from commit 4385349)

Co-authored-by: rohitwaghchaure <[email protected]>
@ruthra-kumar ruthra-kumar merged commit 911ec37 into version-15 Dec 12, 2024
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants