Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,099 Commits 3 Branches 0 Tags 1 GiB
6781f62c70
Commit Graph

2965 Commits

Author SHA1 Message Date
Nabin Hait
e9a62d1236 reload trial balance report 2012-07-23 11:46:37 +05:30
Anand Doshi
7118086658 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-07-23 11:28:10 +05:30
Anand Doshi
dbe31be55c deprecated bulk rename tool 2012-07-20 18:11:41 +05:30
Anand Doshi
76ec66dd65 fixes for unicode 2012-07-20 18:11:30 +05:30
Nabin Hait
454e268109 Recurring Invoice repititive mail sending issue fixed 2012-07-20 17:17:32 +05:30
Nabin Hait
93e82b8742 error fixed in landed cost wizard 2012-07-20 10:40:14 +05:30
Anand Doshi
1703cc89b4 fixes for unicode 2012-07-19 20:31:56 +05:30
Anand Doshi
486f9dfcec added unicode_literals import at start of each file 2012-07-19 13:40:31 +05:30
Nabin Hait
bbc2d44241 Merge branch 'master' of github.com:webnotes/erpnext 2012-07-19 09:15:49 +05:30
Nabin Hait
cea01c7212 item code get query in customer issue 2012-07-19 09:15:12 +05:30
Anand Doshi
5756630efb Merge branch 'master' of github.com:webnotes/erpnext into dev 
Conflicts:
	erpnext/stock/doctype/delivery_note/delivery_note.py
	public/js/all-app.js
 2012-07-18 20:31:37 +05:30
Anand Doshi
249659d673 Changed file names from listview.js to doctype_name_list.js 2012-07-18 20:25:58 +05:30
Anand Doshi
6efc49af46 Merge branch 'master' of github.com:webnotes/erpnext 2012-07-18 20:15:01 +05:30
Anand Doshi
f2f5c94c41 Default Currency specification for Customer and Supplier 
This will get fetched in sales and purchase transactions respectively.
Fix in sales order list view
 2012-07-18 20:13:52 +05:30
Nabin Hait
28115f3373 repost stock due to incorrect packing list 2012-07-18 18:29:05 +05:30
Nabin Hait
2e72b6ae2c Merge branch 'master' of github.com:webnotes/erpnext 2012-07-18 18:13:04 +05:30
Nabin Hait
ddb9f948ee repost stock due to incorrect packing list 2012-07-18 18:12:34 +05:30
Anand Doshi
a60266d780 fix in doclistview group by logic 2012-07-18 15:43:43 +05:30
Nabin Hait
18b9eccdfa packing list issue fixed 2012-07-18 13:31:08 +05:30
Nabin Hait
41c922d200 Merge branch 'master' of github.com:webnotes/erpnext 2012-07-18 13:19:32 +05:30
Nabin Hait
510eda353a packing list issue fixed 2012-07-18 13:19:01 +05:30
Anand Doshi
04fd09c639 Merge branch 'master' of github.com:webnotes/erpnext into dev 2012-07-17 13:33:57 +05:30
Anand Doshi
4612e696b0 mark stock entry as is_submittable 2012-07-17 13:33:41 +05:30
Anand Doshi
3a281ae6c3 Merge branch 'master' of github.com:webnotes/erpnext into dev 
Conflicts:
	erpnext/patches/patch_list.py
 2012-07-17 13:21:55 +05:30
Anand Doshi
26ca2c8c77 fix in syntax of owner match patch 2012-07-17 13:08:46 +05:30
Anand Doshi
5d4aaaa8a7 patch to remove match condition of owner on event doctype 2012-07-17 13:06:34 +05:30
Nabin Hait
8b091cd864 Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-16 16:35:10 +05:30
Nabin Hait
a25ebe3dbf Conversion rate fieldtype set as float (from currency) 2012-07-16 16:34:28 +05:30
Anand Doshi
2f192a6167 Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-16 16:33:22 +05:30
Anand Doshi
8499773db8 fix in last sales and quote rate in quotation 2012-07-16 16:33:10 +05:30
Rushabh Mehta
4ae82ca0c2 users pages deprecated 2012-07-16 16:20:11 +05:30
Rushabh Mehta
527c5b6da5 Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-16 15:45:18 +05:30
Rushabh Mehta
3c419c5e05 cur_frm.doc re-reference when is called 2012-07-16 15:44:38 +05:30
Nabin Hait
65535da220 Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-16 15:38:41 +05:30
Nabin Hait
49e170153e Include in print rate validation added 2012-07-16 15:38:11 +05:30
Anand Doshi
e7c54a4714 Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-16 15:16:27 +05:30
Anand Doshi
7f2385cee9 Merge branch 'master' into dev 2012-07-16 15:15:34 +05:30
Anand Doshi
59fa430be3 fixes in quotation item code get query 2012-07-16 15:15:24 +05:30
Rushabh Mehta
9e9809a44f Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-16 14:17:22 +05:30
Rushabh Mehta
2eef40bf1e get_field > wn.meta.get_docfield 2012-07-16 14:16:57 +05:30
Nabin Hait
8f5cd388cc Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-16 12:50:25 +05:30
Nabin Hait
388e09834c Check duplicate SO entry for same po no and customer 2012-07-16 12:49:52 +05:30
Anand Doshi
bb81c198f5 Merge branch 'dev' of github.com:webnotes/erpnext into dev 
Conflicts:
	public/js/all-app.js
	public/js/all-web.js
 2012-07-13 16:48:08 +05:30
Anand Doshi
2fef0ee4e1 Merge branch 'master' into dev 2012-07-13 16:47:09 +05:30
Anand Doshi
9ec8024db7 show order type icon in sales order list view 2012-07-13 16:46:12 +05:30
Rushabh Mehta
2d7cb22f1f added auth_table patch file: 2012-07-13 15:07:07 +05:30
Rushabh Mehta
91ba346354 profile cleanup start and new auth table for better security 2012-07-13 14:54:40 +05:30
Nabin Hait
981446c7cc Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-13 11:19:27 +05:30
Rushabh Mehta
d47efd57ac check_required fix 2012-07-13 11:15:25 +05:30
Nabin Hait
0c9a262de4 fixed conflict 2012-07-13 10:39:45 +05:30
Nabin Hait
91223d325b fixed conflict 2012-07-13 10:35:44 +05:30
Anand Doshi
158e7751a8 Merge branch 'master' into dev 2012-07-13 08:53:17 +05:30
Anand Doshi
255d58b3a0 fixes in error logging and refresh cache issues 2012-07-13 08:53:07 +05:30
Anand Doshi
31d8e5618e Merge branch 'master' into dev 2012-07-13 08:24:28 +05:30
Anand Doshi
6c3b622c00 fixes in cms2 patch 2012-07-13 08:24:16 +05:30
Anand Doshi
1d2826d69d Merge branch 'master' into dev 2012-07-13 08:15:34 +05:30
Anand Doshi
665f6048f1 do not delete web cache in refresh cache 2012-07-13 08:15:03 +05:30
Anand Doshi
72a824f483 do not delete web cache in refresh cache 2012-07-13 08:14:32 +05:30
Anand Doshi
91f731641c Merge branch 'master' into dev 2012-07-13 02:16:54 +05:30
Anand Doshi
4cf55c5a04 fixes in blog caching 2012-07-13 02:16:22 +05:30
Anand Doshi
46ac229edc Merge branch 'master' into dev 2012-07-13 01:45:33 +05:30
Anand Doshi
53bd49d46c fixes in blog cache logic 2012-07-13 01:45:19 +05:30
Anand Doshi
d738a2106d Merge branch 'master' into dev 2012-07-13 01:32:36 +05:30
Anand Doshi
51eb8a18ba fix in blog caching 2012-07-13 01:32:23 +05:30
Anand Doshi
0842fad927 Merge branch 'master' into dev 2012-07-13 01:22:32 +05:30
Anand Doshi
970988664a clear cache if home page 2012-07-13 01:22:19 +05:30
Anand Doshi
aa3ab5ec59 Merge branch 'master' into dev 2012-07-13 01:15:08 +05:30
Anand Doshi
200c443b72 fixes in blog list 2012-07-13 01:14:52 +05:30
Anand Doshi
8b8478178c Merge branch 'master' into dev 2012-07-13 00:47:17 +05:30
Anand Doshi
f01059fd3e fixes in blog list 2012-07-13 00:46:59 +05:30
Anand Doshi
4a56e996f1 Merge branch 'master' into dev 2012-07-12 23:38:45 +05:30
Anand Doshi
4659b1eb25 log error on saving doclist in cms2 patch 2012-07-12 23:38:31 +05:30
Anand Doshi
c97f780940 Merge branch 'master' into dev 
Conflicts:
	erpnext/patches/patch_list.py
	erpnext/startup/js/complete_setup.js
	erpnext/stock/doctype/item/item.txt
	public/css/all-app.css
	public/js/all-app.js
	public/js/all-web.js
 2012-07-12 22:16:19 +05:30
Anand Doshi
af1f437fad update in cms2 patch: delete html files 2012-07-12 22:06:27 +05:30
Anand Doshi
3d53e86755 fixes in log comment and web page saving 2012-07-12 20:12:40 +05:30
Anand Doshi
c4eb9bf838 cms2 patch updates 2012-07-12 19:15:52 +05:30
Anand Doshi
1a51cc9ad0 fixes in cms2 updates 2012-07-12 19:03:58 +05:30
Anand Doshi
d68dceb791 Merge branch 'master' of github.com:webnotes/erpnext into cms2 2012-07-12 18:53:35 +05:30
Anand Doshi
51146c07c3 cleaner web cache code 2012-07-12 18:41:12 +05:30
Rushabh Mehta
8cbbab2e75 Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-12 18:01:31 +05:30
Rushabh Mehta
357fb2640b sales bom fixes and mandatory in table fields 2012-07-12 18:00:21 +05:30
Nabin Hait
51f8a6d0d5 select employee based on joining and relieving date in salary maanger 2012-07-12 16:25:13 +05:30
Rushabh Mehta
4feae61b62 fixes to taxes and charges master and naming_series 2012-07-12 16:01:20 +05:30
Nabin Hait
70db682a9a fixed conflict in setup control 2012-07-12 11:47:40 +05:30
Rushabh Mehta
5faf37f312 item group cleanup 2012-07-12 11:33:00 +05:30
Nabin Hait
179f01af17 hong kong added in country list 2012-07-12 11:03:39 +05:30
Nabin Hait
e9c19369a9 salary slip will not submitted through salary manager if Send email checked and invalid email id 2012-07-12 10:33:45 +05:30
Rushabh Mehta
cf969143f2 cleaned up customer group 2012-07-12 09:54:43 +05:30
Anand Doshi
8790188fc8 fixes in web cache record insert for exceptional pages like 404, login-page, index etc. 2012-07-11 20:04:32 +05:30
Rushabh Mehta
b9fabf8e16 sales bom cleanup 2012-07-11 19:18:50 +05:30
Anand Doshi
be59e7cc10 fixes in web cache 2012-07-11 19:12:01 +05:30
Anand Doshi
f7765a899b Show Brand as ERPNext if brand not specified 2012-07-11 19:05:27 +05:30
Anand Doshi
51fc20be5b fixes in index page logic 2012-07-11 18:56:13 +05:30
Nabin Hait
4b8b19a281 Merge branch 'master' of github.com:webnotes/erpnext 2012-07-11 18:41:20 +05:30
Anand Doshi
8c7e76ba44 RSS for blog 
Comment addition into blog page's dom
 2012-07-11 18:40:57 +05:30
Nabin Hait
548a45d550 Hong kong timezone added 2012-07-11 18:40:48 +05:30
Nabin Hait
0cd057ce94 Hong kong timezone added 2012-07-11 18:39:28 +05:30
Rushabh Mehta
cda9732f51 price list cleanup 2012-07-11 17:29:46 +05:30
Nabin Hait
42e1273c4c listview for salary structure 2012-07-11 16:38:00 +05:30
Rushabh Mehta
3a0f191658 cleaned up fiscal_year, currency and added select-all + help in doclistview 2012-07-11 16:35:39 +05:30
Nabin Hait
3b0f5dddea fiscal_year_closed and abbr removed from code 2012-07-11 15:14:06 +05:30
Rushabh Mehta
9acf463427 budget distribution cleanup and formatting of markdown 2012-07-11 14:39:33 +05:30
Anand Doshi
1522f5d76b Merge branch 'master' of github.com:webnotes/erpnext into cms2 2012-07-11 14:27:22 +05:30
Rushabh Mehta
e3dd54c220 Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-11 13:19:36 +05:30
Rushabh Mehta
e57267f79a added patch for account and cleanups to breadcrumbs and msgprint 2012-07-11 13:18:58 +05:30
Nabin Hait
21fdff01e2 Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-11 13:16:38 +05:30
Nabin Hait
9e5059f6b9 packing list introduced in pos invoice 2012-07-11 13:15:57 +05:30
Nabin Hait
cfc6bb1d6c consider warehouse, serial no and batch no from packing list for sales bom item and populate packing list only for sales bom items 2012-07-11 13:14:52 +05:30
Anand Doshi
e2cddd4e78 Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-11 12:09:41 +05:30
Anand Doshi
45ec64a58e fixes in outgoing email connection error handling 2012-07-11 12:06:38 +05:30
Nabin Hait
e4e78b469a Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-11 11:54:08 +05:30
Rushabh Mehta
bf96499c0e account cleanup, added toggle_fields in cur_frm 2012-07-11 09:51:18 +05:30
Rushabh Mehta
d6814dde29 account cleanup started 2012-07-10 18:38:59 +05:30
Nabin Hait
c296764cfe repost button removed from closing entry voucher 2012-07-10 18:25:59 +05:30
Nabin Hait
dcc4cf1fe6 Merge branch 'master' of github.com:webnotes/erpnext 2012-07-10 18:18:57 +05:30
Nabin Hait
04aa191869 freezed account allowed in closing entry 2012-07-10 18:18:03 +05:30
Rushabh Mehta
5281e350fb cost center cleanup 2012-07-10 18:16:09 +05:30
Nabin Hait
29d7641206 fixed issue in period closing voucher: consider freezed account for closing 2012-07-10 18:12:00 +05:30
Rushabh Mehta
1ee2a5ac12 cost center cleanup + grid css 2012-07-10 17:22:20 +05:30
Anand Doshi
090a12d167 do not force send email using conf.py configuration 2012-07-10 15:15:46 +05:30
Nabin Hait
0aec0e1a63 repost balance button removed from period closing voucher 2012-07-10 14:24:45 +05:30
Nabin Hait
7c0b893b1f mandatory validation in cost center 2012-07-10 14:18:35 +05:30
Nabin Hait
969622dcef mandatory validation in cost center 2012-07-10 14:11:01 +05:30
Nabin Hait
0a38e4528b Merge branch 'master' of github.com:webnotes/erpnext 2012-07-10 10:28:21 +05:30
Nabin Hait
1b310c26ce removed depricated commenting style 2012-07-10 10:27:58 +05:30
Anand Doshi
40fce89631 Favicon for website 
Started work on comments to be embedded in blog page
 2012-07-09 20:02:52 +05:30
