mbauskar 196f3b1fb8 resolved merge conflicts

2017-06-21 14:38:06 +05:30

..

accounts

UOM column in Batch Wise Balance History Report (#9359)

2017-06-20 13:02:35 +05:30

buying

fix logic of quantity validation (#9311)

2017-06-16 11:43:36 +05:30

change_log

…

commands

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

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

config

…

controllers

[UX] Error in purchase transaction - Ignore instead of Prompt #7766 (#9329)

2017-06-16 15:30:14 +05:30

crm

make quotation against lead company name (#9188)

2017-06-21 12:55:27 +05:30

demo

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

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

docs

added new images, links #9262

2017-06-20 18:19:50 +05:30

hr

[fixes] fix message and type conversion;

2017-06-19 09:59:09 +05:30

hub_node

…

maintenance

fixed merge conflicts

2017-06-15 13:42:47 +05:30

manufacturing

Fixed BOM value not updating on changing item (#9350)

2017-06-19 12:25:14 +05:30

patches

resolved merge conflicts

2017-06-21 14:38:06 +05:30

portal

…

projects

resolved merge conflicts

2017-06-21 14:38:06 +05:30

public

[fix] typo, item group route to have parent only for non root

2017-06-20 14:07:33 +05:30

schools

Trigger assessment plan every time page loads

2017-06-21 12:08:23 +05:30

selling

[fix] get status in calendar view and show green background

2017-06-21 11:58:29 +05:30

setup

[fix] typo, item group route to have parent only for non root

2017-06-20 14:07:33 +05:30

shopping_cart

Fix and improve shopping cart (#9348)

2017-06-20 12:51:32 +05:30

startup

…

stock

resolved merge conflicts

2017-06-21 14:38:06 +05:30

support

fixed merge conflicts

2017-06-15 13:42:47 +05:30

templates

Merge pull request #9373 from sagarvora/gh-9289

2017-06-20 14:31:22 +05:30

tests

…

translations

[translation] translation updates

2017-06-20 11:22:36 +02:00

utilities

Leaderboard of customers, items, suppliers and sales partner (#9354)

2017-06-20 13:04:45 +05:30

__init__.py

bumped to version 8.0.51

2017-06-21 13:47:12 +06:00

exceptions.py

…

hooks.py

…

modules.txt

…

patches.txt

resolved merge conflicts

2017-06-21 14:38:06 +05:30