Commit Graph

6341 Commits

Author SHA1 Message Date
Anand Doshi
34736c8d87 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
Conflicts:
	accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.py
2013-07-11 18:29:32 +05:30
Anand Doshi
946e0de0cf [minor] [fix] 2013-07-11 18:26:00 +05:30
Nabin Hait
cfecd2bc16 [fix] [cleanup] fixes while testing and code cleanup 2013-07-11 17:49:18 +05:30
Nabin Hait
1ac928ed5c Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-11 16:07:53 +05:30
Rushabh Mehta
e464105c8e [style] Style Fixes for Home Page 2013-07-11 15:28:05 +05:30
Rushabh Mehta
80d83f5ae3 [style] Style Fixes for Home Page 2013-07-11 15:19:13 +05:30
Rushabh Mehta
df92a553cb [style] Added Icons to Pages 2013-07-11 14:50:43 +05:30
Nabin Hait
efc998b61e Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-11 12:37:01 +05:30
Rushabh Mehta
278f961daf [minor] [fix] doctype recursive 2013-07-11 12:35:42 +05:30
Nabin Hait
d9fd9f567e Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-11 12:34:43 +05:30
Rushabh Mehta
0e31093bdc Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-11 12:17:35 +05:30
Rushabh Mehta
1bfb6db586 [minor] Bill Date not mandatory in Purchase Invoice 2013-07-11 12:16:59 +05:30
Nabin Hait
c0816d7efe Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-11 11:58:43 +05:30
Nabin Hait
789976f272 [fix] [stock] batch no query in stock entry 2013-07-11 11:58:20 +05:30
Nabin Hait
76cacdbb78 [fix] [hr] letter head in salary slip email 2013-07-11 11:11:34 +05:30
Rushabh Mehta
03be82f41a [minor] [css] #574 2013-07-11 10:22:07 +05:30
Anand Doshi
63d844b2d2 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
Conflicts:
	selling/doctype/quotation/quotation.py
	utilities/transaction_base.py
2013-07-10 20:55:15 +05:30
Anand Doshi
2ac0a83bd8 [webshop] Place Order - submits Quotation, creates Customer if required, creates and submits Sales Order 2013-07-10 20:49:44 +05:30
Rushabh Mehta
208e4f59b7 [minor] minor fix in latest_updates 2013-07-10 20:45:38 +05:30
Rushabh Mehta
e62a85afcf [patch] [minor] removed patch 2013-07-10 20:44:13 +05:30
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