Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,439 Commits 3 Branches 0 Tags 1 GiB
8652331d1c
Commit Graph

35336 Commits

Author SHA1 Message Date
Deepesh Garg
bb21c044f6
fix: Billing Address display in buying transactions (#35451) 2023-05-31 11:02:30 +05:30
Deepesh Garg
27d5e6a99b
fix: Error while validating budget (#35487) 
* fix: Error while validating budget

* chore: remove print statement
 2023-05-31 10:51:33 +05:30
Rohit Waghchaure
2fc7d82324 fix: missing bom details in the stock entry 2023-05-30 18:22:48 +05:30
rohitwaghchaure
ffd5308ed9
Merge pull request #35478 from rohitwaghchaure/fixed-lead-time-calculation-in-work-order 
fix: incorrect transferred qty in the job card
 2023-05-30 18:11:57 +05:30
Rohit Waghchaure
d3a5e49db9 fix: incorrect transfer quantity in the job card 2023-05-30 17:27:16 +05:30
Anand Baburajan
dbdc420066
fix: allow assets with depr entries to be cancelled (#35477) 
fix: allow asset with depr entries to be cancelled
 2023-05-30 16:28:57 +05:30
Nabin Hait
e78a7de1e5 fix: Rearranged accounting module links 2023-05-30 13:25:00 +05:30
Nabin Hait
5cf4c8c8b7 fix: removed duplicate links of manufacturing workspace 2023-05-30 13:18:58 +05:30
Nabin Hait
86f88817a9 fix: Added pos links in Selling workspace 2023-05-30 13:18:58 +05:30
Nabin Hait
0b28f641ad fix: Delete Retail and Utilities worspaces amd hide default Settings and Integration workspaces 2023-05-30 13:18:52 +05:30
Nabin Hait
243c49c550 refactor: Workspace cleanup 2023-05-30 13:17:59 +05:30
Sagar Sharma
91ca266db6
Merge branch 'develop' into FIX_retention_stock_entry_conversion_factor 2023-05-30 11:05:37 +05:30
rohitwaghchaure
df921b79a4
Merge pull request #35465 from rohitwaghchaure/fixed-inter-transfer-company 
fix: rate not fetching properly for inter transfer purchase order
 2023-05-30 09:14:16 +05:30
Rohit Waghchaure
2931c657f4 fix: rate not fetching properly for inter transfer purchase order 2023-05-30 08:34:12 +05:30
rohitwaghchaure
7dce06021e
Merge pull request #35462 from ankush/item_quick_entry 
refactor!: Drop custom item quick entry
 2023-05-30 08:32:09 +05:30
Sagar Sharma
ed0c8ae452
Merge branch 'develop' into FIX_retention_stock_entry_conversion_factor 2023-05-30 08:05:54 +05:30
Anand Baburajan
ae26d72f7f
fix: monthly wdv depr schedule for existing assets [dev] (#35460) 
fix: monthly wdv depr schedule for existing assets
 2023-05-29 23:18:07 +05:30
Ankush Menat
b10e19141c refactor!: Drop item quick entry 
- Item variants creator - we have better one on document
- Everything else - hardcoded behaviour that's not needed anymore IMO.
 2023-05-29 22:33:56 +05:30
Marc de Lima Lucio
6954f538c9 fix: retention stock entry: grab conversion factor from source 2023-05-29 17:41:14 +02:00
Ankush Menat
964bb1d948 chore: docs for stock settings 
[skip ci]
 2023-05-29 15:11:28 +05:30
Ankush Menat
8fe8f80033 fix: replace stock projected with ledger 
Ledger is much more widely used report, better to show that first?
 2023-05-29 14:44:54 +05:30
Ankush Menat
dd245ccc7f fix: reorder stock reco tour 2023-05-29 14:44:54 +05:30
Ankush Menat
3341cd6b80 fix: filter parent warehouses by company 2023-05-29 14:44:54 +05:30
Ankush Menat
aa9f926298 fix: warehouse tour 
- remove warehouse type, it doesn't do what it says. Misleading.
 2023-05-29 14:44:54 +05:30
Ankush Menat
81e901ba62 fix: disable/enable with button 2023-05-29 14:44:54 +05:30
Ankush Menat
40ce33dff1 fix: warehouse form cleanup 
- organize fields
- group transit fields and move them lower
- enable/disable should be button
- hide pointless fields from listview
 2023-05-29 14:44:54 +05:30
Ankush Menat
7a18db561f fix: hide ledger button on new warehouse 2023-05-29 14:44:54 +05:30
Ankush Menat
2e13fbab5e fix: stock settings tour 
- remove dead fields
- Keep only essential fields in tour
 2023-05-29 14:44:50 +05:30
HarryPaulo
b7407a1d81
feat: add todo calendar to bootinfo.calendars (#35124) 
* feat: add todo calendar to bootinfo.calendars

* chore: Linting Issues

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-05-29 10:37:35 +05:30
Raffael Meyer
1f08330ae1
fix: labels and translations (#34896) 
* fix: german translation of expense claim

* fix: consistent labels and translations in project Costing and Billing

* fix: german translation of Stock Entry

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-05-29 09:56:16 +05:30
Akshay
1ab04344db
fix (ui): debit note issued status indicator color (#35401) 
* fix: debit note issued status indicator color

* fix: change DebitNoteIssued color from grey to gray
 2023-05-29 09:42:01 +05:30
Vishnu VS
01567b5ec4
fix(UX): task and project name in error message (#35435) 2023-05-29 09:39:13 +05:30
Nabin Hait
3504bf7f62
fix: Show future payments in accounts receivable summary (#35416) 2023-05-29 09:23:40 +05:30
Sagar Sharma
336ff5b327
Merge branch 'develop' into FIX-ISS-23-24-01015 2023-05-27 12:13:39 +05:30
Sagar Sharma
027de41600 fix: incorrect POS Reserved Qty in Stock Projected Qty Report 2023-05-27 12:05:37 +05:30
rohitwaghchaure
4099330bf4
Merge pull request #35426 from rohitwaghchaure/fixed-incorrect-actual-qty-bin 
fix: incorrect available quantity in BIN
 2023-05-26 22:47:42 +05:30
Sagar Sharma
8cc8af8204
Merge branch 'develop' into stock-reservation 2023-05-26 15:28:54 +05:30
Rohit Waghchaure
718ad3f240 fix: travis 2023-05-26 11:29:22 +05:30
Sagar Sharma
761f8a9f05 fix: use float_precision while checking for negative stock in BIN 2023-05-26 04:23:36 +05:30
Rohit Waghchaure
9e5e2de5d5 fix: incorrect available quantity in BIN 2023-05-25 23:56:23 +05:30
Sagar Sharma
b4362e5517
Merge branch 'develop' into PACKING-SLIP-FOR-DN-PACKED-ITEMS 2023-05-25 23:15:46 +05:30
mergify[bot]
55806c51f2
fix: Gross and Net Profit Report - incorrect calculation of totals 
* fix: account group totals calculation to consider include_in_gross

(cherry picked from commit 8dcb9302b417618505ea24e5566c017eff451c1e)

* refactor: remove unused parameters

(cherry picked from commit 50822f207ec5272d4d71a2b6579693da2088105d)

* refactor: merge separate loops for calculating group / leaf node totals
rename function
remove return statement as the list is  mutated

(cherry picked from commit 1a3b9c5bdfb9fac04a3a7d8724e6b3c3b593ec19)

* fix: add total col for gross and net profit

(cherry picked from commit cb9b4fbb91f4b73916416167932064ef5965eed1)

---------

Co-authored-by: Anoop Kurungadam <anoop@earthianslive.com>
 2023-05-25 18:12:50 +05:30
Sagar Sharma
6f0867b006
Merge branch 'develop' into PACKING-SLIP-FOR-DN-PACKED-ITEMS 2023-05-25 18:04:06 +05:30
Sagar Sharma
196e18187f fix(patch): add patch to set packed_qty in draft DN 2023-05-25 18:03:39 +05:30
Sagar Sharma
5c7f3adf5a
Merge branch 'develop' into stock-balance-typo 2023-05-25 16:04:11 +05:30
Sagar Sharma
c4e1f927ee chore: typo in stock balance 2023-05-25 16:03:15 +05:30
Sagar Sharma
82f0bd9ee9 feat: add Reserved Stock column in Stock Balance Report 2023-05-25 15:57:06 +05:30
Sagar Sharma
988db2eaf6
Merge branch 'develop' into stock-reservation 2023-05-25 15:10:54 +05:30
ruthra kumar
ec5d34117b
Merge pull request #35417 from ruthra-kumar/fix_ambiguous_company_in_gross_profit_report 
fix(Gross Profit): 'company' column is ambiguous in filter
 2023-05-25 15:06:35 +05:30
Sagar Sharma
ccb2dc4df5 Merge branch 'develop' into stock-reservation 2023-05-25 14:35:59 +05:30
ruthra kumar
448712f719 fix(Gross Profit): 'company' column is ambiguous in filter 2023-05-25 14:18:41 +05:30
Sagar Sharma
fefd788eb5 fix(ux): add non-group warehouse filter 2023-05-25 11:49:47 +05:30
rohitwaghchaure
0bc9c3260e
Merge pull request #35348 from rohitwaghchaure/refactor-stock-balance-report 
refactor: stock balance report
 2023-05-24 19:46:04 +05:30
rohitwaghchaure
693133d8f7
Merge pull request #35410 from rohitwaghchaure/fixed-negative-reserved-qty-for-production-plan 
fix: Negative value in Reserved Qty for Production Plan
 2023-05-24 19:08:14 +05:30
Rohit Waghchaure
a37608a36c fix: Negative value in Reserved Qty for Production Plan 2023-05-24 17:14:00 +05:30
Sagar Sharma
2813042936
Merge branch 'develop' into PACKING-SLIP-FOR-DN-PACKED-ITEMS 2023-05-24 14:35:51 +05:30
rohitwaghchaure
565322daba
Merge branch 'develop' into stock-reservation 2023-05-24 14:32:04 +05:30
rohitwaghchaure
0d8f48891d
Merge pull request #35405 from rohitwaghchaure/fixed-available-qty-issue 
fix: available qty not fetching for raw material in PP
 2023-05-24 14:24:53 +05:30
Rohit Waghchaure
8e3463c4ef fix: available qty not fetching for raw material in PP 2023-05-24 14:12:58 +05:30
Gursheen Kaur Anand
c1f1a033c9
fix: tab-uniformity (#35400) 
Made Doctype tabs uniform

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
 2023-05-24 12:45:00 +05:30
Anand Baburajan
edb7b0db8f
fix: incorrect depr schedule and posting dates on selling of existing assets [dev] (#35398) 
* fix: calc depr amount properly on selling of existing assets and fix incorrect posting dates

* chore: get number_of_depreciations_booked properly

* chore: fix test_gle_made_by_asset_sale_for_existing_asset
 2023-05-24 12:29:46 +05:30
Rohit Waghchaure
3f548ac910 fix: Stock Analytics and Warehouse wise Item Balance Age and Value issue 2023-05-23 17:06:11 +05:30
Rohit Waghchaure
545b2d32cd fix: balance quantity 2023-05-23 17:06:11 +05:30
Rohit Waghchaure
d9979b2ffb refactor: stock balance report 2023-05-23 17:06:11 +05:30
Ankush Menat
b0eb72ffac
fix: replace quotation with invoice in first onboarding (#35389) 
[skip ci]
 2023-05-23 15:35:55 +05:30
Sagar Sharma
a111917114 fix: Pick List TypeError 2023-05-23 12:57:48 +05:30
Sagar Sharma
00bb8add40
Merge pull request #35380 from CodeVenturers/OpenContrib 
fix: TypeError while saving Job card
 2023-05-23 10:49:42 +05:30
vishnu
8c34cc0e00 fix: use flt instead of mandatory field 2023-05-23 04:27:50 +00:00
rohitwaghchaure
4cb9cbee06
Merge pull request #35381 from rohitwaghchaure/fixed-skip-available-qty-for-sub-assembly 
feat: provision to skip available sub assembly items in the production plan
 2023-05-23 09:39:09 +05:30
Sagar Sharma
4fee4fb3b7
Merge branch 'develop' into PACKING-SLIP-FOR-DN-PACKED-ITEMS 2023-05-23 07:10:09 +05:30
Rohit Waghchaure
9dd566c1e8 test: test case to skip available qty for sub-assembly items 2023-05-23 01:02:16 +05:30
Rohit Waghchaure
64751ec4d9 feat: provision to skip available sub assembly items in the production plan 2023-05-23 00:16:48 +05:30
vishnu
a209fb4b64 fix: error while saving job card 2023-05-22 18:00:50 +00:00
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
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
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
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
Rohit Waghchaure
1a673fd424 fix: Changed type of column 'serial_no' in Stock Reconciliation to fix Data too long error 2023-05-09 18:45:19 +05:30
ruthra kumar
b8971c7add
Merge pull request #35216 from rtdany10/broken-empty-row-save 
fix: broken save on empty row existance
 2023-05-09 18:31:17 +05:30
Rohit Waghchaure
aba8431d70 fix: non manufacturing items/fixed asset items in BOM 2023-05-09 16:48:30 +05:30
rohitwaghchaure
d5f123f2e1
Merge pull request #35220 from rohitwaghchaure/fixed-performance-issue-for-ste-mr 
fix: added search index to improve performance
 2023-05-09 14:33:56 +05:30
Rohit Waghchaure
80ea22b56c fix: added search index to improve performance 2023-05-09 12:42:17 +05:30
ruthra kumar
afe9d7614b
Merge pull request #35212 from ruthra-kumar/chore_change_throw_to_msgprint 
chore: convert throw to msgprint in payment reconciliation job hook
 2023-05-08 17:57:13 +05:30
Dany Robert
d9b231aa16 fix: broken save on empty row existance 2023-05-08 12:26:47 +00:00
Anand Baburajan
5a3acab110
fix: handle empty FBs properly in TB and GL [develop] (#35190) 
fix: handle empty FBs properly in TB and GL
 2023-05-08 16:54:00 +05:30
Sagar Sharma
12785101d9
Merge branch 'develop' into stock-reservation 2023-05-08 16:47:40 +05:30
Sagar Sharma
2e9278ef90
Merge branch 'develop' into PACKING-SLIP-FOR-DN-PACKED-ITEMS 2023-05-08 16:47:30 +05:30
ruthra kumar
73134d57bf chore: convert throw to msgprint 2023-05-08 16:42:12 +05:30
ruthra kumar
446f3d12eb
Merge pull request #35153 from ruthra-kumar/fetch_sales_team_from_customer_master 
fix: fetch default sales team on Quotation -> Sales Order creation
 2023-05-08 14:19:28 +05:30
ruthra kumar
6315d9f836
Merge pull request #35142 from ruthra-kumar/fix_bypass_check_in_customer_group 
fix: ineffective bypass flag for Credit Limit in Customer Group
 2023-05-08 14:10:31 +05:30
ruthra kumar
34a5f24026
Merge pull request #35186 from ruthra-kumar/child_account_should_inherit_parent_account_currency 
fix: child acc will inherit acc currency if explicitly specified
 2023-05-08 14:09:46 +05:30
ruthra kumar
f6ea8fd8d7 test: currency inheritance on child accounts 2023-05-08 13:30:39 +05:30
rohitwaghchaure
ecc80a8504
Merge pull request #34998 from Vishnu7025/develop 
fix: update workstation hour rate when workstation change in job card
 2023-05-08 09:25:38 +05:30
rohitwaghchaure
328c3369a2
Merge pull request #35200 from rohitwaghchaure/fixed-accepted-warehouse-and-supplier-warehouse-issue 
fix: error regarding accepted and supplier warehouse
 2023-05-08 09:23:54 +05:30
Rohit Waghchaure
15f5f98858 fix: error regarding accepted and supplier warehouse 2023-05-07 20:27:17 +05:30
rohitwaghchaure
530edaf3d1
Merge branch 'develop' into develop 2023-05-07 19:58:42 +05:30
rohitwaghchaure
40e3747b93
Merge branch 'develop' into fixed-order-of-reposting-entry 2023-05-07 01:39:23 +05:30
Ritwik Puri
140cec8eb2
Merge branch 'develop' into fix-incorrect-fg-item-qty-in-job-po 2023-05-06 22:49:09 +05:30
Rohit Waghchaure
af16fbb0a3 fix: incorrect fg item quantity in subcontracted PO 2023-05-06 20:30:53 +05:30
Rohit Waghchaure
c8a4791d9b fix: pick the in progress reposting entries first 2023-05-06 20:09:15 +05:30
Deepesh Garg
23e7c1480f
Merge pull request #34897 from barredterra/fix-translation-files 
fix: translation files
 2023-05-06 18:24:50 +05:30
ruthra kumar
abe691c03d fix: child acc will inherit acc currency if explicitly specified 2023-05-06 10:40:41 +05:30
Hossein Yousefian
27d71e9ec1
Merge branch 'develop' into get_incoming_rate_v14_fix 2023-05-06 08:12:36 +03:30
Nabin Hait
713fa67b96 fix: account closing balance patch 2023-05-05 17:54:34 +05:30
Rohit Waghchaure
8167b24219 fix: not allow to transfer excess materials against the job card 2023-05-04 18:24:16 +05:30
rohitwaghchaure
3993bfd510
Merge pull request #35161 from rohitwaghchaure/configure-notify-reposting-role 
feat: configuration to notify reposting errors to specific role
 2023-05-04 17:35:14 +05:30
rohitwaghchaure
2bf771683c
Merge pull request #35158 from rohitwaghchaure/fixed-internal-trasfer-condition 
fix: internal transfer condition
 2023-05-04 17:01:58 +05:30
Rohit Waghchaure
c7b62011db feat: configuration to notify reposting errors to specific role 2023-05-04 16:49:14 +05:30
Rohit Waghchaure
b5a2ccf21d fix: internal transfer condition 2023-05-04 15:38:35 +05:30
Sagar Sharma
e0b22edb2e test: add test case 2023-05-04 15:07:52 +05:30
ruthra kumar
4d31436917 fix: fetch default sales team on Quotation -> Sales Order creation 2023-05-04 10:45:22 +05:30
Raffael Meyer
9fd0091b60
Merge branch 'develop' into fix-translation-files 2023-05-04 00:26:01 +02:00
rohitwaghchaure
bea8f481b4
Merge pull request #35148 from rohitwaghchaure/fixed-extra-job-card-quantity-issue 
fix: over production percentage not considered in validation
 2023-05-04 00:13:53 +05:30
Rohit Waghchaure
a84d0af81e fix: over production percentage not considered in validation 2023-05-03 23:22:59 +05:30
rohitwaghchaure
dfee45f7ae
Merge pull request #35144 from rohitwaghchaure/feat-reserved-qty-for-production-plan-in-bin 
feat: reserve qty against production plan raw materials in BIN
 2023-05-03 22:24:05 +05:30
Rohit Waghchaure
06e91e758f feat: reserve qty against production plan raw materials in BIN 2023-05-03 18:21:23 +05:30
ruthra kumar
f9a4972cb6 fix: bypass flag in Customer Group wasn't effective 2023-05-03 16:40:38 +05:30
s-aga-r
7548bb3fbe Merge branch 'develop' into stock-reservation 2023-05-03 12:06:11 +05:30
Sagar Sharma
6bcda38415
Merge branch 'develop' into PACKING-SLIP-FOR-DN-PACKED-ITEMS 2023-05-03 12:01:46 +05:30
s-aga-r
a6cb6c6f47 fix: recalculate costs in SCR while reposting 2023-05-03 11:33:52 +05:30
Anand Baburajan
6864b11f83
fix: handle finance book properly in trial balance and general ledger (#35085) 
* fix: get default fb properly and handle different fb and default fb case

* chore: minor UX improvement

* fix: handle FBs properly in general ledger
 2023-05-02 20:58:22 +05:30
Sagar Sharma
862041dc0e
Merge branch 'develop' into PACKING-SLIP-FOR-DN-PACKED-ITEMS 2023-05-02 19:11:33 +05:30
Vishnu VS
536473a484
Merge branch 'develop' into develop 2023-05-02 17:42:41 +05:30
ruthra kumar
7e24215b3a
Merge pull request #35107 from ruthra-kumar/fix_incorrect_paid_amount_if_bank_cash_account_missing 
fix: incorrect paid_amount and exchange rate in Payment Entry
 2023-05-02 15:07:36 +05:30
ruthra kumar
1d70183d8c
Merge pull request #35091 from ruthra-kumar/cost_center_allocation_splits_roundoff 
refactor: button to toggle parent doc cost center preference for rounding adjustment amount
 2023-05-02 14:07:22 +05:30
ruthra kumar
8f2302a7bf
Merge pull request #35061 from ruthra-kumar/refactor_pe_dont_book_gain_loss_for_sales_purchase_orders 
refactor: don't book exchange gain/loss for sales/purchase orders
 2023-05-02 14:03:17 +05:30
rohitwaghchaure
9aa646512a
Merge pull request #35123 from rohitwaghchaure/fixed-performance-issue-delivery-note 
fix: timeout error while submitting delivery note
 2023-05-01 23:30:14 +05:30
Rohit Waghchaure
2d5ccc07b1 fix: timeout error while submitting delivery note 2023-05-01 21:17:18 +05:30
rohitwaghchaure
a10aab35ff
Merge pull request #35118 from rohitwaghchaure/fixed-don-not-allow-to-repost-valuation 
fix: don't allow to make reposting for the closed period
 2023-05-01 20:41:14 +05:30
mergify[bot]
49674585a5
fix: handle expected_value_after_useful_life properly in asset value adjustment (backport #35117) (#35119) 
fix: handle expected_value_after_useful_life properly in asset value adjustment (#35117)

(cherry picked from commit 80230fec3ef079b75825447a61836f8a9ce64f57)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-05-01 19:59:58 +05:30
Rohit Waghchaure
f751727149 fix: don't allow to make reposting for the closed period 2023-05-01 18:48:29 +05:30
ruthra kumar
ce4e18c8d2 test: Sales/Purchase Orders will not book Exchange gain/loss 2023-05-01 14:09:19 +05:30
ruthra kumar
effb34bbfa refactor: don't book exch gain/loss for sales/purchase orders 2023-05-01 14:08:30 +05:30
Deepesh Garg
ea0b03ae9e
fix: Updates in process statement of Accounts (#35064) 2023-05-01 13:09:47 +05:30
ruthra kumar
092c4b4c58 refactor: simplify group by invoice logic 2023-05-01 11:53:43 +05:30
Deepesh Garg
64be694087
fix: Patch for posting closing balances (#35037) 2023-05-01 10:56:46 +05:30
Deepesh Garg
f3b3dabb9a
fix: Naming series error in Journal Entry template (#35084) 2023-05-01 10:50:51 +05:30
Sagar Sharma
424bd701f3
Merge branch 'develop' into PACKING-SLIP-FOR-DN-PACKED-ITEMS 2023-05-01 08:05:18 +05:30