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

9764 Commits

Author SHA1 Message Date
bhupen
52b3924006 mendatory hours field 2016-12-14 11:32:23 +05:30
OluyomiKay
8f8fd39855 erpnext Include Cash Account Type (eg. Petty Cash) in Bank Reconciliation 2016-12-14 13:25:58 +08:00
Neil Trini Lasrado
fef568ecfa Documentation for Training Module 2016-12-13 16:48:50 +05:30
Neil Trini Lasrado
984ee372e8 [new Feature] Added Training Module 2016-12-13 15:42:12 +05:30
bhupen
b42dc5a899 mendatory hours field 2016-12-13 15:25:53 +05:30
strixaluco
757d127844 [docs] mention UID in LDAP instruction 2016-12-13 17:54:41 +08:00
Nabin Hait
80cea9795e Address naming if multiple address for same type 2016-12-13 14:50:35 +05:30
Nabin Hait
201af80706 Fixed merge conflict 2016-12-13 14:30:32 +05:30
Nabin Hait
9d56d598bf bumped to version 7.1.24 2016-12-13 14:52:15 +06:00
Kanchan Chauhan
b79aa1d091 [Minor] Read permissions to Employee on Activity Type and Appraisal Template 2016-12-13 14:16:57 +05:30
Nabin Hait
8ecc14b7bd Revert "email cc test fixes for frappe/frappe#2441" 2016-12-13 14:11:49 +05:30
Nabin Hait
23165ce0b4 Merge pull request #7185 from KanchanChauhan/salary-test-cases 
[Fix] Salary Slip test cases fix
 2016-12-13 12:40:19 +05:30
Kanchan Chauhan
d917b66a31 [Fix] Salary Slip test cases fix 2016-12-13 12:12:49 +05:30
Nabin Hait
ee877fd631 Merge pull request #7199 from RobertSchouten/email_cc_dev 
email cc test fixes for frappe/frappe#2441
 2016-12-13 11:31:06 +05:30
Nabin Hait
784f6cc31a Merge pull request #7181 from KanchanChauhan/sales-person-status 
Added "Enabled" to Sales Person
 2016-12-13 11:28:36 +05:30
Nabin Hait
346a6a5d84 Update set_sales_person_status.py 2016-12-13 11:27:46 +05:30
Nabin Hait
82ce67d49a Merge pull request #7190 from KanchanChauhan/jinja-in-tc 
Jinja template in Terms and Conditions
 2016-12-13 11:25:07 +05:30
Nabin Hait
18d6dc0459 Merge pull request #7193 from KanchanChauhan/get-project-task 
Show only Project tasks in depends on tasks
 2016-12-13 11:24:11 +05:30
Nabin Hait
c5869a00df Merge pull request #7194 from rohitwaghchaure/pricing_rule_issue_v7_1 
[Fix] Ignore pricing rule not removed the discount percentage
 2016-12-13 11:22:49 +05:30
Nabin Hait
9a1a4cd0ac Fixed test cases for item / warehouse renaming 2016-12-13 10:46:50 +05:30
Rohit Waghchaure
2976e56d23 [Fix] Ignore pricing rule not removed the discount percentage 2016-12-13 10:28:27 +05:30
robert schouten
3d22eb1d59 email cc test fixes for frappe/frappe#2441 2016-12-13 11:32:09 +08:00
Kanchan Chauhan
f0b0db444d Added Is Active to Sales Person 2016-12-12 19:12:41 +05:30
Kanchan Chauhan
a72841e5e5 Show only Project tasks in depends on tasks 2016-12-12 18:33:46 +05:30
Nabin Hait
da3a9e255d Changed fieldtype of opening stock from Int to Float 2016-12-12 18:22:15 +05:30
Kanchan Chauhan
b642625ed2 Jinja template in Terms and Conditions 2016-12-12 17:34:30 +05:30
Nabin Hait
f67799197d Merge pull request #7189 from nabinhait/fix_10111 
Rename and merging of Item and Warehouse
 2016-12-12 17:27:38 +05:30
Nabin Hait
f09c6679c7 Merge pull request #7187 from rohitwaghchaure/budget_report_issue 
[Fix] Budget variance report based on cost center/project
 2016-12-12 17:25:44 +05:30
Nabin Hait
37104b6bb1 Merge pull request #7184 from rohitwaghchaure/dropship_po_issue 
[Fix] Unable to purchase item in the company warehouse if dropship has enabled
 2016-12-12 17:24:48 +05:30
Rohit Waghchaure
9f2cc382a8 [POS] Provision to delete the offline records 2016-12-12 17:15:47 +05:30
Nabin Hait
fb1fb83b8c [tests] Test cases for Item and Warehouse renaming and merging 2016-12-12 17:01:24 +05:30
Rohit Waghchaure
f4074c2029 [Fix] Budget variance report 2016-12-12 16:48:14 +05:30
Nabin Hait
3ef63bef02 Rename and merging of Item and Warehouse and patch to fix deleted bins 2016-12-12 15:37:52 +05:30
Nabin Hait
142aab79bf Fieldtype of payment url should be Small Text 2016-12-12 15:37:52 +05:30
Nabin Hait
0fa0af18cc Merge pull request #7175 from neilLasrado/develop 
Student Attendance Tool
 2016-12-12 15:03:59 +05:30
