Commit Graph

5689 Commits

Author SHA1 Message Date
Anand Doshi
f309613a7d [selling] [calculations] client side calculations, cleanup, patch fixes 2013-05-21 19:35:06 +05:30
Anand Doshi
b5aa8da0dd Merge branch 'edge' of github.com:webnotes/erpnext into webshop 2013-05-17 15:12:49 +05:30
Anand Doshi
8d04f8b045 Merge branch 'master' into edge 2013-05-17 15:11:31 +05:30
Anand Doshi
48787e944e Merge branch 'edge' of github.com:webnotes/erpnext into webshop
Conflicts:
	patches/april_2013/p05_update_file_data.py
2013-05-17 15:10:57 +05:30
Nabin Hait
d37ac68f1b [fixes] fixes in patch 2013-05-17 13:17:01 +05:30
Nabin Hait
434c1c69cc Merge branch 'master' into edge 2013-05-17 12:51:56 +05:30
Nabin Hait
8f78bec5b8 Merge branch 'master' of github.com:webnotes/erpnext 2013-05-17 12:49:36 +05:30
Nabin Hait
8a7d4f51b4 [latest updates] 2013-05-17 12:49:15 +05:30
Nabin Hait
b9669de3ff [patch] repost_stock: commit after every 50 2013-05-17 12:21:13 +05:30
Nabin Hait
f826b93a75 [patch] set conversion factor in pur invoice and repost stock_received_but_not_billed patch 2013-05-17 12:19:50 +05:30
Anand Doshi
44a01faff9 [patches] [fix] fixed an old patch 2013-05-16 16:17:15 +05:30
Anand Doshi
27ff675a07 [patches] [fix] fixed an old patch 2013-05-16 16:15:19 +05:30
Anand Doshi
9a22e3f1db [patches] [fix] fixed an old patch 2013-05-16 16:13:16 +05:30
Anand Doshi
cae99dbf71 [patches] [fix] fixed an old patch 2013-05-16 15:57:45 +05:30
Anand Doshi
6e0e1c8fcc [patches] [fix] fixed an old patch 2013-05-16 15:46:32 +05:30
Anand Doshi
101877276e [patches] [fix] fixed an old patch 2013-05-16 15:45:06 +05:30
Anand Doshi
71c265dee8 [patches] [fix] fix in old patch 2013-05-16 15:42:56 +05:30
Anand Doshi
6febab9f92 [patches] [fix] fix in an old patch 2013-05-16 15:40:07 +05:30
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