Pranav Nachanekar
a3b8c77af1
Fixed leads
2019-09-12 15:19:22 +05:30
Pranav Nachanekar
1564f1476c
Added customer to calender event
2019-09-12 14:24:28 +05:30
Pranav Nachanekar
469247bf73
Change max date of datepicker
...
to number of days in future as specified by the settings
2019-09-12 11:15:42 +05:30
Pranav Nachanekar
a2dbd391b3
Add lead and calender event to appointments
2019-09-12 10:48:26 +05:30
Pranav Nachanekar
8051ca1859
Limit advance booking of appointments
2019-09-12 10:47:45 +05:30
Pranav Nachanekar
249cdd92e0
Added uniqueness check for offset
2019-09-11 14:59:25 +05:30
Pranav Nachanekar
e543fc483f
Removed email reminders
...
As it will be handled by calender event in the future
2019-09-11 14:59:13 +05:30
Pranav Nachanekar
0cc837eac5
Create event for the appointment
...
TODO: Add lead and employee to this
2019-09-11 14:12:30 +05:30
Pranav Nachanekar
5038d6a6db
Removed appointment tests
...
TODO: Write better tests after adding lead and calender event generation
2019-09-11 10:31:04 +05:30
Pranav Nachanekar
2d7370a525
Moved delete_appointment
2019-09-10 16:46:17 +05:30
Pranav Nachanekar
c4950a0281
Added doctype
...
availabitlity of slots added
2019-09-10 15:10:51 +05:30
Pranav Nachanekar
5c211d8abf
fixed codacy
2019-09-10 11:52:55 +05:30
Pranav Nachanekar
06facea895
added doctype
2019-09-09 17:09:03 +05:30
Pranav Nachanekar
110f4ea0c9
Formatting
2019-09-09 17:04:25 +05:30
Pranav Nachanekar
db21f86b26
Removed unneccessary doctype
2019-09-09 17:01:40 +05:30
Pranav Nachanekar
5945144c08
Added tests
2019-09-09 16:35:48 +05:30
Pranav Nachanekar
10711dd09d
Refactor UI
2019-09-09 15:41:20 +05:30
Pranav Nachanekar
48e43e2421
build fix
2019-09-09 14:43:55 +05:30
Pranav Nachanekar
217aadba7e
Better autoname
2019-09-09 14:43:41 +05:30
Nabin Hait
eb2ab3bf76
Merge branch 'develop' into develop
2019-09-05 14:59:16 +05:30
pranav nachnekar
d272fd42c9
changed Autoname
2019-09-03 14:16:56 +05:30
Rohan
7fa3f3fe98
fix: include start and end date for contract status ( #18866 )
2019-09-03 14:16:12 +05:30
pranav nachnekar
a3d04cdbca
A
2019-09-03 13:17:35 +05:30
pranav nachnekar
eb4fa966b0
Added validation for timezones
2019-09-03 12:04:23 +05:30
pranav nachnekar
ad6151b690
Added guest permissions
2019-09-03 12:04:13 +05:30
pranav nachnekar
64095084e7
Removed end time in favor of appointment duration
2019-09-03 12:03:14 +05:30
Himanshu
fffdb6f575
feat(Contacts): Multiple Emails in a Contact ( #18675 )
...
* feat: render multiple addresses
* feat: move to newer contacts structure
* fix: iterate over valid variable
* fix: use primary label instead of bold letters
* fix: call popup get contact name from number
* fix: make contact structure call popup compatible
* fix: query
* fix: add city, state and country
* fix: display address
* fix: get address in single line
* fix: review fixes
* fix: translation strings
* fix: fix query for contacts
* fix: remove references of mobile_no
2019-09-02 15:57:45 +05:30
pranav nachnekar
adba6c833d
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2019-08-28 17:00:27 +05:30
pranav nachnekar
7b9e30914f
Added doctypes and portal pages
2019-08-28 16:57:37 +05:30
Suraj Shetty
6affeaa9c1
fix: check if number exists after striping '0'
...
- Absract number striping logic to separate method
- Rename a confusing variable name
- Remove leftout print statement
2019-08-21 09:14:56 +05:30
Suraj Shetty
80afee04a4
fix: Set address while creating Opportunity from Lead ( #18702 )
...
* fix: Set address while creating Opportunity from Lead
* fix: Setting of address in opportunity from Lead
2019-08-13 10:58:29 +05:30
Faris Ansari
9eda500dbc
Merge branch 'develop' into refactor-call-popup
2019-08-12 15:56:35 +05:30
Suraj Shetty
f81b6c7cfb
fix: Set address while creating Opportunity from Lead ( #18700 )
2019-08-12 13:05:22 +05:30
Suraj Shetty
429bfcfd83
fix: Make requested changes
2019-08-08 19:16:32 +05:30
Suraj Shetty
7d3f1fef1c
fix: Employee selection for call popup
...
- Check if employee with matched number is also
scheduled to receive popup
2019-08-05 21:21:45 +05:30
Suraj Shetty
0957480305
fix: Show popup to employees with same phone number
2019-08-05 11:32:51 +05:30
Anurag Mishra
0505135f90
Merge branch 'develop' into refactor-call-popup
2019-07-24 18:33:14 +05:30
Suraj Shetty
4177ecb6b2
Merge branch 'develop' of github.com:frappe/erpnext into refactor-call-popup
2019-07-22 15:18:03 +05:30
Suraj Shetty
433e587a95
style: Add tabs
2019-07-22 13:21:35 +05:30
Suraj Shetty
002474367b
Merge branch 'develop' into email-campaign
2019-07-22 13:20:06 +05:30
Rucha Mahabal
6224266512
fix: replaced frappe.db.get_value with frappe.db.exists
2019-07-22 13:04:43 +05:30
Rucha Mahabal
d23a95c06e
fix: removed unnecessary fields from Campaign DocType and other fixes in Email Campaign
2019-07-22 12:26:52 +05:30
Faris Ansari
e3b3ac8a59
fix: Fetch email when making Opportunity from Lead ( #18373 )
2019-07-22 11:31:30 +05:30
Rucha Mahabal
324ab98b99
Merge branch 'email-campaign' of https://github.com/ruchamahabal/erpnext into email-campaign
2019-07-22 03:27:29 +05:30
Rucha Mahabal
8d994cb1f2
fix: allow only 1 active Email Campaign for a lead/contact at a time
2019-07-22 03:26:40 +05:30
Rucha Mahabal
b54459e588
dash: added Email Campaign to CRM dashboard
2019-07-22 03:23:40 +05:30
Rucha Mahabal
a566b4e24a
Merge branch 'develop' into email-campaign
2019-07-19 15:07:56 +05:30
Suraj Shetty
82cfccab2f
fix: Get user_id of employee instead of name
...
- Remove caching from lead
2019-07-17 11:52:35 +05:30
Suraj Shetty
e7d277d51e
fix: Last communication query
2019-07-16 13:53:41 +05:30
Suraj Shetty
f5dd494716
fix(call popup): Multiple changes
...
- Remove summary from call log use comments instead
- Add contact and lead if matched to the call log
- Add received by field with Employee Link
- DocPerm to allow Employees to have read access on call log
- Remove unwanted code
- Add a method to get lead just by providing phone number
- Show popup only to Employee to which the system is trying to connect.
- Remove custom code from call popup dialog and replace it with
standard fields
- Increase timeout to hide popup after the call has been disconnected.
2019-07-16 11:07:25 +05:30
Rucha Mahabal
bbb22ad082
fix: child table naming
2019-07-15 17:52:50 +05:30
deepeshgarg007
eac5461229
fix: Address filtering fix in opportunity
2019-07-15 13:55:08 +05:30
Rucha Mahabal
0fe37fda09
codacy fixes
2019-07-12 17:47:32 +05:30
Rucha Mahabal
4879e00d64
codacy fixes
2019-07-12 16:09:32 +05:30
Rucha Mahabal
c35a9a4888
codacy fixes
2019-07-12 15:49:05 +05:30
Rucha Mahabal
7396bb8933
codacy fixes
2019-07-12 14:47:02 +05:30
Rucha Mahabal
2b7064a348
codacy fixes
2019-07-12 14:34:43 +05:30
Rucha Mahabal
9e35bff55c
feat: Email Campaign
2019-07-12 13:56:36 +05:30
Rucha Mahabal
8c747ce5cf
merged
2019-07-09 15:18:45 +05:30
Rucha Mahabal
36963a8e04
feat: Email Campaign
2019-07-09 15:14:13 +05:30
Suraj Shetty
247d50e552
refactor: Remove unwanted debug flag
2019-07-03 10:47:35 +05:30
Nabin Hait
34c551d9a5
fix: Missing commits from hotfix branch ( #17997 )
...
* fix: merge conflict
* fix: restored missing set_gst_state_and_state_number function
* fix: style linting as per codacy
* fix: Fixes related to customer/lead merging
* fix: merge conflict
* fix: Fixes related to customer/lead merging
* fix: Assign isue/opportunity to user
* fix: Assign isue/opportunity to user
* fix: Replaced Invoice type by GST Category
* fix: merge conflict
* fix: merge conflict
* fix: test cases
* fix: test cases
2019-07-03 10:34:31 +05:30
Aditya Hase
8d70073cf8
refactor: Remove implicit auto assignment feature ( #18124 )
...
This behaviour now can be replicated with Assignment Rule configurations.
2019-07-01 19:35:17 +05:30
Suraj Shetty
502565ff56
fix: Make required changes
2019-07-01 14:28:59 +05:30
Rucha Mahabal
162f7d1b50
auto email and new communication linked to email campaign setup
2019-07-01 01:09:58 +05:30
Rucha Mahabal
dcf5fbd35d
added some validations
2019-06-30 16:36:09 +05:30
Rucha Mahabal
fc03509e46
created data structure for email automation
2019-06-30 16:24:29 +05:30
Suraj Shetty
19e4fde737
Merge branch 'develop' of github.com:frappe/erpnext into call-summary-dialog
2019-06-30 15:30:59 +05:30
Faris Ansari
23f9b6156f
fix(Opportunity): Don't assign to Guest ( #17996 )
...
If Opportunity is created from Website, it breaks because
the assign_to user is Guest
2019-06-20 11:34:14 +05:30
Suraj Shetty
9ba9a91631
fix: Strip leading zero from phone number
2019-06-18 10:56:47 +05:30
Suraj Shetty
04d623ab66
fix: Get employee login ids directly from child table
2019-06-17 15:20:28 +05:30
Suraj Shetty
2f84779667
fix: Last Communication for lead
...
- Remove unused code
- Remove unused import
2019-06-12 10:31:07 +05:30
Suraj Shetty
6013375fbb
fix: Improve call popup UX
...
- Close modal after 10 secs if user is has not entered any call summary
- Show alert once the summary was saved
2019-06-11 08:03:55 +05:30
Suraj Shetty
77302b3928
fix: Save summary to right field
2019-06-11 08:01:18 +05:30
Suraj Shetty
13770ccf7a
fix: Codacy
2019-06-10 09:52:53 +05:30
Suraj Shetty
c8c17422f7
fix: Change call log fieldname and some cleanups
2019-06-07 10:22:50 +05:30
Suraj Shetty
97780613ad
fix: Improve call popup UI
2019-06-06 14:48:37 +05:30
Suraj Shetty
87645e98ad
fix: Get available employees from communication medium
2019-06-06 11:24:31 +05:30
Suraj Shetty
44c0e9d549
fix: Create call log instead of communication
2019-06-06 11:18:16 +05:30
Suraj Shetty
e9bfecf405
fix: Add code to update call summary
2019-06-03 12:27:02 +05:30
Suraj Shetty
893a0c24bb
fix: Add call summary
2019-05-31 13:42:22 +05:30
Suraj Shetty
824d0ecc48
Merge branch 'develop' of github.com:frappe/erpnext into call-summary-dialog
2019-05-26 07:30:51 +05:30
Rushabh Mehta
2d7993592f
Merge pull request #17703 from rmehta/yeah-form-js
...
refactor: deprecate old API as per https://github.com/frappe/frappe/pull/7537
2019-05-24 11:36:16 +05:30
Suraj Shetty
591ad37894
fix: call popup [wip]
2019-05-24 10:11:48 +05:30
Rushabh Mehta
04e89ce808
refactor: deprecate old API
2019-05-22 16:52:36 +05:30
Suraj Shetty
07fe299628
fix: Make changes to fix call flow and popup trigger
2019-05-22 15:48:57 +05:30
Suraj Shetty
ee7d6e4598
Merge branch 'develop' of github.com:frappe/erpnext into call-summary-dialog
2019-05-22 14:55:48 +05:30
Nabin Hait
7327f8a901
fix: Person / Org name is not mandatory while creation of lead from email ( #17676 )
2019-05-21 15:05:26 +05:30
Suraj Shetty
863b93c32d
refator: Rename files and move code
2019-05-21 07:57:06 +05:30
Suraj Shetty
8a178d6f30
fix: Update call summary dialog
2019-05-18 16:11:29 +05:30
Suraj Shetty
dd6b70c7cd
feat: Show contact on incoming call
2019-05-16 23:55:35 +05:30
Nabin Hait
3fccfaa7ce
feat: Added 'Add Multiple' options in all sales / purchase transactions
2019-05-16 14:54:05 +05:30
Suraj Shetty
03c3bd5f4a
feat: Open modal in realtime for incoming call
2019-05-16 13:39:50 +05:30
Suraj Shetty
d382f1d470
Merge branch 'develop' of github.com:frappe/erpnext into call-summary-dialog
2019-05-16 09:47:17 +05:30
Rohan Bansal
9778ff8ab3
feat(crm): Allow leads to be imported without person name
2019-05-10 16:09:48 +05:30
Suraj Shetty
8b0588deaf
feat: Init call summary popup
2019-05-02 14:59:44 +05:30
Rohit Waghchaure
270d4e9f4e
fix: moved erpnext related methods from frappe to erpnext
2019-04-22 14:11:43 +05:30
Rushabh Mehta
6aaac1e9db
fix(assign): do not assign if administrator
2019-04-15 16:58:45 +05:30
Rushabh Mehta
4f49ce4124
feat: auto assign lead/opportunity to lead owner, customer account manager
2019-04-12 09:04:17 +05:30
Mangesh-Khairnar
b343407236
refactor: change validate email add to validate email address
2019-03-16 13:40:58 +05:30
Sagar Vora
f97c5dad82
Merge branch 'staging' into develop
2019-01-29 18:39:14 +05:30
Nabin Hait
e8190473f5
Merge branch 'staging-fixes' into unicode
2019-01-29 11:13:04 +05:30
Frappe Bot
e415cce1a9
Merge branch 'staging' into develop
2019-01-23 08:19:00 +00:00
Aditya Hase
4b4265f8a7
fix(dead-code): Remove .py files ( #16457 )
2019-01-22 20:54:21 +05:30
Aditya Hase
f3c22f342c
fix(unicode): Import unicode_literals in every file
2019-01-22 18:36:10 +05:30
deepeshgarg007
8c4bd951a8
fix(Codacy): Deleted unused imports and files
2019-01-02 13:24:12 +05:30
deepeshgarg007
de1e6fc1c4
Merge branch 'develop' of https://github.com/frappe/erpnext into opportunity-lost-reason
2019-01-01 08:57:18 +05:30
deepeshgarg007
c5a0b2edb6
Lost opportunity report
2018-12-31 16:34:16 +05:30
deepeshgarg007
5e9c7e2203
fix:Test cases for opportinity
2018-12-31 16:24:46 +05:30
deepeshgarg007
dc218ebeeb
test :test case for setting opportunity as lost
2018-12-29 22:11:19 +05:30
deepeshgarg007
d9a768a88f
feat: Set lost reasons in opportunity and quotation using table multiselect
2018-12-29 19:33:44 +05:30
Suraj Shetty
b2965001d1
Replace 'Make' with 'Create'
2018-12-23 13:25:58 +05:30
Raffael Meyer
25e9db5e81
Do not display gender for companies ( #15728 )
2018-10-18 16:49:49 +05:30
Charles-Henri Decultot
75fa6b3ee8
[Enhancement] Improvement to the sales pipeline ( #15524 )
...
* Additions to sales pipeline
* Codacy corrections
* Codacy corrections
* Codacy corrections
* Replace _ with dummy for unused variable
* Performance + dates corrections
* Itertuples modification
* Removing trailing whitespaces
* Sales stage doctype
* Divide sales stages fixtures in separate functions
* Remove duplicate fixtures
* Add newline after method
* Missing requirement
2018-10-03 10:41:40 +05:30
Charles-Henri Decultot
efd776da46
Events in timeline ( #15485 )
...
* Events in timeline
* Namespace correction
* Codacy correction
* Addition of sales partners in participants
* Correct json indent
2018-10-03 10:41:26 +05:30
Charles-Henri Decultot
b2281cc1fd
Lead to customer UX enhancement ( #15525 )
...
* Lead to customer UX enhancement
* Market segment
* Market Segment to DocType
* Specific function for fixtures
* Merge issue correction
* Doctype merge correction
2018-10-02 11:25:00 +05:30
Charles-Henri Decultot
4fd7a4e0d7
Lead notes ( #15510 )
...
* Notes field in Lead
* Add notes to lead details report
2018-09-30 21:20:55 +05:30
Shreya Shah
13761dde38
[Report] Lead Conversion Time ( #15237 )
...
* New Report Lead Conversion Time
* Add column for support tickets and a row for Average
2018-09-18 10:55:35 +05:30
Rushabh Mehta
13bcc4e27e
perms: fix default import, export perms
2018-08-29 17:10:27 +05:30
Shreya Shah
a5add289bb
Refactor Naming Series ( #15070 )
...
* Patch to create Property Setter for existing naming series
* Update existing naming series options with new
* Add patch link to patches.txt
* Update patch
* Fix codacy
* Fix as per suggestions
* Remove old patch for property setter
* Improve as per suggested
- Modified the naming
- Also refactored naming for doctypes having autoname with series
- Added a patch to make property setter for autoname
* Fix Travis
* Rebase with develop
2018-08-28 13:44:48 +05:30
Rushabh Mehta
708e47aadf
optimize(various)
2018-08-08 16:37:31 +05:30
Rushabh Mehta
096b943b0c
[minor] fixes to moment.defaultDateFormat and daily work summary eplies
2018-06-25 22:38:20 +05:30
Shreya
cdd3982b44
[minor] Fix
2018-06-14 16:43:47 +05:30
Shreya
f333536446
Remove test_records.json and modify test
2018-06-14 16:43:07 +05:30
Rohan Bansal
841d54c49d
Start adding tests for contracts
2018-06-04 15:56:38 +05:30
Rohan Bansal
bf0f0aaf6f
Add Contract-related doctypes to ERPNext
2018-06-04 15:56:38 +05:30
Nabin Hait
33df0b4fbf
Test case fixes ( #14219 )
...
* Test case fixes
* fetch_from fixes
2018-05-26 09:09:02 +05:30
Rushabh Mehta
0b628386de
[minor] remove in_dialog old property
2018-05-16 12:51:22 +05:30
Shreya
3f77852e93
Pass buying or selling as filter parameters
...
Wherever get_exchange_rate is called, pass filter buying or selling on the basis of doctype.
2018-05-15 17:22:06 +05:30
Nabin Hait
642d39098a
Fixed merge conflict
2018-04-13 14:38:57 +05:30
rohitwaghchaure
098b444f6f
[minor] Toggle required opportunity item table based on with items field ( #13584 )
2018-04-12 13:26:50 +05:30
Zarrar
0702f29860
Add Ends-On field in the Lead doctype ( #13147 )
...
* add ends_on date in lead to be mapped with calendar event
* set default ends_on to 1 hour from contact_time
2018-03-12 18:49:54 +05:30
Prateeksha Singh
9362cf37e0
[charts] update charts API
2018-03-12 09:54:56 +05:30
Achilles Rasquinha
646522886c
self.assertEqual
2018-02-28 21:13:51 +05:30
Nabin Hait
e6d65bc2a1
Fixed translations and tests ( #12900 )
...
* Fixed translations and tests
* minor fixes
* minor test fixes
2018-02-14 17:44:06 +05:30
Rushabh Mehta
b5a3df920c
[fix] primary button color for make
2018-01-23 16:08:52 +05:30
Nabin Hait
a2426fcc9e
Get default tax template only if tax template not selected or template is for other company ( #12492 )
2018-01-15 17:45:46 +05:30
Nabin Hait
941d0af13a
Fixed organization lead error
2018-01-03 14:12:56 +05:30
Nabin Hait
123759aff7
Fixes for travis ( #12161 )
...
* Fixes for travis
* Testcase fixes for get_item_details
* Testcase fixes for get_item_details
* Travis fixes
* Travis fixes
2017-12-26 17:50:34 +05:30
rohitwaghchaure
505661b5c0
[fix] Wrong company's default tax fetch ( #11927 )
2017-12-11 14:52:28 +05:30
Zarrar
17fd6610dc
Fix travis ( #11882 )
...
* fieldname wrong
* bifurcated test into two - error when both were running async
* minor fixes with link and route
* move school domain rename up
* fix async creation of operations test
* edit-in-full-page is button, not link
* set_route issue in production order test
* minor changes
* fix task tree test
* more fixes
* fix server side issue
* improvising ui tests
2017-12-08 14:57:38 +05:30
Saurabh
b750b304dd
fixed merge-conflicts
2017-11-28 11:02:28 +05:30
Charles-Henri Decultot
22641e44ad
Allowing the creation of an Oganization as Lead ( #11724 )
...
* Allow the creation of an organization lead
* Changes following test fails
* Test case correction
2017-11-27 11:58:22 +05:30
Zarrar
a90274fed9
linking issue in dashboard ( #11701 )
2017-11-23 12:19:40 +05:30
Rushabh Mehta
a5ebebd09c
[enhance] Add Issue Type and Opportunity Type masters ( #11598 )
...
* [enhance] added & linked Issue Type & Opportunity Type with opportunity
* [patch] create issue and opportunity type from the custom field if available
* [minor] issue_type and opportunity type should be mandatory
* [patches] removed try catch from the patch
* [fix] patch
* [refactor] cleanup issue/opportunity type
2017-11-16 17:03:52 +05:30
Rushabh Mehta
d5c6416d91
[new feature] Product Configurator (via Item Quick Entry) ( #11535 )
...
* [Feature] Item Variant Creation from Quick Entry
* [minor] formatted js
* [minor] set 3 attribute per page instead of 5 in template
* [fix] fixed codecy issue
* [fix] label translation
* [minor] changed trigger event of item template
* [fix] moved item ui tests under stock
* [UI test] added test for item attribute
* [UI test] added test for creation of item variant from quick entry
* [fix] item variant ui test fixes
* [wip]
* [cleanup] item quick entry
* [remove] tests, fixtures were missing
* [refactor] use set_only_once in item
2017-11-14 15:27:28 +05:30
Rushabh Mehta
98aa581864
[fix] default tax only on insert ( #11544 )
...
* [fix] default tax only on insert
* [fix] default tax only on insert
* [fix] default tax only on insert
2017-11-14 09:32:32 +05:30
Prateeksha Singh
bfb108d722
Replace c3 ( #11112 )
...
* [charts] replace in asset.js
* replace in reports
2017-10-17 12:03:02 +05:30
Makarand Bauskar
cb38e599e5
[minor] don't create lead if customer contact is already created against contact_email ( #10976 )
...
* [minor] don't create lead if customer contact is already created against contact_email
* [tests] added tests cases for opportunity to check if lead is required or not
2017-10-02 11:40:43 +05:30
Nabin Hait
6d78f7b862
Fixed indentation
2017-09-21 15:51:42 +05:30