Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,443 Commits 3 Branches 0 Tags
Commit Graph

33443 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Glen Whitney
dea6a90a1f feat(Accounting Dimension): other apps may have accounting dimension doctypes 
Prior to this change, there was simply a single hardcoded list of doctypes
  with accounting dimensions in ERPNext. However, when extending the
  capabilities of ERPNext using an add-on app rather than by modifying
  ERPNext itself, it may well be necessary to create new doctypes in other
  apps that will have accounting dimensions as well.

  So, this PR moves the list of doctypes with accounting dimensions into
  hooks.py so it can be accumulated from multiple apps. It also allows the
  list of doctypes in make_dimension_in_accounting_doctypes be specifiable,
  for more convenient use in the after_install hooks of other apps.
 2020-12-03 22:27:44 +00:00
Abhishek Balam
a31731e73d
Merge pull request #24050 from Anuja-pawar/fiscal_year_filter_fix 
refactor(Fiscal Year): to avoid using SQL query to get fiscal year filters
 2020-12-03 17:37:29 +05:30
Anuja P
69c5d49b25 refactor: to avoid using SQL query to get fiscal year filters 2020-12-03 15:14:54 +05:30
rohitwaghchaure
f851eed7b4
Merge pull request #24048 from rohitwaghchaure/fixed-incorrect-balance-value-in-stock-balance-develop 
fix: incorrect balance value in stock balance report
 2020-12-03 13:45:07 +05:30
Rohit Waghchaure
8474476316 fix: incorrect balance value in stock balance report 2020-12-03 13:43:11 +05:30
Marica
376c1eaa48
Merge pull request #22914 from newmatik/shipment_with_integration 
feat: Shipment Doctype
 2020-12-02 17:37:41 +05:30
Joshua Angelo Bienes
324622bd2a
Merge branch 'develop' into shipment_with_integration 2020-12-02 19:21:32 +08:00
Marica
cf44f1c9d3
Merge pull request #24044 from marination/gross-pay-based-on-present-days-test 
fix: Test Payment Based on Leave Application (Travis)
 2020-12-02 16:42:47 +05:30
marination
523c464a92 fix: Test Payment Based on Leave Application (Travis) 2020-12-02 16:01:35 +05:30
jbienesdev
8e68f128c1 fix: travis build error 
- Removed shipment notification and subscription files
- Minor changes on shipment field configuration
- Add shipment to desk
 2020-12-02 08:56:49 +00:00
jbienesdev
b4b542d1c3 chore: linter issues and sider checks 2020-12-02 07:15:16 +00:00
jbienesdev
99361b4a9e chore: remove notification details section 2020-12-02 07:15:14 +00:00
jbienesdev
28055f483d fix(shipment): change shipment test and refactor shipment.js 2020-12-02 07:15:13 +00:00
jbienesdev
ac3c1f1493 chore: remove packlink, letmeship, and sendcloud files 2020-12-02 07:15:11 +00:00
jbienesdev
000494f548 fix(shipment): apply code review 2020-12-02 07:15:05 +00:00
jbienesdev
1c9410e5e8 feat(shipment): Shipment Doctype with Integrations 2020-12-02 07:14:58 +00:00
Deepesh Garg
d8aeaed6ab
Merge pull request #24039 from rohitwaghchaure/fixed-incorrect-gstr-report-issue 
fix: GSTR B2C report
 2020-12-01 20:44:33 +05:30
Rohit Waghchaure
1ac040a418 fix: GSTR report 2020-12-01 13:50:01 +05:30
Anurag Mishra
0fb05d1ba4
Merge pull request #24038 from Anurag810/bom-fix 
fix:  keyerror 'sourced_by_supplier'
 2020-12-01 13:47:06 +05:30
