rohitwaghchaure
2676e0ea1f
chore: fix conflicts
2025-01-14 12:49:17 +05:30
Rohit Waghchaure
2f2554e9e5
fix: auto fetch batch and serial no for draft stock transactions
...
(cherry picked from commit 88ab9be79c
2025-01-14 07:06:32 +00:00
ruthra kumar
f954b241a8
Merge pull request #45234 from frappe/mergify/bp/version-15-hotfix/pr-45209
...
fix: batch number search on pos (backport #45209 )
2025-01-14 11:42:04 +05:30
ruthra kumar
13c3483669
Merge pull request #45256 from frappe/mergify/bp/version-15-hotfix/pr-45078
...
fix: don't create invoice if `current_invoice_start ` is in future (backport #45078 )
2025-01-14 10:43:19 +05:30
ruthra kumar
74a256ad57
Merge pull request #45255 from frappe/mergify/bp/version-15-hotfix/pr-45074
...
fix: set billing and shipping address on change of company (backport #45074 )
2025-01-14 10:22:42 +05:30
ruthra kumar
f897999d79
Merge pull request #45254 from frappe/mergify/bp/version-15-hotfix/pr-45001
...
fix: deduct tds on excess amount if checked (backport #45001 )
2025-01-14 10:21:57 +05:30
Sanket322
abfcfdfe7e
fix: minor update for readability
...
(cherry picked from commit 61d4593236
2025-01-14 04:43:28 +00:00
Sanket322
3f6d7741d9
fix: don't create invoice if invoice start date is in future
...
(cherry picked from commit 058fdca981
2025-01-14 04:43:28 +00:00
ruthra kumar
9757c92635
Merge pull request #45252 from frappe/mergify/bp/version-15-hotfix/pr-44798
...
fix: update discounting on mixed conditions (backport #44798 )
2025-01-14 10:09:52 +05:30
Sanket322
80e6112549
fix: pass right existing address
...
(cherry picked from commit ce99764772
2025-01-14 04:35:20 +00:00
Sanket322
42eb88f5f6
fix: set billing and shipping address on change of company
...
(cherry picked from commit f46f1bead4
2025-01-14 04:35:20 +00:00
ljain112
07c3605905
fix: deduct tds on excess amount if checked
...
(cherry picked from commit a203e3ffaf
2025-01-14 04:33:18 +00:00
DHINESH00
1d5a73a325
fix: Semgrep rules
...
(cherry picked from commit 547c8004eb
2025-01-14 04:29:07 +00:00
DHINESH00
38cb5a98bf
fix: update discounting on mixed conditions
...
(cherry picked from commit d541259da9
2025-01-14 04:29:06 +00:00
rohitwaghchaure
136333377a
Merge pull request #45217 from frappe/mergify/bp/version-15-hotfix/pr-45214
...
fix: delivery_document_no column issue (backport #45214 )
2025-01-13 12:25:50 +05:30
rohitwaghchaure
4ee6a4eab6
Merge pull request #45218 from frappe/mergify/bp/version-15-hotfix/pr-45207
...
fix: incorrect valuation rate for PI based revaluation (backport #45207 )
2025-01-13 12:25:44 +05:30
mergify[bot]
f7448c6f79
fix(Timesheet): ignore permissions when updating Task and Project (backport #45168 ) ( #45170 )
...
* fix(Timesheet): ignore permissions when updating Task and Project (#45168 )
(cherry picked from commit 9e760e54a514891507+barredterra@users.noreply.github.com >
2025-01-13 12:08:17 +05:30
Diptanil Saha
fe5c458c45
fix: batch number search on pos ( #45209 )
...
* fix: price of items with batch number not having seperate item price on pos search bar
* fix: introduced batch number based sorting
(cherry picked from commit e529f82392
2025-01-13 06:37:26 +00:00
mergify[bot]
47c6e5a931
fix: typo in manufacturing settings (backport #45190 ) ( #45193 )
...
fix: typo in manufacturing settings
(cherry picked from commit a9b761f862diptanil@frappe.io >
2025-01-13 11:59:27 +05:30
mergify[bot]
0665bc4a28
chore: removal of decapitalization feature (backport #45162 ) ( #45173 )
...
* chore: removal of decapitalization feature (#45162 )
* chore: removal of decapitalization feature
* fix: rearrangement of asset capitalization doctype fields
(cherry picked from commit 7ea73d8265142375893+khushi8112@users.noreply.github.com >
2025-01-13 11:58:53 +05:30
Rohit Waghchaure
7d66e4efb0
fix: test case
2025-01-11 11:06:13 +05:30
rohitwaghchaure
bb170c024f
chore: fix conflicts
2025-01-11 11:00:20 +05:30
rohitwaghchaure
9426a32184
chore: fix conflicts
2025-01-11 10:59:26 +05:30
Rohit Waghchaure
f7e3854641
fix: incorrect valuation rate for PI based revaluation
...
(cherry picked from commit 14ce2337df
2025-01-11 04:39:31 +00:00
Rohit Waghchaure
0df18080c7
fix: delivery_document_no column issue
...
(cherry picked from commit 61efb2bb39
2025-01-11 04:38:31 +00:00
rohitwaghchaure
f5c9ab054f
Merge pull request #45197 from FathihMohammed/qty_precision_fix
...
fix: precision loss causing process loss variance
2025-01-10 11:18:21 +05:30
ruthra kumar
698b6e6caf
Merge pull request #45140 from frappe/mergify/bp/version-15-hotfix/pr-45100
...
chore: removal of tally migration feature (backport #45100 )
2025-01-09 19:56:16 +05:30
FATHIH MOHAMMED
d84601b2a3
fix: precision loss causing process loss variance
2025-01-09 13:27:27 +00:00
rohitwaghchaure
ef3e442684
Merge pull request #45186 from frappe/mergify/bp/version-15-hotfix/pr-45180
...
fix: do not add ordered items from Quotation to new Sales Order (backport #45180 )
2025-01-09 16:26:56 +05:30
rohitwaghchaure
01c7956329
Merge pull request #45184 from frappe/mergify/bp/version-15-hotfix/pr-45183
...
fix: not able to see create Quality Inspection button (backport #45183 )
2025-01-09 14:50:24 +05:30
Rohit Waghchaure
f414fa4981
fix: do not add ordered items from Quotation to new Sales Order
...
(cherry picked from commit 2e930eb97b
2025-01-09 09:09:55 +00:00
Rohit Waghchaure
a79cae1fef
fix: not able to see create Quality Inspection button
...
(cherry picked from commit b291835ccd
2025-01-09 09:07:50 +00:00
rohitwaghchaure
5e32796987
Merge pull request #45179 from frappe/mergify/bp/version-15-hotfix/pr-45177
...
fix: timeout error for work order (backport #45177 )
2025-01-09 14:06:58 +05:30
Rohit Waghchaure
122b966a7b
fix: timeout error for work order
...
(cherry picked from commit b4ceda6f2c
2025-01-09 08:18:25 +00:00
Khushi Rawat
9e60d1ad79
Merge pull request #45149 from frappe/mergify/bp/version-15-hotfix/pr-45066
...
feat: work in progress status for asset (backport #45066 )
2025-01-08 11:45:46 +05:30
Khushi Rawat
4227d76f08
fix: removed unmerged patches
2025-01-08 11:23:38 +05:30
Khushi Rawat
e9be8583b0
fix: resolved conflicts
2025-01-08 11:08:27 +05:30
Khushi Rawat
7318748a4c
fix: resolved conflicts
2025-01-08 11:07:30 +05:30
ruthra kumar
19dc9975dd
Merge pull request #45157 from frappe/mergify/bp/version-15-hotfix/pr-45154
...
fix: possible deadlock while using auto reconciliation (backport #45154 )
2025-01-08 10:05:34 +05:30
ruthra kumar
36dbb867ed
chore: resolve conflict
2025-01-08 09:19:53 +05:30
ruthra kumar
e578ab2c86
refactor: remove tally migration doctype
2025-01-08 09:16:53 +05:30
ruthra kumar
c45f22c776
Merge pull request #45139 from frappe/mergify/bp/version-15-hotfix/pr-45130
...
refactor: change sales invoice button position (backport #45130 )
2025-01-08 09:01:59 +05:30
ruthra kumar
acd66fa00c
chore: remove 'Experimental' tag
...
(cherry picked from commit 4620025dcd
2025-01-08 03:31:35 +00:00
ruthra kumar
04384c47f8
Merge pull request #45153 from frappe/mergify/bp/version-15-hotfix/pr-45112
...
fix: Missing company filter breaks `get_account_balance` in Bank Reco (backport #45112 )
2025-01-08 09:00:01 +05:30
marination
754845a935
fix: Override pre-commit behaviour due to conflicts with CI
...
(cherry picked from commit d7bf73cffa
2025-01-08 02:47:22 +00:00
marination
931b5166a8
fix: Missing company filter breaks get_account_balance in Bank Reco
...
(cherry picked from commit 8de0fe78ea
2025-01-08 02:47:21 +00:00
Khushi Rawat
1ea36bba88
feat: work in progress status for asset ( #45066 )
...
* feat: work in progress status for asset
* fix: test case correction
* fix(patch): added patch to update status of assets
* fix: updated tests
(cherry picked from commit 6850019649
2025-01-07 18:14:22 +00:00
rohitwaghchaure
807d591e7e
Merge pull request #45145 from frappe/mergify/bp/version-15-hotfix/pr-45144
...
fix: issue in returning components against the SCO (backport #45144 )
2025-01-07 23:41:03 +05:30
Rohit Waghchaure
87405f0753
fix: issue in returning components against the SCO
...
(cherry picked from commit 729ce1dc50
2025-01-07 13:02:09 +00:00
rohitwaghchaure
e36bd5fe26
Merge pull request #45143 from frappe/mergify/bp/version-15-hotfix/pr-45048
...
fix: serial and batch no. buttons on pos (backport #45048 )
2025-01-07 18:32:05 +05:30
