Saurabh
468e41f24f
[enhance] introduce ignore_fields param for _tree and get_query
2016-10-27 15:23:19 +05:30
Nabin Hait
622c05cc60
Merge pull request #6724 from rohitwaghchaure/bank_clearance_report_issue
...
[Fix] No permission to read report Bank Clearance Summary for account user
2016-10-27 13:48:19 +05:30
Rohit Waghchaure
53a28eb39d
[Fix] No permission to read report Bank Clearance Summary for account user
2016-10-27 11:46:10 +05:30
bcornwellmott
7ef2c0fc34
Fix calendar view for Timesheet
...
All the calendar events for Timesheets show up on one date. This is because there was a change to the timesheet_calendar.js file when the Gantt chart was added, but the get_events for the calendar wasn't fixed at the same time. Just fixing the reference to the start and end times.
2016-10-26 11:02:48 -07:00
Nabin Hait
38c1732304
Merge branch 'develop'
2016-10-26 17:56:16 +05:30
Nabin Hait
62616a03b3
bumped to version 7.1.0
2016-10-26 18:26:16 +06:00
Nabin Hait
afa3697c7f
Merge pull request #6717 from frappe/nabinhait-patch-1
...
Update __init__.py
2016-10-26 17:54:58 +05:30
Nabin Hait
6d1eda812d
Update __init__.py
2016-10-26 17:54:47 +05:30
Nabin Hait
72cee33b3a
[translations]
2016-10-26 17:45:06 +05:30
Nabin Hait
72a1943c8e
Fixed version conflict
2016-10-26 16:41:21 +05:30
Nabin Hait
4c0a9f420f
Merge branch 'hotfix'
2016-10-26 16:40:45 +05:30
Nabin Hait
f3882d2699
bumped to version 7.0.63
2016-10-26 17:10:44 +06:00
Nabin Hait
2e12a76d18
Merge pull request #6716 from nabinhait/develop
...
Change Logs for v7.1
2016-10-26 16:37:10 +05:30
Nabin Hait
7f19a24e5e
Merge pull request #6705 from KanchanChauhan/get-serial-no
...
Fetch serial no by default
2016-10-26 16:31:11 +05:30
Nabin Hait
c5cbde273f
Change Logs for v7.1
2016-10-26 16:28:54 +05:30
Kanchan Chauhan
0a3f2c818a
Fetch serial no by default
2016-10-26 14:59:43 +05:30
Nabin Hait
683c4798b5
Merge pull request #6714 from KanchanChauhan/balance-sheet-error
...
[Fix] Error in Balance Sheet Report
2016-10-26 14:27:33 +05:30
Nabin Hait
a3c24385cf
Merge pull request #6710 from frappe/bcornwellmott-patch-1
...
[Minor] Add details to MRs from PPT
2016-10-26 13:06:22 +05:30
Nabin Hait
e0aaea20af
Merge pull request #6701 from shreyasp/modify-submit-docs
...
[Fix] Make purchase order item reqd_date modifiable after submit
2016-10-26 13:05:11 +05:30
Kanchan Chauhan
dc3198a11c
[Fix] Error in Balance Sheet Report
2016-10-26 13:05:08 +05:30
Shreyas Patil
6c7d6e095b
Update purchase_order_item.json
2016-10-26 12:47:35 +05:30
shreyas
fd04d62c2e
[Minor] Added expected_delivery_date to purchase order item doctype
2016-10-26 12:38:31 +05:30
Nabin Hait
821331b3c0
Merge pull request #6712 from neilLasrado/develop
...
Allow rename of student doctype
2016-10-26 12:32:20 +05:30
Neil Trini Lasrado
a3f2a47020
Allow rename of student doctype
2016-10-26 12:24:27 +05:30
Revant Nandgaonkar
0bb92ab7a0
[docs] Email and Phone validation on Custom Fields ( #6703 )
2016-10-26 11:05:12 +05:30
bcornwellmott
30df3cd3dc
Add description, stock UOM and Min Order Qty to MRs
...
The material requests currently do not include descriptions, stock UOM and Min Order Quantities. This fix adds them. This is especially critical in the CSV export, which currently is missing all this info.
2016-10-25 14:21:26 -07:00
shreyas
99e063f831
[Fix] Make purchase order item reqd_date modifiable after submit
2016-10-25 12:44:27 +05:30
Nabin Hait
ffd2fc5101
[fix] Validate if warehouse is not linked to any account
2016-10-24 18:54:07 +05:30
Nabin Hait
d662502f3c
[fix] Validate if warehouse is not linked to any account
2016-10-24 18:17:57 +05:30
Nabin Hait
c00b17a6e0
Update project.json
2016-10-24 17:53:06 +05:30
Nabin Hait
fe86debf5d
[fix] Duplicate salary components
2016-10-24 17:47:18 +05:30
Nabin Hait
7d977a243a
Merge pull request #6690 from rohitwaghchaure/v7_pricing_rule_issue
...
[Fix] Pricing rule discount issue
2016-10-24 16:47:33 +05:30
Nabin Hait
0f9d60099d
Merge pull request #6692 from neilLasrado/develop
...
Typo fix
2016-10-24 16:46:27 +05:30
Nabin Hait
a02fb1541a
Merge pull request #6553 from saurabh6790/scrap_management
...
Scrap management
2016-10-24 16:46:13 +05:30
Nabin Hait
1f3771cdf1
Merge pull request #6687 from KanchanChauhan/lead-changes
...
Contact by and contact date validations
2016-10-24 16:44:08 +05:30
Rohit Waghchaure
43b508089e
[Fix] Pricing rule discount issue
2016-10-24 16:16:24 +05:30
Neil Trini Lasrado
5ddd7acdbd
Typo fix
2016-10-24 15:25:47 +05:30
Saurabh
8c3764a6ef
test case for scrap item
2016-10-24 13:55:36 +05:30
Saurabh
4ae4eb0eb9
added get_scrap_items param to get_bom_items_as_dict
2016-10-24 13:55:36 +05:30
Saurabh
5a2fa8aac7
[enhance] scrap management
2016-10-24 13:55:36 +05:30
Saurabh
464c27e189
[feature] scrap management
2016-10-24 13:55:36 +05:30
Kanchan Chauhan
a1cedbc7b2
Contact by and contact date validations
2016-10-24 13:51:13 +05:30
Nabin Hait
cf397d3190
Merge pull request #6688 from frappe/umairsy-patch-5
...
Update domainify.py
2016-10-24 13:43:57 +05:30
Umair Sayed
a56775ce9a
Update domainify.py
2016-10-24 13:00:17 +05:30
Nabin Hait
f430d73daf
Merge pull request #6662 from PawanMeh/fixes_6363
...
[fix] #6363
2016-10-24 11:56:43 +05:30
Nabin Hait
00b3443b61
Merge pull request #6653 from shreyasp/cust-credit-limit
...
[Minor] Do not allow change in credit limit
2016-10-24 11:55:24 +05:30
Nabin Hait
a221f7ec5d
Update test_customer.py
2016-10-24 11:27:56 +05:30
Pawan Mehta
297e725727
Update project.json
2016-10-24 11:24:38 +05:30
Nabin Hait
df366a6e9c
Merge pull request #6683 from KanchanChauhan/multiple-active-salary-slio
...
Warning if there are mutliple active salary structures
2016-10-24 11:23:57 +05:30
Mainul Islam
a964db7821
Add multiple emoloyee in salary structure ( #6621 )
...
* Add multiple emoloyee in salary structure
* Added in Menu
* Remove Default Value from Company field
* Change Section Label
* Added Button in Salary Structure and set route_options
* Remove Single Doctype
* Add Dialog for Employee Add
* View Employee and Check or Uncheck
* Complete Multiple Employee Add in Employee Table and Neve Entry in Duplicate in Employees
* Employees View Section in Dialog Added Employe Name and set Employee Id as Title
* Delete SIngle Doctype
* Chagne to
* Remove checkbox
* Remove add button and set primary button
2016-10-24 11:22:00 +05:30
