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

619 Commits

Author SHA1 Message Date
Anand Doshi
236cc173ad rename Purchase Request to Material Request 2013-02-18 13:49:15 +05:30
Anand Doshi
03741698e4 added icons in modules drop down menu 2013-02-16 15:05:37 +05:30
Rushabh Mehta
1a9f0848b3 added calendar view 2013-02-15 12:09:05 +05:30
Rushabh Mehta
8fbfbfbb78 number format fix 2013-02-13 22:02:09 +05:30
Rushabh Mehta
af222dc6b2 updated language 2013-02-11 11:49:18 +05:30
Rushabh Mehta
60135df6fd updated language 2013-02-11 11:44:12 +05:30
Rushabh Mehta
8c713e7f0c added holidy_block_list_allow 2013-02-06 16:10:48 +05:30
Rushabh Mehta
eadedb567d added bookmarks 2013-02-06 13:15:13 +05:30
Rushabh Mehta
fdc629be4d get post fix 2013-01-31 22:05:39 +05:30
Rushabh Mehta
028abd2d08 bugfix in session update and separated GET and POST queries 2013-01-31 11:20:10 +05:30
Anand Doshi
f83f151ac3 fix in get_currency -- using :Company 2013-01-30 00:42:41 +05:30
Nabin Hait
c0ef8de6f7 Merge branch 'master' of github.com:webnotes/erpnext 2013-01-28 16:56:51 +05:30
Nabin Hait
23decac683 fixes in features setup 2013-01-28 16:56:07 +05:30
Rushabh Mehta
cda5d42a65 updated languages 2013-01-28 14:21:40 +05:30
Rushabh Mehta
8e3affbf70 added nl 2013-01-25 11:58:18 +05:30
Rushabh Mehta
4e01011669 added language to pages 2013-01-24 19:31:55 +05:30
Rushabh Mehta
317177afd2 updated languages 2013-01-24 18:18:39 +05:30
Rushabh Mehta
ad14943c3f added arabic 2013-01-24 17:37:43 +05:30
Rushabh Mehta
4c17718b4c added portuguese 2013-01-24 16:31:23 +05:30
Rushabh Mehta
6c8cef71a0 fixes to desktop 2013-01-24 16:30:50 +05:30
Rushabh Mehta
908d09d058 added spanish 2013-01-24 15:55:30 +05:30
Rushabh Mehta
27254d9440 added spanish 2013-01-24 15:55:08 +05:30
Rushabh Mehta
9c77a25cd3 merge 2013-01-23 19:44:35 +05:30
Rushabh Mehta
597d470e63 added format_currency and added options to all currency fields 2013-01-23 19:39:51 +05:30
Nabin Hait
92a0218091 added uom column in stock reports 2013-01-22 17:52:43 +05:30
Nabin Hait
319fb92d18 consider global val method if not specified in item master and apply zero filters 2013-01-22 14:40:20 +05:30
Nabin Hait
d797ffbd37 show analytics value based valuation method defined in item master 2013-01-22 14:02:55 +05:30
Anand Doshi
ef02ddfc40 Merge branch 'master' of github.com:webnotes/erpnext into purchase_price_list 
Conflicts:
	accounts/doctype/gl_control/gl_control.py
 2013-01-17 20:31:41 +05:30
Rushabh Mehta
db7139a649 started fresh install and added country_info 2013-01-17 18:22:22 +05:30
Anand Doshi
03fa78597d Merge branch 'master' into purchase_price_list 2013-01-17 10:58:41 +05:30
Rushabh Mehta
8d3fe553e5 added automatic lead creation for sales email id 2013-01-16 12:19:28 +05:30
Rushabh Mehta
2e5db35856 added automatic lead creation for sales email id 2013-01-16 11:34:26 +05:30
Anand Doshi
756dca719b refactored purchase cycle's get item details and update item details functions and started with purchase price list 2013-01-15 18:39:21 +05:30
Rushabh Mehta
3c5161113e merge 2013-01-14 16:11:03 +05:30
Rushabh Mehta
be9ef4ac89 added code to update timestamps in Task, Customer Issue and Support Ticket 2013-01-14 15:48:00 +05:30
Anand Doshi
54d6f18402 if local, then setup defaults 2013-01-14 15:06:53 +05:30
Anand Doshi
6c5262abb1 Merge branch 'master' of github.com:webnotes/erpnext into stock_reco 
Conflicts:
	patches/patch_list.py
	stock/report/stock_ledger/stock_ledger.txt
 2013-01-14 13:28:31 +05:30
