Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,440 Commits 3 Branches 0 Tags 1 GiB
83aa5ee3df
Commit Graph

17440 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
Rohit Waghchaure
8afe267813 [Fix] POS issues 2017-01-12 15:22:02 +05:30
Saurabh
056276c60e [minor][fix] show date in user format 2017-01-11 15:50:09 +05:30
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
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
Nabin Hait
5dd988207f Show values based on precision and filter out zero value rows 2017-01-10 16:10:40 +05:30
Nabin Hait
b8350353ea Merge branch 'hotfix' 2017-01-10 12:30:10 +05:30
Nabin Hait
4180a37773 bumped to version 7.2.8 2017-01-10 13:00:09 +06:00
Nabin Hait
a7f616564e Merge pull request #7417 from KanchanChauhan/quick-entry-for-item 
[Minor] Valuation rate in Quick entry for Item
 2017-01-10 12:23:36 +05:30
Kanchan Chauhan
43e07aed2c [Minor]Valuation rate in Quick entry for Item 2017-01-10 12:06:51 +05:30
Nabin Hait
9215581345 Merge pull request #7414 from KanchanChauhan/timesheet-payroll-frequency-toggle 
[Fix] Payroll Frequency toggle fix
 2017-01-10 11:58:36 +05:30
Kanchan Chauhan
2b41f9d548 [Fix] Payroll Frequency toggle fix 2017-01-09 18:43:52 +05:30
Nabin Hait
ec793b4846 Merge branch 'hotfix' of git://github.com/frappe/erpnext into hotfix 2017-01-09 17:24:10 +05:30
Nabin Hait
a2fae844b6 Merge pull request #7410 from RobertSchouten/timesheet_overlap_validation 
[fix] timesheet overlap validation not including modified timesheet
 2017-01-09 17:15:40 +05:30
Nabin Hait
21544ca978 Merge branch 'hotfix' 2017-01-09 16:57:11 +05:30
Nabin Hait
2bb9093b9a bumped to version 7.2.7 2017-01-09 17:27:10 +06:00
Nabin Hait
f0c41b5709 Merge pull request #7412 from nabinhait/hotfix 
Allow fetching same items multiple times from source doc if all qty not processed
 2017-01-09 16:00:08 +05:30
Nabin Hait
1839fcca11 Merge pull request #7406 from saurabh6790/terms_and_cond_fix 
[fix] if terms exists then only call render_template
 2017-01-09 15:49:56 +05:30
Nabin Hait
d1eb237909 Merge pull request #7400 from rohitwaghchaure/minor_issue 
Get item default warehouse
 2017-01-09 15:49:14 +05:30
Nabin Hait
a9b9edd9bc Merge pull request #7392 from frappe/bcornwellmott-patch-2 
Fix number of digits on report
 2017-01-09 15:48:04 +05:30
Nabin Hait
07b524ee50 Merge pull request #7398 from nabinhait/filter_dashboard 
Reload in_standard_filter property
 2017-01-09 15:43:30 +05:30
Nabin Hait
802b4359b5 Fetch same items multiple times from source doc if all qty not processed 2017-01-09 15:32:20 +05:30
robert schouten
138c2f6b29 [fix] timesheet overlap validation not including modified timesheet 2017-01-09 12:50:35 +08:00
Saurabh
f65e8de5a5 [fix] if terms exists then only call render_template 2017-01-07 08:18:10 +05:30
bcornwellmott
34e34ed1e8 Trigger Restart of build checks 2017-01-06 17:21:16 -08:00