nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-05 21:29:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed project_name to project

Browse Source
This commit is contained in:
Neil Trini Lasrado
2016-03-09 17:02:59 +05:30
parent 2c70238fbb
commit 6e343e23d9
58 changed files with 396 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/public/js/controllers/transaction.js
View File

@@ -186,7 +186,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
ignore_pricing_rule: me.frm.doc.ignore_pricing_rule,
doctype: me.frm.doc.doctype,
name: me.frm.doc.name,
project_name: item.project_name || me.frm.doc.project_name,
project: item.project || me.frm.doc.project,
qty: item.qty
}
},

24
erpnext/public/js/feature_setup.js
View File

@@ -5,27 +5,27 @@
Dictionary Format
'projects': {
'Sales Order': {
'fields':['project_name'],
'fields':['project'],
'items':['projected_qty']
},
'Purchase Order': {
'fields':['project_name']
'fields':['project']
}
}
// ====================================================================*/
frappe.provide("erpnext.feature_setup");
erpnext.feature_setup.feature_dict = {
'fs_projects': {
'BOM': {'fields':['project_name']},
'Delivery Note': {'fields':['project_name']},
'Purchase Invoice': {'items':['project_name']},
'Production Order': {'fields':['project_name']},
'Purchase Order': {'items':['project_name']},
'Purchase Receipt': {'items':['project_name']},
'Sales Invoice': {'fields':['project_name']},
'Sales Order': {'fields':['project_name']},
'Stock Entry': {'fields':['project_name']},
'Timesheet': {'timesheet_details':['project_name']}
'BOM': {'fields':['project']},
'Delivery Note': {'fields':['project']},
'Purchase Invoice': {'items':['project']},
'Production Order': {'fields':['project']},
'Purchase Order': {'items':['project']},
'Purchase Receipt': {'items':['project']},
'Sales Invoice': {'fields':['project']},
'Sales Order': {'fields':['project']},
'Stock Entry': {'fields':['project']},
'Timesheet': {'timesheet_details':['project']}
},
'fs_discounts': {
'Delivery Note': {'items':['discount_percentage']},