nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-29 14:48:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed version conflict

Browse Source
This commit is contained in:
Nabin Hait
2016-09-14 15:50:22 +05:30
parent e9fa81c286 4a121d60db
commit d5ebd79ad7
16 changed files with 56 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/patches/v7_0/migrate_mode_of_payments_v6_to_v7.py
View File

@@ -29,8 +29,8 @@ def execute():
row.db_update()
si_doc.set_paid_amount()
si_doc.db_set("paid_amount", si_doc.paid_amount)
si_doc.db_set("base_paid_amount", si_doc.base_paid_amount)
si_doc.db_set("paid_amount", si_doc.paid_amount, update_modified = False)
si_doc.db_set("base_paid_amount", si_doc.base_paid_amount, update_modified = False)
count +=1

6
erpnext/patches/v7_0/move_timelogbatch_from_salesinvoiceitem_to_salesinvoicetimesheet.py
View File

@@ -9,6 +9,6 @@ def execute():
ts = si_doc.append('timesheets',{})
ts.time_sheet = time_sheet.name
ts.billing_amount = time_sheet.total_billable_amount
si_doc.update_time_sheet(time_sheet.sales_invoice)
si_doc.flags.ignore_validate_update_after_submit = True
si_doc.save()
ts.db_update()
si_doc.calculate_billing_amount_from_timesheet()
si_doc.db_set("total_billing_amount", si_doc.total_billing_amount, update_modified = False)

7
erpnext/patches/v7_0/remove_doctypes_and_reports.py
View File

@@ -1,9 +1,10 @@
import frappe
def execute():
for doctype in ['Time Log Batch', 'Time Log Batch Detail', 'Time Log']:
frappe.delete_doc('DocType', doctype)
if frappe.db.table_exists("Time Log"):
frappe.db.sql("""delete from `tabDocType`
where name in('Time Log Batch', 'Time Log Batch Detail', 'Time Log')""")
report = "Daily Time Log Summary"
if frappe.db.exists("Report", report):
frappe.delete_doc('Report', report)