Rohit Waghchaure
|
e7485150a1
|
added roles in the report
|
2017-03-06 14:26:09 +05:30 |
|
Rohit Waghchaure
|
312498060f
|
changed doctype name userrole to has role
|
2017-03-06 14:24:39 +05:30 |
|
Rohit Waghchaure
|
d59f8b32cd
|
changed user_roles to roles
|
2017-03-06 14:24:39 +05:30 |
|
Nabin Hait
|
a07c3193cf
|
Merge pull request #7889 from rohitwaghchaure/sales_return_issue_for_pos
[Fix] Sales Return Invoice (Is POS) doesn't show correct payment data
|
2017-03-04 18:32:40 +05:30 |
|
Nabin Hait
|
feb45727e5
|
Merge pull request #7912 from mbauskar/develop
[minor] fixes contact field set query for opportunity
|
2017-03-04 18:31:09 +05:30 |
|
Rohit Waghchaure
|
a31ffbc745
|
[Fix] Sales Return Invoice (Is POS) doesn't show correct payment data
|
2017-03-03 16:28:49 +05:30 |
|
mbauskar
|
91c6ffde86
|
[minor] fixes contact field set query for opportunity
|
2017-03-02 17:29:16 +05:30 |
|
Nabin Hait
|
78a650062c
|
Update company.json
|
2017-03-02 14:48:49 +05:30 |
|
Nabin Hait
|
57a47a83a0
|
Merge pull request #7887 from rohitwaghchaure/capacity_planning
[Fix] Pull operation on production order, when making from sales order
|
2017-03-02 14:17:09 +05:30 |
|
Nabin Hait
|
a0fb3e5128
|
Merge pull request #7888 from KanchanChauhan/payroll-fix
[Fix] JV entry for Employee Loan only if Loan exists
|
2017-03-02 14:15:59 +05:30 |
|
Nabin Hait
|
42bc399f2a
|
Merge pull request #7890 from KanchanChauhan/hr-page
[Minor] Employee Loan Management moved up in HR Page
|
2017-03-02 14:14:04 +05:30 |
|
Nabin Hait
|
bc10ea897d
|
Merge pull request #7893 from pratu16x7/crm-docs
CRM docs update
|
2017-03-02 14:13:19 +05:30 |
|
Nabin Hait
|
17cf220cbc
|
Merge pull request #7908 from KanchanChauhan/removed-paid-status
[Minor] Removed Paid status from Salary Slip
|
2017-03-02 14:12:34 +05:30 |
|
Kanchan Chauhan
|
cfb0adff98
|
[Minor] Removed Paid status from Salary Slip
|
2017-03-02 12:59:35 +05:30 |
|
Nabin Hait
|
834d616c60
|
Merge branch 'master' into develop
|
2017-03-02 12:38:15 +05:30 |
|
Nabin Hait
|
c99f85d84c
|
Merge branch 'hotfix'
|
2017-03-02 12:38:14 +05:30 |
|
Nabin Hait
|
1cc7024cb4
|
bumped to version 7.2.27
|
2017-03-02 13:08:14 +06:00 |
|
Rushabh Mehta
|
7067ff026a
|
[minor] add progress in desktop help message
|
2017-03-02 11:14:09 +05:30 |
|
Rushabh Mehta
|
e7900b24a0
|
[minor] add progress in desktop help message
|
2017-03-02 11:13:18 +05:30 |
|
Saurabh
|
e95b6e75ac
|
Merge pull request #7905 from saurabh6790/demo_data_setup_fix
[fix] add from date field to salary structure in setup demo data
|
2017-03-02 08:53:27 +05:30 |
|
Saurabh
|
b3134d34fa
|
[fix] add from date field to salary structure in setup demo data
|
2017-03-02 08:43:08 +05:30 |
|
Nabin Hait
|
258c8199fb
|
Merge pull request #7842 from superlack/develop
Add Sales Orders to Project costing and billing section
|
2017-03-01 17:20:23 +05:30 |
|
pratu16x7
|
4e71337f3d
|
fix lead, customer, opportunity pages
|
2017-03-01 04:02:50 +05:30 |
|
Nabin Hait
|
18b7364a81
|
Merge branch 'master' into develop
|
2017-02-28 18:56:26 +05:30 |
|
Nabin Hait
|
093eba2336
|
Merge branch 'hotfix'
|
2017-02-28 18:56:25 +05:30 |
|
Nabin Hait
|
db2aefa3a6
|
bumped to version 7.2.26
|
2017-02-28 19:26:25 +06:00 |
|
Rushabh Mehta
|
f8b19e07cf
|
[minor] activation messages only for non activated users
|
2017-02-28 18:54:07 +05:30 |
|
Kanchan Chauhan
|
639eebdae5
|
[Minor] Employee Loan Management moved up in HR Page
|
2017-02-28 18:01:07 +05:30 |
|
Kanchan Chauhan
|
e6254b96c4
|
[Fix] JV entry for Loan only if Loan exists
|
2017-02-28 17:42:09 +05:30 |
|
Rohit Waghchaure
|
2c2ce8c557
|
[Fix] Pull operation on production order, when making from sales order
|
2017-02-28 17:12:18 +05:30 |
|
Nabin Hait
|
8312f1cd64
|
Merge pull request #7671 from bcornwellmott/link_mrs
Created button to link buying items to material requests
|
2017-02-28 15:56:06 +05:30 |
|
Nabin Hait
|
6bbf141d57
|
Merge branch 'develop' into link_mrs
|
2017-02-28 15:55:35 +05:30 |
|
Nabin Hait
|
38c7ad2c69
|
Update supplier_quotation.json
|
2017-02-28 15:53:10 +05:30 |
|
Nabin Hait
|
491d2ad140
|
Update request_for_quotation.json
|
2017-02-28 15:52:43 +05:30 |
|
Nabin Hait
|
365ed5dea9
|
Update purchase_order.json
|
2017-02-28 15:51:00 +05:30 |
|
Nabin Hait
|
fd37395995
|
Merge pull request #7878 from netchampfaris/lead-fix
fix date compare in contact_date
|
2017-02-28 15:37:42 +05:30 |
|
Faris Ansari
|
0ded707397
|
fix date compare in contact_date
|
2017-02-27 21:51:46 +05:30 |
|
superlack
|
62d7ba0afd
|
Update project.py
|
2017-02-27 07:00:30 -08:00 |
|
Nabin Hait
|
cda28ceeec
|
[translations]
|
2017-02-27 17:46:47 +05:30 |
|
Nabin Hait
|
409062b8a4
|
Merge pull request #7869 from KanchanChauhan/dependent-tasks
Dependent task dates gets updated with parent dates
|
2017-02-27 17:34:09 +05:30 |
|
Nabin Hait
|
631ecad985
|
Merge pull request #7875 from KanchanChauhan/employee-loan-fixes
[Fix] Multiple fixes in Employee Loan
|
2017-02-27 17:28:20 +05:30 |
|
Nabin Hait
|
3ddc26060a
|
Merge pull request #7876 from KanchanChauhan/salary-slip-fix
[Fix] Update totals on salary component deletion
|
2017-02-27 17:26:39 +05:30 |
|
Kanchan Chauhan
|
c02745c826
|
[Fix] Update totals on salary component deletion
|
2017-02-27 17:21:41 +05:30 |
|
Kanchan Chauhan
|
a13adc0e6b
|
[Fix] Multiple fixes in Employee Loan
|
2017-02-27 16:56:00 +05:30 |
|
Nabin Hait
|
b9741b6ed5
|
Merge branch 'master' into develop
|
2017-02-27 15:41:44 +05:30 |
|
Nabin Hait
|
d39b012981
|
Merge branch 'hotfix'
|
2017-02-27 15:41:43 +05:30 |
|
Nabin Hait
|
b99a38d6ae
|
bumped to version 7.2.25
|
2017-02-27 16:11:43 +06:00 |
|
Nabin Hait
|
a2afc4e11c
|
Update activation.py
|
2017-02-27 15:39:29 +05:30 |
|
Kanchan Chauhan
|
e76685d925
|
Dependent task dates gets updated with parent dates
|
2017-02-27 14:55:03 +05:30 |
|
Nabin Hait
|
c642f76a4d
|
Fixed merge conflict
|
2017-02-27 14:40:53 +05:30 |
|