Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41,555 Commits 3 Branches 0 Tags 1 GiB
6d750e185e
Commit Graph

31830 Commits

Author SHA1 Message Date
marination
ea036e4958 fix: Better Exception Handling and vaeiabl naming 
- Function to handle RS exceptions (create log and raise error)
- Handle `ResponseError` where it is anticipated
- Misc: Better variables
 2022-04-04 11:07:53 +05:30
Rucha Mahabal
62cdde9a84 test: skip auto attendance 2022-04-04 11:05:03 +05:30
Rucha Mahabal
277bda11dd test: validations for duplicate and overlapping shift attendance records 2022-04-04 11:04:24 +05:30
Rucha Mahabal
83489be7d9 fix: add validation for overlapping shift attendance 
- skip auto attendance in case of overlapping shift attendance record

- this case won't occur in case of shift assignment, since it will not allow overlapping shifts to be assigned

- can happen if manual attendance records are created
 2022-04-04 11:00:26 +05:30
Suraj Shetty
f4b8573e64 test: Fix erroneous code 2022-04-04 09:31:15 +05:30
Suraj Shetty
cfee53eb55 fix: Handle exception where no employee is returned 2022-04-04 07:38:15 +05:30
Suraj Shetty
39abfae5fe chore: Remove unused code 
- and simplify get_call_log
 2022-04-04 07:28:41 +05:30
Suraj Shetty
0e9ebad9c6 test: Refactor exotel test setup 
- Remove unnecessary code
- Move test data to separate file
- Make proper test assertions
 2022-04-04 07:23:08 +05:30
Rucha Mahabal
7bd84f2696 chore: remove unused import 2022-04-03 23:58:04 +05:30
Rucha Mahabal
58fb2f7dde refactor: Overlapping validation for Shift Request 
- commonify time overlap function between request and assignment

- add tests for shift request overlap
 2022-04-03 23:54:03 +05:30
Rucha Mahabal
6fffdcf0c7 test: Shift Type with Auto Attendance setup and working 
fix test setups
 2022-04-03 22:37:10 +05:30
Rucha Mahabal
655c1dd6ab fix: attendance fixes 
- check half day attendance threshold before absent threshold to avoid half day getting marked as absent

- round working hours to 2 digits for better accuracy

- start and end dates for absent attendance marking
 2022-04-03 21:47:32 +05:30
Suraj Shetty
6644ebd52d
Merge branch 'develop' into exotel-fixes 2022-04-03 21:17:29 +05:30
Deepesh Garg
a7e125a540 chore: format patch file 2022-04-02 20:36:36 +05:30
Deepesh Garg
c58fde2fb2 fix: Add competitor field back 2022-04-02 20:03:46 +05:30
Deepesh Garg
7e185fb0f2 Merge branch 'develop' of https://github.com/frappe/erpnext into patch-3 2022-04-02 17:42:09 +05:30
Deepesh Garg
485f5cfdfe fix: Resolve conflicts 2022-04-02 17:25:29 +05:30
Deepesh Garg
0f6d52c625 Merge branch 'develop' of https://github.com/frappe/erpnext into mergify/bp/develop/pr-30385 2022-04-02 17:24:19 +05:30
Subin Tom
e57e7bb02c fix: added tests(fixed) 2022-04-02 17:16:56 +05:30
Ankush Menat
c8ead0a7ab fix: dont send empty serial no in get_item_details 
[skip ci]
 2022-04-01 21:11:03 +05:30
Ankush Menat
6a069d6efa feat: dont trigger selector if all info is scanned 2022-04-01 21:11:03 +05:30
Ankush Menat
47f27a5171 refactor: move scan api to stock utils; add item_info 2022-04-01 21:11:03 +05:30
Ankush Menat
9bf427985f fix!: remove barcode field triggers 
use "scan barcode" field instead for scanning

[skip ci]
 2022-04-01 21:11:03 +05:30
Ankush Menat
530f767098 revert: "fix: ignore circular dependencies on barcode scan" 
This reverts commit 98468fab18.
 2022-04-01 21:11:03 +05:30
Ankush Menat
767b827b59 feat: return batch code while scanning serial no 2022-04-01 21:11:03 +05:30
marination
07f17453cd fix: Use Payload in AutoCompleter (categories in search) and misc 
- Separate Item group and Item autocomplete dict definition
- Add payload along with Item group, containing namke and route
- Pass weightage while defining item group autocomplete dict (auto sort)
- Use payload while getting results for categories in search
- Remove check to show categories, always show
- Search fields mandatory if reidsearch enabled
- Code separation (rough)
 2022-04-01 18:47:01 +05:30
