Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46,520 Commits 3 Branches 0 Tags 1 GiB
c5e4e01747
Commit Graph

890 Commits

Author SHA1 Message Date
phot0n
8004550444 fix: add payments as a required app for erpnext 2022-07-25 10:46:46 +05:30
Rucha Mahabal
108cce2785 refactor: rewrite raw sql queries with frappe.qb and database API 2022-07-07 19:00:19 +05:30
Rucha Mahabal
ef02e58859 Merge branch 'develop' into hr-separation 2022-07-07 13:46:54 +05:30
Sagar Vora
05351bee8b Merge remote-tracking branch 'upstream/develop' into remove-india 2022-07-03 18:07:44 +05:30
Rucha Mahabal
466bf99835 fix: Remove Expense Claim from Bank Reconciliation 
- add hooks `get_matching_queries` and `bank_reconciliation_doctypes` to extend the functionality in other apps
 2022-07-01 19:01:17 +05:30
Rucha Mahabal
211b46b7e6 fix: Loan Application test 2022-06-29 18:00:48 +05:30
Rucha Mahabal
ef63c61ebd
Merge branch 'develop' into hr-separation 2022-06-29 12:35:51 +05:30
Ankush Menat
5d73697c64
fix: offset some scheduled jobs to avoid locks (#31466) 
If your site has multiple background workers then there's possibility
that two jobs will execute in parallal, this creates problem when both
are on operating on same data.

This PR adds a separate section for hourly and daily jobs which have
frequency offset from default frequency to avoid such conflicts.
 2022-06-28 12:22:17 +05:30
Rucha Mahabal
6a65c8aff4 Merge branch 'develop' into hr-separation 2022-06-28 11:51:59 +05:30
Nabin Hait
925b9d985e fix: open lead and opportunities based on today's event 2022-06-27 22:13:09 +05:30
Sagar Vora
7f390fb755 Merge branch 'develop' into remove-india 2022-06-26 18:10:44 +05:30
Nabin Hait
f904ac599e fix: merge conflicts and sider issues 2022-06-25 11:40:23 +05:30
Sagar Vora
9b057d15b2 fix: move hooks to reduce diff 2022-06-24 15:04:28 +05:30
Sagar Vora
12b7e14fde chore: keep back code to be a part of other apps / to be ported later 2022-06-24 13:38:13 +05:30
Rucha Mahabal
1ff0e4519f chore: Extract Expense Claim, FnF, Gratuity, Employee Advance related code from accounting 
- Added hooks `advance_payment_doctypes`, `invoice_doctypes`, `period_closing_doctypes` for other apps to extend accounting functionality

- Removed `set_query` code from `journal_entry.js` and `payment_entry.js`

- removed `update_status_for_full_and_final_statement` trigger on JE submission/cancellation

- refactored `payment_entry.py`: split functions for validating reference doctypes for easy overriding, removed hrms references from `get_reference_details` and `get_payment_entry`

- removed dead code: functions `get_bill_no_and_update_amounts`, `get_total_amount_exchange_rate_base_on_currency`, `get_total_amount_exchange_rate_for_employee_advance`, `get_amounts_based_on_ref_doc`, `get_amounts_based_on_reference_doctype`
 2022-06-23 16:17:34 +05:30
Sagar Vora
e48a8cd1e8 fix: remove india hook 2022-06-19 23:20:28 +05:30
Sagar Vora
ec9861266e Merge remote-tracking branch 'upstream/develop' into remove-india 2022-06-19 22:57:22 +05:30
Rucha Mahabal
fbc1330ab0 chore: Remove HR/Payroll related setups and fixtures 
- Fixtures moved to HRMS app

- 'HR' field in Terms and Conditions removed, added via HRMS setup
 2022-06-17 16:34:13 +05:30
Rucha Mahabal
3fe2ef6790 chore: update import paths for HR 2022-06-15 12:43:45 +05:30
Rucha Mahabal
ab8df98cab chore: Remove regional code for India HR, moved to HRMS 2022-06-10 18:22:07 +05:30
Rucha Mahabal
85b18e23d7 fix: remove employee reminders, move to HRMS app 
- change `erpnext.hr.EmployeeController` to `erpnext.setup.EmployeeController`
 2022-06-10 16:26:07 +05:30
Rucha Mahabal
512c82f76d chore: Update imports/paths for doctypes moved to erpnext setup module 2022-06-10 15:06:54 +05:30
Marica
ff0a6b7cbd
Merge branch 'develop' into perf-bom-update-tool 2022-06-07 14:49:59 +05:30
marination
ab2d95a74d feat: Level-wise BOM cost updation 
- Process BOMs level wise and Pause after level is complete
- Cron job will resume Paused jobs, which will again process the new level and pause at the end
- This will go on until all BOMs are updated
- Added Progress section with fields to track updated BOMs in Log
- Cleanup: Add BOM Updation utils file to contain helper functions/sub-functions
- Cleanup: BOM Update Log file will only contain functions that are in direct context of the Log

Co-authored-by: Gavin D'souza <gavin18d@gmail.com>
 2022-05-25 11:21:01 +05:30
ruthra kumar
7b1cb6711d refactor: include Payment ledger in accounting dimensions list 2022-05-20 18:21:47 +05:30
Deepesh Garg
481752134f fix: Add validation for SEZ and Export invoices without payment of taxes 
(cherry picked from commit cb8453dac8c38aed201f84c51f27ae217cc1f465)
 2022-05-15 15:04:21 +00:00
Ankush Menat
95e41b0d48 chore: correct version in hooks 
[skip ci]
 2022-05-08 22:04:14 +05:30
Deepesh Garg
322f0db1e9 chore: Resolve conflicts 2022-05-03 18:28:50 +05:30
Deepesh Garg
2e3e666784 Merge branch 'develop' of https://github.com/frappe/erpnext into erpnext_setup_cleanup 2022-05-03 18:17:36 +05:30
Ankush Menat
bae8ab2fa9
Merge branch 'develop' into education_sepration 2022-05-02 11:47:37 +05:30
Deepesh Garg
cc867fd949 chore: Remove Fees Doctype 2022-04-28 15:51:32 +05:30
Deepesh Garg
848827cf5c chore: Remove references for Assessment Group 2022-04-28 15:11:22 +05:30
Deepesh Garg
60b693f84f chore: clean up hooks 2022-04-28 12:02:54 +05:30
Deepesh Garg
41e2959389 chore: remove files related to LMS 2022-04-28 10:41:30 +05:30
Deepesh Garg
429361ce87 chore: Remove domains from Setup 2022-04-27 13:32:51 +05:30
Deepesh Garg
82a0635c66 fix: Consistent accounting dimensions across Sales and Purchase docs 2022-04-26 14:01:13 +05:30
Deepesh Garg
0a67b0239e fix: Consistent customer and supplier forms 2022-04-16 19:43:59 +05:30
Ankush Menat
63d892454b Merge branch 'develop' into bom-update-tool 2022-03-28 20:28:21 +05:30
Ankush Menat
494bd9ef78 style: format code with black 2022-03-28 18:52:46 +05:30
marination
4283a13e5a feat: BOM Update Log 
- Created BOM Update Log that will handle queued job status and failures
- Moved validation and BG job to thus new doctype
- BOM Update Tool only works as an endpoint
 2022-03-16 19:47:25 +05:30
Sagar Vora
3d45f3a6a8 Merge remote-tracking branch 'upstream/develop' into remove-india 2022-03-03 10:20:50 +05:30
Sagar Vora
3936d8b70e refactor: remove India specific code 2022-02-20 11:48:04 +05:30
ChillarAnand
db1957ffe6 Merge branch 'develop' into remove-nonprofit 2022-02-17 13:00:58 +05:30
Sagar Sharma
19a6c21eec
refactor!: amazon mws integration (#29438) 
* remove: amazon mws integration

* add patch to remove doctype

* remove old patch
 2022-02-14 19:43:26 +05:30
Mohammed Yusuf Shaikh
a3e69cf75d
feat: Bulk Transaction Processing (#28580) 
* feat: Bulk Transaction Processing

* fix: add flags to ignore validations and exception handling correction

* fix: remove duplicate code, added logger functionality and improved notifications

* fix: linting and sider issues

* test: added tests

* fix: linter issues

* fix: failing test case

* fix: sider issues and test cases

* refactor: mapping function calls to create order/invoice

* fix: added more test cases to increase coverage

* fix: test cases

* fix: sider issue

* fix: rename doctype, improve formatting and minor refactor

* fix: update doctype name in hooks and sider issues

* fix: entry log test case

* fix: typos, translations and company name in tests

* fix: linter issues and translations

* fix: linter issue

* fix: split into separate function for marking failed transaction

* fix: typos, retry failed transaction logic and make log read only

* fix: hide retry button when no failed transactions and remove test cases not rrelevant

* fix: sider issues and indentation to tabs

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-02-08 01:00:37 +05:30
ChillarAnand
325dc92d37 Merge branch 'develop' into remove-nonprofit 2022-02-03 16:38:01 +05:30
marination
7bc087ed44 fix: Merge conflicts, Linter and Server Test 
- Resolve inconsistency due to conflict with https://github.com/frappe/erpnext/pull/27050
- Resolve Linter issues (imports and spaces)
- Include customer_reviews.js in bundle, move it to /public/js
 2022-02-01 10:51:50 +05:30
Ankush Menat
6cd7c47409 Merge branch 'develop' into e-commerce-refactor-develop 2022-01-31 17:14:36 +05:30
Saqib Ansari
c5782b0e71 revert: "refactor!: drop e-invoicing integration from erpnext (#26940)" 
This reverts commit c335962827.
 2022-01-27 20:09:56 +05:30
ChillarAnand
7086d3f3d7 Merge branch 'develop' into remove-nonprofit 2022-01-24 11:35:47 +05:30
Chillar Anand
2718ddd784
refactor: Removed hospitality domain from ERPNext (#29167) 2022-01-20 11:57:22 +05:30
Marica
b5abf68b0d
Merge branch 'develop' into e-commerce-refactor-develop 2022-01-12 02:52:03 +05:30
ChillarAnand
0c0a9ed96d refactor: Remove non-profit domain from ERPNext 2022-01-06 09:53:49 +05:30
Chillar Anand
0900c3d655
refactor: Removed agriculture module from ERPNext (#29022) 2022-01-04 17:26:11 +05:30
Development for People
076cb408db
fix: missed colon (#28979) 2021-12-21 15:48:31 +05:30
Saqib
7d0a3e4e8b
Merge pull request #28550 from nextchamp-saqib/fix-sla 
refactor(SLA): Application of SLA and its fields
 2021-12-13 10:29:56 +05:30
Dany Robert
c5c47e9fad feat: generate QR Code for POS transactions 2021-12-07 11:01:02 +00:00
Saqib Ansari
c1d8877a83 refactor: handle special cases on communication creation 2021-12-06 14:34:59 +05:30
Saqib
7091ca6812
Merge branch 'develop' into fix-sla 2021-12-03 11:53:25 +05:30
Deepesh Garg
0d9b0fe6dc
Merge pull request #28464 from mhbu50/develop 
fix:Change QR Code Triggerr event
 2021-11-29 18:46:56 +05:30
Deepesh Garg
4382040fb6
fix: Move trigger from on trash to on cancel 2021-11-29 18:25:47 +05:30
Saqib Ansari
a8c75b6862 refactor: application of SLA and its metrics 2021-11-26 20:16:21 +05:30
Deepesh Garg
73c56510d8 fix: Delete KSA vat setting on deleting company 2021-11-22 14:21:53 +05:30
Mohammed Redah
9d319c2205
fix:Change QR Code Triggerr event 
This fixes the bug if the user changes the date after insertion it will show the wrong values
 2021-11-19 15:13:23 +03:00
marination
9aeb211142 chore: Remove Home Page is Products and Sider fixes 
- Removed `Home Page is Products` checkbox in E Comm Settings. Can be manually set in Website Settings
- Removed hooks trigger to reset home page as products
- Sider: duplicate color attribute, shift `return` to next line, over-indentation
 2021-11-16 17:21:46 +05:30
marination
f9929ed8a6 Merge branch 'develop' of https://github.com/frappe/erpnext into e-commerce-refactor-develop 2021-11-16 16:06:07 +05:30
Ankush Menat
8fe5feb6a4 chore: remove all six compat code 2021-11-05 11:16:29 +05:30
Ankush Menat
6098e92ba9 chore: remove utf-8 compat code 2021-11-05 11:16:29 +05:30
marination
22f41a17b7 chore: Removed Shopping Cart Module 
- Moved all files and web templates from Shopping Cart to E-commerce module
- Made Shopping Cart module obsolete
- Moved select E-commerce related files from Portal to E-commerce module
- Minor cleanups
- Fixed Shopping Cart and Product Configurator tests
 2021-10-12 16:54:11 +05:30
marination
025574d9b5 chore: Removing Item's Website section & references 
- Removed old onboarding slide json and `create_onboarding_docs` methods
- Removed website sections from Item master
- Removed references to item website fields
- Shifted Item doctype website methods to Website Item
- Removed WebsiteGenerator from Item doctype
- Website Items in Homepage Products section
- Removed redundant code from item_group.py
- Fix: Item field filters won’t appear in website
 2021-10-12 16:03:19 +05:30
marination
eef9cf152f chore: Drive E-commerce via Website Item 
- Removed Shopping Cart Settings
- Portal fully driven via E Commerce Settings
- All Item listing querying will happen via ProductQuery engine only
- Product Listing via Website Items
- removed redundant code
- Moved all website logic from Item to Website Item
 2021-10-12 15:48:06 +05:30
marination
939b0dd67d feat: E-commerce Refactor 
- Created "Website Item" to handle website related information
- Publishing Item new flow
- Created "E Commerce Settings"
- Removed Products Settings
 2021-10-12 15:16:21 +05:30
Deepesh Garg
1aba3592fa
Merge pull request #27369 from Havenir/ksa-vat 
feat(regional): KSA E-Invoicing and VAT Report
 2021-10-11 12:16:51 +05:30
Rucha Mahabal
01bea14622
fix: sider 2021-10-04 09:58:38 +05:30
ChillarAnand
a1d3a09d3c Merge branch 'develop' into care 2021-10-04 09:46:34 +05:30
mergify[bot]
b9942ad639
feat: Tracking Multi-round interview (#25482) (#27724) 
* feat: Tracking Multi-round interview

* fix: releted to scheduler event and formating

* fix: job applicant UI/UX and conflicts

* test: Interview Round

* fix(test): Employee referral, Employee Onboarding, Job Offer

* fix: sider

* feat: set default value in Hr settings

* feat: added validation for designation

* test: Interview

* test: Added validatiolns for skill

* test: Interview feedback

* fix: sider

* fix: remove unnecessary validations and form label cleanups

* chore: clean-up Interview Round and Interview Type doctype

* fix: remove redundant Rating Value, only keep Rating

* fix: update interview details on feedback submission

- make interview feedback submission dialog minimizable

* fix: show submit feedback button only if feedback doesn't exist

* refactor: Interview and Feedback statuses and workflow

* fix(HR Settings): clean up interview settings

* refactor: Interview

* refactor: Interview Feedback, remove unnecessary validations

* chore: update notification messages

* chore: remove unnecessary formatting changes in attendance list and leave application

* refactor: Job Applicant to Interview mapping

* chore: sorted imports

* chore: sorted imports

* fix: sider issues

* fix: linter issues

* fix: sider issues

* fix: tests

* fix: sorted imports

* fix: tests, sider

* fix: therapy plan test

* fix: sider issues

* feat: Include From Time and To Time fields in Interview for cleaner data

* feat: Interview Calendar

* fix: allow renaming masters

* fix: add more fields to list view and standard filter

* fix: validate overlapping interviews

* fix: update tests

* fix: linter issues

* refactor: replace reminder messages with Email Templates

* fix: sider issues

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit 57e66f958cd57d66a6fd3b19f6cd3593eab63666)

Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
 2021-10-01 13:15:40 +05:30
Ahmad
940db71a82 fix: indentations 2021-09-17 01:14:41 +05:00
Deepesh Garg
c9c8957250
feat: Merge POS invoices based on customer group (#27471) 
* feat: Merge POS invoices based on customer group

* fix: Linting Issues

* fix: fieldname

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-09-16 19:33:57 +05:30
Ahmad
8a42570c96 refactor(regional): moved methos to region specific utils for KSA 2021-09-14 14:45:23 +05:00
Shariq Ansari
9aa6f52edd
fix: Webform Permission for custom doctype (#26232) 
* fix: Webform Permission for custom doctype

* fix: sider fix

* fix: app check condition for getting correct list_context

* chore: Better naming convention

* test: Added test case to check permission for webform of custom doctype

* chore: linting issue

* chore: linting issue

* fix: sider fix

* test: minor changes

* chore: linter and better naming method

* chore: linter fix

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-09-14 12:49:08 +05:30
Ahmad
87380d021d feat(regional): QR Code generation for Saudi Arabia Sales Invoices 2021-09-06 23:36:55 +05:00
ChillarAnand
c8565c7090 chore: Removed healthcare module code in other modules 2021-09-06 20:47:27 +05:30
Deepesh Garg
8f5a77446e
Merge pull request #27279 from deepeshgarg007/gstr_1_cdnr_unregistered_json_develop 
feat: CDNR Unreg json generation
 2021-09-03 13:55:00 +05:30
Subin Tom
798b464ee3
fix: braintree payment processed twice (#27300) 2021-09-03 12:30:57 +05:30
ChillarAnand
e913e277d9 chore: Rename imports from erpnext to healthcare 2021-09-02 19:47:39 +05:30
Deepesh Garg
c85242e03d Merge branch 'develop' of https://github.com/frappe/erpnext into gstr_1_cdnr_unregistered_json_develop 2021-09-02 18:59:59 +05:30
Chillar Anand
915b34391c
chore: Clean up imports (#27302) 
* chore: Added isort to pre-commit config

* chore: Sort imports with isort

* chore: Clean up imports with pycln

* chore: Sort imports with isort

* chore: Fix import issues

* chore: Clean up sider issues

* chore: Remove import errors from flake8 ignore list

* chore: Clean up lint issues
 2021-09-02 16:44:59 +05:30
Deepesh Garg
8b644d8889 fix: Report and JSON generation for Advances received 2021-09-01 10:28:15 +05:30
Rucha Mahabal
212eb4bc1a
feat(Healthcare): Capacity for Service Unit, concurrent appointments based on capacity, Patient Appointments (#27219) 
* feat(Healthcare): Capacity for Service Unit, concurrent appointments based on Capacity, Patient enhancements

* fix: appointment test

Co-authored-by: Anoop <3326959+akurungadam@users.noreply.github.com>
 2021-08-30 13:10:18 +05:30
Frappe PR Bot
255b99ebdc
feat: Employee reminders (#25735) (#27115) 
* feat: Add reminders section to HR Settings

* refactor: Extract generic function for getting Employees

* feat: Employee Work Anniversary Reminder

* feat: Daily Holiday Reminder

* fix: Unnecessary params and replace [] with .get()

* test: Daily Holiday Reminders

* test: is_holiday basic tests

* refactor: Move employee reminders code to separate module

* feat: Add advance reminder to HR settings

* feat: Advance Holiday Reminders

* refactor: get_holidays_for_employee

* feat: Email holiday reminders in advance + tests

* fix: Remove unused import

* refactor: HR Setting Reminder Section

* refactor: Remove Daily Holiday Reminders feat

* feat: Reminder miss warning

* fix: Failing test and function name change

* chore: Add patch for field rename

* chore: Rename frequency label

* fix: Failing patch test

* fix: sider and removed description of fields

* fix: email alignment

Co-authored-by: pateljannat <pateljannat2308@gmail.com>
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
(cherry picked from commit 24b2a315818d08ad4cb03347ccf5297df916a5ac)

Co-authored-by: Mohammad Hussain Nagaria <34810212+NagariaHussain@users.noreply.github.com>
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
 2021-08-24 20:19:22 +05:30
Deepesh Garg
2b2572b9b9
fix: Cascade deletion for Company (#26923) 
* fix: Cascade deletion for Company
 2021-08-20 14:40:12 +05:30
Saqib
c335962827
refactor!: drop e-invoicing integration from erpnext (#26940) 2021-08-20 11:10:46 +05:30
marination
45617ae22f fix: Shopping cart Exchange rate validation 
- Use `get_exchange_rate` to check for price list exchange rate in cart settings
- Move cart exchange rate validation for Price List from hooks to doc event
- Call cart exchange rate validation on PL update only if PL is in cart and currency is changed
 2021-08-19 20:01:05 +05:30
Saqib
3a50490c04
fix: fetching of item tax from hsn code (#26736) 
* fix: fetching of item tax from hsn code
 2021-08-03 15:57:11 +05:30
Ankush
efb037b566
refactor!: drop shopify integration from ERPNext (#26700) 
BREAKING CHANGE: remove Shopify integration.

The integration is moved to a separate app with additional enhancements.

The app is still FOSS and licensed under the same license as ERPNext. Any
data migration required is taken care of after installing the app and
enabling it.

New app: https://github.com/frappe/ecommerce_integrations
 2021-08-02 21:57:52 +05:30
Noah Jacob
cbddedab7b
fix: included company in Link Document Type filters for contact (#26576) 2021-07-26 12:54:35 +05:30
Ganga Manoj
f4fc1384a5
fix(Issue): Calculate first_response_time based on working hours (#25991) 2021-07-14 11:43:10 +05:30
Jannat Patel
5a4251107c
feat: Project Portal Enhancements (#26090) 
* fix: project portal enhancements

* fix: timesheet table and task nesting

* fix: semgrep and link issue

* fix: sider

* fix: project details view title

* fix: project progress pills

* fix: website route rule for project

* fix: multi level nesting

* fix: added subject and indentation

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-07-01 17:17:34 +05:30
Himanshu
ec25d5938b
feat(SLA): Apply SLA to any document (#22449) 2021-06-14 19:05:52 +05:30
Rohit Waghchaure
b103b24ae1 fix: timeout error in the repost item valuation 2021-06-11 10:55:05 +05:30