Mohammed R Abukhamseen
8662a4f677
POS - Translate some text & numpad ( #14765 )
...
* make label & placeholder translatable
* numpad translatable
* Update point_of_sale.js
remove debugger
2018-07-01 16:44:09 +05:30
Nabin Hait
e3daaa63f0
Payroll fixes ( #14758 )
...
* Ignore calculating tds if amount/formula is mentioned in salary structure
* [fix] Paid amount in Journal Entry from Payroll Entry
* fix codacy
2018-07-01 16:43:34 +05:30
Ranjith Kurungadam
b1a756cc9f
HRA Indian regional - field basic in company, calc changes ( #14757 )
2018-07-01 16:42:38 +05:30
rohitwaghchaure
1501a6e58e
[Fix] Data missing issue in stock ledger report ( #14755 )
2018-07-01 16:42:00 +05:30
rohitwaghchaure
01fe4a3726
[Fix] Consider the cancelled purchase receipt in backflush raw materials ( #14753 )
2018-07-01 16:41:39 +05:30
Ranjith
69b03a3b53
fix typo
2018-06-29 20:14:20 +05:30
rohitwaghchaure
c5183b7c2a
Merge pull request #14756 from rohitwaghchaure/fix_patch_for_set_salary_component_properties
...
[Fix] Patch
2018-06-29 19:02:38 +05:30
Rohit Waghchaure
4178030c99
[Fix] Patch
2018-06-29 17:54:25 +05:30
Ranjith Kurungadam
fd7ef2e15c
Salary Component - field display, value dependency ( #14747 )
2018-06-29 16:53:56 +05:30
Ranjith Kurungadam
b402ccc0b5
Payroll Entry - make only one JE, separate JE for Flexi ( #14752 )
2018-06-29 16:48:49 +05:30
Nabin Hait
b192a4af77
reload doc in patch
2018-06-29 15:30:41 +05:30
Nabin Hait
6e86fb2540
Set user permissions for new departments based on company
2018-06-29 14:36:45 +05:30
Nabin Hait
c114ceb67d
Set salary component properties in existing components and salary structures
2018-06-29 14:36:45 +05:30
Manas Solanki
ee32a78e9f
Update bom_stock_calculated.py
2018-06-29 13:33:32 +05:30
Nabin Hait
104f62090d
Add filters for cost center in Budget Variance report
2018-06-29 12:25:03 +05:30
Himanshu Mishra
7aabef2026
Add configurable frequency in Selling Settings for update of project … ( #14670 )
...
* Add configurable frequency in Selling Settings for update of project and company
* remove redundant code
* remove redundant code, only trigger calculation if order/invoice is present
* removed dangling commas as per common convention in hooks
* fix:handling multiple documents
* Update selling_settings.json
2018-06-28 23:43:23 +05:30
Nabin Hait
d0c6184e24
minor patch fixes
2018-06-28 23:42:55 +05:30
rohitwaghchaure
191876f51b
[Fix] Bank Account mandatory ( #14734 )
2018-06-28 23:28:58 +05:30
Ranjith Kurungadam
a10f118ddd
Payroll Entry - Validate Attendance ( #14738 )
2018-06-28 23:28:07 +05:30
Nabin Hait
7324815fdb
map payment terms template from SO to SI
2018-06-28 23:12:02 +05:30
Charles-Henri Decultot
52fb43fc4f
Add no copy to payment terms template ( #14725 )
2018-06-28 23:06:30 +05:30
Charles-Henri Decultot
97fa94e77d
Journal and Entry number correction ( #14720 )
2018-06-28 23:05:58 +05:30
Cadmandata
d673afccf2
Updated comment in make_stock_entry() function ( #14726 )
...
Purpose flag is used in make_stock_entry(**args) function, but it was not included in the comment inside the function.
2018-06-28 23:05:32 +05:30
Ranjith Kurungadam
f6e654eccc
Payroll Entry - fix deduct taxes ( #14730 )
2018-06-28 23:04:51 +05:30
rohitwaghchaure
cae945e743
Added validation and fixes UX for asset ( #14727 )
2018-06-28 23:04:25 +05:30
Ranjith Kurungadam
6ceed038e6
Fix benefits ( #14735 )
...
* Employee Benefit Application - fix typo
* Employee Benefits - fix field renamed
2018-06-28 23:02:58 +05:30
Manas Solanki
3ff7f79cc7
Merge pull request #14740 from manassolanki/fix-20
...
[minor] fix for the args in the frm.call
2018-06-28 20:47:25 +05:30
Manas Solanki
89e7f8b387
[minor] fix for the args in the frm.call
2018-06-28 20:44:53 +05:30
Rohit Waghchaure
ed71c36748
[Fix] Not able to save subcontracted purchase receipt
2018-06-28 18:36:35 +05:30
Ranjith Kurungadam
b66bde32f8
Payroll Entry - fix only one employee fetched ( #14718 )
2018-06-28 14:40:29 +05:30
Charles-Henri Decultot
8b22310d66
Allow auto repeat update ( #14706 )
...
* Allow auto repeat update
* Allow auto-repeat reference update
2018-06-28 14:27:58 +05:30
Zarrar
254ce645b1
[ Enhance ] Setup Wizard - Chart of Accounts ( #14698 )
...
* enable selection of coa for user
Give user option to select coa that's been verified along with standard and standard with numbers. Also added a button that opens a dialog and renders the selected chart
* read chart from file and make a tree render-able dict of it
* tree method to return node data for coa setup wizard
2018-06-28 14:15:34 +05:30
Shreya Shah
2fbc8509f5
Fix error message ( #14716 )
2018-06-28 14:14:28 +05:30
Pawan Mehta
c7897e491d
[fix] #14714 ( #14715 )
2018-06-28 14:13:56 +05:30
KanchanChauhan
168e66b107
Blanket Order translation fix for DE ( #14711 )
2018-06-28 14:13:24 +05:30
rohitwaghchaure
e27b85de4f
Added test cases for Overproduction against Work Order / Sales Order ( #14704 )
2018-06-28 12:48:28 +05:30
rohitwaghchaure
4c23be1821
Added test cases for subcontract ( #14702 )
2018-06-28 11:18:37 +05:30
Prateeksha Singh
5d227c9028
Revert "[hub] add link in modules"
2018-06-28 09:59:46 +05:30
Prateeksha Singh
84d358bd0a
Merge pull request #14708 from pratu16x7/hub-fixes
...
[hub] add link in modules
2018-06-28 03:23:03 +05:30
Prateeksha Singh
2e0b5140e7
[hub] add link in modules
2018-06-28 03:17:39 +05:30
Manas Solanki
4933e6bfeb
Update test_finance_book.py ( #14703 )
2018-06-27 17:30:09 +05:30
Ranjith Kurungadam
23e235395e
Salary Slip - remove check query limited to one ( #14699 )
2018-06-27 17:29:40 +05:30
Shreya Shah
f2f54e741b
Merge pull request #14701 from shreyashah115/testing-1
...
[minor] Blanket order
2018-06-27 16:00:02 +05:30
Shreya
32b57da335
Make supplier_name and customer_name fields read only
2018-06-27 15:20:33 +05:30
Shreya
18bed504dc
Set target qty 0
...
If the ordered qty exceeds the quantity in blanket order items, on routing to a new Purchase order or Sales order, set target qty as 0 to avoid negative qty.
2018-06-27 15:14:43 +05:30
Manas Solanki
b912374b96
[test] check the finance book via the journal entry
2018-06-27 15:07:15 +05:30
rohitwaghchaure
67d87e29e3
[Fix] Wrong rate calculation in Itemwise sales register report for multi uom ( #14690 )
2018-06-27 11:22:03 +05:30
Ranjith Kurungadam
53cdbe960e
Salary Slip - fix query ( #14693 )
2018-06-27 11:15:39 +05:30
Jamsheer
86aed90a5c
[Fix] - Get payroll period days ( #14686 )
...
* Fix - get_payroll_period_days
* Fix - get_payroll_period_days
2018-06-27 11:13:20 +05:30
Deepak kumar
55cf6c5f7e
Membership ( #14688 )
...
* Correct the label and field name
* Update membership.json
2018-06-27 09:17:33 +05:30
rohitwaghchaure
f3cf15fa0d
[Fix] While saving project getting timeout error ( #14672 )
2018-06-26 17:06:00 +05:30
Nabin Hait
e2a8120ef8
ignore user permissions for some fields
2018-06-26 15:27:34 +05:30
Prateeksha Singh
34aeefc0a1
[fix] yet another python attribute fetch
2018-06-26 12:18:29 +05:30
Manas Solanki
7707cee6b7
Merge pull request #14676 from KanchanChauhan/allow-only-submitted-bo
...
Allow only submitted Blanket Order in PO/SO
2018-06-26 11:46:23 +05:30
Manas Solanki
860e169081
Update sales_order.js
2018-06-26 11:45:04 +05:30
Manas Solanki
0ebd0f0d62
Update purchase_order.js
2018-06-26 11:44:29 +05:30
Kanchan Chauhan
bddebb52d6
Allow only submitted Blanket Order in PO/SO
2018-06-26 09:31:27 +05:30
Rushabh Mehta
096b943b0c
[minor] fixes to moment.defaultDateFormat and daily work summary eplies
2018-06-25 22:38:20 +05:30
Frappe PR Bot
5c13cb3221
[Translation] Updated Translations ( #14669 )
2018-06-25 15:08:15 +05:30
mnaim-cloude8
56e4346ead
To fixed if if no schedule and disposal is NOT within the period. ( #14637 )
...
* To fixed if if no schedule and disposal is NOT within the period, then opening accumulated depreciation not included.
If no schedule, and disposal is within period, accumulated dep is the amount eliminated.
* Update asset_depreciations_and_balances.py
2018-06-25 15:05:26 +05:30
Jamsheer
4f8deb92cc
[Fix] - Leave Perid - Grant Allocations ( #14668 )
...
* Leave Perid - Grant Allocations - Fix
* Codacy - string statement has no effect
2018-06-25 14:49:54 +05:30
Shreya Shah
d8031d1a53
Clear child table before appending ( #14648 )
2018-06-25 10:34:55 +05:30
rohitwaghchaure
34c187706d
[Enhance] Added Budget exception approver role in company ( #14645 )
...
* [Enhance] Added Budget exception approver role in company
* Added test cases for budget
2018-06-25 10:31:08 +05:30
Ranjith Kurungadam
b4ad3c3f77
Salary Structure Assignment - remove to_date ( #14642 )
...
* Salary Structure Assignment - remove to_date
* fix Salary Assignment - remove to_date
* Salary Slip - fix codacy remove sting based query, add end_date to condition
2018-06-25 10:29:54 +05:30
Jamsheer
8044d09d50
[Enhance] Refactor ( #14647 )
...
* Payroll Entry - Make Bank Entry button routes to Journal Entry list view
* Salary Component - additional component and flexi not comes in same component
* Salary Structure - refactor validation messages
2018-06-25 10:29:06 +05:30
rohitwaghchaure
3a595d07d0
[Fix] POS Closing Voucher, on save collected amount becomes zero issue and added test cases ( #14649 )
...
* [Fix] POS Closing Voucher, on save collected amount becomes zero
* Added test cases for the POS Closing Voucher
2018-06-25 10:10:29 +05:30
Jamsheer
648728f330
Fix - depends on lwp - employee benefit ( #14644 )
2018-06-22 17:28:29 +05:30
Jamsheer
b64161a389
Employee benefit - Last payroll period benefit ( #14634 )
...
* Employee benefit - Last payroll period benefit
* Method name refactor
2018-06-22 17:27:54 +05:30
Sushant Nadkar
00f0f0f5fc
Added adational filters to Tax Rule doctype ( #14639 )
2018-06-22 15:57:19 +05:30
Shreya Shah
5b64e98c5b
Fetch company on employee selection ( #14633 )
2018-06-22 15:41:57 +05:30
rohitwaghchaure
d3fb0fbb20
Added test cases for asset accounting, asset value adjustment ( #14572 )
...
* Added test cases for asset accounting, asset value adjustment
* Accounting entry for the asset created manually
* Added asset movement test cases and validation
* Added validation to make asset from purchase receupt, invoice only
2018-06-22 15:40:59 +05:30
Ranjith Kurungadam
ce26610d39
Fix tax calculation ( #14635 )
...
* Salary Detail - field is_additional_component
* TDS fix - exclude additional component from monthly salary, but add to annual income to calculate tax
* fix indentation
2018-06-22 15:39:49 +05:30
Ameya Shenoy
4e96f55eff
Merge branch 'master' into develop
2018-06-22 05:10:29 +00:00
Ameya Shenoy
774f676a25
bumped to version 10.1.40
2018-06-22 05:10:27 +00:00
Prateeksha Singh
c92bbcb9fa
Merge pull request #14629 from pratu16x7/css-fixes
...
[portal] fix item-preview column #13077
2018-06-21 22:47:41 +05:30
Prateeksha Singh
9a138f07f7
[portal] fix item-preview column #13077
2018-06-21 22:42:03 +05:30
Nabin Hait
3ebc15cc8f
test fixes
2018-06-21 17:55:32 +05:30
Nabin Hait
e5b3a56cea
Test case fixes
2018-06-21 15:21:17 +05:30
Zlash65
4cf46edabc
expense_claim related fix in payment entry
...
outstanding amount calculation fix, manual entry of expense trigger calculation of allocation added
2018-06-21 15:18:13 +05:30
rohitwaghchaure
ae276bcaa1
Don't allow to sale asset item from POS ( #14623 )
2018-06-21 13:18:01 +05:30
Shreya Shah
c8a40f3ef0
[Tests] Employee Onboarding & Separation ( #14606 )
...
* Set query on department
* Add test for Employee Onboarding
* Add fetch for Employee Separation fields
* Add test for Employee Separation
* Fix Staffing Plan test case
2018-06-21 13:06:47 +05:30
Sachin Mane
19a5a5dcf4
improve performance of stock_value retrieval using tabBin instead of … ( #14584 )
...
* improve performance of stock_value retrieval using tabBin instead of stock ledger
* rename fn
* rename fn
* Update warehouse.py
2018-06-21 13:01:48 +05:30
rohitwaghchaure
79e5b07e62
[Fix] Subscription method ( #14604 )
...
* [Fix] Subscription method path
* [Fix] Condition
2018-06-21 12:58:14 +05:30
rohitwaghchaure
4d80c05125
[Fix] Deferred account must be liability account ( #14612 )
2018-06-21 11:55:49 +05:30
Shreya Shah
22bb61b58c
Merge pull request #14608 from shreyashah115/fix-onboard
...
[Enhance] Employee Onboarding & Separation
2018-06-21 11:51:39 +05:30
Jamsheer
f76dbbae68
Compensatory Leave Request ( #14611 )
...
* Compensatory Leave Request - Validate Holidays and Attendance
* Compensatory Leave Request - Cancel
* Half Day in Compensatory Leave Request
* Leave allocation on Compensatory Leave Request - Fix
* Unused import
2018-06-21 11:38:38 +05:30
Nabin Hait
227489193b
Test case fixes
2018-06-21 11:36:13 +05:30
umaepoch
0484547150
BOM Stock Calculation Report ( #14561 )
...
* BOM Stock Calculated
* BOM Stock Calculated
* BOM Stock Calculated
* BOM Stock Calculated
* BOM Stock Calculated
* Update bom_stock_calculated.json
2018-06-21 11:27:54 +05:30
Zarrar
e25dcd2737
[Minor] Report related fixes ( #14620 )
...
* fix in query incase list is empty
* periodicity not found error
when called from consolidated financial statements and custom cash flow is activated
* unset currency filter to apply default currency or so
* python 2 - 3 fix
2018-06-21 10:53:12 +05:30
Siddhi Sawant
51e4d641c8
Job Applicant Source ( #14543 )
...
* New doctype - Job Applicant Source
* Source and source name field in job applicant
* Updated install_fixtures with default options
* Update install_fixtures.py
* Fixes codacy
2018-06-21 10:47:54 +05:30
Frappe PR Bot
748c0240db
[Translation] Updated Translations ( #14615 )
2018-06-21 10:34:28 +05:30
Charles-Henri Decultot
fc2292f08c
Email alert renamed to Notification ( #14618 )
2018-06-21 09:17:52 +05:30
Nabin Hait
3946b77555
changed fieldname of inventory section break in Item
2018-06-20 22:33:34 +05:30
Shreya Shah
b125ba9ed8
Update status if tasks have been completed ( #14601 )
2018-06-20 17:52:21 +05:30
Manas Solanki
616a6d2bc2
Test leave management ( #14587 )
...
* test max allowed days in leave policy
* test the leave period
* test leave encashment
2018-06-20 17:47:45 +05:30
Suraj Shetty
be3ce16352
Daily work summary reply report ( #14583 )
...
* Add daily work summary reply report
* Show user name instead of email
* Remove print statement
* Change field datatype
* ReRun Travis
2018-06-20 17:46:03 +05:30
Nabin Hait
7aae0e66df
minor fix
2018-06-20 17:45:39 +05:30
Bassam Ramadan
45725c2c7b
add missing brand filter to stock balance report ( #14597 )
...
add missing brand filter to stock balance report
2018-06-20 17:41:29 +05:30
Shreya
3fd21d4273
Fix codacy
2018-06-20 16:09:16 +05:30
Shreya
5c6ade4bd8
Update and set status on the basis of project completion
2018-06-20 15:55:27 +05:30