Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,434 Commits 3 Branches 0 Tags 1 GiB
981d48339a
Commit Graph

258 Commits

Author SHA1 Message Date
Rushabh Mehta
cfb5466d30 added export to reports using downloadify 2012-09-14 18:12:17 +05:30
Rushabh Mehta
ed856486bc update progress bar to 100 on request closing 2012-09-14 11:51:22 +05:30
Rushabh Mehta
1c409a84cd with original-length header for gzip response 2012-09-14 11:40:47 +05:30
Rushabh Mehta
b40e93733c merge with master 2012-09-14 11:29:52 +05:30
Rushabh Mehta
42208085a1 removed logs in request 2012-09-14 11:28:46 +05:30
Rushabh Mehta
263e7a4bae rebuild 2012-09-14 11:16:09 +05:30
Rushabh Mehta
043e7c4eb9 merge 2012-09-14 11:15:06 +05:30
Rushabh Mehta
c6369046a1 merge 2012-09-14 11:09:46 +05:30
Rushabh Mehta
bf65507939 added watch, check progress 2012-09-14 11:08:53 +05:30
Rushabh Mehta
36353b2c7e updated progress bar 2012-09-14 10:46:36 +05:30
Rushabh Mehta
f8ed0583b6 updated progress bar 2012-09-14 10:44:09 +05:30
Rushabh Mehta
2be4c6f8ed created grid report, report dump and general ledger report 2012-09-13 19:42:28 +05:30
Rushabh Mehta
95e4e1418d created grid report, report dump and general ledger report 2012-09-13 19:40:56 +05:30
Anand Doshi
e08249f3d5 allow multisort with selectable sort order 2012-09-13 15:39:34 +05:30
Anand Doshi
99e5ac3452 multi sort for stock ledger search criteria 2012-09-13 15:24:19 +05:30
Rushabh Mehta
93e9fdfe48 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-09-13 12:00:54 +05:30
Rushabh Mehta
fd1c166f5b late loading js (require) files in localStorage, brought back versions (simpler) 2012-09-13 10:21:29 +05:30
Rushabh Mehta
24ebe3ffdd merge with master 2012-09-12 19:07:07 +05:30
Rushabh Mehta
588a98a10f fixes to chart_of_accounts, added opening + pl condition 2012-09-12 19:00:14 +05:30
Rushabh Mehta
0fa8e33835 chart of accounts: balances calculation 2012-09-12 18:14:12 +05:30
Rushabh Mehta
ad37f276da Created Chart of Accounts using Slick Grid and Tree 2012-09-12 17:13:36 +05:30
Anand Doshi
ce946afb67 Merge branch 'master' of github.com:webnotes/erpnext into unicode 
Conflicts:
	public/js/all-app.js
 2012-09-10 14:18:17 +05:30
Nabin Hait
6c8504877b Fixes in item wise purchase details report 2012-09-10 12:23:06 +05:30
Anand Doshi
0dab087be1 Merge branch 'master' of github.com:webnotes/erpnext into unicode 
Conflicts:
	erpnext/accounts/doctype/sales_invoice/sales_invoice.txt
	public/js/all-app.js
 2012-09-10 11:31:18 +05:30
Nabin Hait
f28f4c7a89 section hide_unhide issue fixed 2012-09-07 11:59:05 +05:30
Anand Doshi
f03e3bb06b Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-09-06 07:55:19 +05:30
Anand Doshi
e642805882 changed date displayed in transaction listing from modified date to transaction/posting date 2012-09-03 13:32:25 +05:30
Anand Doshi
b211a41547 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-31 13:39:58 +05:30
Anand Doshi
00d3c7c67d open communication in dialog 2012-08-31 13:25:03 +05:30
Anand Doshi
fa97e8c783 Merge branch 'master' of github.com:webnotes/erpnext into unicode 
Conflicts:
	erpnext/accounts/search_criteria/cash_flow_statement/__init__.py
	erpnext/accounts/search_criteria/cash_flow_statement/cash_flow_statement.py
	public/js/all-app.js
 2012-08-31 12:09:02 +05:30
