Commit Graph

29090 Commits

Author SHA1 Message Date
deepeshgarg007
45f57f273c fix: Serial no validation against sales invoice 2019-11-29 15:56:08 +05:30
Nabin Hait
e0912e4fcc Merge branch 'v12-pre-release' into version-12 2019-11-25 15:11:24 +05:30
Nabin Hait
4d12f8acab bumped to version 12.2.0 2019-11-25 15:31:23 +05:50
Nabin Hait
c856cb85d9 log: Change log for v12.2.0 2019-11-25 15:08:47 +05:30
Nabin Hait
35e8d1e1d7
Stock acc bal sync msg (#19676)
* fix: Prefilled JV via Account Balance and Stock Value mismatch error message

- Make JV button will route to Journal Entry and add rows in child table

* fix: make journal entry to sync stock and account balance

* fix: translated action label
2019-11-25 14:02:51 +05:30
Saqib
cd3976f7d2 Asset cancellation fix (#19671)
* fix: remove asset movement mandatory fields

* fix: label for reference doctype
2019-11-25 12:24:34 +05:30
Saqib
f37a46edea Fixed Asset Refactor Review fixes (#19665)
* fix: fixed asset item creation ux fixes

* fix: auto creation of asset ux fixes

* fix: [LCV] incorrect condition when checking assets linked with PR

* fix: bulk update assets

* refac: remove company level cwip enabling
* cwip can be enabled only on category level

* fix: #19649
2019-11-22 16:32:50 +05:30
thefalconx33
fa42999314 fix: last purchase rate greater than selling price 2019-11-22 12:15:41 +05:30
Nabin Hait
7af153da50
fix: Multiple fixes related to landed cost accounting (#19656) 2019-11-22 11:35:14 +05:30
Saqib
150c44b350 fix: asset movement ux fixes (#19641) 2019-11-22 11:08:35 +05:30
rohitwaghchaure
225d38e797
Merge pull request #19634 from rohitwaghchaure/cherry-pick_of_item_query_issue
Cherry pick of item query issue
2019-11-21 11:05:13 +05:30
Rohit Waghchaure
a831848074 fix: code cleanup 2019-11-20 19:42:27 +05:30
Rohit Waghchaure
eed30c6d8c fix: not able to select item in sales order 2019-11-20 19:42:11 +05:30
Nabin Hait
9db9edca2c fix(expense claim): fetch outstanding documents based on party account type 2019-11-19 18:44:54 +05:30
Mangesh-Khairnar
3f854fce2e feat: fetch leave approver from both employee and department approvers (#19613)
* fix: fetch leave approvers from both department and employee master

* fix: creaate a set of approvers
2019-11-19 15:07:30 +05:30
RJPvT
a998978415 fix: pending on review date (#19609)
* fix: On Specific case if no item code in name

* fix: pending on review date
2019-11-19 14:54:38 +05:30
Deepesh Garg
87c6718d90 fix: Book valuation expense in specified account rather than expense included in valuation account (#19590)
* fix: Book valuation expense in specified accout rather than expense included in valuation account

* fix: Remove undefined variable

* fix: Test cases

* fix: Test Case
2019-11-18 12:34:30 +05:30
Saqib
d995609ffa Fixed asset refactor (#19369)
* refactor: Asset Movement with multiple assets using table

* refactor: Create Asset Movement from Asset List & Linking PR/PI with Asset

* feat: Auto create asset on Purchase checkbox

* refactor: LCV for asset created via PR/PI

* refactor: get asset category accounts from item master

* refactor: Purchase Receipt for asset purchasing

* refactor: Purchase Invoice for asset purchasing

* fix: post-refactor delete fixes

* refactor: moved asset validation from pr/pi on asset submission

* fix: Asset Category should be defined for auto purchasing assets

* fix: undo serial_no_update removal (for non asset item) from LCV

* fix: remove duplicate calls from item.js

* fix: args position of all occurrence of get_asset_category_account()

* fix: test cases

* fix: landed cost voucher validations

* refactor: test case for auto creation of asset

* fix: removed invalid assertions

* fix: patch errors on travis

* fix: codacy fixes

* fix: PI Items not fetching details from item

* fix: asset movement from list view having default purpose 'Receipt'

* chore: msgprint for selecting item code first while creating asset manually

* fix: alert messages

* minor: asset movement fixes

* fix: lcv was made against submitted assets

* minor: ux fixes

* refac: move specific asset validation to SINV

* chore: remove make_purchase_invoice from asset form
* make asset movement on asset submission
* add PR & PI queries based on item code

* refac: not allow last movement cancellation
* move asset movement creation on asset submission
* asset movement naming series
* add tests

* fix: code review changes

* chore: remove unecessary asset movement updation

* refac: setting latest location while making asset movements
* Added extra validations

* fix: form dashboard make lcv button

* fix: auto asset movement creation validation

* fix: allow lcv against other items after removing submitted assets

* chore: remove unwanted condition

* fix: mismatch debit credit on  purchase of asset with valuation tax

* chore: toggle required field based on movement type

* chore: fix lcv error message

* fix: travis failing

* fix: travis failing test

* fix: wrong conditions after merge

* fix: cannot cancel assets

* fix: travis failing* fix change in deletion of assets

* fix: codacy

* fix: process cancellation of assets

* refac: cancellation of pr only deletes auto created assets

* fix: incorrect query
2019-11-18 11:46:55 +05:30
rohitwaghchaure
6424416886 fix: sales order item shwoing incorrect produced qty (#19584) 2019-11-15 14:18:45 +05:30
Anurag Mishra
28a7ce9a50 fix: On Specific case if no item code in name 2019-11-15 14:01:07 +05:30
rohitwaghchaure
16f6ca12a7
Merge pull request #19023 from Alchez/dev-work-order-bugs
fix: Work Order operating cost re-calculation on client-side (develop)
2019-11-15 11:19:10 +05:30
rohitwaghchaure
c74c5d5644
Merge pull request #19583 from rohitwaghchaure/fixed_stock_rec_showing_incorrect_current_qty_and_serial_no
fix: stock reconciliation showing incorrect current serial no and qty
2019-11-15 10:17:11 +05:30
Deepesh Garg
0a23e1aea5
Merge pull request #19586 from prssanna/dashboard-fix
fix: Ignore Period Closing Voucher entries in Accounts dashboard
2019-11-15 08:21:02 +05:30
prssanna
74bbcb539f fix: Ignore period closing voucher entries in accounts dashboard 2019-11-14 22:47:58 +05:30
Mangesh-Khairnar
f1e6387fab
Merge pull request #19585 from frappe/leave-approver-employee-fix
fix: fetch approver from employee
2019-11-14 19:28:22 +05:30
Mangesh-Khairnar
d545f6fb6b
fix: fetch approver from employee 2019-11-14 19:26:49 +05:30
Rohit Waghchaure
cf55c9c6da fix: stock reconciliation shwoing incorrect current serial no and qty 2019-11-14 18:22:20 +05:30
Marica
c9e8a1bf96 fix: Account Balance and Stock Value out of sync error message (#19526)
* fix: Account Balance and Stock Value out of sync error message

Added 'Make Adjustment Entry' button and enhanced message

* fix: Split message and changed routing for translation
2019-11-14 16:13:43 +05:30
rohitwaghchaure
e942f99897
Update work_order.js 2019-11-14 15:26:18 +05:30
Nabin Hait
ec082754b4
fix: One serial no can be tagged in multiple invoices if used against different items (#19580) 2019-11-14 13:28:24 +05:30
Deepesh Garg
d69d0e3046 fix(patch): skip leave ledger entry creation for denied leaves (#19579) 2019-11-14 13:05:13 +05:30
Mangesh-Khairnar
fc3b924d4d fix: skip leave ledger entry creation for denied leaves (#19556)
* fix: skip leave ledger entry creation for denied leave application

* patch: remove incorrect leave ledger entries

* fix: create reverse ledger entry before setting status to cancel
2019-11-14 12:02:10 +05:30
Himanshu
5503b6cff5 fix(Task): Do not create/schedule task after project end (#19184)
* fix: do not create/schedule task after project end

* fix: check difference between dates

* fix: check project date

* fix: task creation

* fix: tests
2019-11-14 10:11:25 +05:30
Saqib
73616d6b33 fix: duplication while bulk creation of item tax template (#19570) 2019-11-14 10:09:44 +05:30
Deepesh Garg
95a6320459
Merge pull request #19576 from marination/cwip-patch-fix
fix(patch): Enable CWIP Accounting
2019-11-13 22:18:12 +05:30
Himanshu
1ad2d4a962 fix: get tags for rfq (#19564)
* fix: get tags for rfq

* chore: remove console log
2019-11-13 19:21:52 +05:30
marination
9ffa9d4a64 fix(patch): Enable CWIP Accounting 2019-11-13 19:10:20 +05:30
Mangesh-Khairnar
af7fe1937e fix: fetch leave approver defined in employee in leave application (#19559)
* fix: fetch leave approver defined in employee in leave application

* Update department_approver.py
2019-11-13 19:00:56 +05:30
Saqib
3e515e704d Monthly distribution of depreciation amount (#19493)
* feat: allow monthly distribution of depreciation amount

* chore: added comments

* fix: monthly depr was not starting from use date's month
2019-11-13 19:00:24 +05:30
rohitwaghchaure
94565d69d1 fix: travis failing (#19568) 2019-11-13 18:58:22 +05:30
Nabin Hait
732d6afad5
fix: Show AR summary based on outstanding (#19573) 2019-11-13 18:49:23 +05:30
rohitwaghchaure
d064505ebe fix: incorrect produced qty in the production plan (#19569) 2019-11-13 18:17:48 +05:30
rohitwaghchaure
ba8fc21594 fix: merge similar entries for serialized items in stock reconciliation (#19408) 2019-11-13 18:11:58 +05:30
Nabin Hait
3a72cb46bc
fix: Set due date in accounts receivable based on payment terms (#19563) 2019-11-13 17:58:10 +05:30
Deepesh Garg
082bfb8cb3
Merge pull request #19567 from deepeshgarg007/balance_sheet_develop
fix: Accumulated Values filter disappearing
2019-11-13 17:46:46 +05:30
deepeshgarg007
5ea4328359 fix: Accumulated Values filter disappearing 2019-11-13 13:23:49 +05:30
Rohan
4d27b50437
Merge branch 'develop' into dev-work-order-bugs 2019-11-13 13:09:12 +05:30
rohitwaghchaure
ffbfaf7099 fix: email digest showing incorrect upcoming events (#19552) 2019-11-13 10:59:23 +05:30
Mangesh-Khairnar
06c8129574 fix(batch): fetch company on splitting the batch (#19558) 2019-11-13 10:51:43 +05:30
Marica
d00c59830e feat: Disable CWIP Accounting checkbox added in Company and Asset Category (#19262)
* feat: Disable CWIP Accounting checkbox added in Company and Asset Category

Asset Settings is removed completely
Disable CWIP Accounting checkbox will give priority to Asset Category

* fix: Changed checkbox name to 'Enable Capital Work in Progress Accounting'

- checkbox will be disabled by default
- Enabling it in Company will globally enable it
- When globally disabled , it's value on the asset category will be considered

* chore: Added patch to set pre-existing CWIP checkbox value into new checkbox

* fix(test): Asset

* fix: Asset Test and Patch

* fix(test): Opening Invoice Creation Tool

* Update asset.py

* fix: Patch and other fixes
2019-11-12 19:17:43 +05:30