Nabin Hait
94a6c7e8ac changes in reset_series 2012-07-09 16:06:53 +05:30
Anand Doshi
e47def842d Improvements in product page and its listing 
Login page rendered via a template
 2012-07-09 15:56:12 +05:30
Nabin Hait
cbd23dace7 Merge branch 'master' of git://github.com/webnotes/erpnext 2012-07-09 15:26:10 +05:30
Nabin Hait
1c9903594b utility script for cleanup test data 2012-07-09 15:25:08 +05:30
Anand Doshi
0f5e220d6c Email Digest: New Transactions --> consider feed_type is null records only 2012-07-09 12:48:32 +05:30
Anand Doshi
c6fce634cf added app frame to todo list 2012-07-09 12:34:02 +05:30
Anand Doshi
95a822c701 Fetch Customer's Item Code in Sales Transaction 2012-07-09 11:09:07 +05:30
Nabin Hait
cb2e76a79c delete row issue in grid fixed 2012-07-05 14:44:39 +05:30
Anand Doshi
8c90f12967 changed label of included in print rate to Is this Tax included in Basic Rate? 2012-07-04 13:30:13 +05:30
Anand Doshi
ac475c61dc Merge branch 'master' of github.com:webnotes/erpnext 2012-07-04 11:26:01 +05:30
Anand Doshi
1731786a61 Merge branch 'master' of github.com:webnotes/erpnext into cms2 2012-07-03 15:51:11 +05:30
Nabin Hait
b0e15d6ec5 Update master 2012-07-03 15:30:52 +05:30
Anand Doshi
af539fa5bd deprecate import data control 2012-07-03 14:45:03 +05:30
Anand Doshi
1b8f24b507 update in contact's permissions 2012-07-03 12:55:17 +05:30
Nabin Hait
594d63ab5d serial no fix 2012-07-03 12:24:18 +05:30
Nabin Hait
fdb1993125 fixed conflict 2012-07-03 12:14:48 +05:30
Anand Doshi
851b9c0aad address contact permissions 2012-07-02 20:25:26 +05:30
Anand Doshi
d383e573fc contact, address list views and allow their deletion from customer / supplier form 2012-07-02 19:45:35 +05:30
Nabin Hait
9b1e9aceaf packing list cleanup and serial no status update 2012-07-02 16:42:46 +05:30
Nabin Hait
52fd9de425 packing list cleanup and serial no status update 2012-07-02 16:41:11 +05:30
Nabin Hait
de293e51fc save packing list after cleanup 2012-07-02 16:24:54 +05:30
Anand Doshi
8c7cd2c407 Merge branch 'master' of github.com:webnotes/erpnext into dev 2012-07-02 14:44:05 +05:30
Anand Doshi
cec84e1ec7 logout a disabled user 2012-07-02 11:55:29 +05:30
Nabin Hait
6751261589 reload pr-po mapper patch' 2012-07-02 11:24:37 +05:30
Nabin Hait
5a376f0cdb Merge branch 'master' of github.com:webnotes/erpnext 2012-07-02 11:14:25 +05:30
Nabin Hait
84a2e546de po date should be greated than equal to pur request date 2012-07-02 11:13:48 +05:30
Anand Doshi
c4cae8d561 Merge branch 'master' into dev 2012-06-29 19:07:29 +05:30
Anand Doshi
54b7235705 formatted money in chart of accounts tree 2012-06-29 19:07:20 +05:30
Anand Doshi
365e0c5f13 Merge branch 'master' into dev 2012-06-29 19:04:10 +05:30
Anand Doshi
351352670e formatted money in chart of accounts tree 2012-06-29 19:03:59 +05:30
Anand Doshi
e9a21cbb85 show child table values in doclistview 2012-06-29 18:09:04 +05:30
Anand Doshi
ebe23b0f89 allow deletion of communication 2012-06-29 16:38:07 +05:30
Anand Doshi
1f69f92d2f supplier part number in purchase order 2012-06-29 13:25:08 +05:30
Anand Doshi
efc055241a Merge branch 'master' into dev 2012-06-29 12:25:02 +05:30
Anand Doshi
08faf5bb7f added field descriptions for packing slip 2012-06-29 12:24:35 +05:30
Anand Doshi
bd025a6cdf added field descriptions for packing slip 2012-06-29 12:23:44 +05:30
Anand Doshi
b38546489d Merge branch 'master' into dev 2012-06-28 20:49:31 +05:30
Anand Doshi
bfd9258326 fix in cacheitem table 2012-06-28 20:46:46 +05:30
Anand Doshi
e301e8a6c1 Merge branch 'master' into dev 
Conflicts:
	erpnext/buying/doctype/quality_inspection/quality_inspection.py
 2012-06-28 18:40:57 +05:30
Anand Doshi
cbf181c390 employee list -- show status 2012-06-28 18:38:38 +05:30
Anand Doshi
36f5e257ed minor fix in support ticket list view 2012-06-28 13:08:43 +05:30
Anand Doshi
fef4a71177 minor fix in communication list view 2012-06-28 13:05:39 +05:30
Anand Doshi
0afab07a1f communication listview - show pretty date 2012-06-28 12:59:33 +05:30
Nabin Hait
2c2a17f138 pull available qty in so and DN in selection of item 2012-06-27 15:14:58 +05:30
Nabin Hait
1bf92fe034 update modified time of GRN while updating QA no in GRN 2012-06-27 14:50:14 +05:30
Anand Doshi
d4425cc57d Merge branch 'master' into dev 
Conflicts:
	erpnext/support/doctype/maintenance_visit/maintenance_visit.py
 2012-06-27 14:13:34 +05:30
Nabin Hait
490ae41cee maintenance visit cleanup and integrated with maintenance schedule 2012-06-27 13:21:12 +05:30
Anand Doshi
bba4db1627 product listing and pages 2012-06-27 12:06:45 +05:30
Nabin Hait
b81aa88091 Lease agreement link removed from account home page 2012-06-27 12:00:24 +05:30
Nabin Hait
7ce737be3d Issue fixed in stock reconciliation 2012-06-27 11:33:05 +05:30
Nabin Hait
b8108c68e9 Issue fixed in stock reconciliation 2012-06-27 11:16:28 +05:30
Nabin Hait
5a24749456 Merge branch 'master' of github.com:webnotes/erpnext 2012-06-27 10:12:21 +05:30
Anand Doshi
10bcf5ea25 blog listing + started with products page and listing 2012-06-26 18:54:10 +05:30
Anand Doshi
74962a9213 auto create email digest after setup is completed 2012-06-26 12:47:14 +05:30
Anand Doshi
401f12418f Merge branch 'master' into dev 
Conflicts:
	erpnext/patches/patch_list.py
 2012-06-26 12:20:29 +05:30
Anand Doshi
0b06004986 delete unwanted doctypes of website settings 2012-06-26 12:18:41 +05:30
Anand Doshi
68196bc966 delete records in child table where parent is missing or parent is like 
old_par%
 2012-06-26 12:15:21 +05:30
Anand Doshi
81fa802e09 Merge branch 'master' into dev 2012-06-25 20:06:54 +05:30
Anand Doshi
8ae5ba9abf fixes related to --> clear locals and then sync locals when whole doclist is passed 2012-06-25 20:05:35 +05:30
Nabin Hait
a5e972dd89 reserved warehouse in so and delivery warehouse in dn can be different 2012-06-25 18:06:37 +05:30
Nabin Hait
c6fc345f35 alter tabsessions to change user column definition 2012-06-25 15:30:59 +05:30
Nabin Hait
e5a0086fea alter tabsessions to change user column definition 2012-06-25 15:29:40 +05:30
Nabin Hait
8b14617dce run view ledger report through set_route 2012-06-25 13:15:59 +05:30
Nabin Hait
72a6ec8cb3 SO search query in DN: currency check removed 2012-06-25 10:39:38 +05:30
Anand Doshi
c7b485e724 blog - on update - delete cache if not published 2012-06-22 20:08:30 +05:30
Anand Doshi
72c945b7c6 template based web page loading using web.py 2012-06-22 20:01:07 +05:30
Nabin Hait
33dcbc096a error fixed in cost center wise expense report 2012-06-22 14:34:46 +05:30
Nabin Hait
bceec1cbef error fixed in cost center wise expense report 2012-06-22 14:32:56 +05:30
Nabin Hait
1f5a58eed7 listview of sales invoice 2012-06-22 14:19:06 +05:30
Nabin Hait
486718250e listview of purchase invoice and deletion of supplier 2012-06-22 14:14:04 +05:30
Nabin Hait
318eab813c delete customer account on deletion of customer record 2012-06-22 13:35:13 +05:30
Anand Doshi
24aaa09c99 Merge branch 'master' into dev 2012-06-22 10:56:59 +05:30
Anand Doshi
b4aa0f8ce8 fix in price list: check if a row has content before checking its length; allow only 1 attachment 2012-06-22 10:56:12 +05:30
Anand Doshi
9078f652c3 Merge branch 'master' into cms2 2012-06-21 11:50:44 +05:30
Anand Doshi
5d9fc72753 updates in web.py and template - page.html 2012-06-21 11:48:51 +05:30
Anand Doshi
2939a0ea65 fetch price list rates when creating quotation from opportunity 2012-06-21 11:20:37 +05:30
Nabin Hait
0480153042 error fixed in sales register 2012-06-19 18:07:03 +05:30
Nabin Hait
11de3ec952 fixed error in purchase register 2012-06-19 18:03:31 +05:30
Rushabh Mehta
40182bada3 added patch 2012-06-19 14:15:13 +05:30
Anand Doshi
f8946b1e31 fix in buttons displayed - on change of status in lead form 2012-06-18 18:04:28 +05:30
Anand Doshi
422a27cde0 fix in web page saving issue 2012-06-18 17:37:04 +05:30
Nabin Hait
785fe9abc4 validation changed in supplier 2012-06-18 12:43:25 +05:30
Nabin Hait
34b4d26c1a reload_doc replaced with sync in patch 2012-06-18 11:18:27 +05:30
Nabin Hait
28447e84c2 Update master 2012-06-18 11:03:51 +05:30
Nabin Hait
3adfa9595e patch list updated 2012-06-17 21:57:37 +05:30
Nabin Hait
3ad3ebdaec set recurring type as Monthly in all old sales invoice 2012-06-17 21:54:50 +05:30
Nabin Hait
8eadf09e99 recurring invoice : quarterly, half-yearly and yearly 2012-06-17 21:48:33 +05:30
Rushabh Mehta
96bf0b7f53 web pages don't render into Page and Page does not get written as HTML. Welcome Jinja2 Templates 2012-06-15 17:29:03 +05:30
Rushabh Mehta
cc53afcef3 Merge branch 'master' of github.com:webnotes/erpnext into cms2 2012-06-15 14:01:07 +05:30
Rushabh Mehta
bd7f7231f2 cms now powered by jinja2 2012-06-15 14:00:06 +05:30
Anand Doshi
3878b2a1ac add unique constraint to tabSeries name column 2012-06-14 18:28:29 +05:30
Anand Doshi
7d1e8f218b change date field for sales invoice in sales personwise transaction summary search criteria 2012-06-14 18:11:36 +05:30
Anand Doshi
616c355d20 fix in todos and email settings 2012-06-14 16:46:48 +05:30
Anand Doshi
a86d7887f0 fixes in support ticket autoreply 2012-06-14 14:59:04 +05:30
Anand Doshi
92fd9cce35 fixes in support ticket and email settings 2012-06-14 14:55:44 +05:30
Rushabh Mehta
4c56275d26 appframe is now heading 2012-06-14 11:05:09 +05:30
Anand Doshi
575545d441 added link to show list of all reports 2012-06-13 19:36:55 +05:30
Anand Doshi
94f26eae7c patch for list of search criteria and reports 2012-06-13 19:04:27 +05:30
Anand Doshi
47afacc8e9 1. Reports List - allow read permission to All 
2. Display message when ToDo doesnt contain any item
 2012-06-13 18:02:43 +05:30
