Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
38,310 Commits 3 Branches 0 Tags
Commit Graph

28784 Commits

Author SHA1 Message Date
Marica
e8be3a5243
Merge branch 'develop' into stock-analytics 2021-08-11 10:35:33 +05:30
Deepesh Garg
bff3b0962a fix: Override template only if setting is enabled 2021-08-10 23:58:27 +05:30
Rucha Mahabal
9855bbb95e fix(style): apply svg container margin only in desktop view (#26894) 2021-08-10 23:53:02 +05:30
Rucha Mahabal
15cb248d9e fix(style): apply svg container margin only in desktop view 2021-08-10 23:44:08 +05:30
Rohit Waghchaure
7167fd00bc Merge branch 'version-13-hotfix' into merged-v13-hotfix-into-pre-release 2021-08-10 23:30:16 +05:30
Frappe PR Bot
1167a9bf94
fix: unsetting of payment if no pos profile found (#26891) 
* fix: unseting of payment if no pos profile found (#26884)

(cherry picked from commit b614834efedbef572e0567828f0d9d82e81331ee)

# Conflicts:
#	erpnext/public/js/controllers/taxes_and_totals.js

* fix: conflicts

* fix: conflicts

* fix: conflicts

* fix: conflicts

Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
Co-authored-by: Afshan <afshan13k@gmail.com>
 2021-08-10 23:18:23 +05:30
Frappe PR Bot
b7b111c3ed
fix: unseting of payment if no pos profile found (#26884) (#26890) 
(cherry picked from commit b614834efedbef572e0567828f0d9d82e81331ee)

Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-08-10 22:52:37 +05:30
Afshan
b614834efe
fix: unseting of payment if no pos profile found (#26884) 2021-08-10 21:33:58 +05:30
marination
eb2050b407 fix: Brand filter in Stock Analytics 2021-08-10 20:37:09 +05:30
Anupam Kumar
a6aa6cd7d6
fix: timesheet amount issue (#25993) 
* fix: timesheet amount issue

* fix: timesheet detail rate conversion

* fix: condition to check timesheet currency

* fix: removing console statement
 2021-08-10 20:32:15 +05:30
Rucha Mahabal
52cd007292 fix: make bundled assets for hierarchy chart 2021-08-10 20:13:28 +05:30
Frappe PR Bot
1a39d1a311
fix: cost center & account validation in Sales/Purchase Taxes and Charges (#26881) 2021-08-10 19:38:39 +05:30
Anuja Pawar
66784a16cb
fix: Sales Return cancellation if linked with Payment Entry (#26883) 2021-08-10 19:38:16 +05:30
Marica
d657f39ab8
Merge pull request #25622 from noahjacob/promo_scheme_feat 
feat: added multi-select fields to create multiple pricing rules.
 2021-08-10 19:09:42 +05:30
marination
55d8aaf0b6 fix: Stock Analytics Report must consider warehouse during calculation 2021-08-10 19:01:05 +05:30
Marica
af9863146d
fix: Grammar in Error message 2021-08-10 18:49:07 +05:30
Noah Jacob
49b7c7575e refactor: code cleanup 2021-08-10 18:35:46 +05:30
Noah Jacob
4ee6e32d74 test(fix): fixed test case 2021-08-10 18:34:18 +05:30
Rucha Mahabal
f9afade7dc fix: test 2021-08-10 18:02:41 +05:30
Rucha Mahabal
c1bb4eec9c fix: remove unnecessary imports 2021-08-10 18:02:31 +05:30
Rucha Mahabal
5f0edca3f3 fix(style): longer titles overflowing 2021-08-10 18:02:21 +05:30
Rucha Mahabal
78f50a9809 feat: Export chart option in desktop view 2021-08-10 18:02:05 +05:30
Rucha Mahabal
6f799d17ce feat: Expand All nodes option in Desktop view 2021-08-10 18:01:15 +05:30
Rucha Mahabal
982a097d7a fix: tests 2021-08-10 18:00:27 +05:30
Rucha Mahabal
525d4d4776 fix: sider 2021-08-10 17:56:13 +05:30
Rucha Mahabal
a1d379d5d4 test: UI tests for org chart mobile 
fix(mobile): detach node before emptying hierarchy

fix(mobile): sibling group not rendering for first level
 2021-08-10 17:56:04 +05:30
Rucha Mahabal
3cc85e166f test: UI tests for org chart desktop 2021-08-10 17:55:53 +05:30
Rucha Mahabal
e1cf7712d9 fix: sider 2021-08-10 17:55:17 +05:30
Rucha Mahabal
9e7302a21e fix(mobile): collapsed nodes not expanding 2021-08-10 17:55:08 +05:30
Rucha Mahabal
9270de59f4 fix: sibling group expansion not working for root nodes 2021-08-10 17:51:37 +05:30
Rucha Mahabal
c79316a9c0 fix: exclude active node while fetching sibling group 2021-08-10 17:51:28 +05:30
Rucha Mahabal
1a3c335feb feat: use icon for connections on mobile view 2021-08-10 17:50:13 +05:30
Rucha Mahabal
b6715189fb fix: do not sort by number of connections 2021-08-10 17:50:02 +05:30
Rucha Mahabal
a48b23e6a5 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
 2021-08-10 17:49:53 +05:30
Rucha Mahabal
31a0f36ed9 feat: handle multiple root / orphan nodes 2021-08-10 17:49:44 +05:30
Rucha Mahabal
97d2bab434 fix: unnecessary variables 2021-08-10 17:49:36 +05:30
Rucha Mahabal
6a4cce2431 fix: removing orphaned connectors 2021-08-10 17:49:27 +05:30
Rucha Mahabal
781d1bf28d fix: sider 2021-08-10 17:49:12 +05:30
Rucha Mahabal
d363f9db3d fix: edit node button overflowing 2021-08-10 17:48:23 +05:30
Rucha Mahabal
6d06d8c207 feat: add arc to connectors in mobile view 2021-08-10 17:48:13 +05:30
Rucha Mahabal
4e7cda6e65 refactor: use arcs instead of bezier curves for cleaner connectors 2021-08-10 17:48:02 +05:30
Rucha Mahabal
e179cd9841 fix: revert changes in employee descendants query 2021-08-10 17:47:53 +05:30
Rucha Mahabal
aacb649050 feat: setup node edit action 2021-08-10 17:47:43 +05:30
Rucha Mahabal
249621af1b refactor: add options to chart 
- method to return the node data

- wrapper for showing the hierarchy
 2021-08-10 17:47:06 +05:30
Rucha Mahabal
281241dc24 chore: create separate files for Desktop and Mobile view and bundle assets 2021-08-10 17:46:51 +05:30
Rucha Mahabal
e9c6ea077f fix: don't refresh connections for same node 
- remove all connectors while expanding a group node
 2021-08-10 17:46:40 +05:30
Rucha Mahabal
fb9b628b89 feat: connectors for mobile node cards 2021-08-10 17:46:20 +05:30
Rucha Mahabal
25c5cff3de fix: expanded node group interactions and visibility 2021-08-10 17:46:10 +05:30
Rucha Mahabal
5046cb09d8 feat(mobile): sibling node group expansion and rendering 2021-08-10 17:45:51 +05:30
Rucha Mahabal
8a33a039f7 feat: org chart mobile interactions 2021-08-10 17:44:52 +05:30