Marica
6b15a05de4
Merge pull request #26187 from marination/country-modal-cart
...
fix: Address Card issues in e-commerce
2021-06-24 12:25:21 +05:30
Deepesh Garg
437e972108
Merge pull request #26143 from deepeshgarg007/gstr_1_export_invoices_error
...
fix: Export invoices not visible in GSTR-1 report
2021-06-24 12:15:29 +05:30
Deepesh Garg
9d8e8f8bdf
fix: Do not show received amount after tax for internal tarnsfers
2021-06-24 12:02:39 +05:30
Deepesh Garg
bd9317956b
fix: Taxes on Internal Transfer payment entry
2021-06-24 12:02:32 +05:30
marination
bbe64b5604
fix: (style) Address card buttons hover state
2021-06-24 12:01:12 +05:30
Rucha Mahabal
a9b5dc6030
fix: chart not visible for First Response Time reports ( #26032 ) ( #26185 )
2021-06-24 11:53:28 +05:30
marination
f5fa1ee4b6
fix: Country Link field in 'Add address' website modal auto-clears
2021-06-24 11:03:32 +05:30
Deepesh Garg
5e49bee755
Merge pull request #26083 from deepeshgarg007/payroll_accounting_dimension
...
fix: Accounting Dimensions for payroll entry accrual Journal Entry
2021-06-24 10:38:42 +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
4cf0b02ddc
Merge pull request #26095 from deepeshgarg007/sales_order_billed_qty
...
fix: Incorrect billed qty in Sales Order analytics
2021-06-24 10:21:57 +05:30
Deepesh Garg
3007c9900b
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into payroll_accounting_dimension
2021-06-23 23:06:15 +05:30
Deepesh Garg
7e006496dd
fix: Check if item tax template exists
2021-06-23 22:52:51 +05:30
Deepesh Garg
c9c1d10435
fix: Make item tax templates optional
2021-06-23 22:47:29 +05:30
Deepesh Garg
1f7b95f390
fix: User is not able to change item tax template
2021-06-23 20:56:27 +05:30
marination
078826d510
fix: Sider
2021-06-23 20:12:59 +05:30
marination
f913e0dd05
fix: Consider Table Multiselect fields in Query engine
...
- Since table multiselect fields were not handled, the query tried searching for this child field in item master
- This broke the query
- On trying to reload or go back to all-products page with field filters that are table mutiselect, page breaks
2021-06-23 20:06:11 +05:30
rohitwaghchaure
b4863bfa50
Merge pull request #25696 from rohitwaghchaure/incorrect-serial-no-qty-valuation-report
...
feat: Incorrect valuation rate report for serialized items
2021-06-23 16:52:51 +05:30
marination
1b9b72d12e
fix: Filters did not consider Website Item Group
2021-06-23 16:03:24 +05:30
Deepesh Garg
0bfffddac4
fix: Test Cases
2021-06-23 15:37:17 +05:30
marination
d802d73973
fix: Consider Website Item Groups in Item group page product listing
...
- Passed an argument to query engine to know when query is for item group page
- If for item group page, get data with regards to website item group table
- This query should be fast since there's one filter and that shortens the table beforehand
- This data is merged with the results from the Item master (results only considering item attributes and field filters)
- The combined data is then sorted as per weightage
Co-authored-by: Gavin D'souza <gavin18d@gmail.com>
2021-06-23 14:24:13 +05:30
Jannat Patel
9ec0ded28f
fix: Staffing plan vacancies data type issue ( #25941 )
...
* fix: staffing plan vacancies data type issue
* fix: translation issue
* fix: removed greater than 0 condition
2021-06-23 14:05:10 +05:30
Deepesh Garg
35e11fbea6
fix: Tests
2021-06-23 13:17:01 +05:30
Deepesh Garg
208b5f9e73
chore: Add comments
2021-06-23 12:44:56 +05:30
Deepesh Garg
40a4330ec1
fix: Move tax categories up in country wise json
2021-06-23 12:38:37 +05:30
Jannat Patel
44815393b3
fix: job applicant link issue ( #25934 )
2021-06-23 12:28:02 +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
Anurag Mishra
fc98abece9
feat: Employee Grievance ( #25705 )
...
* feat: Employee Grievance
* feat: link to desk and automatic unsuspend
* test: Employee Grievance
* fix: Sider and Translation
* fix: sider
* fix: formatting
* feat: changes requested
* feat: Employee Grievance
* feat: link to desk and automatic unsuspend
* test: Employee Grievance
* fix: Sider and Translation
* fix: sider
* fix: formatting
* feat: changes requested
* fix: patch test and sider issue
* fix: make Employee Responsible non-mandatory since there cannot be an employee responsible for all sorts of grievances
- show pay cut and suspension buttons only if Employee Resposible is set
- some label changes
* feat: added subject field for more context
- set title for documents
- added list view settings
- refactor suspend and unsuspend functions
- add submit and cancel perms for system and hr managers
- fix tests
* fix: sider issues
* fix: removed suspension and paycut
* fix:sider
* fix: test
* fix: test
* fix: resolved Conflicts
* fix: sider
* fix: remove debugging print statements
* fix: validation message
* fix: unnecessary comma
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-06-23 11:21:38 +05:30
marination
ea2c02738d
fix: Include Stock Reco logic in update_qty_in_future_sle
2021-06-22 21:44:50 +05:30
Noah Jacob
c05496a5a7
fix: fixed rounding off ordered percent to 100 in condition ( #26152 )
2021-06-22 17:53:53 +05:30
Subin Tom
219a87d530
fix: disable sales order cancellation if linked to draft invoice ( #26125 )
2021-06-22 16:28:58 +05:30
Subin Tom
889140fd8c
fix: sql syntax error in get_project_name method ( #26147 )
2021-06-22 16:26:19 +05:30
Deepesh Garg
cfdda21dd2
fix: Export invoices not visible in GSTR-1 report
2021-06-22 13:03:22 +05:30
Marica
703c30f5f8
fix: Consistent alert indicators
2021-06-22 11:20:17 +05:30
Marica
9f15ebe711
Merge pull request #26134 from marination/product-weightage
...
fix: Sort website products by weightage mentioned in Item master
2021-06-22 11:16:20 +05:30
marination
f97206b3cb
fix: Sort website products by weightage mentioned in Item master
2021-06-21 19:38:37 +05:30
marination
ea0dea46e0
fix: sider and semgrep
2021-06-21 16:51:12 +05:30
marination
49ec0e5ac3
feat: Optionally allow rejected quality inspection on submission
2021-06-21 16:18:35 +05:30
rohitwaghchaure
d6eacf556d
Merge pull request #26126 from rohitwaghchaure/production-plan-fix-to-show-parent-warehouse
...
fix: allow to select group warehouse while downloading materials from production plan
2021-06-21 15:39:13 +05:30
rohitwaghchaure
8347eb1dba
Update production_plan.js
2021-06-21 15:38:44 +05:30
Rohit Waghchaure
773aabae44
fix: allow to select group warehouse while downloading materials from production plan
2021-06-21 14:54:27 +05:30
rohitwaghchaure
3956f82e7c
Merge pull request #26122 from rohitwaghchaure/fix-rate-not-able-to-change
...
fix: rate not able to change in purchase order
2021-06-21 13:40:29 +05:30
Ankush
e78364c191
fix: status indicator for delivery notes ( #26062 )
...
On list view `per_returned` isn't fetched i.e. `undefined` which become
0 hence the list view indicator is false.
This "computation" is already done by status updater, so relying on
doc.status is better than redefining it.
2021-06-21 11:15:16 +05:30
Saqib
4b32ccb124
fix(pos): unsupported operand type -=: for 'float' and 'NoneType' ( #26097 )
2021-06-21 10:49:25 +05:30
Saqib
fb89008a13
fix(pos): unsupported operand type -=: for 'float' and 'NoneType' ( #26097 )
2021-06-21 10:49:09 +05:30
Rohit Waghchaure
582f187726
fix: rate not able to change in purchase order
2021-06-21 00:59:02 +05:30
rohitwaghchaure
ab3cd7e283
Merge pull request #26023 from rohitwaghchaure/fixed-linking-between-mr-and-sq
...
fix: material request and supplier quotation not linked if supplier quotation created from supplier portal
2021-06-20 15:16:32 +05:30
Marica
29a1a8d2d6
Merge pull request #25878 from rohitwaghchaure/v13-sub-contract-enhancemnet
...
feat: subcontract code refactor and enhancement
2021-06-20 11:54:23 +05:30
Rohit Waghchaure
3d7f660bec
fix: test case for Project Profitability report
2021-06-20 10:20:35 +05:30
Rohit Waghchaure
f5db407461
fix: available qty for consumption
2021-06-19 23:19:45 +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
