marination 9eeddc28b0 fix: Merge conflict inconsistency due to https://github.com/frappe/erpnext/pull/27931

2022-02-01 12:15:48 +05:30

..

accounts

Merge branch 'develop' into e-commerce-refactor-develop

2022-02-01 00:56:11 +05:30

assets

fix: fetch image form item (#29523)

2022-01-31 10:56:00 +05:30

buying

Merge branch 'develop' into e-commerce-refactor-develop

2022-01-31 17:14:36 +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 branch 'develop' into e-commerce-refactor-develop

2022-01-31 17:14:36 +05:30

crm

fix: multiple CRM fixes (#29507)

2022-01-29 22:32:03 +05:30

domains

refactor: Removed hospitality domain from ERPNext (#29167)

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

e_commerce

fix: Failing test, sider and linter

2022-02-01 12:08:33 +05:30

education

fix: updated standard workspace json files

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

erpnext_integrations

Merge branch 'develop' into e-commerce-refactor-develop

2022-01-31 17:14:36 +05:30

hr

test: get interview details for applicant dashboard

2022-01-29 21:15:49 +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(ux): sort multi-production item plans correctly

2022-01-30 22:58:30 +05:30

non_profit

fix: updated standard workspace json files

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

patches

fix: Faulty 'continue' not setting value in db

2022-02-01 11:03:12 +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: Fix imports and formatting (linter) & Sider (unused import)

2022-02-01 00:54:54 +05:30

projects

fix: Employee Onboarding and Separation UX (#29504)

2022-01-29 15:27:36 +05:30

public

fix(ux): tripple digit cart qty

2022-02-01 11:07:33 +05:30

quality_management

fix: updated standard workspace json files

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

regional

Merge pull request #29480 from nextchamp-saqib/revert-drop-einvoicing

2022-01-31 11:35:48 +05:30

selling

Merge branch 'develop' into e-commerce-refactor-develop

2022-01-31 17:14:36 +05:30

setup

fix: missing validate_item_group_defaults function

2022-01-31 17:15:17 +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

fix: Failing test, sider and linter

2022-02-01 12:08:33 +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

fix: Merge conflict inconsistency due to https://github.com/frappe/erpnext/pull/27931

2022-02-01 12:15:48 +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: fetch correct selling price.

2022-02-01 10:59:57 +05:30

www

chore: Fix imports and formatting (linter) & Sider (unused import)

2022-02-01 00:54:54 +05:30

__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

fix: Merge conflicts, Linter and Server Test

2022-02-01 10:51:50 +05:30

modules.txt

Merge branch 'develop' into e-commerce-refactor-develop

2022-01-31 17:14:36 +05:30

patches.txt

fix: Convert Item links to Website Item links in Item Card Group template data

2022-02-01 11:02:48 +05:30