Nabin Hait
7d4fd35aa3
Add POS Settings link in Accounts module ( #11060 )
2017-10-05 12:20:33 +05:30
rohitwaghchaure
e87a076f1d
Update link in the pos for offline and online mode from pos settings ( #11061 )
2017-10-05 12:20:20 +05:30
Nabin Hait
ff689a658f
Merge branch 'staging'
2017-10-04 18:21:35 +05:30
Nabin Hait
b290e3a4e7
bumped to version 9.1.0
2017-10-04 18:51:34 +06:00
Nabin Hait
77f0822abe
Merge branch 'develop' into staging
2017-10-04 18:11:16 +05:30
Nabin Hait
f83bc51e81
Merge branch 'master' into staging
2017-10-04 18:05:21 +05:30
Nabin Hait
fc712aea32
Merge branch 'master' into develop
2017-10-04 18:05:20 +05:30
Nabin Hait
7105c4b76c
Merge branch 'hotfix'
2017-10-04 18:05:19 +05:30
Nabin Hait
54c725dcd1
bumped to version 9.0.9
2017-10-04 18:35:19 +06:00
rohitwaghchaure
1e2c554e61
[Fix] Stock entry multi uom batch validation issue ( #11049 )
2017-10-04 17:52:49 +05:30
tundebabzy
65dfd09947
fix wrong variable name ( #11050 )
2017-10-04 17:51:44 +05:30
Javier Wong
61287e3c53
[fix] Change Sample Item Error Message to Zero Valuation Rate ( #10935 )
...
Change Sample Item Error Message to Zero Valuation Rate
2017-10-04 16:01:34 +05:30
Makarand Bauskar
1b67d71139
[minor] add the Lead in email account -> append_to field ( #10983 )
2017-10-04 15:55:56 +05:30
Doridel Cahanap
32456b0f14
[minor edits] BOM Stock Report ( #11012 )
...
* HTML for BOM Stock Report to show filters in PDF
* Added BOM Stock Report in Manufacturing Config under Report
2017-10-04 15:54:44 +05:30
Nabin Hait
3d0d4b2157
update subscription period only if relevant date field exists ( #11046 )
2017-10-04 15:51:55 +05:30
Nabin Hait
7e5a9f5c0e
Update new bom rate while replacing BOM ( #11045 )
2017-10-04 15:51:34 +05:30
KanchanChauhan
d3e21fff66
[Minor] Employee name as standard filter ( #11043 )
2017-10-04 15:20:34 +05:30
Nabin Hait
5171956646
Merge branch 'master' into staging
2017-10-04 14:52:33 +05:30
Nabin Hait
0cc93538ed
Merge branch 'hotfix'
2017-10-04 14:52:32 +05:30
Nabin Hait
b779644493
Merge branch 'master' into develop
2017-10-04 14:52:32 +05:30
Nabin Hait
c83e793ce8
bumped to version 9.0.8
2017-10-04 15:22:31 +06:00
Revant Nandgaonkar
4d68e03a97
[Fix] Job Opening Web Form breadcrumb ( #11029 )
2017-10-04 14:35:21 +05:30
Makarand Bauskar
eaec4695f7
[hotfix] filter doctype if the doctype has subscription field ( #11038 )
2017-10-04 14:34:45 +05:30
rohitwaghchaure
5049edb494
[Fix] Discount and serial no search issue ( #11040 )
2017-10-04 14:33:12 +05:30
Makarand Bauskar
d17bea0a31
[hotfix] check minimum actual start time and actual end time before updating PO Operations ( #11041 )
...
* [hotfix] check minimum actual start time and actual end time before updating PO Operations
* Update production_order.py
2017-10-04 14:30:12 +05:30
Saurabh
444bfff1ff
[fix] resolved merge conflicts
2017-10-03 18:03:18 +05:30
Saurabh
ee4a2dd26f
[fix] resolved merge conflicts
2017-10-03 18:02:09 +05:30
Saurabh
f6580268e6
Merge branch 'hotfix'
2017-10-03 18:00:32 +05:30
Saurabh
e3a468ed1b
bumped to version 9.0.7
2017-10-03 18:30:31 +06:00
rohitwaghchaure
9e6f2a49e8
Merge pull request #11033 from rohitwaghchaure/subscription_next_data_fix
...
[Fix] Subscription next schedule date, cancel issue, added from and to date
2017-10-03 17:48:53 +05:30
Rohit Waghchaure
445e8a2e57
[Fix] Subscription end date, cancel issue, added from and to date
2017-10-03 17:45:11 +05:30
Nabin Hait
7b6eaee05b
Fixes to handle async events ( #11018 )
...
* Fixes to handle async events
* transaction.js code cleanup
* Don't map taxes and charges while making PO from SO for drop-ship
* Removed print
2017-10-03 01:09:46 +05:30
rohitwaghchaure
c26e3f1569
Merge pull request #11024 from rohitwaghchaure/payment_issue_in_pos
...
[Fix] Old invoice payment amount showing in the payment modal while making payment
2017-10-02 22:29:49 +05:30
Rohit Waghchaure
c4e52e5f95
[Fix] Old invoice payment amount showing in the payment modal while making payment
2017-10-02 21:20:54 +05:30
Nabin Hait
7eba1a35d3
Controller init args fix ( #11015 )
...
* Controller init args fix
* cleanup useless code
2017-10-02 15:59:27 +05:30
Nabin Hait
1f10d693e9
Don't set currency as company currency if default currency is different ( #11011 )
2017-10-02 13:20:51 +05:30
Nabin Hait
53e8989699
Merge branch 'master' into staging
2017-10-02 12:28:27 +05:30
Nabin Hait
8919669ac2
Merge branch 'master' into develop
2017-10-02 12:28:27 +05:30
Nabin Hait
d977333a99
Merge branch 'hotfix'
2017-10-02 12:28:26 +05:30
Nabin Hait
3a2834c7ad
bumped to version 9.0.6
2017-10-02 12:58:26 +06:00
rohitwaghchaure
88491715e0
[Fix] select batch not displaying in the modal, duplicate invoice making after sync ( #11005 )
2017-10-02 12:13:36 +05:30
Nabin Hait
0bdf1e5ef1
Merge branch 'master' into staging
2017-10-02 12:09:01 +05:30
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
