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

6273 Commits

Author SHA1 Message Date
Sagar Sharma
9fb6fc5b9a
Merge pull request #35677 from s-aga-r/FIX-ISS-23-24-01397 
fix: add validation for QI in PR
 2023-06-17 12:19:07 +05:30
rohitwaghchaure
86612b6c05
Merge pull request #35747 from rohitwaghchaure/fixed-incorrect-stock-value-for-pr-return 
fix: incorrect stock value for purchase returned with rejected qty
 2023-06-16 23:08:17 +05:30
Rohit Waghchaure
28dd758aa3 fix: incorrect stock value for purchase returned with rejected qty 2023-06-16 16:44:56 +05:30
Ankush Menat
29da1db516
perf: Duplicate queries for UOM (#35744) 
This query repeats for every item, UOMs rarely if ever change
 2023-06-16 16:38:30 +05:30
Ankush Menat
433489a9e6
perf: Index pick list field in stock entry and DN (#35738) 
We check if pick list is created against them but there's no index so we
end up reading entire table.

```
+------+-------------+------------------+-------+---------------+----------+---------+------+--------+-----------+----------+------------+-------------+
| id   | select_type | table            | type  | possible_keys | key      | key_len | ref  | rows   | r_rows    | filtered | r_filtered | Extra       |
+------+-------------+------------------+-------+---------------+----------+---------+------+--------+-----------+----------+------------+-------------+
|    1 | SIMPLE      | tabDelivery Note | index | NULL          | modified | 9       | NULL | 207015 | 348940.00 |   100.00 |       0.00 | Using where |
+------+-------------+------------------+-------+---------------+----------+---------+------+--------+-----------+----------+------------+-------------+
```

After

```
+------+-------------+------------------+------+-----------------+-----------------+---------+-------+------+--------+----------+------------+------------------------------->
| id   | select_type | table            | type | possible_keys   | key             | key_len | ref   | rows | r_rows | filtered | r_filtered | Extra                         >
+------+-------------+------------------+------+-----------------+-----------------+---------+-------+------+--------+----------+------------+------------------------------->
|    1 | SIMPLE      | tabDelivery Note | ref  | pick_list_index | pick_list_index | 563     | const | 1    | 0.00   |   100.00 |     100.00 | Using index condition; Using w>
+------+-------------+------------------+------+-----------------+-----------------+---------+-------+------+--------+----------+------------+------------------------------->
```
 2023-06-16 15:26:40 +05:30
Ankush Menat
81f916b7d3
perf: Ignore cancelled pick lists while fetching picked items (#35737) 2023-06-16 15:26:01 +05:30
Ankush Menat
07d748c290
perf: Index sales_order_item in Pick list item (#35735) 
- `get_picked_items_qty` does full table scan
- because it also locks, it does full table lock.
 2023-06-16 14:06:24 +05:30
rohitwaghchaure
24d1bf275a
Merge pull request #35699 from rohitwaghchaure/fixed-added-validation-for-incorrect-type 
fix: added validation for incorrect type
 2023-06-15 14:17:04 +05:30
Rohit Waghchaure
1c2fe085b5 fix: test case and removed outward field 2023-06-15 12:56:41 +05:30
Sagar Sharma
ccdf2e6340
Merge pull request #35700 from s-aga-r/FIX-SR-DIFF-QTY 
fix: update `Stock Reconciliation` diff qty while reposting
 2023-06-15 11:42:24 +05:30
s-aga-r
6a1b0a2fab fix: update Stock Reconciliation diff qty while reposting 2023-06-15 11:39:22 +05:30
Rohit Waghchaure
f968f0f257 fix: added validation for incorrect type 2023-06-14 23:26:35 +05:30
rohitwaghchaure
4820221a41
Merge pull request #35636 from s-aga-r/FIX-SBB-AttributeError 
fix: miscellaneous
 2023-06-14 16:02:04 +05:30
s-aga-r
2c1ab569a7 fix: add validation for QI in PR 2023-06-14 15:37:28 +05:30
s-aga-r
7549a5c371 fix(ux): add filters for SBB 2023-06-14 15:04:51 +05:30
s-aga-r
fe054508f1 fix: 'NoneType' object has no attribute 'precision' for Job Card 2023-06-14 15:04:36 +05:30
Hossein Yousefian
9f669d4c2f
Stock aging report fix when called in dashboard chart (#35671) 
fix: get_range_age conditions fixed

see https://github.com/frappe/erpnext/issues/35669
 2023-06-13 19:20:07 +05:30
Ankush Menat
a3ea985348
refactor: Use db.set_single_value (#35668) 
I just applied semgrep autofix. Untested completed, review before merging.

```yaml
- id: frappe-set-value-semantics
  patterns:
    - pattern-either:
      - pattern: frappe.db.set_value($DOCTYPE, None, $...AFTER)
      - pattern: frappe.db.set_value($DOCTYPE, $DOCTYPE, $...AFTER)
  fix: frappe.db.set_single_value($DOCTYPE, $...AFTER)
  message: |
    If $DOCTYPE is a single doctype then using `frappe.db.set_value` is discouraged for setting values in DB. Use db.set_single_value for single doctype instead.
  languages: [python]
  severity: ERROR
```
 2023-06-13 17:30:38 +05:30
rohitwaghchaure
93fe923e2a
Merge branch 'develop' into fixed-process-loss-in-job-card 2023-06-12 19:04:19 +05:30
s-aga-r
db159dd11f fix: Stock Reconciliation document update while reposting 2023-06-12 18:28:16 +05:30
Rohit Waghchaure
0382eecff4 fix: test case 2023-06-12 18:20:38 +05:30
s-aga-r
c9923e4996 fix: 'NoneType' object has no attribute 'precision' 2023-06-12 12:33:13 +05:30
s-aga-r
c6acb0d200 fix: DocType not found 2023-06-12 12:33:13 +05:30
s-aga-r
0b009da122 fix(ux): only list related DocTypes 2023-06-12 12:33:13 +05:30
s-aga-r
9a12545ac3 fix(ux): add filter disabled=0 for batch no 2023-06-12 12:33:07 +05:30
David Arnold
c1b42b858d
fix: set Phone and Email option in doctypes (#35549) 2023-06-11 19:34:41 +05:30
Rohit Waghchaure
e9a6191af9 fix: added process loss in job card 2023-06-09 20:33:46 +05:30
Sagar Sharma
e3802d1c3f
Merge pull request #35618 from s-aga-r/FIX-SBB-SERIAL-NO-QTY 
fix: reset entries qty to `1` for serial item
 2023-06-09 13:01:01 +05:30
s-aga-r
b5c5a90f71 fix(ux): set warehouse for new row 2023-06-09 12:22:24 +05:30
s-aga-r
1f28ca717e fix(ux): set entries qty to 1 before making the field read-only 2023-06-09 12:06:46 +05:30
s-aga-r
1d904c0a86 fix(ux): make qty field read-only for serial item 2023-06-09 12:05:02 +05:30
s-aga-r
93e3fe8445 fix: reset entries qty to 1 for serial item 2023-06-09 11:10:47 +05:30
s-aga-r
446253ff39 fix: TypeError in Closing Stock Balance 2023-06-09 09:30:24 +05:30
Didiman1998
0c12d4d3c5
fix: remove code that causes upscrolling (#35140) 
Co-authored-by: Dietmar Fischer <fischer@kk-software.de>
 2023-06-07 22:35:44 +05:30
rohitwaghchaure
930a107af8
Merge pull request #35567 from s-aga-r/FIX-SBB-STATUS 
fix(ux): serial and batch bundle status
 2023-06-07 14:49:43 +05:30
Ankush Menat
4507cb3cd7
fix: enqueue_after_commit wherever it makes sense (#35588) 2023-06-07 11:58:36 +05:30
s-aga-r
d6208d2e45 fix(ux): serial and batch bundle status 2023-06-06 12:07:46 +05:30
Rohit Waghchaure
dcb0462d51 fix: added validation for insufficient stock during stock transfer 2023-06-05 16:58:54 +05:30
rohitwaghchaure
64f767b95d
Merge pull request #35552 from rohitwaghchaure/fixed-serial-batch-get-query 
fix: get_query for batch number and incorrect batch qty
 2023-06-04 16:56:46 +05:30
Rohit Waghchaure
acd12c5830 fix: get_query for batch number and incorrect batch qty 2023-06-04 16:09:01 +05:30
Sagar Sharma
5ebf46a1b5
Merge pull request #35510 from s-aga-r/FIX-ISS-23-24-01141 
fix: ignore `Non-Stock Item` while calculating `% Picked` in Sales Order
 2023-06-03 11:18:05 +05:30
Rohit Waghchaure
bb95451db6 feat: added jinja method get_serial_or_batch_nos for print format and new print format 'Purchase Receipt Serial and Batch Bundle Print for reference 2023-06-02 17:14:18 +05:30
Rohit Waghchaure
40ab3bdd35 test: test cases for serial and batch bundle 2023-06-02 17:14:18 +05:30
Rohit Waghchaure
42b229435c fix: stock reco test case for serial and batch bundle 2023-06-02 17:14:18 +05:30
Rohit Waghchaure
f4cfc589c6 fix: serial and batch selector 2023-06-02 17:14:18 +05:30
Rohit Waghchaure
26b39ac7f4 fix: travis for asset capitalization and asset repair 2023-06-02 17:14:18 +05:30
Rohit Waghchaure
e88c5d6d90 fix: travis for subcontracting module 2023-06-02 17:14:18 +05:30
Rohit Waghchaure
f79f2a3bab fix: dialog issue 2023-06-02 17:14:18 +05:30
Rohit Waghchaure
74ab20f97a fix: travis for POS merge invoice and putaway rule 2023-06-02 17:14:18 +05:30
Rohit Waghchaure
f8bf4aa7c8 fix: travis for work order, pos invoice and landed cost voucher 2023-06-02 17:14:17 +05:30