Himanshu
29d4ae6716
feat(Communication): Move Timeline DocType and Name to Dynamic Links ( #17593 )
...
* fix: ambigious error
2019-05-20 15:14:07 +05:30
Faris Ansari
a1f31e8444
feat(regional): Bank remittance report ( #17524 )
...
feat(regional): Bank remittance report
2019-05-20 15:00:48 +05:30
Mangesh-Khairnar
57c861efc3
feat: add patch to create custom fields for india specific client
2019-05-20 13:08:18 +05:30
Rohit Waghchaure
97d2a46052
feat: added checkbox in the filter of general ledger to show opening entries
2019-05-20 12:28:57 +05:30
Anurag Mishra
fc86df6453
fix: Allow return if delivery note or sales order is required in selling settings(v12) ( #17631 )
...
* fix: Allow retrun if delivery note or sales order is required in selling settings
* fix: combined condition
* style: refactor
2019-05-18 13:03:08 +05:30
Deepesh Garg
2cab66cda1
Merge pull request #17658 from deepeshgarg007/territory_item_code_develop
...
fix: Inactive Sales Item report fixes
2019-05-17 16:20:30 +05:30
deepeshgarg007
a4c9134d33
fix: Inactive Sales Item report fixes
2019-05-17 16:19:15 +05:30
Deepesh Garg
e796d2844c
fix: Unable to create item variant based on manufacturer ( #17652 )
...
* fix: Unable to create item variant against manufacturer
* fix: Spacing fixes
* fix: Spacing fixes in item.js
2019-05-17 15:39:22 +05:30
Nabin Hait
9764eff1a4
Merge branch 'develop' into gle-opening-stock-reco-dev
2019-05-17 14:34:39 +05:30
rohitwaghchaure
c356fef9c4
Merge pull request #17599 from Anurag810/bom_items_and_scraps
...
feat: added report for showing complete hierarchy of bom with item details and scraps
2019-05-17 11:22:12 +05:30
Rohan
a094560b8b
fix(tests): Save batch instead of submitting it ( #17637 )
2019-05-16 19:44:55 +05:30
Rushabh Mehta
8ec3718aba
Merge pull request #17625 from rmehta/link-preview-item-task
...
fix: link preview for item and task
2019-05-16 19:35:05 +05:30
Nabin Hait
06c8cf4321
fix: BOM Item rate based on uom conversion factor and exchange rate
2019-05-16 19:23:00 +05:30
Anurag Mishra
15e2546846
Merge branch 'develop' into bom_items_and_scraps
2019-05-16 18:24:04 +05:30
Nabin Hait
3f119ec256
fix: GL Entry for opening stock reconciliation
2019-05-16 17:29:10 +05:30
Anurag Mishra
dd5d4c49c4
fix: indent
2019-05-16 17:08:44 +05:30
Rohit Waghchaure
cb4e28fb31
fix: changed fieldtype from data to float
2019-05-16 17:01:05 +05:30
Shivam Mishra
8a976ba8ab
feat: LMS is now compatible with Frappe Theme ( #17600 )
...
* style: UI fixes for frappe_theme compatibility
* chore: minor ui fixes
2019-05-16 16:38:13 +05:30
Saurabh
1bcdb094ea
Merge pull request #17630 from nabinhait/multi-fixes-dev
...
fix: Multiple small fixes
2019-05-16 15:21:15 +05:30
rohitwaghchaure
144e60a234
Update bom_items_and_scraps.py
2019-05-16 15:03:30 +05:30
Anurag Mishra
39c80789c9
Merge branch 'develop' into bom_items_and_scraps
2019-05-16 14:59:38 +05:30
Rushabh Mehta
a02ab2d3d7
Merge pull request #17635 from nabinhait/add-multiple-items-dev
...
feat: Added 'Add Multiple' options in all sales / purchase transactions
2019-05-16 14:57:03 +05:30
Nabin Hait
3fccfaa7ce
feat: Added 'Add Multiple' options in all sales / purchase transactions
2019-05-16 14:54:05 +05:30
Anurag Mishra
b921d9f94d
Merge branch 'develop' into bom_items_and_scraps
2019-05-16 14:24:16 +05:30
Nabin Hait
2a8c463079
fix: show tasks in project order by due date and status
2019-05-16 13:46:05 +05:30
Nabin Hait
b90fc7fc0d
fix: Get bank account on selection of payment mode in Loan
2019-05-16 13:45:54 +05:30
Nabin Hait
ab1c43dbee
fix: To allow creation of sales invoice without customer
2019-05-16 13:45:36 +05:30
Anurag Mishra
6f619e2bbf
Merge branch 'develop' into subs
2019-05-16 12:52:26 +05:30
Nabin Hait
6b9d64ce1d
refator: Payroll processing and tax calculation ( #17617 )
...
* refactor: Payroll processing and tax calculation
* fix: payroll test cases
* fix: Codacy fixes
* fix: payroll test cases
* fix: removed unwanted code
2019-05-16 11:23:04 +05:30
Anurag Mishra
b6a4a02dc2
Merge branch 'develop' into subs
2019-05-16 10:48:21 +05:30
Himanshu
0e31089af6
validate: if additional salary exists ( #17529 )
2019-05-16 10:35:02 +05:30
Rushabh Mehta
fd6ae67b16
fix: link preview for item and task
2019-05-16 10:25:27 +05:30
Prasad Ramesh
067d3c0c09
fix: made Sales Partner Comission report visible in Selling module ( #17602 )
2019-05-16 10:18:02 +05:30
Mangesh-Khairnar
afb0c4aa43
fix: delete entry on cancellation of transaction
2019-05-15 21:50:34 +05:30
Mangesh-Khairnar
f8f02c508d
feat: create leave ledger entry on leave encashment creation
2019-05-15 21:50:06 +05:30
Mangesh-Khairnar
50037f8609
fix: consider min days remaining as remaining leaves
2019-05-15 21:49:27 +05:30
Anurag Mishra
1a98cce3a4
Merge branch 'develop' into subs
2019-05-15 16:40:03 +05:30
Mangesh-Khairnar
6ba9a128e7
feat: calculate leave balance using ledger entries
2019-05-15 15:53:54 +05:30
Mangesh-Khairnar
964deaca96
test: creation of ledger entries on application submit
2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
201aeeb20d
test: creation of ledger entries on allocation submit
2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
170b8dded8
fix: expiry logic for carry forwarded allocation
2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
9bb4b8e8b2
feat: create expiry ledger entry on allocation period completion
2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
cf8f4bda8f
fix: skip application fetch for non allocation records
2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
783bd89413
feat: handle cancellation workflow for leave application
2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
5448edff2c
feat: delete cancelled allocation from ledger
2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
01490f1560
feat: add cancellation workflow for leave allocation ledger entry
2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
5ad83c06c2
feat: add ledger entries on leave addition
2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
679371e397
feat: get carry forwarded leaves via ledger entries
2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
2b421c39b5
feat: add transaction details in ledger
2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
1de990b2ac
feat: create leave ledger entry
2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
5e2b067107
feat: display carry forwarded allocation days and total leaves allocated
2019-05-15 15:53:52 +05:30
Mangesh-Khairnar
0abf5d340c
fix: carry forwarded allocation period validation
2019-05-15 15:53:52 +05:30
Mangesh-Khairnar
d01863707c
test: pass leave type as params
2019-05-15 15:53:52 +05:30
Mangesh-Khairnar
70cf4a6796
feat: validate leave allocation period to be within expiry limits
2019-05-15 15:53:52 +05:30
Mangesh-Khairnar
99c9cfaaed
feat: generate leave allocation for carry forwarded leaves
2019-05-15 15:53:52 +05:30
Mangesh-Khairnar
4badca54af
feat: validate leave expiry days
2019-05-15 15:53:52 +05:30
Mangesh-Khairnar
0c0bfb1ef0
feat: calculate carry forward leaves allocation
2019-05-15 15:53:52 +05:30
Mangesh-Khairnar
d6c5b6320f
feat: add a field for conditionally displaying carry forwarded leave
2019-05-15 15:53:52 +05:30
Mangesh-Khairnar
e46d3a87ea
feat: set carry forwarded leave allocation
2019-05-15 15:53:52 +05:30
Mangesh-Khairnar
c28d2e4b2a
test: create leave allocation check
2019-05-15 15:53:51 +05:30
Mangesh-Khairnar
bd3b3ea12c
test: create leave type
2019-05-15 15:53:51 +05:30
Mangesh-Khairnar
7c6b6eae5b
feat: set leave allocation on carry forward check
2019-05-15 15:53:51 +05:30
Mangesh-Khairnar
1208ca6a36
feat: add old leaves to track carry forward leave allocation
2019-05-15 15:53:51 +05:30
Mangesh-Khairnar
c182a5687e
feat: add validation for carry forward leave expiry
2019-05-15 15:53:51 +05:30
Mangesh-Khairnar
fd53c64d5d
feat: create carried forward leave expiry option
2019-05-15 15:53:51 +05:30
Mangesh-Khairnar
6e3586423f
fix: multiple changes
2019-05-15 15:50:50 +05:30
Deepesh Garg
0ae1c293d3
fix: Status updater fixes in PO and SO and test coverage for return ( #17491 )
...
* fix: Status updator fixes in sales and purchase cycle
* fix: Test cases for return in so and po
* fix: Resolve conflicts
2019-05-15 12:23:24 +05:30
Saurabh
9da57d79b5
fix: reload docs before creating custom fields ( #17586 )
2019-05-15 11:39:41 +05:30
Mohamed Al Zubaidi
4c0f754a96
Fix typos ( #17601 )
2019-05-15 11:38:56 +05:30
Karthikeyan S
c3779851e4
fix(HR Settings): Unable to save HR Settings ( #17608 )
2019-05-15 11:38:20 +05:30
rohitwaghchaure
d07a3e1de2
fix: limit offset was missing in the get_delivery_notes_to_be_billed method ( #17611 )
2019-05-15 07:46:28 +05:30
rohitwaghchaure
32d91b2c00
fix: not able to create the sales invoice without item code ( #17612 )
2019-05-15 07:41:44 +05:30
Himanshu
abcb6aea00
fix: do not remove assignment when closed ( #17613 )
2019-05-14 20:07:53 +00:00
Mangesh-Khairnar
cf71a84976
style: formatting changes
2019-05-14 18:50:40 +05:30
Mangesh-Khairnar
cd59263736
fix: reload doc on generation of text file
2019-05-14 18:34:14 +05:30
Mangesh-Khairnar
c68ee1fcc6
feat: add account field in payment order
2019-05-14 18:31:14 +05:30
Mangesh-Khairnar
557419a745
feat: load company bank account
2019-05-14 18:30:19 +05:30
Mangesh-Khairnar
d9140dc772
feat: add party bank account field
2019-05-14 18:28:24 +05:30
Mangesh-Khairnar
6175eb2cf9
feat: add validation for fields
2019-05-14 18:25:57 +05:30
Faris Ansari
ec7b064528
fix: Clear messages during setup fixtures
2019-05-14 16:21:09 +05:30
Anurag Mishra
52f31d211d
Merge branch 'develop' into bom_items_and_scraps
2019-05-14 15:29:43 +05:30
Shivam Mishra
621cdeb36a
Merge pull request #17592 from scmmishra/acad-fixes
...
fix: bug fixes in LMS
2019-05-14 15:20:22 +05:30
Anurag Mishra
f1f2a3eed0
feat: added report for showinrg complete hierarchy of bom with item details and scraps
2019-05-14 15:04:26 +05:30
Saurabh
1d90ebb16a
Merge pull request #17579 from rmehta/remove-feedback-trigger
...
fix: remove link to feedback trigger
2019-05-14 14:38:30 +05:30
deepeshgarg007
d9a22726f1
fix: Make territory filter mandatory
2019-05-14 14:36:40 +05:30
Shivam Mishra
776d891b19
fix: test for course
2019-05-14 14:16:50 +05:30
Shivam Mishra
f82d0a6074
fix: show video duration and publish date only if data exists
2019-05-14 12:02:51 +05:30
Deepesh Garg
571c5c8bf1
Merge branch 'develop' into inactive_items_row_develop
2019-05-14 11:54:08 +05:30
Shivam Mishra
2430fd3a4c
chore: show description on course card
2019-05-14 11:24:51 +05:30
Shivam Mishra
f2d62195b0
chore: Minor code improvements
2019-05-14 11:24:45 +05:30
Shivam Mishra
d2c4af154b
fix: Video not found bug
2019-05-14 11:24:40 +05:30
rohitwaghchaure
39be1d43bc
Merge pull request #17546 from rohitwaghchaure/incorrect_payment_amount_if_advance_amount_in_si_develop
...
fix: incorrect payment amount in the payment terms if the sales invoice has the advance amount
2019-05-14 11:15:14 +05:30
Shivam Mishra
51b6fe2b8d
feat: Allow disbaling LMS ( #17587 )
2019-05-14 10:22:15 +05:30
deepeshgarg007
4dcba49b5f
fix: Do not append row if item is sold within days since last order
2019-05-14 08:53:24 +05:30
Anurag Mishra
73706f85aa
feat: Bank remittance report for tracking payroll-entry transactions ( #17013 )
...
* feat: Bank remittance report for tracking payroll-entry transactions
* feat: show Company bank account and bank name
* feat: Added Permissions to view report
* feat: Validated report only if debit account is present
* fix: query optimisation
* feat: Added From date and To date filters
* fix: code optimisation
* fix: requested changes
* fix: requested changes and refactor
* style: indentation
* style: Formatting
* fix: added parameter filters
2019-05-13 19:03:21 +05:30
Deepesh Garg
dbf9251324
Merge branch 'develop' into blanket_order_in_selling_module_page
2019-05-13 16:49:47 +05:30
Basawaraj Savalagi
09bafc6d10
feat: Added Link to Blanket Orded in Selling Module Page
2019-05-13 14:59:19 +05:30
Rushabh Mehta
cb83742859
fix: remove link to feedback trigger
2019-05-13 14:19:09 +05:30
Saurabh
9706aaab65
Merge pull request #17556 from Alchez/develop-lead-import-fix
...
feat(crm): Allow leads to be imported without person name
2019-05-13 12:10:12 +05:30
Saurabh
1ab0b78ece
Merge pull request #17569 from Mangesh-Khairnar/training-event-fix
...
feat: validate training event period
2019-05-13 11:47:39 +05:30
