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

[conflict] fixed

Browse Source
This commit is contained in:
Nabin Hait
2013-07-05 15:25:58 +05:30
parent eb883ee7a3 11d688a536
commit 1bec8012d2
145 changed files with 772 additions and 497 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,7 @@
{
"creation": "2013-03-05 14:50:38",
"docstatus": 0,
"modified": "2013-05-01 15:49:47",
"modified": "2013-07-05 14:26:48",
"modified_by": "Administrator",
"owner": "harshada@webnotestech.com"
},
@@ -11,6 +11,7 @@
"autoname": "field:batch_id",
"doctype": "DocType",
"document_type": "Master",
"icon": "icon-archive",
"max_attachments": 5,
"module": "Stock",
"name": "__common__"

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

@@ -2,7 +2,7 @@
{
"creation": "2013-05-24 19:29:09",
"docstatus": 0,
"modified": "2013-06-27 11:33:53",
"modified": "2013-07-05 14:34:50",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -12,6 +12,7 @@
"doctype": "DocType",
"document_type": "Transaction",
"hide_toolbar": 0,
"icon": "icon-truck",
"in_create": 0,
"is_submittable": 1,
"module": "Stock",
@@ -41,6 +42,13 @@
"doctype": "DocType",
"name": "Delivery Note"
},
{
"doctype": "DocField",
"fieldname": "delivery_to_section",
"fieldtype": "Section Break",
"label": "Delivery To",
"options": "icon-user"
},
{
"doctype": "DocField",
"fieldname": "column_break0",
@@ -100,38 +108,34 @@
"read_only": 1
},
{
"depends_on": "customer",
"doctype": "DocField",
"fieldname": "address_display",
"fieldtype": "Small Text",
"hidden": 0,
"hidden": 1,
"label": "Shipping Address",
"read_only": 1
},
{
"depends_on": "customer",
"doctype": "DocField",
"fieldname": "contact_display",
"fieldtype": "Small Text",
"hidden": 0,
"hidden": 1,
"label": "Contact",
"read_only": 1
},
{
"depends_on": "customer",
"doctype": "DocField",
"fieldname": "contact_mobile",
"fieldtype": "Text",
"hidden": 0,
"hidden": 1,
"label": "Mobile No",
"read_only": 1
},
{
"depends_on": "customer",
"doctype": "DocField",
"fieldname": "contact_email",
"fieldtype": "Text",
"hidden": 0,
"hidden": 1,
"label": "Contact Email",
"print_hide": 1,
"read_only": 1
@@ -248,6 +252,7 @@
"fieldname": "sec_break25",
"fieldtype": "Section Break",
"label": "Price List and Currency",
"options": "icon-tag",
"read_only": 0
},
{
@@ -323,6 +328,7 @@
"fieldtype": "Section Break",
"label": "Items",
"oldfieldtype": "Section Break",
"options": "icon-shopping-cart",
"read_only": 0
},
{
@@ -345,6 +351,7 @@
"fieldtype": "Section Break",
"label": "Packing List",
"oldfieldtype": "Section Break",
"options": "icon-suitcase",
"print_hide": 1,
"read_only": 0
},
@@ -371,7 +378,6 @@
"doctype": "DocField",
"fieldname": "section_break0",
"fieldtype": "Section Break",
"options": "Simple",
"read_only": 0
},
{
@@ -442,6 +448,7 @@
"fieldtype": "Section Break",
"label": "Taxes",
"oldfieldtype": "Section Break",
"options": "icon-money",
"read_only": 0
},
{
@@ -542,6 +549,7 @@
"fieldtype": "Section Break",
"label": "Totals",
"oldfieldtype": "Section Break",
"options": "icon-money",
"print_hide": 0,
"read_only": 0
},
@@ -644,6 +652,7 @@
"fieldtype": "Section Break",
"label": "Terms and Conditions",
"oldfieldtype": "Section Break",
"options": "icon-legal",
"read_only": 0
},
{
@@ -690,6 +699,7 @@
"fieldname": "transporter_info",
"fieldtype": "Section Break",
"label": "Transporter Info",
"options": "icon-truck",
"print_hide": 1,
"read_only": 0
},
@@ -751,6 +761,7 @@
"fieldname": "contact_info",
"fieldtype": "Section Break",
"label": "Contact Info",
"options": "icon-bullhorn",
"read_only": 0
},
{
@@ -802,6 +813,7 @@
"fieldtype": "Section Break",
"label": "More Info",
"oldfieldtype": "Section Break",
"options": "icon-file-text",
"print_hide": 1,
"read_only": 0
},
@@ -1040,6 +1052,7 @@
"fieldtype": "Section Break",
"label": "Sales Team",
"oldfieldtype": "Section Break",
"options": "icon-group",
"print_hide": 1,
"read_only": 0
},
@@ -1095,7 +1108,6 @@
"doctype": "DocField",
"fieldname": "section_break1",
"fieldtype": "Section Break",
"options": "Simple",
"print_hide": 1,
"read_only": 0
},

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

