Rushabh Mehta
|
54ba900e72
|
Merge pull request #17214 from rmehta/auto-assign-issue
feat: auto assign lead/opportunity to lead owner, customer account manager
|
2019-04-12 11:11:59 +05:30 |
|
Nabin Hait
|
851acc30b3
|
Merge pull request #17208 from asbasawaraj/fixed_sanctioned_amount_update_issue
fix: Fixed Sanctioned Amount Update Issue in Expense Claim
|
2019-04-12 11:06:02 +05:30 |
|
Nabin Hait
|
165e92ad5b
|
Merge pull request #17210 from rohitwaghchaure/fix_taxes_and_charges_are_adding_multiple_times
fix: Taxes and charges table not clear the existing rows if the template is changed
|
2019-04-12 11:02:37 +05:30 |
|
Rushabh Mehta
|
4f49ce4124
|
feat: auto assign lead/opportunity to lead owner, customer account manager
|
2019-04-12 09:04:17 +05:30 |
|
Faris Ansari
|
0ff5a7b30f
|
Merge pull request #16827 from Mangesh-Khairnar/so-on-hold
Feature: Sales order on hold
|
2019-04-11 19:29:48 +05:30 |
|
Rohit Waghchaure
|
72cc37e8da
|
fix: Taxes and charges table not clear the existing rows if the template is changed
|
2019-04-11 18:35:15 +05:30 |
|
Basawaraj Savalagi
|
9ce8c3061f
|
Fixed Sanctioned Amount Update Issue in Expense Claim
|
2019-04-11 16:30:11 +05:30 |
|
Mangesh-Khairnar
|
3ab2a18088
|
Merge branch 'develop' into so-on-hold
|
2019-04-11 15:49:06 +05:30 |
|
Faris Ansari
|
6472ed2c1e
|
Merge pull request #16941 from Mangesh-Khairnar/po-on-hold
Feature: Purchase order on hold
|
2019-04-11 15:36:54 +05:30 |
|
Nabin Hait
|
65cca62ef9
|
fixed merge conflict
|
2019-04-11 12:32:43 +05:30 |
|
Nabin Hait
|
89206e74d0
|
fixed merge conflict
|
2019-04-11 12:31:14 +05:30 |
|
rohitwaghchaure
|
92b190febb
|
Merge pull request #17199 from Anurag810/pos_running_items
fix: item order by idx in pos(v12)
|
2019-04-11 11:53:22 +05:30 |
|
Nabin Hait
|
0f62b13dd8
|
Merge pull request #17159 from rohitwaghchaure/sales_return_not_working_for_bundle_items
fix: sales return not working for product bundle items
|
2019-04-11 11:44:57 +05:30 |
|
Nabin Hait
|
961d7ace4a
|
Merge pull request #17189 from nabinhait/sales-person
fix: Made employee optional in sales person
|
2019-04-11 11:37:08 +05:30 |
|
Nabin Hait
|
38351587fc
|
Merge pull request #17197 from nabinhait/training-feedback
fix: training feedback code cleanup
|
2019-04-11 11:36:50 +05:30 |
|
rohitwaghchaure
|
4898d1936b
|
Merge pull request #17200 from Anurag810/pos_running
fix: order by idx(v11)
|
2019-04-11 10:57:05 +05:30 |
|
rohitwaghchaure
|
a6f54aa437
|
Merge pull request #17204 from rohitwaghchaure/fix_test_cases_for_item_variant_develop
fix: item variant test cases(cherry-pick)
|
2019-04-11 10:56:06 +05:30 |
|
rohitwaghchaure
|
22d6eb3eaa
|
Merge pull request #17191 from rohitwaghchaure/asset_depreciation_rate_hotfix
fix: Asset depreciation formula for WDV method, user was not able to edit schedule table for Manula method
|
2019-04-11 09:58:02 +05:30 |
|
rohitwaghchaure
|
6cd114b467
|
Merge pull request #17198 from rohitwaghchaure/fix_auto_assign_payment_entry_to_invoice
fix: don't assign the advance payment entries if Allocate Advances Automatically is disabled
|
2019-04-11 09:57:45 +05:30 |
|
Rohit Waghchaure
|
9665a531fc
|
fix: item variant test cases
|
2019-04-11 09:56:00 +05:30 |
|
rohitwaghchaure
|
2521b1347b
|
Merge pull request #17201 from rohitwaghchaure/fix_test_cases_for_item_variant
Fix: item variant test cases
|
2019-04-10 19:16:51 +05:30 |
|
Anurag Mishra
|
9a2ae67f86
|
fix: order by idx
|
2019-04-10 17:57:23 +05:30 |
|
Rohit Waghchaure
|
f3a9552e48
|
fix: item variant test cases
|
2019-04-10 17:57:09 +05:30 |
|
Anurag Mishra
|
5ab5f77fd4
|
fix: order by idx
|
2019-04-10 17:53:45 +05:30 |
|
Rohit Waghchaure
|
49907e746b
|
fix: test cases
|
2019-04-10 17:33:32 +05:30 |
|
Rohit Waghchaure
|
45d0b31d44
|
fix: test cases
|
2019-04-10 17:25:08 +05:30 |
|
Rohit Waghchaure
|
b286fc99b8
|
fix: don't assign the advance payment entries if Allocate Advances Automatically is disabled
|
2019-04-10 16:16:30 +05:30 |
|
Nabin Hait
|
c8c678f747
|
fix: training feedback code cleanup
|
2019-04-10 15:56:16 +05:30 |
|
Rohit Waghchaure
|
bb0d4e37b9
|
fix: Asset depreciation formula for WDV method, user was not able to edit schedule table for Manula method
|
2019-04-10 03:14:11 +05:30 |
|
Nabin Hait
|
b305f38869
|
fix: Made employee optional in sales person
|
2019-04-09 20:06:11 +05:30 |
|
Mangesh-Khairnar
|
63cf56f406
|
style: change function call to anonymous function call
|
2019-04-09 17:47:25 +05:30 |
|
Nabin Hait
|
7dcdb93596
|
Merge pull request #17178 from Anurag810/timesheet_report_fixes
fix: timesheet_report (WN-SUP41913)
|
2019-04-09 17:28:22 +05:30 |
|
rohitwaghchaure
|
5f2238e98f
|
Merge pull request #17181 from Anurag810/fix_auditing_voucher
fix: Auditing voucher
|
2019-04-09 16:36:03 +05:30 |
|
Anurag Mishra
|
67e6da2086
|
fix: Removed Extra page on generating pdf in print formats
|
2019-04-09 15:19:05 +05:30 |
|
Anurag Mishra
|
ef11d378d4
|
fix: UI on generating pdf in print format
|
2019-04-09 15:19:05 +05:30 |
|
Anurag Mishra
|
ed82e8ba3b
|
fix: removed before from accounts_controlle.pyr and fetch the gl from frontend
|
2019-04-09 15:19:05 +05:30 |
|
Anurag Mishra
|
b62cfffdea
|
fix: Print Auditing print format
|
2019-04-09 15:19:05 +05:30 |
|
Anurag Mishra
|
22867f7fa5
|
fix: added currency
|
2019-04-09 15:06:49 +05:30 |
|
Anurag Mishra
|
3e8b8a4359
|
fix: filters and some conditions
|
2019-04-09 14:34:56 +05:30 |
|
Mangesh-Khairnar
|
b70b048fa2
|
style: change type comparison for boolean expression
|
2019-04-09 12:26:52 +05:30 |
|
Mangesh-Khairnar
|
16c4fd6733
|
Merge branch 'develop' of https://github.com/frappe/erpnext into so-on-hold
|
2019-04-09 12:13:45 +05:30 |
|
Mangesh-Khairnar
|
a2facd4dd2
|
style: change function call to anonymous function
|
2019-04-09 12:07:44 +05:30 |
|
Rushabh Mehta
|
0d3986c9f6
|
fix(dashboard): account timeline for balance sheet accounts
|
2019-04-09 11:36:41 +05:30 |
|
Anurag Mishra
|
17fbafa390
|
fix: filters,added total,only submitted doc,considered fraction
|
2019-04-09 11:31:11 +05:30 |
|
Faris Ansari
|
aac7719dd9
|
fix: Translated string method in Jinja (#17174)
|
2019-04-08 21:50:58 +05:30 |
|
Rushabh Mehta
|
da3f07221c
|
fix(dashboard): accounting timeline query fix
|
2019-04-08 19:38:55 +05:30 |
|
Rushabh Mehta
|
3882a41c51
|
fix(dashboard): simpler way to get account timeline from first principles
|
2019-04-08 19:05:12 +05:30 |
|
Rushabh Mehta
|
2cce72412d
|
Merge pull request #17168 from frappe/revert-17086-check-version-hf
Revert "fix: Raise exception if apps are on incompatible branches"
|
2019-04-08 17:11:15 +05:30 |
|
Rushabh Mehta
|
1412a681f3
|
Revert "fix: Raise exception if apps are on incompatible branches"
|
2019-04-08 17:10:56 +05:30 |
|
Rushabh Mehta
|
fbc56c6d97
|
fix(style): left padding in marketplace view
|
2019-04-08 17:02:22 +05:30 |
|