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

45505 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ruthra kumar
9e73af891d fix: get base grand total while pulling reference details in PE 2023-06-23 14:50:14 +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
ruthra kumar
4e7deba2ad
Merge pull request #35825 from ruthra-kumar/convert_db_call_to_whitelisted_method 
fix: multiple fixes in reconciliation tools
 2023-06-22 11:27:04 +05:30
ruthra kumar
41b9e92868 fix: incorrect cost center error in bank reconciliation 2023-06-22 10:43:13 +05:30
Rohit Waghchaure
756dbe7ce8 refactor: return against rejected warehouse 2023-06-21 17:40:48 +05:30
mergify[bot]
39a1f4a4c1
fix: issue of asset value_after_depreciation field getting updated twice if workflow is enabled in Journal Entry (backport #35821) (#35826) 
* Fixes issue of asset value_after_depreciation field getting updated twice if workflow is enabled in Journal Entry (#35821)

* Fixes issue of asset value_after_depreciation field getting updated twice if workflow is enabled in Journal Entry

* chore: remove unnecessary line break

* chore: formatting

---------

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
(cherry picked from commit 000ebe447991185e4d5a4050b066fa0781575e65)

# Conflicts:
#	erpnext/assets/doctype/asset/depreciation.py

* chore: resolve conflicts

---------

Co-authored-by: saeedkola <mohammedsaeedk@gmail.com>
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-06-21 15:38:06 +05:30
ruthra kumar
ad758b8d85 fix: no permission for accounts settings on payment reconciliation 2023-06-21 14:19:02 +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
8816039bd9
Merge pull request #35810 from rohitwaghchaure/stock-error-for-service-item 
fix: stock error for service item
 2023-06-20 17:20:26 +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
32965f1af9 fix: stock error for service item 2023-06-20 16:27:23 +05:30
Rohit Waghchaure
a627d2a38c fix: keyerror while checking the stock balance report 2023-06-20 15:55:18 +05:30
ruthra kumar
8aa47a13e3
Merge pull request #35794 from ruthra-kumar/exchange_revaluation_only_post_on_account_currency_based_on_scenario 
fix: Exchange Rate Revaluation should only post on the currency that has balance in a 'zero' balance account
 2023-06-20 13:58:54 +05:30
Deepesh Garg
32c35b87f9
Merge pull request #34675 from frappe/bank-trans-party-automatch 
feat: Auto set Party in Bank Transaction
 2023-06-20 13:24:44 +05:30
Anand Baburajan
df090cbe87
chore: minor typo in fixed asset register (#35801) 
chore: renaming entries to assets
 2023-06-20 13:03:15 +05:30
ruthra kumar
6694175a51 refactor: higher precision for rounding loss and allow '0' 2023-06-20 12:44:08 +05:30
ruthra kumar
4567474418 refactor: allow '0' rounding allowance 2023-06-20 12:44:08 +05:30
ruthra kumar
9d04af9ecc refactor: allow higher precision for new exchange rate 2023-06-20 12:44:08 +05:30
ruthra kumar
1b33afd699 fix: for zero bal accounts, dr/cr only on currency that has balance 2023-06-20 12:44:04 +05:30
Anand Baburajan
0d12588583
fix: date and finance book fixes in fixed asset register (#35751) 
* fix: handle finance books properly and show all assets by default in fixed asset register

* chore: rename value to depr amount

* chore: get asset value for correct fb properly

* chore: rename include_default_book_entries to include_default_book_assets
 2023-06-20 12:06:27 +05:30
Smit Vora
4fbff20954
fix: make credit note and debit note exclusive (#35781) 2023-06-19 21:14:42 +05:30
Anand Baburajan
c1da3ddbbf
fix: fix get outstanding invoices btn and add get outstanding orders btn (#35776) 
* fix: fix get outstanding invoices btn and add get outstanding orders btn

* chore: remove unnecessary arg
 2023-06-19 19:53:05 +05:30
Marica
8ab8230adf
Merge branch 'develop' into bank-trans-party-automatch 2023-06-19 19:19:15 +05:30
Sagar Sharma
b26d70b527
Merge pull request #35782 from s-aga-r/SE-PURPOSE-INDEX 
perf: index `purpose` in `Stock Entry`
 2023-06-19 18:43:02 +05:30
s-aga-r
4f941ac5c0 perf: index purpose in Stock Entry 2023-06-19 18:42:25 +05:30
Raffael Meyer
11126521c9
Merge branch 'develop' into bank-trans-party-automatch 2023-06-19 15:04:37 +02:00
Deepesh Garg
9d27a25e5f
fix: Allocated amount validation for other party types (#35741) 
* fix: Allocated amount validation for other party types

* chore: Validation for return allocations

* chore: minor typo

---------

Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
 2023-06-19 11:04:50 +05:30
mergify[bot]
78fbd6452b
fix: unsupported operand type(s) for //: 'float' and 'NoneType' for POS Barcode search (#35710) 
* fix: unsupported operand type(s) for //: 'float' and 'NoneType' for POS Barcode search (#35710)

(cherry picked from commit 58a6bbcf6d95f59821484ff29b585c10529a0fe4)

# Conflicts:
#	erpnext/selling/page/point_of_sale/point_of_sale.py

* chore: resolve conflicts

---------

Co-authored-by: Vishal Dhayagude <vishdha@users.noreply.github.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-06-19 09:14:43 +05:30
Abhinav Raut
2a24423ad2
fix: loan interest accrual date (#35695) 
fix: loan interest accrual date

---------

Co-authored-by: Abhinav Raut <abhinav.raut@zerodha.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-06-18 23:11:52 +05:30
HENRY Florian
d12c9b434e
chore: fr translation lead vs prospect (#35697) 
chore: fr translation lead vs prospect
 2023-06-18 22:30:15 +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
Lakshit Jain
93c0c26843
fix: modify filters for account in journal entry (#35626) 2023-06-18 22:25:28 +05:30
David Arnold
0444b98802
feat: add verified chart of accounts for colombia in two variants (#34508) 
This information is scraped from the in Colombia widely trusted site
dedicated to the plan unico de cuentas (PUC): puc.com.co

feat(accounts): add account_type overlay to colombian CoA

Add account_type overlay with a most significant number matching
strategy and a hand-crafted dictionary based on the erpnext
documentation and the corresponding account description from puc.com.co

Script used for scraping:
https://gist.github.com/blaggacao/d45a454d27556f41fef88833937088f1
 2023-06-18 22:17:31 +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
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
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
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
Raffael Meyer
51848ee9d7
Merge branch 'develop' into bank-trans-party-automatch 2023-06-15 16:36:17 +02:00