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
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
Diptanil Saha
54e3a74936
fix: serial and batch no. buttons on pos ( #45048 )
...
(cherry picked from commit 31dd32dcdf
2025-01-07 12:36:46 +00:00
Diptanil Saha
296d5d2295
chore: removal of tally migration feature ( #45100 )
...
(cherry picked from commit 9f77793f16
2025-01-07 12:00:01 +00:00
Ejaaz Khan
f654c2d156
refactor: change sales invoice button position ( #45130 )
...
(cherry picked from commit a0f17f8e73
2025-01-07 11:49:24 +00:00
ruthra kumar
cac35246f1
Merge pull request #45123 from frappe/mergify/bp/version-15-hotfix/pr-45121
...
fix: discount resetting on date change (backport #45121 )
2025-01-07 11:32:09 +05:30
ruthra kumar
af53381163
fix: discount resetting on date change
...
revert #44989
(cherry picked from commit 886281f81a
2025-01-07 05:51:48 +00:00
ruthra kumar
1c06831b11
Merge pull request #45109 from frappe/mergify/bp/version-15-hotfix/pr-45107
...
fix: Returned Qty in Work Order Consumed Materials report (backport #45107 )
2025-01-07 10:12:43 +05:30
ruthra kumar
616a2b7675
Merge pull request #45120 from frappe/mergify/bp/version-15-hotfix/pr-45118
...
fix(Project): make status in confirmation dialog translatable (backport #45118 )
2025-01-07 10:11:56 +05:30
Raffael Meyer
0001d868c7
fix(Project): make status in confirmation dialog translatable ( #45118 )
...
(cherry picked from commit 9eede907f8
2025-01-06 22:13:47 +00:00
mergify[bot]
0abace7911
refactor(Project): extract custom button function (backport #45116 ) ( #45117 )
...
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com >
2025-01-06 23:04:30 +01:00
Rohit Waghchaure
f7b501b29b
fix: Returned Qty in Work Order Consumed Materials report
...
(cherry picked from commit 30d68a31e0
2025-01-06 10:37:32 +00:00
mergify[bot]
01254da4e0
fix: update customer contact details on pos (backport #45071 ) ( #45106 )
...
fix: update customer contact details on pos (#45071 )
* fix: update customer contact details on pos
* refactor: removed console log statement
(cherry picked from commit d79e561248diptanil@frappe.io >
2025-01-06 15:01:23 +05:30
rohitwaghchaure
dadc8266dc
Merge pull request #45098 from frappe/mergify/bp/version-15-hotfix/pr-45084
...
fix: Alternative Items button in Work Order (backport #45084 )
2025-01-06 14:48:02 +05:30
ruthra kumar
100b4e9274
Merge pull request #45103 from frappe/mergify/bp/version-15-hotfix/pr-45006
...
fix: pos search by term items price (backport #45006 )
2025-01-06 14:43:56 +05:30
diptanilsaha
59af144e29
fix: load search term price with customer default price list
...
(cherry picked from commit 2beb485d77
2025-01-06 08:39:58 +00:00
diptanilsaha
452dffab48
fix: load price list rate for pos search term
...
(cherry picked from commit 4b6cae156e
2025-01-06 08:39:57 +00:00
ruthra kumar
eff12cbfbe
Merge pull request #45101 from frappe/mergify/bp/version-15-hotfix/pr-45099
...
fix: show new button in coa if create access (backport #45099 )
2025-01-06 13:56:43 +05:30
sokumon
89155f529e
fix: show new button in coa if create access
...
(cherry picked from commit 3125bc8a16
2025-01-06 08:20:01 +00:00
Mihir Kandoi
642b89782d
fix: Alternative Item button dissapearing on Save event
...
(cherry picked from commit b8838bd9b9
2025-01-06 06:52:16 +00:00
Mihir Kandoi
3194807a41
fix: Alternative Items button in Work Order
...
(cherry picked from commit e28382afc1
2025-01-06 06:52:16 +00:00
ruthra kumar
2333d33362
Merge pull request #45095 from frappe/mergify/bp/version-15-hotfix/pr-44943
...
fix: Bank Reconciliation Statement Report Company Filter (backport #44943 )
2025-01-06 10:51:48 +05:30
creative-paramu
622bfa6633
fix: Bank Reconciliation Statement Report Company Filter
...
(cherry picked from commit 50c92034ba
2025-01-06 10:30:24 +05:30
ruthra kumar
e22771c729
Merge pull request #45080 from frappe/mergify/bp/version-15-hotfix/pr-44983
...
fix: add monthly distributation and write query in qb (backport #44983 )
2025-01-06 10:28:18 +05:30
