Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
31,846 Commits 3 Branches 0 Tags 1 GiB
4c726b25ee
Commit Graph

1651 Commits

Author SHA1 Message Date
Marica
7af7bb8311
fix: Insert Supplier Group via List View (#22403) 2020-06-23 17:51:02 +05:30
Anurag Mishra
289c82243f
feat: New Payroll module (#21990) 
* feat: Moved Document to Payroll Module

* feat: Moved Reports to Payroll Module

* feat: Moved Print fromat With Patch

* feat: Moved Notifiction to Payroll Module and patches

* feat: added dashboard and desk page to Payroll

* feat: Payroll Dashboard

* feat: Module onboarding

* feat: Income tax Deductions Report

* feat: Ecs Checklist Report

* feat: Provident Fund Report

* feat: Professional Fund report and commonified Code

* feat: Total Payments Based On Payment Mode Report

* fix: refactor and added chart Total Payments Based On Payment Mode

* feat: Payroll Settings

* fix: Bank remittance Report

* feat(Payroll based on): Considered unmarked days

* feat: Added Help for condition an formula in Salary structure

* fix: requested changes

* fix: rename report Ecs checklist to salary_payments_via_ecs

* fix: renamed report report/total_payments_based_on_payment_mode

* fix: added role via setup.py for regional report

* feat: added All reports to desk page

* fix: frappe.reload doc in all patches

* fix: codacy

* fix: frappe.reload_doctype for patches

* patch: is_income_tax_component and component_type for salary component

* fix: uncommented code

* test: fixture

* fix: test

* test: test_payment_days_based_on_attendance
 2020-06-19 19:17:57 +05:30
Deepesh Garg
23cb5e1869
Merge pull request #22312 from frappe/email-digest-html 
fix: Email digest html view fix
 2020-06-19 11:36:02 +05:30
Anupam K
bd449c8d07 email digest html fix 2020-06-18 14:20:22 +05:30
Kenneth Sequeira
c159556c24
fix: typo for language in Terms description (#22270) 2020-06-17 09:34:58 +05:30
Rucha Mahabal
73326d308b refactor: move pause SLA configuration to SLA DocType 2020-06-05 18:23:39 +05:30
Rucha Mahabal
25ef6a9638 fix: add default hold statuses in fixtures and patch 2020-06-05 16:37:20 +05:30
Vishal Dhayagude
6ff11de2f0
fix: Added gram, pound to ounce conversion (#21709) 
* fix: pound, grams to Ounce converion factor added

* fix: patch date updated for UOM Conversion Factor

* fix: grams move to gram

* fix: duplicate entry of uom converion factor and patch added

* fix: typo fix

* fix: minor changes

* Update patches.txt

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-05-25 14:54:19 +05:30
Prssanna Desai
ce8f8f4ed7
fix: hide delete company transacations button if not system manager (#21839) 2020-05-21 18:35:03 +05:30
Shivam Mishra
afeed27f8f
Merge branch 'develop' into project-refresh 2020-05-19 11:54:50 +05:30
Suraj Shetty
dde39c3d1a
chore: Drop Python2 support (#21704) 
* chore: Drop Python2 support

* test: Fix test redundancy by removing countries

3 countries seems ennough to test  coa template feature
 2020-05-14 12:09:36 +05:30
Deepesh Garg
12a9328a63
Merge pull request #21668 from abhishekbalam/develop 
feat(Selling): Territory Wise Treeview In 'Customer Acquisition and Loyalty' Report
 2020-05-13 14:26:40 +05:30
Shivam Mishra
846ca09950 Merge branch 'develop' of https://github.com/frappe/erpnext into project-refresh 2020-05-12 17:13:59 +05:30
Shivam Mishra
498f658321
refactor: rename getting started to home (#21674) 
* feat: rename getting started to home

* feat: added patch for renaming
 2020-05-11 20:47:08 +05:30
Abhishek Balam
7cbc902d90 removed validation for root node in territory, codacy recommended changed 2020-05-09 22:35:28 +05:30
Abhishek Balam
d543830a59 feat(Selling): Added Territory wise treeview to 'Customer Acquistion and Loyalty' report 2020-05-09 21:56:53 +05:30
Shivam Mishra
b2103f5470 feat: remove old fixtures 2020-05-06 15:18:43 +05:30
Shivam Mishra
81f8fbb042 feat: update colors 2020-05-05 18:53:29 +05:30
Shivam Mishra
e15dc052a2 Merge branch 'develop' of https://github.com/frappe/erpnext into project-refresh 2020-05-05 18:48:35 +05:30
Shivam Mishra
5f1240bcc6 feat: updated charts to use stacked layout 2020-05-05 18:44:02 +05:30
Rucha Mahabal
98229db3ae
feat: Default Dashboard for Healthcare Workspace (#21414) 
* feat: Default Dashboard for Healthcare Workspace

* fix: patch

* Update add_healthcare_dashboard.py

* fix: failing patch test

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2020-05-05 16:02:16 +05:30
Shivam Mishra
39fe688809 fix: dashboard chart link 2020-05-05 13:05:38 +05:30
Shivam Mishra
813bc49868 feat: added Report Summary Chart as fixture 2020-05-04 20:27:26 +05:30
Rucha Mahabal
f65fb1fcf8
fix: Move Video Doctype from Education module to Core (#21234) 
* fix: move Video Doctype from Education module to Core

* fix: patch to retain Permissions

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2020-04-30 19:47:18 +05:30
Shivam Mishra
ebcc46d837
feat: updated desk pages (#21138) 2020-04-10 18:52:05 +05:30
Raffael Meyer
9aae0c27c2
feat(regional): a central place for regional address templates (#19862) 
* feat: a central place for regional address templates

* set up address templates during install

* why don't the tests run?

* fix: remove unused variables, fix cwd

* fix: .get() dicts contents

* fix: choose the right default

* fix: fieldname is template, not html

* fix: import unittest

* fix: remove unnecessary code

* fix: ensure country exists

* fix: ensure country exists

* feat: test updating an existing template

* fix(regional): DuplicateEntryError in test_update_address_template

* refactor and set 'is_default'

* fix codacy

* fix: patch gst_fixes

* fix: patch update_address_template_for_india

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-04-08 08:56:57 +05:30
Deepesh Garg
c01ec7606d
fix: Currency validation for default company accounts (#21094) 
* fix: Currency validation for default company accounts

* fix: Improve message
 2020-04-06 12:43:07 +05:30
Shivam Mishra
7806e5a052
feat: changes for desk pages (#21027) 
* feat: rename Chart on Getting Started Page

* feat: add dashboard and leaderboard to getting started

* feat: remove communication

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2020-03-31 10:30:20 +05:30
Nabin Hait
ced6898fd7 fix: Ignored user permission for parent_company and existing_company field in Company 2020-03-26 12:30:29 +05:30
Deepesh Garg
fa6454b9c5
fix: Update is_tree field in Tree doctypes (#20981) 2020-03-19 11:01:23 +05:30
Nabin Hait
ddc3bb2251
fix: Multiple fixes for travis (#20924) 
* fix: Multiple fixes for travis

* fix: Multiple fixes for travis

* fix: Run dashboard patch if table already exists

* fix: Multiple fixes for travis

* fix: deletion of auto-created batch
 2020-03-17 17:04:18 +05:30
Deepesh Garg
d190cc0198
Merge pull request #20835 from Thunderbottom/welcome-email-fix 
fix: use ERPNext in welcome email when default company is not set
 2020-03-16 15:54:53 +05:30
Shivam Mishra
c06ba54f1e
refactor: remove website (#20927) 2020-03-12 18:04:42 +05:30
Shivam Mishra
f241054c6c feat: extended settings page 2020-03-12 16:38:59 +05:30
Shivam Mishra
451382e08e feat: update desk pages 2020-03-12 16:34:34 +05:30
Shivam Mishra
1fd1852c6a
Merge branch 'develop' into yet-another-desk 2020-03-10 18:20:27 +05:30
Marica
4528badfcf
fix: ModuleNotFoundError on Turkey Company setup (#20853) 2020-03-09 18:07:43 +05:30
Shivam Mishra
0310366d5a fix (cleanup): remove incomplete dependencies data 2020-03-05 11:28:40 +05:30
Chinmay D. Pai
612e58dca8
fix: use ERPNext in welcome email when default company is not set 
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2020-03-05 10:08:43 +05:30
Priyanka Gangar
ca05c83796
fix: fetch sales person name (#20805) 
* fix: fetch sales person name

* Update sales_person.js

Co-authored-by: pinka0925 <44537026+pinka0925@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-03-02 19:06:06 +05:30
Shivam Mishra
8a8e8d6c5c feat: added base pages for desk 2020-03-02 16:56:31 +05:30
Shivam Mishra
d20e36f3fd
feat: ignore permission when deleting linked emails (#20751) 
* feat: ignore permission when deleting linked emails

* fix: uncommented important snippet
 2020-02-27 19:07:58 +05:30
rohitwaghchaure
7d2c8cffb0
fix: pricing rule not working on item groups (#20547) 
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
 2020-02-09 21:23:53 +05:30
Pranav Nachnekar
6c14a08631
fix: disallow quick entry for doctypes with tree view (#20452) 2020-02-03 17:05:26 +05:30
Suraj Shetty
2f67647f7b Merge branch 'develop' of https://github.com/frappe/erpnext into fix-incorrect-translations 2020-01-29 15:06:50 +05:30
Suraj Shetty
48e9bc3fc9 fix: Incorrect translation syntax 2020-01-29 15:06:18 +05:30
Deepesh Garg
cd8d667861 fix: Parent company defaulting on creation of new company (#20422) 
* fix: Parent company defaulting on creation of new company

* fix: Test Cases

* fix: Test Cases

* fix: Test Cases for staffing plan
 2020-01-28 12:54:45 +05:30
NahuelOperto
be1895fd08 Fix sql injection 2020-01-27 09:02:02 -03:00
Suraj Shetty
080d136fd7
fix: Improper escaping (#20248) 
* fix:  Improper escaping

issue was introduced in https://github.com/frappe/erpnext/pull/20202

* fix: missing closing parentheses

* style: trim unwanted spaces

Co-authored-by: Pranav Nachnekar <prnvnachnekar@gmail.com>
 2020-01-14 12:55:03 +05:30
Pranav Nachnekar
229e5398b5 fix: escape % in customer name (#20202) 2020-01-09 12:21:26 +05:30