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

96 Commits

Author SHA1 Message Date
Rohit Waghchaure
87405f0753 fix: issue in returning components against the SCO 
(cherry picked from commit 729ce1dc50)
 2025-01-07 13:02:09 +00:00
ruthra kumar
33fc987d95 refactor(test): remove hardcoded names 2024-12-23 14:52:02 +05:30
rs-rethik
4884849f23 test: add unit test to validate journal entry posting date 
(cherry picked from commit c14a2d73bf)
 2024-12-23 08:39:54 +00:00
mergify[bot]
8f811728d9 feat(subcontracting): Added provision to create multiple Subcontracting Orders against a single Purchase Order (backport #44711) (#44782) 
* feat(subcontracting): Added provision to create multiple Subcontracting Orders against a single Purchase Order (#44711)

* feat(subcontracting): Added provision to create multiple Subcontracting Orders from a single Subcontracted Purchase Order

* refactor(new_sc_flow_2): Fixed error thrown by semgrep

(cherry picked from commit 3eba6bf3dd)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.js
#	erpnext/buying/doctype/purchase_order/test_purchase_order.py
#	erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
#	erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json
#	erpnext/subcontracting/doctype/subcontracting_order_service_item/subcontracting_order_service_item.json

* feat(subcontracting): Added provision to create multiple Subcontracting Orders against a single Purchase Order (#44711)

* feat(subcontracting): Added provision to create multiple Subcontracting Orders from a single Subcontracted Purchase Order

* refactor(new_sc_flow_2): Fixed error thrown by semgrep

* fix: Resolved errors and removed code from develop branch merged by mistake

---------

Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2024-12-20 12:18:01 +05:30
Ninad1306
558d49b3d3 test: validate buying workflow 
(cherry picked from commit 94d3fc9fde)
 2024-12-03 08:48:52 +00:00
Nabin Hait
9ac87bd3b1 fix: rounding issue of required qty in subcontracting order (#43908) 
* fix: rounding issue of required qty in subcontracting order

* fix: uom issue in test case

* fix: test case

* fix: restored report tests for manufacturing
 2024-10-30 11:25:08 +05:30
Ninad Parikh
6e833cce6a fix: Update Rate as per Valuation Rate for Internal Transfers only if Setting is Enabled (#42050) 
* fix: update rate for internal transfers only if settings enabled

* fix: better naming

* fix: create field for storing incoming rate in purchase doctypes

* fix: use qty instead of qty_in_stock_uom

* fix: add description, refactor for readablility

* test: test case to validate internal transfers at arm's length price

* fix: minor fix

* fix: deletion of code not required

---------

Co-authored-by: Smit Vora <smitvora203@gmail.com>
(cherry picked from commit 723ac0ffc4)
 2024-07-26 12:58:12 +00:00
ruthra kumar
6dbe820416 refactor(test): enfore use of customer/supplier master 
While using advance accounts in foreign currency, always use
Customer/Supplier master to maintain them

(cherry picked from commit 64e63887be)
 2024-06-22 23:58:11 +00:00
ruthra kumar
88e1c28e7d test: advance against purchase invoice 
(cherry picked from commit 90c84822d0)
 2024-06-22 23:58:09 +00:00
ruthra kumar
259d7cde39 test: exc gain/loss booking on advances under asset/liability 
(cherry picked from commit 827d67d02f)
 2024-06-22 23:58:09 +00:00
ruthra kumar
6ebd4ba2cc refactor(test): simpler create_account helper method 
(cherry picked from commit 475e0ddeee)
 2024-06-22 23:58:09 +00:00
ruthra kumar
59950290a2 test: exc gain/loss journals booking in Payable accounts 
(cherry picked from commit 8821c98625)
 2024-04-16 05:29:53 +00:00
Akhil Narang
7828eee014 fix(treewide): manual ruff fixes 
(cherry picked from commit f63396ef47)
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-04-10 16:11:10 +05:30
Akhil Narang
960ef14b7a refactor(treewide): formatting and ruff fixes, + manually enabled F401 
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-04-10 14:15:58 +05:30
ruthra kumar
4b78eb7e76 test: payment against JE reconciliation with different rates 
(cherry picked from commit fe84558b77)
 2024-04-05 05:04:02 +00:00
ruthra kumar
fd33437d7a test: varying posting date for gain loss journal 
(cherry picked from commit 514d5434a3)
 2024-03-28 10:59:24 +00:00
Rohit Waghchaure
9ec24bcc6c fix: use serial/batch fields for subcontracting receipt and in transit stock entry 
(cherry picked from commit 3423334e4f)
 2024-03-24 10:34:52 +00:00
Deepesh Garg
313350534f fix: Remove custom queries for customer 
(cherry picked from commit 60ba25caf2)
 2024-03-16 14:34:36 +00:00
Deepesh Garg
2512d4c7f2 chore: Remove custom party queries 
(cherry picked from commit c9623b6fd6)
 2024-03-16 14:34:36 +00:00
ruthra kumar
e5fdca7b05 test: gain/loss on Journals against Journals 
(cherry picked from commit 8a5078b826)
 2024-03-02 10:08:19 +00:00
mergify[bot]
2ee51d36ff fix: set batch created from bundle to batch field in stock transaction (backport #39966) (#39987) 
fix: set batch created from bundle to batch field in stock transaction (#39966)

* fix: set batch created from bundle to batch field in stock transaction

* fix: validation for serial and batch no

(cherry picked from commit 4b24fcd221)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-21 00:04:01 +05:30
ruthra kumar
83bf2c17e0 refactor(test): Forex Credit Note cancellation against Invoice 
(cherry picked from commit 2f676ced5c)
 2024-02-07 15:00:48 +00:00
mergify[bot]
a118417645 refactor: provision to filter on dimensions in reconciliation tool (#39054) 
* refactor: dimensions section in allocation table in reconciliation

(cherry picked from commit 1cde804c77)

# Conflicts:
#	erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json

* refactor: update dimension doctypes in hooks

(cherry picked from commit cfb3d87267)

* refactor: dimensions filter section in payment reconciliation

(cherry picked from commit 20e0acc20a)

* refactor: column break in dimension section

(cherry picked from commit 20576e0f47)

# Conflicts:
#	erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json

* refactor: handle dimension filters

(cherry picked from commit c1fe4bcc64)

* refactor: pass dimension filters to query

(cherry picked from commit ff60ec85b8)

* refactor: set query filters for dimensions

(cherry picked from commit ad8475cb8b)

* refactor: pass dimension details to query

(cherry picked from commit 5dc22e1811)

* refactor: replace sql with query builder for Jourals query

(cherry picked from commit 9c5a79209e)

* refactor: partial change on outstanding invoice popup

(cherry picked from commit 2154502955)

* fix: typo's and parameter changes

(cherry picked from commit 0ec17590ae)

* refactor: Credit Note and its Exc gain/loss JE inherits dimensions

(cherry picked from commit ab939cc6e8)

* refactor: apply dimension filters on cr/dr notes

(cherry picked from commit 188ff8cde7)

* chore: test dimension filter output

(cherry picked from commit e3c44231ab)

* test: dimension inheritance for cr note reconciliation

(cherry picked from commit ba5a7c8cd8)

* refactor: pass dimension values to Gain/Loss journal

(cherry picked from commit c44eb432a5)

# Conflicts:
#	erpnext/accounts/utils.py

* test: dimension inheritance in PE reconciliation

(cherry picked from commit 6148fb024b)

* refactor: pass dimensions on advance allocation

(cherry picked from commit cbd443a78a)

* test: dimension inheritance on adv allocation

(cherry picked from commit fcf4687c52)

* refactor: dynamic dimension filters in pop up

(cherry picked from commit f8bbb0619c)

* refactor: update dimensions, only if provided

(cherry picked from commit ec0f17ca8b)

* refactor: handle dynamic dimension in order query

(cherry picked from commit 7c2cb70387)

* chore: resolve conflicts

---------

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
 2024-01-28 13:50:08 +05:30
ruthra kumar
1b8f572e80 fix(test): test case for project query 
(cherry picked from commit 3349dde5e2)
 2024-01-16 10:55:36 +00:00
rohitwaghchaure
71fe2bcc28 fix: incorrect ordered qty for Subcontracting Order (#38415) 
(cherry picked from commit fddf341f44)
 2023-11-29 06:52:36 +00:00
ruthra kumar
0366928db5 test: cost center inheritance from payment 2023-09-03 09:21:26 +05:30
ruthra kumar
79fa562004 test: extend test to cancellation 2023-09-02 14:43:25 +05:30
ruthra kumar
cb6da6ec59 test: deduplicate gain/loss JE on reconciling journals against inv 2023-09-02 13:29:33 +05:30
s-aga-r
305d39f6a1 test: add test case for Subcontract PO update items 2023-08-22 18:24:30 +05:30
ruthra kumar
466734fb4b fix(test): replace hardcoded reference to adv with dynamic one 2023-08-05 14:11:57 +05:30
ruthra kumar
804afaa647 chore(test): use existing company for unit test 2023-07-27 09:30:38 +05:30
ruthra kumar
47bbb37291 chore: use frappetestcase 2023-07-27 05:54:13 +05:30
ruthra kumar
ae424fdfed test: assert ledger after cr note cancellation 2023-07-26 22:33:58 +05:30
ruthra kumar
e3d2a2c5bd test: cr notes against invoice 2023-07-26 22:33:58 +05:30
ruthra kumar
70dd9d0671 chore(test): fix broken unit test 2023-07-26 22:33:58 +05:30
ruthra kumar
f3363e813a test: journals against sales invoice 2023-07-26 22:33:58 +05:30
ruthra kumar
5695d6a5a6 refactor: unit tests for journals 2023-07-26 22:33:58 +05:30
ruthra kumar
73cc1ba654 refactor: assert payment ledger outstanding in both currencies 2023-07-26 22:33:58 +05:30
ruthra kumar
6e18bb6456 refactor: cancel gain/loss JE on Journal as payment cancellation 2023-07-26 22:33:58 +05:30
ruthra kumar
5e1cd1f227 test: different scenarios for exchange booking 2023-07-26 22:33:58 +05:30
Ankush Menat
a3ea985348 refactor: Use db.set_single_value (#35668) 
I just applied semgrep autofix. Untested completed, review before merging.

```yaml
- id: frappe-set-value-semantics
  patterns:
    - pattern-either:
      - pattern: frappe.db.set_value($DOCTYPE, None, $...AFTER)
      - pattern: frappe.db.set_value($DOCTYPE, $DOCTYPE, $...AFTER)
  fix: frappe.db.set_single_value($DOCTYPE, $...AFTER)
  message: |
    If $DOCTYPE is a single doctype then using `frappe.db.set_value` is discouraged for setting values in DB. Use db.set_single_value for single doctype instead.
  languages: [python]
  severity: ERROR
```
 2023-06-13 17:30:38 +05:30
Rohit Waghchaure
e88c5d6d90 fix: travis for subcontracting module 2023-06-02 17:14:18 +05:30
Sagar Sharma
d6433f803b refactor(minor): rename function to be more descriptive 2023-05-12 11:45:33 +05:30
Sagar Sharma
324bfa9fde test: fix test case 2022-11-05 16:18:31 +05:30
Sagar Sharma
2effbb55ae test: Add test case for Subcontracting Receipt GL Entries 2022-08-22 22:14:56 +05:30
Sagar Sharma
c247cf728c chore: add test for additional-cost 2022-08-19 11:46:36 +05:30
s-aga-r
6d89b2fa28 refactor: backport old subcontracting code 2022-06-20 23:10:02 +05:30
s-aga-r
9a68af36ec Merge branch 'develop' into subcontracting 2022-06-14 19:13:10 +05:30
Sagar Sharma
213113bc00 Merge branch 'develop' into subcontracting 2022-05-20 12:13:13 +05:30
Sagar Sharma
574181f3d7 test: SubcontractingController 2022-05-20 10:45:33 +05:30