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
|
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 |
|
rohitwaghchaure
|
4928058ed8
|
Merge pull request #33149 from frappe/mergify/bp/version-14-hotfix/pr-33144
fix: incorrect balance qty (backport #33144)
|
2022-11-29 10:41:36 +05:30 |
|
Shariq Ansari
|
8d0f715087
|
fix: only show serial no batch selector only once
(cherry picked from commit 0f87d329d6)
|
2022-11-29 04:51:19 +00:00 |
|
Sabu Siyad
|
c379baf7a2
|
feat(pos): invoice: fitler warehouse by company
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
(cherry picked from commit 4ad0e2ed7e)
|
2022-11-29 04:46:19 +00:00 |
|
Sabu Siyad
|
c03ec80d1a
|
fix(pos): warehouse should be in company
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
(cherry picked from commit 95a620a30d)
|
2022-11-29 04:46:19 +00:00 |
|
Sabu Siyad
|
c1ae5b0af5
|
fix(pos): filter on customer groups
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
(cherry picked from commit cc63415887)
|
2022-11-29 04:26:25 +00:00 |
|
ruthra kumar
|
cdd13cd95f
|
fix: remove duplicate schema
(cherry picked from commit 2c18a95115)
|
2022-11-29 04:06:25 +00:00 |
|
Deepesh Garg
|
5abcb478d0
|
chore: Update condition
(cherry picked from commit 6a47fb6c9e)
|
2022-11-29 03:59:09 +00:00 |
|
Deepesh Garg
|
2aada1a0d9
|
fix: Auto repeat date validations
(cherry picked from commit fa15221455)
|
2022-11-29 03:59:09 +00:00 |
|
Deepesh Garg
|
e093c32d06
|
Merge pull request #33128 from frappe/mergify/bp/version-14-hotfix/pr-33022
feat: Incoterms in buying and selling (backport #33022)
|
2022-11-29 09:28:59 +05:30 |
|
Deepesh Garg
|
93b8cc3042
|
fix(ux): Action buttons in Bank Reconciliation
(cherry picked from commit 6ebe8ad60d)
|
2022-11-29 03:54:02 +00:00 |
|
Rohit Waghchaure
|
93ec57dd44
|
test: test case for serialized batched item
(cherry picked from commit b606a9684b)
|
2022-11-29 03:18:53 +00:00 |
|
Rohit Waghchaure
|
f92b5011da
|
fix: incorrect balance qty
(cherry picked from commit b2105a8be7)
|
2022-11-29 03:18:53 +00:00 |
|
Raffael Meyer
|
7477bb96c8
|
chore: resolve merge conflict
|
2022-11-28 18:51:40 +01:00 |
|
Deepesh Garg
|
6c3fbf03f9
|
Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-33022
|
2022-11-28 23:06:23 +05:30 |
|
Deepesh Garg
|
0d8112af76
|
Merge pull request #33133 from frappe/mergify/bp/version-14-hotfix/pr-33129
chore: Supplier invoice no field description (backport #33129)
|
2022-11-28 22:48:45 +05:30 |
|
Deepesh Garg
|
088c168f96
|
Merge pull request #33142 from frappe/mergify/bp/version-14-hotfix/pr-33107
feat: german tax templates (backport #33107)
|
2022-11-28 22:48:20 +05:30 |
|
Sagar Sharma
|
ae26e550d0
|
Merge pull request #33140 from frappe/mergify/bp/version-14-hotfix/pr-33139
fix: reposting error `AttributeError: 'datetime.timedelta' object has no attribute 'replace'` (backport #33139)
|
2022-11-28 22:06:21 +05:30 |
|
barredterra
|
5652af04ba
|
feat: german tax templates
(cherry picked from commit 7fd2639e68)
|
2022-11-28 16:25:02 +00:00 |
|
s-aga-r
|
4b0c9b6115
|
fix: reposting error AttributeError: 'datetime.timedelta' object has no attribute 'replace'
(cherry picked from commit eeda264eb6)
|
2022-11-28 16:01:39 +00:00 |
|
s-aga-r
|
65ac84e020
|
fix: validation msg in stock entry
(cherry picked from commit ba77da0874)
|
2022-11-28 16:01:39 +00:00 |
|
rohitwaghchaure
|
648a017eda
|
Merge pull request #33137 from frappe/mergify/bp/version-14-hotfix/pr-33135
feat: make Material Request for sub-assembly items (backport #33135)
|
2022-11-28 18:32:54 +05:30 |
|
Rohit Waghchaure
|
5fc4dfaad6
|
feat: make Material Request for sub-assembly items
(cherry picked from commit e02f35c8ff)
|
2022-11-28 11:24:31 +00:00 |
|