HENRY Florian
fe73d55f70
chore: add Work Order test dependencies ( #31936 )
2022-08-23 16:07:10 +05:30
Deepesh Garg
9fd0c25c9f
Merge pull request #31910 from deepeshgarg007/cash_and_non_trade_discount_fix
...
fix: Cash and non trade discount calculation
2022-08-23 10:19:09 +05:30
Deepesh Garg
1cb7ae16ab
chore: Linting issues
2022-08-23 09:12:20 +05:30
Sagar Sharma
bf5c43322a
fix: don't allow to create SCR directly ( #31924 )
2022-08-22 18:36:42 +05:30
Maharshi Patel
42de9ca49e
fix: TDS calculation for advance payment
...
"against_voucher": ["is", "not set"] was used in query due to which if TDS was added on "advance" payment vouchers and then reconciled against purchase invoice. it will not find those vouchers and consider this as first-time threshold due to which it will calculate Tax for all transactions.
(cherry picked from commit a4521437825a960e14556fa3963bd1bd1a55a2dc)
2022-08-22 03:29:46 +00:00
Deepesh Garg
ae3dce0cbd
fix: Test cases
2022-08-22 08:57:58 +05:30
Deepesh Garg
3b15966cc9
fix: Cash and non trade discount calculation
2022-08-21 17:51:05 +05:30
Sagar Sharma
588ca68171
fix: make rate field read-only in subcontracting receipt item ( #31905 )
2022-08-20 17:50:47 +05:30
Sagar Sharma
f92f3e0208
chore: add option for "Subcontracting Receipt" in "Voucher Type"
2022-08-19 20:52:26 +05:30
Sagar Sharma
f8c11847bb
chore: allow subcontracting receipt backdated entry
2022-08-19 20:44:13 +05:30
Sagar Sharma
dd719099bc
Merge branch 'develop' into fix/subcontracting/additional-cost
2022-08-19 11:47:23 +05:30
Sagar Sharma
c247cf728c
chore: add test for additional-cost
2022-08-19 11:46:36 +05:30
Sagar Sharma
addd7347d8
fix: test "test_pending_and_received_qty"
2022-08-19 11:46:27 +05:30
Saqib Ansari
756fe4b375
fix(pos): edge case while closing pos ( #31748 )
...
* fix(pos): edge case while closing pos
* fix: linter
* fix: setting posting_time in pos invoice merge log
2022-08-19 10:22:00 +05:30
Sagar Vora
aafb735283
perf: use create_custom_fields ( #31853 )
...
* perf: use `create_custom_fields`
* fix: default must be a string
2022-08-18 21:01:20 +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
7e88eb549f
chore: remove unwanted field "provisional_expense_account" from SCR ( #31847 )
2022-08-18 17:39: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
ruthra kumar
72a7ed5b58
Merge pull request #31871 from ruthra-kumar/fix_gross_profit_valuation_rate
...
fix: incorrect buying amount in Gross Profit rpt
2022-08-18 16:08:19 +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
ruthra kumar
967dd398e7
fix: incorrect buying amount in Gross Profit rpt
2022-08-17 16:21:03 +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
