Anand Doshi
|
0bf801af62
|
email to leave approver and employee
|
2013-02-15 18:27:05 +05:30 |
|
Rushabh Mehta
|
1a9f0848b3
|
added calendar view
|
2013-02-15 12:09:05 +05:30 |
|
Rushabh Mehta
|
6227527cdb
|
added leave applications and block lists to calendar
|
2013-02-14 20:42:33 +05:30 |
|
Rushabh Mehta
|
b496756696
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-02-14 17:35:32 +05:30 |
|
Rushabh Mehta
|
5eb37647cf
|
added new calendar and renamed holiday block list
|
2013-02-14 17:34:51 +05:30 |
|
Anand Doshi
|
13dc9f3b1f
|
shifted get_url to startup
|
2013-02-13 23:42:48 +05:30 |
|
Rushabh Mehta
|
4b9827a5fc
|
upgraded test_runner, now can run multiple tests
|
2013-02-12 19:20:39 +05:30 |
|
Rushabh Mehta
|
176829e53c
|
added status to Contact and fix bug in communication pull
|
2013-02-11 14:54:30 +05:30 |
|
Rushabh Mehta
|
60135df6fd
|
updated language
|
2013-02-11 11:44:12 +05:30 |
|
Nabin Hait
|
a76a0687ef
|
get_query continued
|
2013-02-08 14:04:13 +05:30 |
|
Rushabh Mehta
|
4f8dfd69f9
|
messages.py use begin/commit for messages
|
2013-02-03 22:42:05 +05:30 |
|
Nabin Hait
|
53595c6521
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-01-30 12:49:44 +05:30 |
|
Nabin Hait
|
bf495c9a6d
|
GL Control rewrite and many other cleanup using inheritence
|
2013-01-30 12:49:08 +05:30 |
|
Rushabh Mehta
|
08da1a0a3d
|
setting list_views
|
2013-01-29 17:53:29 +05:30 |
|
Rushabh Mehta
|
cda5d42a65
|
updated languages
|
2013-01-28 14:21:40 +05:30 |
|
Nabin Hait
|
bf8c5033fe
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-01-25 12:12:45 +05:30 |
|
Nabin Hait
|
5ce1c668b5
|
removed default_currency_fraction and default_currency_format from global defaults
|
2013-01-25 12:06:57 +05:30 |
|
Rushabh Mehta
|
8e3affbf70
|
added nl
|
2013-01-25 11:58:18 +05:30 |
|
Rushabh Mehta
|
317177afd2
|
updated languages
|
2013-01-24 18:18:39 +05:30 |
|
Rushabh Mehta
|
ad14943c3f
|
added arabic
|
2013-01-24 17:37:43 +05:30 |
|
Rushabh Mehta
|
4c17718b4c
|
added portuguese
|
2013-01-24 16:31:23 +05:30 |
|
Rushabh Mehta
|
908d09d058
|
added spanish
|
2013-01-24 15:55:30 +05:30 |
|
Nabin Hait
|
291e8c2545
|
removed landed cost master
|
2013-01-23 16:06:44 +05:30 |
|
Rushabh Mehta
|
cd4a854a28
|
converted currency to float and removed level 1 permissions
|
2013-01-22 15:10:25 +05:30 |
|
Rushabh Mehta
|
bb9968491b
|
added report permissions to txt files
|
2013-01-21 14:22:07 +05:30 |
|
Anand Doshi
|
ef02ddfc40
|
Merge branch 'master' of github.com:webnotes/erpnext into purchase_price_list
Conflicts:
accounts/doctype/gl_control/gl_control.py
|
2013-01-17 20:31:41 +05:30 |
|
Rushabh Mehta
|
80721518e3
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-01-17 18:23:07 +05:30 |
|
Anand Doshi
|
9d9aec1ed4
|
shifted get_company_currency from transaction base to setup/utils.py
|
2013-01-17 15:44:57 +05:30 |
|
Anand Doshi
|
03fa78597d
|
Merge branch 'master' into purchase_price_list
|
2013-01-17 10:58:41 +05:30 |
|
Rushabh Mehta
|
6f9915cd17
|
install from txt files, part 1
|
2013-01-16 17:48:17 +05:30 |
|
Nabin Hait
|
d11e9d6619
|
removed time_to_ampm and time_to_hhmm function
|
2013-01-16 16:51:58 +05:30 |
|
Anand Doshi
|
756dca719b
|
refactored purchase cycle's get item details and update item details functions and started with purchase price list
|
2013-01-15 18:39:21 +05:30 |
|
Rushabh Mehta
|
523aec499a
|
bootstrapped language and added 'hi'
|
2013-01-07 15:39:54 +05:30 |
|
Rushabh Mehta
|
78a0c20305
|
new permission manager
|
2013-01-01 19:51:35 +05:30 |
|
Anand Doshi
|
f9a3c8fcdc
|
added status validation
|
2012-12-28 19:42:49 +05:30 |
|
Rushabh Mehta
|
d616413caa
|
added contact us
|
2012-12-27 18:40:42 +05:30 |
|
Rushabh Mehta
|
1b1517155b
|
added about us page and settings
|
2012-12-27 16:50:24 +05:30 |
|
Rushabh Mehta
|
5f1d57ecb7
|
address now not in dialog, added slideshows in products and groups and removed transaction history from customer / supplier / sales partner
|
2012-12-27 14:05:02 +05:30 |
|
Anand Doshi
|
da2d82cf6d
|
fixes in sms control
|
2012-12-25 18:45:35 +05:30 |
|
Anand Doshi
|
f5d90abe92
|
addchild will never save added doc
|
2012-12-24 17:02:38 +05:30 |
|
Rushabh Mehta
|
d3c9fb6b3b
|
changed desktop modules now using font-awesome instead of noun project fonts
|
2012-12-21 18:27:40 +05:30 |
|
Anand Doshi
|
879ec66ea3
|
Merge branch 'production' of github.com:webnotes/erpnext into production
Conflicts:
accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
buying/doctype/purchase_order_item/purchase_order_item.txt
buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
patches/patch_list.py
|
2012-12-19 22:28:00 +05:30 |
|
Rushabh Mehta
|
8ebf1b86f8
|
added disabled in Report and no_sync fields in import_merge
|
2012-12-19 15:34:00 +05:30 |
|
Nabin Hait
|
4ecc785aab
|
fixed conflict
|
2012-12-19 12:18:15 +05:30 |
|
Rushabh Mehta
|
647e0d1164
|
updates to product_page (search) and kb fix
|
2012-12-18 14:47:54 +05:30 |
|
Nabin Hait
|
5f175dfd00
|
Merge branch 'master' into production
|
2012-12-18 13:49:07 +05:30 |
|
Rushabh Mehta
|
ee472b0926
|
upgraded to bootstrap 2.2
|
2012-12-18 11:47:13 +05:30 |
|
Nabin Hait
|
f8de5b9878
|
merged with master
|
2012-12-14 10:43:56 +05:30 |
|
Nabin Hait
|
df011dbfa5
|
deleted unwanted control doctype and pages
|
2012-12-14 10:42:09 +05:30 |
|
Nabin Hait
|
22c3f63edd
|
small fixes: sms, quotation messages etc
|
2012-12-13 15:09:42 +05:30 |
|
Rushabh Mehta
|
291449b6fb
|
refactored javascript models
|
2012-12-13 12:53:21 +05:30 |
|
Rushabh Mehta
|
9e12af4b7c
|
updated recipients email in communication
|
2012-12-12 16:13:29 +05:30 |
|
Rushabh Mehta
|
686022f777
|
fixes to recent patch and removed company_control, home_control, webforms, wip_monitor
|
2012-12-12 15:25:51 +05:30 |
|
Nabin Hait
|
be356b8692
|
Merge branch 'master' of github.com:webnotes/erpnext into production
|
2012-12-12 12:58:22 +05:30 |
|
Rushabh Mehta
|
39b5b0653e
|
assign_to / messages public bug
|
2012-12-11 16:28:33 +05:30 |
|
Rushabh Mehta
|
24a69613e0
|
update file urls
|
2012-12-11 15:58:19 +05:30 |
|
Anand Doshi
|
c3b9a00c53
|
changed old type txt to new type txtt
|
2012-12-11 15:20:53 +05:30 |
|
Anand Doshi
|
36bf910563
|
removed Standard from default print format
|
2012-12-11 14:01:59 +05:30 |
|
Rushabh Mehta
|
880e26d9c2
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-07 15:23:41 +01:00 |
|
Anand Doshi
|
d62845641d
|
fix in assign to notifications
|
2012-12-07 19:28:27 +05:30 |
|
Rushabh Mehta
|
4ddbacc460
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-07 14:40:42 +01:00 |
|
Anand Doshi
|
b6a0f780f0
|
fix in assign notifications
|
2012-12-07 19:10:16 +05:30 |
|
Rushabh Mehta
|
989ca93b17
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-06 07:17:58 +01:00 |
|
Rushabh Mehta
|
2d05732589
|
kb - error fixed
|
2012-12-05 17:32:52 +05:30 |
|
Rushabh Mehta
|
cf9668758a
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-03 11:00:23 +01:00 |
|
Rushabh Mehta
|
346c832475
|
remove rename_tool
|
2012-12-03 14:15:53 +05:30 |
|
Rushabh Mehta
|
fccdfb1ccf
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-03 07:03:33 +01:00 |
|
Rushabh Mehta
|
833f070991
|
added allow_rename and also fix in autonotification
|
2012-12-03 11:33:08 +05:30 |
|
Rushabh Mehta
|
7c49b32636
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-03 05:54:25 +01:00 |
|
Rushabh Mehta
|
08a437bad7
|
removed schedule date mandatory from purchase receipt
|
2012-12-03 10:21:52 +05:30 |
|
Rushabh Mehta
|
1491328bf1
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-11-30 12:49:11 +01:00 |
|
Anand Doshi
|
ea61d8cf99
|
replaced set
|
2012-11-30 17:18:45 +05:30 |
|
Anand Doshi
|
535fbb1b00
|
replaced get_value
|
2012-11-30 17:16:03 +05:30 |
|
Rushabh Mehta
|
f9d4927303
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-11-30 12:32:50 +01:00 |
|
Anand Doshi
|
0fd99e7536
|
removed unnecessary imports
|
2012-11-30 16:38:04 +05:30 |
|
Rushabh Mehta
|
35c017a78f
|
cleanup of notification control: now in boot
|
2012-11-30 10:57:28 +05:30 |
|
Rushabh Mehta
|
b12d5363bc
|
merge
|
2012-11-29 16:30:57 +05:30 |
|
Rushabh Mehta
|
2df69f048e
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-11-29 10:55:30 +01:00 |
|
Nabin Hait
|
5f91862aef
|
error fixed in adding answer in knowledge base
|
2012-11-29 15:23:26 +05:30 |
|
Rushabh Mehta
|
d7fe2bfe1b
|
webnotes.model.doctype (new version)
|
2012-11-29 11:49:56 +05:30 |
|
Rushabh Mehta
|
42bd645dea
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-11-28 11:35:07 +01:00 |
|
Rushabh Mehta
|
57774c032c
|
contact.js: set customer, supplier
|
2012-11-28 16:01:58 +05:30 |
|
Rushabh Mehta
|
d547aee201
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-11-27 14:27:11 +01:00 |
|
Rushabh Mehta
|
80127bfb6a
|
refactored communication and added to Lead / Contact
|
2012-11-27 18:41:35 +05:30 |
|
Rushabh Mehta
|
e1a1a7f637
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-11-26 13:48:53 +01:00 |
|
Rushabh Mehta
|
c4e7b6800a
|
separated communication view
|
2012-11-26 18:18:10 +05:30 |
|
Rushabh Mehta
|
1d1d96641d
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-11-24 11:16:16 +01:00 |
|
Rushabh Mehta
|
bf09c672cd
|
support ticket response deprecated, moved to communication
|
2012-11-24 15:26:48 +05:30 |
|
Rushabh Mehta
|
17db39dc94
|
moving support ticket response to communication (wip)
|
2012-11-24 14:45:31 +05:30 |
|
Rushabh Mehta
|
4d4a21eab7
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-11-23 13:36:02 +01:00 |
|
Rushabh Mehta
|
78d4b49e62
|
introducing model 3.0, refactored import module
|
2012-11-23 17:53:43 +05:30 |
|
Rushabh Mehta
|
bc261a8591
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-11-23 12:05:28 +01:00 |
|
Rushabh Mehta
|
a44b66e47a
|
calendar.js: events made smaller (online) and other minor ui fixes
|
2012-11-23 16:34:42 +05:30 |
|
Rushabh Mehta
|
2e593fada9
|
calendar.js: events made smaller (online) and other minor ui fixes
|
2012-11-23 16:24:56 +05:30 |
|
Rushabh Mehta
|
0a68da5d15
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-11-22 14:26:39 +01:00 |
|
Anand Doshi
|
c69f02b0ad
|
attach get_query in onload of communication, address and contact
|
2012-11-22 18:56:11 +05:30 |
|
Rushabh Mehta
|
35b7416dc6
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-11-22 13:12:27 +01:00 |
|
Anand Doshi
|
83350bc946
|
supplier can now be searched using name
|
2012-11-22 17:39:19 +05:30 |
|
Anand Doshi
|
93a35cab19
|
added customer get_query to allow search based on customer name. also don't show name again if id naming is based on customer name and not series
|
2012-11-21 18:02:22 +05:30 |
|
Anand Doshi
|
b45cbda7fa
|
fixed order by for common queries, should be ordered based on startswith match and then alphabetical order for fuzzy match
|
2012-11-21 18:00:22 +05:30 |
|
Rushabh Mehta
|
e3c5ecc115
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-11-19 14:20:24 +01:00 |
|
Anand Doshi
|
fdfa60546a
|
always open links embedded in knowledge base answers in new tab
|
2012-11-19 18:48:25 +05:30 |
|
Rushabh Mehta
|
8355b320a0
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-11-16 09:55:38 +01:00 |
|
Rushabh Mehta
|
ce4ed265d2
|
fixes to rename_tool, added serial no for rename
|
2012-11-16 14:25:03 +05:30 |
|
Rushabh Mehta
|
0314750fb0
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-11-14 07:29:44 +01:00 |
|
Rushabh Mehta
|
3684155f28
|
deprecated breadcrumbs, titles are now selectable
|
2012-11-13 16:44:27 +05:30 |
|
Rushabh Mehta
|
efa2e95dd2
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-11-13 07:13:43 +01:00 |
|
Rushabh Mehta
|
ec40686cc3
|
messages, popups disabled
|
2012-11-13 10:59:11 +05:30 |
|
Rushabh Mehta
|
2465452df1
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-10-29 09:35:51 +01:00 |
|
Anand Doshi
|
ae30e01172
|
fetch contact designation and department as contact_designation and contact_department respectively
|
2012-10-26 15:01:22 +05:30 |
|
Rushabh Mehta
|
0c778493d3
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-10-10 10:57:30 +02:00 |
|
Anand Doshi
|
1aace542c9
|
removed import error bypass and added missing py files for each doctype
|
2012-10-10 14:26:23 +05:30 |
|
Rushabh Mehta
|
4b41afdafb
|
begin commit fix in cleanup data
|
2012-10-09 15:19:59 +02:00 |
|
Anand Doshi
|
037c2570b6
|
multi-line todo
|
2012-10-09 11:05:25 +05:30 |
|
Anand Doshi
|
cdba51c5a9
|
added page permissions, modified report listing links
|
2012-10-04 18:11:29 +05:30 |
|
Rushabh Mehta
|
b62bbc6dc7
|
update to messages, added avatar-large
|
2012-10-03 18:32:10 +05:30 |
|
Rushabh Mehta
|
ac7baf046a
|
commonified ripped paper effect and ctrl+s in todo
|
2012-10-03 12:22:13 +05:30 |
|
Rushabh Mehta
|
3009c46ba5
|
moved to bootstrap 2.1 and some ui fixes in todo and messages
|
2012-10-03 11:56:38 +05:30 |
|
Rushabh Mehta
|
beb3a872ce
|
Merge branch '1209' of github.com:webnotes/erpnext into 1209
|
2012-10-01 14:47:06 +05:30 |
|
Rushabh Mehta
|
2d700dd90d
|
added query report and cleaned up wn.ui.Dialog
|
2012-10-01 14:46:37 +05:30 |
|
Anand Doshi
|
fdbc730821
|
merged deprecate account balance
|
2012-10-01 11:30:00 +05:30 |
|
Anand Doshi
|
b83307823b
|
Merge branch '1209' of github.com:webnotes/erpnext into 1209
|
2012-09-28 12:39:37 +05:30 |
|
Anand Doshi
|
8bde7cb8db
|
Merge branch 'master' of github.com:webnotes/erpnext into 1209
|
2012-09-28 12:36:22 +05:30 |
|
Rushabh Mehta
|
294778a83c
|
messages.js: allow user to task messages
|
2012-09-27 15:43:06 +02:00 |
|
Rushabh Mehta
|
dd46b52467
|
updated messages
|
2012-09-27 19:01:52 +05:30 |
|
Rushabh Mehta
|
7f9c369266
|
updated messages
|
2012-09-27 18:48:43 +05:30 |
|
Rushabh Mehta
|
6e04ef7989
|
updated messages
|
2012-09-27 18:41:46 +05:30 |
|
Rushabh Mehta
|
55fd5f3ed6
|
added voucher import tool
|
2012-09-26 19:00:02 +05:30 |
|
Rushabh Mehta
|
7c454b3039
|
dont save duplicate files
|
2012-09-25 18:20:36 +05:30 |
|
Rushabh Mehta
|
0152b12e75
|
__session_cache removed and introducted memcache for caching
|
2012-09-25 14:22:23 +05:30 |
|
Rushabh Mehta
|
707932da0c
|
updated paths
|
2012-09-25 10:42:00 +05:30 |
|
Rushabh Mehta
|
2fa2f7178d
|
moved directory structure
|
2012-09-24 19:13:42 +05:30 |
|
Rushabh Mehta
|
66ac2b018a
|
first cut for lazy loading framework
|
2011-09-05 18:43:09 +05:30 |
|
Nabin Hait
|
d075a6c53d
|
Removed cstr in return for get_server_fields()
|
2011-08-17 10:50:57 +05:30 |
|
Nabin Hait
|
06c4de8ae6
|
removed cstr in get_server_fields return value
|
2011-08-16 16:38:11 +05:30 |
|
Nabin Hait
|
b1e8be462b
|
error fixed in patch util
|
2011-08-10 14:16:43 +05:30 |
|
Nabin Hait
|
ef1f75bdff
|
Merge pull request #32 from nabinhait/master
Small issues fixed
|
2011-08-04 23:19:56 -07:00 |
|
Nabin Hait
|
71f2bd97b6
|
level was not adding in add_permission()
|
2011-08-05 11:08:42 +05:30 |
|
Rushabh Mehta
|
393e70b631
|
merged from stable
|
2011-08-02 13:05:09 +05:30 |
|
Nabin Hait
|
f541b746d1
|
fixed conflict while merging master and live
|
2011-07-28 15:33:42 +05:30 |
|
Nabin Hait
|
36506a20fa
|
merged some update from live
|
2011-07-28 15:18:05 +05:30 |
|
Nabin Hait
|
d29916b7f5
|
file_list field hidden in bulk rename tool
|
2011-07-27 14:26:23 +05:30 |
|
Nabin Hait
|
07385ac812
|
Bulk rename tool included in setup module
|
2011-07-27 14:12:14 +05:30 |
|
Nabin Hait
|
5e04246b82
|
Merge branch 'stable' of github.com:webnotes/erpnext
|
2011-07-26 16:03:01 +05:30 |
|
Nabin Hait
|
587ac5c941
|
fixed conflict
|
2011-07-26 15:46:10 +05:30 |
|
Rushabh Mehta
|
ee81150e7c
|
re-fix after reverting
|
2011-07-26 12:35:25 +05:30 |
|
nabinhait
|
1458af0691
|
Index patch released and doctype updated based on index
|
2011-07-20 10:31:19 +05:30 |
|
nabinhait
|
5a328d2964
|
In SMS Control removed https while connecting gateway
|
2011-07-19 12:34:04 +05:30 |
|
nabinhait
|
9f9b082f54
|
patch function written for illegal cancelled entry
|
2011-07-08 18:04:05 +05:30 |
|
Ravi Dey
|
b8668d1fd0
|
bulk rename
|
2011-07-07 18:51:57 +05:30 |
|
Ravi Dey
|
f3a5b778b9
|
bulk rename
|
2011-07-07 18:44:32 +05:30 |
|
Ravi Dey
|
f96fa9a87b
|
bulk rename py
|
2011-07-07 16:43:56 +05:30 |
|
Ravi Dey
|
8cfa84a646
|
bulk rename
|
2011-07-07 16:37:03 +05:30 |
|
nabinhait
|
5deab24401
|
fixed conflict while merging with webnotes repo
|
2011-07-06 09:23:02 +05:30 |
|
nabinhait
|
1bd56b1c08
|
removed get_tips() from js file
|
2011-07-05 14:41:36 +05:30 |
|
nabinhait
|
d4403c3ec8
|
utilities module exported and company, rename tool txt updated
|
2011-07-01 19:26:59 +05:30 |
|
nabinhait
|
a56fc00ea3
|
resoved conflict in patch, company and renaming tools
|
2011-07-01 16:32:03 +05:30 |
|
nabinhait
|
ec097975d0
|
restructured erpnext and deleted unwanted
|
2011-07-01 13:34:41 +05:30 |
|
Ravi Dey
|
5708da5a9f
|
Default currency for company fixed
|
2011-06-28 19:01:02 +05:30 |
|
Pratik Vyas
|
c1e6e4c752
|
Sourced wnframework-modules from Google Code as erpnext
|
2011-06-08 14:37:15 +05:30 |
|