Commit Graph

5950 Commits

Author SHA1 Message Date
Anand Doshi
9741bfb9f6 Merge branch 'master' into edge 2013-05-10 00:40:09 +05:30
Anand Doshi
2186e83670 [lead to customer] [fix] fix for creating customer from lead when there are restrictive permissions based on company for creating customer 2013-05-10 00:39:15 +05:30
Anand Doshi
7cf6d2ed85 Merge branch 'master' into edge 2013-05-09 20:32:00 +05:30
Anand Doshi
9e1d120186 [time log] [query] search task based on subject 2013-05-09 19:34:34 +05:30
Nabin Hait
6ac6858571 Merge branch 'master' of github.com:webnotes/erpnext 2013-05-09 16:56:59 +05:30
Nabin Hait
e1b2ae5739 [fixes] float precision for pur invoice 2013-05-09 16:56:19 +05:30
Anand Doshi
3615123af4 Merge branch 'master' into edge 2013-05-09 15:17:33 +05:30
Anand Doshi
59db6b5890 Merge branch 'master' of github.com:webnotes/erpnext 2013-05-09 15:15:17 +05:30
Anand Doshi
ef06a4b349 [autoname] [cleanup] strip blank spaces and remove autoname where naming_series: can be set in doctype 2013-05-09 15:13:47 +05:30
Nabin Hait
f377402592 Merge branch 'master' of github.com:webnotes/erpnext 2013-05-09 14:16:14 +05:30
Nabin Hait
5dc5bf9972 [stock entry] total amount field added 2013-05-09 14:15:24 +05:30
Anand Doshi
6bcacee4d4 Merge branch 'master' into edge 2013-05-09 13:22:49 +05:30
Anand Doshi
21b854b7cc [rename] [fix] merge related fixes 2013-05-09 13:21:13 +05:30
Anand Doshi
6f6a12e28d Merge branch 'master' into edge 2013-05-09 12:48:44 +05:30
Anand Doshi
bddd5d9b0c [rename] [fix] merge should be passed to on_rename method of controller for further processing 2013-05-09 12:45:18 +05:30
Rushabh Mehta
f514998011 merge 2013-05-09 11:42:35 +05:30
Anand Doshi
0e86428857 Merge branch 'edge' of github.com:webnotes/erpnext into edge 2013-05-08 17:44:42 +05:30
Anand Doshi
4f8a81ca97 [item] [usability] change image view on change of image 2013-05-08 17:40:35 +05:30
Anand Doshi
75eeb01052 [attachments] [fix] on adding and removing attachments, update the select fields with options attach_files: 2013-05-08 12:35:33 +05:30
Anand Doshi
c414175a44 Merge branch 'master' of github.com:webnotes/erpnext into edge 2013-05-08 11:45:32 +05:30
Nabin Hait
f7bdf8e05a [fixes][jv] set clearance date as null on saving document 2013-05-07 16:48:55 +05:30
Nabin Hait
04f888fa52 [fixes] item_code non-mandatory in item if naming_series 2013-05-07 16:03:10 +05:30
Rushabh Mehta
a1a20e70c6 [listviews] [style] upgraded to responsives 2013-05-07 14:08:17 +05:30
Nabin Hait
f2d4df975e [fixes] floating point issue in buying rate 2013-05-07 13:12:02 +05:30
Nabin Hait
620576080a [fixes][currency symbol] fieldtype in report 2013-05-07 12:03:33 +05:30
Nabin Hait
c1b9619321 [fixes] company for auto-material request 2013-05-07 11:16:20 +05:30
Nabin Hait
6754dda4a8 [report] employee information 2013-05-06 18:50:29 +05:30
Nabin Hait
35e7e8f58f [report] employee birthday 2013-05-06 18:37:57 +05:30
Nabin Hait
15697ed937 [fixes] hour_rate fetching in bom 2013-05-06 17:01:19 +05:30
Nabin Hait
6d309f727f [report] maintenance schedules 2013-05-06 14:34:33 +05:30
Anand Doshi
b8b1e58c4d [buying controller] [fix] use discount_rate instead of discount 2013-05-06 12:52:46 +05:30
Rushabh Mehta
08332ddacd [form] [scripting] fixes and cleanups for new triggering system 2013-05-06 12:46:13 +05:30
Nabin Hait
a55723bea2 [report] sales partners commission 2013-05-06 12:46:07 +05:30
Nabin Hait
52f7b6daf8 [report] purchase in transit in new style 2013-05-06 12:24:27 +05:30
Anand Doshi
3f9366bb6c Merge branch 'edge' of github.com:webnotes/erpnext into webshop
Conflicts:
	stock/doctype/item/item.txt
2013-05-06 12:07:30 +05:30
Anand Doshi
4cea651a36 Merge branch 'master' of github.com:webnotes/erpnext into edge 2013-05-06 11:36:51 +05:30
Nabin Hait
e23d2a35c4 [fixes] sales/purchase register 2013-05-06 11:08:21 +05:30
Nabin Hait
1ae4b51cb2 [report] issued items against production orderr 2013-05-03 18:27:23 +05:30
Nabin Hait
dc992824d0 Merge branch 'master' into edge 2013-05-03 15:42:03 +05:30
Nabin Hait
c51c0ce3e9 [fixes] salary slip 2013-05-03 15:40:26 +05:30
Nabin Hait
317f0273e7 [query report] item-wise purchase history 2013-05-03 15:08:12 +05:30
Nabin Hait
9c7eb486ed [Query Report] Item-wise Sales History 2013-05-03 14:50:12 +05:30
Anand Doshi
2a9735a2f1 [pos setting] [permission] removed system manager permission 2013-05-03 14:48:13 +05:30
Anand Doshi
cba730c7bd [sales common] [fix] minor fix in validation message 2013-05-03 14:47:59 +05:30
Anand Doshi
0f5f584651 [stock entry] [test] fixes in test cases 2013-05-03 14:34:12 +05:30
Rushabh Mehta
d2923fe2b2 [form] [controls] finished controls and script manager - 1st cut 2013-05-03 14:27:32 +05:30
Nabin Hait
fdd919a1d3 [report] sales personwise transaction summary 2013-05-03 14:24:24 +05:30
Anand Doshi
549dfdbfed Merge branch 'master' into pos_fetch 2013-05-03 13:41:26 +05:30
Anand Doshi
d2b8b83e20 [sales invoice] [fetching] fetch customer info, pos settings and item details if not fetched 2013-05-03 13:22:41 +05:30
Anand Doshi
855cf8db21 Merge branch 'pos_fetch' 2013-05-03 11:23:01 +05:30