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
Nabin Hait
90350dfb86
Merge pull request #7476 from rohitwaghchaure/draft_status_issue_after_amend
...
[Fix] After amend the status become cancelled even if docstatus is zero
2017-01-13 13:14:43 +05:30
Nabin Hait
e43a94de4b
Merge branch 'hotfix' into draft_status_issue_after_amend
2017-01-13 13:14:32 +05:30
Nabin Hait
9698f1b923
Merge pull request #7473 from KanchanChauhan/salary-slip-before-june
...
Patch to add Start and End Date in Salary Slips
2017-01-13 12:53:15 +05:30
Rohit Waghchaure
29458836e4
[Fix] After amend the status become cancelled even if docstatus is zero
2017-01-13 12:51:19 +05:30
robert schouten
1a92d54dcb
[fix] profiability analasyis orderby cost center name
2017-01-13 14:52:11 +08:00
Kanchan Chauhan
b6114e672f
Patch to add Start and End Date in Salary Slips
2017-01-13 12:05:03 +05:30
Nabin Hait
4bd42146ba
Merge pull request #7462 from rohitwaghchaure/minor_pos_issue
...
[Fix] POS issues
2017-01-13 11:55:52 +05:30
Nabin Hait
ba2a76cfb7
Merge pull request #7453 from KanchanChauhan/salary-register-report
...
Changes to Salary Register
2017-01-13 11:51:48 +05:30
Nabin Hait
8f0c060578
Merge pull request #7447 from saurabh6790/tree_param_fix
...
[fix] provision to handle custom mandatory params while creating node
2017-01-13 11:50:18 +05:30
Nabin Hait
17cd36b7d5
Merge pull request #7451 from saurabh6790/chequeprint_date_fix
...
[minor][fix] show date in user format
2017-01-13 11:36:12 +05:30
Nabin Hait
90de12fea3
Merge pull request #7446 from KanchanChauhan/fieldtype-edit-desc
...
[Minor] Field type of Description field changed to Text Editor
2017-01-13 11:34:51 +05:30
Nabin Hait
007c87ea63
Merge pull request #7440 from nabinhait/gle_repost_optimization
...
Optimization to reduce GLE reposting time for future stock transactions
2017-01-13 11:33:42 +05:30
Nabin Hait
02b6fe0fcb
Merge pull request #7443 from nabinhait/hotfix
...
Fetch bin details after setting warehouse based on POS Profile
2017-01-13 11:32:57 +05:30
Nabin Hait
4440ac037f
Merge pull request #7470 from frappe/forellana-digithinkit-patch-1
...
[FIX] Contact form breaks on existing lead
2017-01-13 11:29:10 +05:30
robert schouten
d56627f2b7
[fix] profiability analasyis orderby project name
2017-01-13 11:53:43 +08:00
Felipe Orellana
ac81440a81
[FIX] Contact form breaks on existing lead
...
When an email address from the contacts form is from a existing lead utils.py tries to set new_lead(an undefined var) as the lead reference if a lead is found.
2017-01-12 12:08:20 -05:00
Kanchan Chauhan
7933eb685c
[Enhancement] Attendance Module
2017-01-12 17:24:53 +05:30
Rohit Waghchaure
8afe267813
[Fix] POS issues
2017-01-12 15:22:02 +05:30
bcornwellmott
5dfffe7586
Merge pull request #7449 from RicardoJohann/rename_ss
...
allowed rename salary structure
2017-01-11 09:15:03 -08:00
Kanchan Chauhan
2f3ae914a6
Changes to Salary Register
2017-01-11 19:45:01 +05:30
Ben Cornwell-Mott
1cd7e54822
Adds button to find MRs linked to Supplier
2017-01-11 03:05:49 -08:00
Saurabh
056276c60e
[minor][fix] show date in user format
2017-01-11 15:50:09 +05:30
RicardoJohann
7182de7684
allowed rename salary structure
2017-01-11 06:28:59 -02:00
Saurabh
2f02101d7d
[fix] provision to handle custom mandatory params while creating node
2017-01-11 12:41:01 +05:30
Kanchan Chauhan
595cfb9f17
[Minor] Field type of Description field changed to Text Editor
2017-01-11 12:03:15 +05:30
Nabin Hait
0287d31c0f
Fetch bin details after setting warehouse based on POS Profile
2017-01-11 10:31:45 +05:30
Nabin Hait
ffa5ffe607
Merge pull request #7442 from nabinhait/hotfix
...
Fix for Budget against Project
2017-01-11 10:30:44 +05:30
Nabin Hait
c0eab41ec5
Fix for Budget against Project
2017-01-11 10:16:19 +05:30
Neil Trini Lasrado
2a9e0f6fd8
Added assessment result tool
2017-01-10 17:32:02 +05:30
Nabin Hait
9e08ccdf39
Merge pull request #7425 from KanchanChauhan/sync-projecttask-task
...
Sync Project Task and Task
2017-01-10 17:26:51 +05:30
Nabin Hait
1612fa1253
Merge pull request #7426 from nabinhait/hotfix
...
Show values based on precision and filter out zero value rows
2017-01-10 17:26:27 +05:30
Nabin Hait
20aba32318
Merge pull request #7427 from KanchanChauhan/projects-manager-role
...
[Minor] Added Projects Manager role
2017-01-10 17:25:16 +05:30
Kanchan Chauhan
c4aceaad7f
[Minor] Added Projects Manager role
2017-01-10 16:35:54 +05:30
