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

[fix] [demo] permissions for accounting

Browse Source
This commit is contained in:
Rushabh Mehta 2016-07-14 15:46:12 +05:30
parent 64602168b7
commit 92d1b8cc6d
5 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/demo/demo.py
View File

@ -4,7 +4,7 @@ import frappe, sys
import erpnext import erpnext
import frappe.utils import frappe.utils
from erpnext.demo.setup_data import setup_data from erpnext.demo.setup_data import setup_data
from erpnext.demo.user import hr, sales, purchase, manufacturing, stock from erpnext.demo.user import hr, sales, purchase, manufacturing, stock, accounts
""" """
Make a demo Make a demo
@ -68,8 +68,7 @@ def simulate():
purchase.work() purchase.work()
manufacturing.work() manufacturing.work()
stock.work() stock.work()
# run_stock() accounts.work()
# run_accounts()
# run_projects() # run_projects()
# run_messages() # run_messages()

2
erpnext/demo/setup_data.py
View File

@ -330,6 +330,6 @@ def setup_user_roles():
if not frappe.db.get_global('demo_accounts_user'): if not frappe.db.get_global('demo_accounts_user'):
user = frappe.get_doc('User', 'LeonAbdulov@example.com') user = frappe.get_doc('User', 'LeonAbdulov@example.com')
user.add_roles('Accounts User', 'Accounts Manager') user.add_roles('Accounts User', 'Accounts Manager', 'Sales User', 'Purchase User')
frappe.db.set_global('demo_accounts_user', user.name) frappe.db.set_global('demo_accounts_user', user.name)

3
erpnext/demo/user/accounts.py
View File

@ -15,8 +15,7 @@ def work():
if random.random() < 0.5: if random.random() < 0.5:
from erpnext.selling.doctype.sales_order.sales_order import make_sales_invoice from erpnext.selling.doctype.sales_order.sales_order import make_sales_invoice
report = "Ordered Items to be Billed" report = "Ordered Items to be Billed"
for so in list(set([r[0] for r in for so in list(set([r[0] for r in query_report.run(report)["result"]
query_report.run(report)["result"]
if r[0]!="Total"]))[:random.randint(1, 5)]: if r[0]!="Total"]))[:random.randint(1, 5)]:
si = frappe.get_doc(make_sales_invoice(so)) si = frappe.get_doc(make_sales_invoice(so))
si.posting_date = frappe.flags.current_date si.posting_date = frappe.flags.current_date

7
erpnext/demo/user/purchase.py
View File

@ -131,10 +131,13 @@ def make_subcontract():
po.is_subcontracted = "Yes" po.is_subcontracted = "Yes"
po.supplier = get_random("Supplier") po.supplier = get_random("Supplier")
item_code = get_random("Item", {"is_sub_contracted_item": 1})
moq = frappe.db.get_value('Item', item_code, 'min_order_qty')
po.append("items", { po.append("items", {
"item_code": get_random("Item", {"is_sub_contracted_item": 1}), "item_code": item_code,
"schedule_date": frappe.utils.add_days(frappe.flags.current_date, 7), "schedule_date": frappe.utils.add_days(frappe.flags.current_date, 7),
"qty": 20 "qty": moq
}) })
po.set_missing_values() po.set_missing_values()
try: try:

9
erpnext/stock/doctype/delivery_note/delivery_note.js
View File

@ -5,6 +5,15 @@
frappe.provide("erpnext.stock"); frappe.provide("erpnext.stock");
frappe.provide("erpnext.stock.delivery_note"); frappe.provide("erpnext.stock.delivery_note");
frappe.ui.form.on('Delivery Note', 'onload', function(frm) {
frm.set_indicator_formatter('item_code',
function(doc) {
return (doc.docstatus==1 || doc.qty<=doc.actual_qty) ? "green" : "orange"
})
})
erpnext.stock.DeliveryNoteController = erpnext.selling.SellingController.extend({ erpnext.stock.DeliveryNoteController = erpnext.selling.SellingController.extend({
refresh: function(doc, dt, dn) { refresh: function(doc, dt, dn) {
this._super(); this._super();