Nabin Hait 927d14e021 fix: merge conflict

2021-06-21 15:48:15 +05:30

..

accounts

fix: Customer Ledger Summary report not working on python 3 (#23957)

2021-01-04 11:54:19 +05:30

agriculture

…

assets

fix: Asset Maintenance - TypeError - Version 11 (#19069)

2019-09-16 19:42:38 +05:30

buying

fix: alter 'other_charges_calculation' to Long Text (#21304)

2020-04-16 22:45:12 +05:30

change_log

…

commands

…

config

fix(buying): Translate label for "Supplier Addresses And Contacts" Report

2019-06-28 14:36:53 +05:30

controllers

fix(stock_controller): precision based on debit_in_account_currency

2020-09-15 15:36:31 +08:00

crm

fix: icon for opportunity (#19381)

2019-10-23 11:07:33 +05:30

demo

fix: Fixes related to customer/lead merging (#18075)

2019-06-28 12:36:27 +05:30

domains

…

education

chore: remove unlinked letter head references (#19139)

2019-09-24 09:52:13 +05:30

erpnext_integrations

fix: update shopify api version (#22311)

2020-06-18 15:50:16 +05:30

healthcare

Fix: sql injection (#20816)

2020-03-16 22:36:19 +05:30

hotels

…

hr

Fix: sql injection (#20816)

2020-03-16 22:36:19 +05:30

hub

…

hub_node

fix: translating Error (#18140)

2019-07-03 11:42:33 +05:30

maintenance

…

manufacturing

Merge branch 'version-11-hotfix' into v11-work-order-bugs

2019-11-13 13:08:59 +05:30

non_profit

…

patches

fix(patch): use translated string while setting notification template (#21680)

2020-05-11 19:28:30 +05:30

portal

…

projects

fix: smaller then instead of bigger then :-( dumb mistake (#20693)

2020-02-26 12:49:48 +05:30

public

Merge pull request #20656 from marination/precision-mr-item-v11-hotfix

2020-02-18 12:34:45 +05:30

regional

Fix: sql injection (#20816)

2020-03-16 22:36:19 +05:30

restaurant

…

selling

fix: alter 'other_charges_calculation' to Long Text (#21304)

2020-04-16 22:45:12 +05:30

setup

fix: use ERPNext in welcome email when default company is not set (#20837)

2020-03-16 13:50:09 +05:30

shopping_cart

fix product_info

2020-06-25 16:18:58 +02:00

startup

…

stock

fix: show disabled items in the stock balance

2020-06-02 12:39:51 +05:30

support

fix(Issue): track issue split from (#18995)

2019-09-11 19:20:47 +05:30

templates

fix: shopping cart item availability

2019-08-20 19:18:45 +05:30

tests

perf(tests): Do not unnecessarily create companies

2019-07-26 05:59:31 +05:30

translations

…

utilities

…

www

…

__init__.py

bumped to version 11.1.69

2021-06-21 16:04:04 +05:50

exceptions.py

…

hooks.py

chore: moves email digest to long job from regular

2019-10-30 15:20:43 +05:30

modules.txt

…

patches.txt

fix(item): patch to rename duplicate item_code values to name (#21621)

2020-05-07 12:11:42 +05:30