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 |
|
Nabin Hait
|
f039c8b58f
|
get_query for invoice in c-form
|
2012-08-14 15:38:17 +05:30 |
|
Anand Doshi
|
0851b4b397
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
|
2012-08-14 14:56:09 +05:30 |
|
Anand Doshi
|
46f8b50c8c
|
added Expense Claim Type link in HR Home page
|
2012-08-14 14:53:38 +05:30 |
|
Nabin Hait
|
22aa31ead2
|
updated profile permission
|
2012-08-13 13:15:36 +05:30 |
|
Rushabh Mehta
|
c3de42c892
|
bugfix: blog
|
2012-08-13 11:31:27 +05:30 |
|
Rushabh Mehta
|
fa0e252d4b
|
blog comments fix, markdown and not sent multiple times
|
2012-08-13 11:09:21 +05:30 |
|
Anand Doshi
|
6547375a2b
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
erpnext/buying/doctype/purchase_common/purchase_common.js
|
2012-08-10 15:42:50 +05:30 |
|
Anand Doshi
|
544b0f64d1
|
cascade project name to other items, if selected in one item during purchase cycle
|
2012-08-10 15:37:54 +05:30 |
|
Anand Doshi
|
241437995f
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
erpnext/setup/doctype/company/company.txt
|
2012-08-10 12:58:48 +05:30 |
|
Anand Doshi
|
f08cbe185d
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-08-10 12:48:46 +05:30 |
|
Anand Doshi
|
6810979dab
|
Company Form: do not hide 'Default Settings' section break for a new company, as it contains a mandatory field 'Default Currency'
|
2012-08-10 12:38:48 +05:30 |
|
Nabin Hait
|
4d0cba8249
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-08-09 16:24:47 +05:30 |
|
Nabin Hait
|
cd4918736a
|
error fixed in account browser
|
2012-08-09 16:24:20 +05:30 |
|
Anand Doshi
|
8456eabed8
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
|
2012-08-09 12:17:44 +05:30 |
|
Anand Doshi
|
c6cf4a2630
|
do not display mouse as a clickable pointer when hovering on description in todo list
|
2012-08-09 12:16:03 +05:30 |
|
Anand Doshi
|
63fee973d7
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
|
2012-08-09 11:34:47 +05:30 |
|
Anand Doshi
|
c4df355edc
|
removed msgprint in get_pos_details of sales invoice
|
2012-08-09 11:33:56 +05:30 |
|
Anand Doshi
|
11a5ba64dd
|
fixed bug in depends_on: hidden property of a docfield should have value as 0 or 1
|
2012-08-09 11:30:21 +05:30 |
|
Rushabh Mehta
|
899fe5d3f0
|
links enabled in todo
|
2012-08-08 15:30:19 +05:30 |
|
Rushabh Mehta
|
02f459abcf
|
Merge branch 'unicode' of github.com:webnotes/erpnext into unicode
|
2012-08-08 14:29:55 +05:30 |
|
Rushabh Mehta
|
0f0d8850d0
|
merged with master (project cleanup)
|
2012-08-08 14:28:24 +05:30 |
|
Rushabh Mehta
|
a8733daf80
|
fix to project_list
|
2012-08-08 14:26:53 +05:30 |
|
Rushabh Mehta
|
aff1599fe5
|
cleanup to projects and tasks and now embedding gantt chart inside project
|
2012-08-08 14:19:33 +05:30 |
|
Rushabh Mehta
|
2937e7e842
|
task cleanup: moved allocated_to -> assigned_to, autoname is now task (istead of tic)
|
2012-08-08 12:54:47 +05:30 |
|
Anand Doshi
|
a5c7bd34d0
|
Merge branch 'unicode' of github.com:webnotes/erpnext into unicode
|
2012-08-08 10:54:56 +05:30 |
|
Anand Doshi
|
0cedc1cc9c
|
removed reply_to while sending email in email digest
|
2012-08-08 10:54:11 +05:30 |
|
Rushabh Mehta
|
17588987a4
|
file upload should not be decoded
|
2012-08-08 10:37:02 +05:30 |
|
Rushabh Mehta
|
22fbea975f
|
Merge branch 'unicode' of github.com:webnotes/erpnext into unicode
|
2012-08-08 10:07:39 +05:30 |
|
Rushabh Mehta
|
7dbef2549a
|
pre, code style fix
|
2012-08-08 10:06:43 +05:30 |
|
Rushabh Mehta
|
bf8cac53c7
|
pre, code style fix
|
2012-08-08 10:05:51 +05:30 |
|
Rushabh Mehta
|
bc26218889
|
added jQuery.Gantt
|
2012-08-08 10:02:55 +05:30 |
|
Rushabh Mehta
|
02aab69427
|
merge
|
2012-08-07 16:44:36 +05:30 |
|
Rushabh Mehta
|
47ba1d144a
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-08-07 16:38:00 +05:30 |
|
Rushabh Mehta
|
586c6f3cbe
|
calendar: links to ref document
|
2012-08-07 16:36:40 +05:30 |
|
Rushabh Mehta
|
c2ef064ebb
|
todo page background bugfix
|
2012-08-07 16:36:10 +05:30 |
|
Rushabh Mehta
|
df196c12a9
|
projects: milestones have events, tasks have events with better description
|
2012-08-07 16:35:27 +05:30 |
|
Anand Doshi
|
7b64b96676
|
renamed report folder
|
2012-08-07 15:30:40 +05:30 |
|
Anand Doshi
|
ebcb3c02d0
|
fixes in supplier quotations report patch
|
2012-08-07 15:24:46 +05:30 |
|
Anand Doshi
|
26dc1b776a
|
fix in report: supplier quotations after merge with unicode
|
2012-08-07 15:17:53 +05:30 |
|
Anand Doshi
|
4e2feb2b28
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
|
2012-08-07 15:14:07 +05:30 |
|
Anand Doshi
|
883285f503
|
fix in supplier quotations patch
|
2012-08-07 15:13:48 +05:30 |
|
Anand Doshi
|
e81c07ff4d
|
appended unicode literals import after merge
|
2012-08-07 15:08:52 +05:30 |
|
Anand Doshi
|
16ad50f641
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
erpnext/stock/doctype/item/item.txt
|
2012-08-07 15:07:56 +05:30 |
|
Anand Doshi
|
f6624257ad
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-08-07 15:06:17 +05:30 |
|
Anand Doshi
|
e30d5f833e
|
New Report: Supplier Quotations
|
2012-08-07 15:05:42 +05:30 |
|
Rushabh Mehta
|
6252c13ec8
|
added code style and mardown in todo
|
2012-08-07 12:53:49 +05:30 |
|