Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,868 Commits 3 Branches 0 Tags 1 GiB
158e7751a8
Commit Graph

122 Commits

Author SHA1 Message Date
Anand Doshi
c97f780940 Merge branch 'master' into dev 
Conflicts:
	erpnext/patches/patch_list.py
	erpnext/startup/js/complete_setup.js
	erpnext/stock/doctype/item/item.txt
	public/css/all-app.css
	public/js/all-app.js
	public/js/all-web.js
 2012-07-12 22:16:19 +05:30
Anand Doshi
d68dceb791 Merge branch 'master' of github.com:webnotes/erpnext into cms2 2012-07-12 18:53:35 +05:30
Anand Doshi
51146c07c3 cleaner web cache code 2012-07-12 18:41:12 +05:30
Rushabh Mehta
357fb2640b sales bom fixes and mandatory in table fields 2012-07-12 18:00:21 +05:30
Rushabh Mehta
4feae61b62 fixes to taxes and charges master and naming_series 2012-07-12 16:01:20 +05:30
Rushabh Mehta
5faf37f312 item group cleanup 2012-07-12 11:33:00 +05:30
Nabin Hait
179f01af17 hong kong added in country list 2012-07-12 11:03:39 +05:30
Rushabh Mehta
cf969143f2 cleaned up customer group 2012-07-12 09:54:43 +05:30
Rushabh Mehta
b9fabf8e16 sales bom cleanup 2012-07-11 19:18:50 +05:30
Anand Doshi
8c7e76ba44 RSS for blog 
Comment addition into blog page's dom
 2012-07-11 18:40:57 +05:30
Rushabh Mehta
cda9732f51 price list cleanup 2012-07-11 17:29:46 +05:30
Rushabh Mehta
3a0f191658 cleaned up fiscal_year, currency and added select-all + help in doclistview 2012-07-11 16:35:39 +05:30
Rushabh Mehta
9acf463427 budget distribution cleanup and formatting of markdown 2012-07-11 14:39:33 +05:30
Anand Doshi
1522f5d76b Merge branch 'master' of github.com:webnotes/erpnext into cms2 2012-07-11 14:27:22 +05:30
Rushabh Mehta
e57267f79a added patch for account and cleanups to breadcrumbs and msgprint 2012-07-11 13:18:58 +05:30
Rushabh Mehta
bf96499c0e account cleanup, added toggle_fields in cur_frm 2012-07-11 09:51:18 +05:30
Rushabh Mehta
d6814dde29 account cleanup started 2012-07-10 18:38:59 +05:30
Rushabh Mehta
5281e350fb cost center cleanup 2012-07-10 18:16:09 +05:30
Rushabh Mehta
1ee2a5ac12 cost center cleanup + grid css 2012-07-10 17:22:20 +05:30
Anand Doshi
e47def842d Improvements in product page and its listing 
Login page rendered via a template
 2012-07-09 15:56:12 +05:30
Anand Doshi
d4be00b1fd Merge branch 'master' into dev 2012-07-09 13:32:27 +05:30
Anand Doshi
368cb53cf6 css fix for sidebar statuses in list view 2012-07-09 13:32:06 +05:30
Anand Doshi
5d91e83f11 Merge branch 'master' into dev 2012-07-09 10:19:23 +05:30
Anand Doshi
7048f2a57c on amend, retain the existing attachments 2012-07-09 10:19:03 +05:30
Anand Doshi
842c96361e updates in form's column break logic 2012-07-06 13:03:08 +05:30
Anand Doshi
29c5d35ee5 Merge branch 'master' into dev 2012-07-06 11:27:15 +05:30
Nabin Hait
cb2e76a79c delete row issue in grid fixed 2012-07-05 14:44:39 +05:30
Anand Doshi
2cfe2d4616 Merge branch 'master' of github.com:webnotes/erpnext into dev 2012-07-04 14:17:46 +05:30
Rushabh Mehta
4764e70d09 changed timeout to 1000ms in linkfield change event 2012-07-04 10:46:26 +02:00
Anand Doshi
cdc011cdbd fix in section hiding / column hiding logic 2012-07-04 13:17:44 +05:30
Anand Doshi
1731786a61 Merge branch 'master' of github.com:webnotes/erpnext into cms2 2012-07-03 15:51:11 +05:30
Anand Doshi
ebe23b0f89 allow deletion of communication 2012-06-29 16:38:07 +05:30
Anand Doshi
0afab07a1f communication listview - show pretty date 2012-06-28 12:59:33 +05:30
Anand Doshi
bba4db1627 product listing and pages 2012-06-27 12:06:45 +05:30
Anand Doshi
81fa802e09 Merge branch 'master' into dev 2012-06-25 20:06:54 +05:30
Anand Doshi
8ae5ba9abf fixes related to --> clear locals and then sync locals when whole doclist is passed 2012-06-25 20:05:35 +05:30
Nabin Hait
8b14617dce run view ledger report through set_route 2012-06-25 13:15:59 +05:30
Anand Doshi
72c945b7c6 template based web page loading using web.py 2012-06-22 20:01:07 +05:30
Nabin Hait
4ce8e16ded Merge branch 'master' of github.com:webnotes/erpnext 2012-06-22 12:16:43 +05:30
Nabin Hait
59e4dcb1b0 Error fixed in new report: sort by child table column 2012-06-22 12:16:21 +05:30
Anand Doshi
815ad3fa28 Merge branch 'master' into dev 2012-06-22 12:14:43 +05:30
Anand Doshi
ab65b54c43 fix in dialog: if an in_dialog doctype is called using url, it will open 
in form with header and sidebar
 2012-06-22 12:11:24 +05:30
Anand Doshi
9078f652c3 Merge branch 'master' into cms2 2012-06-21 11:50:44 +05:30
Anand Doshi
5d9fc72753 updates in web.py and template - page.html 2012-06-21 11:48:51 +05:30
Anand Doshi
05cbf96e84 Merge branch 'master' into dev 2012-06-21 11:20:10 +05:30
Anand Doshi
f1c287bdda fix in file_list issue due to import data 2012-06-20 13:46:26 +05:30
Anand Doshi
be7c426e15 add parent column in filter list 2012-06-19 17:52:37 +05:30
Rushabh Mehta
40182bada3 added patch 2012-06-19 14:15:13 +05:30
Anand Doshi
f4b552ea5d fixed: link field validate data on defocus, if autosuggest or search not used 2012-06-19 13:17:56 +05:30
Nabin Hait
90376f6ce4 reset to prev version 2012-06-19 10:31:08 +05:30