mergify[bot]
15c1af3d8a
fix: consider 0 if rate/qty are null (backport #35338 ) ( #35340 )
...
fix: consider 0 if rate/qty are null (#35338 )
[skip ci]
(cherry picked from commit e5c86bc2e8 )
Co-authored-by: Ankush Menat <ankush@frappe.io >
2023-05-17 16:17:21 +05:30
mergify[bot]
de5fabc67a
chore: Update user manual link ( #34478 )
...
* chore: Update user manual link (#34478 )
(cherry picked from commit be723bb9d4 )
# Conflicts:
# erpnext/patches.txt
* chore: resolve conflicts
---------
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com >
2023-03-19 18:06:45 +05:30
mergify[bot]
53ab4d92e8
fix: forced delete linked desktop_icons (backport #34107 ) ( #34130 )
...
fix: forced delete linked desktop_icons (#34107 )
* fix: forced delete linked desktop_icons
* fix: black
(cherry picked from commit 5e48e61c66 )
Co-authored-by: Shadrak Gurupnor <30501401+shadrak98@users.noreply.github.com >
2023-02-19 12:08:12 +05:30
Rohit Waghchaure
1928195167
fix: patch item_reposting_for_incorrect_sl_and_gl
...
(cherry picked from commit dbde3a3421 )
2023-01-17 06:49:25 +00:00
Ankush Menat
f5015750e4
perf: Drop name part from posting sort index ( #33551 )
...
(cherry picked from commit 8a56df695d )
# Conflicts:
# erpnext/patches.txt
2023-01-10 04:25:07 +00:00
barredterra
5b5a85ee3b
fix: reload currency exchange settings
...
(cherry picked from commit 06e094b5fc )
2022-12-06 12:09:03 +00:00
Ritwik Puri
9a737afb77
chore(patch): remove reload_doc from post model sync update_exchange_rate_settings patch ( #32994 )
...
[skip ci]
(cherry picked from commit b03b568e6c )
2022-11-17 06:30:33 +00:00
Deepesh Garg
25e87641b6
chore: Add patch to update repayment schedule type in loan documents
...
(cherry picked from commit 679b5ed551 )
# Conflicts:
# erpnext/patches.txt
2022-10-23 14:08:34 +00:00
Deepesh Garg
097398914e
fix: Disbursement Account in patch to update old loans
...
(cherry picked from commit be623ce8e8 )
2022-09-28 14:07:00 +00:00
mergify[bot]
0e9a1fb40e
fix: force delete old report docs (backport #32026 ) ( #32027 )
...
fix: force delete old report docs (#32026 )
(cherry picked from commit ffa3071d36 )
Co-authored-by: Ankush Menat <ankush@frappe.io >
2022-08-30 15:46:08 +05:30
mergify[bot]
1b5a1cbaad
fix(patch): update sla doctype directly (backport #32014 ) ( #32015 )
...
fix(patch): update sla doctype directly (#32014 )
fix: update sla doctype directly
(cherry picked from commit 2d41704424 )
Co-authored-by: Ankush Menat <ankush@frappe.io >
2022-08-29 22:17:39 +05:30
ruthra kumar
04bdff736b
chore: patch for creating existing dimensions in asset repair
...
(cherry picked from commit 80f508c4b1 )
2022-08-08 11:10:25 +00:00
Marica
d2d651a0c3
Merge branch 'develop' into make-image-field-obsolete-in-web-item
2022-07-25 12:43:08 +05:30
Sagar Vora
bf2833b8ee
fix: ensure defaults removed in bad frappe patch get set again ( #31659 )
2022-07-21 13:32:03 +05:30
Deepesh Garg
6d61525ae4
Merge pull request #31648 from deepeshgarg007/dimension-patch-fix
...
fix: Patch to make accounting dimension in orders
2022-07-20 19:02:00 +05:30
Deepesh Garg
d46e406db7
fix: Patch to make accounting dimension in orders
2022-07-20 18:59:36 +05:30
Rucha Mahabal
f222284c33
Merge branch 'develop' into hr-separation
2022-07-20 15:47:40 +05:30
Nabin Hait
6c29146c91
fix: Removed 'Allow Monthly Depreciation' checkbox
2022-07-20 14:27:06 +05:30
Rucha Mahabal
8ce526115d
patch: Add HR & Payroll deprecation warning
2022-07-19 13:19:34 +05:30
Rucha Mahabal
2ae48fbdd4
Merge branch 'develop' into hr-separation
2022-07-18 10:58:22 +05:30
Sagar Vora
70c4117c22
fix: unlink custom fields in patch
2022-07-14 15:02:37 +05:30
Rucha Mahabal
d8aa1c59f1
Merge branch 'develop' into hr-separation
2022-07-12 19:27:19 +05:30
Marica
681b334236
Merge branch 'develop' into make-image-field-obsolete-in-web-item
2022-07-11 11:22:51 +05:30
Rucha Mahabal
2248276fe9
chore: Remove gratuity rule patch
2022-07-07 13:48:59 +05:30
Rucha Mahabal
ef02e58859
Merge branch 'develop' into hr-separation
2022-07-07 13:46:54 +05:30
Sagar Sharma
f9885746a8
Merge branch 'develop' into subcontracting
2022-07-07 09:56:23 +05:30
Marica
b58d7d1c89
Merge branch 'develop' into make-image-field-obsolete-in-web-item
2022-07-06 14:43:23 +05:30
Rucha Mahabal
1497e26f82
fix: patches
2022-06-29 18:38:39 +05:30
Rucha Mahabal
6a65c8aff4
Merge branch 'develop' into hr-separation
2022-06-28 11:51:59 +05:30
Rucha Mahabal
930e557fc6
fix: remove HR/Payroll patches
2022-06-27 20:25:16 +05:30
marination
9541354ec7
chore: Make image field obsolete in Website Item (redundant)
...
- Delete Image field and set `website_image` as form's image field for uploads
- Remove instances of `image` field access via Website Item
- Item -> Web Item via Desk: Map Item's `image` to Web Item's `website_image`
- Item -> Web Item via patch: `website_image` will be mapped with thumbnail
- Remove magic that auto-sets `website_image` from `image` in Website Item
2022-06-27 13:00:00 +05:30
Sagar Vora
85c4c342d8
fix: improve patches
2022-06-26 18:30:54 +05:30
Smit Vora
8fb0997cf1
patch: remove related docs and warn
2022-06-24 21:59:28 +05:30
Sagar Vora
2e6919b7be
fix: remove more India patches
2022-06-24 14:14:12 +05:30
s-aga-r
f6ef3068d7
Merge branch 'develop' into subcontracting
2022-06-20 23:10:31 +05:30
s-aga-r
6d89b2fa28
refactor: backport old subcontracting code
2022-06-20 23:10:02 +05:30
Sagar Vora
ec9861266e
Merge remote-tracking branch 'upstream/develop' into remove-india
2022-06-19 22:57:22 +05:30
Ankush Menat
6f2086d770
test: verify that all patches exist in patches.txt ( #31371 )
...
* chore: delete orphaned patches
* test: orphan/missing entries in patches.txt
[skip ci]
2022-06-16 22:15:06 +05:30
Sagar Sharma
f7a52f76d4
Merge branch 'develop' into subcontracting
2022-06-08 04:27:24 -07:00
Ankush Menat
ee5bc58e9b
fix(job card): only hold during draft state ( #31243 )
2022-06-06 16:27:25 +05:30
s-aga-r
992ba974e2
Merge branch 'develop' into subcontracting
2022-06-03 13:25:49 +05:30
Rucha Mahabal
956a803be7
Merge branch 'develop' into fix-salary-slip-bg-job
2022-06-02 17:30:34 +05:30
Rucha Mahabal
d4b9cc0242
fix: remove leave policy assignment creation patch ( #31097 )
2022-06-01 12:18:14 +05:30
Rucha Mahabal
1c91793634
Merge branch 'develop' into fix-salary-slip-bg-job
2022-06-01 12:15:42 +05:30
Ankush Menat
a1b7a7983a
refactor!: drop naming series tool ( #31183 )
2022-05-31 15:35:40 +05:30
Sagar Sharma
4ff734c25a
Merge branch 'develop' into subcontracting
2022-05-25 12:32:33 +05:30
Rucha Mahabal
273b21c0cb
chore: move patch for updating Employee Advance status to v13 ( #31118 )
2022-05-25 11:34:25 +05:30
Sagar Sharma
213113bc00
Merge branch 'develop' into subcontracting
2022-05-20 12:13:13 +05:30
Sagar Sharma
323bdf85ce
feat: SL and GL reposting
2022-05-20 10:45:34 +05:30
Rucha Mahabal
7d4872aedd
patch: set payroll entry status
2022-05-19 20:35:56 +05:30