Commit Graph

2172 Commits

Author SHA1 Message Date
Deepesh Garg
fc09377de2 fix: Resolve conflicts 2022-03-27 19:18:32 +05:30
Deepesh Garg
19b1b1f4ba test: test for auto write-off amount
(cherry picked from commit 6a50f36b3167d43b1e964d4f0cf96af587f1a4a2)

# Conflicts:
#	erpnext/public/js/controllers/taxes_and_totals.js
2022-03-25 15:27:12 +00:00
Deepesh Garg
8cfa3a9ece fix: Ignore for Purchase Invoices
(cherry picked from commit ed38679d222e12709396fbb8dacbe9e25ea38ed7)

# Conflicts:
#	erpnext/public/js/controllers/taxes_and_totals.js
2022-03-25 15:27:11 +00:00
Deepesh Garg
d04d3038f5 fix: Client side changes for POS Write off amount
(cherry picked from commit 2e33e748ea248acface128f759d3982635024399)

# Conflicts:
#	erpnext/public/js/controllers/taxes_and_totals.js
2022-03-25 15:27:10 +00:00
Deepesh Garg
54cdff7947 fix: Add back calculation for discount
(cherry picked from commit 067564bd260437290b7cb190fb1cdc02eb658d0a)
2022-03-25 07:30:40 +00:00
Deepesh Garg
174a6ec398 fix: Rate change issue on save and mapping from other doc
(cherry picked from commit 13fcda57767c456dfca4c064c41ca4f80a1898b2)
2022-03-25 07:30:40 +00:00
Ankush Menat
4aa74af90d fix: ignore items without info for pending qty computation 2022-03-23 15:46:40 +05:30
Ankush Menat
be16fb9dbb chore(DX): add sourceURL for debugging 2022-03-23 15:46:40 +05:30
Deepesh Garg
78ca88d227 fix: Check if onload property exists in the form object 2022-03-23 13:55:05 +05:30
Deepesh Garg
66ca085e39 fix: Changing item prices on converting orders/receipts to invoices 2022-03-22 23:03:41 +05:30
Ankush Menat
0a533d6ccc fix: skip already selected serials in sr selector 2022-03-19 20:55:27 +05:30
Ankush Menat
5ec27c9055 fix: filter serial nos by selected batch number 2022-03-19 20:55:27 +05:30
Ankush Menat
f4c213379e fix: set current qty as default qty for stock entry 2022-03-19 20:55:27 +05:30
Deepesh Garg
d596e0e4df fix: Shipping rule application fixes 2022-03-10 20:56:36 +05:30
Rushabh Mehta
1e7df5d0c2 fix(minor): student attendance tool query fix 2022-02-26 11:07:44 +05:30
Rucha Mahabal
71d33081aa
fix: org chart connectors not rendered when Employee Naming is set to Full Name (#29997) 2022-02-25 23:01:32 +05:30
Deepesh Garg
25edc700bd
Merge pull request #29974 from deepeshgarg007/abbr_check
fix: Make abbreviation limit to 10
2022-02-25 15:52:51 +05:30
Saqib Ansari
81514516f3 fix(pos): coupon code is applied even if ignore pricing rule is check 2022-02-25 15:18:06 +05:30
Deepesh Garg
239733acd1 fix: Make abbreviation limit to 10 2022-02-23 20:41:49 +05:30
Deepesh Garg
bd80e04aa7
Merge pull request #29865 from deepeshgarg007/loan_bank_reco
feat: Bank Reconciliation for loan documents
2022-02-22 20:43:00 +05:30
Marica
235fc127b3
fix: Fetch conversion factor even if it already existed in row, on item change (#29917)
* fix: Fetch conversion factor even if it already existed in row, on item change

* fix: Retain manually changed conversion factor

- If item code changes, reset conversion factor on client side
- Keep API behavious consistent, if conversion factor is sent, same must come back
- API should not ideally reset values in most cases
2022-02-22 12:53:46 +05:30
Deepesh Garg
0d8c24f488 Merge branch 'develop' of https://github.com/frappe/erpnext into loan_bank_reco 2022-02-21 22:22:02 +05:30
Ankush Menat
342d09a671 feat: get_valuation_rate batch wise
This function is used to show valuation rate on frontend and also as
fallback in case values aren't available. Add "batch_no" param to get
batch specific valuation rates.

Co-Authored-By: Alan Tom <2.alan.tom@gmail.com>
2022-02-21 18:02:40 +05:30
Deepesh Garg
b7c388976d Merge branch 'develop' of https://github.com/frappe/erpnext into loan_bank_reco 2022-02-21 16:58:52 +05:30
Deepesh Garg
555b1335f6 feat: Bank Reconciliation for loan documents 2022-02-17 19:15:30 +05:30
Saqib Ansari
2743999785 fix: coupon code is applied even if ignore_pricing_rule is enabled 2022-02-17 16:03:43 +05:30
Saqib Ansari
4f4395545e
Merge branch 'develop' into fix-ignore-pricing-rule 2022-02-08 15:29:28 +05:30
Saqib Ansari
5e32b809cb
Merge pull request #29599 from nemesis189/coupon-code-issue-pos
fix: Coupon code item pricing dynamic updation issue in pos screen
2022-02-08 11:50:19 +05:30
Saqib Ansari
4c3d751421
Merge branch 'develop' into fix-ignore-pricing-rule 2022-02-08 11:42:33 +05:30
Mohammed Yusuf Shaikh
a3e69cf75d
feat: Bulk Transaction Processing (#28580)
* feat: Bulk Transaction Processing

* fix: add flags to ignore validations and exception handling correction

* fix: remove duplicate code, added logger functionality and improved notifications

* fix: linting and sider issues

* test: added tests

* fix: linter issues

* fix: failing test case

* fix: sider issues and test cases

* refactor: mapping function calls to create order/invoice

* fix: added more test cases to increase coverage

* fix: test cases

* fix: sider issue

* fix: rename doctype, improve formatting and minor refactor

* fix: update doctype name in hooks and sider issues

* fix: entry log test case

* fix: typos, translations and company name in tests

* fix: linter issues and translations

* fix: linter issue

* fix: split into separate function for marking failed transaction

* fix: typos, retry failed transaction logic and make log read only

* fix: hide retry button when no failed transactions and remove test cases not rrelevant

* fix: sider issues and indentation to tabs

Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-02-08 01:00:37 +05:30
Marica
79ab8e6459
Merge pull request #29456 from marination/product-bundle-packing-list-logic
fix: Incorrect packing list for recurring items & code cleanup
2022-02-03 22:09:52 +05:30
marination
017a882f90 fix: Remove cart.js from erpnext-web bundle
- Due to it being in the bundle, controls bundle was required for Dialogs used in cart
- But this is exclusively used in `cart.html`
- It has no reason to load and break the login page
- Moved it back to where the html is, it is now back to being tightly coupled with its html
2022-02-03 21:34:48 +05:30
Suraj Shetty
e652ab5f05 fix: Load control & dialog assets with cart.js
Previously, control & dialog assets were getting loaded only on visiting "/cart", but since cart.js sets up various events on homepage, dialog related assets are required up-front.
2022-02-03 20:06:24 +05:30
Marica
e9fc6c3249
Merge branch 'develop' into product-bundle-packing-list-logic 2022-02-03 17:02:57 +05:30
marination
f47db26fa6 fix: Cart buttons not working
- Add cart.js to web bundle
- Hide icon conditionally since now this file loads on every single page
2022-02-03 12:54:59 +05:30
Saqib Ansari
5a7236efcd
Merge branch 'develop' into fix-ignore-pricing-rule 2022-02-02 21:47:51 +05:30
Subin Tom
ccf63124d6 fix: Coupon code item pricing dynamic updation issue 2022-02-02 20:13:33 +05:30
marination
8c90c505c0 fix: (minor) build issues on cart and item page
- Move `cart.js` to public/js directory
- Reorder import sequence in erpnext web bundle
- Removed unused script block
2022-02-02 10:40:45 +05:30
marination
7bc087ed44 fix: Merge conflicts, Linter and Server Test
- Resolve inconsistency due to conflict with https://github.com/frappe/erpnext/pull/27050
- Resolve Linter issues (imports and spaces)
- Include customer_reviews.js in bundle, move it to /public/js
2022-02-01 10:51:50 +05:30
marination
b2b827f50f chore: Adjust to ESbuild and missing imports
- update erpnext web bundle and tweak to fit new build system
- change page id in scss due to change in v14 router
- add missing imports
2022-02-01 00:03:08 +05:30
Ankush Menat
6cd7c47409 Merge branch 'develop' into e-commerce-refactor-develop 2022-01-31 17:14:36 +05:30
Ankush Menat
14e3e163ae fix: ignore alternate item while checking pending qty 2022-01-29 13:59:25 +05:30
marination
4c677eafe9 fix: Linter and minor code refactor
- Create an indexed map of stale packed items table to avoid loops to check if packed item row exists
- Reset packed items if row deletion takes place
- Renamed functions to self-explain them
- Split long function
- Reduce function calls inside function (makes it harder to follow through)
2022-01-26 01:10:24 +05:30
Saqib Ansari
f6dda738dc fix: ignore pricing rule in all transactions 2022-01-20 12:22:56 +05:30
Marica
b5abf68b0d
Merge branch 'develop' into e-commerce-refactor-develop 2022-01-12 02:52:03 +05:30
Deepesh Garg
b83608b029
Merge pull request #28994 from nextchamp-saqib/zero-qty-debit-note
fix: cannot create debit note with zero qty
2022-01-07 18:35:24 +05:30
Deepesh Garg
f6f449ed18
Merge pull request #29176 from deepeshgarg007/outstanding_amount_anomaly
fix: Inconsistency in calculating outstanding amount
2022-01-07 13:28:52 +05:30
Deepesh Garg
9d3a5c3184 fix: Inconsistency in calculating outstanding amount 2022-01-06 18:58:49 +05:30
Chillar Anand
0900c3d655
refactor: Removed agriculture module from ERPNext (#29022) 2022-01-04 17:26:11 +05:30
Saqib Ansari
79ccf80faf
Merge branch 'develop' into zero-qty-debit-note 2021-12-29 17:32:16 +05:30