Commit Graph

814 Commits

Author SHA1 Message Date
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
Nabin Hait
a3d1b6973a fix: merge conflict 2021-05-31 11:21:33 +05:30
Suraj Shetty
815aad1003 fix: Rename email.bundle to erpnext_email.bundle
to avoid override of frappe email styles
2021-05-23 13:31:54 +05:30
Suraj Shetty
a83d2aacd9
Merge branch 'develop' into esbuild 2021-05-18 14:48:28 +05:30
Deepesh Garg
55fe85d850
feat(India): Multiple GST enhancement and fixes (#25249)
* fix: RCM tax calculation

* feat(India): ITC Reversal via Journal Entry

* fix: Reverse Charge booking logic and validation

* fix: Addd patch for availed ITC fields

* fix: Hooks method to update availed ITC field

* fix: Cleanup and fixes in GSTR3B report

* fix: Update params in GSTR-1 report

* fix: Debit note using Sales Invoice

* fix: Setup and patch

* fix: GSTR 3B report cleanup and updates

* fix: Add method to get invoices liable to reverse charge

* fix: Add taxable value in Purchase Invoice Item

* fix: Inward supplies liable to reverse charge

* fix: Linting issues

* fix: GSTR3B report test
2021-05-14 12:17:41 +05:30
Anurag Mishra
0c482fde5f
feat: Leave Policy Assignment Refactor (#24327)
* feat: Leave Policy Assignment Refactor

* fix: Changes Requested

* fix: sider

* fix: changes requested

* test: fixed

* test: fixed wrong set query

* fix: remove commented code

* fix(style): extra space

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-05-13 13:20:14 +05:30
Saqib
9226cd3932
feat(india): reduced rate of depreciation as per IT Act (#25648)
* feat(india): reduced rate of depreciation as per IT Act

* refactor: check date difference instead of month difference

* feat: add test for regional feature
2021-05-10 12:36:56 +05:30
Faris Ansari
69eb6d476e Merge remote-tracking branch 'upstream/develop' into esbuild 2021-05-07 15:21:33 +05:30
Faris Ansari
464d838447 fix: Update bundle paths 2021-05-07 14:53:42 +05:30
Rohit Waghchaure
a8f78fabfd fix: patch failing while migrating from v7 to v13 2021-04-13 18:51:21 +05:30
Deepesh Garg
c36e48a869
fix: GST on freight charge in e-invoicing (#25000)
* fix: GST on freight charge in e-invocing

* fix: Add patch for taxable value field

* fix: Handle discounts on net total

* fix: Handle all types of discounts for e-invoicing

* fix: Absolute taxable values

* fix: Use correct tax amount
2021-04-12 10:55:43 +05:30
Ankush Menat
76c8521010
fix: remove gst name validation for purch Invoice 2021-04-07 16:28:13 +05:30
shariquerik
1989375be4 fix: Employee profile pic upload access for erpnext user 2021-03-26 16:34:22 +05:30
rohitwaghchaure
575f8f226b
fix: repost not completed backdated transactions (#24980) 2021-03-24 11:30:53 +05:30
Afshan
5d66a2b326
fix: added correct path in hooks (#24862) 2021-03-12 15:51:34 +05:30
Ankush Menat
a44df63a91
fix: Add warning for invalid GST invoice numbers
GST Invoice numbers should be 16 characters alphanumeric with dash(/) or
slash(-) only. Add check for doc.name before saving and warn about
naming series.
2021-03-03 11:26:12 +05:30
Deepesh Garg
7a837170ea Merge branch 'develop' of https://github.com/frappe/erpnext into other_app_acc_dims 2021-02-25 15:41:03 +05:30
Deepesh Garg
bb8cd1cdaa
feat: Basic validation for indian PAN No. in Supplier (#24687) 2021-02-22 19:28:45 +05:30
Deepesh Garg
6a5ef261f2
feat: Normal rounding for GST Taxes (#24488)
* feat: Normal rounding for GST Taxes

* fix: Add test case

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-02-19 14:30:23 +05:30
Suraj Shetty
6fa44fefc3 fix: Use new favicon 2021-02-10 15:48:32 +05:30
Suraj Shetty
0a8939e1c1 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-29 08:56:22 +05:30
leela
3234df5581 feat: improved call log doctype
* Added links and some more fields into Call Log Doctype
* Display call info in the call log link pages
2021-01-28 18:34:58 +05:30
Raffael Meyer
f6f4376463
feat: remove german sales invoice validation (#24441)
This can be better achieved via Customize Form
(mandatory and mandatory_depends_on)
2021-01-28 12:16:26 +05:30
Rucha Mahabal
7201498801
Merge branch 'develop' into patient-history-enhancements 2021-01-22 09:04:37 +05:30
Rucha Mahabal
f1cca59d80 feat: update expiry for memberships 2021-01-21 16:36:15 +05:30
Suraj Shetty
bbc6bfd3c3 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-19 09:34:06 +05:30
Rucha Mahabal
060d647248 fix: travis 2021-01-15 00:19:14 +05:30
Rucha Mahabal
751719ea0d
Merge branch 'develop' into patient-history-enhancements 2021-01-14 14:08:50 +05:30
Saqib
6d74f5b59b
feat: GST E Invoicing (#23455)
* feat: init e-invoice settings

* feat: read public key file

* feat: rsa encryption with public key

* feat: save token and sek from auth request

* chore: handle error response

* feat: AES decryption of SEK with appkey

* feat: decrypt json data with SEK

* feat: make e invoice from erpnext sales invoice

* feat: generate IRN

* feat: decode signed json and QR code

* chore: validations

* feat: cancel IRN

* feat: complete e-invoice schema

* chore: move e-invoice settings to regional

* chore: split einvoice settings and operations

* chore: rename schema to template & js cleanup

* feat: make IRN field on regional setup

* feat: Generate & Cancel IRN from Sales Invoice

* chore: minor fixes

* fix: item discount

* chore: show irn cancelled check after cancellation

* fix: hide cancel irn dialog on error

* fix: public key is required on validate

* fix: cannot find attached key file

* fix: validation if e invoicing is disabled

* fix: do not show generate irn for invalid supply type

* fix: update irn_cancelled after cancelling irn

* chore: show irn field for proper gst_category

* feat: e-way bill details in e-invoice

* fix: save e-way bill no on irn generation

* chore: no copy on e invoice custom fields

* feat: cancel e-way bill before cancelling IRN

* feat: manual download / upload json

* chore: group e-invoicing actions

* fix: fn name

* chore: save signed invoice and qrcode after uplaoding irn

* fix: fetch token if not valid

* chore: move einvoicing stuff to seperate folder

* feat: QRCode Image and E-Invoice Print Format

* fix: bug

* fix: invalid syntax

* chore: code cleanup

* chore: clean up e invoice actions

* fix: download & upload e-invoice

* fix: print format

* fix: validations

* fix: add permissions on regional setup

* feat: add patch

* fix: validate document name

* fix: return date

* fix: credit note einvoice

* fix: validations

* fix: error logging

* fix: e_invoice module not found

* fix: add missing package

* fix: rename e_invoice_utils.py

* fix: einvoice field validation

* fix: patch

* fix: invoice totals calculation

* fix: other charges calculation

* chore: improve document name validation message

* fix: qr code image string

* feat: initialize GSP connector

* chore: remove unwanted fields

* fix: qr code generation

* feat: fetch and cache GSTIN details

* feat: generate & cancel IRN

* feat: cancel eway bill

* chore: remove unwanted fuctions

* chore: clean up einvoice actions

* fix: attach qrcode on irn generation

* fix: generate & cancel IRN

* fix: show/hide eway bill fields

* fix: valiations

* feat: generate eway bill from IRN

* chore: remove unwanted imports

* chore: error logging

* feat: header & footer in GST E Invoice

* chore: remove test pincode

* fix: invalid syntax

* feat: cess non advolem on einvoice item

* chore: remove fetch token from e invocie settings

* fix: imports

* fix: error handling

* feat: update timeline on einvoice actions

* fix: qrcode image size

* fix: exclude intra company transactions

* fix: eway bill test

* fix: ewaybill mandatory conditions

* chore: add tests

* fix: returning condition

* feat: log e-invocing requests

* chore: add ack date and ack no field for print formats

* fix: sider issues

* feat: show e-invoice preview before IRN generation

* fix: use as_list for error message

* fix: minor ux issues

* fix: dialog is undefined

* fix: error handling

* feat: add docs link to e invoice settings

* feat: multiple gstins for e invoicing

* fix: uncomment test condition

* fix: remove test pincode

* fix: cannot cancel irn without submitting sales invoice

* chore: code cleanup

* fix: sider issues

* fix: e invoice request log permissions

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-12-25 10:26:43 +05:30
Rucha Mahabal
02ebc9a11e
Merge branch 'develop' into patient-history-enhancements 2020-12-16 12:51:45 +05:30
Rushabh Mehta
fec8dba16c fix(merge): merge develop 2020-12-08 16:23:09 +05:30
Walstan Baptista
0baebbdafe
fix: added Purchase Order to Global Search (#24055) 2020-12-08 09:43:29 +05:30
Glen Whitney
dea6a90a1f feat(Accounting Dimension): other apps may have accounting dimension doctypes
Prior to this change, there was simply a single hardcoded list of doctypes
  with accounting dimensions in ERPNext. However, when extending the
  capabilities of ERPNext using an add-on app rather than by modifying
  ERPNext itself, it may well be necessary to create new doctypes in other
  apps that will have accounting dimensions as well.

  So, this PR moves the list of doctypes with accounting dimensions into
  hooks.py so it can be accumulated from multiple apps. It also allows the
  list of doctypes in make_dimension_in_accounting_doctypes be specifiable,
  for more convenient use in the after_install hooks of other apps.
2020-12-03 22:27:44 +00:00
Rucha Mahabal
288853d8f0
Merge branch 'develop' into patient-history-enhancements 2020-12-01 13:44:16 +05:30
Leela vadlamudi
a3845a95ed
feat: Introducing telephony module (#24032) 2020-12-01 13:04:53 +05:30
Rucha Mahabal
7a69a3367c
Merge branch 'develop' into patient-history-enhancements 2020-11-30 14:16:46 +05:30
Rucha Mahabal
c0fcc807d3 feat: hooks for updating and deleting medical records 2020-11-30 13:22:01 +05:30
Rucha Mahabal
4097e89f8b feat: Standard doctype config for Patient History 2020-11-30 12:48:39 +05:30
Rucha Mahabal
c91e03c891 feat: Create Patient Medical Record on configured doctype submission 2020-11-28 20:24:06 +05:30
Anurag Mishra
755b773616
feat: Leave policy assignment (#23112)
* feat: Leave Policy Assignment

* feat: linking with leave allocation and valiations

* style: removed old code from leave period

* feat: Bulk Leave policy Assignment and grant Leaves

* fix: overlap validation

* feat: earned leaves based on joining date

* feat: automatic grant leave based on leave policy

* patch: create leave policy assignment based on employee current leave policy

* fix: dependent test cases

* test: Leave policy assignment

* fix: some enhancement

* style: break large function into small function

* fix:requested Changes

* fix(patch): Handled old Leave allocatioln

* fix:codacy

* fix: travis and sider,codacy

* fix: codacy

* fix: codacy

* fix: requested changes and sider

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-11-25 16:05:17 +05:30
Deepesh Garg
d07447aa5f
fix: Validation for duplicate Tax Category (#23978)
* fix: Validation for duplicate Tax Category

* Update utils.py

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-11-24 08:09:17 +05:30
Deepesh Garg
f0187f6db2
Merge pull request #23447 from hasnain2808/UAE-VAT-Format
feat: UAE VAT 201 Report
2020-11-18 15:15:00 +05:30
Deepesh Garg
37dc369af9
feat: Sync old shopify orders (#23841)
* feat: Sync old shopify orders

* fix: Old orders syncing by date

* fix: Remove unnecessary code

* fix: Remove unintentional changes

Co-authored-by: Saurabh <saurabh@erpnext.com>
2020-11-13 16:53:35 +05:30
Shivam Mishra
bed717b442 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-11-12 11:32:59 +05:30
Rushabh Mehta
780b6b466b fix(hooks): include js/css with full path 2020-11-11 11:44:28 +05:30
Mohammad Hasnain Mohsin Rajan
6e9e6d2491
Merge branch 'develop' into UAE-VAT-Format 2020-10-28 21:06:11 +05:30
Rucha Mahabal
4887b69946
feat: Inpatient Medication Order and Entry (#23473)
* feat: Inpatient Medication Order

* feat: Inpatient Medication Entry

* feat: update medication orders on medication entry submission

* feat: added custom fields for medication references in Stock Entry

* feat: make stock entry if update stock is checked in IPMOE

* fix: handle cancel event for Inpatient Medication Entry

* fix(ux): add link and progress bar to dashboard

* refactor(ux): Adding Medication Orders without linking to Patient Encounter

* fix: make medication entry child table read only

* fix: filter stock items during manual medication order creation

* fix: codacy

* chore: tests for Inpatient Medication Order

* chore: tests for Inpatient Medication Entry

* fix: code clean-up

* fix: filter for inpatients in IPMO

* fix: add datetime validations for IPME filters

* fix: do not hardcode stock entry type

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-10-23 20:33:30 +05:30
prssanna
d7b704c90f Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui 2020-10-22 15:39:47 +05:30
prssanna
b57b3c9f6c feat: hook to fetch additional print settings in print view 2020-10-22 15:37:47 +05:30
Shivam Mishra
9d468a8daf Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-10-21 11:38:31 +05:30
Mohammad Hasnain
75ccb62d46 Merge branch 'develop' into UAE-VAT-Format 2020-10-20 09:40:44 +05:30
Shivam Mishra
8261df29c4 feat: update splash logo 2020-10-19 13:52:35 +05:30
Faris Ansari
22bcad9dc7 fix: Cleanup code 2020-10-16 15:28:12 +05:30
Abhishek Balam
6e9e7b4c7a fix: serverside validation overrides 2020-10-14 19:31:37 +05:30
Abhishek Balam
346ca568b7 fix: set company link in address when is_your_company_address is set 2020-10-14 18:11:04 +05:30
Mohammad Hasnain Mohsin Rajan
abf628c95d Merge branch 'develop' into UAE-VAT-Format 2020-10-14 00:26:57 +05:30
Shivam Mishra
55f52e8135 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-10-13 20:09:22 +05:30
Mohammad Hasnain
ac451b3a54 feat(UAE VAT 21): Move standard rated expense from Sales invoice to Purchase invoice 2020-10-11 01:40:22 +05:30
Mohammad Hasnain
fc2ace1a31 Merge branch 'develop' into UAE-VAT-Format 2020-10-10 22:06:06 +05:30
Raffael Meyer
2acfc2a034
Merge branch 'develop' into validate_regional_germany 2020-10-06 16:53:52 +02:00
Faris Ansari
db8764a520
Merge pull request #23201 from alyf-de/website_theme_scss
fix: style for website theme
2020-09-30 18:26:58 +05:30
barredterra
81ad90c1d4 feat: validate sales invoice for germany 2020-09-29 11:54:57 +02:00
hasnain2808
23c8966e81 Merge branch 'develop' into UAE-VAT-Format 2020-09-28 20:06:02 +05:30
Anupam
77cf53201a feat: open lead status on next contact date 2020-09-28 18:38:41 +05:30
Shivam Mishra
9a4d603403 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-09-25 11:44:37 +05:30
hasnain2808
3ef11b1d64 feat(UAE VAT 21): Add region fields for UAE VAT 21 2020-09-24 13:21:23 +05:30
Raffael Meyer
8b78bf19bd
Merge branch 'develop' into website_theme_scss 2020-09-23 11:38:59 +02:00
barredterra
60bfbbc5af fix: use path istead of hook 2020-09-11 16:05:10 +02:00
Gavin D'souza
71ac399369 fix: Commonified function and updated scheduler events
Co-authored-by: marination <maricadsouza221197@gmail.com>
2020-09-10 13:58:48 +05:30
hasnain2808
7b7a8e1309 feat: RCM for UAE VAT 2020-09-09 20:54:30 +05:30
Marica
54ab426c1c
Merge branch 'develop' into youtube-analytics 2020-09-07 18:54:11 +05:30
marination
06ee0ea00b feat: Added Scheduler Job to auto update statistics
- Added frequency in Video Settings
- Cron job to check half hourly job
- Hourly job to run job based on frequency
- Patch to set youtube id in video for ease in computing
2020-09-07 18:49:06 +05:30
Suraj Shetty
df00c5c846 fix: Update erpnext logo 2020-09-01 13:55:34 +05:30
barredterra
a162248f32 fix: use hook for website theme scss 2020-08-28 15:16:39 +02:00
Suraj Shetty
ecc7eedd10 fix: Update erpnext logo 2020-08-23 16:35:39 +05:30
Abhishek Balam
ee5b9c7691
feat(Accounting): Process Statement Of Accounts (#22901)
* feat: Process Statement Of Accounts initial commit

* fix: add jinja supported inputs for subject and body in email settings

* feat: utils support in template, tested autoemail, fixed issues
2020-08-11 16:23:47 +05:30
KanchanChauhan
2826fd3c20
feat: Dunning (#22559)
* feat: Dunning

* fix: Replaces spaces with tab

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-07-23 15:45:03 +05:30