Rucha Mahabal
866763c16a
fix(minor): Employee filter in Unpaid Expense Claims report ( #27530 )
2021-09-16 00:05:16 +05:30
rohitwaghchaure
e6a1ad8016
fix: not able to submit stock entry with 350 items ( #27523 )
2021-09-15 20:42:47 +05:30
Ankush Menat
70c203d19e
test: automated test for running all stock reports ( #27510 )
...
* test: automated test for running all stock reports
These test do not assert correctness, they just check that "execute" function
is working with sane filters.
* test: make report execution test modular
2021-09-15 19:24:35 +05:30
Frappe PR Bot
29dab0699c
fix(minor): Remove b2c limit check from CDNR Invoices ( #27516 ) ( #27520 )
...
* fix(minor): Remove b2c limit check from CDNR Invoices
* fix: Remove unnecessary format
(cherry picked from commit 978028c880445362afc0cfca9118424174541cc7)
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-09-15 19:12:02 +05:30
Noah Jacob
5e0b21582a
fix: table data deleted on submitted maintenance schedule ( #27513 )
2021-09-15 17:37:52 +05:30
Frappe PR Bot
d4d5e2786f
fix: Maintain same rate in Stock Ledger until stock become positive ( #27227 ) ( #27478 )
...
* fix: Maintain same rate in Stock Ledger until stock become positive
* fix: Maintain same rate in Stock Ledger until stock become positive
(cherry picked from commit 10754831c33b3459d5a45c98f875afa48a444627)
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-09-15 17:07:58 +05:30
rohitwaghchaure
c5a77f60ed
feat: provision to add scrap item in job card ( #27483 )
2021-09-15 16:45:57 +05:30
Frappe PR Bot
6e7945fbb7
fix: Tags getting fetched correctly in Get Supplier in RFQ (Request For Quotation) ( #27499 ) ( #27506 )
...
* fix: Tags getting fetched correctly in Get Supplier in RFQ( Request For Quotation ) #26343
* fix: Linting issues
* fix: remove unnecessary caching
[skip ci]
Co-authored-by: Vama Mehta <vama.mehta@inqubit.in>
Co-authored-by: Ankush Menat <ankush@iwebnotes.in>
(cherry picked from commit 50fe23308acad58ab2db2056ea6dd163913725ef)
2021-09-15 11:10:11 +05:30
Deepesh Garg
759f2b7920
fix: Autoname for customer and supplier ( #27398 )
2021-09-15 10:24:26 +05:30
Deepesh Garg
625626b973
fix: Values with same account and different account number in consolidated balance sheet report ( #27493 )
2021-09-15 10:10:54 +05:30
rohitwaghchaure
2e2985e4f1
fix: calculate operating cost based on BOM Quantity ( #27464 )
...
* fix: calculate operating cost based on BOM Quantity
* fix: added test cases
2021-09-15 00:37:41 +05:30
Deepesh Garg
c53b78e712
fix: Patch for updating tax withholding category dates ( #27489 )
2021-09-14 20:28:48 +05:30
Ankush Menat
fea51f4082
chore: isort
...
[skip ci]
2021-09-14 19:04:47 +05:30
Marica
8fed8da9eb
Merge pull request #27475 from marination/job-card-excess-transfer
...
fix: Handle Excess/Multiple Item Transfer against Job Card
2021-09-14 17:13:23 +05:30
Marica
de9f78350b
Merge branch 'develop' into job-card-excess-transfer
2021-09-14 16:50:06 +05:30
marination
469bb8d977
test: Work Order Material Transfer against Job Card
...
- Tests for multiple items transfer and excess transfer against JC
- Remove unused __future__ imports
- Changed Copyright year
- Sider: (js) Added space before if
2021-09-14 16:27:39 +05:30
DeeMysterio
aa82624f31
Merge pull request #27281 from DeeMysterio/party-specific-items
...
feat: link items to supplier / customer
2021-09-14 13:58:18 +05:30
Shariq Ansari
9aa6f52edd
fix: Webform Permission for custom doctype ( #26232 )
...
* fix: Webform Permission for custom doctype
* fix: sider fix
* fix: app check condition for getting correct list_context
* chore: Better naming convention
* test: Added test case to check permission for webform of custom doctype
* chore: linting issue
* chore: linting issue
* fix: sider fix
* test: minor changes
* chore: linter and better naming method
* chore: linter fix
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-09-14 12:49:08 +05:30
marination
9520215e2b
feat: Handle Excess/Multiple Item Transfer against Job Card
...
- Hide MR/Material Transfer buttons in JC if cancelled
- Show MR/Material transfer buttons if pending to transfer or excess transfer allowed
- Renamed ‘Transferred Qty’ to ‘FG Qty from Transferred Raw Materials’ in JC
- Set status to Completed in JC in case of excess transfer too
- During excess transfer against JC, avoid negative ‘For Quantity’. Set to 0 instead
- Job card section and excess transfer allowance checkbox in Manufacturing Settings
- Renamed ’Allow Multiple Material Consumption’ to ‘Allow Continuous Material Consumption’ (fiedname is same)
- Secured denominator variables in `get_transfered_raw_materials` to avoid ZeroDivisionError
2021-09-14 12:33:21 +05:30
Chillar Anand
95460d9818
fix(HR): Ignore invalid fields when updating employee details ( #27456 )
2021-09-14 12:00:34 +05:30
Faris Ansari
1c1b476d67
perf: Optimize get_attribute_filters ( #26729 )
...
* perf: Optimize get_attribute_filters
* fix: handle when filter attributes are undefined
* chore: unused imports
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-09-14 11:41:19 +05:30
Rucha Mahabal
b98740b44a
fix: employee advance return through multiple additional salaries ( #27438 )
...
* fix: employee advance return through multiple additional salaries
* test: test repay unclaimed amount from salary
* fix: sorting in imports
2021-09-14 11:20:15 +05:30
Deepesh Garg
c7ceb37b63
Merge pull request #27465 from nextchamp-saqib/so-analytics-report-fix
...
fix: cancelled sales invoices are considered in billed qty calculation
2021-09-14 10:05:36 +05:30
Saqib Ansari
44139fbac5
fix: cancelled sales invoices are considered in billed quantity calculation
2021-09-13 16:50:11 +05:30
Saqib
a5baf909b7
fix: editable price list rate field in sales transactions ( #27455 )
2021-09-13 15:50:20 +05:30
Rucha Mahabal
bab644a249
fix(Payroll): incorrect component amount calculation if dependent on another payment days based component ( #27349 )
...
* fix(Payroll): incorrect component amount calculation if dependent on another payment days based component
* fix: set component amount precision at the end
* fix: consider default amount during taxt calculations
* test: component amount dependent on another payment days based component
* fix: test
2021-09-13 13:24:27 +05:30
Saqib
7292f5476d
feat: (get_items_from) filter material request item in purchase order ( #27449 )
2021-09-13 12:13:43 +05:30
Ankush Menat
d743c41b54
fix(ux): apply proper filtering in stock reports ( #27411 )
...
* fix(ux): apply proper filtering in stock reports
Stock Balance: apply company filter to warehouse field
Stock Ageing: apply company filter to warehouse field
* fix: unnecessary parens
Co-authored-by: Alan <2.alan.tom@gmail.com>
2021-09-12 16:38:18 +05:30
Ankush Menat
6ef879fca2
fix(ux): clean invalid fields from variant setting ( #27412 )
2021-09-12 16:36:51 +05:30
Frappe PR Bot
a52d4c25ff
fix: fail migration due to None type during v13_0.update_returned_qty_in_pr_dn ( #27430 ) ( #27436 )
...
* fix: fail migration due to None type
* fix: incorrect key: value pair in filter.
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
(cherry picked from commit becf471a3a238cfaa20a8940e0106c7e0e0386c2)
Co-authored-by: Devin Slauenwhite <devin.slauenwhite@gmail.com>
2021-09-11 17:54:55 +05:30
Sagar Vora
dae0a1c1d6
fix: Template Error due to use of single quote ( #27433 )
2021-09-11 17:54:21 +05:30
Ankush Menat
62fc544280
test: basic tests for controllers/queries ( #27422 )
2021-09-10 12:46:35 +05:30
Suraj Shetty
3da34382b5
ci: Remove extra space
...
🤦🏻♂️
2021-09-10 10:18:41 +05:30
Suraj Shetty
333b83b583
ci: Ignore demo folder
...
Coverage for the demo folder is not relevant... can be ignored
2021-09-10 09:58:48 +05:30
Suraj Shetty
df913ac036
Merge pull request #27421 from surajshetty3416/enable-codecov
...
ci: Use codecov for coverage reporting
2021-09-10 09:51:44 +05:30
Suraj Shetty
629f5e1fdf
chore: Add codecov badge
2021-09-10 08:21:01 +05:30
Suraj Shetty
86afece6ad
ci: Add codecov configuration file
2021-09-10 08:14:43 +05:30
Suraj Shetty
1fc8fcc258
ci: Upload coverage report to codecov
2021-09-10 08:08:00 +05:30
Anuja Pawar
a58e309297
fix: fix to fetch customers and billing email in PSOA ( #27363 )
2021-09-09 19:37:52 +05:30
Subin Tom
8b4c57ee09
fix: pos payment mode selection issue ( #27409 )
2021-09-09 19:33:34 +05:30
Anupam Kumar
7edac5a5d7
fix: removing duplicate currency() from sales_invoice.js ( #27410 )
2021-09-09 19:17:01 +05:30
Noah Jacob
acdb10377f
refactor: .doc missing and empty row on new doc ( #27408 )
...
* refactor: .doc missing and empty row on new doc
* fix: let -> const
2021-09-09 18:54:00 +05:30
Ankush Menat
a40709a673
chore: remove obsolete file
...
snyk has been removed, this file is not required anymore.
2021-09-09 13:55:56 +05:30
Rushabh Mehta
95e440b537
Merge pull request #27406 from ankush/remove_snyk
...
chore: remove snyk from devdependencies
2021-09-09 13:07:52 +05:30
Ankush Menat
518f827d87
chore: remove snyk from devdependencies
2021-09-09 12:52:45 +05:30
Ankush Menat
678335f8ac
fix: job card overlap unknown column jc.employee
( #27403 )
...
* fix: incorrect query for job card overlap
* test: employee overlap in job cards
* test: simplify/refactor job card tests
2021-09-09 12:24:23 +05:30
dependabot[bot]
9670490a1d
chore(deps): bump axios from 0.21.1 to 0.21.4 ( #27402 )
...
Bumps [axios](https://github.com/axios/axios ) from 0.21.1 to 0.21.4.
- [Release notes](https://github.com/axios/axios/releases )
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md )
- [Commits](https://github.com/axios/axios/compare/v0.21.1...v0.21.4 )
---
updated-dependencies:
- dependency-name: axios
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
[skip ci]
2021-09-09 12:21:47 +05:30
Deepesh Garg
9104796eb8
Merge pull request #27258 from deepeshgarg007/tds_validity
...
feat: Validity dates in Tax Withholding Rates
2021-09-09 12:17:36 +05:30
Anuja Pawar
3576668638
fix: added Show Remarks checkbox in AR & AP reports ( #27374 )
2021-09-09 11:57:29 +05:30
Deepesh Garg
e7e2ce1271
fix: Linting Issues
2021-09-09 11:36:57 +05:30