Nabin Hait
07e4fd17af
Merge pull request #7157 from rohitwaghchaure/timesheet_po_issue
...
[fix] Timesheet datetime issue
2016-12-07 18:37:02 +05:30
Rohit Waghchaure
0327b35b5e
[fix] timesheet datetime issue
2016-12-07 18:32:36 +05:30
Manas Solanki
2e0fbdeebe
[Fix] Test Case
...
- Previous test case fixed
- Additional test case for project against budget
2016-12-07 18:17:26 +05:30
Manas Solanki
17faa794bf
[Fix] More optimized code
2016-12-07 18:17:26 +05:30
Manas Solanki
5bd4d8a932
[Fix] Budget against Projects
...
- Test case fixed
- Either cost center or project is mandatory
2016-12-07 18:17:26 +05:30
Manas Solanki
1fa1fd7482
[Enhancement] Budget against Project
2016-12-07 18:17:26 +05:30
Rushabh Mehta
b78fc37ce9
[minor] Add button to add help article from Issue #7132 ( #7154 )
2016-12-07 14:41:23 +05:30
James Robertson
e4b9473f83
Fixes erpnext issue 6891 ( #7128 )
...
* Fixes erpnext issue 6891
Updated all 4 items listed on the issue. Removed old out of date image
files and created new ones. Fixed broken links.
* Update to Pull Request #7128
Changes to images to comply with guidelines.
2016-12-07 12:14:51 +05:30
Rushabh Mehta
2167ff589c
[minor] update font awesome icons
2016-12-07 11:09:02 +05:30
Nabin Hait
5c18bd9b61
Fixed merge conflict
2016-12-06 16:16:58 +05:30
Nabin Hait
5c3564143b
Merge branch 'hotfix'
2016-12-06 16:14:44 +05:30
Nabin Hait
bc2deafcf9
bumped to version 7.1.21
2016-12-06 16:44:44 +06:00
Nabin Hait
45fda8a257
Merge pull request #7149 from KanchanChauhan/salary-slip-validation-in-leave
...
[Minor] Validation fixes in Leave Application and Monthly Salary Register Fix for other laguages
2016-12-06 16:01:38 +05:30
Nabin Hait
67d226f491
Merge pull request #7127 from KanchanChauhan/salary-slip-fix
...
[Fix] lwp issue fixed for salary slip without salary structure
2016-12-06 15:48:47 +05:30
Nabin Hait
cb3f44716a
Merge pull request #7139 from rohitwaghchaure/customer_billing_amount_issue
...
[Fix] Currecny symbol for customer's total annual billing, total unpaid amount
2016-12-06 15:42:37 +05:30
Nabin Hait
9313a7408c
Merge pull request #7144 from rohitwaghchaure/report_builder_total_row_issue
...
[Enhancement] Total row added for report builder
2016-12-06 15:42:19 +05:30
Nabin Hait
e644ca8992
Merge pull request #7146 from RobertSchouten/digest_cache_dev
...
[fix] email digest cache by frequency
2016-12-06 15:41:33 +05:30
Nabin Hait
cacfb6839f
Merge pull request #7138 from rohitwaghchaure/so_po_status_issue
...
[Fix] Status of sales order and purchase order
2016-12-06 15:40:57 +05:30
Kanchan Chauhan
dc80b35104
[Minor] Apply Salary Slip validation only if it is submitted
2016-12-06 15:37:24 +05:30
Nabin Hait
b9ebbf18f2
Merge pull request #7143 from rohitwaghchaure/customer_credit_issue
...
[fix] test cases for customer credit
2016-12-06 15:36:18 +05:30
robert schouten
7f72cd0f97
[fix] email digest cache by frequency
2016-12-06 08:51:40 +08:00
Rohit Waghchaure
6f6a533d66
[fix] salary slip working days
2016-12-05 23:33:02 +05:30
Rohit Waghchaure
36a01d3464
[Enhancement] Total row added for report builder
2016-12-05 18:59:59 +05:30
Rohit Waghchaure
bcc6ea450a
[fix] test cases for customer credit
2016-12-05 18:32:57 +05:30
Nabin Hait
cc43c2f5aa
Merge pull request #7142 from neilLasrado/develop
...
Updated schools.py in Config
2016-12-05 17:56:45 +05:30
Neil Trini Lasrado
f5c2cf4b5c
Updated schools.py in Config
2016-12-05 17:53:41 +05:30
Rohit Waghchaure
c857f37f3a
[fix] currecny symbol for customer's total annual billing, total unpaid amount
2016-12-05 17:44:06 +05:30
Nabin Hait
df63c372b3
Merge pull request #7140 from neilLasrado/develop
...
Updated schools.py in Config
2016-12-05 17:32:25 +05:30
Neil Trini Lasrado
9e7ad6a630
Updated schools.py in Config
2016-12-05 17:28:07 +05:30
Nabin Hait
3f1c50a483
Merge pull request #6920 from KanchanChauhan/delivery-note-serial-no-fifo
...
[Fix] Fetch Serial No by default for Delivery Note Item
2016-12-05 16:51:42 +05:30
Nabin Hait
4306cc80d0
removed print
2016-12-05 16:51:30 +05:30
Rohit Waghchaure
82fa27c36f
[Fix] Status of sales order and purchase order
2016-12-05 16:32:23 +05:30
Rushabh Mehta
86f8ab95f6
[minor] font-awesome fixes
2016-12-05 15:02:24 +05:30
Nabin Hait
12a396ef25
Merge pull request #7107 from RobertSchouten/timesheetdates
...
calc timesheet dates on validate not just submit
2016-12-05 14:23:21 +05:30
Rushabh Mehta
323c06ebbf
[minor] rename icons as per FontAwesome 4 ( #7136 )
2016-12-05 14:17:26 +05:30
Kanchan Chauhan
4a888b4c91
[Fix] lwp issue fixed for salary slip without salary structure
2016-12-04 13:42:30 +05:30
Kanchan Chauhan
af0d6378f1
[Fix] Fetch Serial No by default for Delivery Note Item
2016-12-02 18:18:04 +05:30
Nabin Hait
84694d0b0d
Merge pull request #7119 from neilLasrado/reports
...
Code Cleanup
2016-12-02 12:13:00 +05:30
Neil Trini Lasrado
6841b3198b
Added Roll Number to Student Batch Attendance Tool and Optimised code to mark attendance
2016-12-01 18:40:49 +05:30
Neil Trini Lasrado
305166b111
Fixes for Student Batch Wise attendance tool
2016-12-01 18:40:49 +05:30
Nabin Hait
14a4c729b3
Merge pull request #7038 from KanchanChauhan/pricing-rule-in-shopping-cart
...
Apply Pricing Rule in Shopping Cart
2016-12-01 18:09:34 +05:30
Nabin Hait
6c44d259ca
Merge pull request #7106 from pratu16x7/doc-fixes
...
CRM: Customer page fixes
2016-12-01 18:09:02 +05:30
Nabin Hait
1ab446a810
Merge pull request #7086 from frappe/netchampfaris-documentation
...
Update quotation.md
2016-12-01 18:08:36 +05:30
Nabin Hait
cd43d3aa20
Merge pull request #7088 from rohitwaghchaure/documentation_november
...
[fix] Documentation
2016-12-01 18:08:05 +05:30
Nabin Hait
ee9d1b4520
Merge pull request #7099 from ishanloya/patch-1
...
Update merging-documents.md
2016-12-01 18:07:49 +05:30
Nabin Hait
feec1abb6e
Merge pull request #7103 from bhupennewalkar1337/delivery-note-fix
...
[Fix] Disallow same items to be fetched multiple times in sales invoice
2016-12-01 18:07:28 +05:30
Nabin Hait
d97ec828b5
Merge pull request #7113 from rohitwaghchaure/edit_serial_no
...
Allow user to edit serial no for credit note, debit note
2016-12-01 18:06:58 +05:30
Nabin Hait
5bd8eb8d01
Merge pull request #7115 from neilLasrado/reports
...
Fixes for Absent Student Report
2016-12-01 17:02:10 +05:30
Neil Trini Lasrado
71aaeae91c
Fixes for Student Batch-Wise Attendance report and Absent Student Report
2016-12-01 16:48:27 +05:30
Nabin Hait
1f1ffd79e2
Merge pull request #7109 from RobertSchouten/project_wise
...
[fix] Project wise Stock Tracking is script report
2016-12-01 16:12:46 +05:30