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
Deepesh Garg
8cdd7ce7b6
fix: Add python 3 compatible string types
2021-06-24 21:13:10 +05:30
Deepesh Garg
b4b76b75cd
Merge pull request #26176 from deepeshgarg007/item_tax_fetch_fix
...
fix: User is not able to change item tax template
2021-06-24 19:55:49 +05:30
Deepesh Garg
1658107a92
fix: Linting fixes
2021-06-24 19:18:50 +05:30
Deepesh Garg
e21e435a0d
fix: Add python 3 compatible string types
2021-06-24 19:17:58 +05:30
Deepesh Garg
755ebdf582
Update party.js
2021-06-24 17:35:14 +05:30
Deepesh Garg
e693cceb58
Merge pull request #26132 from noahjacob/shipping_address_fix
...
fix: fetch preferred shipping address
2021-06-24 17:31:21 +05:30
Deepesh Garg
f84f8d5260
Update party.js
2021-06-24 17:29:55 +05:30
Noah Jacob
dbdf2515cd
fix: fetches correct preferred shipping address
2021-06-24 17:06:18 +05:30
Deepesh Garg
94d460412a
fix: User is not able to change item tax template
2021-06-24 10:39:49 +05:30
Deepesh Garg
03b629c851
Merge pull request #26100 from deepeshgarg007/pi_billing_address
...
fix: Billing address not fetched in Purchase Invoice
2021-06-24 10:29:01 +05:30
Deepesh Garg
da7f45130b
fix: Billing address not fetched in Purchase Invoice
2021-06-24 10:25:24 +05:30
Deepesh Garg
1f7b95f390
fix: User is not able to change item tax template
2021-06-23 20:56:27 +05:30
Noah Jacob
b4b6288596
fix: fetches correct preferred shipping address
2021-06-23 17:05:44 +05:30
Deepesh Garg
673470705b
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into bootstraped_gst_setup
2021-06-23 11:33:15 +05:30
Saqib
fb89008a13
fix(pos): unsupported operand type -=: for 'float' and 'NoneType' ( #26097 )
2021-06-21 10:49:09 +05:30
Saqib
7ff19ebec8
fix(pos): unsupported operand type -= for 'float' and 'NoneType' ( #26096 )
2021-06-21 10:48:50 +05:30
Rohit Waghchaure
f0dfea1d47
fix: test case for Project Profitability report
2021-06-20 15:31:25 +05:30
Rohit Waghchaure
110e152fa3
fix: purchase invoice qty change not recalculate the consumed qty and added test cases for purchase invoice
2021-06-20 15:28:23 +05:30
Rohit Waghchaure
6bbc8ec3e8
fix: code cleanup and convert public method to private for subcontracting class
2021-06-20 15:27:04 +05:30
Rohit Waghchaure
5cc3f14506
fix: purchase invoice qty change not recalculate the consumed qty and added test cases for purchase invoice
2021-06-19 23:16:23 +05:30
Rohit Waghchaure
ddb0ec261a
fix: code cleanup and convert public method to private for subcontracting class
2021-06-19 23:16:23 +05:30
Deepesh Garg
a58b571ccb
fix: Billing address not fetched in Purchase Invoice
2021-06-18 10:45:35 +05:30
Ankush
fd84847f2b
fix: syntax fixes for native class ( #26064 )
2021-06-16 11:14:40 +05:30
Nabin Hait
0950481253
fix: merge conflict
2021-06-15 20:18:06 +05:30
Himanshu
ec25d5938b
feat(SLA): Apply SLA to any document ( #22449 )
2021-06-14 19:05:52 +05:30
Ankush Menat
348f04ca82
fix: syntax error in serial/batch selector ( #26024 )
2021-06-11 21:01:30 +05:30
Nabin Hait
d17217c4e2
Merge pull request #25831 from deepeshgarg007/tds_advance_payment_v13
...
feat: Tax deduction against advance payments
2021-06-10 20:25:30 +05:30
Deepesh Garg
5434dd048b
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into dynamic_gst_rates
2021-06-10 18:56:39 +05:30
Deepesh Garg
758db793be
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13
2021-06-09 13:39:07 +05:30
Jannat Patel
6b8c123fd9
fix: Quiz timer ( #25983 )
...
* fix: quiz timer
* fix: pass time bound parameter
* fix: sider
2021-06-08 18:57:49 +05:30
pateljannat
7ace06ac21
fix: sider
2021-06-08 18:26:23 +05:30
pateljannat
bbf07d9214
fix: quiz timer issues
2021-06-08 17:05:44 +05:30
Deepesh Garg
6f2dacc60c
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13
2021-06-06 19:31:50 +05:30
Deepesh Garg
3646c301ed
fix: Linting issues
2021-06-05 13:21:03 +05:30
Deepesh Garg
8a7e283926
feat: Item Taxes based on net rate
2021-06-04 22:53:26 +05:30
Rohan Bansal
a06ec03efc
test: add test for new QI function
2021-06-02 14:55:31 +05:30
Rohan Bansal
11aff80dea
Merge remote-tracking branch 'upstream/version-13-hotfix' into dev-quality-inspection-accounts
2021-06-02 14:22:32 +05:30
Deepesh Garg
2f5885627d
fix: Labeling and other fixes
2021-06-01 11:07:18 +05:30
Nabin Hait
a3d1b6973a
fix: merge conflict
2021-05-31 11:21:33 +05:30
Deepesh Garg
4311fdc3a1
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into bootstraped_gst_setup
2021-05-27 17:49:23 +05:30
anushka19
04dfaf3b2a
fix: Broken help links fixed
2021-05-27 17:45:37 +05:30
Rohan Bansal
1cdf5a0dba
fix: add requested changes
2021-05-26 14:42:15 +05:30
Rohan Bansal
c5b074269a
Merge remote-tracking branch 'upstream/version-13-hotfix' into dev-quality-inspection-accounts
2021-05-26 14:32:14 +05:30
Ankush Menat
ff96bdf0c1
fix(ux): fix unstranslated text in msgprint/throw
2021-05-25 20:59:20 +05:30
Deepesh Garg
36d47f97f4
fix: Linting issues
2021-05-25 17:40:04 +05:30
Deepesh Garg
b07f7d1b70
fix: Linting and other fixes
2021-05-25 17:39:04 +05:30
Deepesh Garg
e2f83ffaa4
fix: Linting fixes and other checks
2021-05-25 17:35:41 +05:30
Deepesh Garg
fd380d34f9
fix: Linting errors
2021-05-25 17:35:05 +05:30
Deepesh Garg
c26de28613
fix: TDS against Purhase Orders
2021-05-25 17:25:13 +05:30
Deepesh Garg
61c5e478af
feat: Tax deduction against advance payments
2021-05-25 17:20:52 +05:30
Suraj Shetty
540c82712a
Merge pull request #25803 from surajshetty3416/fix-extend-cscript
2021-05-23 13:39:09 +05:30
Rucha Mahabal
59961f70ee
refactor: timesheet
2021-05-22 10:21:04 +05:30
Suraj Shetty
81d49e9c71
fix: Use extend_cscript function to properly extend class methods to cscript
2021-05-21 17:03:09 +05:30
rohitwaghchaure
651e934415
Merge pull request #25683 from noahjacob/supplier_item_group_link
...
feat: linking supplier with an item group for filtering items
2021-05-21 12:07:53 +05:30
Rucha Mahabal
be247ec3de
fix: error message placeholders and sider issues
2021-05-20 22:17:20 +05:30
noahjacob
ca2fb47d44
feat: updates item_code filters if item_group is linked to supplier
2021-05-18 15:01:05 +05:30
Suraj Shetty
a83d2aacd9
Merge branch 'develop' into esbuild
2021-05-18 14:48:28 +05:30
Nabin Hait
8b2fef11b1
fix: merge conflict
2021-05-17 11:37:14 +05:30
Anupam
35137ba9e0
removing currency filter and added rate conversion while fetching timesheets in SI
2021-05-16 14:17:56 +05:30
Anupam
fd4743cc31
refactor: timesheet
2021-05-15 20:01:17 +05:30
Alan
55c2fec683
feat: add pending qty section to batch/serial selector dialog ( #25519 )
...
* feat: add pending qty section to batch/serial selector dialog
* fix: call attach in setup and refresh, fix conditional
* refactor: camel to snake casing
2021-05-14 12:36:41 +05:30
Alan
eca86290bc
fix: show uom for item in selector dialog ( #25697 )
2021-05-14 12:21:38 +05:30
Prssanna Desai
0eb3a38c9d
fix: quiz evalutation issue ( #25671 )
2021-05-13 12:17:28 +05:30
Deepesh Garg
83f98f6992
Merge pull request #25653 from deepeshgarg007/tax_labels
...
fix: Client script breaking while settings tax labels
2021-05-10 18:24:02 +05:30
Deepesh Garg
9f0823a164
fix: Linting issues
2021-05-10 16:07:41 +05:30
Deepesh Garg
13dfb9734c
fix: Lable for transaction child tables
2021-05-10 15:38:32 +05:30
Deepesh Garg
1a48eb49cf
fix: Client script breaking while settings tax labels
2021-05-10 14:37:10 +05:30
Alan
c6dc9eaf2e
feat!: add pick batch button ( #25413 )
...
* feat!: add pick batch button
BREAKING CHANGE: replaces setup_serial_no with setup_serial_or_batch_no.
* refactor: use setup_serial_or_batch_no instead of setup_serial_no
* refactor: use setup_serial_or_batch_no instead of setup_serial_no
* refactor: use setup_serial_or_batch_no instead of setup_serial_no
* style: add sider review changes
* refactor: make consice, extract function
* refactor: camel to snake casing
2021-05-07 20:30:04 +05:30
Faris Ansari
f97cc0367b
fix: initialize filters in constructor
2021-05-07 15:32:06 +05:30
Faris Ansari
69eb6d476e
Merge remote-tracking branch 'upstream/develop' into esbuild
2021-05-07 15:21:33 +05:30
Faris Ansari
464d838447
fix: Update bundle paths
2021-05-07 14:53:42 +05:30
Faris Ansari
f751738267
fix: Make js bundles
2021-05-07 14:51:05 +05:30
Nabin Hait
7481f54e0c
Merge branch 'version-13' into develop
2021-05-06 19:18:18 +05:30
Deepesh Garg
daf6c124a9
fix: Check if payment schedule exists
2021-05-06 16:47:02 +05:30
Deepesh Garg
be66ee9723
fix: Check if payment schedule exits before updating label
2021-05-06 16:46:55 +05:30
Deepesh Garg
a0ed517c85
fix: function call to update payment schedule labels
2021-05-06 16:46:47 +05:30
Deepesh Garg
ffea9d4126
fix: Check if payment schedule exists
2021-05-05 12:28:40 +05:30
Deepesh Garg
1bb7bb74ad
fix: Check if payment schedule exits before updating label
2021-05-05 12:19:57 +05:30
Deepesh Garg
04923d6a65
fix: function call to update payment schedule labels
2021-05-04 21:01:12 +05:30
Saqib
cdc99cdd49
fix(pos): incorrect expense account set in pos invoice ( #25543 )
2021-05-03 11:54:55 +05:30
Deepesh Garg
0ae702aab9
Merge branch 'develop' of https://github.com/frappe/erpnext into bootstraped_gst_setup
2021-05-02 22:37:04 +05:30
Deepesh Garg
f6610c96dd
fix: Gracefully handle duplicate bank account name to make setup faster
2021-05-02 12:23:11 +05:30
Saqib Ansari
3e83542360
fix: sider issues
2021-04-29 18:12:47 +05:30
Saqib Ansari
973afeac3c
feat: set dynamic labels for payment schedule fields
2021-04-29 18:12:27 +05:30
Saqib Ansari
a91eebf6aa
feat: base payment amount in payment schedule
2021-04-29 18:12:23 +05:30
Saqib Ansari
6fb417590f
fix: sider issues
2021-04-29 14:05:20 +05:30
Saqib Ansari
c5c9f9a941
feat: set dynamic labels for payment schedule fields
2021-04-23 15:34:58 +05:30
Saqib Ansari
d552fe6778
feat: base payment amount in payment schedule
2021-04-23 14:46:52 +05:30
Faris Ansari
1fe891b287
refactor: Replace Class.extend with native class
2021-04-23 08:04:00 +05:30
Alan
157b388209
fix: change subcontracted item display ( #25425 )
2021-04-21 21:00:22 +05:30
Marica
e8bc912ffc
perf: Fetching exchange rate on every line item slows down PO ( #25345 )
...
* fix: Dont fetch exchange rates for each line item once fetched at parent
`
* perf: Use price list conversion rate from parent
- If price list conversion rate exists in args already from earlier call, use that
- `get_price_list_currency_and_exchange_rate` wont be called for each child row
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-04-19 11:05:21 +05:30
Jannat Patel
dcdd3bebbe
feat: Timer in LMS Quiz ( #24246 )
...
* feat: new fields in quiz doctypes
* feat: timer in lms quiz
* fix: variable initialisation
* fix: context, exception fix
* fix:sider
* fix:sider
* fix: indentation
* fix: timer
* fix: sider
* fix: return value and format
* fix: show time taken only after all attempts are over
* fix: sider
Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2021-04-19 10:36:40 +05:30
rohitwaghchaure
72929aab38
Merge pull request #24878 from anupamvs/planning
...
feat: add total available stock field in PO
2021-04-15 16:28:49 +05:30
Sun Howwrongbum
c50fbc6897
fix: list lookup with undefined variable ( #25210 )
...
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-04-15 14:52:13 +05:30
Anupam Kumar
ee0dda6ba5
Merge branch 'develop' into planning
2021-04-15 12:48:25 +05:30
Marica
4e25aa77dd
Merge branch 'develop' into dev-quality-inspection-accounts
2021-04-14 19:06:14 +05:30
Marica
f045fde9f4
Merge branch 'develop' into patch-8
2021-04-14 18:56:15 +05:30
Marica
24e45163d5
fix: Sider
2021-04-14 18:53:15 +05:30
Rohan Bansal
03f711e3a2
style: sider issues
2021-04-14 14:41:55 +05:30
Rohan Bansal
7f8b95efe8
fix: move QI logic to stock module
2021-04-14 14:15:45 +05:30
Deepesh Garg
b67058869a
fix: Round off final tax amount instead of current tax amount ( #25188 )
...
* fix: Round off final tax amount instead of current tax amount
* fix: Syntax error
* fix: Indentation
* fix: Round Off taxes order execution
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-04-14 11:20:27 +05:30
Nabin Hait
10c61376e3
fix: Backport missing commits to develop branch ( #25305 )
2021-04-13 15:46:01 +05:30
Marica
1f9d231acf
Merge branch 'develop' into patch-8
2021-04-13 15:43:46 +05:30
Rushabh Mehta
65f25c27b3
fix(minor): fix dynamically changing grid properties
2021-04-13 11:58:16 +05:30
Andy Zhu
bffe933c22
Fix: attempts to add overrides function
...
Overrides parent_fieldname in outer form to all child rows's fieldname
2021-04-12 22:49:26 +12:00
Anupam Kumar
cd2aedd0c6
Merge branch 'develop' into planning
2021-04-09 17:59:47 +05:30
Jannat Patel
d9fa79de99
fix: serial no refresh issue ( #25127 )
...
* fix: serial no refresh issue
* fix: sider
2021-04-08 16:04:57 +05:30
Anupam Kumar
dfdf72cbb2
Merge branch 'develop' into planning
2021-04-08 10:58:05 +05:30
Rohan Bansal
a93b514b2f
feat: create Quality Inspections from account and stock documents
2021-04-06 17:20:16 +05:30
Anupam Kumar
1033cf72f6
fix: added flag for dont_fetch_price_list_rate in transaction ( #25041 )
2021-03-31 19:39:45 +05:30
rohitwaghchaure
d5759bab11
Merge pull request #24922 from rohitwaghchaure/feat-recursice-pricing-rule
...
feat: recursive pricing rule
2021-03-26 19:10:10 +05:30
Prssanna Desai
3da2df55f4
Merge branch 'develop' into help-links-fix
2021-03-26 15:35:17 +05:30
prssanna
dd2a315d06
style: fix formatting
2021-03-26 14:35:47 +05:30
prssanna
97aab3ac21
fix: missing help links in navbar help dropdown
2021-03-24 16:44:49 +05:30
Anupam Kumar
d1bbb4c311
Merge branch 'develop' into planning
2021-03-24 15:12:04 +05:30