Anand Doshi
8981b586a1 fixed form header label issue: on change of field, label should change to Not Saved 2012-08-31 12:03:46 +05:30
Anand Doshi
8a72ec5e39 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-16 16:06:12 +05:30
Anand Doshi
126658a77d fixes due to changes in filter logic 2012-08-16 16:05:53 +05:30
Anand Doshi
f19f13314a Merge branch 'master' of github.com:webnotes/erpnext into unicode 
Conflicts:
	public/js/all-app.js
 2012-08-16 15:48:16 +05:30
Anand Doshi
a6de55e2e6 fixed selection of field names in filters, such that if two tables have the same fieldnames, it doesn't cause conflict 2012-08-16 15:45:28 +05:30
Anand Doshi
63fee973d7 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-09 11:34:47 +05:30
Anand Doshi
11a5ba64dd fixed bug in depends_on: hidden property of a docfield should have value as 0 or 1 2012-08-09 11:30:21 +05:30
Rushabh Mehta
0f0d8850d0 merged with master (project cleanup) 2012-08-08 14:28:24 +05:30
Rushabh Mehta
aff1599fe5 cleanup to projects and tasks and now embedding gantt chart inside project 2012-08-08 14:19:33 +05:30
Rushabh Mehta
17588987a4 file upload should not be decoded 2012-08-08 10:37:02 +05:30
Rushabh Mehta
22fbea975f Merge branch 'unicode' of github.com:webnotes/erpnext into unicode 2012-08-08 10:07:39 +05:30
Rushabh Mehta
7dbef2549a pre, code style fix 2012-08-08 10:06:43 +05:30
Rushabh Mehta
bf8cac53c7 pre, code style fix 2012-08-08 10:05:51 +05:30
Rushabh Mehta
02aab69427 merge 2012-08-07 16:44:36 +05:30
Anand Doshi
16ad50f641 Merge branch 'master' of github.com:webnotes/erpnext into unicode 
Conflicts:
	erpnext/stock/doctype/item/item.txt
 2012-08-07 15:07:56 +05:30
Rushabh Mehta
6252c13ec8 added code style and mardown in todo 2012-08-07 12:53:49 +05:30
Rushabh Mehta
c7dbe293c3 updates to kb: unanswered questions show in desktop, questions query moved to server-side 2012-08-07 12:12:55 +05:30
Anand Doshi
b8219aa4f0 Merge branch 'master' of github.com:webnotes/erpnext into unicode 
Conflicts:
	public/js/all-app.js
	public/js/fields.js
 2012-08-06 19:55:43 +05:30
Rushabh Mehta
aaa75496e2 added email chain on blog comment and number of comments 2012-08-06 15:22:17 +05:30
Rushabh Mehta
90115202f2 build 2012-08-06 14:30:56 +05:30
Rushabh Mehta
a49a552a37 merge 2012-08-06 14:30:31 +05:30
Rushabh Mehta
5d4a9f8554 date format bug fixed 2012-08-06 14:20:15 +05:30
Rushabh Mehta
6243f29ab3 framework updates 2012-08-06 11:15:22 +05:30
Rushabh Mehta
49dc5da0dc refactor unicode changes and merge with master with refactored email 2012-08-03 16:02:24 +05:30
Rushabh Mehta
c0fded82e6 Merge branch 'master' of github.com:webnotes/erpnext 2012-08-03 14:18:05 +05:30
Rushabh Mehta
0c5b438623 framework updates 2012-08-03 14:12:14 +05:30
Anand Doshi
e69c7f487f Merge branch 'master' of github.com:webnotes/erpnext 2012-08-02 18:53:31 +05:30
Anand Doshi
a67a74fee1 supplier quotation, project shift patch 2012-08-02 18:53:00 +05:30
Rushabh Mehta
a4fe7180f4 html generation moved from web.py to web_cache.py so it can be called from other places as a response from server.py 2012-08-02 13:07:23 +05:30
Anand Doshi
48553618b0 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-07-31 19:38:39 +05:30
Anand Doshi
dc40385d41 validate link only if value is non empty 2012-07-31 19:37:39 +05:30
Rushabh Mehta
0fa628bf86 Merge branch 'master' of github.com:webnotes/erpnext into unicode 
Conflicts:
	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
	erpnext/patches/patch_list.py
	public/js/report-legacy.js
 2012-07-26 15:46:13 +02:00
