Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,570 Commits 3 Branches 0 Tags 1 GiB
d9fc3f3d90
Commit Graph

40570 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Saqib Ansari
afc5c26d1c fix(test): ignore stock validation 2022-02-08 16:04:08 +05:30
Saqib Ansari
3f962739fb Merge branch 'develop' of https://github.com/frappe/erpnext into consolidation-round-off-err 2022-02-08 16:02:18 +05:30
Saqib Ansari
0fc5d2278d fix: currency in bank reconciliation chart 2022-02-08 15:50:41 +05:30
Rucha Mahabal
bdf38a33cc
Merge pull request #29650 from ruchamahabal/fix-earned-leaves-allocation 2022-02-08 15:47:43 +05:30
Saqib Ansari
4f4395545e
Merge branch 'develop' into fix-ignore-pricing-rule 2022-02-08 15:29:28 +05:30
Saqib Ansari
27ced4f082
Merge pull request #29560 from ruthra-kumar/bug_invoice_creation_throws_typeerror 
fix: typeerror on invoice creation from SO/PO
 2022-02-08 15:27:05 +05:30
Rucha Mahabal
b71283aa7d
Merge branch 'develop' into fix-earned-leaves-allocation 2022-02-08 14:39:55 +05:30
Rucha Mahabal
bd1555bd23 fix: handle carry forwarded leaves while checking for duplicate allocation 2022-02-08 14:36:31 +05:30
Ankush Menat
bb105a33b2 test: validate on save instead of on creation 
(cherry picked from commit 0efd5577bd9bdc0bb900d4d23d85aa86fd09929a)
 2022-02-08 14:01:41 +05:30
Bhavesh Maheshwari
3969840ee8 fix: ignore rate validation for work order 
(cherry picked from commit f29aed7f7130b805810075db1e5e1003e997bef8)
 2022-02-08 14:01:41 +05:30
marination
7116d7ae0e fix: Set Pending Qty in Prod Plan after updating Work Order 2022-02-08 12:40:33 +05:30
marination
4f5a0b8941 chore: Fix flaky test test_exact_match_with_price 
- Clear cart settings in cache to avoid stale values
 2022-02-08 12:02:02 +05:30
Saqib Ansari
0f913e0173
Merge branch 'develop' into bug_invoice_creation_throws_typeerror 2022-02-08 11:51:26 +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
8eff2969b0
Merge pull request #29699 from nextchamp-saqib/improve-debit-to-err-msg 
chore: show credit/debit-to account in error message
 2022-02-08 11:42:57 +05:30
Saqib Ansari
4c3d751421
Merge branch 'develop' into fix-ignore-pricing-rule 2022-02-08 11:42:33 +05:30
Saqib Ansari
0452d7de20 fix(pos): incorrect grand_total in case of inclusive taxes on item 2022-02-08 11:26:23 +05:30
marination
a64228741d fix: Trim spaces from attributes (multi-variant creation) & explicit method for building cache 
- Multiple Item Variants creation fails due to extra spaces in attributes from popup. Clean them before passing to server side
- Mention explicit method to build variants cache to avoid ambiguity between old method path (pre-refactor)
 2022-02-08 11:15:19 +05:30
