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

45445 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rohit Waghchaure
9cf645e07f fix: serial and batch bundle values in the standard print format 2023-06-26 16:00:53 +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
mergify[bot]
e3afcc6945
fix: cannot start / stop Job Card (backport #35753) (#35755) 
fix: cannot start / stop jobs

(cherry picked from commit 53ec2a9268ca41fd44f58859df02c1f0876ed757)

Co-authored-by: Anoop Kurungadam <anoop@earthianslive.com>
 2023-06-17 12:15:47 +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
Ankush Menat
6086d1a99d
perf: duplicate queries while checking prevdoc (#35746) 
These values can't change durning DB transaction AFAIK
 2023-06-16 18:25:58 +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
mergify[bot]
50f83859db
fix: consider field precision while setting sle actual_qty (backport #35717) (#35720) 
* fix: consider field precision while setting sle actual_qty (#35717)

(cherry picked from commit 3f62e854e58346b86bf510a60712ae1a364a3e9c)

# Conflicts:
#	erpnext/controllers/buying_controller.py

* chore: `conflicts`

---------

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
 2023-06-15 20:18:17 +05:30
Rucha Mahabal
6dd5117f61
Merge pull request #35709 from ruchamahabal/remove-hierarchy-chart 2023-06-15 19:15:39 +05:30
rohitwaghchaure
6cb31a9770
Merge pull request #35712 from s-aga-r/FIX-ISS-23-24-01470 
fix: `Process Loss Report`
 2023-06-15 19:13:08 +05:30
rohitwaghchaure
fc38d45c35
Merge pull request #35711 from rohitwaghchaure/fixed-incorrect-gl-for-debit-note 
fix: incorrect gl entries for standalone debit note
 2023-06-15 19:12:29 +05:30
Rohit Waghchaure
f9f662679f test: added test case 2023-06-15 18:09:56 +05:30
Anand Baburajan
bb39a2cac7
fix: don't add GL Entry for Acc. Depr. while scrapping non-depreciable assets (#35714) 
fix: on asset scrap, don't add gl entry for acc. depr. if no acc. depr.
 2023-06-15 17:12:59 +05:30
s-aga-r
d176d86e2c fix: Process Loss Report 2023-06-15 16:01:08 +05:30
Rohit Waghchaure
6e198188ff fix: incorrect gl entries for standalone debit note with update stock 2023-06-15 14:45:27 +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
Rucha Mahabal
8c374f57ed chore: remove html2canvas from dependencies 
- was used for hierarchy charts (org charts)
 2023-06-15 13:56:05 +05:30
Rucha Mahabal
520268002f refactor!: remove hierarchy charts 2023-06-15 13:10:19 +05:30
Rohit Waghchaure
1c2fe085b5 fix: test case and removed outward field 2023-06-15 12:56:41 +05:30
ruthra kumar
490ec63114
Merge pull request #35701 from ruthra-kumar/typeerror_on_exchange_rate_revaluation 
fix: typeerror on exchange rate revaluation
 2023-06-15 12:24:07 +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
ruthra kumar
f8273f7db6 fix: typeerror on exchange rate revaluation 2023-06-15 11:37:59 +05:30
Rohit Waghchaure
f968f0f257 fix: added validation for incorrect type 2023-06-14 23:26:35 +05:30
ruthra kumar
be78ae72ef
Merge pull request #35694 from ruthra-kumar/reference_error_on_err 
fix: reference error while using exchange rate revaluation
 2023-06-14 20:44:16 +05:30
ruthra kumar
cd538e138a fix: reference error while using exchange rate revaluation 2023-06-14 20:28:28 +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
Suraj Shetty
afaa85fbde
fix(telephony): Check if setup_phone method exists 
We are just overriding Data control. 

This fails if other field type like "Small Text" has option set as "Phone"
 2023-06-14 15:54:27 +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
5c805db573 fix(ux): add is_cancelled=0 filter 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
Deepesh Garg
984f89d274
fix: Validation for delivery date in Sales Order (#35597) 
* fix: Validation for delivery date in Sales Order

* chore: update utils

* chore: revert

* chore: Add default delivery date
 2023-06-13 21:35:52 +05:30
Deepesh Garg
937c0feefe
fix: Lower deduction certificate not getting applied (#35667) 2023-06-13 20:06:36 +05:30
Anand Baburajan
491a50a027
fix: make showing taxes as table in print configurable (#35672) 2023-06-13 19:42:56 +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
Devin Slauenwhite
20de27d480
fix(accounts): validate payment entry references with latest data. (#31166) 
* test: payment entry over allocation.

* fix: validate allocated_amount against latest outstanding amount.

* fix: payment entry get outstanding documents for advance payments

* fix: only fetch latest outstanding_amount.

* fix: throw if reference is allocated

* test: throw error if a reference has been partially allocated after inital creation.

* chore: test name

* fix: remove unused part of test

* chore: linter

* chore: more user friendly error messages

* fix: only validate outstanding amount if partly paid and don't filter by cost center

* chore: minor refactor for doc.cost_center

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>

---------

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-06-13 19:06:53 +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
ruthra kumar
b43e068852
Merge pull request #35659 from ruthra-kumar/fix_attribute_error_in_payment_reconciliation 
fix: attribute error on payment reconciliation tool
 2023-06-13 10:16:26 +05:30
ruthra kumar
b672616617
Merge pull request #35620 from ruthra-kumar/err_higher_allowance_for_debit_credit_diff 
fix: allow custom rounding loss allowance in Exchange Rate Revaluation
 2023-06-13 09:46:08 +05:30
ruthra kumar
bada5796fa fix: attribute error on payment reconciliation tool 2023-06-13 09:32:24 +05:30
rohitwaghchaure
4ee08b92ae
Merge pull request #35629 from rohitwaghchaure/fixed-process-loss-in-job-card 
fix: added process loss in job card
 2023-06-12 23:29:15 +05:30
ruthra kumar
96a0132501 fix: allow user to set rounding loss allowance for accounts balance 2023-06-12 22:05:08 +05:30
Ankush Menat
f957a84830
build!: update deps and drop setup.py (#35653) 2023-06-12 21:46:06 +05:30
rohitwaghchaure
64586187de
Merge branch 'develop' into fixed-process-loss-in-job-card 2023-06-12 21:39:29 +05:30