Marica 4d8d4acec4

Merge pull request #29913 from marination/item-merge-bundles ...

fix: Block merging items if both have product bundles

2022-02-23 16:59:22 +05:30

..

accounts

test: fix flaky stateful tests (#29749)

2022-02-23 16:17:41 +05:30

assets

fix: ignore duplicates explicitly

2022-02-23 14:27:45 +05:30

bulk_transaction

feat: Bulk Transaction Processing (#28580)

2022-02-08 01:00:37 +05:30

buying

fix: ignore duplicates explicitly

2022-02-23 14:27:45 +05:30

change_log

…

commands

fix!: drop old broken demo files (#29339)

2022-01-18 17:43:27 +05:30

communication

…

config

…

controllers

Merge pull request #29879 from deepeshgarg007/misc_fixes

2022-02-23 11:22:08 +05:30

crm

fix: allow renaming and merging (#29830)

2022-02-16 17:20:07 +05:30

domains

refactor: Removed hospitality domain from ERPNext (#29167)

2022-01-20 11:57:22 +05:30

e_commerce

fix: ignore duplicates explicitly

2022-02-23 14:27:45 +05:30

education

fix: Program Enrollment tests (#29592)

2022-02-02 17:30:29 +05:30

erpnext_integrations

fix: ignore duplicates explicitly

2022-02-23 14:27:45 +05:30

hr

fix: ignore duplicates explicitly

2022-02-23 14:27:45 +05:30

loan_management

Merge branch 'develop' of https://github.com/frappe/erpnext into loan_bank_reco

2022-02-21 16:58:52 +05:30

maintenance

fix: update status on visit cancel (#29389)

2022-01-21 14:48:33 +05:30

manufacturing

test: move report tests to subttest (#29945)

2022-02-22 19:24:49 +05:30

non_profit

fix: updated standard workspace json files

2022-01-13 19:24:11 +05:30

patches

Merge branch 'develop' of https://github.com/frappe/erpnext into loan_bank_reco

2022-02-21 22:22:02 +05:30

payroll

fix(Salary Slip): TypeError while clearing any amount field in components (#29931)

2022-02-22 11:41:09 +05:30

portal

fix: ignore duplicates explicitly

2022-02-23 14:27:45 +05:30

projects

chore: remove unused code and fields related to workstation from Timesheet Detail

2022-02-17 17:48:18 +05:30

public

Merge pull request #29953 from marination/heart-icon-and-shop-by-category

2022-02-23 13:01:30 +05:30

quality_management

fix: updated standard workspace json files

2022-01-13 19:24:11 +05:30

regional

fix: ignore duplicates explicitly

2022-02-23 14:27:45 +05:30

selling

chore: Show 'Produced Qty' field in Sales Order Item (#29903)

2022-02-21 14:22:14 +05:30

setup

fix: ignore duplicates explicitly

2022-02-23 14:27:45 +05:30

shopping_cart

…

startup

…

stock

Merge pull request #29913 from marination/item-merge-bundles

2022-02-23 16:59:22 +05:30

support

fix(minor): allow SLA update without permission check

2022-01-18 18:07:11 +05:30

telephony

…

templates

chore: Change heart icon to icon-heart and change var icon-stroke to accomodate changes in frappe icon

2022-02-23 00:13:44 +05:30

tests

test: only test erpnext doctypes

2022-02-21 15:32:28 +05:30

translations

fix: Email translations

2022-02-23 10:54:44 +05:30

utilities

fix: restrict filetypes to csv for rename tool

2022-02-10 10:26:00 +05:30

www

Merge pull request #29953 from marination/heart-icon-and-shop-by-category

2022-02-23 13:01:30 +05:30

__init__.py

fix: allow regional_overrides hook to be set in subsequent apps

2022-02-09 16:56:53 +05:30

.stylelintrc

…

exceptions.py

…

hooks.py

refactor!: amazon mws integration (#29438)

2022-02-14 19:43:26 +05:30

modules.txt

feat: Bulk Transaction Processing (#28580)

2022-02-08 01:00:37 +05:30

patches.txt

Merge branch 'develop' of https://github.com/frappe/erpnext into loan_bank_reco

2022-02-21 22:22:02 +05:30