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

fixes merge conflict

Browse Source
This commit is contained in:
Nabin Hait
2013-01-21 17:30:35 +05:30
parent aeb992a4fd a1e8e07fde
commit 223897f145
136 changed files with 3652 additions and 3278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
stock/doctype/batch/batch.txt
View File

@@ -9,13 +9,13 @@
{
"section_style": "Simple",
"module": "Stock",
"server_code_error": " ",
"allow_trash": 1,
"doctype": "DocType",
"autoname": "field:batch_id",
"allow_trash": 1,
"document_type": "Master",
"autoname": "field:batch_id",
"name": "__common__",
"colour": "White:FFF",
"server_code_error": " ",
"version": 12
},
{
@@ -43,6 +43,7 @@
"doctype": "DocPerm",
"write": 1,
"cancel": 1,
"report": 1,
"permlevel": 0
},
{
@@ -111,10 +112,10 @@
"doctype": "DocField",
"label": "Item",
"oldfieldname": "item",
"permlevel": 0,
"options": "Item",
"fieldname": "item",
"fieldtype": "Link",
"reqd": 1,
"options": "Item"
"permlevel": 0
}
]

3
stock/doctype/bin/bin.txt
View File

@@ -12,9 +12,9 @@
"search_fields": "item_code,warehouse",
"module": "Stock",
"server_code_error": " ",
"autoname": "BIN/.#######",
"read_only": 0,
"_last_update": "1322549701",
"autoname": "BIN/.#######",
"name": "__common__",
"colour": "White:FFF",
"doctype": "DocType",
@@ -36,6 +36,7 @@
"read": 1,
"doctype": "DocPerm",
"parenttype": "DocType",
"report": 1,
"permlevel": 0,
"parentfield": "permissions"
},

6
stock/doctype/delivery_note/delivery_note.py
View File

@@ -18,10 +18,10 @@ from __future__ import unicode_literals
import webnotes
from webnotes.utils import cstr, flt, getdate
from webnotes.model import db_exists
from webnotes.model.wrapper import getlist, copy_doclist
from webnotes.model.wrapper import getlist
from webnotes.model.code import get_obj
from webnotes import msgprint
from setup.utils import get_company_currency
sql = webnotes.conn.sql
@@ -149,7 +149,7 @@ class DocType(TransactionBase):
sales_com_obj.check_conversion_rate(self)
# Get total in Words
dcc = TransactionBase().get_company_currency(self.doc.company)
dcc = get_company_currency(self.doc.company)
self.doc.in_words = sales_com_obj.get_total_in_words(dcc, self.doc.rounded_total)
self.doc.in_words_export = sales_com_obj.get_total_in_words(self.doc.currency, self.doc.rounded_total_export)

133
stock/doctype/delivery_note/delivery_note.txt
View File

