schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,284 Commits 322 Branches 1,581 Tags
eb36ebee8fbd9eb2dd569a4d56b6158568e954cb
Commit Graph

39284 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
eb36ebee8f fix: Resolve conflicts 2022-02-07 18:49:57 +05:30
Deepesh Garg
25012399fa fix: Add disbursement accounts to tests 
(cherry picked from commit 8ece2845f2)
 2022-02-07 09:09:20 +00:00
Deepesh Garg
4ab6994b3d feat: Refund entry against loans 
(cherry picked from commit c68c70f8bc)

# Conflicts:
#	erpnext/loan_management/doctype/loan/loan.json
#	erpnext/patches.txt
 2022-02-07 09:09:19 +00:00
Ankush Menat
e618571fb3 fix: dont show cancelled PO items in plan report 
(cherry picked from commit 6459ceaea1)
 2022-02-06 20:07:22 +05:30
Marica
c99a14a7f3 Merge pull request #29646 from frappe/mergify/bp/version-13-pre-release/pr-29642 
fix: Regenerate packed items on newly mapped doc (backport #29642)
 2022-02-04 23:25:17 +05:30
marination
db24fca8c1 fix: Regenerate packed items on newly mapped doc 
- Cannot determine action on newly mapped DN that hasnt been inserted
- Rows could have been deleted, updated, added, etc. before first save
- In this case , reset packing table

(cherry picked from commit bd41a99c8a)
 2022-02-04 17:33:17 +00:00
Marica
e095e27cb9 Merge pull request #29629 from frappe/mergify/bp/version-13-pre-release/pr-29456 
fix: Incorrect packing list for recurring items & code cleanup (backport #29456)
 2022-02-04 10:17:46 +05:30
marination
bdfb478b3b fix: (Linter) import sequence 
(cherry picked from commit f18ec2d947)
 2022-02-03 16:41:20 +00:00
marination
2428812dcc test: Packed Items test file 
(cherry picked from commit 4e7b4dc9a8)
 2022-02-03 16:41:20 +00:00
marination
677a3975ba refactor: Price fetching and updation logic 
- fetch price from price list, use item master valuation rate as fallback fo0r packed item
- use a item code, item row name map to maintain cumulative price
- reset table if item in a row is replaced
- loop over items table only to set price, lesser iterations than packed items table

(cherry picked from commit 2f4d266ee1)
 2022-02-03 16:41:19 +00:00
marination
5d37c9c38d chore: Break updation logic into smaller functions 
- Smaller functions for updation
- All calls visible from parent function to avoid context switching due to nested calls

(cherry picked from commit 2c14ab0439)
 2022-02-03 16:41:19 +00:00
marination
b836d4fe25 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)

(cherry picked from commit 4c677eafe9)
 2022-02-03 16:41:18 +00:00
marination
153fd355bc chore: SQL to QB & accomodate Update Items 
- `doc_before_save` does not exist via Update Items (updates stuff in the backend so doc isn't considered unsaved/dirty)
- converted more raw sql to qb and ORM

(cherry picked from commit f8a5786542)
 2022-02-03 16:41:18 +00:00
marination
350cac9207 fix: Incorrect packing list for recurring items & code cleanup 
- Fix Incorrect packing list for recurring items in the Items table
- Re-organised functions based on external use and order of use
- Deleted `clean_packing_list` function and reduced no.of loops
- Raw SQL to QB
- Minor formatting changes

(cherry picked from commit 3f48fc1898)
 2022-02-03 16:41:17 +00:00
mergify[bot]
c054d1f7ee fix: ignore empty customer/supplier in item query (#29610) (#29614) 
* fix: dont try to filter by customer/supplier if None

* test: item query with emtpy supplier

(cherry picked from commit 41a95e5624)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-02-03 14:44:33 +05:30
Deepesh Garg
68b337316a Merge pull request #29573 from frappe/mergify/bp/version-13-pre-release/pr-29561 
feat: Provisional accounting for expenses (backport #29451) (backport #29561)
 2022-02-01 20:39:09 +05:30
Deepesh Garg
1ab3714fd0 chore: Resolve conflicts 2022-02-01 19:41:00 +05:30
Deepesh Garg
dbb3ea3a6e chore: fix tests 
(cherry picked from commit 640b2d57de)
 2022-02-01 12:42:09 +00:00
Deepesh Garg
abfccde664 fix: Linting Issues 
(cherry picked from commit c71dbda166)
 2022-02-01 12:42:09 +00:00
Deepesh Garg
293ec00023 chore: Resolve conflicts 
(cherry picked from commit aa16a4bb5f)

# Conflicts:
#	erpnext/patches.txt
 2022-02-01 12:42:09 +00:00
Deepesh Garg
061a569f4d feat: Provisional accounting for expenses (#29451) 
* feat: Provisonal accounting for expenses

* fix: Method for provisional accounting entry

* chore: Add test case

* fix: Remove test case

* fix: Use company doctype

* fix: Add provisional expense account field in Purchase Receipt Item

* fix: Test case

* fix: Move provisional expense account to parent

* fix: Patch

(cherry picked from commit 528c71382f)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
#	erpnext/patches.txt
#	erpnext/setup/doctype/company/company.json
#	erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
#	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
(cherry picked from commit a54c84728f)

# Conflicts:
#	erpnext/patches.txt
 2022-02-01 12:42:08 +00:00
rohitwaghchaure
8c0613a600 Merge pull request #29542 from rohitwaghchaure/merge-branch-hotfix-to-pre-release-for-13-20 
chore: Merge branch 'version-13-hotfix' into 'version-13-pre-release'
 2022-01-31 20:16:11 +05:30
Rohit Waghchaure
862961d92e chore: Merge branch 'version-13-hotfix' into 'version-13-pre-release' 2022-01-31 19:38:44 +05:30
mergify[bot]
5ac11a4ba5 refactor!: dynamically compute bom_level (backport #29522) (#29540) 
* refactor!: dynamically compute bom_level

(cherry picked from commit 157b4b33fe)

# Conflicts:
#	erpnext/manufacturing/doctype/bom/bom.py
#	erpnext/patches.txt

* fix(ux): sort multi-production item plans correctly

(cherry picked from commit d38fd8635c)

* fix: conflicts

* fix: removed set_bom_level

* fix: conflict

Co-authored-by: Ankush Menat <ankush@frappe.io>
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2022-01-31 17:11:43 +05:30
Ankush Menat
2bc42759d2 Merge pull request #29534 from frappe/mergify/bp/version-13-hotfix/pr-29519 
fix: bin uniqueness (backport #29519)
 2022-01-31 15:56:12 +05:30
mergify[bot]
9425ca07f5 chore: revert manual handling of stock level section (#29537) (#29538) 
(cherry picked from commit a254201696)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-01-31 15:43:08 +05:30
Ankush Menat
2b868e7f56 fix: update reserved qty for production/ s/c 
(cherry picked from commit 0a15334464)
 2022-01-31 09:00:20 +00:00
Ankush Menat
f99f537b57 refactor: patch for fixing broken bins 
fix(patch): delete fully broken bins

if bin doesn't have item_code or warehouse then it's not recoverable.

(cherry picked from commit c2ecc7a2d1)
 2022-01-31 09:00:19 +00:00
Sagar Sharma
a7b30d9197 fix(patch): patch duplicate bins 
(cherry picked from commit 7ff3ca25e5)
 2022-01-31 09:00:18 +00:00
Ankush Menat
b3f36efa8f fix: ignore None item/wh whie updating reservation 
(cherry picked from commit a1e7771cdd)
 2022-01-31 09:00:17 +00:00
Ankush Menat
8aa6423093 fix: add unique constraint on bin at db level 
(cherry picked from commit 08810dbcce)
 2022-01-31 09:00:16 +00:00
Saqib Ansari
144c8ec904 Merge pull request #29528 from frappe/mergify/bp/version-13-hotfix/pr-29454 
fix(sales order): incorrect no. of items fetched while creating dn (backport #29454)
 2022-01-31 12:16:30 +05:30
Saqib Ansari
bed7201efe fix: merge conflicts 2022-01-31 11:40:59 +05:30
Saqib Ansari
e6f2343fb4 chore: add comment 
(cherry picked from commit 0b9a850a17)
 2022-01-31 06:09:26 +00:00
Saqib Ansari
9da63f2e79 fix(sales order): incorrect no. of items fetched while creating dn 
(cherry picked from commit a73ad6759d)

# Conflicts:
#	erpnext/selling/doctype/sales_order/sales_order.js
 2022-01-31 06:09:26 +00:00
Saqib Ansari
f31e52123a fix: qty filter not working if apply_multiple_pricing_rules is enabled 2022-01-31 11:37:33 +05:30
Deepesh Garg
2c83f18864 Merge pull request #29518 from frappe/mergify/bp/version-13-hotfix/pr-29499 
fix(India): Tax calculation for overseas suppliers (backport #29499)
 2022-01-31 11:06:51 +05:30
mergify[bot]
0fb4e81a30 fix: cost of poor quality report time filters not working (#28958) (#29521) 
* fix: cost of poor quality report time filters not working

* chore:update cost of poor quality report to use query builder

* fix: linter warnings

* chore: updated report query

* chore: added test filters

* fix : cleared linter warnings

* chore: formatting

* refactor: query generation

- optionally apply date filters
- join instead of expensive sub-query
- return as dictionary

* test: simplify test

Co-authored-by: Ankush Menat <ankush@frappe.io>
(cherry picked from commit 0f7c2a19de)

Co-authored-by: aaronmenezes <ron2805@gmail.com>
 2022-01-30 20:49:41 +05:30
Deepesh Garg
dc82becbd2 fix(India) Tax calculation for overseas suppliers 
(cherry picked from commit e45c38337c)
 2022-01-30 07:44:43 +00:00
Ankush Menat
70dc77305b fix: work order serial no allows storing whitespace 
(cherry picked from commit 43bd88e741)
 2022-01-29 14:27:09 +05:30
Ankush Menat
db3eef9a8b fix: extend sr_no cleanup to packed items too 
(cherry picked from commit e177c5277f)
 2022-01-29 14:27:09 +05:30
Ankush Menat
cc08125f39 refactor: reusable clean_serial_nos 
(cherry picked from commit b20df3745e)
 2022-01-29 14:27:09 +05:30
Ankush Menat
997ddbea78 fix: ignore alternate item while checking pending qty 
(cherry picked from commit 14e3e163ae)
 2022-01-29 14:02:10 +05:30
Deepesh Garg
ebe9599dda Merge pull request #29428 from deepeshgarg007/shipping_rule_apply 
fix: Add shipping charges to taxes only if applicable
 2022-01-29 12:56:49 +05:30
Saqib Ansari
8535ad5294 chore: undo unnecessary changes 
(cherry picked from commit 3da2cac772)
 2022-01-29 07:14:23 +00:00
Saqib Ansari
eeb2402764 chore: rename redefinition of multiple pricing rule test 
(cherry picked from commit 5a7a9a598b)
 2022-01-29 07:14:22 +00:00
Saqib Ansari
e7e0359e3e test: add test_multiple_pricing_rules 
(cherry picked from commit c0d1f4869f)
 2022-01-29 07:14:22 +00:00
Saqib Ansari
c24724ac7a fix: qty filter not working if apply_multiple_pricing_rules is enabled 
(cherry picked from commit 1e17d6a607)
 2022-01-29 07:14:22 +00:00
Deepesh Garg
5f9fdba49e Merge branch 'version-13-hotfix' into shipping_rule_apply 2022-01-29 12:41:14 +05:30
Ankush Menat
5dd443eeb0 test: delete data after running test 
[skip ci]
 2022-01-28 13:52:20 +05:30