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

Merge https://github.com/frappe/erpnext into item_group

Browse Source
This commit is contained in:
Neil Trini Lasrado 2014-08-25 16:18:31 +05:30
commit d676491b6e
37 changed files with 870 additions and 898 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/accounts/doctype/c_form/c_form.json
View File

@ -1,5 +1,4 @@
{
"allow_attach": 1,
"autoname": "naming_series:",
"creation": "2013-03-07 11:55:06",
"docstatus": 0,

1
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
View File

@ -1,5 +1,4 @@
{
"allow_attach": 1,
"allow_import": 1,
"autoname": "naming_series:",
"creation": "2013-05-21 16:16:39",

1
erpnext/accounts/doctype/sales_invoice/sales_invoice.json
View File

@ -1,5 +1,4 @@
{
"allow_attach": 1,
"allow_import": 1,
"autoname": "naming_series:",
"creation": "2013-05-24 19:29:05",

1
erpnext/buying/doctype/purchase_order/purchase_order.json
View File

@ -1,5 +1,4 @@
{
"allow_attach": 1,
"allow_import": 1,
"autoname": "naming_series:",
"creation": "2013-05-21 16:16:39",

1
erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
View File

@ -1,5 +1,4 @@
{
"allow_attach": 1,
"allow_import": 1,
"autoname": "naming_series:",
"creation": "2013-05-21 16:16:45",

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

@ -1,5 +1,4 @@
{
"allow_attach": 1,
"allow_import": 1,
"allow_rename": 1,
"autoname": "naming_series:",

1
erpnext/hr/doctype/job_applicant/job_applicant.json
View File

@ -1,5 +1,4 @@
{
"allow_attach": 1,
"autoname": "field:applicant_name",
"creation": "2013-01-29 19:25:37",
"description": "Applicant for a Job",

1
erpnext/hr/doctype/leave_application/leave_application.json
View File

@ -1,5 +1,4 @@
{
"allow_attach": 1,
"autoname": "LAP/.#####",
"creation": "2013-02-20 11:18:11",
"description": "Apply / Approve Leaves",

1
erpnext/hr/doctype/upload_attendance/upload_attendance.json
View File

@ -1,5 +1,4 @@
{
"allow_attach": 0,
"creation": "2013-01-25 11:34:53.000000",
"docstatus": 0,
"doctype": "DocType",

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

@ -1,5 +1,4 @@
{
"allow_attach": 0,
"allow_copy": 0,
"allow_import": 1,
"allow_rename": 0,

1
erpnext/patches.txt
View File

@ -77,3 +77,4 @@ erpnext.patches.v4_2.fix_account_master_type
erpnext.patches.v4_2.update_project_milestones
erpnext.patches.v4_2.add_currency_turkish_lira #2014-08-08
execute:frappe.delete_doc("DocType", "Landed Cost Wizard")
erpnext.patches.v4_2.default_website_style

9
erpnext/patches/v4_2/default_website_style.py Normal file
View File

@ -0,0 +1,9 @@
import frappe
from frappe.templates.pages.style_settings import default_properties
def execute():
style_settings = frappe.get_doc("Style Settings", "Style Settings")
if not style_settings.apply_style:
style_settings.update(default_properties)
style_settings.apply_style = 1
style_settings.save()

1
erpnext/projects/doctype/project/project.json
View File

@ -1,5 +1,4 @@
{
"allow_attach": 1,
"allow_import": 1,
"allow_rename": 1,
"autoname": "field:project_name",

1
erpnext/projects/doctype/task/task.json
View File

@ -1,5 +1,4 @@
{
"allow_attach": 1,
"allow_import": 1,
"autoname": "TASK.#####",
"creation": "2013-01-29 19:25:50",

1
erpnext/projects/doctype/time_log/time_log.json
View File

@ -1,5 +1,4 @@
{
"allow_attach": 1,
"allow_import": 1,
"autoname": "naming_series:",
"creation": "2013-04-03 16:38:41",

2
erpnext/public/js/conf.js
View File

@ -15,4 +15,6 @@ $(document).bind('toolbar_setup', function() {
"text-overflow": "ellipsis",
"white-space": "nowrap"
});
$('[data-link="docs"]').attr("href", "https://erpnext.com/user-guide")
});

1
erpnext/selling/doctype/quotation/quotation.json
View File

@ -1,5 +1,4 @@
{
"allow_attach": 1,
"allow_import": 1,
"autoname": "naming_series:",
"creation": "2013-05-24 19:29:08",

1
erpnext/selling/doctype/sales_order/sales_order.json
View File

@ -1,5 +1,4 @@
{
"allow_attach": 1,
"allow_import": 1,
"autoname": "naming_series:",
"creation": "2013-06-18 12:39:59",

1
erpnext/selling/doctype/sms_center/sms_center.json
View File

@ -1,5 +1,4 @@
{
"allow_attach": 0,
"allow_copy": 1,
"creation": "2013-01-10 16:34:22",
"docstatus": 0,

1
erpnext/setup/doctype/item_group/item_group.json
View File

@ -1,5 +1,4 @@
{
"allow_attach": 1,
"allow_import": 1,
"allow_rename": 1,
"autoname": "field:item_group_name",

5
erpnext/setup/page/setup_wizard/default_website.py
View File

@ -6,6 +6,7 @@ import frappe
from frappe import _
from frappe.utils import nowdate
from frappe.templates.pages.style_settings import default_properties
class website_maker(object):
def __init__(self, company, tagline, user):
@ -35,8 +36,8 @@ class website_maker(object):
def make_style_settings(self):
style_settings = frappe.get_doc("Style Settings", "Style Settings")
style_settings.top_bar_background = "F2F2F2"
style_settings.font_size = "15px"
style_settings.update(default_properties)
style_settings.apply_style = 1
style_settings.save()
def make_website_settings(self):

2
erpnext/setup/page/setup_wizard/sample_home_page.css
View File

@ -22,7 +22,7 @@
}
.slide {
padding: 60px 40px;
padding: 30px 40px;
max-width: 800px;
margin: auto;
}

1
erpnext/stock/doctype/batch/batch.json
View File

@ -1,5 +1,4 @@
{
"allow_attach": 1,
"allow_import": 1,
"autoname": "field:batch_id",
"creation": "2013-03-05 14:50:38.000000",

1
erpnext/stock/doctype/delivery_note/delivery_note.json
View File

@ -1,5 +1,4 @@
{
"allow_attach": 1,
"autoname": "naming_series:",
"creation": "2013-05-24 19:29:09",
"docstatus": 0,

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

@ -1,5 +1,4 @@
{
"allow_attach": 1,
"allow_import": 1,
"allow_rename": 1,
"autoname": "field:item_code",

1
erpnext/stock/doctype/material_request/material_request.json
View File

@ -1,5 +1,4 @@
{
"allow_attach": 1,
"allow_import": 1,
"autoname": "naming_series:",
"creation": "2013-03-07 14:48:38",

1
erpnext/stock/doctype/price_list/price_list.json
View File

@ -1,5 +1,4 @@
{
"allow_attach": 0,
"allow_copy": 0,
"allow_email": 1,
"allow_import": 1,

1
erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
View File

@ -1,5 +1,4 @@
{
"allow_attach": 1,
"autoname": "naming_series:",
"creation": "2013-05-21 16:16:39",
"docstatus": 0,

1
erpnext/stock/doctype/serial_no/serial_no.json
View File

@ -1,5 +1,4 @@
{
"allow_attach": 1,
"allow_import": 1,
"allow_rename": 1,
"autoname": "field:serial_no",

1
erpnext/stock/doctype/stock_entry/stock_entry.json
View File

@ -1,5 +1,4 @@
{
"allow_attach": 0,
"allow_copy": 0,
"allow_import": 1,
"allow_rename": 0,

1
erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json
View File

@ -1,5 +1,4 @@
{
"allow_attach": 0,
"allow_copy": 1,
"autoname": "SR/.######",
"creation": "2013-03-28 10:35:31",

1
erpnext/support/doctype/support_ticket/support_ticket.json
View File

@ -1,5 +1,4 @@
{
"allow_attach": 1,
"autoname": "naming_series:",
"creation": "2013-02-01 10:36:25",
"docstatus": 0,

5
erpnext/utilities/doctype/address/address_list.js
View File

@ -1,5 +0,0 @@
frappe.listview_settings['Address'] = {
set_title_left: function() {
frappe.set_route("Module", "Selling");
}
}

5
erpnext/utilities/doctype/contact/contact_list.js
View File

@ -1,5 +0,0 @@
frappe.listview_settings['Address'] = {
set_title_left: function() {
frappe.set_route("Module", "Selling");
}
}

3
erpnext/utilities/doctype/note/note_list.js
View File

@ -1,6 +1,3 @@
frappe.listview_settings['Note'] = {
add_fields: ["title", "public"],
set_title_left: function() {
frappe.set_route();
}
}

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

@ -1,5 +1,4 @@
{
"allow_attach": 0,
"allow_email": 1,
"allow_print": 1,
"creation": "2012-12-03 10:25:59.000000",

2
erpnext/utilities/repost_stock.py
View File

@ -77,7 +77,7 @@ def get_reserved_qty(item_code, warehouse):
(select qty as dnpi_qty, qty as so_item_qty,
ifnull(delivered_qty, 0) as so_item_delivered_qty, parent, name
from `tabSales Order Item` so_item
where item_code = %s and reserved_warehouse = %s
where item_code = %s and warehouse = %s
and exists(select * from `tabSales Order` so
where so.name = so_item.parent and so.docstatus = 1
and so.status != 'Stopped'))