@@ -88,10 +88,10 @@
"depends_on": "customer",
"doctype": "DocField",
"label": "Select Shipping Address",
"options": "Address",
"permlevel": 0,
"fieldname": "customer_address",
"fieldtype": "Link",
"permlevel": 0,
"options": "Address",
"in_filter": 1
},
{
@@ -149,8 +149,8 @@
"fieldtype": "Date",
"search_index": 1,
"reqd": 1,
"in_filter": 1,
"width": "100px"
"width": "100px",
"in_filter": 1
},
{
"print_hide": 1,
@@ -219,10 +219,10 @@
"doctype": "DocField",
"label": "Delivery Note Items",
"oldfieldname": "delivery_note_details",
"permlevel": 0,
"options": "Delivery Note Item",
"fieldname": "delivery_note_details",
"fieldtype": "Table",
"options": "Delivery Note Item"
"permlevel": 0
},
{
"print_hide": 1,
@@ -234,10 +234,10 @@
},
{
"doctype": "DocField",
"options": "Simple",
"permlevel": 0,
"fieldname": "section_break0",
"fieldtype": "Section Break",
"permlevel": 0
"options": "Simple"
},
{
"doctype": "DocField",
@@ -281,21 +281,21 @@
"doctype": "DocField",
"label": "Sales Order No",
"oldfieldname": "sales_order_no",
"permlevel": 0,
"options": "Sales Order",
"fieldname": "sales_order_no",
"fieldtype": "Link",
"options": "Sales Order"
"permlevel": 0
},
{
"print_hide": 1,
"oldfieldtype": "Button",
"doctype": "DocField",
"label": "Get Items",
"options": "pull_sales_order_details",
"permlevel": 0,
"fieldname": "get_items",
"fieldtype": "Button",
"hidden": 0,
"permlevel": 0
"options": "pull_sales_order_details"
},
{
"doctype": "DocField",
@@ -317,22 +317,22 @@
"doctype": "DocField",
"label": "Price List",
"oldfieldname": "price_list_name",
"permlevel": 0,
"options": "link:Price List",
"fieldname": "price_list_name",
"fieldtype": "Select",
"reqd": 1,
"options": "link:Price List"
"permlevel": 0
},
{
"print_hide": 1,
"description": "Select the currency in which price list is maintained",
"doctype": "DocField",
"label": "Price List Currency",
"options": "link:Currency",
"permlevel": 0,
"fieldname": "price_list_currency",
"fieldtype": "Select",
"reqd": 1,
"permlevel": 0
"options": "link:Currency"
},
{
"print_hide": 1,
@@ -359,11 +359,11 @@
"doctype": "DocField",
"label": "Currency",
"oldfieldname": "currency",
"permlevel": 0,
"options": "link:Currency",
"fieldname": "currency",
"fieldtype": "Select",
"reqd": 1,
"options": "link:Currency"
"permlevel": 0
},
{
"print_hide": 1,
@@ -394,10 +394,10 @@
"doctype": "DocField",
"label": "Taxes and Charges",
"oldfieldname": "charge",
"options": "Sales Taxes and Charges Master",
"permlevel": 0,
"fieldname": "charge",
"fieldtype": "Link",
"permlevel": 0
"options": "Sales Taxes and Charges Master"
},
{
"print_hide": 1,
@@ -414,10 +414,10 @@
"doctype": "DocField",
"label": "Sales Taxes and Charges",
"oldfieldname": "other_charges",
"options": "Sales Taxes and Charges",
"permlevel": 0,
"fieldname": "other_charges",
"fieldtype": "Table",
"permlevel": 0
"options": "Sales Taxes and Charges"
},
{
"print_hide": 1,
@@ -560,30 +560,30 @@
"doctype": "DocField",
"label": "Select Terms and Conditions",
"oldfieldname": "tc_name",
"options": "Terms and Conditions",
"permlevel": 0,
"fieldname": "tc_name",
"fieldtype": "Link",
"permlevel": 0
"options": "Terms and Conditions"
},
{
"print_hide": 1,
"oldfieldtype": "Button",
"doctype": "DocField",
"label": "Get Terms and Conditions",
"options": "get_tc_details",
"permlevel": 0,
"fieldname": "get_terms",
"fieldtype": "Button",
"permlevel": 0
"options": "get_tc_details"
},
{
"print_hide": 1,
"oldfieldtype": "HTML",
"doctype": "DocField",
"label": "Terms and Conditions HTML",
"options": "You can add Terms and Notes that will be printed in the Transaction",
"permlevel": 0,
"fieldname": "terms_html",
"fieldtype": "HTML",
"permlevel": 0
"options": "You can add Terms and Notes that will be printed in the Transaction"
},
{
"oldfieldtype": "Text Editor",
@@ -682,10 +682,10 @@
"print_hide": 1,
"doctype": "DocField",
"label": "Contact Person",
"options": "Contact",
"permlevel": 0,
"fieldname": "contact_person",
"fieldtype": "Link",
"permlevel": 0,
"options": "Contact",
"in_filter": 1
},
{
@@ -701,12 +701,12 @@
"search_index": 1,
"doctype": "DocField",
"label": "Territory",
"permlevel": 0,
"options": "Territory",
"fieldname": "territory",
"fieldtype": "Link",
"reqd": 1,
"hidden": 0,
"options": "Territory",
"permlevel": 0,
"in_filter": 1
},
{
@@ -714,10 +714,10 @@
"search_index": 1,
"doctype": "DocField",
"label": "Customer Group",
"options": "Customer Group",
"permlevel": 0,
"fieldname": "customer_group",
"fieldtype": "Link",
"permlevel": 0,
"options": "Customer Group",
"in_filter": 1
},
{
@@ -743,8 +743,8 @@
"fieldtype": "Time",
"search_index": 0,
"reqd": 1,
"in_filter": 0,
"permlevel": 0
"permlevel": 0,
"in_filter": 0
},
{
"print_hide": 1,
@@ -771,10 +771,10 @@
"doctype": "DocField",
"label": "Letter Head",
"oldfieldname": "letter_head",
"options": "link:Letter Head",
"permlevel": 0,
"fieldname": "letter_head",
"fieldtype": "Select",
"permlevel": 0
"options": "link:Letter Head"
},
{
"print_hide": 1,
@@ -796,12 +796,12 @@
"doctype": "DocField",
"label": "Project Name",
"oldfieldname": "project_name",
"permlevel": 0,
"options": "Project",
"fieldname": "project_name",
"fieldtype": "Link",
"search_index": 1,
"in_filter": 1,
"options": "Project"
"permlevel": 0,
"in_filter": 1
},
{
"print_hide": 1,
@@ -809,10 +809,10 @@
"doctype": "DocField",
"label": "Source",
"oldfieldname": "source",
"options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign",
"permlevel": 0,
"fieldname": "source",
"fieldtype": "Select",
"permlevel": 0
"options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign"
},
{
"print_hide": 1,
@@ -820,11 +820,11 @@
"doctype": "DocField",
"label": "Campaign",
"oldfieldname": "campaign",
"options": "Campaign",
"permlevel": 0,
"fieldname": "campaign",
"fieldtype": "Link",
"depends_on": "eval:doc.source == 'Campaign'",
"permlevel": 0
"options": "Campaign"
},
{
"print_hide": 1,
@@ -849,44 +849,44 @@
},
{
"print_hide": 1,
"depends_on": "eval:!doc.__islocal",
"doctype": "DocField",
"description": "% of materials billed against this Delivery Note",
"no_copy": 1,
"search_index": 1,
"doctype": "DocField",
"oldfieldtype": "Currency",
"label": "% Amount Billed",
"oldfieldname": "per_billed",
"fieldname": "per_billed",
"fieldtype": "Currency",
"oldfieldtype": "Currency",
"in_filter": 1,
"permlevel": 1
"depends_on": "eval:!doc.__islocal",
"permlevel": 1,
"in_filter": 1
},
{
"print_hide": 1,
"no_copy": 1,
"doctype": "DocField",
"label": "Billing Status",
"options": "\nNot Billed\nPartly Billed\nFully Billed",
"permlevel": 0,
"fieldname": "billing_status",
"fieldtype": "Select",
"hidden": 1,
"permlevel": 0
"options": "\nNot Billed\nPartly Billed\nFully Billed"
},
{
"print_hide": 1,
"depends_on": "eval:!doc.__islocal",
"doctype": "DocField",
"description": "% of materials delivered against this Delivery Note",
"no_copy": 1,
"search_index": 1,
"doctype": "DocField",
"oldfieldtype": "Currency",
"label": "% Installed",
"oldfieldname": "per_installed",
"fieldname": "per_installed",
"fieldtype": "Currency",
"oldfieldtype": "Currency",
"in_filter": 1,
"permlevel": 1
"depends_on": "eval:!doc.__islocal",
"permlevel": 1,
"in_filter": 1
},
{
"print_hide": 1,
@@ -973,8 +973,8 @@
"fieldtype": "Link",
"search_index": 1,
"reqd": 1,
"in_filter": 1,
"options": "Company"
"options": "Company",
"in_filter": 1
},
{
"print_hide": 1,
@@ -1020,10 +1020,10 @@
"doctype": "DocField",
"label": "Packing Details",
"oldfieldname": "packing_details",
"options": "Delivery Note Packing Item",
"permlevel": 1,
"fieldname": "packing_details",
"fieldtype": "Table",
"permlevel": 1
"options": "Delivery Note Packing Item"
},
{
"print_hide": 1,
@@ -1104,10 +1104,10 @@
"doctype": "DocField",
"label": "Sales Team1",
"oldfieldname": "sales_team",
"options": "Sales Team",
"permlevel": 0,
"fieldname": "sales_team",
"fieldtype": "Table",
"permlevel": 0
"options": "Sales Team"
},
{
"print_hide": 1,
@@ -1124,8 +1124,9 @@
"doctype": "DocPerm",
"submit": 0,
"write": 0,
"role": "Accounts User",
"cancel": 0,
"role": "Accounts User",
"report": 1,
"permlevel": 0
},
{
@@ -1143,6 +1144,7 @@
"doctype": "DocPerm",
"submit": 1,
"write": 1,
"report": 1,
"role": "Sales User",
"cancel": 1,
"permlevel": 0
@@ -1160,6 +1162,7 @@
{
"doctype": "DocPerm",
"role": "Customer",
"report": 1,
"permlevel": 0,
"match": "customer_name"
},
@@ -1189,6 +1192,7 @@
"doctype": "DocPerm",
"submit": 1,
"write": 1,
"report": 1,
"role": "Material Manager",
"cancel": 1,
"permlevel": 0
@@ -1209,6 +1213,7 @@
"doctype": "DocPerm",
"submit": 1,
"write": 1,
"report": 1,
"role": "Material User",
"cancel": 1,
"permlevel": 0

45
stock/doctype/item/item.txt
View File

@@ -2,9 +2,9 @@
{
"owner": "Administrator",
"docstatus": 0,
"creation": "2013-01-16 11:35:56",
"creation": "2013-01-17 10:57:15",
"modified_by": "Administrator",
"modified": "2013-01-19 12:09:54"
"modified": "2013-01-17 11:22:07"
},
{
"allow_attach": 1,
@@ -35,6 +35,7 @@
"parenttype": "DocType",
"report": 1,
"permlevel": 0,
"amend": 0,
"parentfield": "permissions"
},
{
@@ -50,15 +51,6 @@
"fieldtype": "Section Break",
"permlevel": 0
},
{
"oldfieldtype": "Small Text",
"doctype": "DocField",
"label": "Trash Reason",
"oldfieldname": "trash_reason",
"fieldname": "trash_reason",
"fieldtype": "Small Text",
"permlevel": 1
},
{
"description": "Item will be saved by this name in the data base.",
"oldfieldtype": "Data",
@@ -598,18 +590,6 @@
"depends_on": "eval:doc.is_sales_item==\"Yes\"",
"permlevel": 0
},
{
"description": "Create a price list from Price List master and enter standard ref rates against each of them. On selection of a price list in Quotation, Sales Order or Delivery Note, corresponding ref rate will be fetched for this item.",
"oldfieldtype": "Table",
"doctype": "DocField",
"label": "Item Prices",
"oldfieldname": "ref_rate_details",
"options": "Item Price",
"fieldname": "ref_rate_details",
"fieldtype": "Table",
"depends_on": "eval:doc.is_sales_item==\"Yes\"",
"permlevel": 0
},
{
"description": "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",
"depends_on": "eval:doc.is_sales_item==\"Yes\"",
@@ -638,6 +618,25 @@
"fieldtype": "Table",
"permlevel": 0
},
{
"doctype": "DocField",
"label": "Price Lists and Rates",
"fieldname": "price_list_section",
"fieldtype": "Section Break",
"permlevel": 0
},
{
"description": "Create a price list from Price List master and enter standard ref rates against each of them. On selection of a price list in Quotation, Sales Order or Delivery Note, corresponding ref rate will be fetched for this item.",
"oldfieldtype": "Table",
"doctype": "DocField",
"label": "Item Prices",
"oldfieldname": "ref_rate_details",
"options": "Item Price",
"fieldname": "ref_rate_details",
"fieldtype": "Table",
"depends_on": "eval:doc.is_sales_item==\"Yes\"",
"permlevel": 0
},
{
"oldfieldtype": "Section Break",
"doctype": "DocField",

47
stock/doctype/item_price/item_price.txt
View File

@@ -2,31 +2,24 @@
{
"owner": "Administrator",
"docstatus": 0,
"creation": "2012-03-27 14:36:36",
"creation": "2013-01-15 18:43:18",
"modified_by": "Administrator",
"modified": "2012-03-27 14:36:36"
"modified": "2013-01-17 17:53:42"
},
{
"section_style": "Tray",
"istable": 1,
"in_create": 1,
"module": "Stock",
"server_code_error": " ",
"read_only": 0,
"istable": 1,
"autoname": "RFD/.#####",
"name": "__common__",
"colour": "White:FFF",
"in_create": 1,
"doctype": "DocType",
"show_in_menu": 0,
"version": 3
"module": "Stock",
"name": "__common__"
},
{
"name": "__common__",
"parent": "Item Price",
"search_index": 1,
"doctype": "DocField",
"parenttype": "DocType",
"in_filter": 1,
"permlevel": 0,
"parentfield": "fields"
},
@@ -40,9 +33,11 @@
"label": "Price List Name",
"oldfieldname": "price_list_name",
"fieldname": "price_list_name",
"fieldtype": "Select",
"fieldtype": "Link",
"search_index": 1,
"reqd": 1,
"options": "link:Price List"
"options": "Price List",
"in_filter": 1
},
{
"oldfieldtype": "Currency",
@@ -51,7 +46,9 @@
"oldfieldname": "ref_rate",
"fieldname": "ref_rate",
"fieldtype": "Currency",
"reqd": 0
"search_index": 0,
"reqd": 0,
"in_filter": 1
},
{
"oldfieldtype": "Select",
@@ -60,7 +57,23 @@
"oldfieldname": "ref_currency",
"fieldname": "ref_currency",
"fieldtype": "Select",
"search_index": 1,
"reqd": 1,
"options": "link:Currency"
"options": "link:Currency",
"in_filter": 1
},
{
"description": "Allow this price in sales related forms",
"doctype": "DocField",
"label": "For Selling",
"fieldname": "selling",
"fieldtype": "Check"
},
{
"description": "Allow this price in purchase related forms",
"doctype": "DocField",
"label": "For Buying",
"fieldname": "buying",
"fieldtype": "Check"
}
]

11
stock/doctype/landed_cost_master/landed_cost_master.txt
View File