Anand Doshi
d104f4bc32 fix in todo 2012-06-13 17:01:52 +05:30
Anand Doshi
7deaff1979 fixed default tax fetch issue 2012-06-13 14:20:24 +05:30
Anand Doshi
3c3f996ade todo list with assigned to others list 2012-06-13 12:01:41 +05:30
Anand Doshi
64ddb9f069 show assigned to others list in todo 2012-06-12 19:24:12 +05:30
Anand Doshi
4f4f58293f fix in item group on_trash 2012-06-12 17:03:09 +05:30
Nabin Hait
4676891cbf error fixed in reorder item email notification 2012-06-12 15:04:38 +05:30
Nabin Hait
d8fd8cfe1b error fixed in reorder item email notification 2012-06-12 14:30:57 +05:30
Nabin Hait
ea8ff071cb error fixed in reorder item email notification 2012-06-12 14:23:48 +05:30
Anand Doshi
eddea78768 Merge branch 'master' of github.com:webnotes/erpnext 2012-06-12 14:18:14 +05:30
Anand Doshi
443426277b sync purchase invoice item, purchase_receipt_item and purchase order item before patch 2012-06-12 14:17:44 +05:30
Nabin Hait
75af0b2867 Merge branch 'master' of github.com:webnotes/erpnext 2012-06-12 14:16:45 +05:30
Anand Doshi
8eaa2dd570 sync purchase invoice item and purchase order item before patch 2012-06-12 14:16:37 +05:30
Nabin Hait
9b0178acae error fixed in reorder item email notification 2012-06-12 14:16:21 +05:30
Anand Doshi
0146ddcfc6 delete communication log for supplier and customer, on trash 2012-06-12 14:09:44 +05:30
Anand Doshi
89e2b3bda4 minor fix in lead's listview 2012-06-12 13:11:29 +05:30
Anand Doshi
3b6eda3b45 fix in listviews of lead, customer and supplier 2012-06-12 13:08:57 +05:30
Nabin Hait
8afa88b906 fixed utf8 error in multi ledger export 2012-06-11 17:48:40 +05:30
Anand Doshi
a4b19f1d58 Merge branch 'master' of github.com:webnotes/erpnext 2012-06-08 18:21:56 +05:30
Anand Doshi
a65ad2c901 fetch customer/supplier given a contact in communication 2012-06-08 18:21:35 +05:30
Nabin Hait
6581ef9449 fetch organization from lead to quote 2012-06-08 18:19:32 +05:30
Nabin Hait
f74b023106 fetch organization from lead to quote 2012-06-08 18:14:38 +05:30
Nabin Hait
7357fc1817 fetch organization from lead to quote 2012-06-08 18:02:38 +05:30
Nabin Hait
563eb9c43b Merge branch 'master' of github.com:webnotes/erpnext 2012-06-08 16:15:38 +05:30
Nabin Hait
be5e5059c3 Lead Organization field added in quotation 2012-06-08 16:15:08 +05:30
Anand Doshi
3ee7bb5ead Merge branch 'master' of github.com:webnotes/erpnext 2012-06-08 16:07:45 +05:30
Anand Doshi
08c0869a3b load some conf data in boot 2012-06-08 16:07:01 +05:30
Rushabh Mehta
be7ce4744a website color should be black 2012-06-08 14:18:21 +05:30
Nabin Hait
59c7670713 copy uom in pur inv from po, pr 2012-06-08 12:31:37 +05:30
Nabin Hait
d491fc7a31 Merge branch 'master' of github.com:webnotes/erpnext 2012-06-08 12:13:47 +05:30
Nabin Hait
856442e33b taxes query changes 2012-06-08 12:13:00 +05:30
Nabin Hait
2e3579a4eb Item Barcode implemented 2012-06-07 19:09:17 +05:30
Anand Doshi
4dbeae1eae escape double quotes in communication content, allow 0 as value in data/int field 2012-06-07 14:39:42 +05:30
Nabin Hait
91034af0dc Get Query changes for tax account: allowed account type income/expense 2012-06-07 12:12:08 +05:30
Rushabh Mehta
9d18ebbf69 Merge branch 'master' of github.com:webnotes/erpnext 2012-06-07 11:58:16 +05:30
Rushabh Mehta
e810f8eadc web-page name fix 2012-06-07 11:57:32 +05:30
Anand Doshi
afb3d53f55 fix in gs 2012-06-07 11:50:52 +05:30
Anand Doshi
e5de85aec2 fix in communication list in parent forms 2012-06-07 11:41:42 +05:30
Rushabh Mehta
a89f52041f communication is now created when email is sent 2012-06-07 11:30:02 +05:30
Rushabh Mehta
e97f8bbb5a Merge branch 'master' of github.com:webnotes/erpnext 2012-06-07 11:00:49 +05:30
Rushabh Mehta
0873e75fb2 better notification message 2012-06-07 11:00:33 +05:30
Anand Doshi
08c4f64d5f fix in communication listing 2012-06-06 13:19:38 +05:30
Anand Doshi
e37bf2215a do not load communication if no permission 2012-06-06 12:41:34 +05:30
Rushabh Mehta
c91e16dd1e email_digest updates 2012-06-06 11:27:38 +05:30
Rushabh Mehta
0b00b46a99 Merge branch 'master' of github.com:webnotes/erpnext 2012-06-06 11:11:58 +05:30
Rushabh Mehta
260162db1b email digest: mobile friendly 2012-06-06 11:11:35 +05:30
Anand Doshi
937d838bdc min height for communication history and transaction history 2012-06-05 20:19:52 +05:30
Anand Doshi
49230000e5 communication log removal patch 2012-06-05 18:51:57 +05:30
Anand Doshi
dbb84a271e Merge branch 'master' of github.com:webnotes/erpnext into comm_log 
Conflicts:
	erpnext/selling/doctype/lead/lead.js
	erpnext/setup/doctype/contact_control/contact_control.js
 2012-06-05 18:37:17 +05:30
Anand Doshi
390b788e7b communication 2012-06-05 18:28:38 +05:30
Nabin Hait
252a7a189b Account type=Income/Expense allowed in income/expense account searching in sales/pur invoice 2012-06-05 15:27:12 +05:30
Nabin Hait
f24d2efe2c Parent node validation fixed for tree 2012-06-05 10:41:27 +05:30
Nabin Hait
c84c86e458 customer info added in maintenance schedule event 2012-06-04 17:47:47 +05:30
Nabin Hait
6c34e1411f Flexible invoice period in recurring invoice 2012-06-04 16:21:25 +05:30
Nabin Hait
bc8e9d7a34 Flexible invoice period in recurring invoice 2012-06-04 16:18:38 +05:30
Nabin Hait
9ec73ccf1e Merge branch 'master' of github.com:webnotes/erpnext 2012-06-04 14:04:57 +05:30
Nabin Hait
6ea87a42a8 convert to group/ledger button hide/unhide issue fixed 2012-06-04 14:04:36 +05:30
Rushabh Mehta
983c551796 gantt chart fixes 2012-06-04 13:20:42 +05:30
Rushabh Mehta
07c94ce9c0 update in Task, notification and layout 2012-06-04 12:57:23 +05:30
Nabin Hait
aaab084a12 uom field added in pur invoice item table 2012-06-04 12:10:43 +05:30
Nabin Hait
d2301f9569 uom field added in pur invoice item table 2012-06-04 12:07:45 +05:30
Nabin Hait
765298bc63 uom field added in pur invoice item table 2012-06-04 12:02:56 +05:30
Nabin Hait
e4f2c7b213 series issue in attendance template 2012-06-04 11:48:50 +05:30
Nabin Hait
e91d8ccc5c Custom query for item in serial no 2012-06-04 10:47:44 +05:30
Nabin Hait
0e4afb910b parent node get_query modified in all tree 2012-06-04 10:32:31 +05:30
Nabin Hait
e315aba130 expected delivery date mandatory only if order type is sales 2012-06-01 10:11:14 +05:30
Anand Doshi
c5d857896e fixes in communication doctype 2012-05-31 18:23:16 +05:30
Nabin Hait
e44ebb1ec7 removed available qty validation in pos 2012-05-31 15:22:05 +05:30
Anand Doshi
a6708fb748 new doctype: communication 2012-05-31 14:53:55 +05:30
Nabin Hait
fe678fd638 balance area only for accounts not for cost center 2012-05-31 13:32:45 +05:30
Nabin Hait
1835ee6c8b issue fixed 2012-05-31 12:28:07 +05:30
Nabin Hait
0908b2709b fixed conflict 2012-05-31 11:49:37 +05:30
Nabin Hait
5c1de3a639 fixed conflict 2012-05-31 11:47:09 +05:30
Nabin Hait
353bc313a6 Link to Sales/accounts browser fixed 2012-05-31 11:43:14 +05:30
Anand Doshi
6971f577da Merge branch 'master' of github.com:webnotes/erpnext 2012-05-29 15:47:47 +05:30
Anand Doshi
9c011f405d new rename doc function 2012-05-29 15:47:27 +05:30
Anand Doshi
82695ddd90 fixes in transaction history of customer and supplier 2012-05-29 14:14:27 +05:30
Anand Doshi
2ac77beb50 fix in packing list issue 2012-05-29 11:29:52 +05:30
Anand Doshi
53bac88d92 Merge branch 'master' of github.com:webnotes/erpnext 2012-05-29 11:00:06 +05:30
Anand Doshi
2afe974a5b fix in remove euro currency patch 2012-05-29 10:58:28 +05:30
Rushabh Mehta
92c2c8f1f6 Merge branch 'master' of github.com:webnotes/erpnext 2012-05-29 10:53:58 +05:30
Rushabh Mehta
16aea34a37 show new reports as well as old 2012-05-29 10:53:37 +05:30
Anand Doshi
e012f06452 fix in purchase order validate currency's error messages, production order's produced qty field marked as no copy 2012-05-28 19:05:52 +05:30
Anand Doshi
3b091418ec allow zero payment in POS Invoice, when cash/bank account is not specified 2012-05-28 18:08:02 +05:30
Anand Doshi
2ad2426610 fix in get other charges of sales_common.py 2012-05-28 16:05:54 +05:30
Anand Doshi
4792f51e2a remove euro currency patch, address / contact supplier/customer can now contain slashes in their name 2012-05-28 13:26:17 +05:30
Anand Doshi
041cea763e fix in stock ledger entry for items have sales bom 2012-05-25 17:49:37 +05:30
Anand Doshi
16cf4fa806 fix in get_item_list, which was causing negative stock error 2012-05-25 16:54:27 +05:30
Anand Doshi
002191f166 fix in rename tool 2012-05-25 12:20:27 +05:30
Anand Doshi
fc243ea7d4 removed debug from maintenace scheduler 2012-05-24 15:56:34 +05:30
Anand Doshi
5fda36f2c0 fix in profile permissions and support ticket response should update modified datetime 2012-05-24 12:39:18 +05:30
Anand Doshi
fcbd2ad792 Merge branch 'master' of github.com:webnotes/erpnext 2012-05-23 18:27:29 +05:30
Anand Doshi
9da0bf6106 fix in customer address contact report 2012-05-23 18:27:05 +05:30
Nabin Hait
4aaaa8af7b Merge branch 'master' of github.com:webnotes/erpnext 2012-05-23 16:22:41 +05:30
Nabin Hait
2b06b903a5 Merge branch 'shf_rename' 2012-05-23 16:22:24 +05:30
Nabin Hait
517eacf9e3 packing list code updated for duplicate items in item table 2012-05-23 16:21:39 +05:30
Anand Doshi
9327bb9585 fix in tag viewing in doclistview 2012-05-23 15:12:22 +05:30
Nabin Hait
ea538bb9c7 fixed conflict 2012-05-23 12:57:05 +05:30
Nabin Hait
97bb6ce88b create report manager role patch 2012-05-23 12:55:11 +05:30
Nabin Hait
86df78aabc fixed conflict 2012-05-23 11:33:28 +05:30
Nabin Hait
53dab4ac40 validation in customer 2012-05-23 11:29:13 +05:30
Anand Doshi
38830ddae1 removed console log in customer.js 2012-05-23 10:55:59 +05:30
Nabin Hait
611157447f sms fix 2012-05-22 17:25:39 +05:30
Anand Doshi
6033d96a56 fixes in style settings 2012-05-22 17:21:24 +05:30
Anand Doshi
e780f661a7 fix in transaction history 2012-05-22 17:04:33 +05:30
Nabin Hait
df9f8a363e Balance on chart of accounts 2012-05-22 16:54:46 +05:30
Nabin Hait
78b62cd865 Maintain same rate throughout pur cycle: in global defaults, by default set true 2012-05-22 16:23:27 +05:30
Nabin Hait
a21d2a9b38 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-22 14:54:25 +05:30
Nabin Hait
b695f73293 Maintain same rate throughout pur cycle: in global defaults, by default set true 2012-05-22 14:53:40 +05:30
Anand Doshi
f0babb7f0f fixes in cms 2012-05-22 13:41:51 +05:30
Anand Doshi
d287962cd9 removed the double check box in support ticket list 2012-05-21 19:36:47 +05:30
Rushabh Mehta
ceb2ab35e6 fixes in cms page generation 2012-05-21 15:56:50 +02:00
Anand Doshi
cb909d518c Merge branch 'shf_rename' 2012-05-21 18:44:19 +05:30
Anand Doshi
dedd8cc510 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-21 18:41:57 +05:30
Anand Doshi
2c4cd08844 more listviews 2012-05-21 18:40:53 +05:30
Nabin Hait
86375f089a Merge branch 'shf_rename' 
Conflicts:
	erpnext/patches/patch_list.py
 2012-05-21 15:48:21 +05:30
