Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Use ERP Next Doctypes instead of redundant Frappe CRM ones #10

Open
wants to merge 72 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
2b9bcb1
feat: use Industry Type instead of CRM Industry
Aryan20 Oct 31, 2024
6962a04
Merge pull request #1 from rtCamp/feat/use-industry-type
Aryan20 Oct 31, 2024
b564678
feat: use ERP Next Holiday and Holiday List
Aryan20 Oct 31, 2024
e330666
Merge pull request #2 from rtCamp/feat/port-holiday
Aryan20 Oct 31, 2024
2b93485
feat: use ERP Next territory
Aryan20 Oct 31, 2024
464313a
Merge pull request #3 from rtCamp/feat/use-territory
Aryan20 Oct 31, 2024
b613ff0
feat: use ERP Next lead source instead of CRM lead source
Aryan20 Oct 31, 2024
931602b
Merge pull request #4 from rtCamp/feat/use-lead-source
Aryan20 Oct 31, 2024
4041360
feat: use ERP Next service day instead of CRM service day
Aryan20 Oct 31, 2024
50d15a4
Merge pull request #5 from rtCamp/feat/use-service-day
Aryan20 Oct 31, 2024
e4c4379
feat: use customer instead of organization
Aryan20 Oct 31, 2024
2bcdf93
Merge pull request #6 from rtCamp/feat/use-customer
Aryan20 Nov 4, 2024
36dcd50
feat: use ERP Next lead instead of CRM Lead
Aryan20 Nov 7, 2024
da1ff91
Merge pull request #7 from rtCamp/feat/use-lead
Aryan20 Nov 7, 2024
142a386
feat: use ERP Next opportunity instead of CRM Deals
Aryan20 Nov 11, 2024
4bb3e35
Merge pull request #8 from rtCamp/feat/use-opportunity
Aryan20 Nov 11, 2024
f6e3351
fix: use fixtures for customer doc custom fields
Aryan20 Nov 11, 2024
98738ce
Merge pull request #9 from rtCamp/fix/customer-use-fixture
Aryan20 Nov 11, 2024
983bd86
fix: use Opportunity amount instead of annual revenue
Aryan20 Nov 12, 2024
06994a5
Merge pull request #11 from rtCamp/fix/use-opp-amount
Aryan20 Nov 12, 2024
4991072
fix: add log to lead and use customer_name
Aryan20 Nov 12, 2024
d049067
Merge pull request #12 from rtCamp/fix/lead-quick-entry
Aryan20 Nov 12, 2024
05edc26
chore: rename app to Next CRM (#13)
Aryan20 Nov 13, 2024
db66375
fix: resolve CSRF token errors in console
Aryan20 Nov 14, 2024
0ed70d9
Merge pull request #14 from rtCamp/fix/csrf-error
Aryan20 Nov 14, 2024
132e547
fix: fix page address in package.json
Aryan20 Nov 14, 2024
c2b52a3
Merge pull request #15 from rtCamp/fix/csrf-2
Aryan20 Nov 14, 2024
6afb2db
fix: customer override for listview
Aryan20 Nov 14, 2024
daa4cb2
Merge pull request #16 from rtCamp/fix/customer-list
Aryan20 Nov 14, 2024
eb5bf95
fix: typo in mobileopportunity page
Aryan20 Nov 14, 2024
544632c
Merge pull request #17 from rtCamp/fix/opp-typo
Aryan20 Nov 14, 2024
22d2cef
feat: remove CRM Invitation feature
Aryan20 Nov 15, 2024
ef1de63
Merge pull request #18 from rtCamp/feat/remove-invitation
Aryan20 Nov 15, 2024
c7b72e8
feat: use ERP Next Service Level Priority
Aryan20 Nov 15, 2024
3628f5c
Merge pull request #19 from rtCamp/feat/use-slp
Aryan20 Nov 15, 2024
d9ca66c
feat: Use ERP Next ToDo instead of Tasks
Aryan20 Nov 18, 2024
0154eff
Merge pull request #20 from rtCamp/feat/use-todo
Aryan20 Nov 18, 2024
8ab29bf
chore: disable ERP Next integration setting page
Aryan20 Nov 18, 2024
38b7a83
Merge pull request #21 from rtCamp/chore/disable-erpnext-settings
Aryan20 Nov 18, 2024
7c24b9a
fix: lead statuses button link to CRM Lead Status
Aryan20 Nov 18, 2024
3daded3
fix: add status change log to opportunity
Aryan20 Nov 18, 2024
e34ba6f
Merge pull request #22 from rtCamp/fix/dashboard-lead-status
Aryan20 Nov 18, 2024
dffd1bd
Merge pull request #23 from rtCamp/fix/opp-logs
Aryan20 Nov 18, 2024
a5d7281
chore: remove settings for remote ERP Next instance
Aryan20 Nov 18, 2024
1a8c7e3
Merge pull request #24 from rtCamp/chore/remove-remote-erpnext
Aryan20 Nov 18, 2024
e005dab
feat: add API to link to ERP Next instance
Aryan20 Nov 18, 2024
bf1e0f7
Merge pull request #25 from rtCamp/feat/add_erpnext_api
Aryan20 Nov 18, 2024
11e186b
fix: enable ERP Next integration by default
Aryan20 Nov 20, 2024
cc66b8e
fix: rename FCRM instances to NCRM
Aryan20 Nov 20, 2024
2bf30f0
Revert "chore: disable ERP Next integration setting page"
Aryan20 Nov 20, 2024
b6e7622
Merge pull request #26 from rtCamp/revert-21-chore/disable-erpnext-se…
Aryan20 Nov 20, 2024
f59e254
Merge pull request #27 from rtCamp/fix/small-fixes
Aryan20 Nov 20, 2024
598cb71
fix: rename crm to next_crm in js files
Aryan20 Nov 21, 2024
c4bb492
Merge pull request #28 from rtCamp/fix/crm-to-next-crm
Aryan20 Nov 21, 2024
63c2782
fix: add logic for title field and use date
Aryan20 Nov 21, 2024
ef83388
Merge pull request #29 from rtCamp/fix/todo-title-date
Aryan20 Nov 21, 2024
2ef7141
fix: rename deal to opportunity in statusOptions
Aryan20 Nov 21, 2024
3af0367
Merge pull request #30 from rtCamp/fix/opp-status
Aryan20 Nov 21, 2024
fc052fb
fix: add exception handling to customer and contact delete
Aryan20 Nov 21, 2024
14a1059
Merge pull request #31 from rtCamp/fix/exception-handling-linked
Aryan20 Nov 21, 2024
60e716f
fix: add_todo_custom_title_field in install hooks
Aryan20 Nov 21, 2024
58fd9e7
Merge pull request #32 from rtCamp/fix/install-hook
Aryan20 Nov 21, 2024
4eb3ee7
fix: CRM should not send company name in quotation
Aryan20 Nov 22, 2024
01d58f2
Merge pull request #33 from rtCamp/fix/erpnext-company
Aryan20 Nov 22, 2024
323cc9b
fix: todo title install hook should have doctype filter
Aryan20 Nov 22, 2024
65554da
Merge pull request #34 from rtCamp/fix/todo-title-install-hook
Aryan20 Nov 22, 2024
0e3f1b0
fix: rename customerByName to customersByName in store
Aryan20 Nov 22, 2024
c0c91c9
Merge pull request #35 from rtCamp/fix/contact-store-typo
Aryan20 Nov 22, 2024
a769166
fix: reintroduce contact creation on opportunity entry
Aryan20 Nov 22, 2024
9dac781
Merge pull request #36 from rtCamp/fix/re-opp-contact
Aryan20 Nov 22, 2024
bfc222d
chore: change app icon for Next CRM
Aryan20 Nov 22, 2024
a80d7fa
Merge pull request #37 from rtCamp/chore/change-app-icon
Aryan20 Nov 22, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ __pycache__
dev-dist
tags
node_modules
crm/public/frontend
next_crm/public/frontend
frontend/yarn.lock
crm/www/crm.html
build
next_crm/www/next-crm/index.html
build
4 changes: 2 additions & 2 deletions .releaserc
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
"@semantic-release/release-notes-generator",
[
"@semantic-release/exec", {
"prepareCmd": 'sed -ir "s/[0-9]*\.[0-9]*\.[0-9]*/${nextRelease.version}/" crm/__init__.py'
"prepareCmd": 'sed -ir "s/[0-9]*\.[0-9]*\.[0-9]*/${nextRelease.version}/" next_crm/__init__.py'
}
],
[
"@semantic-release/git", {
"assets": ["crm/__init__.py"],
"assets": ["next_crm/__init__.py"],
"message": "chore(release): Bumped to Version ${nextRelease.version}"
}
],
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ Get started with your personal or business site with a few clicks on [Frappe Clo

### Docker (Recommended)

The quickest way to set up Frappe CRM and take it for a test ride.
The quickest way to set up Next CRM and take it for a test ride.

Frappe framework is multi-tenant and supports multiple apps by default. This docker compose is just a standalone version with Frappe CRM pre-installed. Just put it behind your desired reverse-proxy if needed, and you're good to go.
Frappe framework is multi-tenant and supports multiple apps by default. This docker compose is just a standalone version with Next CRM pre-installed. Just put it behind your desired reverse-proxy if needed, and you're good to go.

If you wish to use multiple Frappe apps or need multi-tenancy. Take a look at our production ready self-hosted workflow, or join us on Frappe Cloud to get first party support and hassle-free hosting.

Expand All @@ -68,7 +68,7 @@ Docker Compose File:

wget -O docker-compose.yml https://raw.githubusercontent.com/frappe/crm/develop/docker/docker-compose.yml

Frappe CRM bench setup script
Next CRM bench setup script

wget -O init.sh https://raw.githubusercontent.com/frappe/crm/develop/docker/init.sh

Expand Down Expand Up @@ -99,7 +99,7 @@ If you prefer self-hosting, follow the official [Frappe Bench Installation](http
### Local Setup

1. [Install Bench](https://github.com/frappe/bench).
2. Install Frappe CRM app:
2. Install Next CRM app:
```sh
$ bench get-app crm
```
Expand Down
66 changes: 0 additions & 66 deletions crm/fcrm/doctype/crm_deal/api.py

This file was deleted.

Loading