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

[enhance] show module flow on top of document

Browse Source
This commit is contained in:
Saurabh 2016-04-01 13:08:29 +05:30 committed by Anand Doshi
parent 605f8a7e09
commit 9df3d0fb8a
9 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
View File

@ -26,10 +26,10 @@ erpnext.accounts.PurchaseInvoice = erpnext.buying.BuyingController.extend({
this._super();
hide_fields(this.frm.doc);
cur_frm.page.add_document_flow(cur_frm)
// Show / Hide button
this.show_general_ledger();
if(doc.update_stock==1 && doc.docstatus==1) {
this.show_stock_ledger();
}

2
erpnext/accounts/doctype/sales_invoice/sales_invoice.js
View File

@ -24,7 +24,7 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte
refresh: function(doc, dt, dn) {
this._super();
cur_frm.page.add_document_flow(cur_frm)
if(cur_frm.msgbox && cur_frm.msgbox.$wrapper.is(":visible")) {
// hide new msgbox
cur_frm.msgbox.hide();

2
erpnext/buying/doctype/purchase_order/purchase_order.js
View File

@ -20,7 +20,7 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend(
// this.frm.dashboard.reset();
var allow_receipt = false;
var is_drop_ship = false;
cur_frm.page.add_document_flow(cur_frm)
for (var i in cur_frm.doc.items) {
var item = cur_frm.doc.items[i];
if(item.delivered_by_supplier !== 1) {

2
erpnext/buying/doctype/supplier_quotation/supplier_quotation.js
View File

@ -7,7 +7,7 @@
erpnext.buying.SupplierQuotationController = erpnext.buying.BuyingController.extend({
refresh: function() {
this._super();
cur_frm.page.add_document_flow(cur_frm);
if (this.frm.doc.docstatus === 1) {
cur_frm.add_custom_button(__("Purchase Order"), this.make_purchase_order,
__("Make"));

2
erpnext/selling/doctype/quotation/quotation.js
View File

@ -16,7 +16,7 @@ erpnext.selling.QuotationController = erpnext.selling.SellingController.extend({
},
refresh: function(doc, dt, dn) {
this._super(doc, dt, dn);
cur_frm.page.add_document_flow(cur_frm)
if(doc.docstatus == 1 && doc.status!=='Lost') {
cur_frm.add_custom_button(__('Make Sales Order'),
cur_frm.cscript['Make Sales Order']);

3
erpnext/selling/doctype/sales_order/sales_order.js
View File

@ -21,7 +21,8 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend(
this.frm.dashboard.reset();
var allow_purchase = false;
var allow_delivery = false;
cur_frm.page.add_document_flow(cur_frm)
if(doc.docstatus==1) {
if(doc.status != 'Closed') {

24
erpnext/startup/boot.py
View File

@ -32,6 +32,30 @@ def boot_session(bootinfo):
bootinfo.docs += frappe.db.sql("""select name, default_currency, cost_center,
default_terms, default_letter_head, default_bank_account from `tabCompany`""",
as_dict=1, update={"doctype":":Company"})
bootinfo.module_flow = {
"Selling": {
"Sales Order": ["Quotation", "Sales Order", "Delivery Note", "Sales Invoice", "Journal Entry"],
"Quotation": ["Quotation", "Sales Order", "Delivery Note", "Sales Invoice", "Journal Entry"]
},
"Accounts": {
"Sales Invoice": ["Quotation", "Sales Order", "Delivery Note", "Sales Invoice", "Journal Entry"],
"Purchase Invoice": ["Supplier Quotation", "Purchase Order", "Purchase Receipt",
"Purchase Invoice", "Journal Entry"]
},
"Buying": {
"Purchase Order": ["Supplier Quotation", "Purchase Order", "Purchase Receipt",
"Purchase Invoice", "Journal Entry"],
"Supplier Quotation": ["Supplier Quotation", "Purchase Order", "Purchase Receipt",
"Purchase Invoice", "Journal Entry"]
},
"Stock": {
"Delivery Note": ["Quotation", "Sales Order", "Delivery Note", "Sales Invoice", "Journal Entry"],
"Purchase Receipt": ["Supplier Quotation", "Purchase Order", "Purchase Receipt",
"Purchase Invoice", "Journal Entry"]
}
}
def load_country_and_currency(bootinfo):
country = frappe.db.get_default("country")

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

@ -8,7 +8,7 @@ frappe.provide("erpnext.stock.delivery_note");
erpnext.stock.DeliveryNoteController = erpnext.selling.SellingController.extend({
refresh: function(doc, dt, dn) {
this._super();
cur_frm.page.add_document_flow(cur_frm)
if (!doc.is_return && doc.status!="Closed") {
if(flt(doc.per_installed, 2) < 100 && doc.docstatus==1)
cur_frm.add_custom_button(__('Installation Note'), this.make_installation_note, __("Make"));

2
erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
View File

@ -41,7 +41,7 @@ frappe.ui.form.on("Purchase Receipt", {
erpnext.stock.PurchaseReceiptController = erpnext.buying.BuyingController.extend({
refresh: function() {
this._super();
cur_frm.page.add_document_flow(cur_frm)
if(this.frm.doc.docstatus===1) {
this.show_stock_ledger();
if (cint(frappe.defaults.get_default("auto_accounting_for_stock"))) {