Nabin Hait 7b684a01d3 fix: merge conflict

2019-07-04 12:06:50 +05:30

..

accounts

fix: merge conflict

2019-07-04 12:06:50 +05:30

agriculture

fix(unicode): Import unicode_literals in every file

2019-01-22 18:36:10 +05:30

assets

fix: Missing commits from hotfix branch (#17997)

2019-07-03 10:34:31 +05:30

buying

fix: Missing commits from hotfix branch (#17997)

2019-07-03 10:34:31 +05:30

change_log

fix: change changelog version to 11.1.0

2019-01-29 17:55:46 +05:30

commands

[demo] make it faster, do not send user email

2017-06-16 16:55:32 +05:30

communication

chore: Delete unwanted files

2019-07-01 14:32:29 +05:30

config

fix: Missing commits from hotfix branch (#17997)

2019-07-03 10:34:31 +05:30

controllers

fix: merge conflict

2019-07-04 12:06:50 +05:30

crm

refactor: Remove unwanted debug flag

2019-07-03 10:47:35 +05:30

demo

fix: Missing commits from hotfix branch (#17997)

2019-07-03 10:34:31 +05:30

domains

refactor: set Student as default portal role for Education

2019-05-29 18:37:52 +05:30

education

refactor: added missing translation functions (#18143)

2019-07-03 15:15:08 +05:30

erpnext_integrations

refactor: added missing translation functions (#18143)

2019-07-03 15:15:08 +05:30

healthcare

refactor: added missing translation functions (#18143)

2019-07-03 15:15:08 +05:30

hotels

Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes

2018-12-24 16:08:43 +05:30

hr

refactor: added missing translation functions (#18143)

2019-07-03 15:15:08 +05:30

hub

Hub (#10934)

2017-10-05 11:17:30 +05:30

hub_node

refactor: added missing translation functions (#18143)

2019-07-03 15:15:08 +05:30

maintenance

refactor: deprecate old API

2019-05-22 16:52:36 +05:30

manufacturing

fix: Missing commits from hotfix branch (#17997)

2019-07-03 10:34:31 +05:30

non_profit

refactor: change validate email add to validate email address

2019-03-16 13:40:58 +05:30

patches

Merge pull request #18135 from rohitwaghchaure/all_default_values_not_moved_to_item_default_table_develop

2019-07-04 00:48:57 +05:30

portal

Merge branch 'develop' into item-variant-attributes-optional

2019-05-07 14:25:03 +05:30

projects

refactor: added missing translation functions (#18143)

2019-07-03 15:15:08 +05:30

public

refactor: added missing translation functions (#18143)

2019-07-03 15:15:08 +05:30

quality_management

test: fix test case

2019-06-06 12:14:19 +05:30

regional

fix: invoice cancellation (#18152)

2019-07-04 11:37:20 +05:30

restaurant

fix(unicode): Import unicode_literals in every file

2019-01-22 18:36:10 +05:30

selling

fix: Missing commits from hotfix branch (#17997)

2019-07-03 10:34:31 +05:30

setup

fix: Missing commits from hotfix branch (#17997)

2019-07-03 10:34:31 +05:30

shopping_cart

fix: Missing commits from hotfix branch (#17997)

2019-07-03 10:34:31 +05:30

startup

chore: updated education config

2019-03-14 12:31:25 +05:30

stock

fix: multiple minor issues in delayed order report (#18134)

2019-07-03 11:43:38 +05:30

support

fix: Missing commits from hotfix branch (#17997)

2019-07-03 10:34:31 +05:30

templates

fix: Missing commits from hotfix branch (#17997)

2019-07-03 10:34:31 +05:30

tests

fix: fix for test test_contact_search_in_foreign_language

2019-07-02 21:01:57 +05:30

translations

feat: Updated translation (#18125)

2019-07-02 10:14:53 +05:30

utilities

fix: leaderboard chart

2019-07-01 12:20:09 +05:30

www

fix: Show Clear filters when attribute filters are set

2019-06-14 18:16:14 +05:30

__init__.py

fix: Missing commits from hotfix branch (#17997)

2019-07-03 10:34:31 +05:30

exceptions.py

…

hooks.py

fix: Missing commits from hotfix branch (#17997)

2019-07-03 10:34:31 +05:30

modules.txt

feat: Introduce communication module

2019-06-05 12:23:30 +05:30

patches.txt

Merge pull request #18135 from rohitwaghchaure/all_default_values_not_moved_to_item_default_table_develop

2019-07-04 00:48:57 +05:30