Suraj Shetty
|
e0a3869874
|
Merge pull request #34266 from frappe/mergify/bp/develop/pr-34265
|
2023-03-01 17:06:20 +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 |
|
rohitwaghchaure
|
32b64db4d6
|
Merge pull request #34254 from rohitwaghchaure/fixed-subcontracting-stock-availability-issue
fix: consumed qty validation for subcontracting receipt
|
2023-03-01 15:15:25 +05:30 |
|
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 |
|
Sagar Sharma
|
90abb28cb4
|
Merge pull request #34060 from vishdha/pos_fix
fix: multiple Point of Sale conversion issue resolved
|
2023-02-28 14:55:14 +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 |
|
Sagar Sharma
|
9cd42dd60f
|
Merge pull request #34225 from s-aga-r/fix-mr-warehouse
fix: set `from_warehouse` and `to_warehouse` while mapping SE
|
2023-02-27 12:52:53 +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
|
c22641092a
|
Merge pull request #34212 from brian-pond/patch-2
fix: Remove missing DocField in fetch_from
|
2023-02-27 11:52:53 +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
|
9e38b61bd9
|
Merge pull request #34214 from AnandBaburajan/manual_asset_schedule_develop
fix: asset manual depr schedule [develop]
|
2023-02-26 20:22:34 +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 a67284e96dabe71b76a373b5f1f3142dccf3952b.
|
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 |
|