Nabin Hait
c63e233bc7
bumped to version 13.4.0
2021-05-31 11:34:33 +05:50
Nabin Hait
4c94ccc8d8
chore: Added change log
2021-05-31 10:51:57 +05:30
Saqib
89f621baa4
fix(pos): closing entry shows incorrect expected amount ( #25868 )
2021-05-31 09:56:49 +05:30
Rucha Mahabal
3be28054de
refactor: Vehicle Expenses Report ( #25727 )
...
* refactor: Vehicle Expense Report
* test: Vehicle Expenses Report
* feat: Added Employee filter to report
- fix Vehicle Log form view
* fix: set currency fieldtype for chart data
- added filters for employee and vehicle
* fix: service expenses not getting set
2021-05-31 09:11:42 +05:30
Marica
42b2ea556f
Merge pull request #25358 from noahjacob/maintenance_feat
...
refactor: maintenance schedule and visit enhancements.
2021-05-30 01:20:30 +05:30
Rucha Mahabal
05d5fb24f7
fix(test): tax detail report ( #25884 )
2021-05-29 23:18:36 +05:30
Deepesh Garg
ea4f8102e8
Merge pull request #25869 from nextchamp-saqib/plaid-link-reset
...
fix(plaid): cannot reset plaid link for a bank account
2021-05-29 20:05:25 +05:30
Deepesh Garg
d067e25dad
Merge pull request #25828 from Anuja-pawar/issue-summary-report-fix
...
fix: Add Hold status column in the Issue Summary Report
2021-05-29 19:24:15 +05:30
Deepesh Garg
c3d8115ca1
Merge pull request #25849 from nextchamp-saqib/pos-rate-as-identifier
...
fix(pos): cannot add same item with different rates
2021-05-29 17:33:11 +05:30
Deepesh Garg
5483f21fe7
Merge pull request #25872 from nextchamp-saqib/fix-pos-broken-img
...
fix(pos): rendering of broken image on pos
2021-05-29 17:28:03 +05:30
Gavin D'souza
62996ec980
Revert "ci(test): Temporary change to test PY2 compatability removal in Frappe"
...
This reverts commit f93a7a72c1
.
2021-05-28 23:06:15 +05:30
Gavin D'souza
d053081cb7
Merge branch 'develop' of github.com:frappe/erpnext into rm-py2
2021-05-28 21:48:05 +05:30
Ankush Menat
431d3295b4
fix: use dictionary filter instead of list ( #25874 )
...
Item query doesn't support list filter anymore.
2021-05-28 21:12:25 +05:30
Ankush Menat
2df7f474fa
fix: use dictionary filter instead of list ( #25875 )
...
Item query doesn't support list filter anymore.
2021-05-28 21:12:10 +05:30
Deepesh Garg
fb9cb0fd23
Merge pull request #25866 from deepeshgarg007/itc_reversa_address
...
fix(India): Show only company addresses for ITC reversal entry
2021-05-28 18:46:09 +05:30
Deepesh Garg
d4dc76c3ee
Merge pull request #25867 from deepeshgarg007/itc_reversal_address_pre
...
fix(India): Show only company addresses for ITC reversal entry
2021-05-28 18:45:59 +05:30
Saqib Ansari
b72b4c0bf9
fix(pos): rendering of broken image on pos
2021-05-28 17:38:01 +05:30
Raffael Meyer
6038663bf8
fix: add_deduct_tax in Purchase Taxes setup ( #25757 )
2021-05-28 16:29:28 +05:30
Noah Jacob
6fb218e033
refactor: suggested changes
2021-05-28 16:15:50 +05:30
Suraj Shetty
49c20f4f8d
chore: Update server-site test badge URL
2021-05-28 13:41:14 +05:30
Suraj Shetty
97687839b0
ci: Run mariadb tests after PR merge for coverage badge
2021-05-28 13:39:53 +05:30
Saqib Ansari
05386ff12f
chore: remove unwanted method
2021-05-28 12:58:18 +05:30
Deepesh Garg
b084f1d320
fix(India): Show only company addresses for ITC reversal entry
2021-05-28 12:14:56 +05:30
Deepesh Garg
20be7fb93d
fix(India): Show only company addresses for ITC reversal entry
2021-05-28 11:57:38 +05:30
Saqib Ansari
bbce2e91a3
fix: reset plaid link button
2021-05-28 11:56:47 +05:30
Gavin D'souza
f93a7a72c1
ci(test): Temporary change to test PY2 compatability removal in Frappe
2021-05-28 11:44:16 +05:30
Gavin D'souza
07ba05630e
fix: Add future in requirements.txt
...
Since future is removed from frappe, adding it as a dependency here
2021-05-28 11:44:16 +05:30
Saqib Ansari
d24eccd623
fix(plaid): cannot reset plaid link for a bank account
2021-05-28 11:36:24 +05:30
Suraj Shetty
faa25166a9
revert: "ci: Do not generate coverage report for hotfix branch"
...
Reverts: bcf116422a
2021-05-28 11:23:18 +05:30
noahjacob
0b02f1335f
refactor: removed redundant links in test case
2021-05-28 11:04:34 +05:30
noahjacob
d071586589
refactor: removed maintenance schedule detail link
2021-05-28 10:54:35 +05:30
noahjacob
7fa045c1c9
refactor: using parent form links of maintenance schedule
2021-05-28 10:54:35 +05:30
noahjacob
3bca90dbe6
refactor: updated mapping for maintenance schedule links in maintenance visit
2021-05-28 10:54:22 +05:30
Suraj Shetty
1a5c21c759
Merge pull request #25786 from prssanna/website-theme-fixes
2021-05-28 10:48:30 +05:30
Suraj Shetty
68b050de97
Merge pull request #25863 from surajshetty3416/website-theme-fixes-version-13-hotfix
2021-05-28 10:48:23 +05:30
Ganga Manoj
17736afab5
fix(POS): Fix stock availability calculation if negative_stock_allowed is checked ( #25859 )
2021-05-28 10:03:41 +05:30
Ganga Manoj
8a776a63cd
fix(POS): Add Product Bundles to POS item search ( #25860 )
2021-05-28 09:56:30 +05:30
Suraj Shetty
24f2d58f53
Merge pull request #25862 from surajshetty3416/parallel-distributed-testing-version-13-hotfix
2021-05-28 09:40:58 +05:30
Suraj Shetty
f4db3139b7
refactor: Use css variables for breakpoint value
2021-05-28 09:22:46 +05:30
prssanna
c4d4be3265
fix: ensure website theme is applied correctly
2021-05-28 09:22:45 +05:30
Suraj Shetty
bcf116422a
ci: Do not generate coverage report for hotfix branch
2021-05-28 09:12:24 +05:30
Suraj Shetty
85aeca1443
ci: Update Python version to 3.7
2021-05-28 09:10:34 +05:30
Suraj Shetty
6da2212e2d
ci: Update frappe branch
2021-05-28 09:10:34 +05:30
Suraj Shetty
113a6f3d80
fix: Use frappe.safe_eval instead of eval
2021-05-28 09:10:34 +05:30
Suraj Shetty
77f2686142
ci: Use only 3 containers for now
2021-05-28 09:10:34 +05:30
Suraj Shetty
b9a8afc234
ci: Add test orchestrator URL
2021-05-28 09:10:34 +05:30
Suraj Shetty
96542c3d04
style: Fix sider issues
2021-05-28 09:10:34 +05:30
Suraj Shetty
273589e835
test: Fix a case where test used to fail due to holiday list
...
- fixes: "Please set a default Holiday List for Employee EMP-00009 or Company Wind Power LLC" error
2021-05-28 09:10:33 +05:30
Suraj Shetty
54354a84e1
test: Fix permission error
2021-05-28 09:10:33 +05:30
Suraj Shetty
d48ea663d9
test: Fix test name
...
- Rename TestSubcontractedItemToBeReceived > TestSubcontractedItemToBeTransferred
2021-05-28 09:10:33 +05:30