Anuja P
26cc662a78
feat: added filter for customer field
2020-12-03 17:45:34 +05:30
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
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
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
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
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
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
gavin
31ac7d982a
chore(GitHub): Add issue template config
2020-11-27 15:58:07 +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
