Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6315 from rohitwaghchaure/patch_fix

Browse Source 
Patch fix
This commit is contained in:
Nabin Hait 2016-09-08 16:52:32 +05:30 committed by GitHub
commit 7819744e5b
2 changed files with 5 additions and 5 deletions
Show Stats 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_billing_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)