Commit Graph

18116 Commits

Author SHA1 Message Date
Nabin Hait
80b3cf22eb Merge branch 'develop' 2017-03-30 18:28:22 +05:30
Nabin Hait
3b5b081ac4 bumped to version 8.0.0 2017-03-30 18:58:20 +06:00
Nabin Hait
d00218ece3 Merge pull request #8227 from manassolanki/contact_report
Addition of few more fields in student contact report
2017-03-30 17:43:33 +05:30
Nabin Hait
93c15383b8 [translations] 2017-03-30 16:57:19 +05:30
Nabin Hait
3c2be33adf Merge pull request #8226 from mbauskar/item-varient-fix
[minor] make varient fixes in item.js
2017-03-30 16:05:34 +05:30
Manas Solanki
4be52d8a20 Addition of few more fields in student contact report 2017-03-30 16:04:26 +05:30
Nabin Hait
6bd791742f Change log for version 8 2017-03-30 16:00:43 +05:30
mbauskar
90d82be966 [minor] make varient fixes in item.js 2017-03-30 15:36:46 +05:30
Nabin Hait
eb6fa5b70c Update attendance.py 2017-03-30 14:11:47 +05:30
Nabin Hait
1f6bd0ad37 Fixed merge conflict 2017-03-30 13:15:22 +05:30
Nabin Hait
c4894a5287 Merge branch 'hotfix' 2017-03-30 13:14:34 +05:30
Nabin Hait
a9bef56a94 bumped to version 7.2.32 2017-03-30 13:44:34 +06:00
Nabin Hait
f90a3295c4 Merge pull request #8213 from KanchanChauhan/update-disbursment-date
Disbursement Date fetched from JV - Employee Loan
2017-03-30 13:06:40 +05:30
Nabin Hait
a24f8dbb8f Merge branch 'develop' into update-disbursment-date 2017-03-30 13:06:28 +05:30
Kanchan Chauhan
37d8f643cc Read permissions to Employee on Employee Loan and Loan Type 2017-03-30 13:05:49 +05:30
Kanchan Chauhan
400c6f5aef Disbursement Date fetched from JV - Employee Loan 2017-03-30 13:04:05 +05:30
mbauskar
07e6bdd4f2 [minor] check employee date of joining before marking the employee attendance 2017-03-30 12:52:29 +05:30
Kanchan Chauhan
b87c174898 Employee Loan Dashboard 2017-03-30 12:51:46 +05:30
CH
99752e58ec VAT rates update for France 2017-03-30 12:45:08 +05:30
Kanchan Chauhan
5ac740b3cb [Fix] From Date and To Date not to be auto calculated for Timesheet Salary 2017-03-30 12:44:28 +05:30
Manas Solanki
3528d08178 [Fix] Fix in program enrollment tool and report 2017-03-30 12:21:49 +05:30
Nabin Hait
f912317fae Stock Balance: Show records based on all child item groups if filters set based on group node 2017-03-29 18:08:10 +05:30
Nabin Hait
e2fef16d78 Made join_table query optional based on item group filter 2017-03-29 17:51:05 +05:30
Javier Wong
41bf1ba7b3 [enhancement] Stock Balance Report - Added Item Group Filter 2017-03-29 17:51:05 +05:30
Ricardo Johann
3d1434afe7 Export total labels 2017-03-29 17:44:17 +05:30
addymuliady
0dd00eb418 Update accounts-settings.md 2017-03-29 17:40:01 +05:30
Nabin Hait
64e9c4abf4 Changed label of hide_tax_id field 2017-03-29 17:39:08 +05:30
Makis Etzoglou
82e6bc45e4 tax_id add to Sales Order, Delivery Note, and Sales Invoice 2017-03-29 17:39:08 +05:30
Saurabh
a5ddeb44e7 [fix] remove integraton service reference from documentation 2017-03-29 17:32:04 +05:30
Kanchan Chauhan
35b12e2ea6 Company in Leave Control Panel 2017-03-29 17:30:56 +05:30
mbauskar
de98ff6bb9 [minor] hide the stock details section if update_stock is unchecked 2017-03-29 17:29:58 +05:30
rohitwaghchaure
afa93c624b [fix] Reserved qty is not calculating properly in BIN for multi sales UOM (#8203) 2017-03-29 17:29:20 +05:30
Manas Solanki
8519b4bfe4 Changes in Program Enrollment and Report for Student Contact Details (#8176)
* Added the student house name in the program enrollment

* added report for the student contact details

* Enabled tag in Student master and fix in student enrollment tool

* [Fix] School House and Report
2017-03-29 16:07:31 +05:30
Nabin Hait
79731360ed Merge pull request #8126 from kickapoo/issue8094
Add link field Package Code (fixes #8094)
2017-03-28 20:48:39 +05:30
Nabin Hait
fede6d8fbe Updated modified date for production order 2017-03-28 20:42:42 +05:30
Stavros Anastasiadis
b9bbb3c3db Add link field Package Code (fixes #8093) 2017-03-28 16:09:52 +03:00
Nabin Hait
11812db5e8 Merge pull request #8183 from neilLasrado/minor-fix
Fixed issue with misleading error message on Stock Entry creation of Serialized Items
2017-03-28 18:08:42 +05:30
Neil Trini Lasrado
193c8919b9 Fixed issue with misleading error message on Stock Entry creation of Serialized Items 2017-03-28 17:43:23 +05:30
Nabin Hait
d1f6cc88f2 Required items table in Production order 2017-03-28 17:08:40 +05:30
Nabin Hait
dac525433c Merge pull request #8178 from nabinhait/develop
Patch order changed for multiple uoms in sales cycle
2017-03-28 16:55:57 +05:30
rohitwaghchaure
e313c09fd7 Merge pull request #8182 from frappe/netchampfaris-patch-1
Update POS screenshot
2017-03-28 16:35:16 +05:30
Faris Ansari
49a3d6d8f6 Update POS screenshot 2017-03-28 16:17:30 +05:30
Nabin Hait
580682d6a2 Merge pull request #8136 from dottenbr/customs_tariff_number
Add Customs Tariff Number
2017-03-28 13:51:52 +05:30
Nabin Hait
6c3eb36c35 Merge branch 'develop' into customs_tariff_number 2017-03-28 13:51:44 +05:30
Nabin Hait
da749f716b Merge pull request #8172 from rohitwaghchaure/credit_note_serial_no_issue
[fix] During making credit note from sales invoice, system fetching new serial no instead of old serial no from the sales invoice
2017-03-28 13:49:32 +05:30
Nabin Hait
2cf5ca28f6 Merge pull request #8173 from nabinhait/hotfix
In gross profit report, if incoming rate not found from last sle, consider average valuation rate
2017-03-28 13:49:09 +05:30
Nabin Hait
95db9f9e09 Merge pull request #8175 from rohitwaghchaure/production_planning_issue
[fix] sales order with status closed fetching on production planning tool
2017-03-28 13:48:42 +05:30
Nabin Hait
621dcc3c84 Patch order changed for multiple uoms in sales cycle 2017-03-28 13:45:56 +05:30
Nabin Hait
010d9cd796 Merge branch 'dottenbr-manufacturer_childtable' into develop 2017-03-28 13:39:43 +05:30
Nabin Hait
77b2fef41e Fixed test cases 2017-03-28 13:39:26 +05:30