Commit Graph

29480 Commits

Author SHA1 Message Date
Mangesh-Khairnar
c436d93303 fix: reset pos profile when default doesn't exists 2019-11-19 18:21:53 +05:30
Pranav Nachnekar
e13b769813
use nowdate instead of date.today()
Co-Authored-By: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2019-11-19 12:04:30 +00:00
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
Joseph Marie Alba
2578d49b84 Correct bug in abbr cause by missing " " separator (#19605)
Only 1 letter ABBR is generated after typing in a COMPANY NAME separated by spaces. This is due to missing " " value in split method.

For example: 

Company Name:    ABC Multiple Industries
Generates Abbr:     A
Correct Abbr should be:  AMI

This is caused by mission " " in split method.
2019-11-19 14:54:09 +05:30
Shivam Mishra
776ff2f75d fix: query for item group listing (#19604) 2019-11-19 14:51:25 +05:30
Mangesh-Khairnar
f3ecfd8e58 fix: fetch leave approvers from both department and employee master (#19611)
* fix: fetch leave approvers from both department and employee master

* fix: creaate a set of approvers
2019-11-19 14:50:05 +05:30
0Pranav
539ea2cefb Rename doctype Appointment Booking Slots 2019-11-19 10:59:24 +05:30
0Pranav
b9460ed22c switched ORM methods for single SQL query 2019-11-19 10:46:07 +05:30
Deepesh Garg
ee69f707a9
Merge pull request #19600 from rohitwaghchaure/make_email_queue_issue_in_pos
fix: 'NoneType' object has no attribute 'replace' in POS
2019-11-19 09:47:55 +05:30
deepeshgarg007
0debcf9f2f fix: Share existing condition logic 2019-11-18 22:12:29 +05:30
Khushal Trivedi
ea7979234d Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2019-11-18 19:37:48 +05:30
deepeshgarg007
9c1c4ef3dd refactor: Share transfer cancellation and code cleanup 2019-11-18 17:52:19 +05:30
rohitwaghchaure
8131f7657e
Merge pull request #19601 from rohitwaghchaure/fix_set_query_not_working_for_department_field
fix: not able to select department in instructor form
2019-11-18 16:40:42 +05:30
marination
6ef057a2a3 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
2019-11-18 15:55:32 +05:30
Anurag Mishra
c0d8233a8b fix: Raw material qty depending on the quantity of the parent BOM 2019-11-18 15:45:53 +05:30
Rohit Waghchaure
39eeac265b fix: not able to select department in instructor form 2019-11-18 15:20:15 +05:30
Rohit Waghchaure
466702200f fix: 'NoneType' object has no attribute 'replace' in POS 2019-11-18 14:57:55 +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
gavin
487da8308f
Merge branch 'develop' into updated-requirements 2019-11-15 18:36:28 +05:30
Gavin D'souza
73089470b1 chore: pinned backwards compatible dependencies 2019-11-15 17:38:32 +05:30
Mangesh-Khairnar
f69b9a8c47 fix: fetch default pos profile user for the company 2019-11-15 16:54:26 +05:30
0Pranav
53b65ab8ed Add status expired to doctype quotation 2019-11-15 16:42:32 +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
Gavin D'souza
3798f8bd25 style(requirements): alphabetically sorted requirements 2019-11-15 13:59:15 +05:30
Khushal Trivedi
420359284f Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2019-11-15 13:24:23 +05:30
marination
a076bddd83 fix: Show 'Bill of Materials' custom button conditionally 2019-11-15 12:03:06 +05:30
0Pranav
18fda5a571 add appointment list to module page 2019-11-15 11:58:21 +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
deepeshgarg007
57bd1308eb fix: Validation messages code cleanup 2019-11-15 08:25:48 +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
0Pranav
511780a4d4 feat: configurable redirect on success 2019-11-14 12:47:08 +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
0Pranav
793ba8fc06 pretty timezone names 2019-11-14 11:25:49 +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