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

fixed version conflict

Browse Source
This commit is contained in:
Nabin Hait 2016-09-07 17:01:47 +05:30
commit 0a0df2e433
4 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json
View File

@ -178,7 +178,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 1,
"label": "Allocated", "label": "Allocated",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,

1
erpnext/accounts/page/pos/pos.js
View File

@ -614,6 +614,7 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
this.child.batch_no = this.item_batch_no[this.child.item_code]; this.child.batch_no = this.item_batch_no[this.child.item_code];
this.child.serial_no = (this.item_serial_no[this.child.item_code] this.child.serial_no = (this.item_serial_no[this.child.item_code]
? this.item_serial_no[this.child.item_code][0] : ''); ? this.item_serial_no[this.child.item_code][0] : '');
this.child.item_tax_rate = this.items[0].taxes;
}, },
update_paid_amount_status: function(update_paid_amount){ update_paid_amount_status: function(update_paid_amount){

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

@ -4,8 +4,10 @@ from erpnext.manufacturing.doctype.production_order.production_order \
def execute(): def execute():
frappe.reload_doc('projects', 'doctype', 'timesheet') frappe.reload_doc('projects', 'doctype', 'timesheet')
if not frappe.db.table_exists("Time Log"):
return
for data in frappe.get_all('Time Log', fields=["*"], filters = [["docstatus", "<", "2"]]): for data in frappe.db.sql("select * from `tabTime Log` where where docstatus < 2", as_dict=1):
if data.task: if data.task:
company = frappe.db.get_value("Task", data.task, "company") company = frappe.db.get_value("Task", data.task, "company")
elif data.production_order: elif data.production_order:

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

@ -4,11 +4,14 @@ import frappe
def execute(): def execute():
frappe.reload_doc('accounts', 'doctype', 'sales_invoice_timesheet') frappe.reload_doc('accounts', 'doctype', 'sales_invoice_timesheet')
frappe.reload_doc('accounts', 'doctype', 'sales_invoice_payment') frappe.reload_doc('accounts', 'doctype', 'sales_invoice_payment')
frappe.reload_doc('accounts', 'doctype', 'mode_of_payment')
count = 0
for data in frappe.db.sql("""select name, mode_of_payment, cash_bank_account, paid_amount, company for data in frappe.db.sql("""select name, mode_of_payment, cash_bank_account, paid_amount, company
from `tabSales Invoice` from `tabSales Invoice` si
where is_pos = 1 and docstatus < 2 where si.is_pos = 1 and si.docstatus < 2
and cash_bank_account is not null and cash_bank_account != ''""", as_dict=1): and si.cash_bank_account is not null and si.cash_bank_account != ''
and not exists(select name from `tabSales Invoice Payment` where parent=si.name)""", as_dict=1):
if not data.mode_of_payment and not frappe.db.exists("Mode of Payment", "Cash"): if not data.mode_of_payment and not frappe.db.exists("Mode of Payment", "Cash"):
mop = frappe.new_doc("Mode of Payment") mop = frappe.new_doc("Mode of Payment")
@ -17,13 +20,19 @@ def execute():
mop.save() mop.save()
si_doc = frappe.get_doc('Sales Invoice', data.name) si_doc = frappe.get_doc('Sales Invoice', data.name)
si_doc.append('payments', { row = si_doc.append('payments', {
'mode_of_payment': data.mode_of_payment or 'Cash', 'mode_of_payment': data.mode_of_payment or 'Cash',
'account': data.cash_bank_account, 'account': data.cash_bank_account,
'type': frappe.db.get_value('Mode of Payment', data.mode_of_payment, 'type') or 'Cash', 'type': frappe.db.get_value('Mode of Payment', data.mode_of_payment, 'type') or 'Cash',
'amount': data.paid_amount 'amount': data.paid_amount
}) })
row.db_update()
si_doc.set_paid_amount() si_doc.set_paid_amount()
si_doc.flags.ignore_validate_update_after_submit = True si_doc.db_set("paid_amount", si_doc.paid_amount)
si_doc.save() si_doc.db_set("base_paid_amount", si_doc.base_paid_amount)
count +=1
if count % 200 == 0:
frappe.db.commit()