Commit Graph

315 Commits

Author SHA1 Message Date
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