Anand Doshi
|
f03e3bb06b
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
|
2012-09-06 07:55:19 +05:30 |
|
Nabin Hait
|
d948e9b15c
|
reload doc before auto nification
|
2012-09-05 12:59:07 +05:30 |
|
Anand Doshi
|
b4ea4adeec
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
erpnext/setup/doctype/price_list/price_list.py
|
2012-08-31 16:56:44 +05:30 |
|
Anand Doshi
|
41cd5a68f4
|
autocommit for price list update
|
2012-08-31 13:57:22 +05:30 |
|
Anand Doshi
|
7b20428976
|
merged master
|
2012-08-16 17:10:39 +05:30 |
|
Anand Doshi
|
1467a059ed
|
Merge branch 'master' of github.com:webnotes/erpnext into unicode
|
2012-08-16 17:09:37 +05:30 |
|
Anand Doshi
|
37b1b88710
|
fix in email settings: json.loads defaults to unicode string, hence encode string for smtp login
|
2012-08-16 17:09:13 +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
|
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 |
|
Anand Doshi
|
0cedc1cc9c
|
removed reply_to while sending email in email digest
|
2012-08-08 10:54:11 +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
|
f0018b5e05
|
added unsubscribed fields in Lead and Contact and cleaned up sendmail function
|
2012-08-02 18:03:12 +05:30 |
|
Anand Doshi
|
dbe31be55c
|
deprecated bulk rename tool
|
2012-07-20 18:11:41 +05:30 |
|
Anand Doshi
|
76ec66dd65
|
fixes for unicode
|
2012-07-20 18:11:30 +05:30 |
|
Anand Doshi
|
1703cc89b4
|
fixes for unicode
|
2012-07-19 20:31:56 +05:30 |
|
Anand Doshi
|
486f9dfcec
|
added unicode_literals import at start of each file
|
2012-07-19 13:40:31 +05:30 |
|
Rushabh Mehta
|
4ae82ca0c2
|
users pages deprecated
|
2012-07-16 16:20:11 +05:30 |
|
Rushabh Mehta
|
2eef40bf1e
|
get_field > wn.meta.get_docfield
|
2012-07-16 14:16:57 +05:30 |
|
Rushabh Mehta
|
8cbbab2e75
|
Merge branch 'dev' of github.com:webnotes/erpnext into dev
|
2012-07-12 18:01:31 +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 |
|
Nabin Hait
|
70db682a9a
|
fixed conflict in setup control
|
2012-07-12 11:47:40 +05:30 |
|
Rushabh Mehta
|
5faf37f312
|
item group cleanup
|
2012-07-12 11:33:00 +05:30 |
|
Rushabh Mehta
|
cf969143f2
|
cleaned up customer group
|
2012-07-12 09:54:43 +05:30 |
|
Rushabh Mehta
|
b9fabf8e16
|
sales bom cleanup
|
2012-07-11 19:18:50 +05:30 |
|
Rushabh Mehta
|
cda9732f51
|
price list cleanup
|
2012-07-11 17:29:46 +05:30 |
|
Rushabh Mehta
|
3a0f191658
|
cleaned up fiscal_year, currency and added select-all + help in doclistview
|
2012-07-11 16:35:39 +05:30 |
|
Nabin Hait
|
3b0f5dddea
|
fiscal_year_closed and abbr removed from code
|
2012-07-11 15:14:06 +05:30 |
|
Rushabh Mehta
|
9acf463427
|
budget distribution cleanup and formatting of markdown
|
2012-07-11 14:39:33 +05:30 |
|
Rushabh Mehta
|
e3dd54c220
|
Merge branch 'dev' of github.com:webnotes/erpnext into dev
|
2012-07-11 13:19:36 +05:30 |
|
Rushabh Mehta
|
e57267f79a
|
added patch for account and cleanups to breadcrumbs and msgprint
|
2012-07-11 13:18:58 +05:30 |
|
Anand Doshi
|
45ec64a58e
|
fixes in outgoing email connection error handling
|
2012-07-11 12:06:38 +05:30 |
|
Anand Doshi
|
090a12d167
|
do not force send email using conf.py configuration
|
2012-07-10 15:15:46 +05:30 |
|
Anand Doshi
|
0f5e220d6c
|
Email Digest: New Transactions --> consider feed_type is null records only
|
2012-07-09 12:48:32 +05:30 |
|
Anand Doshi
|
af539fa5bd
|
deprecate import data control
|
2012-07-03 14:45:03 +05:30 |
|
Anand Doshi
|
d383e573fc
|
contact, address list views and allow their deletion from customer / supplier form
|
2012-07-02 19:45:35 +05:30 |
|
Anand Doshi
|
d4425cc57d
|
Merge branch 'master' into dev
Conflicts:
erpnext/support/doctype/maintenance_visit/maintenance_visit.py
|
2012-06-27 14:13:34 +05:30 |
|
Anand Doshi
|
74962a9213
|
auto create email digest after setup is completed
|
2012-06-26 12:47:14 +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
|
b4aa0f8ce8
|
fix in price list: check if a row has content before checking its length; allow only 1 attachment
|
2012-06-22 10:56:12 +05:30 |
|
Anand Doshi
|
616c355d20
|
fix in todos and email settings
|
2012-06-14 16:46:48 +05:30 |
|
Anand Doshi
|
92fd9cce35
|
fixes in support ticket and email settings
|
2012-06-14 14:55:44 +05:30 |
|
Rushabh Mehta
|
4c56275d26
|
appframe is now heading
|
2012-06-14 11:05:09 +05:30 |
|
Anand Doshi
|
4f4f58293f
|
fix in item group on_trash
|
2012-06-12 17:03:09 +05:30 |
|
Nabin Hait
|
2e3579a4eb
|
Item Barcode implemented
|
2012-06-07 19:09:17 +05:30 |
|
Rushabh Mehta
|
0873e75fb2
|
better notification message
|
2012-06-07 11:00:33 +05:30 |
|
Rushabh Mehta
|
c91e16dd1e
|
email_digest updates
|
2012-06-06 11:27:38 +05:30 |
|
Rushabh Mehta
|
0b00b46a99
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-06-06 11:11:58 +05:30 |
|
Rushabh Mehta
|
260162db1b
|
email digest: mobile friendly
|
2012-06-06 11:11:35 +05:30 |
|
Anand Doshi
|
937d838bdc
|
min height for communication history and transaction history
|
2012-06-05 20:19:52 +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 |
|
Nabin Hait
|
f24d2efe2c
|
Parent node validation fixed for tree
|
2012-06-05 10:41:27 +05:30 |
|
Nabin Hait
|
0e4afb910b
|
parent node get_query modified in all tree
|
2012-06-04 10:32:31 +05:30 |
|
Anand Doshi
|
a6708fb748
|
new doctype: communication
|
2012-05-31 14:53:55 +05:30 |
|
Nabin Hait
|
0908b2709b
|
fixed conflict
|
2012-05-31 11:49:37 +05:30 |
|
Nabin Hait
|
5c1de3a639
|
fixed conflict
|
2012-05-31 11:47:09 +05:30 |
|
Nabin Hait
|
353bc313a6
|
Link to Sales/accounts browser fixed
|
2012-05-31 11:43:14 +05:30 |
|
Anand Doshi
|
82695ddd90
|
fixes in transaction history of customer and supplier
|
2012-05-29 14:14:27 +05:30 |
|
Nabin Hait
|
86df78aabc
|
fixed conflict
|
2012-05-23 11:33:28 +05:30 |
|
Nabin Hait
|
b695f73293
|
Maintain same rate throughout pur cycle: in global defaults, by default set true
|
2012-05-22 14:53:40 +05:30 |
|
Nabin Hait
|
86375f089a
|
Merge branch 'shf_rename'
Conflicts:
erpnext/patches/patch_list.py
|
2012-05-21 15:48:21 +05:30 |
|
Nabin Hait
|
d9742a6a58
|
on_trash modified for item group, territory, customer group, and sales person
|
2012-05-21 13:33:09 +05:30 |
|
Rushabh Mehta
|
6598b6276b
|
fixes to website settings and linking import data in setup
|
2012-05-14 15:02:35 +05:30 |
|
Rushabh Mehta
|
0eb790a0ae
|
cleaned up imports, doc
|
2012-05-11 15:53:37 +05:30 |
|
Rushabh Mehta
|
a920943e43
|
new cms with public folder
|
2012-05-07 18:00:57 +05:30 |
|
Anand Doshi
|
29d36a6cea
|
fixes in account setup
|
2012-05-04 16:20:30 +05:30 |
|
Anand Doshi
|
4b6c1f8de5
|
fixes in notification control due to renaming of doctype
|
2012-05-03 16:26:38 +05:30 |
|
Anand Doshi
|
359852e3d9
|
fix in email digest
|
2012-05-03 13:23:06 +05:30 |
|
Anand Doshi
|
57bc3f424f
|
fix in email digest
|
2012-05-03 12:57:56 +05:30 |
|
Anand Doshi
|
996abdd155
|
fix in email digest
|
2012-05-03 12:48:44 +05:30 |
|
Anand Doshi
|
e5982c0399
|
email digest fixes
|
2012-05-03 12:37:26 +05:30 |
|
Nabin Hait
|
926f46f04a
|
Fixed conflict while merging with master
|
2012-05-01 11:51:08 +05:30 |
|
Nabin Hait
|
d58da50f50
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-05-01 11:37:45 +05:30 |
|
Nabin Hait
|
41cc32790f
|
Fixed issie in auto notification
|
2012-04-30 14:36:18 +05:30 |
|
Anand Doshi
|
b60807c325
|
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
|
2012-04-30 12:23:03 +05:30 |
|
Anand Doshi
|
c55d9ad033
|
working on setup account
|
2012-04-30 12:22:47 +05:30 |
|
Nabin Hait
|
ebbd328977
|
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
|
2012-04-27 18:15:13 +05:30 |
|
Anand Doshi
|
f5216b46e3
|
fixes
|
2012-04-27 18:03:47 +05:30 |
|
Nabin Hait
|
914d67a1a3
|
selective deletes from child table while overwriting
|
2012-04-27 17:47:46 +05:30 |
|
Anand Doshi
|
3fbf2ec0c5
|
fix in setup control
|
2012-04-27 16:11:56 +05:30 |
|
Anand Doshi
|
1dac43159a
|
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
|
2012-04-27 15:31:35 +05:30 |
|
Anand Doshi
|
1ed4ef1946
|
fixes in setup
|
2012-04-27 15:30:23 +05:30 |
|
Nabin Hait
|
a6b7886175
|
resolved conflict while merging with master
|
2012-04-26 13:02:36 +05:30 |
|
Nabin Hait
|
50c799880a
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-04-26 12:47:30 +05:30 |
|
Nabin Hait
|
e6d808820a
|
Error fixed in notification control
|
2012-04-24 11:06:48 +05:30 |
|
Nabin Hait
|
a8d83b6c51
|
update modified date
|
2012-04-20 14:02:44 +05:30 |
|
Nabin Hait
|
f7c506d69e
|
fixed conflict while merging with master branch
|
2012-04-20 13:58:43 +05:30 |
|
Nabin Hait
|
e72ae2a19b
|
fixed conflict
|
2012-04-20 13:41:09 +05:30 |
|
Nabin Hait
|
239e79038f
|
Customer/customer group wise price list
|
2012-04-20 10:25:03 +05:30 |
|
Anand Doshi
|
7c67aad059
|
removed account_url from global defaults
|
2012-04-18 17:25:06 +05:30 |
|
Anand Doshi
|
619e16c956
|
removed account_url from global defaults
|
2012-04-18 17:17:02 +05:30 |
|
Anand Doshi
|
8d1a0b4061
|
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
|
2012-04-18 16:08:15 +05:30 |
|
Anand Doshi
|
385380125b
|
fixes in customize form, naming series form loading
|
2012-04-18 16:04:02 +05:30 |
|
Nabin Hait
|
97051ba79f
|
allow negative stock field in global defaults
|
2012-04-18 12:51:11 +05:30 |
|
Rushabh Mehta
|
3a9ddaf2c1
|
permission engine bugfix
|
2012-04-18 12:34:18 +05:30 |
|
Nabin Hait
|
7afc2124a6
|
allow negative qty feature
|
2012-04-18 12:04:20 +05:30 |
|
Anand Doshi
|
acb3d56e02
|
fix in install docs
|
2012-04-17 11:39:18 +05:30 |
|
Nabin Hait
|
6c615d9527
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-04-13 14:14:39 +05:30 |
|
Nabin Hait
|
7fca9e617d
|
fixes in global defaults
|
2012-04-13 12:18:06 +05:30 |
|
Anand Doshi
|
09e8c4cd2d
|
further fixes
|
2012-04-12 17:51:53 +05:30 |
|
Nabin Hait
|
c594bbcae0
|
address html issue fixed
|
2012-04-11 17:14:45 +05:30 |
|
Anand Doshi
|
2424387651
|
fixes after sync testing
|
2012-04-10 19:14:37 +05:30 |
|
Anand Doshi
|
a9ccc7d6bd
|
naming series changes now saved as property setter
|
2012-04-10 15:31:48 +05:30 |
|
Anand Doshi
|
859cb72606
|
new favicon
|
2012-04-10 11:35:19 +05:30 |
|
Anand Doshi
|
87a2c5cc69
|
Merge branch 'master' of github.com:webnotes/erpnext into shf_rename
Conflicts:
erpnext/accounts/doctype/c_form/c_form.txt
erpnext/patches/patch_list.py
erpnext/setup/doctype/permission_control/permission_control.py
|
2012-04-09 12:14:53 +05:30 |
|
Anand Doshi
|
82042f1cff
|
fixes after sync
|
2012-04-06 17:54:17 +05:30 |
|
Anand Doshi
|
fa0cd89a7c
|
change from labels to fieldname in cur_frm.cscript
|
2012-04-05 13:03:35 +05:30 |
|
Anand Doshi
|
00ceafb42d
|
fix in fiscal year of email digest
|
2012-04-03 18:43:17 +05:30 |
|
Anand Doshi
|
fc8bf7b1d8
|
add select type link fields in permission control
|
2012-04-03 13:49:14 +05:30 |
|
Anand Doshi
|
5112b5b6b8
|
rerun of rename_dt
|
2012-04-02 19:12:29 +05:30 |
|
Anand Doshi
|
c88ae2be4d
|
rename dt second cut
|
2012-03-30 18:18:36 +05:30 |
|
Anand Doshi
|
fedfd89e4a
|
rename dt first cut
|
2012-03-30 12:29:06 +05:30 |
|
Anand Doshi
|
7ff696fb12
|
Merge branch 'renamedt' into shf_rename
Conflicts:
erpnext/patches/patch_list.py
|
2012-03-29 15:31:17 +05:30 |
|
Anand Doshi
|
fddb782a82
|
Merge branch 'renamedt' of github.com:webnotes/erpnext into renamedt
|
2012-03-29 15:28:16 +05:30 |
|
Anand Doshi
|
779a365420
|
fix in print hide of amount in words
|
2012-03-28 18:31:26 +05:30 |
|
Anand Doshi
|
a30fbd004e
|
merge of sync handler and sync_file_db - first cut
|
2012-03-27 19:31:38 +05:30 |
|
Anand Doshi
|
5f9501d4d8
|
Merge branch 'sync_file_db' into shf_merge
Conflicts:
erpnext/projects/doctype/project/project.txt
|
2012-03-23 14:51:35 +05:30 |
|
Anand Doshi
|
9b56a8ada9
|
Merge branch 'handlerupdate' into sync_handler_merge
Conflicts:
js/all-app.js
version.num
|
2012-03-23 13:55:20 +05:30 |
|
Nabin Hait
|
f88326ba3f
|
sync ref db
|
2012-03-22 15:07:05 +05:30 |
|
Anand Doshi
|
8463870a4f
|
Added Custom Scripts in setup page
|
2012-03-22 13:39:23 +05:30 |
|
Anand Doshi
|
71d0b2a428
|
permission engine fix - is doctype submittable
|
2012-03-21 17:15:49 +05:30 |
|
Nabin Hait
|
0ad2ef2111
|
sync with respect to file
|
2012-03-21 15:02:39 +05:30 |
|
Rushabh Mehta
|
f74ef4c64b
|
Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-21 07:18:41 +01:00 |
|
Anand Doshi
|
986caee03d
|
clear item cache on update of certain docs
|
2012-03-20 17:30:31 +05:30 |
|
Anand Doshi
|
8347aad402
|
email settings separated from control panel
|
2012-03-20 14:54:25 +05:30 |
|
Rushabh Mehta
|
9b1afe197d
|
cleanup of form, rename, route, added fonts
|
2012-03-20 14:37:44 +05:30 |
|
Rushabh Mehta
|
ffe9d358e8
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-19 12:40:07 +01:00 |
|
Nabin Hait
|
16d9f4942a
|
Update erpnext/setup/doctype/manage_account/manage_account.txt
|
2012-03-19 15:48:08 +05:30 |
|
Nabin Hait
|
9aa3777ba6
|
Update erpnext/setup/doctype/sales_person/sales_person.txt
|
2012-03-19 15:21:30 +05:30 |
|
Nabin Hait
|
e5d99f5ed1
|
Update erpnext/setup/doctype/manage_account/manage_account.txt
|
2012-03-19 15:15:20 +05:30 |
|
Rushabh Mehta
|
052b7e4049
|
fixed list->new->onload hooks
|
2012-03-13 15:19:06 +05:30 |
|
Rushabh Mehta
|
b9878d01e1
|
style fixes
|
2012-03-12 16:12:09 +05:30 |
|
Rushabh Mehta
|
f81a64e57f
|
new listing and changed wn.widgets.listing to wn.ui.listing
|
2012-03-07 18:19:41 +05:30 |
|
Rushabh Mehta
|
0dd5da2299
|
Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
|
2012-03-06 18:41:52 +05:30 |
|
Rushabh Mehta
|
15da133de9
|
removed
|
2012-03-06 18:41:11 +05:30 |
|
Anand Doshi
|
2bc141f5db
|
fix in support ticket and email settings
|
2012-03-06 18:05:23 +05:30 |
|
Anand Doshi
|
bb64d302df
|
email digest fix
|
2012-03-06 11:42:32 +05:30 |
|
Rushabh Mehta
|
b9004bd6d0
|
doclist2
|
2012-03-05 18:28:33 +05:30 |
|
Anand Doshi
|
68fb2c9b19
|
fix in import error due to indentation issues in item_grou[
|
2012-03-01 18:20:31 +05:30 |
|
Anand Doshi
|
e90e35dcda
|
restoring contact control
|
2012-03-01 17:52:31 +05:30 |
|
Anand Doshi
|
0e140962b8
|
Fixes in support ticket overflow, desktop gradients and shadows, setup control fiscal defaults
|
2012-03-01 12:16:02 +05:30 |
|
Anand Doshi
|
fd5a213890
|
fix in account setup and user addition
|
2012-02-29 18:58:02 +05:30 |
|
Anand Doshi
|
0b8ac7fc68
|
fix in company setup
|
2012-02-29 18:33:39 +05:30 |
|
Anand Doshi
|
8049c27d78
|
Merge branch 'master' into navupdate
|
2012-02-29 16:22:30 +05:30 |
|
Rushabh Mehta
|
864a47933e
|
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
|
2012-02-29 15:11:27 +05:30 |
|
Rushabh Mehta
|
12852e73ab
|
added activity page
|
2012-02-29 15:11:06 +05:30 |
|
Anand Doshi
|
1304d97416
|
fix in import data page
|
2012-02-29 14:05:43 +05:30 |
|
Nabin Hait
|
41d6852218
|
Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
|
2012-02-29 11:25:09 +05:30 |
|
Nabin Hait
|
a3eee118fc
|
Added on_trash function for checking link of the master
|
2012-02-29 11:24:55 +05:30 |
|
Rushabh Mehta
|
a38bbe28ce
|
home page fixes
|
2012-02-29 10:55:43 +05:30 |
|