Commit Graph

36258 Commits

Author SHA1 Message Date
rohitwaghchaure
6463cbd15e
Merge pull request #25897 from anupamvs/stock-reconciliation
fix: featching serialized items
2021-05-31 20:00:26 +05:30
Anupam
0358b64743 fix: featching serialized items 2021-05-31 15:59:32 +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
Rucha Mahabal
05d5fb24f7
fix(test): tax detail report (#25884) 2021-05-29 23:18:36 +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
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
Raffael Meyer
6038663bf8
fix: add_deduct_tax in Purchase Taxes setup (#25757) 2021-05-28 16:29:28 +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
Deepesh Garg
b084f1d320 fix(India): Show only company addresses for ITC reversal entry 2021-05-28 12:14:56 +05:30
Suraj Shetty
1a5c21c759
Merge pull request #25786 from prssanna/website-theme-fixes 2021-05-28 10:48:30 +05:30
Suraj Shetty
5f4527a6a1 refactor: Use css variables for breakpoint value 2021-05-28 08:55:38 +05:30
Deepesh Garg
5269f1537d
Merge pull request #25857 from Anuja-pawar/fix-ageing-error-pre-release
fix: ageing error in PSOA
2021-05-27 17:38:01 +05:30
Anuja P
753e5894de fix: ageing error in PSOA 2021-05-27 17:33:22 +05:30
Suraj Shetty
8612558433
Merge branch 'develop' into website-theme-fixes 2021-05-27 13:56:28 +05:30
Anupam Kumar
59769c7a86
fix: student invalid password reset link (#25825) 2021-05-26 12:16:04 +05:30
Nabin Hait
e5df60287e Merge branch 'version-13-hotfix' into version-13-pre-release 2021-05-25 20:42:58 +05:30
Nabin Hait
ba2cbf8ec6
Merge pull request #25714 from deepeshgarg007/net_values_gl_v13
feat: Show net values in Party Accounts
2021-05-25 20:41:30 +05:30
Deepesh Garg
c262705143
feat: Show net values in Party Accounts (#25714) 2021-05-25 20:39:28 +05:30
Deepesh Garg
81376ea44f
feat: Show net values in Party Accounts (#25714) 2021-05-25 20:39:17 +05:30
Ganga Manoj
18cfced032
fix(Material Request): Make status on list and form view the same (#24856) 2021-05-25 19:54:07 +05:30
Nabin Hait
db95db892c fix: merge conflict 2021-05-25 19:33:23 +05:30
Ganga Manoj
99636c6aca
fix: rearrange buttons for company doctype (#25617) 2021-05-25 19:17:01 +05:30
Afshan
4d61fa2497
fix: incorrect cr/dr shown in general ledger for multi-currency transactions (#25654) 2021-05-25 19:16:02 +05:30
Laurynas Sakalauskas
6a62ad325f
fix(plaid): withdrawals and deposits are recorded incorrectly (#25784) 2021-05-25 19:09:44 +05:30
Rakshith N
507a211c81
fix: fetch email id from dialog box in pos past order summary' (#25808) 2021-05-25 19:03:29 +05:30
Suraj Shetty
3563454efa
Merge pull request #25824 from surajshetty3416/fix-variables-import 2021-05-25 16:09:17 +05:30
Suraj Shetty
45bc14408e refactor: Remove redundant variables.scss import 2021-05-25 15:57:33 +05:30
Ankush Menat
073dcf7e42
ci(semgrep): fix false positives (#25823) 2021-05-25 14:06:10 +05:30
Deepesh Garg
09d9bd19ac
Merge pull request #25816 from deepeshgarg007/jv_diff_ignore_v13
fix: Ignore rounding diff while importing JV using data import
2021-05-25 10:59:50 +05:30
rohitwaghchaure
bc7c5bfbe2
Merge pull request #25817 from rohitwaghchaure/fix-removed-serial-no-validate-for-sales-invoice
fix: removed serial no validation for sales invoice
2021-05-25 10:40:46 +05:30
Rohit Waghchaure
b4f0347c02 fix: removed serial no validation for sales invoice 2021-05-24 23:39:25 +05:30
Deepesh Garg
7c0383a9a6
Merge pull request #25815 from deepeshgarg007/cash_flow_mapper_v13
fix: Cashflow mapper not showing data
2021-05-24 20:40:07 +05:30
Anurag Mishra
5670cf4386
feat: enhancements in Training Event (#25782)
* feat: Some Minor fixes

* fix: patch file

* fix: patch

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-05-24 20:24:20 +05:30
Deepesh Garg
25112244ed fix: Ignore rounding diff while importig JV using data import 2021-05-24 20:01:21 +05:30
Deepesh Garg
c348215f61 fix: Cashlfow mapper not showing data 2021-05-24 19:57:53 +05:30
Deepesh Garg
63e4ab4f2d
Merge pull request #25777 from Anuja-pawar/fix-process-SOA-format
fix: Process Statement of Accounts formatting
2021-05-24 19:55:21 +05:30
Saqib
dd5b31f8c4
fix: set disable rounded total if it is globally enabled (#25789) 2021-05-24 18:23:03 +05:30
Saqib
b6d061fa8c
fix(pos): handle db lock timeout error while pos closing (#25813) 2021-05-24 18:22:03 +05:30
Jannat Patel
dc7afa743c
fix: profitability test (#25812)
* fix: profitability test

* fix: replaced class method

* fix: removed print statement
2021-05-24 17:33:48 +05:30
rohitwaghchaure
6809ff4f64
Merge pull request #25776 from rohitwaghchaure/fixed-warehouse-not-found-issue
fix: warehouse not found in stock entry
2021-05-24 17:00:06 +05:30
Nabin Hait
8f057b4bac Merge branch 'version-13-pre-release' into version-13 2021-05-24 16:45:27 +05:30
Nabin Hait
9b912b6adc Merge branch 'version-13' into develop 2021-05-24 16:45:27 +05:30
Nabin Hait
10085580c8 bumped to version 13.3.1 2021-05-24 17:05:27 +05:50
Saqib
6368c976c7 fix: expected amount in pos closing payments table (#25737) 2021-05-24 16:44:38 +05:30
rohitwaghchaure
ce88c945cd
Update stock_entry.js 2021-05-24 11:53:27 +05:30
krishnagirishp
5457db0601
chore: remove uses of six.PY2 in codebase (#25062)
* remove uses of six.py2 in codebase

* changes based on pr feedback

* Update amazon_mws_api.py

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-05-23 21:13:44 +05:30