Commit Graph

5923 Commits

Author SHA1 Message Date
Anand Doshi
fd086d7381 Merge branch 'master' into edge 2013-05-14 15:38:25 +05:30
Anand Doshi
220ff30878 [website] [product] show currency symbol and show specifications below the image 2013-05-14 15:33:34 +05:30
Anand Doshi
c99853c8d4 [buying] [calculation] fix in calculate outstanding amount 2013-05-14 13:35:09 +05:30
Anand Doshi
1d0a4ad6a7 Merge branch 'master' into edge 2013-05-14 12:16:46 +05:30
Nabin Hait
ece3298159 [report] requested qty to be transferred 2013-05-13 16:29:50 +05:30
Nabin Hait
da369d8eee [report] requested qty to be ordered 2013-05-13 16:29:28 +05:30
Nabin Hait
c518e8be12 [report] monthly attendance sheet 2013-05-13 15:59:50 +05:30
Anand Doshi
d246790b0e Merge branch 'master' into edge 2013-05-13 15:16:14 +05:30
Anand Doshi
0d504491dd [task] [query] added match conditions to task query 2013-05-13 15:15:20 +05:30
Nabin Hait
ebf3199dbe [fixes] Write off cost center linked to cost center in pur invoice 2013-05-13 11:15:53 +05:30
Anand Doshi
39384d36ea [precision] server side cleanup and client side precision method 2013-05-11 19:39:53 +05:30
Anand Doshi
5af812a832 [precision] [fixes] 2013-05-10 19:23:02 +05:30
Nabin Hait
58939e3d0c Merge branch 'master' into edge 2013-05-10 18:44:50 +05:30
Nabin Hait
765383b3cf [report] monthly salary register 2013-05-10 18:41:58 +05:30
Anand Doshi
aab81626ce Merge branch 'edge' of github.com:webnotes/erpnext into webshop
Conflicts:
	stock/doctype/item/item.txt
2013-05-10 18:12:24 +05:30
Anand Doshi
21f4ea36b2 [selling] [calculations] server side calculations, test cases and rounding based on currency number format 2013-05-10 18:08:32 +05:30
Nabin Hait
a20e6c79b9 Merge branch 'master' of github.com:webnotes/erpnext 2013-05-10 15:17:48 +05:30
Nabin Hait
4e1dcfc561 [patch] repost stock for no posting date 2013-05-10 15:17:20 +05:30
Anand Doshi
79b2375de0 Merge branch 'master' into edge 2013-05-10 13:39:17 +05:30
Anand Doshi
ce85145779 Merge branch 'master' of github.com:webnotes/erpnext 2013-05-10 13:38:42 +05:30
Anand Doshi
1252729e1c [sales invoice] [fix] bug fix in setting pos values on save 2013-05-10 13:38:23 +05:30
Nabin Hait
e762b264b1 [fixes] bom autoname 2013-05-10 11:11:46 +05:30
Nabin Hait
0f5872b342 Merge branch 'master' of github.com:webnotes/erpnext 2013-05-10 10:48:56 +05:30
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