Nabin Hait
7839ea9687 fixes in new report: same fieldname in multiple table 2012-07-23 16:05:16 +05:30
Nabin Hait
39b8ec0ed8 fixes in new report: same fieldname in multiple table 2012-07-23 15:03:57 +05:30
Nabin Hait
44c6a5bef5 dont display description on old report 2012-07-23 11:54:06 +05:30
Anand Doshi
76ec66dd65 fixes for unicode 2012-07-20 18:11:30 +05:30
Anand Doshi
1703cc89b4 fixes for unicode 2012-07-19 20:31:56 +05:30
Anand Doshi
486f9dfcec added unicode_literals import at start of each file 2012-07-19 13:40:31 +05:30
Anand Doshi
5756630efb Merge branch 'master' of github.com:webnotes/erpnext into dev 
Conflicts:
	erpnext/stock/doctype/delivery_note/delivery_note.py
	public/js/all-app.js
 2012-07-18 20:31:37 +05:30
Anand Doshi
f2f5c94c41 Default Currency specification for Customer and Supplier 
This will get fetched in sales and purchase transactions respectively.
Fix in sales order list view
 2012-07-18 20:13:52 +05:30
Anand Doshi
a60266d780 fix in doclistview group by logic 2012-07-18 15:43:43 +05:30
Anand Doshi
3a281ae6c3 Merge branch 'master' of github.com:webnotes/erpnext into dev 
Conflicts:
	erpnext/patches/patch_list.py
 2012-07-17 13:21:55 +05:30
Anand Doshi
669d15a45c fix in copy doc 2012-07-17 13:16:21 +05:30
Anand Doshi
5d4aaaa8a7 patch to remove match condition of owner on event doctype 2012-07-17 13:06:34 +05:30
Rushabh Mehta
ebf9137a94 report breadcrumbs issue 2012-07-16 16:27:23 +05:30
Rushabh Mehta
4ae82ca0c2 users pages deprecated 2012-07-16 16:20:11 +05:30
Rushabh Mehta
3c419c5e05 cur_frm.doc re-reference when is called 2012-07-16 15:44:38 +05:30
Rushabh Mehta
9e9809a44f Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-16 14:17:22 +05:30
Rushabh Mehta
2eef40bf1e get_field > wn.meta.get_docfield 2012-07-16 14:16:57 +05:30
Anand Doshi
f42d050eb7 Merge branch 'master' into dev 
Conflicts:
	public/js/all-app.js
 2012-07-16 12:19:18 +05:30
Anand Doshi
57fefaa3de show assign to only after save 2012-07-16 12:18:08 +05:30
Anand Doshi
bb81c198f5 Merge branch 'dev' of github.com:webnotes/erpnext into dev 
Conflicts:
	public/js/all-app.js
	public/js/all-web.js
 2012-07-13 16:48:08 +05:30
Anand Doshi
2fef0ee4e1 Merge branch 'master' into dev 2012-07-13 16:47:09 +05:30
Anand Doshi
9ec8024db7 show order type icon in sales order list view 2012-07-13 16:46:12 +05:30
Rushabh Mehta
91ba346354 profile cleanup start and new auth table for better security 2012-07-13 14:54:40 +05:30
Rushabh Mehta
d47efd57ac check_required fix 2012-07-13 11:15:25 +05:30
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