Anand Doshi
|
080b64a98f
|
Fixes in Sales Partner and Support Mails
|
2014-02-07 19:14:21 +05:30 |
|
Akhilesh Darjee
|
f1c3537924
|
webnotes/erpnext#869 newsletter to send to employees
|
2014-02-03 19:28:36 +05:30 |
|
Akhilesh Darjee
|
abb3af7b30
|
Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0-hotfix
|
2014-02-03 16:44:14 +05:30 |
|
Rushabh Mehta
|
347889b233
|
merge
|
2014-02-03 14:49:53 +05:30 |
|
Akhilesh Darjee
|
53593c9c47
|
Newsletter allow delete
|
2014-02-03 13:40:27 +05:30 |
|
Akhilesh Darjee
|
d6d2193f91
|
newsletter reload
|
2014-01-31 19:59:25 +05:30 |
|
Nabin Hait
|
bec11fa86e
|
Newsletter permissions
|
2014-01-31 17:33:23 +05:30 |
|
Rushabh Mehta
|
49dd7bee87
|
added get_supplier_details and commonified invoice functions
|
2014-01-28 17:43:10 +05:30 |
|
Nabin Hait
|
21d324c597
|
Merged with 4.0-wip
|
2014-01-28 15:52:25 +05:30 |
|
Akhilesh Darjee
|
86894f3bbf
|
merge conflict fixed
|
2014-01-27 15:42:02 +05:30 |
|
Rushabh Mehta
|
e288e5238a
|
added title_fields for Task, Newsletter
|
2014-01-24 15:33:42 +05:30 |
|
Rushabh Mehta
|
f96bcf943b
|
added explicit delete perimssions
|
2014-01-20 17:52:13 +05:30 |
|
Nabin Hait
|
dc15b4fa8a
|
Fixed conflict while merging with develop brnach
|
2014-01-20 16:48:49 +05:30 |
|
Akhilesh Darjee
|
2a79b00700
|
minor fix
|
2014-01-15 11:54:05 +05:30 |
|
Akhilesh Darjee
|
6a749e3a8e
|
removed while loop
|
2014-01-15 11:43:47 +05:30 |
|
Akhilesh Darjee
|
5dd92fd5d6
|
reload doc in maintenance schedule
|
2014-01-03 19:14:01 +05:30 |
|
Akhilesh Darjee
|
5c96b75a68
|
fixed maintenance schedule
|
2014-01-02 17:54:12 +05:30 |
|
Akhilesh Darjee
|
064d2ba16a
|
fixed sr no in maintenance schedule
|
2014-01-02 17:47:32 +05:30 |
|
Rushabh Mehta
|
b09d9dabc5
|
started cleanup of address / contact calls - partly fixed for customer, to fix shipping_address, get_pos_values, for all supplier transactions
|
2014-01-02 11:47:23 +05:30 |
|
Anand Doshi
|
8e332ffd16
|
Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions
Conflicts:
erpnext/accounts/page/accounts_browser/accounts_browser.css
erpnext/controllers/buying_controller.py
erpnext/manufacturing/doctype/production_order/production_order.py
erpnext/patches/patch_list.py
erpnext/selling/doctype/customer/customer.txt
erpnext/selling/doctype/sales_order/sales_order.py
erpnext/selling/doctype/sales_order/test_sales_order.py
erpnext/setup/doctype/features_setup/features_setup.txt
erpnext/stock/doctype/stock_entry/test_stock_entry.py
erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
startup/query_handlers.py
|
2013-12-26 19:12:51 +05:30 |
|
Rushabh Mehta
|
54047780fc
|
Merge with 3.3.8
|
2013-12-26 11:07:46 +05:30 |
|
Rushabh Mehta
|
df200f305b
|
Redesigned templates. Now all templates must be inside templates/pages templates/generators
|
2013-12-25 15:19:22 +05:30 |
|
Rushabh Mehta
|
6de403f2be
|
added manifest, hooks and fixed requires webnotes/wnframework#351
|
2013-12-13 14:10:14 +05:30 |
|
Rushabh Mehta
|
1f84799f2d
|
install, web serving, session booting webnotes/wnframework#351
|
2013-12-12 19:12:19 +05:30 |
|
Rushabh Mehta
|
d2dd83c3a3
|
fixed template loader webnotes/wnframework#351
|
2013-12-12 13:57:58 +05:30 |
|
Rushabh Mehta
|
39bb8e2ed4
|
step 0: install
|
2013-12-11 15:32:14 +05:30 |
|
Rushabh Mehta
|
afea58b7a1
|
moved modules inside erpnext folder
|
2013-12-11 10:43:52 +05:30 |
|
Rushabh Mehta
|
2fa2f7178d
|
moved directory structure
|
2012-09-24 19:13:42 +05:30 |
|
Rushabh Mehta
|
feaea28fdf
|
bulk email: parse html2text only once and autocommit on many writes
|
2012-09-24 13:09:05 +05:30 |
|
Anand Doshi
|
70f76117ac
|
Show Create Button for link fields which are allowed for submit
|
2012-09-19 13:06:58 +05:30 |
|
Rushabh Mehta
|
93af75a160
|
added unicode literals in patch
|
2012-09-07 10:57:14 +02:00 |
|
Anand Doshi
|
3d498ccfb1
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
|
2012-09-06 07:56:07 +05:30 |
|
Anand Doshi
|
76ef96f24f
|
begin transaction after commit in support ticket
|
2012-09-06 07:53:37 +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
|
c53a0ffe34
|
by default, communication content is of type 'Text' instead of 'Text Editor'
|
2012-08-31 16:54:59 +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
|
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
|
297f37da03
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
|
2012-08-22 14:59:14 +05:30 |
|
Anand Doshi
|
73c6542e6c
|
minor fix in communication.js
|
2012-08-22 14:57:35 +05:30 |
|
Rushabh Mehta
|
a49a552a37
|
merge
|
2012-08-06 14:30:31 +05:30 |
|
Anand Doshi
|
786444e6bf
|
changed document_type of 'Communication' to 'Master' to enable importing
|
2012-08-03 16:15:39 +05:30 |
|
Anand Doshi
|
ccee92e5c0
|
fixes in header decoding in receiving support ticket email
|
2012-07-31 10:56:24 +05:30 |
|
Anand Doshi
|
3e7a143539
|
fixes in header decoding in receiving support ticket email
|
2012-07-31 10:54:56 +05:30 |
|
Anand Doshi
|
6a223fe77e
|
fixes in receive email
|
2012-07-23 12:51:50 +05:30 |
|