Deepesh Garg
318da16b99
fix: Rounded total for cash and non trade discount invoices
2022-08-29 14:18:39 +05:30
Sagar Sharma
af5cbc881f
chore: allow return of components in SCO ( #31994 )
...
chore: allow return of components in sco
2022-08-26 22:49:40 +05:30
Deepesh Garg
7da39c3ff3
Merge pull request #31991 from frappe/codeowners
...
chore: Update code owners
2022-08-26 17:39:18 +05:30
Deepesh Garg
ac57101833
chore: Update code owners
2022-08-26 17:37:13 +05:30
Deepesh Garg
87ca23736d
Merge pull request #31988 from ruthra-kumar/remove_precision_discount_percentage
...
chore: remove precision on discount_percentage of Sales Invoice Item
2022-08-26 16:03:57 +05:30
HENRY Florian
6cd7ef9cc3
Merge branch 'develop' into dev_enhance_upgrade_process
2022-08-26 11:33:22 +02:00
ruthra kumar
c42fef541a
chore: remove precision on discount_percentage of Sales Invoice Item
2022-08-26 13:15:55 +05:30
rohitwaghchaure
5ac27100a5
Merge pull request #31984 from SolufyPrivateLimited/Solufy-so-to-po
...
fix: Purchase Order creation from Sales Order
2022-08-26 12:00:52 +05:30
Solufyin
bd4b4ddd8b
fix: Purchase Order creation from Sales Order
2022-08-26 11:18:56 +05:30
Florian HENRY
d19b664ba9
chore: better text
2022-08-25 22:35:44 +02:00
Florian HENRY
ac66538651
chore: remove debug
2022-08-25 22:35:08 +02:00
Florian HENRY
9d02fbadb4
fix: upgrade process to version-14 when currency opportunity wass not set
2022-08-25 20:45:35 +02:00
ruthra kumar
902797d0f0
Merge pull request #31977 from ruthra-kumar/ar_ap_report_filter_on_party_type
...
fix: restrict party types to Supplier/Customer for AR/AP report
2022-08-25 16:19:50 +05:30
ruthra kumar
6aa8fd0f7b
fix: restrict party types to Supplier/Customer for AR/AP report
2022-08-25 15:50:06 +05:30
Sagar Sharma
8566832dd5
fix: add validation for PO in Stock Entry ( #31974 )
2022-08-25 15:05:13 +05:30
Deepesh Garg
9e43c9cff3
Merge pull request #31943 from nabinhait/asset-repair
...
fix: gl entries for asset repair
2022-08-25 13:24:26 +05:30
rohitwaghchaure
b27f3ab327
Merge pull request #31967 from rohitwaghchaure/connection-added-for-work-order
...
fix: material request connection on work order
2022-08-25 12:29:10 +05:30
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
