Commit Graph

18309 Commits

Author SHA1 Message Date
Anand Doshi
4cc7d3e392 fix in support ticket rendering 2012-03-08 14:49:49 +05:30
Anand Doshi
c37c772678 fix in support ticket thread 2012-03-08 14:35:19 +05:30
Anand Doshi
20f63da794 fix in messages 2012-03-08 12:10:51 +05:30
Anand Doshi
eb55df0aa3 fix in messages 2012-03-08 12:06:27 +05:30
Anand Doshi
a6952c935c doctype refactor first commit 2012-03-07 19:37:23 +05:30
Rushabh Mehta
9a1bdf7224 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-07 18:20:33 +05:30
Rushabh Mehta
f81a64e57f new listing and changed wn.widgets.listing to wn.ui.listing 2012-03-07 18:19:41 +05:30
Nabin Hait
928e89a359 validation added in enquire 2012-03-07 13:11:24 +05:30
Nabin Hait
20f68b342b Merge branch 'master' of github.com:webnotes/erpnext 2012-03-07 12:51:19 +05:30
Nabin Hait
00260870d1 fixes in rv 2012-03-07 12:50:55 +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
18b6c1d4e9 minor changes in support ticket 2012-03-06 18:31:25 +05:30
Anand Doshi
2bc141f5db fix in support ticket and email settings 2012-03-06 18:05:23 +05:30
Anand Doshi
a872d81983 trying to fix support ticket 2012-03-06 17:09:53 +05:30
Anand Doshi
2b60484bab fix in reverted my company 2012-03-06 16:17:34 +05:30
Anand Doshi
bb64d302df email digest fix 2012-03-06 11:42:32 +05:30
Nabin Hait
4e154d2233 removed rv series def val 2012-03-06 11:19:29 +05:30
Nabin Hait
b659457b4d Removed def value from invoice naming series 2012-03-06 11:07:24 +05:30
Rushabh Mehta
60871c3f54 merge, doclist2 2012-03-05 18:29:34 +05:30
Rushabh Mehta
b9004bd6d0 doclist2 2012-03-05 18:28:33 +05:30
Nabin Hait
a528f54dcb serial no fld print_hide=0 2012-03-05 17:45:38 +05:30
Rushabh Mehta
23d366a0be Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
Conflicts:
	version.num
2012-03-05 11:31:04 +01:00
Nabin Hait
d342e2a4f2 reload item tables 2012-03-05 15:22:55 +05:30
Nabin Hait
cf9c4c45a5 export /import fld hide issue, discount issue 2012-03-05 15:21:35 +05:30
Rushabh Mehta
2f69c14e36 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-05 06:34:17 +01:00
Nabin Hait
d14bea3de5 patch list updated 2012-03-05 11:03:54 +05:30
Rushabh Mehta
38305a4b65 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-05 06:30:10 +01:00
Nabin Hait
3f958f7433 reload patch: field order changed 2012-03-05 10:59:02 +05:30
Nabin Hait
07e9ff3d30 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-05 10:55:24 +05:30
Nabin Hait
9cee59cd05 field order changed 2012-03-05 10:54:54 +05:30
Anand Doshi
821cb64987 fix in delivery note detail double entry 2012-03-03 16:27:48 +05:30
Anand Doshi
5478842d80 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-03 15:02:18 +05:30
Anand Doshi
146f17bf57 fix in delivery note submission - error caused due to default packed qty 2012-03-03 15:01:41 +05:30
Nabin Hait
97e1770296 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-02 17:15:21 +05:30
Nabin Hait
89a30ff7dc Company 'all' removed from financial statements 2012-03-02 17:15:01 +05:30
Rushabh Mehta
c326075bdb Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-02 12:36:39 +01:00
Anand Doshi
c4e2d62333 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-02 17:05:33 +05:30
Anand Doshi
d536f16c53 user addition fix 2012-03-02 17:05:04 +05:30
Rushabh Mehta
bb8bf194a7 merge 2012-03-02 16:28:09 +05:30
Rushabh Mehta
ee92f4b8ca Merge branch 'master' of github.com:webnotes/erpnext 2012-03-02 16:25:35 +05:30
Rushabh Mehta
e45ffd6daf activity date fix 2012-03-02 16:25:22 +05:30
Nabin Hait
a0801f7e39 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-02 16:06:46 +05:30
Nabin Hait
40c514612b price list rate hiding issue 2012-03-02 16:06:33 +05:30
Anand Doshi
5cc8cd7dc1 do not record logins by demo@webnotestech.com 2012-03-02 15:42:08 +05:30
Nabin Hait
7e6b62eafd print hide issue 2012-03-02 15:12:52 +05:30
Nabin Hait
fae852eb78 print hide issue 2012-03-02 15:10:51 +05:30
Rushabh Mehta
d0fb5e5d5d merge 2012-03-02 14:58:39 +05:30
Nabin Hait
e0eb58ad26 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-02 14:57:56 +05:30
Nabin Hait
0d155a9135 print hide issue 2012-03-02 14:57:44 +05:30
Nabin Hait
1841d8defa pr/dn no mapping through sales/pur return 2012-03-02 14:57:27 +05:30
Rushabh Mehta
a86f3e4507 cleanup of handler.js 2012-03-02 14:56:51 +05:30
Rushabh Mehta
58cdaa8590 fix in support ticket sending 2012-03-02 10:03:16 +01:00
Anand Doshi
31c3190681 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-02 13:13:04 +05:30
Anand Doshi
f68e3053a7 fix in support ticket.. checks sync_support_mails checkbox before sending emails 2012-03-02 13:11:53 +05:30
Nabin Hait
6db30a5b5a Merge branch 'master' of github.com:webnotes/erpnext 2012-03-02 12:29:23 +05:30
Nabin Hait
88986ca007 column break print hide issue 2012-03-02 12:29:08 +05:30
Anand Doshi
86fa67065e Merge branch 'master' of github.com:webnotes/erpnext
Conflicts:
	version.num
2012-03-02 12:21:01 +05:30
Anand Doshi
ecd8df8cfb fix in user password change by system manager 2012-03-02 12:18:47 +05:30
Rushabh Mehta
305717a629 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-02 11:30:00 +05:30
Rushabh Mehta
37f531b6da fixes to profile update 2012-03-02 11:29:09 +05:30
Anand Doshi
a7c2de6164 fix in user passwordgs 2012-03-02 11:27:50 +05:30
Anand Doshi
1e9b15eb5d Merge branch 'master' of github.com:webnotes/erpnext
Conflicts:
	version.num
