ruthra kumar
84b7c1bba0
fix: tds incorrectly calculated for invoice that are below threshold
...
Two purchase invoices for the same supplier, using different tax
withholding categories have this issue.
| Category | single | cumulative |
|----------+--------+------------|
| cat1 | 100 | 500 |
| cat2 | 1000 | 5000 |
1. PINV1 of net total: 105/- uses cat1. TDS is calculated as it
breached single threshold
2. PINV2 of net total: 200/- uses cat2. TDS incorrectly calculated as
PINV1 already has TDS calculated and 'consider_party_ledger_amount' is enabled.
2023-05-17 13:55:41 +05:30
Sagar Sharma
42804306fd
Merge branch 'develop' into PACKING-SLIP-FOR-DN-PACKED-ITEMS
2023-05-17 13:17:59 +05:30
ruthra kumar
e927f6cab1
Merge pull request #35239 from ashish-greycube/patch-8
...
fix: in payment_entry difference amount cal is broken
2023-05-17 10:25:55 +05:30
ruthra kumar
0da6c1688b
fix: unable to create partial invoice with auto fetch terms enabled ( #35285 )
...
fix: fetch so/po terms if auto fetch is enabled
2023-05-16 18:57:42 +05:30
rohitwaghchaure
96e6014d12
Merge pull request #35328 from rohitwaghchaure/fixed-create-reposting-entry-for-cancelled-documents
...
fix: force to do reposting for cancelled document
2023-05-16 17:31:45 +05:30
Ashish Shah
ae4e56747c
refactor: use 'flt' for base_total_taxes_and_charges
...
difference_amount calculation is broken, as calculation gives NaN. Fix is make frm.doc.base_total_taxes_and_charges as flt(frm.doc.base_total_taxes_and_charges)
2023-05-16 16:55:11 +05:30
Rohit Waghchaure
6e661e7c0e
fix: force to do reposting for cancelled document
2023-05-16 16:23:52 +05:30
ruthra kumar
776a83066d
fix: cancelled vouchers in tax withheld vouchers list ( #35309 )
2023-05-16 15:54:46 +05:30
Ankush Menat
5574d9a72d
fix(UX): misc "home" onboarding improvements ( #35319 )
...
* fix(UX): cleanup "Home" onboarding
- Remove company, letterhead, data import etc from home onboarding step
* fix(UX): Show quick entry for item
* chore: fix copy here and there
2023-05-16 13:38:55 +05:30
Rucha Mahabal
9feda1b829
perf: cache and simplify queries for holiday list ( #35315 )
2023-05-16 13:11:47 +05:30
rohitwaghchaure
5c2d7701ea
Merge pull request #35312 from rohitwaghchaure/fixed-item-list-view-not-working
...
fix: item list view not working
2023-05-16 01:09:44 +05:30
Rohit Waghchaure
0489e30244
fix: item list view not working
2023-05-16 00:48:52 +05:30
rohitwaghchaure
3f5ce43185
Merge pull request #35138 from s-aga-r/FIX-ISS-23-24-00368
...
fix: recalculate costs in SCR while reposting
2023-05-15 16:26:04 +05:30
rohitwaghchaure
8afbb06a33
Merge branch 'develop' into FIX-ISS-23-24-00368
2023-05-15 13:42:20 +05:30
Wolfram Schmidt
c236979508
fix: Update de.csv ( #35278 )
...
added many fixes on the base of 'No' which is often wrongly translated to 'Kein'.
Also removed translation of Naming Seris like ACC-INV-.YYYY.- to ACC-INV-.YYYY.-
2023-05-15 13:25:23 +05:30
Smit Vora
2a609616d9
fix: port option for additional_conditions in item wise sales register ( #35187 )
...
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2023-05-15 13:24:39 +05:30
vishnu
f2ceb00379
fix: Creating landed cost voucher from connections
2023-05-14 09:35:38 +00:00
Indrajith.vs
0c8276ec82
fix: sales person allocated amount calculation error nonetype and float ( #35293 )
...
fix: sales person allocated amount calculation error nontype and float
2023-05-14 11:47:46 +05:30
Raffael Meyer
870b02b03c
fix: allow over-payment against SO ( #35079 )
2023-05-14 08:59:58 +05:30
Daizy Modi
19cd687784
fix: function batch_no
should only be declared once ( #35115 )
...
fix: remove twice event call of `batch_no` to update batch qty
2023-05-14 08:56:25 +05:30
Kevin Shenk
26c5cfabdc
feat: copy project from timesheet to invoice ( #35146 )
...
copy project from timesheet to invoice
2023-05-14 08:49:28 +05:30
HarryPaulo
e12e3bb012
fix: allow search leads by doctype search fields
...
* fix: allow search leads by doctype search fields
* fix: allow search leads by doctype search fields, linters fix
2023-05-14 08:08:47 +05:30
Phanupong Janthapoon
2b59a95162
fix: share_transfer display wrong currency symbo
...
In multi-companies setting, on amount and rate field of Share Transfer
doctype are displaying wrong currency symbol, when create a
Share Transfer of others company that has different currency than
the main company. This due to the lack of `options` on those fields.
To fix this, add `options` to `amount` and `rate` fields.
2023-05-14 08:06:58 +05:30
rohitwaghchaure
e6f092d257
Merge pull request #35289 from rohitwaghchaure/fixed-inventory-dimesion-for-inter-compnay-trasfer-return
...
fix: inventory dimension for returned inter company transfer
2023-05-13 14:26:17 +05:30
Rohit Waghchaure
38aaba5720
fix: inventory dimension for inter company transfer return use case
2023-05-13 13:00:05 +05:30
Sagar Sharma
81a57e4e41
Merge branch 'develop' into stock-reservation
2023-05-13 09:44:06 +05:30
Sagar Sharma
9b617cc062
Merge branch 'develop' into PACKING-SLIP-FOR-DN-PACKED-ITEMS
2023-05-13 09:43:54 +05:30
Sagar Sharma
e17eeec619
Merge branch 'develop' into FIX-ISS-23-24-00368
2023-05-13 09:43:44 +05:30
Sagar Sharma
59f9d41756
Merge pull request #35275 from s-aga-r/FIX-35272
...
fix: add missing options for `Content Align`
2023-05-13 09:34:45 +05:30
Sagar Sharma
88ab075b11
Merge branch 'develop' into FIX-35272
2023-05-13 09:33:25 +05:30
rohitwaghchaure
e7bb6ad31c
Merge pull request #35224 from rohitwaghchaure/fixed-inventory-dimension-for-material-transfer-not-working
...
fix: inventory dimension for material transfer not working
2023-05-13 02:15:18 +05:30
Rohit Waghchaure
6798b900ef
fix: inventory dimension for material transfer not working
2023-05-13 01:44:06 +05:30
Sagar Sharma
4aff3c9a50
Merge branch 'develop' into FIX-35272
2023-05-12 15:06:47 +05:30
Sagar Sharma
d16caa2d2c
fix: add missing options for Content Align
2023-05-12 15:06:03 +05:30
rohitwaghchaure
0723fbc108
Merge pull request #35273 from rohitwaghchaure/fixed-incorrect-packing-list
...
fix: incorrect packing items
2023-05-12 14:42:57 +05:30
Rohit Waghchaure
a686b8c337
fix: incorrect packing items
2023-05-12 14:12:29 +05:30
rohitwaghchaure
46a2bd8986
Merge pull request #35268 from rohitwaghchaure/fixed-incorrect-bom-filter-issue
...
fix: BOM item filter issue
2023-05-12 13:09:57 +05:30
Rohit Waghchaure
2879cb7c28
fix: bom item filter issue
2023-05-12 13:08:37 +05:30
rohitwaghchaure
4aa1508f04
Merge pull request #35261 from rohitwaghchaure/fixed-timeout-error-for-stock-entry-more-than-6-mmoths
...
fix: enqueue submit/cancel action for stock entry to avoid time out error
2023-05-12 12:32:33 +05:30
Nabin Hait
ca8b587730
Merge pull request #35178 from nabinhait/account-closing-balance-patch
...
fix: account closing balance patch
2023-05-12 12:07:45 +05:30
Sagar Sharma
b22f9a234b
Merge branch 'develop' into FIX-ISS-23-24-00368
2023-05-12 11:55:12 +05:30
Sagar Sharma
9c72c2a6cb
refactor: use calculate_items_qty_and_amount()
to update scr items rate
2023-05-12 11:50:27 +05:30
Sagar Sharma
d6433f803b
refactor(minor): rename function to be more descriptive
2023-05-12 11:45:33 +05:30
Sagar Sharma
46c1bef446
Merge branch 'develop' into PACKING-SLIP-FOR-DN-PACKED-ITEMS
2023-05-12 11:06:00 +05:30
Rohit Waghchaure
2d6f112727
fix: test case
2023-05-12 10:51:14 +05:30
Rohit Waghchaure
7a3801578c
fix: enqueue submit/cancel action for stock entry to avoid time out error
2023-05-11 23:20:12 +05:30
Nabin Hait
f5cc41e182
fix: account closing balance patch
2023-05-10 16:41:47 +05:30
Ankush Menat
2ea38333f0
refactor: use job_id
instead of job_name
( #35242 )
...
depends on https://github.com/frappe/frappe/pull/20951
2023-05-10 13:26:10 +05:30
rohitwaghchaure
5d43b35d20
Merge pull request #35230 from rohitwaghchaure/fixed-serial-no-issue-stock-reco
...
fix: Changed type of column 'serial_no' in Stock Reconciliation to fix Data too Long error
2023-05-09 19:54:24 +05:30
rohitwaghchaure
bf29ec4341
Merge pull request #35227 from rohitwaghchaure/fixed-do-not-include-manufacturing-item
...
fix: non manufacturing items/fixed asset items in BOM
2023-05-09 18:47:36 +05:30