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

33031 Commits

Author SHA1 Message Date
ruthra kumar
3cd34ebab6 fix: 'attribute error' on AR/AP report with delivery note filter 2022-06-27 17:29:25 +05:30
Rucha Mahabal
ba8ea0f4fb chore: Remove HR templates and references from other workspaces 
- Removed template `employees_to_mark_attendance.html`

- Removed HR references from ERPNext Settings and Home workspaces
 2022-06-27 16:56:24 +05:30
Ankush Menat
dd11f26eba
fix: dont update RM items table if not required (#31408) 
Currently on PO update RM item table is auto computed again and again,
if there was any transfer/consumption against that then it will be lost.

This change:
1. Disables updating RM table if no change in qty of FG was made. Since
   RM table can't possibly be different with same FG qty.
2. Blocks update completely if qty is changed and RM items are already
   transferred.
 2022-06-27 15:55:08 +05:30
Ankush Menat
20dac08f5f
refactor: clean up product bundle client side code (#31455) 
refactor: clean up product bundle cient side code

- Remove deprecated CUR_FRM scripts
- Remove client side fetches and move it to doctype schema
 2022-06-27 15:54:54 +05:30
Rucha Mahabal
1d5c8660bb chore: Remove regional HR reports, custom field setups 
- Removed reports Provident Fund Deductions, Professional Tax Deductions, helper js file `salary_slip_deductions_report_filters.js`

- Removed Gratuity rules setup for India and UAE

- Removed custom field setup for India

- Moved all setups to the HRMS app
 2022-06-27 15:12:05 +05:30
marination
9541354ec7 chore: Make image field obsolete in Website Item (redundant) 
- Delete Image field and set `website_image` as form's image field for uploads
- Remove instances of `image` field access via Website Item
- Item -> Web Item via Desk: Map Item's `image` to Web Item's `website_image`
- Item -> Web Item via patch: `website_image` will be mapped with thumbnail
- Remove magic that auto-sets `website_image` from `image` in Website Item
 2022-06-27 13:00:00 +05:30
Sagar Vora
0aafc75c90 fix: add missing print format 2022-06-26 18:36:00 +05:30
Sagar Vora
85c4c342d8 fix: improve patches 2022-06-26 18:30:54 +05:30
Sagar Vora
7f390fb755 Merge branch 'develop' into remove-india 2022-06-26 18:10:44 +05:30
Smit Vora
64de0d06ad patch: remove custom field creation patch 2022-06-26 11:56:06 +05:30
Vladislav
7c682c55fa
Update ru.csv 2022-06-26 01:36:11 +03:00
Vladislav
99504ebe52
Update ru.csv 2022-06-26 00:15:30 +03:00
Deepesh Garg
904e69e541
Merge branch 'develop' into quotation_order_item_syn 2022-06-25 19:46:20 +05:30
Deepesh Garg
9c1eb770ba
Merge pull request #31442 from ruthra-kumar/incorrect_outstanding_on_multiple_cost_centers 
fix: incorrect outstanding for invoice
 2022-06-25 19:42:14 +05:30
Nabin Hait
f72d5506de fix: get_all replace by sql 2022-06-25 15:08:45 +05:30
Nabin Hait
2d226be3c4 fix: Made no of employees a select field 2022-06-25 11:40:23 +05:30
Nabin Hait
483fc420a1 test: invoice from timesheet 2022-06-25 11:40:23 +05:30
Nabin Hait
6a0d0a338d fix: Test cases removed related to copying comments from opportunity to quotation 2022-06-25 11:40:23 +05:30
Nabin Hait
82bf59e2a3 fix: test case 2022-06-25 11:40:23 +05:30
Nabin Hait
d8163f3e47 fix: set exchange rate 2022-06-25 11:40:23 +05:30
Nabin Hait
f904ac599e fix: merge conflicts and sider issues 2022-06-25 11:40:23 +05:30
Vladislav
49aa7634a3
Update ru.csv 2022-06-25 01:32:24 +03:00
Smit Vora
8fb0997cf1 patch: remove related docs and warn 2022-06-24 21:59:28 +05:30
Deepesh Garg
6acd0325be fix: General Ledger and TB opening entries mismatch issues 2022-06-24 21:45:05 +05:30
Deepesh Garg
58fe220479 fix: Quotation and Sales Order item sync 2022-06-24 19:43:50 +05:30
ruthra kumar
321fea322c test: invoice outstanding when gl's are split on cost center allocat 2022-06-24 17:47:11 +05:30
Sagar Vora
b6133c300e test: create TDS payable account 2022-06-24 16:46:52 +05:30
Sagar Vora
4a2a02286a test: create tax withholding category instead of updating 2022-06-24 15:49:19 +05:30
Sagar Vora
69ff61c838 fix: add Lower Deduction Certificate to the Accounting workspace for now 2022-06-24 15:12:43 +05:30
Sagar Vora
9b057d15b2 fix: move hooks to reduce diff 2022-06-24 15:04:28 +05:30
Rucha Mahabal
c619b58ba9 fix: remove HR/Payroll references from form dashboards 
- Employee, Holiday List, Project, Task, Timesheet
 2022-06-24 15:03:16 +05:30
Vladislav
913b393969
Update ru.csv 2022-06-24 11:16:39 +03:00
Vladislav
2826056d41
Update ru.csv 2022-06-24 11:14:57 +03:00
Smit Vora
3c9eea54a5 fix: remove student naming series 2022-06-24 13:42:07 +05:30
Sagar Vora
593147d337 test: move code to ensure fixtures get created 2022-06-24 14:37:11 +05:30
Sagar Vora
2e6919b7be fix: remove more India patches 2022-06-24 14:14:12 +05:30
Sagar Vora
ff10f557c0 test: use Sales Expenses instead of VAT to test disabled account 2022-06-24 13:49:20 +05:30
Sagar Vora
12b7e14fde chore: keep back code to be a part of other apps / to be ported later 2022-06-24 13:38:13 +05:30
ruthra kumar
71f6f78d94 fix: incorrect outstanding for invoice 2022-06-24 13:36:15 +05:30
Rucha Mahabal
39e0d22044 chore: Remove HR related field references from Employee, Department form scripts 
- removed approver fields and payroll cost center from Employee master

- removed query filter code for HR related fields from employee and department form scripts

- removed `update_approver_role`
 2022-06-24 13:14:26 +05:30
Sagar Vora
0810674c8a Merge remote-tracking branch 'upstream/develop' into remove-india 2022-06-24 13:08:40 +05:30
Marica
1d683ca9f2
Merge pull request #31421 from s-aga-r/fix/production-plan/test/planned-qty 
fix: add UOM validation for planned-qty
 2022-06-24 12:40:03 +05:30
Vladislav
f59a6248bc
Update ru.csv 
- fix logic
- add translate
 2022-06-24 01:02:41 +03:00
Rucha Mahabal
eac58abcc5 chore: Remove HR related reports from other modules 
- Project Profitability report: Projects

- Employee Hours Utilization Based on Timesheet: Projects

- Unpaid Expense Claims: Accounts
 2022-06-23 20:50:55 +05:30
Rucha Mahabal
edb528ce41 chore: Remove code for Expense Claim from Project, Task, Delivery Trip 
- Remove `total_expense_claim` field from Project and Task, will be installed with hrms setup

- Remove Expense Claim calculation from `update_costing` in project

- Remove `update_total_expense_claim` from task

- Remove Expense Claim references from employee form tour

- Remove 'Make Expense Claim' button from Delivery Trip, will only be available if hrms is installed

- Update delivery trip tests
 2022-06-23 19:48:42 +05:30
Rucha Mahabal
1ff0e4519f chore: Extract Expense Claim, FnF, Gratuity, Employee Advance related code from accounting 
- Added hooks `advance_payment_doctypes`, `invoice_doctypes`, `period_closing_doctypes` for other apps to extend accounting functionality

- Removed `set_query` code from `journal_entry.js` and `payment_entry.js`

- removed `update_status_for_full_and_final_statement` trigger on JE submission/cancellation

- refactored `payment_entry.py`: split functions for validating reference doctypes for easy overriding, removed hrms references from `get_reference_details` and `get_payment_entry`

- removed dead code: functions `get_bill_no_and_update_amounts`, `get_total_amount_exchange_rate_base_on_currency`, `get_total_amount_exchange_rate_for_employee_advance`, `get_amounts_based_on_ref_doc`, `get_amounts_based_on_reference_doctype`
 2022-06-23 16:17:34 +05:30
GangaManoj
416d578290 fix: Add missing comma 2022-06-23 15:14:31 +05:30
GangaManoj
1b1786532a test: Test monthly depreciation by Written Down Value method 2022-06-23 15:14:31 +05:30
GangaManoj
2b7ab72a72 fix: Convert string to datetime object 2022-06-23 15:14:31 +05:30
GangaManoj
e62beaefc1 test: Test if final day of the month is taken if depr_start_date is the last day of its month 2022-06-23 15:14:31 +05:30
GangaManoj
154e258ad0 fix: Get last day of the monthif depr posting date is the last day of its month 2022-06-23 15:14:31 +05:30
GangaManoj
b07aae4da5 fix: Correct pro-rata amount calculation 2022-06-23 15:14:31 +05:30
GangaManoj
2d9153ea30 fix: Remove misleading comment 2022-06-23 15:14:31 +05:30
GangaManoj
ab13a178b5 fix: Replace asset life with total no of depreciations 2022-06-23 15:14:31 +05:30
Sagar Sharma
73a15adc67
Merge branch 'develop' into fix/production-plan/test/planned-qty 2022-06-23 11:20:22 +05:30
Deepesh Garg
79d5d35df9
Merge pull request #31395 from nihantra/bank_clear_summ 
fix: filter set in Bank Clearance Summary
 2022-06-23 10:54:56 +05:30
Sagar Sharma
70bc51a8fc
Merge branch 'develop' into fix/production-plan/test/planned-qty 2022-06-22 15:33:08 +05:30
s-aga-r
00807abe31 fix: add UOM validation for planned-qty 2022-06-22 14:28:17 +05:30
Deepesh Garg
db2484b6b2
Merge pull request #31418 from ruthra-kumar/payment_ledger_migration_logic_bug 
fix: handle empty values("") in against_voucher columns on gl migration
 2022-06-22 12:51:21 +05:30
Marica
46d02ec4b2
Merge branch 'develop' into bom-update-log-cleanup-perf 2022-06-22 11:50:06 +05:30
Marica
55d67a0d09
Merge pull request #31420 from HarryPaulo/translate-status-filter-orders 
fix: translation for filter status on report
 2022-06-22 11:45:59 +05:30
hrzzz
8b1ff96e30 fix: translation for filter status on report 2022-06-21 15:10:19 -03:00
rohitwaghchaure
186224a12a
Merge branch 'develop' into fixed-transferred-materials-are-not-consumed 2022-06-21 22:45:05 +05:30
ruthra kumar
5826b7b071 fix: identify empty values "" in against_voucher columns 2022-06-21 19:50:50 +05:30
Vladislav
ce1b4e40a1
fix: update ru translate (#31404) 
* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

fix logic

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv
 2022-06-21 19:25:05 +05:30
Rucha Mahabal
f6fbcc99a3 chore: Removed payroll dependencies from Loan Management, moved to hrms app 
- Salary Slip Loan dt moved to hrms, removed from erpnext app

- Repay from Salary field removed from Loan and Loan Repayment, installed on hrms app setup

- fixed references to salary slip loan fields
 2022-06-21 18:13:01 +05:30
Ankush Menat
e866ec6e28
Merge pull request #31412 from s-aga-r/fix/bom/default 
fix: set default_bom for item
 2022-06-21 16:42:38 +05:30
s-aga-r
dc2830da4d fix: set default_bom for item 2022-06-21 15:13:01 +05:30
marination
4cf2225a29 chore: Implement Log clearing interface in BOM Update Log 
- Implement Log clearing interface in BOM Update Log
- Add additional info in sidebar: Log clearing only happens for 'Update Cost' type logs
- 'Replace BOM' logs have important info and is used in BOM timeline, so we'll let users decide if they wanna keep or discard it
 2022-06-21 14:10:59 +05:30
Sagar Sharma
912d26361d
Merge branch 'develop' into fixed-transferred-materials-are-not-consumed 2022-06-21 13:23:37 +05:30
Marica
5ae8f5d4b8
Merge branch 'develop' into bom-update-log-cleanup-perf 2022-06-21 11:01:03 +05:30
Deepesh Garg
f572c20009
Merge branch 'develop' into internal_trasfer_precision_loss 2022-06-21 10:45:02 +05:30
s-aga-r
f6ef3068d7 Merge branch 'develop' into subcontracting 2022-06-20 23:10:31 +05:30
s-aga-r
6d89b2fa28 refactor: backport old subcontracting code 2022-06-20 23:10:02 +05:30
barredterra
e2295b4e2f fix: apply price list rate 2022-06-20 18:52:40 +02:00
Deepesh Garg
46e6c2cd0f Merge branch 'develop' of https://github.com/frappe/erpnext into sales_exchange_rate_validation 2022-06-20 22:00:49 +05:30
Deepesh Garg
8f37393044 test: Add test case 2022-06-20 22:00:32 +05:30
marination
0320b59ea6 chore: Clear Progress section for completed logs & on_submit UX 
- Delete `BOM Update Batch` table on 'Completed' log, to save space
- Hide Progress section on 'Completed' log
- Enqueue `on_submit` for 'Update Cost' job, getting leaf boms could take time for huge DBs. Users have to wait for screen to unfreeze.
- Add error handling to `process_boms_cost_level_wise` (Called via cron job and on submit, both in background)
 2022-06-20 16:25:34 +05:30
Vladislav
b5e22c8e16
Update ru.csv 2022-06-19 21:54:06 +03:00
Sagar Vora
e48a8cd1e8 fix: remove india hook 2022-06-19 23:20:28 +05:30
Sagar Vora
33b54c50ea chore: remove ITC patch 2022-06-19 23:18:04 +05:30
Sagar Vora
ec9861266e Merge remote-tracking branch 'upstream/develop' into remove-india 2022-06-19 22:57:22 +05:30
Deepesh Garg
f337213f33 fix(India): Discounts in E-Invoicing 2022-06-19 21:19:02 +05:30
Deepesh Garg
169ff5a0dd feat: Cash and Non trade discounts in Sales Invoice 2022-06-19 21:18:12 +05:30
Deepesh Garg
9aea017990
Merge pull request #31136 from ruthra-kumar/refactor_payment_reconciliation_tool 
refactor: Payment Reconciliation tool will use Payment Ledger
 2022-06-17 21:40:47 +05:30
Conor
ea28ed1bb3
refactor: if() to CASE WHEN (#31360) 
* refactor: if() to CASE WHEN

* fix: remove duplicate order by

* fix: remove extraneous table

* style: reformat to black spec

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-06-17 21:17:48 +05:30
Deepesh Garg
4a90cd6d54
Merge branch 'develop' into refactor_payment_reconciliation_tool 2022-06-17 21:10:48 +05:30
Deepesh Garg
e457288dba chore: fix condition 2022-06-17 18:56:53 +05:30
Deepesh Garg
02f9441e1a fix: Quotation lost update 2022-06-17 18:54:42 +05:30
Nihantra C. Patel
0097a2b60c
Update bank_clearance_summary.py 2022-06-17 18:35:11 +05:30
ruthra kumar
3a238b4daa docs: specification of payment ledger 2022-06-17 17:57:07 +05:30
ruthra kumar
7312f22f35 refactor: update voucher outstanding from payment ledger 
Outstanding amount is updated from payment ledger, only for
receivable/payable accounts. For remaining account types, update happens
from GL Entry.
 2022-06-17 17:57:07 +05:30
ruthra kumar
524c175cf0 refactor: delink gl entry from reconciliation 2022-06-17 17:57:07 +05:30
ruthra kumar
ae8aa8f3e7 refactor: 'get outstanding invoices' popup in payment entry 
Payment entry has option to select outstanding invoices using a popup
form. This change refactors the pop to use payment ledger to fetch +ve
outstanding invoices.
 2022-06-17 17:57:07 +05:30
ruthra kumar
8c87674c62 refactor: outstanding_invoice function and helper class 
outstanding invoice function has been refactored to use payment ledger
 2022-06-17 17:57:07 +05:30
ruthra kumar
9cdc388c97 test: payment reconciliation tool 
unit test cases for partial reconciliation, return invoice against
invoice, invoice against journals and journal against journal have
been added
 2022-06-17 17:57:07 +05:30
ruthra kumar
65f47bca31 refactor: payment reconciliation tool 
PR uses payment ledger for outstanding invoice and unreconcilied
cr/dr notes.
 2022-06-17 17:57:07 +05:30
ruthra kumar
7b383880c6 feat: helper class for quering Payment Ledger 2022-06-17 17:57:07 +05:30
ruthra kumar
05467ffce2
test: use fixture for payment entry test cases (#31390) 
refactor: use fixture for payment entry test cases
 2022-06-17 17:23:29 +05:30
Conor
74a782d81d
refactor: DB independent quoting and truthy/falsy values (#31358) 
* refactor: DB independent quoting and truthy/falsy values

* style: reformat to black spec

* fix: ifnull -> coalesce

* fix: coalesce -> Coalesce

* fix: revert pypika comparison

* refactor: convert queries to QB

* fix: incorrect value types for query

`=` query makes no sense with list of values

* fix: remove warehouse docstatus condition

* fix: keep using base rate as rate

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-06-17 17:01:27 +05:30
s-aga-r
ca24b5287e chore: make "is_subcontracted" field read-only in PR and PI 2022-06-17 16:47:49 +05:30
s-aga-r
5002f1f1e5 feat: Add hidden field "is_old_subcontracting_flow" in PO, PR and PI 2022-06-17 16:47:41 +05:30
Rucha Mahabal
fbc1330ab0 chore: Remove HR/Payroll related setups and fixtures 
- Fixtures moved to HRMS app

- 'HR' field in Terms and Conditions removed, added via HRMS setup
 2022-06-17 16:34:13 +05:30
Marica
d6078aa911
fix: Respect system precision for user facing balance qty values (#30837) 
* fix: Respect system precision for user facing balance qty values

- `get_precision` -> `set_precision`
- Use system wide currency precision for `stock_value`
- Round of qty defiiciency as per user defined precision (system flt precision), so that it is WYSIWYG for users

* fix: Consider system precision when validating future negative qty

* test: Immediate Negative Qty precision test

- Test for Immediate Negative Qty precision
- Stock Entry Negative Qty message: Format available qty in system precision
- Pass `stock_uom` as confugrable option in `make_item`

* test: Future Negative Qty validation with precision

* fix: Use `get_field_precision` for currency precision as it used to

- `get_field_precision` defaults to number format for precision (maintain old behaviour)
- Don't pass `currency` to `get_field_precision` as its not used anymore
 2022-06-17 15:13:13 +05:30
Ankush Menat
74007c8e91
fix(UX): hide irrelevant UOM fields (#31392) 
fix(UX): hide UOM-related fields if they are inconsequential
 2022-06-17 15:10:21 +05:30
rohitwaghchaure
2ec133df6d
Merge branch 'develop' into fixed-transferred-materials-are-not-consumed 2022-06-17 15:02:07 +05:30
Ankush Menat
10583eb3ce
fix: UOM handling for transaction without item (#31389) 
If invoice is made without item code then UOM, Stock UOM and
conversion_factor all need to be manually added, this is confusing and
leads missing them out leads to errors.

Simplest solution:

- if either UOM exists then set both to same uom conversion factor to
- also set conversion factor based on UOM conversions
 2022-06-17 12:13:27 +05:30
Vladislav
0e8aad9038
Update ru.csv 2022-06-17 00:28:48 +03:00
Sagar Vora
1a3997a566
fix: transaction date gets unset in material request (#31327) 
* fix: set date correctly in material request

* fix: use only `transaction_date` in `get_item_details`
 2022-06-16 22:33:47 +05:30
Ankush Menat
6f2086d770
test: verify that all patches exist in patches.txt (#31371) 
* chore: delete orphaned patches

* test: orphan/missing entries in patches.txt


[skip ci]
 2022-06-16 22:15:06 +05:30
Vladislav
75e1f01b9d
Update ru.csv 2022-06-16 18:32:57 +03:00
Vladislav
c869077c92
Update ru.csv 2022-06-16 18:18:35 +03:00
Jingxuan He
b4a93da9f3
chore: Fix a potential variable misuse bug (#31372) 
* Fix a potential variable misuse bug

* chore: Separate check (separate line) for empty table in Pricing Rule

* chore: Code readability & check for field in row (now row itself)

Co-authored-by: marination <maricadsouza221197@gmail.com>
 2022-06-16 12:16:59 +05:30
Rucha Mahabal
4b3fb83850 fix: remove Salary Slip creation from Timesheet 
- moved to HRMS app
 2022-06-15 23:51:33 +05:30
Ankush Menat
86919d2a6d
test: silent test failure in stock assertions (#31377) 
If actual values are not present then test is silently passing, # of
actual values should be at least equal to expected values.
 2022-06-15 21:19:09 +05:30
Ankush Menat
5c6f22f275
refactor: simpler batching for GLE reposting (#31374) 
* refactor: simpler batching for GLE reposting

* test: add "actual" test for chunked GLE reposting
 2022-06-15 19:30:26 +05:30
Vladislav
041a5e7d1f
Merge branch 'frappe:develop' into develop 2022-06-15 15:03:19 +03:00
Rucha Mahabal
39c30f5b01 chore: remove test for employee 
- Moved to the HRMS app
 2022-06-15 17:26:19 +05:30
Rushabh Mehta
c0f9b34ede
fix(minor): move variants to separate tab (#31354) 
* fix(minor): move variants to separate tab

* fix(minor): variants tab

* fix(minor): add counts

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-06-15 16:08:05 +05:30
Ankush Menat
276267d5a6
fix: remove agriculture module from patch (#31369) 2022-06-15 15:26:05 +05:30
Marica
c83b4043b8
Merge pull request #31353 from marination/so-to-wo-bom 
fix: Pick Template BOM if variant BOM absent in WO popup from SO
 2022-06-15 14:37:15 +05:30
Rucha Mahabal
0f83e7af56 fix: removed expense claim, advance and salary slip updates from PE/JE events 
- moved them to HRMS app hooks
 2022-06-15 13:58:41 +05:30
Ankush Menat
94ad66e55b
chore: revert naming to default (#31364) 2022-06-15 13:35:42 +05:30
Deepesh Garg
be14a7e657
Merge pull request #31365 from ruthra-kumar/add_gl_migration_to_patch 
chore: add gl to payment ledger migarion to patches
 2022-06-15 13:20:10 +05:30
ruthra kumar
538faf3639 chore: add gl to payment ledger migarion to patches 2022-06-15 13:17:06 +05:30
Marica
fafdaff4d4
Merge branch 'develop' into so-to-wo-bom 2022-06-15 12:58:13 +05:30
Rucha Mahabal
3fe2ef6790 chore: update import paths for HR 2022-06-15 12:43:45 +05:30
Rucha Mahabal
8b2d045b06 fix(Projects): add a function get_users_email instead of importing from HR 2022-06-15 12:26:15 +05:30
Conor
b8f728a40a
refactor: use CURRENT_DATE instead of CURDATE() (#31356) 
* refactor: use CURRENT_DATE instead of CURDATE()

* style: reformat to black spec

* refactor: use QB for auto_close queries

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-06-15 12:07:33 +05:30
Nihantra C. Patel
37e9622426
fix: Spelling mistake in quotation depend on (#31362) 
Update quotation.json
 2022-06-15 12:02:57 +05:30
Conor
2a9105f26f
refactor: DB independent capitalization of test cases (#31359) 2022-06-15 11:24:24 +05:30
rohitwaghchaure
a4c2c3e02f
Merge branch 'develop' into fixed-transferred-materials-are-not-consumed 2022-06-15 09:41:01 +05:30
Sagar Sharma
406114374b
Merge branch 'develop' into subcontracting 2022-06-14 06:44:29 -07:00
s-aga-r
9a68af36ec Merge branch 'develop' into subcontracting 2022-06-14 19:13:10 +05:30
Marica
639e4c5714
Merge branch 'develop' into so-to-wo-bom 2022-06-14 18:22:11 +05:30
Ankush Menat
2535d5edd0
perf: GLE reposting with progress and chunking (#31343) 
If stock voucher count goes >1000 then fetching all gles and reposting
them all at once requires much more memory and can cause crash.

- This PR ensures that GLE reposting is done in chunks of 100 vouchers.
- This PR also starts keeping track of how many such chunks were
  processed so in future progress is resumed in event of timeout.
 2022-06-14 18:20:33 +05:30
marination
9f2d325e67 fix: Pick Template BOM if variant BOM absent in WO popup from SO 
- Use `get_default_bom` in sales_order.py (reduce duplicate utility functions)
- Remove redundant if else in `get_work_order_items`
- `get_default_bom`: If no BOM and template exists try to fetch template BOM
- test: `get_work_order_items` via SO and if right BOM is picked
 2022-06-14 17:20:44 +05:30
s-aga-r
ca9d55a2fd chore: update err msg for FG Item in PO 2022-06-14 13:16:22 +05:30
Deepesh Garg
d05d15346a fix: Conversion rate validation for multi-currency invoices 2022-06-14 12:50:49 +05:30
Deepesh Garg
5b2ba087a3 Merge branch 'develop' of https://github.com/frappe/erpnext into quotation_issues 2022-06-14 10:50:47 +05:30
Deepesh Garg
fb3da124e5 chore: linting issues 2022-06-14 10:50:38 +05:30
Conor
00ef499739
refactor: use db independent offset syntax (#31345) 
* chore: use db independent offset syntax

* fix: typo

* style: reformat code to black spec

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-06-14 10:49:07 +05:30
Rucha Mahabal
23b40ff13c fix: remove active employee validation from timesheets 
- moved to hrms hooks, will only be triggered if app is installed
 2022-06-13 20:08:48 +05:30
Marica
f5ebaed191
Merge branch 'develop' into subcontract-supplied-items 2022-06-13 18:32:43 +05:30
marination
b8f468cb4f test: PO Supplied Qty reset on cancel/submit 2022-06-13 18:31:35 +05:30
marination
fa1d9d548e fix: Supplied Qty not updated on Stock Entry cancel 
- Loop over PO supplied items and update them as data from SE will exclude a row if supplied qty becomes 0 on cancel
- Use DB API insteaf of raw SQL
 2022-06-13 17:59:03 +05:30
Ankush Menat
883598d59a chore: delete BOT 
RIP
 2022-06-13 16:24:48 +05:30
Sagar Sharma
f755430098
Merge branch 'develop' into subcontracting 2022-06-13 03:00:53 -07:00
Ankush Menat
697fbe946a
Merge pull request #31337 from gavindsouza/get_fiscal_years-refactor 
refactor: get_fiscal_years API
 2022-06-13 14:56:33 +05:30
Gavin D'souza
e9af68e947 test: Remove deprecated as_tuple kwarg in FrappeTestAPI.post 2022-06-13 14:26:59 +05:30
Solufyin
0410752fcf
Merge branch 'frappe:develop' into solufy_rec_pay_report 2022-06-13 13:20:41 +05:30
Gavin D'souza
5f8cd34da5 fix: Use newer PyPDF2 APIs 
Depends on https://github.com/frappe/frappe/pull/17127
 2022-06-13 12:43:08 +05:30
Gavin D'souza
0727d1d99b refactor: get_fiscal_years API 
* Optimize fiscal year options generation
* Don't pass unrequired criterions / values to prepared query
* Use QB notation for raw query
 2022-06-13 12:43:08 +05:30
Deepesh Garg
ea276a7b86
Merge branch 'develop' into refactor_ar/ap_report 2022-06-13 12:34:47 +05:30
Marica
d3d0ade89f
chore: Accidental '=' instead of comma in French translation (#31335) 2022-06-13 11:54:12 +05:30
HENRY Florian
83367bfe5e
fix: update fr translation (#31232) 
* update fr translation

* fix:update fr translation

* fix:update fr translation

* fix:update fr translation

* fix:update fr translation

* fix:update fr translation

* fix:update fr translation

* fix:update fr translation

* Update fr.csv

update typo

* update fr translation

* update fr translation

* update fr translation

* update fr translation

* update fr translation

* update fr translation

* update fr translation

* update fr translation

* update fr translation

* update fr translation

* update fr translation

* update fr translation

* update fr translation

* update fr translation

* update fr translation

* update fr translation

* update fr translation

* update fr translation

* update fr translation

* fix: Use elision instead of HTML code equivalent

* fix: Use elision instead of HTML code equivalent (pt 2)

* fix: Use elision/single quote instead of HTML code equivalent (pt 3)

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2022-06-13 11:15:47 +05:30
ruthra kumar
3018756482 refactor: remove 'show remarks' 2022-06-13 10:56:33 +05:30
ruthra kumar
71521b6550 refactor: unit test for AR/AP report 2022-06-13 10:56:33 +05:30
ruthra kumar
cd9d70d6ee refactor: show advance payments in AR/AP report 2022-06-13 10:56:33 +05:30
ruthra kumar
dfe3082596 refactor: AR/AP will use payment ledger 2022-06-13 10:56:30 +05:30
Deepesh Garg
eb93564db6 Merge branch 'develop' of https://github.com/frappe/erpnext into quotation_issues 2022-06-11 21:56:24 +05:30
Deepesh Garg
118c786e63 fix: Partially Ordered status for quotation 2022-06-11 21:55:59 +05:30
Vladislav
7bdeac49f4
Update ru.csv 2022-06-11 15:59:49 +03:00
Deepesh Garg
243625898e fix(India): Sales taxes and charges template fetching in quotation 2022-06-10 22:05:58 +05:30
Vladislav
89e720fdf4
Update ru.csv 2022-06-10 17:24:28 +03:00
Deepesh Garg
2fc04f661a fix: Company address filter in quotation 2022-06-10 19:23:17 +05:30
barredterra
f6695909c4 fix: remove DATEV from accounting workspace 2022-06-10 15:51:02 +02:00
Ankush Menat
39ec0aca95
fix(UX): use doc.status for Job Card status (#31320) 
fix(UX): use doc.status for JC status

- Use doc.status directly for indicator - single source of truth
- Update status to cancelled when doc is cancelled
 2022-06-10 18:43:46 +05:30
Rucha Mahabal
ab8df98cab chore: Remove regional code for India HR, moved to HRMS 2022-06-10 18:22:07 +05:30
Deepesh Garg
3d76b1a093
Merge pull request #31182 from ruthra-kumar/migrate_gl_to_payment_ledger_using_sql 
refactor: migrating data from GL to payment ledger using raw SQL
 2022-06-10 17:15:58 +05:30
Rucha Mahabal
85b18e23d7 fix: remove employee reminders, move to HRMS app 
- change `erpnext.hr.EmployeeController` to `erpnext.setup.EmployeeController`
 2022-06-10 16:26:07 +05:30
Vladislav
84620a775d
Update ru.csv 2022-06-10 13:35:51 +03:00
Vladislav
3e66f4214d
Update ru.csv 2022-06-10 13:12:09 +03:00
Rucha Mahabal
512c82f76d chore: Update imports/paths for doctypes moved to erpnext setup module 2022-06-10 15:06:54 +05:30
hendrik
74b274f555
fix: update Period Closing Voucher per Company 
Validate period closing voucher company-wise
 2022-06-10 14:52:53 +05:30
Ankush Menat
450bef8443
Merge pull request #31240 from ankush/repost_match_gle 
fix: unnecessary GLE reposts
 2022-06-10 14:51:45 +05:30
Ankush Menat
3a3d13622d
refactor!: drop github connector from ERPNext (#31316) 2022-06-10 14:01:41 +05:30
Ankush Menat
1646fbe478
refactor: remove add_fetch (#31315) 
- Sales Team already had fetch from set up
- Set up fetch from on sales partner in sales transaction

Reason for removal: the JS code applies arbitrarily to any field called "sales_person"
 2022-06-10 13:52:17 +05:30
ruthra kumar
e2c52436da refactor: migrate gl to payment ledger using sql 2022-06-10 13:17:43 +05:30
Deepesh Garg
9562c28408
Merge pull request #31198 from HarryPaulo/gross-profit-monthly-schedule 
feat: two new groupby mode on gross profit: Monthly, Payment Term
 2022-06-10 12:52:35 +05:30
Rucha Mahabal
0d34e589fd chore: Remove HR and Payroll modules from ERPNext 2022-06-10 12:51:29 +05:30
Rucha Mahabal
a117af253b fix: remove HR specific fields from depatment and employee 
- these will be added to the masters as custom fields on HRMS app setup
 2022-06-10 12:42:59 +05:30
Marica
2941a8ce73
Merge pull request #31303 from marination/update-employee-compatibility-fix 
fix: locale Currency and Float setting in update_employee
 2022-06-10 11:35:02 +05:30
Ankush Menat
6fc32b83c8
fix: revert show title field on Employee doctype (#31312) 2022-06-10 11:03:51 +05:30
Rucha Mahabal
f520f042af chore: move widely used doctypes from HR to Setup module 
- Employee: used in Telephony, Stock, Quality, Projects, Manufacturing, Loans, Buying, Assets, Accounts, Dependent Apps: Healthcare

- Holiday List: CRM (Appointment Booking), Projects, Healthcare, Support (SLA), Education (Student's Holiday List)

- Branch: Selling (SMS Center), used widely as an accounting dimension

- Department: Assets, Projects, SMS Center, used widely as an accounting dimension

- Designation: Lead, Healthcare Practitioner, used in Employee master which will now be in core

- Employee Group: Telephony, Communication

- Child Tables for above dts: Employee Group Table (Employee Group), Employee Education (Employee), Employee External Work History (Employee), Employee Internal Work History (Employee), Designation Skill (Designation), Holiday (Holiday List)
 2022-06-10 11:02:00 +05:30
Deepesh Garg
bbd930184c
Merge pull request #31273 from ruthra-kumar/ignore_payment_ledger_on_loan_cancelation 
fix: ignore payment ledger on cancellation of loan
 2022-06-10 10:55:48 +05:30
Deepesh Garg
a2f34d74f3
Merge pull request #31225 from vishdha/fix_date_range_print 
fix: Print/PDF for financial statement reports displays either wrong date range or wrong fiscal year
 2022-06-10 10:52:53 +05:30
Deepesh Garg
8008653082
Merge pull request #31294 from deepeshgarg007/gstr_3b_taxable_value 
fix(India): Incorrect taxable in GSTR-3B report
 2022-06-10 10:49:14 +05:30
Deepesh Garg
43bf327f9b
Merge pull request #31216 from sunhoww/patch-4 
fix: Trial Balance failing to ignore Finance Book
 2022-06-09 20:34:33 +05:30
Sun Howwrongbum
ee2949aa3f
fix: typo in sql condition 2022-06-09 19:28:59 +05:30
Deepesh Garg
c13e5ad741
fix: Reset represents company on disabling internal customer and supplier (#31302) 2022-06-09 19:18:52 +05:30
Deepesh Garg
b9dbb36d0e chore: Linting Issues 2022-06-09 18:58:04 +05:30
Vladislav
2675751d6c
fix: update ru translate (#31200) 
* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

fix logic

* Update ru.csv

* Update ru.csv

* Update ru.csv
 2022-06-09 18:46:08 +05:30
RJPvT
17887cde71 fix: locale Currency and Float setting in update_employee 
In fieldtypes locale settings (example NL) . and , changes whereby the field is inproperly filled
 2022-06-09 18:40:51 +05:30
Deepesh Garg
7c8bceca34
Merge pull request #31016 from HarryPaulo/fix-average-discount-auth 
fix: correction of the calculation to the average value when there is…
 2022-06-09 18:33:42 +05:30
mergify[bot]
e6f65e1697
chore: Asset Arabic translation Fix (backport #31221) (#31301) 
chore: Asset Arabic translation Fix (#31221)

Update ar.csv

Fix Translation arabic translation that caused an error when submitting an asset if user language was arabic

(cherry picked from commit 9347cbbc9f7826116faf22db7bf9f3bf32e6e3c2)

Co-authored-by: meaziz <minaeaziz@gmail.com>
 2022-06-09 17:47:15 +05:30
Marica
60968419e7
Merge pull request #31296 from ruthra-kumar/misalinged_columns_in_AR_report 
fix: misaligned columns in print format of AR/AP report
 2022-06-09 17:35:21 +05:30
Ankush Menat
16c8b7404d
Merge pull request #31072 from marination/perf-bom-update-tool 
perf: BOM Update Tool
 2022-06-09 17:04:00 +05:30
marination
3fa0a46f39 chore: Less hacky tests, versioning (replace bom) and clearing log data (update cost) 
- Remove `auto_commit_on_many_writes` in `update_cost_in_level()` as commits happen every N BOMs
- Auto commit every 50 BOMs
- test: Remove hacky `frappe.flags.in_test` returns
- test: Enqueue `now` if in tests (for update cost and replace bom)
- Replace BOM: Copy bom object to `_doc_before_save` so that version.py finds a difference between the two
- Replace BOM: Add reference to version
- Update Cost: Unset `processed_boms` if Log is completed (useless after completion)
- test: `update_cost_in_all_boms_in_test` works close to actual prod implementation (only call Cron job manually)
- Test: use `enqueue_replace_bom`  so that test works closest to production behaviour

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
 2022-06-09 16:27:51 +05:30
Ankush Menat
d9a5213952
fix(ux): hide new version btn on unsaved BOM (#31297) 2022-06-09 15:33:18 +05:30
ruthra kumar
bbaa14af16 fix: misaligned columns in print format of AR/AP report 2022-06-09 15:14:44 +05:30
Deepesh Garg
50aafdbe99 chore: cleanup 2022-06-09 11:52:46 +05:30
Deepesh Garg
20f568c159 fix(India): Incorrect taxable in GSTR-3B report 2022-06-09 11:50:37 +05:30
Ankush Menat
a6edce2397
Merge branch 'develop' into perf-bom-update-tool 2022-06-09 11:45:37 +05:30
Ankush Menat
eb53a9727d perf: commit GL reposting periodically 
If you have a huge list of docs to repost then maintaining transaction
throughtout entire GL reposting is not only unnecessary but also creates
performance issues. Periodically commiting the changes prevents lost
progress and reduces memory usage.
 2022-06-09 11:37:43 +05:30
Ankush Menat
67c26325ee fix: unnecessary GLE reposts 
In Sales/Purchase invoices credit/debit are flipped and negated while making GLE,
this is unflipped while posting them but if we compare the flipped ones
it will always result in comparison failure and repost it.
 2022-06-09 11:37:40 +05:30
Ankush Menat
65b21ee7d6 fix: internal transfer GLE validation 2022-06-08 19:26:40 +05:30
Nihantra C. Patel
43b0f2efe6 [DEV] Accounts: Added total of future amount, Remaining Balance in Payable and Receivable reports. 2022-06-08 17:36:42 +05:30
Rushabh Mehta
b29edb302c
Merge pull request #31284 from rmehta/item-form-cleanup 
fix(ux): Add tabs in Item
 2022-06-08 17:01:57 +05:30
Sagar Sharma
f7a52f76d4
Merge branch 'develop' into subcontracting 2022-06-08 04:27:24 -07:00
Rushabh Mehta
5c6937865c fix(ux): Add tabs in Item 2022-06-08 16:30:44 +05:30
Marica
2832731601
fix: Use frappe.as_unicode to decode output of redis module list (#31282) 
- As of redis 7, a list is added to the result of fetching the module list
- This list cannot be "decoded",so use `frappe.as_unicode` that handles bytes as well as other types
 2022-06-08 15:52:13 +05:30
marination
7e41d84a11 chore: get_valuation_rate sider fixes 
- Use qb instead of db.sql
- Don't use `args` as argument for function
- Cleaner variable names
 2022-06-08 14:01:04 +05:30
ruthra kumar
018bc2af43 fix: ignore payment ledger on cancellation of loan 2022-06-08 12:03:47 +05:30
marination
9f2793ccf1 test: Fix test_update_bom_cost_in_all_boms 
- Use base_rate for assertions as rate is subject to change due to conversion factor (USD)
 2022-06-08 11:18:53 +05:30
Saqib Ansari
fb4f8d870b
fix(india): e-invoice eligibility if company gstin is not configured (#31247) 2022-06-08 09:36:33 +05:30
Ankush Menat
f830b57fd4 test: sales register report with conditions 2022-06-07 15:23:32 +05:30
Marica
ff0a6b7cbd
Merge branch 'develop' into perf-bom-update-tool 2022-06-07 14:49:59 +05:30
marination
6bde1bb5d2 test: Util to update cost in all BOMs 
- Utility to update cost in all BOMs without cron jobs or background jobs (run immediately)
- Re-use util wherever all bom costs are to be updated
- Skip explicit commits if in test
- Specify company in test records (dirty data sometimes, company wh mismatch)
- Skip background jobs queueing if in test
 2022-06-07 14:44:00 +05:30
Ankush Menat
25f9d58c34
Merge pull request #31209 from ankush/purch_return_gle 
fix: purchase invoice standalone return GLEs
 2022-06-07 14:28:17 +05:30
Deepesh Garg
20c2ffa767
Merge pull request #31258 from deepeshgarg007/unsecured_term_loan_closure 
fix: Close unsecured terms loans
 2022-06-07 13:53:42 +05:30
Deepesh Garg
eae4f64dd8
Merge pull request #31233 from deepeshgarg007/pi_cancel_provisional_gl_entries 
fix: Reverse provisional entries on Purchase Invoice cancel
 2022-06-07 13:31:02 +05:30
Deepesh Garg
815141bf57 fix: Close unsecured terms loans 2022-06-07 13:16:06 +05:30
Ankush Menat
7726271e2a fix: purchase invoice return GLe 
voucher_wise_stock_value contains tuples and the condition was looking
for string, so it's never triggered.

Caused by https://github.com/frappe/erpnext/pull/24200
 2022-06-07 12:08:20 +05:30
Ankush Menat
293eb8d722 test: create stock test mixin for assertion/utils 2022-06-07 11:35:51 +05:30
Deepesh Garg
dc8e80ea81 test: Add test coverage for cancellation 2022-06-07 11:35:03 +05:30
Rucha Mahabal
91f9f37d64
fix: leave balance for earned leaves in backdated Leave Application dashboard (#31253) 2022-06-07 09:51:30 +05:30
Vishal Dhayagude
934cb97d90
Merge branch 'develop' into fix_date_range_print 2022-06-06 21:34:14 +05:30
Rohit Waghchaure
d94ff3ede8 test: test cases to cover batch, serialized raw materials 2022-06-06 17:57:52 +05:30
marination
15101190a6 chore: get_valuation_rate in bom.py must always return float & goto Item master if no bins 2022-06-06 17:54:13 +05:30
marination
934db57fdd chore: Miscellanous fixes/enhancements 
- `get_valuation_rate`: if no bins are found return 0, SLEs do not exist either
- `get_valuation_rate`: Compute average valuation rate via query
- `get_rm_rate_map`: set order_by as None to avoid creating sort index (modified) each time query runs (seen in process list)
- BOM Update Batch: add status field and hide `boms_updated` so that  users can see progress without loading all updated boms (too much data)
- BOM Update Batch: set batch row status to completed after job runs
- BOM Update Log: remove `parent_boms` field (just pass parent boms to processing function) & remove Paused state (not used)
- Move job to long queue to avoid choking default queue
- `update_cost_in_boms`: use `get_doc` as each BOM is accessed only once. Use `for_update` to lock BOM row
- Commit after every 100 BOMs
 2022-06-06 17:01:51 +05:30
Deepesh Garg
fe5b9e8bbb
Merge branch 'develop' into patch-4 2022-06-06 16:45:20 +05:30
Deepesh Garg
c57125a51a
Merge pull request #31242 from ankush/sales_register 
fix(Sales Register): incorrect query with dimensions
 2022-06-06 16:45:00 +05:30
Deepesh Garg
2041738e04
Merge pull request #31194 from ruthra-kumar/bug_sales_order_analysis_report 
fix: incorrect billed_qty in sales order analysis report when multiple delivery notes for item
 2022-06-06 16:39:13 +05:30
Ankush Menat
ee5bc58e9b
fix(job card): only hold during draft state (#31243) 2022-06-06 16:27:25 +05:30
vishdha
53774e0f52 chore: minor change in fetching start and end date 2022-06-06 16:00:56 +05:30
vishdha
3513d54c0a fix: Print/PDF for financial statement reports displays either wrong date range or wrong fiscal year 2022-06-06 16:00:56 +05:30
Rucha Mahabal
edb775c381 test: Employee Benefit Application 
- make `get_no_of_days` a function for reusability
 2022-06-06 14:34:45 +05:30
Rucha Mahabal
3b8bc7d8e1 fix: incorrect LWP calculation for half days in employee benefit application 2022-06-06 14:34:45 +05:30
Rucha Mahabal
cf04683ad3 fix(Leave Application): 'Cancelled' status shown as 'Open' in list view 2022-06-06 14:34:45 +05:30
Rucha Mahabal
59de303b13 refactor: rewrite lwp queries using query builder 2022-06-06 14:34:45 +05:30
Rucha Mahabal
4decb7a02b fix: Consider only Approved leave applications in LWP, Employee Benefit calculations 
- do not allow submitting leave applications with 'Cancelled' status
 2022-06-06 14:34:45 +05:30
Ankush Menat
c3219ebad1 fix(Sales Register): incorrect query with dimensions 
If accounting dimension is also part of the default filters then same
query is repeated with incorrect syntax.

e.g. `item_group = (child1, child2)` instead of `in` query.

fix: don't add default filter if they are part of dimensions to be
added.
 2022-06-06 12:39:12 +05:30
Deepesh Garg
c6d83c56d0
Merge branch 'develop' into item_wise_report_perf 2022-06-06 11:50:46 +05:30
Sagar Sharma
74fae72939
Merge branch 'develop' into subcontracting 2022-06-06 10:27:25 +05:30
Deepesh Garg
aad887bab9
Merge branch 'develop' into patch-4 2022-06-06 09:16:22 +05:30
Deepesh Garg
c21826e07d
Merge pull request #31223 from dj12djdjs/fix-validation-message 
fix: display currencies in validation message.
 2022-06-06 09:06:52 +05:30
Deepesh Garg
8b56f0559e
Merge branch 'develop' into item_wise_report_perf 2022-06-06 09:01:37 +05:30
Deepesh Garg
95a4602a23
Merge pull request #31231 from deepeshgarg007/gstr_3b_composite_supplies 
fix(India): Supplies from composite dealer not showing up
 2022-06-06 09:00:40 +05:30
Deepesh Garg
21de550549
Merge pull request #31219 from deepeshgarg007/group_filter_cost_center 
fix: Parent dimension filters in orders
 2022-06-06 08:58:40 +05:30
Deepesh Garg
9500aa8c94
Merge pull request #31218 from deepeshgarg007/distinct_gstin 
fix(India): GSTIN filter in GSTR-1 report
 2022-06-06 08:57:55 +05:30
Rohit Waghchaure
333c62de72 fix: transferred batches are not fetched while making Manufacture stock entry 2022-06-06 01:19:58 +05:30
Deepesh Garg
86a24f3d22 fix: Simply cancel reverse entries 2022-06-05 19:12:24 +05:30
Deepesh Garg
61fa4eb6c9 fix: Reverse provisional entries on Purchase Invoice cancel 2022-06-05 18:23:24 +05:30
Deepesh Garg
db07831db7 fix(India): Supplies from composite dealer not showing up 2022-06-05 12:13:02 +05:30
Deepesh Garg
a200e7e1fb fix: Remove redundant query 2022-06-05 11:16:12 +05:30
s-aga-r
992ba974e2 Merge branch 'develop' into subcontracting 2022-06-03 13:25:49 +05:30
Devin Slauenwhite
b061ea4cd2
chore: linter 2022-06-02 14:23:54 -04:00
Devin Slauenwhite
3a1c923e76
fix: display currencies in validation message. 2022-06-02 14:15:50 -04:00
Rucha Mahabal
956a803be7
Merge branch 'develop' into fix-salary-slip-bg-job 2022-06-02 17:30:34 +05:30
Rucha Mahabal
1db4e623ab fix: payroll operations button visibility 2022-06-02 17:26:08 +05:30
Rucha Mahabal
d641f26035 fix: error handling and messages 
- remove savepoints since submission should stop if any error occurs

- refactor variable naming and msgprints

- test Salary Slip creation failure

- fix(test): explicitly commit after payroll entry creation so that the first salary slip creation failure does not rollback the Payroll Entry insert
 2022-06-02 15:08:49 +05:30
Deepesh Garg
3f376cc3a5 fix: Parent dimension filters in orders 2022-06-02 13:57:54 +05:30
marination
62857e3e08 feat: Track progress in Log Batch/Job wise 
- This was done due to stale reads while the background jobs tried updating status of the log
- Added a table where all bom jobs within log will be tracked with what level they are processing
- Cron job will check if table jobs are all processed every 5 mins
- If yes, it will prepare parents and call `process_boms_cost_level_wise` to start next level
- If pending jobs, do nothing
- Current BOM Level is being tracked that helps adding rows to the table
- Individual bom cost jobs (that are queued) will process and update boms > will update BOM Update Batch table row with list of updated BOMs
 2022-06-02 13:35:30 +05:30
Deepesh Garg
f0ac394d6e fix(India): GSTIN filter in GSTR-1 report 2022-06-02 12:59:55 +05:30
Ankush Menat
849a2dc349
Merge branch 'develop' into patch-4 2022-06-02 10:25:20 +05:30
Ankush Menat
77dcdff0db
fix: unusable SO after clearing taxes (#31215) 2022-06-01 22:01:07 +05:30
Sun Howwrongbum
48bde2de2a
fix: Trial Balance failing to ignore Finance Book 2022-06-01 20:20:16 +05:30
Rucha Mahabal
661e05e693 fix(tests): account and company setups 2022-06-01 17:28:42 +05:30
Ankush Menat
3974fbbb6e
feat: UOM specific barcodes (#30988) 2022-06-01 16:43:56 +05:30
Mohammad Hussain Nagaria
37433aad48
fix: Pluralize year text instead of optional bracket (#31210) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-06-01 16:29:20 +05:30
Rucha Mahabal
536f1dfc4b
test: fix attendance tests for unmarked days (#31205) 
* test: fix attendance tests for unmarked days

* chore: remove unused import
 2022-06-01 13:56:55 +05:30
Ankush Menat
c84e11ac82
fix: re-validate warehouse after 'update items' (#31203) 2022-06-01 12:55:10 +05:30
Rucha Mahabal
d4b9cc0242
fix: remove leave policy assignment creation patch (#31097) 2022-06-01 12:18:14 +05:30
Rucha Mahabal
1c91793634
Merge branch 'develop' into fix-salary-slip-bg-job 2022-06-01 12:15:42 +05:30
Rucha Mahabal
653d6341d4 refactor: clean-up and commonify payroll entry test setups 2022-06-01 12:14:42 +05:30
Deepesh Garg
82be717f10
Merge pull request #31201 from deepeshgarg007/manufacturing_workspace_fix 
fix: Remove domain restriction from Manufacturing Workspace
 2022-06-01 09:30:39 +05:30
Deepesh Garg
167cf7b49d fix: Remove domain restrcition from Manufacturing Workspace 2022-06-01 09:04:53 +05:30
Deepesh Garg
753eb3ec3a
Merge branch 'develop' into bug_sales_order_analysis_report 2022-05-31 21:41:35 +05:30
Deepesh Garg
5fd31c6433
Merge pull request #31199 from deepeshgarg007/settings_perm_fix 
fix: Permission for selling and buying settings
 2022-05-31 21:40:55 +05:30
maharshivpatel
b3ccc4bfb9
fix: Auto Insert Item Price If Missing when discount & blank UOM (#31168) 
* fix: Auto Insert Item Price If Missing when discount and blank UOM

fixes wrong item price insert when discount is used and adds uom=stock_uom instead of blank as price is converted to stock uom

* unit tests added for item with discount

I have added test  for auto_insert_price where discount is used.

* unit test issue fixed

fixed make_sales_order as some of the test that depended on it were failing due to passing of incorrect parameters.

Co-authored-by: Ankush Menat <me@ankush.dev>
 2022-05-31 19:48:30 +05:30
Deepesh Garg
a6beafbc3c fix: Permission for selling and buying settings 2022-05-31 19:41:46 +05:30
hrzzz
c4af63ad98 feat: two new groupby mode: Monthly, Payment Term 2022-05-31 10:46:56 -03:00
ruthra kumar
4f1bfbb93d test: multiple delivery notes and billed quantity 2022-05-31 17:24:36 +05:30
ruthra kumar
0331e37982 fix: incorrect billed_qty when item has multiple Delivery note 
sales order analysis report returns incorrect billed_qty value for
an SO item has multiple delivery notes
 2022-05-31 17:15:31 +05:30
marination
a62bc9b6c9 chore: Limit Update Cost jobs & db_update only if changed values 
- If `Update Cost` job is ongoing, then block creation of new ones since all BOMs are updated
- `db_update` in `calculate_rm_cost` only if changed values to reduce redundant row updates
- Misc: Use variable for batch size
 2022-05-31 16:00:29 +05:30
Ankush Menat
a1b7a7983a
refactor!: drop naming series tool (#31183) 2022-05-31 15:35:40 +05:30
Ankush Menat
691b34a8ed chore: unnessary args 2022-05-31 14:15:13 +05:30
Ankush Menat
ddb46c5711
fix: batch selector flag (#31191) 
This is broken again after serializing scan actions, which causes
selector to trigger before batch_no is set.

Solution: for duration of scan disable the selector
 2022-05-31 14:14:27 +05:30
maharshivpatel
a8f98f3f96
feat(india): Improve E-way Bill Cancellation. (#31088) 2022-05-31 12:14:39 +05:30
Rucha Mahabal
ed1ba677d6 test: HRA Exemption in Proof Submission 2022-05-31 11:54:43 +05:30
Rucha Mahabal
cfe2f8cac1 fix: amount precision for Tax Exemption Proof Submission 2022-05-31 11:54:43 +05:30
Rucha Mahabal
2e98e9e0b9 test: set country to India before running regional tests 2022-05-31 11:54:43 +05:30
Rucha Mahabal
00adda7c8d fix: Tax Declaration tests and amount precision 2022-05-31 11:54:43 +05:30
Rucha Mahabal
5e96a46c87 test: HRA Exemption in Employee Tax Exemption Declaration 2022-05-31 11:54:43 +05:30
Rucha Mahabal
2b65c9616f fix: component pay calculation 2022-05-31 11:54:43 +05:30
Rucha Mahabal
34925a3a8c fix: HRA Exemption calculation in case of multiple salary structure assignments 2022-05-31 11:54:43 +05:30
Deepesh Garg
f07246af82
Merge pull request #31127 from deepeshgarg007/loan_interest_accrual 
feat: Auto accrue loan interest for backdated term loans
 2022-05-31 09:55:26 +05:30
Mitchy25
a0c412a0dd
Ignore Cancelled GL Entries 
Profitability Analysis includes 'is_cancelled' GL Entries which means that the profit numbers are incorrect. This change will ensure that the profit figures ignore cancelled GL Entries.
 2022-05-31 15:25:09 +12:00
ruthra kumar
4c74637c91 refactor: remove naming expression for payment ledger 2022-05-30 19:06:56 +05:30
Rucha Mahabal
78c39e947b test: Salary Slip operations queuing, failure, and payroll entry status 
- fix multicurrency test, remove redundant doc creation
 2022-05-30 16:07:19 +05:30
Rucha Mahabal
42f6bca935 fix: reset Error Message on successful operation and fix status update on submit/cancel 2022-05-30 16:04:07 +05:30
Saqib Ansari
08bf0baaae
chore!: remove unused bill no & date from purchase receipt (#31163) 2022-05-30 14:50:50 +05:30
Rucha Mahabal
de55157997 chore: rename method get_salary_component_account method to set 
- since it doesn't return any value
 2022-05-30 12:47:26 +05:30
Ankush Menat
d7a7c47650
Merge branch 'develop' into recursive_non_explosive_bom 2022-05-30 11:12:57 +05:30
Ankush Menat
c02598a51b chore: remove framework tests from erpnext 
Similar tests exist in FW and this is failing because someone updated
the translations
 2022-05-30 11:12:17 +05:30
Ankush Menat
954dac88a8 fix: allow non-explosive recrusive BOMs 
Recursion should be allowed as long as child item is not "exploded"
further by a BOM.
 2022-05-30 10:40:13 +05:30
Ankush Menat
d224bf1d34 fix: only erase BOM when do_not_explode is set 2022-05-30 10:40:13 +05:30
Ankush Menat
b170cec2fe fix(ux): "New Version" button BOM 
"duplicate" technically creates a new version but that's not intuitive
at all.
 2022-05-30 10:40:12 +05:30
Devin Slauenwhite
85b48fcdb9
fix: barcode scan resolve after model is updated (#31058) 
* fix: resolve row after model is updated.

* fix: wait for all fields in the model to be updated.

* fix: sider

* pref: clear scanned code after capturing value

* fix: use frappe.run_serially
 2022-05-29 22:19:09 +05:30
Ankush Menat
933434c3ea chore: format 2022-05-29 22:09:32 +05:30
marination
978ba5238f fix: Safe cast row.rate (in case of faulty exploded items, edge case but oh well) 2022-05-27 21:59:59 +05:30
marination
2de2491e17 perf: get_next_higher_level_boms 
- Separate getting dependants and checking if they are valid (loop within loop led to redundant processing that slowed down function)
- Adding to above, the same dependant(parent) was repeatedly processed as many children shared it. Expensive.
- Use a parent-child map similar to child-parent map to check if all children are resolved
- `map.get()` reduced time: 10 mins -> 0.9s~1 second (as compared to `get_cached_doc` or query)
- Total time: 17 seconds to process 6599 leaf boms and 4.2L parent boms
- Previous Total time: >10 mins (I terminated it due to not wanting to waste time XD)
 2022-05-27 20:33:14 +05:30
HENRY Florian
ce8e05146e
chore: update translation fr for BOM (#31126) 
* fix: update translation

* fix: fr translation for BOM
 2022-05-27 17:27:43 +05:30
MOHAMMED NIYAS
7ff8acac51
fix: date filter on quality inspection report (#31148) 
* fix: date filter

fix from date to to date filter btw those days

* fix: remove unnecessary conditions

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
 2022-05-27 17:13:14 +05:30
marination
5949946265 chore: Change BOM Progress field types to Long Text 2022-05-27 17:04:21 +05:30
Rucha Mahabal
4df76f3956
Merge pull request #31160 from ruchamahabal/fix-gratuity-status-update 2022-05-27 15:05:31 +05:30
Rucha Mahabal
c9e070393d test: make holiday list before running gratuity tests 2022-05-27 14:42:11 +05:30
marination
eabd8290d4 feat: Only update exploded items rate and amount 
- Generate RM-Rate map from Items table (will include subassembly items with rate)
- Function to reset exploded item rate from above map
- `db_update` exploded item rate only if rate is changed
- Via Update Cost, only update exploded items rate, do not regenerate table again
- Exploded Items are regenerated on Save and Replace BOM job
- `calculate_exploded_cost` is run only via non doc events (Update Cost button, Update BOMs Cost Job)
 2022-05-27 14:32:58 +05:30
Rucha Mahabal
79b0aede00 fix: add list view settings for Gratuity 2022-05-27 13:57:09 +05:30
Rucha Mahabal
6c66bbbbfe refactor: clean-up gratuity tests 2022-05-27 13:39:25 +05:30
Rucha Mahabal
b81d7519c1 test: Gratuity status for payment via salary slip 2022-05-27 12:58:10 +05:30
Rucha Mahabal
385e22a067 fix: Gratuity status not updated on salary slip submission 2022-05-27 12:57:07 +05:30
Deepesh Garg
7adcac4e66
Merge pull request #31155 from deepeshgarg007/exchnage_rate_reset 
fix: Exchange rate reste to 1 on making mapped doc
 2022-05-27 12:17:17 +05:30
HarryPaulo
4b04694c2c
fix(pos): freeze screen while processing pos invoices (#30850) 2022-05-27 12:16:07 +05:30
Deepesh Garg
2a10f09d8d fix: Exchange rate reste to 1 on making mapped doc 2022-05-27 12:12:34 +05:30
maharshivpatel
935e5b1dcd
fix(india): duplicate qrcode and hide button (#31100) 2022-05-27 11:48:55 +05:30
Deepesh Garg
d0a9eb4fd0
Merge branch 'develop' into fix-average-discount-auth 2022-05-26 18:22:34 +05:30
Ankush Menat
e3c0d0134e
Merge pull request #31101 from alyf-de/fix-warehouse-js 
fix: Improve button labels in Warehouse
 2022-05-26 18:14:49 +05:30
Ankush Menat
ff798dc5c0
Merge pull request #31141 from ankush/naming_series_live_preview 
feat: live preview of naming series on naming series tool
 2022-05-26 16:49:59 +05:30
Ankush Menat
47b539e638
fix: skip existing batch number during autogen (#31140) 2022-05-26 16:20:56 +05:30
Ankush Menat
964b4184a6 test: add basic tests for naming series tool 2022-05-26 16:17:56 +05:30
Ankush Menat
4d0e2aa33a docs: update help information on naming series 2022-05-26 15:36:48 +05:30
Ankush Menat
24d1bf5328 feat: preview next numbers on naming series tool 2022-05-26 15:15:59 +05:30
Ankush Menat
82cd54b40b chore: resave naming series doctype schema 
separate commit to avoid mixing actual changes
 2022-05-26 15:15:59 +05:30
Sagar Sharma
61296a0658 fix: Subcontracting through Production Plan 2022-05-26 15:08:16 +05:30
Sagar Sharma
bcaac8f90f
Merge branch 'develop' into subcontracting 2022-05-26 15:01:23 +05:30
Rucha Mahabal
5c7451438f
Merge pull request #31130 from ruchamahabal/fix-job-opening 2022-05-26 13:23:44 +05:30
Rucha Mahabal
2bc6d46070 fix: validation message 2022-05-26 13:00:34 +05:30
Deepesh Garg
f49d8cd3b1
Merge pull request #31102 from alyf-de/german-translations-2022-05-23 
feat: Add german translations
 2022-05-26 11:49:56 +05:30
Vladislav
8d2502b5ba
chore: update ru translate 2022-05-26 11:48:38 +05:30
Rucha Mahabal
3f13b0ec97
Merge branch 'develop' into fix-job-opening 2022-05-26 11:38:35 +05:30
Rucha Mahabal
ab0ef60918 test: Job Opening against a Staffing Plan 2022-05-26 11:32:46 +05:30
sersaber
e5d2c1b1f3
fix: change project's actual_start_date fieldtype from Data to Date (#31085) 
* Update project.json

* Update project.json
 2022-05-26 10:04:58 +05:30
Saqib Ansari
ca75d814a3 fix: timesheet fetching in sales invoice 
(cherry picked from commit 216c32f4bc13376335ae31bd09fe6b5c01855ba2)
 2022-05-25 14:45:41 +00:00
xdlumertz
c5e922c76b
fix: Chart data for monthly periodicity in Cash Flow report (#31039) 
fix: Chart data for monthly periodicity in Cash Flow report
 2022-05-25 19:39:59 +05:30
Deepesh Garg
efa5b5b3db
Merge pull request #31038 from alyf-de/taxes-title-field 
feat: show title when linking Taxes and Charges Template
 2022-05-25 19:28:59 +05:30
Deepesh Garg
d68187caae
Merge branch 'develop' into loan_doc_reco_queries 2022-05-25 18:50:54 +05:30
Rucha Mahabal
29228575fa fix: Job Opening linked to Staffing Plan cannot be created/updated if there are existing employees 2022-05-25 18:33:37 +05:30
Deepesh Garg
9e4a36089e chore: Linting Issues 2022-05-25 18:10:42 +05:30
Deepesh Garg
a1f53f8d31 chore: Linting Issues 2022-05-25 17:59:40 +05:30
Deepesh Garg
147fc8fde7 fix: Loan Doc query in Bank Reconciliation Statement 2022-05-25 17:58:30 +05:30
Deepesh Garg
ac17ecb84b
Merge branch 'develop' into party_account_currency_check 2022-05-25 16:21:06 +05:30
Deepesh Garg
bc34737709 chore: Update test case 2022-05-25 15:42:47 +05:30
Deepesh Garg
96d8b1ef3c feat: Auto accrue loan interest for backdated term loans 2022-05-25 14:19:10 +05:30
Deepesh Garg
6edbc58873 fix: Handle missing HSN Codes 
(cherry picked from commit ce3a21eb039453d4786dfd0871a278b588039d80)
 2022-05-25 07:04:44 +00:00
Sagar Sharma
4ff734c25a
Merge branch 'develop' into subcontracting 2022-05-25 12:32:33 +05:30
Saqib Ansari
268f413f56
fix(pos): paid amount calculation for multicurrency invoice (#31112) 2022-05-25 11:40:49 +05:30
Rucha Mahabal
273b21c0cb
chore: move patch for updating Employee Advance status to v13 (#31118) 2022-05-25 11:34:25 +05:30
Deepesh Garg
e75c843dc1
Merge pull request #31077 from deepeshgarg007/payroll_payable_party_type 
fix: Loan repayment entries for payroll payable account
 2022-05-25 11:23:43 +05:30
Deepesh Garg
d81fad09ea
Merge pull request #31080 from deepeshgarg007/company_address_trigger 
fix(India): Async issue in company address trigger
 2022-05-25 11:22:56 +05:30
marination
9f5f18e94d style: Update docstrings and fix/add type hints + Collapsible progress section in Log 2022-05-25 11:22:13 +05:30
marination
ab2d95a74d feat: Level-wise BOM cost updation 
- Process BOMs level wise and Pause after level is complete
- Cron job will resume Paused jobs, which will again process the new level and pause at the end
- This will go on until all BOMs are updated
- Added Progress section with fields to track updated BOMs in Log
- Cleanup: Add BOM Updation utils file to contain helper functions/sub-functions
- Cleanup: BOM Update Log file will only contain functions that are in direct context of the Log

Co-authored-by: Gavin D'souza <gavin18d@gmail.com>
 2022-05-25 11:21:01 +05:30
Devin Slauenwhite
55276f11f8
fix: don't fetch item_code if already exists. (#31113) 
fix: check if item_code exists before fetching
 2022-05-25 09:35:22 +05:30
barredterra
1e9f9c452f style: format 2022-05-24 13:31:29 +02:00
barredterra
1b16eb7667 refactor: set queries during setup 2022-05-24 13:30:59 +02:00
Raffael Meyer
e77c379cbb
fix: remove unsupported arguments 
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
 2022-05-24 11:52:23 +02:00
Raffael Meyer
e3bc3bf0f0
Merge branch 'develop' into german-translations-2022-05-23 2022-05-24 11:41:46 +02:00
Ankush Menat
1ecb8f4a67 chore: disable feed for material request 2022-05-24 14:32:56 +05:30
Ankush Menat
ecb39d81e0
chore: error logging for auto material requests (#31103) 2022-05-23 20:06:24 +05:30
barredterra
2388d86623 feat: Add german translations 2022-05-23 16:01:36 +02:00
barredterra
9356eb11de fix: german translations 2022-05-23 15:35:15 +02:00
barredterra
a6ddd86d31 fix: improve labels, simplify logic 2022-05-23 15:25:00 +02:00
barredterra
c704ad889d style: format warehouse js 2022-05-23 15:18:24 +02:00
Ankush Menat
a36174afdf
test: search test failing because of stale data (#31098) 2022-05-23 15:12:11 +05:30
Ankush Menat
fa039b223e
Merge pull request #31054 from marination/jc-excess-transfer-config 
fix: Job Card excess transfer behaviour
 2022-05-23 14:43:36 +05:30
Suraj Shetty
f2b6475626
Merge pull request #31092 from surajshetty3416/fix-rfq-template 
fix(rfq): Use `<a>` directly and style it as button instead of using `<button>`
 2022-05-23 11:56:17 +05:30
Sagar Sharma
6e5effc1b0
Merge branch 'develop' into subcontracting 2022-05-23 11:35:50 +05:30
Wolfram Schmidt
348a674df9
fix translation German "Designation" (#31082) 
changed "Bezeichnung" to "Position" as the is more precice in the field of employment which erpnext refers to here
 2022-05-23 11:23:12 +05:30
marination
9f6e10663b chore: Run _validate_over_transfer only if excess transfer is blocked in settings 2022-05-23 11:05:55 +05:30
Suraj Shetty
9e306bd250
Merge branch 'develop' into fix-rfq-template 2022-05-23 10:48:22 +05:30
Rucha Mahabal
34e238ce4f
fix: Leave Encashment calculations (#31062) 2022-05-23 10:13:49 +05:30
Suraj Shetty
a29b92febc fix: Use directly <a> and style it as button instead of using button 
Since few email servers (like outlook) strips out link in the button making them unclickable.
 2022-05-23 10:08:20 +05:30
Ankush Menat
1a58b788e5 Merge branch 'develop' into jc-excess-transfer-config 2022-05-21 14:32:44 +05:30
Ankush Menat
66cf9aa344 fix: creation of corrective job card fails 
This used to fail because sub_operations is a child table that's not
initalized by default till v13, in develop branch we init tables with
empty list.
 2022-05-21 14:01:30 +05:30
Ankush Menat
e625394488 test: simplify job card tests 2022-05-21 14:01:28 +05:30
Sagar Sharma
07dc5f180d
Merge branch 'develop' into subcontracting 2022-05-21 10:02:47 +05:30
ruthra kumar
dac678e3fc test: payment ledger entry 2022-05-20 18:21:47 +05:30
ruthra kumar
e888975007 refactor: link payment ledger with gl entry creation 2022-05-20 18:21:47 +05:30
ruthra kumar
59ed7c854d refactor: ignore linked Payment Ledger Entry in basic transactions 2022-05-20 18:21:47 +05:30
ruthra kumar
451cf3a937 refactor: helper class for ple creation and delinking 
Helper functions for delinking ple and for creating payment ledger
entry for transactions on receivable/payable account types
 2022-05-20 18:21:47 +05:30
ruthra kumar
7b1cb6711d refactor: include Payment ledger in accounting dimensions list 2022-05-20 18:21:47 +05:30
ruthra kumar
8e72f19bfb feat: patch to migrate gl entries to payment ledger 2022-05-20 18:21:47 +05:30
ruthra kumar
163085f201 feat: payment ledger doctype created 2022-05-20 18:21:47 +05:30
Deepesh Garg
8fd0b3b9f5 chore: Linting issues 2022-05-20 15:34:03 +05:30
Deepesh Garg
c41f9f046f fix(India): Async issue in company address trigger 2022-05-20 15:33:03 +05:30
Sagar Sharma
213113bc00 Merge branch 'develop' into subcontracting 2022-05-20 12:13:13 +05:30
Sagar Sharma
e9b28452e4 feat: SCR return 2022-05-20 10:45:34 +05:30
Sagar Sharma
323bdf85ce feat: SL and GL reposting 2022-05-20 10:45:34 +05:30
Sagar Sharma
fcc09592b9 refactor!: Stock Ledger Entry 2022-05-20 10:45:34 +05:30
Sagar Sharma
6c794afbe7 refactor!: Item Alternative 2022-05-20 10:45:34 +05:30
Sagar Sharma
92625902ad refactor!: BOM 2022-05-20 10:45:34 +05:30
Sagar Sharma
05f05ab75b refactor!: Subcontracted Item To Be Transferred 2022-05-20 10:45:33 +05:30
Sagar Sharma
3be663b121 refactor!: Subcontracted Item To Be Received 2022-05-20 10:45:33 +05:30
Sagar Sharma
8486bbf31a refactor!: Subcontract Order Summary 2022-05-20 10:45:33 +05:30
Sagar Sharma
3469560105 refactor!: Accounts Controller 2022-05-20 10:45:33 +05:30
Sagar Sharma
5fa3f58c06 refactor!: Purchase Invoice 2022-05-20 10:45:33 +05:30
Sagar Sharma
f09fc46059 refactor!: Purchase Receipt 2022-05-20 10:45:33 +05:30
Sagar Sharma
73484448f2 refactor!: Stock Entry 2022-05-20 10:45:33 +05:30
Sagar Sharma
34bda14b5b refactor!: Buying Controller 2022-05-20 10:45:33 +05:30
Sagar Sharma
dafaed3cbd refactor!: Purchase Order 2022-05-20 10:45:33 +05:30
Sagar Sharma
785d598762 test: SubcontractingReceipt 2022-05-20 10:45:33 +05:30
Sagar Sharma
8bc653b633 test: SubcontractingOrder 2022-05-20 10:45:33 +05:30
Sagar Sharma
574181f3d7 test: SubcontractingController 2022-05-20 10:45:33 +05:30
Sagar Sharma
70a1f40624 feat: New DocType "Subcontracting Receipt" 2022-05-20 10:45:33 +05:30
Sagar Sharma
3b17584bee feat: New DocType "Subcontracting Receipt Supplied Item" 2022-05-20 10:45:33 +05:30
Sagar Sharma
3daf62dce8 feat: New DocType "Subcontracting Receipt Item" 2022-05-20 10:45:33 +05:30
Sagar Sharma
409df263e8 refactor!: change "is_subcontracted" field type from "Select" to "Check" 2022-05-20 10:45:33 +05:30
Sagar Sharma
249726b845 feat: New DocType "Subcontracting Order" 2022-05-20 10:45:33 +05:30
Sagar Sharma
f49c51ab74 feat: New DocType "Subcontracting Order Supplied Item" 2022-05-20 10:45:33 +05:30
Sagar Sharma
f8b7594292 feat: New DocType "Subcontracting Order Item" 2022-05-20 10:45:33 +05:30
Sagar Sharma
dcac7eb67c feat: New DocType "Subcontracting Order Service Item" 2022-05-20 10:45:33 +05:30
Sagar Sharma
29a1cb89c2 feat: SubcontractingController 2022-05-20 10:45:33 +05:30
Sagar Sharma
68c21d9895 feat: Add fields "subcontracting_order" and "sco_rm_detail" in SE and SE Detail 2022-05-20 10:45:33 +05:30
Sagar Sharma
77db843692 refactor!: Make required changes to create SCO from PO 2022-05-20 10:45:30 +05:30
Deepesh Garg
3128f9603e fix: Loan repayment entries for payroll payable account 2022-05-20 08:31:37 +05:30
Deepesh Garg
5edd1dbb35
Merge pull request #31004 from ruthra-kumar/bug_payment_terms_status_rpt 
fix: duplicate entries in payment terms report output
 2022-05-20 07:53:40 +05:30
marination
90d4dc0cd6 fix: test_work_order_with_non_stock_item 
- Use the right price list and currency to avoid rate conversion (1000/62.9), since rates are reset correctly now
- Use RM rate based on Price List in BOM. Non stock item has no valuation
 2022-05-20 03:12:42 +05:30
marination
dd99c00eb6 fix: Get fresh RM rate in calculate_rm_cost 2022-05-19 21:48:24 +05:30
marination
9a7e9d902d perf: Use cached doc instead of get_doc 
- Doc is only used to iterate over items(which wont change) and change rate/amount of rows
- These changes are inserted in db via `db_update`, so no harm
- Tested locally: refetching cached doc after db update, reflects fresh data.
 2022-05-19 21:24:31 +05:30
Rucha Mahabal
7d4872aedd patch: set payroll entry status 2022-05-19 20:35:56 +05:30
Rucha Mahabal
ef8164f188 refactor: UX for Salary Slip creation and submission via Payroll Entry 
- Add status for Queued/Failed

- log errors and show corrective actions in payroll entry
 2022-05-19 20:33:55 +05:30
marination
9dc3083088 fix: Call calculate_cost for Draft BOM and typo in argument 2022-05-19 20:33:48 +05:30
marination
5932e9d78a fix: DB update child items, remove redundancy, fix perf 
- Move `get_boms_in_bottom_up_order` in bom update tool’s file
- Remove repeated rm cost update from `update_cost`. `calculate_cost` handles RM cost update
- db_update children in `calculate_cost` optionally
- Don’t call `update_exploded_items` and regenerate exploded items in `update_cost`. They will stay the same (except cost)
 2022-05-19 20:22:13 +05:30
Ankush Menat
6d6616dbcd
fix: always update item_name for stock entry (#31068) 
If item_name is already set and for some reason becomes outdated then
it's not updated in backend.

Fix: always set item_name and stock_uom when fetching item details
 2022-05-19 14:25:47 +05:30
Ankush Menat
1de6b14d15
fix: remove "scrap %" field (#31069) 
This does nothing, there's scrap items table below that's actually used
for specifying scrap.
 2022-05-19 14:25:16 +05:30
Rucha Mahabal
81c82c8d53 fix(ux): inform the user about salary slip creation/submission happening in the background 2022-05-19 13:41:11 +05:30
marination
b6e46eea80 perf: get_boms_in_bottom_up_order 
- Create child-parent map once and fetch value from child key to get parents
- Get parents recursively for a leaf node (get all ancestors)
- Approx. 44 secs for 4lakh 70k boms
 2022-05-18 13:00:00 +05:30
Saqib Ansari
9fb7b49b43
fix(india): error while parsing e-invoice (#31053) 2022-05-18 11:53:00 +05:30
maharshivpatel
65d55ea8fa
fix(india): eway bill cancel api is disabled (#31055) 2022-05-18 11:52:31 +05:30
marination
e07ce6efe0 fix: Job Card excess transfer behaviour 
- Block excess transfer of items if not allowed in settings
- Behaviour made consistent with js behaviour (button disappears if not pending and not allowed in settings)
- Test for same case
 2022-05-17 17:39:45 +05:30
Rucha Mahabal
28fe4f3d54
fix: unlink Attendance from Employee Checkins on cancellation (#31045) 2022-05-17 12:07:58 +05:30
Deepak
867f2c6282
fix: TypeError in add_indicator_for_multicompany (#31042) 
Minor fix in add_indicator_for_multicompany

In case of multi-company transactions add (+) buttons in connection dashboard pf customer aren't being loaded due to TypeError (TypeError: e.dashboard.stats_area.removeClass is not a function) created by "frm.dashboard.stats_area.removeClass('hidden');" during the stats section creation.
 2022-05-17 11:52:52 +05:30
Saqib Ansari
f915a9cef7
fix: discount ledger entry in case of multicurrency invoice (#31024) 2022-05-17 11:22:01 +05:30
barredterra
cad64f19b7 feat: show title field for Sales Taxes and Charges 2022-05-16 16:19:53 +02:00
barredterra
9553319d87 feat: show title field for Purchase Taxes and Charges 2022-05-16 16:19:32 +02:00
Ankush Menat
3714e36b44
fix: disable pricing rules for internal transfers (#31034) 
* fix: disable pricing rules for internal transfers

* fix: only apply validation on internal transfers

Co-authored-by: Marica <maricadsouza221197@gmail.com>

* fix: internal_party_field undefined

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2022-05-16 18:09:14 +05:30
Marica
06c036f49f
Merge pull request #30834 from ankush/transfer_precision 
fix: precision loss when transferring
 2022-05-16 16:00:06 +05:30
Ankush Menat
c3bfc395b7 chore: disable flaky test 2022-05-16 15:50:04 +05:30
Rucha Mahabal
1b7ce9649b
fix: IN time not captured in Attendance through Employee Checkin (#31029) 2022-05-16 15:45:00 +05:30