Commit Graph

605 Commits

Author SHA1 Message Date
Akhilesh Darjee
e82eee512b Enabled feature in Price List 2014-01-20 16:09:45 +05:30
Nabin Hait
f32314dd0b Do not set income/expense account automatically in company master 2014-01-17 11:53:25 +05:30
Nabin Hait
55387aa931 Fixed conflict 2014-01-10 16:31:48 +05:30
Nabin Hait
68b0d54b4b Set default accounts in company related to perpetual inventory, only it is enabled 2014-01-09 17:25:55 +05:30
Akhilesh Darjee
806017c92a Price List and Item Price : Validfor Buying and Selling as separate check box 2014-01-07 18:37:38 +05:30
Nabin Hait
2ca388b0a5 Merge pull request #1232 from nabinhait/hotfix
Hotfix
2013-12-23 23:29:00 -08:00
Nabin Hait
6a2edee914 Fixes in general ledger report 2013-12-24 11:58:05 +05:30
Pratik Vyas
a38a7b8e76 Merge pull request #1214 from anandpdoshi/hotfix-scheduler-errors
Send Email Digest, only if there is atleast one update for selected cate...
2013-12-19 01:12:17 -08:00
Anand Doshi
88eedb7397 Send Email Digest, only if there is atleast one update for selected categories 2013-12-19 14:07:39 +05:30
Nabin Hait
60ec0128a2 Merge pull request #1205 from akhileshdarjee/master
[fix] [issue] webnotes/erpnext#1191 - set expected delivery date in production order
2013-12-18 20:03:36 -08:00
Pratik Vyas
ef295d2977 Merge pull request #1203 from anandpdoshi/hotfix-scheduler-errors
[fix] scheduler error email digest
2013-12-18 01:10:12 -08:00
Akhilesh Darjee
2d0e31b479 [fix] [minor] merge conflict fixed 2013-12-18 13:32:37 +05:30
Akhilesh Darjee
2678ed181a [fix] [issue] webnotes/erpnext#1191 - set expected delivery date in production order 2013-12-18 13:28:40 +05:30
Anand Doshi
1fce0b1f79 [fix] scheduler error email digest 2013-12-18 13:22:18 +05:30
Anand Doshi
677ef0c3cf [fix] backup manager 2013-12-18 10:56:43 +05:30
Pratik Vyas
3ddd0d89df Merge pull request #1181 from anandpdoshi/hotfix-allow-roles
[minor] [fix] allow roles
2013-12-16 22:19:34 -08:00
Anand Doshi
b0636edaf7 [minor] [scheduler] send scheduler errors as email digest 2013-12-16 13:56:03 +05:30
Nabin Hait
585e936263 [fix] [minor] email digest: consider only submitted documents to get new sum of amount 2013-12-15 12:17:40 +05:30
Nabin Hait
fe5dcd49ae Merge pull request #1183 from nabinhait/hotfix
[fix] [minor] update naming series
2013-12-14 03:50:02 -08:00
Nabin Hait
70cd146bb5 [fix] [minor] update naming series 2013-12-14 17:16:21 +05:30
Anand Doshi
64c512dd61 [minor] [fix] allow roles 2013-12-13 12:34:52 +05:30
Akhilesh Darjee
d9255abd46 [fix] [minor] set send_print_in_body_and_attachment in email settings 2013-12-06 18:49:48 +05:30
Anand Doshi
979a69f32a [minor] [fix] outgoing email settings - Use TLS instead of Use SSL 2013-11-28 12:05:34 +05:30
Akhilesh Darjee
dc4821de08 [fix] [minor] backup dropbox fixed for backup and files path 2013-11-26 19:15:41 +05:30
Akhilesh Darjee
84ed127e72 [fix] [minor] setup wizard - calculate year end date on change of year start date 2013-11-26 17:29:51 +05:30
Akhilesh Darjee
b0a1b3ab47 [fix] [minor] test cases fixes 2013-11-26 14:45:27 +05:30
Akhilesh Darjee
60ae96d588 [fix] [minor] merge conflict fixed 2013-11-26 11:21:07 +05:30
Akhilesh Darjee
ec0da0b177 [fix] [setup_wizard] fiscal year fix for setup wizard 2013-11-25 19:51:18 +05:30
Nabin Hait
4ccb2edbfd Merge branch 'master' of github.com:webnotes/erpnext 2013-11-22 18:10:46 +05:30
Anand Doshi
ef114773a6 [minor] [website] brand_html 2013-11-22 13:25:58 +05:30
Rushabh Mehta
4f08235eeb [email] [minor] changed label webnotes/erpnext#1082 2013-11-22 12:30:51 +05:30
Anand Doshi
6c29492652 [minor] [fix] first web page should set brand_html 2013-11-21 18:28:03 +05:30
Anand Doshi
0c8fd3408c [minor] [website] fix in container 2013-11-21 14:58:59 +05:30
Nabin Hait
8eb0c61649 [minor] merge conflict fixed 2013-11-21 12:28:50 +05:30
Nabin Hait
ca471f41a1 [fix] Rename and merge rewrite 2013-11-20 13:14:12 +05:30
Rushabh Mehta
ad45e31356 [copyright] added Contributors 2013-11-20 13:00:28 +05:30
Anand Doshi
4b781d0117 [minor] website fixes 2013-11-19 15:54:28 +05:30
Rushabh Mehta
5d3cc45a75 [website sitemap] [setup] [minor] fixes 2013-11-19 15:12:10 +05:30
Rushabh Mehta
ebdddf3fb6 [website] [sitemap] cleanup 2013-11-19 14:20:52 +05:30
Anand Doshi
1d55be86b2 [minor] [fix] dropbox 2013-11-18 13:49:41 +05:30
Anand Doshi
0809a95a70 [minor] [fix] setup page titles translatable 2013-11-18 12:50:43 +05:30
Anand Doshi
89844f803d [minor] check permission for editable web page 2013-11-13 17:34:21 +05:30
Anand Doshi
5f73a980b5 [minor] replace 'raise e' with 'raise' for correct tracebacks 2013-11-13 17:31:00 +05:30
Rushabh Mehta
4f642e7670 [cleanup] Fixed title bars, toolbars in all pages, added default background 2013-11-13 16:58:18 +05:30
Rushabh Mehta
91db9dc4ee [cleanup] [ui] minor 2013-11-11 18:28:45 +05:30
Rushabh Mehta
a063b4d50e [cleanup] UI Fixes, minor 2013-11-06 11:29:47 +05:30
Anand Doshi
b03f870441 Merge branch '1310' of github.com:webnotes/erpnext 2013-11-04 15:22:50 +05:30
Anand Doshi
2ced381976 [minor] fixes in test cases and demo 2013-11-04 14:37:29 +05:30
Anand Doshi
daaa14c079 Merge branch '1310' of github.com:webnotes/erpnext
Conflicts:
	setup/doctype/setup_control/setup_control.py
	stock/doctype/stock_entry/stock_entry.py
	utilities/demo/demo_docs/Price_List.csv
2013-11-04 13:14:39 +05:30
Rushabh Mehta
f7b203de2d [cleanup] UI Fixes 2013-11-03 20:37:49 +05:30