tunde
|
85adbd7eae
|
show message if there's no submitted salary slip
|
2017-08-02 14:20:24 +01:00 |
|
tunde
|
c697526382
|
except in python 3 compatible style
|
2017-08-02 14:20:23 +01:00 |
|
Nabin Hait
|
3a512af0e2
|
Merge pull request #10202 from nabinhait/hotfix
Minor fix in bom_stock_qty patch
|
2017-08-01 16:05:44 +05:30 |
|
Nabin Hait
|
9b2b42dfc1
|
Minor fix in bom_stock_qty patch
|
2017-08-01 11:10:29 +05:30 |
|
mbauskar
|
4d185f3541
|
Merge branch 'hotfix'
|
2017-07-31 12:21:35 +05:30 |
|
mbauskar
|
892cd615f8
|
bumped to version 8.6.5
|
2017-07-31 12:51:35 +06:00 |
|
Nabin Hait
|
495ef67caa
|
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
|
2017-07-31 11:25:51 +05:30 |
|
Nabin Hait
|
3beb1ba667
|
Merge pull request #10165 from rohitwaghchaure/production_order_company_issue
[Fix] Timesheet Company Issue
|
2017-07-29 18:20:12 +05:30 |
|
Rohit Waghchaure
|
33977827c4
|
[Fix] Timesheet Company Issue
|
2017-07-29 14:15:50 +05:30 |
|
tundebabzy
|
41c954b8b3
|
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
|
2017-07-28 21:05:15 +05:30 |
|
rohitwaghchaure
|
e2176b852e
|
[Fix] Error in sales invoice and POS if customer group not defined in the customer (#10160)
|
2017-07-28 20:52:02 +05:30 |
|
mbauskar
|
9d5b1b0e8f
|
Merge branch 'hotfix'
|
2017-07-28 16:03:52 +05:30 |
|
mbauskar
|
2b420f7038
|
bumped to version 8.6.4
|
2017-07-28 16:33:52 +06:00 |
|
rohitwaghchaure
|
353af64197
|
[Fix] Unable to save asset because of float error issue (#10157)
|
2017-07-28 15:55:46 +05:30 |
|
Makarand Bauskar
|
8bccaed35a
|
Revert "[Fix] Error in sales invoice and POS if customer group not defined in the customer (#10148)" (#10159)
This reverts commit 4d2e782e42.
|
2017-07-28 15:43:23 +05:30 |
|
rohitwaghchaure
|
4d2e782e42
|
[Fix] Error in sales invoice and POS if customer group not defined in the customer (#10148)
|
2017-07-28 15:21:22 +05:30 |
|
Saurabh
|
734e635ef6
|
Merge branch 'hotfix'
|
2017-07-27 17:50:27 +05:30 |
|
Saurabh
|
6f9ef5b890
|
bumped to version 8.6.3
|
2017-07-27 18:20:27 +06:00 |
|
Makarand Bauskar
|
145393b12f
|
[hotfix] set the account name in GL entry instead of warehouse (#10134)
|
2017-07-27 16:46:40 +05:30 |
|
Makarand Bauskar
|
9c6e2c3637
|
[hotfix] included the get_purchase_trends_filters instead of get_sales_trends_filters in Purchase Receipts trends (#10127)
|
2017-07-27 16:23:57 +05:30 |
|
mbauskar
|
cfc2693b2e
|
Merge branch 'hotfix'
|
2017-07-27 12:18:15 +05:30 |
|
mbauskar
|
448d919cc1
|
bumped to version 8.6.2
|
2017-07-27 12:48:15 +06:00 |
|
tundebabzy
|
87ec6a12ef
|
adds options to currency fields (#10118)
|
2017-07-27 11:38:17 +05:30 |
|
rohitwaghchaure
|
059f99e621
|
[Fix] Wrong avg. buying rate in the Gross Profit report (#10110)
|
2017-07-27 11:37:30 +05:30 |
|
Saurabh
|
4c28fa77bd
|
Merge branch 'hotfix'
|
2017-07-25 18:02:58 +05:30 |
|
Saurabh
|
394dbca0e4
|
bumped to version 8.6.1
|
2017-07-25 18:32:58 +06:00 |
|
Saurabh
|
33ebd9f88e
|
Merge pull request #10088 from saurabh6790/hot_fix_v_8_6_0
[hot][fix] updated modified date for sales order
|
2017-07-25 17:58:12 +05:30 |
|
Saurabh
|
4c1caa7e98
|
[hot][fix] updated modified date for sales order
|
2017-07-25 17:35:14 +05:30 |
|
Saurabh
|
08c3b3c925
|
Merge branch 'staging'
|
2017-07-25 16:42:27 +05:30 |
|
Saurabh
|
bb5812cf0f
|
bumped to version 8.6.0
|
2017-07-25 17:12:26 +06:00 |
|
Saurabh
|
36645e4e2f
|
Merge branch 'master' into staging
|
2017-07-25 16:15:51 +05:30 |
|
Saurabh
|
b296bb1551
|
Merge branch 'hotfix'
|
2017-07-25 16:15:50 +05:30 |
|
Saurabh
|
e7c14fcc3d
|
bumped to version 8.5.5
|
2017-07-25 16:45:49 +06:00 |
|
Saurabh
|
31bb34bbae
|
Merge pull request #10081 from rohitwaghchaure/calendar_view_SO_issue_fix
[Fix] Calendar view for sales order
|
2017-07-25 15:54:09 +05:30 |
|
Saurabh
|
6436b9d089
|
Merge pull request #10080 from rohitwaghchaure/hotfix
[Fix] Negative amount showing in the grand total for multicurrency if discount has applied
|
2017-07-25 15:43:00 +05:30 |
|
Rohit Waghchaure
|
d62fa84ed9
|
[Fix] Calendar view for sales order
|
2017-07-25 15:34:20 +05:30 |
|
Rohit Waghchaure
|
baa937aa52
|
[Fix] Negative amount showing in the grand total for multicurrency if discount has applied
|
2017-07-25 15:26:01 +05:30 |
|
Frappe PR Bot
|
3b128cabb2
|
[Translation] Updated Translations (#10047)
|
2017-07-25 11:46:16 +05:30 |
|
Makarand Bauskar
|
dfc5a454b3
|
[minor] fixed the delivery date issue in Ordered Item to be Dellivered report (#10028)
|
2017-07-25 10:48:43 +05:30 |
|
bcornwellmott
|
1c32f5ace9
|
Whitelist method for adding production orders ops (#9997)
|
2017-07-24 22:43:44 +05:30 |
|
Prateeksha Singh
|
283d5550e6
|
[fix] set sales base field as base_grand_total (#10008)
|
2017-07-21 14:21:35 +05:30 |
|
Rushabh Mehta
|
dda608dd00
|
[fix] update_company_current_month_sales in company.py (#10005)
|
2017-07-21 11:58:14 +05:30 |
|
Faris Ansari
|
e355f99786
|
Remove ellipsis in title and description (#9992)
|
2017-07-20 17:51:19 +05:30 |
|
mbauskar
|
27334c28a9
|
Merge branch 'hotfix'
|
2017-07-20 16:49:30 +05:30 |
|
mbauskar
|
6c8d4678db
|
Merge branch 'master' into develop
|
2017-07-20 16:49:30 +05:30 |
|
mbauskar
|
ea50c9d1be
|
bumped to version 8.5.4
|
2017-07-20 17:19:30 +06:00 |
|
Rushabh Mehta
|
35da7d1fb4
|
[minor] we buy is also checked by default
|
2017-07-20 15:58:20 +05:30 |
|
Rushabh Mehta
|
ced14cc789
|
[fix] setup-wizard
|
2017-07-20 15:55:54 +05:30 |
|
Rushabh Mehta
|
9d27cf3c62
|
[tests] refactored (#9984)
* [tests] refactored
* [fix] test_quotation.js
* [fix] tests.text
* [fix] fiscal year not needed
* [test] add long test
* [fix] add timeout in lead
|
2017-07-20 15:35:03 +05:30 |
|
mbauskar
|
0e6933a1e8
|
resolved merge conflicts
|
2017-07-20 14:19:47 +05:30 |
|