Deepesh Garg
4a2e4748ac
fix: Unallocated amount for inclusive charges
2021-07-13 11:22:55 +05:30
Saqib
7fb64d1645
fix: exchange gain loss not set for advances linked with invoices ( #26436 )
2021-07-12 18:33:16 +05:30
marination
c8a825c478
chore: Test case for QI Rejection in Stock Entry
...
- Use `get_single_value` instead of `get_doc` in validation
- Test Case to check impact of stock settings on SE with rejected qi
2021-07-10 18:26:36 +05:30
Marica
01be96adb2
Merge branch 'version-13-hotfix' into qi-rejection
2021-07-09 13:30:21 +05:30
rohitwaghchaure
c1853ddf73
Merge pull request #26226 from rohitwaghchaure/fixed-removed-values-out-of-sync-on-stock-transaction-submission
...
fix: removed values out of sync validation from stock transactions
2021-06-26 22:28:42 +05:30
Rohit Waghchaure
170f2ad056
fix: removed values out of sync validation from stock transactions
2021-06-26 21:42:47 +05:30
Noah Jacob
58daf5f916
fix: precision rate for packed items ( #26046 )
2021-06-25 12:52:17 +05:30
Ankush
21e44b19f0
perf: don't query unless required (bp #26175 )
...
re-order conditionals so queries are not evaluated unless required.
# Conflicts:
# erpnext/stock/doctype/batch/batch.py
2021-06-24 20:58:07 +05:30
Afshan
7fd44907ba
feat: fetching of qty as per received qty from PR to PI ( #26184 )
2021-06-24 14:26:36 +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
Subin Tom
889140fd8c
fix: sql syntax error in get_project_name method ( #26147 )
2021-06-22 16:26:19 +05:30
Marica
703c30f5f8
fix: Consistent alert indicators
2021-06-22 11:20:17 +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
Rohit Waghchaure
582f187726
fix: rate not able to change in purchase order
2021-06-21 00:59:02 +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
Rohit Waghchaure
ddb0ec261a
fix: code cleanup and convert public method to private for subcontracting class
2021-06-19 23:16:23 +05:30
Rohit Waghchaure
9a2db0b5b1
fix: semgrep error
2021-06-19 23:16:22 +05:30
Rohit Waghchaure
a94b89727c
feat: subcontract code refactor and enhancement
2021-06-19 23:16:22 +05:30
Rohit Waghchaure
8520edc952
fix: time out while submitting the stock transactions with more than 50 items
2021-06-19 00:55:35 +05:30
Noah Jacob
b5a1491176
fix: escaped warehouse value for sql query ( #26049 )
2021-06-15 12:44:04 +05:30
Deepesh Garg
4cd0f6ce23
fix: Revert unintended changes
2021-06-14 20:01:04 +05:30
Deepesh Garg
8718013c96
fix: Add separate function to validate payment entry taxes
2021-06-14 14:34:44 +05:30
Deepesh Garg
580346360f
fix: Auto tax calculations in Payment Entry
2021-06-14 11:16:39 +05:30
Ankush Menat
a9c84f749a
perf(minor): remove unnecessary comprehensions ( #25645 )
2021-06-11 16:00:48 +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
911818a9e2
fix: Add multiple fixes
2021-06-09 22:55:10 +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
18be767f75
fix: Remove invalid test
2021-06-06 13:25:34 +05:30
Deepesh Garg
8a7e283926
feat: Item Taxes based on net rate
2021-06-04 22:53:26 +05:30
rohitwaghchaure
c59371ab0c
fix: filter type for item query ( #25942 )
2021-06-03 20:02:58 +05:30
Marica
e7d9200e0f
Merge pull request #25221 from Alchez/dev-quality-inspection-accounts
...
feat: create Quality Inspections from account and stock documents
2021-06-03 01:39:05 +05:30
Nabin Hait
88d94dbf0a
Merge pull request #25915 from rohitwaghchaure/fixed-work-order-no-able-to-select-item
...
fix: not able to select the item code in work order
2021-06-02 19:00:34 +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
Rohit Waghchaure
721b4130db
fix: not able to select the item code in work order
2021-06-02 14:13:09 +05:30
Suraj Shetty
c26d41acf9
chore: Remove unnecessary print statements
2021-05-28 09:09:36 +05:30
Rohan Bansal
1e3a3b27c6
style: semgrep issues
2021-05-26 15:18:10 +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
Ganga Manoj
18cfced032
fix(Material Request): Make status on list and form view the same ( #24856 )
2021-05-25 19:54:07 +05:30
Deepesh Garg
84f270e732
fix: Remove unwanted commits
2021-05-25 18:03:42 +05:30
Deepesh Garg
c9da1fc568
chore: Test case for adance TDS allocation
2021-05-25 17:37:17 +05:30
Deepesh Garg
a23aaf43f4
fix: Allocate advance taxes only for payment entry
2021-05-25 17:36:06 +05:30
Deepesh Garg
d18dde7757
fix: Add tds in PO and code cleanup
2021-05-25 17:32:28 +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
Ankush Menat
7b4a38c71e
chore: remove print from account controller ( #25807 )
...
This is polluting test output and it's not useful for debugging without
context.
2021-05-23 18:49:26 +05:30
