Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,423 Commits 3 Branches 0 Tags 1 GiB
3956f82e7c
Commit Graph

1783 Commits

Author SHA1 Message Date
walstanb
be98ee26cd fix: breadcrumbs for company 2021-03-09 13:03:52 +05:30
barredterra
ebd1d08e55 refactor: taxes setup 
Better structure of input data.
 2021-03-08 19:53:50 +01:00
barredterra
25afad3dc1 refactor: extend taxes and charges setup 
Add option to specify taxes and charges template depending on the CoA used. Differentiate between purchase, sales and item taxes. Maintain flexibility by using wildcards.
 2021-03-04 21:11:31 +01:00
barredterra
dcfc3d7d12 fix: remove redundant calls to create_sales_tax 2021-03-04 19:29:55 +01:00
Florian HENRY
e11ce57f3c fix: add item taxes at the same times as sales and purchase taxes 2021-02-24 21:45:29 +01:00
Deepesh Garg
7efbbcf3aa fix: Do not delete GST Accounts from GST Settings on clearing transactions from Company Master 2021-02-19 10:53:58 +05:30
Anurag Mishra
5ec592d09c fix: supplier was not able to Submit RFQ due to in sufficient permission 2021-02-18 13:42:04 +05:30
Anupam Kumar
e816ed89e6
fix: portal permission issue (#24577) 2021-02-11 11:12:13 +05:30
Nabin Hait
7177579051
fix: Dependant sle logic fixes (#24489) 
* fix: Dependant sle logic fixes

* fix: negative qty validation

* fix: Travis fixes
 2021-02-02 22:03:07 +05:30
Suraj Shetty
f57efd1150 style: Fix invalid translation syntax usages 2021-02-01 20:09:20 +05:30
prssanna
2aa1efb70e fix: broken image style 2021-01-22 15:31:38 +05:30
prssanna
9f1a156307 Merge branch 'shopping-cart' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-21 13:04:58 +05:30
prssanna
599322871a fix: product query issues 2021-01-20 17:44:08 +05:30
Suraj Shetty
bbc6bfd3c3 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-19 09:34:06 +05:30
Rushabh Mehta
7619d3d6d6 fix(merge): develop 2021-01-12 09:16:21 +05:30
Rushabh Mehta
f8a6dde8d8 fix(minor): routing 2021-01-08 14:37:38 +05:30
Nabin Hait
517fd8b9e6
fix: Ignore customer and supplier while deleting company transactions (#24279) 
* fix: Ignore customer and supplier while deleting company transactions

* fix: Test cases fixed based on Travis
 2021-01-05 09:23:39 +05:30
Shivam Mishra
31a651365d feat: update item group website slider 2020-12-30 15:51:34 +05:30
Shivam Mishra
425bae8bf6 feat: use ProductQuery and ProductFiltersBuilder to build item group page 2020-12-29 17:18:22 +05:30
Shivam Mishra
b06ed4908f feat: add filter tables in item group 2020-12-29 17:16:29 +05:30
Nabin Hait
a77b8c9fcc
Repost item valuation (#24031) 
* feat: Reposting logic for future finished/transferred item

* feat: added fields to identify needs to recalculate rate while reposting

* refactor: Set rate for outgoing and finished items

* refactor: Arranged fields in Stock Entry item table and added fields to identify finished and scrap item

* refactor: Arranged fields in Stock Entry item table and added fields to identify finished and scrap item

* refactor: Get outgoing rate for purchase return

* refactor: Get incoming rate for sales return

* test: Added tests for reposting valuation of transferred/finished/returned items

* feat: added incoming rate field in DN, SI and Packed Item table

* feat: get incoming rate for returned item

* fix: no error while getting valuation rate in stock entry

* fix: update stock ledger for DN and SI

* feat: update item valuation rate in PR and PI based on supplied items cost

* feat: SLE reposting logic for sales return and subcontracted item with test cases

* feat: update qty in future sle

* feat: repost future sle and gle via Repost Item Valuation

* fix: Skip unwanted function calling while reposting

* fix: repost sle for specific item and warehouse

* test: Modified tests for backdated stock reco

* fix: ignore cancelled sle in few methods

* feat: role allowed to do backdated entry

* feat: Show reposting status on stock valuation related reports

* fix: minor fixes

* fix: fixed sider issues

* fix: serial no fix related to immutable ledger

* fix: Test cases fixes related to perpetual inventory

* fix: Test cases fixed

* fix: Fixed reposting on cancel and test cases

* feat: Restart reposting item valuation

* refactor: Code cleanup using small functions and test case fixes

* fix: minor fixes

* fix: Raise on error while reposting item valuation

* fix: minor fix

* fix: Tests fixed

* fix: skip some validation ig gle made from reposting

* fix: test fixes

* fix: debugging stock and account validation

* fix: debugging stock and account validation

* fix: debugging travis for stock and account sync validation

* fix: debugging travis

* fix: debugging travis

* fix: debugging travis
 2020-12-21 14:45:50 +05:30
Suraj Shetty
70cfc4df15 fix: Remove dashboard page from home 2020-12-16 20:55:47 +05:30
Shivam Mishra
fd044b032f Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into desk-enhancements 2020-12-16 13:21:10 +05:30
Suraj Shetty
f2511c84b5 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-12-14 09:05:48 +05:30
Deepesh Garg
f17ea2ccab
fix: Accounting for internal transfer invoices within same company (#24021) 
* fix: Accounting for internal transfer invoices within same company

* fix: warehouse fetching

* fix: Linting issues

* fix: GL entry fixes and validation for intercompany account

* fix: Account naming changes and other fixes

* fix: Add test for internal transfer

* fix: Test Case

* fix: Add description for fields

* fix: Commonfied code

* fix: Map warehouse and serial no
 2020-12-11 21:30:39 +05:30
Rushabh Mehta
39154e5296 fix(minor): add debounce to calls 2020-12-10 12:37:16 +05:30
Rushabh Mehta
fec8dba16c fix(merge): merge develop 2020-12-08 16:23:09 +05:30
Anuja Pawar
d369710c65
fix: fixed home desk page (#24075) 
* fix: fixed home desk page

* fix: suggested changes

Co-authored-by: Marica <maricadsouza221197@gmail.com>

* fix: suggested changes

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-12-08 09:40:08 +05:30
Shivam Mishra
2fa3cac814 feat: update workspace folders 2020-12-03 15:48:57 +05:30
Shivam Mishra
2895645f86 feat: rename desk page to workspace 2020-12-03 15:39:53 +05:30
Shivam Mishra
9aaca25edb feat: update desk page json 2020-12-01 13:39:54 +05:30
Shivam Mishra
de68f74b4c chore: update all desk pages 2020-12-01 12:51:38 +05:30
Shivam Mishra
27e7c264f2 fix: link type 2020-11-30 14:58:16 +05:30
Shivam Mishra
61388d412b feat: update desk pages 2020-11-30 14:58:00 +05:30
Mohammad Hasnain Mohsin Rajan
90e33e53fd
refactor: Format translation strings (#24004) 
* fix: translation strings

* fix: linting
 2020-11-25 15:37:54 +05:30
rohitwaghchaure
6e974bf246
Merge pull request #23949 from pateljannat/email-digest-user-not-found-issue 
fix: email digest user not found
 2020-11-18 23:54:34 +05:30
pateljannat
188657d05a fix: email digest user not found 2020-11-18 17:15:54 +05:30
Rushabh Mehta
542bc01718 fix(minor): update routes 2020-11-18 15:00:34 +05:30
Shivam Mishra
bed717b442 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-11-12 11:32:59 +05:30
Shivam Mishra
f38a1c305e
refactor: show form buttons only if permissions exist (#23851) 
* refactor: show form buttons only if permissions exist

* style: add semicolon

* fix: typo in conditions
 2020-11-09 20:16:28 +05:30
Deepesh Garg
8cfb210dc4
fix: Ignore doctypes on company transaction deleted (#23864) 2020-11-09 20:14:53 +05:30
Shivam Mishra
9d468a8daf Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-10-21 11:38:31 +05:30
Raffael Meyer
d1863e6f9e
fix: Chart of Accounts (#23530) 
* fix: Chart of Accounts

* fix: Chart of Accounts with lower case "of"

Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-10-14 10:29:53 +05:30
Deepesh Garg
06268e5f57
Merge pull request #23623 from kennethsequeira/italy-fy 
fix: Fiscal Year and Tax Rates for Italy
 2020-10-13 20:29:51 +05:30
Shivam Mishra
55f52e8135 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-10-13 20:09:22 +05:30
Kenneth Sequeira
3eec4e61ab fix: GST rates for Australia 2020-10-13 19:23:48 +05:30
Kenneth Sequeira
1b329aaa7b fix: json format fixes 2020-10-13 19:10:09 +05:30
Kenneth Sequeira
968f61d8ba fix: add multiple VAT rates for Italy 2020-10-13 00:25:46 +05:30
Marica
6d935d4e48
Merge branch 'develop' into company-issue 2020-10-12 17:25:12 +05:30
Anupam
22dc42efb9 fix: error log while creating company 2020-10-09 14:58:39 +05:30
Saqib
2016a34e30
fix: naming series - cannot reset current value to zero (#23504) 2020-10-04 18:13:24 +05:30
Shivam Mishra
1323a9a990 feat: set app name for ERPNext in install and patch 2020-09-30 16:33:14 +05:30
Shivam Mishra
9a4d603403 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-09-25 11:44:37 +05:30
Frappe ERPnext
f28bef868d feat: Checkbox for activation of printing UOM after quantity 
Checkbox will be added to Frappe after installation of ERPNext.
(Print Settings docType is part of frappe app, not erpnext app)
 2020-09-02 21:42:52 +02:00
Deepesh Garg
ecc282930a
Merge branch 'develop' into navbar_links 2020-08-28 12:48:46 +05:30
Deepesh Garg
6887382937
fix: Ignore cpmpany and bank account doctype while deleting company transactions (#22953) 2020-08-28 11:52:00 +05:30
Suraj Shetty
6f9f40992c Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-08-23 16:33:50 +05:30
Deepesh Garg
1b760cb278 Merge branch 'develop' of https://github.com/frappe/erpnext into navbar_links 2020-08-21 12:36:21 +05:30
Saurabh
66ff5e5e77
Merge pull request #22990 from saurabh6790/erpnext-before-install-flag-1 
fix: check setup complete flag instead setup page
 2020-08-21 11:55:38 +05:30
Raffael Meyer
585f1f67b7
Merge branch 'develop' into navbar_links 2020-08-19 18:55:44 +02:00
Anupam Kumar
e447c79f9d
fix: Quotation lost reason options fix (#22814) 
* adding patch and lost reason child tables

* fix: conflict resolved
 2020-08-13 09:20:36 +05:30
Deepesh Garg
617027c6ca Merge branch 'develop' of https://github.com/frappe/erpnext into navbar_links 2020-08-12 18:39:20 +05:30
Anupam Kumar
674d1b0803
feat: Material Request and Stock Entry Enhancement (#22671) 
* feat: send to warehouse

* adding warehouse validation

* fix: review changes

* fix: review changes

* stock entry enhancement

* fix: review changes
 2020-08-12 17:55:02 +05:30
Saurabh
58d05ac0e0 fix: check setup complete flag insted setup page 2020-08-10 19:36:45 +05:30
Jai Chavan
dbbb864ba5
fix: Consistent capitalization 2020-08-10 16:55:03 +05:30
Deepesh Garg
a306af8c08 fix: Add help link in navbar settings 2020-08-06 20:52:02 +05:30
Suraj Shetty
1923ef052c
refactor: Format and sanitise user inputs to search queries. (#22913) 
* refactor: Sanitize whitelisted method inputs

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* refactor: Format and sanitize tax_account_query inputs

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* refactor: Validate and sanitize search inputs via decorator

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* style: Minor formatting fix

* refactor: Validate and sanitize search inputs using decorator

* fix: Typo

* fix: Remove unwanted import statement

* refactor: Repalce validate_and_sanitize_search_inputs() with validate_and_sanitize_search_inputs

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-08-05 19:42:25 +05:30
Shivam Mishra
be5e129259 feat: update icons for erpnext settings shortcuts 2020-07-23 17:02:32 +05:30
Shivam Mishra
1358efe896 feat: update icons 2020-07-23 17:02:32 +05:30
Faris Ansari
70aa3c0b1f
fix: Remove explicit exception 
Co-authored-by: gavin <gavin18d@gmail.com>
 2020-07-10 16:13:21 +05:30
Faris Ansari
0a06580e2c
fix: Update message 
Co-authored-by: gavin <gavin18d@gmail.com>
 2020-07-08 12:06:28 +05:30
Faris Ansari
f3a6e30e6a fix: Check if homepage is not setup-wizard 
The new desk changes sets the default homepage to 'workspace'. To avoid
problem in the future, check if the value is not setup-wizard.
Also throw an exception if the check passes, so it exits with error.
 2020-07-08 10:45:55 +05:30
Marica
3e93a2f67f
fix: Set Root as Parent if no parent in new tree view node (#22497) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-06-29 17:39:26 +05:30
rohitwaghchaure
cc7e1b0ec5
Merge pull request #22400 from AfshanKhan/FR_ISS_204290 
fix: removed condition that considered "Standard working hours" while…
 2020-06-25 23:23:33 +05:30
Shivam Mishra
5374e7ae1f fix: add company filter in email digest 2020-06-25 19:41:42 +05:30
Afshan
a462e29172
Merge branch 'develop' into FR_ISS_204290 2020-06-25 14:16:35 +05:30
Afshan
a07a548622 fix: removed "standard working hours" also fixed test cases 2020-06-24 13:07:59 +05:30
rohitwaghchaure
d63c59ced4
Merge branch 'develop' into grn_posting 2020-06-24 10:23:23 +05:30
Marica
7af7bb8311
fix: Insert Supplier Group via List View (#22403) 2020-06-23 17:51:02 +05:30
Deepesh Garg
ded3ab1cd7 fix: Test Cases 2020-06-22 09:40:15 +05:30
Deepesh Garg
c70eb30e7e Merge branch 'develop' of https://github.com/frappe/erpnext into grn_posting 2020-06-20 11:56:25 +05:30
Deepesh Garg
53d5d16abb fix: Move check from Stock Settings to Company Master 2020-06-20 11:55:56 +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
Deepesh Garg
c258ac82c5 feat: Accounting entries for service item in Purchase receipt 2020-06-12 18:33:42 +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