Rushabh Mehta
|
22fbea975f
|
Merge branch 'unicode' of github.com:webnotes/erpnext into unicode
|
2012-08-08 10:07:39 +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 |
|
Rushabh Mehta
|
c7dbe293c3
|
updates to kb: unanswered questions show in desktop, questions query moved to server-side
|
2012-08-07 12:12:55 +05:30 |
|
Anand Doshi
|
b8219aa4f0
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
public/js/all-app.js
public/js/fields.js
|
2012-08-06 19:55:43 +05:30 |
|
Rushabh Mehta
|
aaa75496e2
|
added email chain on blog comment and number of comments
|
2012-08-06 15:22:17 +05:30 |
|
Rushabh Mehta
|
a49a552a37
|
merge
|
2012-08-06 14:30:31 +05:30 |
|
Rushabh Mehta
|
5d4a9f8554
|
date format bug fixed
|
2012-08-06 14:20:15 +05:30 |
|
Rushabh Mehta
|
6243f29ab3
|
framework updates
|
2012-08-06 11:15:22 +05:30 |
|
Rushabh Mehta
|
49dc5da0dc
|
refactor unicode changes and merge with master with refactored email
|
2012-08-03 16:02:24 +05:30 |
|
Rushabh Mehta
|
0c5b438623
|
framework updates
|
2012-08-03 14:12:14 +05:30 |
|
Rushabh Mehta
|
0fa628bf86
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
erpnext/accounts/doctype/sales_invoice/sales_invoice.py
erpnext/patches/patch_list.py
public/js/report-legacy.js
|
2012-07-26 15:46:13 +02:00 |
|
Nabin Hait
|
7839ea9687
|
fixes in new report: same fieldname in multiple table
|
2012-07-23 16:05:16 +05:30 |
|
Nabin Hait
|
39b8ec0ed8
|
fixes in new report: same fieldname in multiple table
|
2012-07-23 15:03:57 +05:30 |
|
Rushabh Mehta
|
3c419c5e05
|
cur_frm.doc re-reference when is called
|
2012-07-16 15:44:38 +05:30 |
|
Rushabh Mehta
|
2eef40bf1e
|
get_field > wn.meta.get_docfield
|
2012-07-16 14:16:57 +05:30 |
|
Anand Doshi
|
9ec8024db7
|
show order type icon in sales order list view
|
2012-07-13 16:46:12 +05:30 |
|
Rushabh Mehta
|
91ba346354
|
profile cleanup start and new auth table for better security
|
2012-07-13 14:54:40 +05:30 |
|
Rushabh Mehta
|
d47efd57ac
|
check_required fix
|
2012-07-13 11:15:25 +05:30 |
|
Anand Doshi
|
c97f780940
|
Merge branch 'master' into dev
Conflicts:
erpnext/patches/patch_list.py
erpnext/startup/js/complete_setup.js
erpnext/stock/doctype/item/item.txt
public/css/all-app.css
public/js/all-app.js
public/js/all-web.js
|
2012-07-12 22:16:19 +05:30 |
|
Anand Doshi
|
d68dceb791
|
Merge branch 'master' of github.com:webnotes/erpnext into cms2
|
2012-07-12 18:53:35 +05:30 |
|
Rushabh Mehta
|
357fb2640b
|
sales bom fixes and mandatory in table fields
|
2012-07-12 18:00:21 +05:30 |
|
Rushabh Mehta
|
4feae61b62
|
fixes to taxes and charges master and naming_series
|
2012-07-12 16:01:20 +05:30 |
|
Rushabh Mehta
|
5faf37f312
|
item group cleanup
|
2012-07-12 11:33:00 +05:30 |
|
Nabin Hait
|
179f01af17
|
hong kong added in country list
|
2012-07-12 11:03:39 +05:30 |
|
Rushabh Mehta
|
cda9732f51
|
price list cleanup
|
2012-07-11 17:29:46 +05:30 |
|
Rushabh Mehta
|
9acf463427
|
budget distribution cleanup and formatting of markdown
|
2012-07-11 14:39:33 +05:30 |
|
Anand Doshi
|
1522f5d76b
|
Merge branch 'master' of github.com:webnotes/erpnext into cms2
|
2012-07-11 14:27:22 +05:30 |
|
Rushabh Mehta
|
e57267f79a
|
added patch for account and cleanups to breadcrumbs and msgprint
|
2012-07-11 13:18:58 +05:30 |
|
Rushabh Mehta
|
5281e350fb
|
cost center cleanup
|
2012-07-10 18:16:09 +05:30 |
|
Nabin Hait
|
cb2e76a79c
|
delete row issue in grid fixed
|
2012-07-05 14:44:39 +05:30 |
|
Anand Doshi
|
1731786a61
|
Merge branch 'master' of github.com:webnotes/erpnext into cms2
|
2012-07-03 15:51:11 +05:30 |
|
Anand Doshi
|
bba4db1627
|
product listing and pages
|
2012-06-27 12:06:45 +05:30 |
|
Anand Doshi
|
8ae5ba9abf
|
fixes related to --> clear locals and then sync locals when whole doclist is passed
|
2012-06-25 20:05:35 +05:30 |
|
Anand Doshi
|
72c945b7c6
|
template based web page loading using web.py
|
2012-06-22 20:01:07 +05:30 |
|
Anand Doshi
|
9078f652c3
|
Merge branch 'master' into cms2
|
2012-06-21 11:50:44 +05:30 |
|
Anand Doshi
|
be7c426e15
|
add parent column in filter list
|
2012-06-19 17:52:37 +05:30 |
|
Rushabh Mehta
|
bd7f7231f2
|
cms now powered by jinja2
|
2012-06-15 14:00:06 +05:30 |
|
Anand Doshi
|
f71d63fda0
|
fix in back button after save/submit
|
2012-06-12 15:45:44 +05:30 |
|
Anand Doshi
|
dbb84a271e
|
Merge branch 'master' of github.com:webnotes/erpnext into comm_log
Conflicts:
erpnext/selling/doctype/lead/lead.js
erpnext/setup/doctype/contact_control/contact_control.js
|
2012-06-05 18:37:17 +05:30 |
|
Rushabh Mehta
|
a660dd9d49
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-06-04 13:21:03 +05:30 |
|
Rushabh Mehta
|
983c551796
|
gantt chart fixes
|
2012-06-04 13:20:42 +05:30 |
|
Anand Doshi
|
bfc52b99fd
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-06-04 13:07:03 +05:30 |
|
Anand Doshi
|
fdc20fdf69
|
fix in get_base_url of dom.js
|
2012-06-04 13:06:38 +05:30 |
|
Rushabh Mehta
|
07c94ce9c0
|
update in Task, notification and layout
|
2012-06-04 12:57:23 +05:30 |
|
Anand Doshi
|
c5d857896e
|
fixes in communication doctype
|
2012-05-31 18:23:16 +05:30 |
|
Anand Doshi
|
a6708fb748
|
new doctype: communication
|
2012-05-31 14:53:55 +05:30 |
|
Anand Doshi
|
1aae261490
|
delete button in doclistview
|
2012-05-21 14:31:03 +05:30 |
|
Anand Doshi
|
d643d367ca
|
Merge branch 'shf_rename'
Conflicts:
public/js/all-app.js
public/js/all-web.js
|
2012-05-18 11:52:31 +05:30 |
|
Anand Doshi
|
ae4fc41e61
|
Merge branch 'shf_rename'
|
2012-05-16 14:35:15 +05:30 |
|
Anand Doshi
|
328cd2e868
|
do not refresh toolbar on set value
|
2012-05-16 12:21:45 +05:30 |
|