Sahil Khan
|
f6a9eec23a
|
Merge branch 'hotfix'
v11.1.23
|
2019-04-29 16:35:41 +05:30 |
|
Sahil Khan
|
5742d0836e
|
bumped to version 11.1.23
|
2019-04-29 16:55:41 +05:50 |
|
Faris Ansari
|
0735165ef3
|
fix: Make Customer and lead field dynamic in quotations and opportunity (#17097)
fix: Make Customer and lead field dynamic in quotations and opportunity
|
2019-04-28 20:46:39 +05:30 |
|
rohitwaghchaure
|
db12f75681
|
Merge pull request #17385 from surajshetty3416/fix-price-list-hotfix
fix: Price list conversion for other UOM from stock UOM item price
|
2019-04-26 12:06:46 +05:30 |
|
Suraj Shetty
|
36a8c431f5
|
fix: Typo
|
2019-04-26 11:18:26 +05:30 |
|
Suraj Shetty
|
5a67431daa
|
fix: Price list for UOM other than stock UOM
-Fixes conversion from default UOM item price to other UOMs
|
2019-04-26 11:18:13 +05:30 |
|
Nabin Hait
|
c4e92b3004
|
Merge pull request #17381 from nabinhait/tax-exemption
refactor: Employee Tax Exemption
|
2019-04-26 00:20:27 +05:30 |
|
Nabin Hait
|
2d90e8a2de
|
fix: test cases
|
2019-04-25 22:29:49 +05:30 |
|
Nabin Hait
|
4a950abf2e
|
fix: test cases
|
2019-04-25 21:42:01 +05:30 |
|
Nabin Hait
|
7f10f4eea1
|
Merge pull request #17376 from rohitwaghchaure/trial_balance_error_finance_book
fix: Trial balance finance book issue
|
2019-04-25 20:35:09 +05:30 |
|
Nabin Hait
|
5c93260eec
|
Merge pull request #17377 from nabinhait/pos-advance-hotfix
fix: Don't allocate advance if pos
|
2019-04-25 20:33:59 +05:30 |
|
Nabin Hait
|
485d9c133a
|
fix: test cases
|
2019-04-25 19:54:20 +05:30 |
|
deepeshgarg007
|
891d9aeee9
|
fix: Remove method from validation
|
2019-04-25 19:19:01 +05:30 |
|
deepeshgarg007
|
51f0d6d409
|
fix: Remove fetch_from from customer name
|
2019-04-25 18:56:08 +05:30 |
|
Nabin Hait
|
80374be724
|
refactor: Employee Tax Exemption
|
2019-04-25 18:44:32 +05:30 |
|
Nabin Hait
|
619bf561da
|
fix: Don't allocate advance if pos
|
2019-04-25 17:47:26 +05:30 |
|
Rohit Waghchaure
|
13c15d0222
|
fix: Trial balance finance book issue
|
2019-04-25 17:46:44 +05:30 |
|
deepeshgarg007
|
3d31bccaf6
|
fix: Change dynamic_field name and minor fixes
|
2019-04-25 17:29:21 +05:30 |
|
deepeshgarg007
|
3959bf34ee
|
Merge branch 'hotfix' of https://github.com/frappe/erpnext into quotation-fix
|
2019-04-25 14:57:56 +05:30 |
|
rohitwaghchaure
|
126c4efb2c
|
Merge pull request #17357 from rohitwaghchaure/fix_straight_line_asset_depreciation
fix: Straight line asset depreciation not working if Expected Value After Useful Life is defined
|
2019-04-25 10:23:15 +05:30 |
|
Rohit Waghchaure
|
7d0bc2bd5a
|
fixed test cases
|
2019-04-25 01:26:27 +05:30 |
|
Nabin Hait
|
0c70ae44c3
|
Merge pull request #17366 from chdecultot/plaid_settings_erro
fix: Better error message for plaid setting
|
2019-04-24 23:15:02 +05:30 |
|
Nabin Hait
|
024dc4a4c9
|
Merge pull request #17316 from alyf-de/validate_iban
feat(accounts): validate Bank Account's IBAN
|
2019-04-24 22:57:04 +05:30 |
|
Deepesh Garg
|
e3567ff31b
|
Merge pull request #17363 from deepeshgarg007/inactive_items_hotfix
feat: Inactive items hotfix
|
2019-04-24 22:30:34 +05:30 |
|
Charles-Henri Decultot
|
97842ca804
|
fix: cleanup development
|
2019-04-24 18:15:46 +02:00 |
|
Charles-Henri Decultot
|
d14799a9fa
|
fix: verbose error message when api keys are not setup
|
2019-04-24 18:06:14 +02:00 |
|
Raffael Meyer
|
e534221245
|
fix: validate IBAN only if it exists
|
2019-04-24 16:22:34 +02:00 |
|
Raffael Meyer
|
4acfec901e
|
Merge branch 'hotfix' of https://github.com/frappe/erpnext into validate_iban
|
2019-04-24 16:15:35 +02:00 |
|
deepeshgarg007
|
a981a8a153
|
fix: Ignore sql injections
|
2019-04-24 15:14:23 +05:30 |
|
deepeshgarg007
|
11e1c60cd3
|
fix: Typo fixes
|
2019-04-24 15:13:59 +05:30 |
|
deepeshgarg007
|
fe7baae9f7
|
fix: Ordering and datatype fixes in inactive items report
|
2019-04-24 15:13:46 +05:30 |
|
deepeshgarg007
|
da64113b9a
|
feat: Logic for query and report creation for inactive items
|
2019-04-24 15:13:28 +05:30 |
|
rohitwaghchaure
|
fb76cb7a78
|
Merge pull request #17301 from rohitwaghchaure/fixed_received_qty_showing_incorrect
fix: received qty in the purchase order item showing incorrect if user has returned the rejected quantity
|
2019-04-24 15:08:39 +05:30 |
|
deepeshgarg007
|
1bd69b4490
|
fix: Reordered and deleted unnecessary filters
|
2019-04-24 15:06:48 +05:30 |
|
deepeshgarg007
|
62d51d82ea
|
feat: Added filters and columns for inactive items report
|
2019-04-24 15:06:23 +05:30 |
|
deepeshgarg007
|
6ddc554965
|
fix: Merge branch hotfix into quotation-fix
|
2019-04-24 14:53:30 +05:30 |
|
Rohit Waghchaure
|
5a6fc77751
|
fix: Straight line asset depreciation not working if Expected Value After Useful Life is defined
|
2019-04-24 11:40:37 +05:30 |
|
Nabin Hait
|
733db826ec
|
Merge branch 'hotfix' into validate_iban
|
2019-04-23 21:39:47 +05:30 |
|
Nabin Hait
|
6643156df6
|
Merge pull request #17347 from nabinhait/invoice-advances
fix: don't allocate advances if POS
|
2019-04-23 21:36:29 +05:30 |
|
Nabin Hait
|
6022f2bcf8
|
Merge pull request #17349 from rohitwaghchaure/invoiced_items_gross_margin_api
feat: Get invoiced item's gross margin using API
|
2019-04-23 21:36:02 +05:30 |
|
Nabin Hait
|
b890492dc0
|
Merge pull request #17348 from nabinhait/salary-slip-rounded
fix: Rounded tax amount in salary slip
|
2019-04-23 21:35:34 +05:30 |
|
Rohit Waghchaure
|
6ea108f01d
|
feat: Get invoiced item's gross margin using API
|
2019-04-23 18:56:26 +05:30 |
|
Nabin Hait
|
628bed1f5a
|
Merge branch 'hotfix' into validate_iban
|
2019-04-23 18:41:46 +05:30 |
|
Nabin Hait
|
4c0e3aa097
|
Merge pull request #17341 from Alchez/hotfix-return-deliveries
fix(selling): Fix method to also consider return documents
|
2019-04-23 18:41:11 +05:30 |
|
Nabin Hait
|
631e334a3f
|
Merge pull request #17338 from chdecultot/bank_reco_corrections
fix: Bank reconciliation corrections
|
2019-04-23 18:40:03 +05:30 |
|
Nabin Hait
|
8f4d92eba2
|
Merge branch 'hotfix' into validate_iban
|
2019-04-23 18:39:12 +05:30 |
|
Deepesh Garg
|
2f4193757e
|
fix: Stock Ledger report fix (#17342)
|
2019-04-23 17:30:11 +05:30 |
|
Rohan Bansal
|
cba64988df
|
fix(selling): Fix method to also consider return documents
|
2019-04-23 16:39:09 +05:30 |
|
Nabin Hait
|
17e6fce486
|
fix: Rounded tax amount in salary slip
|
2019-04-23 15:51:28 +05:30 |
|
Nabin Hait
|
05fb3f2d75
|
fix: don't allocate advances if POS
|
2019-04-23 15:49:38 +05:30 |
|