Sagar Sharma
48a88b7064
Merge branch 'develop' into FIX-ISS-22-23-05720
2023-03-14 11:44:33 +05:30
Anand Baburajan
72e9c05f46
Merge branch 'develop' into patch_assdeprsch_gpa_ndb
2023-03-13 21:31:57 +05:30
Deepesh Garg
c6999fc687
fix: Total row in trail balance report ( #34395 )
...
* fix: Total row in trail balance report
* fix: Calculate total after preparing opening and closing
2023-03-13 21:18:30 +05:30
Deepesh Garg
91f7b0bbd6
Merge branch 'develop' of https://github.com/frappe/erpnext into opening_entry
2023-03-13 20:52:48 +05:30
Deepesh Garg
76775a3e49
fix: Update patch
2023-03-13 20:51:35 +05:30
Deepesh Garg
492e994c22
Merge branch 'develop' into patch_assdeprsch_gpa_ndb
2023-03-13 19:37:55 +05:30
Deepesh Garg
fa776d2987
fix: Use customer name instead of name(id) in PSOA ( #34412 )
2023-03-13 19:37:09 +05:30
Deepesh Garg
d8e54a21fb
test: Update values in Sales Invoice tests ( #34419 )
2023-03-13 19:34:15 +05:30
Sagar Vora
5c06620f97
fix: set tax category from address before executing get_regional_address_details ( #34372 )
2023-03-13 19:32:50 +05:30
HENRY Florian
d267111e13
chore: fix french translation ( #34381 )
...
chore: update french translation
2023-03-13 19:03:16 +05:30
Ernesto Ruiz
796ad01b87
fix: Add translate function to Delayed Tasks Summary Report ( #34411 )
...
fix: Add translate function to Delayed Tasks Summary Report
2023-03-13 19:02:34 +05:30
Deepesh Garg
c8cc3fc65f
chore: Move source and campaign to additional info section ( #34414 )
2023-03-13 18:37:19 +05:30
Deepesh Garg
4416ddc4af
fix: Linked invoice cancellation issue via timesheet ( #34337 )
2023-03-13 18:36:43 +05:30
Sagar Sharma
4a05f3736f
Merge branch 'develop' into FIX-ISS-22-23-05720
2023-03-13 17:50:09 +05:30
s-aga-r
66f650061d
test: add test cases for Over Order Allowance against Blanket Order
2023-03-13 17:21:07 +05:30
Sagar Sharma
9d49afebde
Merge branch 'develop' into fix-22-23-05686
2023-03-13 17:05:27 +05:30
Anand Baburajan
b8703b0b9b
Merge branch 'develop' into patch_assdeprsch_gpa_ndb
2023-03-13 15:35:08 +05:30
Ankush Menat
b8a61be080
test: fix hypothesis tests ( #34416 )
2023-03-13 15:16:30 +05:30
Anand Baburajan
097be8bdea
Merge branch 'develop' into patch_assdeprsch_gpa_ndb
2023-03-13 15:08:08 +05:30
Sagar Sharma
f2e9a67f37
Merge branch 'develop' into FIX-ISS-22-23-05720
2023-03-13 14:32:26 +05:30
s-aga-r
442ee3adba
fix: operation time for multi-level BOM in WO
2023-03-13 14:31:38 +05:30
Ankush Menat
5bf6fb43a9
chore: fix broken TR translations
2023-03-13 14:12:12 +05:30
Deepesh Garg
7101e7acc4
fix: Filtering issue in payment entry ( #34332 )
2023-03-13 14:05:13 +05:30
ruthra kumar
9f26e3c27a
Merge pull request #34408 from ruthra-kumar/delete_remarks_migration_patch
...
chore: delete remarks migration patch
2023-03-13 09:14:21 +05:30
ruthra kumar
da37573b73
chore: delete remarks migration patch
...
Versions higher than V14.18.2, 'remarks' will be moved in 'migrate_gl_to_payment_ledger'
2023-03-12 13:41:50 +05:30
ruthra kumar
e371bb6672
Merge pull request #34387 from ruthra-kumar/refactor_gl_migration_patch
...
refactor(patch): remove inner join to improve SQL performance
2023-03-11 21:00:19 +05:30
Mehmet Demirel
fa6d37542b
chore: Improve Turkish language translation
...
chore: Improve Turkish language translation
2023-03-11 19:18:44 +05:30
Deepesh Garg
aae53bb910
fix: Error in consolidated financial statement ( #34330 )
2023-03-11 19:06:56 +05:30
ruthra kumar
9d0a1149d8
chore: remove remarks migrations patch from patches.txt
...
'Remarks' field is moved in migrate_gl_to_payment_ledger patch itself
from versions highers than v14.18.2. Removing it from patches.txt
2023-03-11 13:17:52 +05:30
ruthra kumar
a43304b01b
Merge branch 'develop' into fix_flaky_test_in_payment_terms_report
2023-03-11 13:05:38 +05:30
ruthra kumar
7fcd74ed03
fix(test): flaky test case in Payment terms report
2023-03-10 21:23:12 +05:30
ruthra kumar
1744f1d4e4
refactor: add remarks to column as well
2023-03-10 15:57:11 +05:30
Anand Baburajan
6308b509fc
Merge branch 'develop' into patch_assdeprsch_gpa_ndb
2023-03-10 15:25:39 +05:30
Deepesh Garg
0157fa15eb
chore: Use account closing balance in set gl entries
2023-03-10 13:02:01 +05:30
s-aga-r
9c1e566394
fix: filters not getting applied on Web Form
2023-03-09 22:12:35 +05:30
ruthra kumar
f9cfabf78e
refactor(patch): remove inner join to improve SQL performance
2023-03-09 19:42:28 +05:30
anandbaburajan
ebb6953274
fix: add missing patch for new fields added in #34214
2023-03-09 17:55:27 +05:30
Deepesh Garg
9a8f8e8b7d
Revert "fix: Default sales team not getting set" ( #34376 )
...
Revert "fix: Default sales team not getting set (#34284 )"
This reverts commit 7d0199d743
2023-03-09 15:36:52 +05:30
Sagar Sharma
87b5734f5b
Merge branch 'develop' into FIX-ITEM-ALTERNATIVE-ERR-MSG
2023-03-09 10:07:24 +05:30
s-aga-r
046834a97a
fix: required_qty get reset to 1 for Alternative Item in WO
2023-03-08 20:40:03 +05:30
s-aga-r
baef5ae1ef
chore: Alternative Item Code error msg
2023-03-08 20:07:30 +05:30
Deepesh Garg
719ac5c8f3
Merge branch 'develop' of https://github.com/frappe/erpnext into opening_entry
2023-03-08 18:35:26 +05:30
Deepesh Garg
f0267feca8
test: Add test case for closing balance
2023-03-08 18:34:07 +05:30
Deepesh Garg
3249a79f07
chore: rename Closing Balance to Account Closing Balance
2023-03-08 15:15:33 +05:30
s-aga-r
b53dcb04ed
test: add test cases for BOM Stock Report
2023-03-08 14:00:06 +05:30
s-aga-r
a65b80911b
fix: BOM Stock Report
2023-03-08 12:59:50 +05:30
Sagar Sharma
336e0b9666
Merge branch 'develop' into fix-22-23-05690
2023-03-07 18:02:52 +05:30
Solufyin
71de72bdd0
fix: Set contact filter link in Opportunity ( #34325 )
...
Co-authored-by: Nihantra C. Patel <n.patel.serpentcs@gmail.com>
2023-03-07 17:44:31 +05:30
Devin Slauenwhite
6de826b8c4
fix: exchange rate revaluation errors ( #33947 )
...
* fix: set new balance for non-positive balances
* fix: don't add debit: 0, credit: 0 entries to journal entry.
* fix: add journal entry difference to unbooked gain/loss of exchange.
* chore: linter
* chore: remove invlaid TODO. [skip-ci]
2023-03-07 17:16:15 +05:30
Sagar Sharma
4d1f620d75
Merge branch 'develop' into fix-22-23-05690
2023-03-07 16:35:17 +05:30
Marica
2feb27e399
fix(minor): Dirty the form after clicking on Get advances button in Invoices ( #34323 )
...
fix(minor): Dirty form after clicking on Get advances button
2023-03-07 15:45:18 +05:30
Sagar Sharma
4cd16a839b
Merge branch 'develop' into fix-22-23-05690
2023-03-07 14:55:46 +05:30
Deepesh Garg
10632d75b0
fix: Do not calculate commission post submit ( #34267 )
...
* fix: Do not calculate commision post submit
* chore: Update condition to match server side logic
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
---------
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
2023-03-07 11:44:09 +05:30
Deepesh Garg
7d0199d743
fix: Default sales team not getting set ( #34284 )
2023-03-07 11:41:26 +05:30
Deepesh Garg
ea8e23384d
fix: Payment Request against sales order with disabled rounded total ( #34281 )
...
* fix: Payment Request against sales order with disabled rounded total
* chore: Do not consider advance amount
2023-03-07 11:40:29 +05:30
Sagar Sharma
3952b3373d
Merge branch 'develop' into fix-22-23-05690
2023-03-07 10:50:39 +05:30
s-aga-r
8ad9e99cea
perf: update_completed_qty() in material_request.py
2023-03-07 10:50:11 +05:30
s-aga-r
de18f98c5c
perf: Stock Entry (Material Transfer)
2023-03-06 23:41:04 +05:30
rohitwaghchaure
53efc8ff77
Merge pull request #34305 from rohitwaghchaure/fixed-not-able-to-complete-bom-update-log
...
fix: BOM Update log not completed
2023-03-06 23:23:58 +05:30
Deepesh Garg
5dabc98ba5
chore: Add index to period closing voucher column
2023-03-06 16:56:33 +05:30
Rohit Waghchaure
2f157fa5d3
fix: BOM Update log not completed
2023-03-06 12:09:50 +05:30
Deepesh Garg
310f71c313
test: Add static posting dates to tests
2023-03-05 18:43:26 +05:30
Deepesh Garg
4a2046dfb6
fix: Aggregation with previous closing balance
2023-03-05 18:18:33 +05:30
barredterra
502a37a864
refactor: use renamed timezone utils
...
https://github.com/frappe/frappe/pull/20253
2023-03-04 19:31:40 +01:00
s-aga-r
70de444b7b
fix: Stock Reconciliation actual_qty
2023-03-04 17:06:07 +05:30
s-aga-r
e6a02719f7
fix: update inventory dimensions before returning sle
2023-03-04 16:02:50 +05:30
s-aga-r
0e1b7760a8
fix: Inventory Dimension for Stock Reconciliation
2023-03-04 01:05:55 +05:30
s-aga-r
53701c37b1
feat: consider over_order_allowance while validating sales order qty
2023-03-03 22:03:54 +05:30
s-aga-r
d7da8928ac
feat: add field Over Order Allowance (%) in Selling Settings
2023-03-03 11:19:28 +05:30
s-aga-r
8bcbc45add
feat: consider over_order_allowance while validating order qty
2023-03-03 11:11:33 +05:30
s-aga-r
fc1088d9c4
fix: don't map item row having 0 qty
2023-03-03 10:50:17 +05:30
s-aga-r
f3993783a3
refactor: rewrite blanket_order.py queries in QB
2023-03-02 17:18:46 +05:30
s-aga-r
f5937f46cb
feat: add field Over Order Allowance (%) in Buying Settings
2023-03-02 17:04:09 +05:30
Deepesh Garg
c3d455653e
Merge pull request #34258 from deepeshgarg007/finance_book_read_only
...
chore: Make finance book read only
2023-03-02 16:47:47 +05:30
Deepesh Garg
c089c4156c
chore: Minor fixes
2023-03-02 16:46:56 +05:30
s-aga-r
abf9a28d6a
fix: hide + button based on Blanket Order Type
2023-03-02 16:40:37 +05:30
Sagar Sharma
90e1a6bc16
Merge branch 'develop' into github-issue-33344
2023-03-02 14:24:14 +05:30
Sagar Sharma
6e9d001819
Merge branch 'develop' into github-issue-33344
2023-03-02 12:09:21 +05:30
Sagar Sharma
50dc0c18eb
Merge branch 'develop' into fix-return-pr-serial-no
2023-03-02 12:06:59 +05:30
Ankush Menat
330ae419be
fix!: Parse float as per number format in quality inspection ( #34259 )
...
fix: Parse float as per number format in quality inspection
2023-03-02 11:59:18 +05:30
s-aga-r
cb0b6de4b9
fix: Serial No is mandatory even if the qty is 0
2023-03-02 11:27:46 +05:30
s-aga-r
a9f0a11ce6
fix: rejected_serial_no not getting copied from PR to PR(Return)
2023-03-02 11:15:46 +05:30
Deepesh Garg
790f0aac12
Merge branch 'develop' into finance_book_read_only
2023-03-02 10:01:12 +05:30
Deepesh Garg
6a89cb98ce
Merge pull request #33874 from frappe/alternative-items-quotation
...
feat: Support for Alternative Items in Quotation
2023-03-01 17:41:24 +05:30
Suraj Shetty
6cd2ba5c66
fix: Resolve conflicts
...
(cherry picked from commit f6469d83981386a7bb57b41178055eae5cda30bf)
2023-03-01 10:59:21 +00:00
Suraj Shetty
46a722d51c
fix: Wrap unexpectedly long text in remark
...
(cherry picked from commit ba66a6714c495f9d70dad79344342779c8011c6e)
# Conflicts:
# erpnext/accounts/report/general_ledger/general_ledger.html
(cherry picked from commit b13bf1ebc517ccd9c5b6b079208ca3883e7418fd)
2023-03-01 10:59:20 +00:00
Deepesh Garg
28dd1a25cb
chore: Make finance book read only
2023-03-01 15:00:24 +05:30
Deepesh Garg
e5f603c9d9
perf: Apply closing balance in Trial Balance report
2023-03-01 14:48:06 +05:30
Deepesh Garg
95c9aafda9
fix: Update patch to generate closing balance entries
2023-03-01 14:45:22 +05:30
Deepesh Garg
436fc03eda
fix: Closing balance entries for period closing voucher
2023-03-01 14:43:49 +05:30
Rohit Waghchaure
b38fe24090
fix: consumed qty validation for subcontracting receipt
2023-03-01 11:42:59 +05:30
rohitwaghchaure
d88fe27be6
Merge pull request #34195 from HarryPaulo/fix-performance-on-insert-item
...
fix: Performance improvement when adding a new item
2023-03-01 10:10:14 +05:30
ruthra kumar
f9c75055bb
Merge pull request #34241 from ruthra-kumar/bug_on_credit_note_creation
...
fix: pos return throwing amount greater than grand total
2023-02-28 18:22:30 +05:30
rohitwaghchaure
9bb8e351a2
Merge pull request #34243 from rohitwaghchaure/fixed-date-filters-in-subcontracting-reports
...
fix: default date in Subcontracting reports
2023-02-28 18:01:14 +05:30
Rohit Waghchaure
dfddc4efc3
fix: default date in Subcontracting reports
2023-02-28 17:53:51 +05:30
rohitwaghchaure
2942cee31e
Merge pull request #34235 from rohitwaghchaure/feat-adjust-valuation-rate
...
feat: adjust purchase receipt valuation rate as per purchase invoice rate
2023-02-28 17:34:53 +05:30
ruthra kumar
35c70f39fa
fix: pos return throwing amount greater than grand total
2023-02-28 16:21:32 +05:30
Rohit Waghchaure
a8445da02a
fix: labels name
2023-02-28 15:47:45 +05:30
s-aga-r
58c027d4cc
chore: Linters
2023-02-28 15:14:34 +05:30
Sagar Sharma
26ced47ddc
Merge branch 'develop' into github-issue-33344
2023-02-28 15:01:40 +05:30
Rohit Waghchaure
8e86553717
test: added test cases
2023-02-28 14:57:04 +05:30
Rohit Waghchaure
eab775ef32
feat: adjust purchase receipt valuation rate as per purchase invoice rate
2023-02-28 14:11:55 +05:30
Vishal
f18ae5856f
chore: minor changes in pos_controller
2023-02-28 11:03:26 +05:30
Vishal
a51bec0269
chore: minor change
2023-02-28 11:03:26 +05:30
Vishal
3ebe7d861d
chore: minor changes added to code
2023-02-28 11:03:26 +05:30
Vishal
1de531e56e
fix: multiple pos conversion issue resolved
2023-02-28 11:03:25 +05:30
Sagar Sharma
ecd15d2a65
Merge branch 'develop' into github-issue-33344
2023-02-27 16:57:29 +05:30
s-aga-r
c09a61f360
fix: set from_warehouse and to_warehouse while mapping SE
2023-02-27 12:26:21 +05:30
Sagar Sharma
bda1340760
Merge branch 'develop' into patch-2
2023-02-27 11:52:31 +05:30
Patrick Eissler
bbb6a62a7d
chore: add german translations ( #34167 )
...
* chore: add german translations
* Apply suggestions from code review
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
---------
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
2023-02-27 11:49:22 +05:30
Deepesh Garg
81651beaef
Merge pull request #34174 from Vishnu7025/coa-import-currency
...
fix: currency in coa import
2023-02-27 11:48:44 +05:30
Sagar Sharma
5dcb723fc7
Merge branch 'develop' into patch-2
2023-02-27 11:14:14 +05:30
Brian Pond
83f3e317e1
fix: Remove missing DocField in fetch_from
2023-02-27 11:10:51 +05:30
ruthra kumar
d8b9b83b11
Merge pull request #34207 from ruthra-kumar/fix_permisssion_error_on_work_order_creation
...
fix: permission error while calling get_work_order_items
2023-02-27 09:55:18 +05:30
Anand Baburajan
feeebb1262
Merge branch 'develop' into manual_asset_schedule_develop
2023-02-26 17:40:26 +05:30
anandbaburajan
dd74839eba
fix: manual depr schedule
2023-02-26 17:36:36 +05:30
Deepesh Garg
a663df376c
fix: Add patch to update closing balances
2023-02-26 16:06:04 +05:30
Deepesh Garg
6607c8bd82
fix: Order by issue in aggregation query
2023-02-26 16:05:26 +05:30
Deepesh Garg
f92c63fb10
feat: Add validations against period closing voucher
2023-02-26 15:53:33 +05:30
Deepesh Garg
7fa7d6b5e4
chore: Rewrite query using query builder
2023-02-26 15:52:30 +05:30
Deepesh Garg
e18336ebe7
feat: Add views in standard filter
2023-02-26 15:47:29 +05:30
rohitwaghchaure
6d6e3cb015
Merge pull request #34206 from rohitwaghchaure/fixed-trivial-error-for-stock-reposting
...
fix: not able to repost gl entries
2023-02-24 21:10:27 +05:30
ruthra kumar
a11d3327df
fix(test): use standalone method to fetch work orders from SO
2023-02-24 21:07:49 +05:30
ruthra kumar
b6bad728cd
fix: permission error while calling get_work_order_items
2023-02-24 21:07:46 +05:30
Rohit Waghchaure
7d10dd9ea8
fix: not able to repost gl entries
2023-02-24 17:50:00 +05:30
Deepesh Garg
e26c6dc76b
Revert "fix: Concurrency issues in Sales and Purchase returns" ( #34202 )
...
Revert "fix: Concurrency issues in Sales and Purchase returns (#34019 )"
This reverts commit a67284e96d
2023-02-24 15:28:14 +05:30
rohitwaghchaure
04f00fd141
Merge pull request #34199 from rohitwaghchaure/fixed-converison-factor-issue
...
fix: conversion factor not set
2023-02-24 14:56:36 +05:30
Rohit Waghchaure
8e46aebc50
fix: conversion factor not set
2023-02-24 14:49:05 +05:30
HarryPaulo
49af5ba434
fix: Performance improvement when adding a new item
2023-02-23 18:11:09 -03:00
rohitwaghchaure
670304fe8e
Merge pull request #34189 from rohitwaghchaure/prevent-to-make-item-price-for-template
...
fix: user shouldn't able to make item price for item template
2023-02-23 20:47:48 +05:30
Rohit Waghchaure
6417ae0ee8
fix: user shouldn't able to make item price for item template
2023-02-23 20:21:50 +05:30
Deepesh Garg
c3f39c3f32
feat: Cascade closing balances on PCV submit
2023-02-23 16:48:54 +05:30
Deepesh Garg
36c08d0835
fix: Add patches to create accounting dimension in Closing Balance
2023-02-23 16:46:37 +05:30
Marica
47ab26dedf
Merge branch 'develop' into alternative-items-quotation
2023-02-23 13:20:28 +05:30
ruthra kumar
a9920715ab
Merge pull request #34022 from ruthra-kumar/gross_profit_memory_and_performance_issue
...
perf: Gross Profit report will fetch SLE's on demand and memoize
2023-02-23 11:55:08 +05:30
ruthra kumar
88d888d9d0
refactor: use docstatus from Delivery Note Item
2023-02-23 11:15:56 +05:30
rohitwaghchaure
3692f960d0
Merge pull request #34172 from rohitwaghchaure/zero-rate-adjust-issue-using-lcv
...
fix: zero division error while making LCV
2023-02-23 10:54:01 +05:30
ruthra kumar
60d3b86cdb
Merge pull request #34176 from ruthra-kumar/fix_ui_freeze_on_sales_invoice
...
fix: ui freeze on item selection in sales invoice
2023-02-23 10:35:50 +05:30
rohitwaghchaure
e3de216e06
Merge pull request #34173 from rohitwaghchaure/incorrect-color-showing-in-report
...
fix: incorrect color in the BOM Stock Report
2023-02-23 09:54:45 +05:30
ruthra kumar
6412583e98
fix: ui freeze on item selection in sales invoice
2023-02-23 09:36:21 +05:30
vishnu
e3c000d0be
chore: change column label
2023-02-22 10:53:11 +00:00
vishnu
19c0b7a523
fix: currency in coa import
2023-02-22 10:24:45 +00:00
Rohit Waghchaure
a8f03ebf7f
fix: incorrect color in the BOM Stock Report
2023-02-22 14:24:18 +05:30
Rohit Waghchaure
80e94a08cf
fix: zero division error while making LCV
2023-02-22 13:29:06 +05:30
Deepesh Garg
b44a19bd1a
feat: Introduce opening entry for reporting
2023-02-21 23:20:28 +05:30
Sankara Subramanian V
a06d24037b
refactor(region): Splitting of KSA(Saudi Arabia) Regional logic from ERPNext ( #33895 )
...
* feat: remove KSA regional code
2023-02-21 22:52:20 +05:30
ruthra kumar
dde5bbc9a7
Merge pull request #34102 from ruthra-kumar/pos_validate_for_duplicate_pos_invoices
...
fix: check for duplicate pos invoices in closing entry
2023-02-21 18:45:39 +05:30
ruthra kumar
47add0b751
fix: check for duplicate in pos closing and pos merge log entry
2023-02-21 17:50:57 +05:30
Deepesh Garg
9739d8b52a
feat: Introduce opening entry for reporting
2023-02-21 15:23:29 +05:30
ruthra kumar
4a7b1de2d8
refactor: clear records in batches in 'Transaction Deletion Record' ( #34109 )
...
refactor: clear records in batches
2023-02-21 14:27:00 +05:30
