Deepesh Garg
dd25ecb70d
fix: Add reports in Desk Page
2021-01-17 17:52:02 +05:30
Deepesh Garg
ec60063155
fix: Auto Loan Write Off
2021-01-17 17:39:51 +05:30
Deepesh Garg
914ab7e4b0
fix: Add filters and currency in reports
2021-01-17 14:40:32 +05:30
Deepesh Garg
addea9697d
feat: Loan Exposure report
2021-01-17 11:36:51 +05:30
Deepesh Garg
7976d12ed0
fix: Applicant-Wise Loan Security Exposure report
2021-01-16 18:10:01 +05:30
Deepesh Garg
1564d6ee1f
fix: Test Case
2021-01-15 19:51:15 +05:30
Deepesh Garg
0c4d61269a
fix: test case
2021-01-15 15:57:18 +05:30
Deepesh Garg
e30b33a3b8
fix: Linting issues
2021-01-15 15:47:15 +05:30
Deepesh Garg
cbed6f970a
Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters
2021-01-15 15:43:59 +05:30
Kanchan Chauhan
d2c71350cd
refactor(Job Application): New fields in Job Applicant and webform ( #23326 )
...
* refactor(Job Application): New fields in Job Applicant and webform
* fix: translation syntax
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-01-15 13:56:03 +05:30
Rohan
b1d08126b0
feat: add "Sync Now" to Plaid Settings ( #23602 )
2021-01-15 12:56:30 +05:30
Rucha Mahabal
004e51ed9f
Merge branch 'develop' into patient-history-enhancements
2021-01-15 12:09:53 +05:30
Rucha Mahabal
1873c389e5
feat: Only allow submittable doctypes for Patient Medical Record
2021-01-15 02:12:57 +05:30
Rucha Mahabal
b15a19c6e0
test: Medical Record creation for custom doctypes
2021-01-15 01:27:30 +05:30
Rucha Mahabal
060d647248
fix: travis
2021-01-15 00:19:14 +05:30
Anuja P
47b42e6441
fix: Translation fixes
2021-01-14 21:20:00 +05:30
Anuja P
5ead7ee6cf
fix:Payment Period based on invoice date report fix/refactor
2021-01-14 20:58:34 +05:30
Deepesh Garg
c96ea002a0
Merge pull request #24375 from deepeshgarg007/plv_cost_center_ignore_v13
...
fix: Ignore group cost center validation for period closing voucher
2021-01-14 19:47:56 +05:30
Deepesh Garg
847c706d2f
fix: Ignore group cost center validation for period closing voucher
2021-01-14 19:44:41 +05:30
Anuja Pawar
4569e52b45
fix: fix for not having fiscal year while creating new company ( #24130 )
...
* fix: Fiscal year fix while creating new company
* fix: for failing Travis
* fix: suggested changes
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
2021-01-14 19:24:30 +05:30
Mohammad Hasnain Mohsin Rajan
00981206ad
fix: last purchase rate not updating when voucher cancelled if only one voucher is present ( #24322 )
...
* fix: last purchase rate not updating
* chore: use orm for updating
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
2021-01-14 19:23:18 +05:30
Deepesh Garg
660d4a1097
Merge pull request #24346 from GangaManoj/timesheet-linking
...
fix: Link timesheets with corresponding projects
2021-01-14 18:49:40 +05:30
Deepesh Garg
3f015f7142
fix: Update fieldnames
2021-01-14 18:44:14 +05:30
Marica
3c878505cb
Merge branch 'develop' into naming-series-proj
2021-01-14 16:34:51 +05:30
Marica
2b75342811
Merge pull request #24294 from marination/mr-se-warehouse-validation
...
fix: Don't validate warehouse values between Material Request and Stock Entry
2021-01-14 15:09:00 +05:30
Rucha Mahabal
751719ea0d
Merge branch 'develop' into patient-history-enhancements
2021-01-14 14:08:50 +05:30
marination
bc9eaac342
fix: Clear merge conflicts
...
- 'get_project_template' was removed a month back
- in 'make_project' insert the project directly as a check for it is there in the beginning.
2021-01-14 13:47:40 +05:30
Rucha Mahabal
6c90e26982
feat: add descriptions for YTD and MTD fields
2021-01-14 13:42:40 +05:30
Marica
17614c9860
Merge branch 'develop' into mr-se-warehouse-validation
2021-01-14 13:02:45 +05:30
Rucha Mahabal
6b9efa894f
Merge branch 'develop' into inpatient-visits-billing
2021-01-14 12:31:43 +05:30
marination
814858061f
fix: test for raising MR-SE mismatch error
...
- Make test add mismatched item code instead of warehouse, since warehouse can be different.
2021-01-14 12:13:08 +05:30
Rucha Mahabal
49702c1487
test: year to date computation for salary slip components
2021-01-14 11:57:24 +05:30
Rucha Mahabal
2c315a738e
feat: Salary Slip with Year to Date Print Format
2021-01-14 10:06:24 +05:30
Rucha Mahabal
fdad94f983
feat(Payroll): compute Year to Date for Salary Slip components
2021-01-14 00:40:58 +05:30
Anuja Pawar
e62ce4b172
fix: Add button PO, PI, SI, DN and, Quotation Dashboard ( #24187 )
2021-01-13 21:13:12 +05:30
Anupam Kumar
4a649a4fce
fix: removing payment_field from loan repayment closuer ( #24291 )
2021-01-13 21:10:49 +05:30
Afshan
33fac19bce
fix: calculation of remaining_sub_periods if relieving date before month start date ( #24319 )
2021-01-13 21:06:04 +05:30
Anuja Pawar
0b04e23f6d
fix: BOM Stock Report UoM correction ( #24339 )
2021-01-13 21:04:03 +05:30
Jannat Patel
00ccec7314
fix: subscription prepaid date validation ( #24356 )
2021-01-13 21:02:15 +05:30
Saqib
53cb9f9f47
fix(e-invoicing): ux issues ( #24358 )
...
* fix: overseas invoice rounding adjustment
* fix: overseas shipping address
* fix: qrcode for document name having forward slash
* feat: sandbox mode toggle
* fix: cannot delete sales invoice if linked to e invoice req log
2021-01-13 21:00:44 +05:30
Kanchan Chauhan
511434190d
fix(work order): Actual start and end dates update ( #24360 )
...
Currently, even when the Work Order (without Operations) is completed and Stock Entries are there, the Actual Start Date and Actual End Date is not updated.
For some reason need to db_set, then it updates the Actual Start Date and Actual End Date
2021-01-13 20:59:43 +05:30
Rucha Mahabal
ef5f0c0461
feat: Issue Summary Script Report ( #23603 )
...
* feat: Issue Summary Report
* feat: Add Issue Metrics to Issue Summary Report
* fix: code clean-up
* feat: Added Report Summary
* feat: Add SLA status fields
* fix: add report link to desk page
* fix: sider issues
Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-01-13 19:59:16 +05:30
Anurag Mishra
1e396dcb2a
fix: validated GST state
2021-01-13 14:01:57 +05:30
Jannat Patel
8aeadc743e
fix: assessment plan error handling for course field ( #23961 )
...
* fix: assessment plan error handling for course field
* fix: message rectification
* fix(travis): clean-up tests
* fix: travis
* fix: tests
Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-01-13 12:56:04 +05:30
Marica
1ff7743d81
Merge branch 'develop' into naming-series-proj
2021-01-13 10:40:24 +05:30
rohitwaghchaure
1c362c81f2
Merge pull request #24324 from marination/bom-rm-rate-company-based
...
fix: Company Wise Valuation Rate for RM in BOM
2021-01-13 10:39:39 +05:30
Rucha Mahabal
0f05925ff4
test: Do Not Bill Patient Encounters for Inpatients
2021-01-13 09:46:33 +05:30
Rucha Mahabal
1354197c72
feat(Healthcare Settings): Do Not Bill Patient Encounters for Inpatients
2021-01-13 09:12:50 +05:30
Rohit Waghchaure
7cd7bf7f96
fix: incorrect key
2021-01-13 00:13:57 +05:30
rohitwaghchaure
bc465a3045
Merge pull request #24332 from rohitwaghchaure/fixed-payment-entry-multi-currency-issue-develop
...
fix: payment entry multi-currency issue
2021-01-13 00:13:14 +05:30
Marica
b8c5cd7331
Merge branch 'develop' into mr-se-warehouse-validation
2021-01-12 20:16:58 +05:30
Marica
30cc040d50
Merge branch 'develop' into batch-selector
2021-01-12 20:14:35 +05:30
Marica
cb079cd8c4
Merge branch 'develop' into naming-series-proj
2021-01-12 19:57:55 +05:30
Marica
69f66664ce
Merge branch 'develop' into qi-reading-status
2021-01-12 19:32:47 +05:30
Anurag Mishra
36fa0512d2
fix: not able to create dunning from sales invoice
2021-01-12 17:02:19 +05:30
Deepesh Garg
59e2114419
Merge pull request #24311 from wojosc/patch-14
...
fix: Update item_tax_template_dashboard.py
2021-01-12 13:09:35 +05:30
Deepesh Garg
7fd2b35a7d
Merge pull request #24092 from pateljannat/project-template-and-tasks
...
feat: Project template with dependent tasks
2021-01-12 11:28:35 +05:30
Marica
69abc27316
Merge branch 'develop' into qi-reading-status
2021-01-12 11:15:36 +05:30
Anupam
c53ad88503
fix: resolved commit
2021-01-12 10:51:29 +05:30
Marica
0600d572ba
Merge branch 'develop' into batch-selector
2021-01-12 10:28:47 +05:30
Rucha Mahabal
80911577f5
Merge pull request #24340 from ruchamahabal/make-ipme-entries-editable
...
fix: allow medication entries to be deleted from the table
2021-01-11 17:59:02 +05:30
rohitwaghchaure
c92da35997
Merge pull request #22944 from anupamvs/opportunity-status
...
fix: Opportunity Status fix
2021-01-11 17:34:06 +05:30
Rucha Mahabal
8549358708
Merge branch 'develop' into make-ipme-entries-editable
2021-01-11 15:31:08 +05:30
Marica
aef71a8abe
Merge branch 'develop' into batch-selector
2021-01-11 14:22:11 +05:30
Marica
cffc489d57
Merge branch 'develop' into partially-submit-drop-ship-items-issue
2021-01-11 13:39:49 +05:30
Saqib
d43bb4db41
fix(pos): error while merging pos invoices into sales invoice ( #24337 )
2021-01-11 12:59:35 +05:30
marination
7646d7b741
fix: Batch/Serial Selector for Batched Item
2021-01-11 12:51:15 +05:30
Jannat Patel
dcda8b9e8c
feat: Patient appointment status changes ( #24201 )
...
* feat: patient appointment status changes
* fix: sider
* fix: sider
* fix: test status on cancel of docs and test refactor
Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-01-11 12:50:39 +05:30
Rucha Mahabal
aff3f611d3
fix: allow medication entries to be deleted from the table
2021-01-11 12:48:11 +05:30
Jannat Patel
8a07de9ee0
Merge branch 'develop' into project-template-and-tasks
2021-01-11 10:57:09 +05:30
pateljannat
2460e101a7
fix: indicator ofor template task
2021-01-11 10:05:54 +05:30
Deepesh Garg
d3634f6dac
feat: Loan Interest Report
2021-01-10 19:26:45 +05:30
Deepesh Garg
1b208e0695
fix: Add total loan interest amount field in loans
2021-01-10 12:29:55 +05:30
Ganga Manoj
2ffa4b9ce4
fix: Link timesheets with corresponding projects
2021-01-08 20:58:00 +05:30
Marica
b9d5ae9285
Merge branch 'develop' into qi-ux
2021-01-08 20:28:28 +05:30
Marica
63a91fc742
Merge branch 'develop' into qi-ux
2021-01-08 18:42:54 +05:30
Marica
ace08b1e48
Merge branch 'develop' into qc-back-update-se
2021-01-08 18:42:19 +05:30
marination
b7637f49cd
fix: Remove QI link on cancel wherever same QI name exists
2021-01-08 18:35:49 +05:30
Anurag Mishra
05f6edfe0a
Merge branch 'develop' into fixed-payment-entry-multi-currency-issue-develop
2021-01-08 17:27:22 +05:30
Rohit Waghchaure
3777c6aa38
fix: payment entry multi-currency issue
2021-01-08 12:59:15 +05:30
Rucha Mahabal
a93151502c
fix: Components formulated from additional salary not being fetched in Payroll Entry
2021-01-08 12:10:26 +05:30
marination
c4963bfdb2
fix: Back Update from QC based on Batch No
2021-01-08 09:56:04 +05:30
marination
ff6ee9d4e7
fix: Formula field description and Rearrange grid view
...
- Missing closing quote in Formula field description
- In grid view of child table in QI, show only input fields
2021-01-08 09:14:43 +05:30
Leela vadlamudi
df9144c198
feat: Voice Call Settings doctype added ( #24126 )
...
(cherry picked from commit 29778e2fba
2021-01-07 17:20:40 +05:30
Marica
5cfdd0f503
Merge branch 'develop' into qi-ux
2021-01-07 15:47:55 +05:30
Marica
d91c7e2b38
Merge branch 'develop' into mr-se-warehouse-validation
2021-01-07 15:41:21 +05:30
marination
fab080c875
fix: Company Wise Valuation Rate for RM in BOM
2021-01-07 15:25:39 +05:30
pateljannat
fd5ebe9d4a
fix: patch and columns
2021-01-07 15:16:15 +05:30
Jannat Patel
a586b0ba17
Merge branch 'develop' into project-template-and-tasks
2021-01-07 13:01:02 +05:30
Anurag Mishra
77ba72c4ff
Merge branch 'develop' into payroll_fixes2.0
2021-01-06 14:23:53 +05:30
Anurag Mishra
e7fa6f6a1c
fix: edditable employee grid
2021-01-06 13:25:09 +05:30
Shivam Mishra
9fc44f1606
Merge pull request #24182 from scmmishra/fix-dont-set-primary
2021-01-06 12:52:44 +05:30
Jannat Patel
5a579089c2
fix: indentation
2021-01-06 11:21:13 +05:30
Deepesh Garg
5e15a5d230
Merge pull request #24186 from frappe/validate_regional_germany
...
fix: regional validation of sales invoice (germany)
2021-01-06 09:35:05 +05:30
Deepesh Garg
e72c51204b
Merge pull request #24189 from timgates42/bugfix_typo_update
...
docs: fix simple typo, udpate -> update
2021-01-06 09:34:11 +05:30
Deepesh Garg
f2863f9d16
Merge pull request #24313 from deepeshgarg007/ytd_error_fix_v13
...
fix: Consider only submitted salary slips
2021-01-06 09:30:00 +05:30
Deepesh Garg
ad8be7c1fe
fix: Consider only submitted salary slips
2021-01-06 09:29:03 +05:30
Rucha Mahabal
a7a609d4ff
Merge pull request #24281 from ruchamahabal/allow-discharge
...
feat: Allow Discharge despite Unbilled Healthcare Services
2021-01-06 09:27:26 +05:30
Deepesh Garg
6f18d4c0f6
Merge pull request #24312 from deepeshgarg007/sanctioned_loan_unpledge
...
fix: Sanctioned loan security unpledge
2021-01-06 09:13:19 +05:30
Deepesh Garg
05fe7ac29c
fix: fieldname
2021-01-06 09:10:28 +05:30
Deepesh Garg
dd768a07c5
fix: Sanctioned loan security unpledge
2021-01-05 23:55:00 +05:30
Wolfram Schmidt
5eef19723d
Update item_tax_template_dashboard.py
...
added missing backlink. In Item Groups I can set Item Tax Temple in Table taxes.
2021-01-05 18:47:11 +01:00
Nabin Hait
f7b9b0687e
fix: tax calculation on salary slip for the first month ( #24272 )
...
* fix: tax calculation on salary slip for the first month
* fix: net pay precision issue
* fix: net pay precision issue
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
2021-01-05 20:43:11 +05:30
Deepesh Garg
b01b108dfa
fix: do not consider current salary slip in sum
2021-01-05 17:34:16 +05:30
Saurabh
994fa48cd4
Merge branch 'develop' into fix-dont-set-primary
2021-01-05 16:32:56 +05:30
Saqib
80e0952ba7
refactor: fetch & validate address from erpnext rather than gst portal
2021-01-05 16:04:25 +05:30
Saqib
a56a5ccefa
refactor: fetch & validate address from erpnext rather than gst portal ( #24297 )
2021-01-05 15:59:17 +05:30
Marica
ba6e50b15e
Merge branch 'develop' into qi-ux
2021-01-05 15:15:10 +05:30
Anurag Mishra
112b3894cc
Merge pull request #24296 from AfshanKhan/fix-add-comp-in-leave-ledger
...
fix: set company in leave allocation and leave ledger entry
2021-01-05 14:45:16 +05:30
Marica
eab1867235
Merge branch 'develop' into qi-ux
2021-01-05 14:23:05 +05:30
Anurag Mishra
239fe7336e
fix: charts not displaying when tree_type changed
...
fix: charts not displaying when tree_type changed
2021-01-05 14:03:03 +05:30
Saqib
60460a6d23
fix(e-invoicing): minor calculation fixes ( #24282 )
2021-01-05 13:54:04 +05:30
Saqib
1f591ab02e
fix(e-invoicing): minor calculation fixes ( #24285 )
2021-01-05 13:53:51 +05:30
Afshan
f79c4d3560
Merge branch 'develop' into fix-add-comp-in-leave-ledger
2021-01-05 13:27:15 +05:30
Jannat Patel
16a809483b
fix: indentation
2021-01-05 12:28:45 +05:30
marination
b8aeb9ea88
fix: Indentation and missing semi-colon
...
- Fix incorrect indentation after merge conflict
- Sider
2021-01-05 12:16:25 +05:30
Rucha Mahabal
d643bb7c4b
Merge branch 'develop' into allow-discharge
2021-01-05 12:07:26 +05:30
Jannat Patel
06a401ffbf
fix: incoming rate attribute error ( #24287 )
...
Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>
2021-01-05 11:54:34 +05:30
Marica
41ea77ce31
Merge branch 'develop' into putaway
2021-01-05 11:24:05 +05:30
Marica
95344f01e6
Merge branch 'develop' into qi-ux
2021-01-05 10:44:52 +05:30
Jannat Patel
7d0f35c4ab
Merge branch 'develop' into partially-submit-drop-ship-items-issue
2021-01-05 10:42:30 +05:30
Rucha Mahabal
f97e668130
Merge branch 'develop' into allow-discharge
2021-01-05 10:38:16 +05:30
Deepesh Garg
bfa71c23ae
Merge pull request #23965 from vorasmit/remarks-fix-develop
...
fix: add remarks to sales invoice
2021-01-05 09:54:53 +05:30
Nabin Hait
72fa368e8f
Merge branch 'develop' into mr-se-warehouse-validation
2021-01-05 09:30:16 +05:30
Nabin Hait
5a8f141eda
Merge branch 'develop' into fix-add-comp-in-leave-ledger
2021-01-05 09:29:44 +05:30
Marica
099162814c
Merge branch 'develop' into qi-ux
2021-01-05 09:27:40 +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
Afshan
0da201c6a5
fix: set company in leave allocation and leave ledger entry
2021-01-04 19:04:05 +05:30
marination
0c883853b3
fix: Dont validate warehouse values between MR to Stock Entry
...
- Remove validation thta checks if warehouse in Stock Entry is the same as MR that it was pulled from
2021-01-04 18:48:50 +05:30
Anupam
27fd9e4d7d
fix: added empty value in Quality Inspection Reading status
2021-01-04 18:18:00 +05:30
Deepesh Garg
797a742cb2
Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters
2021-01-04 14:24:00 +05:30
Deepesh Garg
a873ae0d9f
fix: Check for custom dimensions
2021-01-04 14:23:31 +05:30
Rucha Mahabal
7206e12c2f
test: Allow Discharge despite Unbilled Services
2021-01-04 12:11:00 +05:30
Rucha Mahabal
03b25be9e9
feat: Allow Discharge despite Unbilled Healthcare Services
2021-01-04 11:16:59 +05:30
marination
7877d5a7c2
fix: Create QI Parameters (links) in test cases
2021-01-04 11:10:04 +05:30
Saurabh
0feaab5261
bumped to version 13.0.0-beta.9
2021-01-02 20:19:56 +05:50
Afshan
a245f667d0
fix: pos error pop up ( #24237 )
2021-01-02 10:30:22 +05:30
Deepesh Garg
ffca52a348
Merge pull request #24254 from nextchamp-saqib/loan-patch-fix
...
fix: update old loan patch
2021-01-01 13:50:52 +05:30
vorasmit
3ef965f253
Update patches.txt
2021-01-01 10:55:20 +05:30
vorasmit
8c39ab68df
Delete update_sales_invoice_remarks.py
2021-01-01 10:54:57 +05:30
Anurag Mishra
b901d4002a
Merge pull request #24264 from AfshanKhan/fix-sal-struc-assign-payroll-acc
...
fix: setting correct account for sal struct assignment if not specified.
2020-12-31 18:26:46 +05:30
Afshan
47bc42740b
Merge branch 'develop' into fix-sal-struc-assign-payroll-acc
2020-12-31 17:41:44 +05:30
Afshan
4edcf813e7
Merge branch 'develop' into allow-cancel-leave-policy
2020-12-31 17:41:34 +05:30
Rohit Waghchaure
16bce49f18
fix: incorrect valuation rate for finished good
2020-12-31 17:39:52 +05:30
Anurag Mishra
d7ea2bd705
Merge pull request #24177 from AfshanKhan/fix-perm-empl-sal-slip
...
fix: error popup for submitted doc
2020-12-31 17:07:30 +05:30
Afshan
e69148c266
fix: allow leave policy assignment to be cancelled.
2020-12-31 16:45:00 +05:30
Afshan
8b60fe6125
fix: setting correct account for sal struct assignment if not specified.
2020-12-31 16:10:39 +05:30
Saqib
f8f015c961
fix: cannot submit e-invoice if legal name not found
2020-12-31 13:28:08 +05:30
Saqib
2b67d57480
fix: cannot submit e-invoice if legal name not found
2020-12-31 13:26:05 +05:30
Saqib Ansari
d5d571ab9d
fix: update old loan patch
2020-12-31 12:55:35 +05:30
Saurabh
08b89d1ce0
bumped to version 13.0.0-beta.8
2020-12-31 12:12:58 +05:50
Saqib
fc7a11e2aa
fix (e-invoicing): item & invoice value calculation ( #24253 )
2020-12-31 11:35:46 +05:30
Deepesh Garg
23ab5c5cc0
fix: Multiplle sider issues
2020-12-31 11:29:06 +05:30
Deepesh Garg
133ce286f9
Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters
2020-12-31 11:24:14 +05:30
Deepesh Garg
f57089532a
Merge pull request #24252 from deepeshgarg007/partial_security_unpledge
...
fix: Partial loan security unpledging
2020-12-30 21:37:52 +05:30
Mohammad Hasnain Mohsin Rajan
11176852eb
Merge branch 'develop' into bugfix_typo_update
2020-12-30 20:59:38 +05:30
Deepesh Garg
9716216632
fix: check for string types
2020-12-30 20:33:35 +05:30
Deepesh Garg
a60707873c
fix: Partial loan security unpledging
2020-12-30 20:24:15 +05:30
Karthikeyan S
a25cb9a563
fix(GST E Invoice): update live URLs for adaequare GSP ( #24251 )
2020-12-30 19:41:00 +05:30
Karthikeyan S
aa44c754de
fix(GST E Invoice): update live URLs for adaequare GSP ( #24248 )
2020-12-30 19:22:37 +05:30
Deepesh Garg
5891b48cf6
Merge pull request #24176 from GangaManoj/Year-to-Date
...
feat: Add year_to_date field (cumulative salary for a fiscal year)
2020-12-30 16:53:47 +05:30
rohitwaghchaure
bb0fd33ac5
Merge pull request #24169 from Anurag810/payroll-entry-fixes
...
fix: allow addition and removal of employee in payroll Entry
2020-12-30 16:50:02 +05:30
Deepesh Garg
66dcaf3ab2
fix: Salary structure assignment in tests
2020-12-30 15:47:22 +05:30
Saqib
f946bbd032
fix: minor e-invoicing issues ( #24239 )
...
* fix: invoice value set to zero if rounded total disabled
* fix: unit rate & gross amount calculation
* fix: e-invoice-setup patch
* chore: no need to re-run the patch
* fix: item value & invoice value calculations
2020-12-30 14:43:42 +05:30
Deepesh Garg
97d055dfc3
fix: Test Case
2020-12-30 14:06:13 +05:30
Anurag Mishra
b7631af741
Merge branch 'develop' into payroll-entry-fixes
2020-12-30 13:22:13 +05:30
Deepesh Garg
8b7ebe5044
fix: Test Case cleanup and fixes
2020-12-30 12:45:46 +05:30
Deepesh Garg
20133bd1df
fix: Remove comments
2020-12-29 22:19:12 +05:30
Deepesh Garg
7e4eacba8d
Merge branch 'develop' of https://github.com/frappe/erpnext into Year-to-Date
2020-12-29 22:13:55 +05:30
Deepesh Garg
353f8f4d85
fix: Add test case for YTD
2020-12-29 22:13:40 +05:30
Anurag Mishra
15af7a4afc
Merge pull request #24226 from AfshanKhan/asset-report
...
fix: asset depreciation ledger
2020-12-29 18:58:56 +05:30
Deepesh Garg
60b77f9865
Merge branch 'develop' of https://github.com/frappe/erpnext into Year-to-Date
2020-12-29 18:26:32 +05:30
rohitwaghchaure
b09ddc4672
Merge pull request #24233 from rohitwaghchaure/back-dates-allow-field-issue
...
fix: option name for the field 'Role Allowed to Create/Edit Back-dated Transactions'
2020-12-29 17:52:43 +05:30
Deepesh Garg
ff51540eed
Merge branch 'accounting_dimension_filters' of github.com:deepeshgarg007/erpnext into accounting_dimension_filters
2020-12-29 17:02:07 +05:30
Deepesh Garg
e061004956
fix: Improve validation message
2020-12-29 17:00:39 +05:30
Raffael Meyer
a3462f6b0c
Merge branch 'develop' into validate_regional_germany
2020-12-29 11:58:57 +01:00
Rohit Waghchaure
81285204dc
fix: option name for the field 'Role Allowed to Create/Edit Back-dated Transactions'
2020-12-29 16:25:45 +05:30
Deepesh Garg
4a8c2c4cb5
Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters
2020-12-29 15:10:36 +05:30
Anurag Mishra
5af8d2b883
Merge branch 'develop' into payroll-entry-fixes
2020-12-29 13:09:42 +05:30
Afshan
91e3c07d77
fix: assest depreciation ledger
2020-12-28 19:42:46 +05:30
marination
a69e81a151
chore: Made 'Parameter' a link field in QI and QI Template
...
- Added doctype Quality Inspection Parameter
- Made 'Parameter' a link field in QI and QI Template
- Added patch to create Quality Inspection Parameter records for every parameter in the system
2020-12-28 18:07:22 +05:30
marination
29a03bd5a1
feat: Add 'Manual Inspection' checkbox
...
- fix merge conflict in js file
- Dont auto set status if manual inspection is checked
- Added 'Manual Inspection' checkbox in QI readings table
2020-12-28 16:59:13 +05:30
pateljannat
88471854d5
fix: sider
2020-12-28 15:40:23 +05:30
rohitwaghchaure
527b7e16e5
Revert "feat: Batch wise item selling pricing"
2020-12-28 15:29:30 +05:30
Marica
62f9cc6c5a
Merge branch 'develop' into qi-ux
2020-12-28 15:09:15 +05:30
rohitwaghchaure
72e8ec5eee
Merge pull request #24087 from deepeshgarg007/batch-wise-pricing
...
feat: Batch wise item selling pricing
2020-12-28 14:37:33 +05:30
Rohit Waghchaure
40d2c6a0cc
fix: finished good produced qty validation
2020-12-28 14:08:45 +05:30
pateljannat
aa8ff81061
Merge branch 'project-template-and-tasks' of https://github.com/pateljannat/erpnext into project-template-and-tasks
2020-12-28 12:35:27 +05:30
pateljannat
71f203dbc5
fix: template task status, subject in project template task
2020-12-28 12:35:19 +05:30
Rucha Mahabal
e1b9707ec1
Merge pull request #24152 from ruchamahabal/fix-therapy-type-filter
...
fix: filter Therapy Types and Therapy Plan in Patient Appointment
2020-12-28 11:36:34 +05:30
Deepesh Garg
d3814b2676
Merge branch develop into batch-wise-pricing
2020-12-28 10:48:29 +05:30
Jannat Patel
c09100d738
Merge branch 'develop' into partially-submit-drop-ship-items-issue
2020-12-28 10:20:27 +05:30
Deepesh Garg
7c300859ed
fix: Test Cases
2020-12-26 20:14:51 +05:30
Deepesh Garg
d4fc451c2a
Merge pull request #24191 from nextchamp-saqib/accounting-entries-for-asset
...
fix: accounting entries of asset when submitting purchase receipt
2020-12-26 19:14:32 +05:30
Saurabh
d1d030b54a
bumped to version 13.0.0-beta.7
2020-12-26 15:15:51 +05:50
Saqib
60a1d25196
fix: cancelling of asset value adjustement ( #24193 )
2020-12-26 13:01:49 +05:30
rohitwaghchaure
9f1e1f6c23
Merge pull request #24207 from rohitwaghchaure/fixed-serial-no-return-issue
...
fix: partial serial no return issue
2020-12-26 12:12:04 +05:30
Deepesh Garg
4f8da4c313
fix: Test Cases
2020-12-26 11:37:51 +05:30
Nabin Hait
af1af925ac
chore: Added change log ( #24213 )
2020-12-26 11:09:46 +05:30
Saqib
17e96901db
feat: GST E Invoicing ( #23455 )
...
* feat: init e-invoice settings
* feat: read public key file
* feat: rsa encryption with public key
* feat: save token and sek from auth request
* chore: handle error response
* feat: AES decryption of SEK with appkey
* feat: decrypt json data with SEK
* feat: make e invoice from erpnext sales invoice
* feat: generate IRN
* feat: decode signed json and QR code
* chore: validations
* feat: cancel IRN
* feat: complete e-invoice schema
* chore: move e-invoice settings to regional
* chore: split einvoice settings and operations
* chore: rename schema to template & js cleanup
* feat: make IRN field on regional setup
* feat: Generate & Cancel IRN from Sales Invoice
* chore: minor fixes
* fix: item discount
* chore: show irn cancelled check after cancellation
* fix: hide cancel irn dialog on error
* fix: public key is required on validate
* fix: cannot find attached key file
* fix: validation if e invoicing is disabled
* fix: do not show generate irn for invalid supply type
* fix: update irn_cancelled after cancelling irn
* chore: show irn field for proper gst_category
* feat: e-way bill details in e-invoice
* fix: save e-way bill no on irn generation
* chore: no copy on e invoice custom fields
* feat: cancel e-way bill before cancelling IRN
* feat: manual download / upload json
* chore: group e-invoicing actions
* fix: fn name
* chore: save signed invoice and qrcode after uplaoding irn
* fix: fetch token if not valid
* chore: move einvoicing stuff to seperate folder
* feat: QRCode Image and E-Invoice Print Format
* fix: bug
* fix: invalid syntax
* chore: code cleanup
* chore: clean up e invoice actions
* fix: download & upload e-invoice
* fix: print format
* fix: validations
* fix: add permissions on regional setup
* feat: add patch
* fix: validate document name
* fix: return date
* fix: credit note einvoice
* fix: validations
* fix: error logging
* fix: e_invoice module not found
* fix: add missing package
* fix: rename e_invoice_utils.py
* fix: einvoice field validation
* fix: patch
* fix: invoice totals calculation
* fix: other charges calculation
* chore: improve document name validation message
* fix: qr code image string
* feat: initialize GSP connector
* chore: remove unwanted fields
* fix: qr code generation
* feat: fetch and cache GSTIN details
* feat: generate & cancel IRN
* feat: cancel eway bill
* chore: remove unwanted fuctions
* chore: clean up einvoice actions
* fix: attach qrcode on irn generation
* fix: generate & cancel IRN
* fix: show/hide eway bill fields
* fix: valiations
* feat: generate eway bill from IRN
* chore: remove unwanted imports
* chore: error logging
* feat: header & footer in GST E Invoice
* chore: remove test pincode
* fix: invalid syntax
* feat: cess non advolem on einvoice item
* chore: remove fetch token from e invocie settings
* fix: imports
* fix: error handling
* feat: update timeline on einvoice actions
* fix: qrcode image size
* fix: exclude intra company transactions
* fix: eway bill test
* fix: ewaybill mandatory conditions
* chore: add tests
* fix: returning condition
* feat: log e-invocing requests
* chore: add ack date and ack no field for print formats
* fix: sider issues
* feat: show e-invoice preview before IRN generation
* fix: use as_list for error message
* fix: minor ux issues
* fix: dialog is undefined
* fix: error handling
* feat: add docs link to e invoice settings
* feat: multiple gstins for e invoicing
* fix: uncomment test condition
* fix: remove test pincode
* fix: cannot cancel irn without submitting sales invoice
* chore: code cleanup
* fix: sider issues
* fix: e invoice request log permissions
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-12-25 20:55:21 +05:30
Nabin Hait
0788df412c
fix: Removed permissions from UAE VAT Settings
2020-12-25 20:54:01 +05:30
Nabin Hait
f8c1cb5dc3
fix: Removed permissions from UAE VAT Settings
2020-12-25 20:53:18 +05:30
Deepesh Garg
5269f02919
Merge branch 'develop' of https://github.com/frappe/erpnext into lcv_multicurrency
2020-12-25 18:35:26 +05:30
Deepesh Garg
bfc17e487c
fix: Commonify code for Stock Entry
2020-12-25 18:34:39 +05:30
rohitwaghchaure
49d7499990
fix: added shipment link in delivery note dashboard ( #24210 )
...
* fix: added shipment link in delivery note dashboard
* Update shipment.py
2020-12-25 18:15:35 +05:30
rohitwaghchaure
0917c1ec7c
fix: travis failing ( #24211 )
2020-12-25 18:13:12 +05:30
Nabin Hait
b99c77b753
Reposting fixes ( #24202 )
...
* fix: finished item validation and rate
* fix: Check if stock and account balance in sync after reposting
* fix: validate stock accounts in journal entry
* fix: validate expense against budget
2020-12-25 18:12:35 +05:30
Nabin Hait
327f03566a
Reposting fixes pre release ( #24203 )
...
* fix: finished item validation and rate
* fix: Check if stock and account balance in sync after reposting
* fix: validate stock accounts in journal entry
* fix: validate expense against budget
2020-12-25 18:11:54 +05:30
hasnain2808@gmail.com
46d5f4c7f1
refactor(analytics report): linting
2020-12-25 16:34:43 +05:30
rohitwaghchaure
fa0a075e95
Merge pull request #24196 from scmmishra/fix-file-url-employee
...
fix: use file_url to save file and not file name
2020-12-25 16:22:15 +05:30
rohitwaghchaure
ebcd4c454e
Merge pull request #24209 from rohitwaghchaure/added-shipment-link-in-delivery-note
...
fix: added shipment link in delivery note dashboard
2020-12-25 16:07:35 +05:30
Rohit Waghchaure
dab1ab990d
fix: partial serial no return issue
2020-12-25 15:25:16 +05:30
rohitwaghchaure
de10d7dcf2
Update shipment.py
2020-12-25 15:15:55 +05:30
Rohit Waghchaure
5bcc6c6b15
fix: added shipment link in delivery note dashboard
2020-12-25 15:02:53 +05:30
rohitwaghchaure
fc01a838b5
Merge pull request #24208 from rohitwaghchaure/fixed-serial-no-return-issue-v13
...
fix: partial serial no return issue
2020-12-25 13:32:36 +05:30
Rohit Waghchaure
adc369f726
fix: partial serial no return issue
2020-12-25 13:28:47 +05:30
Saqib
6d74f5b59b
feat: GST E Invoicing ( #23455 )
...
* feat: init e-invoice settings
* feat: read public key file
* feat: rsa encryption with public key
* feat: save token and sek from auth request
* chore: handle error response
* feat: AES decryption of SEK with appkey
* feat: decrypt json data with SEK
* feat: make e invoice from erpnext sales invoice
* feat: generate IRN
* feat: decode signed json and QR code
* chore: validations
* feat: cancel IRN
* feat: complete e-invoice schema
* chore: move e-invoice settings to regional
* chore: split einvoice settings and operations
* chore: rename schema to template & js cleanup
* feat: make IRN field on regional setup
* feat: Generate & Cancel IRN from Sales Invoice
* chore: minor fixes
* fix: item discount
* chore: show irn cancelled check after cancellation
* fix: hide cancel irn dialog on error
* fix: public key is required on validate
* fix: cannot find attached key file
* fix: validation if e invoicing is disabled
* fix: do not show generate irn for invalid supply type
* fix: update irn_cancelled after cancelling irn
* chore: show irn field for proper gst_category
* feat: e-way bill details in e-invoice
* fix: save e-way bill no on irn generation
* chore: no copy on e invoice custom fields
* feat: cancel e-way bill before cancelling IRN
* feat: manual download / upload json
* chore: group e-invoicing actions
* fix: fn name
* chore: save signed invoice and qrcode after uplaoding irn
* fix: fetch token if not valid
* chore: move einvoicing stuff to seperate folder
* feat: QRCode Image and E-Invoice Print Format
* fix: bug
* fix: invalid syntax
* chore: code cleanup
* chore: clean up e invoice actions
* fix: download & upload e-invoice
* fix: print format
* fix: validations
* fix: add permissions on regional setup
* feat: add patch
* fix: validate document name
* fix: return date
* fix: credit note einvoice
* fix: validations
* fix: error logging
* fix: e_invoice module not found
* fix: add missing package
* fix: rename e_invoice_utils.py
* fix: einvoice field validation
* fix: patch
* fix: invoice totals calculation
* fix: other charges calculation
* chore: improve document name validation message
* fix: qr code image string
* feat: initialize GSP connector
* chore: remove unwanted fields
* fix: qr code generation
* feat: fetch and cache GSTIN details
* feat: generate & cancel IRN
* feat: cancel eway bill
* chore: remove unwanted fuctions
* chore: clean up einvoice actions
* fix: attach qrcode on irn generation
* fix: generate & cancel IRN
* fix: show/hide eway bill fields
* fix: valiations
* feat: generate eway bill from IRN
* chore: remove unwanted imports
* chore: error logging
* feat: header & footer in GST E Invoice
* chore: remove test pincode
* fix: invalid syntax
* feat: cess non advolem on einvoice item
* chore: remove fetch token from e invocie settings
* fix: imports
* fix: error handling
* feat: update timeline on einvoice actions
* fix: qrcode image size
* fix: exclude intra company transactions
* fix: eway bill test
* fix: ewaybill mandatory conditions
* chore: add tests
* fix: returning condition
* feat: log e-invocing requests
* chore: add ack date and ack no field for print formats
* fix: sider issues
* feat: show e-invoice preview before IRN generation
* fix: use as_list for error message
* fix: minor ux issues
* fix: dialog is undefined
* fix: error handling
* feat: add docs link to e invoice settings
* feat: multiple gstins for e invoicing
* fix: uncomment test condition
* fix: remove test pincode
* fix: cannot cancel irn without submitting sales invoice
* chore: code cleanup
* fix: sider issues
* fix: e invoice request log permissions
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-12-25 10:26:43 +05:30
rohitwaghchaure
4e9361f74b
Merge pull request #24204 from rohitwaghchaure/pricing-rule-not-working-margin
...
fix: multiple pricing rule with margin type as Percentage is not working
2020-12-25 09:33:39 +05:30
Rohit Waghchaure
ba5b603a0b
fix: multiple pricing rule with margin type not working
2020-12-24 22:49:38 +05:30
Rohit Waghchaure
aea62da544
fix: multiple pricing rule with margin type not working
2020-12-24 22:44:31 +05:30
rohitwaghchaure
b9352b729a
Merge pull request #24063 from rohitwaghchaure/fixed-job-card-cacncel-flow-develop
...
fix: don't cancel job card if manufacturing entry has made
2020-12-24 17:46:45 +05:30
rohitwaghchaure
630258f493
Merge pull request #24164 from rohitwaghchaure/do-not-manufacture-same-serial-no-two-develop
...
fix: do not manufacture same serial no multiple times
2020-12-24 17:46:26 +05:30
Rucha Mahabal
d013d94e8d
Merge branch 'develop' into fix-therapy-type-filter
2020-12-24 17:44:25 +05:30
Rohit Waghchaure
304100db3b
fix: don't cancel job card if manufacturing entry has made
2020-12-24 16:36:37 +05:30
Rohit Waghchaure
ed20819432
fix: travis
2020-12-24 16:24:10 +05:30
Anurag Mishra
527a156512
feat: validated employees whose salary has been already precessed
2020-12-24 13:59:12 +05:30
Jannat Patel
29dd7e5fc4
Merge branch 'develop' into partially-submit-drop-ship-items-issue
2020-12-24 13:44:42 +05:30
Rucha Mahabal
9fe7f235d0
fix: Do not cancel reference document on Quality Inspection cancellation ( #24198 )
2020-12-24 11:03:48 +05:30
Rucha Mahabal
d2f91e8c11
fix: Do not cancel reference document on Quality Inspection cancellation ( #24197 )
2020-12-24 11:03:36 +05:30
Deepesh Garg
aa7ab211be
Merge pull request #24171 from deepeshgarg007/breadcrum_schema
...
fix: Add breadcrumbs to item group page
2020-12-23 16:52:48 +05:30
Shivam Mishra
1ab4f09ee9
fix: use file_url to save file and not file name
2020-12-23 15:18:41 +05:30
Anurag Mishra
d884216c6f
fix: leave policy dashboard fix
...
fix: leave policy dashboard fix
2020-12-23 13:19:12 +05:30
Anurag Mishra
d556847fca
fix: allow addition and removal of employee in payroll Entry
2020-12-23 12:59:48 +05:30
Nabin Hait
0411a43c6e
fix: set finished good item rate based on qty
2020-12-23 12:14:41 +05:30
Afshan
adf9b49e14
fix: sal slip popup error
2020-12-23 11:39:38 +05:30
Saqib Ansari
09c6842199
fix: accounting entries of asset when submitting purchase receipt
2020-12-23 11:29:26 +05:30
Tim Gates
1fb412e3f6
docs: fix simple typo, udpate -> update
...
There is a small typo in erpnext/patches/v4_0/map_charge_to_taxes_and_charges.py.
Should read `update` rather than `udpate`.
2020-12-23 11:39:37 +11:00
barredterra
df8ea19406
fix: whitespace
2020-12-22 17:34:31 +01:00
barredterra
2acd8cbc02
fix: sider
2020-12-22 17:34:22 +01:00
Jannat Patel
b07914d185
Merge branch 'develop' into project-template-and-tasks
2020-12-22 20:47:30 +05:30
pateljannat
8dec1c142f
fix: removed unused imports
2020-12-22 19:55:31 +05:30
Deepesh Garg
e5e2ad646a
fix: Test Cases
2020-12-22 19:53:07 +05:30
pateljannat
6cf018c762
fix: holiday update in tests
2020-12-22 19:40:41 +05:30
pateljannat
4ebee5014e
feat: aholiday check before setting start and end date in task
2020-12-22 18:14:46 +05:30
barredterra
511be6466d
Revert "fix: fail silently"
...
This reverts commit 6900a79421
2020-12-22 11:43:33 +01:00
barredterra
a69021018a
test: add test for accounts controller
2020-12-22 11:38:09 +01:00
barredterra
5adbe49ca6
refactor: translation syntax
2020-12-22 11:37:43 +01:00
barredterra
6900a79421
fix: fail silently
2020-12-22 11:37:13 +01:00
Deepesh Garg
e1320c7e47
Merge branch 'develop' of https://github.com/frappe/erpnext into lcv_multicurrency
2020-12-22 13:32:59 +05:30
Deepesh Garg
468f67a4de
fix: Add parent for all-products page
2020-12-22 12:44:09 +05:30
