Nabin Hait
0695ea21b5
Merge pull request #16019 from frappe-pr-bot/translations-2018-11-19
...
[Translation] Updated Translations
2018-11-26 21:04:13 +05:30
Nabin Hait
b5fbfaf4cd
Merge pull request #16089 from frappe/update-stale-bot
...
[stale] Increase Number of days of inactivity
2018-11-26 17:15:46 +05:30
Nabin Hait
f7b6c95326
Merge pull request #16087 from surajshetty3416/update-eslint-config
...
fix[eslintrc]: Add Vue to globals
2018-11-26 17:14:25 +05:30
Prateeksha Singh
50b6a5ddc8
Update stale.yml
2018-11-26 14:44:26 +05:30
Suraj Shetty
584430c49c
Add vue to globals
...
- Also set sourceType as module to avoid import lint error
2018-11-26 12:32:29 +05:30
frappe-pr-bot
2ed4d84cd3
[Translation] Updated Translations
2018-11-19 11:57:50 +02:00
Frappe Bot
8c7373dfd0
Merge branch 'staging' into develop
2018-11-15 09:45:05 +00:00
Frappe Bot
64b4d98778
Merge branch 'staging-fixes' into staging
2018-11-15 09:43:08 +00:00
Frappe Bot
d9dccaefba
bumped to version 11.0.3-beta.24
2018-11-15 09:42:35 +00:00
Frappe Bot
ef745b0197
bumped to version 11.0.3-beta.23
2018-11-15 09:37:17 +00:00
Frappe Bot
eb4969d24f
Merge branch 'staging' into develop
2018-11-15 09:26:03 +00:00
Nabin Hait
0aca5aad14
Merge pull request #15976 from deepeshgarg007/summary
...
[Fix] Accounts receivable summary print format showing zero values
2018-11-15 14:52:16 +05:30
Nabin Hait
a0a2f58a21
Merge pull request #15985 from adityahase/perf-patch
...
perf(patch): Use INSERT with ON DUPLICATE KEY UPDATE
2018-11-15 14:50:58 +05:30
Frappe Bot
6647ea270c
Merge branch 'staging-fixes' into staging
2018-11-15 09:19:18 +00:00
Frappe Bot
a4fe912382
bumped to version 11.0.3-beta.23
2018-11-15 09:19:18 +00:00
Frappe Bot
98b4a1bc81
Merge branch 'master' into staging-fixes
2018-11-15 09:12:04 +00:00
Frappe Bot
0b697c5298
Merge branch 'hotfix'
2018-11-15 09:04:14 +00:00
Frappe Bot
2426d00dd6
bumped to version 10.1.72
2018-11-15 09:04:14 +00:00
rohitwaghchaure
cc907559d0
Merge pull request #15992 from rohitwaghchaure/code_optimization_for_consolidated_report
...
Code optimization for consolidated financial statement report
2018-11-15 13:48:17 +05:30
Rohit Waghchaure
704796b1cb
Code optimization for consolidated financial statement report
2018-11-15 13:46:18 +05:30
rohitwaghchaure
02a7f8f0b2
Merge pull request #15991 from rohitwaghchaure/fixed_consolidated_conversion_issue
...
[Fix] Consolidated financial statement report currency conversion issue
2018-11-15 12:56:11 +05:30
Rohit Waghchaure
9d0f90975b
[Fix] Consolidated financial statement report currency conversion issue
2018-11-15 12:55:20 +05:30
rohitwaghchaure
93f358778b
Merge pull request #15990 from rohitwaghchaure/patch_code_refactor
...
[Minor] Patch fixes
2018-11-15 12:21:46 +05:30
Rohit Waghchaure
43920530a1
[Minor] Patch fixes
2018-11-15 12:20:27 +05:30
Deepesh Garg
3b8c84fa75
Merge pull request #15975 from nabinhait/staging-fixes
...
fix(test): Fixed item discount amount calculation and test cases related to pricing rule
2018-11-15 12:01:09 +05:30
rohitwaghchaure
e907c0d15c
Merge pull request #15986 from rohitwaghchaure/added_currency_filter_in_consolidated_report
...
Added currency filter in consolidated financial statement report
2018-11-15 10:53:02 +05:30
Rohit Waghchaure
a95697f506
Added currency filter in consolidated financial statement report
2018-11-14 19:55:44 +05:30
Aditya Hase
d168a71cfb
perf(patch): Use INSERT with ON DUPLICATE KEY UPDATE
...
update_total_qty_field patch was using UPDATE statement with CASE
Now use INSERT INTO with ON DUPLICATE KEY UPDATE clause which
allows this query to use indexes and update multiple rows per query.
2018-11-14 19:09:07 +05:30
Frappe Bot
98a2348779
Merge branch 'staging' into develop
2018-11-14 11:33:08 +00:00
Frappe Bot
e4193030b1
Merge branch 'staging-fixes' into staging
2018-11-14 11:33:03 +00:00
Frappe Bot
fac49983a0
bumped to version 11.0.3-beta.22
2018-11-14 11:32:34 +00:00
rohitwaghchaure
ba97b9b2d8
Merge pull request #15980 from rohitwaghchaure/on_save_allow_transfer_for_manufatured_changed
...
[Fix] On save Allow Transfer for Manufacture reset to default value even if user has changed manually
2018-11-14 15:12:45 +05:30
rohitwaghchaure
593f3f1756
Merge pull request #15978 from nabinhait/fetch_from_fix
...
fix(patch): Fetch missing gst hsn code in transactions and set hsn-wise taxes
2018-11-14 15:11:26 +05:30
rohitwaghchaure
5395b164cd
Merge pull request #15983 from rohitwaghchaure/fixed_claimed_amount_issue
...
Claimed amount is not reset on cancel of employee advance
2018-11-14 13:21:11 +05:30
Rohit Waghchaure
047a7123eb
Claimed amount is not reset on cancel
2018-11-14 13:20:00 +05:30
Rohit Waghchaure
917dda1b76
[Fix] On save Allow Transfer for Manufacture reset to default value even if user has changed manually
2018-11-14 01:18:41 +05:30
Nabin Hait
367a076fa4
fix(discount): Fixed item discount amount calculation
2018-11-13 18:41:58 +05:30
Nabin Hait
d34bfa8c2c
fix(patch): Fetch missing gst hsn code in transactions and set hsn-wise taxes
2018-11-13 18:21:22 +05:30
Frappe Bot
fe62024824
bumped to version 11.0.3-beta.21
2018-11-13 11:41:27 +00:00
Frappe Bot
b5c7b96a73
Merge branch 'staging' into develop
2018-11-13 11:33:31 +00:00
Nabin Hait
3409e55d24
Merge pull request #15974 from Alsum/assign-sa
...
assign-sa-to-group-of-employees
2018-11-13 16:55:17 +05:30
deepeshgarg007
7bc6f3843a
Fix for accounts Receivable Summary Showing zero values
2018-11-13 16:54:54 +05:30
Frappe Bot
25a74b8283
Merge branch 'staging-fixes' into staging
2018-11-13 11:23:06 +00:00
Frappe Bot
a29237beeb
bumped to version 11.0.3-beta.21
2018-11-13 11:23:06 +00:00
Nabin Hait
7fe4124bb8
fix(field property): Made barcode field non-mandatory in item
2018-11-13 16:48:59 +05:30
Frappe Bot
88c88d6e7c
Merge branch 'master' into staging-fixes
2018-11-13 10:59:05 +00:00
Frappe Bot
cb1726d6ec
Merge branch 'hotfix'
2018-11-13 10:55:31 +00:00
Frappe Bot
6b78e520d2
bumped to version 10.1.71
2018-11-13 10:55:31 +00:00
Nabin Hait
688758a56f
fix(test): Fixed item discount amount calculation and test cases related to pricing rule
2018-11-13 16:13:16 +05:30
alsum
e04a753d53
assign-sa-to-group-of-employees
2018-11-13 11:43:58 +02:00
