Ameya Shenoy ea42980de6 Merge branch 'staging' into develop

2018-11-06 11:17:24 +00:00

..

accounts

Merge branch 'staging' into develop

2018-11-06 11:17:24 +00:00

agriculture

Doctypes in domains that are in beta are now restricted to that domain

2018-11-04 08:39:52 -05:00

assets

Merge branch 'staging' into develop

2018-11-06 11:17:24 +00:00

buying

Merge branch 'staging' into develop

2018-10-23 08:06:15 +00:00

change_log

…

commands

…

config

Merge branch 'master' into staging-fixes

2018-10-23 12:52:48 +00:00

controllers

Merge branch 'staging' into develop

2018-10-19 13:27:07 +00:00

crm

Do not display gender for companies (#15728)

2018-10-18 16:49:49 +05:30

demo

item data updated with retail data

2018-10-10 14:28:17 +05:30

domains

[fix] Healthcare field and desktop icon (#15638)

2018-10-10 14:44:36 +05:30

education

Merge branch 'staging' into develop

2018-11-05 06:53:27 +00:00

erpnext_integrations

[Feature] ERPNext Quickbooks Migrator (#15718)

2018-10-17 17:50:00 +05:30

healthcare

Doctypes in domains that are in beta are now restricted to that domain

2018-11-04 08:39:52 -05:00

hotels

Merge branch 'staging' into develop

2018-11-05 06:53:27 +00:00

hr

Merge branch 'staging' into develop

2018-11-05 06:53:27 +00:00

hub

…

hub_node

fix(hub): Prevent registered actions

2018-11-05 19:18:48 +05:30

maintenance

…

manufacturing

Merge branch 'staging' into develop

2018-10-30 12:54:16 +00:00

non_profit

Doctypes in domains that are in beta are now restricted to that domain

2018-11-04 08:39:52 -05:00

patches

Merge branch 'staging' into develop

2018-11-06 11:17:24 +00:00

portal

…

projects

Merge branch 'staging' into develop

2018-10-17 09:44:39 +00:00

public

Merge pull request #15911 from netchampfaris/marketplace-fixes-3

2018-11-05 19:19:44 +05:30

regional

Merge branch 'staging' into develop

2018-10-15 12:25:03 +00:00

restaurant

…

selling

allow creating sales order on the last valid day of a quotation (#15875)

2018-11-05 16:02:18 +05:30

setup

File api (#15637)

2018-10-15 10:38:53 +05:30

shopping_cart

…

startup

…

stock

Merge branch 'staging' into develop

2018-11-06 11:17:24 +00:00

support

…

templates

Merge pull request #15547 from Zlash65/demo-refactor

2018-10-16 17:34:09 +05:30

tests

…

translations

[Translation] Updated Translations (#15909)

2018-11-05 16:01:47 +05:30

utilities

Add event in transaction base correction (#15631)

2018-10-11 16:54:26 +05:30

www

…

__init__.py

Merge branch 'master' into staging-fixes

2018-11-06 11:02:08 +00:00

exceptions.py

…

hooks.py

Merge branch 'staging' into develop

2018-11-06 11:17:24 +00:00

modules.txt

…

patches.txt

Fixed merge conflict

2018-10-15 15:43:21 +05:30