Anand Doshi
|
ded4848a5e
|
Merge branch 'master' into edge
|
2013-04-24 15:35:38 +05:30 |
|
Anand Doshi
|
77bb4cef39
|
[naming series] [fixes] consider custom fields with fieldname naming_series
|
2013-04-24 15:32:39 +05:30 |
|
Anand Doshi
|
deb31432dd
|
Merge branch 'master' into edge
|
2013-04-23 17:08:34 +05:30 |
|
Anand Doshi
|
10f09092aa
|
[backup manager] [fixes] show erroneous files in error email message
|
2013-04-23 17:07:52 +05:30 |
|
Anand Doshi
|
3e8c696de7
|
Merge branch 'master' into edge
|
2013-04-23 14:24:00 +05:30 |
|
Anand Doshi
|
ed7cf1bced
|
[backup manager] [fixes] fixes in dropbox and google drive
|
2013-04-23 14:23:03 +05:30 |
|
Anand Doshi
|
a536eef393
|
Merge branch 'master' into edge
|
2013-04-23 13:10:55 +05:30 |
|
Anand Doshi
|
76d7ec51fb
|
[backup manager] [fixes] fix in dropbox folder path
|
2013-04-23 13:05:40 +05:30 |
|
Anand Doshi
|
dc0f2d2422
|
Merge branch 'master' into edge
Conflicts:
accounts/doctype/sales_invoice/sales_invoice.txt
stock/doctype/item/item.txt
|
2013-04-23 12:42:18 +05:30 |
|
Anand Doshi
|
890265928b
|
[backup manager] [error handling] on error, send complete traceback as email
|
2013-04-23 12:30:38 +05:30 |
|
Rushabh Mehta
|
4c3419bee0
|
Merge branch 'master' into edge
|
2013-04-22 14:03:31 +05:30 |
|
Anand Doshi
|
5717fe3aba
|
[cost center] [default value] default cost center for each company, auto set default cost center for various transactions during creation
|
2013-04-17 18:02:52 +05:30 |
|
Anand Doshi
|
2b349d38d9
|
Merge branch 'master' into edge
|
2013-04-17 15:10:47 +05:30 |
|
Anand Doshi
|
d484b380ad
|
[email digest] [sender] sender should be the automail id specified in Email Settings
|
2013-04-17 15:10:08 +05:30 |
|
Anand Doshi
|
e776742f5d
|
[company] [cleanup] on_rename method
|
2013-04-17 13:19:35 +05:30 |
|
Rushabh Mehta
|
33075e1f69
|
[files] [patch] dropped file_list property and moved links to
|
2013-04-10 11:08:50 +05:30 |
|
Nabin Hait
|
2b61f6142a
|
fixed conflict
|
2013-04-08 12:44:57 +05:30 |
|
Nabin Hait
|
a477d41843
|
[aii] some fixes
|
2013-04-08 12:39:11 +05:30 |
|
Rushabh Mehta
|
cfa663e337
|
[message] [fix] rewire to core
|
2013-04-04 10:02:08 +05:30 |
|
Rushabh Mehta
|
5c12765313
|
[merge]
|
2013-04-02 10:51:11 +05:30 |
|
Rushabh Mehta
|
9db1a68d89
|
[website] [cleanup] moved website generic utils to framework
|
2013-04-02 10:41:37 +05:30 |
|
Rushabh Mehta
|
6d61024e9e
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-04-01 15:05:13 +05:30 |
|
Rushabh Mehta
|
9f43fc50ad
|
[website] [product list] image clickable
|
2013-04-01 12:12:47 +05:30 |
|
Nabin Hait
|
787c02ee42
|
aii fixes
|
2013-03-29 16:42:33 +05:30 |
|
Nabin Hait
|
acecb94a0f
|
patch: update item tax rate in json format
|
2013-03-29 10:48:41 +05:30 |
|
Rushabh Mehta
|
7ab3267886
|
updated item group limit to 100
|
2013-03-28 17:09:23 +05:30 |
|
Nabin Hait
|
41fe3567bb
|
fixed conflict and aii check in global defaults
|
2013-03-28 15:54:11 +05:30 |
|
Anand Doshi
|
9d601d593d
|
removed in dialog from activity type
|
2013-03-28 11:49:00 +05:30 |
|
Anand Doshi
|
fc33ef6bfb
|
fixes in purchase invoice
|
2013-03-26 12:13:14 +05:30 |
|
Nabin Hait
|
82be7dc301
|
fixed conflict
|
2013-03-25 18:30:15 +05:30 |
|
Nabin Hait
|
557d858d89
|
aii: patches and default values fetching
|
2013-03-25 18:28:16 +05:30 |
|
Rushabh Mehta
|
74506e96d3
|
[profile/email] [feature] added option not to send print as email body. fix in profile delete
|
2013-03-25 17:52:14 +05:30 |
|
Rushabh Mehta
|
df8b652402
|
[accounts] [feature] added default_cash_account in company and gets set in Journal Voucher
|
2013-03-25 15:44:36 +05:30 |
|
Rushabh Mehta
|
c5570c6341
|
added warehouse company validation, if warehouse is added to company
|
2013-03-25 15:21:24 +05:30 |
|
Nabin Hait
|
0931642c3a
|
fixes in backup_dropbox
|
2013-03-25 11:54:42 +05:30 |
|
Nabin Hait
|
690fefe9c1
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-25 11:07:38 +05:30 |
|
Nabin Hait
|
0fc2454384
|
aii: patches and fine tuning
|
2013-03-25 11:06:00 +05:30 |
|
Anand Doshi
|
44e35ab231
|
removed unnecessary imports from backup manager files
|
2013-03-22 18:47:52 +05:30 |
|
Anand Doshi
|
aeed499d12
|
Merge branch 'master' into edge
Conflicts:
setup/doctype/backup_manager/backup_dropbox.py
|
2013-03-22 18:43:47 +05:30 |
|
Rushabh Mehta
|
af578d73ef
|
merge
|
2013-03-21 17:40:08 +05:30 |
|
Rushabh Mehta
|
bed19ac4d3
|
added website pages for orders, tickets and added sales invoice print format
|
2013-03-21 17:12:25 +05:30 |
|
Akhilesh Darjee
|
4e7a58608f
|
google drive redirect url fixed.
|
2013-03-20 16:33:02 +05:30 |
|
Akhilesh Darjee
|
ba9ecaeef7
|
backup dropbox and googledrive problems fixed.
|
2013-03-20 13:47:17 +05:30 |
|
Akhilesh Darjee
|
3abf67cf5e
|
dropbox and googledrive problems fixed
|
2013-03-20 13:25:28 +05:30 |
|
Akhilesh Darjee
|
3433f11abe
|
Merge branch 'master' of https://github.com/webnotes/erpnext
|
2013-03-20 12:50:57 +05:30 |
|
Nabin Hait
|
aa6f939b86
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-20 11:43:47 +05:30 |
|
Akhilesh Darjee
|
4ff94e389e
|
dropbox chunked uploader fixed.
|
2013-03-20 11:20:47 +05:30 |
|
Akhilesh Darjee
|
09957b61c8
|
Dropbox upload chunked fixed.
|
2013-03-20 10:21:51 +05:30 |
|
Nabin Hait
|
8803df04cc
|
aii: get_query for default account in company
|
2013-03-19 18:53:00 +05:30 |
|
Anand Doshi
|
9bddd83604
|
fix in global defaults
|
2013-03-19 18:40:35 +05:30 |
|