Deepesh Garg
c9da1fc568
chore: Test case for adance TDS allocation
2021-05-25 17:37:17 +05:30
Deepesh Garg
a23aaf43f4
fix: Allocate advance taxes only for payment entry
2021-05-25 17:36:06 +05:30
Deepesh Garg
e2f83ffaa4
fix: Linting fixes and other checks
2021-05-25 17:35:41 +05:30
Deepesh Garg
77dcee9d67
fix: Test Cases
2021-05-25 17:35:15 +05:30
Deepesh Garg
fd380d34f9
fix: Linting errors
2021-05-25 17:35:05 +05:30
Deepesh Garg
a87e3fcb7c
fix: TDS report cleanup
2021-05-25 17:34:45 +05:30
Deepesh Garg
79b422c0a9
fix: Advance TDS in TDS payable monthly report
2021-05-25 17:33:59 +05:30
Deepesh Garg
d18dde7757
fix: Add tds in PO and code cleanup
2021-05-25 17:32:28 +05:30
Deepesh Garg
c26de28613
fix: TDS against Purhase Orders
2021-05-25 17:25:13 +05:30
Deepesh Garg
61c5e478af
feat: Tax deduction against advance payments
2021-05-25 17:20:52 +05:30
Deepesh Garg
c9aa726818
feat: Tax deduction against advance payments
2021-05-25 17:17:40 +05:30
Anuja P
3efd411ddb
fix: Hold status is added in the report
2021-05-25 16:24:01 +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
Suraj Shetty
d3b9edd2c4
fix: Remove unnecessary import
2021-05-25 12:52:26 +05:30
Suraj Shetty
b14a935c5d
Merge branch 'develop' of github.com:frappe/erpnext into refactor-website-routing
2021-05-25 11:02:03 +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
Suraj Shetty
2f8a742aa8
refactor: Replace render imports
2021-05-25 10:28:32 +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
Ankush Menat
15f8a0fb22
test: fix flaky test
2021-05-24 17:55:39 +05:30
Ankush Menat
3aed662f46
chore: translation / semgrep / sider fixes
2021-05-24 17:55:39 +05:30
Ankush Menat
c15fef571f
test: item naming series behaviour
2021-05-24 17:55:39 +05:30
Ankush Menat
76dd6e9046
test: contextmanager to change settings
2021-05-24 17:55:39 +05:30
Ankush Menat
42e057d079
test: add test for get_timeline_data in item
2021-05-24 17:55:38 +05:30
Ankush Menat
e971b4592e
test: add test for is_stock_item
2021-05-24 17:55:38 +05:30
Ankush Menat
57266a7343
refactor: check_stock_uom_with_bin
2021-05-24 17:55:38 +05:30
Ankush Menat
fc54cf68ac
test: add tests for checking stock_uom with bin
2021-05-24 17:55:38 +05:30
Ankush Menat
4e360f805f
test: hoist defaults to function signature
2021-05-24 17:55:38 +05:30
Ankush Menat
a11a8e8ab2
chore: add blame ignore file
2021-05-24 17:55:38 +05:30
Ankush Menat
eb17732876
test: add test for item attribute completion
2021-05-24 17:55:37 +05:30
Ankush Menat
f5a937bc45
test: check index creation on item table
2021-05-24 17:55:37 +05:30
Ankush Menat
b9fa12d572
test: add tests for uom conversion function
2021-05-24 17:55:37 +05:30
Ankush Menat
019be66b7b
fix: consider all UOMs for intermediate conversion
...
- Using `get_value` will restrict intermediate UOM to first UOM that is
found.
- A self join is required to truly capture the required behaviour.
- Add explanation and examples.
2021-05-24 17:55:37 +05:30
Ankush Menat
0d7f54c6c2
refactor: simplify UOM conversion logic
...
- Remove unnecessary sql query
- Remove convoluted matching logic and be explcitiy while querying.
- better variable names for understanding matching cases
2021-05-24 17:55:37 +05:30
Ankush Menat
297dc5e345
perf: add basic optimisation for uom conversion
2021-05-24 17:55:37 +05:30
Ankush Menat
958d485ba4
refactor: msgprint(raise_exception)->frappe.throw
2021-05-24 17:55:36 +05:30
Ankush Menat
ccbde0efa0
refactor: use enumerate instead of trackign index
...
also removed dead code
2021-05-24 17:55:36 +05:30
Ankush Menat
44c489223b
chore: remove py2 compat code
2021-05-24 17:55:18 +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
noahjacob
bf1b3b89d1
refactor: updated conditional visibility of check box
2021-05-24 17:03:15 +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
