Commit Graph

3169 Commits

Author SHA1 Message Date
Rushabh Mehta
a9302b01d1 added dropdowns to website toolbar 2012-09-05 12:32:19 +05:30
Anand Doshi
e642805882 changed date displayed in transaction listing from modified date to transaction/posting date 2012-09-03 13:32:25 +05:30
Anand Doshi
eb3089e6e3 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-31 16:57:04 +05:30
Anand Doshi
b4ea4adeec Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
	erpnext/setup/doctype/price_list/price_list.py
2012-08-31 16:56:44 +05:30
Anand Doshi
c53a0ffe34 by default, communication content is of type 'Text' instead of 'Text Editor' 2012-08-31 16:54:59 +05:30
Anand Doshi
41cd5a68f4 autocommit for price list update 2012-08-31 13:57:22 +05:30
Anand Doshi
b211a41547 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-31 13:39:58 +05:30
Anand Doshi
29abc389eb run communication list if a new communication is added 2012-08-31 13:39:18 +05:30
Anand Doshi
00d3c7c67d open communication in dialog 2012-08-31 13:25:03 +05:30
Anand Doshi
fa97e8c783 Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
	erpnext/accounts/search_criteria/cash_flow_statement/__init__.py
	erpnext/accounts/search_criteria/cash_flow_statement/cash_flow_statement.py
	public/js/all-app.js
2012-08-31 12:09:02 +05:30
Anand Doshi
687a655b36 Merge branch 'master' of github.com:webnotes/erpnext 2012-08-31 12:04:16 +05:30
Anand Doshi
8981b586a1 fixed form header label issue: on change of field, label should change to Not Saved 2012-08-31 12:03:46 +05:30
Nabin Hait
245f920772 removed cash flow statement 2012-08-31 11:01:21 +05:30
Anand Doshi
62a3881837 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-30 18:17:20 +05:30
Nabin Hait
26da576f1e patch list updated 2012-08-29 12:09:35 +05:30
Nabin Hait
fff16c337d fixes in over billing validation 2012-08-29 12:07:32 +05:30
Nabin Hait
9c043b2f51 Billed amount in SO and DN based on export amount and patch for it 2012-08-29 11:46:12 +05:30
Nabin Hait
12e1a5f983 Merge branch 'master' of github.com:webnotes/erpnext 2012-08-28 10:50:45 +05:30
Nabin Hait
f826eecfc7 fixes in bom: updating cost 2012-08-28 10:50:18 +05:30
Anand Doshi
ebcb8b3fac fix in change password of profile settings page 2012-08-27 15:49:27 +05:30
Anand Doshi
9ee4adb27a send newsletter as owner 2012-08-24 15:18:48 +05:30
Anand Doshi
ad86d0f474 show message after sending test email 2012-08-24 14:47:30 +05:30
Anand Doshi
c6800106fb added newsletter listing 2012-08-24 14:47:10 +05:30
Anand Doshi
3f8277b6bb added newsletter link in support home page. also hide naming series after save 2012-08-24 14:23:27 +05:30
Anand Doshi
9fdc4abced added newsletter feature 2012-08-24 14:13:42 +05:30
Anand Doshi
998d39f71b Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-24 12:17:33 +05:30
Anand Doshi
ba278000d7 edit / add nodes allowed in sales browser, only if user has valid permissions 2012-08-24 12:15:44 +05:30
Anand Doshi
d0fcdf6ec1 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-23 18:34:46 +05:30
Anand Doshi
763e4c93bc added permission checking to show add child, edit and view ledger links
in chart of accounts
2012-08-23 18:34:04 +05:30
Anand Doshi
5513775326 fix in number of comments 2012-08-23 17:17:46 +05:30
Anand Doshi
005ab30644 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-23 17:17:24 +05:30
Anand Doshi
7e657d79fd global date format for blog comments 2012-08-23 17:15:13 +05:30
Anand Doshi
d297b88f60 Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
	erpnext/patches/patch_list.py
2012-08-23 15:26:38 +05:30
Anand Doshi
6db2ac51e6 changed blog comments date format to global date format i.e. 1 January 2012 2012-08-23 15:24:21 +05:30
Anand Doshi
297f37da03 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-22 14:59:14 +05:30
Anand Doshi
688b712bda Merge branch 'master' of github.com:webnotes/erpnext 2012-08-22 14:58:03 +05:30
Anand Doshi
73c6542e6c minor fix in communication.js 2012-08-22 14:57:35 +05:30
Nabin Hait
fd3f24f4be customer name should come in recurring invoice print format instead of customer id 2012-08-20 11:43:55 +05:30
Anand Doshi
25dd92dbdb coerce markdown2.UnicodeWithAttrs to unicode in blog comments 2012-08-17 23:36:11 +05:30
Anand Doshi
5fc48f566f Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
	erpnext/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.txt
2012-08-17 11:48:34 +05:30
Nabin Hait
daba7c40a6 Merge branch 'master' of github.com:webnotes/erpnext 2012-08-17 11:00:42 +05:30
Nabin Hait
0170b2b4bc default purchase taxes and charges master will be automatically fetched in pur transactions 2012-08-17 11:00:15 +05:30
Anand Doshi
7b20428976 merged master 2012-08-16 17:10:39 +05:30
Anand Doshi
1467a059ed Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-16 17:09:37 +05:30
Anand Doshi
37b1b88710 fix in email settings: json.loads defaults to unicode string, hence encode string for smtp login 2012-08-16 17:09:13 +05:30
Anand Doshi
8a72ec5e39 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-16 16:06:12 +05:30
Anand Doshi
126658a77d fixes due to changes in filter logic 2012-08-16 16:05:53 +05:30
Anand Doshi
f19f13314a Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
	public/js/all-app.js
2012-08-16 15:48:16 +05:30
Anand Doshi
a6de55e2e6 fixed selection of field names in filters, such that if two tables have the same fieldnames, it doesn't cause conflict 2012-08-16 15:45:28 +05:30
Nabin Hait
7e555e9f78 Update erpnext/accounts/doctype/cost_center/cost_center.py 2012-08-14 16:42:30 +05:30