Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
5946c2f
fix: plaid NoneType error #24675
casesolved-co-uk Apr 14, 2021
df51aa3
fix: Ignore rounding diff while importig JV using data import
deepeshgarg007 May 14, 2021
ad1f1e0
fix: Cashlfow mapper not showing data
deepeshgarg007 May 18, 2021
1891375
Merge pull request #25715 from deepeshgarg007/ignore_rouding_diff
deepeshgarg007 May 19, 2021
13927e3
Merge pull request #25662 from CaseSolvedUK/plaid-24675-v12
deepeshgarg007 May 20, 2021
3d3ee77
Merge branch 'version-12' into version-12-hotfix
nabinhait May 20, 2021
dd82bbf
Merge branch 'version-12-hotfix' into cash_flow_mapper_fix
deepeshgarg007 May 24, 2021
1853f5d
Merge pull request #25739 from deepeshgarg007/cash_flow_mapper_fix
deepeshgarg007 May 24, 2021
fa3ca02
fix: student invalid password reset link (#25827)
anupamvs May 26, 2021
6a1ccf9
fix: Taxable value in GSTR-1 report
deepeshgarg007 Jun 1, 2021
21c15b8
fix: Add taxable value in Purchase Invoice Item
deepeshgarg007 Jun 1, 2021
688a5ac
Merge pull request #25913 from deepeshgarg007/gst_freight_taxable_value
deepeshgarg007 Jun 2, 2021
1c3c2b3
fix: update shopify api version (#25939)
ankush Jun 3, 2021
5c450cd
fix: sync shopify customer addresses (#25937)
ankush Jun 3, 2021
7bb95f0
feat: cost-center wise period closing entry (#25930)
nextchamp-saqib Jun 3, 2021
a1a3f67
fix: invalid 'depends_on' expression in opportunity (#25954)
ruchamahabal Jun 4, 2021
d789dd3
fix: wrong round off gl entry posted in case of purchase invoice (#25…
nextchamp-saqib Jun 6, 2021
85dca01
fix: update employee field on renaming employee (#25958)
ruchamahabal Jun 7, 2021
3c5b33c
fix: update cost center in SI (#25972)
Anuja-pawar Jun 7, 2021
bda4323
ci: Use only compatible version of bench CLI
gavindsouza Jun 10, 2021
56a2134
Merge pull request #26001 from frappe/gavindsouza-patch-1
gavindsouza Jun 10, 2021
94f0aae
chore: Added change log for v12.22.0
nabinhait Jun 17, 2021
83b6746
bumped to version 12.22.0
nabinhait Jun 17, 2021
67f8021
Merge branch 'v12-pre-release' into version-12
nabinhait Jun 17, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@ install:
- cd ~
- nvm install 10

- git clone https://github.com/frappe/bench --depth 1
- pip install -e ./bench
- pip install -U frappe-bench --only-binary='all'

- git clone https://github.com/frappe/frappe --branch $TRAVIS_BRANCH --depth 1
- bench init --skip-assets --frappe-path ~/frappe --python $(which python) frappe-bench
Expand Down
2 changes: 1 addition & 1 deletion erpnext/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from erpnext.hooks import regional_overrides
from frappe.utils import getdate

__version__ = '12.21.0'
__version__ = '12.22.0'

def get_default_company(user=None):
'''Get default company for user'''
Expand Down
8 changes: 6 additions & 2 deletions erpnext/accounts/doctype/journal_entry/journal_entry.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,11 @@ def validate(self):
self.validate_entries_for_advance()
self.validate_multi_currency()
self.set_amounts_in_company_currency()
self.validate_total_debit_and_credit()

# Do not validate while importing via data import
if not frappe.flags.in_import:
self.validate_total_debit_and_credit()

self.validate_against_jv()
self.validate_reference_doc()
self.set_against_account()
Expand Down Expand Up @@ -1047,4 +1051,4 @@ def update_accounts(source, target, source_parent):
},
}, target_doc)

return doclist
return doclist
Loading