Rohit Waghchaure
c858d52ce7 [Fix] Unable to purchase item in the company warehouse if dropship has enabled 2016-12-12 13:06:06 +05:30
Rohit Waghchaure
5664f8553e [Fix] Item group missing in the POS profile 2016-12-12 12:28:07 +05:30
Neil Trini Lasrado
eccbf43235 Renamed Student Batch Attendance Tool to Student Attendance Tool 
Merged code for Student Attendance against Course Schedule and Student Batch
Student Attendance Tool now shows marked student attendance as well.
Fixed validation login in Student Attendance for duplicate Student Attendance Record validation"
 2016-12-09 17:41:09 +05:30
Saurabh
940084ed59 [minor][fix] show tax rate if account type is tax 2016-12-09 17:38:36 +05:30
Rushabh Mehta
81af229466 [minor] google analytics id in docs and minor fixes to web forms 2016-12-09 17:29:36 +05:30
Nabin Hait
58667ab123 Fixed merge conflict 2016-12-09 15:49:24 +05:30
Nabin Hait
10de98c0be bumped to version 7.1.23 2016-12-09 16:15:45 +06:00
Nabin Hait
00ae31bd1c Merge pull request #7172 from nabinhait/hotfix 
Issue fixed in Quality Inspection, P&L period and purchase register
 2016-12-09 15:44:05 +05:30
Nabin Hait
6bfdd63ec8 Merge pull request #7171 from rohitwaghchaure/payment_entry_issue 
[Fix] Payment entry showing wrong invoice amount
 2016-12-09 15:11:38 +05:30
Nabin Hait
b00df641e0 Fixed period end date if year starts in the middle of the month 2016-12-09 15:09:11 +05:30
Nabin Hait
76a8508d2b Unlink Quality Inspection from PR while cancelling QI 2016-12-09 15:09:11 +05:30
Nabin Hait
43df804176 Fixed renamed fieldname 2016-12-09 15:09:11 +05:30
Rohit Waghchaure
e505067887 [Fix] Payment entry showing wrong invoice amount 2016-12-09 12:55:29 +05:30
Nabin Hait
abd5a92bcc Merge pull request #7162 from nabinhait/manqala-exchange_rate_modifications1 
Exchange rate base on date
 2016-12-09 12:34:15 +05:30
Nabin Hait
a0fc404eb8 Merge pull request #7164 from KanchanChauhan/quoted-item-comparison-report-fix 
[Fix] Quoted Item Comparison
 2016-12-09 12:18:06 +05:30
Nabin Hait
8e885163a3 Update quoted_item_comparison.py 2016-12-09 12:17:45 +05:30
Nabin Hait
ad4f1c7fd1 date is optional in get_exchange_rate 2016-12-09 12:14:47 +05:30
Nabin Hait
d249c76ce0 Merge pull request #7165 from KanchanChauhan/salary-component-type-in-new-signups 
[Minor]Added type to Salary Components
 2016-12-09 11:50:43 +05:30
Viet Pham
ddb856377c Fix patch update_status_of_po_so.py caused error: Column 'per_billed' cannot be null 2016-12-08 20:02:39 +07:00
Kanchan Chauhan
13f19993c5 [Minor]Added type to Salary Components 2016-12-08 17:50:15 +05:30
Kanchan Chauhan
5c031a3512 [Fix] Quoted Item Comparison 2016-12-08 17:29:04 +05:30
Kanchan Chauhan
0ece9e0e2e [Fix] Salary Slip Test cases fix 2016-12-08 17:02:36 +05:30
Nabin Hait
352d95344e Set exchange rate on change of date for Journal/Payment Entry 2016-12-08 16:06:47 +05:30
Nabin Hait
aa0d174d3d Replaced spaces with tabs 2016-12-08 15:44:16 +05:30
Nabin Hait
3113f00c46 Replaced spaces with tabs 2016-12-08 15:42:44 +05:30
Nabin Hait
288a18e0cc Fixes and patch for Currency Exchange based on date 2016-12-08 15:36:23 +05:30
Nabin Hait
b267a6c90e Merge branch 'develop' of https://github.com/frappe/erpnext into manqala-exchange_rate_modifications1 2016-12-08 14:45:12 +05:30
Nabin Hait
87d70279c6 get exchange rate on change of date 2016-12-08 14:43:11 +05:30
Nabin Hait
32e5b7af20 Update set_budget_against_as_cost_center.py 2016-12-08 14:42:04 +05:30
Nabin Hait
1cc55fbbcb Fixed merge conflict 2016-12-08 14:09:23 +05:30
Nabin Hait
72c5aec68b Merge pull request #7094 from manassolanki/budget 
[Enhancement] Budget Against Project #7036
 2016-12-08 13:52:33 +05:30
Nabin Hait
f5460e9e6f Merge pull request #6846 from KanchanChauhan/payroll-updates 
Weekly, Fortnightly, Bimonthly and Monthly payroll frequency
 2016-12-08 13:51:55 +05:30
Nabin Hait
ded059b253 [fix][tests] Fetching serial nos via get item details 2016-12-08 13:20:43 +05:30
Nabin Hait
1b9caf90dd Merge branch 'master' into develop 2016-12-08 12:33:54 +05:30
Nabin Hait
7b513891e3 bumped to version 7.1.22 2016-12-08 13:03:53 +06:00
Kanchan Chauhan
f7b25cbb6b [WIP] Payroll Updates 2016-12-08 12:20:20 +05:30
Manas Solanki
482fa672c2 [Fix] Patch for budget_against 2016-12-08 12:16:29 +05:30
Rohit Waghchaure
86ed030b5c minor issue 2016-12-07 19:17:01 +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
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
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
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
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