Commit Graph

5839 Commits

Author SHA1 Message Date
Anand Doshi
c852596f15 [patches] [fix] removed purchase request reload 2013-05-16 15:37:36 +05:30
Anand Doshi
1d4b5b4ca6 [patches] [fix] removed blog reload 2013-05-16 15:35:08 +05:30
Anand Doshi
45736cf2a9 Merge branch 'master' of github.com:webnotes/erpnext 2013-05-16 15:28:34 +05:30
Anand Doshi
4221814131 [patches] [fix] replace sync with reload_doc in old patches 2013-05-16 15:28:19 +05:30
Nabin Hait
b4cb103e65 Merge branch 'master' into edge 2013-05-16 11:03:47 +05:30
Nabin Hait
1fd546f424 [fixes] prosting date for gl entry 2013-05-16 11:02:07 +05:30
Anand Doshi
0eef6e9e42 Merge branch 'edge' of github.com:webnotes/erpnext into webshop
Conflicts:
	patches/patch_list.py
2013-05-15 21:18:27 +05:30
Anand Doshi
1dde46aff0 [buying, selling] [refactor] get item details 2013-05-15 21:15:57 +05:30
Anand Doshi
bad148a431 Merge branch 'master' into edge 2013-05-15 12:39:08 +05:30
Anand Doshi
bfc18ea6c4 [setup home] combined Update Application, Backup Manager and Scheduler Error Log under Setup > Administration 2013-05-15 12:24:50 +05:30
Anand Doshi
fdec02385d Merge branch 'master' into edge 2013-05-15 11:42:50 +05:30
Anand Doshi
2e311acaa5 [website] [fix] fixes in support ticket and profile pages, when using guest user login 2013-05-15 11:42:09 +05:30
Anand Doshi
4f4873695b Merge branch 'master' into edge 2013-05-14 19:26:23 +05:30
Anand Doshi
4430c0d718 [upload attendance] [fix] fixed import issue for role restricted whitelist methods 2013-05-14 19:23:37 +05:30
Anand Doshi
7901f936e4 Merge branch 'master' into edge 2013-05-14 17:11:56 +05:30
Anand Doshi
6e3706d733 [employee] [fix] on user id, set Employee role to profile 2013-05-14 17:11:27 +05:30
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