Sagar Sharma
a07a5572ea
Merge branch 'develop' into FIX-ISS-22-23-05936
2023-03-17 16:18:54 +05:30
Danny
ca10e2bb9f
fix: bad strings format for command get-untraslated ( #34361 )
...
* fix: bad string foramt
* fix: bad string format
* fix: pre-commit format
---------
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
2023-03-17 16:13:32 +05:30
Sagar Sharma
f2c78163bf
Merge branch 'develop' into FIX-34354
2023-03-17 15:58:46 +05:30
Deepesh Garg
d8ece86463
fix: Update account number from parent company ( #34474 )
2023-03-17 15:55:11 +05:30
Deepesh Garg
7b630217bd
fix: Multiple accounting dimension filtering in AR/AP reports ( #34464 )
...
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
2023-03-17 15:51:33 +05:30
Deepesh Garg
be723bb9d4
chore: Update user manual link ( #34478 )
2023-03-17 15:39:33 +05:30
ruthra kumar
6b0dc62681
Merge pull request #34456 from ruthra-kumar/gp_return_invoice_issue
...
fix: Gross Profit reports Invoices with -ve qty for Invoices with Cr Notes
2023-03-17 15:26:41 +05:30
Sagar Sharma
0753aa5ab7
Merge branch 'develop' into FIX-34354
2023-03-17 15:16:41 +05:30
Sagar Sharma
3fb64cacfc
Merge branch 'develop' into FIX-ISS-22-23-05936
2023-03-17 15:03:44 +05:30
ruthra kumar
cc61daeec4
test: Gross Profit report output for Cr notes
...
2 New test cases added.
1. Standalone Cr notes will be reported as normal Invoices
2. Cr notes against an Invoice will not overallocate qty if there are
multiple instances of same item
2023-03-17 14:48:57 +05:30
ruthra kumar
d0715a82eb
refactor: Ignore linked Cr Notes in Report output
2023-03-17 14:48:57 +05:30
ruthra kumar
e2f19c6a14
fix: Overallocation of 'qty' from Cr Notes to Parent Invoice
...
Cr Notes 'qty' are overallocated to parent invoice, when there are
mulitple instances of same item in Invoice.
2023-03-17 14:48:57 +05:30
ruthra kumar
ec075122b6
refactor: difference amt validation for same currency accounts
2023-03-17 14:14:17 +05:30
ruthra kumar
861387f164
test: difference amount should not be calculated for base currency
2023-03-17 14:14:17 +05:30
ruthra kumar
48fae0c1ce
fix: difference amount calculation for company currency accounts
2023-03-17 14:14:17 +05:30
Sagar Sharma
db1f2d6279
Merge branch 'develop' into FIX-ISS-22-23-05936
2023-03-17 13:54:13 +05:30
s-aga-r
b04a101c11
fix: incorrect Opening Value in Stock Balance report
2023-03-17 13:53:49 +05:30
rohitwaghchaure
558db13040
Merge branch 'develop' into fix-22-23-05686
2023-03-17 08:57:37 +05:30
Anand Baburajan
563ee92043
Merge branch 'develop' into FIX-34354
2023-03-16 18:22:13 +05:30
Anand Baburajan
b6b8392413
fix: refactor asset depr schedule and remove unnecessary depr method ( #34434 )
...
* fix: remove depr method from depr schedule and refactor assetdeprsch
* chore: use assetdeprsch's depr method, not deprschedule's
* fix: use default 0 value for NDB and OAD
* chore: fix rounded numbers
* chore: correct rounding in test_website_item_price_for_logged_in_user
2023-03-16 18:18:47 +05:30
Sagar Sharma
357d4994e4
Merge branch 'develop' into fix-22-23-05686
2023-03-14 20:59:38 +05:30
Sagar Sharma
ea269c6a1c
Merge branch 'develop' into FIX-34354
2023-03-14 20:59:27 +05:30
Ankush Menat
f1752fcd7a
Merge pull request #34116 from prateekkaramchandani/develop
...
fix: use max function to get default company address
2023-03-14 19:38:26 +05:30
Ankush Menat
e0042972c8
test: add test for primary address sorting
2023-03-14 18:50:19 +05:30
Ankush Menat
55489d0056
Merge branch 'develop' into prateekkaramchandani/develop
2023-03-14 18:39:06 +05:30
Sagar Sharma
e0b288fbf0
Merge branch 'develop' into FIX-34354
2023-03-14 18:19:38 +05:30
Sagar Sharma
258242f8d7
Merge branch 'develop' into FIX-ISS-22-23-05720
2023-03-14 18:17:48 +05:30
Ankush Menat
f95ad039e4
test: add timeout to all BOM related tests ( #34446 )
...
* Revert "chore: remove failing test (#34444 )"
This reverts commit b89ecd482d
2023-03-14 18:10:17 +05:30
Deepesh Garg
b89ecd482d
chore: remove failing test ( #34444 )
2023-03-14 15:53:03 +05:30
Johannes Obermeier
70c78d0d67
fix: incorrect EAN validation, EAN can be an EAN8, EAN12 or EAN13 code ( #34250 )
...
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2023-03-14 15:27:05 +05:30
s-aga-r
22ad9a1903
chore: Allow Zero Valuation Rate msg in SE
2023-03-14 14:33:03 +05:30
Sagar Sharma
0dbf4557db
Merge branch 'develop' into FIX-ISS-22-23-05720
2023-03-14 13:19:58 +05:30
Sagar Sharma
185a8910d2
Merge branch 'develop' into fix-22-23-05686
2023-03-14 13:19:46 +05:30
Sagar Sharma
6c88fb7a8d
Merge branch 'develop' into fix-22-23-05686
2023-03-14 11:44:39 +05:30
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
