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
Nabin Hait
5478a7fa67
Merge branch 'develop' of https://github.com/AravindPranera/erpnext-1 into AravindPranera-develop
2017-09-21 15:48:18 +05:30
AravindPranera
cb6774e373
Files added with all functions
2017-09-18 17:37:37 +05:30
AravindPranera
27bbb561d2
removed whitespace
2017-09-15 11:04:14 +05:30
AravindPranera
2c1f44ecfa
Trailing space removed in line 275
2017-09-15 10:57:23 +05:30
AravindPranera
c73383c34c
Trailing whitespace in Line 207 and 276
2017-09-15 10:34:21 +05:30
Nabin Hait
092f6d3739
Fixes ui tests
2017-09-14 16:45:47 +05:30
Rushabh Mehta
f056974bc5
[domain] Healthcare ( #10664 )
...
* Medical module for erpnext
* Changes in core for Medical module
* patient registration updated
* fix - appointment invioce - fields missing
* pages- indicator instead of bg-color
* Lab Test field renamed service type
* Department added Lab Test
* procedure name in prescription
* fixes sample collection
* filter disabled patient
* fix patient admission
* updated patient age
* availability check msg updated
* fixes, removed procedure from invoice
* sample print renamed
* fixes, validation
* service desk physician in filter
* refactor scheduler
* Appointment -field property - set only once = 1
* Appointment - Mark closed and pending buttons removed
* Appointment - readonly = 1 if value set
* Appointment - availabilty
* Appointment - Cancel - info - cancel invoice
* Appointment - set pending appointments
* Dosage form - new DT
* Drug Prescription - Dosage form added
* Facility - Floor - removed from Fecility
* Floor - removed
* Lab Test Template - item creation validation
* Procedure - Create Procedure
* Procedure Appointment - new DT
* Service Unit - Floor reference removed
* Zone Fcilities - Unused DT removed
* Appointment Desk - fixed
* Service Desk - method pointing from procedure changed to procedure_appointment
* Consultation print - got featured
* Consultation - removed patient refernce to procedure prescription
* Procedure Prescription - removed patient refernce
* Lab Test - Changed field properties and value
* Lab Test - field property changed
* Lab Test - methods rewrite - lab test doc creation
* Lab Test - create lab test from invoice and consultaion - got changed
* Button History changed to Medical Record
* Service Desk - Updated
* Notification - Procedure Appointment
* fix-get procedure prescription
* fix field added to test prescription
* msgprint on invoice creation
* fix data on install
* Merge branch erpnext/develop
* fixes- minor
* Setup wizard - Create Sensitivity
* Appointment - Validate and Save if there is no schedule for Physician
* Consultation - Button create vital signs and medical record
* Review Type - New DocType
* Review Detail and Treatment Plan - Childs - Consultation
* Patient Medical Record - field Attach doc
* Consultation - New Fields
* Consultation - Manage new Fields - Medical record add action
* Patient Relation - Child DocType - Patient
* Patient - Patient Relation added
* Patient - collapsible = 1
* Laboratory Settings - fields - message for lab test
* Laboratory Settings - get message for lab test
* SMS text for lab test and invoice test report
* Procedure Stock Detail - Stock detail for Procedure and Template
* Template Stage Detail - Stage detail for Procedure Template
* Procedure Stage Detail - Stage detail for Procedure
* Service Unit - field - warehouse
* Scheduler - msg - content changed
* Laboratory Settings - defualt - msg content
* Invoice Test Report - msg print
* Print Format-Changed-Consultation-Invoice Test Report-Lab Test
* OP Settings - Expnse Account for Stock Entry in Procedure
* Procedure and Procedure Template - Manage Stock Stage and Sample Collection
* Procedure Appointment - Manage Stock and Stage
* Lab Test - fixed - resource not find
* Invoice Test Report - fixed - resource not find
* Procedure - doc reload after insert
* Patient Medical Record - fixed - refernce missed
* Create Vital Signs -on client side
* Rename module Medical to Healthcare
* Remove In Patient (IP) Feature.
* Rename - Procedure to Clinical Procedure
* Remove spaces in Naming Series
* Rename Duration to Drug Prescription Duration
* Duration to Drug Prescription Duration
* Merge All Settings to Healthcare Settings
* Healthcare settings - import fixed
* Procedure related documents are removed
* Appointment Desk and Sevrvice Desk are removed
* Consultation - minimal
* Consultation - minimal
* Consultation - minimal - patient detials in collapsible section
* Message Print to Alerts
* Patient - some fields removed
* Patient - create consultation - message print to alerts
* Consultation - show patient details updated
* Setup wizard - Duration to Drug Prescritpion Duration
* Healthcare Settings - patient registration - fee collection
* Lab Test - Create Sales Invoice bug fixed
* Healthcare menu rearranged
* Healthcare Settings - Optimised and Rearragnged
* Healthcare Settings - Expense account removed
* Receivable account removed from patient
* Patient - Optimised and Rearragnged
* Removed Referring Physician
* Healthcare Settings - bold headings removed
* Physician - Patient - Fields are Segregated
* Remove Service Unit
* Remove - Service Type
* Consultation invoice
* Lab Test - invoice
* Patient - Invoice
* Rename Appointment to Patient Appointment
* wip
* Patient Dashboard, Physician Form cleanup
* Dosage renamed to Prescription Dosage
* Renamed Drug Prescription Duration to Prescription Duration
* Patient Appointment booking modal
* Patient Age - calculate by dob
* Remove - scheduler
* Consultation - Appointment to Patient Appointment
* Patient Dashboard - rearranged
* Patient Appointment
* Removed rer_physician from lab test and consultation
* Patient Appontment Changes
* Appointment and Consultation - optimized
* Patient Appointment - fee validity code optimized
* Consultation and Patient Appointment - Invoice validate two side
* fix : #13 remove relation to admission
* Healthcare - Patient Portal
* fix import error
* domain Healthcare added on install
* Removed - Invoice Test Report
* Physician Schedule - menu
* Consultation - patient details - re write
* New Doctype-Medical Code
* Consultation - Daignosis codification
* Medical Code - Codification - Settings
* Medical Code Standard - Medical Code - Codification - Settings
* fix appointment calendar
* fix appointment analytics
* Menu Medical Code Standard
* New Doctype - Medical Code Standard
* Set Physician Role insted of IP Physician and OP Physician Role
* fixed some json files
* Medical code - permission to physician
* Unused Childs - Work Schedule and User List - Removed
* Label Procedure to Lab Test
* Lab Test and Patient - code optimised
* Add Item Groups - setup wizard
* Healthcare Settings - add Role - Medical Administrator
* Healthcare - Demo setup - Make Demo
* Fee Validity - Logic Test
* Test Fee Validity - Optimised
* Healthcare Doctypes - Restricted to Domain Healthcare
* Domainify - remove Healthcare Roles - Other Domains
* Healthcare doctypes - beta checked
* Codacy fixes
* Codacy - fixes
* Codacy - fixes
* Codacy - fixes
* Codacy - fixes
* Codacy - fixes
* Lab Test - print hide =1 for some fields
* Consultation - Codification field label to Medical Coding
* Codacy fixes - import frappe and etc.
* Codacy fixes - import frappe in test_vital_signs
* Codacy fixes
* Codacy fixes
* Codacy fixes and remove delete perm for patient
* send_sms - import form frappe
* Healthcare Settings
* Lab Prescription - Consultation - Test Code - read_only = 0
* Portal fixes
* Patient Appointment - filter physician - if has schedule
* Physician - IP Charge - Removed
* test - files
* Web Form - Patient Profile - removed
* Role Medical Administrator to Healthcare Administrator
* WIP healthcare documentation
* Coday - fixes
* Travis - fixes
* Lab Test Report - menu
* Reorder Healthcare settings - group lab config to bottom
* Sample Collection - New - allow Sample and patient Selection
* Rate - similar behaviour and Label as in Item Standard Selling Rate
* Healthcare documentation
* Lab Test Samples to Lab Test sample
* Commplaints to Complaint
* Commplaints to Complaint
* Antibiotics to Antibiotic
* Appointment Token Number - remove
* View - Medical record
* Codacy fixes
* update healthcare docs
* Cleanup Docs - Search, quick entry, trsck change, etc.
* [minor] ux changes
2017-09-13 12:52:30 +05:30
AravindPranera
6544a85f1e
Opportunity Items fetching into Request for quotation
2017-08-24 18:32:40 +05:30
Rushabh Mehta
72fa958f2c
[layout] lead and opportunity ( #10487 )
2017-08-23 18:47:57 +05:30
mbauskar
f03afe0878
Merge branch 'master' into staging
2017-08-14 09:31:01 +05:30
rohitwaghchaure
35438b6fc0
[Fix] Opportunity status has not changed after making of quotation against it if items has not added in the opportunity ( #10351 )
2017-08-10 11:15:50 +05:30
Rushabh Mehta
09d1eaa87b
[minor] standard filters
2017-08-08 12:00:04 +05:30
Ameya Shenoy
4331067e57
[ui-test] completed tests for manufacturing ( #10218 )
...
* modified test_item to include child table assertions
* minor travis fixes
* removed css selectors and used cur_frm
2017-08-04 10:50:32 +05:30
Vishal Dhayagude
95dfe27bf7
[UI Test] Sales Order with multi currency and tax ( #10189 )
...
* [UI Test] Sales Order with multi currency and tax
* [fix]Codacy fixed
* [fix] tests.txt
2017-07-31 17:29:25 +05:30
Ameya Shenoy
4e91f28ce5
[ui-testing] added test for production order ( #10138 )
...
* temporary commit for switching branches
* [ui-tests] added bill_of_materials test
* added warehouses required for production order
* [ui-test] added production order test
* debugging travis failure
2017-07-31 11:02:28 +05:30
Vishal Dhayagude
569011fb21
[UI Test] Test for Product Bundle added ( #10158 )
2017-07-28 19:36:50 +05:30
Ameya Shenoy
91b2833708
[ui-tests] added workstation and operation ( #10044 )
...
* [ui-test] workstation and operation testing added
* [ui-tests] removed unnecessary assertions and used logical names for operations and workstations
2017-07-24 14:34:30 +05:30
Ameya Shenoy
73f969fd7f
[ui-test] manufacturing item creation testing ( #10009 )
2017-07-21 14:22:08 +05:30
Rushabh Mehta
9d27cf3c62
[tests] refactored ( #9984 )
...
* [tests] refactored
* [fix] test_quotation.js
* [fix] tests.text
* [fix] fiscal year not needed
* [test] add long test
* [fix] add timeout in lead
2017-07-20 15:35:03 +05:30
Makarand Bauskar
ef8d6dc8f8
[minor] ingore mandatory while auto closing issues and opportunity ( #9783 )
2017-07-12 14:52:32 +05:30
Rushabh Mehta
4a7b4efbec
[tests] update travis.yml to run ui-tests ( #9748 )
...
* [tests] update travis.yml to run ui-tests
* [tests] update travis.yml to run ui-tests
* [test] fix item_group.py
* [test] fix item_group.py
* [check] daily work summary fails?
* [check] daily work summary fails?
* [check] daily work summary fails?
* [check] daily work summary fails?
* [check] daily work summary fails?
* [check] daily work summary fails?
* [check] no scheduled jobs for tests
* [check] daily work summary fails?
* [check] daily work summary fails?
2017-07-10 23:00:01 +05:30
mbauskar
66e2a510b9
[minor] deleted deprecated reprots and changed the lead.json modified time
2017-06-22 16:57:46 +05:30
mbauskar
f9e2bf1ab4
fixed merge conflicts
2017-06-15 13:42:47 +05:30
Manas Solanki
95ca531def
make quotation against lead company name ( #9188 )
2017-06-14 16:13:23 +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
KanchanChauhan
1dc26b127b
Salutation and Gender in Lead and Customer ( #9199 )
2017-06-13 15:26:35 +05:30
Faris Ansari
5f27c94100
Merge pull request #9078 from netchampfaris/remove-globals
...
Lint and fix JS files
2017-06-06 11:35:42 +05:30
Nabin Hait
fa16b849a0
Merge branch 'master' into develop
2017-05-30 22:52:39 +05:30
mbauskar
26044f436a
[minor] fixed a unexpected token error for opportunity
2017-05-30 22:28:08 +05:30
Nabin Hait
c9fa07b16d
Merge branch 'master' into develop
2017-05-30 15:59:04 +05:30
Nabin Hait
6a5cf672c1
Fixed opportunity status ( #9062 )
2017-05-30 15:34:20 +05:30
Faris Ansari
ab74ca7fff
Lint and fix JS files
2017-05-30 12:54:42 +05:30
Nabin Hait
c9f5d84742
Merge branch 'master' into develop
2017-05-23 17:16:19 +05:30