2012-03-01 19:28:36 +05:30
Anand Doshi
e306a1f5e1 fix in sales and purchase common column hide 2012-03-01 19:25:33 +05:30
Nabin Hait
06292433a6 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-01 19:23:42 +05:30
Nabin Hait
760e91e949 print hide issue fixed in dn 2012-03-01 19:23:21 +05:30
Rushabh Mehta
84e0c6f7ba Merge branch 'master' of github.com:webnotes/erpnext 2012-03-01 18:59:01 +05:30
Rushabh Mehta
b5af807281 browser support 2012-03-01 18:58:29 +05:30
Nabin Hait
c4bc429cf7 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-01 18:56:33 +05:30
Nabin Hait
80d5261100 patch list updated 2012-03-01 18:56:06 +05:30
Rushabh Mehta
97ceffccce Merge branch 'master' of github.com:webnotes/erpnext 2012-03-01 18:53:50 +05:30
Rushabh Mehta
5d267a4ad7 browse support 2012-03-01 18:53:06 +05:30
Nabin Hait
1fb0058283 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-01 18:48:54 +05:30
Nabin Hait
db4af96388 issue fixed in pos 2012-03-01 18:47:51 +05:30
Rushabh Mehta
f6cca4f218 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-01 18:42:44 +05:30
Rushabh Mehta
70f7674aed browse support and images 2012-03-01 18:42:05 +05:30
Anand Doshi
50b950b692 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-01 18:21:27 +05:30
Anand Doshi
68fb2c9b19 fix in import error due to indentation issues in item_grou[ 2012-03-01 18:20:31 +05:30
Nabin Hait
96639d76b2 fixed indentation issue for custom script 2012-03-01 18:11:27 +05:30
Nabin Hait
823f192876 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-01 18:04:29 +05:30
Nabin Hait
423474da5c transaction date issue in mapper patch 2012-03-01 18:04:08 +05:30
Nabin Hait
f237a67183 transaction date issue in mapper 2012-03-01 18:03:47 +05:30
Anand Doshi
232d725fd7 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-01 17:55:13 +05:30
Anand Doshi
e90e35dcda restoring contact control 2012-03-01 17:52:31 +05:30
Nabin Hait
e3ce5b4e0c voucher date removal issue fixed 2012-03-01 17:37:36 +05:30
Nabin Hait
be0b090d27 voucher date removal issue fixed 2012-03-01 17:31:51 +05:30
Nabin Hait
7807c6f173 clear cache patch 2012-03-01 15:58:30 +05:30
Nabin Hait
5b29deb968 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-01 15:52:12 +05:30
Nabin Hait
995d79421d error fixed in patch 2012-03-01 15:51:33 +05:30
Anand Doshi
496d9a0980 Merge branch 'master' into navupdate 2012-03-01 14:55:22 +05:30
Anand Doshi
48ca42beb9 Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
Conflicts:
	version.num
2012-03-01 14:54:01 +05:30
Anand Doshi
08c8edb87f fix in desktop and notifications 2012-03-01 14:53:05 +05:30
Nabin Hait
b95ad21208 Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate 2012-03-01 14:48:13 +05:30
Nabin Hait
cf907f98bd error fixed in posting balance 2012-03-01 14:47:56 +05:30
Rushabh Mehta
4a0cc249a9 merge 2012-03-01 13:59:47 +05:30
Rushabh Mehta
b473a4d489 added all_read condition to check if user can read 2012-03-01 13:58:17 +05:30
Anand Doshi
8acf46c725 update in patches 2012-03-01 13:58:13 +05:30
Anand Doshi
552093c3fd Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
Conflicts:
	version.num
2012-03-01 13:51:23 +05:30
Anand Doshi
1f4efc77ac fix in print formats and file rename 2012-03-01 13:50:33 +05:30
Rushabh Mehta
b6023a4d34 users - list condition 2012-03-01 13:47:51 +05:30
Rushabh Mehta
df33cb3a39 added activity avatar and removed menus.css 2012-03-01 13:44:09 +05:30
Rushabh Mehta
fe521fdbc2 add messages to always show and add attribution to patch 2012-03-01 13:39:09 +05:30
Rushabh Mehta
cc131af77a add messages to always show 2012-03-01 13:35:07 +05:30
Rushabh Mehta
5ce587be33 merge 2012-03-01 13:32:06 +05:30
Rushabh Mehta
4c1e9e7db4 added attributions pages 2012-03-01 13:30:34 +05:30
Nabin Hait
2b9a13d81f Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate 2012-03-01 13:05:23 +05:30
Nabin Hait
eaf144a545 form cleanup in pur cycle 2012-03-01 13:05:04 +05:30
Nabin Hait
e73db0e331 set serial_no status="In Store" if purchase return cancelled 2012-03-01 12:26:12 +05:30
Anand Doshi
fba591cbb3 Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate 2012-03-01 12:21:16 +05:30
Rushabh Mehta
111bca8220 activity image 2012-03-01 12:19:18 +05:30
Anand Doshi
91797904c9 Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate 2012-03-01 12:17:54 +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
Rushabh Mehta
cc6398e7c7 patch - update user_image in profile 2012-03-01 12:15:54 +05:30
Rushabh Mehta
b4a2f4c98f activty images, website heading fix 2012-03-01 11:49:54 +05:30
Rushabh Mehta
ffb25fc36b users button fix 2012-03-01 11:29:22 +05:30
Rushabh Mehta
94a2fecf9d merge 2012-03-01 11:26:07 +05:30
Rushabh Mehta
428929b1f7 fixed permissions 2012-03-01 11:24:45 +05:30
Nabin Hait
bb4539e458 fixed conflict in version 2012-03-01 10:58:48 +05:30
Nabin Hait
6d517ff005 form cleanup: fixed callback issues 2012-03-01 10:57:23 +05:30
Nabin Hait
284a07e23b if more info unchecked, more info in customer, supplier will be visible 2012-03-01 10:55:41 +05:30
Nabin Hait
177ca8dbbd Description changed 2012-03-01 10:54:34 +05:30
Nabin Hait
63b275c97f allowed debit and credit against same acc head 2012-03-01 10:35:35 +05:30
Rushabh Mehta
a4f454faa0 module page link fix 2012-02-29 19:19:01 +05:30
Rushabh Mehta
204e77d125 background, user_info 2012-02-29 19:09:20 +05:30
Rushabh Mehta
dc7e6889dd Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate 2012-02-29 19:06:56 +05:30
Anand Doshi
9a63996699 fix in account setup and user addition 2012-02-29 18:59:45 +05:30
Anand Doshi
fd5a213890 fix in account setup and user addition 2012-02-29 18:58:02 +05:30
Rushabh Mehta
4240ade0de user background 2012-02-29 18:40:21 +05:30
Rushabh Mehta
412a65c23c user background 2012-02-29 18:38:18 +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
79ae16506b minor fix 2012-02-29 15:23:25 +05:30
Rushabh Mehta
1572adf7f7 minor fix 2012-02-29 15:19:20 +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
c70933373b Merge branch 'master' of github.com:webnotes/erpnext 2012-02-29 14:06:25 +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
Nabin Hait
902b14592f Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate 2012-02-29 10:44:51 +05:30
Nabin Hait
22aa17bcce changes in trend analyzer query 2012-02-29 10:44:27 +05:30
Nabin Hait
72d412567c Update erpnext/analysis/search_criteria/trend_analyzer/trend_analyzer.py 2012-02-29 10:43:21 +05:30
Rushabh Mehta
17da764d04 modules_setup 2012-02-28 18:56:56 +05:30
Rushabh Mehta
75d8f51e7d messages and merge 2012-02-28 17:44:16 +05:30
Rushabh Mehta
aaf86ba4ef added users 2012-02-28 17:40:13 +05:30
Nabin Hait
bef8b86331 Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate 2012-02-28 14:14:49 +05:30
Nabin Hait
1f4aeab85c error fixed in label_cleanup 2012-02-28 14:14:20 +05:30
Anand Doshi
6b69b4f6a4 Merge branch 'master' into navupdate 2012-02-28 13:51:29 +05:30
Anand Doshi
fc60335620 fix in leave application query 2012-02-28 13:51:04 +05:30
Nabin Hait
6c75cce4b9 fixed confilct 2012-02-28 11:46:43 +05:30
Anand Doshi
f9e4b16731 fix in scheduler related import issue 2012-02-28 11:31:46 +05:30
Anand Doshi
b37f22dc97 Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate 2012-02-27 19:16:40 +05:30
Anand Doshi
ac144121ff fix in hover effect 2012-02-27 19:16:24 +05:30
Rushabh Mehta
caebd1bff6 Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate 2012-02-27 19:05:44 +05:30
Rushabh Mehta
1a5c9c5926 message reply 2012-02-27 18:56:31 +05:30
Nabin Hait
5bdd20c46b dynamic label change, form cleanup, hide/unhide in purchase cycle 2012-02-27 18:46:51 +05:30
Anand Doshi
2b8c4d78f3 reload messages 2012-02-27 18:42:00 +05:30
Rushabh Mehta
ef29e55469 message delete 2012-02-27 18:41:11 +05:30
Anand Doshi
f9f73bfa55 Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
Conflicts:
	version.num
2012-02-27 18:32:38 +05:30
Anand Doshi
e68a1e5ecc click effect on button 2012-02-27 18:31:15 +05:30
Rushabh Mehta
07a36a4baa messages 2012-02-27 18:17:57 +05:30
Rushabh Mehta
05c339cea7 merge 2012-02-27 18:08:27 +05:30
Rushabh Mehta
fdea966198 messages 2012-02-27 18:03:54 +05:30
Anand Doshi
226df715b2 support ticket css 2012-02-27 17:24:47 +05:30
Anand Doshi
b25b4b7624 Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate 2012-02-27 17:19:03 +05:30
Anand Doshi
5b1beebd33 Changed position of menus in navbar 2012-02-27 17:17:48 +05:30
Anand Doshi
0455ddfb98 Merge branch 'master' into navupdate
Conflicts:
	version.num
2012-02-27 13:21:48 +05:30
Rushabh Mehta
a3211d3e94 calendar bug fixes 2012-02-27 12:54:47 +05:30
Rushabh Mehta
aa999df088 calendar fix 2012-02-27 12:54:04 +05:30
Nabin Hait
5b09122264 fixed conflict while merging 2012-02-27 12:52:46 +05:30
Nabin Hait
78805e702e patch for form/label cleanup 2012-02-27 12:48:35 +05:30
Nabin Hait
0959341130 Form Cleanup: Dynamic label change, smart hide/unhide and dependencies 2012-02-27 12:47:40 +05:30
Nabin Hait
0cde984dc5 Update future year balances at the time of tranaction and acc bal reposting patch 2012-02-27 12:34:14 +05:30
Anand Doshi
01a7558589 added class 'web-footer' to text 'Powered by ERPNext' to make it visible in any background 2012-02-24 19:35:09 +05:30
Anand Doshi
d45ab64a85 Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
Conflicts:
	version.num
2012-02-24 19:28:09 +05:30
Anand Doshi
40ee8d6432 UI fixes in support ticket and desktop 2012-02-24 19:21:47 +05:30
Rushabh Mehta
a50b762d36 support link 2012-02-24 18:13:08 +05:30
Anand Doshi
db62876bc9 desktop icons 2012-02-24 17:56:00 +05:30
Anand Doshi
eaaf65131b desktop: first cut 2012-02-24 15:29:07 +05:30
Rushabh Mehta
b73fa49f34 cleaned up kb 2012-02-24 15:07:39 +05:30
Rushabh Mehta
2886b95da0 added todo 2012-02-24 11:26:31 +05:30
Anand Doshi
ef041114bb show submittable warning 2012-02-23 12:56:45 +05:30
Rushabh Mehta
3966f1dc5d added license files 2012-02-23 12:35:32 +05:30
Rushabh Mehta
c023cdd0c0 Merge branch 'master' of github.com:webnotes/erpnext into navupdate 2012-02-23 11:46:39 +05:30
Rushabh Mehta
1a35574afe redesigned scheduler 2012-02-23 11:46:28 +05:30
Anand Doshi
23b9de1582 Merge branch 'master' of github.com:webnotes/erpnext 2012-02-23 11:32:07 +05:30
Anand Doshi
bfa58a3516 allow deletion of products 2012-02-23 11:31:17 +05:30
Anand Doshi
9f94275d65 allow deletion of products 2012-02-23 11:27:40 +05:30
Nabin Hait
8569b7400a Update erpnext/production/doctype/bill_of_materials/bill_of_materials.py 2012-02-23 10:46:24 +05:30
Anand Doshi
cab5b31ffa change product's document type to Master 2012-02-22 18:33:39 +05:30
Nabin Hait
72129a8587 Product document type set as master 2012-02-22 18:30:20 +05:30
Rushabh Mehta
17773d0763 added docdiff and removed un-necessary files 2012-02-22 15:55:41 +05:30
Rushabh Mehta
c5471ddb8d added setup and removed multi-col layout in body 2012-02-22 12:07:42 +05:30
Rushabh Mehta
2478363bba Merge branch 'master' of github.com:webnotes/erpnext into navupdate 2012-02-21 19:04:14 +05:30
Rushabh Mehta
35fabf76a6 updated module pages 2012-02-21 19:03:50 +05:30
Anand Doshi
ffbfd2c60a Update feed on submission 2012-02-21 18:15:31 +05:30
Rushabh Mehta
393d325e00 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-21 13:15:02 +01:00
Rushabh Mehta
085617ed12 merge latest 2012-02-21 17:31:04 +05:30
Anand Doshi
c70e8d9791 fix in remove_archive 2012-02-21 17:30:36 +05:30
Rushabh Mehta
50144468be Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-21 12:58:48 +01:00
Anand Doshi
b8fa4a37e5 fix in remove_archive 2012-02-21 17:27:24 +05:30
Rushabh Mehta
d025133b39 added module pages and other css updates 2012-02-21 17:26:50 +05:30
Rushabh Mehta
307da4f91b Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-21 12:17:20 +01:00
Anand Doshi
62a3872480 fix in remove_archive 2012-02-21 16:46:57 +05:30
Rushabh Mehta
534b6a7d7f Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-21 12:16:13 +01:00
Anand Doshi
5ff541b53c fix in remove_archive patch 2012-02-21 16:44:31 +05:30
Rushabh Mehta
7a867fc1f8 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-21 12:00:02 +01:00
Anand Doshi
8e703ef26f packing slip fix 2012-02-21 16:29:46 +05:30
Rushabh Mehta
0c410b8261 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-21 11:58:03 +01:00
Anand Doshi
0bcc20f980 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-21 16:26:36 +05:30
Anand Doshi
ff33677624 Packing Slip Fix 2012-02-21 16:26:08 +05:30
Nabin Hait
e1f976ce05 deleted supp quotation 2012-02-21 14:33:45 +05:30
Rushabh Mehta
02b36eba1c Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-21 09:54:33 +01:00
Nabin Hait
b461e1788a patch list updated 2012-02-21 14:22:06 +05:30
Rushabh Mehta
cdf0b7a502 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-21 09:45:46 +01:00
Anand Doshi
f9e9000092 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-21 14:12:39 +05:30
Anand Doshi
c05ee5bf64 patch to remove archive 2012-02-21 14:12:13 +05:30
Rushabh Mehta
25e57421f7 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-21 09:17:30 +01:00
Nabin Hait
4b36c1e8f4 insert after fld should be no copy in custom fld 2012-02-21 13:43:59 +05:30
Rushabh Mehta
2fe8f12424 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-21 09:06:55 +01:00
Nabin Hait
8e9b578c00 expected delivery date can be equal to po date, not before po date 2012-02-21 13:35:28 +05:30
Rushabh Mehta
e55778627f Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-21 08:57:24 +01:00
Nabin Hait
1a7cd16dba reorder qty fld in item 2012-02-21 13:26:49 +05:30
Nabin Hait
5fe6760406 reorder level checking based on stores and reserved warehouse 2012-02-21 13:25:27 +05:30
Rushabh Mehta
98902f82db Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-21 07:24:52 +01:00
Rushabh Mehta
6e156c748b moved to boostrap 2.0 2012-02-21 11:19:24 +05:30
Nabin Hait
468008717b removed extra cond from bom 2012-02-21 11:14:49 +05:30
Rushabh Mehta
4dc2f43c0d moving to bootstrap 2.0 2012-02-21 10:30:43 +05:30
Rushabh Mehta
f70760d8c8 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-20 14:09:09 +01:00
Anand Doshi
0b3f4d40c4 fix in support ticket and email digest 2012-02-20 18:38:33 +05:30
Rushabh Mehta
09a897afe4 added selling-home 2012-02-20 18:30:52 +05:30
Rushabh Mehta
d25e0957d4 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-20 12:06:55 +01:00
Anand Doshi
2a7fa0451c todo_item patch 2012-02-20 16:36:08 +05:30
Anand Doshi
09ef7dc416 Merge branch 'latest' of github.com:webnotes/erpnext into latest
Conflicts:
	version.num
2012-02-20 16:33:28 +05:30
Anand Doshi
c3023be794 notifications of todo items 2012-02-20 16:31:55 +05:30
Rushabh Mehta
3f29b85f5d 2 col layout in form, docbrowser and home 2012-02-20 15:40:29 +05:30
Rushabh Mehta
cb1ab98bec Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-20 08:35:47 +01:00
Nabin Hait
f361289147 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-20 13:05:01 +05:30
Nabin Hait
6ac0be5fb2 delete all cancelled gl entry on account deletion 2012-02-20 13:04:36 +05:30
Rushabh Mehta
5ceab06bb5 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-20 08:06:37 +01:00
Rushabh Mehta
13531b73eb form bugfix and otehr minor fixes 2012-02-20 12:35:23 +05:30
Nabin Hait
db0df4fd53 over-wrinting of child tables data in import_data 2012-02-17 15:55:51 +05:30
Rushabh Mehta
7b7af279cf Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-17 08:18:30 +01:00
Rushabh Mehta
aa848bee28 website css cleanups + dropdown in top toolbar 2012-02-17 12:06:33 +05:30
Rushabh Mehta
639c268abd Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-17 05:59:46 +01:00
Anand Doshi
e31d94ffc4 fix in control panel issue of sales and purchase return wizard 2012-02-17 10:27:46 +05:30
Rushabh Mehta
265c41b604 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-16 12:05:24 +01:00
Anand Doshi
e7ecb86ce7 roles for a new company's first user 2012-02-16 16:34:47 +05:30
Rushabh Mehta
ee5ba8105e Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-16 11:46:59 +01:00
Anand Doshi
aa92ecdd26 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-16 15:56:57 +05:30
Anand Doshi
8aa841866f add Website Manager Role to first user 2012-02-16 15:56:36 +05:30
Rushabh Mehta
22eb57a217 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-16 11:00:23 +01:00
Nabin Hait
60e81ce8f5 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-16 15:29:09 +05:30
Rushabh Mehta
7c76f80966 gateway patch 2012-02-16 10:58:45 +01:00
Nabin Hait
195b620787 callback issue in packing slip 2012-02-16 15:21:39 +05:30
Rushabh Mehta
1b1179477b added patch 2012-02-16 15:11:28 +05:30
Rushabh Mehta
8425c87d5f fixed old style file names 2012-02-16 13:01:28 +05:30
Anand Doshi
761a044cd7 fix in user addition email sending.. 2012-02-16 12:47:11 +05:30
Anand Doshi
ec1af179cb Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-16 12:08:10 +05:30
Anand Doshi
f8395343f7 fix in password not copied to server database during company creation 2012-02-16 12:07:38 +05:30
Nabin Hait
da1f48b96e mentioed account type for some tax/chargeable account 2012-02-16 10:55:05 +05:30
Nabin Hait
470e18a380 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-15 17:31:56 +05:30
Nabin Hait
2d8ac7f3f9 fixed asynchronus issue 2012-02-15 17:31:23 +05:30
Anand Doshi
2c2991c3b7 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-15 15:42:34 +05:30
Anand Doshi
65bc9db85e File Data rename 2012-02-15 15:42:18 +05:30
Rushabh Mehta
f27b67b474 fix in change password 2012-02-15 10:45:29 +01:00
Nabin Hait
237ac638f5 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-15 14:28:57 +05:30
Nabin Hait
ab90ee04f5 callback issues and item default get most priority 2012-02-15 14:28:02 +05:30
Rushabh Mehta
533bc77976 rolling back gateway changes 2012-02-15 09:35:42 +01:00
Nabin Hait
0e14191163 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-14 18:55:34 +05:30
Nabin Hait
13e62ccbc9 clear cache patch 2012-02-14 18:55:01 +05:30
Rushabh Mehta
c9b10fd8d4 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-14 17:25:40 +05:30
Rushabh Mehta
eec8e92604 login, analytics fix 2012-02-14 17:25:31 +05:30
Anand Doshi
518202f9f2 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-14 16:16:42 +05:30
Anand Doshi
737c2f9432 fix in login as 2012-02-14 16:16:13 +05:30
Nabin Hait
75ef7c7a89 def val of is_subcontracted is NO 2012-02-14 16:08:22 +05:30
Nabin Hait
3d794a682d required by date should be mapped in indent-po 2012-02-14 15:25:11 +05:30
Nabin Hait
461a071dfa Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-14 15:13:52 +05:30
Nabin Hait
84d73103f8 sales team mapping issue in SO-DN and SO-RV 2012-02-14 15:13:21 +05:30
Anand Doshi
ec6f9fedd6 Fix in smtplib import issue 2012-02-14 13:54:04 +05:30
Anand Doshi
507cb3c592 add website manager patch 2012-02-14 12:58:47 +05:30
Anand Doshi
b2be11cad1 error due to old packing slip hide fields in feature setup 2012-02-14 12:45:55 +05:30
Rushabh Mehta
56c5ae5bc8 version 2012-02-14 11:47:05 +05:30
Rushabh Mehta
afaac60982 made all.js and all.css and all guests share same session 2012-02-14 11:44:13 +05:30
Nabin Hait
5bd88d99b5 fixes 2012-02-14 11:39:42 +05:30
Nabin Hait
7eda1cac27 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-14 09:57:57 +05:30
Anand Doshi
2c582d5f65 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-13 19:00:24 +05:30
Anand Doshi
d7ddea1e2a domain list patch 2012-02-13 18:59:43 +05:30
Nabin Hait
c45337bf97 Merge branch 'stable' of github.com:webnotes/erpnext into stable 2012-02-13 18:25:52 +05:30
Nabin Hait
409612457b error fixed in trash control 2012-02-13 18:24:14 +05:30
Rushabh Mehta
bfc03cf8bd Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-13 13:41:51 +01:00
Rushabh Mehta
a9bd79487d company whitelist fix 2012-02-13 13:41:45 +01:00
Anand Doshi
ce0c65f173 Merge branch 'stable' into latest 2012-02-13 18:01:23 +05:30
Anand Doshi
5fe5df370f Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-13 17:57:45 +05:30
Anand Doshi
e8928b8bff website settings 2012-02-13 17:56:59 +05:30
Rushabh Mehta
f17ce7bc67 added whitelist check 2012-02-13 16:50:52 +05:30
Nabin Hait
e63ea67b54 error fixed in patch 2012-02-13 15:38:15 +05:30
Anand Doshi
82cfe4b28d Merge branch 'stable' of github.com:webnotes/erpnext into stable 2012-02-13 15:30:24 +05:30
Nabin Hait
42852a88dc account type patch added in patch list 2012-02-13 15:29:51 +05:30
Anand Doshi
702f174265 call update item details in post render 2012-02-13 15:29:41 +05:30
Rushabh Mehta
ff0946bbda naming fix in web page, list style 2012-02-13 15:26:17 +05:30
Nabin Hait
bd0c05bf94 Mentioned account type in default accounts 2012-02-13 14:48:34 +05:30
Anand Doshi
945b3c4680 Domain Name list in Website Settings 2012-02-13 14:04:54 +05:30
Nabin Hait
7949b33b70 Logout session if user deleted 2012-02-13 12:43:38 +05:30
Nabin Hait
043b0f26bd Merge branch 'stable' of github.com:webnotes/erpnext 2012-02-13 12:26:45 +05:30
Nabin Hait
bf0d92e125 deleted and disabled users excluded in applicable to and approver link fields 2012-02-13 12:22:08 +05:30
Nabin Hait
b0fd0b3615 Edited through patch 2012-02-13 11:34:36 +05:30
Anand Doshi
ba746dfb2f Stop support ticket refresh on send, if there is a server message 2012-02-10 15:46:54 +05:30
Anand Doshi
701e0559e9 Merge branch 'stable' into latest 2012-02-10 13:44:03 +05:30
Anand Doshi
00f9b58bba Do not refresh is there is an exception 2012-02-10 13:43:39 +05:30
Anand Doshi
15d2d45b36 Merge branch 'stable' into latest 2012-02-10 10:57:26 +05:30
Anand Doshi
110047ea5b Debit/Credit note creation on purchase/sales return 2012-02-10 10:48:35 +05:30
Anand Doshi
dae6e1e6a2 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-09 12:48:13 +05:30
Anand Doshi
ad37575701 First name and last name in setup account dialog 2012-02-09 12:48:04 +05:30
Rushabh Mehta
96765f170d Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-09 12:46:17 +05:30
Rushabh Mehta
0b2874afdb fix to install 2012-02-09 12:45:50 +05:30
Anand Doshi
95e89de21d Merge branch 'stable' into latest
Conflicts:
	erpnext/home/page/event_updates/event_updates.js
2012-02-09 12:23:15 +05:30
Anand Doshi
3801804a8a First Name and Last Name in setup account dialog box 2012-02-09 12:16:47 +05:30
Anand Doshi
83302dfe63 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-08 16:23:47 +05:30
Anand Doshi
cf5f0232a9 Merge branch 'stable' into latest 2012-02-08 16:23:35 +05:30
Anand Doshi
df3f452a14 Fix in Purchase Invoice creation due to item tax stringify issue 2012-02-08 16:22:59 +05:30
Rushabh Mehta
f16e32eca1 report builder fix' 2012-02-08 16:16:28 +05:30
Rushabh Mehta
b8d6497818 many style fixes 2012-02-08 12:33:13 +05:30
Anand Doshi
a685379d6b Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-08 11:06:12 +05:30
Anand Doshi
9908d6e4be Merge branch 'stable' into latest 2012-02-08 11:05:47 +05:30
Rushabh Mehta
a1f3764238 about us style fix 2012-02-08 10:51:08 +05:30
Anand Doshi
c9fcc05792 Allow IS POS to be set as default from customize form view 2012-02-08 10:46:27 +05:30
Rushabh Mehta
02ec8c06fb Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-08 10:44:33 +05:30
Rushabh Mehta
3fd279977b website p sty;e 2012-02-08 10:44:02 +05:30
Anand Doshi
c6eea1e1ca Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-08 10:24:16 +05:30
Anand Doshi
88e4a0ffc2 Merge branch 'stable' into latest 2012-02-08 10:24:03 +05:30
Rushabh Mehta
bd20d29dae pre style 2012-02-08 10:23:16 +05:30
Anand Doshi
d7ac84f430 removed msgprint in pending po items to receive report 2012-02-08 10:18:30 +05:30
Anand Doshi
a629fa3f05 Merge branch 'stable' into latest 2012-02-07 18:02:42 +05:30
Anand Doshi
02035d071a Fix in import docs containing utf-8 encoding 2012-02-07 17:57:40 +05:30
Rushabh Mehta
a7f0c448bb Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-07 14:58:14 +05:30
Rushabh Mehta
4d20b2246c style fixes 2012-02-07 14:57:49 +05:30
Anand Doshi
f812acf063 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-07 14:51:56 +05:30
Anand Doshi
8d3d2a9905 Merge branch 'stable' into latest 2012-02-07 14:51:38 +05:30
Anand Doshi
e59f456ad4 If support ticket doesnt have body, then do not append in reply to string 2012-02-07 14:50:50 +05:30
Rushabh Mehta
5b625fa592 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-07 14:32:20 +05:30
Rushabh Mehta
f9620eaf44 fix to product, blog 2012-02-07 14:31:49 +05:30
Anand Doshi
b65363aa46 Merge branch 'stable' into latest 2012-02-07 14:28:29 +05:30
Anand Doshi
188a499f45 Fix in default customer group fetch while converting lead to customer 2012-02-07 14:28:05 +05:30
Anand Doshi
4e47c48707 Merge branch 'stable' into latest 2012-02-07 13:33:10 +05:30
Anand Doshi
7e8082e193 Fixed mapping of conversion rate for PO-PR and PO-PV 2012-02-07 13:32:20 +05:30
Rushabh Mehta
518533fde0 added sitemap, rss feeds 2012-02-07 13:29:31 +05:30
Rushabh Mehta
9c7fe3bce4 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-07 11:43:51 +05:30
Rushabh Mehta
8b96b05163 fixes to products 2012-02-07 11:43:41 +05:30
Rushabh Mehta
002340080d fixes to products 2012-02-07 07:08:05 +01:00
Anand Doshi
67d2c8396c Merge branch 'latest' of github.com:webnotes/erpnext into latest
Conflicts:
	version.num
2012-02-07 10:59:29 +05:30
Anand Doshi
e00e70841c Merge branch 'stable' into latest
Conflicts:
	erpnext/accounts/doctype/journal_voucher/journal_voucher.js
	erpnext/accounts/doctype/payable_voucher/payable_voucher.js
	index.html
	version.num
2012-02-07 10:58:45 +05:30
Anand Doshi
d008964fd6 Fetch defaults in purchase common and sales common related doctypes and fix minor utf-8 issues 2012-02-07 10:48:11 +05:30
Rushabh Mehta
f35992f695 top bar to accept url 2012-02-07 10:39:17 +05:30
Anand Doshi
99e7f3d7a4 Fix in valuation_control.py: eval requires a string. does not accept None. 2012-02-06 18:06:34 +05:30
Rushabh Mehta
0a45f96c48 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-06 17:40:46 +05:30
Rushabh Mehta
28307193a1 item group txt 2012-02-06 17:40:37 +05:30
Rushabh Mehta
cc54fd46bc website fixes 2012-02-06 13:09:08 +01:00
Rushabh Mehta
e651648b1b added missing icons 2012-02-06 16:28:06 +05:30
Rushabh Mehta
a7e68f7cd7 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-06 15:33:37 +05:30
Rushabh Mehta
e219db0e20 moved wnf.py to erpnext and added website manager role 2012-02-06 15:33:08 +05:30
Rushabh Mehta
b4244bacba Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-06 10:59:48 +01:00
Rushabh Mehta
4167e2f97a patch fix 2012-02-06 10:58:48 +01:00
Rushabh Mehta
74fab55948 add home in website patch 2012-02-06 14:34:42 +05:30
Rushabh Mehta
594a0ca11d fix in related page 2012-02-06 12:52:15 +05:30
Rushabh Mehta
af1cb632d6 bugfix to topbar 2012-02-06 07:29:52 +01:00
Rushabh Mehta
04048ff890 Merge branch 'stable' of github.com:webnotes/erpnext into latest 2012-02-06 07:12:43 +01:00
Anand Doshi
7e13f9b4b5 Fix in email digest due to unicode change 2012-02-06 11:41:25 +05:30
Rushabh Mehta
fd5005567b Fix in setup role permissions 2012-02-06 06:34:04 +01:00
Rushabh Mehta
7d5575ea3a Merge branch 'stable' of github.com:webnotes/erpnext into latest 2012-02-04 11:53:08 +01:00
Anand Doshi
b05f1a68f5 support ticket send issue 2012-02-04 16:22:21 +05:30
Rushabh Mehta
eba29ab88a Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-04 09:54:10 +05:30
Rushabh Mehta
6147451da3 refactored patches, bug fix for assign_to 2012-02-04 09:53:25 +05:30
Rushabh Mehta
cc43b7e927 Merge branch 'stable' of github.com:webnotes/erpnext into latest 2012-02-03 13:35:59 +01:00
Anand Doshi
3f711e2cb0 Fix in support ticket response issue 2012-02-03 18:03:32 +05:30
Rushabh Mehta
479670e4e1 added unicode to mysql, fix in about us 2012-02-03 16:56:18 +05:30
Rushabh Mehta
b4c814484e fix to patch 2012-02-03 13:36:44 +05:30
Rushabh Mehta
63d669f390 updated feed for comments and login 2012-02-03 12:56:12 +05:30
Rushabh Mehta
adc9a61bd7 bugfix 2012-02-02 16:45:26 +05:30
Rushabh Mehta
50e2cfe78e dateutil.js/patch fix 2012-02-02 16:40:01 +05:30
Anand Doshi
6d5cd01e03 Merge branch 'stable' into latest 2012-02-02 15:36:58 +05:30
Anand Doshi
2cb047d5a4 Added search field 'account_type' in account doctype 2012-02-02 15:36:34 +05:30
Anand Doshi
62427a6024 Merge branch 'stable' into latest 2012-02-02 15:23:33 +05:30
Anand Doshi
962c2aa80d Auto fetch default bank account for jv of type Bank Voucher 2012-02-02 15:22:11 +05:30
Anand Doshi
8694dbb754 Merge branch 'stable' into latest 2012-02-02 14:07:55 +05:30
Anand Doshi
fd11313138 Support ticket response text fix 2012-02-02 14:07:39 +05:30
Anand Doshi
1a3bce3676 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-02 13:45:00 +05:30
Anand Doshi
32e1fa22cd Merge branch 'stable' into latest 2012-02-02 13:44:32 +05:30
Rushabh Mehta
63adcb7355 patch update 2012-02-02 13:44:28 +05:30
Anand Doshi
ce25e169ab Show only last response in support ticket response message 2012-02-02 13:44:05 +05:30
Rushabh Mehta
a3d21a46e8 version 2012-02-02 13:43:20 +05:30
Rushabh Mehta
7018b19f42 added website settings, refactored home 2012-02-02 13:42:28 +05:30
Anand Doshi
0c9cde9f62 Merge branch 'stable' into latest
Conflicts:
	version.num
2012-02-02 12:43:39 +05:30
Anand Doshi
354dd9b35a Allow changing export_rate if discount=0, then calculate discount based on ref_rate and export_rate (valid for non inclusive pricing) 2012-02-02 12:42:14 +05:30
Anand Doshi
a9a5128402 Merge branch 'stable' into latest
Conflicts:
	erpnext/stock/doctype/item/item.txt
	index.html
	version.num
2012-02-02 11:44:25 +05:30
Anand Doshi
75d30b803f Packing Slip and its patches 2012-02-02 11:38:15 +05:30
Rushabh Mehta
d47e1d14b7 added related page and other cleanups 2012-02-01 18:02:33 +05:30
Rushabh Mehta
9c69914cf6 todo fix 2012-02-01 15:03:54 +05:30
Rushabh Mehta
9ef63f93d6 moved back to 'index.cgi' model 2012-02-01 14:47:29 +05:30
Anand Doshi
3325d0db74 Patch to set docstatus=2 for purchase returned serial no 2012-02-01 11:36:31 +05:30
Anand Doshi
4f948e03be Set docstatus as 2 for a purchase returned serial no 2012-02-01 11:27:36 +05:30
Rushabh Mehta
ab1148cbc9 added products, custom pages and footer 2012-01-31 18:01:16 +05:30
Anand Doshi
6afc6818a3 Check for duplicate challan number only in submitted purchase receipts 2012-01-31 17:21:04 +05:30
Anand Doshi
0717ca63b2 Fix in Purchase Return - Serial No. status issue 2012-01-31 16:20:37 +05:30
Anand Doshi
6c95ccb8f5 Net total calculation fix 2012-01-30 14:28:31 +05:30
Rushabh Mehta
bc5ec4f19e version 2012-01-30 14:02:41 +05:30
Rushabh Mehta
d6840b202a added products + cleanups 2012-01-30 14:00:46 +05:30
Anand Doshi
2729123868 Fix add user from my company 2012-01-30 12:50:18 +05:30
Anand Doshi
5f29438b1c Fix in add user in my company 2012-01-30 12:44:59 +05:30
Anand Doshi
f3d3105d9a Password fix on add user 2012-01-30 12:40:07 +05:30
Anand Doshi
e72de12993 Merge branch 'master' into latest
Conflicts:
	index.html
	version.num
2012-01-30 11:59:05 +05:30
Anand Doshi
69cfc5566a Email settings check on save 2012-01-30 11:54:59 +05:30
Anand Doshi
d3db70bb72 Supplier rename fix 2012-01-30 11:08:47 +05:30
Anand Doshi
327269fbc6 Check email settings while saving 2012-01-27 18:49:51 +05:30
Rushabh Mehta
3a751e8f82 added blog subscriber, unsubscribe 2012-01-27 18:00:14 +05:30
Rushabh Mehta
ad10c695ff Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-01-27 15:57:32 +05:30
Rushabh Mehta
c8d2e73ee6 added blog 2012-01-27 15:57:17 +05:30
Anand Doshi
76a4caeada fix in send notification part of recurring invoices 2012-01-27 14:34:26 +05:30
Anand Doshi
f5738817db fix in recurring invoice 2012-01-27 14:18:09 +05:30
Anand Doshi
707cd06606 Merge branch 'latest' of github.com:webnotes/erpnext into latest
Conflicts:
	erpnext/accounts/doctype/receivable_voucher/receivable_voucher.py
2012-01-27 12:30:35 +05:30
Anand Doshi
02c662936f Merge branch 'master' into latest 2012-01-27 12:28:21 +05:30
Anand Doshi
74d1b65105 changed sql to webnotes.conn.sql to avoid errors due to closing of connections in scheduler/push patch 2012-01-27 12:25:09 +05:30
Rushabh Mehta
51e51da63f added about_us 2012-01-27 12:17:09 +05:30
Rushabh Mehta
4adaae6974 version 2012-01-25 18:49:32 +05:30
Rushabh Mehta
949496c31b added website.page.contact 2012-01-25 18:48:46 +05:30
Anand Doshi
af1ad9a31e Merge branch 'latest' of github.com:webnotes/erpnext into latest
Conflicts:
	version.num
2012-01-25 17:27:57 +05:30
Anand Doshi
6e174cc2c4 Merge branch 'master' into latest
Conflicts:
	erpnext/setup/doctype/notification_control/notification_control.js
	index.html
	version.num
2012-01-25 17:21:14 +05:30
Anand Doshi
46848a48fe Show DocType Labels instead of DocType names in Customize Form View 2012-01-25 17:15:46 +05:30
Rushabh Mehta
4b1fe0528a added home template 2012-01-25 15:06:28 +05:30
Anand Doshi
04a115e771 Fix: Logout user on disabling profile 2012-01-25 12:52:38 +05:30
Rushabh Mehta
9c7a01ade9 starting up 2012-01-25 11:04:54 +05:30
Rushabh Mehta
a8ad3907db added website page, home, patch 2012-01-25 10:37:35 +05:30
Anand Doshi
c655e37f1a Fixes in production and stock modules 2012-01-25 09:58:06 +05:30
Anand Doshi
d194e6b5cf Fix: show message if contact doesn't have email if notification control is enabled 2012-01-24 17:08:53 +05:30
Rushabh Mehta
17a8a3697d Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-01-24 15:16:34 +05:30
Rushabh Mehta
5b9270981c added css: 2012-01-24 15:16:06 +05:30
Anand Doshi
6be842f960 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-01-24 14:58:41 +05:30
Anand Doshi
a2c9e39ca3 Merge branch 'master' into latest
Conflicts:
	index.html
	version.num
2012-01-24 14:58:24 +05:30
Anand Doshi
f51e52c1be Fix in subject issue of support ticket 2012-01-24 14:56:20 +05:30
Rushabh Mehta
7cca292494 version 2012-01-24 14:34:27 +05:30
Rushabh Mehta
865c00a79a started website 2012-01-24 14:33:21 +05:30
Anand Doshi
a2fcca578d Purchase Other Charges - company field 2012-01-24 13:46:46 +05:30
Anand Doshi
2e3ce6cc02 Fix error in patch due to single quote in name 2012-01-24 11:37:28 +05:30
Anand Doshi
3c572d7468 change patch file in patch list customer address contact patch 2012-01-24 10:55:04 +05:30
Anand Doshi
568ab004ad Merge branch 'latest' of github.com:webnotes/erpnext into latest
Conflicts:
	index.html
	version.num
2012-01-23 18:41:33 +05:30
Anand Doshi
590be7e643 Merge branch 'master' into latest
Conflicts:
	index.html
	version.num
2012-01-23 18:37:09 +05:30
Anand Doshi
706baf77ae customer address contact patch 2012-01-23 18:35:28 +05:30
Anand Doshi
9a7ea9285e Customer Address Contact report 2012-01-23 18:32:20 +05:30
Anand Doshi
7daed0cad7 Merge branch 'master' into stable 2012-01-23 18:13:58 +05:30
Rushabh Mehta
1061b4a7ea Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-01-23 16:18:53 +05:30
Rushabh Mehta
c5bf642c7d version 2012-01-23 16:18:34 +05:30
Anand Doshi
4d22ce96d1 Fix: is_default of BOM 2012-01-23 14:51:00 +05:30
Anand Doshi
cfdd827a84 Merge branch 'master' into latest 2012-01-23 14:09:50 +05:30
Anand Doshi
a170418ed0 Fixes in floating point issues 2012-01-23 14:09:06 +05:30
Anand Doshi
0529bc1e53 Doc's name in subject of auto notifications 2012-01-23 10:54:53 +05:30
Rushabh Mehta
843db59fcb version fixes 2012-01-20 17:43:37 +05:30
Rushabh Mehta
49ebfb6a30 version 2012-01-20 15:32:18 +05:30
Anand Doshi
6840ef67df Merge branch 'stable' into latest 2012-01-20 15:03:23 +05:30
Anand Doshi
da68ce8b84 Fix to other charges total 2012-01-20 15:02:41 +05:30
Anand Doshi
af4b0a9e90 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-01-20 14:50:45 +05:30
Anand Doshi
12b1db4e8a Merge branch 'stable' into latest 2012-01-20 14:50:15 +05:30
Anand Doshi
60c42d2e1c Fix to other charges total 2012-01-20 14:44:14 +05:30
Anand Doshi
4c92390972 Fix to other charges total 2012-01-20 14:32:01 +05:30
Anand Doshi
10393b39d3 Other Charges total fixed to 2 decimals 2012-01-20 14:29:40 +05:30
Rushabh Mehta
c071af73e2 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-01-20 13:51:44 +05:30
Rushabh Mehta
8c309bee53 bootstrap toolbar 2012-01-20 13:47:16 +05:30
Anand Doshi
821b6544f8 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-01-20 13:23:37 +05:30
Anand Doshi
42907ffb43 Merge branch 'stable' into latest 2012-01-20 13:23:04 +05:30
Anand Doshi
ff54778418 Fix in sales_common 2012-01-20 13:20:21 +05:30
Rushabh Mehta
764fdb942e updated account url and js version 2012-01-20 12:07:56 +05:30
Rushabh Mehta
b7d831b734 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-01-20 10:53:35 +05:30
Rushabh Mehta
0a5657809a fixes to add user 2012-01-20 10:52:53 +05:30
Anand Doshi
869c7bcbb2 Validate if another GRN exists having same supplier and challan no. - then throw exception 2012-01-19 18:31:21 +05:30
Anand Doshi
8c36f47ea6 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-01-19 17:13:43 +05:30
Anand Doshi
6c7e54d373 Merge branch 'master' into latest 2012-01-19 17:13:05 +05:30
Anand Doshi
edb45c6ce5 Purchase Rcpt in Feed, Grand Total fixed to 2 decimals in sales_common.js 2012-01-19 17:12:17 +05:30
Rushabh Mehta
f2c4c4231f minor bugfixes 2012-01-19 11:43:34 +01:00
Rushabh Mehta
3a32478db9 confict fix 2012-01-19 15:11:07 +05:30
Rushabh Mehta
d31bf62c9a fixed patches, small bugs 2012-01-19 15:09:49 +05:30
Anand Doshi
20274a0069 Merge branch 'master' into latest 2012-01-19 15:00:56 +05:30
Anand Doshi
39eff71864 remove get tds button 2012-01-19 14:57:23 +05:30
Anand Doshi
28ac0b0c88 Merge branch 'master' into latest
Conflicts:
	erpnext/patches/patch_list.py
2012-01-19 14:31:03 +05:30
Anand Doshi
26814e7bad Remove Get TDS button, which appears twice in JV 2012-01-19 14:26:25 +05:30
Anand Doshi
ad2f5d1270 Merge branch 'stable' 2012-01-19 12:42:11 +05:30
Anand Doshi
f343a8bc75 remove extra buttons labelled Make Maintenance Visit 2012-01-19 12:41:54 +05:30
Anand Doshi
4b0b4a7fdc Merge branch 'stable'
Conflicts:
	erpnext/patches/patch_list.py
2012-01-19 12:35:54 +05:30
Anand Doshi
b5bc54dd00 Merge branch 'stable' into latest
Conflicts:
	erpnext/patches/patch_list.py
2012-01-19 12:34:30 +05:30
Anand Doshi
5f72836f11 Patch to change allocated_to options to 'Profile' 2012-01-19 12:32:15 +05:30
Anand Doshi
06c1050863 Merge branch 'master' into latest 2012-01-19 11:51:28 +05:30
Anand Doshi
367357fafd utf-8 encode response message while sending email response message 2012-01-19 11:48:43 +05:30
Anand Doshi
d94d1c6dff Merge branch 'master' into latest 2012-01-19 11:38:23 +05:30
Anand Doshi
32fd59b3ff resolved utf-8 issue in 'In Reply To' part of support ticket response 2012-01-19 11:37:32 +05:30
Anand Doshi
a7d632db99 Merge branch 'latest' of github.com:webnotes/erpnext into latest
Conflicts:
	index.html
	version.num
2012-01-18 12:33:16 +05:30
Anand Doshi
165fe9e122 Merge branch 'stable' into latest 2012-01-18 12:31:51 +05:30
Anand Doshi
2cb3cef064 Merge branch 'stable' 2012-01-18 12:31:32 +05:30
Anand Doshi
890aa0f51d fix: interface error due to use of sql instead of webnotes.conn.sql 2012-01-18 12:25:20 +05:30
Rushabh Mehta
94b88b9e22 added patch for subdomain 2012-01-18 10:55:39 +05:30
Rushabh Mehta
0a29975bfe fixed conflicts 2012-01-18 10:54:55 +05:30
Rushabh Mehta
88ba7b86dc fixes to login check 2012-01-18 06:18:52 +01:00
Anand Doshi
d3a23b5e8c Item Manufacturer/Supplier Details in item doctype 2012-01-17 18:46:43 +05:30
Rushabh Mehta
bedc1fe534 new login authentication 2012-01-17 18:17:06 +05:30
Anand Doshi
16c4e72199 Merge branch 'stable' into latest 2012-01-17 14:25:30 +05:30
Anand Doshi
97bd3663f2 Show full name in contact_display 2012-01-17 14:22:09 +05:30
Anand Doshi
34561e73dd Merge branch 'stable' into latest 2012-01-16 17:53:45 +05:30
Anand Doshi
a0b1948261 Support Ticket - In response to fix 2012-01-16 17:52:15 +05:30
Anand Doshi
dc914276a9 Merge branch 'master' into latest 2012-01-16 17:39:33 +05:30
Anand Doshi
a9023b1787 Merge branch 'stable' 2012-01-16 17:39:10 +05:30
Anand Doshi
fd0373826b Merge branch 'stable' of github.com:webnotes/erpnext into stable 2012-01-16 17:38:47 +05:30
Anand Doshi
d487f782a4 Fix: change module name from material_management to stock in an import in installation_note 2012-01-16 17:38:19 +05:30
Anand Doshi
077416300e Fix: floating point issue on submission of RV and creation of GL Entry 2012-01-16 16:02:47 +05:30
Rushabh Mehta
b3672784be support ticket goes with response 2012-01-16 14:27:43 +05:30
Anand Doshi
90f6e55c29 Changes in Inclusive Rate Taxes precision 2012-01-16 14:13:39 +05:30
Rushabh Mehta
cb60ca13a9 added patch to convert tables to utf8 2012-01-16 11:58:14 +05:30
Anand Doshi
1acf3f4de5 Merge branch 'stable' 2012-01-13 17:43:46 +05:30
Anand Doshi
610f9728ab Removing ref_rate back calculation as it injects floating point issue 2012-01-13 17:43:22 +05:30
Anand Doshi
8241e9a2ce Merge branch 'stable' 2012-01-13 15:54:01 +05:30
Anand Doshi
a318235a1f Fix: Paid amount + Write Off Amount and grand total difference calculation with 2 decimal precision 2012-01-13 15:53:46 +05:30
Anand Doshi
e5b60884d0 Merge branch 'stable' 2012-01-13 15:46:17 +05:30
Anand Doshi
4badeecf36 Reverting toFixed issue for grand total 2012-01-13 15:45:58 +05:30
Anand Doshi
98660b5d5a Merge branch 'stable' 2012-01-13 14:36:09 +05:30
Anand Doshi
560883145c Fix to floating point issue in grand total 2012-01-13 14:35:42 +05:30
Anand Doshi
ada0b5d554 Merge branch 'stable' 2012-01-13 13:24:53 +05:30
Anand Doshi
7b96d1f300 search_criteria patch 2012-01-13 11:53:22 +05:30
Anand Doshi
4b80a81a2e Rename Search Criteria Patch 2012-01-13 11:14:29 +05:30
Anand Doshi
d2b8072805 Merge branch 'stable' 2012-01-12 15:13:59 +05:30
Anand Doshi
265f3edb8f On clicking Get Charges, also pull the field included_in_print_rate 2012-01-12 14:56:26 +05:30
Anand Doshi
d03efeaf00 Fixed UX issue in change user password by system manager 2012-01-12 14:50:51 +05:30
Anand Doshi
29c5676467 Merge branch 'stable' 2012-01-12 13:47:22 +05:30
Anand Doshi
cb1f361461 Fix: Notify via email on new post on my company page 2012-01-12 13:46:46 +05:30
Anand Doshi
640955f91d Patch for fixes after major production rewrite 2012-01-12 12:55:29 +05:30
Anand Doshi
2bc9423cd1 Fix: Backflush issue due to missing BOM 2012-01-12 12:32:13 +05:30
Nabin Hait
c95bad917b open sales order query changes: pull only those which are pending to deliver 2012-01-11 18:28:43 +05:30
Nabin Hait
d3db58d6b4 Pull only SO which has production/subcontracted item 2012-01-11 17:48:09 +05:30
Nabin Hait
8389e7aad1 Description changed in pro order 2012-01-11 17:37:06 +05:30
Nabin Hait
a8077bdd20 Error fixed in patch 2012-01-11 17:22:54 +05:30
Nabin Hait
ce3ecf00c2 Removed msgprint from bom control 2012-01-11 17:17:47 +05:30
Nabin Hait
8be5017048 Merge branch 'master' of github.com:webnotes/erpnext 2012-01-11 16:58:01 +05:30
Nabin Hait
42a411398a Error fixed in patches 2012-01-11 16:57:44 +05:30
Anand Doshi
a550c06729 last_name optional in profile settings 2012-01-11 16:53:50 +05:30
Nabin Hait
55c037c250 Added production_cleanup patch 2012-01-11 16:44:07 +05:30
Nabin Hait
c5d6bcbb8f Production module cleanup 2012-01-11 16:41:16 +05:30
Anand Doshi
06d43bcfe2 Fix: Rounded Total appearing extra in Standard Print Format 2012-01-11 15:05:24 +05:30
Anand Doshi
58574acfbc Fix: Bug in Actual Tax Rate due to inclusive rate 2012-01-11 13:39:06 +05:30
Anand Doshi
a8c2f59d1b Escape (') in customer name in authorization control 2012-01-11 12:07:48 +05:30
Anand Doshi
385299903d Escape (') in customer name in authorization control 2012-01-11 12:03:47 +05:30
Anand Doshi
35041607be Fix: when ref_rate is 0 and basic_rate is > 0, calc ref_rate 2012-01-11 11:21:58 +05:30
Anand Doshi
9896452903 txt dump of DocType Label Indent and Module Def Buying 2012-01-10 17:58:07 +05:30
Anand Doshi
bf166e487d Patch to rename doctype indent 2012-01-10 17:06:16 +05:30
Anand Doshi
3a82dfd171 Rename Indent to Purchase Requisition 2012-01-10 16:56:11 +05:30
Anand Doshi
bc45f896f7 Merged master with stable 2012-01-10 14:11:07 +05:30
Anand Doshi
266829f024 Merge branch 'master' into stable 2012-01-10 13:59:14 +05:30
Anand Doshi
a0aa3d5605 Merge branch 'master' of github.com:webnotes/erpnext 2012-01-10 13:59:04 +05:30
Anand Doshi
95c9d30cfd Removed unnecessary console logs 2012-01-10 11:52:43 +05:30
Anand Doshi
a9df960494 On Print Hide, hide net_total, rounded_total_export and grand_total_export 2012-01-09 16:55:30 +05:30
Nabin Hait
40de49110e Removed webforms link from setup 2012-01-09 12:54:20 +05:30
Anand Doshi
07d8570c80 Make Profile Last Name optional in profile settings 2012-01-06 18:14:42 +05:30
Anand Doshi
a31fd1080b Change in top toolbar. It will not include profile link. The home right sidebar will have the profile settings link 2012-01-06 16:27:54 +05:30
Anand Doshi
58455c9d8e Changes in print format to hide taxes when using inclusive prices and showing reference rate when discount is to be displayed 2012-01-06 14:33:57 +05:30
Anand Doshi
4a1da119f9 Refresh support ticket status when a new reply is received 2012-01-06 12:58:23 +05:30
Anand Doshi
7f16efe35d Refresh issue fixed for support ticket 2012-01-06 12:06:29 +05:30
Anand Doshi
7a87c7de46 Trying to fix support ticket refresh issue 2012-01-06 12:02:50 +05:30
Anand Doshi
449f534c36 Trying to fix support ticket refresh on reply issue 2012-01-06 11:54:21 +05:30
Anand Doshi
6a13e8b645 Apply naming series when saving support ticket for 1st time 2012-01-05 19:17:57 +05:30
Nabin Hait
fb5df36c38 event notificationin maintenance schedule 2012-01-05 18:37:27 +05:30
Nabin Hait
84745e7ac1 event notificationin maintenance schedule 2012-01-05 18:03:16 +05:30
Anand Doshi
9dd1e5d728 Support Ticket Naming Series 2012-01-05 17:39:42 +05:30
Anand Doshi
97b1bf4b19 Fixed support ticket issue 2012-01-05 15:46:47 +05:30
Anand Doshi
dc64802e96 Fix Support Ticket 2012-01-05 15:19:00 +05:30
Anand Doshi
523f3a0ea2 Added Administrator to exception list of users to be logged out post login 2012-01-05 14:34:30 +05:30
Nabin Hait
a9cca2e2e9 error fixed in reorder indent 2012-01-05 14:10:14 +05:30
Nabin Hait
8fb9abd47e Subject added in notification mail 2012-01-05 14:01:35 +05:30
Anand Doshi
9dfc9f617b Fix regarding support ticket to support ticket system email chaining issue 2012-01-05 13:54:29 +05:30
Nabin Hait
b50c02214c removed pur of service 2012-01-05 12:21:03 +05:30
Nabin Hait
7394239e05 delete purpose of service 2012-01-05 12:16:28 +05:30
Nabin Hait
2abc6026f2 reload po-pr mapper 2012-01-05 11:24:49 +05:30
Nabin Hait
d2686b1c31 reload doctype 2012-01-05 11:16:18 +05:30
Anand Doshi
5e57a39bb1 Merge branch 'master' into stable 2012-01-04 19:32:01 +05:30
Anand Doshi
f80f20f480 Changes in Notifications 2012-01-04 19:31:32 +05:30
Nabin Hait
15e8277a46 Dont update series starts from if no prefix 2012-01-04 16:23:09 +05:30
Nabin Hait
9d8e85c1f5 Dont update series starts from if no prefix 2012-01-04 16:17:18 +05:30
Anand Doshi
a6272af68a Fix to logout previous session on login 2012-01-03 17:02:20 +05:30
Anand Doshi
b63a007c91 Fixed logout issue 2012-01-03 16:11:04 +05:30
Anand Doshi
d34ff76526 Fixed logout issues 2012-01-03 16:00:03 +05:30
Anand Doshi
6ac1d4bb44 Merge branch 'stable' of github.com:webnotes/erpnext into stable
Conflicts:
	erpnext/stock/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt
2012-01-03 11:45:11 +05:30
Anand Doshi
9fdee387ea Allow demo user to have multiple sessions 2012-01-03 11:26:00 +05:30
Nabin Hait
616548f95c Merge branch 'master' of github.com:webnotes/erpnext 2012-01-03 11:10:25 +05:30
Nabin Hait
db126e80b8 pos setting patch 2012-01-03 11:10:11 +05:30
Anand Doshi
d56d57d205 Patch system changes, Inclusive Price feature and session cache clear on disabling user or on new login 2012-01-02 16:25:05 +05:30
Anand Doshi
1e4b8be8dc Merge pull request #194 from anandpdoshi/master
Posting comments to other users now working
2012-01-02 02:31:30 -08:00
Anand Doshi
1fad05aed8 Bug Fix: Posting comments to other users now working 2012-01-02 16:00:15 +05:30
Anand Doshi
62dbf27780 Merge pull request #192 from anandpdoshi/master
New transaction entries fix for email digest
2011-12-30 02:33:05 -08:00
Anand Doshi
34b9f5b1e0 Fix new transaction entries issue 2011-12-30 16:02:03 +05:30
Nabin Hait
c184dc56a4 Error fixed in uom conversion rate fetching 2011-12-30 13:29:45 +05:30
Nabin Hait
a21156d4d3 Removed msgprint 2011-12-30 11:16:15 +05:30
Nabin Hait
21d0b68a7d Fixes in pending_patches 2011-12-29 15:39:26 +05:30
Nabin Hait
0dfb8e939c Pending patches to be run from patch.py 2011-12-29 14:40:05 +05:30
Nabin Hait
48285ede08 Merge branch 'master' of github.com:webnotes/erpnext 2011-12-29 12:57:31 +05:30
Nabin Hait
6182b929bf set default value as blank insead of None through manage account 2011-12-29 12:56:55 +05:30
Anand Doshi
10748d6bdb Merge pull request #190 from anandpdoshi/master
Changed link for customer master and supplier master in accounts browser
2011-12-28 03:49:13 -08:00
Anand Doshi
eaa6d21691 Changed link for customer master and supplier master in accounts browser 2011-12-28 17:18:09 +05:30
Nabin Hait
9e08c12a10 Default price list currency issue in delivery note fixed 2011-12-28 16:30:48 +05:30
Anand Doshi
7a4d9dbd3e Fixes in support ticket attachments 2011-12-27 19:40:10 +05:30
Anand Doshi
c50f605450 Enabled Attachments in Support Ticket 2011-12-27 17:44:30 +05:30
Anand Doshi
08eff708bf Merge branch 'master' of github.com:webnotes/erpnext 2011-12-27 17:24:19 +05:30
Anand Doshi
20f0d305cb Allow attachments in support ticket 2011-12-27 17:09:55 +05:30
Nabin Hait
4febc84f13 Merge branch 'master' of github.com:webnotes/erpnext 2011-12-27 16:42:27 +05:30
Nabin Hait
3029474b0e Fixes in recurring invoice 2011-12-27 16:42:03 +05:30
Nijil Y
04eb52dbe3 added fields 2011-12-26 15:30:45 +05:30
Nijil Y
68de3687f4 added fields 2011-12-26 15:24:55 +05:30
Nabin Hait
3f7d7077f0 Merge pull request #183 from nijil/master
allignment and error fix
2011-12-25 23:13:05 -08:00
Nabin Hait
a0778fec61 Reload gl mapper patches 2011-12-26 12:28:14 +05:30
Nijil Y
2a59030e05 task notification fix 2011-12-26 12:00:30 +05:30
Nabin Hait
16aacdfeeb Error fixed in ticket 2011-12-26 11:37:52 +05:30
Nabin Hait
cf0163d09e Patch updated 2011-12-26 11:13:49 +05:30
Nabin Hait
f7e1569207 ticket.py modified 2011-12-26 11:08:55 +05:30
Nabin Hait
a0286e986e patch updated 2011-12-26 11:08:32 +05:30
Nabin Hait
40deced91c Merge pull request #180 from nijil/master
Task Notification
2011-12-25 21:24:33 -08:00
Nabin Hait
56f7ccbe70 Merge branch 'master' of github.com:webnotes/erpnext 2011-12-23 18:26:34 +05:30
Nabin Hait
c6359a9179 Patch to update against_voucher in gle for jv aganst jv 2011-12-23 18:26:17 +05:30
Nabin Hait
382dc6e819 GL Mapper changes for JV 2011-12-23 18:25:11 +05:30
Nijil Y
a4e8d1e983 . 2011-12-23 18:01:40 +05:30
Nijil Y
0cfecf2920 email message fix for task 2011-12-23 17:54:07 +05:30
Nijil Y
0de918204d Merge branch 'master' of git://github.com/webnotes/erpnext 2011-12-23 17:35:39 +05:30
Nijil Y
cc64682baa fixed 2011-12-23 17:35:18 +05:30
Nijil Y
89e5624730 Update erpnext/projects/doctype/ticket/ticket.py 2011-12-23 16:21:51 +05:30
Nijil Y
9239afa222 Update erpnext/projects/doctype/ticket/ticket.py 2011-12-23 16:18:49 +05:30
Nijil Y
cc0e502d0f scheduler 2011-12-23 15:08:43 +05:30
Anand Doshi
8d53f7635a Merge pull request #179 from anandpdoshi/master
Changes in Permission Manager to exclude doctype of 'Core' module and also mark Profile as not in create
2011-12-23 00:21:53 -08:00
Anand Doshi
ac20eb2107 Changes in Permission Manager to exclude doctype of 'Core' module and mark Profile as not in create 2011-12-23 13:50:28 +05:30
Nijil Y
4d64379aa6 scheduler added to project control for reminder 2011-12-23 12:32:08 +05:30
Nijil Y
b8eab4f2da Merge branch 'master' of git://github.com/webnotes/erpnext 2011-12-23 12:19:46 +05:30
Nijil Y
f1e98b9d8b Scheduler added for reminder notification - which will be sent 2 days before the task begins 2011-12-23 12:01:31 +05:30
Anand Doshi
d9fc4c07c9 Merge pull request #178 from anandpdoshi/master
Fix: Email digest gets deleted if even one is disabled
2011-12-22 22:27:47 -08:00
Anand Doshi
bd269cdbe7 Fix: Email digest gets deleted if even one is disabled. 2011-12-23 11:55:00 +05:30
Nabin Hait
e80496cef4 Consider description also to check item duplication in purchase cycle 2011-12-23 11:25:37 +05:30
Nabin Hait
e323ef20b0 Merge branch 'master' of github.com:webnotes/erpnext 2011-12-22 19:05:08 +05:30
Nabin Hait
d0a892ffe7 print hide price list flds 2011-12-22 19:04:49 +05:30
Anand Doshi
f5d5f10ff3 Remove "Add Recipients" button from Email Digest (again!) 2011-12-22 19:02:15 +05:30
Anand Doshi
4714424de0 Merge branch 'master' of github.com:webnotes/erpnext 2011-12-22 18:22:46 +05:30
Anand Doshi
0188df1609 Amended the patch to import class Document 2011-12-22 18:21:57 +05:30
Anand Doshi
27b05eac7a Merge pull request #176 from anandpdoshi/master
Patch to enable income year to date summary in email digest
2011-12-22 04:48:57 -08:00
Anand Doshi
68f3967de0 Patch to enable income year to date summary in email digest 2011-12-22 18:18:10 +05:30
Anand Doshi
a4db9e9b5a Merge pull request #175 from anandpdoshi/master
Added feature: Income Year To Date in Email Digest
2011-12-22 04:33:35 -08:00
Anand Doshi
61a4a498cf Added feature: Income Year To Date in Email Digest 2011-12-22 18:02:36 +05:30
Nijil Y
f2a5c290b3 Merge branch 'master' of git://github.com/webnotes/erpnext 2011-12-22 17:43:46 +05:30
Nijil Y
b3058a3d5a Task Notification donw, reminder left 2011-12-22 17:39:18 +05:30
Anand Doshi
6d0be02364 Merge pull request #174 from anandpdoshi/master
Fixed issue: If account of type "Bank or Cash" is not associated to a GL Entry, then it displays an alert in the email digest email body
2011-12-22 04:06:35 -08:00
Anand Doshi
94a18109d7 Fixed issue: If account of type "Bank or Cash" is not associated to any GL Entry, then it displays an alert in the email digest email body 2011-12-22 17:34:11 +05:30
Anand Doshi
3ca92bb3e4 Merge pull request #173 from anandpdoshi/master
Dont show bank balance if no ledger of type "Bank or Cash"
2011-12-22 03:54:48 -08:00
Anand Doshi
7792d08408 Dont show bank balance if no ledger of type "Bank or Cash" 2011-12-22 17:23:11 +05:30
Anand Doshi
99479bdb7f Merge pull request #172 from anandpdoshi/master
remove previous field property setter
2011-12-22 01:50:07 -08:00
Anand Doshi
f2f4c87bb6 remove previous field property setter 2011-12-22 15:19:16 +05:30
Anand Doshi
d1bfe839fa Merge pull request #171 from anandpdoshi/master
Patch to update idx which starts with 0
2011-12-22 01:37:04 -08:00
Anand Doshi
9ca7e5255b Patch to update idx.. start idx from 1 2011-12-22 15:05:14 +05:30
Nijil Y
8acb043a8a update 2011-12-22 13:08:25 +05:30
Nabin Hait
7e812bbee0 Error fixed in patch 2011-12-22 12:58:34 +05:30
Nabin Hait
6998261a7e Error fixed in auto indent patches 2011-12-22 12:56:57 +05:30
Nabin Hait
20c87531cb Merge branch 'master' of github.com:webnotes/erpnext 2011-12-22 12:54:39 +05:30
Nabin Hait
9e8249fea1 Error fixed in bin 2011-12-22 12:54:13 +05:30
Anand Doshi
5a32f78bf3 Merge pull request #170 from anandpdoshi/master
calls on_update method of email_digest obj for creating a scheduler entry
2011-12-21 22:59:31 -08:00
Anand Doshi
248f8f5687 Update on previous commit: calls on_update method of email_digest obj for creating a scheduler entry 2011-12-22 12:26:36 +05:30
Anand Doshi
c9b2743e1c Merge pull request #168 from anandpdoshi/master
Fix Image attachments and Enable Email Digests
2011-12-21 22:45:13 -08:00
Anand Doshi
972b165850 Modified deploy_email_digest to enable all the default email digests 2011-12-22 12:04:28 +05:30
Nabin Hait
b9e8a41cd2 Account and cost center get_query changes for other charges table 2011-12-21 17:33:57 +05:30
Nijil Y
36f58835e6 Update erpnext/patches/auto_indent.py 2011-12-21 16:35:43 +05:30
Nijil Y
c62953579d fix 2011-12-21 16:32:42 +05:30
Nijil Y
f800dc02f1 fix 2011-12-21 16:20:39 +05:30
Anand Doshi
c111803a4a Fixed image attachment in profile settings 2011-12-21 14:55:14 +05:30
Nijil Y
07b03fbe09 Merge branch 'master' of github.com:nijil/erpnext 2011-12-21 14:54:34 +05:30
Nijil Y
9e6f00abab fixes for notification 2011-12-21 14:54:14 +05:30
Nijil Y
b36bebe9f0 Update erpnext/stock/doctype/bin/bin.py 2011-12-21 14:53:04 +05:30
Nijil Y
2c19960996 account conflict 2011-12-21 13:30:09 +05:30
Nabin Hait
da9e2e6898 Company master link in global defaults 2011-12-21 13:24:10 +05:30
Nijil Y
9b6fc0f83d Merge branch 'master' of github.com:nijil/erpnext 2011-12-21 13:24:02 +05:30
Nabin Hait
520de0529f Merge branch 'master' of github.com:webnotes/erpnext 2011-12-21 12:51:38 +05:30
Nijil Y
0f9eaeaa3c updation Merge branch 'master' of git://github.com/webnotes/erpnext
Conflicts:
	erpnext/projects/doctype/ticket/ticket.py
2011-12-21 12:34:13 +05:30
Nijil Y
16ca593bbf Update erpnext/patches/auto_indent.py 2011-12-21 12:20:07 +05:30
Nijil Y
4d6a71c5f2 Update erpnext/patches/auto_indent.py 2011-12-21 11:56:42 +05:30
Nijil Y
35aa35bea3 Update erpnext/patches/auto_indent.py 2011-12-21 11:50:20 +05:30
Nabin Hait
53ef4009ba Fixes in patches 2011-12-21 11:22:32 +05:30
Nijil Y
205e042113 patch file 2011-12-20 21:14:43 +05:30
Nijil Y
dc0461296d Email Notification for Tasks 2011-12-20 21:13:58 +05:30
Anand Doshi
146f47faab Merge pull request #167 from anandpdoshi/master
Patch to remove extra button from Email Digest Form
2011-12-20 05:40:59 -08:00
Nabin Hait
63b94c42e4 Price list patch 2011-12-20 19:09:23 +05:30
Nabin Hait
60fc54a9ba Price List redesign: Maintain PL in any currency and convert it into base currency in the particular form 2011-12-20 18:59:26 +05:30
Nabin Hait
7c03cfad6a Default Price List Currency fld added in Global Defaults 2011-12-20 18:50:41 +05:30
Nabin Hait
a57732f71d Removed custom field from doctype 2011-12-20 18:48:19 +05:30
Anand Doshi
6a605b47ef Patch to remove 'Add Recipients' button from Email Digest form 2011-12-20 18:31:57 +05:30
Nijil Y
04da8741c3 fix 2011-12-20 18:09:43 +05:30
Nijil Y
d82e8df7e5 patch update for auto indent with email notify 2011-12-20 17:30:41 +05:30
Nijil Y
8dd861bda5 Auto Indent creation when stock reaches re-order level 2011-12-20 17:17:51 +05:30
Nabin Hait
74fcb69b13 Error fixed in cust group 2011-12-20 11:48:27 +05:30
Nabin Hait
b8cec492c5 Fixed issue in c-form patch 2011-12-16 16:48:17 +05:30
Nabin Hait
488bcc8700 reload_employeewise_balance_leave_report patch updated 2011-12-16 16:29:31 +05:30
Nabin Hait
e3daffe477 reload_employeewise_balance_leave_report 2011-12-16 16:28:26 +05:30
Nabin Hait
3bfeefafcd Modified patch 2011-12-16 16:19:38 +05:30
Nabin Hait
f8bfcdc495 Modified patch 2011-12-16 16:15:31 +05:30
Nabin Hait
c57c5b0b44 Return if old patch.py executed anyway 2011-12-16 10:17:26 +05:30
Nabin Hait
b2150de64b Freezing Error fixed in purchase invoice 2011-12-15 16:29:04 +05:30
Nabin Hait
9a0d05d354 Merge branch 'master' of github.com:webnotes/erpnext 2011-12-15 15:48:51 +05:30
Nabin Hait
6e9a1284d4 remove depricated default fileds 2011-12-15 15:48:18 +05:30
Anand Doshi
490d298fa0 patch to remove old control panel email settings 2011-12-15 15:46:31 +05:30
Anand Doshi
ca39b180f5 patch to remove old control panel email settings 2011-12-15 15:40:15 +05:30
Anand Doshi
48d8d36b79 Merge branch 'master' of github.com:webnotes/erpnext 2011-12-15 14:28:02 +05:30
Anand Doshi
7f18dd3b94 Patches for email digest and remove page break from defaults 2011-12-15 14:24:55 +05:30
Nabin Hait
b3081fafb6 Merge pull request #160 from nijil/master
Accounts Default Form Fix
2011-12-14 22:28:52 -08:00
Anand Doshi
a51aefbced Merge branch 'master' of github.com:webnotes/erpnext 2011-12-14 20:36:11 +05:30
Anand Doshi
21c649527a Provides better error message to the user 2011-12-14 20:35:19 +05:30
Anand Doshi
407ebb9e41 Merge pull request #161 from anandpdoshi/master
Resolved bug: when account of type 'Bank or Cash' does not exists
2011-12-14 06:36:32 -08:00
Anand Doshi
e7982f0f85 Merge branch 'master' of github.com:anandpdoshi/erpnext
Conflicts:
	erpnext/setup/doctype/email_digest/email_digest.py
2011-12-14 20:05:16 +05:30
Anand Doshi
ddf4c2655d Resolved bug: if account of type 'Bank or Cash' does not exists, then it shows error in the email digest email but does not raise exception 2011-12-14 20:04:04 +05:30
Anand Doshi
3fe9795020 Resolved bug: if account of type 'Bank or Cash' does not exists, then it shows error in the email digest email but does not raise exception 2011-12-14 20:00:55 +05:30
Nabin Hait
44bba97dc9 Merge branch 'master' of github.com:webnotes/erpnext 2011-12-14 18:09:39 +05:30
Nabin Hait
b93ea233ff Error fixed in task 2011-12-14 18:09:13 +05:30
Anand Doshi
c2a9cca4fd Change in add user dialog box:
Now it includes First Name, Last Name and Password field
if run as a standalone app
2011-12-14 17:12:12 +05:30
Anand Doshi
ad42e558df Merge branch 'master' of github.com:webnotes/erpnext 2011-12-14 16:10:44 +05:30
Anand Doshi
ed73fb2b26 Fixed bug regarding setting of banner 2011-12-14 16:09:59 +05:30
Nijil Y
b40f826c5a . 2011-12-14 15:50:09 +05:30
Nijil Y
d18153e413 Account Default settings form fix 2011-12-14 15:28:51 +05:30
Anand Doshi
e47be26682 Merge pull request #159 from anandpdoshi/master
Commented print statement in email_digest.py
2011-12-13 23:07:30 -08:00
Anand Doshi
8875d91a8e Commented print statement while inserting record in scheduler 2011-12-14 12:35:07 +05:30
Nabin Hait
9e4d5b9649 Merge branch 'master' of github.com:webnotes/erpnext 2011-12-14 11:27:50 +05:30
Nabin Hait
3a2fcba15f Purchase Discount option in Features Setup 2011-12-14 11:26:46 +05:30
Nabin Hait
f21ceb283c Arranged field order in item table 2011-12-14 11:26:05 +05:30
Nabin Hait
dcac0e7565 Merge pull request #156 from anandpdoshi/master
Email Digest and patch to remove duplicate entries created in Table Mapper Detail
2011-12-13 05:37:41 -08:00
Nabin Hait
536e0cb1c4 fixes in patch 2011-12-13 19:05:13 +05:30
Nabin Hait
08d803791d Merge branch 'master' of git://github.com/nijil/erpnext 2011-12-13 18:49:59 +05:30
Nabin Hait
85e8e01fd6 notification email for recurring invoice 2011-12-13 18:48:24 +05:30
Nijil Y
f6a3441d99 patch 2011-12-13 18:31:42 +05:30
Nijil Y
8fb260504a purchase discount 2011-12-13 18:14:15 +05:30
Anand Doshi
f5ff4434df Patch to reload Task doctype of Projects Module 2011-12-13 18:13:23 +05:30
Anand Doshi
206df20f36 Changes in print formats to include selected print heading and discount
appended in description
2011-12-13 15:57:09 +05:30
Anand Doshi
130ae98675 Changes in dashboard start date and end date default logic such that the
conditions for fiscal year range are met
2011-12-12 20:24:06 +05:30
Anand Doshi
3a23a5740e In Dashboard, display a customer friendly error message when the start and end dates
are not within a fiscal year
2011-12-12 19:50:09 +05:30
Anand Doshi
5245e6547b Change path of images in accounts browser and sales browser 2011-12-12 19:18:23 +05:30
Nabin Hait
8a6b3b8713 Validation added in c-form 2011-12-12 14:16:16 +05:30
Anand Doshi
deb816d30c Patch to remove duplicate entries created due to change in
validation_logic in Table Mapper Detail for the following doctypes:
* Delivery Note-Receivable Voucher
* Purchase Order-Purchase Voucher
* Sales Order-Receivable Voucher
2011-12-12 12:41:36 +05:30
Nijil Y
fdc7fc62a5 payable voucher.js 2011-12-12 10:50:18 +05:30
Nijil Y
b54d7282a7 pvdetail 2011-12-12 10:31:23 +05:30
Anand Doshi
17c1a7d9ed Merge branch 'master' of github.com:webnotes/erpnext into edigest 2011-12-08 19:36:54 +05:30
Anand Doshi
fb3c3fb064 Merge branch 'master' of github.com:anandpdoshi/erpnext into edigest 2011-12-08 19:36:29 +05:30
Anand Doshi
633edbef46 Email Digest - ready to be deployed 2011-12-08 19:34:01 +05:30
Nijil Y
38821f6104 txt order update 2011-12-08 18:32:58 +05:30
Nabin Hait
7e44f9789b Patch for c-form 2011-12-08 18:07:20 +05:30
Nabin Hait
2577e2ae27 Patch for c-form 2011-12-08 18:06:53 +05:30
Nabin Hait
fd20340576 Introduced C-form for Indian customer 2011-12-08 17:49:40 +05:30
Nijil Y
edf8bc2a3e Discount in purchase cycle Merge branch 'master' of git://github.com/nijil/erpnext
Conflicts:
	erpnext/accounts/doctype/pv_detail/pv_detail.txt
	erpnext/buying/doctype/po_detail/po_detail.txt
	erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt
2011-12-08 17:29:24 +05:30
Nijil Y
add0c85648 Discount in purchase cycle 2011-12-08 16:53:12 +05:30
Nijil Y
d8e5bed9e5 Discount in purchase cycle 2011-12-08 16:09:18 +05:30
Nijil Y
4499851ceb checking.. 2011-12-08 14:14:11 +05:30
Nijil Y
630256f65b purchase recipt detail 2011-12-08 13:01:43 +05:30
Nabin Hait
cde8bec0a6 Merge branch 'master' of github.com:webnotes/erpnext 2011-12-06 19:05:14 +05:30
Nabin Hait
38d24534d7 Recurring invoice checkbox added in features setup 2011-12-06 19:04:21 +05:30
Anand Doshi
590448aaef Changes in email digest 2011-12-06 18:51:14 +05:30
Nabin Hait
b28d6dc617 Repost stock patch 2011-12-06 15:11:14 +05:30
Nabin Hait
ea5f5ca57d Recurring invoices patch 2011-12-06 15:10:48 +05:30
Nabin Hait
a4fdc84fda Introduced recurring invoices 2011-12-06 15:04:47 +05:30
Anand Doshi
41e542ce4d Email Digest changes 2011-12-06 10:41:54 +05:30
Anand Doshi
3f040a8f9e Resolved bug Project creation:
Customer details not getting autofilled on customer selection
2011-12-05 12:17:51 +05:30
Anand Doshi
adf2f777d3 Removed print format option. Instead show html code. 2011-12-05 12:16:31 +05:30
Anand Doshi
393f5e6078 Queries to get new records in a particular doctype 2011-12-02 19:20:10 +05:30
Anand Doshi
f10ad98ebf Refactored queries to be more clean 2011-12-02 17:53:08 +05:30
Anand Doshi
7057cbf9e5 Started with email digest 2011-12-02 15:15:38 +05:30
Anand Doshi
a27ae827c9 Merge branch 'master' of github.com:webnotes/erpnext 2011-11-30 15:25:19 +05:30
Anand Doshi
ed825062f1 Hide programming error messages from user on update_security 2011-11-30 15:23:37 +05:30
Nabin Hait
142af06d19 update serial no incoming rate through landing cost wizard 2011-11-25 16:37:21 +05:30
Nabin Hait
3aed35da0a Merge branch 'master' of github.com:webnotes/erpnext 2011-11-25 14:43:39 +05:30
Nabin Hait
28b793c88a incoming rate in serial no should be valuation rate instead of pur rate 2011-11-25 14:43:11 +05:30
Anand Doshi
8c10de6c1a Modified patch to create a DocType Label record for DocLayer 2011-11-25 11:25:39 +05:30
Nijil
4e54d7a434 pvdetail and patch 2011-11-24 16:18:42 +05:30
Nijil
1530b93a6e purchase recipt 2011-11-24 15:53:56 +05:30
Nijil
2f82c29348 .. 2011-11-24 15:18:17 +05:30
Nijil
ba40bc93fe payable voucher txt 2011-11-24 15:14:09 +05:30
Nijil
c37dad26d9 txt files 2011-11-24 15:07:54 +05:30
Nabin Hait
e92066fa80 modified fld prop in gl entry and index patch 2011-11-24 15:04:47 +05:30
Nabin Hait
a8be65aedf Merge branch 'master' of github.com:webnotes/erpnext 2011-11-24 14:48:13 +05:30
Nabin Hait
d6ed0748a3 help content midified 2011-11-24 14:47:18 +05:30
Anand Doshi
956d665738 Merge pull request #148 from anandpdoshi/master
Modified GLEntry doctype to be not in create
2011-11-24 00:29:53 -08:00
Anand Doshi
be14e021b9 Reload GL Entry doctype 2011-11-24 13:57:46 +05:30
Anand Doshi
96e5343519 Marked GLEntry as Not In Create 2011-11-24 13:51:09 +05:30
Anand Doshi
6b8d0bfb2a Added patch to reload doclayer, doclayer field and print format doctypes 2011-11-23 18:39:08 +05:30
Anand Doshi
6e5e30c420 Merge pull request #147 from anandpdoshi/master
Added Customize Form View and Print Formats to Setup Page
2011-11-23 04:35:20 -08:00
Anand Doshi
a04afc9b3b Added Customize Form View (DocLayer) and Print Formats(docbrowser) to Setup Page 2011-11-23 13:51:52 +05:30
Nabin Hait
36427e577d address filter flds 2011-11-23 13:21:21 +05:30
Nabin Hait
5f9ceb8dc8 filter property changed in address 2011-11-23 13:19:20 +05:30
Nabin Hait
ed6b489715 filter property changed in address 2011-11-23 13:17:54 +05:30
Nabin Hait
3addd27f2c Address is added in setup for deleting purpose 2011-11-23 13:11:15 +05:30
Nabin Hait
816383056f On deletion of warehouse, delete bin and sle if no qty 2011-11-23 12:58:03 +05:30
Nabin Hait
04176e62d8 fixed error in internal reco 2011-11-23 12:15:42 +05:30
Nijil
6800ad55bd patch for Discount Rate 2011-11-22 15:21:42 +05:30
Nijil
54eb735a47 Added Discount in Purchase Cycle 2011-11-22 15:12:00 +05:30
Nabin Hait
2690e72c14 updated reco patch 2011-11-21 17:27:36 +05:30
Nabin Hait
38477a3616 patch for stock reconciliation 2011-11-21 17:16:48 +05:30
Nabin Hait
fc26f64011 rewritten stock reconciliation 2011-11-21 17:13:53 +05:30
Nijil
4491f01ce4 discount rate on purchase 2011-11-21 11:31:27 +05:30
Nijil
eb8233c779 Merge branch 'master' of git://github.com/webnotes/erpnext 2011-11-21 10:35:15 +05:30
Nijil
c7d64cf5a8 almost 2011-11-20 00:22:41 +05:30
Nijil
296c17b7ae checking 2011-11-18 14:12:06 +05:30
Nabin Hait
8fa6ad90ed sms sender name validation 2011-11-17 18:07:13 +05:30
Nabin Hait
26f74ed121 sms sender name validation 2011-11-17 18:03:10 +05:30
Nabin Hait
bc60c1f29c fixed patch 2011-11-17 16:59:29 +05:30
Nabin Hait
92ec8d26eb reload LC wizard 2011-11-17 15:03:05 +05:30
Nabin Hait
1a8831f476 reload LC wizard 2011-11-17 15:00:55 +05:30
Nabin Hait
a8da0fecb5 Account link query changed in LC wizard 2011-11-17 14:47:05 +05:30
Nabin Hait
f164b269db Merge branch 'master' of github.com:webnotes/erpnext 2011-11-16 16:39:16 +05:30
Nabin Hait
9dd6330418 updated landed cost wizard 2011-11-16 16:38:55 +05:30
Nabin Hait
815a75f917 Rewritten landed cost wizard 2011-11-16 16:34:53 +05:30
Nabin Hait
b0fa2af45b Rewritten landed cost wizard 2011-11-16 16:20:37 +05:30
Anand Doshi
bf41aef7f0 Merge pull request #144 from anandpdoshi/master
Changes in spartan print formats to show border in chrome
2011-11-16 01:20:33 -08:00
Anand Doshi
19a2767b77 Changes in spartan print formats to show border in chrome 2011-11-16 14:49:37 +05:30
Nabin Hait
7b095e97ad Update erpnext/selling/doctype/quotation/quotation.py 2011-11-16 14:25:36 +05:30
Nabin Hait
efc2c327cf Update erpnext/selling/doctype/quotation/quotation.py 2011-11-16 14:24:31 +05:30
Nabin Hait
4faf99424a Modified validation for duplicate item 2011-11-16 14:20:45 +05:30
Nabin Hait
65a053abe6 Modified validation for duplicate item 2011-11-16 14:19:26 +05:30
Anand Doshi
0900756510 Merge pull request #143 from anandpdoshi/master
Changes in Sales Invoice Print Formats
2011-11-16 00:34:36 -08:00
Anand Doshi
9fe4331862 Changes in Sales Invoice Print Format 2011-11-16 14:03:52 +05:30
Anand Doshi
96fd8bec9b Changes in Sales Invoice Print Formats 2011-11-16 14:02:30 +05:30
Anand Doshi
ded71563c8 Merge pull request #142 from anandpdoshi/master
New Print Formats as part of erpnext repository
2011-11-16 00:02:43 -08:00
Anand Doshi
c573fb8eed Modified patch install_print_formats to reload the newly added Print Formats 2011-11-16 13:31:21 +05:30
Anand Doshi
e3559853bd Added new Print Formats as part of repository 2011-11-16 13:18:45 +05:30
Nabin Hait
0c92493c81 Fixed check_for_acc_of_supplier validation 2011-11-16 10:12:32 +05:30
Anand Doshi
86e91e5dce Changes in patch for installation of new print formats 2011-11-15 18:06:16 +05:30
Anand Doshi
f8b01097ac Merge branch 'master' of github.com:webnotes/erpnext
Conflicts:
	index.html
2011-11-15 15:24:11 +05:30
Anand Doshi
3cb68e17b9 New Print Formats 2011-11-15 15:22:44 +05:30
Nabin Hait
5b7badaf20 supplier account head validated with supplier 2011-11-11 12:37:53 +05:30
Nabin Hait
ff72835ad9 Qty consumed per unit field type currency to data 2011-11-10 14:37:47 +05:30
Nabin Hait
e098481f45 Pull items from BOM for production issue 2011-11-10 10:56:53 +05:30
Nabin Hait
33e19480ae UOM field added in BOM, will be fetched from item master 2011-11-09 13:53:16 +05:30
Nabin Hait
2cca0e7620 test case added for multiple stock entry for same datetime 2011-11-09 12:12:53 +05:30
Nabin Hait
93ba4fbaa4 Fixes related to finding prev sle 2011-11-08 15:30:04 +05:30
Nabin Hait
235439df5b bin fixes for reposting future entries 2011-11-08 12:52:51 +05:30
Nabin Hait
76228f1c79 bin fixes for reposting future entries 2011-11-08 12:49:24 +05:30
Rushabh Mehta
d77cb27bd2 fixes to bin for reposting future entires 2011-11-08 12:06:02 +05:30
Rushabh Mehta
efd222b6ac logout fix 2011-11-08 10:39:52 +05:30
Nabin Hait
cc02fd445c Repair button only visible after submit 2011-11-07 12:14:28 +05:30
Nabin Hait
30d34c4311 sal manager reload patch 2011-11-07 11:07:50 +05:30
Nabin Hait
990a5eacca sal manager reload patch 2011-11-07 10:51:29 +05:30
Nabin Hait
c67e0d85d3 Employemnt Type filter removed from salary manager 2011-11-07 10:48:51 +05:30
Rushabh Mehta
ae00547592 appriasal copy fix 2011-11-04 10:43:11 +05:30
Rushabh Mehta
36fc1d06fb appriasal copy fix 2011-11-04 10:41:12 +05:30
Anand Doshi
9207f51ced Changed image path to lib/images 2011-11-01 10:55:02 +05:30
Anand Doshi
3ee06a924a Fixed Knowledge Base Issue 2011-11-01 10:46:49 +05:30
Anand Doshi
30cf682e46 Change criteria name of employeewise_balance_leave_report 2011-10-31 17:41:04 +05:30
Anand Doshi
25190a903c Report to get Employeewise Balance Leave 2011-10-31 16:47:48 +05:30
Anand Doshi
dac955b897 Merge branch 'master' of github.com:webnotes/erpnext 2011-10-25 10:58:17 +05:30
Anand Doshi
867895404e Reverting the change '`' as it is taken care of by default 2011-10-25 10:54:49 +05:30
Anand Doshi
cd04d950a1 Merge pull request #137 from anandpdoshi/master
Changed path to image files in my_company.js
2011-10-24 03:21:19 -07:00
Anand Doshi
b16c231158 changed path to image files 2011-10-24 15:49:11 +05:30
Anand Doshi
71e3c9be66 Merge pull request #136 from anandpdoshi/master
Trend Analyser - allow table names with space
2011-10-24 02:18:24 -07:00
Rushabh Mehta
9666e657ce fixed fpe in bin 2011-10-24 14:35:04 +05:30
Rushabh Mehta
06f432f4c7 fixes to valuation control 2011-10-24 11:59:22 +05:30
Anand Doshi
2cde8670f2 enclosed table names in "`" to allow spaces in table names while querying 2011-10-24 11:39:36 +05:30
Rushabh Mehta
09dba5cf1d fixes to valuation control 2011-10-24 11:17:36 +05:30
Nabin Hait
612efe843b POS Setting js code restored from history 2011-10-21 16:19:58 +05:30
Nabin Hait
e2f0c5dfd0 Trend analyzer fix due to project field movement to item level in pur cycle 2011-10-21 14:55:16 +05:30
Nabin Hait
d0c9d422af patch for project changes in pur cycle 2011-10-20 19:21:03 +05:30
Nabin Hait
1979ad0586 Project wise analysis included in trend analyzer 2011-10-20 19:20:16 +05:30
Nabin Hait
57dd62d790 project column moved to item table in pur cycle 2011-10-20 19:19:07 +05:30
Nabin Hait
69554511da fixes in patch 2011-10-19 16:35:39 +05:30
Nabin Hait
2eb5ae48f7 patch: default print format for invoice is standard 2011-10-19 16:06:37 +05:30
Nabin Hait
13800440f1 fixed issue in patch 2011-10-19 15:38:42 +05:30
Nabin Hait
d751c1d40d patch for reloading print format and new POS format 2011-10-19 15:33:27 +05:30
Nabin Hait
68791fb13d resolved conflict 2011-10-19 15:15:51 +05:30
Nabin Hait
7762bdaf77 Letter head issue fixed in print format 2011-10-19 15:05:26 +05:30
Rushabh Mehta
790f453490 version update for wnf 2011-10-19 14:06:32 +05:30
Nabin Hait
ec7a85d11f 'Delivery Note Packing List Wise' print format modified 2011-10-18 19:03:02 +05:30
Nabin Hait
1546003d69 issue fixed in patch 2011-10-18 18:47:08 +05:30
Nabin Hait
0c005421fe Packing slip issues fixed and modified print format 2011-10-18 16:44:20 +05:30
Nabin Hait
a315a31919 Issue fixed in get stock qty if bin not exists 2011-10-17 15:01:31 +05:30
Nabin Hait
e7c4a4011f acc bal repost patch moved in separate file 2011-10-14 19:05:38 +05:30
Nabin Hait
df8304f00b acc bal repost patch moved in separate file 2011-10-14 19:05:08 +05:30
Nabin Hait
c0d7434794 Edited erpnext/patches/patch.py via GitHub 2011-10-14 00:14:31 +05:30
Nabin Hait
989462b669 account balance reposting with freezing current session 2011-10-13 17:33:30 +05:30
Nabin Hait
1a1ce709e0 Changes regarding POS fields 2011-10-13 14:08:33 +05:30
Nabin Hait
d84ad942d1 Removed repost patch 2011-10-13 14:04:26 +05:30
Nabin Hait
fe4c4f94da repost account balance patch 2011-10-13 11:07:14 +05:30
Nabin Hait
a6f0550d40 test cases for leave 2011-10-12 17:04:31 +05:30
Nabin Hait
c7cf94ec7b page break allow_on_submit 2011-10-12 13:16:11 +05:30
Nabin Hait
ee9efb568b flds added in mapper 2011-10-12 12:42:07 +05:30
Nabin Hait
89a9a26524 page_break column allow_on_submit 2011-10-12 12:41:00 +05:30
Nabin Hait
db3728955b error fixed in leave calculation 2011-10-11 17:11:24 +05:30
Nabin Hait
685564f71d Resolved conflict after merging with master 2011-10-11 14:42:34 +05:30
Nabin Hait
fb37157163 packing slip related changes and test case for item 2011-10-11 13:57:48 +05:30
Nabin Hait
c1d4281718 packing slip related changes 2011-10-11 12:50:55 +05:30
Rushabh Mehta
5f66d60bdd fixed login url 2011-10-11 10:58:11 +05:30
Rushabh Mehta
6edb4635e6 fixed bugs 2011-10-11 10:50:23 +05:30
Ravi Dey
24ef523cac Issue fixed in setup control 2011-10-10 18:39:49 +05:30
Nabin Hait
15cad19d7c Serial No moved to Stock module from Support module 2011-10-10 17:10:24 +05:30
Nabin Hait
2810691979 field hide/unhide for pos 2011-10-10 12:33:43 +05:30
Nabin Hait
6a0561612f cost center groupto ledger and vice versa 2011-10-10 12:23:10 +05:30
Nabin Hait
8e54aa882a patch for page break issue 2011-10-07 19:03:19 +05:30
Nabin Hait
ddaa5a33fe reload PO-PR mapper 2011-10-07 12:36:13 +05:30
Nabin Hait
7a941869ab clear cache forcefully 2011-10-07 12:30:48 +05:30
Nabin Hait
d08fe6099a map schedule date from po to pr 2011-10-07 12:11:19 +05:30
Nabin Hait
914491f630 deleted duplicate button from QA inspection report 2011-10-06 10:23:26 +05:30
Nabin Hait
c68e045014 deleted duplicate button from QA inspection report 2011-10-05 17:01:16 +05:30
Nabin Hait
5630049d2a QA Inspection: get_query 2011-10-05 16:57:36 +05:30
Nabin Hait
1971942db8 purchase tax mapping while pulling 2011-10-05 14:56:16 +05:30
Nabin Hait
da50c0859c features by default on 2011-10-05 12:10:08 +05:30
Nabin Hait
a55eec137f Fieldname changed in Features Setup 2011-10-05 11:47:08 +05:30
Nabin Hait
b30c4a6611 Fieldname changed in Features Setup 2011-10-05 11:36:16 +05:30
Nabin Hait
a970b11cfb Test case added for Material Issue 2011-09-30 18:05:08 +05:30
Nabin Hait
61985ac5fa get_query modified for item in quotation 2011-09-30 17:46:08 +05:30
Nabin Hait
88e5170bd0 Test case added for MTN 2011-09-30 17:21:41 +05:30
Nabin Hait
88f9cb5d24 Test case added for MTN 2011-09-30 17:20:06 +05:30
Nabin Hait
31665e538a Test Case:
stock entry submit and cancel
Sandbox created for maintaining testdata and testcases
2011-09-29 10:41:02 +05:30
Nabin Hait
79e8247d82 fix in stock ledger 2011-09-29 10:40:04 +05:30
Nabin Hait
fff40599e8 test field deleted from warehouse 2011-09-29 10:39:44 +05:30
Nabin Hait
525887fd8a Error fixed in auth control 2011-09-27 17:00:01 +05:30
Nabin Hait
c8d5625763 removed trashed profile from user search result 2011-09-27 15:26:29 +05:30
Nabin Hait
d9a16a282c deleted gl_entry.js file 2011-09-27 15:10:07 +05:30
Nabin Hait
ec451da2f4 Re-written update_against_document_in_jv function in RV and PV 2011-09-27 12:47:59 +05:30
Nabin Hait
e2df68bb5b reload internal reconciliation 2011-09-27 12:47:09 +05:30
Nabin Hait
e76e2a1172 reload internal reconciliation 2011-09-27 12:45:48 +05:30
Nabin Hait
80ed6b25e8 deleted gl_control.js file 2011-09-27 11:53:23 +05:30
Nabin Hait
7e97d1f390 rebuild all tree through push_patch
Appraisal score allowed to be fraction
unhide group/ledger field in cost senter for import purpose
update_nsm_model in cost center on_trash()
2011-09-27 11:34:06 +05:30
Nabin Hait
3c8a50c257 Trial balance opening issue fixed if there is no prev year 2011-09-27 11:16:30 +05:30
Nabin Hait
a77cea2b90 Dont add opening entries in account balance debit, credit column 2011-09-27 11:14:54 +05:30
Nabin Hait
c752d075e6 fixed issue in reseting in opening balance, clear bal only that company 2011-09-27 11:04:24 +05:30
Nabin Hait
5c55e43234 trend analyzer issue fixed 2011-09-27 10:57:14 +05:30
Nabin Hait
c034e3d531 Merge branch 'master' of github.com:webnotes/erpnext 2011-09-27 10:55:24 +05:30
Nabin Hait
39297e5775 update_nsm_model in cost center on_trash() 2011-09-27 10:36:17 +05:30
Nabin Hait
d223d12308 Rewritten update_against_document function 2011-09-26 18:57:43 +05:30
Nabin Hait
5f2046496b Internal Reconciliation: for knock out booking and payment entries 2011-09-26 18:56:02 +05:30
Nabin Hait
2736fd59ca fixed cancelled gl entry issue in period closing voucher 2011-09-26 12:55:52 +05:30
Nabin Hait
a28e366c15 deleted duplicate button fron JV 2011-09-22 16:32:02 +05:30
Nabin Hait
5941ae3b75 Default account creation order changed 2011-09-22 16:10:43 +05:30
Nabin Hait
b3ce0ecb34 repost account balance through push patch 2011-09-22 16:10:15 +05:30
Nabin Hait
e8475f9b85 Appraisal score allowed to be fraction 2011-09-22 11:00:53 +05:30
Nabin Hait
fdb0e362a7 update valuation and bin_aqat patch applicable after 01-09-2009 entries 2011-09-19 12:22:47 +05:30
Nabin Hait
48a52d42ed Merge branch 'master' of github.com:webnotes/erpnext 2011-09-16 17:29:30 +05:30
Nabin Hait
f060d0cd16 contact address will be fetched in sales invoice onload when come through mapper 2011-09-16 17:28:49 +05:30
Rushabh Mehta
32e00cb050 missing buttons 2011-09-16 16:28:35 +05:30
Nabin Hait
618d65b6ad company delete permission to system manager 2011-09-16 15:55:19 +05:30
Nabin Hait
e10900115e updated company on_trash function 2011-09-16 15:50:45 +05:30
Nabin Hait
d984872be9 checked sal struc docstatus in validation 2011-09-16 14:47:19 +05:30
Nabin Hait
2d26fe48ed removed sal structure amend permission 2011-09-16 14:35:57 +05:30
Nabin Hait
1dfb3fc7d8 Merge branch 'master' of github.com:webnotes/erpnext 2011-09-16 14:33:38 +05:30
Nabin Hait
0b5f9b0475 update valuation and bin_aqat patch 2011-09-16 14:32:23 +05:30
Nabin Hait
8c9a5af231 Error fixed in bin 2011-09-16 12:51:19 +05:30
Nabin Hait
73c4a4a154 removed make_feed() function 2011-09-16 11:24:54 +05:30
Nabin Hait
ecc75123e8 Merge branch 'master' of github.com:webnotes/erpnext 2011-09-15 15:40:53 +05:30
Nabin Hait
6ae7f8fe58 check serial nos bin qty only if serial no entered into the document 2011-09-15 15:40:27 +05:30
Rushabh Mehta
2adbd89ada Merge branch 'master' of github.com:webnotes/erpnext 2011-09-15 15:09:14 +05:30
Rushabh Mehta
53ba83158c fixes to startup 2011-09-15 15:06:23 +05:30
Nabin Hait
3b19f6b7c8 opening balance fixes in general ledger 2011-09-15 14:38:54 +05:30
Rushabh Mehta
0aed26d83d moved report to folder 2011-09-15 13:00:46 +05:30
Rushabh Mehta
2773940db1 merged from master 2011-09-15 12:55:25 +05:30
Rushabh Mehta
1e11cb486d merging from master and usability fixes to setup 2011-09-14 13:25:10 +05:30
Rushabh Mehta
5f50617121 removed readme 2011-09-13 15:48:51 +05:30
Rushabh Mehta
cbaae20328 breakup of farmework files 2011-09-08 19:07:14 +05:30
Rushabh Mehta
5caedffff8 fixes to buttons etc 2011-09-08 15:45:37 +05:30
Rushabh Mehta
8cf45175a7 Merge branch 'master' of github.com:webnotes/erpnext 2011-09-08 14:17:41 +05:30
Rushabh Mehta
5ede3e8411 fixes to home (multiple loading) 2011-09-08 14:16:34 +05:30
Rushabh Mehta
11c6be065a ready for 0.1 2011-09-06 15:50:01 +05:30
Rushabh Mehta
aa7b05aaeb Merge branch 'master' of github.com:webnotes/erpnext 2011-09-06 12:47:51 +05:30
Rushabh Mehta
b5717bd807 patch etc fixes 2011-09-06 12:46:33 +05:30
Rushabh Mehta
66ac2b018a first cut for lazy loading framework 2011-09-05 18:43:09 +05:30