Rushabh Mehta
710dc5392f
[merge]
2017-01-27 15:48:31 +05:30
Makarand Bauskar
01eefafad5
[minor] minor fixes in opportunity form ( #7549 )
2017-01-23 12:15:36 +05:30
Rushabh Mehta
8d39fd9790
[fix] address queries + tests
2017-01-16 13:06:15 +05:30
ci2014
820abd3ba4
Fix missing comma ( #7495 )
...
Fixed missing comma after method set_contact_link
2017-01-16 11:57:34 +05:30
Rushabh Mehta
b92087cb2d
[cleanup] move contact, address to frappe 💥
2017-01-13 18:54:47 +05:30
Kanchan Chauhan
b7cc393eb8
Email ID renamed to Email Address
2017-01-03 16:45:38 +05:30
Rushabh Mehta
e60c2c7b7a
[minor] dashboard cleanups
2016-12-27 12:14:37 +05:30
Rushabh Mehta
99c814b360
[fix] paging for products (support)
2016-12-19 11:55:10 +05:30
Nabin Hait
f49bbe1142
Cleanup of lead and opportunity status updating logic
2016-12-15 11:51:54 +05:30
Nabin Hait
ad4f1c7fd1
date is optional in get_exchange_rate
2016-12-09 12:14:47 +05:30
Nabin Hait
1cc55fbbcb
Fixed merge conflict
2016-12-08 14:09:23 +05:30
Rushabh Mehta
323c06ebbf
[minor] rename icons as per FontAwesome 4 ( #7136 )
2016-12-05 14:17:26 +05:30
Nabin Hait
95e6ccd419
Merge branch 'master' into develop
2016-11-14 12:42:26 +05:30
Nabin Hait
a5a733630f
[fix] Opportunity loading issue
2016-11-14 12:32:16 +05:30
Nabin Hait
256a3fef95
Fixed multiple minor issues
2016-11-14 11:10:50 +05:30
Rushabh Mehta
13fc52d713
[minor] added default standard filters ( #6854 )
2016-11-07 17:19:19 +05:30
Nabin Hait
81f7a265bc
Merge pull request #6723 from rohitwaghchaure/enhancement_remember_last_selected_value
...
Remember last selected value for link field
2016-11-04 16:13:49 +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
1ac67b873c
[fix] Get data in opportunity dashboard
2016-11-03 11:00:09 +05:30
Kanchan Chauhan
a1cedbc7b2
Contact by and contact date validations
2016-10-24 13:51:13 +05:30
Nabin Hait
fa1cdd5bf0
Fixed merge conflict
2016-10-18 15:37:33 +05:30
Rushabh Mehta
17f6874450
[minor] [fix] doctype_dasboard.py files, move data to get_data
2016-10-18 14:54:39 +05:30
Rohit Waghchaure
5b5f3743dd
Opportunity, added supplier quotation in the dashboard
2016-09-19 18:36:21 +05:30
Chude Osiegbu
3c6a937a7c
Merge branch 'develop' into exchange_rate_modifications
2016-09-18 21:47:55 +01:00
Nabin Hait
5bab04fead
Merge pull request #6381 from rmehta/lead-source
...
[enhance] added Lead Source master, fixes #6231
2016-09-16 16:58:40 +05:30
Rushabh Mehta
39b5d39df6
[fix] remove campaign depends on
2016-09-16 15:55:34 +05:30
Rushabh Mehta
59dc0ece9f
[enhance] added Lead Source master, fixes #6231
2016-09-16 11:44:49 +05:30
Rohit Waghchaure
00295f2b8d
make supplier quotation from opportunity
2016-09-14 15:36:40 +05:30
Chude Osiegbu
fbf27b5031
Further corrections to Currency Exchange table
2016-09-07 03:06:08 +01:00
Rushabh Mehta
d973c1606a
[revert] is_sales_item, is_purchase_item back
2016-08-16 11:32:08 +05:30
Rushabh Mehta
f2d89987f5
[minor] ignore email validation if comes from email;
2016-08-03 16:42:29 +05:30
Rushabh Mehta
24f45af27e
[fix] minor dont make lead for invalid email
2016-08-01 16:07:56 +05:30
Nabin Hait
e72ff9377a
Added converted status in Opportunity
2016-07-28 15:59:20 +05:30
Rushabh Mehta
cd385c3735
[fix] [minor] email pulling error, via scheduler log
2016-07-24 13:07:50 +05:30
Rushabh Mehta
8d8bbb0588
[bugfix] opportunity naming
2016-07-15 16:50:52 +05:30
Rushabh Mehta
176b63b354
[fix] remove first row on mapping, fixes #5707
2016-07-14 17:43:48 +05:30
Rushabh Mehta
3ce24d64c2
[cleanup] payment entry form view
2016-07-11 16:08:46 +05:30
Rushabh Mehta
391c0efcee
[fix] make grids editable
2016-07-11 13:01:58 +05:30
Rushabh Mehta
964ad0fcae
[cleanup] rename "links" to "dashboard"
2016-07-07 14:28:05 +05:30
Rushabh Mehta
2a1e3bb31b
[fix] sender name in lead
2016-07-07 14:28:05 +05:30
Nabin Hait
3950507d4b
[fix] Currency and exchange rate while Quotation made from Opportunity for lead
2016-07-07 11:12:44 +05:30
Nabin Hait
821367fee8
[fix] Dont set currency and exchange rate while Quotation made from Opportunity for lead
2016-07-07 10:55:47 +05:30
Kanchan Chauhan
65c8b5a216
Newsletter moved to Frappe
2016-06-28 17:28:40 +05:30
Rushabh Mehta
a334062b03
[redesign] website routing system
2016-06-24 16:18:07 +05:30
Rushabh Mehta
8a065e0028
[rename] Bulk Email to Email Queue
2016-06-22 12:58:39 +05:30
Rushabh Mehta
560ee7bb12
Merge pull request #5480 from vjFaLk/restrict-newsletter-list
...
Added code to Restrict Newsletter List Recipients
2016-06-22 12:08:41 +05:30
Rushabh Mehta
4cf914d902
[minor] added mins to first response for opportunity
2016-06-22 11:22:12 +05:30
Valmik Jangla
2225decb2b
Restrict Newsletter lists
2016-06-15 16:04:17 +05:30
Rushabh Mehta
a55fb6426c
[patch] mins_to_first_response in opporutnity and issue
2016-06-14 15:54:54 +05:30
Rushabh Mehta
e0686b32f3
[minor] cleanups
2016-06-10 12:38:52 +05:30
Alec Ruiz-Ramon
fcaaa29a58
Status updater for quotation/lost to lead, quotation lost to oppt, and to set conversion as priority in lead
...
cleanup
squashed
2016-06-09 21:17:57 -04:00
Rushabh Mehta
aa60fd9037
[fix] new_doc to frappe.new_doc
2016-06-01 11:46:33 +05:30
Anand Doshi
07dfb475ca
[fix] newsletter progress percentage
2016-05-26 16:41:14 +05:30
Rushabh Mehta
c96c4d6424
[minor] ignore xss in email sender
2016-05-24 16:02:49 +05:30
Rushabh Mehta
c93caee284
Merge pull request #5265 from ShashaQin/patch-46
...
Update opportunity.py
2016-05-16 11:56:32 +05:30
Rushabh Mehta
be2ee18de4
[fixed] frappe.require is now async 💥
2016-04-29 17:22:42 +05:30
ShashaQin
4303164ae0
Update opportunity.py
2016-04-26 14:49:34 +08:00
Anand Doshi
b2b02a574a
Merge branch 'master' into develop
2016-04-20 16:45:20 +05:30
Neil Trini Lasrado
ab822c5d16
Removed no-copy from source in lead
2016-04-20 11:03:15 +05:30
Maxwell Morais
52ec0fa7e9
get_address_display calling method error
...
get_address_display, dont can be use in replacement as a function in the doctype controler, since it dont expect `cdt` and `cdn` as arguments.
972c25f78d/erpnext/public/js/utils/party.js (L53)
2016-04-18 13:24:25 -03:00
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
Valmik Jangla
4af736b989
Moved tasks content to newsletter.py
2016-04-13 19:11:55 +05:30
Valmik Jangla
6842f2e75c
WIP code migration from Celery to RQ
2016-04-11 17:41:34 +05:30
Anand Doshi
2f957f27b0
[fix] apply Tax Rule for lead
2016-04-08 17:43:08 +05:30
Neil Trini Lasrado
cb6430575b
Fixed validation message for disabled employee
2016-04-08 16:36:26 +05:30
Rushabh Mehta
78b7a53635
[cleanup] set default bold, print_hide for prints
2016-04-06 15:29:45 +05:30
Rushabh Mehta
d690094b12
[image] added default image field for employee, customer, item, contact, lead, supplier and using - instead of / as separator in BOM
2016-04-04 16:57:56 +05:30
Nabin Hait
33f42aaad1
[fix] Get email field if field type is Code, Text, Small Text or Data
2016-03-31 11:59:10 +05:30
Rushabh Mehta
72b4ad8155
[cleanup] for quick-entry
2016-03-30 15:42:22 +05:30
Valmik Jangla
865d547965
Removed from GL Entry, Opportunity and Quotation
2016-03-11 13:05:20 +05:30
Valmik Jangla
634ecae020
Removed from Lead
2016-03-11 13:05:19 +05:30
Rushabh Mehta
aac4dcedc8
[fix] print language and contact_email fields and removed translations
2016-03-02 15:45:09 +05:30
makeen
4741182b25
[fix] add subscribers even though some emails are invalid
2016-02-15 10:58:12 +01:00
Rushabh Mehta
10663ab37f
Merge pull request #4762 from nabinhait/multifixes3
...
Advance adjustment in invoice cannot be greater than grand total
2016-02-08 18:53:27 +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
Nabin Hait
289ffb788c
[fix] Advance adjustment in invoice cannot be greater than grand total
2016-02-08 11:07:00 +05:30
Rushabh Mehta
7bb2f3a27b
[fix] newsletter priority
2016-02-03 16:20:59 +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
Nabin Hait
9824e22ce1
[fix] Price list rate applied via set_missing_values
2016-01-19 16:48:32 +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
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
Rushabh Mehta
d6c5235d58
[minor] [translation] fix #4343
2015-11-30 11:33:01 +05:30
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
915778fb69
[fix] Clear addressed and contacts on a new form
2015-10-30 14:43:13 +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
Nabin Hait
f924e08b93
[fix] Validate duplicate email ids in Lead
2015-10-01 11:51:48 +05:30
Anand Doshi
b20baf894f
[fix] Remove party_account_currency from Customer and Supplier, and use currency derived from get_party_account
2015-09-30 15:11:12 +05:30
Rushabh Mehta
4bcbcd29f7
[enhancement] lower priority for newsletter emails
2015-09-29 14:58:45 +05:30
Anand Doshi
c5f919eb68
[fix] use the new split_emails method to split emails by comma
2015-09-16 19:20:55 +05:30
Anand Doshi
dbe623b167
[fix] Use User Permission value as default only if the document type is Setup
2015-09-14 13:08:53 +05:30
Anand Doshi
5d9cfc76cd
Don't copy title field in Duplicate
2015-09-11 15:35:26 +05:30
Nabin Hait
2377cdfa4e
Fixed conflict
2015-09-09 18:45:41 +05:30
Anand Doshi
bc1e8b4408
[minor] Unset Apply User Permissions in default permissions
2015-09-08 19:23:23 +05:30
Nabin Hait
216aaaf1d6
Set currency and exchange rate based on Customer's currency while making Quotation from Opportunity
2015-09-04 16:41:04 +05:30
Rushabh Mehta
c2283ca304
[hot] [fix] remove test options in Opportunity
2015-09-02 18:56:35 +05:30