Anurag Mishra
0e9eb95b22
Merge branch 'develop' into bom-fix 2020-12-01 13:18:00 +05:30
Leela vadlamudi
a3845a95ed
feat: Introducing telephony module (#24032) 2020-12-01 13:04:53 +05:30
Nabin Hait
029b9c08dd
Update bom.py 2020-12-01 09:33:17 +05:30
Suraj Shetty
ad57eef40c
fix(product-listing): Check if customer exists (#24030) 
- It might happen that perty_name might not always be Customer
(it might be Supplier as well)
 2020-12-01 09:14:57 +05:30
Afshan
ccf5dc66e2
feat: multi-currency payroll (#23519) 
* feat: multi-currency payroll

* fix: refactor and added conditions

* fix: uncommented code

* style: removed comments

* fix: missing argument

* style: styling changes

* fix: test cases

* Update asset_value_adjustment.py

* patch: update columns

* style: formating

* style: formatting

* fix: 1st review

* fix: refactor

* Revert "fix: refactor"

This reverts commit eca0e17d11a192d60f249b2af992971c625aec46.

reverting to previous state

* Revert "fix: 1st review"

This reverts commit 7eac48b102157df4353598f73b2ea97308af436a.

reverting before 1st review

* fix: 2nd review changes

* fix: test cases

* fix: added call to fetch exchange rate

* fix: remove unnecessary code

* fix: refactor

* fix: refactor patch

* fix: refactor

* fix: refactor

* fix: clear test data

* fix: slider

* feat: multi-currency payroll

* fix: refactor and added conditions

* fix: uncommented code

* style: removed comments

* fix: missing argument

* style: styling changes

* fix: test cases

* patch: update columns

* Update asset_value_adjustment.py

* style: formating

* style: formatting

* fix: 1st review

* fix: refactor

* Revert "fix: refactor"

This reverts commit eca0e17d11a192d60f249b2af992971c625aec46.

reverting to previous state

* Revert "fix: 1st review"

This reverts commit 7eac48b102157df4353598f73b2ea97308af436a.

reverting before 1st review

* fix: 2nd review changes

* fix: test cases

* fix: added call to fetch exchange rate

* fix: remove unnecessary code

* fix: refactor

* fix: refactor patch

* fix: refactor

* fix: refactor

* fix: clear test data

* fix: slider

* feat: Added company field in leave encashment and employee benefit

* refactor: Refactored multi-currency payroll patch

* fix: currency column in salary register

* refactor: Refactored code for making bank and return entry against employee advance

* fix: minor cleanup

* fix: fixed translation

* fix: removed salary component type

* fix: fixed sider issues

* fix: translation and slider

* style: formatted msg

* fix: fixed slider

* fix: travis

* fix: refactor

* fix: slider

* fix: slider

* fix: slider

* fix: travis

* fix: patch

* fix: patch

* fix: travis

* fix: travis

* fix: travis

* fix: travis

* fix: travis

* fix: travis

* fix: re-run travis

* fix: rerun travis

* fix: rerun travis

* fix: rerun travis

* fix: travis rerun

* fix: increased throttle_user_limit from 60 to 100

* fix: patch

* fix: patch

* fix: assign payroll payable account as default payroll payable account in SSA

* fix: removed debugger

* fix: slider

Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-12-01 09:11:05 +05:30
Anurag Mishra
66e8a12d0f fix: KeyError 'sourced_by_supplier' 2020-11-30 17:53:28 +05:30
Anurag Mishra
8b6c58d560
Merge pull request #24005 from Anurag810/leave_ledger_patch 
fix: ignore exception during leave ledger creation from patch
 2020-11-30 13:26:47 +05:30
Deepesh Garg
8db507bfd9
Merge pull request #24027 from resilient-tech/fix-taxjar 
fix: import taxjar globally in the taxjar_integration module
 2020-11-30 11:23:32 +05:30
Deepesh Garg
6302de9290
Merge pull request #23975 from deepeshgarg007/jv_zero_value 
fix: Validation for journal entry with 0 debit and credit values
 2020-11-30 10:56:40 +05:30
Deepesh Garg
2d5530da96 fix: Invoice discounting test 2020-11-29 22:17:47 +05:30
Sagar Vora
38e4635a10 fix: import taxjar globally in the taxjar_integration module 2020-11-29 20:26:26 +05:30
gavin
31ac7d982a
chore(GitHub): Add issue template config 2020-11-27 15:58:07 +05:30
Anurag Mishra
755b773616
feat: Leave policy assignment (#23112) 
* feat: Leave Policy Assignment

* feat: linking with leave allocation and valiations

* style: removed old code from leave period

* feat: Bulk Leave policy Assignment and grant Leaves

* fix: overlap validation

* feat: earned leaves based on joining date

* feat: automatic grant leave based on leave policy

* patch: create leave policy assignment based on employee current leave policy

* fix: dependent test cases

* test: Leave policy assignment

* fix: some enhancement

* style: break large function into small function

* fix:requested Changes

* fix(patch): Handled old Leave allocatioln

* fix:codacy

* fix: travis and sider,codacy

* fix: codacy

* fix: codacy

* fix: requested changes and sider

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-11-25 16:05:17 +05:30
Anurag Mishra
f32cff1080
feat : Leave type with partial payment (#23173) 
* feat: Partially paid Leaves

* feat: some importatnt validation

* fix: requested changes

* fix: requested changes

* fix: travis, sider, codacy

* fix: changes requested

* test: Partially Paid Leaves
 2020-11-25 16:00:15 +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
Prssanna Desai
e60a62bde5
fix: function imports in account_balance_timeline.py (#24003) 2020-11-25 15:37:02 +05:30
Mohammad Hasnain Mohsin Rajan
e15b6a91de
Filters for tax templates (#23998) 
* feat: add company filter to tax templates

* fix: remove filer from PO because it is from tran

* fix: linting

* fix: solve translation string issues

* fix: remove doctype name
 2020-11-25 15:36:41 +05:30
Anurag Mishra
7824e81298 fix: ignore exception during leave ledger creation from patch 2020-11-25 14:54:50 +05:30
Rucha Mahabal
6b57cf3285
feat: Quality Inspection on Job Card (#23964) 
* feat: Quality Inspection on Job Card

* fix(Job Card): quality inspection filter query

* fix: sider issues
 2020-11-25 09:17:16 +05:30
Nabin Hait
0508e6bdfa
fix: Added link of bank reconciliation and clearance in accounting desk page (#23809) 2020-11-25 09:16:12 +05:30
Raffael Meyer
fbcc3c1b70
fix: Translatable strings (#23783) 
* fix: start_pattern

* fix: translatable strings

* fix: add missing semicolon (task)

* fix: add missing semicolon (setup_wizard)

* fix: text should start on the same line

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>

* fix: move out HTML element as variable

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>

* fix: pull out message, translate "Undo".

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>

* fix: typo

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>

* fix: text should start on the same line

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>

* Revert "fix: start_pattern"

This reverts commit decc62e2ab75f45db1df022fe13780c2d0d2560d.

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2020-11-25 09:11:51 +05:30
Rucha Mahabal
c66bd45ba4
feat: Inpatient Medication Orders Script Report (#23984) 
* feat: Inpatient Medication Orders Script Report

* feat: add chart for Inpatient Medication Order Report

* feat: add report to Desk Page

* feat: added filters for dates and healthcare service unit

* test: Inpatient Medication Orders report
 2020-11-25 09:09:40 +05:30
Deepesh Garg
a339752ba4
fix: Loan disbursement amount validation (#24000) 2020-11-25 08:54:51 +05:30
Mohammad Hasnain Mohsin Rajan
e4755828c4
fix: template errors in pricing rule (#23999) 
* fix: solve microtemplating errors
 2020-11-24 23:31:06 +05:30
rohitwaghchaure
f38abdeac0
Merge pull request #23994 from rohitwaghchaure/bom-stock-project-item-color-develop 
fix: bom stock report color showing always red
 2020-11-24 21:16:51 +05:30
rohitwaghchaure
5ab2e6c1ff
Merge pull request #23991 from pateljannat/job-card-operation-field-error 
fix: job card error handling for operations field
 2020-11-24 17:05:44 +05:30
Rohit Waghchaure
5a33f2c394 fix: bom stock report color showing always red 2020-11-24 16:59:36 +05:30
rohitwaghchaure
ccd554c19c
Merge pull request #23989 from Anurag810/item-maintain-stock-fixes 
fix: maintain stock can't be changed it there is product bundle
 2020-11-24 15:57:01 +05:30
pateljannat
b67ebc7636 fix: job card error handling for operations field 2020-11-24 15:37:30 +05:30
Deepesh Garg
d39ebf248e
Merge pull request #23990 from deepeshgarg007/shopify_order_id_sync 
fix: Old shopify order syncing date
 2020-11-24 15:12:53 +05:30
Deepesh Garg
43a830f3f5 fix: Old shopify order syncing date 2020-11-24 15:10:36 +05:30