Commit Graph

33296 Commits

Author SHA1 Message Date
Saqib
65820f6b6c
fix: cannot expand row in update items dialog (#23840) 2020-11-05 17:38:43 +05:30
Saqib
76cd680c57
fix: asset finance book depreciation posting date fix (#23834) 2020-11-05 16:37:19 +05:30
Marica
596656b372
Merge pull request #23824 from marination/delete-quoted-item-old-report-pre-release
chore: Delete Quoted Item Comparison Report
2020-11-05 10:03:58 +05:30
Marica
0c74cd8872
Merge pull request #23821 from marination/so-to-po-dialog-fix-v13-beta
fix: SO to PO Mapping Issue
2020-11-05 09:26:32 +05:30
Marica
5c4b35e65e
Merge pull request #23827 from marination/rfq-test-fixes-pre-release
chore: Reposition RFQ fields
2020-11-05 09:24:29 +05:30
Abhishek Balam
48d9173a55
Merge pull request #23828 from abhishekbalam/psoa_testcase_fix
fix(PSOA): key error if no customers found
2020-11-05 00:21:24 +05:30
Abhishek Balam
5db99e0649 fix: code improvement, match error type for message 2020-11-04 23:43:11 +05:30
Abhishek Balam
5fe3abcfae fix: sales person without customer link throwing keyerror 2020-11-04 23:23:34 +05:30
marination
edd9080ea6 chore: Reposition RFQ fields 2020-11-04 22:13:57 +05:30
Rucha Mahabal
dd7f4df669
fix: Budget test cases (#23822) 2020-11-04 21:59:08 +05:30
marination
75fcfbb49c chore: Delete Quoted Item Comparison Report 2020-11-04 21:24:04 +05:30
marination
e3864c9b16 fix: Make sure row object has doctype so that read only property is applied to rows 2020-11-04 21:08:36 +05:30
marination
413b1c3b43 fix: SO to PO Mapping Issue
- removed type: GET , which made the URL longer
- Added only relevant fields from Items table to Dialog table to reduce args load
- Made separate method to set table data in dialog
- Added freeze message
2020-11-04 21:08:27 +05:30
Rucha Mahabal
de79dd36e7
Merge pull request #23818 from ruchamahabal/fix-therapy-plan-template-v13
fix: therapy plan and session fixes
2020-11-04 21:06:58 +05:30
Rucha Mahabal
e50697d459 fix: sider 2020-11-04 20:24:04 +05:30
Rucha Mahabal
40246caf5e fix: therapy plan and session fixes 2020-11-04 20:13:53 +05:30
Mangesh-Khairnar
5756798689
fix: update integrations desk page (#23772) 2020-11-04 16:44:44 +05:30
rohitwaghchaure
ed2f9edcdd
Merge pull request #23813 from rohitwaghchaure/fixed-sequence-id-column-display-pre-release
fix: on save sequence id column override with workstation
2020-11-04 14:25:58 +05:30
Rohit Waghchaure
58c538d46b fix: on save sequence id column override with workstation 2020-11-04 13:35:42 +05:30
rohitwaghchaure
e0828a80c7
Merge pull request #23811 from rohitwaghchaure/sequence-id-column-override-withoperation-pre
fix: sequence id override with operation column
2020-11-04 13:16:21 +05:30
Rohit Waghchaure
4cf346c082 fix: sequence id override with operation column 2020-11-04 13:14:28 +05:30
Rucha Mahabal
bc8809f4bf
Merge pull request #23800 from ruchamahabal/fix-ipme-v13
fix: Inpatient Medication Order and Entry fixes
2020-11-03 15:41:52 +05:30
Rucha Mahabal
6c135dd06d fix: Inpatient Medication Order and Entry fixes 2020-11-03 14:43:40 +05:30
Saqib
940e307194
fix: cannot save customer email & phone (#23798) 2020-11-03 10:51:18 +05:30
Saqib
a53e8404d1
fix: cannot add items to cart (#23795)
* fix: _ is not defined

* fix: item image alt gets overflowed due to large text

* fix: available item qty in pos search

* fix: cash shortcuts overflow
2020-11-03 10:07:50 +05:30
Saqib
ce7d7155db
fix: asset finance book posting date fix (#23779) 2020-10-30 15:30:27 +05:30
Rucha Mahabal
400737d005
Merge pull request #23768 from ruchamahabal/fix-issue-v13-beta
fix: set SLA variance in seconds for Duration fieldtype
2020-10-30 00:10:45 +05:30
Rucha Mahabal
1636383120
fix: subscription test case
Co-authored-by: Marica <maricadsouza221197@gmail.com>

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-10-30 00:09:55 +05:30
Rucha Mahabal
2bb7ed34d8
fix: Student Attendance error message (#23769) 2020-10-29 23:03:53 +05:30
Rucha Mahabal
c548d56498 fix: set SLA variance in seconds for Duration fieldtype (#23765)
* fix: calculate SLA variance in seconds for Duration fieldtype

* fix: sider
2020-10-29 22:41:38 +05:30
Saqib
825d79b31b
fix: pos profile has no attr 'show_only_available_items' (#23759) 2020-10-29 13:23:59 +05:30
Deepesh Garg
2004f64bcd
Merge pull request #23755 from deepeshgarg007/accounting_dimension_gl_fix_v13
fix: Do not allow Company as accounting dimension
2020-10-29 11:58:19 +05:30
Deepesh Garg
0dcb5887f3 fix: Do not allow Company as accounting dimension 2020-10-29 11:54:14 +05:30
Saqib
0d5aff54c2
fix: pos register shows cancelled documents (#23745) 2020-10-28 17:09:07 +05:30
Saqib
b088c783df
fix: item wise tax calculation (#23746) 2020-10-28 17:07:30 +05:30
Saqib
34873bf26b
fix: multiple pos issues (#23725)
* fix: point of sale search

* fix: pos fetches expired serial nos

* fix: pos doesn't refresh on route change

* fix: opening balances not set in opening entry

* fix: remove debug statement

* fix: invalid query if no serial no is reserved by pos invoice

* chore: make new order btn primary

* chore: filter warehouse by company

* chore: add shortcuts for new order and email

* fix: cannot fetch serial no if no batch control

* chore: add shortcuts for menu items

* feat: standard keyboard shortcuts for pos page

* feat: display only items that are in stock

* fix: empty point of sale page if opening entry dialog is closed

* feat: conversion factor in pos item details

* fix: show all invalid mode of payments

* chore: show all items if allow negative stock is checked

* fix: -ve amount set when changing mode of payment

* fix: pos closing validations

* fix: test

* fix: non expired serial no fetching query

* fix: cannot dismiss pos opening creation dialog

* fix: transalation strings

* fix: msgprint to throw

* chore: use as_list in frappe.throw

* chore: clean up pos invoice.js & .py

* fix: codacy

* fix: transalation syntax

* fix: codacy

* fix: set_missing_values called twice from pos page

* fix: mode selector with double spaces

* fix: do not allow tables in pos additional fields

* fix: pos is not defined

* feat: set mode of payments for returns

* fix: remove naming series from pos profile

* fix: error message

* fix: minor bugs

* chore: re-arrange pos closing entry detail fields

* fix: sider & frappe linter

* fix: more translation strings

* fix: travis

* fix: more translation strings

* fix: sider

* fix: travis

* fix: unexpected end of string

* fix: travis
2020-10-26 13:24:47 +05:30
Nabin Hait
da301b0b7a fix: merge conflict 2020-10-25 13:07:59 +05:30
Nabin Hait
ba1cca6b2d
fix: Show accounts in financial statements upto level 20 (#23718) 2020-10-24 22:00:32 +05:30
rohitwaghchaure
8be296b343
Merge pull request #23675 from rohitwaghchaure/feat-added-balance-serial-no-column-develop
feat: balance serial nos in stock ledger report
2020-10-24 19:04:31 +05:30
Rucha Mahabal
434791ed6e
feat: Therapy Plan Template (#23558)
* feat: Therapy Plan Template

* feat: Handle billing Therapy Plans created via Templates

* feat: add dashboard to Therapy Plan Template

* fix: codacy issues

* fix: sider

* fix: validate Therapy Session overlap

* feat: Create Sales Invoice from Therapy Plan

* fix: sider

* chore: added tests for Therapy Plan Template

* fix: test

* fix: test

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-10-24 14:20:38 +05:30
Rucha Mahabal
e977bc38a3
Merge pull request #23714 from ruchamahabal/education-module-fixes
fix: Education Module fixes
2020-10-24 01:08:42 +05:30
Rucha Mahabal
5ecf6b34b0
Merge branch 'develop' into education-module-fixes 2020-10-24 00:27:24 +05:30
Rucha Mahabal
1c4d732873 fix: sider and translation issues 2020-10-24 00:21:05 +05:30
Rucha Mahabal
b3f81ad5b0 fix: allow future attendance marking for leave applications 2020-10-23 21:21:58 +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
Marica
3ad9393ff8
fix: SO to PO flow improvement (#23357)
* fix: SO to PO flow improvement

* fix: Dont map shipping_address

- shipping_address is a text field in SO and link field in PO
- Drop shipping case handles its mapping
- normal case doesnt need to map

* fix: Hide/Add rows depending on Against Default Supplier

* fix: Removed Default Supplier Select field from popup

- removed Default Supplier Select field from popup
- only loop through suppliers of selected items if via default supplier
- only check for items in selected items

* fix: Sales Order Drop Shipping Test

* fix: (translation)Multi line to single line strings

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-10-23 19:40:55 +05:30
Marica
0bd576aa44
fix: RFQ UX fixes (#23382)
* chore: RFQ UX fixes

* fix: RFQ to SUpplier Quotation Dialog

* fix: Remove 'No Quote' functionality

- No Quote in Suppliers table is removed
- It's use everywhere has been removed too (tests, server side files, DOM event)

* chore: More Info section and Project field

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-10-23 19:38:30 +05:30
Deepesh Garg
c4be397954
Merge pull request #23439 from Mangesh-Khairnar/mpesa-integration
feat: M-pesa integration
2020-10-23 19:35:52 +05:30
Saqib
b4448114cf
feat: opening invoice creation tool with background jobs (#23595)
* feat: opening invoice creation tool with background jobs

* fix: tests

* fix: codacy

* fix: sider

* fix: codacy

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-10-23 19:32:37 +05:30
Marica
758a68da35
fix: Sequence Matcher shouldn't get None input (#23539)
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-10-23 19:26:43 +05:30