Deepesh Garg
|
076027a68c
|
chore: Consider bundle qty as well
(cherry picked from commit e5566b31d5)
|
2022-12-06 12:08:06 +00:00 |
|
Deepesh Garg
|
82cdf49d32
|
fix: Bundle item rates
(cherry picked from commit 826f45ad60)
|
2022-12-06 12:08:05 +00:00 |
|
Deepesh Garg
|
cc0f9d4ed5
|
Merge pull request #33235 from frappe/mergify/bp/version-14-hotfix/pr-33191
fix: key error while filtering on date range and reporting on foreign currency (backport #33191)
|
2022-12-06 17:36:18 +05:30 |
|
ruthra kumar
|
23a0a5337e
|
fix: key error on p/l and balance sheet reports on foreign currency
(cherry picked from commit a6794c3606)
|
2022-12-06 16:55:03 +05:30 |
|
ruthra kumar
|
e18d0eca3c
|
fix: replace sql code with fields list in get_cached_value
(cherry picked from commit 19db7e2989)
|
2022-12-06 16:55:00 +05:30 |
|
ruthra kumar
|
08bca7d252
|
fix: key error while filtering on date range and different currency
(cherry picked from commit 9b8d6fe411)
|
2022-12-06 10:14:01 +00:00 |
|
Deepesh Garg
|
ee74c555d5
|
Merge pull request #33230 from frappe/mergify/bp/version-14-hotfix/pr-33219
fix: Allow item rate updates for non-stock invoices (backport #33219)
|
2022-12-06 12:30:41 +05:30 |
|
Deepesh Garg
|
030765618b
|
fix: Allow item rate udpates for non-stock invoices
(cherry picked from commit ef9d126254)
|
2022-12-06 03:43:16 +00:00 |
|
rohitwaghchaure
|
cea7a32abc
|
Merge pull request #33225 from frappe/mergify/bp/version-14-hotfix/pr-33224
fix: non empty FG batch picked while completing work order (backport #33224)
|
2022-12-05 23:59:07 +05:30 |
|
Rohit Waghchaure
|
e5e6b5d81c
|
fix: non empty FG batch picked while completing work order
(cherry picked from commit 713330cbf6)
|
2022-12-05 15:00:15 +00:00 |
|
ruthra kumar
|
60f5611fb9
|
Merge pull request #33223 from frappe/mergify/bp/version-14-hotfix/pr-33222
fix: data import mandatory account_head, charge_type (backport #33222)
|
2022-12-05 17:56:27 +05:30 |
|
ruthra kumar
|
653cb9fc3b
|
fix: data import mandatory account_head, charge_type
(cherry picked from commit 3814db02eb)
|
2022-12-05 11:27:34 +00:00 |
|
Sagar Sharma
|
5bdec0b512
|
Merge pull request #33205 from frappe/mergify/bp/version-14-hotfix/pr-33199
refactor: remove `balance` from `Warehouse Tree` (backport #33199)
|
2022-12-02 18:27:07 +05:30 |
|
s-aga-r
|
bcbeaea05c
|
refactor: remove balance from Warehouse Tree
(cherry picked from commit 3ce8386ca3)
|
2022-12-02 08:55:05 +00:00 |
|
Deepesh Garg
|
251440dfec
|
Merge pull request #33203 from frappe/mergify/bp/version-14-hotfix/pr-33193
fix: clear repost logs using Log Settings (backport #33193)
|
2022-12-02 14:23:29 +05:30 |
|
Rohit Waghchaure
|
39680ed28b
|
fix: test case
(cherry picked from commit 2cce6f2a34)
|
2022-12-02 08:26:50 +00:00 |
|
Rohit Waghchaure
|
e039a14f6f
|
fix: default clear repost logs
(cherry picked from commit 5949a7ecff)
|
2022-12-02 08:26:49 +00:00 |
|
Deepesh Garg
|
a05bf0a7ca
|
Merge pull request #33201 from frappe/mergify/bp/version-14-hotfix/pr-33195
fix: type error on Sales Pipeline Analytics (backport #33195)
|
2022-12-02 13:13:44 +05:30 |
|
ruthra kumar
|
3af2b9b423
|
fix: type error on Sales Pipeline Analytics
(cherry picked from commit 4856e750f9)
|
2022-12-02 04:41:21 +00:00 |
|
Deepesh Garg
|
d7306d2ec4
|
Merge pull request #33197 from frappe/mergify/bp/version-14-hotfix/pr-33183
fix: Due date for month end payment term (backport #33183)
|
2022-12-02 10:09:55 +05:30 |
|
Sagar Sharma
|
ffa4deac26
|
Merge pull request #33196 from frappe/mergify/bp/version-14-hotfix/pr-33182
fix: Error on making stock entry from material request (backport #33182)
|
2022-12-01 21:37:39 +05:30 |
|
Sagar Sharma
|
a80f8ed2f8
|
Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-33182
|
2022-12-01 19:56:55 +05:30 |
|
Sagar Sharma
|
1214b93e07
|
Merge pull request #33198 from frappe/mergify/bp/version-14-hotfix/pr-33170
fix(UX): Alert on change of item rate in Stock Entry (backport #33170)
|
2022-12-01 19:56:16 +05:30 |
|
Deepesh Garg
|
b2da76f02c
|
fix(UX): Alert on change of item rate in Stock Entry
(cherry picked from commit 4bd9289d7d)
|
2022-12-01 12:47:39 +00:00 |
|
Deepesh Garg
|
9b40b7f240
|
fix: Due date for month end payment term
(cherry picked from commit bfb81ef56f)
|
2022-12-01 12:46:55 +00:00 |
|
Deepesh Garg
|
701ccc36c8
|
fix: Error on making stock entry from material request
(cherry picked from commit 64e5a79a91)
|
2022-12-01 12:46:12 +00:00 |
|
Deepesh Garg
|
dfd43141e3
|
Merge pull request #33188 from frappe/mergify/bp/version-14-hotfix/pr-33091
fix(pos): partial return amount update (backport #33091)
|
2022-12-01 16:17:29 +05:30 |
|
Deepesh Garg
|
6debf39ee8
|
Merge pull request #33189 from AnandBaburajan/asset_last_day_test_bug_14_htfx
fix: use is_last_day_of_the_month in test_scrap_asset (backport #33185)
|
2022-12-01 16:17:01 +05:30 |
|
anandbaburajan
|
fc175e2b1f
|
fix: use is_last_day_of_the_month in test_scrap_asset
|
2022-12-01 13:01:23 +05:30 |
|
Sabu Siyad
|
fae941c4e3
|
fix(lint): trailing whitespace
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
(cherry picked from commit c5edbe2e2f)
|
2022-12-01 06:12:26 +00:00 |
|
Sabu Siyad
|
91920f4d84
|
fix(pos): partial return amount update
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
(cherry picked from commit a378619c9a)
|
2022-12-01 06:12:25 +00:00 |
|
Sagar Sharma
|
6957e2a85c
|
Merge pull request #33175 from frappe/mergify/bp/version-14-hotfix/pr-33174
fix: add company filter in RFQ Items (backport #33174)
|
2022-11-30 12:25:57 +05:30 |
|
s-aga-r
|
7c1595e2c2
|
fix: add company filter in RFQ Items
(cherry picked from commit ca0485a503)
|
2022-11-30 05:07:06 +00:00 |
|
Deepesh Garg
|
6878536a57
|
Merge pull request #33168 from frappe/mergify/bp/version-14-hotfix/pr-33162
fix: Tax withholding net total for PI in reports (backport #33162)
|
2022-11-29 19:23:16 +05:30 |
|
Deepesh Garg
|
f87c3c6157
|
fix: Tax withholding net total for PI in reports
(cherry picked from commit 3eb1ed19a1)
|
2022-11-29 13:21:16 +00:00 |
|
Sagar Sharma
|
f2f06aaa56
|
Merge pull request #33159 from frappe/mergify/bp/version-14-hotfix/pr-33136
fix: reset `voucher_type` and `voucher_no` if `based_on` is set to `Transaction` (backport #33136)
|
2022-11-29 13:24:53 +05:30 |
|
s-aga-r
|
5728300f03
|
chore: make posting_date and posting_time read-only if based_on is set to Transaction
(cherry picked from commit 4e10352b48)
|
2022-11-29 06:44:35 +00:00 |
|
s-aga-r
|
e530f0b2fb
|
fix: reset voucher_type and voucher_no if based_on is set to Item and Warehouse
(cherry picked from commit eeec008547)
|
2022-11-29 06:44:35 +00:00 |
|
rohitwaghchaure
|
8ebf34629d
|
Merge pull request #33158 from frappe/mergify/bp/version-14-hotfix/pr-33013
fix: validate repost item valuation against accounts freeze date (backport #33013)
|
2022-11-29 12:06:29 +05:30 |
|
Sagar Sharma
|
72351e38f2
|
Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-33013
|
2022-11-29 11:16:53 +05:30 |
|
Deepesh Garg
|
6fa81089d6
|
Merge pull request #33152 from frappe/mergify/bp/version-14-hotfix/pr-33143
fix: Auto repeat date validations (backport #33143)
|
2022-11-29 11:07:46 +05:30 |
|
Deepesh Garg
|
fb6791abe3
|
Merge pull request #33153 from frappe/mergify/bp/version-14-hotfix/pr-33115
fix: remove product schema block from additional info section on item template (backport #33115)
|
2022-11-29 11:07:23 +05:30 |
|
Deepesh Garg
|
bf833c4f09
|
Merge pull request #33151 from frappe/mergify/bp/version-14-hotfix/pr-33138
fix(ux): Action buttons in Bank Reconciliation (backport #33138)
|
2022-11-29 11:06:48 +05:30 |
|
Deepesh Garg
|
5848147a92
|
Merge pull request #33155 from frappe/mergify/bp/version-14-hotfix/pr-33098
fix(pos): warehouse selection (backport #33098)
|
2022-11-29 11:06:21 +05:30 |
|
Deepesh Garg
|
150319d0cb
|
Merge pull request #33156 from frappe/mergify/bp/version-14-hotfix/pr-33116
fix: only show serial no batch selector only once (backport #33116)
|
2022-11-29 11:06:08 +05:30 |
|
Deepesh Garg
|
b9ff172e13
|
Merge pull request #33154 from frappe/mergify/bp/version-14-hotfix/pr-33112
fix(pos): filter on customer groups (backport #33112)
|
2022-11-29 11:05:54 +05:30 |
|
Dany Robert
|
5854f1791c
|
chore: pre-commit
(cherry picked from commit 88a0aa4077)
|
2022-11-29 05:11:39 +00:00 |
|
Dany Robert
|
c9c7222ded
|
fix: check for session user rather than owner
(cherry picked from commit b482e3876d)
|
2022-11-29 05:11:39 +00:00 |
|
Dany Robert
|
68d9161a66
|
chore: pre-commit
(cherry picked from commit be15419bd5)
|
2022-11-29 05:11:38 +00:00 |
|
Dany Robert
|
04f50ea76a
|
feat: validate repost item valuation against accounts freeze date
(cherry picked from commit 61f05132db)
|
2022-11-29 05:11:38 +00:00 |
|