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

32897 Commits

Author SHA1 Message Date
Sagar Sharma
addd7347d8 fix: test "test_pending_and_received_qty" 2022-08-19 11:46:27 +05:30
Sagar Sharma
256b4245d5 chore: add additional-cost table in SCR 2022-08-18 20:59:30 +05:30
Sagar Sharma
2fc6833684 fix: recalculate rate of items based on "Recalculate Rate" checkbox 2022-08-18 19:50:00 +05:30
Sagar Sharma
ea82fe5bc2 chore: move "set_missing_values_in_additional_costs" from SCO to SC" 2022-08-18 17:20:22 +05:30
Sagar Sharma
eabd3135f0 fix: base_amount and exchange_rate in additional-cost table 2022-08-18 17:16:29 +05:30
Sagar Sharma
d7ed4093d8 fix: additional-cost in items table 2022-08-18 16:45:11 +05:30
Deepesh Garg
86bdddd1b8
Merge pull request #31875 from adityahase/fix-projects-typo 
fix(projects): Add missing comma
 2022-08-18 11:18:51 +05:30
Deepesh Garg
1a6508972e
fix: Make expense account editable in Purchase Receipt Item (#31730) 
Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
 2022-08-18 10:59:39 +05:30
Sagar Sharma
8704ca783d
fix: Add dimension section in subcontracting doctypes (#31849) 2022-08-18 10:58:33 +05:30
Aditya Hase
d38778e400
fix(projects): Add missing comma 
Added with https://github.com/frappe/erpnext/pull/31360
 2022-08-17 18:21:43 +05:30
Sagar Sharma
f1a612245c
fix: Transit filter for Default Target Warehouse in SE (#31839) 2022-08-17 16:44:12 +05:30
Sagar Sharma
2d04e71412
fix: Make expense account editable in Subcontracting Receipt Item (#31848) 2022-08-17 15:57:41 +05:30
rohitwaghchaure
396667b702
Merge pull request #31860 from rohitwaghchaure/delete-custom-fields-on-dimension-delete 
fix: delete custom fields on deletion of inventory dimension
 2022-08-17 15:43:54 +05:30
ruthra kumar
ea84c157e0
Merge pull request #31856 from ruthra-kumar/incorrect_tax_due_to_exchange_rate 
fix: incorrect tax amt due to different exchange rate in PR and PI
 2022-08-17 15:05:57 +05:30
Rohit Waghchaure
0b39a0123e fix: delete custom fields on deletion of inventory dimension 2022-08-17 14:55:02 +05:30
rohitwaghchaure
dd08045f28
Merge pull request #31863 from rohitwaghchaure/allow-to-make-material-issue 
fix: not able to issue expired batches
 2022-08-17 14:45:14 +05:30
Rohit Waghchaure
795c94384a fix: not able to issue expired batches 2022-08-17 14:03:55 +05:30
Sagar Sharma
313625c349
fix: incorrect rate in BOM exploded items (#31513) 2022-08-17 13:51:53 +05:30
Sagar Sharma
538cd6fdcf
fix: incorrect produced-qty in production-plan-item (#31706) 2022-08-17 13:01:56 +05:30
ruthra kumar
5fd0770372 fix: incorrect tax amt due to different exchange rate in PR and PI 2022-08-16 16:41:33 +05:30
ruthra kumar
3b4c0a3fc0
fix(minor): don't print tax rate if its '0' (#31838) 2022-08-16 16:35:46 +05:30
Sagar Sharma
0047e18a9b
fix: check item_code in all rows of po_items (#31741) 
fix: check item-code in each row of po-items
 2022-08-13 11:07:22 +05:30
Sagar Sharma
e5e88bb9f1
fix: contact search in request for quotation (#31828) 2022-08-13 11:05:48 +05:30
Deepesh Garg
79ac50d0f7 fix: Unable to make payment entry against Fees using education app 2022-08-11 19:31:31 +05:30
Deepesh Garg
72869ed197
Merge pull request #31799 from abhinavxd/fix-process-loan-interest-accrual 
fix: process loan interest accrual
 2022-08-11 15:47:18 +05:30
ruthra kumar
5018472840
Merge pull request #31817 from ruthra-kumar/fix_pos_recent_order_crash_due_to_large_data 
fix: limit pos recent order page result
 2022-08-10 15:48:28 +05:30
Nabin Hait
eb25eddc22
Merge pull request #31816 from nabinhait/crm-no-of-employees 
fix: limited options for no-of-employees in the crm documents
 2022-08-09 20:47:52 +05:30
Nabin Hait
909945c0ac fix: map old data as per new options of no-of-employees 2022-08-09 20:47:18 +05:30
ruthra kumar
bb40e38451 fix: limit pos recent order page result 2022-08-09 19:35:43 +05:30
Nabin Hait
7ecd67605f fix: limited options for no-of-employees in crm 2022-08-09 19:06:57 +05:30
Ankush Menat
08d7c48dc7
refactor: use browser native lazy loading (#31814) 2022-08-09 18:49:14 +05:30
Akash Krishna
32b30bc5de
Tds report (#31801) 
* fix: TDS Computation Summary Report not loading, too many values to unpack
 2022-08-09 17:41:02 +05:30
rohitwaghchaure
e93a1cc02e
Merge pull request #31804 from rohitwaghchaure/fixed-incorret-incoming-rate-for-internal-suppliier 
fix: incorrect incoming rate set for inter transfer purchase receipt
 2022-08-09 16:00:31 +05:30
Raffael Meyer
6b510546ae
fix: german translations (#31732) 2022-08-09 15:11:52 +05:30
Rohit Waghchaure
ddd24ea8c8 fix: incorrect incoming rate set for inter transfer purchase receipt 2022-08-09 14:50:20 +05:30
Abhinav Raut
534d7ce64b fix: term loan interest calculation 2022-08-08 17:35:31 +05:30
Deepesh Garg
5c4cc5ae5b
Merge pull request #31779 from ruthra-kumar/bug_add_accouting_dimension_in_asset_repair 
Bug add accouting dimension in asset repair
 2022-08-08 16:39:21 +05:30
Abhinav Raut
9ef8d5c5c3 fix: process loan interest accrual 2022-08-08 16:29:13 +05:30
Deepesh Garg
b85dbdc3c1
Merge pull request #31777 from ruthra-kumar/intercompany_po_bug 
fix: intercompany SO created from Purchase Order throws exception
 2022-08-08 16:06:09 +05:30
Sagar Vora
d05082987f fix: set company_address for purchases in party.js 2022-08-08 06:04:10 +00:00
Sagar Vora
a3625b3817 fix: set billing_address for purchases in get_party_details 2022-08-08 06:04:10 +00:00
ruthra kumar
80f508c4b1 chore: patch for creating existing dimensions in asset repair 2022-08-05 15:22:38 +05:30
Abhinav Raut
a272d73dd9 fix: pending principal- amount 2022-08-04 19:04:34 +05:30
ruthra kumar
452584c4bd fix: add asset repair to accounting dimension list 2022-08-04 14:09:26 +05:30
ruthra kumar
af0a353b79 fix: intercompany SO throws exception 2022-08-04 14:01:23 +05:30
ruthra kumar
ef312b8fc4 test: posting_date should not affect outstanding amount calculation 2022-08-04 09:38:01 +05:30
ruthra kumar
5f1562c5b2 fix: posting_date of linked vouchers should not affect outstanding 
posting_date filter should not be applied for linked vouchers.
 2022-08-04 09:38:01 +05:30
Ankush Menat
17b9bfd249
fix(ecommerce): remove query to non-existing field (#31771) 2022-08-03 16:48:27 +05:30
HarryPaulo
ea88451875
fix: getting error to show sales invoice group or print rep… (#31756) 
fix: formatter getting error to show sales invoice group or print report.

1 - When I view the Gross Profit report in Sales Invoice mode, the table is all broken.
Error on browser console:
TypeError: Cannot read properties of undefined (reading 'indent')

2 - When I try to print, no matter the Group (Sales Invoice, Item Code, Item Group...) nothing happens. in browser log console I have the following error:
TypeError: Cannot read properties of undefined (reading 'content')

i fixed both errors and all working perfectly.
 2022-08-03 11:21:30 +05:30
Devin Slauenwhite
9c580dde39
fix: linter (#31763) 2022-08-03 11:16:59 +05:30