Commit Graph

38508 Commits

Author SHA1 Message Date
Ankush Menat
e46567192a
fix: invalid escape sequences in regex 2021-09-01 16:57:17 +05:30
Ankush Menat
55b24345a0
fix: remove unused format from query
doctype is not used in query and parent alone is enough to identify
packed items.
2021-09-01 15:33:37 +05:30
Ankush Menat
7d9819f352
fix: remove duplicate imports 2021-09-01 15:33:35 +05:30
Ankush Menat
2d62c500c4
fix: undefined variables 2021-09-01 15:05:00 +05:30
Ankush Menat
9fec0a5c68
refactor: itemgetter instead of assigned lambda 2021-09-01 15:02:29 +05:30
Ankush Menat
010060d92e
chore: correct indentation 2021-09-01 15:02:29 +05:30
Ankush Menat
694ae81618
fix: remove bare excepts 2021-09-01 15:02:28 +05:30
Alan
72ece75b11
ci(semgrep): add translation checks for report labels (#27280)
* ci(semgrep): add translation checks for report labels

* refactor: shift report tests to it's own yml

path can't be applied on a test id basis

* ci: ignore regional report in translation checks

[skip ci]
2021-09-01 14:19:39 +05:30
Alan
9dc0843cbd
fix: translate labels (#27282)
[skip ci]
2021-09-01 12:58:34 +05:30
Rucha Mahabal
ef76f62bc1
fix: Healthcare Service Unit fixes (#27273)
* fix: validate service unit setup against practitioner schedule

* fix: service unit properties getting overwritten
2021-08-31 21:06:53 +05:30
Ankush Menat
c1d986a0c6
fix: revert "refactor: simplify initialize_previous_data" (#27270)
This reverts commit 2f5624e588541103adb4a3170f2886590dcee42e.
2021-08-31 19:43:42 +05:30
Afshan
763450dcf8
Revert "fix: add child item groups into the filters (#26997)" (#27266)
This reverts commit c60d5523bc.
2021-08-31 19:07:20 +05:30
Frappe PR Bot
81fb493850
fix: payment terms on Sales Order when Invoice Portion field is empty (#27259) 2021-08-31 19:01:03 +05:30
Anuja Pawar
3e404f15ff
refactor: payment reconciliation tool (#27128) 2021-08-31 18:59:29 +05:30
Deepesh Garg
c37cec9b9d
fix(minor): Incorrect unallocated amount on type receive (#27262) 2021-08-31 18:50:23 +05:30
Frappe PR Bot
6281c33dd4
fix: pos payment methods not setting rounded_total (#27260) 2021-08-31 18:39:51 +05:30
Subin Tom
7004944cc0
feat: Taxjar Integration update (#27143)
* feat: Taxjar Integration update

* added taxable_amount,taxable_amount fields in setup.py

* Update taxjar_integration.py

Sider issues fix

* Sider issues fix

* Sider issues fix

* sider issue fix: unused import

* sider issue fix

* Update erpnext/erpnext_integrations/taxjar_integration.py

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>

* Removed permission for 'All'

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-08-31 18:33:16 +05:30
gavin
dea14eef51
Merge pull request #27240 from ankush/ubuntu_ci
ci: switch to latest LTS Ubuntu version
2021-08-31 18:22:30 +05:30
Anurag Mishra
ab47409e91
feat: Full and Final Settlement and Gratuity Fix (#26364)
* feat: Full and Final Settlement

* removed option to pay via salary slip

* feat: Create JV

* test:fnf

* fix: tracking asset movement

* fix: sider and test

* fix: changes Requested

* fix: changes requested

* fix: valication for Asset

* fix: add filter for reference document only if relevant field is present

* fix: doctype cleanup

- add more fields to the list view and standard filter

- set title field

- incorrect field labels

* feat: add list view settings for FNF

* fix: incorrect reference type set in Journal Entry

* fix: validation message

* chore: add Full and Final Statement link to Workspace

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-08-31 17:59:26 +05:30
Jannat Patel
48f2e5ac1d
fix: email digest original_user issue (#27191) 2021-08-31 17:43:30 +05:30
Frappe PR Bot
e958ae9002
feat: color and leave type in leave application calendar (#27246) (#27255)
* feat: color and leave type in leave application calendar

* fix: sider + use cstring

(cherry picked from commit 366eb86fdfd9bb204bce677b01b8d5bb5ffa4d6d)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
2021-08-31 17:34:48 +05:30
Dany Robert
94dcbf851a
fix: update get_exchange_rate for test mode (#26847)
* fix: no api calls on test mode

* fix: make api call, but return 1.0 incase of invalid currency

* feat: patch request.get

* fix: clear cache after test

* fix: add missing test_exchange_value

* fix: avoid api call in implicit function call during test

* fix: returning 1 while in test causes failure

Returning 1.00 causes failure of exchange rate tests.

* chore: retab

* chore: style
2021-08-31 17:19:12 +05:30
Alan
88aa7b824e
fix: pass labels through translation function (#27252) 2021-08-31 15:16:04 +05:30
Chillar Anand
88d849320f
fix(payroll): Fixed issue with accessing last salary slip for new employee (#27247) 2021-08-31 14:42:21 +05:30
Rucha Mahabal
52dd326f22
fix(test): first check for org chart always fails (#27249) 2021-08-31 13:18:31 +05:30
Ankush Menat
602374a0a4
ci: switch to latest LTS Ubuntu version 2021-08-30 19:32:53 +05:30
Rucha Mahabal
1682402a9f
refactor: Healthcare Redesign Changes (#27236) 2021-08-30 18:26:56 +05:30
Dany Robert
5fd04101d4
fix: Stock Ageing report issues for serialized items (#27228)
* fix: incorrect calculation in get_range_age

* fix: remove serial numbers not in stock from fifo_queue

* refactor: make serial_no condition explicit

* refactor: reduce code duplication

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-08-30 18:11:33 +05:30
Deepesh Garg
fd467e6d32
fix: Correct company address not getting copied from Purchase Order to Invoice (#27217)
* fix: Correct company adderess not getting copied from Purchase Order to Invoice

* fix: Linting issues
2021-08-30 17:53:59 +05:30
Ankush Menat
9de0f7538f
ci: concurrency control for CI jobs (#27230)
similar to https://github.com/frappe/frappe/pull/14061

This will ensure that only one instance of the following tests run per
PR and cancel previous running/queued jobs when new commits are pushed.

- Server / unit tests
- UI tests
- Patch test
2021-08-30 14:07:13 +05:30
Ankush Menat
7d2a0fe38e
Merge pull request #27197 from marination/supplier-primary-address
feat: (consistency) Add Primary Address and Contact section in Supplier
2021-08-30 14:03:09 +05:30
Subin Tom
9cb642238f
fix: expense claim reimbursed amount update (#27204) 2021-08-30 13:17:22 +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
Marica
fbcf82f788
Merge branch 'develop' into supplier-primary-address 2021-08-30 12:51:37 +05:30
marination
7b78473da3 fix: Indentation and removed f-strings
- Sider: fixed indentation in js
- Dont use f-strings in queries
2021-08-30 12:50:24 +05:30
Ankush Menat
e5e00700e5
ci: use node action instead of apt (#27220) 2021-08-30 12:07:11 +05:30
Deepesh Garg
f5cdbf161d
fix: LTV ratio comparison (#27207) 2021-08-28 14:55:51 +05:30
François de Ryckel
327071cb90
replace cur_frm with frm (#27210) 2021-08-28 14:55:11 +05:30
dependabot[bot]
2caa090991
chore(deps): bump tar from 6.1.0 to 6.1.11 (#27203)
Bumps [tar](https://github.com/npm/node-tar) from 6.1.0 to 6.1.11.
- [Release notes](https://github.com/npm/node-tar/releases)
- [Changelog](https://github.com/npm/node-tar/blob/main/CHANGELOG.md)
- [Commits](https://github.com/npm/node-tar/compare/v6.1.0...v6.1.11)

---
updated-dependencies:
- dependency-name: tar
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-27 19:59:36 +05:30
Devin Slauenwhite
072151e16d
feat: Payment reconciliation on accounts module workspace (#25925)
* feat: add payment reconciliation to accounting workspace

* fix: update modified and duplicate the link

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-08-27 19:44:57 +05:30
marination
2a3ef03388 fix: Popup stale build and data consistency
- Include `supplier_quick_entry.js` in erpnext.bundle.js
- Create primary supplier address on update
- Set newly created address (quick entry)  in Supplier and Customer
- Clear address set in supplier and customer on delete (dependency)
2021-08-27 18:06:51 +05:30
Shadrak Gurupnor
7433757489
fix: patches were breaking during migration (#27200)
* fix: patches were breaking during migrating

* fix: patches were breaking during migration
2021-08-27 18:00:16 +05:30
Rucha Mahabal
5f3ec8230f
Merge pull request #27102 from anupamvs/prospect
feat(CRM): Prospect to group Leads
2021-08-27 16:48:41 +05:30
Shadrak Gurupnor
17e0fa7a8b
fix: patches were breaking while migrating (#27195)
* fix: patches were breaking while migrating

* fix: Removed duplicate function

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-08-27 16:42:25 +05:30
Rucha Mahabal
e170ad2df3 chore: add more fields to Prospect list view 2021-08-27 16:26:12 +05:30
Anupam Kumar
212921aace
Merge branch 'develop' into prospect 2021-08-27 15:57:10 +05:30
marination
bf72ec0598 feat: (consistency) Add Primary Address and Contact section in Supplier
- The same is present in customer and is inconsistent with supplier
- Helps quickly create primary address and contact via quick entry
2021-08-27 15:51:31 +05:30
Kamal Johnson
a285b5b78b
feat: Accounts, Selling & Assets Onboarding cleanup (#27112)
* refactor: company form fields arrangement

* refactor: accounts onboarding steps

* refactor: re-arrange fields & modify labels in company form

* feat: onbording steps for accounts module

* fix: updated onboarding steps for selling module

* fix: remove unwanted steps from accounts

* feat: add more onboarding steps

* feat: Refactor onboarding-module for accounting workspace

* feat: Add basic asset onboarding steps

* feat: Add basic asset item form tour

* feat: Add basic selling onboarding-steps

* feat: Add basic form tour for purchase recipt

* feat: Add basic form tour for existing asset

* feat: Adding asset category form tour

* feat: Add form tour for asset category

* feat: Refactor sales taxes and charges template form tour with new  method

* refactor: Remove old form tour for accounts settings

* refactor: Change asset category form tour with new tour method

* refactor: Change asset item form tour with new tour method

* refactor: Change purchase receipt form tour with new tour method

* refactor: Change asset form tour with new tour method

* refactor: Remove old form tour for selling settings

* refactor: general fix/typo in onboarding steps

* Apply suggestions from code review

Co-authored-by: Nabin Hait <nabinhait@gmail.com>

* refactor: Remove old form tour method for sales order.

* fix: removed duplicate section break

* fix: Removed duplicate fields

Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
Co-authored-by: Anuja <anuja.pawar20@gmail.com>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-08-27 15:47:11 +05:30
Saqib
987746592c
fix: period closing voucher tests (#27198) 2021-08-27 15:41:26 +05:30
Anupam
d701ad5313 fix: using frm instead of cur_frm 2021-08-27 13:09:52 +05:30