GangaManoj
129df6e129
fix: Update Product Bundle rate based on its updated amount
2021-08-24 21:55:54 +05:30
GangaManoj
31482a08dc
fix: Update Product Bundle price based on the rates of its child Items
2021-08-24 21:42:44 +05:30
Pruthvi Patel
7c957d72b3
perf: reduce number of queries to validate selling price ( #26225 )
...
* perf: reduce number of queries to validate selling price
* fix: improved flow and formatting
* fix: improve condition and use of `as_dict`
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2021-08-24 21:24:25 +05:30
Nabin Hait
b99a8cb96e
Merge pull request #27087 from deepeshgarg007/validate_due_date_fix
...
fix: Ignore due date validations if payment terms are copied from orders/receipts
2021-08-24 21:10:44 +05:30
Nabin Hait
f5e52549e2
Merge branch 'develop' into fix-scrap-items-updation
2021-08-24 21:07:59 +05:30
Nabin Hait
14332ad8a2
Merge pull request #27114 from frappe-pr-bot/backport/develop/24664
...
refactor: social media post fixes
2021-08-24 21:04:36 +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
18alantom
95a2565d86
fix: correct value in test
2021-08-24 20:18:53 +05:30
18alantom
aff9aee29c
Merge branch 'develop' into feat-bom-process-loss-fp
2021-08-24 20:15:51 +05:30
18alantom
c3ce3f918d
fix: remove spurious function 'toggle_operations'
2021-08-24 20:15:19 +05:30
Anupam Kumar
1c279af0b3
fix: lead name issue ( #26999 )
...
* fix: lead name issue
* fix: change lead name wrt first name, middle and last name
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
2021-08-24 20:06:04 +05:30
Rucha Mahabal
d0cc1be230
Merge branch 'develop' into backport/develop/24664
2021-08-24 20:05:53 +05:30
Saqib
f1313302c9
fix: pos invoice test ( #27113 )
2021-08-24 19:45:21 +05:30
Marica
3167b58aee
Merge branch 'develop' into fix-scrap-items-updation
2021-08-24 19:33:09 +05:30
Anupam Kumar
164acc845a
refactor: social media post fixes ( #24664 )
...
* fix: social media post fixes
* feat: post metrics and some fixes
* fix: sider issues
* fix: sider issue
* fix: reverting optional chaning statements
* fix: sider issues
* fix: review chnages
* fix: text trigger check
* fix: sider issue
(cherry picked from commit f7e0edecc9ce45ba7baa4c17b2b35f487dffccf2)
2021-08-24 13:47:00 +00:00
18alantom
8f73d587f9
feat: process loss report, fix set pl query condition
2021-08-24 18:38:23 +05:30
GangaManoj
b4b6d10b5d
fix: Add editable Rate column
2021-08-24 17:59:11 +05:30
GangaManoj
8af5802e42
fix: Populate Bundle Items table
2021-08-24 17:58:23 +05:30
GangaManoj
91af0d6ffb
fix: Add Bundle Items table
2021-08-24 17:57:55 +05:30
Afshan
ad06fb2179
fix: calculation of gross profit percentage in Gross Profit Report ( #27045 )
2021-08-24 17:35:01 +05:30
Saqib
1db812ab9f
Merge branch 'develop' into common-party-acc
2021-08-24 17:27:43 +05:30
Saqib
f47cbae5e0
feat: allow draft pos invoices even if no stock available ( #27078 )
2021-08-24 17:27:27 +05:30
Saqib
9198caa5e7
fix: incorrect gl entry on period closing involving finance books ( #26921 )
2021-08-24 17:26:23 +05:30
Subin Tom
2e5525aba9
fix: Correct price list rate value in return si ( #27097 )
2021-08-24 17:24:41 +05:30
Saqib
ce129a1414
feat: re-arrange company doctype fields ( #27091 )
2021-08-24 17:23:14 +05:30
Anupam
0c6212189e
feat: link lead communication to prospect
2021-08-24 16:49:53 +05:30
Marica
774f305713
Merge branch 'develop' into update-stock-onboarding-fp
2021-08-24 16:23:42 +05:30
Subin Tom
d4d5a4221a
feat: coupon code discount in pos invoice ( #27004 )
2021-08-24 16:22:46 +05:30
18alantom
b58853e89d
feat: add procss_loss_qty field in work order
2021-08-24 16:11:29 +05:30
Anupam
3610882077
fix: reverting local chnages
2021-08-24 15:51:57 +05:30
Anupam
797b19a14a
feat: creation of prospect from lead
2021-08-24 15:50:15 +05:30
Saqib
9e82c24b27
fix: pos closing entry cancellation test ( #27099 )
...
* fix: pos closing entry cancellation test
* fix: invalid imports
* fix: sider issue
2021-08-24 15:37:00 +05:30
Saqib
6cf9254ee5
fix: invalid imports ( #27101 )
2021-08-24 15:26:44 +05:30
18alantom
7fb08173b5
fix: reword error messages, fix test values
2021-08-24 15:01:38 +05:30
18alantom
ad735522cb
fix: rename form tours to doctype names, remove tours from js controllers
2021-08-24 14:54:38 +05:30
Marica
b9130bf4db
Merge branch 'develop' into fix-scrap-items-updation
2021-08-24 12:54:38 +05:30
Ankush Menat
c09d8a2809
fix(ux): keep stock entry title & purpose in sync ( #27043 )
...
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2021-08-24 12:20:34 +05:30
Ankush Menat
6de7b8ea93
fix: discard empty rows from update items ( #27021 )
2021-08-24 12:18:40 +05:30
Ankush Menat
0dff0beaba
fix: stock analytics report date range issues and add company filter ( #27014 )
...
* test: tests for correct get_period_date_ranges
* fix: stock analytics report date range issues
- Upon selecting second half of month with Monthly filter, data from
that period was missing.
- Solution: "round down" the date as per expected frequency.
* chore: drop py2 and fix misleading docstring
* test: fix test to avoid FY clash
* feat: add company filter in stock analytics report
[skip ci]
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2021-08-24 12:16:46 +05:30
rohitwaghchaure
6106a635f8
Merge branch 'develop' into fix-scrap-items-updation
2021-08-24 12:10:04 +05:30
Pruthvi Patel
332ac105b5
refactor: use read_only_depends_on instead of code ( #27008 )
2021-08-24 12:07:38 +05:30
rohitwaghchaure
db385261f0
Merge pull request #27080 from rohitwaghchaure/fixed-stock-ledger-report-with-included-uom
...
fix: stock ledger report not working if include UOM selected in filter
2021-08-24 10:16:35 +05:30
rohitwaghchaure
95866b736e
Merge pull request #27081 from rohitwaghchaure/fixed-donot-overrride-batch-no
...
fix: batch no reset on changing of qty
2021-08-24 10:15:36 +05:30
Anupam
4a529f8039
feat: Prospect
2021-08-24 09:35:59 +05:30
rohitwaghchaure
da3220e38e
Merge branch 'develop' into fixed-stock-ledger-report-with-included-uom
2021-08-24 08:50:49 +05:30
Rushabh Mehta
49e0a4f287
Revert "fix: Salary component account filter ( #26604 )"
...
This reverts commit ae9d1d9617
2021-08-24 08:33:57 +05:30
GangaManoj
46650cce0d
fix: Calculate total buying_amount and gross profit for each invoice
2021-08-23 21:17:32 +05:30
Deepesh Garg
bd709f8ab0
fix: Ignore due date validations if payment terms are copied from orders/receipts
2021-08-23 19:05:52 +05:30
rohitwaghchaure
129a0fc8b2
Merge branch 'develop' into fixed-donot-overrride-batch-no
2021-08-23 18:07:22 +05:30
Deepesh Garg
69973a65aa
Merge pull request #26900 from deepeshgarg007/payment_entry_validations_and_trigger_develop
...
fix: Multiple fixes in payment entry
2021-08-23 18:03:01 +05:30
Subin Tom
47b63a627d
fix: Eway bill test update to check ver 1.0.0421 ( #27083 )
2021-08-23 15:38:26 +05:30
Rohit Waghchaure
e1f070437a
fix: selected batch no changed on updation of qty
2021-08-23 14:27:55 +05:30
Rohit Waghchaure
098d349bf4
fix: stock ledger report not working if include uom selected in filter
2021-08-23 13:36:13 +05:30
Subin Tom
8b2fe9e793
fix: eway bill version changed to 1.0.0421 ( #27044 )
2021-08-23 11:17:31 +05:30
Subin Tom
7d627df4db
fix: pos return payment mode issue ( #26872 )
2021-08-23 11:05:07 +05:30
Deepesh Garg
df185045a1
Merge branch 'develop' into payment_entry_validations_and_trigger_develop
2021-08-23 10:34:28 +05:30
Deepesh Garg
496bff5136
feat: Column for total amount due in Accounts Receivable/Payable Summary ( #27069 )
2021-08-22 18:10:51 +05:30
Deepesh Garg
57e326e7d0
fix: Consolidated balance sheet showing incorrect values ( #26975 )
2021-08-21 17:59:11 +05:30
Saqib
5395f56c88
Merge branch 'develop' into common-party-acc
2021-08-20 20:42:50 +05:30
Saqib
ec258551bf
fix: flaky test for SLA ( #27051 )
2021-08-20 19:09:31 +05:30
GangaManoj
d1453c0cd0
fix: Remove Item Code and Item Name columns
2021-08-20 18:26:17 +05:30
GangaManoj
75d4fc99fc
fix: Display Items in the format Item Code: Item Name
2021-08-20 18:25:36 +05:30
Alan
62c590261c
refactor: rectify typo ( #27057 )
...
[skip ci]
2021-08-20 18:21:09 +05:30
18alantom
810bce8da2
Merge branch 'develop' into update-stock-onboarding-fp
2021-08-20 16:31:27 +05:30
18alantom
f4487c3ae5
refactor: use Form Tour doc instead of controller form tour
...
note - keeping controller form tours as a fallback, new form tours
seem to work only for Stock Settings
2021-08-20 16:25:20 +05:30
18alantom
77ebbdd172
fix: minor changes
...
- remove Is Group from warehouse
- change stock entry type
- link to stock entry type
- add posting date to stock reco
- change report to Stock Projected Qty
- highlight quality inspection action
- remove allow neg highlight
2021-08-20 16:21:33 +05:30
Deepesh Garg
2b2572b9b9
fix: Cascade deletion for Company ( #26923 )
...
* fix: Cascade deletion for Company
2021-08-20 14:40:12 +05:30
18alantom
6ef16ee4fb
fix: update scrap table item details; typo
2021-08-20 12:24:13 +05:30
Saqib
c335962827
refactor!: drop e-invoicing integration from erpnext ( #26940 )
2021-08-20 11:10:46 +05:30
Saqib
153fe1cdb4
refactor: scan barcode field scanning ( #26990 )
2021-08-20 11:09:51 +05:30
Nabin Hait
b8c998119b
Merge pull request #27040 from marination/cart-pl-exchange-rate
...
fix: Shopping cart Exchange rate validation
2021-08-20 10:56:10 +05:30
Nabin Hait
12d7f83998
Merge pull request #27033 from noahjacob/ux_promo_scheme_fix
...
fix(ux): removed rate from grid view
2021-08-20 10:51:59 +05:30
Nabin Hait
657e61ae6d
Merge pull request #27028 from noahjacob/prompt_warehouse_fix
...
fix: incorrect mandatory error message for warehouse
2021-08-20 10:48:34 +05:30
GangaManoj
b5fac83987
fix: Add items belonging to Product Bundles as children
2021-08-20 06:07:53 +05:30
GangaManoj
33f100d75d
fix: Set initial_depth to 3
2021-08-20 06:06:47 +05:30
GangaManoj
97a1d426a3
fix: Assign indent and parent_invoice
2021-08-20 03:54:19 +05:30
GangaManoj
779a1d68a5
fix: Make Invoice row bold
2021-08-20 02:38:34 +05:30
GangaManoj
5ffaff8e48
fix: Display items as descendants of invoices
2021-08-20 02:20:18 +05:30
GangaManoj
17a154017b
fix: Display data in tree form
2021-08-20 02:19:18 +05:30
GangaManoj
76921137ed
fix: Return data as dict if the report is grouped by Invoice
2021-08-20 02:16:49 +05:30
marination
8046d15ef0
chore: Comment out obsolete test
...
- Modifying this test means considering extreme edge cases, which seems pointless now
2021-08-19 21:10:30 +05:30
Noah Jacob
f13315809e
refactor: renamed varint_item_code to variant_item_code ( #27025 )
2021-08-19 20:28:30 +05:30
marination
45617ae22f
fix: Shopping cart Exchange rate validation
...
- Use `get_exchange_rate` to check for price list exchange rate in cart settings
- Move cart exchange rate validation for Price List from hooks to doc event
- Call cart exchange rate validation on PL update only if PL is in cart and currency is changed
2021-08-19 20:01:05 +05:30
Alan
9225f02599
fix: pass planned start date to created work order ( #27031 )
...
* fix: pass planned start date to created workorder
* test: production plan to work order start date
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-08-19 18:49:20 +05:30
Saqib Ansari
8e79c48db8
fix: remove unwanted filter query
2021-08-19 18:10:02 +05:30
Saqib Ansari
71e7254184
test: creation of advance entry on invoice submission
2021-08-19 18:09:35 +05:30
Saqib Ansari
977b09b6ba
feat: auto create advance entry on invoice submission
2021-08-19 18:09:35 +05:30
Saqib Ansari
cad08bc428
feat: toggle to enable common party accounting
2021-08-19 18:09:35 +05:30
Saqib Ansari
dddc29fdc1
feat: initialize party link for customer & suppliers
2021-08-19 18:09:35 +05:30
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
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.
(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
GangaManoj
4a77bd2304
fix: Syntax error
2021-08-18 00:33:43 +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
18alantom
cc177f3415
fix: wo tests, sider, account for pl in se validation
2021-08-17 16:49:00 +05:30
18alantom
2670adc0c0
test: check manufacture completion qty in se and wo
2021-08-17 16:40:44 +05:30
18alantom
ad73d3fbfb
refactor: validation error message formatting
2021-08-17 16:40:16 +05:30
18alantom
23ef51a981
fix: sider
2021-08-17 16:40:05 +05:30
18alantom
47a4a3d888
refactor: polyfill ??
2021-08-17 16:39:05 +05:30
Deepesh Garg
fd739749ba
test: Add test case for payment entry
2021-08-17 16:38:25 +05:30
18alantom
55acb2e843
fix: sider
2021-08-17 16:37:34 +05:30
18alantom
cdf253aeb4
fix: add more validations, remove source wh req for pl item
2021-08-17 16:36:32 +05:30
18alantom
8ecb146231
test: add bom tests for process loss val, add se test for qty calc
2021-08-17 16:36:24 +05:30
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
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
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
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
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
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
18alantom
f7b747e19c
refactor: reduce steps, reword cards
2021-08-16 15:14:36 +05:30
18alantom
599c1024a2
fix: semgrep, remove trailing and leading whitespaces
2021-08-16 15:14:22 +05:30
18alantom
95992a7ea5
refactor: fix typo, remove target warehouse cause SE Type dependency
2021-08-16 15:13:45 +05:30
18alantom
37466631f2
refactor: reorder steps according to stock settings refactor
2021-08-16 15:13:14 +05:30
18alantom
9581836885
refactor: add watch video step for stock opening balance
2021-08-16 15:13:05 +05:30
18alantom
1d67d20185
refactor: remove DN, PR; change wording, add/remove steps in tour
2021-08-16 15:12:57 +05:30
18alantom
51d2317bb5
refactor: sider/semgrep
2021-08-16 15:12:28 +05:30
18alantom
1851232e3c
refactor: move trailing whitespace out of translate func
2021-08-16 15:12:23 +05:30
18alantom
0b669b3d7e
refactor: add form tour for stock module onboarding
2021-08-16 15:12:16 +05:30
18alantom
23e1d2b536
refactor: update stock onboarding
2021-08-16 15:12:09 +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
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
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
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
Saqib
88f13fef81
fix: ZeroDivisionError on creating e-invoice for credit note ( #26915 )
2021-08-12 16:26:51 +05:30
Ganga Manoj
54c31ed33c
feat: depreciate asset after sale ( #26543 )
2021-08-12 13:42:56 +05:30
Marica
08e4026456
fix: Stock Analytics Report must consider warehouse during calculation ( #26908 )
...
* fix: Stock Analytics Report must consider warehouse during calculation
* fix: Brand filter in Stock Analytics
(cherry picked from commit 703b081172981833bcf9a1fc5c86517817c3ff32)
2021-08-12 05:02:42 +00:00
Deepesh Garg
f037bae8ea
Merge pull request #26397 from GangaManoj/po-payment-terms
...
feat: Fetch Payment Terms from linked Sales/Purchase Order
2021-08-11 22:28:34 +05:30
Deepesh Garg
a7054560da
Merge branch 'develop' into po-payment-terms
2021-08-11 19:31:30 +05:30
Marica
42899d69ea
Merge branch 'develop' into stock-analytics
2021-08-11 18:44:29 +05:30
Deepesh Garg
13fb71f642
Merge branch 'develop' into payment_entry_validations_and_trigger_develop
2021-08-11 18:20:42 +05:30
marination
455d300fca
Revert "test: fix POS Closing Entry Test"
...
This reverts commit 8f1a3aef2e
2021-08-11 17:00:46 +05:30
marination
867939fcae
test: fixed asset movement tests
...
- set cwip account in company to avoid value missing
- removed unused statement
- removed trailing spaces
2021-08-11 16:40:07 +05:30
marination
8f1a3aef2e
test: fix POS Closing Entry Test
...
- Separated into two tests, one checks if SI cancelling is blocked, the other checks PCE cancel impact
- This is done because after cancel via assertRaises, damage done by cancel still exists or is partially comitted
- Dont use this partially cancelled doc for any assertions further, end test at exception assertion
- Use `get_value` to check SI docstatus, as its primary key changes after cancel
2021-08-11 15:17:06 +05:30
Suraj Shetty
99658ceb4e
fix: Nest .level class style under .hierarchy class
...
- To avoid style overrides in list view
2021-08-11 14:19:07 +05:30
marination
bca30d6101
test: fix Shift Request test
...
- Use `get_value` instead of `get_doc`
- Remove unnecessary loop, only one shift assignment is made against a shift request
- Get value after cancel again. Get doc is not reliable since primary key changed after cancel
2021-08-11 13:29:44 +05:30
marination
e5b0221693
test: fix attendance request tests
...
- Use `frappe.db.get_value` instead of `get_doc` for asserting values
- Get values after cancellation as reloading attendance doc breaks due to stale doc (primary key changed after cancel of attendance request)
- rollback everything on tearDown
2021-08-11 13:02:49 +05:30
Deepesh Garg
a1f0cebda5
fix: Do not update settings for test
2021-08-11 11:50:39 +05:30
Deepesh Garg
02f44528f2
test: Add test case for payment entry unlink
2021-08-11 11:50:39 +05:30
Deepesh Garg
7141860c04
test: Update exchange rate in test cases
2021-08-11 11:50:39 +05:30
Deepesh Garg
b5162390e5
fix: Only do specific validations on reference unlink
2021-08-11 11:50:39 +05:30
Deepesh Garg
188bba8feb
fix: Validation for receivingfrom customer against negative outstanding
2021-08-11 11:50:39 +05:30
Deepesh Garg
c5276f3fd3
fix: Multiple fixes in payment entry
2021-08-11 11:50:16 +05:30
Deepesh Garg
a57d13e1e9
fix: Multiple fixes in payment entry
2021-08-11 11:50:16 +05:30
Afshan
976ae13c1e
Merge branch 'develop' into payment-reconc-party-validation-fix
2021-08-11 11:49:27 +05:30
Ankush
c1c9c4b68e
Merge branch 'develop' into fix_dn_test
2021-08-11 11:40:15 +05:30
Ankush
9152715f90
perf: various minor perf fixes for ledger postings ( #26775 )
...
* perf: only validate if voucher is journal entry
* perf: optimize merge GLE
- Order fields such that comparison will fail faster
- Break out of loops if not matched
* perf: don't try to match SLE if count mismatch
* refactor: simplify initialize_previous_data
* perf: use cache for fetching valuation_method
These are set only once fields
* refactor: simplify get_future_stock_vouchers
* refactor: simplify get_voucherwise_gl_entries
* perf: fetch only required fields for GL comparison
`select *` fetches all fields, output of this function is only used for
comparing.
* perf: reorder conditions in PL cost center check
* perf: reduce query while validating new gle
* perf: use cache for validating warehouse props
These properties don't change often, no need to query everytime.
* perf: use cached stock settings to validate SLE
* docs: update misleading docstring
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2021-08-11 11:17:50 +05:30
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 b614834efe
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 b614834efe
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
Rucha Mahabal
506ecb4216
feat: Organizational Chart
2021-08-10 17:44:30 +05:30
