Deepesh Garg
911818a9e2
fix: Add multiple fixes
2021-06-09 22:55:10 +05:30
Deepesh Garg
6f2dacc60c
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13
2021-06-06 19:31:50 +05:30
rohitwaghchaure
c59371ab0c
fix: filter type for item query ( #25942 )
2021-06-03 20:02:58 +05:30
Marica
e7d9200e0f
Merge pull request #25221 from Alchez/dev-quality-inspection-accounts
...
feat: create Quality Inspections from account and stock documents
2021-06-03 01:39:05 +05:30
Nabin Hait
88d94dbf0a
Merge pull request #25915 from rohitwaghchaure/fixed-work-order-no-able-to-select-item
...
fix: not able to select the item code in work order
2021-06-02 19:00:34 +05:30
Rohan Bansal
a06ec03efc
test: add test for new QI function
2021-06-02 14:55:31 +05:30
Rohan Bansal
11aff80dea
Merge remote-tracking branch 'upstream/version-13-hotfix' into dev-quality-inspection-accounts
2021-06-02 14:22:32 +05:30
Rohit Waghchaure
721b4130db
fix: not able to select the item code in work order
2021-06-02 14:13:09 +05:30
Suraj Shetty
c26d41acf9
chore: Remove unnecessary print statements
2021-05-28 09:09:36 +05:30
Rohan Bansal
1e3a3b27c6
style: semgrep issues
2021-05-26 15:18:10 +05:30
Rohan Bansal
1cdf5a0dba
fix: add requested changes
2021-05-26 14:42:15 +05:30
Rohan Bansal
c5b074269a
Merge remote-tracking branch 'upstream/version-13-hotfix' into dev-quality-inspection-accounts
2021-05-26 14:32:14 +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
Deepesh Garg
84f270e732
fix: Remove unwanted commits
2021-05-25 18:03:42 +05:30
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
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
Ankush Menat
7b4a38c71e
chore: remove print from account controller ( #25807 )
...
This is polluting test output and it's not useful for debugging without
context.
2021-05-23 18:49:26 +05:30
rohitwaghchaure
651e934415
Merge pull request #25683 from noahjacob/supplier_item_group_link
...
feat: linking supplier with an item group for filtering items
2021-05-21 12:07:53 +05:30
noahjacob
8e34c49ac9
refactor: using get_all instead of get_list
2021-05-19 13:51:36 +05:30
noahjacob
ca2fb47d44
feat: updates item_code filters if item_group is linked to supplier
2021-05-18 15:01:05 +05:30
rohitwaghchaure
2aa401826e
fix: validation message of quality inspection in purchase receipt ( #25666 )
2021-05-14 12:34:50 +05:30
rohitwaghchaure
958c96ee3f
Merge pull request #25660 from deepeshgarg007/promotional_item_cost_center
...
fix: Breaking cost center validation
2021-05-11 18:08:17 +05:30
Deepesh Garg
a60c3081cf
fix: Breaking cost center validation
2021-05-11 16:38:33 +05:30
Ganga Manoj
f2eb8dd1d5
feat: Transaction Deletion Record ( #25354 )
...
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-05-10 14:02:58 +05:30
Rucha Mahabal
062d30146f
fix: Include search fields in Project Link field query ( #25505 )
...
* fix: Include search fields in Project Link field query
* fix: add project_name to Project search fields
2021-05-07 13:31:14 +05:30
Saqib
900a8fb21a
feat(pos): ability to retry on pos closing failure ( #25595 )
...
* feat(pos): ability to retry on pos closing failure
* fix: sider issues
* fix: sider issues
* fix: mark all queued closing entry as failed
* feat: add headline message
2021-05-06 17:02:47 +05:30
18alantom
2a20a03c28
fix: check for None in item.schedule_date before setting
2021-05-05 11:59:15 +05:30
Saqib
83e3820575
fix: remove print statement
2021-04-29 12:21:56 +05:30
Saqib Ansari
da5b55c4f5
fix: test
2021-04-28 14:55:33 +05:30
Saqib Ansari
3f7ec95af8
Merge branch 'develop' of https://github.com/frappe/erpnext into payment-term-amount-display-currency-fix
2021-04-28 14:45:27 +05:30
Ankush Menat
9178d95cca
fix: can not create item variants ( #25433 )
...
* fix: item_code assigned to function returning None
* fix: ignore has_variants and attributes in variant
* fix: patch to remove has_variants and attributes
* chore: fix whitespace in translation
2021-04-26 15:37:17 +05:30
Deepesh Garg
4c8d15b487
fix: Incorrect GL Entry validation ( #25474 )
...
* fix: Incorrect GL Entry validation
* fix: Add validation for party accounts
* fix: Scrub labels
* fix: Translation
2021-04-26 15:24:34 +05:30
Saqib Ansari
d552fe6778
feat: base payment amount in payment schedule
2021-04-23 14:46:52 +05:30
Deepesh Garg
cb718fce88
feat: Role to allow over billing, delivery, receipt ( #24854 )
...
* feat: Role to allow over billing, delivery, receipt
* fix: Typo
2021-04-19 13:25:15 +05:30
Ankush Menat
7eac4a250d
fix: functions using mutable defaults ( #25370 )
2021-04-19 10:33:39 +05:30
Ankush Menat
ad6a2657ae
chore: minor translation fixes
2021-04-17 16:56:09 +05:30
Ankush Menat
dedf2c1b61
fix: remove duplicate keys from dictionaries
2021-04-17 16:56:08 +05:30
Marica
4e25aa77dd
Merge branch 'develop' into dev-quality-inspection-accounts
2021-04-14 19:06:14 +05:30
rohitwaghchaure
ac6facda3d
Merge pull request #25186 from rohitwaghchaure/fixed-incorrect-batch-selected-in-purchase-rceipt-develop
...
fix: incorrect batch picked in subcontracted purchase receipt
2021-04-14 14:35:12 +05:30
Rohan Bansal
7f8b95efe8
fix: move QI logic to stock module
2021-04-14 14:15:45 +05:30
Nabin Hait
2535fe9b1e
fix: Resolved merge conflict
2021-04-14 13:09:50 +05:30
Nabin Hait
f7441c4c0a
Merge branch 'develop' into fixed-incorrect-batch-selected-in-purchase-rceipt-develop
2021-04-14 11:23:00 +05:30
Deepesh Garg
e2dc102bc6
fix: Zero amount completed delivery notes being shown in Sales Invocie get items ( #25317 )
2021-04-14 11:21:11 +05:30
Deepesh Garg
b67058869a
fix: Round off final tax amount instead of current tax amount ( #25188 )
...
* fix: Round off final tax amount instead of current tax amount
* fix: Syntax error
* fix: Indentation
* fix: Round Off taxes order execution
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-04-14 11:20:27 +05:30
rohitwaghchaure
ce6c3b5b74
fix: incorrect incoming rate for the sales return ( #25306 )
2021-04-13 20:55:52 +05:30
Nabin Hait
10c61376e3
fix: Backport missing commits to develop branch ( #25305 )
2021-04-13 15:46:01 +05:30
Deepesh Garg
5f3d7f547c
fix: Item wise tax rate for consolidated POS invoice ( #25029 )
...
* fix: Item wise tax rate for consolidated POS invoice
* fix: Do not alter item wise taxes for consolidated invoices
* fix: Add test case
* fix: Update
* fix: Set opening stock for test item
* fix: Add valuation rate for opening stock
2021-04-12 10:56:47 +05:30
