mbauskar 62f0722325 resolved merge conflicts

2017-08-21 08:58:42 +05:30

..

accounts

resolved merge conflicts

2017-08-21 08:58:42 +05:30

buying

[ui test ] Travis failing fix (#10468)

2017-08-21 08:07:42 +05:30

change_log

Docs in website (#10149)

2017-07-28 11:44:08 +05:30

commands

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

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

config

[docs] cleanup

2017-07-31 17:40:17 +05:30

controllers

Merge branch 'master' into develop

2017-08-14 09:31:01 +05:30

crm

Merge branch 'master' into develop

2017-08-14 09:31:01 +05:30

demo

[minor] fixes for pos_profile in make-demo (#10289)

2017-08-08 15:00:30 +05:30

docs

Added Quote Status to RFQ Suppliers with No Quote

2017-08-17 11:18:49 +05:30

hr

resolved merge conflicts

2017-08-21 08:58:42 +05:30

hub_node

removed Is Sales Item and Is Purchase Item

2016-04-15 12:57:00 +05:30

maintenance

fixed merge conflicts

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

manufacturing

[ui test ] Travis failing fix (#10468)

2017-08-21 08:07:42 +05:30

patches

resolved merge conflicts

2017-08-21 08:58:42 +05:30

portal

[hotfix] fixed the recursion error while saving the User (#8696)

2017-05-05 11:53:00 +05:30

projects

merged hotfix branch into staging (#10191)

2017-08-01 11:06:41 +05:30

public

resolved merge conflicts

2017-08-21 08:58:42 +05:30

regional

Additional GST related fields in Invoice and Sales/Purchase Register reort (#10405)

2017-08-21 08:28:55 +05:30

schools

resolved merge conflicts

2017-08-21 08:58:42 +05:30

selling

resolved merge conflicts

2017-08-21 08:58:42 +05:30

setup

resolved merge conflicts

2017-08-21 08:58:42 +05:30

shopping_cart

[fix] redirect to payment url if paying via web portal (#10265)

2017-08-08 11:29:11 +05:30

startup

[Fix] Default selling settings not fetched on customer quick entry form (#10243)

2017-08-02 18:16:13 +05:30

stock

resolved merge conflicts

2017-08-21 08:58:42 +05:30

support

Changed Text of Knowledge base button to Help Article

2017-08-04 16:14:38 +05:30

templates

Fixes in Order / Quotation (#10361)

2017-08-10 21:06:09 +05:30

tests

[UI Test] travis.yml modified for fresh UI Test (#10446)

2017-08-20 10:59:48 +05:30

translations

[Translation] Updated Translations (#10047)

2017-07-25 11:46:16 +05:30

utilities

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

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

__init__.py

bumped to version 8.8.4

2017-08-21 09:27:32 +06:00

exceptions.py

…

hooks.py

Fixes in Order / Quotation (#10361)

2017-08-10 21:06:09 +05:30

modules.txt

[wip] GST for India. Pending reports

2017-06-22 22:31:32 +05:30

patches.txt

Additional GST related fields in Invoice and Sales/Purchase Register reort (#10405)

2017-08-21 08:28:55 +05:30