Deepesh Garg 72d9dc6c85 chore: resolve more conflicts

2023-08-21 10:04:20 +05:30

..

accounts

chore: resolve more conflicts

2023-08-21 10:04:20 +05:30

assets

chore: add validation for depreciation expense account in asset category (backport #36659) (#36661)

2023-08-15 18:27:01 +05:30

bulk_transaction

feat: Add filters in Loan Interest Report (#33907)

2023-02-11 11:20:10 +05:30

buying

fix(RFQ): make "update password" and "submit quotation" buttons the same size (backport #36667) (#36686)

2023-08-17 16:00:17 +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

chore: linter fix

2023-08-17 07:40:10 +00:00

crm

Contact Doctype don't have any field job_title. (#36156)

2023-08-04 17:52:29 +05:30

domains

chore: remove files related to LMS

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

e_commerce

fix: Button Alignment center in hero slider (#36607)

2023-08-14 16:20:58 +05:30

erpnext_integrations

refactor: Workspace cleanup (backport #35409) (#35512)

2023-06-01 11:57:07 +05:30

loan_management

Merge pull request #36614 from deepeshgarg007/loan_repayment_cancel_v14

2023-08-13 11:57:49 +05:30

maintenance

fix: Remove missing DocField in fetch_from

2023-02-27 06:24:24 +00:00

manufacturing

fix: fetch Stock UOM from Item if not set (backport #36606) (#36617)

2023-08-12 23:25:05 +05:30

patches

chore: patch to update property setter for Journal Entry Accounts

2023-08-14 04:51:37 +00:00

portal

chore: ERPNext setup wizard cleanup (#33675)

2023-04-24 15:28:41 +05:30

projects

feat: Tick on checkbox to include draft timesheets (backport #36577) (#36640)

2023-08-17 17:13:51 +05:30

public

Merge pull request #36645 from frappe/mergify/bp/version-14-hotfix/pr-36495

2023-08-18 09:27:10 +05:30

quality_management

fix: Defined "Open" Status as default (backport #36421) (#36424)

2023-07-31 18:32:29 +05:30

regional

fix: Lower deduction certificate for multi-company (#36491)

2023-08-05 22:44:10 +05:30

selling

chore: resolve conflicts

2023-08-15 08:56:37 +05:30

setup

fix: move company rename to long queue

2023-08-10 10:03:22 +05:30

shopping_cart

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

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

startup

fix: allow over-payment against SO (#35079)

2023-05-14 11:44:50 +05:30

stock

fix(ux): change batch selection message to alert (backport #36500) (#36697)

2023-08-17 18:03:58 +05:30

subcontracting

fix: get incoming rate instead of BOM rate (backport #36496) (#36506)

2023-08-06 14:51:23 +05:30

support

perf: send SLA doctypes in boot

2023-07-16 07:01:32 +00:00

telephony

fix: Set correct options for link field

2022-04-14 12:32:31 +05:30

templates

feat(RFQ): make email message fully configurable (backport #36353) (#36531)

2023-08-17 12:11:37 +05:30

tests

Merge branch 'develop' into hr-separation

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

translations

chore: remove merge conflict

2023-08-01 14:18:14 +05:30

utilities

fix(regional): set frappe.flags.company temporarily, where required

2023-07-24 14:05:34 +00:00

www

chore: release v14 (#34733)

2023-04-05 17:41:20 +05:30

__init__.py

chore(release): Bumped to Version 14.34.3

2023-08-11 13:28:22 +00:00

.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

perf: asset depreciation entry posting (#36461)

2023-08-08 15:09:55 +05:30

modules.txt

Merge branch 'develop' into hr-separation

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

patches.txt

Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-36642

2023-08-16 09:58:31 +05:30