Nabin Hait
cba9c716f2 Remove all those parent items from packing details which are no longer present in main item table 2012-05-21 15:35:23 +05:30
Nabin Hait
ee2201cc68 forced export limit increased to 2000 2012-05-21 15:13:57 +05:30
Anand Doshi
6420e602e0 make server side custom script readonly for system manager 2012-05-21 15:11:36 +05:30
Anand Doshi
8db7ff3b36 hide domain list field, as it is not functional currently 2012-05-21 14:59:45 +05:30
Nabin Hait
d429a20c6e Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-21 14:51:04 +05:30
Nabin Hait
8b426a6142 customer issue cleanup 2012-05-21 14:50:28 +05:30
Nabin Hait
fec3f783af custom field included in docfield query 2012-05-21 14:40:25 +05:30
Anand Doshi
1aae261490 delete button in doclistview 2012-05-21 14:31:03 +05:30
Nabin Hait
d9742a6a58 on_trash modified for item group, territory, customer group, and sales person 2012-05-21 13:33:09 +05:30
Anand Doshi
881f154275 change session cache storage as json 2012-05-21 13:13:10 +05:30
Rushabh Mehta
03a26f2ed2 list blogs based on creation date 2012-05-19 10:53:15 +05:30
Nabin Hait
c68635d70a Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-18 18:37:28 +05:30
Nabin Hait
3b8d4776a2 company validation 2012-05-18 18:36:56 +05:30
Anand Doshi
df914991c4 Merge branch 'shf_rename' 2012-05-18 18:21:43 +05:30
Anand Doshi
bde13a655f moved uom next to qty in quotation item 2012-05-18 18:21:29 +05:30
Anand Doshi
fd3b19defa Merge branch 'shf_rename' 2012-05-18 18:08:44 +05:30
Anand Doshi
67a2e0123c moved po number and po date to basic info section of delivery note 2012-05-18 18:08:28 +05:30
Anand Doshi
0f7dd5453d Merge branch 'shf_rename' 2012-05-18 16:55:48 +05:30
Anand Doshi
227e9d3ac6 cleanup customize form 2012-05-18 16:55:20 +05:30
Anand Doshi
00175612ac Merge branch 'shf_rename' 
Conflicts:
	erpnext/stock/doctype/item/listview.js
 2012-05-18 16:50:35 +05:30
Anand Doshi
d49da9bff1 new listviews 2012-05-18 16:49:36 +05:30
Anand Doshi
d643d367ca Merge branch 'shf_rename' 
Conflicts:
	public/js/all-app.js
	public/js/all-web.js
 2012-05-18 11:52:31 +05:30
Anand Doshi
acd291a228 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-18 11:50:08 +05:30
Nabin Hait
c1f1702e22 so pending item patch 2012-05-18 11:43:10 +05:30
Nabin Hait
c58fbffc00 so pending item patch 2012-05-18 11:07:04 +05:30
Nabin Hait
a926468574 reload so pending items 2012-05-17 18:12:32 +05:30
Anand Doshi
fc9145425d Fixes in Print Formats - discount in description 2012-05-17 18:11:54 +05:30
Nabin Hait
7a13b238cb fixes in sales order pending items report 2012-05-17 18:06:14 +05:30
Nabin Hait
7638833b75 salary register issue fixed 2012-05-17 17:47:26 +05:30
Nabin Hait
f5e9dd7b96 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-17 17:10:59 +05:30
Nabin Hait
76d69b1000 salary register issue fixed 2012-05-17 17:10:15 +05:30
Anand Doshi
c7e26873c0 Merge branch 'shf_rename' 2012-05-17 15:28:54 +05:30
Anand Doshi
dad93ce8a3 fix in payment reconciliation 2012-05-17 15:28:38 +05:30
Nabin Hait
57f9bd1d73 bom issue fixed 2012-05-17 15:02:02 +05:30
Nabin Hait
86289d1291 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-17 12:48:19 +05:30
Nabin Hait
8b2473cc40 report fixed: sales persons target variance (item group wise) 2012-05-17 12:47:48 +05:30
Anand Doshi
ae4fc41e61 Merge branch 'shf_rename' 2012-05-16 14:35:15 +05:30
Anand Doshi
57599ebbae Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-16 14:11:24 +05:30
Anand Doshi
9175100e3d fixes in print format 2012-05-16 14:10:27 +05:30
Nabin Hait
76862b1ebc Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-16 14:07:11 +05:30
Nabin Hait
7b87a7ec74 fixed pos settings 2012-05-16 14:07:02 +05:30
Anand Doshi
28335b7ee7 print format readonly patch 2012-05-16 13:44:06 +05:30
Anand Doshi
c51c0d38d7 Merge branch 'shf_rename' 2012-05-16 12:28:14 +05:30
Nabin Hait
f0c3fc47f9 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-16 12:20:53 +05:30
Nabin Hait
86dec8da7a naming series issue fixed in pos settings 2012-05-16 12:20:21 +05:30
Anand Doshi
1bba28a723 Merge branch 'shf_rename' 
Conflicts:
	erpnext/patches/patch_list.py
 2012-05-15 18:22:55 +05:30
Anand Doshi
a5a747fd8d reload sales invoice print formats 2012-05-15 18:17:52 +05:30
Nabin Hait
f044526b92 json error fixed in stock entry 2012-05-15 15:29:47 +05:30
Nabin Hait
901e92d8fa rejected qty issue fixed 2012-05-15 13:40:26 +05:30
Nabin Hait
0a1c5d9db6 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-15 12:15:44 +05:30
Nabin Hait
ed02a85184 fixed issue 2012-05-15 12:15:19 +05:30
Anand Doshi
f295591168 Merge branch 'shf_rename' 2012-05-14 18:03:45 +05:30
Anand Doshi
4ce0cd7274 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-14 18:03:12 +05:30
Anand Doshi
4924c96380 sync support emails only when sync_support_mails is set to 1 2012-05-14 18:02:21 +05:30
Rushabh Mehta
deeae62b18 merge js/css 2012-05-14 15:03:17 +05:30
Rushabh Mehta
6598b6276b fixes to website settings and linking import data in setup 2012-05-14 15:02:35 +05:30
Nabin Hait
a13b435163 invoice period in print format if recurring invoice 2012-05-14 14:11:56 +05:30
Anand Doshi
07af8f6247 fix in last purchase rate 2012-05-14 13:02:31 +05:30
Anand Doshi
4a3d3d75de Merge branch 'shf_rename' 
Conflicts:
	erpnext/patches/patch_list.py
 2012-05-14 12:53:29 +05:30
Anand Doshi
314c202340 more changes to last purchase rate 2012-05-11 18:38:11 +05:30
Anand Doshi
cec150b487 fixes in last purchase rate 2012-05-11 18:13:53 +05:30
Rushabh Mehta
7483ae9573 fix in button disablity leading to double click 2012-05-11 16:23:41 +05:30
Rushabh Mehta
0eb790a0ae cleaned up imports, doc 2012-05-11 15:53:37 +05:30
Nabin Hait
956eeb1361 fetch defaults after mapping from prev document 2012-05-11 14:45:02 +05:30
Nabin Hait
bd3d3ca1eb error fixed in sending mail on submitting of sal slip 2012-05-11 13:36:17 +05:30
Nabin Hait
43dd041ced page role series pacth 2012-05-11 11:47:18 +05:30
Nabin Hait
a5b8ac4867 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-11 11:12:23 +05:30
Nabin Hait
41526227e3 page role series pacth 2012-05-11 11:11:46 +05:30
Anand Doshi
df74d30cf1 fix in listview of journal voucher 2012-05-10 19:19:31 +05:30
Rushabh Mehta
7f523ac33c merge 2012-05-10 19:11:00 +05:30
Rushabh Mehta
ea7ba72397 data import and upload issues 2012-05-10 19:07:53 +05:30
Anand Doshi
2f53eba3dc Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-10 18:48:47 +05:30
Anand Doshi
02c0eaf99a don't show currency in journal voucher's listview 2012-05-10 18:48:15 +05:30
Nabin Hait
ef85c4e556 posting time fixes in stock ledger entry 2012-05-10 17:48:34 +05:30
Anand Doshi
4b1a44f4a7 fix blog page 2012-05-10 15:44:36 +05:30
Anand Doshi
3fa25faca2 fixes after merge with cms 2012-05-10 15:15:43 +05:30
Nabin Hait
91d6d1423d reload reports 2012-05-10 14:32:56 +05:30
Nabin Hait
3f7b883010 reload reports 2012-05-10 14:32:02 +05:30
Anand Doshi
e463fc6300 Merge branch 'master' of github.com:webnotes/erpnext 2012-05-10 14:20:09 +05:30
Anand Doshi
951d8ec342 fix in issues arising due to wn.require 2012-05-10 14:19:11 +05:30
Nabin Hait
6fb498ebcd changed field position of net total(import) 2012-05-10 14:03:39 +05:30
Nabin Hait
a15740a974 fixed issue 2012-05-10 12:56:40 +05:30
Anand Doshi
bf68e04d2f Merge branch 'master' of github.com:webnotes/erpnext 
Conflicts:
	erpnext/patches/patch_list.py
 2012-05-10 12:40:58 +05:30
