ruthra kumar b96b3b51b6 chore: resolve conflicts

2024-07-15 15:22:06 +05:30

..

accounts

chore: resolve conflicts

2024-07-15 15:22:06 +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: dynamic_link for party in customer and supplier dashboard

2024-06-28 06:35:17 +00:00

change_log

…

commands

…

communication

…

config

…

controllers

fix: removed max discount validation for sales return

2024-07-10 07:01:54 +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

…

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: migrate lead notes

2024-06-18 22:57:19 +00:00

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

chore: resolve conflict

2024-07-01 17:05:56 +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

…

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

…

hooks.py

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

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

modules.txt

…

patches.txt

fix: priority not working for multiple pricing rules (backport #41516) (#41524)

2024-05-20 13:39:39 +05:30