Commit Graph

5412 Commits

Author SHA1 Message Date
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
Nabin Hait
808b085057 fixes: make payment entry from purchase invoice 2013-03-26 17:07:11 +05:30
Rushabh Mehta
426e9c732e Merge branch 'master' of github.com:webnotes/erpnext 2013-03-26 15:57:44 +05:30
Rushabh Mehta
c75eaa2e3c [print] [fix] added utf-8 metatag 2013-03-26 15:56:47 +05:30
Nabin Hait
511902fc97 Merge branch 'master' into edge 2013-03-26 15:48:45 +05:30
Nabin Hait
19da7b8bdf fixes: fetching from pos setting 2013-03-26 15:47:46 +05:30
Nabin Hait
8e64160121 Merge branch 'master' into edge 2013-03-26 15:44:41 +05:30
Nabin Hait
7483485ac0 fixes: fetching from pos setting 2013-03-26 15:43:18 +05:30
Nabin Hait
495db08104 copy expense account to all row if entered in one 2013-03-26 15:24:56 +05:30
Nabin Hait
e28efd8dc8 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-26 15:03:49 +05:30
Nabin Hait
b3b335c89e fixes: make payment entry from sales invoice 2013-03-26 15:03:13 +05:30
Anand Doshi
ea4b05bb2c Merge branch 'master' of github.com:webnotes/erpnext 2013-03-26 14:49:48 +05:30
Anand Doshi
40dc9e83a5 fixes in test cases and added fiscal year field to stock reco 2013-03-26 14:49:25 +05:30
Rushabh Mehta
08c33bd6bc [accounts] [fix] aganist_jv query error 2013-03-26 14:43:41 +05:30
Rushabh Mehta
2c3f35f557 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-26 14:42:02 +05:30
Rushabh Mehta
f5784e785a [accounts] [fix] aganist_jv query error 2013-03-26 14:41:09 +05:30
Nabin Hait
6c49b57602 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-26 14:28:11 +05:30
Nabin Hait
86f5e2e564 aii: gl entries for serial no 2013-03-26 14:27:20 +05:30
Rushabh Mehta
265c1947e3 [form] [usability] change z-index only if in form 2013-03-26 14:16:20 +05:30
Rushabh Mehta
988bca04f2 [selling] [usability] rearranged lead 2013-03-26 13:07:49 +05:30
Rushabh Mehta
a5094edbd9 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-26 13:02:44 +05:30
Rushabh Mehta
b6c117957f [fields, project] [fix] NaN bug, project gantt refresh bug 2013-03-26 13:02:22 +05:30
Nabin Hait
e1c76a1a8e Merge branch 'master' of github.com:webnotes/erpnext 2013-03-26 13:01:28 +05:30
Nabin Hait
4a4ae0840a expense account optional mandatory in pos setting 2013-03-26 13:00:53 +05:30
Nabin Hait
fd606afcb9 expense account optional mandatory in pos sett 2013-03-26 12:50:03 +05:30
Rushabh Mehta
06e3ef055b Merge branch 'master' of github.com:webnotes/erpnext 2013-03-26 12:47:51 +05:30
Rushabh Mehta
4731fb999c [feature] [fix] utilities/rename tool upgraded to upload multiple items 2013-03-26 12:47:19 +05:30
Anand Doshi
acec0227c5 fixes in stock entry 2013-03-26 12:33:43 +05:30
Anand Doshi
9f91053201 patch to set user type as System User if user has a role and if previous user type is Partner 2013-03-26 12:25:11 +05:30
Anand Doshi
fc33ef6bfb fixes in purchase invoice 2013-03-26 12:13:14 +05:30
Nabin Hait
72d9c5b724 fixed floating point issue in jv 2013-03-26 11:54:40 +05:30
Nabin Hait
d216390bcb Merge branch 'master' into edge 2013-03-26 11:01:45 +05:30
Nabin Hait
6dcee5a1f8 fixes in website utils 2013-03-26 10:45:29 +05:30
Nabin Hait
82be7dc301 fixed conflict 2013-03-25 18:30:15 +05:30
Nabin Hait
557d858d89 aii: patches and default values fetching 2013-03-25 18:28:16 +05:30
Rushabh Mehta
74506e96d3 [profile/email] [feature] added option not to send print as email body. fix in profile delete 2013-03-25 17:52:14 +05:30
Rushabh Mehta
06d186ba98 [stock] [feature] added project to stock ledger entry and updated stock balance report 2013-03-25 17:03:52 +05:30
Rushabh Mehta
e97ce3475d [accounts] [feature] added default_cash_account in company and gets set in Journal Voucher 2013-03-25 15:55:24 +05:30