Nabin Hait
fdeb55ba69 stock reco patch 2012-05-10 12:18:11 +05:30
Nabin Hait
08f4cb7f6a stock reco fix in valuation and cancellation 2012-05-10 12:13:47 +05:30
Anand Doshi
df8b4ab9b1 Merge branch 'cms' 2012-05-10 10:21:29 +05:30
Rushabh Mehta
078867c411 fixes to listview 2012-05-09 16:15:51 +05:30
Rushabh Mehta
81dba76699 cms updates 2012-05-09 15:37:54 +05:30
Nabin Hait
7f82256394 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-09 15:27:03 +05:30
Nabin Hait
68f9ad31ae serialized inventory fixes : serial no for sales bom child item and rejected qty 2012-05-09 15:26:27 +05:30
Rushabh Mehta
be93aa027f cms fixes 2012-05-09 14:44:40 +05:30
Rushabh Mehta
fa390039ff cms fixes 2012-05-09 14:41:36 +05:30
Rushabh Mehta
caf4e374ab cms fixes 2012-05-09 14:40:44 +05:30
Rushabh Mehta
9454ccc5b8 cms fixes 2012-05-09 14:35:00 +05:30
Rushabh Mehta
cb1f1d81aa cms patch 2012-05-09 14:10:49 +05:30
Rushabh Mehta
e45042e011 merge 2012-05-09 12:22:50 +05:30
Rushabh Mehta
b9483d1809 cms updates 2012-05-09 11:42:52 +05:30
Anand Doshi
c241a476ab moved shipping address in basic info section 2012-05-09 11:07:15 +05:30
Rushabh Mehta
458ca8eddb cms fixes 2012-05-09 10:17:08 +05:30
Nabin Hait
a6b8e84f09 removed whong depends on value 2012-05-08 17:18:40 +05:30
Rushabh Mehta
a933b632ad templates cleaner and generation for all pages 2012-05-08 16:06:44 +05:30
Rushabh Mehta
5ab8163140 fixes to routing and activating web page 2012-05-08 12:58:32 +05:30
Nabin Hait
6d6ca4bdb8 mapper fix 2012-05-08 11:51:35 +05:30
Rushabh Mehta
c22d9e03e7 Merge branch 'shf_rename' of github.com:webnotes/erpnext into cms 2012-05-08 11:02:58 +05:30
Rushabh Mehta
a920943e43 new cms with public folder 2012-05-07 18:00:57 +05:30
Nabin Hait
c22bd05bb5 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-07 17:35:45 +05:30
Nabin Hait
5375627bca stock reco issue fixed 2012-05-07 17:35:15 +05:30
Anand Doshi
a00852ce19 fix in purchase receipt - show challan no for indian customers 2012-05-07 16:59:28 +05:30
Nabin Hait
12ec1db2fa Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-07 12:00:00 +05:30
Nabin Hait
5f4ca56fd1 Fixes related to renamedt 2012-05-07 11:59:23 +05:30
Rushabh Mehta
7ef15ce7fe Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-07 10:44:24 +05:30
Rushabh Mehta
252664e288 remove unsupported for google 2012-05-07 10:43:18 +05:30
Anand Doshi
ebc3b87f8d Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-05 20:06:43 +05:30
Anand Doshi
f36aee2c6b fix in contact address saving issue 2012-05-05 20:05:58 +05:30
Nabin Hait
875ccac151 stock reco cancellation issue fxed 2012-05-04 18:48:30 +05:30
Nabin Hait
b5d50dcc53 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-04 17:56:00 +05:30
Nabin Hait
ce4d297641 rename dt in custom search criteria 2012-05-04 17:55:32 +05:30
Anand Doshi
29d36a6cea fixes in account setup 2012-05-04 16:20:30 +05:30
Anand Doshi
bc1d74dbfe fix in landed cost master query 2012-05-04 13:13:44 +05:30
Anand Doshi
837baee1b4 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-04 13:05:36 +05:30
Anand Doshi
cc1583de88 fix in landed cost master 2012-05-04 13:04:40 +05:30
Nabin Hait
8cf9934b93 Trend analyzer issue fixed 2012-05-04 12:52:56 +05:30
Nabin Hait
978a1e0e46 field rearranged in sales invoice 2012-05-04 11:57:55 +05:30
Nabin Hait
ff81c37689 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-04 11:46:38 +05:30
Nabin Hait
0fb4eeb5bb cancellation issue fixed in stock reco 2012-05-04 11:46:07 +05:30
Rushabh Mehta
f9c766ad3a login-topbar id fix 2012-05-04 11:41:57 +05:30
Rushabh Mehta
7f5791ba1e jv, search fix 2012-05-04 10:10:30 +05:30
Rushabh Mehta
22cd09beb3 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-04 10:02:51 +05:30
Rushabh Mehta
5a774db021 delivery, not and sales_bom 2012-05-04 10:02:09 +05:30
Nabin Hait
7c60fc13b2 reports fixed: itemwise sales/delivery report 2012-05-03 18:22:32 +05:30
Nabin Hait
a67f706c92 options did not updated in stock entry 2012-05-03 18:09:15 +05:30
Nabin Hait
0f11df13bb Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-03 17:50:06 +05:30
Nabin Hait
d8df7b5884 quotation fix 2012-05-03 17:49:45 +05:30
Anand Doshi
f09bd67e53 fix in security settings 2012-05-03 16:44:54 +05:30
Anand Doshi
ee9863cfce Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-03 16:27:20 +05:30
Anand Doshi
4b6c1f8de5 fixes in notification control due to renaming of doctype 2012-05-03 16:26:38 +05:30
Nabin Hait
d315cb5eb7 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-03 14:55:36 +05:30
Nabin Hait
dc7ffe47b2 fixes in quotation 2012-05-03 14:55:21 +05:30
Nabin Hait
16b6386648 fixes in quotation 2012-05-03 14:41:35 +05:30
Anand Doshi
47fac1804b Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-03 13:23:32 +05:30
Anand Doshi
359852e3d9 fix in email digest 2012-05-03 13:23:06 +05:30
Nabin Hait
618331672d Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-03 13:10:52 +05:30
Nabin Hait
32826a8cf1 fixes in customerwise price list 2012-05-03 13:10:34 +05:30
Anand Doshi
57bc3f424f fix in email digest 2012-05-03 12:57:56 +05:30
Anand Doshi
996abdd155 fix in email digest 2012-05-03 12:48:44 +05:30
Anand Doshi
a467eee917 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-03 12:38:01 +05:30
Anand Doshi
e5982c0399 email digest fixes 2012-05-03 12:37:26 +05:30
Rushabh Mehta
ce02a74dbc login id for topbar 2012-05-03 10:57:03 +05:30
Rushabh Mehta
39489278ec update messages fix 2012-05-03 10:44:44 +05:30
Rushabh Mehta
28bb342f96 list view for purchase receipt 2012-05-03 10:41:19 +05:30
Rushabh Mehta
3d0c9ba22d added listview for stock entry, listview templates 2012-05-03 10:35:51 +05:30
Rushabh Mehta
182569feb0 shipping address on top for delivery note 2012-05-03 10:28:23 +05:30
Rushabh Mehta
acd0769098 list in listview and sales order fix 2012-05-03 10:20:38 +05:30
Nabin Hait
8c04a1fe77 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-02 17:59:20 +05:30
Nabin Hait
b92d9ef618 removed patch file specific to bullows 2012-05-02 17:58:13 +05:30
Rushabh Mehta
d5e1031f42 floating logo on left 2012-05-02 17:44:59 +05:30
Nabin Hait
52ca9a1ed1 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-02 16:05:15 +05:30
Nabin Hait
00ba2ce8b4 fixes in sales and pur return 2012-05-02 16:04:42 +05:30
Rushabh Mehta
f2c3db6e83 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-02 15:30:58 +05:30
Rushabh Mehta
4ee56c064e added ace editor 2012-05-02 15:30:15 +05:30
Nabin Hait
a4561e14aa patch list updated 2012-05-02 14:58:53 +05:30
Nabin Hait
7ef8168dbc Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-02 14:56:17 +05:30
Nabin Hait
afb704c940 rename fix in prev doctype 2012-05-02 14:56:00 +05:30
Rushabh Mehta
30ab0227b3 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-02 13:45:25 +05:30
Rushabh Mehta
aa51377e94 custom startup 2012-05-02 13:03:41 +05:30
Anand Doshi
187ac7ccf1 delete question-view page 2012-05-02 12:23:44 +05:30
Anand Doshi
60118662ff delete question-view page 2012-05-02 12:23:05 +05:30
Anand Doshi
b1f46c80b2 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-02 12:21:53 +05:30
Anand Doshi
e876ac2005 delete question-view page 2012-05-02 12:21:27 +05:30
Nabin Hait
a4e9a52ea3 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-02 12:19:59 +05:30
Nabin Hait
ab96d12086 fixes in customerwise price list 2012-05-02 12:19:33 +05:30
Rushabh Mehta
7b4a60a980 form toolbar lables and support ticket fix 2012-05-02 11:35:04 +05:30
Nabin Hait
c55d83b36e Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-02 10:36:29 +05:30
Nabin Hait
dd200d363e cleanup property setter patch 2012-05-02 10:36:16 +05:30
Nabin Hait
50a0cadb9f cleanup property setter patch 2012-05-02 10:32:28 +05:30
Rushabh Mehta
b21307767d Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-02 10:22:20 +05:30
Rushabh Mehta
a0571fe570 toolbar fix for null 2012-05-02 10:20:40 +05:30
Nabin Hait
8d6917dc04 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-02 10:00:44 +05:30
Nabin Hait
07c3b399f6 field arrngement fix 2012-05-02 10:00:03 +05:30
Rushabh Mehta
8eba118379 font fix 2012-05-02 09:45:28 +05:30
Anand Doshi
98ae634c50 fixes in sales order item widths 2012-05-01 18:31:40 +05:30
Nabin Hait
722bbd8ef0 JV fix 2012-05-01 16:36:51 +05:30
Nabin Hait
5af62d0857 fixed conflict using theirs 2012-05-01 16:29:40 +05:30
Nabin Hait
796505a83e field arrangement in purchase and stock cycle 2012-05-01 16:26:16 +05:30
Rushabh Mehta
8360a5f729 no address in footer 2012-05-01 16:23:05 +05:30
Rushabh Mehta
c59fc6623b Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-01 16:15:37 +05:30
Rushabh Mehta
39c47a0b4b blog sequence 2012-05-01 16:15:09 +05:30
Anand Doshi
23e777545a fix in naming series patch's execution 2012-05-01 16:05:23 +05:30
Rushabh Mehta
58bf2379a0 double dashbaord 2012-05-01 15:18:26 +05:30
Rushabh Mehta
ef048f7256 fix to profile_settings 2012-05-01 14:56:20 +05:30
Rushabh Mehta
30e3f157bc fix to startupjs 2012-05-01 14:07:41 +05:30
Rushabh Mehta
efed5239f0 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-01 13:43:03 +05:30
Rushabh Mehta
6f8e9e951e website fixes 2012-05-01 13:41:44 +05:30
Nabin Hait
57d7c815d2 field arrangement in sales cycle 2012-05-01 12:35:12 +05:30
Anand Doshi
3f6eed2dc2 fix in account subscription info box creation 2012-05-01 12:23:28 +05:30
Nabin Hait
926f46f04a Fixed conflict while merging with master 2012-05-01 11:51:08 +05:30
Nabin Hait
d58da50f50 Merge branch 'master' of github.com:webnotes/erpnext 2012-05-01 11:37:45 +05:30
Nabin Hait
2ade43a647 field arrangement in sales cycle 2012-05-01 11:37:13 +05:30
Nabin Hait
1e335f3272 fixes in validattion of debit to account with customer in sales invoice 2012-05-01 10:53:50 +05:30
Nabin Hait
41c62727c7 fixes in validattion of debit to account with customer in sales invoice 2012-05-01 10:45:47 +05:30
Anand Doshi
563fcc1b05 fix in startup.js 2012-04-30 21:06:31 +05:30
Anand Doshi
5c2a792d03 if max_users = 0, consider unlimited users 2012-04-30 20:03:23 +05:30
Anand Doshi
954567b87f Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-30 20:01:00 +05:30
Anand Doshi
4b2b159d12 if max_users = 0, consider unlimited users 2012-04-30 20:00:19 +05:30
Rushabh Mehta
45850fe496 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-30 18:38:40 +05:30
Anand Doshi
84777ac457 change in expiry message 2012-04-30 18:33:32 +05:30
Rushabh Mehta
2ab4451d1b Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-30 18:05:47 +05:30
Nabin Hait
228d03ec01 posting time fix 2012-04-30 16:59:39 +05:30
Rushabh Mehta
79a664b4dc cleaned up lead, opportunity, jv 2012-04-30 16:12:03 +05:30
Anand Doshi
72308564be Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-30 15:44:02 +05:30
Anand Doshi
2aa9ba63e3 fixes in select field type 2012-04-30 15:43:34 +05:30
Nabin Hait
41cc32790f Fixed issie in auto notification 2012-04-30 14:36:18 +05:30
Rushabh Mehta
542acf6757 website, product and grid bugfix 2012-04-30 14:23:12 +05:30
Rushabh Mehta
963c651f2c Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-30 14:22:50 +05:30
Rushabh Mehta
a4be4d3390 website, product and grid bugfix 2012-04-30 14:22:02 +05:30
Anand Doshi
b60807c325 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-30 12:23:03 +05:30
Anand Doshi
c55d9ad033 working on setup account 2012-04-30 12:22:47 +05:30
Anand Doshi
8cffe7e440 fix in support ticket, expiry banner 2012-04-30 12:13:51 +05:30
Nabin Hait
28b9551acf fixes in patch 2012-04-30 11:55:25 +05:30
Nabin Hait
d1ac71c3e7 patch list updated 2012-04-30 11:53:58 +05:30
Nabin Hait
d4c5a9e2c4 fixes in bin 2012-04-30 11:50:34 +05:30
Nabin Hait
3e8f35c09e fixes in bin 2012-04-30 11:47:45 +05:30
Nabin Hait
fc51f995c8 fixes in bin 2012-04-30 11:43:16 +05:30
Rushabh Mehta
30cb5c20a1 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-27 18:39:56 +05:30
Rushabh Mehta
389880d0b6 more website cleanups 2012-04-27 18:39:14 +05:30
Nabin Hait
7ff69e10bf repost stock for entries where posting time goes wrong 2012-04-27 18:27:06 +05:30
Nabin Hait
ebbd328977 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-27 18:15:13 +05:30
Anand Doshi
f5216b46e3 fixes 2012-04-27 18:03:47 +05:30
Nabin Hait
914d67a1a3 selective deletes from child table while overwriting 2012-04-27 17:47:46 +05:30
Anand Doshi
864e220ec5 fixes in serial no patch 2012-04-27 17:12:47 +05:30
Anand Doshi
d461148296 fix in reload_c_form path 2012-04-27 17:05:50 +05:30
Anand Doshi
3fbf2ec0c5 fix in setup control 2012-04-27 16:11:56 +05:30
Anand Doshi
1dac43159a Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-27 15:31:35 +05:30
Anand Doshi
1ed4ef1946 fixes in setup 2012-04-27 15:30:23 +05:30
Nabin Hait
201f8ca821 fixed conflict in sales bom using ours 2012-04-27 14:03:06 +05:30
Nabin Hait
b931f37735 fixed conflict using ours 2012-04-27 13:59:39 +05:30
Nabin Hait
0d1daa8875 fld order change 2012-04-27 13:56:58 +05:30
Nabin Hait
de975ff307 fixed filtering issue in gs 2012-04-27 13:53:20 +05:30
Nabin Hait
762056aaa8 sales bom amendment issue fixed 2012-04-27 11:06:12 +05:30
Nabin Hait
727431b7b1 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-27 11:04:44 +05:30
Nabin Hait
b9d3ade2f4 sales bom issue fixed 2012-04-27 11:04:11 +05:30
Rushabh Mehta
2e16a01efd Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-26 19:02:32 +05:30
Rushabh Mehta
702473d65e website updates 2012-04-26 19:01:35 +05:30
Nabin Hait
92ec4dcb6f minor fixes 2012-04-26 13:13:10 +05:30
Nabin Hait
2453740621 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-26 13:03:18 +05:30
Nabin Hait
a6b7886175 resolved conflict while merging with master 2012-04-26 13:02:36 +05:30
Nabin Hait
50c799880a Merge branch 'master' of github.com:webnotes/erpnext 2012-04-26 12:47:30 +05:30
Nabin Hait
5a6e641565 fixed batch issue 2012-04-26 11:11:34 +05:30
Rushabh Mehta
44279f87b4 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-25 18:25:29 +05:30
Nabin Hait
aa577ed82e serial no fixes: sle creation through import data 2012-04-25 18:25:13 +05:30
Rushabh Mehta
dcfdfc317c fixes to website module and fixed rename and double column bugs 2012-04-25 18:24:44 +05:30
Nabin Hait
04a276c934 Error fixed in gl netry when negative entry and cancel event 2012-04-25 16:08:45 +05:30
Nabin Hait
ed7de5fee2 posting time format validation 2012-04-25 15:07:46 +05:30
Nabin Hait
4626b27038 updated sales bom document 2012-04-24 15:17:56 +05:30
Nabin Hait
d98ca01082 fixed wrong serial no qty validation 2012-04-24 14:07:04 +05:30
Nabin Hait
3afecb9e30 update permission in appraisal 2012-04-24 13:32:26 +05:30
Nabin Hait
9a6dbfca8f updated permlevel in address 2012-04-24 12:40:50 +05:30
Nabin Hait
dd828be432 updated patch list 2012-04-24 12:25:39 +05:30
Nabin Hait
3fb741c3ef update role in address 2012-04-24 12:23:12 +05:30
Nabin Hait
663e971557 Make next document button hide/unhide 2012-04-24 11:39:54 +05:30
Nabin Hait
e6d808820a Error fixed in notification control 2012-04-24 11:06:48 +05:30
Nabin Hait
4c9525139d Error fixed in stock ledger netry batch related 2012-04-24 10:38:37 +05:30
Nabin Hait
8f9a953931 Update erpnext/accounts/doctype/ledger_balance_export/ledger_balance_export.py 2012-04-23 19:00:39 +05:30
Nabin Hait
69f6d79791 patch list modified 2012-04-23 18:27:53 +05:30
Nabin Hait
a45f44d805 remove def val from rv detail cost center 2012-04-23 18:26:08 +05:30
Nabin Hait
e848300958 patch list modified 2012-04-23 18:24:22 +05:30
Nabin Hait
ca102d567e change cacheitem schema 2012-04-23 18:23:17 +05:30
Nabin Hait
2bbb086b10 Update erpnext/accounts/doctype/rv_detail/rv_detail.txt 2012-04-23 17:57:18 +05:30
Nabin Hait
9ceaccce86 create custom flds for bullows account 2012-04-23 16:04:41 +05:30
Nabin Hait
c425d8bd16 after sync cleanup 2012-04-23 16:04:16 +05:30
Nabin Hait
708917db50 some fixes in cleanup 2012-04-23 16:03:38 +05:30
Nabin Hait
6dbfcdbe5c Merge branch 'master' of github.com:webnotes/erpnext 2012-04-23 14:03:22 +05:30
Nabin Hait
b743bb6c10 ledger bal export format changed 2012-04-23 14:03:07 +05:30
Nabin Hait
51834a45a7 purchase invoice with write off feature 2012-04-23 12:47:12 +05:30
Nabin Hait
15230eb955 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-23 12:17:41 +05:30
Nabin Hait
6ed865f89a Fld label based on currency 2012-04-23 10:37:28 +05:30
Rushabh Mehta
f4a8c87db5 kb bug fix 2012-04-23 10:31:29 +05:30
Nabin Hait
a8d83b6c51 update modified date 2012-04-20 14:02:44 +05:30
Nabin Hait
f19bb52b2a Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-20 13:59:22 +05:30
Nabin Hait
f7c506d69e fixed conflict while merging with master branch 2012-04-20 13:58:43 +05:30
Anand Doshi
3d9f436ce9 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-20 13:43:05 +05:30
Anand Doshi
0f8e491bdd removed Knowledge Base module, fixed questions page name 2012-04-20 13:42:43 +05:30
Nabin Hait
e72ae2a19b fixed conflict 2012-04-20 13:41:09 +05:30
Rushabh Mehta
5bce61d58e merge 2012-04-20 13:40:48 +05:30
Rushabh Mehta
f30d1a0515 report builder - sort, save, pre-select columns, Report DocType 2012-04-20 13:37:49 +05:30
Nabin Hait
0788570ce7 automatically write off feature in sales invoice 2012-04-20 13:31:05 +05:30
Anand Doshi
b301251090 Store base currency on client side 2012-04-20 11:51:27 +05:30
Anand Doshi
9e0221c58e Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-20 11:22:38 +05:30
Anand Doshi
b8660fb51c fixes in production, porjects, packing slip 2012-04-20 11:21:47 +05:30
Anand Doshi
37df8abfc7 knowledge base module removed 2012-04-20 11:17:10 +05:30
Nabin Hait
b9984c8995 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-20 10:25:33 +05:30
Nabin Hait
239e79038f Customer/customer group wise price list 2012-04-20 10:25:03 +05:30
Anand Doshi
7c135ed2fc projects date_format to be fetched from wn.boot.sysdefaults 2012-04-19 17:58:56 +05:30
Rushabh Mehta
6ff95727e1 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-19 17:49:44 +05:30
Rushabh Mehta
a11bc07a7f new report builder - todo: sort, save 2012-04-19 17:48:57 +05:30
Nabin Hait
94329abd02 modifed format for raw material report in prod plan 2012-04-19 16:08:33 +05:30
Nabin Hait
776e8572a2 issue fixed in prod plan 2012-04-19 15:00:48 +05:30
Nabin Hait
cba6f9148a Merge branch 'master' of github.com:webnotes/erpnext 2012-04-19 13:56:04 +05:30
Nabin Hait
40738aecfa removed msgprint 2012-04-19 13:55:45 +05:30
Anand Doshi
b50a7a5ff9 Fix in rate fetching on get item details, when using inclusive rate 2012-04-19 12:00:49 +05:30
Anand Doshi
f642168a26 hr home: changed Allocate Leaves --> Leave Allocation Tool 2012-04-18 18:35:30 +05:30
Anand Doshi
7c67aad059 removed account_url from global defaults 2012-04-18 17:25:06 +05:30
Anand Doshi
2d56115c08 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-18 17:18:06 +05:30
Anand Doshi
619e16c956 removed account_url from global defaults 2012-04-18 17:17:02 +05:30
Rushabh Mehta
81c8ec2b89 knowledge base cleanup 2012-04-18 17:14:33 +05:30
Rushabh Mehta
46162c4e35 knowledge base cleanup 2012-04-18 16:59:37 +05:30
Rushabh Mehta
b194eb83a9 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-18 16:56:09 +05:30
Rushabh Mehta
edab76b274 knowledge base cleanup 2012-04-18 16:55:43 +05:30
Nabin Hait
66c7fbca8a Merge branch 'master' of github.com:webnotes/erpnext 2012-04-18 16:18:58 +05:30
Nabin Hait
6da191de03 negative stock fixes 2012-04-18 16:18:20 +05:30
Anand Doshi
8d1a0b4061 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-18 16:08:15 +05:30
Anand Doshi
385380125b fixes in customize form, naming series form loading 2012-04-18 16:04:02 +05:30
Nabin Hait
97051ba79f allow negative stock field in global defaults 2012-04-18 12:51:11 +05:30
Rushabh Mehta
5fc06554ff question css 2012-04-18 12:50:09 +05:30
Nabin Hait
4776d3e097 Update erpnext/production/doctype/bill_of_materials/bill_of_materials.js 2012-04-18 12:37:01 +05:30
Rushabh Mehta
b12349a768 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-18 12:34:43 +05:30
Rushabh Mehta
3a9ddaf2c1 permission engine bugfix 2012-04-18 12:34:18 +05:30
Nabin Hait
7afc2124a6 allow negative qty feature 2012-04-18 12:04:20 +05:30
Anand Doshi
1fb128158c fix in support ticket options of naming_series 2012-04-18 11:18:54 +05:30
Anand Doshi
40808e18f1 minor fixes 2012-04-17 18:43:29 +05:30
Nabin Hait
69e7eb4f3d Merge branch 'master' of github.com:webnotes/erpnext 2012-04-17 18:06:10 +05:30
Nabin Hait
5da9d56047 removed voucher date filter 2012-04-17 18:05:58 +05:30
Anand Doshi
c9d1ac4112 fix - show about of application 2012-04-17 13:54:53 +05:30
Anand Doshi
44f16eaefa Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-17 13:00:01 +05:30
Anand Doshi
b9e9197e5f fix in doclistview - check if _user_tags exists before rendering 2012-04-17 12:59:18 +05:30
Rushabh Mehta
38bdf6c5e7 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-17 12:41:04 +05:30
Rushabh Mehta
2146fd17e7 new sales_browser 2012-04-17 12:40:37 +05:30
Anand Doshi
b2974e8e59 fix in delete check 2012-04-17 11:57:50 +05:30
Anand Doshi
24e18569d9 fixes in install docs for roles 2012-04-17 11:45:35 +05:30
Anand Doshi
acb3d56e02 fix in install docs 2012-04-17 11:39:18 +05:30
Anand Doshi
45a4edc9c9 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 
Conflicts:
	css/all-app.css
	version.num
 2012-04-17 11:19:15 +05:30
