ruthra kumar 5ce4dae204 chore: resolve conflict

2024-09-23 20:02:10 +05:30

..

accounts

chore: resolve conflict

2024-09-23 20:02:10 +05:30

assets

fix: translate in js

2024-09-19 03:27:14 +00:00

bulk_transaction

style: format js files

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

buying

fix: incorrect actual cost in Procurement Tracker report (backport #43109) (#43137)

2024-09-09 20:35:14 +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

fix: invalid gp calculation

2024-09-17 06:33:14 +00:00

crm

chore: resolve conflicts

2024-08-24 12:38:11 +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

fix: bom cost update is not working (backport #43155) (#43156)

2024-09-10 23:07:52 +05:30

patches

fix(patch): replace repost with direct sql to update 'against_voucher

2024-08-16 10:02:33 +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: unreconcile allocation child table redirect url voucher no issue

2024-09-09 09:00:19 +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: Translation for button SO to PO --conflicts

2024-09-18 21:47:30 +05:30

setup

chore: resolve conflict

2024-07-24 18:48:32 +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

fix: incorrect stock balance for inventory dimension (backport #43284) (#43289)

2024-09-19 10:20:58 +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

Merge pull request #42671 from frappe/mergify/bp/version-14-hotfix/pr-42669

2024-08-27 16:54:22 +02: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

chore: mass trailing whitespace and EOF fixes

2021-08-19 13:43:28 +05:30

exceptions.py

style: format code with black

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

hooks.py

chore: resolve conflict

2024-07-24 18:48:32 +05:30

modules.txt

Merge branch 'develop' into hr-separation

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

patches.txt

chore: resolve conflict

2024-08-16 15:34:48 +05:30