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

24551 Commits

Author SHA1 Message Date
Marica
724d03ec68
Merge branch 'develop' into fix-si-pos-return 2020-12-07 12:01:19 +05:30
Kenneth Sequeira
85af44b7ed fix: client side UX fixes 2020-12-07 11:18:20 +05:30
Anuja P
550cb9c78f fix: suggested changes 2020-12-07 11:11:00 +05:30
Kenneth Sequeira
00510e7f12 Merge branch 'cont-temp' of https://github.com/kennethsequeira/erpnext into cont-temp 
pull latest
 2020-12-07 10:56:30 +05:30
Anuja P
47b4b7009d Merge branch 'develop' of https://github.com/frappe/erpnext into company_fiscal_year_fix 
Merge branch 'develop' of https://github.com/frappe/erpnext into company_fiscal_year_fix
 2020-12-07 10:55:44 +05:30
Kenneth Sequeira
5f95ba57a8 fix: py code clean up and doc help 2020-12-07 10:45:13 +05:30
Rucha Mahabal
063be69b58
fix(patch): set update_modified to False while setting issue/opportunity metrics (#24073) 2020-12-07 10:41:05 +05:30
Marica
13dcd18ede
Merge branch 'develop' into cont-temp 2020-12-07 09:53:23 +05:30
Deepesh Garg
6c35767995
Merge pull request #24069 from deepeshgarg007/gstr_3b_report_ims 
fix: Show tax amount in base currencies
 2020-12-06 23:24:24 +05:30
rohitwaghchaure
0a672b69e6
Merge pull request #22859 from marination/pr-dn-return 
feat: Return tracking in PR/DN
 2020-12-06 22:43:34 +05:30
Deepesh Garg
cfeca0dc87 fix: Show tax amount in base currencies 2020-12-06 18:28:30 +05:30
Michelle Alva
c9067e40cb
fix: Change validation message 
grammatical fix
 2020-12-06 10:48:32 +05:30
Deepesh Garg
2d1cfae596 fix: fieldname 2020-12-05 22:44:45 +05:30
Deepesh Garg
ceefd66090
Merge pull request #24041 from saurabh6790/v13-patch-fixes-1 
fix: reload doctype number card link
 2020-12-05 22:43:46 +05:30
Anuja P
b6cf75d2a8 fix: error messsage indent fix 2020-12-05 22:25:17 +05:30
Anuja P
d3157c9347 Merge branch 'develop' of https://github.com/frappe/erpnext into company_fiscal_year_fix 
Merge branch 'develop' of https://github.com/frappe/erpnext into company_fiscal_year_fix
 2020-12-05 22:21:03 +05:30
Marica
3b2da41f84
Merge branch 'develop' into debit-credit-opening-invoice-tool 2020-12-05 17:04:26 +05:30
Anuja P
2e4faf96f2 fix: Added TDS Payable account number and an error message 2020-12-05 13:36:43 +05:30
Deepesh Garg
eb951f3996
Merge pull request #24060 from deepeshgarg007/template_update 
fix(India): Tax template update on supplier change
 2020-12-05 12:38:10 +05:30
Marica
067f35df26
Merge branch 'develop' into debit-credit-opening-invoice-tool 2020-12-04 21:13:23 +05:30
marination
c866abca56 fix: (travis) Disable update stock for deferred accounting item's Sales Invoice 2020-12-04 20:12:52 +05:30
Anurag Mishra
26b3328af7
fix: leave policy assignment patch (#24061) 2020-12-04 19:50:24 +05:30
Deepesh Garg
a767085276 fix: Tax template update on supplier 2020-12-04 18:07:46 +05:30
Marica
afc517b8bf
Merge branch 'develop' into link-to-mr 2020-12-04 16:30:40 +05:30
Anuja Pawar
8a8a91c6b9
Merge branch 'develop' into issue_customer_filter 2020-12-04 15:26:40 +05:30
Anuja P
2e48cf7308 Merge branch 'issue_customer_filter' of https://github.com/Anuja-pawar/erpnext into issue_customer_filter 
Merge branch 'issue_customer_filter' of https://github.com/Anuja-pawar/erpnext into issue_customer_filter
 2020-12-04 15:19:06 +05:30
Kenneth Sequeira
c4eb41c92b fix; styling for sider 2020-12-04 15:00:22 +05:30
Anuja P
931f2e73a7 fix: sider changes 2020-12-04 14:57:23 +05:30
Anuja Pawar
84166a931e
Merge branch 'develop' into issue_customer_filter 2020-12-04 13:33:18 +05:30
marination
6a2431586e fix: Make new Customers for account missing test and set company 2020-12-04 13:31:36 +05:30
Rucha Mahabal
edee530d4c fix: paid amount in Sales Invoice POS return resets to 0 2020-12-04 12:13:26 +05:30
Rohit Waghchaure
28e86cf183 fix: pricing rule with transaction not working for additional product 2020-12-04 11:57:56 +05:30
Anuja P
0139109de2 fix: consistency check 2020-12-04 11:28:13 +05:30
Marica
4bf951a85b
Merge branch 'develop' into v13-patch-fixes-1 2020-12-03 19:55:03 +05:30
Anuja P
25e058833a fix: sider changes 2020-12-03 18:13:24 +05:30
Anuja P
26cc662a78 feat: added filter for customer field 2020-12-03 17:45:34 +05:30
Rohit Waghchaure
8474476316 fix: incorrect balance value in stock balance report 2020-12-03 13:43:11 +05:30
Kenneth Sequeira
131e46bab7 chore: add help section for Jinja 2020-12-02 21:37:55 +05:30
Kenneth Sequeira
9abc685504 feat: add jinja templating in contract template 2020-12-02 21:13:50 +05:30
Joshua Angelo Bienes
324622bd2a
Merge branch 'develop' into shipment_with_integration 2020-12-02 19:21:32 +08:00
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
Saurabh
2e27f074c3 feat: reload doctype number card link 2020-12-01 18:08:04 +05:30
Rohit Waghchaure
1ac040a418 fix: GSTR report 2020-12-01 13:50:01 +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
Saqib Ansari
19d5074c25 fix: get formatted value in 'taxes' print template 2020-11-30 15:49:00 +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
marination
724e16bca1 chore: Use JSON style response and use ORM 
- Use JSON style response for report columns
- Use ORM instead of frappe.db.sql
- Remove returned % from list view
 2020-11-30 12:55:30 +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
452cbcd6ea fix: Update payments directly in Loan Interest Accrual 2020-11-30 10:55:12 +05:30
Deepesh Garg
681c0e297c Merge branch 'develop' of https://github.com/frappe/erpnext into loan_patch_fix 2020-11-29 23:07:14 +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
Rucha Mahabal
cf012ca9c3 fix: show stock entry button only if update stock is enabled 2020-11-27 12:39:33 +05:30
Rucha Mahabal
f5eddce407 test: Inpatient Medication Entry Drug Shortage 2020-11-27 12:27:17 +05:30
Rucha Mahabal
ac8ee249d5 feat: Medication doctypes added to Desk page and Patient dashboard 2020-11-26 22:11:20 +05:30
Rucha Mahabal
54228691e7 feat(IPME): Button to create Stock Entry for Drug Shortage 2020-11-26 16:38:28 +05:30
Marica
307bd01504
Merge branch 'develop' into pr-dn-return 2020-11-25 17:24:03 +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
Marica
df17b4ff83
Merge branch 'develop' into pr-dn-return 2020-11-25 10:43:55 +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
Anurag Mishra
927106f552 fix: maintain stock can't be changed it there is product bundle 2020-11-24 15:02:52 +05:30
Deepesh Garg
d07447aa5f
fix: Validation for duplicate Tax Category (#23978) 
* fix: Validation for duplicate Tax Category

* Update utils.py

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-11-24 08:09:17 +05:30
Afshan
6aa6ec1832
fix: clear error message when approval not available (#23971) 2020-11-24 08:01:19 +05:30
rohitwaghchaure
b9b8a13393
Merge pull request #23980 from rohitwaghchaure/color-not-showing-in-bom-stock-report-develop 
fix: bom stock report color issue
 2020-11-23 16:43:32 +05:30
Rucha Mahabal
9a73a67dcd
Merge pull request #23982 from pateljannat/track-changes-in-stock-settings 
fix: enabling track changes for stock settings
 2020-11-23 15:57:48 +05:30
rohitwaghchaure
f9a44000d9
Update bom_stock_report.js 2020-11-23 15:40:06 +05:30
pateljannat
34f381df17 fix: enabling track changes for stock settings 2020-11-23 15:31:08 +05:30
Rohit Waghchaure
610d9ca649 fix: bom stock report color issue 2020-11-23 14:10:55 +05:30
Deepesh Garg
20d6143c38 fix: Validation for journal entry with 0 debit and credit values 2020-11-21 12:09:11 +05:30