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

24830 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Ganga Manoj
2ffa4b9ce4 fix: Link timesheets with corresponding projects 2021-01-08 20:58:00 +05:30