mirror of
https://github.com/frappe/erpnext.git
synced 2026-06-08 15:42:52 +00:00
317888211a
* [Fix] Error in sales invoice and POS if customer group not defined in the customer (#10148)
* Revert "[Fix] Error in sales invoice and POS if customer group not defined in the customer (#10148)" (#10159)
This reverts commit 4d2e782e42.
* [Fix] Unable to save asset because of float error issue (#10157)
* bumped to version 8.6.4
* [Fix] Error in sales invoice and POS if customer group not defined in the customer (#10160)
* Set billing hours to 0 in timesheet #9535 (#10139)
* `update_billing_hours` to use flt not cint
* if not billable, reset billable hours
* if not billable, reset time rates
* test
* [Fix] Timesheet Company Issue
* Added delivery date in SO parent form. Fixes #10104 (#10155)
* Added delivery date in SO parent form. Fixes #10104
* UI tests for sales order delivery date
* bumped to version 8.6.5
15 lines
538 B
Python
15 lines
538 B
Python
# Copyright (c) 2017, Frappe and Contributors
|
|
# License: GNU General Public License v3. See license.txt
|
|
|
|
from __future__ import unicode_literals
|
|
import frappe
|
|
|
|
def execute():
|
|
frappe.reload_doctype('Timesheet')
|
|
company = frappe.get_all('Company')
|
|
|
|
#Check more than one company exists
|
|
if len(company) > 1:
|
|
frappe.db.sql(""" update `tabTimesheet` set `tabTimesheet`.company =
|
|
(select company from `tabProduction Order` where name = `tabTimesheet`.production_order)
|
|
where production_order is not null and production_order !=''""") |