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

32535 Commits

Author SHA1 Message Date
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
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
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
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
Deepesh Garg
243625898e fix(India): Sales taxes and charges template fetching in quotation 2022-06-10 22:05:58 +05:30
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
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
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
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
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
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
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
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
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