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
Frappe PR Bot
255b99ebdc
feat: Employee reminders ( #25735 ) ( #27115 )
...
* feat: Add reminders section to HR Settings
* refactor: Extract generic function for getting Employees
* feat: Employee Work Anniversary Reminder
* feat: Daily Holiday Reminder
* fix: Unnecessary params and replace [] with .get()
* test: Daily Holiday Reminders
* test: is_holiday basic tests
* refactor: Move employee reminders code to separate module
* feat: Add advance reminder to HR settings
* feat: Advance Holiday Reminders
* refactor: get_holidays_for_employee
* feat: Email holiday reminders in advance + tests
* fix: Remove unused import
* refactor: HR Setting Reminder Section
* refactor: Remove Daily Holiday Reminders feat
* feat: Reminder miss warning
* fix: Failing test and function name change
* chore: Add patch for field rename
* chore: Rename frequency label
* fix: Failing patch test
* fix: sider and removed description of fields
* fix: email alignment
Co-authored-by: pateljannat <pateljannat2308@gmail.com>
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
(cherry picked from commit 24b2a315818d08ad4cb03347ccf5297df916a5ac)
Co-authored-by: Mohammad Hussain Nagaria <34810212+NagariaHussain@users.noreply.github.com>
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
2021-08-24 20:19:22 +05:30
Subin Tom
d4d5a4221a
feat: coupon code discount in pos invoice ( #27004 )
2021-08-24 16:22:46 +05:30
Ankush Menat
6de7b8ea93
fix: discard empty rows from update items ( #27021 )
2021-08-24 12:18:40 +05:30
Subin Tom
7d627df4db
fix: pos return payment mode issue ( #26872 )
2021-08-23 11:05:07 +05:30
Saqib
153fe1cdb4
refactor: scan barcode field scanning ( #26990 )
2021-08-20 11:09:51 +05:30
Ankush Menat
4551d7d602
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +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
Rohit Waghchaure
eb1e3181a4
fix: conflicts while merging brnach version-13 to develop
2021-08-17 10:53:19 +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
Deepesh Garg
a7054560da
Merge branch 'develop' into po-payment-terms
2021-08-11 19:31:30 +05:30
Deepesh Garg
bff3b0962a
fix: Override template only if setting is enabled
2021-08-10 23:58:27 +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 b614834efe
)
# 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
Afshan
b614834efe
fix: unseting of payment if no pos profile found ( #26884 )
2021-08-10 21:33:58 +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
Rucha Mahabal
f9afade7dc
fix: test
2021-08-10 18:02:41 +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
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
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
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
Anuja Pawar
0e337be065
fix: cost center & account validation in Sales/Purchase Taxes and Charges ( #25929 )
2021-08-10 17:26:35 +05:30
Nabin Hait
f8031d3d79
Merge pull request #26261 from ruchamahabal/org-chart
...
feat: Organizational Chart
2021-08-10 17:12:59 +05:30
Subin Tom
793063bf4e
fix: pos return payment mode issue ( #26875 )
2021-08-10 15:57:30 +05:30
marination
f22b858253
fix: Clean Serial No input on Server Side
2021-08-10 14:35:41 +05:30
Deepesh Garg
bcf56e64ba
fix: Ignore default payment term templates when coping payment terms from orders
2021-08-09 18:53:14 +05:30
Deepesh Garg
a27ef14db6
fix: Override template only if setting is enabled
2021-08-07 00:12:57 +05:30
Deepesh Garg
0bba425fe3
fix: Ignore default payment term templates when coping payment terms from orders
2021-08-06 23:53:16 +05:30
Marica
7cbd755951
Merge branch 'develop' into serial-no-space
2021-07-30 14:09:19 +05:30
walstanb
655b5dc190
fix: date as reference_date from bank transactions
2021-07-28 14:30:11 +05:30
Deepesh Garg
8d52a22709
fix: Additional discount calculations in Invoices ( #26553 )
...
* fix: Additional discount calculations in Invoices
* revert: Client side handling for Dynamic GST Rates
* fix: Add update item tax template method back
* fix: Revert refresh field
* fix: add company change trigger
2021-07-26 19:00:57 +05:30
Frappe PR Bot
4209b3bda9
fix: included company in Link Document Type filters for contact ( #26576 ) ( #26634 )
...
(cherry picked from commit cbddedab7b
)
Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
2021-07-26 13:00:32 +05:30
Noah Jacob
cbddedab7b
fix: included company in Link Document Type filters for contact ( #26576 )
2021-07-26 12:54:35 +05:30
Rucha Mahabal
c676eaae57
fix: test
2021-07-25 23:11:18 +05:30
Rucha Mahabal
37198159aa
feat: Export chart option in desktop view
2021-07-25 20:28:01 +05:30
Anurag0911
4128aa7628
fix: syntax error ( #26610 )
...
Removed "," at erpnext/public/js/controllers/taxes_and_totals.js:87
2021-07-23 16:52:42 +05:30
Nabin Hait
595c7a6e61
fix: merge conflict
2021-07-22 17:11:20 +05:30
marination
eecfc4c0ae
fix: Clean Serial No input on Server Side
2021-07-22 13:23:54 +05:30
Nabin Hait
13466bba90
Merge pull request #26588 from deepeshgarg007/tax_flow_fix_pre_release
...
fix: Additional discount calculations in Invoices
2021-07-22 11:30:47 +05:30
Rucha Mahabal
1176761757
feat: Expand All nodes option in Desktop view
2021-07-21 23:19:47 +05:30
Deepesh Garg
9ab18b5341
fix: add company change trigger
2021-07-21 23:18:17 +05:30
Deepesh Garg
9fa92c912b
fix: Revert refresh field
2021-07-21 23:18:17 +05:30
Deepesh Garg
72eb72f66f
fix: Add update item tax template method back
2021-07-21 23:18:17 +05:30
Deepesh Garg
50b188214d
revert: Client side handling for Dynamic GST Rates
2021-07-21 23:18:17 +05:30
Deepesh Garg
f9da88cb15
fix: Additional discount calculations in Invoices
2021-07-21 23:17:56 +05:30
Suraj Shetty
85c8daae9c
fix: Pass doc and other parameters to properly prefill information - while creating customer from form dashboard
2021-07-20 10:24:14 +05:30
Suraj Shetty
c077314568
fix: Pass doc and other parameters to properly prefill information
...
- while creating customer from form dashboard
2021-07-20 09:57:18 +05:30
Rucha Mahabal
ee7eaf9c70
test: UI tests for org chart mobile
...
fix(mobile): detach node before emptying hierarchy
fix(mobile): sibling group not rendering for first level
2021-07-15 19:19:09 +05:30
Rucha Mahabal
f004b404d1
test: UI tests for org chart desktop
2021-07-14 23:50:54 +05:30
Deepesh Garg
13fffeb97b
Merge pull request #26473 from deepeshgarg007/bootstrapped_gst_setup_develop
...
feat(India): Bootstrapped GST Setup
2021-07-14 16:44:12 +05:30
Kenneth Sequeira
513375f264
fix: Nested/Multi-level BOM help link ( #26409 )
...
Updated the link for multi-level boms. Current link is broken.
2021-07-14 16:07:47 +05:30
Kenneth Sequeira
7a89033163
fix: update integration links in help.js ( #26483 )
2021-07-14 16:07:31 +05:30
Kenneth Sequeira
24e08301bc
fix: update integration links in help.js ( #26483 )
2021-07-14 16:02:49 +05:30
Deepesh Garg
2908f2ee20
fix: Revert Changes
2021-07-13 16:49:21 +05:30
Deepesh Garg
1001f29784
fix: Gracefully handle duplicate bank account name to make setup faster
2021-07-13 16:47:38 +05:30
Deepesh Garg
07d9f3f74b
fix: Incorrect discount amount on amended document
2021-07-13 15:35:59 +05:30
Deepesh Garg
eef8e4a9d4
Merge pull request #26292 from deepeshgarg007/amended_doc_discount
...
fix: Incorrect discount amount on amended document
2021-07-13 15:34:24 +05:30
Rucha Mahabal
fc4079587b
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into org-chart
2021-07-13 12:38:37 +05:30
Deepesh Garg
4ff98cc171
fix: Incorrect discount amount on amended document
2021-07-12 11:27:28 +05:30
Kenneth Sequeira
862ce916ae
fix: Nested/Multi-level BOM help link ( #26409 )
...
Updated the link for multi-level boms. Current link is broken.
2021-07-09 21:52:50 +05:30
Rucha Mahabal
4582f28d0d
fix: sider
2021-07-09 01:25:26 +05:30
Rucha Mahabal
24b31c0bf9
fix(mobile): collapsed nodes not expanding
2021-07-09 01:03:02 +05:30
Rucha Mahabal
06fc9e7847
fix: sibling group expansion not working for root nodes
2021-07-08 18:44:53 +05:30
Rucha Mahabal
05ffc0d3e0
feat: use icon for connections on mobile view
2021-07-08 16:55:42 +05:30
Rucha Mahabal
48018b8d8c
fix: do not sort by number of connections
2021-07-08 11:23:50 +05:30
Rucha Mahabal
df3bb9ea8c
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-07-08 09:53:31 +05:30
Rucha Mahabal
6eec251273
feat: handle multiple root / orphan nodes
2021-07-07 12:05:50 +05:30
Rucha Mahabal
6d5ee25bba
fix: unnecessary variables
2021-07-07 09:43:28 +05:30
Rucha Mahabal
ad06603392
fix: removing orphaned connectors
2021-07-06 18:16:49 +05:30
Deepesh Garg
63096014a7
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into bootstraped_gst_setup
2021-07-02 20:30:18 +05:30
Rucha Mahabal
2fcd05aa82
fix: sider
2021-07-02 18:15:18 +05:30
Deepesh Garg
991d3cdd76
fix: Incorrect discount amount on amended document
2021-07-01 21:17:17 +05:30
Rucha Mahabal
77b0b8a877
fix: edit node button overflowing
2021-06-30 02:29:16 +05:30
Rucha Mahabal
b8a18bfef1
feat: add arc to connectors in mobile view
2021-06-30 01:57:43 +05:30
Rucha Mahabal
a7507f7af6
refactor: use arcs instead of bezier curves for cleaner connectors
2021-06-30 01:46:10 +05:30
Rucha Mahabal
c40b9d276e
feat: setup node edit action
2021-06-29 21:51:21 +05:30
Rucha Mahabal
f15e8b7f5a
refactor: add options to chart
...
- method to return the node data
- wrapper for showing the hierarchy
2021-06-29 21:26:47 +05:30
Rucha Mahabal
bcc998e8c2
chore: create separate files for Desktop and Mobile view and bundle assets
2021-06-29 19:15:08 +05:30
Deepesh Garg
1e5482cedd
fix: Revert Changes
2021-06-26 23:49:32 +05:30
Deepesh Garg
3239f774bd
Merge pull request #26183 from deepeshgarg007/item_tax_fetch_fix_develop
...
fix: User is not able to change item tax template
2021-06-25 10:46:14 +05:30
Deepesh Garg
7b7796c1ed
fix: Linting fixes
2021-06-24 21:13:18 +05:30