Nabin Hait
8c0dcd383b some more fixes in support 2012-04-16 18:47:20 +05:30
Rushabh Mehta
6910ec1946 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-16 18:37:33 +05:30
Rushabh Mehta
71085592a4 fixed account_browser 2012-04-16 18:36:46 +05:30
Nabin Hait
fe127c216c fixed issue in stock 2012-04-16 16:01:02 +05:30
Rushabh Mehta
6610d390e1 merge 2012-04-16 14:49:11 +05:30
Nabin Hait
6f89f1eb86 fixes in sales cycle 2012-04-16 14:44:47 +05:30
Nabin Hait
eb3bb01431 Update erpnext/selling/doctype/sales_order/sales_order.js 2012-04-16 13:41:06 +05:30
Rushabh Mehta
449f56db75 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-16 13:35:53 +05:30
Rushabh Mehta
6820dbf72d framework build 2012-04-16 13:33:14 +05:30
Nabin Hait
eaf8b91402 hr reports cleanup 2012-04-16 12:31:36 +05:30
Nabin Hait
dbffc2d8d0 fixed hr issues 2012-04-16 12:22:47 +05:30
Rushabh Mehta
0c18b18b84 new framework build 2012-04-16 11:18:45 +05:30
Rushabh Mehta
c8abe5b2ad style cleanups and new builds 2012-04-15 22:31:32 +05:30
Rushabh Mehta
cabfc65fe0 lib/py/webnotes/defs.py -> conf.py (see sample in lib/conf/conf.py) 2012-04-14 16:08:45 +05:30
Rushabh Mehta
f465b4fa76 merge 2012-04-13 19:06:05 +05:30
Rushabh Mehta
850c928a02 started rewrite of accounts browser 2012-04-13 19:04:55 +05:30
Anand Doshi
a202f00dc0 fixes in accounts 2012-04-13 16:03:27 +05:30
Anand Doshi
a0f6a3eab7 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-13 15:34:27 +05:30
Nabin Hait
f3348c5136 Merge branch 'master' into shf_rename 2012-04-13 14:41:56 +05:30
Nabin Hait
781a3c9b1f Merge branch 'master' of github.com:webnotes/erpnext 2012-04-13 14:41:45 +05:30
Nabin Hait
82c53871c7 fixes in se js 2012-04-13 14:39:04 +05:30
Nabin Hait
1c9061eff6 fixed conflict using theirs 2012-04-13 14:24:35 +05:30
Nabin Hait
6c615d9527 Merge branch 'master' of github.com:webnotes/erpnext 2012-04-13 14:14:39 +05:30
Nabin Hait
b09b3bc253 all fields visible if any other custom purpose in stock entry 2012-04-13 14:13:02 +05:30
Anand Doshi
6af47a8c37 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-13 13:13:54 +05:30
Anand Doshi
b3ab90a01a field changes in sp return tool 2012-04-13 12:38:34 +05:30
Anand Doshi
800b214ff3 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-13 12:37:23 +05:30
Anand Doshi
3abe9bd018 fixes in fieldnames and hide unnecessary fields in jv 2012-04-13 12:36:44 +05:30
Anand Doshi
b641ed2a1e Added doc_type to JV Print Formats 2012-04-13 12:27:56 +05:30
Nabin Hait
7fca9e617d fixes in global defaults 2012-04-13 12:18:06 +05:30
Rushabh Mehta
d76146372e merge 2012-04-13 12:01:23 +05:30
Nabin Hait
b176e94b92 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-13 11:53:35 +05:30
Nabin Hait
e77164955b removed repair fn, fixes in reports 2012-04-13 11:53:06 +05:30
Anand Doshi
7aafb7e19e Purchase Requisition to Purchase Request 2012-04-13 11:52:17 +05:30
Rushabh Mehta
97ae17eaf7 merge 2012-04-13 11:42:56 +05:30
Rushabh Mehta
f1264a7f76 listing, module pages in appframe 2012-04-13 11:41:43 +05:30
Anand Doshi
83808267d5 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-13 11:40:38 +05:30
Anand Doshi
1c2ac00a82 fixes in sales cycle 2012-04-13 11:38:01 +05:30
Anand Doshi
f31fc22ef0 fixes in doctype 2012-04-13 11:37:19 +05:30
Nabin Hait
a73b2965aa cleanup and fixes 2012-04-13 11:02:26 +05:30
Anand Doshi
44e954f509 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-12 17:52:09 +05:30
Anand Doshi
09e8c4cd2d further fixes 2012-04-12 17:51:53 +05:30
Nabin Hait
3cb148e53b fixed conflict 2012-04-12 16:44:23 +05:30
Nabin Hait
de237e2bf7 error fixed 2012-04-12 16:36:01 +05:30
Anand Doshi
25bc68c7b2 fix in field names 2012-04-12 14:08:43 +05:30
Anand Doshi
654f6bfa85 fixes 2012-04-12 12:15:35 +05:30
Anand Doshi
9e6af24269 fixes in button function calling 2012-04-11 19:07:02 +05:30
Anand Doshi
5ed0b6971c Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-11 17:51:12 +05:30
Anand Doshi
e68fe505b9 custom fields creation patch - not to be executed automatically 2012-04-11 17:49:21 +05:30
Nabin Hait
c594bbcae0 address html issue fixed 2012-04-11 17:14:45 +05:30
Anand Doshi
ece64fa908 fixes 2012-04-10 19:18:00 +05:30
Anand Doshi
2424387651 fixes after sync testing 2012-04-10 19:14:37 +05:30
Nabin Hait
7a3faa9575 Merge branch 'master' of github.com:webnotes/erpnext 2012-04-10 18:07:51 +05:30
Nabin Hait
af094b9daf ledger balance export report in new format 2012-04-10 18:07:36 +05:30
Nabin Hait
0a8a487230 Update erpnext/stock/doctype/item/item.js 2012-04-10 16:50:23 +05:30
Anand Doshi
a9ccc7d6bd naming series changes now saved as property setter 2012-04-10 15:31:48 +05:30
Anand Doshi
cfcaf38111 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-10 12:39:15 +05:30
Anand Doshi
966b6f1aa0 fix in patches 2012-04-10 12:38:17 +05:30
Rushabh Mehta
db05aacbc4 merge 2012-04-10 11:51:51 +05:30
Rushabh Mehta
d2cec5bd14 website style fixes 2012-04-10 11:51:08 +05:30
Anand Doshi
859cb72606 new favicon 2012-04-10 11:35:19 +05:30
Anand Doshi
9afb57ffb2 Syntax error fix in c_form.txt 2012-04-09 12:23:36 +05:30
Anand Doshi
87a2c5cc69 Merge branch 'master' of github.com:webnotes/erpnext into shf_rename 
Conflicts:
	erpnext/accounts/doctype/c_form/c_form.txt
	erpnext/patches/patch_list.py
	erpnext/setup/doctype/permission_control/permission_control.py
 2012-04-09 12:14:53 +05:30
