Compare commits

...

6 Commits

Author SHA1 Message Date
Frappe PR Bot
9ec3087af8 chore(release): Bumped to Version 14.30.6
## [14.30.6](https://github.com/frappe/erpnext/compare/v14.30.5...v14.30.6) (2023-07-14)

### Bug Fixes

* Opening entries showing up incorrectly in TB report ([#36135](https://github.com/frappe/erpnext/issues/36135)) ([8e48c4e](8e48c4ee3e))
2023-07-14 14:37:01 +00:00
mergify[bot]
8e48c4ee3e fix: Opening entries showing up incorrectly in TB report (#36135)
fix: Opening entries showing up incorrectly in TB report (#36135)

fix: Opening entries showing up incorrectly in TB report (#36135)

* fix: Opening entries showing up incorrectly in TB report

* chore: Linting Issue

(cherry picked from commit 297c7e833c)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
(cherry picked from commit d10e5e666b)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2023-07-14 20:05:40 +05:30
Frappe PR Bot
ed8217d309 chore(release): Bumped to Version 14.30.5
## [14.30.5](https://github.com/frappe/erpnext/compare/v14.30.4...v14.30.5) (2023-07-14)

### Bug Fixes

* `TypeError` while creating WO from PP (backport [#36136](https://github.com/frappe/erpnext/issues/36136)) (backport [#36137](https://github.com/frappe/erpnext/issues/36137)) ([#36138](https://github.com/frappe/erpnext/issues/36138)) ([c3acdcf](c3acdcf3ac))
2023-07-14 12:50:49 +00:00
mergify[bot]
c3acdcf3ac fix: TypeError while creating WO from PP (backport #36136) (backport #36137) (#36138)
fix: `TypeError` while creating WO from PP (backport #36136) (#36137)

fix: `TypeError` while creating WO from PP (#36136)

(cherry picked from commit 8f5b94f5fd)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
(cherry picked from commit dd5101056d)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2023-07-14 18:10:16 +05:30
Frappe PR Bot
d420eeb884 chore(release): Bumped to Version 14.30.4
## [14.30.4](https://github.com/frappe/erpnext/compare/v14.30.3...v14.30.4) (2023-07-14)

### Bug Fixes

* Handle multi-company in patch ([#36127](https://github.com/frappe/erpnext/issues/36127)) ([43d6cc0](43d6cc087e))
2023-07-14 10:43:22 +00:00
mergify[bot]
43d6cc087e fix: Handle multi-company in patch (#36127)
fix: Handle multi-company in patch (#36127)

* fix: Handle multi-company in patch (#36127)

fix: Handle multi-compnay in patch
(cherry picked from commit ac9ad8ec36)

* chore: re trigger patch

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
(cherry picked from commit e7f57542ab)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2023-07-14 16:02:32 +05:30
6 changed files with 7 additions and 5 deletions

View File

@@ -3,7 +3,7 @@ import inspect
import frappe
__version__ = "14.30.3"
__version__ = "14.30.6"
def get_default_company(user=None):

View File

@@ -416,6 +416,7 @@ def set_gl_entries_by_account(
filters,
gl_entries_by_account,
ignore_closing_entries=False,
ignore_opening_entries=False,
):
"""Returns a dict like { "account": [gl entries], ... }"""
gl_entries = []
@@ -426,7 +427,6 @@ def set_gl_entries_by_account(
pluck="name",
)
ignore_opening_entries = False
if accounts_list:
# For balance sheet
if not from_date:

View File

@@ -117,6 +117,7 @@ def get_data(filters):
filters,
gl_entries_by_account,
ignore_closing_entries=not flt(filters.with_period_closing_entry),
ignore_opening_entries=True,
)
calculate_values(accounts, gl_entries_by_account, opening_balances)

View File

@@ -621,7 +621,7 @@ class ProductionPlan(Document):
def create_work_order(self, item):
from erpnext.manufacturing.doctype.work_order.work_order import OverProductionError
if item.get("qty") <= 0:
if flt(item.get("qty")) <= 0:
return
wo = frappe.new_doc("Work Order")

View File

@@ -336,4 +336,4 @@ erpnext.patches.v14_0.cleanup_workspaces
erpnext.patches.v14_0.enable_allow_existing_serial_no
erpnext.patches.v14_0.set_report_in_process_SOA
erpnext.patches.v14_0.create_accounting_dimensions_for_closing_balance
erpnext.patches.v14_0.update_closing_balances #14-07-2023
erpnext.patches.v14_0.update_closing_balances #15-07-2023

View File

@@ -50,6 +50,7 @@ def execute():
"voucher_no": ["!=", pcv.name],
"posting_date": ["between", [pcv_doc.year_start_date, pcv.posting_date]],
"is_opening": "No",
"company": company,
},
fields=["*"],
)
@@ -58,7 +59,7 @@ def execute():
# add opening entries only for the first pcv
closing_entries += frappe.db.get_all(
"GL Entry",
filters={"is_cancelled": 0, "is_opening": "Yes"},
filters={"is_cancelled": 0, "is_opening": "Yes", "company": company},
fields=["*"],
)