Nabin Hait
f059e7be35
Merge branch 'master' into develop
2017-10-02 12:09:00 +05:30
Nabin Hait
00a48ad4e5
Merge branch 'hotfix'
2017-10-02 12:09:00 +05:30
Nabin Hait
def308a433
bumped to version 9.0.5
2017-10-02 12:38:59 +06:00
Makarand Bauskar
cb38e599e5
[minor] don't create lead if customer contact is already created against contact_email ( #10976 )
...
* [minor] don't create lead if customer contact is already created against contact_email
* [tests] added tests cases for opportunity to check if lead is required or not
2017-10-02 11:40:43 +05:30
Nabin Hait
9b98d7fa14
Gst doctype roles ( #10984 )
...
* Removed default permission from GST doctypes
* default permission from GST doctypes
2017-10-02 11:38:40 +05:30
Makarand Bauskar
b1bf502119
[hotfix] validate company name on 'The Brand' Slide instead of 'Your Organization' ( #11007 )
2017-10-02 11:38:03 +05:30
Nabin Hait
cb48404bd2
Revert "Fixes for uom in get_item_details ( #10986 )" ( #11009 )
...
This reverts commit 5b58e489a8
.
2017-10-02 11:37:18 +05:30
Nabin Hait
5b58e489a8
Fixes for uom in get_item_details ( #10986 )
2017-10-02 11:36:10 +05:30
Rushabh Mehta
4b99fe15cc
[version] 9.x.x-develop
2017-09-30 11:41:26 +05:30
Rushabh Mehta
b9fe14631d
[fix] healthcare setup
2017-09-30 10:46:56 +05:30
Nabin Hait
01b96a0e31
Fixes for uom in get_item_details
2017-09-29 18:57:41 +05:30
Nabin Hait
79a1d2a3b0
Fixes for uom in get_item_details
2017-09-29 18:15:40 +05:30
Nabin Hait
6488645d42
Fixed ui tests for production order
2017-09-29 16:38:28 +05:30
Rushabh Mehta
b46900a4cb
Merge branch 'master' into staging
2017-09-29 16:22:02 +05:30
Rushabh Mehta
912ae24ca2
Merge branch 'master' into develop
2017-09-29 16:22:02 +05:30
Rushabh Mehta
e292c83114
Merge branch 'hotfix'
2017-09-29 16:22:01 +05:30
Rushabh Mehta
e1a4b3e4bc
bumped to version 9.0.4
2017-09-29 16:52:01 +06:00
Rushabh Mehta
d3a48a83fd
[fix] bom.py, dont use keyword
2017-09-29 15:50:17 +05:30
Rushabh Mehta
80d24f83f8
[fix] item variant description
2017-09-29 15:39:03 +05:30
Pawan Mehta
5d8fd477bd
[fix] #10840 ( #10844 )
2017-09-29 15:23:54 +05:30
Javier Wong
bf37995745
[Enhancement] Sales and Purchase Default UOM ( #10929 )
...
Option for specifying an optional default Sales and Purchase UOM at the item master level.
2017-09-29 15:23:08 +05:30
tundebabzy
5510d0751d
correctly set frm company currency ( #10944 )
2017-09-29 15:21:59 +05:30
Shreya Shah
b79c4a9ff6
Getting last purchase price of an item ( #10897 )
...
* Added a column last purchase rate
* Removed button last purchase rate
* Get last purchase rate on adding an item
* Added test case for last purchase rate
* Replaced cur_frm with frm
* Update purchase_order.js
2017-09-29 15:20:48 +05:30
Francisco Roldán
1b61dfd9ea
translated ( #10886 )
2017-09-29 15:19:12 +05:30
Shridhar Patil
3f7d96ecba
Unassign from todo. ( #10896 )
...
Unassign from todo when the status is changed to Closed or Cancelled
2017-09-29 15:18:43 +05:30
Faris Ansari
367b90e3ae
Add Data Import Tool desktop icon ( #10916 )
...
fixes #8332
2017-09-29 15:17:48 +05:30
Nabin Hait
945f502748
Fixes for updating item variant from template ( #10975 )
...
* Fixes for updating item variant from template
* More fixes for test cases
2017-09-29 15:11:50 +05:30
Makarand Bauskar
9c339145b2
[Enhance] Custom notification messages for subscription documents ( #10970 )
...
* [minor] configurable subscription email message and subject for notification
* [minor] added description for subject field
2017-09-29 15:02:51 +05:30
Rushabh Mehta
3c14c5a16c
[fix] tax_rule.py args
2017-09-29 13:21:22 +05:30
Nabin Hait
bdb4c542e7
default permission from GST doctypes
2017-09-29 10:39:32 +05:30
Nabin Hait
6d61a45f42
Removed default permission from GST doctypes
2017-09-29 10:35:21 +05:30
Nabin Hait
c314485d55
Fixes based on test case
2017-09-28 18:55:49 +05:30
Nabin Hait
3b04cfc812
minor fix
2017-09-28 18:55:49 +05:30
mbauskar
79ba422273
Merge branch 'develop' into staging
2017-09-28 16:32:33 +05:30
rohitwaghchaure
0dc3c1b114
Merge pull request #10953 from rohitwaghchaure/has_batch_item_in_demo
...
[minor] Added batch item in the demo data
2017-09-28 16:07:01 +05:30
schilgod
0f6fff6f0c
item price track_changes default to 1 ( #10958 )
2017-09-28 15:28:59 +05:30
Rushabh Mehta
2b87d100fa
[fix] https://github.com/frappe/erpnext/issues/10956
2017-09-28 15:21:36 +05:30
Rohit Waghchaure
c4ee77a3cc
[minor] Added batch item in the demo data
2017-09-28 15:19:26 +05:30
Nabin Hait
c9f9e5235b
Fixed merge conflict
2017-09-28 12:31:33 +05:30
Nabin Hait
edd4fd4692
Merge branch 'hotfix'
2017-09-28 12:30:48 +05:30
Nabin Hait
ca916a73de
bumped to version 9.0.3
2017-09-28 13:00:48 +06:00
Makarand Bauskar
53e19075d1
[hotfix] fixes and refactored Quoted Item Comparison report ( #10954 )
2017-09-28 12:30:04 +05:30
Rushabh Mehta
a0ba5594f9
[fix] production_order.py via error report
2017-09-28 11:26:24 +05:30
rohitwaghchaure
16645803f9
[fix] Added billing address gstin number in the sales invoice and delivery note as well in the sales gst reports ( #10872 )
2017-09-28 11:05:03 +05:30
rohitwaghchaure
94799a8b93
[fix] ‘NoneType’ object is not iterable onload of POS ( #10941 )
2017-09-28 10:56:27 +05:30
Nabin Hait
fce14fdcf0
Fixed merge conflict
2017-09-27 17:21:21 +05:30
Nabin Hait
7baacb7f74
Merge branch 'hotfix'
2017-09-27 17:19:55 +05:30
Nabin Hait
76615c8001
bumped to version 9.0.2
2017-09-27 17:49:55 +06:00
Prateeksha Singh
283922daa2
[fix] Check for stock_qty, else use qty ( #10937 )
2017-09-27 17:12:28 +05:30
rohitwaghchaure
da8de2f0c7
Re-order patch sequence ( #10936 )
2017-09-27 17:11:40 +05:30