Deepesh Garg bc94358e98 chore: resolve conflicts

2023-03-30 12:15:56 +05:30

..

accounts

Merge pull request #34619 from frappe/mergify/bp/version-14-hotfix/pr-34608

2023-03-28 17:21:11 +05:30

assets

Asset maintenance task add dropdown "3 Yearly" (#34607)

2023-03-29 12:15:40 +00:00

bulk_transaction

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

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

buying

fix: Party Name in SOA print when viewed from Customer/Supplier master (#34597)

2023-03-28 16:48:53 +05:30

change_log

…

commands

…

communication

…

config

…

controllers

fix: zero rm-cost for batch rm item in SCR (backport #34616) (#34623)

2023-03-28 21:09:01 +05:30

crm

fix: enabling lead even after "Opportunity" created against it (#34627)

2023-03-30 02:34:48 +00:00

domains

…

e_commerce

fix: E-commerce issue with Item Variants

2023-03-21 09:17:33 +00:00

erpnext_integrations

feat: bank reconciliation and plaid changes (#33986)

2023-03-17 09:01:29 +05:30

loan_management

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

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

maintenance

fix: Remove missing DocField in fetch_from

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

manufacturing

fix: Time button not working in the job card

2023-03-23 17:06:58 +00:00

patches

fix: enabling lead even after "Opportunity" created against it (#34627)

2023-03-30 02:34:48 +00:00

portal

…

projects

fix: Linked invoice cancellation issue via timesheet (#34337)

2023-03-13 18:58:54 +05:30

public

fix: Note username overlapping with note content(CRM)

2023-03-22 06:32:46 +00:00

quality_management

…

regional

…

selling

fix: Party Name in SOA print when viewed from Customer/Supplier master (#34597)

2023-03-28 16:48:53 +05:30

setup

chore: Update user manual link (#34478)

2023-03-19 18:06:45 +05:30

shopping_cart

…

startup

feat: Setting to allow Sales Order creation against expired quotation (#33952)

2023-02-13 11:08:55 +05:30

stock

fix: incorrect Opening Value in Stock Balance report

2023-03-28 12:11:54 +00:00

subcontracting

fix: consumed qty validation for subcontracting receipt

2023-03-01 09:46:22 +00:00

support

Revert "refactor: use renamed timezone utils (#34301)"

2023-03-07 17:56:57 +05:30

telephony

…

templates

fix: E-commerce issue with Item Variants

2023-03-21 09:17:33 +00:00

tests

…

translations

fix: remove unused translation (#34519)

2023-03-23 00:06:14 +05:30

utilities

Revert "refactor: use renamed timezone utils (#34301)"

2023-03-07 17:56:57 +05:30

www

Revert "refactor: use renamed timezone utils (#34301)"

2023-03-07 17:56:57 +05:30

__init__.py

…

.stylelintrc

…

exceptions.py

…

hooks.py

feat: deprecate get_customer_list (#34563)

2023-03-24 15:14:25 +05:30

modules.txt

…

patches.txt

chore: resolve conflicts

2023-03-30 12:15:56 +05:30