Nabin Hait
a987b35b72
Merge pull request #7514 from KanchanChauhan/fix-payroll
...
[Minor] Payroll Fix
2017-01-17 14:59:59 +05:30
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
2f2b6df781
Merge pull request #7411 from KanchanChauhan/fleet-moved-to-hr
...
Fleet management moved to HR
2017-01-17 11:06:00 +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
2bbf784fd8
Merge branch 'hotfix'
2017-01-16 13:04:53 +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
5d69900f66
Merge branch 'hotfix'
2017-01-13 17:30:45 +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
ca7c5275c0
Merge branch 'hotfix'
2017-01-13 17:10:51 +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
74c56aff90
Merge branch 'hotfix'
2017-01-13 14:33:56 +05:30
Nabin Hait
45cad45420
bumped to version 7.2.9
2017-01-13 15:03:56 +06:00
