brotherton-erpnext/erpnext
Makarand Bauskar 317888211a merged hotfix branch into staging (#10191)
* [Fix] Error in sales invoice and POS if customer group not defined in the customer (#10148)

* Revert "[Fix] Error in sales invoice and POS if customer group not defined in the customer (#10148)" (#10159)

This reverts commit 4d2e782e42.

* [Fix] Unable to save asset because of float error issue (#10157)

* bumped to version 8.6.4

* [Fix] Error in sales invoice and POS if customer group not defined in the customer (#10160)

* Set billing hours to 0 in timesheet #9535 (#10139)

* `update_billing_hours` to use flt not cint

* if not billable, reset billable hours

* if not billable, reset time rates

* test

* [Fix] Timesheet Company Issue

* Added delivery date in SO parent form. Fixes #10104 (#10155)

* Added delivery date in SO parent form. Fixes #10104

* UI tests for sales order delivery date

* bumped to version 8.6.5
2017-08-01 11:06:41 +05:30
..
accounts merged hotfix branch into staging (#10191) 2017-08-01 11:06:41 +05:30
buying [Fix] RFQ list showing to all supplier in the portal (#10023) 2017-07-25 14:12:58 +05:30
change_log [minor] added change log for v8.3.0 (#9629) 2017-07-05 15:36:38 +05:30
commands [demo] make it faster, do not send user email 2017-06-16 16:55:32 +05:30
config Added Project Type new doctype to be added as link field for Project Type field in project instead of select field (#9929) 2017-07-26 17:55:25 +05:30
controllers merged hotfix branch into staging (#10191) 2017-08-01 11:06:41 +05:30
crm [ui-tests] added workstation and operation (#10044) 2017-07-24 14:34:30 +05:30
demo merged hotfix branch into staging (#10191) 2017-08-01 11:06:41 +05:30
docs Merge branch 'master' into develop 2017-07-25 16:42:28 +05:30
hr Merge branch 'master' into staging 2017-07-27 17:50:28 +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 merged hotfix branch into staging (#10191) 2017-08-01 11:06:41 +05:30
patches merged hotfix branch into staging (#10191) 2017-08-01 11:06:41 +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 [minor][wiz] fix company image alignment (#10114) (#10117) 2017-07-26 18:19:41 +05:30
regional Itemised tax breakup fix in docs other than invoice (#9961) 2017-07-20 13:32:01 +05:30
schools [UI Tests] School Academic Term test (#10050) 2017-07-25 11:46:34 +05:30
selling merged hotfix branch into staging (#10191) 2017-08-01 11:06:41 +05:30
setup Added Project Type new doctype to be added as link field for Project Type field in project instead of select field (#9929) 2017-07-26 17:55:25 +05:30
shopping_cart Fix and improve shopping cart (#9348) 2017-06-20 12:51:32 +05:30
startup Sales Goal by Company (#9723) 2017-07-18 10:35:12 +05:30
stock Merge branch 'master' into staging 2017-07-27 17:50:28 +05:30
support Timeline Title for small resolution Add to knowledge base button. (#9926) 2017-07-25 14:16:48 +05:30
templates Timesheet web (#10037) 2017-07-25 10:53:12 +05:30
tests merged hotfix branch into staging (#10191) 2017-08-01 11:06:41 +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 merged hotfix branch into staging (#10191) 2017-08-01 11:06:41 +05:30
exceptions.py
hooks.py Timesheet web (#10037) 2017-07-25 10:53:12 +05:30
modules.txt [wip] GST for India. Pending reports 2017-06-22 22:31:32 +05:30
patches.txt merged hotfix branch into staging (#10191) 2017-08-01 11:06:41 +05:30