Gavin D'souza
f8c9fba52d fix: Handle changes in frappe's get_monthly_goal_graph_data API 2022-04-01 17:18:47 +05:30
Sagar Sharma
01c64915c8 chore: remove unwanted validation 2022-04-01 15:51:48 +05:30
Ankush Menat
6c5b01c60d
perf: index barcode for faster scans (#30543) 2022-04-01 15:27:46 +05:30
Alberto826
5d14e7860e
Fix: Remove trailing slash "/" from route (#30532) 
Routes with trailing slash "/" causes a redirect to port 8080 in docker host with reverse proxy.
The Student Admission Row template has this issue.
 2022-04-01 14:48:00 +05:30
Deepesh Garg
9a6a181f14 fix: Ignore disabled tax categories 2022-04-01 14:46:26 +05:30
Rucha Mahabal
65763275ae
fix: convert dates to datetime before comparing in leave days calculation and fix half day edge case (#30538) 2022-04-01 13:47:52 +05:30
Sagar Sharma
0a3cdc2623 chore: rename "is_subcontracted" field label to "Is Subcontracted" 2022-04-01 13:22:54 +05:30
Sagar Sharma
d074c93ac7 refactor!: change "is_subcontracted" field type from "Select" to "Check" 2022-04-01 13:22:44 +05:30
Ankush Menat
257623509d
perf: use cached single docs (#30536) 
frappe.local is request specific thread local, hence is almost as good
as no caching.
 2022-04-01 11:55:19 +05:30
Saqib Ansari
bfc34e1084
fix: check for debit credit difference even after round-off adjustment (#30050) 2022-04-01 11:03:16 +05:30
Deepesh Garg
8598d64d2c
Merge pull request #30502 from dj12djdjs/fix-pe-ex-rate-precision 
fix(accounts): payment entry exchange rate precision
 2022-04-01 09:48:15 +05:30
Deepesh Garg
df06d263ae
Merge pull request #30510 from deepeshgarg007/tax_mapping 
fix: Taxes getting overriden from mapped to target doc
 2022-04-01 09:43:19 +05:30
rohitwaghchaure
8d16c7f44b
Merge pull request #30527 from rohitwaghchaure/feat-pick-list-item-reference-in-delivery-note 
feat: minor, pick list item reference on delivery note item table
 2022-03-31 20:22:49 +05:30
Rohit Waghchaure
2f51011f91 test: test case to check pick list name has mapped or not 2022-03-31 18:47:09 +05:30
Rohit Waghchaure
2f63ae2ee9 feat: minor, pick list item reference on delivery note item table 2022-03-31 18:43:42 +05:30
Deepesh Garg
02dab021c6
Merge pull request #30500 from deepeshgarg007/auto_tax_gst 
fix(India): Tax fetching based on tax category
 2022-03-31 18:01:32 +05:30
marination
7e207c8901 fix: Call Redisearch index creation functions on enabling redisearch in settings 2022-03-31 16:29:18 +05:30
Marica
cd9d07028d
Merge branch 'develop' into bom-update-tool 2022-03-31 14:54:05 +05:30
Marica
901d8eac57
Merge pull request #30509 from marination/buying-validate-items 
fix: Add non-existent Item check and cleanup in `validate_for_items`
 2022-03-31 14:52:34 +05:30
Saqib Ansari
9af353ffa9
Merge pull request #30461 from nextchamp-saqib/fix-asset-warehouse-validation 
fix(asset): do not validate warehouse on asset purchase
 2022-03-31 14:15:16 +05:30
Deepesh Garg
e0631474c0
Merge branch 'develop' into auto_tax_gst 2022-03-31 13:52:10 +05:30
Deepesh Garg
544533ced2
Merge pull request #30486 from deepeshgarg007/account_currenct_change_test 
fix: Account currency validation
 2022-03-31 13:39:04 +05:30
marination
93f6346cea fix: (test) change expected exception due to https://github.com/frappe/frappe/pull/16454 2022-03-31 13:07:51 +05:30
marination
2fece523f6 chore: Added BOM std filters and update type in List View 2022-03-31 12:55:48 +05:30
Saqib Ansari
4623a1bc57 fix(test): Item MacBook does not exist 2022-03-31 12:48:00 +05:30
Marica
f482b184a0
Merge branch 'develop' into bom-update-tool 2022-03-31 12:42:56 +05:30
Rucha Mahabal
d45e286216 test: shift assignment creation 2022-03-31 12:15:38 +05:30
Deepesh Garg
4720969ce6 fix: Taxes getting overriden from mapped to target doc 2022-03-31 12:14:16 +05:30
marination
982a246eec fix: Add non-existent Item check and cleanup in validate_for_items 
- Added a validation if invalid item code ia passed via data import/API, etc.
- Used DB APIs instead of raw sql
- Separated checks into separate functions
- Added return types to functions
- Better variable naming and removed redundant utils import in function
 2022-03-31 11:47:20 +05:30
Saqib Ansari
199a6da960 perf: skip warehouse validation for non-stock items 2022-03-31 11:41:52 +05:30
Rucha Mahabal
e4cc0c1c87 fix: tests 2022-03-31 00:21:23 +05:30
Rucha Mahabal
97547da7ee fix(test): make holiday list for shift and checkin tests 2022-03-31 00:17:32 +05:30
Devin Slauenwhite
62266b29aa fix: exchange rate precision 2022-03-30 14:22:44 -04:00
Rucha Mahabal
af139193a5 test: fetching shifts in Employee Checkins 2022-03-30 23:27:49 +05:30
Ankush Menat
b981fae5a4
fix: remove naming series from bin, repost queue (#30497) 
Removing naming series from:
1. Bin
2. Repost queue

These doctypes are not user facing and dont really need naming series.
Current implementation of naming makes stock transaction sequential if
these documents are to be created during submission.
 2022-03-30 21:46:15 +05:30
Deepesh Garg
45f78977bf
Merge pull request #30493 from nabinhait/party-account-in-ar-ap-report 
feat: Receivable/Payable Account column and filter in AR/AP report
 2022-03-30 21:16:32 +05:30
Deepesh Garg
d93edbc859 fix: make test record 2022-03-30 21:07:56 +05:30
Deepesh Garg
532961fad2 fix(India): Tax fetching based on tax category 2022-03-30 19:33:44 +05:30
ruthra kumar
7558f1b078 refactor: adding new filters and column to test cases 2022-03-30 18:50:18 +05:30
ruthra kumar
eaeadbc422 feat: additional filters in payment terms status report 2022-03-30 18:50:13 +05:30
marination
a945484af4 test: Added test for 2 more validations 
- Covers full validate function
 2022-03-30 18:20:54 +05:30
marination
620575a901 fix: Type Annotations, Redundancy, etc. 
- Renamed public function`update_new_bom` to `update_new_bom_in_bom_items`
- Replaced `get_cached_doc` with `get_doc`
- Removed click progress bar (drive through update log)
- Removed `bom_obj.update_new_bom()`, was redundant. Did same job as `update_new_bom_in_bom_items`
- Removed `update_new_bom()` in `bom.py`, unused.
- Prettier query formatting
- `update_type` annotated as non optional Literal
- Removed redundant use of JobTimeoutException
- Corrected type annotations in `create_bom_update_log()`
 2022-03-30 18:03:52 +05:30
mergify[bot]
89a9afab94
fix: cast array slice index integer while splitting serial_nos array (#30468) (#30496) 
(cherry picked from commit 3f3717952c94af428c3d4c919aceb6b8cbae7679)

Co-authored-by: Anoop <anoop@earthianslive.com>
 2022-03-30 17:00:28 +05:30
Sagar Vora
7bece37918 fix: update get_cached_value usage based on changes in definition 2022-03-30 15:35:56 +05:30
Saqib Ansari
5408980223 Merge pull request #30453 from rahib-hassan/fix-paymentorder-row-delete 
fix: enable row deletion in reference table
 2022-03-30 15:31:54 +05:30
Rucha Mahabal
72501f2161
Merge branch 'develop' into multiple-shifts 2022-03-30 15:28:51 +05:30
Rucha Mahabal
baec607ff5 style: format code with black 2022-03-30 15:23:13 +05:30
Rucha Mahabal
acb27430ac test: monthly attendance sheet 2022-03-30 15:14:31 +05:30
Saqib Ansari
291415d255
Merge pull request #30453 from rahib-hassan/fix-paymentorder-row-delete 
fix: enable row deletion in reference table
 2022-03-30 15:00:16 +05:30
Saqib Ansari
03e6a6c699
Merge branch 'develop' into fix-asset-warehouse-validation 2022-03-30 14:58:49 +05:30
Rucha Mahabal
9ff1904aec
fix: explicitly check if additional salary is recurring while fetching components for payroll (#30489) 2022-03-30 14:47:11 +05:30
Ahmad
1fdc085d17 fix: web form filter for project 2022-03-30 13:23:30 +05:00
marination
ebf00946c9 fix: Semgrep 
- Explain explicit commits and skip semgrep
- Format client side translated string correctly
 2022-03-30 13:22:29 +05:30
Ankush Menat
8ab226a2fc
test: add class to uniquely id item dashboard (#30487) 2022-03-30 13:20:54 +05:30
marination
79495679e2 fix: Auto format bom_update_log.py 2022-03-30 13:08:58 +05:30
marination
1d1e925bcf test: API hit via BOM Update Tool 
- test creation of log and it's impact
 2022-03-30 13:01:01 +05:30
Deepesh Garg
d4cc7c553e fix: Account currency validation 2022-03-30 12:43:18 +05:30
Marica
7e719a12f1
Merge pull request #30377 from marination/stock-entry-items-idx 
fix: Dont set `idx` while adding WO items to Stock Entry
 2022-03-30 11:14:18 +05:30
Saqib Ansari
87dc9c6331
Merge pull request #30470 from nextchamp-saqib/fix-dn-credit-limit-validation 
fix: credit limit validation in delivery note
 2022-03-30 11:08:25 +05:30
Marica
a51ba4cedf
Merge branch 'develop' into bom-update-tool 2022-03-30 10:36:15 +05:30
marination
b5ad626d23 fix: Linter 2022-03-30 10:22:05 +05:30
Saqib Ansari
6528218ac3 perf: skip warehouse validation for non-stock items 2022-03-29 18:43:33 +05:30
Ankush Menat
b80fac03af
fix: validate 0 transfer qty in stock entry (#30476) 2022-03-29 17:19:22 +05:30
Rucha Mahabal
41cfcdba44 feat: show shift-wise attendance in monthly attendance sheet 2022-03-29 16:10:46 +05:30
Rucha Mahabal
865204a541 feat: add colors for attendance status to lessen the cognitive load 
- legend with colors and full form for status abbreviations
 2022-03-29 16:10:46 +05:30
Rucha Mahabal
e79d292233 refactor: Monthly Attendance Sheet 
- split into smaller functions

- add type hints

- get rid of unnecessary db calls and loops

- add docstrings for functions
 2022-03-29 16:10:41 +05:30
Rucha Mahabal
f2ee36579b chore: sort imports, remove unused imports 2022-03-29 16:09:47 +05:30
Rucha Mahabal
4ef2911953 refactor: mark absent for employees with no attendance 
- break down into smaller functions

- make it work with multiple shifts

- this will mark employee as absent per shift, meaning employee can be present for one shift and absent for another on the same day
 2022-03-29 16:09:39 +05:30
Rucha Mahabal
742c8f0790 feat: auto attendance marking for multiple shifts on the same day 2022-03-29 16:08:43 +05:30
Rucha Mahabal
cb3b330097 refactor: Allow multiple attendance records creation for different shifts 2022-03-29 16:05:36 +05:30
Rucha Mahabal
f6a12a902f refactor: rewrite docstrings and add type hints for functions 2022-03-29 16:05:01 +05:30
Rucha Mahabal
e7cbb5fe6b fix: fetching shift on timing boundaries 2022-03-29 16:02:42 +05:30
Rucha Mahabal
62e72752dc refactor: handle shifts spanning over 2 different days 2022-03-29 16:02:17 +05:30
Rucha Mahabal
ace3f8a023 fix: handle shift grace overlap while finding current shift 2022-03-29 16:01:25 +05:30
Rucha Mahabal
625a9f69f5 refactor: consider timeslots in get_employee_shift 2022-03-29 16:01:18 +05:30
Rucha Mahabal
3711119a66 refactor: overlapping shifts validation 
- convert raw query to frappe.qb

- check for overlapping timings if dates overlap

- translation friendly error messages with link to overlapping doc
 2022-03-29 15:59:56 +05:30
Ankush Menat
b12fe0f15b
fix: dont check for failed repost while freezing (#30472) 
[skip ci]
 2022-03-29 13:54:26 +05:30
marination
fa3b953cf7 test: idx mapping correctness 2022-03-29 13:54:14 +05:30
Saqib Ansari
c122882884 fix: credit limit validation in delivery note 2022-03-29 13:36:00 +05:30
Marica
88a460b54e
Merge branch 'develop' into stock-entry-items-idx 2022-03-29 13:18:08 +05:30
Ankush Menat
0cb9cdb414
Merge branch 'develop' into fix-asset-warehouse-validation 2022-03-29 11:48:35 +05:30
Ankush Menat
76dce2eddc
fix: use name for links not item_code (#30462) 2022-03-29 11:21:03 +05:30
Saqib Ansari
b60fad6113 Merge branch 'develop' of https://github.com/frappe/erpnext into fix-asset-warehouse-validation 2022-03-29 10:50:21 +05:30
Saqib Ansari
136466d255 fix(asset): do not validate warehouse on asset purchase 2022-03-29 10:47:27 +05:30
Deepesh Garg
03952f8819 fix(India): Auto tax fetching based on GSTIN 
(cherry picked from commit 7cae669e814a958310ca1b8ee408450569c32d10)

# Conflicts:
#	erpnext/patches.txt
#	erpnext/regional/india/setup.py
#	erpnext/selling/doctype/quotation/quotation.json
 2022-03-29 04:56:49 +00:00
marination
639d380c1f chore: Remove redundant idx query and value setting 
- idx can be removed from `select_columns` as it is already in the main query
- setting idx to '' is not required as it is not used further
 2022-03-28 21:00:00 +05:30
Ankush Menat
63d892454b Merge branch 'develop' into bom-update-tool 2022-03-28 20:28:21 +05:30
Ankush Menat
40d7418dca Merge branch 'develop' into stock-entry-items-idx 2022-03-28 20:21:21 +05:30
Ankush Menat
3821a97a75 Merge branch 'develop' into mergify/bp/develop/pr-30395 2022-03-28 20:14:19 +05:30
Ankush Menat
7ef54809be Merge branch 'develop' into exotel-fixes 2022-03-28 19:55:39 +05:30
Ankush Menat
494bd9ef78 style: format code with black 2022-03-28 18:52:46 +05:30
Ankush Menat
8dff4d66a4
fix: bom valuation - handle lack of LPP (#30454) 2022-03-28 18:18:23 +05:30
Sagar Vora
77c36f6d22
fix: set options for Currency field Incoming Rate (#30384) 2022-03-28 17:55:23 +05:30
Raffael Meyer
c01fe74cf0
fix(patch): fix failing patches (#30427) 
* patch: reload Opportunity

* patch: reload child tables before doctype
 2022-03-28 17:53:54 +05:30
Saqib Ansari
eea183957a
Merge pull request #30419 from nextchamp-saqib/fix-item-tax-template-patch 
fix: move item tax to item tax template patch
 2022-03-28 17:34:31 +05:30
rahib-hassan
500870b2b0 fix: enable row deletion in reference table 2022-03-28 15:25:01 +05:30
Ankush Menat
b58b1343bb refactor: dont harcode "serial_no" field 2022-03-28 12:07:00 +05:30
Ankush Menat
98468fab18 fix: ignore circular dependencies on barcode scan 2022-03-28 12:07:00 +05:30
Ankush Menat
806f420ddd fix: revert global flag added for erasing barcode 
This looked like a hack and doesn't even work anyway! how can row level
barcode-item relation be maitnained on entire form?
 2022-03-28 12:07:00 +05:30
Ankush Menat
17a2ceb5d1 style: prettier js 2022-03-28 12:07:00 +05:30
Ankush Menat
9f0e7949aa fix: clean up if item is not found 2022-03-28 12:07:00 +05:30
Ankush Menat
32e44f5121 fix: correctly capture first serial no 2022-03-28 12:07:00 +05:30
Ankush Menat
b3c604d679 refactor: dont hardcode child table name 2022-03-28 12:07:00 +05:30
Ankush Menat
3a8656b3c8 refactor: split data update responsibilty to multiple functions 
Apply "single responsibilty principle"
 2022-03-28 12:07:00 +05:30
Ankush Menat
c34847e801 refactor: dont hardcode child table "items" 2022-03-28 12:07:00 +05:30
Ankush Menat
893139f963 refactor: dont hardcode "scan_barcode" field 2022-03-28 12:07:00 +05:30
Ankush Menat
bd06ffab00 refactor: store scannned field as attr 2022-03-28 12:07:00 +05:30
Ankush Menat
2d15413c9e refactor: transaction.js -> barcode_scanner.js 2022-03-28 12:07:00 +05:30
Ankush Menat
18abb28744 fix(barcode_scan): dont add duplicate serial nos 2022-03-28 12:07:00 +05:30
Ankush Menat
b06123bc65 fix: trigger table_add on new row 2022-03-28 12:07:00 +05:30
Ankush Menat
a270f12855 fix(UX): reduce duration of barcode scan toasts 
default is 7 which is bit too much when you're scanning lots of items,
switched to 5 sec delay
 2022-03-28 12:07:00 +05:30
Ankush Menat
69ae2661d2 fix: update picked qty on cancellation 2022-03-28 10:43:32 +05:30
Deepesh Garg
33fa14b6cf
fix: Resolve conflicts 2022-03-27 19:23:53 +05:30
Deepesh Garg
18c5b24ac1 fix: Update condition 2022-03-27 19:20:37 +05:30
Deepesh Garg
fc09377de2 fix: Resolve conflicts 2022-03-27 19:18:32 +05:30
Deepesh Garg
485e6b6a09 fix: Incorrect default amount to pay for POS invoices 
(cherry picked from commit a044e9268786b3395f2e33fd5b79e64bc60160a5)

# Conflicts:
#	erpnext/public/js/controllers/taxes_and_totals.js
 2022-03-27 12:31:36 +00:00
Ankush Menat
e401ad3f90 refactor: replace dead duplicate code 2022-03-26 19:33:00 +05:30
Ankush Menat
9daea6fa6c perf: slimmer and faster before_tests 2022-03-26 19:33:00 +05:30
Saqib Ansari
4766732b56
Merge branch 'develop' into fix-item-tax-template-patch 2022-03-26 11:48:41 +05:30
Saqib Ansari
8e7c214e9e
Merge branch 'develop' into fix-minor-custom-cash-flow 2022-03-26 11:48:40 +05:30
Deepesh Garg
2e9648538e fix: Check for onload property 
(cherry picked from commit 71402b43a776d4af98912223c8299c4fd8bfbbfe)
 2022-03-25 16:23:44 +00:00
Rucha Mahabal
ffec9516fa fix: do not update status to Paid if sanctioned amount is 0 2022-03-25 21:41:48 +05:30
Rucha Mahabal
2d915782cb chore: sort imports 2022-03-25 21:41:48 +05:30
Rucha Mahabal
edf0c0030e test: expense claim against fully and partially paid advances 2022-03-25 21:41:48 +05:30
Rucha Mahabal
0461223627 fix: Expense Claim conditions for Paid status 
- status doesn't change to Paid if the entire required amount is already covered via linked advances

- status doesn't change to Paid if the claim is partially paid via advances

- patch to update such uncancelled claims to Paid
 2022-03-25 21:41:48 +05:30
Deepesh Garg
19b1b1f4ba test: test for auto write-off amount 
(cherry picked from commit 6a50f36b3167d43b1e964d4f0cf96af587f1a4a2)

# Conflicts:
#	erpnext/public/js/controllers/taxes_and_totals.js
 2022-03-25 15:27:12 +00:00
Deepesh Garg
b2ac773cca fix: Ignore for Purchase Invoices 
(cherry picked from commit d3fd2fd2c535733939ed69439301033052f45712)
 2022-03-25 15:27:11 +00:00
Deepesh Garg
8cfa3a9ece fix: Ignore for Purchase Invoices 
(cherry picked from commit ed38679d222e12709396fbb8dacbe9e25ea38ed7)

# Conflicts:
#	erpnext/public/js/controllers/taxes_and_totals.js
 2022-03-25 15:27:11 +00:00
Deepesh Garg
d04d3038f5 fix: Client side changes for POS Write off amount 
(cherry picked from commit 2e33e748ea248acface128f759d3982635024399)

# Conflicts:
#	erpnext/public/js/controllers/taxes_and_totals.js
 2022-03-25 15:27:10 +00:00
Deepesh Garg
f57f4af1d9 fix: Write off amount wrongly calculated in POS Invoice 
(cherry picked from commit ee4258e42c33899fae7b7add8a676274259a40e0)
 2022-03-25 15:27:10 +00:00
Ankush Menat
0534cf6c9c
fix: show subassembly table always (#30422) 
[skip ci]
 2022-03-25 19:03:33 +05:30
Saqib Ansari
80c7d7064b
Merge branch 'develop' into fix-minor-custom-cash-flow 2022-03-25 17:16:42 +05:30
Saqib Ansari
5450542fdb fix: unsupported operand type(s) for +=: 'int' and 'NoneType' 2022-03-25 16:44:37 +05:30
Wolfram Schmidt
85b0d5fc77
fix: translations (#30387) 
fixed and added translation
 2022-03-25 16:22:23 +05:30
Ankush Menat
f06ef17b5d fix: copy has_batch_no and has_serial_no while duplicating 2022-03-25 16:18:58 +05:30
Ankush Menat
f4b39b87e3 fix(UX): use autocomplete for variant fields 2022-03-25 16:18:58 +05:30
Saqib Ansari
936267c934 fix: move item tax to item tax template patch 2022-03-25 15:45:13 +05:30
Saqib Ansari
33863cd6ab
Merge pull request #30324 from nextchamp-saqib/fix-pos-issues-again 
fix: multiple pos issues
 2022-03-25 15:34:54 +05:30
Deepesh Garg
a9d992ac9f
Merge pull request #30338 from deepeshgarg007/bank_transaction_currency_symbol_fixes 
fix: Currency symbol in bank transactions
 2022-03-25 14:39:01 +05:30
Deepesh Garg
97e102ceef fix: Condition 
(cherry picked from commit 2e0e6ca6b177043f673c05472ac3069f060d1563)
 2022-03-25 07:30:41 +00:00
Deepesh Garg
a83a0a03b1 fix: Revert rate calculation 
(cherry picked from commit 6937a498e71cffc56cad65141f561b4c8785d185)
 2022-03-25 07:30:40 +00:00
Deepesh Garg
54cdff7947 fix: Add back calculation for discount 
(cherry picked from commit 067564bd260437290b7cb190fb1cdc02eb658d0a)
 2022-03-25 07:30:40 +00:00
Deepesh Garg
174a6ec398 fix: Rate change issue on save and mapping from other doc 
(cherry picked from commit 13fcda57767c456dfca4c064c41ca4f80a1898b2)
 2022-03-25 07:30:40 +00:00
Shadrak Gurupnor
c4854bb1b1
fix: failing broken patches (#30409) 
* fix: failing broken patches

* refactor: simpler conditions

[skip ci]
 2022-03-25 12:49:37 +05:30
Saqib Ansari
9a0f5bff65
Merge branch 'develop' into fix-pos-issues-again 2022-03-25 10:52:08 +05:30
Saqib Ansari
16253a2f72 fix: set is_return & return_against in POS Invoice Reference table 2022-03-25 10:51:30 +05:30
Ankush Menat
788d492757 test: basic item and wh capacity dashboard tests 2022-03-25 10:51:19 +05:30
Ankush Menat
10d5fb8cd1 test: check printviews for all docs 2022-03-25 10:51:19 +05:30
Saqib Ansari
1b556d1c53 fix: test cases 2022-03-24 17:59:34 +05:30
Ankush Menat
d4ee31dc8f fix: consider all existing PO items 
When this is sent from API/client side doesn't send temporary_name it
can be flaky. Hence, use all available names for validation.
 2022-03-24 17:58:22 +05:30
Saqib Ansari
cb4873c019 fix: sider issues 2022-03-24 17:56:27 +05:30
Saqib Ansari
cf51a0a1b8 fix(pos): cannot close the pos if sr. no. is sold & returned 2022-03-24 16:22:36 +05:30
Ankush Menat
5b1d6055e6 fix: subassembly items linked to temporary name 
Production Plan tables for po_items and sub_assembly_items are prepared
client side so both dont exist at time of first save or modifying and
hence any "links" created are invalid. This change retains temporary
name so it can be relinked server side after naming is performed.

Co-Authored-By: Marica <maricadsouza221197@gmail.com>
 2022-03-24 15:00:05 +05:30
Ankush Menat
3d43c437ad fix: only validate qty for main non-subassy items 2022-03-24 15:00:05 +05:30
Marica
d24458ab77
fix: (ux) Add is_group=0 filter on website warehouse (#30396) 
- It does not support group warehouses right now and it is misleading
 2022-03-24 12:56:57 +05:30
Saqib Ansari
4aabe97565
Merge branch 'develop' into fix-pos-issues-again 2022-03-24 11:18:13 +05:30
Deepesh Garg
07c7ebfd99
Merge branch 'develop' into gst_state_number_unsetting 2022-03-23 22:04:13 +05:30
Ankush Menat
c9dcf31cf7 test: ensure super()setUpClass is called 2022-03-23 19:46:50 +05:30
Deepesh Garg
993cc287d5
Merge branch 'develop' into sales_person_dashboard 2022-03-23 16:11:22 +05:30
Ankush Menat
6418dc1606 fix: make auto created job cards "Open" 2022-03-23 15:50:46 +05:30
Ankush Menat
e1f5620654 fix: material transfer status should be before WIP 2022-03-23 15:50:46 +05:30
Ankush Menat
4aa74af90d fix: ignore items without info for pending qty computation 2022-03-23 15:46:40 +05:30
Ankush Menat
be16fb9dbb chore(DX): add sourceURL for debugging 2022-03-23 15:46:40 +05:30
marination
a787ebb732 fix: Dont set idx while adding WO items to Stock Entry 
- `idx` must be computed by base document's `self.append()` function, so do not set it
 2022-03-23 14:59:27 +05:30
Deepesh Garg
78ca88d227 fix: Check if onload property exists in the form object 2022-03-23 13:55:05 +05:30
Deepesh Garg
c3f1ad78aa
Merge pull request #30361 from deepeshgarg007/tax_account_display 
fix: GST account not showing up in tax templates
 2022-03-23 13:17:11 +05:30
Deepesh Garg
3a1e31592e
Merge branch 'develop' into ignore_price_list 2022-03-23 09:27:44 +05:30
Deepesh Garg
405dcb1d3c fix: Add ignore pricelist for missing flows 2022-03-23 09:04:03 +05:30
Deepesh Garg
66ca085e39 fix: Changing item prices on converting orders/receipts to invoices 2022-03-22 23:03:41 +05:30
Deepesh Garg
57924599da fix: GST account not showing up in tax templates 2022-03-22 18:26:58 +05:30
Saqib Ansari
f2ae63cbfd fix(pos): remove returned sr. nos. from pos reserved sr. nos. list 2022-03-22 17:41:49 +05:30
Ankush Menat
f606d2ecc6
fix: flaky salary slip email test (#30358) 2022-03-22 17:36:18 +05:30
Ankush Menat
41db43cdc5 fix: consider full integer batch nos 2022-03-22 16:40:17 +05:30
Ankush Menat
a18c687844 fix: ignore already fetched serial no 
exclude_sr_nos is sent as JSON string of list, so load it before
operating on it.
 2022-03-22 16:40:17 +05:30
Subin Tom
b19305aa83 fix: used get_employees_with_number, strip_number methods 2022-03-22 16:22:09 +05:30
Deepesh Garg
ec04242d72
Merge pull request #30340 from deepeshgarg007/opening_too_field_fixes 
fix: Opening invoice tool field placement
 2022-03-22 16:17:12 +05:30
Deepesh Garg
749ab9b799
Merge branch 'develop' into bank_transaction_currency_symbol_fixes 2022-03-22 16:16:03 +05:30
Marica
87a0b72c26
Merge pull request #30336 from marination/product-filter-lookup 
fix: Product Filters Lookup
 2022-03-22 15:31:28 +05:30
Rucha Mahabal
0ae6561620
test: get leave allocation records query (#30342) 
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-03-22 15:14:05 +05:30
Ankush Menat
51873da4bc test: dynamic current FY creation in before_tests 2022-03-22 14:23:56 +05:30
Ankush Menat
6b638a196b chore: drop dead sample code 2022-03-22 14:23:56 +05:30
Ankush Menat
9a99f993bc refactor: merge print settings custom fields 2022-03-22 14:23:56 +05:30
Ankush Menat
457d616966 refactor: remove dead duplicate code 2022-03-22 14:23:56 +05:30
Ankush Menat
f37316a266 refactor: use get_value instead of exists 2022-03-22 13:07:45 +05:30
barredterra
5c4eabf075 fix: usage of frappe.db.exists 2022-03-22 13:07:45 +05:30
Marica
387fa61a83
Merge branch 'develop' into product-filter-lookup 2022-03-22 12:13:46 +05:30
Deepesh Garg
01cd9e7c2e
Merge branch 'develop' into opening_too_field_fixes 2022-03-22 11:53:06 +05:30
Deepesh Garg
4e2f866a2a
Merge branch 'develop' into gst_state_number_unsetting 2022-03-22 11:52:55 +05:30
Deepesh Garg
645ed7d0fd
Merge branch 'develop' into sales_person_dashboard 2022-03-22 11:52:36 +05:30
Deepesh Garg
69a4b8c80b
Merge branch 'develop' into bank_transaction_currency_symbol_fixes 2022-03-22 11:52:20 +05:30
HarryPaulo
3eb5440aa9
fix: linters erros on report sales payments summary (#30345) 
* fix: wrong values for report and get change amout based on payment TYPE.

* charcase for select field.

* fix: linter check erros

* fix: linters errors

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-03-22 11:39:15 +05:30
Deepesh Garg
636e7f67eb fix: Opening invoice tool field placement 2022-03-21 19:34:57 +05:30
Deepesh Garg
e78a445c24 fix: Currency symbol in bank transactions 2022-03-21 19:06:04 +05:30
marination
f6e64c2cac fix: Product Filters Lookup 
- bind the right classes to the filter lookup field
- make class names more descriptive
- make filter lookup field more visible with white bg and border
- bind lookup input field js in `views.js`
- make filter lookup field functioning for atribute filters too
- added placeholder to lookup field
 2022-03-21 17:58:39 +05:30
Deepesh Garg
1b2c6a5b78
fix: Code cleanup 2022-03-21 17:06:23 +05:30
HarryPaulo
01fd3adedf
fix: report sales payments summary (#30264) 2022-03-21 16:57:27 +05:30
Deepesh Garg
9376d8d308
Merge pull request #30312 from alyf-de/refactor-sales-analytics 
refactor: sales analytics
 2022-03-21 16:44:23 +05:30
Deepesh Garg
363e676a35 fix: Reset GST State number 2022-03-21 16:28:17 +05:30
Ankush Menat
d3be84bfe8 test: correct use of test decorator 2022-03-21 15:40:34 +05:30
Rucha Mahabal
95568210b2
fix(ux): warning for disabled carry forwarding in Policy Assignment (#30331) 2022-03-21 15:30:04 +05:30
Saqib Ansari
aff7408775 fix(pos): allow validating stock on save 2022-03-21 14:08:56 +05:30
Saqib Ansari
4afb47e869 fix(pos): specific case when serialized item not removed 2022-03-21 13:24:11 +05:30
Saqib Ansari
2f82e237ef fix(pos): customer group filter in customer selector 2022-03-21 12:47:35 +05:30
Deepesh Garg
3a7776ea7f fix: Contribution amount against invoices in Sales Person Dashboard 2022-03-21 12:04:18 +05:30
Saqib Ansari
d5fd8e0ba6 fix: prevent multiple save on applying coupon code 2022-03-21 11:36:30 +05:30
Deepesh Garg
1daaf6be2a
Merge pull request #30317 from deepeshgarg007/opening_gl_validation 
fix: P&L account validation on cancellation
 2022-03-21 10:45:07 +05:30
Saqib Ansari
6dc7d6b085
Merge pull request #30287 from nextchamp-saqib/fix-cash-flow-query 
fix: custom cash flow mapper doesn't show any data
 2022-03-21 10:32:42 +05:30
Deepesh Garg
28001ddf42
Merge pull request #30304 from deepeshgarg007/enable_ksa_vat_docs 
fix: Add permission for KSA VAT documents
 2022-03-21 10:18:40 +05:30
Deepesh Garg
2ff6790283 fix: P&L account validation on cancellation 2022-03-21 09:43:31 +05:30
Raffael Meyer
0a015b7f70
refactor: remove redundant if-statement (#30311) 2022-03-20 19:29:41 +05:30
Ankush Menat
c2aad115c1
fix: disable deferred naming on SLE/GLE if hash method is used. (#30286) 
* fix: dont rename GLE/SLE that dont have naming series

* test: tests for deferred naming of ledgers
 2022-03-20 19:26:34 +05:30
HENRY Florian
ca8d757691
fix: clear "Retain Sample" and "Max Sample Quantity" in Item card if Has Batch No is uncheck (#30307) 2022-03-20 15:27:00 +05:30
barredterra
36df21067c refactor: sales analytics 2022-03-20 03:58:24 +01:00
Ankush Menat
4859574233 perf: Single query to delete bins instead of N 2022-03-19 20:55:27 +05:30
Ankush Menat
684d9d66d1 test: warehouse conversion and treeview test 2022-03-19 20:55:27 +05:30
Ankush Menat
953afda01b refactor(warehouse): raw query to ORM 2022-03-19 20:55:27 +05:30
Ankush Menat
4b695915f4 refactor: Use QB for serial fetching query 2022-03-19 20:55:27 +05:30
Ankush Menat
a585dff6fd refactor: batch no filter handling 2022-03-19 20:55:27 +05:30
Ankush Menat
b9eec331e3 test: auto serial fetching 2022-03-19 20:55:27 +05:30
Ankush Menat
4f8bb91eae fix: sort serial nos before sending 2022-03-19 20:55:27 +05:30
Ankush Menat
0a533d6ccc fix: skip already selected serials in sr selector 2022-03-19 20:55:27 +05:30
Ankush Menat
5ec27c9055 fix: filter serial nos by selected batch number 2022-03-19 20:55:27 +05:30
Ankush Menat
f4c213379e fix: set current qty as default qty for stock entry 2022-03-19 20:55:27 +05:30
mergify[bot]
c2cbd407c1
fix: Allow on Submit for Material Request Item Required Date (#30174) (#30308) 
* fix: Allow on Submit for Material Request Item Required Date

* chore: whitespace

(cherry picked from commit cca9668309711bf3ca517726a94df547c5a16bbb)

Co-authored-by: Devarsh Bhatt <58166671+bhattdevarsh@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
 2022-03-19 20:31:06 +05:30