mergify[bot] f469ec87d9

fix: broken patches (backport #29067) (#29406) ...

* chore: patch fixes

(cherry picked from commit 8b5b146f6d2720587a16f78a8d47840be8dca2b7)

# Conflicts:
#	erpnext/patches/v13_0/make_homepage_products_website_items.py

* fix: remove desktop icons while deleting sales reports

(cherry picked from commit 5f72026cb932d01fc827c382747e996a94b441fd)

* refactor: dont ignore dangerous exceptions in patches

(cherry picked from commit 0aa1ea8aeb7757592616bd491de98c69fef08854)

* fix: make patch kinda idempotent

with previous query rerunning would've caused all values to become 0.

* chore: conflicts

* fix: check type before patching

Co-authored-by: Saurabh <saurabh6790@gmail.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>

2022-01-25 11:14:08 +05:30

..

accounts

Merge pull request #29360 from ruthra-kumar/test_case_deferred_report

2022-01-24 12:41:37 +05:30

assets

Merge pull request #29334 from nextchamp-saqib/grouped-asset-purchase

2022-01-21 15:33:13 +05:30

buying

fix: fixed card for buying workspace

2022-01-13 20:19:49 +05:30

change_log

…

commands

fix!: drop old broken demo files (#29339)

2022-01-18 17:43:27 +05:30

communication

chore: remove utf-8 compat code

2021-11-05 11:16:29 +05:30

config

chore: remove all six compat code

2021-11-05 11:16:29 +05:30

controllers

Merge pull request #29334 from nextchamp-saqib/grouped-asset-purchase

2022-01-21 15:33:13 +05:30

crm

fix: updated standard workspace json files

2022-01-13 19:24:11 +05:30

domains

refactor: Removed hospitality domain from ERPNext (#29167)

2022-01-20 11:57:22 +05:30

education

fix: updated standard workspace json files

2022-01-13 19:24:11 +05:30

erpnext_integrations

fix: updated standard workspace json files

2022-01-13 19:24:11 +05:30

hr

fix: honour 'include holidays' setting while marking attendance for leave application (#29425)

2022-01-24 19:05:24 +05:30

loan_management

fix: updated standard workspace json files

2022-01-13 19:24:11 +05:30

maintenance

fix: update status on visit cancel (#29389)

2022-01-21 14:48:33 +05:30

manufacturing

fix: fetch "transfer material against" from BOM (#29435)

2022-01-24 21:45:51 +05:30

non_profit

fix: updated standard workspace json files

2022-01-13 19:24:11 +05:30

patches

fix: broken patches (backport #29067) (#29406)

2022-01-25 11:14:08 +05:30

payroll

fix: honour 'include holidays' setting while marking attendance for leave application (#29425)

2022-01-24 19:05:24 +05:30

portal

chore: remove all six compat code

2021-11-05 11:16:29 +05:30

projects

fix(Timesheets): calculate to time (#28589)

2022-01-21 13:05:47 +05:30

public

Merge pull request #28994 from nextchamp-saqib/zero-qty-debit-note

2022-01-07 18:35:24 +05:30

quality_management

fix: updated standard workspace json files

2022-01-13 19:24:11 +05:30

regional

Merge pull request #29175 from rtdany10/patch-14

2022-01-15 20:52:57 +05:30

selling

Merge pull request #29353 from anupamvs/crm-contact-duplication-develop

2022-01-24 10:16:49 +05:30

setup

Merge pull request #29278 from shariquerik/update-workspace-json

2022-01-17 13:25:16 +05:30

shopping_cart

fix: specify fields to be set in Lead (#28288)

2021-11-09 15:49:32 +05:30

startup

feat: CRM Settings (#27788)

2021-12-06 13:52:00 +05:30

stock

Merge pull request #29419 from rohitwaghchaure/fix-incorrect-rm-qty-in-stock-entry

2022-01-24 12:13:54 +05:30

support

fix(minor): allow SLA update without permission check

2022-01-18 18:07:11 +05:30

telephony

chore: remove utf-8 compat code

2021-11-05 11:16:29 +05:30

templates

chore: remove all six compat code

2021-11-05 11:16:29 +05:30

tests

test: clear singles cache for changed settings (#29430)

2022-01-24 18:44:08 +05:30

translations

revert: german translation of "Minute"

2021-12-31 17:43:10 +01:00

utilities

fix: updated standard workspace json files

2022-01-13 19:24:11 +05:30

www

Delete __init__.py

2021-11-27 23:16:34 +00:00

__init__.py

test: remove unnecessary creation of companies #28965

2021-12-20 22:00:31 +05:30

.stylelintrc

…

exceptions.py

chore: remove all six compat code

2021-11-05 11:16:29 +05:30

hooks.py

refactor: Removed hospitality domain from ERPNext (#29167)

2022-01-20 11:57:22 +05:30

modules.txt

refactor: Removed hospitality domain from ERPNext (#29167)

2022-01-20 11:57:22 +05:30

patches.txt

Merge pull request #29334 from nextchamp-saqib/grouped-asset-purchase

2022-01-21 15:33:13 +05:30