Nabin Hait 0950481253 fix: merge conflict

2021-06-15 20:18:06 +05:30

..

accounts

fix: merge conflict

2021-06-15 20:18:06 +05:30

agriculture

…

assets

perf(minor): remove unnecessary comprehensions (port #25645)

2021-06-11 18:40:22 +05:30

buying

fix: merge conflict

2021-06-15 20:18:06 +05:30

change_log

chore: Added change log for v13.5.0

2021-06-15 19:44:06 +05:30

commands

…

communication

…

config

…

controllers

fix: merge conflict

2021-06-15 20:18:06 +05:30

crm

fix: merge conflict

2021-06-15 20:18:06 +05:30

demo

…

domains

…

education

fix: merge conflict

2021-06-15 20:18:06 +05:30

erpnext_integrations

fix: merge conflict

2021-05-31 11:21:33 +05:30

healthcare

fix: update linked Customer on Patient update only if Link Customer to Patient is enabled (#25921)

2021-06-03 09:24:31 +05:30

hotels

…

hr

fix: merge conflict

2021-06-15 20:18:06 +05:30

hub

…

hub_node

…

loan_management

fix: Rename Loan Management workspace to Loans (#25856)

2021-05-31 19:48:31 +05:30

maintenance

fix: merge conflict

2021-06-15 20:18:06 +05:30

manufacturing

fix: merge conflict

2021-06-15 20:18:06 +05:30

non_profit

fix(ux): fix unstranslated text in msgprint/throw

2021-05-25 20:59:20 +05:30

patches

fix: merge conflict

2021-06-15 20:18:06 +05:30

payroll

fix: merge conflict

2021-06-15 20:18:06 +05:30

portal

refactor: Rename assertEquals to assertEqual to avoid deprecation warnings

2021-05-10 09:18:25 +05:30

projects

perf(minor): remove unnecessary comprehensions (port #25645)

2021-06-11 18:40:22 +05:30

public

fix: merge conflict

2021-06-15 20:18:06 +05:30

quality_management

…

regional

fix: merge conflict

2021-06-15 20:18:06 +05:30

restaurant

…

selling

fix: merge conflict

2021-06-15 20:18:06 +05:30

setup

fix: merge conflict

2021-06-15 20:18:06 +05:30

shopping_cart

test: Pass ConflictingTaxRule during tax rule test

2021-05-28 09:09:36 +05:30

startup

…

stock

fix: merge conflict

2021-06-15 20:18:06 +05:30

support

fix: merge conflict

2021-06-15 20:18:06 +05:30

telephony

…

templates

…

tests

Merge pull request #25805 from ankush/refactor_item

2021-06-03 14:23:18 +05:30

translations

…

utilities

perf(minor): remove unnecessary comprehensions (port #25645)

2021-06-11 18:40:22 +05:30

www

fix: Quiz timer (#25983)

2021-06-08 18:57:49 +05:30

__init__.py

bumped to version 13.5.0

2021-06-15 20:18:40 +05:50

.stylelintrc

…

exceptions.py

…

hooks.py

feat(SLA): Apply SLA to any document (#22449)

2021-06-14 19:05:52 +05:30

modules.txt

…

patches.txt

fix: merge conflict

2021-06-15 20:18:06 +05:30