barredterra
f259bf48aa
refactor: make tax category
2021-06-02 13:20:03 +02:00
barredterra
e3557ff131
Merge branch 'version-13-hotfix' into item-tax-templates
2021-06-02 12:17:27 +02:00
Rohan Bansal
a06ec03efc
test: add test for new QI function
2021-06-02 14:55:31 +05:30
Rohan Bansal
11aff80dea
Merge remote-tracking branch 'upstream/version-13-hotfix' into dev-quality-inspection-accounts
2021-06-02 14:22:32 +05:30
Rohit Waghchaure
721b4130db
fix: not able to select the item code in work order
2021-06-02 14:13:09 +05:30
Fisher Yu
865663857c
fix: chart of accounts importer always error ( #25882 )
...
* fix: chart of accounts importer always error
chart of accounts importer always error Parent Account Missing
* Update chart_of_accounts_importer.py
2021-06-01 12:15:58 +05:30
Ankush Menat
2c7fac0e76
fix: reload doc for possible future schema changes ( #25904 )
2021-06-01 11:56:00 +05:30
Deepesh Garg
2f5885627d
fix: Labeling and other fixes
2021-06-01 11:07:18 +05:30
Jannat Patel
1175e0686b
refactor: leave balance report ( #25771 )
...
* refactor: leave balance report
* refactor: sql to orm
2021-06-01 10:53:00 +05:30
Ganga Manoj
c8b34798fe
fix(Delivery Note): Assign Product Bundle's conversion_factor to Packed Items ( #25840 )
2021-06-01 10:44:26 +05:30
rohitwaghchaure
970f00922d
Merge pull request #25898 from anupamvs/stock-reconciliation
...
fix: featching serialized items
2021-05-31 20:00:35 +05:30
Jannat Patel
022b5c973a
fix: wrap dates in getdate for leave application ( #25899 )
...
* fix: wrap dates in getdate for leave application
* fix: translation issue
* fix: replaced today with getdate
2021-05-31 19:49:53 +05:30
Ganga Manoj
908b0090e9
fix: Create POS Invoice for Product Bundles ( #25847 )
...
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-05-31 19:49:03 +05:30
Deepesh Garg
0ea6725baa
fix: Rename Loan Management workspace to Loans ( #25856 )
2021-05-31 19:48:31 +05:30
Anupam
0358b64743
fix: featching serialized items
2021-05-31 15:59:32 +05:30
Raffael Meyer
80540d38ba
fix: add_deduct_tax in Purchase Taxes setup ( #25871 )
2021-05-31 15:36:20 +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
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
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
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
Saqib Ansari
b72b4c0bf9
fix(pos): rendering of broken image on pos
2021-05-28 17:38:01 +05:30
Noah Jacob
6fb218e033
refactor: suggested changes
2021-05-28 16:15:50 +05:30
Saqib Ansari
05386ff12f
chore: remove unwanted method
2021-05-28 12:58:18 +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
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
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