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

Merge pull request #4193 from anandpdoshi/attach-as-small-text

Browse Source 
[fix] change attach fields to small text
This commit is contained in:
Rushabh Mehta 2015-10-19 14:58:57 +05:30
commit 64fd970a8a
20 changed files with 2130 additions and 2123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
View File

@ -1093,7 +1093,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"modified": "2015-10-02 07:39:03.652117", "modified": "2015-10-19 03:04:52.304768",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Purchase Invoice Item", "name": "Purchase Invoice Item",

2
erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
View File

@ -1282,7 +1282,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"modified": "2015-10-12 07:39:10.093569", "modified": "2015-10-19 03:04:52.093181",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Sales Invoice Item", "name": "Sales Invoice Item",

2
erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
View File

@ -1200,7 +1200,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"modified": "2015-10-02 07:39:04.668166", "modified": "2015-10-19 03:04:51.773011",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Purchase Order Item", "name": "Purchase Order Item",

2
erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
View File

@ -925,7 +925,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"modified": "2015-10-02 07:39:15.526625", "modified": "2015-10-19 03:04:51.597343",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Supplier Quotation Item", "name": "Supplier Quotation Item",

2
erpnext/crm/doctype/opportunity_item/opportunity_item.json
View File

@ -316,7 +316,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"modified": "2015-10-02 07:38:58.762989", "modified": "2015-10-19 03:04:51.988510",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "CRM", "module": "CRM",
"name": "Opportunity Item", "name": "Opportunity Item",

2
erpnext/hr/doctype/employee/employee.json
View File

@ -1893,7 +1893,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-10-02 07:38:48.903414", "modified": "2015-10-19 03:04:49.862553",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Employee", "name": "Employee",

2
erpnext/manufacturing/doctype/bom/bom.json
View File

@ -713,7 +713,7 @@
"is_submittable": 1, "is_submittable": 1,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-10-02 07:38:39.897527", "modified": "2015-10-19 03:04:50.130520",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Manufacturing", "module": "Manufacturing",
"name": "BOM", "name": "BOM",

2
erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json
View File

@ -355,7 +355,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"modified": "2015-10-02 07:38:40.165303", "modified": "2015-10-19 03:04:51.159841",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Manufacturing", "module": "Manufacturing",
"name": "BOM Explosion Item", "name": "BOM Explosion Item",

2
erpnext/manufacturing/doctype/bom_item/bom_item.json
View File

@ -403,7 +403,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"modified": "2015-10-02 07:38:40.326267", "modified": "2015-10-19 03:04:51.064785",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Manufacturing", "module": "Manufacturing",
"name": "BOM Item", "name": "BOM Item",

2
erpnext/selling/doctype/quotation_item/quotation_item.json
View File

@ -837,7 +837,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"modified": "2015-10-02 07:39:07.606420", "modified": "2015-10-19 03:04:51.443832",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Quotation Item", "name": "Quotation Item",

2
erpnext/selling/doctype/sales_order_item/sales_order_item.json
View File

@ -1095,7 +1095,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"modified": "2015-10-12 07:39:11.263915", "modified": "2015-10-19 03:04:51.257808",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Sales Order Item", "name": "Sales Order Item",

2
erpnext/setup/doctype/sales_partner/sales_partner.json
View File

@ -568,7 +568,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-10-02 07:39:11.592673", "modified": "2015-10-19 03:04:48.999751",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Setup", "module": "Setup",
"name": "Sales Partner", "name": "Sales Partner",

2
erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
View File

@ -1160,7 +1160,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"modified": "2015-10-12 07:38:45.228391", "modified": "2015-10-19 03:04:50.887288",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Delivery Note Item", "name": "Delivery Note Item",

2
erpnext/stock/doctype/item/item.json
View File

@ -2113,7 +2113,7 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 1, "max_attachments": 1,
"modified": "2015-10-12 17:13:32.613254", "modified": "2015-10-19 03:04:49.445770",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Item", "name": "Item",

9
erpnext/stock/doctype/item/item.py
View File

@ -82,6 +82,9 @@ class Item(WebsiteGenerator):
def make_thumbnail(self): def make_thumbnail(self):
"""Make a thumbnail of `website_image`""" """Make a thumbnail of `website_image`"""
if not self.is_new() and self.website_image != frappe.db.get_value(self.doctype, self.name, "website_image"):
self.thumbnail = None
if self.website_image and not self.thumbnail: if self.website_image and not self.thumbnail:
file_doc = frappe.get_doc("File", { file_doc = frappe.get_doc("File", {
"file_url": self.website_image, "file_url": self.website_image,
@ -89,6 +92,7 @@ class Item(WebsiteGenerator):
"attached_to_name": self.name "attached_to_name": self.name
}) })
# for CSV import
if not file_doc: if not file_doc:
file_doc = frappe.get_doc({ file_doc = frappe.get_doc({
"doctype": "File", "doctype": "File",
@ -98,7 +102,10 @@ class Item(WebsiteGenerator):
}).insert() }).insert()
if file_doc: if file_doc:
self.thumbnail = file_doc.make_thumbnail() if not file_doc.thumbnail_url:
file_doc.make_thumbnail()
self.thumbnail = file_doc.thumbnail_url
def get_context(self, context): def get_context(self, context):
context.parent_groups = get_parent_item_groups(self.item_group) + \ context.parent_groups = get_parent_item_groups(self.item_group) + \

2
erpnext/stock/doctype/material_request_item/material_request_item.json
View File

@ -577,7 +577,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"modified": "2015-10-02 07:38:57.123645", "modified": "2015-10-19 03:04:50.737233",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Material Request Item", "name": "Material Request Item",

2
erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
View File

@ -1411,7 +1411,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"modified": "2015-10-02 07:39:05.809946", "modified": "2015-10-19 03:04:50.503105",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Purchase Receipt Item", "name": "Purchase Receipt Item",

2
erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
View File

@ -909,7 +909,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"modified": "2015-10-02 07:39:14.010470", "modified": "2015-10-19 03:04:50.303251",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Stock Entry Detail", "name": "Stock Entry Detail",

2
erpnext/support/doctype/issue/issue.json
View File

@ -597,7 +597,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-10-02 07:38:51.908646", "modified": "2015-10-19 03:04:49.729321",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Support", "module": "Support",
"name": "Issue", "name": "Issue",

2
erpnext/utilities/doctype/rename_tool/rename_tool.json
View File

@ -83,7 +83,7 @@
"issingle": 1, "issingle": 1,
"istable": 0, "istable": 0,
"max_attachments": 1, "max_attachments": 1,
"modified": "2015-03-02 02:35:34.129309", "modified": "2015-10-19 03:04:49.097140",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Utilities", "module": "Utilities",
"name": "Rename Tool", "name": "Rename Tool",