Nabin Hait
ac53b11969 stock reco fixes with testcases 2013-01-11 19:25:46 +05:30
Rushabh Mehta
5e7ec20588 datepicker fixes 2013-01-11 11:15:27 +05:30
Rushabh Mehta
4f5b89934b stock uom replace bugfix 2013-01-11 10:50:54 +05:30
Rushabh Mehta
ce1d5276ff added moduleview 2013-01-09 16:39:27 +05:30
Rushabh Mehta
143ea718c3 commified item_code query 2013-01-07 17:03:11 +05:30
Rushabh Mehta
523aec499a bootstrapped language and added 'hi' 2013-01-07 15:39:54 +05:30
Nabin Hait
3882db03e2 Trial Balance : with/without closing entry 2013-01-01 13:48:40 +05:30
Nabin Hait
30f5346184 stock level report 2012-12-28 15:39:55 +05:30
Anand Doshi
6ff2f6690f reduced width of brand in stock analytics report 2012-12-25 18:39:00 +05:30
Anand Doshi
4279dec000 fixed wn.require path for stock analytics and stock balance 2012-12-25 18:35:12 +05:30
Nabin Hait
ce159ab66b stock balance report and inclusion of filter on brand in all stock reports 2012-12-25 18:04:10 +05:30
Anand Doshi
e47ceae4b0 added option to add status in Support Ticket created through website 2012-12-24 19:50:15 +05:30
Anand Doshi
a0713196d2 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-24 18:08:16 +05:30
Anand Doshi
70a3db78b7 fix in module addition in toolbar 2012-12-24 18:07:35 +05:30
Rushabh Mehta
ff153490fe desktop items fix 2012-12-22 07:42:04 +05:30
Rushabh Mehta
5ade7ca570 fixes to new desktop 2012-12-21 21:40:19 +05:30
Rushabh Mehta
d3c9fb6b3b changed desktop modules now using font-awesome instead of noun project fonts 2012-12-21 18:27:40 +05:30
Rushabh Mehta
380d7c6a53 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-21 15:01:08 +05:30
Rushabh Mehta
946e6d4a46 desktop icons now use font-awesome 2012-12-21 15:00:29 +05:30
Nabin Hait
dff6ed880b cleanup for stock entry - remove production order from locals 2012-12-21 14:42:00 +05:30
Nabin Hait
3765430c99 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-21 14:14:40 +05:30
Nabin Hait
079f5e0773 For Material Transfer against Production Order, fetch quantity pending to be transferred for each item. 2012-12-21 14:14:07 +05:30
Rushabh Mehta
d49ca03335 added '+' button to file selector and rounded corners 2012-12-21 12:31:45 +05:30
Anand Doshi
ab5cf08c14 Merge branch 'master' of github.com:webnotes/erpnext into production 2012-12-20 12:42:53 +05:30
Anand Doshi
def65c671d show manufacturing small icon 2012-12-20 12:18:24 +05:30
Rushabh Mehta
be7fe472b6 import merge, remove Core 2012-12-20 11:01:09 +05:30
Rushabh Mehta
5569321d15 fixed z-index and renamed all-app.js to all-app.min.js 2012-12-20 10:37:37 +05:30
Nabin Hait
6435437e5b updates in manufacturing module 2012-12-19 19:33:41 +05:30
Nabin Hait
4ecc785aab fixed conflict 2012-12-19 12:18:15 +05:30
Rushabh Mehta
647e0d1164 updates to product_page (search) and kb fix 2012-12-18 14:47:54 +05:30
Nabin Hait
5f175dfd00 Merge branch 'master' into production 2012-12-18 13:49:07 +05:30
Rushabh Mehta
ee472b0926 upgraded to bootstrap 2.2 2012-12-18 11:47:13 +05:30
Rushabh Mehta
fd6ad19fa0 refactored blog client-side code 2012-12-17 12:52:43 +05:30
Nabin Hait
9ea22b75bd Merge branch 'master' into production 2012-12-17 11:39:41 +05:30
Rushabh Mehta
60f47b3648 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-17 10:28:37 +05:30
Anand Doshi
5f17be8364 added payment link in expiry banner 2012-12-15 18:38:18 +05:30
Nabin Hait
5ca0f44890 bom cleanup 2012-12-14 19:00:42 +05:30
Rushabh Mehta
65f336df59 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-14 16:40:06 +05:30
Rushabh Mehta
173a0fd4b7 refactored web / all-app now linked in app. no wnframework in website 2012-12-14 16:39:27 +05:30
Nabin Hait
3adaf607f0 bom cleanup 2012-12-14 14:25:51 +05:30
Nabin Hait
fce76cd5b2 Merge branch 'master' of github.com:webnotes/erpnext into production 2012-12-14 13:21:52 +05:30
Anand Doshi
161cf87cc0 in mousetrap - do not save if cur_frm.save_disabled is set 2012-12-14 13:13:02 +05:30
Nabin Hait
f8de5b9878 merged with master 2012-12-14 10:43:56 +05:30
Rushabh Mehta
291449b6fb refactored javascript models 2012-12-13 12:53:21 +05:30
Nabin Hait
05de088473 merge, fixed production cleanup patch 2012-12-10 19:28:38 +05:30
Anand Doshi
89e2dd8dbb rename Production --> Manufacturing and delete old patches 2012-12-10 19:01:31 +05:30
Nabin Hait
5999944a5c bom cleanup: update cost and flat bom by traversing full tree 2012-12-10 18:11:42 +05:30
Rushabh Mehta
bbd5ea32d1 added client side functions and mode_of_payment defaults 2012-12-04 16:31:54 +05:30
Rushabh Mehta
b12d5363bc merge 2012-11-29 16:30:57 +05:30
Rushabh Mehta
d7fe2bfe1b webnotes.model.doctype (new version) 2012-11-29 11:49:56 +05:30
Anand Doshi
bd36c4fb59 Merge branch 'edge' of github.com:webnotes/erpnext 2012-11-28 16:07:20 +05:30
Anand Doshi
42d37bf6c2 added Net Profit in financial analytis 2012-11-28 16:06:37 +05:30
Rushabh Mehta
bd919caa9b profile: form is now my settings page, removed (Page, profile-settings) 2012-11-28 15:19:51 +05:30
Rushabh Mehta
cee2b8ff4d support ticket: updated signature, doctype: create py if not exists 2012-11-28 10:47:51 +05:30
Rushabh Mehta
fe9707a08a refactored communication and added to Lead / Contact 2012-11-27 18:43:19 +05:30
Rushabh Mehta
80127bfb6a refactored communication and added to Lead / Contact 2012-11-27 18:41:35 +05:30
Anand Doshi
319ac97963 in communication, on overflowX, provide scroll 2012-11-27 13:30:03 +05:30
Rushabh Mehta
c4e7b6800a separated communication view 2012-11-26 18:18:10 +05:30
Rushabh Mehta
be919b3855 profile: added email signature to outgoing mail and profile settings 2012-11-26 13:54:47 +05:30
Anand Doshi
93a35cab19 added customer get_query to allow search based on customer name. also don't show name again if id naming is based on customer name and not series 2012-11-21 18:02:22 +05:30
Anand Doshi
b45cbda7fa fixed order by for common queries, should be ordered based on startswith match and then alphabetical order for fuzzy match 2012-11-21 18:00:22 +05:30
Anand Doshi
f8c5960cc2 shifted tree_grid.css and its icons to wnframework 2012-11-21 12:04:41 +05:30
Anand Doshi
fdfa60546a always open links embedded in knowledge base answers in new tab 2012-11-19 18:48:25 +05:30
Anand Doshi
452e6869b1 lead get query to search by lead name or lead's company name 2012-11-19 18:08:55 +05:30
Anand Doshi
353d408e88 added get_query for employee related table 2012-11-19 17:35:50 +05:30
Anand Doshi
e65e621145 get_query for profile based link fields to enable searching by name 2012-11-19 15:43:18 +05:30
Rushabh Mehta
601199db6e upgraded jquery and jquery.gantt 2012-11-16 11:46:43 +05:30
Rushabh Mehta
059c1842ec core should open setup 2012-11-15 13:26:00 +05:30
Rushabh Mehta
3684155f28 deprecated breadcrumbs, titles are now selectable 2012-11-13 16:44:27 +05:30
Rushabh Mehta
724bb471ee added latest updates page 2012-11-13 12:32:11 +05:30
Rushabh Mehta
9d0569a690 general_ledger: show against account, set title, and show is_opening as opening 2012-11-13 11:42:42 +05:30
Rushabh Mehta
ec40686cc3 messages, popups disabled 2012-11-13 10:59:11 +05:30
Rushabh Mehta
d1784cca00 passing server date in boot and checking expiry against the server date 2012-11-12 12:57:42 +05:30
Rushabh Mehta
5226ea4c08 removed core.min.js, toolbar.min.js, all-app.js is now loaded dynamically and stored in localstorage 2012-11-09 16:21:15 +05:30
Anand Doshi
73519e1cae fixed new Trial Balance Report 2012-10-11 14:04:27 +05:30
Nabin Hait
976f9eeab7 Merge branch 'master' of github.com:webnotes/erpnext 2012-10-05 12:12:08 +05:30
Nabin Hait
5417f5666c deprecated dashboard 2012-10-05 12:11:23 +05:30
Anand Doshi
58932a5812 Merge branch 'master' of github.com:webnotes/erpnext 2012-10-04 19:26:53 +05:30
Anand Doshi
08ca270b65 allow export of analytics reports to Report Manager or System Manager 2012-10-04 19:26:22 +05:30
Nabin Hait
367f059895 query report fixes 2012-10-04 18:49:14 +05:30
Anand Doshi
cdba51c5a9 added page permissions, modified report listing links 2012-10-04 18:11:29 +05:30
Anand Doshi
278f93c941 Merge branch 'master' of github.com:webnotes/erpnext 2012-10-04 13:54:17 +05:30
Anand Doshi
90a54a0435 fixed: hide links based on roles in accounts home 2012-10-04 13:53:50 +05:30
Rushabh Mehta
e7ccc317de dynamic loading for reports 2012-10-04 09:57:01 +05:30
Rushabh Mehta
b62bbc6dc7 update to messages, added avatar-large 2012-10-03 18:32:10 +05:30
Rushabh Mehta
92f3c02e42 message based on id changed 2012-10-03 14:10:45 +05:30
Rushabh Mehta
ac7baf046a commonified ripped paper effect and ctrl+s in todo 2012-10-03 12:22:13 +05:30
Rushabh Mehta
c919d2579e Merge branch 'master' of github.com:webnotes/erpnext 2012-10-03 11:57:13 +05:30
Rushabh Mehta
3009c46ba5 moved to bootstrap 2.1 and some ui fixes in todo and messages 2012-10-03 11:56:38 +05:30
Anand Doshi
a4cc383625 added 'fixed' property to background so that it does not scroll 2012-10-02 19:13:04 +05:30
Rushabh Mehta
079df382f9 login css 2012-10-02 16:54:42 +05:30
Rushabh Mehta
9d1faea10c separated query-report and added module marker to appframe 2012-10-02 14:56:41 +05:30
Rushabh Mehta
beb3a872ce Merge branch '1209' of github.com:webnotes/erpnext into 1209 2012-10-01 14:47:06 +05:30
Rushabh Mehta
2d700dd90d added query report and cleaned up wn.ui.Dialog 2012-10-01 14:46:37 +05:30
Anand Doshi
fdbc730821 merged deprecate account balance 2012-10-01 11:30:00 +05:30
Rushabh Mehta
3c04193afb form, appframe ui fixes 2012-09-28 18:47:47 +05:30
Rushabh Mehta
b0d32b7a25 form toolbar ui fixes and added themes 2012-09-28 16:11:57 +05:30
Anand Doshi
440c1eb465 deprecated account balance and fixed expiry msg 2012-09-28 16:04:10 +05:30
Anand Doshi
bbab0e4957 build.json: changed path of startup.js 2012-09-26 11:21:36 +05:30
Rushabh Mehta
707932da0c updated paths 2012-09-25 10:42:00 +05:30
Rushabh Mehta
2fa2f7178d moved directory structure 2012-09-24 19:13:42 +05:30
Anand Doshi
ab3764257c fixes in check required 2012-09-24 19:02:50 +05:30
Anand Doshi
5ca167bcbc in mandatory check, call refresh_label_icon only if that function exists 2012-09-24 18:48:44 +05:30
Anand Doshi
bc243dee81 fix in general ledger report: account filter options to be filtered by company 2012-09-24 18:03:35 +05:30
Anand Doshi
1fc9ae2230 Fixes and Validations for nested doctypes 2012-09-24 14:00:59 +05:30
Rushabh Mehta
09d84b6575 Stock Ageing & release of Analytics 2012-09-21 19:46:24 +05:30
Rushabh Mehta
f200c5296d added sales analytics 2012-09-21 15:19:40 +05:30
Rushabh Mehta
6ca8054d55 added stock analytics 2012-09-20 19:03:14 +05:30
Anand Doshi
c63f0518d7 removed zoom from grid report 2012-09-20 12:08:47 +05:30
Anand Doshi
09d686f7f6 zoom for stock ledger report 2012-09-19 19:06:38 +05:30
Rushabh Mehta
40a3b46d61 Added code for plot zoom 2012-09-19 17:13:10 +05:30
Rushabh Mehta
7668317064 separated tooltip text in plot 2012-09-19 16:47:57 +05:30
Rushabh Mehta
4573515899 added graphs in stock ledger and general ledger 2012-09-19 16:41:19 +05:30
Rushabh Mehta
823c021e9c added index patch and updated general_ledger 2012-09-19 12:01:01 +05:30
Rushabh Mehta
eb8673ecc6 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-09-18 18:52:38 +05:30
Rushabh Mehta
2ad0d424a9 Stock Ledger Report 2012-09-18 18:52:05 +05:30
Anand Doshi
081be012dc fix in doclistview new button permissios 2012-09-18 16:25:56 +05:30
Anand Doshi
56bac90081 bug fix in doclistview 2012-09-18 16:07:22 +05:30
Anand Doshi
8c3cfe076e get last purchase rate from item if not found from purchase order or receipt 2012-09-18 13:56:47 +05:30
Rushabh Mehta
4156523175 added flot for graphs in report_grid 2012-09-17 19:10:36 +05:30
Rushabh Mehta
f16b28b92b moved chart_of_accounts as GridReport 2012-09-17 11:05:59 +05:30
Rushabh Mehta
40c1ac00bc merge 2012-09-17 10:05:46 +05:30
Rushabh Mehta
4ce6b60fce updates to general ledger, todo 2012-09-17 10:04:07 +05:30
Anand Doshi
a41f9714e9 fix in appframe make_toolbar 2012-09-15 19:55:31 +05:30
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
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
Anand Doshi
f8946b1e31 fix in buttons displayed - on change of status in lead form 2012-06-18 18:04:28 +05:30
Anand Doshi
38192029e9 SetTimeout hack - in link fields if data is typed and not selected from autocomplete, run validations and triggers 2012-06-18 15:05:20 +05:30
Rushabh Mehta
96bf0b7f53 web pages don't render into Page and Page does not get written as HTML. Welcome Jinja2 Templates 2012-06-15 17:29:03 +05:30