Anand Doshi
85eb840ab4 fix in rename dt patch 2012-04-09 12:02:15 +05:30
Rushabh Mehta
b43f949e93 website smaller 2012-04-08 20:33:51 +05:30
Anand Doshi
82042f1cff fixes after sync 2012-04-06 17:54:17 +05:30
Nabin Hait
3525d92cfb c-form reload pach 2012-04-06 17:49:25 +05:30
Nabin Hait
c63a58d416 c-form reload pach 2012-04-06 17:42:02 +05:30
Nabin Hait
7da6ebc9af Attachment option and total invoiced amt added in c-form 2012-04-06 17:30:53 +05:30
Nabin Hait
1299dab010 Merge branch 'master' of github.com:webnotes/erpnext 2012-04-06 15:19:18 +05:30
Nabin Hait
05e4fc6eb6 Chart of account/cc link only for accounts user and account manager role in account home page 2012-04-06 15:19:02 +05:30
Anand Doshi
7e0479bc4c cleanup of search criteria 2012-04-05 18:27:56 +05:30
Nabin Hait
9ba2e49468 Update erpnext/selling/doctype/sales_common/sales_common.js 2012-04-05 16:54:19 +05:30
Nabin Hait
758eed555c Update erpnext/selling/doctype/sales_common/sales_common.js 2012-04-05 16:45:33 +05:30
Nabin Hait
f77c940fcf fixed price list currency issue 2012-04-05 16:29:02 +05:30
Anand Doshi
fa0cd89a7c change from labels to fieldname in cur_frm.cscript 2012-04-05 13:03:35 +05:30
Anand Doshi
00ceafb42d fix in fiscal year of email digest 2012-04-03 18:43:17 +05:30
Anand Doshi
fc8bf7b1d8 add select type link fields in permission control 2012-04-03 13:49:14 +05:30
Anand Doshi
e9c505608a Merge branch 'master' of github.com:webnotes/erpnext 2012-04-03 13:23:14 +05:30
Anand Doshi
a6eb15df4a fix in earning and deduction type field tyep 2012-04-03 13:22:20 +05:30
Anand Doshi
130dfaee8c fix in todo 2012-04-03 12:18:35 +05:30
Nabin Hait
1b81badd58 validation changes for po item 2012-04-03 11:27:03 +05:30
Anand Doshi
be9562dcd5 rerun of rename_dt 2012-04-02 19:13:00 +05:30
Anand Doshi
5112b5b6b8 rerun of rename_dt 2012-04-02 19:12:29 +05:30
Anand Doshi
5c6cdb06b2 fix in decimal places 2012-04-02 15:02:34 +05:30
Rushabh Mehta
c7f1e5a54a patch fixes 2012-04-02 14:24:35 +05:30
Rushabh Mehta
5475a3ca66 patch fixes 2012-04-02 14:06:46 +05:30
Anand Doshi
896c6fdc3c fix in patch order 2012-04-02 14:06:33 +05:30
Anand Doshi
0442bc5d63 fix in patch list 2012-04-02 13:09:20 +05:30
Anand Doshi
c88ae2be4d rename dt second cut 2012-03-30 18:18:36 +05:30
Anand Doshi
fedfd89e4a rename dt first cut 2012-03-30 12:29:06 +05:30
Anand Doshi
37fb9c8f27 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into shf_rename 
Conflicts:
	version.num
 2012-03-29 15:35:08 +05:30
Anand Doshi
7ff696fb12 Merge branch 'renamedt' into shf_rename 
Conflicts:
	erpnext/patches/patch_list.py
 2012-03-29 15:31:17 +05:30
Anand Doshi
fddb782a82 Merge branch 'renamedt' of github.com:webnotes/erpnext into renamedt 2012-03-29 15:28:16 +05:30
Anand Doshi
0442b4e207 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-29 15:22:15 +05:30
Anand Doshi
66722dfe69 some buying listviews 2012-03-29 15:20:35 +05:30
Nabin Hait
dc8ce0190d Merge branch 'master' into renamedt 2012-03-29 11:53:02 +05:30
Anand Doshi
8ac5ccae0a fix in Sales Order-Receivable Voucher Mapper 2012-03-28 19:29:55 +05:30
Anand Doshi
9767f79845 fix in Sales Order-Receivable Voucher Mapper 2012-03-28 19:25:29 +05:30
Anand Doshi
419260298b fix in mapper 2012-03-28 19:12:36 +05:30
Rushabh Mehta
635f359a71 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-28 15:18:28 +02:00
Rushabh Mehta
43d64c6116 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-28 15:17:59 +02:00
Anand Doshi
2f74d2e7bd Merge branch 'master' of github.com:webnotes/erpnext 2012-03-28 18:34:50 +05:30
Anand Doshi
779a365420 fix in print hide of amount in words 2012-03-28 18:31:26 +05:30
Anand Doshi
18ffd2a1b8 Merge branch 'master' into handlerupdate 2012-03-28 17:56:33 +05:30
Anand Doshi
c9456c18dc listviews 2012-03-28 17:48:30 +05:30
Nabin Hait
79bc01e33d updated rename_dt 2012-03-28 16:19:01 +05:30
Nabin Hait
6370ba8280 Merge branch 'master' of github.com:webnotes/erpnext into renamedt 2012-03-28 16:17:53 +05:30
Rushabh Mehta
0dfa140b7d Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-28 10:42:20 +02:00
Nabin Hait
e6340f26c2 mapper fix in DN_RV 2012-03-28 14:11:31 +05:30
Rushabh Mehta
c0fdaaf2c6 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-28 08:08:47 +02:00
Nabin Hait
5b00addaf7 reload mapper for checking ref value 2012-03-28 11:38:25 +05:30
Rushabh Mehta
bb769c5461 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-28 08:04:17 +02:00
Nabin Hait
13f789701e erro fixed in reorder_item 2012-03-28 11:33:25 +05:30
Nabin Hait
df77a1f619 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-28 11:32:58 +05:30
Nabin Hait
6ed0450dba reload mapper for checking ref value 2012-03-28 11:32:44 +05:30
Anand Doshi
b489297108 added delete_docformat in patch_list 2012-03-27 19:41:45 +05:30
Anand Doshi
2513e50dc4 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into shf_merge 
Conflicts:
	erpnext/website/doctype/style_settings/style_settings.txt
	version.num
 2012-03-27 19:37:10 +05:30
Anand Doshi
a30fbd004e merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
Nabin Hait
a0a3ca3178 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-27 17:09:03 +05:30
Anand Doshi
3107096890 Merge branch 'master' of github.com:webnotes/erpnext into shf_merge 2012-03-27 15:02:38 +05:30
Anand Doshi
66ea30543c sync patches 2012-03-27 15:02:30 +05:30
Anand Doshi
94d26f0338 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-26 22:34:18 +05:30
Anand Doshi
063fe503db fix in queries in stock reconciliation 2012-03-26 22:32:34 +05:30
Rushabh Mehta
91c79305e8 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-26 12:11:22 +02:00
Nabin Hait
854935f12c added docstatus in item get_query in PV 2012-03-26 15:40:56 +05:30
Nabin Hait
b66ade11e0 modified item code get_query in purchase cycle 2012-03-26 15:30:11 +05:30
Rushabh Mehta
20dc45f7bd Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-26 10:50:40 +02:00
Anand Doshi
c009450ef0 fix in item addition - details fetching 2012-03-26 14:17:30 +05:30
Nabin Hait
eecea8ef19 modified item code get_query in purchase cycle 2012-03-26 13:11:15 +05:30
Rushabh Mehta
4227d3fe58 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-26 08:23:18 +02:00
Nabin Hait
9329b5a461 modified item code get_query in purchase cycle 2012-03-26 11:52:16 +05:30
Rushabh Mehta
4a19819fe9 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-26 08:12:32 +02:00
Anand Doshi
4943af6d6c fix in address issue - customer coming in supplied field 2012-03-26 11:42:09 +05:30
Rushabh Mehta
6fd7395101 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-26 08:03:19 +02:00
Nabin Hait
ea36202fbf modified item code get_query in purchase cycle 2012-03-26 11:33:03 +05:30
Rushabh Mehta
5b80423dbb Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-26 07:55:45 +02:00
Nabin Hait
2bd086f1c3 modified item code get_query in purchase cycle 2012-03-26 11:25:31 +05:30
Rushabh Mehta
f06d6f34e7 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-26 07:48:21 +02:00
Nabin Hait
68764ce775 modified item code get_query in purchase cycle 2012-03-26 11:16:41 +05:30
Nabin Hait
e2fe5629f0 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-26 11:07:01 +05:30
Nabin Hait
bb6f10098e updated rename_dt 2012-03-26 11:06:34 +05:30
Rushabh Mehta
9d0ea6a5f1 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-26 07:25:22 +02:00
Nabin Hait
6d4ee80cca Merge branch 'master' of github.com:webnotes/erpnext 2012-03-26 10:54:31 +05:30
Anand Doshi
964dee9f18 fix in stock reconciliation 2012-03-26 10:54:05 +05:30
Nabin Hait
67016dcfea Merge branch 'master' of github.com:webnotes/erpnext 2012-03-26 10:54:05 +05:30
Nabin Hait
f23d18316a modified item code get_query in purchase cycle 2012-03-26 10:53:45 +05:30
Rushabh Mehta
339afe858c link empty value and kb fix 2012-03-23 15:54:49 +05:30
Anand Doshi
5f9501d4d8 Merge branch 'sync_file_db' into shf_merge 
Conflicts:
	erpnext/projects/doctype/project/project.txt
 2012-03-23 14:51:35 +05:30
Anand Doshi
2d4139cbeb sync_handler_merge 2012-03-23 14:46:07 +05:30
Rushabh Mehta
b6f808846d website fixes 2012-03-23 14:19:49 +05:30
Anand Doshi
9b56a8ada9 Merge branch 'handlerupdate' into sync_handler_merge 
Conflicts:
	js/all-app.js
	version.num
 2012-03-23 13:55:20 +05:30
Anand Doshi
134ca41db8 Merge branch 'sync_file_db' of github.com:webnotes/erpnext into sync_file_db 2012-03-23 12:45:05 +05:30
Anand Doshi
358304d216 fix in sales common regarding date formatting 2012-03-23 11:12:03 +05:30
Nabin Hait
191e55f1bc sync ref db patch 2012-03-22 15:07:28 +05:30
Nabin Hait
f88326ba3f sync ref db 2012-03-22 15:07:05 +05:30
Anand Doshi
7944b4b888 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-22 14:34:35 +05:30
Anand Doshi
3697534f10 Merge branch 'master' into handlerupdate 2012-03-22 14:32:10 +05:30
Rushabh Mehta
479061df9c merge 2012-03-22 13:53:34 +05:30
Rushabh Mehta
fa0e7b6933 listing/messages fix 2012-03-22 13:44:04 +05:30
Anand Doshi
8463870a4f Added Custom Scripts in setup page 2012-03-22 13:39:23 +05:30
Rushabh Mehta
1952f5b033 lead listview 2012-03-22 12:21:56 +05:30
Rushabh Mehta
6ac1d73731 lead listview 2012-03-22 12:10:49 +05:30
Rushabh Mehta
27cf13b541 merge 2012-03-22 11:37:56 +05:30
Rushabh Mehta
3f46696db2 removed slider ui 2012-03-22 11:37:08 +05:30
Anand Doshi
98f847c01f fix in todo 2012-03-22 11:18:28 +05:30
Rushabh Mehta
a12a28bec6 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 
Conflicts:
	version.num
 2012-03-22 06:35:35 +01:00
