| NO: | \nDATE: | \n
| M/s | \n
| For |
| Signatory |
| NO: | \nDATE: | \n
| M/s | \n
| For |
| Signatory |
| Customer %s %s |
- Invoice Date: %s Due Date: %s |
+ Invoice Date : %s Invoice Period : %s to %s Due Date : %s |
All details about your Suppliers and past transactions
', - 'module_icon': 'Buying.gif', - 'module_label': 'Buying', - 'module_name': 'Buying', - 'module_seq': 4, - 'name': '__common__' - }, - - # Module Def, Buying - { - 'doctype': u'Module Def', - 'name': 'Buying' - }, - - # Module Def Item - { - 'description': 'Your Supplier Database', - 'display_name': 'Supplier', - 'doc_name': 'Supplier', - 'doc_type': 'Forms', - 'doctype': 'Module Def Item', - 'fields': 'id\nsupplier_type\nsupplier_status\ncompany' - }, - - # Module Def Item - { - 'description': 'Buy requests from various people in your company', - 'display_name': 'Indent', - 'doc_name': 'Indent', - 'doc_type': 'Forms', - 'doctype': 'Module Def Item', - 'fields': 'status\ntransaction_date\nsales_order_no\nremark' - }, - - # Module Def Item - { - 'description': 'Orders you have placed to your suppliers', - 'display_name': 'Purchase Order', - 'doc_name': 'Purchase Order', - 'doc_type': 'Forms', - 'doctype': 'Module Def Item', - 'fields': 'status\nsupplier\ntransaction_date\ngrand_total' - }, - - # Module Def Item - { - 'display_name': 'Itemwise Receipt Details', - 'doc_name': 'Purchase Receipt Detail', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'display_name': 'Purchase in Transit', - 'doc_name': 'PV Detail', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'display_name': 'Pending PO Items To Receive', - 'doc_name': 'PO Detail', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'display_name': 'Pending PO Items To Bill', - 'doc_name': 'PO Detail', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'display_name': 'Itemwise Purchase Details', - 'doc_name': 'PO Detail', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item' - }, - - # Module Def Item - { - 'description': 'Ledger details of your creditors', - 'display_name': "Creditor's Ledger", - 'doc_name': 'GL Entry', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item', - 'icon': 'accept.gif' - }, - - # Module Def Role - { - 'doctype': 'Module Def Role', - 'role': 'Purchase User' - }, - - # Module Def Role - { - 'doctype': 'Module Def Role', - 'role': 'Purchase Manager' - }, - - # Module Def Role - { - 'doctype': 'Module Def Role', - 'role': 'Administrator' - }, - - # Module Def Role - { - 'doctype': 'Module Def Role', - 'role': 'Purchase Master Manager' - } -] \ No newline at end of file diff --git a/erpnext/buying/doctype/indent/indent.js b/erpnext/buying/doctype/indent/indent.js index 570e06c1b8..1940e5a606 100644 --- a/erpnext/buying/doctype/indent/indent.js +++ b/erpnext/buying/doctype/indent/indent.js @@ -17,8 +17,8 @@ cur_frm.cscript.tname = "Indent Detail"; cur_frm.cscript.fname = "indent_details"; -$import(Purchase Common) -$import(SMS Control) +wn.require('erpnext/buying/doctype/purchase_common/purchase_common.js'); +wn.require('erpnext/utilities/doctype/sms_control/sms_control.js'); cur_frm.cscript.indent_doctype_label = get_doctype_label('Indent'); //========================== On Load ================================================= diff --git a/erpnext/buying/doctype/purchase_common/purchase_common.js b/erpnext/buying/doctype/purchase_common/purchase_common.js index f0f24a0eca..4ac3fdfb20 100644 --- a/erpnext/buying/doctype/purchase_common/purchase_common.js +++ b/erpnext/buying/doctype/purchase_common/purchase_common.js @@ -393,12 +393,12 @@ cur_frm.cscript.calc_amount = function(doc, n) { refresh_field('net_total'); refresh_field('net_total_import'); - cur_frm.cscript.val_cal_charges(doc, cdt, cdn, tname, fname, other_fname); + cur_frm.cscript.val_cal_charges(doc, tname, fname, other_fname); } //======== Function was broken away from cur_frm.cscript.calc_amount as PV has fieldname 'rate' instead of 'purchase_rate'=========== -cur_frm.cscript.val_cal_charges = function(doc, cdt, cdn, tname, fname, other_fname){ +cur_frm.cscript.val_cal_charges = function(doc, tname, fname, other_fname){ doc = locals[doc.doctype][doc.name] if(flt(doc.net_total) > 0) { @@ -416,7 +416,7 @@ cur_frm.cscript.val_cal_charges = function(doc, cdt, cdn, tname, fname, other_fn } cur_frm.cscript.calc_other_charges(doc , tname , fname , other_fname); // calculate other charges } - cur_frm.cscript.calc_doc_values(doc, cdt, cdn, tname, fname, other_fname); // calculates total amounts + cur_frm.cscript.calc_doc_values(doc, tname, fname, other_fname); // calculates total amounts refresh_many(['net_total', 'grand_total', 'rounded_total', 'grand_total_import', 'rounded_total_import', 'in_words', 'in_words_import', 'purchase_tax_details', 'total_tax', 'other_charges_added', 'other_charges_deducted', 'net_total_import', 'other_charges_added_import', 'other_charges_deducted_import']); @@ -545,9 +545,10 @@ cur_frm.cscript.calc_other_charges = function(doc , tname , fname , other_fname) // ******* Calculation of total amounts of document (item amount + other charges)**************** -cur_frm.cscript.calc_doc_values = function(doc, cdt, cdn, tname, fname, other_fname) { +cur_frm.cscript.calc_doc_values = function(doc, tname, fname, other_fname) { doc = locals[doc.doctype][doc.name]; - var net_total = 0; var total_tax = 0; var other_charges_added = 0; var other_charges_deducted = 0; + var net_total = 0; var total_tax = 0; var other_charges_added = 0; + var other_charges_deducted = 0; var cl = getchildren(tname, doc.name, fname); for(var i = 0; i
- Modules Setup
- Show, hide modules
-
- Custom Fields
- Add fields to forms
-
Customize Forms
Change entry properties (hide fields, make mandatory etc)
- Numbering Series
- Set multiple numbering series for transactions
+ Custom Fields
+ Add fields to forms
+
+ Custom Scripts
+ Add custom code to forms
Disable Features
Simplify entry forms by disabling features
+ Modules Setup
+ Show, hide modules
+
+ Numbering Series
+ Set multiple numbering series for transactions
+
Style Settings
Change background fonts etc