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
Shreya
a5afd96019
Employee Onboarding and Separation lists
2018-06-20 15:55:14 +05:30
Saurabh
59798b4e88
resolved merge conflict
2018-06-20 15:23:25 +05:30
Saurabh
98b7bb5679
bumped to version 10.1.39
2018-06-20 15:51:40 +06:00
Zarrar
99017b173d
naming for asset maintenance task should be task name ( #14607 )
2018-06-20 14:53:13 +05:30
Ranjith Kurungadam
c1030a3958
fix - Employee Transfer, Promotion ( #14603 )
2018-06-20 12:42:58 +05:30
Jamsheer
a1bb94e59d
Pro-rata component consistency for monthly Salary slip ( #14595 )
...
* Pro-rata component consistency for monthly Salary slip
* Resolve merge conflict
2018-06-20 12:41:32 +05:30
Ranjith Kurungadam
05d00397d0
Update tax calculation ( #14564 )
...
* Tax Slab remove to_amt mandatory, condition data type Code
* Salary Slip - consider condition in tax slab
* Payroll Period - help text for tax slab condition
2018-06-20 12:33:02 +05:30
Ranjith Kurungadam
4f9744a56d
HRA fix ( #14589 )
...
* hra - fix var ref before assignment
* Tax Exemption Category - remove deduction component
2018-06-20 11:10:56 +05:30
Jamsheer
55a2f4da71
Employee Benefit ( #14571 )
...
* Rename - filed is_pro_rata_applicable to pay_against_benefit_claim
* Employee Benefit Application - Validate previous benefit claim
* Employee Benefit Claim - Code refactor
* Salary Slip - additional salary - fix
2018-06-20 11:04:21 +05:30
Jamsheer
c526cad183
[Fix] Additional Salary Component and tax calculation ( #14581 )
...
* Additional salary not include in tax calculation
* Additional salary get doubled in salary slip via Payroll Entry - Fix
* Salary Component - if is_additional_component hide flexi
2018-06-20 10:52:20 +05:30
Shreya Shah
222c550c29
Parse left out time ( #14586 )
2018-06-20 10:51:32 +05:30
Shreya Shah
0cb0c0b642
[Tests] Staffing Plan ( #14585 )
...
* Add test case for Staffing Plan
* Fix codacy
2018-06-20 10:50:54 +05:30
Zarrar
42f2d1a7a8
fix incase no customer fetched ( #14596 )
2018-06-20 10:50:11 +05:30
Ranjith Kurungadam
f972e7b259
Staffing Plan - remove department filter, query by dates ( #14590 )
2018-06-20 10:48:40 +05:30
rohitwaghchaure
fd5ac45775
[Fix] Not able to make invoice in the subscription ( #14594 )
2018-06-20 10:47:55 +05:30
Nabin Hait
a125a6199c
Allowed paid amount against debit/credit note
2018-06-19 12:07:02 +05:30
Shreya Shah
b0575265fb
Test case for Attendance Request ( #14566 )
...
* Add test case for Attendance Request
* Add a message if attendance not submitted
* Add test for cancelled document
2018-06-19 10:47:40 +05:30
Shreya Shah
97124e92fa
[Fixes] Tax withholding category and Bank Guarantee ( #14576 )
...
* Fetch withheld percentage
* Set query for accounts on the basis of company
* Fix bank guarantee error on submit
* Remove errors caused by fields which are removed
2018-06-19 10:46:41 +05:30
Zarrar
ba1cdc6c57
fix opening invoice related authorization control - item=None ( #14567 )
2018-06-19 10:45:47 +05:30
Shreya Shah
cbff30f718
[Tests] Shift Planning ( #14570 )
...
* Cancel shift assignment on cancellation of shift request
* [minor] Fix shift type test
* Modify test for shift request
* Add test case for shift assignment
* Fix syntax
* Fix codacy
2018-06-19 10:45:33 +05:30
asbasawaraj
b0fafa9774
Additional fields in Certified Consultant DocType ( #14573 )
2018-06-19 10:43:55 +05:30
Shreya Shah
77de8dc102
Change Restaurant icon type to module ( #14578 )
2018-06-19 10:43:08 +05:30
Nabin Hait
875c941f3d
fixes in setting itemised tax breakup
2018-06-18 17:41:27 +05:30
Nabin Hait
8eeb5694ba
Fixed qty in item-wise sales history report
2018-06-18 17:41:27 +05:30
Nabin Hait
0bef91c241
minor fix in item type validation
2018-06-18 17:41:27 +05:30
Nabin Hait
ae02209b6a
Removed autoname of child table
2018-06-18 17:41:27 +05:30
Shreya Shah
5c3929c5ea
Fix positioning of fields ( #14562 )
2018-06-18 15:49:59 +05:30
Zarrar
e0adb6bbd6
cost_center overridden by company's default fix in SI ( #14560 )
2018-06-18 15:49:12 +05:30
Shreya Shah
1ac5585151
Bug - Add batch while creating serial nos ( #14559 )
2018-06-18 15:44:10 +05:30
Ranjith Kurungadam
5f7c7bfc78
remove patch to add hra fields ( #14552 )
2018-06-18 15:43:45 +05:30
Ranjith Kurungadam
6cca03195f
fix- Salary Structure filter ( #14558 )
2018-06-18 15:42:38 +05:30
Ranjith Kurungadam
28f49a5a8e
fix - link validation error ( #14547 )
2018-06-18 10:40:23 +05:30
Zarrar
80ff296e97
data not filled in acc. receivable report for some field fix ( #14546 )
2018-06-17 11:21:10 +05:30
Manas Solanki
efa191c72e
[minor fix] change the unicode/str to the datetime obejct ( #14534 )
2018-06-15 18:04:12 +05:30
rohitwaghchaure
83a2612a18
[Fix] Consolidated Financial Statement report ( #14537 )
2018-06-15 18:03:50 +05:30
rohitwaghchaure
77a45b43aa
Added expense account, cost center in the purchase order and material request item doctype and fix the code ( #14535 )
2018-06-15 18:03:31 +05:30
Shreya Shah
27eff99190
[minor] Fixes for Exchange rate revaluation doctype ( #14533 )
...
* Add set query for account and party_type
* Fix asset category error
2018-06-15 16:30:15 +05:30
Shreya Shah
5f855d5da4
Add test case for Inter company Journal Entry ( #14531 )
2018-06-15 15:33:21 +05:30
Ameya Shenoy
22c2f472e3
Merge branch 'master' into develop
2018-06-15 09:35:06 +00:00
Ameya Shenoy
ed77429496
bumped to version 10.1.38
2018-06-15 09:29:56 +00:00
Nabin Hait
380a74732c
salary structure related test case fixes
2018-06-15 14:42:12 +05:30
Nabin Hait
2f89a04511
create user permissions on save of employee
2018-06-15 13:16:44 +05:30
rohitwaghchaure
e647c1f3cb
Renamed asset adjustment to asset value adjustment ( #14532 )
2018-06-15 13:06:28 +05:30
Nabin Hait
fcaeea70d2
Update employee.py
2018-06-15 12:47:45 +05:30
Nabin Hait
5bc533f65d
Test case fixes
2018-06-15 11:59:58 +05:30
asbasawaraj
4c263480c9
Certfication Application Doctype and webform,Certfied Consultant DocType ( #14528 )
2018-06-15 10:04:19 +05:30
Ranjith Kurungadam
0e5c8283fa
Salary Slip - update period factor for tax calc ( #14527 )
2018-06-15 10:03:57 +05:30
Nabin Hait
2737b08f0f
blanket order related fixes
2018-06-14 18:07:34 +05:30
Shreya Shah
0b9b8d6826
Remove unused code ( #14526 )
2018-06-14 17:57:39 +05:30
Shreya Shah
02575d1f2c
Merge pull request #14205 from Alchez/frappe-contract
...
[Feature] Managing Contracts in ERPNext
2018-06-14 17:57:02 +05:30
Ranjith Kurungadam
a8e047afc8
HRA tax exemption Indian regional ( #14520 )
...
* remove HRA fields fom declaration, proof submission
* HRA fields, methods India regional
* Company - remove Payroll Settings
* HRA India regional, override methods
* Patch to add HRA fields for India
2018-06-14 17:56:16 +05:30
Manas Solanki
c7afbea708
Update bom.py ( #14524 )
2018-06-14 17:30:26 +05:30
Nabin Hait
d1f40ad0b6
minor fix
2018-06-14 17:09:55 +05:30
Shreya
cdd3982b44
[minor] Fix
2018-06-14 16:43:47 +05:30
Shreya
f333536446
Remove test_records.json and modify test
2018-06-14 16:43:07 +05:30
Nabin Hait
44341c1637
removed blanket order docs
2018-06-14 15:58:41 +05:30
Nabin Hait
b2d3c0f040
Update ordered qty in blanket order
2018-06-14 15:56:29 +05:30
Manas Solanki
9a31dd7062
test + documentation
2018-06-14 15:56:29 +05:30
Manas Solanki
2df1b31707
[minor] minor fixes along with the codacy
2018-06-14 15:55:38 +05:30
Manas Solanki
e5e87f7137
[feature] Blanket Order
...
- Creaete Sales or Purchase order from the blanket order
- If there is any blanket order for the customer/supplier rates will be fetched from that order
- Manually selecting the Blanket order will change the rates accordingly
- Upon submission of the order, the ordered qty will be updated in the Blanket Order
2018-06-14 15:55:38 +05:30
Manas Solanki
2fb63e1724
init the blanket order
2018-06-14 15:55:37 +05:30
Rushabh Mehta
1198d94904
[rename] Email Alert -> Notification
2018-06-14 13:18:21 +05:30
Shreya Shah
c3d1353ab5
Merge pull request #14518 from shreyashah115/patch-fix
...
Check if table exists else return
2018-06-14 13:08:49 +05:30
Shreya
df385ac3c0
Check if table exists else return
2018-06-14 13:07:52 +05:30
Zarrar
14a9c0706b
Merge pull request #14461 from mntechnique/sales_partner_type
...
Partner Type as Link field added in Sales Partner
2018-06-14 12:48:24 +05:30
Zarrar
6ffdf94003
[Fixes] Defaults and User-Permission based fixes in treeview ( #14501 )
...
* utility function added for treeview
function to distinguish defaults from user permission and return appropriate data
* make use of utility function for treeview
2018-06-14 12:24:16 +05:30
Shreya Shah
06ef4270f2
Merge pull request #14447 from zerodhatech/loan_application
...
[Enhancement] toggle required fields on select of repayment option in loan application
2018-06-14 12:05:46 +05:30
Jamsheer
c7743932ab
[Fix] HR Fixes ( #14511 )
...
* Payroll Entry - fix in db query
* Salary Structure Assignment - Company read_only = 1
* Fixes in hr util and benefit claim
* Employee Benefit Application - Late application - fix
2018-06-14 11:55:17 +05:30
Zarrar
17089eeac3
[Minor] Fetching and appending items in Stock Reconciliation fix ( #14509 )
...
* minor fix in get_list of items in stock reconciliation
* reload doc fails because of backdated modified date
* item and item defaults should load prior to shopify refactor
* attribute value should't be none or empty, could be zero though
* Update item.py
2018-06-14 11:54:18 +05:30
Shreya Shah
dd8fba6783
Do not check for batch on cancellation ( #14506 )
2018-06-14 11:49:45 +05:30
Saurabh
8e74df09a4
[fix] On deletion of salary slip decrease the series count ( #14508 )
2018-06-14 11:47:21 +05:30
Rushabh Mehta
0d19744b17
[fix] for notification
2018-06-14 09:23:32 +05:30
IOWEB TECHNOLOGIES
62805e2101
Fix unicode literal issue that prevents payment entries to be created ( #14515 )
2018-06-14 09:14:07 +05:30
rohitwaghchaure
fb997d6539
[Fix] Woocommerce test cases ( #14513 )
2018-06-14 09:13:39 +05:30
Prateeksha Singh
0738483343
[docs] remove docs folder 💥 , update docs app to foundation ( #14516 )
2018-06-14 09:11:05 +05:30
Manas Solanki
687c6bb002
Merge pull request #14510 from rohitwaghchaure/test_cases_for_material_consumption
...
[Fix] Travis for the test case test_material_consumption
2018-06-13 18:41:12 +05:30
Rohit Waghchaure
80d4477d1e
[Fix] Travis for test_material_consumption
2018-06-13 18:37:03 +05:30
Shreya Shah
a2056a39bd
Fix patch ( #14503 )
...
* Modify patch to move leave approvers from Employee master to Department master
* Rename child table names
- Rename leave approver to leave approvers
- Rename expense approver to expense approvers
* Import cstr
* Fix a condition
2018-06-13 17:11:17 +05:30
Manas Solanki
aa17294979
Update utils.py
2018-06-13 16:47:41 +05:30
Shreya Shah
3d73a6f7f2
Fetch details from Journal Entry in Accounts Payable report ( #14495 )
...
* Fetch bill_no, bill_date from Journal Entry
* Fix as per suggestion
* Fetch details only if bill_no exists
2018-06-13 16:33:06 +05:30
FinByz Tech Pvt. Ltd
46c8ccc6a8
Fix conflict for taxable value having same item in GSTR-1 Report ( #14492 )
...
* Update gstr_1.py
Merge conflict for taxable value having same item
* Update gstr_1.py
* Minor Fix
* Update gstr_1.py
2018-06-13 15:34:17 +05:30
Jamsheer
30f37b2eb1
Payroll Entry - Separate JE for flexi salary component ( #14502 )
...
* Payroll Entry - Accrual entry - exclude only tax impact - and separate JE for Flexi in Bank Entry
* Journal Entry - validate cheque info on submit
* Payroll Entry - Make Bamk Entry - Separate JE for benefit component
2018-06-13 15:29:38 +05:30
Jamsheer
cc25eb00b5
Employee benefit application depends on lwp ( #14494 )
...
* Employee benefit - pro-rata amount - depends on lwp and working days
* HR Util - get holidays for employee
* Employee Benefit Application - calculate remainig on max benefit
* Employee benefit - late application - depends on lwp
* missing semicolon
2018-06-13 15:14:24 +05:30
rohitwaghchaure
93e8bbac84
[Fix] Travis for employee_tax_exemption_declaration ( #14500 )
2018-06-13 15:12:32 +05:30
Shreya Shah
4fe2a91b9f
Remove docstatus=1 to show pending leaves as well ( #14498 )
2018-06-13 15:11:43 +05:30
Manas Solanki
9385cd5203
Merge pull request #14496 from rohitwaghchaure/stock_entry_test_cases
...
[Fix] Travis for stock entry
2018-06-13 14:06:20 +05:30
Rohit Waghchaure
0eef3f665d
[Fix] Travis for stock entry
2018-06-13 13:06:25 +05:30
Manas Solanki
b12f0d90af
fix the timesheet
2018-06-13 12:30:02 +05:30
Jamsheer
f6d7b5d0c8
Salary slip - additional salary - deductions ( #14476 )
2018-06-13 11:36:43 +05:30
Tom Price
32c984cd3c
Fix fields being hidden by default. ( #14490 )
...
Modify the title property to be sensible for general usage, unique and translatable.
Add allow_in_quick_entry properties appropriately.
2018-06-13 11:14:44 +05:30
Manas Solanki
176e7c5ce2
fix the test case for the payroll ( #14480 )
...
* fix the test case for the payroll
* fix the shopify and stock entry
* more structured test cases for payroll
2018-06-13 11:13:01 +05:30
Prateeksha Singh
d1fffb6ba1
Merge pull request #14484 from pratu16x7/help-portal
...
[help-portal] don't show issues to guest
2018-06-12 17:40:36 +05:30
Prateeksha Singh
8d58429b69
[help-portal] don't show issues to guest
2018-06-12 17:39:12 +05:30
Nabin Hait
76c51b3068
minor ux fix
2018-06-12 16:29:10 +05:30
deepak-mnt
b95f60c6f3
minor changes
2018-06-12 16:04:49 +05:30
Rohit Waghchaure
b6381c66d8
[Fix] Purchase receipt test cases
2018-06-12 13:54:40 +05:30
rohitwaghchaure
a6b346f827
Merge pull request #14475 from rohitwaghchaure/asset_test_cases_fixes
...
[Fix] Test cases for asset
2018-06-12 12:21:11 +05:30
Rohit Waghchaure
f270567c45
[Fix] Test cases for asset
2018-06-12 12:20:52 +05:30
Ranjith Kurungadam
138e6abaff
Salary Slip - update tax calculation, deduct tax for unsubmitted exemption proof ( #14428 )
2018-06-12 12:19:36 +05:30
Suraj Shetty
e06ecd2494
Check if user permission for employee exists ( #14474 )
...
- Also check if user has permission to
add user permission to avoid insufficient
permission error while updating user profile
2018-06-12 12:06:41 +05:30
Jamsheer
8d66f1e45d
Employee benefit - Late employee benefit application ( #14465 )
...
* HR Utils - get salary slip total benefit given for a payroll period
* Late employee benefit application
* Additional Salary - code refactor - get_amount
* new line in salary detail json
* Employee benefit late application - validation refactor
* Codacy fix
2018-06-12 11:30:59 +05:30
rohitwaghchaure
2354c1eba3
Merge pull request #14467 from rohitwaghchaure/update_location_in_serial_no
...
Code cleanup and fixes for the asset
2018-06-12 11:19:01 +05:30
Manas Solanki
65b55a53a6
Update test_leave_application.py
2018-06-12 11:18:01 +05:30
Rohit Waghchaure
ec2a2ac47e
[Fix] patch
2018-06-12 01:16:28 +05:30
Manas Solanki
d7f6d45e28
Merge pull request #14468 from manassolanki/fix-travis-1
...
fix the salary slip test cases
2018-06-11 19:29:28 +05:30
Manas Solanki
f226b50d6d
fix the salary slip test cases
2018-06-11 19:27:46 +05:30
Rohit Waghchaure
647d595158
Code cleanup and fixes for the asset
2018-06-11 19:15:08 +05:30
Shridhar Patil
c3f5849ac0
typo fixed
2018-06-11 18:26:45 +05:30
Manas Solanki
e832aa4fe2
Merge pull request #14436 from shreyashah115/fix-trav
...
Travis again
2018-06-11 17:45:11 +05:30
Shreya Shah
157815ff0c
Patch for total quantity ( #14458 )
...
* Add path to patches.txt
* Modify patch
2018-06-11 17:32:17 +05:30
Jamsheer
0ca76323af
Clinical Procedure Template - get_item_details - fix ( #14449 )
2018-06-11 17:25:49 +05:30
Prateeksha Singh
252d0bf255
Merge pull request #14455 from frappe/kennethsequeira-patch-3
...
Fix minor div issue in Accounts index page
2018-06-11 16:33:51 +05:30
rohitwaghchaure
7cd59a2089
Merge pull request #14453 from rohitwaghchaure/item_alternative_fixes_for_backflush
...
[Fix] Alternative item, transferred qty issue for backflush method
2018-06-11 15:44:37 +05:30
Shreya
9680dc476f
Remove commented code
2018-06-11 15:40:09 +05:30
deepak-mnt
bb6753f206
Merge branch 'develop' of https://github.com/frappe/erpnext into sales_partner_type
2018-06-11 15:01:43 +05:30
deepak-mnt
4ec283d775
patch for sales partner type field
2018-06-11 14:53:25 +05:30
Manas Solanki
7e8cbf288c
Update cost_center.py
2018-06-11 14:25:27 +05:30
Kenneth Sequeira
061492a9af
Fix minor div issue in Accounts
2018-06-11 14:24:19 +05:30
Rohit Waghchaure
86026d31cf
[Fix] Alternative item, transferred qty issue for backflush method
2018-06-11 14:11:00 +05:30
Rohit Waghchaure
cdec44ee81
Removed company data from test item records
2018-06-11 13:32:34 +05:30
Prateeksha Singh
ea7533fa75
[tax-breakup] store itemized tax by item_name when can
2018-06-11 13:31:33 +05:30
Shridhar Patil
6a00a17c14
toggle required fields on select of repayment option in loan application
2018-06-11 12:48:31 +05:30
rohitwaghchaure
7048925016
[Enhance] Standalone debit/credit note ( #14269 )
...
* [Enhance] Standalone debit/credit note
* Test cases
* Test cases and documentation
* Removed credit, debit note links from accounts module
2018-06-11 12:02:14 +05:30
Manas Solanki
3639b85663
Merge pull request #14363 from frappe/manassolanki-patch-10
...
PR to check the current state of Travis
2018-06-11 11:40:40 +05:30
Ranjith Kurungadam
e46639f47c
Employee Transfer allow same company, update internal work history ( #14430 )
2018-06-11 11:24:44 +05:30
Zarrar
88a90ff3b5
minor fix in account and account utils ( #14432 )
2018-06-11 11:21:17 +05:30
Shreya
83d5dc119b
Fix Employee tax declaration test case
2018-06-11 10:31:40 +05:30
Shreya
664f30a018
Fix asset maintenance json
2018-06-11 10:31:40 +05:30
Shreya
294238abfd
Fix shopify test case
2018-06-11 10:31:39 +05:30
Shreya
956277b121
Fix tests
2018-06-11 10:31:39 +05:30
Zarrar
65994210f6
fix patch to add email template in hr settings ( #14427 )
2018-06-08 16:57:06 +05:30
Zarrar
44175904c6
Tree fix ( #14425 )
...
* use frm.set_value instead of this.set_value
* generic methods moved to accounts/utils
* clean up code, and make use of methods added in utils
2018-06-08 16:35:21 +05:30
Suraj Shetty
f553b53fbf
Add patch to set update_field and update_value ( #14421 )
...
* Add patch to set update_field and update_value
- set update_field and update_value if empty
since expense claim workflow is dependent on it.
* Set update_field for workflow state of leave application
* Update patch entry
* Fix bug
* Update set_update_field_and_value_in_workflow_state.py
2018-06-08 16:28:36 +05:30
Alchez
ca8138fd13
[Agriculture] Sort crop tasks chronologically and optimize disease task creation ( #14367 )
...
* Improve max crop period check and sort agriculture tasks chronologically
* Reformat crop cycle logic and add field to optimize task creation
2018-06-08 14:55:07 +05:30
Doridel Cahanap
ebb530385a
Add Employee Status Temporary Leave ( #14423 )
2018-06-08 14:54:31 +05:30
rohitwaghchaure
8fc64a9717
[Fix] Travis data ( #14422 )
2018-06-08 14:43:50 +05:30
Zarrar
7ab70ca2d7
[ Fixes ] v11 Tree based doctype testing ( #14419 )
...
* location tree fixes
validate if child present while deleting, filter lists down only group enabled node
* department tree fixes
Adding child fix if added from rootnode with company filter applied. Rename consistency added. Validation added in on_trash
* Company tree fix
Check if child exist while deleting a node validation added.
* Supplier Group tree fixes
on_trash validation added if child node present
* Cost Center tree fixes
Adding child to root node throws error because parent_cost_center picks up root name
2018-06-08 14:33:15 +05:30
Gaurav Naik
094617d29a
Fix to allow migration of individual sites ( #14413 )
2018-06-08 11:44:27 +05:30
Shreya Shah
b9399d8781
Cancel attendance if leave application is cancelled ( #14372 )
...
* Cancel attendance if leave application is cancelled
* Fix as per review
2018-06-08 11:24:08 +05:30
Zarrar
8cd0f67b25
query fix if name contains apostrophe ( #14370 )
2018-06-07 16:48:31 +05:30
Zarrar
13f9851609
[Docs] Update doc for Supplier Group ( #14373 )
...
* add breadcrumb for Supplier Group tree
* change occurrences of supplier-type to supplier-group
* update supplier-group doc, update pngs
2018-06-07 16:47:30 +05:30
Zarrar
209d8f36f7
doctype was not reloaded to pickup changes ( #14371 )
2018-06-07 16:43:55 +05:30
Prateeksha Singh
50ae6b891b
Merge pull request #14410 from pratu16x7/hub-fixes
...
Hub fixes
2018-06-07 14:19:01 +05:30
rohitwaghchaure
2704bef0b3
Merge pull request #14368 from shreyashah115/fix-trav
...
Some more travis fixes
2018-06-07 14:14:33 +05:30
Prateeksha Singh
00ab78d768
[hub] set page title dynamically
2018-06-07 14:13:00 +05:30
Shreya
88591314b0
Fix Leave Application test cases
2018-06-07 13:56:27 +05:30
Rohit Waghchaure
de82ad1c5f
[Fix] Clenaup code if supplier gstin is none
2018-06-07 13:24:25 +05:30
Prateeksha Singh
9a7f957ace
[hub] fix item page recursion
2018-06-07 12:40:40 +05:30
Shreya
88fe0d59d9
Fix daily work summary test
2018-06-07 11:22:26 +05:30
Shreya
4638d1ab97
Fix POS Profile test
2018-06-06 16:23:16 +05:30
Shreya
71316aaec8
Modify asset movement test cases and files
2018-06-06 15:55:30 +05:30
Zarrar
32a118d68c
fix precision in stock entry ( #14366 )
2018-06-06 15:06:52 +05:30
Saurabh
eb579a11e1
Fix demo ( #14365 )
...
* fix demo
* Update asset.json
2018-06-06 15:05:31 +05:30
Shreya
90bdfed3db
Modify all asset test cases
2018-06-06 14:27:55 +05:30
Manas Solanki
3504a2342e
PR to check the current state of Travis
2018-06-06 12:46:06 +05:30
Ranjith Kurungadam
cff14793d8
Salary Structure, Slip - make fields readonly ( #14358 )
...
* Salary Structure, Slip - make fields readonly
* codacy fixes
* Salary Component - reorder fields, removed is_group for flexi
* Update salary_structure.js
2018-06-06 12:04:25 +05:30
Ameya Shenoy
873e28d9b8
Merge branch 'master' into develop
2018-06-06 05:53:19 +00:00
Ameya Shenoy
36cd433999
bumped to version 10.1.37
2018-06-06 05:41:37 +00:00
Charles-Henri Decultot
a774f3d7a0
POS closing voucher ( #14270 )
...
* POS closing voucher
* Codacy corrections + improvements
* Codacy corrections
* POS Closing Voucher improvements
2018-06-06 10:22:13 +05:30
Alchez
eb0ac37587
Fix ISO standard references in Agriculture ( #14361 )
2018-06-06 10:10:56 +05:30
Shreya Shah
59af3a0296
[Enhancement] UOM Conversion Factors ( #13853 )
...
* new doctype UOM category
* new doctype UOM Conversion Factor
* bootstrap json data for uom conversions
* uom conversion in item
* Patch to add all conversions and categories
* Fetch conversions multi-way
* fix codacy
* Rebase with develop
* [minor] Fix
* Add a test case
* Improvise as per review comment
* Add json data for UOMs
* Commonify function and call from patch
* Update uom_conversion_data.py
2018-06-06 09:44:46 +05:30
Sushant Nadkar
d458f7710f
[UX Improvement] Removed uri encoding from search results on front end ( #14266 )
...
* removed uri encoding from search results on front end
* decode search string using html2text
2018-06-06 09:23:38 +05:30
Shreya Shah
c37fd050c5
Remove unnecessary variable ( #14352 )
...
* Remove unnecessary variable
* Replace cur_frm with frm
* Update material_request.js
2018-06-06 09:19:48 +05:30
Shreya
9aa7d8fe5f
Update asset related test cases
2018-06-06 04:27:59 +05:30
Shreya
80a1e156cb
Create location for asset test
2018-06-06 03:11:18 +05:30
Shreya
9c801b976d
Fix share transfer test
2018-06-06 02:58:23 +05:30
Shreya
8f692f9a27
Fix batch test
2018-06-06 02:09:17 +05:30
Shreya
2ad81726d5
Fix utils.py
2018-06-06 02:09:17 +05:30
Manas Solanki
dabe21051c
Update test_company.py ( #14360 )
2018-06-05 16:28:27 +05:30
Nabin Hait
2f273e73b2
minor fixes
2018-06-05 14:40:48 +05:30
Nabin Hait
e0a2ea64c0
Merge branch 'develop' of https://github.com/mnaim-cloude8/erpnext into mnaim-cloude8-develop
2018-06-05 14:21:57 +05:30
Shreya Shah
6ff3a094e2
Fix currency exchange tests ( #14356 )
2018-06-05 14:16:10 +05:30
rohitwaghchaure
50d8c4a10f
[Fix] Not able to save purchase invoice, due to invalid condition ( #14355 )
2018-06-05 13:08:10 +05:30
rohitwaghchaure
2da6b3d628
[enhance] Provision to backflush raw materials based on stock entries for subcontracted items ( #14296 )
2018-06-05 13:06:52 +05:30
Shreya Shah
630721aacc
Travis ( #14354 )
...
* Fix Purchase Receipt tests
* Fix Item test
* Fix daily work summary test
* Modify currency exchange test cases
* Fix Leave Application test
* Update working hours when making salary slip from timesheet
* Replace fixer.io with exchangeratesapi
* Fix codacy
2018-06-05 12:56:10 +05:30
Nabin Hait
81d12cc9c8
Get default income account from Item
2018-06-05 12:49:03 +05:30
Ranjith Kurungadam
d580c92377
Staffing Plan ( #14346 )
...
* validate staffing plan
* staffing plan docs
* get_active_staffing_plan_and_vacancies now returns dict, mandatory fields set
* validate with parent and child company plans, plan now considers open job openings
* Failure details in validate error messages
* Fixed sql injection
2018-06-05 11:40:58 +05:30
Shreya Shah
4fa600a8dd
Apply GST based on Origin and Place of supply GST Code ( #14288 )
...
* Add new gst field in Taxes and Charges template - is_inter_state
* Add a patch
* Add a regional function to fetch taxes on the basis of GSTin
* Add regional function to hooks.py
* Fetch taxes for Purchase Invoice on the basis of Supplier GSTIN
* Fixes in the setup.py for India region
* Set is_inter_state field
For the existing Taxes and Charges templates, if an account_head with igst account (which is set in GST Settings) is found, set the checkbox and also check if it doesn't have a cgst account.
* Fix as per review comment
2018-06-05 11:27:53 +05:30
Shreya Shah
5103454642
New Report Address and Contacts ( #14307 )
...
* New Report Address and Contacts
* Fix codacy
* Add links to report in module pages
2018-06-05 10:44:36 +05:30
Sushant Nadkar
565bf203e5
[Improvement] Added display settings for item price, availibility and stock levels ( #14308 )
...
* display item price on website even when cart is disabled
* added display settings for item price, availibility and stock levels
* Update shopping_cart_settings.json
2018-06-05 10:43:11 +05:30
Alchez
31ab64822c
Make the item UOM more visible ( #14315 )
2018-06-05 10:35:55 +05:30
Shreya Shah
f1e54836cb
Remove hardcoded workflow patches ( #14340 )
2018-06-05 10:35:07 +05:30
Shreya Shah
b75e77a2cc
Fix syntax ( #14342 )
2018-06-05 10:33:29 +05:30
Sushant Nadkar
64907e5083
Validate response message for frappe call ( #14343 )
2018-06-05 10:33:04 +05:30
Zarrar
7c088ff623
dont validate items if item_code not found ( #14344 )
...
item_code field is not set when created using invoice creation tool
2018-06-05 10:32:09 +05:30
rohitwaghchaure
7cf01e7c75
Replaced fixer api with exchangeratesapi ( #14347 )
2018-06-05 10:30:20 +05:30
asbasawaraj
1b16b772ab
Report to Track Expiring Memberships - Monthwise ( #14207 )
2018-06-05 10:30:03 +05:30
Nabin Hait
c4eec99bc4
minor fix
2018-06-05 09:06:30 +05:30
Prateeksha Singh
2141bfab89
[patch][update] naming_series field in member patch
2018-06-04 16:36:12 +05:30
Rohan Bansal
841d54c49d
Start adding tests for contracts
2018-06-04 15:56:38 +05:30
Rohan Bansal
bf0f0aaf6f
Add Contract-related doctypes to ERPNext
2018-06-04 15:56:38 +05:30
Prateeksha Singh
37678d4838
[patch][new] rename old members as per naming series ( #14339 )
2018-06-04 14:25:51 +05:30
Sushant Nadkar
ebf76163ad
show uom in list view of material request ( #14338 )
2018-06-04 14:23:25 +05:30
Ranjith Kurungadam
f576c570c9
Salary Slip - fix when no pyroll period found for tax calc ( #14335 )
2018-06-04 12:53:23 +05:30
Zarrar
fc03a0463c
[Fix] Validate items for saleable, purchaseable or subcontractable in transactions ( #14316 )
...
* validate items to see if they are saleable
* check if items are subcontractable or saleable
* improvise name,error message and code
Validate type function validates item if they are of proper type for that transaction and throws descriptive error.
2018-06-04 12:52:52 +05:30
Nabin Hait
8c7af497a0
Fixed merge conflict
2018-06-04 11:23:36 +05:30
Ranjith Kurungadam
ed4e49c6b2
Salary Slip - Deduct Tax ( #14255 )
...
* Salary Slip - Deduct Tax For Unclaimed Employee Benefits, Unsubmitted Tax Exemption Proof
* fix - missing return statement
2018-06-04 11:17:55 +05:30
Nabin Hait
a55090dc88
Fixed merge conflict
2018-06-04 11:14:50 +05:30
Jamsheer
398f15754d
Rename - Additional Salary Component to Additional Salary ( #14302 )
...
* Rename Doctype Additional Salary Component to Additional Salary
* Remove unused import
2018-06-04 11:02:53 +05:30
rohitwaghchaure
5ecc26bf15
[Fix] get_shipping_address() takes at least 1 argument (0 given) ( #14328 )
2018-06-04 11:00:24 +05:30
Prateeksha Singh
8ac7dfee36
Merge pull request #14329 from pratu16x7/hub-fixes
...
[hub][minor] remove links #14309
2018-06-04 10:28:47 +05:30
Prateeksha Singh
e73df88863
[hub][minor] remove links #14309
2018-06-04 10:26:49 +05:30
rohitwaghchaure
c1cf495a93
[Fix] Special character issue ( #14322 )
2018-06-03 16:00:31 +05:30
Nabin Hait
953ea93f7b
Update leave_type.json
2018-06-03 15:31:35 +05:30
Shreya Shah
d3255b1d3d
Add docs for Inter Company Invoice creation ( #14314 )
2018-06-03 10:28:51 +05:30
Tropicalrambler
8b38e57af2
Correcting typo in the User Documentation ( #14326 )
...
This corrects a simple typo in the Pricing rule topic for documentation
2018-06-03 10:27:38 +05:30
Ranjith Kurungadam
375db6181d
Earned Leave ( #14143 )
...
* Earned Leave Allocations will be initially zero, escaped validation in leave allocation to allow this
* Earned Leave monthly scheduler method, test
* remove whitelist of method
2018-06-01 16:09:28 +05:30
rohitwaghchaure
ce642d73cb
[Fix] Special character issue while upadting customer group in customer ( #14312 )
2018-06-01 15:11:21 +05:30
rohitwaghchaure
2fa057e4ad
[Fix] Expense claim showing status as Unpaid even if Total Advance Amount and Total Sanctioned Amount is same ( #14311 )
2018-06-01 15:10:55 +05:30
Zarrar
7e0e85912b
item_name not fetched in packing slip ( #14310 )
2018-06-01 15:10:33 +05:30
Saurabh
824e068d0a
typo fix
2018-05-31 18:11:05 +05:30
Saurabh
0eb622f7da
[fix] resolve conflicts
2018-05-31 17:32:17 +05:30
Saurabh
fccf7f2a68
bumped to version 10.1.36
2018-05-31 17:54:53 +06:00
Ranjith
590bf4ce3a
codacy fixes
2018-05-31 12:08:14 +05:30
Shreya Shah
c55f774fbf
Address filter in gstr1 report ( #14290 )
2018-05-31 09:33:36 +05:30
AMS Fauzi
f3a6d95634
Develop: Batch Number Series ( #14251 )
2018-05-31 09:31:57 +05:30
rohitwaghchaure
780952ea03
Show actual qty in warehouse link search ( #14258 )
2018-05-31 09:29:18 +05:30
Ahmad M Abdelrahman
f12b446dc8
Bank Account #13714 PR ( #14295 )
2018-05-31 08:58:23 +05:30
Saurabh
e5d076d495
[minor][fix] fix query syntax ( #14294 )
...
* [minor][fix] fix query syntax
* Update pos.py
2018-05-31 08:54:31 +05:30
Umair Sayed
5225c0e541
May docs ( #14298 )
...
* manual update
* Added new videos in learn section. Updated other help pages.
* project module rewrite
* employee and supplier master
* employee and supplier master fixes
2018-05-31 08:43:22 +05:30
rohitwaghchaure
26833cf506
Merge pull request #14299 from rohitwaghchaure/field_rearrange_for_budget
...
Rearrange fields
2018-05-31 00:27:45 +05:30
Rohit Waghchaure
7c0dd7a142
Rearrange fields
2018-05-31 00:27:05 +05:30
Ranjith
0cb2684130
Tax Exemption Proof Submission - validations, eligible hra calc
2018-05-30 20:51:37 +05:30
Ranjith
793f8e8caa
Tax Exemption Declaration - update fields, move generic methods to utils
2018-05-30 20:50:48 +05:30
rohitwaghchaure
31a96d2a3f
[Fix] System not fetching default warehoue defined in pos profile for packing materials of product bundle item ( #14287 )
2018-05-30 18:13:47 +05:30
Prateeksha Singh
c62de0831e
Merge pull request #14291 from pratu16x7/help-page
...
[fix] help page issue listing
2018-05-30 17:27:49 +05:30
Prateeksha Singh
66425c6e7f
[fix] help page issue listing
2018-05-30 17:26:03 +05:30
Shreya Shah
47335e5e60
Stocking out items with expired batches ( #14249 )
...
* Add dropdown in Stock Entry to get expired batch items
* Fetch all the items with expired batches
* Add the fetched item details to stock entry details
* Modify as per the review comments
2018-05-30 15:44:41 +05:30
rohitwaghchaure
05152dad0b
[Enhance] Provision to set overproduction percentage for work order ( #14248 )
2018-05-30 15:28:09 +05:30
Prateeksha Singh
09e46a4e5f
Hub fixes ( #14281 )
...
* [hub] remove list freeze
* [hub] fix svg in icon
* [hub] implement route options in hub list view
2018-05-30 15:12:20 +05:30
Jignesh Greycube
9aca025be2
Documentation to Fetch value in Child Table for a field ( #14282 )
...
* Fetch value in Child Table for a field
Sample Script to fetch value in child table
* Update fetch value in child table field
2018-05-30 15:08:55 +05:30
Ranjith
806cd93791
Merge remote-tracking branch 'frappe/develop' into dev_hra
2018-05-30 13:37:47 +05:30
Ranjith
155ecc1b4a
Tax Exemption Declaration - HRA Calculation
2018-05-30 13:37:15 +05:30
Faris Ansari
6ac9c0f71e
Merge pull request #14267 from surajshetty3416/workflow-doc-changes
...
Add doc related to workflow action
2018-05-30 12:34:21 +05:30
Zarrar
39c0add5a2
query fix sales-person-target-variance-item-group-wise ( #14271 )
2018-05-30 11:56:58 +05:30
Zarrar
58200182b4
update timeline data form Activity Log ( #14276 )
...
Documents updated are stored in Activity Log rather than Communication
2018-05-30 11:56:23 +05:30
Prateeksha Singh
865e16621c
[docs] fix embed issues ( #14268 )
2018-05-29 17:09:56 +05:30
Suraj Shetty
e51e51e138
Add requested changes
2018-05-29 16:46:19 +05:30
Nabin Hait
348a6a8b17
patch fixes
2018-05-29 16:17:15 +05:30
Suraj Shetty
77aed9d58b
Move video section to bottom
2018-05-29 15:45:22 +05:30
Suraj Shetty
16d3494efc
Add doc related to workflow action
2018-05-29 15:29:18 +05:30
Vladyslav Baidak
13d4391e70
Fixed SQL syntax error in Get Loan Details ( #14265 )
2018-05-29 15:22:05 +05:30
Ranjith
7bb621d2bf
Tax Exemption Declaration, Proof Submission HRA fields
2018-05-29 13:58:31 +05:30
Ranjith
fb257ba19c
Company - Payroll Settings- fields
2018-05-29 13:57:27 +05:30
Nabin Hait
4d0c73a5c8
Submit auto created salary structure assignments
2018-05-29 13:25:28 +05:30
Nabin Hait
3aa205f19d
Fixes related to department tree
2018-05-29 13:08:48 +05:30
Saurabh
d3a8c9308b
[fix] add ignore validate flag ( #14238 )
2018-05-29 13:07:27 +05:30
Nabin Hait
288cbcafce
Create demo data for salary structure
2018-05-29 11:04:11 +05:30
Nabin Hait
153536bf70
minor test fixes
2018-05-29 10:58:57 +05:30
Shreya Shah
ae95a8aa15
Update status in Purchase Receipt ( #14257 )
...
* Update status on submission if per_billed = 100
* Add patch to update existing records
2018-05-28 18:24:28 +05:30