Saqib Ansari
e93bb8a336 chore: show credit/debit-to account in error message 2022-02-08 10:49:37 +05:30
Ankush Menat
0ca60afc3f
fix: ignore cancelled SLEs (#29679) 2022-02-08 10:24:19 +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
Deepesh Garg
2280ae5554
Merge pull request #29549 from frappe/mergify/bp/develop/pr-29290 
fix: billed amount in delivery note items (backport #29290)
 2022-02-07 23:49:19 +05:30
Deepesh Garg
529cc72863
Merge pull request #29656 from ankush/credit_debit_pr 
fix: dont ignore items that dont have SVD
 2022-02-07 23:46:07 +05:30
Ankush Menat
f82d7eb73f test: commit item/warehouse creation to db 2022-02-07 22:55:56 +05:30
Ankush Menat
43f8ee1dd1 chore: drop dead field from stock reconciliation 2022-02-07 22:55:56 +05:30
Ankush Menat
699519f7b6 test: product bundle reposting 2022-02-07 22:55:56 +05:30
Ankush Menat
853e658dcc test: move bundle info to class variables 2022-02-07 22:55:56 +05:30
Ankush Menat
1022db0474 fix: merge stock ledger item warehouse with doc's 2022-02-07 22:55:56 +05:30
Ankush Menat
e6ab8df8f2 refactor: simplify get_items_and_warehouses 
Also remove dead code related to stock reconciliation_json.
 2022-02-07 22:55:56 +05:30
Ankush Menat
c56d07dee3 fix: consider packed items too when reposting 2022-02-07 22:55:56 +05:30
Deepesh Garg
eab10a13e7
fix: Conflicts 2022-02-07 22:12:27 +05:30
Saqib Ansari
4655e115d0
Merge branch 'develop' into bug_invoice_creation_throws_typeerror 2022-02-07 20:04:59 +05:30
Ritwik Puri
72a812f18b
fix: use item_code instead of parent field in bom_stock_calculated report (#29684) 2022-02-07 19:43:29 +05:30
Deepesh Garg
8417130788
Merge pull request #29660 from abhinavxd/patch-1 
fix: Add missing key in Loan
 2022-02-07 18:44:37 +05:30
Deepesh Garg
ef69d1fd38 test: Add test case for repayment against partially disbursed loans 2022-02-07 17:00:30 +05:30
Deepesh Garg
fab7f90e8f
Merge pull request #29460 from deepeshgarg007/loan_refund_jv 
feat: Refund entry against loans
 2022-02-07 14:37:47 +05:30
Deepesh Garg
8ece2845f2 fix: Add disbursement accounts to tests 2022-02-07 13:50:31 +05:30
Ankush Menat
5e6227e3d8
fix(ux): make stock entry type the title field (#29674) 2022-02-07 13:19:08 +05:30
Deepesh Garg
8d7331de8f Merge branch 'develop' of https://github.com/frappe/erpnext into loan_refund_jv 2022-02-07 12:49:34 +05:30
Deepesh Garg
4284017e9d
fix: Copyright info 2022-02-07 12:26:01 +05:30
Deepesh Garg
cec971b5db
Merge pull request #29349 from alyf-de/disable-item-tax-category 
feat: option to disable Item Tax Template and Tax Category
 2022-02-07 11:01:03 +05:30
Umair Sayed
104a55aff1
feat: Tab views in Stocks and Accounts Settings (#29638) 
* tab views in Stocks and Accounts Settings. Clean-up in Selling and Buying Settings.

* chore: undo changes to creation timestamp

happened because of a bug in fw

Co-authored-by: Umair Sayed <umairsayed@Umairs-MacBook-Air-2.local>
 2022-02-07 10:42:55 +05:30
Deepesh Garg
400b579f1a
Merge pull request #29670 from frappe/mergify/bp/develop/pr-29635 
fix: Incorrect tax template in Sales Invoice via data import (backport #29635)
 2022-02-07 10:42:31 +05:30
Deepesh Garg
ff57450e77 fix: Replace ORM with query builder 2022-02-06 22:56:12 +05:30
Deepesh Garg
36f4fb0585 fix: Incorrect tax template in Sales Invocie via data import 
(cherry picked from commit 20f321a88980d231f52702e3d32e122022316152)
 2022-02-06 16:24:26 +00:00
Rucha Mahabal
4e3a13117e
Merge branch 'develop' into fix-earned-leaves-allocation 2022-02-06 20:31:48 +05:30
Rucha Mahabal
e25544f94e fix(test): add ignore duplicates flag to allocation function 2022-02-06 20:30:46 +05:30
Ankush Menat
f089d39675 refactor: better method name 
Co-authored-by: gavin <gavin18d@gmail.com>
 2022-02-06 20:12:15 +05:30
Ankush Menat
3e5f940686 test: e2e test for LIFO valuation 2022-02-06 20:12:15 +05:30
Ankush Menat
61c5ad44d3 refactor: get incoming fifo/lifo rate functions 
Re-use same logic for computing incoming rate.
 2022-02-06 20:12:15 +05:30