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 |
|
Anand Doshi
|
bdedd555ca
|
[setup] [update manager] renamed update-this-app page to update-manager
|
2013-04-01 16:51:33 +05:30 |
|
Anand Doshi
|
72b28807d2
|
[setup] [feature] Update Manager for self hosted applications based on wnframework
|
2013-04-01 16:40:19 +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 |
|
Rushabh Mehta
|
06e3ef055b
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-26 12:47:51 +05:30 |
|
Rushabh Mehta
|
4731fb999c
|
[feature] [fix] utilities/rename tool upgraded to upload multiple items
|
2013-03-26 12:47:19 +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 |
|
Nabin Hait
|
364f08a171
|
fixed conflict
|
2013-03-19 18:29:05 +05:30 |
|
Nabin Hait
|
80abad2ee0
|
aii: default account from company
|
2013-03-19 18:18:52 +05:30 |
|
Nabin Hait
|
d98e511c8b
|
deafult account creation in company
|
2013-03-19 12:45:02 +05:30 |
|
Nabin Hait
|
e68103be30
|
fixes in reorder level and company
|
2013-03-19 12:34:47 +05:30 |
|
Nabin Hait
|
928355ad9a
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-19 12:02:13 +05:30 |
|
Nabin Hait
|
89a94d8135
|
aii: stock reconciliation with test case
|
2013-03-19 12:01:46 +05:30 |
|
Rushabh Mehta
|
a54cb247c4
|
webshop login, logout
|
2013-03-19 11:12:22 +05:30 |
|
Anand Doshi
|
f11e2f8f6f
|
Merge branch 'master' of github.com:webnotes/erpnext into sales_purchase_return
Conflicts:
patches/patch_list.py
|
2013-03-18 17:42:08 +05:30 |
|
Rushabh Mehta
|
edf639b607
|
fixed backup/gdrive
|
2013-03-18 12:48:34 +05:30 |
|
Akhilesh Darjee
|
b0f0e7a82f
|
added backup_googledrive.py in backup_manager
|
2013-03-18 11:15:44 +05:30 |
|
Akhilesh Darjee
|
d3a30d84df
|
Merge branch 'master' of https://github.com/webnotes/erpnext
|
2013-03-15 16:23:59 +05:30 |
|
Akhilesh Darjee
|
479af526b0
|
Backup commited.
|
2013-03-15 16:17:31 +05:30 |
|
Anand Doshi
|
23d742693a
|
Merge branch 'master' into sales_purchase_return
|
2013-03-13 14:01:34 +05:30 |
|
Anand Doshi
|
71bed3116f
|
working on merging sales purchase return into stock entry
|
2013-03-13 12:57:04 +05:30 |
|
Rushabh Mehta
|
6a4c468219
|
fix in about
|
2013-03-12 14:59:46 +05:30 |
|