rohitwaghchaure
dae112eed2
Merge pull request #31966 from rohitwaghchaure/set-default-supplier-from-item
...
fix: default supplier not set in the PP
2022-08-25 12:25:00 +05:30
Rohit Waghchaure
9ab10def49
fix: material request connection on work order
2022-08-25 12:13:17 +05:30
Deepesh Garg
c1f6dd46d1
chore: fix against account
2022-08-25 12:10:52 +05:30
Rohit Waghchaure
5fd468d9ec
fix: default supplier not set in the PP
2022-08-25 11:44:12 +05:30
Deepesh Garg
e9b0c7177f
Merge branch 'develop' into fix-consolidation-precision-error
2022-08-25 11:41:20 +05:30
Samuel Danieli
915102a400
chore: german translations ( #31463 )
2022-08-25 11:23:38 +05:30
Deepesh Garg
5187a9a5ad
Merge pull request #31776 from HarryPaulo/fix-net-amout-sales-analytics
...
fix: for Tree Type item and item group show net amout
2022-08-25 11:05:18 +05:30
Deepesh Garg
9b626d06fc
Merge pull request #31909 from s-aga-r/filters/repost-item-valuation/voucher-no
...
fix: Add docstatus filter for voucher_no in Repost Item Valuation
2022-08-25 10:49:29 +05:30
rohitwaghchaure
1af22e5312
Merge pull request #31951 from rohitwaghchaure/maintenance-visit-issue
...
fix: Purposes not set in Maintenance Visit
2022-08-25 10:48:41 +05:30
Deepesh Garg
77906ea4ab
Merge pull request #31934 from ruthra-kumar/disable_discount_accounting_for_buying
...
refactor: disable discount accounting on Buying module(PI)
2022-08-25 10:34:30 +05:30
Deepesh Garg
40bf1a50fd
Merge pull request #31950 from ruthra-kumar/party_currency_or_multi_currency
...
fix: display amount in account currency if party is supplied
2022-08-25 10:33:49 +05:30
Deepesh Garg
91d6454f87
Merge pull request #31955 from FHenry/dev_fr_translation
...
chore: update french translation
2022-08-25 10:26:17 +05:30
ruthra kumar
e5b04d54ff
fix: display amount in account currency if party is supplied
2022-08-25 10:05:25 +05:30
ruthra kumar
ee889afd4c
Merge pull request #31942 from ruthra-kumar/bug_ar_ap_report_include_payment_against_po
...
fix: include payment against PO in AR/AP report
2022-08-25 09:40:45 +05:30
Florian HENRY
299da5d596
chore: update fr translation
2022-08-24 21:29:22 +02:00
Florian HENRY
1f6f2747d4
chore: update fr translation
2022-08-24 21:20:23 +02:00
Florian HENRY
264f98af14
chore: update french translation
2022-08-24 15:52:00 +02:00
Suraj Shetty
122f1c0ced
fix: Explicitly commit "log_error" since its getting called during GET request ( #31952 )
2022-08-24 18:24:39 +05:30
Rohit Waghchaure
f9a7b31b5b
fix: Purposes not set
2022-08-24 17:16:01 +05:30
ruthra kumar
36f5883dda
test: payments against so/po will show up as outstanding amount
...
1. Class will use FrappeTestCase fixture
2. setup and teardown methods are introduced
3. test for payments against SO
2022-08-24 13:59:42 +05:30
Solufyin
0e26df331c
fix: Route condition set for stock ledger ( #31935 )
2022-08-24 13:28:55 +05:30
Nabin Hait
b4a2eb2e65
fix: gl entries for asset repair
2022-08-24 12:29:15 +05:30
ruthra kumar
fdd167cac1
fix: include payment against PO in AR/AP report
2022-08-24 12:24:55 +05:30
HENRY Florian
fe73d55f70
chore: add Work Order test dependencies ( #31936 )
2022-08-23 16:07:10 +05:30
ruthra kumar
277ef04b60
test: remove discount accounting tests
2022-08-23 15:17:27 +05:30
ruthra kumar
a956e20f29
refactor: disable discount accounting on Buying module(PI)
2022-08-23 11:36:00 +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
2effbb55ae
test: Add test case for Subcontracting Receipt GL Entries
2022-08-22 22:14:56 +05:30
Sagar Sharma
bf5c43322a
fix: don't allow to create SCR directly ( #31924 )
2022-08-22 18:36:42 +05:30
Sagar Sharma
e888639c7e
fix: Subcontracting Receipt GL Entries
2022-08-22 10:48:21 +05:30
Deepesh Garg
8cb7567fd3
Merge pull request #31914 from frappe/mergify/bp/develop/pr-31894
...
fix: TDS calculation for advance payment (backport #31894 )
2022-08-22 10:31:30 +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
Sagar Sharma
f4673941e0
chore: move function "add_gl_entry" from purchase_receipt.py to stock_controller.py
2022-08-21 21:26:06 +05:30
Deepesh Garg
3b15966cc9
fix: Cash and non trade discount calculation
2022-08-21 17:51:05 +05:30
Sagar Sharma
520306dc87
fix: Add docstatus filter for voucher_no in Repost Item Valuation
2022-08-21 12:09:08 +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
3b51874da5
Merge pull request #31899 from s-aga-r/subcontracting-receipt/reposting
...
fix: repost item valuation for subcontracting receipt
2022-08-19 22:01:22 +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
1d28ea5458
Merge pull request #31890 from s-aga-r/fix/subcontracting/additional-cost
...
fix: additional-costs in SCO and SCR
2022-08-19 15:26:00 +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
