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

35450 Commits

Author SHA1 Message Date
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
Gursheen Anand
b3d565c91f feat: Provision to send Accounts Receivable Reports using Process Statement of Accounts 
Issue #35707
 2023-06-19 19:59:24 +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
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
Deepesh Garg
5e9014be8c
Merge branch 'develop' into make-accounting-dimension-filter-values-optional 2023-06-19 09:21:04 +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
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
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
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
ruthra kumar
96a0132501 fix: allow user to set rounding loss allowance for accounts balance 2023-06-12 22:05:08 +05:30
rohitwaghchaure
64586187de
Merge branch 'develop' into fixed-process-loss-in-job-card 2023-06-12 21:39:29 +05:30
rohitwaghchaure
62011410b2
fix: test case PyPDF2 (#35652) 
fix: test case
 2023-06-12 19:22:55 +05:30
Ankush Menat
1e8ee9354a
fix(DX): Check Frappe and ERPNext major versions (#35651) 2023-06-12 19:20:52 +05:30
rohitwaghchaure
93fe923e2a
Merge branch 'develop' into fixed-process-loss-in-job-card 2023-06-12 19:04:19 +05:30
mergify[bot]
4f3d531f35
fix: don't set default payment amount in case of invoice return (backport #35645) (#35647) 
fix: don't set default payment amount in case of invoice return (#35645)

(cherry picked from commit 79483cc90eb71fa82d645b2cf54d9731502cf6c7)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-06-12 18:43:26 +05:30
Deepesh Garg
011ac131cf fix: Add column values 2023-06-12 18:42:49 +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
ruthra kumar
42f4f80e0c
fix: Payment against credit notes will be considered as payment against parent invoice in Accounts Receivable/Payable report (#35642) 
* fix: payment against credit note should be linked to parent invoice

* test: AR/AP report for payment against cr note scenario

* fix: cr_note shows up as outstanding invoice

Payment made against cr_note causes it be reported as outstanding invoice
 2023-06-12 17:35:13 +05:30
Deepesh Garg
2f24546b21
fix: Make difference entry button not working (#35622) 2023-06-12 15:20:28 +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
Deepesh Garg
e30c3eafef fix: Stock ledger preview 2023-06-12 11:46:51 +05:30
David Arnold
c1b42b858d
fix: set Phone and Email option in doctypes (#35549) 2023-06-11 19:34:41 +05:30
ruthra kumar
dcbd7d5f1f
fix: incorrect TCS amount while customer has advance payment (#35397) 
* fix: incorrect TCS amount while customer has advance payment

* test: only unallocated advance should for threshold breach validation
 2023-06-10 20:55:30 +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
Anand Baburajan
7bd369c49b
fix: calculate wdv depr schedule properly for existing assets [dev] (#35614) 
* fix: calculate wdv depr schedule properly for existing assets

* fix: calculate wdv depr schedule properly for existing assets properly

* chore: properly call _get_pro_rata_amt
 2023-06-09 12:53:10 +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
Christian Werner
65b2e1fc33
fix: set parent_project when creating a new timesheet (#35607) 
fix "When Creating a new Timesheet from an Task - parent_project is empty" #35578
 2023-06-08 20:00:40 +05:30
Raffael Meyer
b91bb17779
refactor: get default contact or address (#35248) 
* refactor: get_party_shipping_address

* refactor: get_default_contact

* chore: adding docstrings

* fix: keep original order

* fix: use get_all instead of get_list

---------

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
 2023-06-08 19:49:09 +05:30
ruthra kumar
992d61bd90 chore: fix travis 2023-06-08 15:11:46 +05:30