Compare commits

..

10 Commits

Author SHA1 Message Date
Frappe PR Bot
58e304f64b chore(release): Bumped to Version 14.27.7
## [14.27.7](https://github.com/frappe/erpnext/compare/v14.27.6...v14.27.7) (2023-06-17)

### Bug Fixes

* validation of job card in stock entry ([e7abdc3](e7abdc34d0))
2023-06-17 08:35:04 +00:00
rohitwaghchaure
46171738c0 Merge pull request #35761 from frappe/mergify/bp/version-14/pr-35759
fix: validation of job card in stock entry (backport #35756) (backport #35759)
2023-06-17 14:03:29 +05:30
Rohit Waghchaure
e7abdc34d0 fix: validation of job card in stock entry
(cherry picked from commit df8c3f0888)
(cherry picked from commit ce2bf5fb1c)
2023-06-17 08:32:59 +00:00
Frappe PR Bot
7ffa6b4fbd chore(release): Bumped to Version 14.27.6
## [14.27.6](https://github.com/frappe/erpnext/compare/v14.27.5...v14.27.6) (2023-06-17)

### Bug Fixes

* cannot start / stop Job Card (backport [#35753](https://github.com/frappe/erpnext/issues/35753)) ([#35754](https://github.com/frappe/erpnext/issues/35754)) ([19203bb](19203bb87d))
2023-06-17 06:58:24 +00:00
mergify[bot]
19203bb87d fix: cannot start / stop Job Card (backport #35753) (#35754)
fix: cannot start / stop jobs

(cherry picked from commit 53ec2a9268)

Co-authored-by: Anoop Kurungadam <anoop@earthianslive.com>
2023-06-17 12:18:01 +05:30
Frappe PR Bot
138133e11d chore(release): Bumped to Version 14.27.5
## [14.27.5](https://github.com/frappe/erpnext/compare/v14.27.4...v14.27.5) (2023-06-15)

### Bug Fixes

* typeerror on exchange rate revaluation ([d934dda](d934dda410))
2023-06-15 08:10:29 +00:00
ruthra kumar
582ed2c7f1 Merge pull request #35706 from frappe/mergify/bp/version-14/pr-35701
fix: typeerror on exchange rate revaluation (backport #35701)
2023-06-15 13:38:59 +05:30
ruthra kumar
d934dda410 fix: typeerror on exchange rate revaluation
(cherry picked from commit f8273f7db6)
2023-06-15 06:55:03 +00:00
Frappe PR Bot
c774c14b13 chore(release): Bumped to Version 14.27.4
## [14.27.4](https://github.com/frappe/erpnext/compare/v14.27.3...v14.27.4) (2023-06-15)

### Bug Fixes

* update `Stock Reconciliation` diff qty while reposting (backport [#35700](https://github.com/frappe/erpnext/issues/35700)) (backport [#35702](https://github.com/frappe/erpnext/issues/35702)) ([#35703](https://github.com/frappe/erpnext/issues/35703)) ([f3b7eed](f3b7eedb25))
2023-06-15 06:34:31 +00:00
mergify[bot]
f3b7eedb25 fix: update Stock Reconciliation diff qty while reposting (backport #35700) (backport #35702) (#35703)
fix: update `Stock Reconciliation` diff qty while reposting

(cherry picked from commit 6a1b0a2fab)
(cherry picked from commit bdb5cc8ad4)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-06-15 11:46:28 +05:30
5 changed files with 7 additions and 6 deletions

View File

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

View File

@@ -186,7 +186,7 @@ class ExchangeRateRevaluation(Document):
# round off balance based on currency precision
# and consider debit-credit difference allowance
currency_precision = get_currency_precision()
rounding_loss_allowance = rounding_loss_allowance or 0.05
rounding_loss_allowance = float(rounding_loss_allowance) or 0.05
for acc in account_details:
acc.balance_in_account_currency = flt(acc.balance_in_account_currency, currency_precision)
if abs(acc.balance_in_account_currency) <= rounding_loss_allowance:
@@ -552,7 +552,7 @@ def calculate_exchange_rate_using_last_gle(company, account, party_type, party):
@frappe.whitelist()
def get_account_details(
company, posting_date, account, party_type=None, party=None, rounding_loss_allowance=None
company, posting_date, account, party_type=None, party=None, rounding_loss_allowance: float = None
):
if not (company and posting_date):
frappe.throw(_("Company and Posting Date is mandatory"))

View File

@@ -161,7 +161,7 @@ class JobCard(Document):
self.total_completed_qty = flt(self.total_completed_qty, self.precision("total_completed_qty"))
for row in self.sub_operations:
self.c += row.completed_qty
self.total_completed_qty += row.completed_qty
def get_overlap_for(self, args, check_next_available_slot=False):
production_capacity = 1

View File

@@ -268,10 +268,10 @@ class StockEntry(StockController):
return
for row in self.items:
if row.job_card_item:
if row.job_card_item or not row.s_warehouse:
continue
msg = f"""Row #{0}: The job card item reference
msg = f"""Row #{row.idx}: The job card item reference
is missing. Kindly create the stock entry
from the job card. If you have added the row manually
then you won't be able to add job card item reference."""

View File

@@ -821,6 +821,7 @@ class update_entries_after(object):
item.current_amount = flt(item.current_qty) * flt(item.current_valuation_rate)
item.amount = flt(item.qty) * flt(item.valuation_rate)
item.quantity_difference = item.qty - item.current_qty
item.amount_difference = item.amount - item.current_amount
else:
sr.difference_amount = sum([item.amount_difference for item in sr.items])