Commit Graph

22469 Commits

Author SHA1 Message Date
SDLyu
b2eb4ee0f9
Change <br> position
Change <br> position for better format
2020-05-07 17:09:17 +08:00
SDLyu
e164985903
Create taiwan.html 2020-05-07 16:49:29 +08:00
sahil28297
c759e17900
fix(item): patch to rename duplicate item_code values to name (#21622)
Co-authored-by: Mangesh-Khairnar <mkhairnar10@gmail.com>
2020-05-07 12:12:13 +05:30
rohitwaghchaure
9de26f6648
fix: list index out of range (#21613) 2020-05-07 12:06:47 +05:30
Shivam Mishra
318affedb8 fix: divide by zero error 2020-05-06 20:26:12 +05:30
Shivam Mishra
20a1d375f3 feat: add fixture for project dashboards 2020-05-06 20:26:00 +05:30
Shivam Mishra
41616d4dd8 feat: add name to fixture 2020-05-06 20:21:05 +05:30
marination
4a73bc672b fix: Old buying config update & bar chart on desk
- Line chart was inapprpriate as the values were not continuous.
2020-05-06 18:34:07 +05:30
Deepesh Garg
9513171d3f
Merge pull request #21624 from deepeshgarg007/reversse_gl_fix
fix(minor): Reverse GL fix
2020-05-06 18:19:19 +05:30
marination
631260b632 chore: Added fixtures and Onboarding. 2020-05-06 18:12:26 +05:30
Deepesh Garg
b821f22b7c fix(minor): Reverse GL fix 2020-05-06 18:12:23 +05:30
Prssanna Desai
d50502ca40
fix: fix get_employee_details query (#21623) 2020-05-06 17:36:48 +05:30
Anurag Mishra
2596c8bbe7
fix: upload attendance (#21620) 2020-05-06 17:06:53 +05:30
Shivam Mishra
8cdcb965c5 feat: added dashboard fixtures for health care 2020-05-06 15:19:22 +05:30
Shivam Mishra
28436d2bc1 feat: added dashboard fixtures for accounts 2020-05-06 15:19:10 +05:30
Shivam Mishra
b2103f5470 feat: remove old fixtures 2020-05-06 15:18:43 +05:30
Deepesh Garg
88e6f72cad
Merge branch 'develop' into sales-report-total-row 2020-05-06 10:48:21 +05:30
Deepesh Garg
3e0c51879e
fix: Set Purchase Receipt and Delivery Note detail patch (#21607)
* fix: Set Purchase Receipt and Delievry Note detail patch

* fix: Reload purchase receipt item
2020-05-06 10:46:13 +05:30
Anupam K
d078883cd4 fixing callback urls 2020-05-06 01:13:51 +05:30
marination
cc989b62bd feat: Buying Desk, Dashboard and Reports 2020-05-05 23:58:08 +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
945aa08d92 feat: show stacked in report 2020-05-05 18:46:21 +05:30
Shivam Mishra
5f1240bcc6 feat: updated charts to use stacked layout 2020-05-05 18:44:02 +05:30
Nabin Hait
a4567a446f fix: Test for payroll entry 2020-05-05 18:36:12 +05:30
Nabin Hait
07fe4e1933
Update add_default_dashboards.py 2020-05-05 18:27:13 +05:30
Deepesh Garg
0ff0522500
Merge pull request #21605 from deepeshgarg007/loan_security_unpledge_fixes
fix: Loan security unpledge fixes
2020-05-05 17:04:22 +05:30
Deepesh Garg
af27c5142f fix: Loan securiyt unpledge fixes 2020-05-05 16:54:48 +05:30
Rohit Waghchaure
6e95d248e3 fix: work order operation completed qty 2020-05-05 16:35:45 +05:30
rohitwaghchaure
54a6c64b0f
fix: against voucher no not all records showing in case of Group By Voucher (consolidated) (#21592) 2020-05-05 16:17:15 +05:30
Saqib
d76f167e96
fix: handle make_gl_entry in case of cwip enable after puchasing (#21529)
* fix: handle make_gl_entry in case of cwip enable after puchasing

* fix: invalid variable assignment

* fix: make gl entries if cwip has been booked even if cwip is disabled
* add tests

* fix: conditions

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-05-05 16:14:45 +05:30
Saqib
fff00cee3a
chore: fix error message (#21593)
* chore: fix error message

* chore: add row idx
2020-05-05 16:14:17 +05:30
Saqib
d46696fa03
fix: cannot make payment entry against shareholder (#21597) 2020-05-05 16:10:47 +05:30
Anurag Mishra
ddcc4fa9b9
Feat: Monthly attendance sheet Enhancements and UI/UX Improvements (#21331)
* refactor: Employee attendance sheet redesign

* feat: Added weekly off status in monthly Attendance sheet

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-05-05 16:08:05 +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
Nabin Hait
672b74d89c fix: Patch and tests 2020-05-05 15:58:52 +05:30
Anupam K
d097eaef63 Appending Email and Phone in Child Table 2020-05-05 15:57:49 +05:30
Nabin Hait
5a1a765ebf
Update test_leave_encashment.py 2020-05-05 15:37:17 +05:30
Nabin Hait
9be11455a5
Merge branch 'develop' into refactor-addiional-salary 2020-05-05 14:43:07 +05:30
Marica
5e3d8050aa
fix: Handle rows with same item code from Purchase Receipt to Invoice. (#20724)
* fix: Handle rows with same item code from Purchase Receipt to Invoice.

* fix: Added patch, fixed tests, fixed delivery note behaviour

* chore: Added comments amd fixed typo

* fix: Added patch to patches.txt

* fix: Patch fix and simplification, json timestamp updation.

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-05-05 14:37:39 +05:30
Shivam Mishra
cc7488a90d feat: rerun patch to add default dashboards 2020-05-05 13:05:53 +05:30
Shivam Mishra
39fe688809 fix: dashboard chart link 2020-05-05 13:05:38 +05:30
rohitwaghchaure
5210761e57
fix: heatmap not working for customer and supplier (#21578)
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-05-05 12:12:33 +05:30
Suraj Shetty
8e08698c15
test: Fix wrong test for search function (#21588) 2020-05-05 12:06:58 +05:30
Shivam Mishra
4ea122662a refactor: less verbose labels for charts 2020-05-04 20:29:59 +05:30
Shivam Mishra
c7f5724fad feat: added project summary chart to desktop 2020-05-04 20:28:24 +05:30
Shivam Mishra
813bc49868 feat: added Report Summary Chart as fixture 2020-05-04 20:27:26 +05:30
Shivam Mishra
1607891a3c feat: added basic project summary report 2020-05-04 20:26:33 +05:30
Saqib Ansari
52cc6ad456 fix: test 2020-05-04 20:24:00 +05:30
Shivam Mishra
100453c64f feat: added open count tag 2020-05-04 19:32:20 +05:30
sahil28297
232396494b
fix(patch): reload GSTR 3B report 2020-05-04 19:20:55 +05:30
Anurag Mishra
94719e7e81 fix: tests 2020-05-04 18:54:06 +05:30
Anurag Mishra
09572d9892 patch: to link additional salary with salary slip and leave encashment, incentive with additional salary 2020-05-04 17:07:15 +05:30
Anurag Mishra
e15f0da011 fix: conflicts 2020-05-04 13:56:07 +05:30
Anurag Mishra
57f49ae312
Merge branch 'develop' into refactor-addiional-salary 2020-05-04 13:55:17 +05:30
Deepesh Garg
781bf78ce5
Merge pull request #21580 from deepeshgarg007/due_date_loan
fix: Use grace period in days for calculation of due date
2020-05-04 13:49:20 +05:30
Deepesh Garg
2a0de58f3d fix: Use grace period in days for calculation of due date 2020-05-04 13:45:43 +05:30
Nabin Hait
312341555f
Merge branch 'develop' into refactor-addiional-salary 2020-05-04 12:42:20 +05:30
Anurag Mishra
f453a1c13f Fix: requested Changes 2020-05-04 12:36:01 +05:30
Faris Ansari
c6325c2f34
Merge pull request #21550 from frappe/new-translations 2020-05-04 12:28:29 +05:30
Andy Zhu
f7a0b8b5b6
fix: fieldname update for 'Credit' and 'Debit' (#21405)
* fix: fieldname update for 'Credit' and 'Debit'

'credit' updated to 'credit_in_account_currency'
'debit' updated to 'debit_in_account_currency'

* Update journal_entry.py

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-05-04 12:09:28 +05:30
Mangesh-Khairnar
c4c7d15d54
fix: pre-process both the existing and new products (#21526)
* fix: pre-process both the existing and new products

* fix: delete hub tracked item on unpublish

Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-05-04 11:25:06 +05:30
Deepesh Garg
095b5586a2
fix: Accounting Dimensions in Period Closing Voucher (#21564) 2020-05-04 11:12:14 +05:30
Rucha Mahabal
0243981f31
fix: handle exception if sending Appointment Confirmation message fails (#21569) 2020-05-04 11:08:44 +05:30
Deepesh Garg
c33c309da3
Merge pull request #21571 from surajshetty3416/fix-console
refactor: Folio no validation
2020-05-04 09:03:14 +05:30
Deepesh Garg
6df581f78b
Merge pull request #21375 from marination/commonify-warehouse-autofill
chore: Commonify auto-filling warehouses in child tables
2020-05-03 20:33:45 +05:30
Suraj Shetty
9a8512d01d fix: NameError due to invalid variable 2020-05-03 20:17:47 +05:30
Suraj Shetty
9fffe254fc refactor: Folio no validation 2020-05-03 19:10:02 +05:30
rohitwaghchaure
268df35d80
Merge pull request #21516 from marination/stock-balance-cleanup
chore: Added company filter and minor cleanup in Stock Balance Report
2020-05-03 16:31:34 +05:30
Saqib Ansari
ab9bb08c4b fix: test 2020-05-03 14:53:13 +05:30
Saqib
d84a55313a
chore: add validation for gross purchase amount (#21534)
* chore: add validation for gross purchase amount

* fix: tests

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-05-03 13:20:24 +05:30
Suraj Shetty
a5f1fe5bba Merge branch 'develop' of https://github.com/frappe/erpnext into new-translations 2020-05-03 12:39:12 +05:30
Raffael Meyer
33de842071
Update v13_0_0_beta-1.md 2020-05-02 19:25:49 +02:00
Suraj Shetty
a367a07bf1
chore: Rename change log 2020-05-02 22:31:30 +05:30
Mangesh-Khairnar
2f7861a9b8
feat: Process deferred accounting entry (#19658)
* feat: process deferred accounting

* feat: maintain entry for deferred accounting

* feat: add check for automatic deferred accounting entry

* feat: add build conditions for company and account

* fix: create record for automatic processing of deferred accounting

* feat: add custom naming series

* fix: change the deferred revenue creation via hooks

* fix: add client side  validations

* test: creation of gl entries on submission of process deferred accounting

* fix: add multiple validations

* patch(accounts-settings): set automatically process deferred accounting entry

* fix: On cancel function for deferred entry

* fix: Send email per process instead of per invoice

* fix: Test cases

* fix: Label

* fix: Process deferred accounting fixes

* fix: Error flag

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: deepeshgarg007 <deepeshgarg6@gmail.com>
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2020-05-02 20:09:33 +05:30
Saqib Ansari
826b39559d fix: review fixes 2020-05-02 19:50:45 +05:30
Saqib Ansari
971170c590 fix: incorrect total in sales analytics for customer/item group 2020-05-02 19:39:03 +05:30
Deepesh Garg
cea4eeaa53 fix: Reverse GL Entry on cancel fix 2020-05-02 18:05:33 +05:30
Marica
1c8cbd07b8
fix: variable referenced before assignment (#21560) 2020-05-02 17:55:15 +05:30
Nabin Hait
ddf90b29f2
Update salary_slip.py 2020-05-01 22:34:28 +05:30
Sahil Khan
dba2132c91 bumped to version 13.0.0-beta.1 2020-05-01 21:25:26 +05:50
sahil28297
1101f9779e
fix: update version 2020-05-01 21:04:23 +05:30
rohitwaghchaure
85f30e70c8
Merge pull request #21552 from rohitwaghchaure/change-log-for-version-13-beta-pre-release
chore: change log for version 13 beta
2020-05-01 20:05:14 +05:30
Rohit Waghchaure
cfd67a17a3 chore: change log for version 13 beta 2020-05-01 19:58:33 +05:30
Nabin Hait
a67fb31f67
Merge branch 'develop' into refactor-addiional-salary 2020-05-01 19:04:20 +05:30
Nabin Hait
fdacc50e78
Update salary_detail.json 2020-05-01 19:04:00 +05:30
Nabin Hait
a1ffc44f0c fix: removed unwanted comma from json 2020-05-01 18:55:57 +05:30
Deepesh Garg
f7966f444d
Merge pull request #21404 from abhishekbalam/develop
feat(Accounts): Journal Entry Templates v1
2020-05-01 18:42:54 +05:30
Deepesh Garg
978de8779c fix: Add multi currency check and proper account filters 2020-05-01 18:38:13 +05:30
Rohit Waghchaure
795cf87aab fix: test case for loan 2020-05-01 18:31:14 +05:30
Nabin Hait
da17f9cb05
feat: Run MRP at parent level in the production plan (#21545)
* enhance: provision to make material request from other location

* fix: source warehouse for material transfer from production plan

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
2020-05-01 18:16:25 +05:30
Saqib
39805918d4
fix: accounts payable shows advance amount of other company (#21548) 2020-05-01 18:15:13 +05:30
Vishal Dhayagude
2e082affc7
fix(HR): Leave application company field made read-only and filter in Monthly attendance sheet (#20912)
* fix(HR): Leave application company field made Readonly

* fix: in monthly report attandance employee filter based on company

* fix: minor typo

* fix: Fetch company from employee

* Update monthly_attendance_sheet.py

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-05-01 18:11:43 +05:30
Suraj Shetty
119f2f07a5
Merge branch 'develop' into new-translations 2020-05-01 17:59:58 +05:30
Deepesh Garg
0f8150f8de
Merge pull request #21546 from deepeshgarg007/loan_closure_fixes
fix: Loan Closure without loan interest accrual
2020-05-01 15:49:56 +05:30
Deepesh Garg
662838adb3
fix: Party Type filter in payment entry list view (#21541) 2020-05-01 15:00:55 +05:30
Deepesh Garg
db83c29079
Merge branch 'develop' into develop 2020-05-01 14:20:53 +05:30
Deepesh Garg
1b35873743
Merge branch 'develop' into loan_closure_fixes 2020-05-01 14:18:36 +05:30
Deepesh Garg
1a1b06cf59
Merge pull request #21539 from deepeshgarg007/trvis_child_table_validation_fix
fix: Travis (develop)
2020-05-01 14:17:46 +05:30
Deepesh Garg
032814b86a fix: Patch test 2020-05-01 13:26:26 +05:30
Deepesh Garg
998364d636
fix: Update timestamp 2020-05-01 12:04:13 +05:30
Deepesh Garg
6cce75a230
Revert "fix: Update in field type" 2020-05-01 12:03:18 +05:30
Deepesh Garg
e2de2923e2
Merge pull request #21420 from wojosc/patch-8
fix: Update in field type
2020-05-01 11:38:23 +05:30
Deepesh Garg
779815a035 fix: Loan Repayment Test 2020-05-01 11:04:12 +05:30
rohitwaghchaure
be16e5cccc
fix: 'NoneType' object is not iterable (#21537) 2020-05-01 10:50:17 +05:30
mergify[bot]
5ac2c49444
fix: Move Video Doctype from Education module to Core (#21234) (#21533)
* 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>
(cherry picked from commit f65fb1fcf8)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-05-01 10:49:26 +05:30
rohitwaghchaure
52005d1ea3
Merge pull request #21501 from nextchamp-saqib/validate-paid-inv-msg
chore: validate and warn payment against paid invoices
2020-05-01 10:37:23 +05:30
Deepesh Garg
2dbd228eab fix: Check is child table for POS profile user 2020-05-01 09:50:56 +05:30
rohitwaghchaure
260bf54c99
Merge pull request #21171 from nextchamp-saqib/rename-bank-reco
chore: rename bank reconciliation to bank clearance
2020-05-01 09:33:52 +05:30
Deepesh Garg
1a497b3442 Merge branch 'develop' of https://github.com/frappe/erpnext into loan_closure_fixes 2020-05-01 09:24:10 +05:30
marination
3568dc75be fix: Make Company the first filter 2020-05-01 00:01:37 +05:30
Shivam Mishra
d76c5e83ca fix: elif block error 2020-04-30 22:39:03 +05:30
Deepesh Garg
61363d2ced fix: Initialize interest_paid as zero 2020-04-30 22:22:44 +05:30
Deepesh Garg
4226191ec7 fix: Loan Closure without loan interest accrual 2020-04-30 22:11:57 +05:30
Mangesh-Khairnar
367b644d9e fix: delete hub tracked item on unpublish 2020-04-30 20:31:12 +05:30
Saqib
dac51ea1cf
Merge branch 'develop' into validate-paid-inv-msg 2020-04-30 20:08:18 +05:30
Marica
66e99d5767
Merge branch 'develop' into razorpay-subscription 2020-04-30 20:07:05 +05:30
Saqib Ansari
dfa60e0ed8 chore: calculate total row month-wise in sales analytics 2020-04-30 20:06:30 +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
Mangesh-Khairnar
7f374e7ba5 fix: pre-process both the existing and new products 2020-04-30 18:56:27 +05:30
Saqib
4422ffdb22
chore: asset accounts should have company currency (#21524) 2020-04-30 18:39:13 +05:30
Saqib Ansari
10d9974e77 chore: add total row in sales analytics report 2020-04-30 16:28:52 +05:30
Raffael Meyer
3484a79ccf
Update datev_settings.json (#21482) 2020-04-30 16:27:11 +05:30
Michelle Alva
95b186268c
fix: only check for payment_account on bank entry (#21445)
* fix: only check for payment_account on bank entry

Since all the fields (company, start and end date are mandatory before form submission, there is no need to check for them again after submission.

* fix: cur_frm to frm

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-30 16:24:51 +05:30
Suraj Shetty
bd849f5925
Merge branch 'version-13-beta-pre-release' into fix-healthcare-v13-beta 2020-04-30 15:03:39 +05:30
marination
89c41d8384 chore: Added company filter and minor cleanup in Stock Balance Report 2020-04-30 13:56:49 +05:30
Saqib Ansari
c604109287 chore: handle credit note validation 2020-04-30 13:23:59 +05:30
Deepesh Garg
758f0f0780
Merge branch 'develop' into patch-8 2020-04-30 11:37:27 +05:30
Saqib
a8779872ee
feat: force cost center renaming from cost center form (#21503) 2020-04-30 11:28:43 +05:30
Saqib
090e6093f2
fix: list index out of range error (#21467)
* fix: list index out of range error

* fix: condititon
2020-04-30 11:04:44 +05:30
Nabin Hait
b8d633cb4a
fix: Desk links for Income Tax Slab and Employee Other Income (#21510) 2020-04-30 11:03:49 +05:30
Nabin Hait
62394d7762
fix: Tax calcualtion based on slab (#21496)
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
2020-04-30 11:02:53 +05:30
Nabin Hait
691f69c731
fix: Consider any kind of exemptions only if tax exemptions are allowed on tax slab (#21474) 2020-04-30 11:02:28 +05:30
Saqib
078c95c438
fix: print heading field shown in gst section for india region (#21499) 2020-04-30 10:57:38 +05:30
Deepesh Garg
2a9c5badc6
feat: Immutable ledger (#18740)
* fix: Reverse GL entry on cancellation of document

* fix: Removed set posting time field for multiple docs

* fix: Stop future reposting and reverse entry for purchase receipt and delivery note

* fix: Change is_cancelled field from select to check

* Revert "fix: Removed set posting time field for multiple docs"

This reverts commit 81fb808db7da69ab1e58ba226c0cd0b77e5b90c8.

* fix: Multiple fixes in GL Entry

* fix: Remove future reporting from doctypes

* fix: Canceled entry filters in Stock Ledger and General Ledger Report

* fix: Remove print statement

* fix: Validation for back dated entries

* fix: Codacy fixes

* fix: Add ignore links to multiple doctypes

* fix: Codacy Fixes

* fix: Ignore GL Entry and Stock Ledger entry while cancel

* fix: Test case fixes

* fix: Patch

* fix: Codacy

* fix: Budget Test Cases

* fix: Patch

* fix: Patch

* fix: Multiple test cases

* fix: changes in make_reverse_entry function

* fix: Update patch

* fix: Test Cases

* fix: Test Case fixes

* fix: Move patch upward in patches.txt

* fix: Budget Test Cases

* fix: Test Case and codacy

* fix: Patch

* fix: Minor label and UX fixes

* fix: Move freezing date check

* fix: Test Cases

* fix: Test cases

* fix: Test Cases

* fix: Test Case

* fix: Remove update_gl_entries_after function

* fix: Remove update_gl_entries_after function

* fix: Test Cases

* fix: Fiscal Year wise backdated entry

* fix: Update entries only for current SLE

* fix: Remove is_cancelled

* fix: Test Cases

* fix: Test cases

* fix: Test Cases

* fix: Uncomment account and stock balance sync logic

* fix: Stock balance and Account balance out of sync fixes

* fix: Test Cases

* fix: Test cases for POS, Stock Reco and Purchase Receipt

* fix: Stock Reco tests

* fix: Test stock reco precision

* fix: Test stock reco for fifo precision

* fix: Test stock reco for fifo precision

* fix: Stock Entry test case

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-30 10:38:58 +05:30
rohitwaghchaure
c9a6f37199
Merge pull request #21471 from Alchez/dev-update-lead-contact
fix: update lead if contact details are changed (develop)
2020-04-30 03:15:44 +05:30
Suraj Shetty
7c5f43d794 chore: Update Translations 2020-04-29 18:11:03 +00:00
Deepesh Garg
b134abd3bd
Merge pull request #21513 from deepeshgarg007/get_period_api_v13
fix: get_period_list API change fixes
2020-04-29 22:23:15 +05:30
Deepesh Garg
fb992159b5
Merge pull request #21512 from deepeshgarg007/get_period_api
fix: get_period_list API change fixes
2020-04-29 22:20:06 +05:30
Deepesh Garg
7c2d50fa15 fix: Remove print 2020-04-29 22:19:15 +05:30
Deepesh Garg
9d5fabd7ac fix: get_period_list API change fixes 2020-04-29 22:19:02 +05:30
Deepesh Garg
8113294d6e fix: Remove print 2020-04-29 22:16:47 +05:30
Deepesh Garg
0a6450115f fix: get_period_list API change fixes 2020-04-29 22:14:45 +05:30
rohitwaghchaure
38f7cb487a
Merge pull request #21508 from ruchamahabal/fix-healthcare
fix: Healthcare Fixes
2020-04-29 22:13:55 +05:30
Rucha Mahabal
57fc3a5c3c fix: exercise type 2020-04-29 19:49:46 +05:30
Rucha Mahabal
5e8f748a63 feat: add create Sales Invoice option from Therapy Session 2020-04-29 19:49:31 +05:30
Rucha Mahabal
cf10fde5ec fix: mark form as dirty when editing or deleting exercise card 2020-04-29 19:49:15 +05:30
Rucha Mahabal
589440c5ad feat: create medical record for therapy sessions 2020-04-29 19:48:58 +05:30
Rucha Mahabal
033886ae3e fix: change Patient Medical Record subject fieldtype to Text Editor 2020-04-29 19:48:41 +05:30
Rucha Mahabal
b30c9a5735 fix: reload procedure doc on completion 2020-04-29 19:48:17 +05:30
Rucha Mahabal
298c7e5be5 fix: exercise type 2020-04-29 19:23:16 +05:30
Rucha Mahabal
b4b3872ff2 feat: add create Sales Invoice option from Therapy Session 2020-04-29 17:34:36 +05:30
Saqib Ansari
769c0ce72b chore: validate and warn payment against paid invoices 2020-04-29 15:19:08 +05:30
Abhishek Balam
b59e46d773 fix semicolons as per codacy review 2020-04-29 15:01:56 +05:30
Rucha Mahabal
706f6b0030 fix: mark form as dirty when editing or deleting exercise card 2020-04-29 14:19:27 +05:30
Rucha Mahabal
7a0f425674 feat: create medical record for therapy sessions 2020-04-29 13:47:14 +05:30
Deepesh Garg
91e94587b6 fix: Autoname for loan security 2020-04-29 13:43:26 +05:30
Rohan Bansal
7835bf91e4 fix: AttributeError 2020-04-29 13:10:53 +05:30
Rucha Mahabal
708bceba6e fix: change Patient Medical Record subject fieldtype to Text Editor 2020-04-29 13:06:52 +05:30
Deepesh Garg
c544b91e14
Merge pull request #21495 from deepeshgarg007/item_wise_sale_purchase_v13
fix: Group by filter fix in item wise sales and purchase register
2020-04-29 12:37:26 +05:30
Deepesh Garg
0d8f66dafa
Merge pull request #21493 from deepeshgarg007/item_wise_sale_purchase
fix: Group by filter fix in item wise sales and purchase register
2020-04-29 12:36:08 +05:30
Deepesh Garg
60256e7299 fix: Group by filter fix in item wise sales and purchase register 2020-04-29 12:26:47 +05:30
Abhishek Balam
e35bb16436 added journal entry template to accounting desk page 2020-04-29 12:18:33 +05:30
Deepesh Garg
3d8dadaab6 fix: Group by filter fix in item wise sales and purchase register 2020-04-29 12:05:56 +05:30
Abhishek Balam
0c4ce4dbba Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-04-29 12:02:13 +05:30
Anurag Mishra
33793d4e0d
fix: Permission issue Employee Tax exemption (#21490) 2020-04-29 11:48:41 +05:30
Abhishek Balam
3b26b24af6 fix semicolons as per codacy review 2020-04-29 11:28:40 +05:30
Shivam Mishra
357d11adbe
Merge branch 'develop' into razorpay-subscription 2020-04-29 11:17:44 +05:30
Rucha Mahabal
9bf733d82e fix: reload procedure doc on completion 2020-04-29 11:16:34 +05:30
Abhishek Balam
8dbc4e648b rearranged fields in journal entry and journal entry type 2020-04-29 11:13:55 +05:30
Deepesh Garg
e006a76f8d
Merge pull request #21486 from rohitwaghchaure/not-able-to-make-payment-request-against-fees
fix: payment request not able to make against fees
2020-04-29 09:36:37 +05:30
rohitwaghchaure
e8ca145ec1
Merge pull request #21483 from alyf-de/bank_account_dashboards
feat: add Bank Account to dashboards
2020-04-29 05:06:30 +05:30
rohitwaghchaure
20fa73ff9c
Merge pull request #21388 from marination/stock-entry-form-cleanup
chore: Stock Entry Form Cleanup
2020-04-29 03:13:12 +05:30
Rohit Waghchaure
50b4106d1d fix: payment request not able to make against fees 2020-04-29 02:27:47 +05:30
Suraj Shetty
4632379636 chore: Update Translations 2020-04-28 18:04:41 +00:00
Raffael Meyer
49bb8ccd2e feat: add Bank Account to dashboards 2020-04-28 18:56:47 +02:00
marination
769145caba fix: Removed Finished Product and Finished Qty columns from Stock Ledger Report 2020-04-28 21:36:25 +05:30
marination
6c871d6bcf fix: Removed Finished Product and Finished Qty columns from Stock Ledger Report 2020-04-28 21:28:53 +05:30
Deepesh Garg
e317b79361
Merge pull request #21478 from deepeshgarg007/duplicate_code_v13
fix: Remove duplicate code from accounting dimension
2020-04-28 20:36:50 +05:30
Deepesh Garg
7889ca564c fix: Remove duplicate code from accounting dimension 2020-04-28 20:32:32 +05:30
Suraj Shetty
9d185ac4ee Merge branch 'develop' of https://github.com/frappe/erpnext into new-translations 2020-04-28 20:26:29 +05:30
Deepesh Garg
2b73dbeae0
Merge pull request #21476 from deepeshgarg007/duplicate_code
fix: Remove duplicate code from accounting dimension
2020-04-28 20:25:31 +05:30
Deepesh Garg
8705df6283 fix: Remove duplicate code from accounting dimension 2020-04-28 20:19:26 +05:30
marination
b7f6878222 fix: Handle empty child table 2020-04-28 19:18:45 +05:30
Shivam Mishra
525138c42a
Merge branch 'develop' into razorpay-subscription 2020-04-28 19:06:02 +05:30
Rohan Bansal
76825ab2bd fix: update lead if contact details are changed 2020-04-28 16:13:53 +05:30
Shivam Mishra
d445ffc458 feat: whitelist api 2020-04-28 16:04:31 +05:30
Shivam Mishra
7b836e9a92 refactor: update susbcription values all the time 2020-04-28 15:43:04 +05:30
Deepesh Garg
dcef7a96ef
Merge pull request #21463 from deepeshgarg007/allow_loan_security_rename
fix: Allow rename for Loan Security
2020-04-28 14:31:56 +05:30
Deepesh Garg
7b14721e2f fix: Allow rename for Loan Security 2020-04-28 14:25:36 +05:30
Deepesh Garg
43ade21f1e
Merge pull request #21462 from deepeshgarg007/consolidate_statement_fix_v13
fix: Report summary fix in consolidated financial statement for report type Profit and Loss
2020-04-28 13:30:25 +05:30
Deepesh Garg
428978762b
Merge pull request #21461 from deepeshgarg007/consolidate_statement_fix
fix: Report summary fix in consolidated financial statement for report type Profit and Loss
2020-04-28 13:30:12 +05:30
Deepesh Garg
c26db6a606 fix: Report summary fix in consolidated financial statement for report type Profit and Loss 2020-04-28 13:16:49 +05:30
Nabin Hait
1bd6de41e6
Merge branch 'develop' into refactor-addiional-salary 2020-04-28 13:15:18 +05:30
Deepesh Garg
fa2eecc5fc fix: Report summary fix in consolidated financial statement for report type Profit and Loss 2020-04-28 13:12:22 +05:30
rohitwaghchaure
28a4880b48
fix: added validation to not allow to select expired batch (#21455) 2020-04-28 13:01:43 +05:30
Marica
ac98eb5448
fix: Blanket Order in SO/PO child tables (#21443) 2020-04-28 13:00:44 +05:30
Marica
299e217668
fix: Blanket Order in SO/PO child tables (#21442) 2020-04-28 13:00:04 +05:30
rohitwaghchaure
daf37e7570
fix: better validation message for the expense claim and set default cost center in the expenses table (#21454) 2020-04-28 12:48:22 +05:30
Deepesh Garg
558f6aa4cb
Merge pull request #21456 from deepeshgarg007/gross_profit_width
fix: Default column width in Gross profit report
2020-04-28 12:35:50 +05:30
Deepesh Garg
bc346b5bea fix: Default column width in Gross profit report 2020-04-28 12:30:41 +05:30
Anoop
b5e7ea7ab8
Merge branch 'develop' into multi_company 2020-04-28 11:38:07 +05:30
Deepesh Garg
142af4b58a fix: Default column width in Gross profit report 2020-04-28 11:17:45 +05:30
Nabin Hait
504a5f3a3a
fix: reload income_tax_slab_other_charges in patch (#21447)
* fix: reload income_tax_slab_other_charges in patch

* fix: reload lower_deduction_certificate in patch
2020-04-28 11:16:04 +05:30
rohitwaghchaure
236c28fc91
Merge pull request #21453 from anupamvs/campaign-card
Added Campaign Card in CRM Desk
2020-04-28 03:04:12 +05:30
Anupam K
01d0b373e0 Review changes 2020-04-28 00:21:10 +05:30
anoop
1696a2a4b9 fix: default sms text in settings - corrected field names 2020-04-27 23:44:41 +05:30
anoop
0f541cb7ab feat: set title for appointment, encounter, procedure and vitals 2020-04-27 23:42:22 +05:30
Anupam K
cc9dbb912e Adding campaign card in CRM Desk 2020-04-27 22:37:02 +05:30
anoop
ca6f3ec977 fix: set customer name on patient update 2020-04-27 22:27:13 +05:30
anoop
256b77b463 fix: filter service unit by company 2020-04-27 20:00:27 +05:30
anoop
e30cc83591 fix: field order, minor fixes -
patient - update customer, releated fields
patient appointment - send message
2020-04-27 19:36:49 +05:30
Deepesh Garg
57bfd38944
Merge pull request #21436 from deepeshgarg007/ewb_bill_error_message
fix: E-Way bill error message
2020-04-27 15:04:32 +05:30
Deepesh Garg
fe7e6f5f53 fix: Test 2020-04-27 14:05:45 +05:30
Rucha Mahabal
e0ff9142ac fix: show date in the message for already marked attendance 2020-04-27 13:29:46 +05:30
Wolfram Schmidt
acfe8f020f
added time stamp to commit
added time stamp to commit
2020-04-27 08:48:34 +02:00
Rucha Mahabal
f40a431d8c fix: delivery trip form 2020-04-27 11:29:56 +05:30
Ahmad
f34faa9181
Module Import Fix (#21433) 2020-04-27 10:57:02 +05:30
Rucha Mahabal
131452ca94
fix: Lab Test Invoicing (#21435) 2020-04-27 10:52:38 +05:30
Rucha Mahabal
7bbe3dd8a0
fix: Patch for updating Appointment Reminder method in Scheduled Job Type (#21431) 2020-04-27 10:51:46 +05:30
Deepesh Garg
4eecc65cff fix: E-way bill fix in Delivery Note 2020-04-27 10:50:59 +05:30
Deepesh Garg
00ea59b447 fix: Utils messsage cleanup 2020-04-27 10:50:40 +05:30
Deepesh Garg
10aff8e118 fix: E-way bill fix in List view 2020-04-27 10:50:17 +05:30
Deepesh Garg
9979ceb96b fix: E-way bill fix in sales invoice 2020-04-27 10:50:03 +05:30
Deepesh Garg
24b6055d89
Merge pull request #21427 from ruchamahabal/fix-desk-pages
fix(Desk Page): Number of Open Leads not visible on Shortcut Card
2020-04-27 08:41:14 +05:30
rohitwaghchaure
4d754eadc8
Merge branch 'develop' into quo-status-fix 2020-04-27 00:22:43 +05:30
Rucha Mahabal
e34ec70d44 fix(Desk Page): Number of Open Leads not visible on Shortcut Card 2020-04-26 23:40:37 +05:30
Nabin Hait
2305d00e0b
fix: Procurement tracker report (#21421)
* fix: procurement report data was not coming

* fix: leave allocation minor issue
2020-04-26 23:29:13 +05:30
Himanshu
c9a1aa8eaa
fix: add dashboard to quality inspection template (#21423) 2020-04-26 23:28:33 +05:30
Suraj Shetty
3e3a793567
fix: Set barcode field empty only if it has value (#21425)
- To avoid unnecessary form dirty trigger
2020-04-26 23:25:40 +05:30
Anurag Mishra
ded418e31d
feat: employee leave balance reports (#20754)
* feat: Employee leave balance summary report new design

* feat: Employee leave balance report new design

* fix: leave based on multiple holiday list

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-26 21:04:58 +05:30
Nabin Hait
ba70e7e8bc
Payroll based on attendance (#21258)
* feat: Payroll based on attendance and leave

* test: salary slip based 0n attendance

* feat: Payroll based on attendance

* fix: Codacy issues

Co-authored-by: Anurag Mishra <mishranaman123@gmail.com>
2020-04-26 20:17:48 +05:30
Deepesh Garg
d78cf97250
feat: Allow tax withholding category selection at invoice level (#20870)
* feat: Allow tax withholding category selection at invoice level

* fix: Linitng fixes

* feat: TDS calculation using common PAN

* fix: Add provision to deduct Lower TDS in purchase invoice

* fix: Consider only ref docs company while computing TDS

* fix: Default permission fixes

* fix: Add validation for dates in fiscal year

* fix: Undefined variable
2020-04-26 20:08:52 +05:30
Marica
5d5454ef1f
fix [ux]: Purchase Order Form Cleanup (#20932)
* chore: Purchase Order Form Cleanup

* fix: Get Items from popups cleanup

* fix: Shift Set Target Warehouse next to Supply Raw Materials.

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-26 20:07:22 +05:30
rohitwaghchaure
733b47c5e6
Merge pull request #21389 from marination/stock-entry-qty
fix: Issues on qty trigger in Stock Entry Detail
2020-04-26 17:59:45 +05:30
Nabin Hait
58ee6c1e08
feat: Income tax slab (#21399)
* Feat: Multiple tax as per new taxation rule

* patch:for multiple tax slab, fix: payroll and exemption validation

* Test: Fixture

* feat: income tax slab with other charges and tax exempted deduction components

* fix: added missing init file

* fix: Patch fixed

* fix: Patch fixed

* fix: test fixes

* fix: validate duplicate exemption declaration

* fix: payment entry test case

Co-authored-by: Anurag Mishra <mishranaman123@gmail.com>
2020-04-26 17:45:57 +05:30
Saqib Ansari
2fea073539 fix: query logic 2020-04-26 17:30:23 +05:30
marination
de33029393 fix: Remove callback outside if condition 2020-04-26 17:16:21 +05:30
Wolfram Schmidt
64c7eeed24
Update in field type
Warrenty Period (in Days) changed from "Data" to "Int".
2020-04-26 10:56:08 +02:00
Abhishek Balam
8aa8457a2d Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-04-26 13:07:09 +05:30
Abhishek Balam
e4e23836e7 mandatory depends on for cheque no and date, fix typo 2020-04-26 13:06:55 +05:30
Saqib
7e73473a65
fix: (ux) set jv voucher type depending on mode of payment (#21411) 2020-04-26 09:40:57 +05:30
rohitwaghchaure
8b1c71ea44
fix: work order creation message against material request (#21413) 2020-04-26 09:38:18 +05:30
Abhishek Balam
84187fb8e9 Code cleanup and improvements requested in PR:21404 2020-04-26 05:00:36 +05:30
Abhishek Balam
331bc0c366 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-04-25 18:25:27 +05:30
Abhishek Balam
539c67966f rename je template account dt 2020-04-25 18:13:01 +05:30
Abhishek Balam
fb5fbd7e0c Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-04-25 17:59:00 +05:30
rohitwaghchaure
77403abadd
Merge branch 'develop' into social-media-integration-feat 2020-04-25 17:37:24 +05:30
Nabin Hait
ad16e61bc2
fix: Valid warehouse in woocommerce syncing and other small fixes (#21407)
* fix: Valid warehouse in woocommerce syncing

* fix: dmall fixes in gross & net profit report

* fix: company is required for getting party details

* fix: None issue while getting raw material rate based on last purchase rate
2020-04-25 14:52:05 +05:30
Ahmad
454b1cf48d
Hook Fix in the scheduler events (#21410) 2020-04-25 14:51:24 +05:30
Deepesh Garg
0b7bef5971
Merge pull request #21408 from deepeshgarg007/loan_disbursement_against
fix: Loan Disbursement against account
2020-04-25 13:18:49 +05:30
Deepesh Garg
c20de8ac8d fix: Loan Disbursement against account 2020-04-25 13:15:45 +05:30
Saqib
8952ac1ab4
fix: custom buttons are hidden if order type of SO is customised (#21397) 2020-04-25 09:44:21 +05:30
Abhishek Balam
d64438ff47 feat: Journal Entry Template 2020-04-25 03:13:50 +05:30
Abhishek Balam
291837e63d Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-04-25 02:46:00 +05:30
Abhishek Balam
7bbb77e66f feat: Journal Entry Template 2020-04-25 02:45:45 +05:30
rohitwaghchaure
55102f455f
Merge pull request #21401 from rohitwaghchaure/fixed-taget-warehouse-mandatory-issue
fix: make target warehouse field mandatory while saving the work order
2020-04-25 01:19:19 +05:30
Anupam K
524eb6ce9b freeze screen while posting and login 2020-04-25 00:35:26 +05:30
Diksha Jadhav
7b91617303 feat(accounting): show actual qty for warehouse in sales invoice 2020-04-25 00:02:32 +05:30
Rohit Waghchaure
5460691c8f fix: make target warehouse field mandatory while saving the work order 2020-04-24 23:55:33 +05:30
Rucha Mahabal
d124581044
Merge pull request #21384 from anupamvs/email-camp-end-date
fix: set end_date in Email Campaign
2020-04-24 20:04:34 +05:30
Saqib Ansari
8c70e8d4df fix: remove debugger 2020-04-24 16:41:48 +05:30
Saqib Ansari
40140c63dc fix: rate gets overwritten when pricing rule is set 2020-04-24 14:51:56 +05:30
Saqib Ansari
22d2970339 fix: query 2020-04-24 13:47:44 +05:30
Saqib
869ea1d9e4
Merge branch 'develop' into quo-status-fix 2020-04-24 12:17:30 +05:30
Anupam K
e01723e360 Review changes 2020-04-23 23:02:08 +05:30
anoop
c02eceb989 style: intendation 2020-04-23 21:15:06 +05:30
Marica
ba3adf2461
Merge branch 'develop' into stock-entry-form-cleanup 2020-04-23 20:58:44 +05:30
marination
e1e98fe116 fix: Issues on qty trigger in Stock Entry Detail 2020-04-23 20:18:52 +05:30
Rucha Mahabal
1700fc8011
Merge branch 'develop' into email-camp-end-date 2020-04-23 19:42:17 +05:30
marination
f7aa6a8357 chore: Stock Entry Form Cleanup 2020-04-23 19:27:50 +05:30
Saqib Ansari
0f2c64cfef fix: travis 2020-04-23 19:19:09 +05:30
Anurag Mishra
92b933f4ac
feat: Upload Attendance (#20947)
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-23 16:15:18 +05:30
Deepesh Garg
525204bc50
feat: Payment allocation based on payment terms (#20945)
* feat: Payment allocation based on payment terms

* fix: Add desccription for checkbox

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-23 16:07:36 +05:30
Rucha Mahabal
78d7ed521f
Merge branch 'develop' into email-camp-end-date 2020-04-23 16:00:27 +05:30
Saqib
63084c6292
Merge branch 'develop' into quo-status-fix 2020-04-23 15:30:31 +05:30
Anupam K
0f7bac26e6 setting end date in email campaign 2020-04-23 15:29:12 +05:30
Saqib Ansari
1e4c28e99d fix: quotation have expired status even if sales order exists 2020-04-23 15:28:47 +05:30
Anupam K
39911b40f0 setting end date in email campaign 2020-04-23 14:14:49 +05:30
Deepesh Garg
67173ce112
Merge pull request #21382 from deepeshgarg007/loan_security_pledge_aginst_application
fix: Allow creation of loan security pledge from Loan Application for old prices
2020-04-23 13:54:38 +05:30
Deepesh Garg
2daf6dad2e fix: Allow creation of loan security pledge from Loan Application for old prices 2020-04-23 13:51:29 +05:30
Deepesh Garg
b1e68bd022
fix: Rename bank account type doctypes (#21179)
* fix: Rename bank account type doctypes

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2020-04-23 12:19:30 +05:30
Deepesh Garg
fa8396feb5
fix: Budget against accounting dimensions (#21268)
* fix: Budget warning against custom accounting dimension

* fix: Codacy

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-23 10:34:57 +05:30
rohitwaghchaure
168babfebc
fix: bom update cost issue (#21372)
* fix: bom update cost is not working

* added test case for bom cost
2020-04-23 09:48:50 +05:30
rohitwaghchaure
6fa6caf46c
fix: patch and validation message to fix target warehouse issue (#21371) 2020-04-23 09:46:29 +05:30
rohitwaghchaure
e8a651bc00
fix: BOM stock report (#21380) 2020-04-23 09:45:09 +05:30
rohitwaghchaure
28deddeb6f
fix: incorrect out value in stock balance due to precision issue (#21379) 2020-04-23 09:44:58 +05:30
Rucha Mahabal
ec7db4f467 fix: modified timestamp conflict 2020-04-23 03:10:11 +05:30
Rucha Mahabal
d7304519e2 fix: conflicts 2020-04-23 00:52:47 +05:30
marination
8a30cb2565 chore: Commonify autofilling warehouses in child tables 2020-04-23 00:18:21 +05:30
Rucha Mahabal
eaa956b994
feat(Healthcare): Rehabilitation Module (#21216)
* feat: added rehab sub-module doctypes

* feat: rehab module

* feat: prescribe procedures in Patient Encounter

* feat: create Therapy Plan on Encounter submission

* feat: manage item for Therapy Type

* feat: book appointments, get prescribed therapies for Therapy Sessions

* feat: invoice Therapy Sessions

* feat: plan completion progress bar and exercise countsindicators

* feat: Motor Assessment Scale

* feat: add editable card view for exercise steps

* fix: add rehab in healthcare desk page

* fix: card deletion not working when child table is hidden

* feat: automatically fetch therapies according to Body Part

* fix: added tests for Therapy Type and Plan

* fix: add exercises according to body parts in Therapy Type

* fix: label for Exercise Instructions

* fix: exercise cards css

* feat: add dashboard for Therapy Plan

* feat: Patient Assessment Template and Patient Assessment

* feat: add title fields in Therapy Plan and Session

* fix: remove Motor Assessment Scale

* fix: fetch assessment description

* feat: create Patient Assessment from Therapy Session

* fix: anti pattern code

* fix: update desk page

* fix: exercise card rendering

* fix(test): filter out disabled Items in test_mapper

* fix: get stock uom from Stock Settings for Therapy Type Item creation

* fix: multiline SQL query

* fix: permissions for DocTypes

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-22 13:07:12 +05:30
Deepesh Garg
37665e12ca
Merge pull request #21367 from scmmishra/cal-report
fix: specify column width
2020-04-22 12:03:05 +05:30
Shivam Mishra
55baccd63a fix: specify column width 2020-04-22 11:50:06 +05:30
Saqib
9c494d3e72
fix: asset maintenance fixes (#21277)
* fix: asset maintenance fixes

* fix: tests
2020-04-22 11:48:19 +05:30
Nabin Hait
471cf95300
Update purchase_invoice_item.json 2020-04-22 11:46:31 +05:30
Chinmay Pai
8fb863da07
chore: remove oldfieldtype from purchase invoice item (#21365)
fixes issue where framework expects data field type to be validated with
options either set to "Email" or "Phone".

removing oldfieldtype works for now, should be fixed inside framework

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-04-22 11:23:14 +05:30
Rohit Waghchaure
690855d3a1 fix: unsupported operand type issue in pricing rule 2020-04-22 02:49:48 +05:30
Anupam K
4e2256f2e3 Linkedin, Twitter Integration 2020-04-21 22:07:03 +05:30
Nabin Hait
5f77854448
Revert "fix : Create Pick List Fos Sales Order List (#20915)" (#21352)
This reverts commit 27c6f69435.
2020-04-21 14:28:08 +05:30
Nabin Hait
a529a5078f
Update purchase_receipt.json 2020-04-21 13:50:26 +05:30
Marica
bda0ddf1cf
fix: Purchase Receipt Form Cleanup (#21232) 2020-04-21 13:15:05 +05:30
Marica
9942acd9d4
fix [ux]: Material Request Form Cleanup and UX (#20810)
* fix (ux): Material Request Form Cleanup

* fix: Get Items from popup UX

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-21 13:13:39 +05:30
Dharmraj-48
27c6f69435
fix : Create Pick List Fos Sales Order List (#20915)
Co-authored-by: Dharmraj <Dharmraj@bloomstack.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-21 13:10:09 +05:30
Marica
34bbd5b612
fix: Purchase Invoice Form Cleanup (#21230)
* fix: Purchase Invoice Form Cleanup

* fix: Made Supplier field mandatory

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-21 13:00:14 +05:30
Anupam Kumar
a9d59fad94
fix: on item change UOM not updated (#21242)
* fix: on item change UOM not updated

* removing uom from js
2020-04-21 12:57:44 +05:30
Rucha Mahabal
ca1c37c56d
fix(Healthcare): remove hardcoded UOM during Item creation for Templates (#21350) 2020-04-21 12:54:07 +05:30
Marica
9ea1ad4051
fix: Re-order Item Error Email format (#21342)
* fix: Re-order Item Error Email format

* fix: Translated strings
2020-04-21 12:52:29 +05:30
rohitwaghchaure
a92eaff83b
fix: scrap items order not showing correctly in stock entry (#21346) 2020-04-21 11:27:10 +05:30
rohitwaghchaure
3d2ced7926
Merge pull request #21345 from rohitwaghchaure/fixed_free_item_qty_develop
fix: free item quantity issue
2020-04-21 01:10:33 +05:30
Rohit Waghchaure
d093a377ef fix: free item quantity issue 2020-04-21 01:09:44 +05:30
Shivam Mishra
6372d0a842
Merge pull request #21187 from scmmishra/razorpay-subscription
feat: Razorpay subscription for Non profit memberships
2020-04-20 21:01:34 +05:30
Shivam Mishra
745b632ea1 fix: linting fixes 2020-04-20 18:25:51 +05:30
Sahil Khan
f03efdc6b1 fix(patch): reload 'Import Supplier Invoice' doc 2020-04-20 14:18:28 +05:30
Shivam Mishra
83f80517c6
Merge branch 'develop' into razorpay-subscription 2020-04-20 13:54:00 +05:30
Saqib
b61d2411b1
Merge branch 'develop' into rename-bank-reco 2020-04-20 12:21:22 +05:30
Saqib Ansari
9de76de621 fix: patch 2020-04-20 12:19:27 +05:30
Wolfram Schmidt
6d49238159
Update project.json (#21274)
unnecessary requirement for project creation as this is a field of the Type select which will be pre-filled. When creating a project of list view it will also bring up this field as it has "reqd": 1. A new projekt will have the status set to open in most cases.

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>
2020-04-19 20:19:10 +05:30
Shivam Mishra
bd53f3b080 fix: filters as dictionary 2020-04-19 12:47:48 +05:30
Deepesh Garg
3cec5cbb0f
fix: Total amount field ordering in transactions (#21313) 2020-04-18 22:13:48 +05:30
Deepesh Garg
6298bbb1eb
Merge pull request #21328 from rohitwaghchaure/fixed-account-name-in-gl_print
fix: account name not showing in the gl print
2020-04-18 20:40:50 +05:30
Rohit Waghchaure
9793500154 fix: account name not showing in the gl print 2020-04-18 19:02:07 +05:30
rohitwaghchaure
866867661e
Merge pull request #21204 from rohitwaghchaure/fixed_internal_issue_develop
fix: minor issues
2020-04-18 02:08:26 +05:30
Anupam K
790b9ee8d0 Merge branch 'develop' of https://github.com/frappe/erpnext into social-media-integration-feat 2020-04-18 01:51:47 +05:30
Anupam K
c12a40c923 Linkedin, Twitter Integration 2020-04-18 01:50:18 +05:30
Anupam K
22318b2eb6 Linkedin, Twitter Integration 2020-04-18 01:46:38 +05:30
Anupam K
d683dc250d Linkedin, Twitter Integration 2020-04-18 00:48:34 +05:30
Mangesh-Khairnar
bd14a64bfb fix: add label to gl entry 2020-04-17 19:52:47 +05:30
gavin
25932e0613
Merge pull request #21298 from gavindsouza/tally-migration-fixes
fix: Tally migration
2020-04-17 19:12:55 +05:30
Deepesh Garg
3c6795a52d
Merge pull request #21305 from deepeshgarg007/partial_loan_repayment_fixes
fix: Loan Repayment code clean up and other fixes
2020-04-17 11:16:38 +05:30
Nabin Hait
7eaa7f2e41
fix: requested qty for customer provided item and rate for sales (#21299)
* fix: requested qty for customer provided item and rate for sales

* fix: requested qty for material transfer

* fix: customer provided item can be sales item

* fix: requested qty test cases
2020-04-17 10:52:28 +05:30
rohitwaghchaure
e894c35b9a
Merge pull request #21309 from rohitwaghchaure/fixed_job_card_time_issue_develop
fix: job card timer issue
2020-04-17 00:56:28 +05:30
Rohit Waghchaure
250daa3f94 fix: job card time issue 2020-04-17 00:50:00 +05:30
anoop
fdc075220d fix: minor, codacy suggestions 2020-04-16 23:05:38 +05:30
Deepesh Garg
bf78ed6947 fix: Loan Repayment code clean up and other fixes 2020-04-16 22:53:47 +05:30
Nabin Hait
03af0299a6
fix: requested qty calculation and some other small fixes (#21296)
* fix: Made received qty readonly and no-copy

* fix: Made release date mandatory

* fix: requested qty calculation fix for UOM
2020-04-16 20:11:32 +05:30
Shivam Mishra
3e4ab760db
Merge branch 'develop' into razorpay-subscription 2020-04-16 18:17:42 +05:30
anoop
1c49a12ac2 fix: patient appointment
auto invoicing: record payment if payment mode and amount available
test: fixes
2020-04-16 17:00:47 +05:30
Gavin D'souza
496c6a3baa style: removed unused imports and updated formatting 2020-04-16 16:51:59 +05:30
Deepesh Garg
d521ba2c00
Merge pull request #21102 from nextchamp-saqib/asset-cat-validation
fix: no server side validations for accounts in asset category
2020-04-16 16:25:08 +05:30
Saqib
14cdb24290
fix: serial and batch selection from delivery note bug fix (#21291) 2020-04-16 16:21:35 +05:30
Saqib Ansari
33eb35d8b1 fix: incorrect transalation 2020-04-16 16:16:09 +05:30
Gavin D'souza
6abdfc586b fix: strip data fields of whitespaces 2020-04-16 16:14:29 +05:30
Gavin D'souza
72a94941bf fix(tally-migration): DocType improvement 2020-04-16 16:12:40 +05:30
Gavin D'souza
2ad7e81560 fix: handle errors in enqueued methods and update status 2020-04-16 16:11:55 +05:30
anoop
b922b292eb fix: set patient while billing, tests fixed 2020-04-16 13:01:45 +05:30
anoop
93d0c78ca5 feat: multi-company billing
sales onvoice - filter get items based on company
utils - company filters in all get item helper methods
utils - refactor appointemnt items
2020-04-16 13:01:43 +05:30
anoop
7ad98c95b9 company field added 2020-04-16 13:01:43 +05:30
anoop
38f0258991 feat: multi company support 2020-04-16 13:01:43 +05:30
anoop
2d2db60035 feat: multi company support 2020-04-16 13:01:43 +05:30
anoop
80ab98bf36 fix: company when creatign procedure, practitioner name added 2020-04-16 13:01:43 +05:30