Commit Graph

10254 Commits

Author SHA1 Message Date
KanchanChauhan
929c3890a4 Merge pull request #7641 from KanchanChauhan/employee-loan-fix
[Fix] Rate of Interest Fix
2017-02-01 18:06:32 +05:30
KanchanChauhan
0e995adc44 Salary Structure Employee custom field can be used in Formula and Condition (#7615) 2017-02-01 18:05:57 +05:30
Kanchan Chauhan
f01c1c2a9d [Fix] Rate of Interest Fix 2017-02-01 18:05:26 +05:30
KanchanChauhan
3dc96cf71e Merge pull request #7640 from KanchanChauhan/remove-date-validation-salary-structure
[Minor] From Date validation removed from Salary Structure
2017-02-01 17:42:18 +05:30
Kanchan Chauhan
e67e2e6fee [Minor] From Date validation removed from Salary Structure 2017-02-01 17:41:36 +05:30
Rohit Waghchaure
38f808cfae [Fix] Buying rate in gross profit report 2017-02-01 13:34:06 +05:30
rohitwaghchaure
ea092a7b24 [Enhancement] Booking of an employee's expense claim (#7267)
* [Enhancement] Auto book of an employee's expense claim

* test cases

* documentation

* fixes and changes

* removed payable from employee and added into the company

* Added party in account, patch to update party type for customer and supplier accounts

* added party type in erpnext, fix patch

* fixed travis
2017-02-01 12:02:08 +05:30
Rushabh Mehta
587dd90182 [minor] removed customer status 2017-02-01 12:01:24 +05:30
Rushabh Mehta
99ce531beb [minor] css for team updates 2017-02-01 11:46:47 +05:30
Neil Trini Lasrado
d408553b93 Merge pull request #7623 from neilLasrado/guardian
Added Student table in Guardian (Only rendered for display purpose)
2017-01-31 18:18:50 +05:30
Neil Trini Lasrado
ebfb7ff027 Merge pull request #7625 from neilLasrado/student-batch
Added Mark Assessment Result Button in assessment plan
2017-01-31 18:18:32 +05:30
Neil Trini Lasrado
879a2d84dc Added Evaluation Criteria Group 2017-01-31 17:03:37 +05:30
Neil Trini Lasrado
477c88450f UI fixes for Guardian Doctype 2017-01-31 16:49:39 +05:30
Neil Trini Lasrado
9071bcbfa8 Added Student table in Guardian (Only rendered for display purpose) 2017-01-31 16:36:29 +05:30
Rushabh Mehta
7ec4b717ed [feature] added team updates page 2017-01-31 11:42:58 +05:30
Rohit Waghchaure
d9a265fab1 Merge branch 'develop' of github.com:frappe/erpnext into develop 2017-01-31 11:34:07 +05:30
Neil Trini Lasrado
1947aca2a8 Added Mark Assessment Result Button in assessment plan 2017-01-30 18:34:25 +05:30
Neil Trini Lasrado
ba96ce7dd5 Merge pull request #7616 from neilLasrado/assessment-validations
Patch fix for Update Assessment Module Patch
2017-01-30 17:50:37 +05:30
Neil Trini Lasrado
fd1767d2ea Patch fix for Update Assessment Module Patch 2017-01-30 17:50:05 +05:30
Rushabh Mehta
4500f7b4d6 [cleanup] remove unused LMS (#7612) 2017-01-30 17:04:38 +05:30
Neil Trini Lasrado
ab1ee1e6fc Patch fix for Update Assessment Module Patch 2017-01-30 16:40:14 +05:30
Neil Trini Lasrado
80ca65c166 Added validation to ensure that the Sum of Scores of evaluation Criteras is equal to the max assessment score. 2017-01-30 15:28:41 +05:30
KanchanChauhan
fbaa6197f9 Employee Loan Management (#7126)
* [WIP] Employee Loan Management

* EMI calculation

* Fixing PR
2017-01-30 15:15:58 +05:30
Rushabh Mehta
364f48aad2 [minor] fix patch 2017-01-30 13:23:09 +05:30
Rushabh Mehta
87037bdd56 [minor] remove party status as it leads to duplicate notifications fixes #7346, also fix for #7568 2017-01-30 13:22:51 +05:30
Makarand Bauskar
d893efd0a9 [minor] replace object values in translations (#7602) 2017-01-30 12:35:34 +05:30
rohitwaghchaure
3b40098738 Merge pull request #7571 from RicardoJohann/projectfilter
added project filter to gl and carry project filter from P&L
2017-01-30 12:24:36 +05:30
Rohit Waghchaure
b327429db7 [Fix] Allow data import tool for cost center 2017-01-30 11:34:29 +05:30
mbauskar
16ce3623bc [fixes] set lead to Null on delete company transaction & other minor fixes 2017-01-30 10:45:28 +05:30
mbauskar
51b1d6de48 [minor] moved the address_and_contact utils to frappe 2017-01-30 10:45:28 +05:30
mbauskar
7fa039f15c [fixes] delete company transaction and other minor fixes 2017-01-30 10:45:28 +05:30
mbauskar
83f4780f74 [Fixes] Address and Contact fixes 2017-01-30 10:45:28 +05:30
mbauskar
8271b4c564 [minor] fixes in address filters 2017-01-30 10:45:28 +05:30
mbauskar
cbc49e2989 [WIP] Address and Contact Fixes 2017-01-30 10:45:28 +05:30
rohitwaghchaure
531b49f6c7 Merge pull request #7590 from KanchanChauhan/rename-task
[Minor]Task rename now possible
2017-01-30 09:29:10 +05:30
KanchanChauhan
2dfb90a922 Merge pull request #7565 from KanchanChauhan/leave-balance-report-fix
[Fix] Permissions to view Leave Balance Report
2017-01-29 21:07:02 +05:30
Rohit Waghchaure
92c9ad8c72 Merge branch 'master' into develop 2017-01-28 14:14:33 +05:30
Rohit Waghchaure
ce4a0b20ab bumped to version 7.2.18 2017-01-28 14:44:32 +06:00
Kanchan Chauhan
b77eaf7053 [URGENT][FIX]Stock Controller fix 2017-01-28 13:26:46 +05:30
Neil Trini Lasrado
6d0da98a78 Fixes to update student guardian name patch 2017-01-27 17:44:28 +05:30
Neil Trini Lasrado
7ff5682193 Merge branch 'develop' into guarding-name 2017-01-27 16:54:50 +05:30
Neil Trini Lasrado
f36ff488c0 Added Guardian Name to Student Master 2017-01-27 16:53:55 +05:30
Rushabh Mehta
e239d4dfe9 Merge branch 'master' into develop 2017-01-27 16:18:26 +05:30
Rushabh Mehta
098bd34f00 bumped to version 7.2.17 2017-01-27 16:48:25 +06:00
Rushabh Mehta
063e86a1bf [fix] remove on_update in Item 2017-01-27 16:16:08 +05:30
Rushabh Mehta
b5eaf324b3 Merge branch 'master' into develop 2017-01-27 16:03:30 +05:30
Rushabh Mehta
5f0027a2d0 bumped to version 7.2.16 2017-01-27 16:33:29 +06:00
Rushabh Mehta
fd82f4b0d4 [minor] fix for item_group.py 2017-01-27 16:00:47 +05:30
Rushabh Mehta
710dc5392f [merge] 2017-01-27 15:48:31 +05:30
Rushabh Mehta
149c033c8f bumped to version 7.2.15 2017-01-27 16:16:07 +06:00
Neil Trini Lasrado
7326217ab5 Added 'Active' checkbox in list view for Student Batch and Student Group 2017-01-27 14:50:48 +05:30
Neil Trini Lasrado
8c3fb43d8a Fix- Student batch strength in Batch Wise attendance report 2017-01-27 14:13:25 +05:30
Kanchan Chauhan
3dd85a0e9e Task rename now possible 2017-01-27 12:34:06 +05:30
Kanchan Chauhan
e877ecfb7b [Fix] Permissions to view Leave Balance Report 2017-01-27 11:53:56 +05:30
noussh
425d7adcdd Update recurring-orders-and-invoices.md 2017-01-26 15:38:57 +04:00
noussh
0350db6a4e added next link 2017-01-26 15:35:01 +04:00
noussh
1e86546e2c added the link 2017-01-26 12:53:45 +04:00
noussh
6396c90956 Update multi-currency-accounting.md 2017-01-26 12:52:29 +04:00
noussh
47fbc7efa5 adde the next page link 2017-01-26 12:50:34 +04:00
noussh
8b62626cec Wrong path updated 2017-01-25 19:44:32 +04:00
Nabin Hait
355b4110c9 Merge pull request #7583 from rohitwaghchaure/valuation_rate_issue
[Fix] Get valuation rate from item master and update stock value difference
2017-01-25 19:21:04 +05:30
Nabin Hait
cb19f52985 Update stock_controller.py 2017-01-25 19:20:35 +05:30
Rohit Waghchaure
3899d74f15 [Fix] Get valuation rate from item master and update stock value difference 2017-01-25 18:47:53 +05:30
Nabin Hait
57e4ab70be Merge pull request #7580 from KanchanChauhan/calendar-manual-screenshots
New screenshots for Calendar user manual
2017-01-25 17:35:01 +05:30
Nabin Hait
d288909310 Merge pull request #7561 from KanchanChauhan/salary-slip-fix-abbr
Patch to update Salary Detail where Salary Component Abbr is null
2017-01-25 17:23:43 +05:30
Kanchan Chauhan
ce116417e1 New screenshots for Calendar user manual 2017-01-25 15:38:35 +05:30
Ricardo Johann
34354237fd added project filter to gl and carry project filter from P&L 2017-01-24 06:46:07 -03:00
vrms
1f1f56225c Update warehouse.md (#7544)
added some detail about link between Warehouse & Warehouse account & machanics of sub-warehousese (Warehouse >Room >Row > Shelf >box
2017-01-24 11:29:27 +05:30
KanchanChauhan
4333ce0fd8 Merge pull request #7569 from neilLasrado/assessment
Fix for update assessment modules patch
2017-01-24 10:52:50 +05:30
Neil Trini Lasrado
15c5ae0918 Fix for update assessment modules patch 2017-01-24 10:28:49 +05:30
Kanchan Chauhan
679cc23abb [Fix] Naming series issue fix 2017-01-23 17:20:55 +05:30
Kanchan Chauhan
c948a4fc92 Patch to update Salary Detail where Salary Component Abbr is null 2017-01-23 16:12:45 +05:30
rohitwaghchaure
ab65f6d8b1 Merge pull request #7547 from mnatalia/develop
Added translations to the web page and item dashboard.
2017-01-23 15:57:33 +05:30
Neil Trini Lasrado
d471ad2c45 Fix for update assessment modules patch 2017-01-23 14:59:19 +05:30
Makarand Bauskar
01eefafad5 [minor] minor fixes in opportunity form (#7549) 2017-01-23 12:15:36 +05:30
Rushabh Mehta
397e508fc0 [fix] sales_partner.js, fixes #7553 2017-01-21 16:58:57 +05:30
Nabin Hait
1f9d1bb877 Merge branch 'develop' into assessment 2017-01-20 20:09:44 +05:30
Neil Trini Lasrado
16d40cf0a3 Added ability to disable a student in student group/studnet batch 2017-01-20 19:33:09 +05:30
Nabin Hait
349d520ae2 Fixed merge conflict 2017-01-20 15:44:35 +05:30
Nabin Hait
a1d3d84415 bumped to version 7.2.14 2017-01-20 16:10:35 +06:00
Nabin Hait
c1cc7b68c4 Merge pull request #7522 from nabinhait/hotfix
Get valuation rate from Item while not found based on SLE
2017-01-20 15:39:24 +05:30
mnatalia
e09407571c Added translations to the web page and item dashboard. 2017-01-20 12:00:25 +02:00
Nabin Hait
4c952f48f8 Some minor fixes 2017-01-20 15:15:31 +05:30
Nabin Hait
bd1a628c55 Merge pull request #7545 from rohitwaghchaure/minor_issue
[Fix] Account user not able to access the report Payment Period Based On Invoice Date
2017-01-20 14:36:48 +05:30
Rohit Waghchaure
93c001455f [Fix] Account user not able to access the report 2017-01-20 14:18:17 +05:30
Nabin Hait
548cf183ea Merge pull request #7543 from RobertSchouten/leave_allocation_fix
[fix] remove invalid parameter from leave allocation
2017-01-20 12:54:55 +05:30
Nabin Hait
153156e31a Merge pull request #7529 from rohitwaghchaure/budget_issue
[Fix] Budget not working properly
2017-01-20 12:54:29 +05:30
Nabin Hait
a0b967f2cd Get valuation rate from Item while not found based on SLE 2017-01-20 12:50:40 +05:30
Nabin Hait
f356e539bb Update set_null_value_to_fields.py 2017-01-20 12:35:22 +05:30
Rohit Waghchaure
84b827efcd [Fix] Budget not working properly 2017-01-20 12:33:50 +05:30
robert schouten
e14e042f2f [fix] remove invalid parameter from leave allocation 2017-01-20 15:02:00 +08:00
Nabin Hait
bfcacbf2ca Merge pull request #7535 from rohitwaghchaure/landed_cost_voucher_issue
[Fix] Minor issue in landed cost voucher
2017-01-20 12:12:17 +05:30
Rohit Waghchaure
a3a977d02a [Fix] Minor issue in landed cost voucher 2017-01-19 18:38:53 +05:30
Kanchan Chauhan
03dc695c77 [Minor] Set website warehouse as default warehouse 2017-01-19 14:57:05 +05:30
Rushabh Mehta
c81621d3ce [minor] add progress bar in patch 2017-01-19 14:32:36 +05:30
Rushabh Mehta
00d3cd6d64 [fix] contact address link patch 2017-01-19 14:27:02 +05:30
Rushabh Mehta
818af75575 [patch] add patch for contact_address_update 2017-01-19 13:08:46 +05:30
Rushabh Mehta
d69fd1b8c0 [fix] update_salary_slip.py 2017-01-19 12:51:37 +05:30
Rushabh Mehta
683d98fd54 [fix] update_salary_slip.py 2017-01-19 12:48:03 +05:30
Rushabh Mehta
35e4d8b152 [fix] update_salary_slip.py 2017-01-19 12:47:27 +05:30
Rushabh Mehta
60908f4a08 [fix] update_salary_slip.py 2017-01-19 12:46:11 +05:30
Rushabh Mehta
26fdb113a8 [fix] update_salary_slip.py 2017-01-19 12:44:54 +05:30
Kanchan Chauhan
45c14ed41c [Minor] Date fix in Production Order 2017-01-19 12:22:04 +05:30
Nabin Hait
eb80fdef82 Merge pull request #7520 from RobertSchouten/heatmap_limit_dev
[fix] accounts heatmaps now covering 366 days not 20
2017-01-19 09:15:20 +05:30
Nabin Hait
6b3670848e Merge pull request #7477 from rmehta/custom-perms
[minor] fix for custom perms
2017-01-18 17:03:58 +05:30
Rohit Waghchaure
56cc542eb7 [Fix] sales return discount issue 2017-01-18 14:50:24 +05:30
Rushabh Mehta
a0c41b70c4 [fix] tax rule test 2017-01-18 14:14:20 +05:30
Rohit Waghchaure
2b97cee32c [Fix] POS print issue 2017-01-18 13:21:27 +05:30
robert schouten
c0888637cc [fix] accounts heatmaps now covering 366 days not 20 2017-01-18 15:25:58 +08:00
Rushabh Mehta
8f55d6bf3a [fix] test_shopping_cart.py 2017-01-17 22:15:17 +05:30
Rushabh Mehta
d14a6c058a [fix] stop recursion while adding role 2017-01-17 18:46:37 +05:30
Rushabh Mehta
982be9f11b [tests] fixed for shopping cart 2017-01-17 17:57:38 +05:30
Rushabh Mehta
7385b73449 [fix] test 2017-01-17 17:57:38 +05:30
Nabin Hait
dd839055e3 Fixed merge conflict 2017-01-17 15:52:56 +05:30
Nabin Hait
aff2b9479d bumped to version 7.2.13 2017-01-17 16:22:25 +06:00
Nabin Hait
f8676b2058 Create Material Requests considering projected qty of items 2017-01-17 14:11:43 +05:30
Ben Cornwell-Mott
5597f6a830 Fixes counting of in stock parent assemblies and formatting of csv 2017-01-17 14:11:43 +05:30
Kanchan Chauhan
653303180a [Minor] Payroll Fix 2017-01-17 13:54:55 +05:30
Nabin Hait
1c91dc4589 Merge pull request #7475 from RobertSchouten/profitability_order
[fix] profiability analasyis orderby name
2017-01-17 12:39:24 +05:30
Nabin Hait
d9e216878f Merge pull request #7513 from rohitwaghchaure/paid_amount_copy_issue
[Fix] Calculate paid amount when is pos is enabled
2017-01-17 12:38:09 +05:30
Nabin Hait
9e294ee454 Merge branch 'rfq_supplier_pull' into develop 2017-01-17 12:26:09 +05:30
Nabin Hait
2ad62c2892 In RFQ, get items from material requests based on possible supplier 2017-01-17 12:25:33 +05:30
Rohit Waghchaure
f58cad6b13 [Fix] Calculate paid amount when is pos is enabled 2017-01-17 12:11:57 +05:30
Rushabh Mehta
592104ef68 [fix] tests 2017-01-17 12:06:53 +05:30
Nabin Hait
7c7b3c0ab4 Merge pull request #7465 from KanchanChauhan/attendance-enhancement
[Enhancement] Attendance Module
2017-01-17 11:47:02 +05:30
Nabin Hait
0681c77f6a Merge pull request #7506 from mntechnique/hotfix
[Fix] Project: Enabled autocomplete for project users
2017-01-17 11:27:37 +05:30
Nabin Hait
2dab8809e7 Merge pull request #7509 from kickapoo/develop
Add Full Name as option in HR Setting Employee creation option
2017-01-17 11:26:25 +05:30
Dhaifallah Alwadani
9eb830ac4f fix string translation 2017-01-17 11:13:57 +05:30
Nabin Hait
bf01958b85 Merge pull request #7510 from dalwadani/develop
fix string translation
2017-01-17 11:12:15 +05:30
Nabin Hait
b064cf39c2 Merge branch 'develop' into fleet-moved-to-hr 2017-01-17 11:05:39 +05:30
Nabin Hait
03f82240fa Merge pull request #7222 from neilLasrado/assessment
Redesign Assessment Module
2017-01-17 11:04:02 +05:30
Dhaifallah Alwadani
9375d1dfeb fix string translation 2017-01-16 04:05:40 -08:00
Stavros Anastasiadis
241e478dc0 Add Full Name as option in HR Setting Employee creation option 2017-01-16 14:02:28 +02:00
Rushabh Mehta
ffd80a6061 [fix] warehouse test cases 2017-01-16 17:23:20 +05:30
Rushabh Mehta
6695830f3f [fix] warehouse test cases 2017-01-16 16:57:53 +05:30
Gaurav Naik
d9b4c52046 [Fix] Project: Enabled autocomplete for project users 2017-01-16 16:01:25 +05:30
Kanchan Chauhan
f80c2b9606 Fleet management moved to HR 2017-01-16 14:38:24 +05:30
Rushabh Mehta
8d39fd9790 [fix] address queries + tests 2017-01-16 13:06:15 +05:30
Nabin Hait
120461efef Merge branch 'master' into develop 2017-01-16 13:04:54 +05:30
Nabin Hait
71a730a36f bumped to version 7.2.12 2017-01-16 13:34:53 +06:00
KanchanChauhan
b89be1e193 [Minor] Demo fixes (#7499) 2017-01-16 12:57:14 +05:30
Neil Trini Lasrado
38bd62d82d Merge branch 'develop' into assessment 2017-01-16 12:23:51 +05:30
Rushabh Mehta
4ad121e1a4 [minor] fixes for Contact 2017-01-16 12:19:21 +05:30
ci2014
820abd3ba4 Fix missing comma (#7495)
Fixed missing comma after method set_contact_link
2017-01-16 11:57:34 +05:30
Nabin Hait
47bdf8b659 Merge pull request #7490 from rohitwaghchaure/pos_discount_issue
[Fix] Discount not working in the POS
2017-01-16 11:44:50 +05:30
Rohit Waghchaure
685f89f2b7 [Fix] Discount not working in the POS 2017-01-14 20:47:56 +05:30
Rushabh Mehta
95439db53f [fixes] address and contact 2017-01-14 00:25:22 +05:30
Rushabh Mehta
c0bfb0ba56 [fix] contact and address for demo 2017-01-13 23:05:56 +05:30
Rushabh Mehta
b92087cb2d [cleanup] move contact, address to frappe 💥 2017-01-13 18:54:47 +05:30
Nabin Hait
448acf6f46 Merge branch 'master' into develop 2017-01-13 17:30:46 +05:30
Nabin Hait
3d26ddd790 bumped to version 7.2.11 2017-01-13 18:00:45 +06:00
Nabin Hait
e7cb911634 Salary Slip Patch Fixed 2017-01-13 17:30:06 +05:30
Nabin Hait
26ac85be5b Merge branch 'master' into develop 2017-01-13 17:10:52 +05:30
Nabin Hait
fd7f3240b4 bumped to version 7.2.10 2017-01-13 17:40:51 +06:00
Nabin Hait
b166caa9fb Patch fixed 2017-01-13 17:09:57 +05:30
robert schouten
7a3d418aa5 Email inbox based off of frappe email inbox pr (#7308)
* email inbox

* inbox fixes

* separate email-inbox to pass tests

* separate email-inbox to pass tests

* fix import

* add more info to contact and address
2017-01-13 14:51:09 +05:30
Rushabh Mehta
af077dc616 [minor] fix for custom perms 2017-01-13 14:47:37 +05:30
Nabin Hait
b251cd4ccb Fixed merge conflict 2017-01-13 14:34:54 +05:30
Nabin Hait
45cad45420 bumped to version 7.2.9 2017-01-13 15:03:56 +06:00
Nabin Hait
e43a94de4b Merge branch 'hotfix' into draft_status_issue_after_amend 2017-01-13 13:14:32 +05:30
Nabin Hait
9698f1b923 Merge pull request #7473 from KanchanChauhan/salary-slip-before-june
Patch to add Start and End Date in Salary Slips
2017-01-13 12:53:15 +05:30
Rohit Waghchaure
29458836e4 [Fix] After amend the status become cancelled even if docstatus is zero 2017-01-13 12:51:19 +05:30
robert schouten
1a92d54dcb [fix] profiability analasyis orderby cost center name 2017-01-13 14:52:11 +08:00
Kanchan Chauhan
b6114e672f Patch to add Start and End Date in Salary Slips 2017-01-13 12:05:03 +05:30
Nabin Hait
4bd42146ba Merge pull request #7462 from rohitwaghchaure/minor_pos_issue
[Fix] POS issues
2017-01-13 11:55:52 +05:30
Nabin Hait
ba2a76cfb7 Merge pull request #7453 from KanchanChauhan/salary-register-report
Changes to Salary Register
2017-01-13 11:51:48 +05:30
Nabin Hait
8f0c060578 Merge pull request #7447 from saurabh6790/tree_param_fix
[fix] provision to handle custom mandatory params while creating node
2017-01-13 11:50:18 +05:30
Nabin Hait
17cd36b7d5 Merge pull request #7451 from saurabh6790/chequeprint_date_fix
[minor][fix] show date in user format
2017-01-13 11:36:12 +05:30
Nabin Hait
90de12fea3 Merge pull request #7446 from KanchanChauhan/fieldtype-edit-desc
[Minor] Field type of Description field changed to Text Editor
2017-01-13 11:34:51 +05:30
Nabin Hait
007c87ea63 Merge pull request #7440 from nabinhait/gle_repost_optimization
Optimization to reduce GLE reposting time for future stock transactions
2017-01-13 11:33:42 +05:30
robert schouten
d56627f2b7 [fix] profiability analasyis orderby project name 2017-01-13 11:53:43 +08:00
Felipe Orellana
ac81440a81 [FIX] Contact form breaks on existing lead
When an email address from the contacts form is from a existing lead utils.py tries to set new_lead(an undefined var) as the lead reference if a lead is found.
2017-01-12 12:08:20 -05:00
Kanchan Chauhan
7933eb685c [Enhancement] Attendance Module 2017-01-12 17:24:53 +05:30
Rohit Waghchaure
8afe267813 [Fix] POS issues 2017-01-12 15:22:02 +05:30
Kanchan Chauhan
2f3ae914a6 Changes to Salary Register 2017-01-11 19:45:01 +05:30
Ben Cornwell-Mott
1cd7e54822 Adds button to find MRs linked to Supplier 2017-01-11 03:05:49 -08:00
Saurabh
056276c60e [minor][fix] show date in user format 2017-01-11 15:50:09 +05:30
RicardoJohann
7182de7684 allowed rename salary structure 2017-01-11 06:28:59 -02:00
Saurabh
2f02101d7d [fix] provision to handle custom mandatory params while creating node 2017-01-11 12:41:01 +05:30
Kanchan Chauhan
595cfb9f17 [Minor] Field type of Description field changed to Text Editor 2017-01-11 12:03:15 +05:30
Nabin Hait
0287d31c0f Fetch bin details after setting warehouse based on POS Profile 2017-01-11 10:31:45 +05:30
Nabin Hait
c0eab41ec5 Fix for Budget against Project 2017-01-11 10:16:19 +05:30
Ben Cornwell-Mott
3d491f90cc Created 2 reports for stock details 2017-01-10 14:14:18 -08:00
Neil Trini Lasrado
2a9e0f6fd8 Added assessment result tool 2017-01-10 17:32:02 +05:30
Nabin Hait
9e08ccdf39 Merge pull request #7425 from KanchanChauhan/sync-projecttask-task
Sync Project Task and Task
2017-01-10 17:26:51 +05:30
Nabin Hait
1612fa1253 Merge pull request #7426 from nabinhait/hotfix
Show values based on precision and filter out zero value rows
2017-01-10 17:26:27 +05:30
Nabin Hait
20aba32318 Merge pull request #7427 from KanchanChauhan/projects-manager-role
[Minor] Added Projects Manager role
2017-01-10 17:25:16 +05:30
Kanchan Chauhan
c4aceaad7f [Minor] Added Projects Manager role 2017-01-10 16:35:54 +05:30
Nabin Hait
5dd988207f Show values based on precision and filter out zero value rows 2017-01-10 16:10:40 +05:30
Kanchan Chauhan
4a15fa4c86 Sync Project Task and Task 2017-01-10 16:01:38 +05:30
Rushabh Mehta
d40e661ebd [style] better demo start page 2017-01-10 14:46:54 +05:30
Nabin Hait
51d45d8bce Fixed merge conflict 2017-01-10 12:32:01 +05:30
Nabin Hait
4180a37773 bumped to version 7.2.8 2017-01-10 13:00:09 +06:00
Nabin Hait
a7f616564e Merge pull request #7417 from KanchanChauhan/quick-entry-for-item
[Minor] Valuation rate in Quick entry for Item
2017-01-10 12:23:36 +05:30
Nabin Hait
01baceb74e Revert "proposed usage of daterange picker" 2017-01-10 12:19:48 +05:30
Kanchan Chauhan
43e07aed2c [Minor]Valuation rate in Quick entry for Item 2017-01-10 12:06:51 +05:30
Nabin Hait
9215581345 Merge pull request #7414 from KanchanChauhan/timesheet-payroll-frequency-toggle
[Fix] Payroll Frequency toggle fix
2017-01-10 11:58:36 +05:30
Kanchan Chauhan
2b41f9d548 [Fix] Payroll Frequency toggle fix 2017-01-09 18:43:52 +05:30
Neil Trini Lasrado
5a30467ae5 Added test case 2017-01-09 18:26:03 +05:30
Neil Trini Lasrado
a56224c03a Rename Assessment to Assessment Plan 2017-01-09 18:26:03 +05:30