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

6304 Commits

Author SHA1 Message Date
Rohit Waghchaure
aeaf8fd89c fix: incorrect stock levels in the Batch 2023-07-10 13:03:10 +05:30
Ankush Menat
a449a4be29
chore: Add frappe school links (#35995) 
Frappe School provides plenty of free tutorial for learning ERPNext.
 2023-07-04 14:58:45 +05:30
rohitwaghchaure
8179d6a30d
Merge pull request #35977 from rohitwaghchaure/reserve-pos-invoice-batches 
fix: reserve the pos invoice batches
 2023-07-03 22:33:45 +05:30
Rohit Waghchaure
1e8f6c0840 fix: reserve the pos invoice batches 2023-07-03 17:38:48 +05:30
Deepesh Garg
5448859254
fix: Update no copy for received_qty field (#35965) 2023-07-03 13:03:52 +05:30
rohitwaghchaure
232dfad13a
fix: conflicts 2023-07-02 10:45:12 +05:30
Rohit Waghchaure
b77a808921 fix: reposting has not changed valuation rate 
(cherry picked from commit c0c693d8b0faf42089314cf43f4fc117f45de4b4)

# Conflicts:
#	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
 2023-07-02 05:13:29 +00:00
s-aga-r
90a77030a7 fix: add filter for disabled batch 2023-06-30 12:34:39 +05:30
Gursheen Kaur Anand
b9e9204e52
fix: create multiple variants button count and status (#35915) 
fix: change class for fetching columns in multiple variants
 2023-06-28 15:39:00 +05:30
HLD
af418d2342
fix: filter parent warehouses not showing (#35897) 2023-06-27 13:17:52 +05:30
David Arnold
742df8a25e
fix: delivery trip driver is only required on submit (#35876) 
This allows drafting trips and stops without yet deciding on the
assignable driver which, in real life, may well be decided on after
preparing and planning the trip.
 2023-06-27 11:36:44 +05:30
rohitwaghchaure
0e14ea4e32
Merge pull request #35881 from rohitwaghchaure/fixed-serial-batch-bundle-print 
fix: serial and batch bundle values in the standard print format
 2023-06-26 16:21:34 +05:30
Rohit Waghchaure
9cf645e07f fix: serial and batch bundle values in the standard print format 2023-06-26 16:00:53 +05:30
Devin Slauenwhite
f9ed8c10ab
fix: make reorder_level not required (#35831) 
* fix: make reorder_level not required

* fix: allow material request to be made if projected_qty <= reorder_level
 2023-06-24 16:03:15 +05:30
Marica
2868baebab
fix: Payment Term must be mandatory if Allocate Payment based on .. is checked (#35798) 
- Front and Back end validation of condition
- Fix test to accomodate fix
 2023-06-23 16:00:20 +05:30
Deepesh Garg
b523c779f5 Merge branch 'develop' of https://github.com/frappe/erpnext into ledger_preview 2023-06-22 15:43:43 +05:30
Deepesh Garg
0e68da5a2a feat: Show stock ledger preview 2023-06-22 15:43:32 +05:30
rohitwaghchaure
d1bccc8c65
Merge pull request #35829 from rohitwaghchaure/refactor-returned-from-rejected-warehouse 
fix: return against rejected warehouse (UX Issue)
 2023-06-22 12:03:38 +05:30
Rohit Waghchaure
756dbe7ce8 refactor: return against rejected warehouse 2023-06-21 17:40:48 +05:30
rohitwaghchaure
edc38edabf
Merge pull request #35611 from rohitwaghchaure/fix-dont-allow-to-create-reposting-entry-for-closing-stock-balance 
fix: don't allow to make reposting entry for closing stock balance period
 2023-06-21 14:15:40 +05:30
Rohit Waghchaure
96c5c7b1df fix: don't allow to make reposting entry for closing stock balance period 2023-06-21 11:55:51 +05:30
Deepesh Garg
ddbd7d8bbc
Merge pull request #35591 from resilient-tech/remove-whitelisting 
chore: remove whitelisting for methods not accessed from UI
 2023-06-20 20:29:49 +05:30
rohitwaghchaure
79e41e329e
Merge pull request #35809 from rohitwaghchaure/fixed-key-error-in-stock-balance-report 
fix: key error while checking the stock balance report
 2023-06-20 17:00:44 +05:30
Rohit Waghchaure
a627d2a38c fix: keyerror while checking the stock balance report 2023-06-20 15:55:18 +05:30
s-aga-r
4f941ac5c0 perf: index purpose in Stock Entry 2023-06-19 18:42:25 +05:30
Türker Tunalı
507c966aa7
chore: Make material request title translatable (#35764) 
chore: Make material request title translatable
 2023-06-18 22:29:42 +05:30
Sagar Sharma
b5c1c725be
Merge pull request #35739 from s-aga-r/FIX-35493 
fix(ux): set route options for new `SBB`
 2023-06-18 15:13:15 +05:30
rohitwaghchaure
c51e6dba8d
Merge pull request #35756 from rohitwaghchaure/fixed-stock-entry-not-able-to-save 
fix: validation of job card in stock entry
 2023-06-17 13:32:20 +05:30
Rohit Waghchaure
df8c3f0888 fix: validation of job card in stock entry 2023-06-17 12:45:55 +05:30
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
s-aga-r
4b5454c752 fix(ux): set route options for new SBB 2023-06-16 15:04:37 +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