@@ -10,11 +10,11 @@
"section_style": "Simple",
"module": "Stock",
"doctype": "DocType",
"autoname": "field:title",
"document_type": "Master",
"_last_update": "1309508838",
"autoname": "field:title",
"name": "__common__",
"colour": "White:FFF",
"_last_update": "1309508838",
"server_code_error": " ",
"version": 1
},
@@ -68,16 +68,17 @@
"doctype": "DocField",
"label": "Landed Cost",
"oldfieldname": "landed_cost",
"permlevel": 0,
"options": "Landed Cost Master Detail",
"fieldname": "landed_cost",
"fieldtype": "Table",
"options": "Landed Cost Master Detail"
"permlevel": 0
},
{
"create": 1,
"doctype": "DocPerm",
"write": 1,
"role": "Purchase Manager",
"report": 1,
"permlevel": 0
},
{
@@ -85,6 +86,7 @@
"doctype": "DocPerm",
"write": 1,
"role": "System Manager",
"report": 1,
"permlevel": 0
},
{
@@ -92,6 +94,7 @@
"doctype": "DocPerm",
"write": 1,
"role": "Purchase User",
"report": 1,
"permlevel": 0
},
{

29
stock/doctype/packing_slip/packing_slip.txt
View File

@@ -8,19 +8,19 @@
},
{
"section_style": "Simple",
"description": "Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",
"is_submittable": 1,
"description": "Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",
"search_fields": "delivery_note",
"module": "Stock",
"doctype": "DocType",
"read_only_onload": 1,
"autoname": "PS.#######",
"document_type": "Transaction",
"subject": "[%(delivery_note)s] Case Nos: %(from_case_no)s - %(to_case_no)s | Net Weight: %(net_weight_pkg)s %(net_weight_uom)s | Gross Weight: %(gross_weight_pkg)s %(gross_weight_uom)s",
"autoname": "PS.#######",
"_last_update": "1328091392",
"name": "__common__",
"colour": "White:FFF",
"is_transaction_doc": 1,
"_last_update": "1328091392",
"doctype": "DocType",
"show_in_menu": 0,
"version": 1
},
@@ -49,6 +49,7 @@
"doctype": "DocPerm",
"submit": 1,
"write": 1,
"report": 1,
"role": "Material User",
"cancel": 1,
"permlevel": 0
@@ -59,6 +60,7 @@
"doctype": "DocPerm",
"submit": 1,
"write": 1,
"report": 1,
"role": "Sales User",
"cancel": 1,
"permlevel": 0
@@ -69,6 +71,7 @@
"doctype": "DocPerm",
"submit": 1,
"write": 1,
"report": 1,
"role": "Material Master Manager",
"cancel": 1,
"permlevel": 0
@@ -79,6 +82,7 @@
"doctype": "DocPerm",
"submit": 1,
"write": 1,
"report": 1,
"role": "Material Manager",
"cancel": 1,
"permlevel": 0
@@ -89,6 +93,7 @@
"doctype": "DocPerm",
"submit": 1,
"write": 1,
"report": 1,
"role": "Sales Manager",
"cancel": 1,
"permlevel": 0
@@ -116,11 +121,11 @@
"colour": "White:FFF",
"doctype": "DocField",
"label": "Delivery Note",
"permlevel": 0,
"options": "Delivery Note",
"fieldname": "delivery_note",
"fieldtype": "Link",
"reqd": 1,
"options": "Delivery Note"
"permlevel": 0
},
{
"doctype": "DocField",
@@ -133,11 +138,11 @@
"no_copy": 0,
"doctype": "DocField",
"label": "Series",
"permlevel": 0,
"options": "PS",
"fieldname": "naming_series",
"fieldtype": "Select",
"reqd": 1,
"options": "PS"
"permlevel": 0
},
{
"colour": "White:FFF",
@@ -243,10 +248,10 @@
"colour": "White:FFF",
"doctype": "DocField",
"label": "Gross Weight UOM",
"permlevel": 0,
"options": "UOM",
"fieldname": "gross_weight_uom",
"fieldtype": "Link",
"options": "UOM"
"permlevel": 0
},
{
"colour": "White:FFF",
@@ -261,10 +266,10 @@
"no_copy": 1,
"doctype": "DocField",
"label": "Amended From",
"permlevel": 1,
"options": "Packing Slip",
"fieldname": "amended_from",
"fieldtype": "Link",
"options": "Packing Slip"
"permlevel": 1
},
{
"print_hide": 1,

44
stock/doctype/purchase_receipt/purchase_receipt.js
View File

@@ -22,6 +22,29 @@ wn.require('app/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxe
wn.require('app/buying/doctype/purchase_common/purchase_common.js');
wn.require('app/utilities/doctype/sms_control/sms_control.js');
erpnext.buying.PurchaseReceiptController = erpnext.buying.BuyingController.extend({
refresh: function() {
this._super();
if(this.frm.doc.docstatus == 1) {
if(flt(this.frm.doc.per_billed, 2) < 100) {
cur_frm.add_custom_button('Make Purchase Invoice',
cur_frm.cscript['Make Purchase Invoice']);
}
cur_frm.add_custom_button('Send SMS', cur_frm.cscript['Send SMS']);
}
if(wn.boot.control_panel.country == 'India') {
unhide_field(['challan_no', 'challan_date']);
}
}
});
var new_cscript = new erpnext.buying.PurchaseReceiptController({frm: cur_frm});
// for backward compatibility: combine new and previous states
$.extend(cur_frm.cscript, new_cscript);
//========================== On Load ================================================================
cur_frm.cscript.onload = function(doc, cdt, cdn) {
if(!doc.fiscal_year && doc.__islocal){ wn.model.set_default_values(doc);}
@@ -38,26 +61,6 @@ cur_frm.cscript.onload_post_render = function(doc, dt, dn) {
cur_frm.cscript.dynamic_label(doc, dt, dn, callback);
}
//========================== Refresh ===============================================================
cur_frm.cscript.refresh = function(doc, cdt, cdn) {
cur_frm.clear_custom_buttons();
erpnext.hide_naming_series();
if(doc.supplier) $(cur_frm.fields_dict.contact_section.row.wrapper).toggle(true);
else $(cur_frm.fields_dict.contact_section.row.wrapper).toggle(false);
if (!cur_frm.cscript.is_onload) cur_frm.cscript.dynamic_label(doc, cdt, cdn);
if(doc.docstatus == 1){
if (flt(doc.per_billed, 2) < 100) cur_frm.add_custom_button('Make Purchase Invoice', cur_frm.cscript['Make Purchase Invoice']);
cur_frm.add_custom_button('Send SMS', cur_frm.cscript['Send SMS']);
}
if(wn.boot.control_panel.country == 'India') {
unhide_field(['challan_no', 'challan_date']);
}
}
//Supplier
cur_frm.cscript.supplier = function(doc,dt,dn) {
if (doc.supplier) {
@@ -65,7 +68,6 @@ cur_frm.cscript.supplier = function(doc,dt,dn) {
JSON.stringify({ supplier: doc.supplier }),'', doc, dt, dn, 1, function() {
cur_frm.refresh();
});
$(cur_frm.fields_dict.contact_section.row.wrapper).toggle(true);
}
}

50
stock/doctype/purchase_receipt/purchase_receipt.py
View File

@@ -18,18 +18,16 @@ from __future__ import unicode_literals
import webnotes
from webnotes.utils import cstr, flt, get_defaults, getdate
from webnotes.model import db_exists
from webnotes.model.doc import addchild, make_autoname
from webnotes.model.wrapper import getlist, copy_doclist
from webnotes.model.doc import addchild
from webnotes.model.wrapper import getlist
from webnotes.model.code import get_obj
from webnotes import msgprint
from setup.utils import get_company_currency
sql = webnotes.conn.sql
from utilities.transaction_base import TransactionBase
class DocType(TransactionBase):
from controllers.buying_controller import BuyingController
class DocType(BuyingController):
def __init__(self, doc, doclist=[]):
self.doc = doc
self.doclist = doclist
@@ -38,32 +36,9 @@ class DocType(TransactionBase):
self.fname = 'purchase_receipt_details'
self.count = 0
# Autoname
# ---------
def autoname(self):
self.doc.name = make_autoname(self.doc.naming_series+'.#####')
def validate_fiscal_year(self):
get_obj(dt = 'Purchase Common').validate_fiscal_year(self.doc.fiscal_year,self.doc.posting_date,'Transaction Date')
def get_item_details(self, arg = ''):
if arg:
return get_obj(dt='Purchase Common').get_item_details(self,arg)
else:
import json
obj = get_obj('Purchase Common')
for doc in self.doclist:
if doc.fields.get('item_code'):
temp = {
'item_code': doc.fields.get('item_code'),
'warehouse': doc.fields.get('warehouse')
}
ret = obj.get_item_details(self, json.dumps(temp))
for r in ret:
if not doc.fields.get(r):
doc.fields[r] = ret[r]
# GET TERMS & CONDITIONS
# =====================================================================================
def get_tc_details(self):
@@ -125,14 +100,6 @@ class DocType(TransactionBase):
#d.valuation_rate = (flt(d.purchase_rate) + ((flt(d.amount) * (total_b_cost)) / (self.doc.net_total * flt(d.qty))) + (flt(d.rm_supp_cost) / flt(d.qty))) / flt(d.conversion_factor)
d.valuation_rate = (flt(d.purchase_rate) + ((flt(d.amount) * (total_b_cost)) / (self.doc.net_total * flt(d.qty))) + (flt(d.rm_supp_cost) / flt(d.qty)) + (flt(d.item_tax_amount)/flt(d.qty))) / flt(d.conversion_factor)
# Check for Stopped status
def check_for_stopped_status(self, pc_obj):
check_list =[]
for d in getlist(self.doclist, 'purchase_receipt_details'):
if d.fields.has_key('prevdoc_docname') and d.prevdoc_docname and d.prevdoc_docname not in check_list:
check_list.append(d.prevdoc_docname)
pc_obj.check_for_stopped_status( d.prevdoc_doctype, d.prevdoc_docname)
#check in manage account if purchase order required or not.
# ====================================================================================
def po_required(self):
@@ -146,6 +113,8 @@ class DocType(TransactionBase):
# validate
def validate(self):
super(DocType, self).validate()
self.po_required()
self.validate_fiscal_year()
@@ -163,13 +132,12 @@ class DocType(TransactionBase):
pc_obj = get_obj(dt='Purchase Common')
pc_obj.validate_for_items(self)
pc_obj.validate_mandatory(self)
pc_obj.validate_conversion_rate(self)
pc_obj.get_prevdoc_date(self)
pc_obj.validate_reference_value(self)
self.check_for_stopped_status(pc_obj)
# get total in words
dcc = TransactionBase().get_company_currency(self.doc.company)
dcc = get_company_currency(self.doc.company)
self.doc.in_words = pc_obj.get_total_in_words(dcc, self.doc.grand_total)
self.doc.in_words_import = pc_obj.get_total_in_words(self.doc.currency, self.doc.grand_total_import)
# update valuation rate
@@ -255,7 +223,6 @@ class DocType(TransactionBase):
self.values.append({
'item_code' : d.fields.has_key('item_code') and d.item_code or d.rm_item_code,
'warehouse' : wh,
'transaction_date' : getdate(self.doc.modified).strftime('%Y-%m-%d'),
'posting_date' : self.doc.posting_date,
'posting_time' : self.doc.posting_time,
'voucher_type' : 'Purchase Receipt',
@@ -287,7 +254,6 @@ class DocType(TransactionBase):
check_list.append(d.prevdoc_docname)
pc_obj.check_for_stopped_status( d.prevdoc_doctype, d.prevdoc_docname)
# on submit
def on_submit(self):
purchase_controller = webnotes.get_obj("Purchase Common")

470
stock/doctype/purchase_receipt/purchase_receipt.txt
View File

@@ -2,18 +2,19 @@
{
"owner": "Administrator",
"docstatus": 0,
"creation": "2012-07-17 13:24:57",
"creation": "2013-01-18 12:47:03",
"modified_by": "Administrator",
"modified": "2012-12-03 17:10:41"
"modified": "2013-01-18 13:25:36"
},
{
"document_type": "Transaction",
"is_submittable": 1,
"allow_attach": 1,
"search_fields": "status, posting_date, supplier",
"autoname": "naming_series:",
"module": "Stock",
"doctype": "DocType",
"read_only_onload": 1,
"document_type": "Transaction",
"search_fields": "status, posting_date, supplier",
"name": "__common__"
},
{
@@ -36,6 +37,7 @@
"doctype": "DocType"
},
{
"print_width": "50%",
"oldfieldtype": "Column Break",
"doctype": "DocField",
"width": "50%",
@@ -48,27 +50,25 @@
"description": "To manage multiple series please go to Setup > Manage Series",
"no_copy": 1,
"oldfieldtype": "Select",
"colour": "White:FFF",
"doctype": "DocField",
"label": "Series",
"oldfieldname": "naming_series",
"permlevel": 0,
"options": "\nGRN",
"fieldname": "naming_series",
"fieldtype": "Select",
"reqd": 1,
"options": "\nGRN"
"permlevel": 0
},
{
"print_hide": 1,
"print_width": "150px",
"permlevel": 0,
"oldfieldtype": "Link",
"colour": "White:FFF",
"allow_on_submit": 0,
"doctype": "DocField",
"label": "Supplier",
"oldfieldname": "supplier",
"width": "150px",
"trigger": "Client",
"fieldname": "supplier",
"fieldtype": "Link",
"search_index": 1,
@@ -118,6 +118,7 @@
"permlevel": 1
},
{
"print_width": "50%",
"oldfieldtype": "Column Break",
"doctype": "DocField",
"width": "50%",
@@ -128,9 +129,9 @@
{
"print_hide": 1,
"description": "The date at which current entry will get or has actually executed.",
"print_width": "100px",
"no_copy": 1,
"oldfieldtype": "Date",
"colour": "White:FFF",
"doctype": "DocField",
"label": "Posting Date",
"oldfieldname": "posting_date",
@@ -139,15 +140,15 @@
"fieldtype": "Date",
"search_index": 1,
"reqd": 1,
"in_filter": 1,
"permlevel": 0
"permlevel": 0,
"in_filter": 1
},
{
"print_hide": 1,
"description": "Time at which materials were received",
"print_width": "100px",
"no_copy": 1,
"oldfieldtype": "Time",
"colour": "White:FFF",
"doctype": "DocField",
"label": "Posting Time",
"oldfieldname": "posting_time",
@@ -156,14 +157,14 @@
"fieldtype": "Time",
"search_index": 0,
"reqd": 1,
"in_filter": 0,
"permlevel": 0
"permlevel": 0,
"in_filter": 0
},
{
"print_hide": 0,
"print_width": "100px",
"no_copy": 1,
"oldfieldtype": "Data",
"colour": "White:FFF",
"doctype": "DocField",
"label": "Challan No",
"oldfieldname": "challan_no",
@@ -176,9 +177,9 @@
},
{
"print_hide": 0,
"print_width": "100px",
"no_copy": 1,
"oldfieldtype": "Date",
"colour": "White:FFF",
"doctype": "DocField",
"label": "Challan Date",
"oldfieldname": "challan_date",
@@ -191,7 +192,6 @@
},
{
"oldfieldtype": "Section Break",
"colour": "White:FFF",
"doctype": "DocField",
"label": "Items",
"fieldname": "items",
@@ -200,20 +200,19 @@
},
{
"print_hide": 0,
"allow_on_submit": 1,
"oldfieldtype": "Table",
"allow_on_submit": 1,
"doctype": "DocField",
"label": "Purchase Receipt Items",
"oldfieldname": "purchase_receipt_details",
"options": "Purchase Receipt Item",
"permlevel": 0,
"fieldname": "purchase_receipt_details",
"fieldtype": "Table",
"reqd": 0,
"permlevel": 0
"options": "Purchase Receipt Item"
},
{
"oldfieldtype": "Section Break",
"colour": "White:FFF",
"doctype": "DocField",
"options": "Simple",
"fieldname": "section_break0",
@@ -222,58 +221,68 @@
},
{
"print_hide": 1,
"oldfieldtype": "Currency",
"oldfieldtype": "Button",
"doctype": "DocField",
"label": "Net Total",
"oldfieldname": "net_total",
"width": "150px",
"fieldname": "net_total",
"fieldtype": "Currency",
"reqd": 1,
"permlevel": 1
"label": "Get Current Stock",
"permlevel": 0,
"fieldname": "get_current_stock",
"fieldtype": "Button",
"options": "get_current_stock"
},
{
"print_hide": 1,
"oldfieldtype": "Currency",
"doctype": "DocField",
"label": "Net Total (Import)",
"oldfieldname": "net_total_import",
"fieldname": "net_total_import",
"fieldtype": "Currency",
"permlevel": 1
"fieldname": "column_break_18",
"fieldtype": "Column Break",
"permlevel": 0
},
{
"oldfieldtype": "Button",
"doctype": "DocField",
"label": "Re-Calculate Values",
"trigger": "Client",
"fieldname": "recalculate_values",
"fieldtype": "Button",
"permlevel": 0
},
{
"print_hide": 1,
"oldfieldtype": "Button",
"doctype": "DocField",
"label": "Get Current Stock",
"options": "get_current_stock",
"fieldname": "get_current_stock",
"fieldtype": "Button",
"fieldname": "section_break_20",
"fieldtype": "Section Break",
"permlevel": 0
},
{
"oldfieldtype": "Column Break",
"print_hide": 0,
"description": "You can make a purchase receipt from multiple purchase orders. Select purchase orders one by one and click on the button below.",
"no_copy": 1,
"oldfieldtype": "Link",
"doctype": "DocField",
"width": "50%",
"fieldname": "column_break2",
"fieldtype": "Column Break",
"label": "Purchase Order",
"oldfieldname": "purchase_order_no",
"permlevel": 0,
"fieldname": "purchase_order_no",
"fieldtype": "Link",
"options": "Purchase Order"
},
{
"print_hide": 1,
"oldfieldtype": "Button",
"doctype": "DocField",
"label": "Pull Purchase Order Details",
"permlevel": 0,
"fieldname": "pull_purchase_order_details",
"fieldtype": "Button",
"options": "get_po_details"
},
{
"doctype": "DocField",
"label": "Currency & Price List",
"fieldname": "currency_price_list",
"fieldtype": "Section Break",
"permlevel": 0
},
{
"print_hide": 1,
"description": "Supplier's currency",
"oldfieldtype": "Select",
"colour": "White:FFF",
"doctype": "DocField",
"label": "Currency",
"oldfieldname": "currency",
@@ -288,45 +297,56 @@
"description": "Rate at which supplier's currency is converted to company's base currency",
"default": "1.00",
"oldfieldtype": "Currency",
"colour": "White:FFF",
"doctype": "DocField",
"label": "Conversion Rate",
"label": "Exchange Rate",
"oldfieldname": "conversion_rate",
"trigger": "Client",
"fieldname": "conversion_rate",
"fieldtype": "Float",
"reqd": 1,
"permlevel": 0
},
{
"print_hide": 0,
"description": "You can make a purchase receipt from multiple purchase orders. Select purchase orders one by one and click on the button below.",
"no_copy": 1,
"oldfieldtype": "Link",
"colour": "White:FFF",
"print_width": "50%",
"oldfieldtype": "Column Break",
"doctype": "DocField",
"label": "Purchase Order",
"oldfieldname": "purchase_order_no",
"permlevel": 0,
"fieldname": "purchase_order_no",
"fieldtype": "Link",
"options": "Purchase Order"
"width": "50%",
"fieldname": "column_break2",
"fieldtype": "Column Break",
"permlevel": 0
},
{
"print_hide": 1,
"oldfieldtype": "Button",
"colour": "White:FFF",
"description": "Consider this Price List for fetching rate. (only which have \"For Buying\" as checked)",
"doctype": "DocField",
"label": "Pull Purchase Order Details",
"options": "get_po_details",
"fieldname": "pull_purchase_order_details",
"fieldtype": "Button",
"label": "Price List",
"permlevel": 0,
"fieldname": "price_list_name",
"fieldtype": "Link",
"options": "Price List"
},
{
"print_hide": 1,
"depends_on": "price_list_name",
"doctype": "DocField",
"label": "Price List Currency",
"permlevel": 0,
"fieldname": "price_list_currency",
"fieldtype": "Link",
"hidden": 0,
"options": "Currency"
},
{
"print_hide": 1,
"depends_on": "price_list_name",
"doctype": "DocField",
"label": "Price List Exchange Rate",
"fieldname": "plc_conversion_rate",
"fieldtype": "Float",
"permlevel": 0
},
{
"description": "Add / Edit Taxes and Charges",
"oldfieldtype": "Section Break",
"colour": "White:FFF",
"doctype": "DocField",
"label": "Taxes",
"fieldname": "taxes",
@@ -337,55 +357,43 @@
"print_hide": 1,
"description": "If you have created a standard template in Purchase Taxes and Charges Master, select one and click on the button below.",
"oldfieldtype": "Link",
"colour": "White:FFF",
"doctype": "DocField",
"label": "Purchase Taxes and Charges",
"oldfieldname": "purchase_other_charges",
"options": "Purchase Taxes and Charges Master",
"permlevel": 0,
"fieldname": "purchase_other_charges",
"fieldtype": "Link",
"permlevel": 0
"options": "Purchase Taxes and Charges Master"
},
{
"print_hide": 1,
"oldfieldtype": "Button",
"doctype": "DocField",
"label": "Get Tax Detail",
"options": "get_purchase_tax_details",
"permlevel": 0,
"fieldname": "get_tax_detail",
"fieldtype": "Button",
"permlevel": 0
"options": "get_purchase_tax_details"
},
{
"oldfieldtype": "Table",
"doctype": "DocField",
"label": "Purchase Taxes and Charges",
"oldfieldname": "purchase_tax_details",
"options": "Purchase Taxes and Charges",
"permlevel": 0,
"fieldname": "purchase_tax_details",
"fieldtype": "Table",
"permlevel": 0
"options": "Purchase Taxes and Charges"
},
{
"print_hide": 1,
"oldfieldtype": "Button",
"doctype": "DocField",
"label": "Calculate Tax",
"trigger": "Client",
"fieldname": "calculate_tax",
"fieldtype": "Button",
"permlevel": 0
},
{
"print_hide": 1,
"oldfieldtype": "Currency",
"doctype": "DocField",
"label": "Total Tax",
"oldfieldname": "total_tax",
"fieldname": "total_tax",
"fieldtype": "Currency",
"permlevel": 1
},
{
"print_hide": 1,
"oldfieldtype": "HTML",
@@ -398,7 +406,6 @@
{
"description": "Detailed Breakup of the totals",
"oldfieldtype": "Section Break",
"colour": "White:FFF",
"doctype": "DocField",
"label": "Totals",
"fieldname": "totals",
@@ -409,83 +416,12 @@
"print_hide": 1,
"oldfieldtype": "Currency",
"doctype": "DocField",
"label": "Grand Total",
"oldfieldname": "grand_total",
"fieldname": "grand_total",
"label": "Net Total (Import)",
"oldfieldname": "net_total_import",
"fieldname": "net_total_import",
"fieldtype": "Currency",
"permlevel": 1
},
{
"print_hide": 1,
"oldfieldtype": "Currency",
"colour": "White:FFF",
"doctype": "DocField",
"label": "Rounded Total",
"oldfieldname": "rounded_total",
"fieldname": "rounded_total",
"fieldtype": "Currency",
"permlevel": 1
},
{
"print_hide": 1,
"description": "In Words will be visible once you save the Purchase Receipt.",
"oldfieldtype": "Data",
"colour": "White:FFF",
"doctype": "DocField",
"label": "In Words",
"oldfieldname": "in_words",
"fieldname": "in_words",
"fieldtype": "Data",
"permlevel": 1
},
{
"print_hide": 1,
"oldfieldtype": "Currency",
"doctype": "DocField",
"label": "Taxes and Charges Added",
"oldfieldname": "other_charges_added",
"fieldname": "other_charges_added",
"fieldtype": "Currency",
"permlevel": 1
},
{
"print_hide": 1,
"oldfieldtype": "Currency",
"doctype": "DocField",
"label": "Taxes and Charges Deducted",
"oldfieldname": "other_charges_deducted",
"fieldname": "other_charges_deducted",
"fieldtype": "Currency",
"permlevel": 1
},
{
"doctype": "DocField",
"width": "50%",
"fieldname": "column_break3",
"fieldtype": "Column Break",
"permlevel": 0
},
{
"print_hide": 1,
"oldfieldtype": "Currency",
"doctype": "DocField",
"label": "Grand Total (Import)",
"oldfieldname": "grand_total_import",
"fieldname": "grand_total_import",
"fieldtype": "Currency",
"permlevel": 1
},
{
"print_hide": 1,
"oldfieldtype": "Data",
"colour": "White:FFF",
"doctype": "DocField",
"label": "In Words (Import)",
"oldfieldname": "in_words_import",
"fieldname": "in_words_import",
"fieldtype": "Data",
"permlevel": 1
},
{
"print_hide": 1,
"oldfieldtype": "Currency",
@@ -506,10 +442,111 @@
"fieldtype": "Currency",
"permlevel": 1
},
{
"print_hide": 1,
"oldfieldtype": "Currency",
"doctype": "DocField",
"label": "Grand Total (Import)",
"oldfieldname": "grand_total_import",
"fieldname": "grand_total_import",
"fieldtype": "Currency",
"permlevel": 1
},
{
"print_hide": 1,
"oldfieldtype": "Data",
"doctype": "DocField",
"label": "In Words (Import)",
"oldfieldname": "in_words_import",
"fieldname": "in_words_import",
"fieldtype": "Data",
"permlevel": 1
},
{
"print_width": "50%",
"doctype": "DocField",
"width": "50%",
"fieldname": "column_break3",
"fieldtype": "Column Break",
"permlevel": 0
},
{
"print_hide": 1,
"print_width": "150px",
"oldfieldtype": "Currency",
"doctype": "DocField",
"label": "Net Total",
"oldfieldname": "net_total",
"width": "150px",
"fieldname": "net_total",
"fieldtype": "Currency",
"reqd": 1,
"permlevel": 1
},
{
"print_hide": 1,
"oldfieldtype": "Currency",
"doctype": "DocField",
"label": "Taxes and Charges Added",
"oldfieldname": "other_charges_added",
"fieldname": "other_charges_added",
"fieldtype": "Currency",
"permlevel": 1
},
{
"print_hide": 1,
"oldfieldtype": "Currency",
"doctype": "DocField",
"label": "Taxes and Charges Deducted",
"oldfieldname": "other_charges_deducted",
"fieldname": "other_charges_deducted",
"fieldtype": "Currency",
"permlevel": 1
},
{
"print_hide": 1,
"oldfieldtype": "Currency",
"doctype": "DocField",
"label": "Total Tax",
"oldfieldname": "total_tax",
"fieldname": "total_tax",
"fieldtype": "Currency",
"permlevel": 1
},
{
"print_hide": 1,
"oldfieldtype": "Currency",
"doctype": "DocField",
"label": "Grand Total",
"oldfieldname": "grand_total",
"fieldname": "grand_total",
"fieldtype": "Currency",
"permlevel": 1
},
{
"print_hide": 1,
"oldfieldtype": "Currency",
"doctype": "DocField",
"label": "Rounded Total",
"oldfieldname": "rounded_total",
"fieldname": "rounded_total",
"fieldtype": "Currency",
"permlevel": 1
},
{
"print_hide": 1,
"description": "In Words will be visible once you save the Purchase Receipt.",
"oldfieldtype": "Data",
"doctype": "DocField",
"label": "In Words",
"oldfieldname": "in_words",
"fieldname": "in_words",
"fieldtype": "Data",
"permlevel": 1
},
{
"description": "Add Terms and Conditions for the Purchase Receipt. You can also prepare a Terms and Conditions Master and use the Template.",
"oldfieldtype": "Section Break",
"colour": "White:FFF",
"doctype": "DocField",
"label": "Terms and Conditions",
"fieldname": "terms_section_break",
@@ -522,29 +559,29 @@
"doctype": "DocField",
"label": "Select Terms and Conditions",
"oldfieldname": "tc_name",
"options": "Terms and Conditions",
"permlevel": 0,
"fieldname": "tc_name",
"fieldtype": "Link",
"permlevel": 0
"options": "Terms and Conditions"
},
{
"oldfieldtype": "Button",
"doctype": "DocField",
"label": "Get Terms and Conditions",
"options": "get_tc_details",
"permlevel": 0,
"fieldname": "get_terms",
"fieldtype": "Button",
"permlevel": 0
"options": "get_tc_details"
},
{
"print_hide": 1,
"oldfieldtype": "HTML",
"doctype": "DocField",
"label": "Terms and Conditions HTML",
"options": "You can add Terms and Notes that will be printed in the Transaction",
"permlevel": 0,
"fieldname": "terms_html",
"fieldtype": "HTML",
"permlevel": 0
"options": "You can add Terms and Notes that will be printed in the Transaction"
},
{
"oldfieldtype": "Text Editor",
@@ -566,24 +603,29 @@
"print_hide": 1,
"doctype": "DocField",
"label": "Supplier Address",
"options": "Address",
"permlevel": 0,
"fieldname": "supplier_address",
"fieldtype": "Link",
"options": "Address"
},
{
"doctype": "DocField",
"fieldname": "column_break_57",
"fieldtype": "Column Break",
"permlevel": 0
},
{
"print_hide": 1,
"doctype": "DocField",
"label": "Contact Person",
"options": "Contact",
"permlevel": 0,
"fieldname": "contact_person",
"fieldtype": "Link",
"permlevel": 0
"options": "Contact"
},
{
"description": "Filing in Additional Information about the Purchase Receipt will help you analyze your data better.",
"oldfieldtype": "Section Break",
"colour": "White:FFF",
"doctype": "DocField",
"label": "More Info",
"fieldname": "more_info",
@@ -593,9 +635,9 @@
{
"print_hide": 1,
"permlevel": 1,
"print_width": "150px",
"no_copy": 1,
"oldfieldtype": "Select",
"colour": "White:FFF",
"doctype": "DocField",
"label": "Status",
"oldfieldname": "status",
@@ -612,7 +654,6 @@
"description": "% of materials billed against this Purchase Receipt",
"no_copy": 1,
"oldfieldtype": "Currency",
"colour": "White:FFF",
"doctype": "DocField",
"label": "% Billed",
"oldfieldname": "per_billed",
@@ -626,7 +667,6 @@
"description": "Select \"Yes\" for sub - contracting items",
"default": "No",
"oldfieldtype": "Select",
"colour": "White:FFF",
"doctype": "DocField",
"label": "Is Subcontracted",
"oldfieldname": "is_subcontracted",
@@ -637,6 +677,8 @@
},
{
"print_hide": 1,
"permlevel": 1,
"print_width": "150px",
"no_copy": 1,
"oldfieldtype": "Data",
"doctype": "DocField",
@@ -646,26 +688,11 @@
"fieldname": "amended_from",
"fieldtype": "Data",
"hidden": 1,
"permlevel": 1
},
{
"print_hide": 1,
"description": "The date at which current entry is corrected in the system.",
"no_copy": 1,
"oldfieldtype": "Date",
"doctype": "DocField",
"label": "Amendment Date",
"oldfieldname": "amendment_date",
"width": "100px",
"fieldname": "amendment_date",
"fieldtype": "Date",
"hidden": 1,
"permlevel": 0
"options": "Purchase Receipt"
},
{
"print_hide": 1,
"oldfieldtype": "Data",
"colour": "White:FFF",
"doctype": "DocField",
"label": "Range",
"oldfieldname": "range",
@@ -700,25 +727,23 @@
"print_hide": 1,
"no_copy": 1,
"oldfieldtype": "Link",
"colour": "White:FFF",
"allow_on_submit": 1,
"doctype": "DocField",
"label": "Select Print Heading",
"oldfieldname": "select_print_heading",
"permlevel": 0,
"trigger": "Client",
"options": "Print Heading",
"fieldname": "select_print_heading",
"fieldtype": "Link",
"options": "Print Heading",
"permlevel": 0,
"report_hide": 1
},
{
"print_hide": 1,
"permlevel": 0,
"description": "Select the relevant company name if you have multiple companies",
"print_width": "150px",
"no_copy": 0,
"oldfieldtype": "Link",
"colour": "White:FFF",
"doctype": "DocField",
"label": "Company",
"oldfieldname": "company",
@@ -728,11 +753,12 @@
"search_index": 1,
"reqd": 1,
"hidden": 0,
"in_filter": 1,
"options": "Company"
"options": "Company",
"in_filter": 1
},
{
"print_hide": 1,
"print_width": "150px",
"permlevel": 0,
"oldfieldtype": "Select",
"doctype": "DocField",
@@ -748,6 +774,7 @@
},
{
"print_hide": 1,
"print_width": "50%",
"oldfieldtype": "Column Break",
"doctype": "DocField",
"width": "50%",
@@ -757,40 +784,39 @@
},
{
"print_hide": 1,
"permlevel": 0,
"print_width": "30%",
"oldfieldtype": "HTML",
"colour": "White:FFF",
"doctype": "DocField",
"label": "Other Details",
"width": "30%",
"options": "<div class='columnHeading'>Other Details</div>",
"fieldname": "other_details",
"fieldtype": "HTML",
"reqd": 0,
"hidden": 1,
"options": "<div class='columnHeading'>Other Details</div>"
"permlevel": 0
},
{
"print_hide": 1,
"description": "Warehouse where you are maintaining stock of rejected items",
"no_copy": 1,
"oldfieldtype": "Link",
"colour": "White:FFF",
"doctype": "DocField",
"label": "Rejected Warehouse",
"oldfieldname": "rejected_warehouse",
"permlevel": 0,
"options": "Warehouse",
"fieldname": "rejected_warehouse",
"fieldtype": "Link",
"reqd": 0,
"options": "Warehouse"
"permlevel": 0
},
{
"print_hide": 1,
"permlevel": 0,
"description": "Supplier warehouse where you have issued raw materials for sub - contracting",
"print_width": "50px",
"no_copy": 1,
"oldfieldtype": "Link",
"colour": "White:FFF",
"doctype": "DocField",
"label": "Supplier Warehouse",
"oldfieldname": "supplier_warehouse",
@@ -803,7 +829,6 @@
"print_hide": 1,
"no_copy": 1,
"oldfieldtype": "Data",
"colour": "White:FFF",
"doctype": "DocField",
"label": "Cancel Reason",
"oldfieldname": "cancel_reason",
@@ -849,9 +874,9 @@
{
"print_hide": 0,
"description": "Transporter lorry number",
"print_width": "100px",
"no_copy": 1,
"oldfieldtype": "Data",
"colour": "White:FFF",
"doctype": "DocField",
"label": "LR No",
"oldfieldname": "lr_no",
@@ -863,9 +888,9 @@
{
"print_hide": 0,
"description": "Date on which lorry started from supplier warehouse",
"print_width": "100px",
"no_copy": 1,
"oldfieldtype": "Date",
"colour": "White:FFF",
"doctype": "DocField",
"label": "LR Date",
"oldfieldname": "lr_date",
@@ -875,6 +900,7 @@
"permlevel": 0
},
{
"print_width": "50%",
"doctype": "DocField",
"width": "50%",
"fieldname": "column_break5",
@@ -885,7 +911,6 @@
"print_hide": 1,
"description": "Following table will show values if items are sub - contracted. These values will be fetched from the master of \"Bill of Materials\" of sub - contracted items.",
"oldfieldtype": "Section Break",
"colour": "White:FFF",
"doctype": "DocField",
"label": "Raw Material Details",
"fieldname": "raw_material_details",
@@ -899,10 +924,10 @@
"doctype": "DocField",
"label": "Purchase Receipt Item Supplieds",
"oldfieldname": "pr_raw_material_details",
"options": "Purchase Receipt Item Supplied",
"permlevel": 1,
"fieldname": "pr_raw_material_details",
"fieldtype": "Table",
"permlevel": 1
"options": "Purchase Receipt Item Supplied"
},
{
"print_hide": 1,
@@ -920,27 +945,28 @@
"doctype": "DocPerm",
"submit": 1,
"write": 1,
"report": 1,
"role": "Purchase User",
"cancel": 1,
"permlevel": 0,
"match": ""
"permlevel": 0
},
{
"doctype": "DocPerm",
"role": "Purchase User",
"permlevel": 1
"permlevel": 1,
"doctype": "DocPerm"
},
{
"doctype": "DocPerm",
"role": "Supplier",
"match": "supplier",
"permlevel": 0
"report": 1,
"permlevel": 0,
"match": "supplier"
},
{
"write": 1,
"doctype": "DocPerm",
"role": "All",
"permlevel": 2
"permlevel": 2,
"doctype": "DocPerm"
},
{
"amend": 0,
@@ -958,6 +984,7 @@
"doctype": "DocPerm",
"submit": 1,
"write": 1,
"report": 1,
"role": "Material Manager",
"cancel": 1,
"permlevel": 0
@@ -978,6 +1005,7 @@
"doctype": "DocPerm",
"submit": 1,
"write": 1,
"report": 1,
"role": "Material User",
"cancel": 1,
"permlevel": 0

13
stock/doctype/sales_bom/sales_bom.txt
View File

@@ -8,16 +8,16 @@
},
{
"section_style": "Simple",
"description": "Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. \n\nThe package **Item** will have \"Is Stock Item\" as \"No\" and \"Is Sales Item\" as \"Yes\".\n\nFor Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Sales BOM Item.\n\nNote: BOM = Bill of Materials",
"is_submittable": 0,
"description": "Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. \n\nThe package **Item** will have \"Is Stock Item\" as \"No\" and \"Is Sales Item\" as \"Yes\".\n\nFor Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Sales BOM Item.\n\nNote: BOM = Bill of Materials",
"module": "Stock",
"doctype": "DocType",
"allow_trash": 1,
"server_code_error": " ",
"allow_trash": 1,
"document_type": "Master",
"_last_update": "1322549701",
"name": "__common__",
"colour": "White:FFF",
"_last_update": "1322549701",
"doctype": "DocType",
"show_in_menu": 0,
"version": 1
},
@@ -33,8 +33,8 @@
"name": "__common__",
"parent": "Sales BOM",
"read": 1,
"doctype": "DocPerm",
"submit": 0,
"doctype": "DocPerm",
"amend": 0,
"parenttype": "DocType",
"parentfield": "permissions"
@@ -55,6 +55,7 @@
"create": 1,
"doctype": "DocPerm",
"write": 1,
"report": 1,
"role": "Material Manager",
"cancel": 1,
"permlevel": 0
@@ -71,6 +72,7 @@
"create": 0,
"doctype": "DocPerm",
"write": 0,
"report": 1,
"role": "Material User",
"cancel": 0,
"permlevel": 0
@@ -79,6 +81,7 @@
"create": 1,
"doctype": "DocPerm",
"write": 1,
"report": 1,
"role": "Sales User",
"cancel": 1,
"permlevel": 0

70
stock/doctype/serial_no/serial_no.txt
View File

@@ -7,15 +7,15 @@
"modified": "2012-12-03 11:39:34"
},
{
"allow_attach": 1,
"search_fields": "item_code,status",
"module": "Stock",
"document_type": "Master",
"description": "Distinct unit of an Item",
"autoname": "field:serial_no",
"name": "__common__",
"allow_rename": 1,
"doctype": "DocType"
"name": "__common__",
"module": "Stock",
"doctype": "DocType",
"search_fields": "item_code,status",
"allow_attach": 1
},
{
"name": "__common__",
@@ -123,12 +123,12 @@
"doctype": "DocField",
"label": "Item Group",
"oldfieldname": "item_group",
"options": "Item Group",
"permlevel": 1,
"fieldname": "item_group",
"fieldtype": "Link",
"search_index": 0,
"reqd": 1,
"permlevel": 1,
"options": "Item Group",
"in_filter": 0
},
{
@@ -136,12 +136,12 @@
"doctype": "DocField",
"label": "Brand",
"oldfieldname": "brand",
"options": "Brand",
"permlevel": 1,
"fieldname": "brand",
"fieldtype": "Link",
"search_index": 0,
"reqd": 0,
"permlevel": 1,
"options": "Brand",
"in_filter": 0
},
{
@@ -162,10 +162,10 @@
"no_copy": 1,
"doctype": "DocField",
"label": "Purchase Document Type",
"options": "\nPurchase Receipt\nStock Entry",
"permlevel": 0,
"fieldname": "purchase_document_type",
"fieldtype": "Select",
"permlevel": 0
"options": "\nPurchase Receipt\nStock Entry"
},
{
"no_copy": 1,
@@ -226,22 +226,22 @@
"doctype": "DocField",
"label": "Warehouse",
"oldfieldname": "warehouse",
"permlevel": 0,
"options": "Warehouse",
"fieldname": "warehouse",
"fieldtype": "Link",
"search_index": 1,
"reqd": 0,
"options": "Warehouse",
"permlevel": 0,
"in_filter": 1
},
{
"no_copy": 1,
"doctype": "DocField",
"label": "Supplier",
"options": "Supplier",
"permlevel": 0,
"fieldname": "supplier",
"fieldtype": "Link",
"permlevel": 0,
"options": "Supplier",
"in_filter": 1
},
{
@@ -280,10 +280,10 @@
"no_copy": 1,
"doctype": "DocField",
"label": "Delivery Document Type",
"options": "\nDelivery Note\nSales Invoice\nStock Entry",
"permlevel": 1,
"fieldname": "delivery_document_type",
"fieldtype": "Select",
"permlevel": 1,
"options": "\nDelivery Note\nSales Invoice\nStock Entry",
"in_filter": 1
},
{
@@ -328,11 +328,11 @@
"doctype": "DocField",
"label": "Is Cancelled",
"oldfieldname": "is_cancelled",
"options": "\nYes\nNo",
"permlevel": 0,
"fieldname": "is_cancelled",
"fieldtype": "Select",
"hidden": 1,
"permlevel": 0,
"options": "\nYes\nNo",
"report_hide": 1
},
{
@@ -385,10 +385,10 @@
"doctype": "DocField",
"label": "Territory",
"oldfieldname": "territory",
"permlevel": 1,
"options": "Territory",
"fieldname": "territory",
"fieldtype": "Link",
"options": "Territory",
"permlevel": 1,
"report_hide": 0,
"in_filter": 1
},
@@ -407,17 +407,17 @@
"permlevel": 0
},
{
"permlevel": 0,
"no_copy": 0,
"oldfieldtype": "Select",
"doctype": "DocField",
"label": "Maintenance Status",
"oldfieldname": "maintenance_status",
"width": "150px",
"options": "\nUnder Warranty\nOut of Warranty\nUnder AMC\nOut of AMC",
"fieldname": "maintenance_status",
"fieldtype": "Select",
"search_index": 1,
"options": "\nUnder Warranty\nOut of Warranty\nUnder AMC\nOut of AMC",
"permlevel": 0,
"in_filter": 1
},
{
@@ -480,22 +480,22 @@
"search_index": 1,
"doctype": "DocField",
"label": "Company",
"options": "link:Company",
"permlevel": 0,
"fieldname": "company",
"fieldtype": "Select",
"reqd": 1,
"permlevel": 0,
"options": "link:Company",
"in_filter": 1
},
{
"search_index": 1,
"doctype": "DocField",
"label": "Fiscal Year",
"options": "link:Fiscal Year",
"permlevel": 0,
"fieldname": "fiscal_year",
"fieldtype": "Select",
"reqd": 1,
"permlevel": 0,
"options": "link:Fiscal Year",
"in_filter": 1
},
{
@@ -544,6 +544,7 @@
"doctype": "DocPerm",
"submit": 0,
"write": 0,
"report": 1,
"role": "Material Manager",
"cancel": 0,
"permlevel": 0
@@ -564,6 +565,7 @@
"doctype": "DocPerm",
"submit": 0,
"write": 0,
"report": 1,
"role": "Material User",
"cancel": 0,
"permlevel": 0
@@ -572,26 +574,28 @@
"create": 1,
"doctype": "DocPerm",
"write": 1,
"role": "System Manager",
"cancel": 1,
"role": "System Manager",
"report": 1,
"permlevel": 0
},
{
"create": 1,
"doctype": "DocPerm",
"write": 1,
"role": "Material Master Manager",
"cancel": 1,
"role": "Material Master Manager",
"report": 1,
"permlevel": 0
},
{
"doctype": "DocPerm",
"role": "System Manager",
"permlevel": 1
"permlevel": 1,
"doctype": "DocPerm"
},
{
"doctype": "DocPerm",
"role": "Sales Master Manager",
"permlevel": 1
"permlevel": 1,
"doctype": "DocPerm"
}
]

2
stock/doctype/stock_entry/stock_entry.js
View File

@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
wn.require("public/app/js/stock_controller.js");
wn.require("public/app/js/controllers/stock_controller.js");
wn.provide("erpnext.stock");
erpnext.stock.StockEntry = erpnext.stock.StockController.extend({

114
stock/doctype/stock_entry/stock_entry.txt
View File

@@ -7,20 +7,20 @@
"modified": "2013-01-11 11:54:51"
},
{
"in_create": 0,
"is_submittable": 1,
"in_create": 0,
"allow_print": 0,
"search_fields": "transfer_date, from_warehouse, to_warehouse, purpose, remarks",
"module": "Stock",
"doctype": "DocType",
"autoname": "naming_series:",
"read_only_onload": 0,
"doctype": "DocType",
"in_dialog": 0,
"issingle": 0,
"allow_attach": 0,
"read_only": 0,
"allow_email": 0,
"hide_heading": 0,
"autoname": "naming_series:",
"issingle": 0,
"name": "__common__",
"allow_rename": 0,
"max_attachments": 0,
@@ -70,9 +70,9 @@
"search_index": 0,
"reqd": 1,
"hidden": 0,
"in_filter": 0,
"options": "\nSTE",
"report_hide": 0
"report_hide": 0,
"in_filter": 0
},
{
"print_hide": 0,
@@ -105,21 +105,21 @@
{
"print_hide": 1,
"description": "The date at which current entry will get or has actually executed.",
"default": "Today",
"no_copy": 1,
"oldfieldtype": "Date",
"allow_on_submit": 0,
"doctype": "DocField",
"label": "Posting Date",
"oldfieldname": "posting_date",
"no_copy": 1,
"default": "Today",
"fieldname": "posting_date",
"fieldtype": "Date",
"search_index": 1,
"reqd": 1,
"hidden": 0,
"in_filter": 1,
"permlevel": 0,
"report_hide": 0
"report_hide": 0,
"in_filter": 1
},
{
"print_hide": 1,
@@ -190,10 +190,10 @@
},
{
"doctype": "DocField",
"options": "Simple",
"permlevel": 0,
"fieldname": "sb0",
"fieldtype": "Section Break",
"permlevel": 0
"options": "Simple"
},
{
"print_hide": 0,
@@ -219,10 +219,10 @@
"oldfieldtype": "Button",
"doctype": "DocField",
"label": "Get Stock and Rate",
"options": "get_stock_and_rate",
"permlevel": 0,
"fieldname": "get_stock_and_rate",
"fieldtype": "Button",
"permlevel": 0
"options": "get_stock_and_rate"
},
{
"doctype": "DocField",
@@ -233,17 +233,17 @@
},
{
"print_hide": 1,
"depends_on": "eval:inList([\"Material Transfer\", \"Manufacture/Repack\"], doc.purpose)",
"doctype": "DocField",
"no_copy": 0,
"search_index": 1,
"allow_on_submit": 0,
"doctype": "DocField",
"oldfieldtype": "Link",
"label": "Production Order",
"oldfieldname": "production_order",
"permlevel": 0,
"fieldname": "production_order",
"fieldtype": "Link",
"oldfieldtype": "Link",
"depends_on": "eval:inList([\"Material Transfer\", \"Manufacture/Repack\"], doc.purpose)",
"reqd": 0,
"hidden": 1,
"options": "Production Order",
@@ -254,43 +254,43 @@
"depends_on": "eval:!inList([\"Sales Return\", \"Purchase Return\"], doc.purpose)",
"doctype": "DocField",
"label": "BOM No",
"options": "BOM",
"permlevel": 0,
"fieldname": "bom_no",
"fieldtype": "Link",
"permlevel": 0
"options": "BOM"
},
{
"print_hide": 1,
"depends_on": "eval:!inList([\"Sales Return\", \"Purchase Return\"], doc.purpose)",
"doctype": "DocField",
"description": "As per Stock UOM",
"no_copy": 0,
"search_index": 0,
"allow_on_submit": 0,
"doctype": "DocField",
"oldfieldtype": "Currency",
"label": "Manufacturing Quantity",
"oldfieldname": "fg_completed_qty",
"fieldname": "fg_completed_qty",
"fieldtype": "Currency",
"oldfieldtype": "Currency",
"depends_on": "eval:!inList([\"Sales Return\", \"Purchase Return\"], doc.purpose)",
"reqd": 0,
"hidden": 0,
"in_filter": 0,
"permlevel": 0,
"report_hide": 0
"report_hide": 0,
"in_filter": 0
},
{
"print_hide": 1,
"depends_on": "eval:doc.purpose==\"Sales Return\"",
"doctype": "DocField",
"no_copy": 1,
"search_index": 1,
"allow_on_submit": 0,
"doctype": "DocField",
"oldfieldtype": "Link",
"label": "Delivery Note No",
"oldfieldname": "delivery_note_no",
"permlevel": 0,
"fieldname": "delivery_note_no",
"fieldtype": "Link",
"oldfieldtype": "Link",
"depends_on": "eval:doc.purpose==\"Sales Return\"",
"reqd": 0,
"hidden": 1,
"options": "Delivery Note",
@@ -299,17 +299,17 @@
},
{
"print_hide": 1,
"depends_on": "eval:doc.purpose==\"Purchase Return\"",
"doctype": "DocField",
"no_copy": 1,
"search_index": 1,
"allow_on_submit": 0,
"doctype": "DocField",
"oldfieldtype": "Link",
"label": "Purchase Receipt No",
"oldfieldname": "purchase_receipt_no",
"permlevel": 0,
"fieldname": "purchase_receipt_no",
"fieldtype": "Link",
"oldfieldtype": "Link",
"depends_on": "eval:doc.purpose==\"Purchase Return\"",
"reqd": 0,
"hidden": 1,
"options": "Purchase Receipt",
@@ -334,15 +334,15 @@
},
{
"print_hide": 1,
"depends_on": "eval:!inList([\"Sales Return\", \"Purchase Return\"], doc.purpose)",
"doctype": "DocField",
"no_copy": 0,
"search_index": 0,
"allow_on_submit": 0,
"doctype": "DocField",
"oldfieldtype": "Button",
"label": "Get Items",
"fieldname": "get_items",
"fieldtype": "Button",
"oldfieldtype": "Button",
"depends_on": "eval:!inList([\"Sales Return\", \"Purchase Return\"], doc.purpose)",
"reqd": 0,
"hidden": 0,
"permlevel": 0,
@@ -355,11 +355,11 @@
"depends_on": "eval:doc.purpose==\"Sales Return\"",
"doctype": "DocField",
"label": "Sales Invoice No",
"options": "Sales Invoice",
"permlevel": 0,
"fieldname": "sales_invoice_no",
"fieldtype": "Link",
"hidden": 1,
"permlevel": 0
"options": "Sales Invoice"
},
{
"depends_on": "eval:(doc.purpose==\"Sales Return\" || doc.purpose==\"Purchase Return\")",
@@ -371,17 +371,17 @@
},
{
"print_hide": 1,
"depends_on": "eval:doc.purpose==\"Purchase Return\"",
"doctype": "DocField",
"no_copy": 1,
"search_index": 0,
"allow_on_submit": 0,
"doctype": "DocField",
"oldfieldtype": "Link",
"label": "Supplier",
"oldfieldname": "supplier",
"permlevel": 0,
"fieldname": "supplier",
"fieldtype": "Link",
"oldfieldtype": "Link",
"depends_on": "eval:doc.purpose==\"Purchase Return\"",
"reqd": 0,
"hidden": 0,
"options": "Supplier",
@@ -390,16 +390,16 @@
},
{
"print_hide": 0,
"depends_on": "eval:doc.purpose==\"Purchase Return\"",
"doctype": "DocField",
"no_copy": 1,
"search_index": 0,
"allow_on_submit": 0,
"doctype": "DocField",
"oldfieldtype": "Data",
"label": "Supplier Name",
"oldfieldname": "supplier_name",
"fieldname": "supplier_name",
"fieldtype": "Data",
"oldfieldtype": "Data",
"depends_on": "eval:doc.purpose==\"Purchase Return\"",
"reqd": 0,
"hidden": 0,
"permlevel": 1,
@@ -408,16 +408,16 @@
},
{
"print_hide": 0,
"depends_on": "eval:doc.purpose==\"Purchase Return\"",
"doctype": "DocField",
"no_copy": 1,
"search_index": 0,
"allow_on_submit": 0,
"doctype": "DocField",
"oldfieldtype": "Small Text",
"label": "Supplier Address",
"oldfieldname": "supplier_address",
"fieldname": "supplier_address",
"fieldtype": "Small Text",
"oldfieldtype": "Small Text",
"depends_on": "eval:doc.purpose==\"Purchase Return\"",
"reqd": 0,
"hidden": 0,
"permlevel": 0,
@@ -426,17 +426,17 @@
},
{
"print_hide": 1,
"depends_on": "eval:doc.purpose==\"Sales Return\"",
"doctype": "DocField",
"no_copy": 1,
"search_index": 0,
"allow_on_submit": 0,
"doctype": "DocField",
"oldfieldtype": "Link",
"label": "Customer",
"oldfieldname": "customer",
"permlevel": 0,
"fieldname": "customer",
"fieldtype": "Link",
"oldfieldtype": "Link",
"depends_on": "eval:doc.purpose==\"Sales Return\"",
"reqd": 0,
"hidden": 0,
"options": "Customer",
@@ -445,16 +445,16 @@
},
{
"print_hide": 0,
"depends_on": "eval:doc.purpose==\"Sales Return\"",
"doctype": "DocField",
"no_copy": 1,
"search_index": 0,
"allow_on_submit": 0,
"doctype": "DocField",
"oldfieldtype": "Data",
"label": "Customer Name",
"oldfieldname": "customer_name",
"fieldname": "customer_name",
"fieldtype": "Data",
"oldfieldtype": "Data",
"depends_on": "eval:doc.purpose==\"Sales Return\"",
"reqd": 0,
"hidden": 0,
"permlevel": 1,
@@ -463,16 +463,16 @@
},
{
"print_hide": 0,
"depends_on": "eval:doc.purpose==\"Sales Return\"",
"doctype": "DocField",
"no_copy": 1,
"search_index": 0,
"allow_on_submit": 0,
"doctype": "DocField",
"oldfieldtype": "Small Text",
"label": "Customer Address",
"oldfieldname": "customer_address",
"fieldname": "customer_address",
"fieldtype": "Small Text",
"oldfieldtype": "Small Text",
"depends_on": "eval:doc.purpose==\"Sales Return\"",
"reqd": 0,
"hidden": 0,
"permlevel": 0,
@@ -500,10 +500,10 @@
"doctype": "DocField",
"label": "Project Name",
"oldfieldname": "project_name",
"options": "Project",
"permlevel": 0,
"fieldname": "project_name",
"fieldtype": "Link",
"permlevel": 0,
"options": "Project",
"in_filter": 1
},
{
@@ -591,6 +591,7 @@
"doctype": "DocPerm",
"submit": 1,
"write": 1,
"report": 1,
"role": "Material User",
"cancel": 1,
"permlevel": 0
@@ -631,6 +632,7 @@
"doctype": "DocPerm",
"submit": 1,
"write": 1,
"report": 1,
"role": "Manufacturing User",
"cancel": 1,
"permlevel": 0
@@ -650,6 +652,7 @@
"doctype": "DocPerm",
"submit": 1,
"write": 1,
"report": 1,
"role": "Manufacturing Manager",
"cancel": 1,
"permlevel": 0
@@ -679,6 +682,7 @@
"doctype": "DocPerm",
"submit": 1,
"write": 1,
"report": 1,
"role": "Material Manager",
"cancel": 1,
"permlevel": 0

9
stock/doctype/stock_ledger_entry/stock_ledger_entry.txt
View File

@@ -32,6 +32,7 @@
"parent": "Stock Ledger Entry",
"read": 1,
"doctype": "DocPerm",
"report": 1,
"parenttype": "DocType",
"permlevel": 0,
"parentfield": "permissions"
@@ -271,8 +272,8 @@
"doctype": "DocPerm",
"submit": 0,
"write": 0,
"cancel": 0,
"role": "Sales User"
"role": "Sales User",
"cancel": 0
},
{
"amend": 0,
@@ -280,8 +281,8 @@
"doctype": "DocPerm",
"submit": 0,
"write": 0,
"cancel": 0,
"role": "Material User"
"role": "Material User",
"cancel": 0
},
{
"role": "Accounts Manager",

2
stock/doctype/stock_reconciliation/stock_reconciliation.js
View File

@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
wn.require("public/app/js/stock_controller.js");
wn.require("public/app/js/controllers/stock_controller.js");
wn.provide("erpnext.stock");
erpnext.stock.StockReconciliation = erpnext.stock.StockController.extend({

56
stock/doctype/warehouse/warehouse.txt
View File

@@ -7,13 +7,13 @@
"modified": "2012-12-03 11:24:31"
},
{
"autoname": "field:warehouse_name",
"document_type": "Master",
"description": "A logical Warehouse against which stock entries are made.",
"autoname": "field:warehouse_name",
"allow_rename": 1,
"search_fields": "warehouse_type",
"module": "Stock",
"doctype": "DocType",
"document_type": "Master",
"search_fields": "warehouse_type",
"name": "__common__"
},
{
@@ -59,11 +59,11 @@
"doctype": "DocField",
"label": "Warehouse Type",
"oldfieldname": "warehouse_type",
"options": "Warehouse Type",
"permlevel": 0,
"fieldname": "warehouse_type",
"fieldtype": "Link",
"reqd": 1,
"permlevel": 0
"options": "Warehouse Type"
},
{
"oldfieldtype": "Link",
@@ -71,11 +71,11 @@
"doctype": "DocField",
"label": "Company",
"oldfieldname": "company",
"options": "Company",
"permlevel": 0,
"fieldname": "company",
"fieldtype": "Link",
"search_index": 1,
"permlevel": 0,
"options": "Company",
"in_filter": 1
},
{
@@ -103,20 +103,20 @@
"doctype": "DocField",
"label": "Phone No",
"oldfieldname": "phone_no",
"options": "Phone",
"permlevel": 0,
"fieldname": "phone_no",
"fieldtype": "Data",
"permlevel": 0
"options": "Phone"
},
{
"oldfieldtype": "Int",
"doctype": "DocField",
"label": "Mobile No",
"oldfieldname": "mobile_no",
"options": "Phone",
"permlevel": 0,
"fieldname": "mobile_no",
"fieldtype": "Data",
"permlevel": 0
"options": "Phone"
},
{
"oldfieldtype": "Column Break",
@@ -159,10 +159,10 @@
"doctype": "DocField",
"label": "State",
"oldfieldname": "state",
"options": "Suggest",
"permlevel": 0,
"fieldname": "state",
"fieldtype": "Data",
"permlevel": 0
"options": "Suggest"
},
{
"oldfieldtype": "Int",
@@ -184,10 +184,10 @@
},
{
"doctype": "DocField",
"label": "Merge With",
"options": "Warehouse",
"fieldname": "merge_with",
"fieldtype": "Link",
"label": "Merge With",
"permlevel": 2
},
{
@@ -203,8 +203,8 @@
"doctype": "DocPerm",
"submit": 0,
"write": 0,
"cancel": 0,
"role": "Material User",
"cancel": 0,
"permlevel": 2
},
{
@@ -213,8 +213,9 @@
"doctype": "DocPerm",
"submit": 0,
"write": 0,
"cancel": 0,
"report": 1,
"role": "Material User",
"cancel": 0,
"permlevel": 0
},
{
@@ -223,8 +224,8 @@
"doctype": "DocPerm",
"submit": 0,
"write": 0,
"cancel": 0,
"role": "Material User",
"cancel": 0,
"permlevel": 1
},
{
@@ -233,8 +234,8 @@
"doctype": "DocPerm",
"submit": 0,
"write": 0,
"cancel": 0,
"role": "Material Manager",
"cancel": 0,
"permlevel": 2
},
{
@@ -243,8 +244,9 @@
"doctype": "DocPerm",
"submit": 0,
"write": 0,
"cancel": 0,
"report": 1,
"role": "Material Manager",
"cancel": 0,
"permlevel": 0
},
{
@@ -253,14 +255,14 @@
"doctype": "DocPerm",
"submit": 0,
"write": 0,
"cancel": 0,
"role": "Material Manager",
"cancel": 0,
"permlevel": 1
},
{
"doctype": "DocPerm",
"role": "All",
"permlevel": 1
"permlevel": 1,
"doctype": "DocPerm"
},
{
"amend": 0,
@@ -268,21 +270,23 @@
"doctype": "DocPerm",
"submit": 0,
"write": 1,
"cancel": 1,
"report": 1,
"role": "Material Master Manager",
"cancel": 1,
"permlevel": 0
},
{
"doctype": "DocPerm",
"role": "Material Master Manager",
"permlevel": 1
"permlevel": 1,
"doctype": "DocPerm"
},
{
"create": 1,
"doctype": "DocPerm",
"write": 1,
"role": "System Manager",
"cancel": 1,
"role": "System Manager",
"report": 1,
"permlevel": 0
},
{