Commit Graph

36565 Commits

Author SHA1 Message Date
Gursheen Anand
8ef0d88708 fix: call validate before setting repost flag 2023-09-23 20:29:38 +05:30
Gursheen Anand
1856050ef9 fix: do not run bg job for single doc 2023-09-23 19:30:42 +05:30
Gursheen Anand
a856091ff4 refactor: remove repeated validation for voucher 2023-09-23 19:18:06 +05:30
Gursheen Anand
7ebf083683 refactor: use repost accounting legder 2023-09-23 19:13:33 +05:30
Gursheen Anand
ba7212c98b refactor: remove unused method 2023-09-23 19:11:46 +05:30
Gursheen Anand
5346c67b02 fix: apply gl report filters 2023-09-23 17:50:45 +05:30
Gursheen Anand
545f2ccdf1 chore: remove unused variable 2023-09-23 14:59:12 +05:30
Gursheen Anand
b3aa201eb5 fix: split inv allocated amt on server side 2023-09-23 14:57:53 +05:30
Deepesh Garg
06a45897de feat: Toggle net values in Trial Balance report 2023-09-23 14:34:11 +05:30
Florian HENRY
f15603017c refactor: missing translation 2023-09-22 16:56:12 +02:00
Florian HENRY
b2d520647f refactor: missing translation 2023-09-22 16:55:58 +02:00
Florian HENRY
d1c69aa229 Merge branch 'develop' of https://github.com/frappe/erpnext into dev_fr_translation 2023-09-22 16:53:13 +02:00
Florian HENRY
dc1294ec54 refactor: missing translation 2023-09-22 16:53:06 +02:00
s-aga-r
9554f6ea3c refactor!: remove GoCardless Templates 2023-09-22 19:04:51 +05:30
s-aga-r
543a76863f refactor!: remove GoCardless Mandate 2023-09-22 19:04:51 +05:30
s-aga-r
eb419e8e59 refactor!: remove Mpesa Settings 2023-09-22 19:04:49 +05:30
s-aga-r
eded7871f3 refactor!: remove GoCardless Settings 2023-09-22 18:59:28 +05:30
ruthra kumar
c5e4e01747
Merge pull request #37202 from ruthra-kumar/ignore_ple_on_pcv_cancellation
refactor: ignore PLE's on PCV cancellation
2023-09-22 13:28:40 +05:30
Gursheen Anand
ac28a5b372 fix: allocate amt for payment term invoices 2023-09-22 12:41:17 +05:30
ruthra kumar
301092dad1 refactor: ignore PLE's on PCV cancellation 2023-09-22 12:40:51 +05:30
ruthra kumar
150728deaa refactor: button on PE to filter associated Journals 2023-09-22 11:30:47 +05:30
Gursheen Anand
c66c438575 test: reposted acc entries for pi 2023-09-22 11:22:25 +05:30
ruthra kumar
d4773872aa
Merge pull request #37069 from marination/advance-unlink-impact
fix: Recalculate `advance_paid` in SO/PO after unlinking from advance entry
2023-09-22 08:35:27 +05:30
s-aga-r
c679d54852
Merge pull request #37185 from s-aga-r/REFACTOR-SRE
refactor(minor): Stock Reservation Entry
2023-09-21 21:46:09 +05:30
s-aga-r
b6437e387f fix: Item Dashboard 2023-09-21 18:23:20 +05:30
s-aga-r
8b6430c886 refactor(minor): Stock Reservation Entry 2023-09-21 18:23:18 +05:30
Gursheen Anand
c88f6d1fa7 fix: linting issues 2023-09-21 17:41:59 +05:30
Gursheen Anand
23470bf52d feat: allow repost for pi 2023-09-21 17:30:53 +05:30
Gursheen Anand
e77814fbc0 feat: add repost btn in invoice 2023-09-21 17:29:14 +05:30
Gursheen Anand
68effd93bd refactor: move reposting logic to common controller 2023-09-21 17:28:07 +05:30
Gursheen Anand
e922ec60eb feat: allow on submit fields 2023-09-21 17:26:20 +05:30
Florian HENRY
c5667a6cc1 fix: missing french translation on Lead and Prospect 2023-09-21 12:53:30 +02:00
Florian HENRY
fb844920af feat: Customer and Supplier - Primary Address and Contact on the same column as new adress and contact 2023-09-21 12:28:09 +02:00
ruthra kumar
f31a527505
Merge pull request #37120 from vorasmit/fix-dup-advance
fix: handle multiple references with same name
2023-09-21 14:20:04 +05:30
s-aga-r
acda72d616
feat: Stock Ledger Variance report (#37165)
* feat: `Stock Ledger Variance` report

* refactor: `get_data()`
2023-09-21 12:51:28 +05:30
s-aga-r
f0859ecc60
fix: labels for Stock Ledger Invariant Check report (#37150)
refactor: `Stock Ledger Invariant Check` report
2023-09-20 18:36:24 +05:30
rohitwaghchaure
dd4769ecf1
feat: allow to edit Stock Quantity in the Sales and Purchase Transactions (#36600)
feat: allow to edit Stock Quantity in the Sales and Purchase transactions
2023-09-20 18:09:03 +05:30
rohitwaghchaure
e6199dc802
fix: allow to select parent warehouse in the website item (#37047) 2023-09-20 17:27:35 +05:30
Ankush Menat
bf01f3227f chore: remove import script
Unused
2023-09-20 16:22:49 +05:30
Smit Vora
3e282bfbce
chore: add regional support for getting payment entries (#37119)
chore: add regional support for get payment entries
2023-09-19 20:47:21 +05:30
RJPvT
c35dea7177
chore: translations dutch (#37042)
update: translations dutch
2023-09-19 20:26:42 +05:30
Raffael Meyer
57d5c8a837
fix: update help links (#37098) 2023-09-19 19:59:16 +05:30
Raffael Meyer
84a9000db2
fix: german translation of Sales and Purchase Invoice (#37122)
* fix: german translation of Purchase Invoice

* fix: german translation of Sales Invoice
2023-09-19 19:57:43 +05:30
NandhiniDevi
6be567dbf6
fix: add item group filter added in item-wise purchase register (#36937)
fix: add item group filter added in item-wise purchase register (#36937)
2023-09-19 19:25:46 +05:30
NIYAZ RAZAK
141ba255e0
feat: validate duplicate date in holiday list (#37022)
* feat: validate duplicate date in table

* chore: cleanup

* chore: linting issues

* chore: linting issues

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2023-09-19 18:50:47 +05:30
Deepesh Garg
e19e04b050
feat: Add a process document for Subscription (#37126)
* feat: Add a process document for Subscription

* chore: Remove print statements

* feat: Input for generating invoice before currenc invoice date

* chore: patch for backward compatability

* refactor: Unit tests for subscription

* chore: set status on insert
2023-09-19 18:39:44 +05:30
RitvikSardana
03f0abf6de
fix: after applying coupon code, field in_words not updated (#37133)
* fix: after applying coupon code, field in_words not updated

* fix: changed the order of the function set_total_in_words
2023-09-19 13:08:17 +05:30
s-aga-r
9c9d0ecb73
feat: provision to create RIV from Stock Ledger Invariant Check report (#37115)
* feat: provision to create RIV from `Stock Ledger Invariant Check` report

* fix: `linter`
2023-09-19 13:00:44 +05:30
David Arnold
c99c486716
Merge branch 'develop' into fix/payment-url 2023-09-18 20:33:30 +02:00
David Arnold
7bc8ff21d4
fix: payment url display as link 2023-09-18 20:33:21 +02:00
David Arnold
6e1ad4c5bd
fix: payment request rounding in multi-currency and on status update 2023-09-18 20:29:27 +02:00
mergify[bot]
195de14810
fix: don't set from warehouse for purchase material request (backport #37132) (#37134)
fix: don't set from warehouse for purchase material request (#37132)

(cherry picked from commit e62b783f340844783352030de422c6be14b3ddfc)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-09-18 22:31:22 +05:30
Ankush Menat
dd24a1b36e
chore: remove obsolete welcome page (#37143) 2023-09-18 16:43:13 +00:00
Ankush Menat
d0eac47483 fix: stock summary page 2023-09-18 21:49:52 +05:30
ruthra kumar
2a575d9dc2
Merge pull request #37131 from ruthra-kumar/more_generic_customer_filter_in_ar_report
refactor: more generic filters in Accounts Receivable report
2023-09-18 16:59:25 +05:30
ruthra kumar
08d91ab831 refactor(test): AR output filtered on USD customers 2023-09-18 16:28:06 +05:30
ruthra kumar
083c82c206 chore: remove stale code 2023-09-18 16:28:06 +05:30
ruthra kumar
ac650d2e7a refactor: replace 'customer' filter with 'party_type' and 'party' 2023-09-18 16:28:02 +05:30
ruthra kumar
5acbf3f262
Merge pull request #37127 from ruthra-kumar/better_date_filters_in_get_outstanding_invoices
refactor: better date filters in `Get Outstanding Invoices` dialog
2023-09-18 13:20:32 +05:30
RitvikSardana
3764c01028
fix: accounting dimensions required while creating POS Profile (#36668)
* fix: accounting dimensions required while creating POS Porfile

* fix: accounting dimensions fetched while closing POS

* chore: code cleanup

* fix: ad set in final consolidated invoice

* chore: code cleanup

* chore: code cleanup

* fix: accounting dimension validation from backend

* chore: code cleanup

* chore: code cleanup

* chore: code cleanup

* fix: added edge case when acc dimension is created after creating pos profile

* test: added test case for Pos Closing For Required Accounting Dimension In Pos Profile

* test: fixed the test case

* test: fixing test case

* fix: changed test case location

* test: fixing test case

* test: fixing test case

---------

Co-authored-by: Ritvik Sardana <ritviksardana@Ritviks-MacBook-Air.local>
2023-09-18 13:07:14 +05:30
ruthra kumar
9004721859 refactor: better date filters in Get Outstanding Invoices dialog 2023-09-18 12:46:08 +05:30
Smit Vora
a9c85e4179 fix: handle multiple references with same name 2023-09-17 16:14:21 +05:30
Deepesh Garg
5e21e7cd1d
fix: Don't allow merging accounts with different currency (#37074)
* fix: Don't allow merging accounts with different currency

* test: Update conflicting values

* test: Update conflicting values
2023-09-17 15:54:06 +05:30
ruthra kumar
21f94918a3
Merge pull request #36893 from marination/bank-reco-code-cleanup
refactor: Bank Reconciliation Tool APIs
2023-09-17 08:07:30 +05:30
Gursheen Kaur Anand
099468e3cf
fix: company wise deferred accounting fields in item (#37023)
* fix: move deferred accounts in accounting section

* fix: move deferred check boxes in item accounting

* fix: show company wise acc in filters

* fix: fetch item deferred account from child table

* fix: tests using deferred acc

* refactor: use cached value

* fix: cached value call

* feat: patch to migrate deferred acc

* fix: hardcode education module doctypes in patch

* chore: resolve conflicts

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2023-09-16 21:25:31 +05:30
HENRY Florian
34bb64e41a
fix(ux): move get_route_options_for_new_doc to refresh (#37096)
fix: move `get_route_options_for_new_doc` to `refresh`
2023-09-16 15:59:09 +05:30
s-aga-r
fc016680c9
fix: ignore user permissions for Source Warehouse in MR (#37102)
fix: ignore user permissions for Source Warehouse in MR
2023-09-15 21:45:43 +05:30
Ankush Menat
7045810bae refactor: move clear data button to user action 2023-09-15 20:47:28 +05:30
ruthra kumar
a093dff039
Merge pull request #37108 from ruthra-kumar/better_asset_validation_on_returns
fix: asset validation misfire on debit notes
2023-09-15 20:01:34 +05:30
ruthra kumar
097b9892dc fix: asset validation misfire on debit notes 2023-09-15 17:54:20 +05:30
ruthra kumar
855a0d3bec
Merge pull request #37105 from ruthra-kumar/move_unreconcile_btn_to_group
refactor: move `unreconcile` button into a drop down
2023-09-15 16:57:32 +05:30
Ankush Menat
61778d5058
ci: restart bench before final migrate (#37104)
Also remove few patches which are now handled automatically
2023-09-15 16:51:56 +05:30
ruthra kumar
94ce43b0d5 refactor: add unreconcile btn to purchase invoice 2023-09-15 16:21:50 +05:30
ruthra kumar
f2b0ac6868 refactor: move unreconcile btn inside a drop down 2023-09-15 16:19:27 +05:30
ruthra kumar
2be025311a test: bank reconciliation API methods 2023-09-15 14:44:07 +05:30
mergify[bot]
08aaf22b2a
fix: precision issue and column name (backport #37073) (#37089)
fix: precision issue and column name (#37073)

(cherry picked from commit f2395a92971f48904e88afb929285def7ba221e4)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-09-15 12:09:48 +05:30
ruthra kumar
85ebaa3aed
Merge pull request #36879 from ruthra-kumar/unreconcile_feature
feat: Unreconcile Payments
2023-09-14 12:17:46 +05:30
Ankush Menat
2dbdc402bb refactor!: remove social media post module 2023-09-14 12:11:23 +05:30
Gursheen Kaur Anand
5976d0d13f
fix: prorate factor in subscription invoice total (#36880)
fix: prorate factor calculation
2023-09-14 12:05:05 +05:30
Ankush Menat
2135b0132d refactor!: remove twitter integration 2023-09-14 11:25:49 +05:30
s-aga-r
41fb40e26f
Merge pull request #37015 from s-aga-r/REMOVE-WOOCOMMERCE
refactor!: remove `woocommerce` integration
2023-09-14 10:41:18 +05:30
Florian HENRY
0932f1c9d4 Merge branch 'develop' of https://github.com/frappe/erpnext into dev_remove_regional_france 2023-09-13 17:19:14 +02:00
Florian HENRY
a3ebef7a29 fix: fix CI 2023-09-13 17:18:13 +02:00
Abdo
6f4f5be990
chore: Translate Voucher Type in General Ledger Report (#36874)
chore: Translate Voucher Type in  General Ledger Report
2023-09-13 20:38:45 +05:30
ViralKansodiya
96363dbb07
fix: Remove redundant code (#37001)
fix: Remove redundant code
2023-09-13 20:34:20 +05:30
Deepesh Garg
7711744020
Merge pull request #37032 from HarryPaulo/auth-rule-based-on-item-group
feat: created "based on" Item Group to specify a different percentage…
2023-09-13 20:27:34 +05:30
Deepesh Garg
1db05c80e1
Merge pull request #37031 from HarryPaulo/fix-auth-rule-based-on
fix: "Based on" field always has the value "Not applicable"
2023-09-13 20:26:28 +05:30
Deepesh Garg
6664bc98a0
Merge pull request #37041 from vorasmit/fix-advances
fix: multiple fixes for booking advances in seperate account
2023-09-13 20:24:57 +05:30
marination
8a4954d713 test: Impact on SO of advance PE submit and unlinking/replacement by SI 2023-09-13 19:09:03 +05:30
s-aga-r
d2f3286115 fix: ignore user permissions for From Warehouse in PR 2023-09-13 16:26:29 +05:30
Deepesh Garg
7bfd487b25
Merge pull request #36364 from SvbZ3r0/develop
fix: Naming Series preview when no previous transaction present
2023-09-13 15:17:51 +05:30
Deepesh Garg
1d014122c1
Merge pull request #36980 from anandbaburajan/SI_DI_internal_and_external_links
fix: + btn not appearing for delivery note connection
2023-09-13 15:16:11 +05:30
marination
426350eee6 fix: Update advance_paid in SO/PO after unlinking from advance entry 2023-09-13 14:24:56 +05:30
s-aga-r
b83d880d66
Merge pull request #37046 from s-aga-r/FIX-1081
fix: Purchase Receipt Provisional Accounting GL Entries
2023-09-13 14:21:59 +05:30
rohitwaghchaure
0e83190c19
fix: incorrect stock ledger entries in DN (#36944) 2023-09-13 13:34:40 +05:30
s-aga-r
1c78a5a9aa test: Purchase Receipt Provisional Accounting GL Entries 2023-09-13 12:28:18 +05:30
s-aga-r
74272a2e28 fix: patch to delete Woocommerce Settings DocType 2023-09-13 12:02:27 +05:30
s-aga-r
328ba4b656 refactor!: remove woocommerce 2023-09-13 11:50:04 +05:30
s-aga-r
6bab0eeaa1 fix: Purchase Receipt Provisional Accounting GL Entries 2023-09-13 11:24:10 +05:30
rohitwaghchaure
e6c302a397
fix: test case (#37063) 2023-09-13 11:22:43 +05:30
Deepesh Garg
88f7e57edf
Merge pull request #37055 from deepeshgarg007/dimension_filters_gl
fix: Apply dimension filter, irrespective of dimension columns
2023-09-13 10:05:58 +05:30
ruthra kumar
5898a6f48e
Merge pull request #37057 from ruthra-kumar/packed_item_picking_expired_price
fix: Packed item incorrectly picks expired price on Sales Order
2023-09-13 08:18:47 +05:30
ruthra kumar
055156d28a test: expired item price should not be picked 2023-09-13 07:48:59 +05:30
ruthra kumar
47ffa4983c fix: packed item using expired price 2023-09-13 06:03:12 +05:30
Deepesh Garg
1f02fb3bd9
Merge pull request #37017 from anandbaburajan/company_tabs
chore: add tabs for company doctype
2023-09-12 22:41:23 +05:30
Deepesh Garg
769db0b3bc fix: Apply dimension filter, irrespective of dimesion columns 2023-09-12 21:14:08 +05:30
HarryPaulo
da54ab5b3d fix: linters 2023-09-12 09:43:11 -03:00
rohitwaghchaure
9a23ba53c5
fix: button to make BOMs (#37049)
fix: custom button to make BOMs
2023-09-12 17:19:12 +05:30
mergify[bot]
93af6f6a1b
feat: provision to set required by from Production Plan (backport #37039) (#37040)
feat: provision to set required by from Production Plan (#37039)

* feat: provision to set the Required By date from production plan

* test: added test case for validate schedule_date

(cherry picked from commit d278b116030df0f272c3c101b75fe3b66a344c04)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-09-12 16:29:02 +05:30
Smit Vora
c09807845f fix: ensure correct preview and set latest transaction date 2023-09-12 13:25:51 +05:30
s-aga-r
3c6e527dd1
Merge pull request #37025 from s-aga-r/FIX-883
fix: `Parent Task` link with `Project Task`
2023-09-12 06:59:45 +05:30
HarryPaulo
623239d3f7 feat: created "based on" Item Group to specify a different percentage for each item group 2023-09-11 18:14:38 -03:00
HarryPaulo
fae640c56f fix: "Based on" field always has the value "Not applicable" 2023-09-11 17:57:31 -03:00
marination
2ad62be2c7 chore: Convert db.sql to QB queries 2023-09-12 00:00:06 +05:30
s-aga-r
0d5c8f03bd test: add test case for Task having common subject 2023-09-11 22:36:58 +05:30
marination
b9750f324b fix: Remove get_matching_vouchers_for_bank_reconciliation
- There should only be one hook to add queries to `get_linked_payments`
- `get_matching_queries` will be the only hook just like before
2023-09-11 21:51:10 +05:30
s-aga-r
5cae2e79bd fix: reload task before save 2023-09-11 20:36:27 +05:30
s-aga-r
d3295c43e3 fix: set Template Task ref in Project Task 2023-09-11 20:36:11 +05:30
s-aga-r
b4bcd9ba3f feat: new field in Task to hold ref of Template Task 2023-09-11 20:35:12 +05:30
Smit Vora
43061f4416 fix: correct set_query filters 2023-09-11 19:16:25 +05:30
s-aga-r
d739ab6ee3
fix(ux): docstatus filter for Reference Name in QI (#37024) 2023-09-11 18:52:31 +05:30
anandbaburajan
dda4c5ec59 chore: add tabs for company doctype 2023-09-10 22:06:28 +05:30
s-aga-r
ce549ce9b2
fix(ux): filters for SCR Item Serial and Batch Bundle (#37013) 2023-09-10 17:10:04 +05:30
Bernd Oliver Sünderhauf
846ae32d92
feat: Add half-yearly asset maintenance periodicity. (#37006) 2023-09-10 17:00:01 +05:30
Deepesh Garg
b34c03d306
Merge pull request #36843 from GursheenK/process-soa-pdf-name
fix: show customer name for naming series in process soa
2023-09-10 12:20:53 +05:30
Deepesh Garg
c849a012d5
Merge pull request #36974 from GursheenK/tax_withholding_category_base_total_for_si
fix: tax category field in tax withholding details report
2023-09-10 11:40:36 +05:30
barredterra
3e0a795028 chore: migrate translations to frappe 2023-09-10 00:21:41 +02:00
barredterra
2a77b50191 chore: migrate translations from frappe 2023-09-10 00:17:02 +02:00
ruthra kumar
d398775715 test: multi currency invoice unreconciliation
exchange gain/loss associated with the unreconcile invoice should be
cancelled as well
2023-09-09 07:30:58 +05:30
ruthra kumar
5c09fdf941 refactor(test): more modularization 2023-09-09 06:54:50 +05:30
ruthra kumar
1d93d66c30 refactor: cancel gain/loss JE on multi currency transactions 2023-09-08 21:29:13 +05:30
Florian HENRY
bb8153173a Merge branch 'develop' of https://github.com/frappe/erpnext into dev_remove_regional_france 2023-09-07 13:14:45 +02:00
Anand Baburajan
034322c53f
fix: correct asset daily depr schedule calculation [dev] (#36993)
fix: correct asset daily depr schedule calculation
2023-09-06 22:20:38 +05:30
Florian HENRY
f447177f8d refactor: Remove Regionalisation From France as now there is an App ERPNext France to manage it 2023-09-06 17:41:27 +02:00
Florian HENRY
662e9547da refactor: Remove Regionalisation From France as now there is an App ERPNext France to manage it 2023-09-06 17:40:19 +02:00
Deepesh Garg
c2f8f1d028
Merge pull request #36983 from deepeshgarg007/employee_utils
chore: Update employee for tests
2023-09-06 16:31:29 +05:30
Sagar Vora
1b853857aa chore: remove unused variable job 2023-09-06 14:14:22 +05:30
Deepesh Garg
ae01d70b33 chore: Update employee for tests 2023-09-06 13:19:00 +05:30
Anand Baburajan
0077659e93
chore: asset finance books validation (#36979) 2023-09-06 12:44:07 +05:30
Devin Slauenwhite
8ce6b8179e
fix: use primary key for link lookup (#36919) 2023-09-06 11:44:45 +05:30
anandbaburajan
e1a94a9ba1 fix: move SI and DI connected links to internal_and_external_links 2023-09-05 21:38:06 +05:30
Gursheen Anand
175870ce8d test: tax withholding details report 2023-09-05 18:51:41 +05:30
Gursheen Anand
8eea4eb56e fix: remove tax category from common fields 2023-09-05 18:50:53 +05:30
Anand Baburajan
174f95d699
fix: ask for asset related accounts only when needed (#36960)
* fix: only ask for asset_received_but_not_billed account when needed

* chore: remove unnecessary if condition

* fix: only ask for expenses_included_in_asset_valuation account when needed
2023-09-05 17:45:23 +05:30
s-aga-r
f809e12747
fix: ignore mandatory fields while saving WO (#36954) 2023-09-05 16:27:17 +05:30
ruthra kumar
ccd2e2b086
Merge pull request #36963 from ruthra-kumar/index_error_on_receivable_report
fix: index error on Receivable report based on payment terms
2023-09-05 16:12:38 +05:30
ruthra kumar
b9c556c4a9 fix: index error on Receivable report based on payment terms
cr note's don't have payment terms. So, skip for them.
2023-09-05 15:07:07 +05:30
RitvikSardana
d2f03c8a65
fix: payment recon not showing payment entry when party_type is Student (#36920)
* fix: payment recon not showing payment entry when party_type is Student

* chore: code cleanup

* fix: payment recon based on account_type which is fetched from Party Type master
2023-09-05 12:00:54 +05:30
ruthra kumar
5dbcf7d2b9 refactor: only cancel specific gain/loss je 2023-09-05 09:52:36 +05:30
ruthra kumar
6fd1c1bca2 refactor: display allocated amount in account currency with symbol 2023-09-05 09:34:01 +05:30
ruthra kumar
9a1588f1cc fix: typo in doctype name and qb 2023-09-05 08:34:26 +05:30
ruthra kumar
67980188a7 test: more granular unreconciliation 2023-09-05 08:34:26 +05:30
ruthra kumar
9b6eac23b6 refactor: unlink individual vouchers from payments 2023-09-05 08:34:26 +05:30
ruthra kumar
b4dc2bdf28 chore: type info 2023-09-05 08:34:26 +05:30
ruthra kumar
0130aea2aa refactor: convert raw sql to query_builder 2023-09-05 08:34:26 +05:30
ruthra kumar
de910ab152 refactor: single fetch and unlinking logic for JE and PE 2023-09-05 08:34:26 +05:30
ruthra kumar
285963acdb feat: unreconcile support for journal entry 2023-09-05 08:34:26 +05:30
ruthra kumar
cce96669f0 refactor: modularisation and group by voucher_no 2023-09-05 08:34:26 +05:30
ruthra kumar
0ccb6d8242 chore: rename and add trigger in journal entry 2023-09-05 08:34:26 +05:30
ruthra kumar
69683776a5 chore: code cleanup 2023-09-05 08:34:26 +05:30
ruthra kumar
1981f3837a chore: fetch logic for payment entry 2023-09-05 08:34:26 +05:30
ruthra kumar
25fe752185 chore: move functions to a separate file in utils 2023-09-05 08:34:26 +05:30
ruthra kumar
5981c7e0ad chore: move dialog building function to utils.js file 2023-09-05 08:34:26 +05:30
ruthra kumar
58dc0e52e1 refactor: add UI elements 2023-09-05 08:34:26 +05:30
ruthra kumar
6bbe47c671 chore: delete unreoncile doc upon parent doc deletion 2023-09-05 08:34:26 +05:30
ruthra kumar
489a545bbb chore: track changes 2023-09-05 08:34:26 +05:30
ruthra kumar
42df0d3d67 refactor: remove references using framework 2023-09-05 08:34:26 +05:30
ruthra kumar
fbdfb8151c chore: delete references upon parent deletion 2023-09-05 08:34:26 +05:30
ruthra kumar
41eb2c9f5a feat: filter on voucher no 2023-09-05 08:34:26 +05:30
ruthra kumar
fc6be5bfb9 feat: UI for unreconcile 2023-09-05 08:34:26 +05:30
ruthra kumar
0faffaa8db test: basic unreconcile function 2023-09-05 08:34:26 +05:30
ruthra kumar
5114a9580d refactor: adding 'Get Allocations' button 2023-09-05 08:34:26 +05:30
ruthra kumar
e48a90efe6 chore: working state on barebones functions 2023-09-05 08:34:26 +05:30
ruthra kumar
dc71623295 feat: introduce unreconcile doctype 2023-09-05 08:34:26 +05:30
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
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
marination
480903e3f4 refactor: verbosity in get_linked_payments result
- Easier to read field names like x["rank"] than x[0]
- It's hard to keep up with what the indices mean, thus reducing readability
2023-08-31 21:05:40 +05:30