Commit Graph

38257 Commits

Author SHA1 Message Date
18alantom
7433b97106 refactor: shift auto entry of is process loss check, update validations 2021-08-17 16:35:16 +05:30
18alantom
3df8d0cdf0 fix: add warehouse and unset is scrap for process loss items 2021-08-17 16:29:42 +05:30
18alantom
984c97ed4e feat: add is process loss autoset and validation 2021-08-17 16:28:54 +05:30
18alantom
b6dc0efa27 feat: add provision for process loss in manufac 2021-08-17 16:23:19 +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
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
Deepesh Garg
3b4258b817
Merge pull request #26958 from deepeshgarg007/export_type_mandatory_v13_pre
fix: Add mandatory depends on condition for export type field
2021-08-16 15:16:07 +05:30
Anupam Kumar
a9a24051c9
feat: enable track changes for leave type (#26917)
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
2021-08-16 14:48:53 +05:30
Deepesh Garg
4b9c127494 Merge branch 'version-13-pre-release' of https://github.com/frappe/erpnext into export_type_mandatory_v13_pre 2021-08-16 14:38:54 +05:30
Deepesh Garg
b58b1127f3 fix: Add mandatory depends on condition for export type field 2021-08-16 14:36:50 +05:30
Deepesh Garg
9b564a7b51
Merge pull request #26955 from deepeshgarg007/export_type_mandatory
fix: Add mandatory depends on condition for export type field
2021-08-16 14:16:32 +05:30
Deepesh Garg
3f07bb7021 fix: Add mandatory depends on condition for export type field 2021-08-16 13:18:39 +05:30
Rucha Mahabal
67e3971c3b
fix: Org Chart fixes (#26952)
* 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
2021-08-16 10:38:39 +05:30
Rucha Mahabal
0b4959966c fix: expand all nodes not working when there are only 2 levels
- added dom freeze while expanding all nodes and exporting
2021-08-16 10:19:48 +05:30
Rucha Mahabal
4c612b7cb2 fix: add z-index to filter to avoid svg wrapper overlapping 2021-08-15 21:32:39 +05:30
Rucha Mahabal
4981746b9a
Merge branch 'develop' into org-chart-develop 2021-08-15 20:50:56 +05:30
Suraj Shetty
1514916520 fix: Nest .level class style under .hierarchy class (#26905)
fix: Nest `.level` class style under `.hierarchy` class
2021-08-15 20:43:16 +05:30
Deepesh Garg
7145e9d183
Merge pull request #26359 from GangaManoj/enable-discount-accounting
feat: Enable discount accounting
2021-08-14 18:05:29 +05:30
Frappe PR Bot
b5926a33b3
fix: unknown attribute "string_type" (#26947) (#26950)
(cherry picked from commit 6aed9e26acaf266f7260adab16656d554c6bb022)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-08-14 10:48:33 +05:30
GangaManoj
f9356ee642 fix: Sider issues 2021-08-13 17:40:51 +05:30
GangaManoj
f977c65e80 fix: Make enable_discount_accounting a class property 2021-08-13 17:17:58 +05:30
GangaManoj
5999760a65 fix: Syntax error 2021-08-13 17:13:38 +05:30
Marica
f1c9766748
Merge pull request #26943 from frappe-pr-bot/backport/version-13-pre-release/26942
fix: (Stock Analytics) Copy previous balance dict object instead of assigning
2021-08-13 16:01:21 +05:30
Deepesh Garg
5122948450 Merge branch 'develop' of https://github.com/frappe/erpnext into enable-discount-accounting 2021-08-13 16:00:20 +05:30
Marica
2e6899fbe4 fix: Copy previous balance dict object instead of assigning (#26942)
- Due to plain assignment, dict mutation gave wrong monthly values

(cherry picked from commit fe2a34f171)
2021-08-13 10:08:41 +00:00
Marica
fe2a34f171
fix: Copy previous balance dict object instead of assigning (#26942)
- Due to plain assignment, dict mutation gave wrong monthly values
2021-08-13 15:37:45 +05:30
Ankush Menat
8a6b82b196
ci: ignore js files in unittests (#26934)
* ci: ignore js files in unittests

- Avoid running python unittests on PRs that ONLY change JS files.

* ci: ignore md files in test workflows
2021-08-13 12:59:27 +05:30
Shariq Ansari
b32c2fa561
fix: updated erpnext wspace json files (#26380)
* fix: updated erpnext wspace json files

* fix: updated wspace json files

* fix: updated wspace json files

* fix: removed padding code from  wspace json files

* fix: Updated restrict_to_domain in wspace json

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-08-13 12:19:16 +05:30
Afshan
587d2db6a9
fix: show proper currency symbol in taxes and charges table (#26827)
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-08-13 10:59:06 +05:30
Afshan
1de4c01942
fix: Deferred Revenue Section should be collapsible only if its not enabled (#26928) 2021-08-12 23:06:34 +05:30
Noah Jacob
b8658d003f
fix: from_warehouse getting set to None (#26920) 2021-08-12 20:03:28 +05:30
Frappe PR Bot
f4b2f4aaf7
fix: ZeroDivisionError on creating e-invoice for credit note (#26918) 2021-08-12 17:11:38 +05:30