Julian Robbins
62e3e75555
Addition of Imap to description of usable mail accounts ( #8806 )
2017-05-13 09:55:23 +05:30
Saurabh
154385db1b
Merge branch 'develop'
2017-05-13 07:42:03 +05:30
Saurabh
82e303882e
bumped to version 8.0.26
2017-05-13 08:12:03 +06:00
Saurabh
b679533f81
Merge pull request #8815 from saurabh6790/activation_status_fix
...
[fix] rename Student Batch to Student Batch Name in activation check
2017-05-13 07:08:02 +05:30
Saurabh
45540569ff
[fix] rename Student Batch to Student Batch Name in activation check
2017-05-13 06:30:41 +05:30
Makarand Bauskar
d4e15ca359
[minor] create student batch if does not exists ( #8781 )
...
* [minor] create student batch if does not exists
* [fix] minor fixes in if condition
2017-05-12 11:23:58 +05:30
Makarand Bauskar
e8270fe21c
[fix] minor fix in get_context for item variants ( #8791 )
2017-05-12 11:23:23 +05:30
Saurabh
62c7deee00
[fix] don't allow string values in limits to avoid sql injection ( #8779 )
2017-05-11 18:03:12 +05:30
Nabin Hait
fcefc601e0
Merge branch 'develop'
2017-05-11 17:06:56 +05:30
Nabin Hait
b579fd7ada
bumped to version 8.0.25
2017-05-11 17:36:56 +06:00
Nabin Hait
4f5ad50ecf
Item Rate in Sales Return must be less than or equal to reference doc ( #8775 )
...
* Item Rate in Sales Return must be less than or equal to reference doc
* Fix as rate field is not there in Packed Item
2017-05-11 16:44:19 +05:30
Nabin Hait
5ad6126832
On saving of Accounts Settings, only save enabled warehouses ( #8772 )
2017-05-11 13:34:04 +05:30
Nabin Hait
62d27ab7d3
Reload doctype bewfore renaming margin fields ( #8771 )
2017-05-11 13:26:55 +05:30
KanchanChauhan
f74010d379
Calculations based on working and payment days should be made if salary structure exists ( #8770 )
2017-05-11 11:42:35 +05:30
Makarand Bauskar
0e4c5c9efb
[minor] renamed a Total Margin field to Rate With Margin ( #8720 )
...
* [minor] renamed a Total Margin field to Rate With Margin
* [minor] minor fixes in field lable
2017-05-11 11:40:02 +05:30
Faris Ansari
734d7795f8
Show party name in General Ledger print report ( #8760 )
2017-05-11 11:38:30 +05:30
Makarand Bauskar
464f108586
[minor] added currency in Totals for Trial Balance report ( #8757 )
...
* [minor] added currency in Totals for Trial Balance report
* [minor] used erpnext.get_default_currency to fetch the company currency
2017-05-10 19:40:36 +05:30
KanchanChauhan
323e46ba5a
Added parent filter to the Salary Structure Employee since it was getting base and variable value from first found Salary Structure Employee ( #8756 )
2017-05-10 17:46:32 +05:30
Makarand Bauskar
62414565b1
[minor] added the address_html field in company doctype ( #8754 )
2017-05-10 14:52:03 +05:30
Manas Solanki
426b8a14fd
Merge the student group and student batch ( #8663 )
...
* deleted student batch creation tool
* Patch for deleting the doctype and config
* Changes in the student attendance
* Patch for renaming the student batch as student group
* Changes in the student attendance
* Change in the student attendance reports
- Absent student report
- Student Batch-wise attendance
- Student monthly attendance sheet
* Changes in the patch
* Changes in the course schedule
* Changes in the course scheduling tool
* Change in the assessment plan
* Changes in the assessment result tool
* Cleanup
* Changes in the api.py
* create student group from student batch
* delete student batch
* add patch
* remove student batch from config/schools.py
* Delete the depricated doctype with patch
* Changes in patch
* Changes as per PR
2017-05-09 15:32:52 +05:30
Nabin Hait
0d0d3bacd7
Merge branch 'develop'
2017-05-09 15:13:32 +05:30
Nabin Hait
70e1778712
bumped to version 8.0.24
2017-05-09 15:43:32 +06:00
Nabin Hait
4e6ff8ccd8
Ignore permission for Bin in warehouse query ( #8742 )
2017-05-09 15:09:10 +05:30
Rushabh Mehta
95233a62d7
[minor] item route item_name + random string
2017-05-09 07:48:41 +05:30
Nabin Hait
226ea7db88
Filter issue on timesheet calendar view ( #8730 )
2017-05-08 17:34:07 +05:30
Saurabh
9df45bbc42
[fix] Reference Document is required to create Payment Request ( #8729 )
...
* [fix] Referene Document is required to create Payment Request
* Update payment_request.py
2017-05-08 17:24:23 +05:30
Rushabh Mehta
a6bc583daf
[minor] item route is item name + code
2017-05-08 11:35:40 +05:30
Nabin Hait
3f7fff04f4
Merge branch 'develop'
2017-05-06 13:40:52 +05:30
Nabin Hait
b5a9822fff
bumped to version 8.0.23
2017-05-06 14:10:52 +06:00
Nabin Hait
17179ee83a
minor syntax fix
2017-05-06 13:23:12 +05:30
Ishan Loya
120ee275cc
Fix typo ( #8719 )
2017-05-06 12:48:22 +05:30
Makarand Bauskar
486045e1d1
[minor] check if date of joining is available before creating Salary Slip ( #8700 )
2017-05-06 12:47:42 +05:30
Nabin Hait
3257aeeb55
Price list rate fix multiple uom and validation with prev doc ( #8718 )
2017-05-06 12:47:14 +05:30
Nabin Hait
7228e1af6e
Customer/Supplier Name in sales/purchase analytics ( #8717 )
2017-05-06 12:45:37 +05:30
Nabin Hait
6e7407962f
Get exchange rate only if date and currency is present ( #8712 )
...
* Get exchange rate only if date and currency is present
* Update transaction.js
2017-05-06 12:45:16 +05:30
Rushabh Mehta
b7e740ff45
[minor] ignore permissions for bin on warehouse_query ( #8713 )
2017-05-06 12:44:03 +05:30
Dominik Ottenbreit
51cd2df763
Fix Romanian Translation ( #8706 )
2017-05-05 17:30:45 +05:30
Pawan Mehta
cac94b9bd5
[fix] #8373 ( #8707 )
2017-05-05 17:29:57 +05:30
Manas Solanki
65c8466622
check for mandatory field before frappe.call ( #8705 )
2017-05-05 17:28:09 +05:30
Nabin Hait
42343bbc2c
Selling price validation against last purchase rate / valuation rate ( #8702 )
2017-05-05 17:23:17 +05:30
KanchanChauhan
ed56b8afd8
Website route for item based on name not item name ( #8682 )
2017-05-05 11:56:55 +05:30
Makarand Bauskar
6b3bc8a8e1
[hotfix] fixed the recursion error while saving the User ( #8696 )
2017-05-05 11:53:00 +05:30
Makarand Bauskar
c4ec937835
[hotfix] fixed object has no attribute 'delivered_by_supplier' ( #8699 )
2017-05-05 11:52:17 +05:30
Nabin Hait
d2a966eef3
Update general_ledger.py
2017-05-05 10:41:16 +05:30
rohitwaghchaure
6324987c15
[fix] Company's abbreviation change will not update the warehouse ( #8685 )
2017-05-04 16:12:29 +05:30
Nabin Hait
c9bfb64cd9
Merge branch 'develop'
2017-05-04 12:20:31 +05:30
Nabin Hait
8470b39d4c
bumped to version 8.0.22
2017-05-04 12:50:31 +06:00
Nabin Hait
932423ecba
Balance Sheet always shows accumulated values from previous fiscal year ( #8668 )
2017-05-04 12:12:29 +05:30
Faris Ansari
1c09a991f3
Change beta_version to 8.x-beta ( #8673 )
...
* Change beta_version to 8.x-beta
* change to 8.x.x-beta
2017-05-04 12:12:14 +05:30
Nabin Hait
fcc0246b38
Get mobile nos for customer contact ( #8674 )
2017-05-04 12:11:48 +05:30
