Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,739 Commits 3 Branches 0 Tags 1 GiB
206313d69b
Commit Graph

36739 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ganga Manoj
c8b34798fe
fix(Delivery Note): Assign Product Bundle's conversion_factor to Packed Items (#25840) 2021-06-01 10:44:26 +05:30
Suraj Shetty
5b17f335d1
ci: Add coveralls_repo_token env variable 2021-06-01 08:18:56 +05:30
rohitwaghchaure
970f00922d
Merge pull request #25898 from anupamvs/stock-reconciliation 
fix: featching serialized items
 2021-05-31 20:00:35 +05:30
rohitwaghchaure
6463cbd15e
Merge pull request #25897 from anupamvs/stock-reconciliation 
fix: featching serialized items
 2021-05-31 20:00:26 +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
Eben van Deventer
7f2ae23dbf
Correct South Africa VAT Rate 
On 1 April 2018 South Africa increased the VAT rate from 14% to 15%, this proposed change seeks to update the default parameters for a fresh ERPNext installation.
This was already done with a commit to version-13 branch under #25894, this proposed change is to ensure that the update is pulled through to future versions.
 2021-05-31 12:24:29 +02:00
Raffael Meyer
80540d38ba
fix: add_deduct_tax in Purchase Taxes setup (#25871) 2021-05-31 15:36:20 +05:30
Nabin Hait
a3d1b6973a fix: merge conflict 2021-05-31 11:21:33 +05:30
Nabin Hait
d0ba0217e4 Merge branch 'version-13-pre-release' into version-13 2021-05-31 11:14:33 +05:30
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