Commit Graph

38407 Commits

Author SHA1 Message Date
Afshan
c60d5523bc
fix: add child item groups into the filters (#26997)
* fix: add child item groups into the filters

* fix: appending values to proper variable

* fix: refactor the loop
2021-08-19 16:23:18 +05:30
Noah Jacob
6541453c16 fix(ux): removed rate from grid view 2021-08-19 15:53:55 +05:30
Alan
09f34e558e
fix: set production plan to completed even on over production (#27027) 2021-08-19 15:51:36 +05:30
Ankush Menat
993b0532f8
Merge pull request #27026 from ankush/eq_assign
fix: equality check instead of assignment


[skip ci]
2021-08-19 15:43:34 +05:30
Noah Jacob
cf8d2d97dd fix: Incorrect mandatory error message for warehouse 2021-08-19 15:43:20 +05:30
Ankush Menat
5b54d0436b
chore: revert "chore: ignore whitespace fixes from git blame"
This reverts commit 2c40b7c206.
2021-08-19 14:18:39 +05:30
Ankush Menat
2c40b7c206
chore: ignore whitespace fixes from git blame 2021-08-19 14:12:09 +05:30
Ankush Menat
0ef5247e2f
chore: whitespace cleanup from codebase (#27023)
* chore: mass trailing whitespace and EOF fixes

* chore: update git-blame-ignore-revs
2021-08-19 14:09:54 +05:30
Ankush Menat
49db369d21
chore: update git-blame-ignore-revs 2021-08-19 13:44:11 +05:30
Ankush Menat
4551d7d602
chore: mass trailing whitespace and EOF fixes 2021-08-19 13:43:28 +05:30
Deepesh Garg
869e36c33a
Merge pull request #26737 from nemesis189/payment-reconc-party-validation-fix
fix: Payment Reconciliation party validation issue
2021-08-19 12:40:54 +05:30
Afshan
ecd6584c50
fix: assigning values to rows in sales register reports (#26546)
* fix: assigning values to rows in sales register reports

* fix: check for is_internal_customer for unrealized_profit_loss_account
2021-08-19 12:18:27 +05:30
Frappe PR Bot
44434ff70f
fix: date_unchanged calculation in "Update Items" (#26992) (#27011)
Branch corrected https://github.com/frappe/erpnext/pull/26058

  ERPNext generates "Cannot set quantity less than delivered quantity" error even the delivered qty is zero when user clicks "Update Items".
  "date_unchanged" variable gets false value because of new_date is string.

  "getdate(new_date)" corrects the date comparison.

  ![ERPNext_PR](https://user-images.githubusercontent.com/710051/121928377-c0263180-cd48-11eb-8cd9-eda7dace09d6.gif)

(cherry picked from commit d8a7abcd02f674bf6c4270a817ae9762a0b57140)

Co-authored-by: Türker Tunalı <turkert@hotmail.com>
2021-08-18 18:33:06 +05:30
Subin Tom
ef792971f3
fix: Add ignore user perms to set_target_warehouse field in sales invoice (#26987)
* reverting ot v12.7.1

* fix: Ignore user permissions for set_target_warehouse in SI

Co-authored-by: Subin Tom <subin-home@Subins-MacBook-Air.local>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
2021-08-18 18:20:04 +05:30
Afshan
dc7280eef0
fix: filtering of items in Sales and Purchase Orders (#26936)
* fix: filtering of items in Sales and Purchase Orders

* fix: slider

* fix: slider
2021-08-18 17:44:40 +05:30
Afshan
87372c8ce4
Merge branch 'develop' into payment-reconc-party-validation-fix 2021-08-18 16:20:36 +05:30
Subin Tom
333e44eb47
fix: Dimension filter query fix to avoid including disabled dimensions (#26988)
* reverting ot v12.7.1

* fix: Dimension filter query fix to not display disabled dimensions

Co-authored-by: Subin Tom <subin-home@Subins-MacBook-Air.local>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
2021-08-18 16:17:54 +05:30
Afshan
2416b3a1ee
Merge branch 'develop' into payment-reconc-party-validation-fix 2021-08-18 16:03:47 +05:30
Marica
112fc888f1
fix: Return Qty in PR/DN for legacy data (#27001) 2021-08-18 15:29:48 +05:30
Saqib
cab49254fc
fix: failing tests in issue doctype (#26998) 2021-08-18 14:53:32 +05:30
Saqib
fbc163cea6
feat: dynamic conditions for applying SLA (#26662) 2021-08-18 11:53:26 +05:30
Rucha Mahabal
15df0ad6a0
fix: undefined variable due to inconsistent porting of commits (#26994) 2021-08-18 11:23:44 +05:30
rohitwaghchaure
c068e8128c
Merge pull request #26993 from rohitwaghchaure/fixed-sales-invoice-not-loading
fix: sales invoice not loading issue
2021-08-18 10:32:54 +05:30
Rohit Waghchaure
e0862de863 fix: sales invoice not loading issue 2021-08-18 10:27:58 +05:30
Afshan
5fec44446e
fix: set account for change amount even if pos profile not found (#26986) 2021-08-17 20:06:19 +05:30
Deepesh Garg
93fc469ace
Merge pull request #26973 from deepeshgarg007/payment_entry_unallocated_fix
fix: Incorrect unallocated amount calculation in payment entry
2021-08-17 19:13:58 +05:30
Mohammed Redah
a2966db1e5
fix: change print_format_type from Server to Jinja (#26374) 2021-08-17 18:45:55 +05:30
Deepesh Garg
fd739749ba test: Add test case for payment entry 2021-08-17 16:38:25 +05:30
Frappe PR Bot
a14d218834
fix: typo (#26967) (#26984)
(cherry picked from commit ace8cf965d2aab3faa18aa704e0e796f707cc666)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
2021-08-17 16:14:37 +05:30
Ankush Menat
8bbec42fa0
fix: undo changes to patch (#26983)
* fix: undo changes to patch

* ci: ignore empty body / head
2021-08-17 15:14:13 +05:30
Saqib
3c525e1136
fix(sla): 'doctype' is not defined (#26982) 2021-08-17 14:22:47 +05:30
Sagar Vora
d932cba38a
Merge pull request #26976 from resilient-tech/fix-incorrect-modified
fix: Incorrect `modified` time in documents that inherit from `StatusUpdater`
2021-08-17 13:17:09 +05:30
rohitwaghchaure
972da750bc
Merge pull request #26977 from rohitwaghchaure/fixed-added-missing-fieldname
chore: added missing field-name
2021-08-17 13:10:29 +05:30
Rohit Waghchaure
fbb328b84a chore: added missing fieldname 2021-08-17 13:07:03 +05:30
Deepesh Garg
b1bcb3bf13 fix: Incorrect unallocated amount calculation in payment entry 2021-08-17 11:28:46 +05:30
Rohit Waghchaure
e92a8b87da Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2021-08-17 11:02:56 +05:30
Rohit Waghchaure
eb1e3181a4 fix: conflicts while merging brnach version-13 to develop 2021-08-17 10:53:19 +05:30
Chillar Anand
8c851b7019
Merge pull request #26906 from ChillarAnand/label
fix: Changed label to "Inpatient Visit Charge" in appointment type
2021-08-17 10:39:18 +05:30
Rohit Waghchaure
b27eeb54ae Merge branch 'version-13-pre-release' into version-13 2021-08-17 10:05:50 +05:30
Rohit Waghchaure
03fdce5a19 bumped to version 13.9.0 2021-08-17 10:25:49 +05:50
rohitwaghchaure
6dd9e0194c
Merge pull request #26968 from rohitwaghchaure/release-notes-v13-9-0
chore: Release Notes v13.9.0
2021-08-16 22:17:47 +05:30
Rucha Mahabal
39efc62b94
feat: Organizational Chart (#26893)
* feat: Organizational Chart

* feat: org chart mobile interactions

* feat(mobile): sibling node group expansion and rendering

* fix: expanded node group interactions and visibility

* feat: connectors for mobile node cards

* fix: don't refresh connections for same node

- remove all connectors while expanding a group node

* chore: create separate files for Desktop and Mobile view and bundle assets

* refactor: add options to chart

- method to return the node data

- wrapper for showing the hierarchy

* feat: setup node edit action

* fix: revert changes in employee descendants query

* refactor: use arcs instead of bezier curves for cleaner connectors

* feat: add arc to connectors in mobile view

* fix: edit node button overflowing

* fix: sider

* fix: removing orphaned connectors

* fix: unnecessary variables

* feat: handle multiple root / orphan nodes

* perf: Optimise Rendering

- optimise get_children function

- use promises instead of callbacks

- optimise selectors

- use const wherever possible

- use pure js instead of jquery for connectors for faster rendering

* fix: do not sort by number of connections

* feat: use icon for connections on mobile view

* fix: exclude active node while fetching sibling group

* fix: sibling group expansion not working for root nodes

* fix(mobile): collapsed nodes not expanding

* fix: sider

* test: UI tests for org chart desktop

* test: UI tests for org chart mobile

fix(mobile): detach node before emptying hierarchy

fix(mobile): sibling group not rendering for first level

* fix: sider

* ci(cypress): use env variable for key

documentation ref: https://docs.cypress.io/guides/guides/command-line\#cypress-run

* fix(tests): clear filter before typing

* fix(tests): apply filters correctly

* fix: tests

* fix: tests

* fix: tests

* fix(test): increase timeout for record creation

* fix: sider

* fix: sider

* feat: Expand All nodes option in Desktop view

* feat: add html2canvas for easily exporting html to images using canvas

* feat: Export chart option in desktop view

* fix(style): longer titles overflowing

* fix: remove unnecessary imports

* fix: test

* fix: make bundled assets for hierarchy chart

* fix(style): apply svg container margin only in desktop view

* fix: Nest `.level` class style under `.hierarchy` class (#26905)

fix: Nest `.level` class style under `.hierarchy` class

* fix: add z-index to filter to avoid svg wrapper overlapping

* fix: expand all nodes not working when there are only 2 levels

- added dom freeze while expanding all nodes and exporting

* fix: test

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-08-16 20:42:23 +05:30
Rohit Waghchaure
9722641847 chore: Release Notes v13.9.0 2021-08-16 20:38:38 +05:30
Rucha Mahabal
33032ce07d fix: test 2021-08-16 19:27:29 +05:30
Deepesh Garg
a320a8f1df
Merge pull request #26966 from deepeshgarg007/distributed_budget_variance_report_v13_pre
fix: Budget variance missing values
2021-08-16 18:28:19 +05:30
Deepesh Garg
58c1739eac fix: Budget variance missing values 2021-08-16 18:04:57 +05:30
Ankush Menat
2a43fe1a22
ci: ignore backports while checking docs (#26962)
[skip ci]
2021-08-16 18:03:21 +05:30
Deepesh Garg
9c893e320d
Merge pull request #26960 from deepeshgarg007/distributed_budget_variance_report
fix: Budget variance missing values
2021-08-16 17:55:46 +05:30
Rucha Mahabal
bf75ea70fb
feat: Training Event Status Update and Validations (#26698)
* fix: training event employee status not updated on feedback submission

* feat: update attendees status on training event status update

* test: Training Event and Feedback

* chore: remove unused import
2021-08-16 17:22:51 +05:30
Deepesh Garg
8410e4854f fix: Budget variance missing values 2021-08-16 17:14:40 +05:30