Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,831 Commits 3 Branches 0 Tags 1 GiB
78b438f6cf
Commit Graph

721 Commits

Author SHA1 Message Date
Prateeksha Singh
bfb108d722 Replace c3 (#11112) 
* [charts] replace in asset.js

* replace in reports
 2017-10-17 12:03:02 +05:30
Ashwini Save
e33a1e0515 Hide "Help Article" button for timeline Communication type "Comment". (#10541) 2017-08-25 12:44:33 +05:30
Ashwini Save
cbef770ed7 Changed Text of Knowledge base button to Help Article 2017-08-04 16:14:38 +05:30
Britlog
4c7709efbd Portal breadcrumbs (#10095) 2017-07-28 18:54:22 +05:30
Ashwini Save
2ffe878999 Timeline Title for small resolution Add to knowledge base button. (#9926) 
* Add to Knowledge Base button class updated to hide for mobile view.

* Updated code to avoid multiple occurance of Knowledge Base button while updating comment.
 2017-07-25 14:16:48 +05:30
rohitwaghchaure
ea4497c8d2 Renamed the report Support Hours to Support Hours Distribution (#9874) 2017-07-17 14:55:42 +05:30
Makarand Bauskar
ef8d6dc8f8 [minor] ingore mandatory while auto closing issues and opportunity (#9783) 2017-07-12 14:52:32 +05:30
Rohit Waghchaure
67526f244e [enhance] Report for analysis of support hours count 2017-06-26 17:04:52 +05:30
mbauskar
f9e2bf1ab4 fixed merge conflicts 2017-06-15 13:42:47 +05:30
tundebabzy
f5604c101c Once primary key is generated, do not allow changing Series #8911 (#9265) 
* changes set_only_once field for tabDocField to 1

* changes all affected doctypes `set_only_once` option to 1

* add patch name to text file

* adds test cases

* Revert "add patch name to text file"

This reverts commit fc7cb6b4557217cee61abfbbf42ff6f40099f23c.

* Revert "changes set_only_once field for tabDocField to 1"

This reverts commit 2b1f7f31a0d6491056d809f319bae0f7b84be435.
 2017-06-14 16:10:09 +05:30
Faris Ansari
ab74ca7fff Lint and fix JS files 2017-05-30 12:54:42 +05:30
Javier Wong
fc11fce990 [enhancement] Changed Issue Description and Resolution to Text Editor (#8346) 2017-04-06 14:56:44 +05:30
Rushabh Mehta
a07c43fd68 [feature] ability to have variants based on manufacturer 2017-03-21 17:48:34 +01:00
Rohit Waghchaure
611a70a12a changes in the report roles 2017-03-06 16:36:46 +05:30
Rohit Waghchaure
e7485150a1 added roles in the report 2017-03-06 14:26:09 +05:30
Nabin Hait
0d66579e83 Merge branch 'develop' into develop 2017-02-20 19:22:03 +05:30
Nabin Hait
fd3ec066ce Added fields in global search 2017-02-20 13:38:31 +05:30
mbauskar
90818080b1 [minor] Configured Auto Close days for Opportunity and Issue 2017-02-17 14:56:00 +05:30
mbauskar
2ecfd9be5d [minor] fetched tickets to closed using sql instead of get_all 2017-02-14 08:41:09 +05:30
mbauskar
9c0bf73d25 [minor] auto close issue using ORM (document save method) 2017-02-07 12:50:05 +05:30
Rushabh Mehta
8d39fd9790 [fix] address queries + tests 2017-01-16 13:06:15 +05:30
Rushabh Mehta
4ad121e1a4 [minor] fixes for Contact 2017-01-16 12:19:21 +05:30
Rushabh Mehta
b92087cb2d [cleanup] move contact, address to frappe 💥 2017-01-13 18:54:47 +05:30
Nabin Hait
f02f1bb0c7 Added standard filters 2016-12-15 14:57:20 +05:30
Nabin Hait
201af80706 Fixed merge conflict 2016-12-13 14:30:32 +05:30
Kanchan Chauhan
d917b66a31 [Fix] Salary Slip test cases fix 2016-12-13 12:12:49 +05:30
Rushabh Mehta
81af229466 [minor] google analytics id in docs and minor fixes to web forms 2016-12-09 17:29:36 +05:30
Rushabh Mehta
b78fc37ce9 [minor] Add button to add help article from Issue #7132 (#7154) 2016-12-07 14:41:23 +05:30
Rushabh Mehta
323c06ebbf [minor] rename icons as per FontAwesome 4 (#7136) 2016-12-05 14:17:26 +05:30
Maxwell Morais
2f948530cb Bug due Translation support in Support Analytics 
I think no one that don't speak english use this!
But today talking about this report, I discovered that it dont work!

For my surprise, it don't work have 2 years, if you aren't a english speaker!
 2016-11-24 20:36:40 -06:00
Rushabh Mehta
13fc52d713 [minor] added default standard filters (#6854) 2016-11-07 17:19:19 +05:30
Rohit Waghchaure
0d2f7e62c0 set remember last selected value as true for company field 2016-11-03 16:19:34 +05:30
Nabin Hait
33fafb7728 Set warranty claim resolution date as today only if it is not set 2016-10-05 16:43:20 +05:30
Rohit Waghchaure
1d0b18661e [Fix] Minor changes in warranty claim 2016-09-29 18:55:45 +05:30
Nabin Hait
d8a372587d [fix] Legend in support analytics chart 2016-08-18 16:14:23 +05:30
Kanchan Chauhan
fb3eb13ca4 New Maintenance Module 2016-06-29 15:51:02 +05:30
Rushabh Mehta
bd9680f82e [added] web-forms 2016-06-24 16:41:33 +05:30
Rushabh Mehta
a334062b03 [redesign] website routing system 2016-06-24 16:18:07 +05:30
Rushabh Mehta
4cf914d902 [minor] added mins to first response for opportunity 2016-06-22 11:22:12 +05:30
Rushabh Mehta
b5f2c78f8f [list] reports for item list 2016-06-15 12:57:22 +05:30
Rushabh Mehta
dc1758b36e [report] minutes to first response for issues 2016-06-14 18:26:09 +05:30
Rushabh Mehta
f7e6ec0654 [report] minutes to first response for issues 2016-06-14 18:08:51 +05:30
Rushabh Mehta
57f35ddb4a [minor] fix update_mins_to_first_response patch 2016-06-14 16:29:33 +05:30
Rushabh Mehta
a55fb6426c [patch] mins_to_first_response in opporutnity and issue 2016-06-14 15:54:54 +05:30
Nabin Hait
1df75c930f Merge pull request #5390 from MaxMorais/patch-5 
get_address_display cannot be called directly
 2016-06-14 11:32:06 +05:30
Rushabh Mehta
e0686b32f3 [minor] cleanups 2016-06-10 12:38:52 +05:30
Rushabh Mehta
7ce345a827 [minor] re-organize issue 2016-06-08 11:10:34 +05:30
Maxwell Morais
1ea13f1f49 Set get_contact_details and get_address_display to the right standard! 2016-06-07 02:35:11 -03:00
Maxwell Morais
57b6b1dc85 Set get_contact_details to the right standard! 2016-06-07 02:32:47 -03:00
Nabin Hait
b46d021f2a Charts on reports / activity page, deprecated financial analytics report 2016-05-26 15:26:01 +05:30
Maxwell Morais
498cc58522 get_address_display cannot be called directly 
The new function get_address_display dont allow directly call, since it dont support, `frm, cdt, cdn` as arguments
 2016-05-22 20:19:30 -03:00
Maxwell Morais
92b0be93c7 Removed HTML tags from messages 
Remove HTML from messages
 2016-05-16 06:24:55 -03:00
Maxwell Morais
89fdbdf404 Translation improvements 
Translation improvements
 2016-05-16 06:08:51 -03:00
Maxwell Morais
52a66fc90b Reduce start and end date verification 
Given the actual scenario, that verify if the start_date <= end_date, do schedule a Maintenance, 2 days are required, but in many cases only one day is required!
 2016-05-16 06:06:59 -03:00
Maxwell Morais
4e7b52952e Added warning 
Added a warning to show a information to the active user
 2016-05-16 05:38:04 -03:00
Maxwell Morais
28453efece Small improvement in maintenance scheduler 
This improvement is intended to start disable blocking Maintenance Schedule submit, when the `Sales Person` does not have a `user_id` in the Employee!

The old logic try to use the `sales_person` email_id or the `owner` to create the event, but due some fails in the code, it dont occurs!
 2016-05-16 00:50:03 -03:00
Rohit Waghchaure
a92560c851 [Fix] Warranty claim form, unexpected token illegal error 2016-05-12 16:30:56 +05:30
Rushabh Mehta
c711b82889 Merge pull request #5296 from KanchanChauhan/websitemakeover 
New look to the website
 2016-05-02 15:54:41 +05:30
Kanchan Chauhan
239b351367 New look to the website 2016-05-02 11:43:44 +05:30
Rushabh Mehta
be2ee18de4 [fixed] frappe.require is now async 💥 2016-04-29 17:22:42 +05:30
Kanchan Chauhan
11638ba358 Changes 3 2016-04-20 16:24:25 +05:30
Kanchan Chauhan
704f248952 Changes 2 2016-04-20 16:24:24 +05:30
Umair Sayyed
72534deea2 removed Is Sales Item and Is Purchase Item 2016-04-15 12:57:00 +05:30
Nabin Hait
972c25f78d Fixed conflict 2016-04-14 18:25:53 +05:30
Rushabh Mehta
78b7a53635 [cleanup] set default bold, print_hide for prints 2016-04-06 15:29:45 +05:30
Nabin Hait
83e61bf368 [fix] Get query for item in warranty claim 2016-04-01 11:10:27 +05:30
Javier Wong
6487b525d0 Set Resolution Date to include Time 2016-03-31 18:27:36 +08:00
Rushabh Mehta
45c6b550f0 [cleanup] assets and made items mandatory in transactions 2016-03-31 15:37:51 +05:30
Rushabh Mehta
72b4ad8155 [cleanup] for quick-entry 2016-03-30 15:42:22 +05:30
Rushabh Mehta
c9850f9e04 Merge pull request #5077 from frappe/master 
Master
 2016-03-29 11:59:32 +05:30
Valmik Jangla
47b89756d9 Fix for Holiday List in Maintenance Schedule 2016-03-28 12:34:21 +05:30
Rushabh Mehta
c20c536f28 [fix] [wip] cleanup for collaborative pm 2016-03-25 17:22:17 +05:30
Rushabh Mehta
b2269dd326 [fix] back links from project web view 2016-03-23 18:29:00 +05:30
Kanchan Chauhan
b3fe6a45a7 WIP Collaborative Project Management first commit 2016-03-16 18:34:33 +05:30
Anand Doshi
4284fcf2a6 [fix] additional fixes for removal of Fiscal Year form Holiday List 2016-03-11 17:16:30 +05:30
Valmik Jangla
ba54a43e32 Fixed Maintenance Schedule to work wit new Holiday List 
Improved code in Holiday List for speed
 2016-03-11 14:58:55 +05:30
Valmik Jangla
bc60970fcb Removed from Maitenance Visit and Warranty Claim 2016-03-11 13:05:19 +05:30
Neil Trini Lasrado
f79760ce2d Mumtiple fixes 2016-02-23 18:35:45 +05:30
Rushabh Mehta
f2763d7abe [cleanup] warranty claim form 2016-02-11 11:06:15 +05:30
Rushabh Mehta
1652839086 [minor] [fix] address trigger in warranty claim 2016-02-11 11:06:15 +05:30
Anand Doshi
17d4fc4fa7 [enhancement] Merge Comment and Feed into Communication 💥 
Depends on frappe/frappe#1532
 2016-02-08 13:06:56 +05:30
Anand Doshi
01de945388 [cleanup] Removed 'Is Service Item' checkbox and filters 
'Is Service Item' checkbox only worked for filtering Items in Maintenance Schedule and Maintenance Visit, and validating that Items in a Maintenance type Order were of type 'Service'. However, it doesn't fit an actual use case where any Sales Item could be given for Maintenance, making the checkbox an unnecessary addition.
 2016-01-26 16:22:51 +05:30
Rushabh Mehta
b46069d44b [cleanup] contextual buttons in sales & purchase and fix rate setting in opp -> quotation and material request -> purchase order 2016-01-15 16:59:26 +05:30
Rushabh Mehta
66eaf7e1c3 Merge pull request #4607 from saurabh6790/group_custom_buttons 
[enhance] merge customize buttons under groups
 2016-01-15 11:15:23 +05:30
Rushabh Mehta
9bf2df9303 [minor] [layout] cleaned up Time Log layout 2016-01-14 18:19:21 +05:30
Saurabh
e23e99f4bd [enhance] merge customize buttons under groups 2016-01-13 09:18:31 +05:30
Rushabh Mehta
5760b79747 [translations] fixes #4533 2016-01-04 15:57:01 +05:30
Nabin Hait
b6b56453e1 [fix] Get defaults based on doctype or fieldname 2015-12-23 16:37:06 +05:30
bohlian
ff1ab26088 Removed Warehouse Requirement for SerialNo Listing 
Removed the requirement that Warehouse has to be assigned for Serial Number to appear in the listing.
 2015-11-25 16:06:20 +08:00
Anand Doshi
602e8253be [enhancement] Int, Currency, Float, Percent as not null and default to 0 2015-11-19 13:23:36 +05:30
Nabin Hait
bdfb070ed6 [fix] Serial No query in Warranty Claim 2015-10-28 15:38:22 +05:30
Nabin Hait
398c83afa5 [fix] For Serial No Status 2015-10-22 15:11:44 +05:30
Anand Doshi
73286dd9f5 [minor] define email field for Issue 2015-10-20 14:53:22 +05:30
Anand Doshi
1d093a4039 [fix] change attach fields to small text 2015-10-19 12:56:29 +05:30
Rushabh Mehta
ee6862b277 [fix] VARCHAR lengths as 140 2015-10-14 17:28:35 +05:30
Anand Doshi
71ebad5668 Limit varchar length to 140 instead of 255 to mitigate Row Size Too Large error 2015-10-14 16:13:49 +05:30
Rushabh Mehta
7f75dbf061 [cleanup] remove backup manager 2015-09-28 19:12:54 +05:30
Anand Doshi
86102064a5 [fix] Use add_fetch in Product Bundle, Maintenance Visit and Maintenance Schedule instead of redundant get_item_details method 2015-09-15 11:50:30 +05:30
Anand Doshi
bc1e8b4408 [minor] Unset Apply User Permissions in default permissions 2015-09-08 19:23:23 +05:30
Anand Doshi
8b66f2a691 Exported all doctypes 2015-08-27 16:45:52 +05:30
Anand Doshi
282e4947fa [fix] Changed more section label to 'More Information' 2015-08-27 13:11:46 +05:30
Rushabh Mehta
81e9d4e8f5 [fix] changed text > text editor for description fields in tables 2015-08-19 13:00:03 +05:30
Rushabh Mehta
1e8025b327 [cleanup] yes/no selects changed to checks in Item 2015-07-29 11:38:33 +05:30
Nabin Hait
a2f18ba794 [fix] Contact section visibility in Warranty Claim 2015-07-28 12:00:45 +05:30
Nabin Hait
f92465981c datetime issue fixed in maintenance schedule 2015-07-02 14:09:49 +05:30
Rushabh Mehta
cf29f6468d [minor] add attachment to issue via portal: 2015-06-01 17:47:03 +05:30
Rushabh Mehta
a33d468d30 [fixes] portal, issues, addresses etc 2015-06-01 17:15:42 +05:30
Pratik Vyas
37ee57c211 [fix] Remove guest perms from Issue 2015-05-28 13:04:43 +05:30
Rushabh Mehta
43c885868f [usability] re-layout Issue Form 2015-05-20 16:47:45 +05:30
Rushabh Mehta
0718292bfa [minor] naming series not set message 2015-05-18 11:19:10 +05:30
Nabin Hait
26c8a96b0a set contact and customer in issue 2015-05-17 10:39:06 +05:30
Rushabh Mehta
3d7793dae3 [hot] fix in issue 2015-05-15 20:59:19 +05:30
Rushabh Mehta
8360e2df71 [fix] [minor] update customer in issue fixes #3241 2015-05-15 14:09:23 +05:30
Rushabh Mehta
82ee5fdba6 [email] changes in email_account api 2015-05-04 18:17:22 +05:30
kressi
d1aa37f521 removed attributes from frappe is_website_user 2015-05-02 10:24:17 +02:00
Rushabh Mehta
7c32770a69 move opportunity item to CRM 2015-04-02 22:06:36 +05:30
Rushabh Mehta
4c46687fb1 [incoming sales email] to opportunity 2015-04-02 22:00:34 +05:30
Rushabh Mehta
4c8d01ba9e [issue] close, reopen buttons 2015-04-01 15:43:14 +05:30
Rushabh Mehta
aefc01372f [listview] issue: open, close | so, po: stop, unstop 2015-03-31 13:39:42 +05:30
Rushabh Mehta
8f343165ad [patch-fix] convert_stock_reco 2015-03-20 15:04:13 +05:30
Rushabh Mehta
14ae4c3603 [email] many fixes, newsletter, unsubscribe 2015-03-19 17:16:03 +05:30
Anand Doshi
9d9e31f4e8 moved get_list_context to module 2015-03-13 12:48:05 +05:30
Rushabh Mehta
f5f0d5a83a [breadcrumbs] refactor 2015-03-09 15:48:16 +05:30
Anand Doshi
e514323be4 load all js and css like before in desk.html 2015-03-06 13:17:26 +05:30
Anand Doshi
885e074697 Changed company name from Web Notes to Frappe Technologies 2015-03-03 14:56:43 +05:30
Anand Doshi
d35354cc06 Merge remote-tracking branch 'frappe/develop' into v5.0 
Conflicts:
	erpnext/__version__.py
	erpnext/accounts/doctype/budget_distribution/test_budget_distribution.py
	erpnext/accounts/doctype/chart_of_accounts/charts/account_properties.py
	erpnext/hooks.py
	erpnext/patches.txt
	erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
	erpnext/stock/get_item_details.py
	erpnext/translations/ar.csv
	erpnext/translations/bs.csv
	erpnext/translations/ca.csv
	erpnext/translations/el.csv
	erpnext/translations/es.csv
	erpnext/translations/fr.csv
	erpnext/translations/hr.csv
	erpnext/translations/id.csv
	erpnext/translations/is.csv
	erpnext/translations/ja.csv
	erpnext/translations/nl.csv
	erpnext/translations/pl.csv
	erpnext/translations/pt-BR.csv
	erpnext/translations/ru.csv
	erpnext/translations/tr.csv
	erpnext/translations/zh-cn.csv
	erpnext/translations/zh-tw.csv
	setup.py
 2015-02-24 18:12:17 +05:30
Anand Doshi
d57e793bf3 [fix] Added unicode_literals if missing in py files 2015-02-24 12:24:53 +05:30
Anand Doshi
f9fc04ce8e Website Listing 2015-02-23 22:34:27 +05:30
Rushabh Mehta
d54031f3b5 [tests] [projects] merged tasks and projects and added quick edit of tasks from projects 2015-02-22 22:32:39 +05:30
Rushabh Mehta
7bbbda162c [warranty claim] ux - serial no on top 2015-02-21 14:49:17 +05:30
Rushabh Mehta
813f0eda05 [form] section labels 2015-02-20 16:02:48 +05:30
Rushabh Mehta
c7a11cc451 [usability] [fixes] stock entry and production order 2015-02-19 16:28:35 +05:30
Rushabh Mehta
d60acb9f26 [fixes] production, added qty transferred, fix gantt, fiscal year (set fiscal year, instead of validation 2015-02-19 14:53:31 +05:30
Anand Doshi
8c0f05fbae [minor] grid report loading 2015-02-17 19:53:23 +05:30
Rushabh Mehta
46e03eadca [rename] Customer Issue -> Warranty Claim 2015-02-17 10:45:50 +05:30
Nabin Hait
15cd12214e Fixed conflict while merging v4 into v5 2015-02-10 16:37:18 +05:30
Rushabh Mehta
a232c80d77 [share] add share permission 2015-02-05 15:52:58 +05:30
Rushabh Mehta
c567e8e960 [fix] analytics reports + remove print item tables #2667 2015-02-03 17:56:25 +05:30
Rushabh Mehta
06fa46fafe [fix] onshow > on_page_show 2015-01-29 18:09:11 +05:30
Nabin Hait
22a4b82bd2 Minor fixes 2015-01-28 13:11:49 +05:30
Rushabh Mehta
5bceebc6a1 [fix] fixes birthday reminders #2021 2015-01-23 15:22:30 +05:30
Rushabh Mehta
135fe3405f [ui] listviews 2015-01-12 16:11:02 +05:30
Rushabh Mehta
738d4ef5c8 [ui] [listviews] indicators 2015-01-06 18:09:02 +05:30
Rushabh Mehta
e1cb0ae738 [design] list views 2015-01-05 17:39:05 +05:30
Anand Doshi
3f5e95a99e [design] Fixed Grid Reports 2015-01-01 16:26:18 +05:30
Rushabh Mehta
90e270a8aa [ux] fixed creation via tree views for Item Group etc 2015-01-01 15:59:40 +05:30
Rushabh Mehta
4c36d7388c [ux] fixed creation via tree views for Item Group etc 2015-01-01 15:59:34 +05:30
Rushabh Mehta
419ae33c3e [merge] v5-design 2014-12-31 15:03:14 +05:30
Nabin Hait
dd38a266b8 Removed tname and fname from code 2014-12-26 13:15:21 +05:30
Rushabh Mehta
4096a3ab2b [design] form toolbar 2014-12-26 12:53:02 +05:30
Rushabh Mehta
a9ba5eff99 [design] pos 2014-12-26 12:52:11 +05:30
Nabin Hait
e7d153624f Table Field Renaming: code replace, JV and budget distribution renamed 2014-12-25 16:01:55 +05:30
Nabin Hait
d8f4984d71 Table fieldnames renaming: updated json and patch 2014-12-24 17:04:48 +05:30
Rushabh Mehta
1913d5b366 [series] for Issue 2014-11-28 14:27:46 +05:30
Rushabh Mehta
bd9b62ff28 [rename] Support Ticket -> Issue 2014-11-28 11:46:10 +05:30
Nabin Hait
ae1dcabcb5 Fixed merge conflict 2014-11-05 12:41:02 +05:30
ankitjavalkarwork
4e61536f50 Fix Customer Issue error on click event of Serial No. field 2014-10-27 11:08:05 +05:30
Neil Trini Lasrado
9614b552fd fiscal year auto-fetch added to c-form, installation_note, stock_reconciliation, customer_issue, maintanence_visit & removed for Expense Claim 2014-10-09 15:01:12 +05:30
Nabin Hait
c68646c694 [merge] 4.x to 5.0 2014-10-06 12:57:48 +05:30
Rushabh Mehta
3ef0b7ce99 [fix] support ticket feed 2014-09-29 12:48:31 +05:30
Nabin Hait
95f1fe92e2 Maintenance visit search field issue fixed 2014-09-26 14:23:00 +05:30
Rushabh Mehta
5cdc8e560c [mailbox] removed separate email settings for jobs, sales, support 2014-09-16 15:12:18 +05:30
Rushabh Mehta
e10cf021d9 [email] remove communicationlist #561 2014-09-16 15:12:18 +05:30
Rushabh Mehta
ce00772ac0 [cleanup] removed communication js, fields 2014-09-16 15:11:42 +05:30
Rushabh Mehta
c0bb453b88 [refactor] [frappe 5.0] 2014-09-16 15:10:54 +05:30
Rushabh Mehta
ed37cef32a [refactor modules] 2014-09-16 15:08:02 +05:30
81552433qqcom
1db294e837 hotfix for project wise report 
translation patch for email digest and support ticket.
 2014-09-16 16:49:58 +08:00
81552433qqcom
951da0ca3d added translations to report py file. 2014-09-12 16:07:12 +05:30
Anand Doshi
12b98027ee [fix] Maintenance Scheduler periodicity validation 2014-08-29 16:11:11 +05:30
Nabin Hait
0514e07ef4 minor fix 2014-08-29 11:50:59 +05:30
Nabin Hait
818bacae49 Minor fix in maintenance schedule 2014-08-29 11:50:58 +05:30
Anand Doshi
46256cddd7 Enqueue Newsletter sending in Longjob Queue 2014-08-27 12:23:52 +05:30
Rushabh Mehta
e8dd4160d4 [cleanup] remove allow_attach 2014-08-25 13:04:21 +05:30
Nabin Hait
df5ab4e228 Minor fix in maintenance schedule 2014-08-21 11:32:39 +05:30
Rushabh Mehta
0d0f5f6c25 [ux] fixes to timeline 2014-08-14 11:43:46 +05:30
Rushabh Mehta
ab8bde0149 [ux] added folds, show actual / projected qty in pos 2014-08-14 11:43:46 +05:30
Rushabh Mehta
7a4e739d6c templating for hr 2014-08-08 11:56:32 +05:30
Rushabh Mehta
a660464cec added for support 2014-08-08 11:56:32 +05:30
Rushabh Mehta
995185d02d [ux] fixed primary action 2014-08-08 11:51:23 +05:30
Nabin Hait
1279f1d430 Fixes for customer / supplier renaming 2014-08-04 13:05:59 +05:30
nabinhait
d6ff58daa1 Minor fix in customer issue 2014-07-31 11:40:41 +05:30
Anand Doshi
d1a2ce2750 [minor] is_ajax check in newsletter 2014-07-23 12:51:17 +05:30
Anand Doshi
de85a3af15 Newsletter: Bulk Send via worker 2014-07-22 19:49:16 +05:30
Anand Doshi
c70d2d23a8 Support Ticket: set resolution_date as None if missing 2014-07-16 11:48:51 +05:30
Anand Doshi
3a389788bf BugFix: Maintenance Visit against Customer Issue 
+ Map Item details from Customer Issue into Maintenance Visit Purpose Table
+ Map Prev DocType and Prev DocName
+ Changed prevdoc_doctype and prevdoc_docname into Dynamic Link
 2014-07-07 12:24:19 +05:30
Rushabh Mehta
6084a3e63a formatting fix in support ticket autoreply 2014-07-02 17:13:08 +05:30
Nabin Hait
4e4a83bcef Fixes in maintenance schedule 2014-06-30 11:50:17 +05:30
Anand Doshi
83da92fdcc Naming Series Property Setter Patch 2014-06-23 18:04:07 +05:30
Anand Doshi
a5cfc59d81 Validate Select field values 2014-06-19 16:05:08 +05:30
Anand Doshi
862fe60368 Minor fix in newsletter 2014-06-10 17:15:50 +05:30
Anand Doshi
7656377f3f Show website route for generator via set_intro, fix in Support Email Settings 2014-06-10 15:48:37 +05:30
Anand Doshi
ec8240e890 Apply User Permissions optional in Script and Query Reports 2014-06-04 17:48:58 +05:30
Anand Doshi
a8ce570635 Permission relogication continued 2014-06-04 17:48:53 +05:30
Anand Doshi
fab0904af7 Started permission relogication 2014-06-04 17:48:52 +05:30
Nabin Hait
abb62c76d8 Removed allocated to field from serach fields in support ticket 2014-06-03 10:50:55 +05:30
Rushabh Mehta
f944e819e9 fixes #1581 and added icons to grid reports 2014-05-27 15:22:04 +05:30
Rushabh Mehta
a39cae9c2e added title field to support ticket, lead and employee 2014-05-21 17:34:22 +05:30
Nabin Hait
2e0620e370 Server side onload functionality in multiple docs 2014-05-19 18:15:58 +05:30
Anand Doshi
54b7962eb9 Pass frm to open_mapped_doc 2014-05-14 17:38:45 +05:30
Nabin Hait
aade34b0c9 Reports and print formats modified for renamed fields 2014-05-13 16:12:37 +05:30
Rushabh Mehta
75e11a7270 Merge pull request #1616 from pdvyas/migrate-3to4 
3 to 4 migration fixes
 2014-05-10 22:19:07 +05:30
Pratik Vyas
6e686224eb fix patches 2014-05-10 22:17:04 +05:30
Anand Doshi
78e9c6ef70 Deprecate Select fields with options as link: 2014-05-09 13:36:13 +05:30
Anand Doshi
7e1b75a705 Newsletter status display. Fixes #1593 2014-05-07 18:44:02 +05:30
Anand Doshi
dc644c37e6 Merge pull request #1597 from anandpdoshi/naming-series-by-fiscal-year 
Naming series by fiscal year
 2014-05-07 11:06:36 +05:30
Anand Doshi
8c2dbab878 Changed default naming series options 
C-Form: C-FORM-.#####
	Purchase Invoice: PINV-.#####
	Sales Invoice: SINV-.#####
	Purchase Order: PO-.#####
	Quality Inspection: QI-.#####
	Supplier: SUPP-.#####
	Supplier Quotation: SQTN-.#####
	Attendance: ATT-.#####
	Production Order: PRO-.#####
	Installation Note: IN-.#####
	Lead: LEAD-.#####
	Opportunity: OPTY-.#####
	Quotation: QTN-.#####
	Sales Order: SO-.#####
	Delivery Note: DN-.#####
	Item: ITEM-.#####
	Material Request: MREQ-.#####
	Packing Slip: PS-.#####
	Purchase Receipt: PREC-.#####
	Stock Entry: STE-.#####
	Customer Issue: CI-.#####
	Support Ticket: SUP-.#####
	Customer: CUST-.#####
	Journal Voucher: JV-.#####
 2014-05-06 19:43:11 +05:30
Nabin Hait
ce4a87ce83 Maintenance schedule: get no of visits and period validation. Fixes #1591 2014-05-06 18:52:36 +05:30
Anand Doshi
8bde7f9b3a Conditionally toggle Naming Series. Fixes #1526 2014-04-24 18:11:49 +05:30
Rushabh Mehta
c38fc713c6 updated translations 2014-04-16 17:46:30 +05:30
Anand Doshi
652bc0784a Ported v3 fixes to v4 
Commit range: webnotes/erpnext@e4b72df2f4bd7272c42e90f6faec3c27aa763b82..webnotes/erpnext@85441b0180f84246259d5a0ab4e3bcbf29355efe
 2014-04-16 15:26:42 +05:30
Rushabh Mehta
d85dc868ca more message fixes for translation 2014-04-15 22:54:34 +05:30
Rushabh Mehta
ff93802d58 more message fixes 2014-04-15 18:40:31 +05:30
Rushabh Mehta
2c45899a02 fixed strings for translation 2014-04-15 14:41:56 +05:30
Pratik Vyas
b52618c142 frappe._ to __ 2014-04-14 16:25:30 +05:30
Anand Doshi
9fd50bcfb6 Fixed rest of the test cases frappe/frapp#478 2014-04-09 19:20:01 +05:30
Anand Doshi
d29465029d Fixed Test Cases frappe/frappe#478 2014-04-08 20:15:22 +05:30
Rushabh Mehta
a504f0638b frappe/frappe#478, fixed list passed in 2014-04-04 12:16:26 +05:30
Rushabh Mehta
f14b809ab5 frappe/frappe#478, more changes, removed bean 2014-04-03 14:30:42 +05:30
Rushabh Mehta
f191f854cd frappe/frappe#478 erpnext install works 2014-04-02 18:09:34 +05:30
Rushabh Mehta
f2227d033c frappe/frappe#478, removed instances of .fields 2014-03-31 23:37:40 +05:30
Rushabh Mehta
231f6a5b58 frappe/frappe#478 added test_records.json 2014-03-31 23:05:12 +05:30
Rushabh Mehta
0a0f2495a2 frappe/frappe#478, frappe tests pass, .txt renamed to .json 2014-03-31 17:27:06 +05:30
Nabin Hait
0e13cd5ac9 frappe/frappe#478 2014-03-28 17:01:32 +05:30
Nabin Hait
0d8d30e1cc frappe/frappe#478 2014-03-28 16:57:21 +05:30
Rushabh Mehta
b385ecf65e frappe/frappe#478 2014-03-28 16:54:45 +05:30
Anand Doshi
81ba0b29da frappe/frappe#478 2014-03-28 15:23:26 +05:30
Anand Doshi
f78d1aee28 Replaced doc, doc.fields frappe/frappe#478 2014-03-28 13:55:00 +05:30
Anand Doshi
40534f076b Changed creation, modified format frappe/frappe#478 2014-03-28 12:46:53 +05:30
Rushabh Mehta
daae743608 frappe/frappe#478 2014-03-27 17:54:18 +05:30
Rushabh Mehta
e88bc8b12a frappe/frappe#478 2014-03-27 17:51:41 +05:30
Rushabh Mehta
d2b34dc30c frappe/frappe#478 2014-03-27 16:12:56 +05:30
Rushabh Mehta
66d52b55c0 #478 2014-03-27 14:17:33 +05:30
Rushabh Mehta
aa355af2cf refactored client side Model and Meta - frappe/frappe#478 2014-03-26 18:24:30 +05:30
Nabin Hait
5c6b34a84c minor fix 2014-03-26 10:30:25 +05:30
Nabin Hait
d6e4ab3fd4 maintenance schedule: validate amc dates and update in serial no 2014-03-26 10:23:27 +05:30
Nabin Hait
4d713ac5ba sql injection fixes 2014-03-21 11:22:37 +05:30
Rushabh Mehta
7c932003ed rename Profile to User frappe/frappe#470 2014-03-11 16:15:59 +05:30
Anand Doshi
09a9f4c0c9 Added module to Report doctype 2014-03-07 17:20:22 +05:30
Rushabh Mehta
73f0bf36c1 fixed #1454 2014-03-06 14:45:02 +05:30
Anand Doshi
2d5727b17b Ignore mandatory during email pulling 2014-03-05 19:24:07 +05:30
Anand Doshi
e30511d315 Email Settings split into Outgoing Email Settings and Support Email Settings 2014-03-03 20:32:20 +05:30
Anand Doshi
f5794f1c07 Module Home Pages using Module View 2014-03-03 15:06:34 +05:30
Anand Doshi
e9baaa68e7 Changed frappe.conn to frappe.db 2014-02-26 12:35:33 +05:30
Rushabh Mehta
793ba6bd37 -webnotes +frappe 💥 2014-02-14 15:47:51 +05:30
Nabin Hait
f0d29be1d5 Removed on_trash function from support ticket 2014-02-12 14:54:11 +05:30
Anand Doshi
93fdc670fe Fixes in Test Cases 2014-02-11 14:40:21 +05:30
Anand Doshi
080b64a98f Fixes in Sales Partner and Support Mails 2014-02-07 19:14:21 +05:30
Akhilesh Darjee
f1c3537924 webnotes/erpnext#869 newsletter to send to employees 2014-02-03 19:28:36 +05:30
Akhilesh Darjee
abb3af7b30 Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0-hotfix 2014-02-03 16:44:14 +05:30
Rushabh Mehta
347889b233 merge 2014-02-03 14:49:53 +05:30
Akhilesh Darjee
53593c9c47 Newsletter allow delete 2014-02-03 13:40:27 +05:30
Akhilesh Darjee
d6d2193f91 newsletter reload 2014-01-31 19:59:25 +05:30
Nabin Hait
bec11fa86e Newsletter permissions 2014-01-31 17:33:23 +05:30
Rushabh Mehta
49dd7bee87 added get_supplier_details and commonified invoice functions 2014-01-28 17:43:10 +05:30
Nabin Hait
21d324c597 Merged with 4.0-wip 2014-01-28 15:52:25 +05:30
Akhilesh Darjee
86894f3bbf merge conflict fixed 2014-01-27 15:42:02 +05:30
Rushabh Mehta
e288e5238a added title_fields for Task, Newsletter 2014-01-24 15:33:42 +05:30
Rushabh Mehta
f96bcf943b added explicit delete perimssions 2014-01-20 17:52:13 +05:30
Nabin Hait
dc15b4fa8a Fixed conflict while merging with develop brnach 2014-01-20 16:48:49 +05:30
Akhilesh Darjee
2a79b00700 minor fix 2014-01-15 11:54:05 +05:30
Akhilesh Darjee
6a749e3a8e removed while loop 2014-01-15 11:43:47 +05:30
Akhilesh Darjee
5dd92fd5d6 reload doc in maintenance schedule 2014-01-03 19:14:01 +05:30
Akhilesh Darjee
5c96b75a68 fixed maintenance schedule 2014-01-02 17:54:12 +05:30
Akhilesh Darjee
064d2ba16a fixed sr no in maintenance schedule 2014-01-02 17:47:32 +05:30
Rushabh Mehta
b09d9dabc5 started cleanup of address / contact calls - partly fixed for customer, to fix shipping_address, get_pos_values, for all supplier transactions 2014-01-02 11:47:23 +05:30
Anand Doshi
8e332ffd16 Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions 
Conflicts:
	erpnext/accounts/page/accounts_browser/accounts_browser.css
	erpnext/controllers/buying_controller.py
	erpnext/manufacturing/doctype/production_order/production_order.py
	erpnext/patches/patch_list.py
	erpnext/selling/doctype/customer/customer.txt
	erpnext/selling/doctype/sales_order/sales_order.py
	erpnext/selling/doctype/sales_order/test_sales_order.py
	erpnext/setup/doctype/features_setup/features_setup.txt
	erpnext/stock/doctype/stock_entry/test_stock_entry.py
	erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
	startup/query_handlers.py
 2013-12-26 19:12:51 +05:30
Rushabh Mehta
54047780fc Merge with 3.3.8 2013-12-26 11:07:46 +05:30
Rushabh Mehta
df200f305b Redesigned templates. Now all templates must be inside templates/pages templates/generators 2013-12-25 15:19:22 +05:30
Rushabh Mehta
6de403f2be added manifest, hooks and fixed requires webnotes/wnframework#351 2013-12-13 14:10:14 +05:30
Rushabh Mehta
1f84799f2d install, web serving, session booting webnotes/wnframework#351 2013-12-12 19:12:19 +05:30
Rushabh Mehta
d2dd83c3a3 fixed template loader webnotes/wnframework#351 2013-12-12 13:57:58 +05:30
Rushabh Mehta
39bb8e2ed4 step 0: install 2013-12-11 15:32:14 +05:30
Rushabh Mehta
afea58b7a1 moved modules inside erpnext folder 2013-12-11 10:43:52 +05:30
Rushabh Mehta
2fa2f7178d moved directory structure 2012-09-24 19:13:42 +05:30
Rushabh Mehta
feaea28fdf bulk email: parse html2text only once and autocommit on many writes 2012-09-24 13:09:05 +05:30
Anand Doshi
70f76117ac Show Create Button for link fields which are allowed for submit 2012-09-19 13:06:58 +05:30
Rushabh Mehta
93af75a160 added unicode literals in patch 2012-09-07 10:57:14 +02:00
Anand Doshi
3d498ccfb1 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-09-06 07:56:07 +05:30
Anand Doshi
76ef96f24f begin transaction after commit in support ticket 2012-09-06 07:53:37 +05:30
Anand Doshi
eb3089e6e3 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-31 16:57:04 +05:30
Anand Doshi
c53a0ffe34 by default, communication content is of type 'Text' instead of 'Text Editor' 2012-08-31 16:54:59 +05:30
Anand Doshi
b211a41547 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-31 13:39:58 +05:30
Anand Doshi
29abc389eb run communication list if a new communication is added 2012-08-31 13:39:18 +05:30
Anand Doshi
00d3c7c67d open communication in dialog 2012-08-31 13:25:03 +05:30
Anand Doshi
9ee4adb27a send newsletter as owner 2012-08-24 15:18:48 +05:30
Anand Doshi
ad86d0f474 show message after sending test email 2012-08-24 14:47:30 +05:30
Anand Doshi
c6800106fb added newsletter listing 2012-08-24 14:47:10 +05:30
Anand Doshi
3f8277b6bb added newsletter link in support home page. also hide naming series after save 2012-08-24 14:23:27 +05:30
Anand Doshi
9fdc4abced added newsletter feature 2012-08-24 14:13:42 +05:30
Anand Doshi
297f37da03 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-22 14:59:14 +05:30
Anand Doshi
73c6542e6c minor fix in communication.js 2012-08-22 14:57:35 +05:30
Rushabh Mehta
a49a552a37 merge 2012-08-06 14:30:31 +05:30
Anand Doshi
786444e6bf changed document_type of 'Communication' to 'Master' to enable importing 2012-08-03 16:15:39 +05:30
Anand Doshi
ccee92e5c0 fixes in header decoding in receiving support ticket email 2012-07-31 10:56:24 +05:30
Anand Doshi
3e7a143539 fixes in header decoding in receiving support ticket email 2012-07-31 10:54:56 +05:30
Anand Doshi
6a223fe77e fixes in receive email 2012-07-23 12:51:50 +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
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
249659d673 Changed file names from listview.js to doctype_name_list.js 2012-07-18 20:25:58 +05:30
Anand Doshi
ebe23b0f89 allow deletion of communication 2012-06-29 16:38:07 +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
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
8ae5ba9abf fixes related to --> clear locals and then sync locals when whole doclist is passed 2012-06-25 20:05:35 +05:30
Anand Doshi
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
a65ad2c901 fetch customer/supplier given a contact in communication 2012-06-08 18:21:35 +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
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
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
Anand Doshi
937d838bdc min height for communication history and transaction history 2012-06-05 20:19:52 +05:30
Anand Doshi
dbb84a271e Merge branch 'master' of github.com:webnotes/erpnext into comm_log 
Conflicts:
	erpnext/selling/doctype/lead/lead.js
	erpnext/setup/doctype/contact_control/contact_control.js
 2012-06-05 18:37:17 +05:30
Anand Doshi
390b788e7b communication 2012-06-05 18:28:38 +05:30
Nabin Hait
c84c86e458 customer info added in maintenance schedule event 2012-06-04 17:47:47 +05:30
Anand Doshi
c5d857896e fixes in communication doctype 2012-05-31 18:23:16 +05:30
Anand Doshi
a6708fb748 new doctype: communication 2012-05-31 14:53:55 +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
9327bb9585 fix in tag viewing in doclistview 2012-05-23 15:12:22 +05:30
Anand Doshi
d287962cd9 removed the double check box in support ticket list 2012-05-21 19:36:47 +05:30
Anand Doshi
cb909d518c Merge branch 'shf_rename' 2012-05-21 18:44:19 +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
8b426a6142 customer issue cleanup 2012-05-21 14:50:28 +05:30
Anand Doshi
1aae261490 delete button in doclistview 2012-05-21 14:31:03 +05:30
Anand Doshi
f295591168 Merge branch 'shf_rename' 2012-05-14 18:03:45 +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
0eb790a0ae cleaned up imports, doc 2012-05-11 15:53:37 +05:30
Rushabh Mehta
078867c411 fixes to listview 2012-05-09 16:15:51 +05:30
Rushabh Mehta
7b4a60a980 form toolbar lables and support ticket fix 2012-05-02 11:35:04 +05:30
Anand Doshi
8cffe7e440 fix in support ticket, expiry banner 2012-04-30 12:13:51 +05:30
Anand Doshi
385380125b fixes in customize form, naming series form loading 2012-04-18 16:04:02 +05:30
Anand Doshi
1fb128158c fix in support ticket options of naming_series 2012-04-18 11:18:54 +05:30
Anand Doshi
b2974e8e59 fix in delete check 2012-04-17 11:57:50 +05:30
Anand Doshi
acb3d56e02 fix in install docs 2012-04-17 11:39:18 +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
1c2ac00a82 fixes in sales cycle 2012-04-13 11:38:01 +05:30
Anand Doshi
2424387651 fixes after sync testing 2012-04-10 19:14:37 +05:30
Anand Doshi
fa0cd89a7c change from labels to fieldname in cur_frm.cscript 2012-04-05 13:03:35 +05:30