Anand Doshi
f1eb1b1508 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-22 11:02:46 +05:30
Anand Doshi
06fcfdfcde assign to - allow comments 2012-03-22 11:01:38 +05:30
Rushabh Mehta
aaac794a8e Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-22 06:08:04 +01:00
Nabin Hait
40d4b4d939 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-22 10:34:13 +05:30
Nabin Hait
2f82219fd0 item query changes in stock entry 2012-03-22 10:32:06 +05:30
Nabin Hait
9066dcaba5 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-22 10:26:07 +05:30
Nabin Hait
afeeb9c484 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-22 10:24:39 +05:30
Nabin Hait
bad13149b2 item query changes in stock entry 2012-03-22 10:24:26 +05:30
Rushabh Mehta
d0f26026af Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-21 13:34:00 +01:00
Anand Doshi
29ed95ba22 simple fixes in todo 2012-03-21 18:02:17 +05:30
Anand Doshi
71d0b2a428 permission engine fix - is doctype submittable 2012-03-21 17:15:49 +05:30
Rushabh Mehta
b1f77d1bde Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-21 12:39:54 +01:00
Nabin Hait
f676824791 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-21 17:08:35 +05:30
Nabin Hait
653536596d fax added in address display 2012-03-21 17:07:42 +05:30
Rushabh Mehta
2d229b423e Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-21 12:28:42 +01:00
Nabin Hait
d551281cbe cdt not defined fixed 2012-03-21 16:57:08 +05:30
Rushabh Mehta
9851fcef2c Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-21 11:33:27 +01:00
Nabin Hait
93162f603d update bom no options in stock entry 2012-03-21 16:02:44 +05:30
Rushabh Mehta
c1f8af58d1 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-21 11:29:06 +01:00
Nabin Hait
31fcc4bb36 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-21 15:57:07 +05:30
Nabin Hait
830b8baa9d update bom no options in stock entry 2012-03-21 15:56:22 +05:30
Nabin Hait
2a68bdf231 Update erpnext/stock/doctype/stock_entry/stock_entry.txt 2012-03-21 15:50:14 +05:30
Rushabh Mehta
e07c38f5f5 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-21 11:06:38 +01:00
Nabin Hait
c37cb4d7c3 Update erpnext/stock/doctype/stock_entry/stock_entry.js 2012-03-21 15:35:41 +05:30
Nabin Hait
ac9adff1bb Update erpnext/stock/doctype/stock_entry/stock_entry.py 2012-03-21 15:35:04 +05:30
Nabin Hait
7ff14ede3c Update erpnext/stock/doctype/stock_entry/stock_entry.txt 2012-03-21 15:33:50 +05:30
Nabin Hait
0ad2ef2111 sync with respect to file 2012-03-21 15:02:39 +05:30
Rushabh Mehta
5bd00adeed Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-21 09:06:02 +01:00
Rushabh Mehta
983a171567 using font lato 2012-03-21 13:35:34 +05:30
Nabin Hait
e8da15cb5b sync ref file 2012-03-21 12:45:14 +05:30
Rushabh Mehta
7aaea5e2be Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-21 08:00:11 +01:00
Rushabh Mehta
c01b7e9c75 website topbar fix, doclistnew, back fix 2012-03-21 12:29:56 +05:30
Nabin Hait
91375d64f1 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-21 12:05:30 +05:30
Rushabh Mehta
69c9065e7c Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-21 07:23:11 +01:00
Rushabh Mehta
fd563b4874 support ticket listview 2012-03-21 11:52:49 +05:30
Rushabh Mehta
f74ef4c64b Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-21 07:18:41 +01:00
Rushabh Mehta
a665c1f60d stylefixes and listviews 2012-03-21 11:47:58 +05:30
Rushabh Mehta
dad4e3ebac Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-21 07:17:28 +01:00
Nabin Hait
5f04061291 changes in recurring invoice print format 2012-03-21 11:47:00 +05:30
Rushabh Mehta
0d1e918177 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-21 06:33:35 +01:00
Nabin Hait
39a24794eb Purpose others to other 2012-03-21 11:02:50 +05:30
Rushabh Mehta
454c6ac716 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-21 05:42:31 +01:00
Rushabh Mehta
437c1b512c listview update and form fix 2012-03-20 18:45:28 +05:30
Anand Doshi
310bc462b9 fix in doctype refactor patch 2012-03-20 17:49:23 +05:30
Nabin Hait
ba62cf3b5a Merge branch 'master' of github.com:webnotes/erpnext 2012-03-20 17:40:16 +05:30
Nabin Hait
39c26f4580 billing period in recurring sales invoice mail 2012-03-20 17:39:48 +05:30
Anand Doshi
986caee03d clear item cache on update of certain docs 2012-03-20 17:30:31 +05:30
Nabin Hait
ceb9f41f15 lead organization fld added in quotation for printing: patch 2012-03-20 17:04:32 +05:30
Nabin Hait
de51040763 lead organization fld added in quotation for printing 2012-03-20 16:47:03 +05:30
Nabin Hait
9ff92369ad lead organization fld added in quotation for printing 2012-03-20 16:44:15 +05:30
Anand Doshi
8347aad402 email settings separated from control panel 2012-03-20 14:54:25 +05:30
Rushabh Mehta
9b1afe197d cleanup of form, rename, route, added fonts 2012-03-20 14:37:44 +05:30
Nabin Hait
93654a3e04 stock entry: new purpose others added 2012-03-20 14:31:14 +05:30
Nabin Hait
594ee37d26 patch list updated 2012-03-20 14:26:32 +05:30
Nabin Hait
547478f973 stock entry: new purpose others added in stock entry 2012-03-20 14:26:14 +05:30
Anand Doshi
d05aad6474 fix in POS invoice 2012-03-20 12:33:02 +05:30
Anand Doshi
6ba51ca693 POS Invoice fix 2012-03-20 12:24:51 +05:30
Anand Doshi
4f5e92a06c Merge branch 'master' of github.com:webnotes/erpnext 2012-03-20 12:17:50 +05:30
Anand Doshi
547ce9f9c8 POS Invoice fix 2012-03-20 12:11:38 +05:30
Anand Doshi
3401086d66 POS Invoice fix 2012-03-20 12:07:18 +05:30
Nabin Hait
bdd6877a4f Merge branch 'master' of github.com:webnotes/erpnext 2012-03-19 18:56:08 +05:30
Nabin Hait
31e0eacb7a Update erpnext/selling/doctype/sales_order/sales_order.js 2012-03-19 18:54:11 +05:30
Rushabh Mehta
9d0fc767b2 merge 2012-03-19 18:44:33 +05:30
Nabin Hait
11824ffb90 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-19 18:43:51 +05:30
Nabin Hait
fdab486720 Update erpnext/selling/doctype/sales_order/sales_order.js 2012-03-19 18:43:07 +05:30
Rushabh Mehta
d48417c93b slide navigation fixes 2012-03-19 18:42:13 +05:30
Nabin Hait
7107d4af2b Merge branch 'master' of github.com:webnotes/erpnext 2012-03-19 18:39:42 +05:30
Rushabh Mehta
8d8fa66e8f Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-19 14:06:12 +01:00
Nabin Hait
b7dce7da31 Update erpnext/stock/doctype/delivery_note/delivery_note.js 2012-03-19 18:35:57 +05:30
Rushabh Mehta
ffe9d358e8 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-19 12:40:07 +01:00
Nabin Hait
65ad3b1a0f Update erpnext/accounts/search_criteria/trial_balance/trial_balance.py 2012-03-19 17:09:14 +05:30
Nabin Hait
a189af48f6 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-19 16:27:42 +05:30
Nabin Hait
16d9f4942a Update erpnext/setup/doctype/manage_account/manage_account.txt 2012-03-19 15:48:08 +05:30
Nabin Hait
422f7e99db Update erpnext/selling/doctype/customer/customer.txt 2012-03-19 15:37:03 +05:30
Nabin Hait
9aa3777ba6 Update erpnext/setup/doctype/sales_person/sales_person.txt 2012-03-19 15:21:30 +05:30
Nabin Hait
e5d99f5ed1 Update erpnext/setup/doctype/manage_account/manage_account.txt 2012-03-19 15:15:20 +05:30
Anand Doshi
a7158f6ea9 fix in session expiry 2012-03-19 14:41:05 +05:30
Anand Doshi
5dabfdd920 sync doctype - first cut 2012-03-19 14:26:14 +05:30
Rushabh Mehta
6498cee998 fixed conflict 2012-03-19 09:01:16 +01:00
Nabin Hait
b6cd3316c4 error fixed in lease receipts client wise 2012-03-19 13:27:06 +05:30
Anand Doshi
f02c9e7b6c fix in due_date fetching for receivable voucher 2012-03-19 11:43:24 +05:30
Rushabh Mehta
a0a53c90f1 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-19 06:12:43 +01:00
Nabin Hait
15a0271557 Update erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt 2012-03-19 10:22:32 +05:30
Nabin Hait
9f5b2cd8d9 Update erpnext/stock/doctype/delivery_note/delivery_note.txt 2012-03-19 10:20:22 +05:30
Rushabh Mehta
7afaa8665d major reworking of page navigation 2012-03-16 18:28:09 +05:30
Nabin Hait
3ffca32ace rename dt patch updated 2012-03-16 16:21:44 +05:30
Nabin Hait
deac31fd2d Update erpnext/selling/doctype/sales_common/sales_common.py 2012-03-16 15:14:27 +05:30
Nabin Hait
15afe87984 cost center will be fetched from other charges master 2012-03-16 15:11:02 +05:30
Rushabh Mehta
8e3d596cbc Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-15 16:44:19 +05:30
Rushabh Mehta
2438de4c9b fixed tags in list2 2012-03-15 16:43:46 +05:30
Rushabh Mehta
2f052fd1ff Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-15 07:22:39 +01:00
Rushabh Mehta
5b9e0951d7 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 
Conflicts:
	version.num
 2012-03-15 07:21:43 +01:00
Anand Doshi
92da889d32 fix in report builder saving 2012-03-15 11:50:26 +05:30
Anand Doshi
96188f0310 sync with gateway moved to defs 2012-03-15 11:11:57 +05:30
Rushabh Mehta
f47192c5ce merge 2012-03-14 19:07:11 +05:30
Rushabh Mehta
08b670bddd listing with stats 2012-03-14 19:06:20 +05:30
Rushabh Mehta
3b3e336fcc Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-14 13:25:19 +01:00
Anand Doshi
018f075b66 Merge branch 'master' into sync 2012-03-14 17:54:32 +05:30
Anand Doshi
0e2461fa7c fix in qa inspection report link 2012-03-14 17:53:53 +05:30
Anand Doshi
4b7ddff4c9 patch after doctype.py refactor 2012-03-14 17:45:54 +05:30
Rushabh Mehta
3bbc7aeeb8 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 
Conflicts:
	version.num
 2012-03-14 07:58:10 +01:00
Anand Doshi
0493897297 Merge branch 'master' into sync 
Conflicts:
	js/all-app.js
	js/all-web.js
	version.num
 2012-03-14 12:24:37 +05:30
Anand Doshi
990599ad9a Merge branch 'master' of github.com:webnotes/erpnext 2012-03-14 12:20:58 +05:30
Nabin Hait
4af2c094cc rename dt error fixed 2012-03-14 12:12:23 +05:30
Nabin Hait
1732905db8 rename dt error fixed 2012-03-14 12:04:16 +05:30
Anand Doshi
7854f81ca0 show todo, calendar and support desktop notifications 2012-03-14 12:01:13 +05:30
Nabin Hait
64f40fab6d Rename doctype for more meaningful name 2012-03-14 11:07:00 +05:30
Rushabh Mehta
052b7e4049 fixed list->new->onload hooks 2012-03-13 15:19:06 +05:30
Nabin Hait
c6b989c9d7 update stock reco permission 2012-03-13 12:47:07 +05:30
Nabin Hait
9826ccce54 update stock reco permission 2012-03-13 12:45:53 +05:30
Rushabh Mehta
b9878d01e1 style fixes 2012-03-12 16:12:09 +05:30
Rushabh Mehta
ae4d1f973c modules cleanup 2012-03-12 14:34:55 +05:30
Anand Doshi
5230aa89a2 Merge branch 'master' into sync 2012-03-12 13:28:15 +05:30
Rushabh Mehta
09595eee3e Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-12 13:21:07 +05:30
Nabin Hait
b5b39f0e48 update cost as per LPR and standard rate 2012-03-12 11:25:10 +05:30
Rushabh Mehta
9f89e35ebe search selector fix for link 2012-03-09 17:51:39 +05:30
Rushabh Mehta
519f70b384 new autosuggest, other fixes 2012-03-09 16:44:21 +05:30
Nabin Hait
6715172211 sub contracted item are allowed to create po 2012-03-09 16:04:19 +05:30
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