Commit Graph

46362 Commits

Author SHA1 Message Date
ruthra kumar
f7865da4d2 refactor: gain/loss should use same posting date as payment 2023-09-04 21:40:40 +05:30
rohitwaghchaure
6a7bdeffdf
fix: auto refresh serial and batch bundle field (#36943) 2023-09-04 14:11:42 +05:30
ruthra kumar
04bc353e7f
Merge pull request #36940 from ruthra-kumar/invalid_gain_loss_in_expense_claim
fix: invalid gain/loss JE created on base currency Expense Claim
2023-09-04 13:56:01 +05:30
ruthra kumar
75d95acb23 fix: invalid gain/loss JE created on base currency Expense Claim 2023-09-04 13:05:57 +05:30
s-aga-r
cd8ddae7c5
refactor: remove Recalculate Rate from SCR Item (#36929) 2023-09-03 18:54:44 +05:30
s-aga-r
22cf1556cd
feat: Service Item and Finished Good Map (#36647)
* feat: new DocType `Service Item and Finished Good Map`

* fix(ux): filters for Service Item and Finished Good

* fix: validations for Service Item and Finished Good

* feat: set FG Item on Service Item selection in PO

* refactor: one-to-many mapping between service item and finished goods

* feat: auto set Service Item for finished good in PO created from PP

* feat: auto set Service Item on Finished Good selection in PO

* test: add test case for service item and finished goods map

* feat: `BOM` field in `Finished Good Detail`

* feat: new DocType `Subcontracting BOM`

* fix: filters and validations for Subcontracting BOM

* feat: auto select Service Item in PO created from PP

* test: add test case for PO service item auto pick

* feat: pick BOM from Subcontracting BOM in SCO

* feat: auto pick `Service Item` on FG select

* refactor: remove DocType `Service Item and Finished Goods Map` and `Finished Good Detail`

* feat: fetch FG for Service Item

* chore: `linter`

* refactor: update `Auto Name` expression for Subcontracting BOM
2023-09-03 11:59:28 +00:00
HENRY Florian
24e1144de5
fix: when create doc from item dashboard default uom (buying or selling) is not correctly selected (#36892)
fix: when create doc from item dashboard defaut uom is not correctly selected
2023-09-03 16:37:52 +05:30
ruthra kumar
27e0dd9fdc
Merge pull request #36911 from ruthra-kumar/deduplicate_gain_loss_journal_creation
fix: deduplicate gain/loss JE creation for journals as payment
2023-09-03 10:11:43 +05:30
ruthra kumar
0366928db5 test: cost center inheritance from payment 2023-09-03 09:21:26 +05:30
ruthra kumar
d6a3b9a5c7 refactor: use payment's CC for gain/loss if company default is unset 2023-09-03 09:21:23 +05:30
Anand Baburajan
4f0bb45a8b
chore: patch to correct asset values if je has workflow [dev] (#36914)
chore: patch to correct asset values if je has workflow
2023-09-02 18:31:32 +05:30
Deepesh Garg
2e7548462d
Merge pull request #36895 from blaggacao/fix-coa-dill-down-on-startup
fix(startup): coa drill down
2023-09-02 17:12:18 +05:30
Deepesh Garg
f3282b1bb3
Merge pull request #36908 from barredterra/unreconcile-bank-transaction
fix: only show "Unreconcile" if reconciled
2023-09-02 17:11:56 +05:30
Deepesh Garg
30aba9414c
Merge pull request #36900 from GursheenK/pcv-request-timeout
fix: reduce threshold for background job in PCV
2023-09-02 17:11:08 +05:30
ruthra kumar
79fa562004 test: extend test to cancellation 2023-09-02 14:43:25 +05:30
ruthra kumar
cb6da6ec59 test: deduplicate gain/loss JE on reconciling journals against inv 2023-09-02 13:29:33 +05:30
ruthra kumar
79c6f0165b fix: deduplicate gain/loss JE creation for journals as payment 2023-09-02 13:29:31 +05:30
RitvikSardana
e599f75a51
fix: account payable currency and value (#36859)
* fix: account payable currency and value

* fix: added party_type and party in accounts payable report

* chore: code cleanup

* fix: customer group test case failure

* fix: added test case of the issue

* fix: filter toggle for party_type

* fix: filter toggle for party_type

* chore: fix typo

---------

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
2023-09-02 13:08:08 +05:30
s-aga-r
2d8363a983
feat: Serial and Batch reservation (#35946)
* feat: add `Has Serial No` and `Has Batch No` fields in SRE

* chore: set `Has Serial No` and `Has Batch No` while creating SRE

* feat: add field `Reserved Serial and Batch` in SRE

* fix(ux): hide `Amend` button on cancelled SRE

* fix: add validation for SRE amended doc

* fix(ux): hide `Reserved Serial and Batch` Table for non-serial/batch item

* fix(ux): set `Display Depends On` for `Has Serial No` and `Has Batch No` in SRE

* fix(ux): make `serial_no` and `batch_no` fields read-only based on `has_serial_no` and `has_batch_no`

* chore: remove table `Serial and Batch Entry` fieldlabel

* fix(ux): set warehouse for new row

* fix(ux): make qty field read-only for serial item

* fix(ux): set rows qty to `1` before making the field read-only

* chore: add filters for serial no

* chore: add filters for batch no

* chore: don't show Serial NO if already selected

* chore: hide rate related fields

* feat: add field `Reservation Based On` in SRE

* chore: make `Reserved Qty` field editable in SCR

* chore: add method to get total reserved qty against a voucher

* fix: add validation for `Reserved Qty`

* fix: update SRE status and Voucher's Reserved Qty

* chore: enable `Track Changes` in SRE

* fix: add validation to prevent delivered SRE to get updated

* fix(ux): make fields `Reserved Qty` and `Reservation Based On` read-only for delivered SRE

* fix: consider voucher's delivered qty while calculating max reserved qty

* fix: add UOM validation for SRE Reserved Qty

* fix: SRE warehouse mismatch error in DN

* fix: auto cancel SRE on update if item is fully delivered for the SO

* fix: skip SRE creation for group warehouse

* feat: add `Set Warehouse` field in SO stock reservation dialog

* fix(ux): hide `Add Row` button in SO stock reservation dialog

* fix: group warehouse validation in SO

* fix(ux): don't show Batch No if already selected

* feat: add field `Auto Reserve Serial and Batch Nos` in `Stock Settings`

* refactor: SRE reserved qty validation

* feat: auto serial and batch reservation

* chore: add section for `Serial and Batch Reservation` in `Stock Settings`

* fix: make SRE sb_entries warehouse mandatory

* fix(ux): unreserved qty calculation

* fix: add validation for `Reserved Qty` against `Batch`

* refactor: combine `get_available_qty_to_reserve()` and `get_available_qty_to_reserve_batch()`

* fix: validate disabled batch

* fix: add validation to validate serial nos availability

* fix: update row qty if `Partial Reservation` is enabled

* fix: ignore reserved serial nos while getting available serial nos

* fix: add validation to prevent repeat batches

* fix(ux): add validation for duplicate Serial No

* fix: don't allow to update SRE with delivered stock

* fix: ignore reserved serial and batch if reservation based on is not Serial and Batch

* fix(ux): stock un-reservation confirmation before `Update Items`

* chore: return list instead os set

* feat: add field `Delivered Qty` in `Serial and Batch Entry`

* feat: option to get SO reserved stock in Delivery Note

* fix: ignore reserved batches while getting available batches

* chore: `conflicts`

* fix: incorrect available qty

* fix: 'str' object has no attribute 'nodes_'

* fix: `linter`

* fix(ux): hide `Get Items From > Stock Reservation` if Stock Reservation is disabled

* fix(ux): add `depends_on` for `Auto Reserve Serial and Batch Nos`

* fix(ux): hide Stock Reservation field description in submitted SO

* fix(ux): confirm before unreserve stock

* feat: option to create DN for reserved stock from SO

* fix: update delivered qty in SRE sb_entries

* fix: Delivery Note (Reserved Stock) based on Delivery Date

* fix(ux): SO `Update Items` confirmation on `Update` button click

* feat: add dialog box to select SRE to unreserve

* fix: `ZeroDivisionError` while saving the DN (Reserved Stock)

* fix: don't allow to create Pick List if stock is reserved against SO

* fix(ux): hide Create > Pick List button for SO with reserved stock

* refactor: map reserved stock by default in DN

* refactor: code cleanup and comments

* fix: don't allow Stock Reservation against SO having Pick List

* refactor: `create_stock_reservation_entries()`

* feat: add fields to hold Pick List ref in SRE

* feat: add field `Stock Reserved Qty` in Pick List Item

* feat: provision to reserve stock from Pick List against Sales Order

* fix: don't allow to update SRE if created against a Pick List

* fix(ux): confirm before unreserve stock in Pick List

* fix: don't allow to update Pick List having reserved stock

* fix: circular dependency while cancelling the DN created from Pick List with Reserved Stock

* chore: update `Max Reserve Qty` err msg to be more descriptive

* refactor: rename field `Reserve Stock on Sales Order Submission`

* fix: msg on partial reservation if disabled in stock settings

* chore: add field description for `Enable Stock Reservation`

* fix(test): `test_stock_reservation_against_sales_order`

* fix(test): `test_stock_reservation_against_sales_order`

* test: add test cases for serial and batch reservation

* fix: batch stock levels qty

* refactor: method `get_sre_reserved_qty_for_item_and_warehouse`

* feat: show `Reserved Stock` in item master stock levels

* feat: Reserved Stock Report

* fix(ux): SO stock reservation dialogs width

* refactor: get previous values from `_doc_before_save` instead of db

* fix(ux): make `Reservation Based On` read-only if created against Pick List

* feat: option to open `Reserved Stock` report from Sales Order

* fix(ux): Sales Order - Reserve and Unreserve dialog box

* fix: decrease SRE Delivered Qty on DN cancel

* fix(ux): hide `Unreserve` button once reserved stock is delivered

* chore: `linter`

* fix(test): `test_reserved_stock_report`

* test: add test case for DN cancellation

* chore: rename field `Auto Reserve Stock on Sales Order Submission`

* fix: `Insufficient Stock` error msg
2023-09-02 11:02:24 +05:30
barredterra
91e574609f fix: only show "Unreconcile" if reconciled 2023-09-01 19:23:27 +02:00
ruthra kumar
0e517227ee
Merge pull request #36899 from ruthra-kumar/use_own_exchange_rate_on_references
fix: difference amount calculation logic in Payment Entry UI
2023-09-01 17:37:23 +05:30
Deepesh Garg
1e72a43a8e
Merge pull request #36889 from GursheenK/discount-accounting-multi-currency-gle
fix: fetch currency in discount accounting SI
2023-09-01 15:11:21 +05:30
Deepesh Garg
39b598e0ec
Merge pull request #36898 from rtdany10/company-ambiguous
fix: `company` is ambiguous
2023-09-01 14:28:34 +05:30
Gursheen Anand
b6e6f2ef8d fix: reduce threshold for bg job fn 2023-09-01 12:36:40 +05:30
ruthra kumar
a7e0709ae8 fix: difference amount in UI should not be calculated 2023-09-01 12:18:55 +05:30
Dany Robert
3e1065a561 fix: company is ambiguous 2023-09-01 04:58:59 +00:00
ruthra kumar
0d26f67be5
Merge pull request #36888 from ruthra-kumar/gain_loss_refactor_issue_01_patch_failed
fix: calcuate received/paid amount on exchange rate change in Payment Entry
2023-08-31 18:37:39 +05:30
ruthra kumar
64d835374b fix: calcuate received/paid amount on rate change in PE 2023-08-31 17:58:26 +05:30
Gursheen Anand
112cfe6dfa fix: fetch discount amount for gle in base currency 2023-08-31 17:08:51 +05:30
Deepesh Garg
2537f5674e
Merge pull request #36886 from GursheenK/sales-register-tax-accounts
fix: tax accounts in sales register
2023-08-31 15:53:39 +05:30
Gursheen Anand
d73daafe77 fix: tax accounts in sales register 2023-08-31 15:19:46 +05:30
Deepesh Garg
cd74c6c07f
Merge pull request #36881 from deepeshgarg007/patch_revert
chore: remove patch
2023-08-30 22:12:46 +05:30
Deepesh Garg
283c0a1c0f chore: remove patch 2023-08-30 19:43:32 +05:30
Suraj Shetty
f032476a75
Merge pull request #36869 from RitvikSardana/develop-ritvik-ignore-perm-tree-doctype 2023-08-30 16:46:28 +05:30
Suraj Shetty
e92d4e9b4a
Merge branch 'develop' into develop-ritvik-ignore-perm-tree-doctype 2023-08-30 16:46:00 +05:30
Deepesh Garg
5e38109481
Merge pull request #36872 from deepeshgarg007/sales_purchase_register_query
fix: Sales/Purchase register showing duplicate records
2023-08-29 21:47:01 +05:30
Ankush Menat
e75b72ae2d
Merge pull request #36856 from frappe/desk_user
refactor!: Lower all perm to `Desk User`
2023-08-29 20:55:55 +05:30
Deepesh Garg
92e503f75b fix: Sales/Purchase register showing duplicate records 2023-08-29 20:45:57 +05:30
rohitwaghchaure
dea802dc41
fix: added valuation field type (Float/Currency) in the filter (#36866) 2023-08-29 16:53:00 +05:30
Ankush Menat
4856e11549 chore: update integrations workspace 2023-08-29 15:51:40 +05:30
RitvikSardana
de433d8626 fix: added ignore_user_permissions to parent field of tree doctypes 2023-08-29 13:07:13 +05:30
Corentin Flr
5c4df3e0e3
fix: Setup flake8 to stop turning trailing commas into tuples (#36850) 2023-08-29 10:59:58 +05:30
Deepesh Garg
1c237f455e
fix(demo): COA fixes for Mexico country (#36840) 2023-08-29 10:50:12 +05:30
Gursheen Kaur Anand
26e8b8f959
fix: create entries for only PR items present in LCV (#36852)
* fix: check if item code exists in lcv before creating gle

* refactor: use qb to fetch lcv items
2023-08-29 09:03:31 +05:30
Ankush Menat
0d22fe02be refactor!: Lower all perm to Desk User 2023-08-28 22:42:14 +05:30
ViralKansodiya
3a2933db4d
fix: error in report when data is not available to load chart in report (#36842) 2023-08-28 18:14:52 +05:30
s-aga-r
eb5c61be1e
Merge pull request #36811 from s-aga-r/SCR-SCRAP-ITEMS
feat: provision to add scrap items in Subcontracting Receipt
2023-08-28 17:11:00 +05:30
s-aga-r
9d330a13ed fix: get Valuation Rate instead of BOM rate 2023-08-28 16:09:05 +05:30
s-aga-r
592c7b5ff1 fix: test cases 2023-08-28 15:32:08 +05:30
ruthra kumar
9895bc3246
Merge pull request #36844 from ruthra-kumar/validation_error_on_payment_entry
fix: allocation error on partial payment against sales order
2023-08-28 15:11:36 +05:30