Nabin Hait cab8dfc5fb Fixed merge conflict

2018-01-05 14:15:39 +05:30

..

accounts

[fix] setup alias for ifnull condition (#12327)

2018-01-05 12:48:08 +05:30

agriculture

[fix] if item code exists then only call get_item_details (#12258)

2018-01-01 16:17:02 +05:30

assets

[Fix] Asset make sales invoice (#12168)

2017-12-26 16:23:06 +05:30

buying

Fixed merge conflict

2018-01-05 14:15:39 +05:30

change_log

Version 10 change log

2017-12-25 12:25:52 +05:30

commands

…

config

Patient medical record and Consulatation (#12198)

2017-12-29 14:32:13 +05:30

controllers

Fixed merge conflict

2018-01-05 14:15:39 +05:30

crm

Fixed organization lead error

2018-01-03 14:12:56 +05:30

demo

[fix] set asset owner demo data

2017-12-19 14:52:07 +05:30

docs

Merge branch 'master' into develop

2018-01-05 13:17:00 +05:30

domains

Set the guardian role automatically. (#12136)

2017-12-22 10:50:10 +05:30

education

Merge branch 'master' into develop

2018-01-05 13:17:00 +05:30

erpnext_integrations

Add Github Connector (#11259)

2017-11-13 19:19:13 +05:30

healthcare

Patient medical record and Consulatation (#12198)

2017-12-29 14:32:13 +05:30

hr

Merge branch 'master' into develop

2018-01-05 13:17:00 +05:30

hub

Hub (#10934)

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

hub_node

Employee advance (#11875)

2017-12-14 13:25:57 +05:30

maintenance

Added maintenance to Asset and enhanced maintenance for Asset Maintenance

2017-11-28 15:14:56 +05:30

manufacturing

[fix] key error (#12257)

2018-01-01 16:17:14 +05:30

non_profit

[minor] Chapter head link with Member (#12003)

2017-12-14 13:26:22 +05:30

patches

Fixed merge conflict

2018-01-05 14:15:39 +05:30

portal

Set the guardian role automatically. (#12136)

2017-12-22 10:50:10 +05:30

projects

[Minor] Fix adding child to root task issue (#12121)

2017-12-22 11:00:19 +05:30

public

Merge branch 'master' into develop

2018-01-05 13:17:00 +05:30

regional

[minor] Code cleanup (#12278)

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

restaurant

Fix travis (#11882)

2017-12-08 14:57:38 +05:30

selling

Companywise default tax template (#12290)

2018-01-05 12:42:02 +05:30

setup

fix for the non stock items for the shopping cart (#12294)

2018-01-05 12:47:20 +05:30

shopping_cart

fix for the non stock items for the shopping cart (#12294)

2018-01-05 12:47:20 +05:30

startup

[hotfix] User not able to edit exchange rate even if Allow Stale Exchange Rates is disabled in the accounts settings (#11409)

2017-11-02 18:12:14 +05:30

stock

Fixed merge conflict

2018-01-05 14:15:39 +05:30

support

[enhance] Add Issue Type and Opportunity Type masters (#11598)

2017-11-16 17:03:52 +05:30

templates

fix for the non stock items for the shopping cart (#12294)

2018-01-05 12:47:20 +05:30

tests

[Minor] Fix adding child to root task issue (#12121)

2017-12-22 11:00:19 +05:30

translations

[Translation] Updated Translations (#12212)

2017-12-28 12:31:01 +05:30

utilities

Merge branch 'master' into develop

2018-01-05 13:17:00 +05:30

__init__.py

bumped to version 10.0.6

2018-01-05 13:46:59 +06:00

exceptions.py

…

hooks.py

[Enhance] New print format for UAE/KSA for vat/excise (#12202)

2017-12-28 14:20:13 +05:30

modules.txt

[Agriculture Domain] (#11663)

2017-12-06 18:36:27 +05:30

patches.txt

Re-execute uae vat patch (#12230)

2017-12-28 18:42:22 +05:30