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

Merge branch 'responsive' of github.com:webnotes/erpnext into responsive

Browse Source
This commit is contained in:
Anand Doshi 2013-06-04 15:48:43 +05:30
commit d64a642974
9 changed files with 197 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
accounts/doctype/account/account.py
View File

@ -29,6 +29,7 @@ class DocType:
self.nsm_parent_field = 'parent_account'
def autoname(self):
"""Append abbreviation to company on naming"""
self.doc.name = self.doc.account_name.strip() + ' - ' + \
webnotes.conn.get_value("Company", self.doc.company, "abbr")
@ -37,6 +38,7 @@ class DocType:
return {'address': address}
def validate_master_name(self):
"""Remind to add master name"""
if (self.doc.master_type == 'Customer' or self.doc.master_type == 'Supplier') \
and not self.doc.master_name:
msgprint("Message: Please enter Master Name once the account is created.")
@ -62,6 +64,7 @@ class DocType:
self.doc.debit_or_credit = par[0][3]
def validate_max_root_accounts(self):
"""Raise exception if there are more than 4 root accounts"""
if webnotes.conn.sql("""select count(*) from tabAccount where
company=%s and ifnull(parent_account,'')='' and docstatus != 2""",
self.doc.company)[0][0] > 4:
@ -69,7 +72,6 @@ class DocType:
raise_exception=1)
def validate_duplicate_account(self):
if self.doc.fields.get('__islocal') or not self.doc.name:
company_abbr = webnotes.conn.get_value("Company", self.doc.company, "abbr")
if sql("""select name from tabAccount where name=%s""",
@ -134,6 +136,7 @@ class DocType:
self.doc.parent_account = ''
def update_nsm_model(self):
"""update lft, rgt indices for nested set model"""
import webnotes
import webnotes.utils.nestedset
webnotes.utils.nestedset.update_nsm(self)

1
accounts/page/accounts_browser/README.md Normal file
View File

@ -0,0 +1 @@
Tree view browser for Chart of Accounts and Chart of Cost Centers

2
buying/page/purchase_analytics/purchase_analytics.js
View File

@ -49,7 +49,7 @@ erpnext.PurchaseAnalytics = wn.views.TreeGridReport.extend({
item_key: "supplier",
parent_field: "parent_supplier_type",
formatter: function(item) {
// return repl('<a href="#Report2/stock-invoices/customer=%(enc_value)s">%(value)s</a>', {
// return repl('<a href="#Report/stock-invoices/customer=%(enc_value)s">%(value)s</a>', {
// value: item.name,
// enc_value: encodeURIComponent(item.name)
// });

28
config.json
View File

@ -2,69 +2,69 @@
"modules": {
"Selling": {
"link": "selling-home",
"color": "#3f4901",
"color": "#1abc9c",
"icon": "icon-tag",
"type": "module"
},
"Accounts": {
"link": "accounts-home",
"color": "#025770",
"color": "#3498db",
"icon": "icon-money",
"type": "module"
},
"Stock": {
"type": "module",
"link": "stock-home",
"color": "#a66a02",
"color": "#f39c12",
"icon": "icon-truck"
},
"Buying": {
"type": "module",
"link": "buying-home",
"color": "#8F0222",
"color": "#c0392b",
"icon": "icon-shopping-cart"
},
"Support": {
"type": "module",
"link": "support-home",
"color": "#410169",
"color": "#2c3e50",
"icon": "icon-phone"
},
"Projects": {
"type": "module",
"link": "projects-home",
"color": "#473b7f",
"color": "#8e44ad",
"icon": "icon-tasks"
},
"Manufacturing": {
"type": "module",
"link": "manufacturing-home",
"color": "#590116",
"icon": "icon-magic"
"color": "#7f8c8d",
"icon": "icon-cogs"
},
"Website": {
"type": "module",
"link": "website-home",
"color": "#968c00",
"color": "#16a085",
"icon": "icon-globe"
},
"HR": {
"type": "module",
"link": "hr-home",
"color": "#018d6c",
"color": "#2ecc71",
"label": "Human Resources",
"icon": "icon-group"
},
"Setup": {
"type": "setup",
"link": "Setup",
"color": "#484848",
"color": "#bdc3c7",
"icon": "icon-wrench"
},
"Activity": {
"type": "page",
"link": "activity",
"color": "#633501",
"color": "#e67e22",
"icon": "icon-play",
"label": "Activity"
},
@ -72,9 +72,9 @@
"type": "list",
"doctype": "Note",
"link": "List/Note",
"color": "#01372b",
"color": "#95a5a6",
"label": "Notes",
"icon": "icon-question-sign"
"icon": "icon-file-alt"
}
},
"web": {

2
home/page/activity/activity.js
View File

@ -19,7 +19,7 @@ wn.pages['activity'].onload = function(wrapper) {
// Build Report Button
if(wn.boot.profile.can_get_report.indexOf("Feed")!=-1) {
wrapper.appframe.add_button('Build Report', function() {
wn.set_route('Report2', "Feed");
wn.set_route('Report', "Feed");
}, 'icon-th')
}
}

2
hr/page/hr_home/hr_home.js
View File

@ -175,7 +175,7 @@ wn.module_page["HR"] = [
},
{
"label":wn._("Employee Information"),
route: "Report2/Employee/Employee Information"
route: "Report/Employee/Employee Information"
},
{
"label":wn._("Monthly Salary Register"),

171
public/images/erpnext-2013.svg Normal file
View File

@ -0,0 +1,171 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="744.09448819"
height="1052.3622047"
id="svg2"
version="1.1"
inkscape:version="0.48.2 r9819"
sodipodi:docname="erpnext-logo-2013 - flat-ui-colors.svg"
inkscape:export-filename="/Users/anandpdoshi/Dropbox/erpnext/logo 2013/erpnext-logo-2013 other colors 3.png"
inkscape:export-xdpi="167.56363"
inkscape:export-ydpi="167.56363">
<defs
id="defs4" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.53740115"
inkscape:cx="523.82055"
inkscape:cy="650.03526"
inkscape:document-units="px"
inkscape:current-layer="layer5"
showgrid="false"
inkscape:snap-bbox="false"
showguides="true"
inkscape:guide-bbox="true"
inkscape:snap-global="true"
inkscape:bbox-paths="false"
inkscape:bbox-nodes="false"
inkscape:snap-page="false"
inkscape:snap-grids="true"
inkscape:window-width="721"
inkscape:window-height="690"
inkscape:window-x="559"
inkscape:window-y="0"
inkscape:window-maximized="0">
<inkscape:grid
type="xygrid"
id="grid3836" />
</sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
style="display:inline">
<rect
style="opacity:0.90000000000000002;fill:#f39c12;fill-opacity:1"
id="rect3800"
width="150"
height="150"
x="60.000008"
y="-472.36218"
rx="20"
ry="20"
transform="scale(1,-1)" />
</g>
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="Layer 2">
<path
transform="scale(1,-1)"
style="display:inline;opacity:0.90000000000000002;fill:#f1c40f;fill-opacity:1"
d="m 180,-372.36218 110,0 20,0 0,20 0,110 c 0,11.08 -8.92,20 -20,20 l -110,0 c -11.08,0 -20,-8.92 -20,-20 l 0,-110 c 0,-11.08 8.92,-20 20,-20 z"
id="rect3051"
inkscape:connector-curvature="0"
sodipodi:nodetypes="scccssssss" />
</g>
<g
inkscape:groupmode="layer"
id="layer3"
inkscape:label="Layer 3">
<rect
style="display:inline;opacity:0.90000000000000002;fill:#2ecc71;fill-opacity:0.94117647"
id="rect3840"
width="150"
height="150"
x="260"
y="-272.36218"
rx="20"
ry="20"
transform="scale(1,-1)" />
</g>
<g
inkscape:groupmode="layer"
id="layer4"
inkscape:label="Layer 4">
<path
sodipodi:nodetypes="scccssssss"
inkscape:connector-curvature="0"
id="path3054"
d="m 490,372.36218 -110,0 -20,0 0,-20 0,-110 c 0,-11.08 8.92,-20 20,-20 l 110,0 c 11.08,0 20,8.92 20,20 l 0,110 c 0,11.08 -8.92,20 -20,20 z"
style="display:inline;opacity:0.90000000000000002;fill:#27ae60;fill-opacity:1" />
</g>
<g
inkscape:groupmode="layer"
id="layer5"
inkscape:label="Layer 5">
<rect
style="display:inline;opacity:0.90000000000000002;fill:#3498db;fill-opacity:0.94117647"
id="rect3844"
width="150"
height="150"
x="460"
y="-472.36218"
rx="20"
ry="20"
transform="scale(1,-1)" />
</g>
<g
inkscape:groupmode="layer"
id="layer6"
inkscape:label="Layer 6">
<path
style="display:inline;opacity:0.90000000000000002;fill:#2980b9;fill-opacity:0.94117647"
d="m 490,422.36218 -110,0 -20,0 0,20 0,110 c 0,11.08 8.92,20 20,20 l 110,0 c 11.08,0 20,-8.92 20,-20 l 0,-110 c 0,-11.08 -8.92,-20 -20,-20 z"
id="path3058"
inkscape:connector-curvature="0"
sodipodi:nodetypes="scccssssss" />
</g>
<g
inkscape:groupmode="layer"
id="layer7"
inkscape:label="Layer 7">
<rect
style="display:inline;opacity:0.90000000000000002;fill:#c0392b;fill-opacity:1"
id="rect3848"
width="150"
height="150"
x="260"
y="-672.36218"
rx="20"
ry="20"
transform="scale(1,-1)" />
</g>
<g
inkscape:groupmode="layer"
id="layer8"
inkscape:label="Layer 8">
<path
sodipodi:nodetypes="scccssssss"
inkscape:connector-curvature="0"
id="path3056"
d="m 180,422.36218 110,0 20,0 0,20 0,110 c 0,11.08 -8.92,20 -20,20 l -110,0 c -11.08,0 -20,-8.92 -20,-20 l 0,-110 c 0,-11.08 8.92,-20 20,-20 z"
style="display:inline;opacity:0.90000000000000002;fill:#e74c3c;fill-opacity:1" />
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 5.1 KiB

BIN
public/images/favicon.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

8
stock/page/stock_home/stock_home.js
View File

@ -164,7 +164,7 @@ wn.module_page["Stock"] = [
items: [
{
"label":wn._("Stock Ledger"),
route: "Report2/Stock Ledger Entry/Stock Ledger",
route: "Report/Stock Ledger Entry/Stock Ledger",
doctype: "Stock Ledger Entry"
},
{
@ -179,17 +179,17 @@ wn.module_page["Stock"] = [
},
{
"label":wn._("Serial No Service Contract Expiry"),
route: "Report2/Serial No/Serial No Service Contract Expiry",
route: "Report/Serial No/Serial No Service Contract Expiry",
doctype: "Serial No"
},
{
"label":wn._("Serial No Status"),
route: "Report2/Serial No/Serial No Status",
route: "Report/Serial No/Serial No Status",
doctype: "Serial No"
},
{
"label":wn._("Serial No Warranty Expiry"),
route: "Report2/Serial No/Serial No Warranty Expiry",
route: "Report/Serial No/Serial No Warranty Expiry",
doctype: "Serial No"
},
{