Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,832 Commits 3 Branches 0 Tags 1 GiB
69c9065e7c
Commit Graph

1026 Commits

Author SHA1 Message Date
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