Commit Graph

35032 Commits

Author SHA1 Message Date
Sagar Sharma
4fee4fb3b7
Merge branch 'develop' into PACKING-SLIP-FOR-DN-PACKED-ITEMS 2023-05-23 07:10:09 +05:30
Sagar Sharma
57ee473fa4 fix: don't recalculate rate for SCR rejected warehouse SLE 2023-05-22 15:07:39 +05:30
Sagar Sharma
7e4dc11c4c
Merge branch 'develop' into PACKING-SLIP-FOR-DN-PACKED-ITEMS 2023-05-21 08:34:41 +05:30
Ankush Menat
ba61865ee6 chore: drop outdated navigation video
new stuff is in work, this one is actually counter-productive rn.
2023-05-20 19:45:59 +05:30
rohitwaghchaure
44cd76bb48
Merge pull request #35365 from rohitwaghchaure/create-reposting-entries-from-report
feat: provision to make reposting entries from Stock and Account Value Comparison Report
2023-05-20 17:06:13 +05:30
Rohit Waghchaure
7b818e9d34 feat: provision to make reposting entries from Stock and Account Value Comparison Report 2023-05-19 18:53:40 +05:30
Deepesh Garg
68eee35c5d
Merge pull request #35346 from nabinhait/account-closing-balance-patch-fix
fix: account closing balance patch
2023-05-19 11:09:39 +05:30
rohitwaghchaure
216983a729
Merge pull request #34909 from ihosseinu/get_incoming_rate_v14_fix
Get incoming rate v14 fix
2023-05-19 09:56:32 +05:30
Sagar Sharma
44b0bc2d76
Merge branch 'develop' into PACKING-SLIP-FOR-DN-PACKED-ITEMS 2023-05-19 09:20:21 +05:30
ruthra kumar
b2290c6f57 fix: possible type error on quotation -> sales order creation 2023-05-18 12:48:15 +05:30
ruthra kumar
1587ce3bfb
Merge pull request #35335 from ruthra-kumar/incorrect_tds_calcuation_if_supplier_has_different_category
fix: tds incorrectly calculated for invoice that are below threshold
2023-05-18 12:38:31 +05:30
ruthra kumar
132846bbd1 fix(test): cumulative threshold checks 2023-05-18 12:00:59 +05:30
MOHAMMED NIYAS
90ddf1c0f0
fix: create sales order
Getting error while clicking create sales order button from quotation

Taceback (most recent call last):
  File "apps/frappe/frappe/app.py", line 66, in application
    response = frappe.api.handle()
  File "apps/frappe/frappe/api.py", line 54, in handle
    return frappe.handler.handle()
  File "apps/frappe/frappe/handler.py", line 45, in handle
    data = execute_cmd(cmd)
  File "apps/frappe/frappe/handler.py", line 83, in execute_cmd
    return frappe.call(method, **frappe.form_dict)
  File "apps/frappe/frappe/__init__.py", line 1607, in call
    return fn(*args, **newargs)
  File "apps/frappe/frappe/model/mapper.py", line 36, in make_mapped_doc
    return method(source_name)
  File "apps/erpnext/erpnext/selling/doctype/quotation/quotation.py", line 263, in make_sales_order
    return _make_sales_order(source_name, target_doc)
  File "apps/erpnext/erpnext/selling/doctype/quotation/quotation.py", line 333, in _make_sales_order
    doclist = get_mapped_doc(
  File "apps/frappe/frappe/model/mapper.py", line 144, in get_mapped_doc
    postprocess(source_doc, target_doc)
  File "apps/erpnext/erpnext/selling/doctype/quotation/quotation.py", line 291, in set_missing_values
    for d in customer.get("sales_team"):
TypeError: 'NoneType' object is not iterable
2023-05-18 10:23:58 +05:30
rohitwaghchaure
ffb353032d
Merge branch 'develop' into get_incoming_rate_v14_fix 2023-05-18 06:13:52 +05:30
rohitwaghchaure
6fbcc3d196
Merge pull request #35298 from CodeVenturers/OpenContirb
fix: Creating landed cost voucher from connections
2023-05-18 06:00:07 +05:30
Anand Baburajan
8c53e0f004
fix: depreciation schedule for existing assets [dev] (#35256)
* fix: depreciation schedule for existing assets

* chore: correct logic for existing assets and fix test

* chore: properly check if depr amount is non zero
2023-05-17 22:29:09 +05:30
Nabin Hait
2b8c39eee9 fix: account closing balance patch 2023-05-17 22:05:46 +05:30
Sagar Sharma
fcea907cf9
Merge branch 'develop' into FIX-35014 2023-05-17 16:09:21 +05:30
Sagar Sharma
9fb8b1827d fix: Pick List Status 2023-05-17 16:07:58 +05:30
Ankush Menat
e5c86bc2e8
fix: consider 0 if rate/qty are null (#35338)
[skip ci]
2023-05-17 16:04:49 +05:30
Sagar Sharma
adf2474d9d fix(ux): SCR consumed-qty read-only property 2023-05-17 15:12:47 +05:30
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
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
Rohit Waghchaure
38aaba5720 fix: inventory dimension for inter company transfer return use case 2023-05-13 13:00:05 +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
88ab075b11
Merge branch 'develop' into FIX-35272 2023-05-13 09:33:25 +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