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

41436 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
96fc6ad590
Merge pull request #30146 from marination/bom-update-tool 
refactor: Add exception handling in background job within BOM Update Tool
 2022-03-31 15:54:34 +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
gavin
b9d37152ba
Merge pull request #30494 from resilient-tech/fix-get-cached-value 
fix: update `get_cached_value` usage based on changes in definition
 2022-03-30 16:26:51 +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
0a3cf64037 chore: ignore formatting changes in blame 2022-03-30 15:24:55 +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