Commit Graph

5589 Commits

Author SHA1 Message Date
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
Rushabh Mehta
2f8ad5e5c1 [accounts] [feature] added default_cash_account in company and gets set in Journal Voucher 2013-03-25 15:48:57 +05:30
Rushabh Mehta
df8b652402 [accounts] [feature] added default_cash_account in company and gets set in Journal Voucher 2013-03-25 15:44:36 +05:30
Nabin Hait
57916252d9 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-25 15:35:03 +05:30
Rushabh Mehta
c5570c6341 added warehouse company validation, if warehouse is added to company 2013-03-25 15:21:24 +05:30
Anand Doshi
6e38564357 Merge branch 'master' into edge 2013-03-25 13:40:49 +05:30
Anand Doshi
256f29a580 Merge pull request #319 from akhileshdarjee/master
Barcode problems fixed in Invoices
2013-03-25 01:07:13 -07:00
Akhilesh Darjee
498bed7b66 Merge branch 'master' of https://github.com/webnotes/erpnext 2013-03-25 12:52:54 +05:30
Akhilesh Darjee
7e062b3352 barcode error in sales_invoice fixed. 2013-03-25 12:28:39 +05:30
Anand Doshi
73ea15d2d3 for checking timelog conflicts, also check if tasks are the same 2013-03-25 12:09:24 +05:30
Nabin Hait
0931642c3a fixes in backup_dropbox 2013-03-25 11:54:42 +05:30
Nabin Hait
690fefe9c1 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-25 11:07:38 +05:30
Nabin Hait
456465770b aii: patch: update valuation rate in purchase invoice item 2013-03-25 11:07:12 +05:30
Nabin Hait
0fc2454384 aii: patches and fine tuning 2013-03-25 11:06:00 +05:30
Anand Doshi
44e35ab231 removed unnecessary imports from backup manager files 2013-03-22 18:47:52 +05:30
Anand Doshi
aeed499d12 Merge branch 'master' into edge
Conflicts:
	setup/doctype/backup_manager/backup_dropbox.py
2013-03-22 18:43:47 +05:30
Anand Doshi
b632ba5f51 changed fieldtype of repeat_on_day_of_month to Int 2013-03-22 18:38:33 +05:30
Anand Doshi
b70b93260c Merge pull request #318 from akhileshdarjee/master
Permissions in Invoices fixed.
2013-03-22 06:06:56 -07:00
Akhilesh Darjee
2f2ac966ad Merge branch 'master' of https://github.com/webnotes/erpnext 2013-03-22 18:28:51 +05:30
Akhilesh Darjee
ac61ec3a5b Permissions problem in invoice fixed. 2013-03-22 18:20:11 +05:30
Anand Doshi
a1e44e4202 Merge pull request #315 from mayur-patel/master
Added default for Employee doctype with help of Anand Doshi
2013-03-22 05:49:25 -07:00
Akhilesh Darjee
c3fde66f2c contact us page problem fixed. 2013-03-22 18:05:22 +05:30
Anand Doshi
c8e64f5d42 shifted field category of Purchase Taxes and Charges to the left 2013-03-22 16:49:16 +05:30
Rushabh Mehta
3f725308e1 [website] [number_format] [fix] moved js function & added amount to order list 2013-03-22 14:56:31 +05:30