@@ -2,7 +2,7 @@
{
"creation": "2013-05-03 10:45:46",
"docstatus": 0,
"modified": "2013-07-01 11:45:59",
"modified": "2013-07-05 14:43:01",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -14,6 +14,7 @@
"description": "A Product or a Service that is bought, sold or kept in stock.",
"doctype": "DocType",
"document_type": "Master",
"icon": "icon-circle",
"max_attachments": 1,
"module": "Stock",
"name": "__common__",
@@ -44,11 +45,12 @@
},
{
"doctype": "DocField",
"fieldname": "item",
"fieldname": "name_and_description_section",
"fieldtype": "Section Break",
"label": "Item",
"label": "Name and Description",
"no_copy": 0,
"oldfieldtype": "Section Break",
"options": "icon-flag",
"read_only": 0
},
{
@@ -188,6 +190,7 @@
"fieldtype": "Section Break",
"label": "Inventory",
"oldfieldtype": "Section Break",
"options": "icon-truck",
"read_only": 0
},
{
@@ -343,6 +346,7 @@
"fieldname": "reorder_section",
"fieldtype": "Section Break",
"label": "Re-order",
"options": "icon-rss",
"read_only": 0
},
{
@@ -367,7 +371,6 @@
"doctype": "DocField",
"fieldname": "section_break_31",
"fieldtype": "Section Break",
"options": "Simple",
"read_only": 0
},
{
@@ -384,6 +387,7 @@
"fieldtype": "Section Break",
"label": "Purchase Details",
"oldfieldtype": "Section Break",
"options": "icon-shopping-cart",
"read_only": 0
},
{
@@ -508,6 +512,7 @@
"fieldtype": "Section Break",
"label": "Sales Details",
"oldfieldtype": "Section Break",
"options": "icon-tag",
"read_only": 0
},
{
@@ -617,6 +622,7 @@
"fieldtype": "Section Break",
"label": "Item Tax",
"oldfieldtype": "Section Break",
"options": "icon-money",
"read_only": 0
},
{
@@ -634,6 +640,7 @@
"fieldname": "price_list_section",
"fieldtype": "Section Break",
"label": "Price Lists and Rates",
"options": "icon-money",
"read_only": 0
},
{
@@ -653,6 +660,7 @@
"fieldtype": "Section Break",
"label": "Inspection Criteria",
"oldfieldtype": "Section Break",
"options": "icon-search",
"read_only": 0
},
{
@@ -686,6 +694,7 @@
"fieldtype": "Section Break",
"label": "Manufacturing",
"oldfieldtype": "Section Break",
"options": "icon-cogs",
"read_only": 0
},
{
@@ -756,6 +765,7 @@
"fieldname": "website_section",
"fieldtype": "Section Break",
"label": "Website",
"options": "icon-globe",
"read_only": 0
},
{

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

@@ -2,12 +2,13 @@
{
"creation": "2013-01-22 16:50:39",
"docstatus": 0,
"modified": "2013-01-22 16:54:49",
"modified": "2013-07-05 14:43:57",
"modified_by": "Administrator",
"owner": "wasim@webnotestech.com"
},
{
"doctype": "DocType",
"icon": "icon-magic",
"issingle": 1,
"module": "Stock",
"name": "__common__"

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

@@ -2,7 +2,7 @@
{
"creation": "2013-03-07 14:48:38",
"docstatus": 0,
"modified": "2013-07-04 10:24:53",
"modified": "2013-07-05 14:46:13",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -11,6 +11,7 @@
"allow_print": 0,
"autoname": "naming_series:",
"doctype": "DocType",
"icon": "icon-ticket",
"is_submittable": 1,
"module": "Stock",
"name": "__common__",

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

@@ -2,7 +2,7 @@
{
"creation": "2013-04-11 15:32:24",
"docstatus": 0,
"modified": "2013-06-11 16:16:37",
"modified": "2013-07-05 14:47:57",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -11,6 +11,7 @@
"description": "Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",
"doctype": "DocType",
"document_type": "Transaction",
"icon": "icon-suitcase",
"is_submittable": 1,
"module": "Stock",
"name": "__common__",

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

@@ -2,7 +2,7 @@
{
"creation": "2013-05-21 16:16:39",
"docstatus": 0,
"modified": "2013-07-05 14:38:03",
"modified": "2013-07-05 14:52:08",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -11,6 +11,7 @@
"autoname": "naming_series:",
"doctype": "DocType",
"document_type": "Transaction",
"icon": "icon-truck",
"is_submittable": 1,
"module": "Stock",
"name": "__common__",
@@ -38,6 +39,13 @@
"doctype": "DocType",
"name": "Purchase Receipt"
},
{
"doctype": "DocField",
"fieldname": "supplier_section",
"fieldtype": "Section Break",
"label": "Supplier",
"options": "icon-user"
},
{
"doctype": "DocField",
"fieldname": "column_break0",
@@ -86,38 +94,34 @@
"read_only": 1
},
{
"depends_on": "supplier",
"doctype": "DocField",
"fieldname": "address_display",
"fieldtype": "Small Text",
"hidden": 0,
"hidden": 1,
"label": "Address",
"read_only": 1
},
{
"depends_on": "supplier",
"doctype": "DocField",
"fieldname": "contact_display",
"fieldtype": "Small Text",
"hidden": 0,
"hidden": 1,
"label": "Contact",
"read_only": 1
},
{
"depends_on": "supplier",
"doctype": "DocField",
"fieldname": "contact_mobile",
"fieldtype": "Text",
"hidden": 0,
"hidden": 1,
"label": "Mobile No",
"read_only": 1
},
{
"depends_on": "supplier",
"doctype": "DocField",
"fieldname": "contact_email",
"fieldtype": "Text",
"hidden": 0,
"hidden": 1,
"label": "Contact Email",
"print_hide": 1,
"read_only": 1
@@ -195,7 +199,8 @@
"fieldname": "items",
"fieldtype": "Section Break",
"label": "Items",
"oldfieldtype": "Section Break"
"oldfieldtype": "Section Break",
"options": "icon-shopping-cart"
},
{
"allow_on_submit": 1,
@@ -213,8 +218,7 @@
"doctype": "DocField",
"fieldname": "section_break0",
"fieldtype": "Section Break",
"oldfieldtype": "Section Break",
"options": "Simple"
"oldfieldtype": "Section Break"
},
{
"doctype": "DocField",
@@ -267,7 +271,8 @@
"doctype": "DocField",
"fieldname": "currency_price_list",
"fieldtype": "Section Break",
"label": "Currency & Price List"
"label": "Currency & Price List",
"options": "icon-tag"
},
{
"description": "Supplier's currency",
@@ -334,7 +339,8 @@
"fieldname": "taxes",
"fieldtype": "Section Break",
"label": "Taxes",
"oldfieldtype": "Section Break"
"oldfieldtype": "Section Break",
"options": "icon-money"
},
{
"description": "If you have created a standard template in Purchase Taxes and Charges Master, select one and click on the button below.",
@@ -387,7 +393,8 @@
"fieldname": "totals",
"fieldtype": "Section Break",
"label": "Totals",
"oldfieldtype": "Section Break"
"oldfieldtype": "Section Break",
"options": "icon-money"
},
{
"doctype": "DocField",
@@ -536,7 +543,8 @@
"fieldname": "terms_section_break",
"fieldtype": "Section Break",
"label": "Terms and Conditions",
"oldfieldtype": "Section Break"
"oldfieldtype": "Section Break",
"options": "icon-legal"
},
{
"doctype": "DocField",
@@ -568,7 +576,8 @@
"doctype": "DocField",
"fieldname": "contact_section",
"fieldtype": "Section Break",
"label": "Contact Info"
"label": "Contact Info",
"options": "icon-bullhorn"
},
{
"doctype": "DocField",
@@ -597,7 +606,8 @@
"fieldname": "more_info",
"fieldtype": "Section Break",
"label": "More Info",
"oldfieldtype": "Section Break"
"oldfieldtype": "Section Break",
"options": "icon-file-text"
},
{
"doctype": "DocField",
@@ -801,7 +811,8 @@
"doctype": "DocField",
"fieldname": "transporter_info",
"fieldtype": "Section Break",
"label": "Transporter Info"
"label": "Transporter Info",
"options": "icon-truck"
},
{
"doctype": "DocField",
@@ -849,8 +860,9 @@
"doctype": "DocField",
"fieldname": "raw_material_details",
"fieldtype": "Section Break",
"label": "Raw Material Details",
"label": "Raw Materials Supplied",
"oldfieldtype": "Section Break",
"options": "icon-table",
"print_hide": 1,
"read_only": 1
},

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

@@ -2,7 +2,7 @@
{
"creation": "2013-05-16 10:59:15",
"docstatus": 0,
"modified": "2013-07-02 12:07:21",
"modified": "2013-07-05 14:54:52",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -13,6 +13,7 @@
"description": "Distinct unit of an Item",
"doctype": "DocType",
"document_type": "Master",
"icon": "icon-barcode",
"module": "Stock",
"name": "__common__",
"search_fields": "item_code,status"

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

@@ -2,7 +2,7 @@
{
"creation": "2013-04-09 11:43:55",
"docstatus": 0,
"modified": "2013-05-09 13:31:00",
"modified": "2013-07-05 14:56:06",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -16,6 +16,7 @@
"doctype": "DocType",
"hide_heading": 0,
"hide_toolbar": 0,
"icon": "icon-file-text",
"in_create": 0,
"in_dialog": 0,
"is_submittable": 1,

16
stock/doctype/stock_ledger_entry/stock_ledger_entry.py
View File

@@ -119,11 +119,11 @@ class DocType(DocListController):
def scrub_posting_time(self):
if not self.doc.posting_time or self.doc.posting_time == '00:0':
self.doc.posting_time = '00:00'
def on_doctype_update(self):
if not webnotes.conn.sql("""show index from `tabStock Ledger Entry`
where Key_name="posting_sort_index" """):
webnotes.conn.commit()
webnotes.conn.sql("""alter table `tabStock Ledger Entry`
add index posting_sort_index(posting_date, posting_time, name)""")
webnotes.conn.begin()
def on_doctype_update():
if not webnotes.conn.sql("""show index from `tabStock Ledger Entry`
where Key_name="posting_sort_index" """):
webnotes.conn.commit()
webnotes.conn.sql("""alter table `tabStock Ledger Entry`
add index posting_sort_index(posting_date, posting_time, name)""")
webnotes.conn.begin()

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

@@ -2,7 +2,7 @@
{
"creation": "2013-01-29 19:25:42",
"docstatus": 0,
"modified": "2013-06-28 12:39:07",
"modified": "2013-07-05 14:56:15",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -14,6 +14,7 @@
"doctype": "DocType",
"document_type": "Other",
"hide_toolbar": 1,
"icon": "icon-list",
"in_create": 1,
"module": "Stock",
"name": "__common__"

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

@@ -2,7 +2,7 @@
{
"creation": "2013-03-28 10:35:31",
"docstatus": 0,
"modified": "2013-04-10 13:44:19",
"modified": "2013-07-05 14:56:37",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -14,6 +14,7 @@
"autoname": "SR/.######",
"description": "This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.",
"doctype": "DocType",
"icon": "icon-upload-alt",
"is_submittable": 1,
"max_attachments": 1,
"module": "Stock",

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

@@ -2,13 +2,14 @@
{
"creation": "2013-06-24 16:37:54",
"docstatus": 0,
"modified": "2013-06-24 17:41:02",
"modified": "2013-07-05 14:56:41",
"modified_by": "Administrator",
"owner": "Administrator"
},
{
"description": "Settings",
"doctype": "DocType",
"icon": "icon-cog",
"issingle": 1,
"module": "Stock",
"name": "__common__"

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

@@ -2,12 +2,13 @@
{
"creation": "2013-01-10 16:34:30",
"docstatus": 0,
"modified": "2013-01-22 13:57:23",
"modified": "2013-07-05 14:56:45",
"modified_by": "Administrator",
"owner": "Administrator"
},
{
"doctype": "DocType",
"icon": "icon-magic",
"in_create": 0,
"issingle": 1,
"module": "Stock",

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

@@ -2,7 +2,7 @@
{
"creation": "2013-03-07 18:50:32",
"docstatus": 0,
"modified": "2013-03-11 17:58:45",
"modified": "2013-07-05 15:02:12",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -12,6 +12,7 @@
"description": "A logical Warehouse against which stock entries are made.",
"doctype": "DocType",
"document_type": "Master",
"icon": "icon-building",
"module": "Stock",
"name": "__common__",
"search_fields": "warehouse_type"