ruthra kumar 99d5b6dc71 chore: resolve conflicts

2024-07-24 13:04:57 +05:30

..

accounts

chore: resolve conflicts

2024-07-24 13:04:57 +05:30

assets

fix: fetch expence account from asset category

2024-07-04 01:45:01 +05:30

bulk_transaction

style: format js files

2024-03-11 11:03:58 +05:30

buying

fix: remove proprietorship and update it with individual (backport #42307)

2024-07-17 14:03:52 +05:30

change_log

chore: verison bump and change log

2022-08-01 22:29:34 +05:30

commands

style: format code with black

2022-03-28 18:52:46 +05:30

communication

chore: remove utf-8 compat code

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

config

chore: clean up hooks

2022-04-28 12:02:54 +05:30

controllers

refactor: repost without checking on flag

2024-07-24 07:29:09 +00:00

crm

Merge branch 'version-14-hotfix' of https://github.com/frappe/erpnext into default_dates_in_reports

2024-04-24 17:20:55 +05:30

domains

chore: remove files related to LMS

2022-04-28 10:41:30 +05:30

e_commerce

fix(treewide): manual ruff fixes

2024-04-10 17:13:31 +05:30

erpnext_integrations

fix(treewide): manual ruff fixes

2024-04-10 17:13:31 +05:30

loan_management

refactor(treewide): formatting and ruff fixes, + manually enabled F401

2024-04-10 17:13:31 +05:30

maintenance

refactor(treewide): formatting and ruff fixes, + manually enabled F401

2024-04-10 17:13:31 +05:30

manufacturing

Merge pull request #40543 from frappe/mergify/bp/version-14-hotfix/pr-40542

2024-06-18 12:51:55 +02:00

patches

fix: remove proprietorship and update it with individual (backport #42307)

2024-07-17 14:03:52 +05:30

portal

refactor(treewide): formatting and ruff fixes, + manually enabled F401

2024-04-10 17:13:31 +05:30

projects

fix: cost center filter according to the company in project

2024-05-27 04:41:12 +00:00

public

fix: multiple free items on same Item Group

2024-07-03 12:28:35 +00:00

quality_management

refactor(treewide): formatting and ruff fixes, + manually enabled F401

2024-04-10 17:13:31 +05:30

regional

refactor: remove obsolete function call (#42162)

2024-07-03 10:22:23 +00:00

selling

fix: remove proprietorship and update it with individual (backport #42307)

2024-07-17 14:03:52 +05:30

setup

fix(Holiday List): sort holidays on save to avoid disorienting the user (backport #42236) (#42251)

2024-07-09 18:44:08 +05:30

shopping_cart

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

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

startup

refactor(treewide): formatting and ruff fixes, + manually enabled F401

2024-04-10 17:13:31 +05:30

stock

chore: resolve conflict

2024-07-10 15:30:24 +05:30

subcontracting

fix: stock qty validation in SCR (backport #42124) (#42224)

2024-07-08 17:06:23 +05:30

support

refactor(treewide): formatting and ruff fixes, + manually enabled F401

2024-04-10 17:13:31 +05:30

telephony

refactor(treewide): formatting and ruff fixes, + manually enabled F401

2024-04-10 17:13:31 +05:30

templates

Merge pull request #40543 from frappe/mergify/bp/version-14-hotfix/pr-40542

2024-06-18 12:51:55 +02:00

tests

refactor(treewide): formatting and ruff fixes, + manually enabled F401

2024-04-10 17:13:31 +05:30

translations

fix: add missing german translations

2024-07-08 17:51:41 +00:00

utilities

fix: validate uom is integer for PR item (backport #41074) (#41076)

2024-04-18 07:53:33 +05:30

www

refactor(treewide): formatting and ruff fixes, + manually enabled F401

2024-04-10 17:13:31 +05:30

__init__.py

Merge branch 'version-14' into version-14-hotfix

2024-04-16 17:59:35 +05:30

.stylelintrc

…

exceptions.py

style: format code with black

2022-03-28 18:52:46 +05:30

hooks.py

refactor(treewide): formatting and ruff fixes, + manually enabled F401

2024-04-10 17:13:31 +05:30

modules.txt

Merge branch 'develop' into hr-separation

2022-07-12 19:27:19 +05:30

patches.txt

chore: resolve conflict

2024-07-18 14:41:09 +05:30