Commit Graph

6579 Commits

Author SHA1 Message Date
Rushabh Mehta
7571ff36b4 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-10 20:43:15 +05:30
Rushabh Mehta
e41bceb3df [feature] [website] Create Default Home Page 2013-07-10 20:42:44 +05:30
Nabin Hait
d96bfaf6af [fix] get_query where options not mentioned 2013-07-10 20:30:00 +05:30
Nabin Hait
eddd4a1674 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-10 19:12:14 +05:30
Nabin Hait
a4f0240bfc [conflict] merged for get_query 2013-07-10 19:05:57 +05:30
Rushabh Mehta
994c319c31 [minor] 2013-07-10 19:03:09 +05:30
Rushabh Mehta
8f61991235 [minor] 2013-07-10 19:02:07 +05:30
Rushabh Mehta
69c1858c24 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-10 19:00:30 +05:30
Rushabh Mehta
ad71473f35 [cleanup] Default Warehouses created on Company creation. Warehouse names have Company abbreviation as suffix 2013-07-10 18:59:55 +05:30
Rushabh Mehta
982ad35fd2 [cleanup] Removed Warehouse Type 2013-07-10 18:39:06 +05:30
Nabin Hait
c0ebaae15a [fix][hr] fetch emp name in attendance and default value 2013-07-10 17:42:01 +05:30
Saurabh
ee85cfd476 get_query to server side 2013-07-10 17:35:14 +05:30
Nabin Hait
10b112807c [fix] related to mapping 2013-07-10 16:48:29 +05:30
Saurabh
a29b69245e get_query to servet side 2013-07-10 16:06:31 +05:30
Nabin Hait
3093e6fd39 Merge pull request #568 from akhileshdarjee/responsive
[Fix][Purchase Order]Warehouse in Item grid to call get_projected_qty
2013-07-10 03:05:42 -07:00
Nabin Hait
6e68e0e5d8 [fix] validate with prev doc 2013-07-10 15:33:29 +05:30
Nabin Hait
cb04d0cd14 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-10 15:16:30 +05:30
Rushabh Mehta
3429b609a7 [feature] [grid] Allow Grid viewable columns to be selected via 'In List View' 2013-07-10 15:03:37 +05:30
Saurabh
2deca5f3f6 queries to server side 2013-07-10 14:31:29 +05:30
Nabin Hait
a0af48f101 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-10 14:17:19 +05:30
Nabin Hait
749b37f4f5 [fix][hr] pull salary structure in salary slip 2013-07-10 14:16:59 +05:30
Saurabh
86408c3d44 queries to server side 2013-07-10 14:00:37 +05:30
Rushabh Mehta
790a91271e [fix] Customer Issue no longer submittable, does not make sense 2013-07-10 13:18:02 +05:30
Nabin Hait
96b8acb9da Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-10 13:16:17 +05:30
Saurabh
d8a9033c9b Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive 2013-07-10 13:09:11 +05:30
Saurabh
f52dc07a58 queries to server side 2013-07-10 13:07:49 +05:30
Rushabh Mehta
852a602624 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-10 13:06:45 +05:30
Rushabh Mehta
919b9fcccf [cleanup] Maintenance Schedule, Maintenance Visit 2013-07-10 13:06:14 +05:30
Akhilesh Darjee
0c9a7a0a13 [Fix]Warehouse in Item grid of Purchase Order to call get_projected_qty 2013-07-10 12:54:32 +05:30
Nabin Hait
b7770cf510 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-10 12:31:42 +05:30
Nabin Hait
6c17f012ba [minor][hr] validation added: salary slip can not be made if employee left before this month 2013-07-10 12:28:56 +05:30
Rushabh Mehta
f9404ba89f [feature] Added Section Breaks to Grids for better visual hierarchy 2013-07-10 12:07:45 +05:30
Anand Doshi
afad0efca3 [minor] [fix] trigger startup after page route in app.js so that dialogs created in startup do not auto-close 2013-07-10 12:00:26 +05:30
Saurabh
2e3c06e66d [get_query]to server side 2013-07-09 18:20:49 +05:30
Anand Doshi
0cc2830392 [minor] [fix] use --no-color in latest updates build 2013-07-09 16:42:36 +05:30
Saurabh
38683718e1 [get_query] to server side 2013-07-09 16:34:50 +05:30
Saurabh
ab462d2000 [get_query]to server side 2013-07-09 16:18:52 +05:30
Anand Doshi
d33244ce27 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-09 15:45:54 +05:30
Anand Doshi
1357c0b2df [cleanup] #402 changed fieldname company_name to company in Cost Center 2013-07-09 15:45:38 +05:30
Nabin Hait
c81236770f Merge branch 'master' of github.com:webnotes/erpnext 2013-07-09 15:39:21 +05:30
Nabin Hait
5c33e59e7a [fix][report] sales/purchase register, same accounts as income and tax account 2013-07-09 15:38:40 +05:30
Rushabh Mehta
30d3dcb258 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-09 14:37:28 +05:30
Rushabh Mehta
3ed351df8e [feature] generate latest updates page from git commit log 2013-07-09 14:36:41 +05:30
Anand Doshi
c120776931 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
Conflicts:
	buying/doctype/purchase_order_item/purchase_order_item.txt
2013-07-09 13:10:15 +05:30
Anand Doshi
bdee6e074a [cleanup] moved company to top section, hide company if only one exists, changed field labels 2013-07-09 13:03:39 +05:30
Nabin Hait
0f3d2df8e8 Merge branch 'master' of github.com:webnotes/erpnext into responsive 2013-07-09 12:44:17 +05:30
Nabin Hait
d49aae27df Merge pull request #564 from akhileshdarjee/master
[Cleanup][Report]Removed Filters from Warehouse-Wise Stock Balance & Batch-Wise Balance History, added company in Warehouse-Wise Stock Balance
2013-07-09 00:06:47 -07:00
Nabin Hait
3b999225ba [validation] over billing against DN/PR 2013-07-09 12:35:52 +05:30
Nabin Hait
170f3fa575 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-09 12:08:19 +05:30
Rushabh Mehta
5758f7e3b7 [stock-entry] show gl if auto inventory accounting #561 2013-07-09 12:05:33 +05:30