Commit Graph

5549 Commits

Author SHA1 Message Date
Nabin Hait
acd0443778 Merge branch 'master' of github.com:webnotes/erpnext 2013-04-01 17:24:17 +05:30
Nabin Hait
2f20a7ac96 [patch][serial no] for striped serial nos 2013-04-01 17:23:43 +05:30
Anand Doshi
bdedd555ca [setup] [update manager] renamed update-this-app page to update-manager 2013-04-01 16:51:33 +05:30
Anand Doshi
72b28807d2 [setup] [feature] Update Manager for self hosted applications based on wnframework 2013-04-01 16:40:19 +05:30
Nabin Hait
f777f7ac43 Merge branch 'master' of github.com:webnotes/erpnext 2013-04-01 15:41:49 +05:30
Nabin Hait
eaeb50effa [fixes] small issue fixed in sales taxes and charges 2013-04-01 15:40:50 +05:30
Rushabh Mehta
6d61024e9e Merge branch 'master' of github.com:webnotes/erpnext 2013-04-01 15:05:13 +05:30
Nabin Hait
1013e77957 fixes in checking print_hide property in standard print format 2013-04-01 12:18:36 +05:30
Rushabh Mehta
9f43fc50ad [website] [product list] image clickable 2013-04-01 12:12:47 +05:30
Anand Doshi
e242890c98 Merge branch 'master' into edge 2013-03-30 22:10:47 +05:30
Nabin Hait
d270559fa9 minor fixes in stock entry 2013-03-30 17:48:37 +05:30
Nabin Hait
dc35137e20 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-30 17:47:56 +05:30
Rushabh Mehta
fe7a53bca3 [data-import] [fix] changed template to remove -- separators that get removed for some reason 2013-03-30 11:56:13 +05:30
Anand Doshi
e49d504995 Merge branch 'aii_release' into edge 2013-03-29 20:43:36 +05:30
Anand Doshi
19acce9fa1 [aii] [patches] minor fixes 2013-03-29 20:40:23 +05:30
Anand Doshi
96a5f1dda0 Merge branch 'aii_release' of github.com:webnotes/erpnext into aii_release 2013-03-29 19:44:52 +05:30
Nabin Hait
86f1ca2d00 aii: fixes in stock reconciliation 2013-03-29 18:20:10 +05:30
Anand Doshi
82433e81c6 Merge branch 'aii_release' of github.com:webnotes/erpnext into aii_release 2013-03-29 16:47:56 +05:30
Nabin Hait
787c02ee42 aii fixes 2013-03-29 16:42:33 +05:30
Anand Doshi
10a209d405 [gross profit] [request] added Avg. Buying Rate column 2013-03-29 12:26:47 +05:30
Nabin Hait
acecb94a0f patch: update item tax rate in json format 2013-03-29 10:48:41 +05:30
Anand Doshi
491a547708 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-28 19:08:52 +05:30
Anand Doshi
7bfa40fdd3 sales return validate before save/submit 2013-03-28 18:48:04 +05:30
Rushabh Mehta
7ab3267886 updated item group limit to 100 2013-03-28 17:09:23 +05:30
Rushabh Mehta
de492d1738 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-28 16:51:31 +05:30
Rushabh Mehta
acfab66239 [patch] [fix] substr starts with 1 2013-03-28 16:47:47 +05:30
Anand Doshi
24e0a3bb34 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-28 16:41:02 +05:30
Anand Doshi
8c45420f19 fixes in gross profit report 2013-03-28 16:40:30 +05:30
Rushabh Mehta
bab17a9a1f Merge branch 'edge' of github.com:webnotes/erpnext into edge 2013-03-28 16:27:51 +05:30
Rushabh Mehta
693c4b014d Merge branch 'master' into edge 2013-03-28 16:27:33 +05:30
Rushabh Mehta
2fe802c81e [website] [cleanup] selectable images will now be relative urls (files/..) or full urls (http:..) 2013-03-28 16:26:11 +05:30
Nabin Hait
41fe3567bb fixed conflict and aii check in global defaults 2013-03-28 15:54:11 +05:30
Rushabh Mehta
0c541a0fe2 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-28 15:36:12 +05:30
Nabin Hait
e2fe8de637 patch: update against expense_account in purchase invoice 2013-03-28 15:30:41 +05:30
Anand Doshi
9d601d593d removed in dialog from activity type 2013-03-28 11:49:00 +05:30
Rushabh Mehta
46adab70e2 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-28 10:35:25 +05:30
Rushabh Mehta
81aec56531 [form] [usability] added min width on link fields in grid 2013-03-28 10:34:46 +05:30
Anand Doshi
f2dc4222f9 Merge branch 'master' into edge 2013-03-27 17:41:34 +05:30
Anand Doshi
c1fd51b04a Merge branch 'master' of github.com:webnotes/erpnext
Conflicts:
	patches/patch_list.py
2013-03-27 17:36:43 +05:30
Anand Doshi
e35073157c set fiscal year in stock entry and stock reconciliation 2013-03-27 17:35:23 +05:30
Rushabh Mehta
114dc67571 [patch] [fix] 2013-03-26 17:20:31 +01:00
Rushabh Mehta
80fee65ed2 [patch] [fix] material rename 2013-03-26 21:34:38 +05:30
Anand Doshi
c09831f8f2 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-26 18:47:01 +05:30
Anand Doshi
96b189c118 fixes in test cases and buying amount function 2013-03-26 18:43:10 +05:30
Nabin Hait
d1d7de2b43 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-26 17:44:17 +05:30
Nabin Hait
88eb328622 fixes: show deducted tax in purchase register 2013-03-26 17:44:00 +05:30
Rushabh Mehta
bf0cd67915 Merge branch 'edge' of github.com:webnotes/erpnext into edge 2013-03-26 17:39:29 +05:30
Rushabh Mehta
f9d2ff067e Merge branch 'master' of github.com:webnotes/erpnext 2013-03-26 17:16:15 +05:30
Rushabh Mehta
e9ef6be57f [rename] [feature] added merge feature to rename_doc 2013-03-26 17:15:49 +05:30
Nabin Hait
9ea26bb826 Merge branch 'master' into edge 2013-03-26 17:08:37 +05:30