Compare commits

...

19 Commits

Author SHA1 Message Date
diptanilsaha
a43c9c9681 Merge branch 'version-15' into 53117_resolve_conflict 2026-03-03 23:03:30 +05:30
Frappe PR Bot
b2a8af5ba6 chore(release): Bumped to Version 15.99.1
## [15.99.1](https://github.com/frappe/erpnext/compare/v15.99.0...v15.99.1) (2026-02-27)

### Bug Fixes

* old stock reco entries causing issue in the stock balance report ([bba0a6d](bba0a6d950))
2026-02-27 10:50:36 +00:00
rohitwaghchaure
45eed5fd81 Merge pull request #53025 from frappe/mergify/bp/version-15/pr-53020
fix: old stock reco entries causing issue in the stock balance report (backport #53013) (backport #53020)
2026-02-27 16:18:40 +05:30
rohitwaghchaure
435c852b54 chore: fix conflicts
Added a method to prepare stock reconciliation voucher-wise count and updated logic for handling stock reconciliation entries.

(cherry picked from commit cc6fbde463)
2026-02-27 10:32:36 +00:00
Rohit Waghchaure
bba0a6d950 fix: old stock reco entries causing issue in the stock balance report
(cherry picked from commit 0874cbc268)

# Conflicts:
#	erpnext/stock/report/stock_balance/stock_balance.py
(cherry picked from commit b712467049)
2026-02-27 10:32:36 +00:00
Frappe PR Bot
7ad770a83a chore(release): Bumped to Version 15.99.0
# [15.99.0](https://github.com/frappe/erpnext/compare/v15.98.1...v15.99.0) (2026-02-25)

### Bug Fixes

* **`fiscal_year_company`:** made `company` field mandatory ([2fffc94](2fffc9448b))
* **`fiscal_year`:** `Fiscal Year` auto-generation and notification ([397f39e](397f39e271))
* `update_stock` behaviour on selling invoices ([82bcb62](82bcb62b21))
* Add handling for Sales Invoice Item quantity field ([41c7890](41c7890a6d))
* add purchase invoice as well ([2fc3e30](2fc3e30f9f))
* avoid duplicate taxes and charges rows in payment entry (backport [#52178](https://github.com/frappe/erpnext/issues/52178)) ([#52318](https://github.com/frappe/erpnext/issues/52318)) ([946c355](946c3554b1))
* better permissions on make payment request ([ce7101f](ce7101f555))
* bug with comparison regarding `None` values and empty string ([852c200](852c200ee0))
* check gl account of an associated bank account in bank transaction ([6b286ae](6b286ae03d))
* enfore permission on make_payment_request ([4602919](460291990a))
* get employee email with priority if preferred is not set ([943e2c0](943e2c00bc))
* ignore permissions instead of saving parent ([bce77b6](bce77b6117))
* inconsistent label name between parent and child ([1bf608f](1bf608f835))
* **manufacturing:** remove delete query of job card & batch and serial no  ([#52840](https://github.com/frappe/erpnext/issues/52840)) ([e30b2f1](e30b2f1d04))
* **manufacturing:** set pick list purpose while creating it from work order ([33d48c5](33d48c5575))
* **manufacturing:** update status for work order before calculating planned qty ([b3bcfd5](b3bcfd5a64))
* permission issue for quotation item during update item ([5a3c027](5a3c027432))
* prevent precision errors in  discount distribution with inclusive tax ([61ac180](61ac18069b))
* **Purchase Receipt:** copy project from first row when adding items ([fd48fb4](fd48fb49b9))
* remove supplier invoice date/posting date validation ([dcf4ac6](dcf4ac66bb))
* reservation based on field should be read only in SRE ([c3626d6](c3626d67ca))
* restore missing  `has_permission` import ([0ba965a](0ba965aae6))
* **sales-order:** update quotation status while cancelling sales order ([#52822](https://github.com/frappe/erpnext/issues/52822)) ([2420122](2420122f0e))
* **sales-order:** update quotation status while cancelling sales order (backport [#52822](https://github.com/frappe/erpnext/issues/52822)) ([#52918](https://github.com/frappe/erpnext/issues/52918)) ([3ae5de7](3ae5de7b11))
* sensible insufficient stock message in pick list ([3bafa36](3bafa360b2))
* setup fails to set abbr to departments ([c432506](c432506912))
* skip empty dimension values in exchange gain loss ([09ba980](09ba9808de))
* typo ([3893900](38939005ca))
* unable to submit subcontracting order if created from material request ([0422117](0422117003))
* update items fetches wrong item code ([97a4a5f](97a4a5f1cc))
* **work_order:** update returned qty ([bb1a655](bb1a655efb))

### Features

* **Journal Entry Account:** add Bank Transaction as Reference Type (backport [#52760](https://github.com/frappe/erpnext/issues/52760)) ([#52815](https://github.com/frappe/erpnext/issues/52815)) ([7032197](7032197f97))
* retrieve employee basic contact information ([4b2ac62](4b2ac626c5))
* retrieve employee contact details ([caa03ef](caa03efbe1))
* update item button addition for quotation (backport [#50976](https://github.com/frappe/erpnext/issues/50976)) ([#52810](https://github.com/frappe/erpnext/issues/52810)) ([800e384](800e38453b))
* update item button addition for quotation (backport [#50976](https://github.com/frappe/erpnext/issues/50976)) ([#52810](https://github.com/frappe/erpnext/issues/52810)) ([e2a1a7a](e2a1a7a36d))

### Reverts

* Revert "feat: update item button addition for quotation (backport [#50976](https://github.com/frappe/erpnext/issues/50976)) ([#5](https://github.com/frappe/erpnext/issues/5)…" ([656b1bc](656b1bcede))
2026-02-25 06:29:35 +00:00
ruthra kumar
5396b141dd Merge pull request #52926 from frappe/version-15-hotfix
chore: release v15
2026-02-25 11:58:05 +05:30
Frappe PR Bot
2888b68334 chore(release): Bumped to Version 15.98.1
## [15.98.1](https://github.com/frappe/erpnext/compare/v15.98.0...v15.98.1) (2026-02-19)

### Bug Fixes

* better permissions on make payment request ([f06e20d](f06e20d993))
2026-02-19 05:00:53 +00:00
ruthra kumar
f7f10a5930 Merge pull request #52789 from frappe/mergify/bp/version-15/pr-52763
fix: better permissions on make payment request (backport #52763)
2026-02-19 10:27:15 +05:30
ruthra kumar
f06e20d993 fix: better permissions on make payment request
(cherry picked from commit f36962fc58)
2026-02-19 04:31:56 +00:00
Frappe PR Bot
a66854d16d chore(release): Bumped to Version 15.98.0
# [15.98.0](https://github.com/frappe/erpnext/compare/v15.97.0...v15.98.0) (2026-02-17)

### Bug Fixes

* **accounts-controller:** handle empty items list ([13239a9](13239a9dee))
* **accounts:** correct base grand total and rounded total mismatch ([#51739](https://github.com/frappe/erpnext/issues/51739)) ([8bdbb24](8bdbb24d73))
* add base_tax_withholding_net_total to tax withholding report ([ed42d54](ed42d54989))
* allow rename for market segment doctype ([0a41987](0a4198718b))
* allow sequence id edit in BOM if routing is not set ([c425944](c425944bdf))
* better validation for negative batch ([85d18fa](85d18fa7a4))
* cancel SABB if SLE cancelled from LCV ([f2a77d1](f2a77d178d))
* consider sle for negative stock validation ([ca79f64](ca79f6478a))
* do not allow plant floor company and warehouse to be updated ([d6333c1](d6333c1562))
* **manufacturing:** add sales order fields in subassembly child table ([0576752](0576752d3b))
* **manufacturing:** set sales order references in subassembly child table ([53e18a9](53e18a9beb))
* Payment Terms auto-fetched in Sales Invoice even when automatically_fetch_payment_terms is disabled ([78a3701](78a3701f4c))
* **pos_invoice:** add correct depends on condition (backport [#52689](https://github.com/frappe/erpnext/issues/52689)) ([#52693](https://github.com/frappe/erpnext/issues/52693)) ([4fe9689](4fe968961a))
* **postgres:** validate against period closing using MAX(period_end_date) ([#51554](https://github.com/frappe/erpnext/issues/51554)) ([9ec3031](9ec30319e4))
* production plan status ([97a6610](97a6610c0c))
* recalculate tax withholding during Purchase Order child update ([273029d](273029d0f0))
* set base_tax_withholding_net_total for jv in tds report ([68099a9](68099a9b5c))
* standalone credit/debit notes should not fetch any serial or batch by default ([79c3bc9](79c3bc9bcd))
* total weight does not update when updating items ([e12871b](e12871b408))

### Features

* Negative Batch report ([6313636](631363632b))
* show formatted currency symbol on ledger preview ([383648f](383648fb59))
2026-02-17 14:12:38 +00:00
ruthra kumar
72bb3e26cd Merge pull request #52730 from frappe/version-15-hotfix
chore: release v15
2026-02-17 19:38:01 +05:30
Frappe PR Bot
b340d7c6bb chore(release): Bumped to Version 15.97.0
# [15.97.0](https://github.com/frappe/erpnext/compare/v15.96.1...v15.97.0) (2026-02-11)

### Bug Fixes

* Added a missing option to the currency field (backport [#52528](https://github.com/frappe/erpnext/issues/52528)) ([#52586](https://github.com/frappe/erpnext/issues/52586)) ([a6f5b88](a6f5b88f9b))
* **buying:** add supplier group link filters in field level ([436cb8d](436cb8dbfc))
* email campaign timeout issue (backport [#51994](https://github.com/frappe/erpnext/issues/51994)) ([#52555](https://github.com/frappe/erpnext/issues/52555)) ([6c9681b](6c9681ba4c))
* enabling skip delivery option for order type maintenance ([a8f05ca](a8f05cadea))
* **gross profit report:** translate column Sales Invoice ([4e910d8](4e910d8a69))
* **gross-profit:** handle item group filters ([7cd9de2](7cd9de211f))
* **gross-profit:** handle returns outside sale period ([303dac2](303dac262c))
* handle gross profit and percentage for return invoices ([bde19ab](bde19ab010))
* **manufacturing:** fix chart period keys ([99f3a7e](99f3a7e4cf))
* **manufacturing:** handle None value for actual_end_date ([f965b35](f965b352c8))
* **map_current_doc:** prevent mutation of query args in get_query (backport [#52202](https://github.com/frappe/erpnext/issues/52202)) ([#52583](https://github.com/frappe/erpnext/issues/52583)) ([9519773](9519773c5c))
* merge taxes in purchase receipt when get items from multiple purchase invoices ([#51422](https://github.com/frappe/erpnext/issues/51422)) ([68338ab](68338abe07))
* **quotation:** ignore zero ordered_qty ([ad92c02](ad92c021f7))
* rate comparison in stock reco ([cacca81](cacca812ed))
* remove incorrect validation from email digest throwing spurious error (backport [#51827](https://github.com/frappe/erpnext/issues/51827)) ([#52582](https://github.com/frappe/erpnext/issues/52582)) ([b034f3d](b034f3d3db))
* resolve conflicts ([36e2cf4](36e2cf49f3))
* return None instead of 0 if valuation rate is falsy ([195f020](195f020636))
* stock balance report issue ([bda7220](bda7220b70))
* **stock:** add is group filter for warehouse fields ([5b7ee0a](5b7ee0af66))
* **stock:** ignore pos reserved batches for stock levels ([635a421](635a421807))
* **stock:** inward stock for pick list test record ([5a42ff0](5a42ff0c3c))
* **stock:** set source warehouse for issue type ([19dca36](19dca36dec))
* **stock:** update target field attribute ([9cfd704](9cfd704eef))
* validate asset movement transaction date (backport [#52340](https://github.com/frappe/erpnext/issues/52340)) ([#52560](https://github.com/frappe/erpnext/issues/52560)) ([eea8cb5](eea8cb5885))

### Features

* allow negative stock for the batch item ([4c094c3](4c094c3d86))
2026-02-11 04:58:18 +00:00
ruthra kumar
0bd3c3b566 Merge pull request #52598 from frappe/version-15-hotfix
chore: release v15
2026-02-11 10:26:50 +05:30
Frappe PR Bot
9c2b4f611d chore(release): Bumped to Version 15.96.1
## [15.96.1](https://github.com/frappe/erpnext/compare/v15.96.0...v15.96.1) (2026-02-05)

### Bug Fixes

* stock balance report issue ([3d525ad](3d525addbe))
2026-02-05 10:53:47 +00:00
rohitwaghchaure
350282f0cc Merge pull request #52463 from frappe/mergify/bp/version-15/pr-52462
fix: stock balance report issue (backport #52462)
2026-02-05 16:20:43 +05:30
Rohit Waghchaure
3d525addbe fix: stock balance report issue
(cherry picked from commit bda7220b70)
2026-02-05 10:20:21 +00:00
Frappe PR Bot
6ba8725940 chore(release): Bumped to Version 15.96.0
# [15.96.0](https://github.com/frappe/erpnext/compare/v15.95.2...v15.96.0) (2026-02-03)

### Bug Fixes

* add docstatus condition to get_sales_invoice_item function ([#51517](https://github.com/frappe/erpnext/issues/51517)) ([afc4c85](afc4c856f8))
* add missing param ([a61ad15](a61ad15998))
* add precision to rejected batch no qty calculation ([d5570f8](d5570f83d2))
* backport Switzerland VAT rates update to version-15 ([#52244](https://github.com/frappe/erpnext/issues/52244)) ([f5481dc](f5481dc7d5))
* **bank_account:** `is_company_account` related validations (backport [#51887](https://github.com/frappe/erpnext/issues/51887)) ([#51921](https://github.com/frappe/erpnext/issues/51921)) ([7226066](7226066772))
* **barcode:** failing request when item has both batch and serial ([19e0d75](19e0d75c22))
* correct exchange gain loss in ppr ([e42f8ff](e42f8ffd5d))
* duplicate account number (Indonesia COA) (backport [#52080](https://github.com/frappe/erpnext/issues/52080)) ([#52316](https://github.com/frappe/erpnext/issues/52316)) ([ac1f29d](ac1f29d5cb))
* hide close button on WO if WO is completed ([bd96868](bd96868736))
* imports ([528a482](528a482240))
* include credit notes in project gross margin calculation ([d9d48da](d9d48da505))
* journal auditing voucher print date to use posting_date ([6413ce4](6413ce467f))
* **mode of payment:** use valid syntax (backport [#51542](https://github.com/frappe/erpnext/issues/51542)) ([#52134](https://github.com/frappe/erpnext/issues/52134)) ([22869b6](22869b6f9d))
* negative stock for purchase return ([c30d76a](c30d76ae68))
* populate contact fields when creating quotation from customer ([78f8922](78f8922a9c))
* production plan not considering planning datetime when creating WO ([7b6c7c3](7b6c7c3e27))
* **profit and loss statement:** exclude non period columns ([32c5861](32c5861919))
* remove unneccessary check ([6a68155](6a681557a9))
* reset incoming rate in selling controller if there are changes in item ([c6937c8](c6937c8375))
* revert to old orm ([7e01ae9](7e01ae9e4a))
* **RFQ:** render email templates for preview and sending ([07c5622](07c56221a5))
* **stock:** add stock recon opening stock condition ([0cbb7f8](0cbb7f8714))
* **stock:** fetch batch wise valuation rate in get_items ([f1ba825](f1ba825818))
* **stock:** ignore packing slip while cancelling the sales invoice ([e6083a5](e6083a57de))
* **stock:** include subcontracting order qty while calculating the bin qty ([ba17fdd](ba17fdd072))
* **stock:** remove is_return condition on pos batch qty calculation ([a638dec](a638dece6b))
* **stock:** set incoming_rate with lcv rate for internal purchase ([41c592a](41c592a1a8))
* **subcontracting:** include item bom in supplied items grouping key ([3b12d60](3b12d60877))
* test cases ([2c74491](2c74491eb6))
* validate over ordering of quotation ([0e60750](0e60750bd8))
* validation when more than one FG items in repack stock entry ([fec3a8b](fec3a8b511))
* zero valuation rate if returning from different warehouse ([28929df](28929df0e8))

### Features

* **delivery-note:** add status indicator when document is partially billed ([e5e3b8a](e5e3b8a6ae))
* filter to display trial balance report without group account (backport [#48486](https://github.com/frappe/erpnext/issues/48486)) ([#52146](https://github.com/frappe/erpnext/issues/52146)) ([f48b4cd](f48b4cda50))
2026-02-03 17:18:56 +00:00
rohitwaghchaure
d0f96c48cf Merge pull request #52348 from frappe/version-15-hotfix
chore: release v15
2026-02-03 22:47:29 +05:30

View File

@@ -4,7 +4,7 @@ import inspect
import frappe
from frappe.utils.user import is_website_user
__version__ = "15.95.2"
__version__ = "15.99.1"
def get_default_company(user=None):