Commit Graph

151 Commits

Author SHA1 Message Date
Anand Doshi
92af795f12 Fixed note permission query 2015-03-31 14:42:22 +05:30
Rushabh Mehta
14ae4c3603 [email] many fixes, newsletter, unsubscribe 2015-03-19 17:16:03 +05:30
Anand Doshi
885e074697 Changed company name from Web Notes to Frappe Technologies 2015-03-03 14:56:43 +05:30
Rushabh Mehta
00e3b26597 [fix] rename tool #2861 2015-03-02 15:05:36 +05:30
Anand Doshi
d35354cc06 Merge remote-tracking branch 'frappe/develop' into v5.0
Conflicts:
	erpnext/__version__.py
	erpnext/accounts/doctype/budget_distribution/test_budget_distribution.py
	erpnext/accounts/doctype/chart_of_accounts/charts/account_properties.py
	erpnext/hooks.py
	erpnext/patches.txt
	erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
	erpnext/stock/get_item_details.py
	erpnext/translations/ar.csv
	erpnext/translations/bs.csv
	erpnext/translations/ca.csv
	erpnext/translations/el.csv
	erpnext/translations/es.csv
	erpnext/translations/fr.csv
	erpnext/translations/hr.csv
	erpnext/translations/id.csv
	erpnext/translations/is.csv
	erpnext/translations/ja.csv
	erpnext/translations/nl.csv
	erpnext/translations/pl.csv
	erpnext/translations/pt-BR.csv
	erpnext/translations/ru.csv
	erpnext/translations/tr.csv
	erpnext/translations/zh-cn.csv
	erpnext/translations/zh-tw.csv
	setup.py
2015-02-24 18:12:17 +05:30
Anand Doshi
d57e793bf3 [fix] Added unicode_literals if missing in py files 2015-02-24 12:24:53 +05:30
Rushabh Mehta
813f0eda05 [form] section labels 2015-02-20 16:02:48 +05:30
Nabin Hait
15cd12214e Fixed conflict while merging v4 into v5 2015-02-10 16:37:18 +05:30
Rushabh Mehta
a232c80d77 [share] add share permission 2015-02-05 15:52:58 +05:30
Rushabh Mehta
0e13221338 [print] item tables - override description and uom 2015-02-04 17:02:24 +05:30
Nabin Hait
aabeb38c15 minor fix 2015-01-19 11:07:32 +05:30
Nabin Hait
fe93ea56b6 Minor fixes: escaped characters 2015-01-19 11:07:32 +05:30
Rushabh Mehta
0335005eea [minor] added allow rename 2015-01-15 15:29:22 +05:30
Rushabh Mehta
e1cb0ae738 [design] list views 2015-01-05 17:39:05 +05:30
Rushabh Mehta
a5b149c061 [design] module pages, messages, timelines 2014-12-26 12:53:02 +05:30
Rushabh Mehta
9f32a50379 [merge] fix 2014-12-03 12:35:19 +05:30
Rushabh Mehta
6d950d23a8 [merge] 2014-11-28 12:08:51 +05:30
Rushabh Mehta
bd9b62ff28 [rename] Support Ticket -> Issue 2014-11-28 11:46:10 +05:30
Rushabh Mehta
2f4567fa3c [minor] [ux] address refresh for lead 2014-11-24 15:18:40 +05:30
Rushabh Mehta
7d36875d6f [refactor] address and contact list in customer, supplier, lead, sales person 2014-11-24 14:16:47 +05:30
Nabin Hait
ae1dcabcb5 Fixed merge conflict 2014-11-05 12:41:02 +05:30
Nabin Hait
10b155a486 cost center based on project 2014-10-23 13:18:59 +05:30
Nabin Hait
c68646c694 [merge] 4.x to 5.0 2014-10-06 12:57:48 +05:30
Rushabh Mehta
e10cf021d9 [email] remove communicationlist #561 2014-09-16 15:12:18 +05:30
Rushabh Mehta
ce00772ac0 [cleanup] removed communication js, fields 2014-09-16 15:11:42 +05:30
Rushabh Mehta
c0bb453b88 [refactor] [frappe 5.0] 2014-09-16 15:10:54 +05:30
Anand Doshi
30c5b41398 [minor] removed Suggest 2014-09-15 16:43:34 +05:30
Nabin Hait
65bef02607 Fixes in address template 2014-09-15 12:18:28 +05:30
Rushabh Mehta
7a6ab91080 remove set_title_left 2014-08-25 13:04:22 +05:30
Rushabh Mehta
e8dd4160d4 [cleanup] remove allow_attach 2014-08-25 13:04:21 +05:30
Anand Doshi
62aa8fa4e7 [minor] Removed 'PIN: ' from default Address Template 2014-08-18 12:53:37 +05:30
nabinhait
f807cda375 PR and PI gl entries fixes for landed cost 2014-08-11 16:12:31 +05:30
Rushabh Mehta
139ec2a64f Update note_list.html 2014-08-08 15:47:56 +05:30
Anand Doshi
4cc94df752 [tests] Fixed Test Records 2014-08-08 11:56:32 +05:30
Rushabh Mehta
7a4e739d6c templating for hr 2014-08-08 11:56:32 +05:30
Rushabh Mehta
8544447b19 added more listview templates 2014-08-08 11:56:32 +05:30
Rushabh Mehta
18eb4f5015 added listviews for sales, purchase 2014-08-08 11:56:31 +05:30
Anand Doshi
62b1cbf003 [impact] Limit available functions in jinja environment 2014-07-25 13:02:29 +05:30
Rushabh Mehta
f84c240d1c cleanup for print format 2014-07-25 13:01:52 +05:30
nabinhait
7e848b1924 Title mandatory in Note. Fixes #1913 2014-07-09 12:54:56 +05:30
Anand Doshi
cd0aed993a Fixed Address Template Patch 2014-06-06 17:37:31 +05:30
Anand Doshi
fc601659f5 Fixed Address Template 2014-06-06 17:07:50 +05:30
Anand Doshi
2ec93590e4 Minor fix in address template 2014-06-06 11:45:30 +05:30
Rushabh Mehta
ba83e9cfbe removed sms control and related cleanup, fixes frappe/erpnext#462 2014-06-05 17:56:42 +05:30
Rushabh Mehta
5036706f81 removed address_title from address and removed test 2014-06-05 16:16:13 +05:30
Rushabh Mehta
c02fbd22fa removed address_title from address and removed test 2014-06-05 16:16:13 +05:30
Rushabh Mehta
33020a63b8 patch for address template fixes #1749 2014-06-05 16:16:13 +05:30
Rushabh Mehta
eaa2e55d20 patch for address template fixes #1749 2014-06-05 16:16:13 +05:30
Rushabh Mehta
c22e11d483 added address template: 2014-06-05 16:01:55 +05:30
Anand Doshi
85479bcbc0 Fixes for apply user permissions and momentjs 2014-06-04 18:15:43 +05:30