Commit Graph

38625 Commits

Author SHA1 Message Date
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
GangaManoj
e44567754d fix: Display Packed/Bundle Items table only if it exists 2021-08-27 20:16:13 +05:30
GangaManoj
a2b394b195 fix: Enable Print Hide for Bundle Items 2021-08-27 20:06:22 +05:30
GangaManoj
a7be02fe32 fix: Only add Item to packed_items list if it's not already there 2021-08-27 20:02:36 +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
08188f2ac7
Merge branch 'develop' into gross-profit-product-bundle 2021-08-27 15:41:41 +05:30
Saqib
987746592c
fix: period closing voucher tests (#27198) 2021-08-27 15:41:26 +05:30
Saqib
8008598eb2
Merge branch 'develop' into gross-profit-product-bundle 2021-08-27 14:48:54 +05:30
Anupam
d701ad5313 fix: using frm instead of cur_frm 2021-08-27 13:09:52 +05:30
Rucha Mahabal
71b7c63ec0
feat: Ability to schedule onboarding and separation activities (#26738)
* refactor: employee onboarding form clean-up

* feat: ability to schedule onboarding / separation tasks

* feat: skip holidays while setting boarding activity dates

* chore: remove unused child table - Employee Onboarding Activity

* fix: tests

* fix: employee separation test
2021-08-27 11:12:24 +05:30
rohitwaghchaure
e6799d78ef
fix: operation time auto set to zero (#27188) 2021-08-27 10:46:45 +05:30
GangaManoj
535dd2d36d fix: Move Packed Items table right below the Items table 2021-08-27 02:47:11 +05:30
GangaManoj
4353c5e339 fix: Disable Add Row and Delete Row for Bundle Items 2021-08-27 02:32:34 +05:30
GangaManoj
bdbd4f83ab fix: Create separate section for Bundle Items 2021-08-27 02:29:47 +05:30
GangaManoj
20cfe60e84 feat: Populate Bundle Items table 2021-08-27 01:49:58 +05:30
GangaManoj
efd8a8b28e feat: Add Bundle Items table 2021-08-27 01:49:28 +05:30
GangaManoj
681c92d646 fix: Make Sales Order field editable so the PO can be linked with an SO later 2021-08-27 01:48:46 +05:30
GangaManoj
c33f5cad01 fix: Hide Rate of Bundle Items while printing 2021-08-27 01:21:52 +05:30
GangaManoj
99e6e2ce3f fix: Make Rate column read only by default 2021-08-27 01:15:01 +05:30
GangaManoj
6c03af815e fix: Display Bundle Items right below the Items table 2021-08-27 01:14:23 +05:30
GangaManoj
e506cd6a2f fix: Enable Fetch If Empty for Rate 2021-08-27 01:06:48 +05:30
GangaManoj
d4405c5e52 fix: Calculate Product Bundle price based on the prices of its child items 2021-08-27 01:02:34 +05:30
Deepesh Garg
ae7ec8e44d
fix: Base amount in tax gl entry 2021-08-26 23:51:09 +05:30
Frappe PR Bot
a1737c9a0c
fix: Production Plan: load document defaults for plan items & remove name column from listview (#26584) (#27184)
(cherry picked from commit 69d88a921273c9e0ea29d7131232686a0be7bb78)

Co-authored-by: Richard Case <64409021+casesolved-co-uk@users.noreply.github.com>
2021-08-26 23:04:54 +05:30
Pawan Mehta
db69d1dc00
fix: fetch from more than one sales order in Maintenance Visit (#26924)
* [fix] #26336

* fix(ux): make customer field reqd for fetching SO

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-08-26 22:54:24 +05:30
Chillar Anand
f1b77360ee
feat(healthcare): Added Treatment Plan Template feature (#26557)
* feat: Added doctypes for treatment plan template

* feat: Added child doctype

* feat: Added validations for patient age

* chore: Clean up treatment plan template

* fix: Limit plan items to templates

* Added multiselectdialogbox for treatment plan template

* Add template name as autoname

* Clean up code

* Cleanup lint issues

* Clean up code

* Added tests for tpt filters

* Added test records

* Fix order of fields

* Added tests for care plan template

* Added age property for patient

* Clean up code

* Clean up list view

* Clean up code

* Fix lint issues

* Clean up test records

* Code cleanup

no-docs

* chore: Code cleanup

* chore: Use ORM instead of raw sql

* fix: Make treatment plan item fields mandatory

* fix: Added healthcare roles in permissions rules

* fix: Added filters for symptoms, diagnosis

* fix: Show applicable treatment plans button only if patient is present

* fix: Fix key error issues

* fix: Fix issues with filters in plan templates

* chore: Fix age filters

* refactor: appending treatment plan items

* fix: treatment plan test

Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-08-26 22:15:30 +05:30
Rohan
16eed07a0f
fix: use Stripe's Price API for plan-price information (#26107)
* fix: use Stripe's new Plan API for price information

* patch: use inbuilt function to rename field

* fix: patch call

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-08-26 21:47:00 +05:30
Noah Jacob
422f67a4c9
refactor: update manufacturing module onboarding (#26945)
* refactor: updated manufacturing onboarding cards

* refactor: added form tours

* refactor: updated form tours and card descriptions

* Fix: Case of description

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-08-26 21:40:48 +05:30
Lovin Maxwell
f91faac7cd
fix: Pricing Rule on Transaction Based on Coupon (#26949) 2021-08-26 20:54:02 +05:30
Ankush Menat
ae55eab599
chore: remove deprecated and empty QUnit tests (#27179)
* chore: remove deprecated and empty QUnit tests

* ci: fix UI test config

Testing library was added on Frappe, in order to reuse command testing
library has to be installed during setup process.
2021-08-26 20:43:06 +05:30
Ankush Menat
a9852a5483
fix(ux): hide irrelevant fields for asset items (#26274) 2021-08-26 20:02:51 +05:30
Deepesh Garg
4b1f165429
fix: Use reverse debit and credit to get net amount in GL Entries (#27174)
* fix: Use reverse debit and credit to get net amount in GL Entries

* fix: Remove unused import
2021-08-26 18:34:15 +05:30
Ankush Menat
c07dce940e
fix: don't allow BOM's item code at any level of child items (#27157)
* refactor: bom recursion checking

* fix: dont allow bom recursion

if same item_code is added in child items at any level, it shouldn't be allowed.

* test: add test for bom recursion

* test: fix broken prodplan test using recursive bom

* test: fix recursive bom in tests
2021-08-26 18:33:42 +05:30
Marica
73b686a498
Merge pull request #27169 from marination/internal-customer-util
fix: Remove duplicate `create_internal_customer` utility
2021-08-26 16:42:28 +05:30
Ankush Menat
e7109c18db
fix: negative qty validation on stock reco cancellation (#27170)
* test: negative stock validation on SR cancel

* fix: negative stock setting ignored in stock reco

In stock reconcilation cancellation negative stock setting is ignored as
`db.get_value` is returning string `'0'` which is not casted to int/bool
for further logic. This causes negative qty, which evantually gets
caught by reposting but by design this should stop cancellation.

* test: typo and minor refactor
2021-08-26 16:40:45 +05:30