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

32159 Commits

Author SHA1 Message Date
Deepesh Garg
d4d83f4bb6 test: Fixes in test case 2022-04-23 12:33:35 +05:30
Deepesh Garg
0eacc99ab7 test: Fixes in test case 2022-04-23 12:08:30 +05:30
Rucha Mahabal
deed9702cf
Merge pull request #30780 from ruchamahabal/promotion-enhancements 2022-04-22 22:33:39 +05:30
Rucha Mahabal
8e5327a0e0 fix: clear property child table on changing employee 2022-04-22 21:33:24 +05:30
Rucha Mahabal
9d158088ee chore: remove unused Employee Transfer Property doctype 2022-04-22 20:20:12 +05:30
Rucha Mahabal
cfa4dfe7a8 fix: reset old CTC on promotion cancellation 2022-04-22 20:20:04 +05:30
Rucha Mahabal
9b93c63830 fix: tests 2022-04-22 17:54:32 +05:30
Wolfram Schmidt
43c1d63ab2
fix translation (#30781) 
fixed the short word for March in german language
 2022-04-22 17:32:34 +05:30
Rucha Mahabal
788e0a1c6c chore: format employee_property_update.js 2022-04-22 17:25:37 +05:30
Rucha Mahabal
ed04241cf4
Merge branch 'develop' into promotion-enhancements 2022-04-22 16:38:01 +05:30
Rucha Mahabal
833a33a94b test: employee property update via Employee Promotion 2022-04-22 16:28:25 +05:30
Rucha Mahabal
a93867de19 feat: add CTC fields in Employee master and Promotion 2022-04-22 16:28:14 +05:30
marination
8d632e9b9c style: Re-run pre-commit 2022-04-22 16:27:29 +05:30
marination
b848e61954 fix: Skip unpublished Variants with published templates in shopping cart quote validation 2022-04-22 16:25:56 +05:30
Devin Slauenwhite
53d8168dea fix: linter format string after translation 2022-04-22 16:25:28 +05:30
Devin Slauenwhite
ea6d6e31b3 fix: linter trilaing whitespace 2022-04-22 16:25:21 +05:30
Devin Slauenwhite
48da3b4482 fix: sider issues 2022-04-22 16:23:18 +05:30
Devin Slauenwhite
b88d5d135e fix(test): validate exception without website item 2022-04-22 16:23:07 +05:30
Devin Slauenwhite
86832fb7fe test: assert error if quotation contains non website item 2022-04-22 16:22:58 +05:30
Devin Slauenwhite
678a1179d4 fix: shopping cart quotation without website item 2022-04-22 16:22:32 +05:30
Deepesh Garg
9bb132fdd3 fix: Do not validate while creating accounting dimension 2022-04-22 13:39:43 +05:30
Vladislav
e088e65871
fix: update translation (#30725) 
* 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-04-22 11:00:57 +05:30
Deepesh Garg
81b3342480
Merge pull request #30757 from nextchamp-saqib/einv-401-fix 
fix(india): 401 & 403 client error while generating IRN
 2022-04-21 18:55:26 +05:30
Deepesh Garg
8a8476bb5c test: Add test coverage for bank clearance 2022-04-21 18:53:18 +05:30
Ankush Menat
d5ab626a31
Merge pull request #30726 from ankush/dependent_gle_reposting 
fix: dependent gle reposting
 2022-04-21 18:06:40 +05:30
Ankush Menat
ee3036651a
fix: batch_no filtering not working when batch no is also a number in scientific notation (#30770) 
[skip ci]
 2022-04-21 16:34:31 +05:30
rahib-hassan
78c8e46511
Merge branch 'develop' into separate-discount-account 2022-04-21 15:06:58 +05:30
Deepesh Garg
c42547d40f fix: Use parent cost center for Sales and Purchase Invoice 2022-04-21 13:26:44 +05:30
Marica
87f1617780
Merge branch 'develop' into field-filters-e-com 2022-04-21 12:32:33 +05:30
marination
c5d4bed932 test: setup e commerce settings before running invalid filtrs test 2022-04-21 12:29:30 +05:30
Rucha Mahabal
c3dc5d5ce7 fix: property addition not working for select fields 2022-04-21 08:17:00 +05:30
rahib-hassan
02e17dbded fix: removed manual enable-discount-account method 2022-04-21 02:42:42 +05:30
rahib-hassan
2c78cc2014 fix: removed manual rollback - enable discount account 2022-04-21 02:40:59 +05:30
Deepesh Garg
3d0e68acaa fix: select doctype as payment_document 2022-04-20 19:49:53 +05:30
Deepesh Garg
c3e27b5556 fix: Loan doctypes in bank reconciliation 2022-04-20 19:07:53 +05:30
marination
8981405a62 test: Field filter validation and Custom field as field filter 
- Test to block Item fields (which aren’t in Website Item) in E Commerce Settings as filters
- Removed unnecessary function and setup in E Commerce Settings test
- Removed commented useless test
- Test to check custom field as filter
 2022-04-20 18:50:47 +05:30
marination
6d750e185e fix: Handle Multiselect field mapping separately 
- Map Multiselect child table to Website Item (copy rows)
 2022-04-20 17:40:03 +05:30
rahib-hassan
13092bcc2d fix: enable discount roll_back 2022-04-20 16:46:29 +05:30
rahib-hassan
1e143e7479 fix: use @change_settings to enable_discount_account 2022-04-20 16:06:55 +05:30
rahib-hassan
f3fa6ac4c2 fix: account setting seperation gl discount account creation 2022-04-20 16:01:12 +05:30
Rucha Mahabal
5411e69553
fix: filters not working in Shift Assignment Calendar view (#30752) 2022-04-20 14:56:06 +05:30
Saqib Ansari
ee8047aba3 fix(india): 401 & 403 client error while generating IRN 2022-04-20 14:14:29 +05:30
rahib-hassan
f058755ad3 fix: test cases updated 2022-04-20 13:24:15 +05:30
HENRY Florian
143786aaa0
fix: Must not be able to start Job Card if it is related to Work Order that is not started yet (#29072) 
* fix: Cannot start Job strat if related to Work Order not started yet

* fix: Cannot start Job strat if related to Work Order not started yet

* test

* test

* fix siders

* PR review

* chore: Code cleanup

- Better short circuit for if condition (make it such that both conditions dont always have to be computed)
- Remove `r.message` extraction by avoiding `then()`

* chore: Remove unnecessary json change

Co-authored-by: marination <maricadsouza221197@gmail.com>
 2022-04-20 12:29:52 +05:30
marination
5660b335ba fix: Mistyped variable name in patch 2022-04-20 12:25:59 +05:30
Deepesh Garg
0ac11a5b30 fix: First preference to parent cost center rather than round off cost center 2022-04-20 12:18:11 +05:30
Ankush Menat
9734329094 test: discard local future SLE cache between tests 2022-04-19 17:40:28 +05:30
Ankush Menat
700e864d90 fix: sort stock vouchers before reposting GLE 2022-04-19 17:40:26 +05:30
Ankush Menat
b24920c0e9 fix: correct sorting while updating bin 2022-04-19 17:38:36 +05:30
Ankush Menat
d2882ea436 test: use disposable item codes in tests 
dependency causes flake
 2022-04-19 17:38:36 +05:30
Ankush Menat
8f519545b0 test: repost queue progress 2022-04-19 17:38:36 +05:30
Ankush Menat
ecdb49314f fix: dependent GLE reposting 2022-04-19 17:38:36 +05:30
Ankush Menat
a2af2daca7 test: dependent GL entry reposting 2022-04-19 17:38:36 +05:30
Ankush Menat
afc5a55a23 refactor: repost error handling 2022-04-19 17:38:36 +05:30
FinByz Tech Pvt. Ltd
54a05075f3 fix(india): transporter name is null while generating e-way bill (#30736) 
(cherry picked from commit 6291b28c37f02380001ab68b3a660b2804383ab2)
 2022-04-19 10:57:59 +00:00
Rucha Mahabal
789fa31b82
Merge branch 'develop' into shift-type-null-in-employee-checkin 2022-04-19 13:39:32 +05:30
Rucha Mahabal
3cddc1e97e test: shift fetching when assignment has an end date 2022-04-19 13:39:03 +05:30
Rucha Mahabal
98cccf221e fix: shift fetching fails in Employee Checkin if shift assignment has an end date 
Co-authored-by: Ejaaz Khan <ejaazrkhan@gmail.com>
 2022-04-19 13:17:36 +05:30
Rucha Mahabal
7c547f152f
fix(patch): check if column is present while fixing reverse linking (#30737) 2022-04-19 12:18:46 +05:30
marination
d0cd194398 chore: Patch to copy custom fields (field filters) from Item to Website Item 2022-04-18 21:40:19 +05:30
Deepesh Garg
d96bfe13a8 Merge pull request #30721 from ruthra-kumar/bug_so_analysis_report 
fix: SO's without delivery note will also be fetched
 2022-04-18 19:58:37 +05:30
marination
1e80b97915 refactor: Change Filter Fields table fieldtype to Autocomplete 
- Remove dynamic js fieldtype change to `Select`
 2022-04-18 19:01:43 +05:30
marination
d35b37881b fix: Validate field filter wrt to Website Item & re-use validation in Item Group 2022-04-18 18:51:48 +05:30
Marica
8a366309e1
Merge branch 'develop' into field-filters-e-com 2022-04-18 18:11:25 +05:30
marination
c993ac09df fix: Query filter fields from Website Item instead of Item master 
- tweak `filters.py` to correctly query filter field values from Website Item
- Use Website Item for filter field options in Settings and Item Group Field Filter table
 2022-04-18 18:01:48 +05:30
rahib-hassan
bcfbb3e9c8 fix: code formatting 2022-04-18 15:04:47 +05:30
rahib-hassan
ebb7bc201b fix: library import formatting 2022-04-18 14:53:45 +05:30
Deepesh Garg
264ec65255
Merge pull request #30728 from deepeshgarg007/pricing_rule_apply_mapped_doc 
fix: Price changing on creating Sales return from Delivery Note
 2022-04-18 14:34:28 +05:30
rahib-hassan
52fd804aed Merge branch 'develop' of github.com:rahib-hassan/erpnext into separate-discount-account 2022-04-18 14:13:46 +05:30
Deepesh Garg
9c081947ec fix: Price changing on creating Sales retrun from Delivery Note 2022-04-18 10:21:15 +05:30
Deepesh Garg
5cdd0d6719 fix: Move tax withholding category field 2022-04-16 20:34:56 +05:30
Deepesh Garg
0a67b0239e fix: Consistent customer and supplier forms 2022-04-16 19:43:59 +05:30
ruthra kumar
13487e2408 test: Sales order analysis report 2022-04-16 12:02:32 +05:30
Bhavesh Maheshwari
72757994f8 fix: process statement to_date override 
(cherry picked from commit 378d15d388ae9cac7a5f897af83c99605403503a)
 2022-04-14 13:14:11 +00:00
ruthra kumar
e28e6726f1 fix: SO analysis rpt will fetch SO's without Delivery note as well 2022-04-14 18:37:46 +05:30
Ankush Menat
9af2d68945 refactor: convert queries to ORM/QB, add types 2022-04-14 18:05:38 +05:30
Ankush Menat
ba29323e11 test: increase assertions to cover all cases 2022-04-14 18:05:38 +05:30
Ankush Menat
e278ee359a test: item attribute columns 2022-04-14 18:05:38 +05:30
Ankush Menat
febc74a21b refactor: rewrite stock balance query to QB 2022-04-14 18:05:35 +05:30
Ankush Menat
8a499e95d3 test: uom conversion in stock balance report 2022-04-14 18:01:43 +05:30
Ankush Menat
af0ea7b532 test: assert balanaces against SLE 2022-04-14 18:01:42 +05:30
Ankush Menat
f4766ae4eb test: opening balance in stock balance report 2022-04-14 18:01:42 +05:30
Ankush Menat
8b2432dfa0 test: stock balance report tests 2022-04-14 18:01:42 +05:30
Ankush Menat
64ac22af82 refactor: add filter type info 2022-04-14 18:01:42 +05:30
HENRY Florian
e6aa28ea14
fix: update translation (#30716) 
* fix: update translation

* fix: update translation

* fix: update translation

* fix: update translation
 2022-04-14 17:46:47 +05:30
Ankush Menat
15576c1ce8
Merge pull request #30707 from marination/values-out-of-sync-jv 
fix: Remove "Values Out of Sync" validation
 2022-04-14 17:39:18 +05:30
Ankush Menat
0d64349142
Merge branch 'develop' into separate-discount-account 2022-04-14 17:29:28 +05:30
rahib-hassan
4130493b58 fix: Label typo 2022-04-14 16:03:08 +05:30
rahib-hassan
01fde15bd5 fix: dependent codes updated 2022-04-14 15:48:55 +05:30
rahib-hassan
0eff74c650 fix: tabspacing 2022-04-14 15:42:16 +05:30
Deepesh Garg
1659f1eb6d
Merge pull request #29963 from nabinhait/income-tax-computation 
feat: Income tax computation Report
 2022-04-14 15:31:17 +05:30
Deepesh Garg
e2fa9f708e
Merge pull request #30710 from deepeshgarg007/advance_jv_allocation 
fix: Exchange gain and loss on advance Journal Entry allocation
 2022-04-14 15:10:04 +05:30
Nabin Hait
cd2ab32242 fix: orginised code 2022-04-14 14:05:21 +05:30
Nabin Hait
bc7007d588
fix: get enabled deduction components 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2022-04-14 14:02:01 +05:30
Nabin Hait
d06b7378f8
fix: get enabled and submitted income tax slab 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2022-04-14 14:01:44 +05:30
Nabin Hait
67086e618d
fix: get enabled earning components 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2022-04-14 14:00:28 +05:30
Marica
87117313a1
Merge branch 'develop' into values-out-of-sync-jv 2022-04-14 13:41:27 +05:30
Deepesh Garg
c38be53ce8 test: Update customer in Sales Invoice 2022-04-14 13:26:47 +05:30
Suraj Shetty
11fa187263
Merge pull request #30715 from surajshetty3416/fix-exotel-call-log 2022-04-14 12:45:15 +05:30
Suraj Shetty
77599fe443 fix: Set correct options for link field 
issue introduced via https://github.com/frappe/erpnext/pull/30711
 2022-04-14 12:32:31 +05:30
Deepesh Garg
86cfa3a53f
Merge pull request #30712 from frappe/mergify/bp/develop/pr-30700 
fix: Payment reco query with max invoice and payment amount limit (backport #30700)
 2022-04-14 12:32:11 +05:30
marination
d75d5ebe8d chore: Remove Values Out of Sync from Repost hourly job 
- It runs after repost (after commiting), so it has 0 impact on repost itself
- Just that scheduled job log shows up as failed, while actually repost is done and repost document is "Completed"
- The check is inaccurate also, so best to remove this
- Users cant do anything about it anyway. This just piles up phantom failed jobs unneccessarily
 2022-04-14 12:30:06 +05:30
Deepesh Garg
065c38152a Merge branch 'develop' of https://github.com/frappe/erpnext into item_wise_provisional_accounting 2022-04-14 12:04:21 +05:30
Deepesh Garg
ad171c6225 test: Update test case 2022-04-14 12:03:12 +05:30
Deepesh Garg
e6cb948a96 fix: Payment reco query with max invocie and payment amount limit 
(cherry picked from commit 4008c95ac6afc3b06a0a602e3f469db61e1f0453)
 2022-04-14 05:42:17 +00:00
Deepesh Garg
972d9ec5b4 test: Update customer 2022-04-14 11:10:41 +05:30
Suraj Shetty
6e837bcdfc style: Fix linter warning 2022-04-14 10:02:15 +05:30
Suraj Shetty
c272170b86 fix(call log): Convert Data to Link for type_of_call 
Convert `Data` to `Link` for type_of_call,
employee_user_id and call_received_by fields
 2022-04-14 09:51:54 +05:30
Deepesh Garg
31883b699d fix: Exchange gain and loss on advance jv allocation 2022-04-13 20:52:25 +05:30
Ankush Menat
79fbc2c504
test: flaky PR close test (#30709) 2022-04-13 20:42:25 +05:30
Suraj Shetty
d890ee9495
Merge pull request #29962 from nemesis189/exotel-fixes 
fix: Exotel Call Log fixes
 2022-04-13 20:36:03 +05:30
Suraj Shetty
ff41b8da4e fix: Update received_by if "to" is changed 2022-04-13 20:12:08 +05:30
Suraj Shetty
cef28df8db test: Do not overwrite frappe.form_dict to retain proxy reference 
Set frappe.local.form_dict instead
 2022-04-13 19:10:19 +05:30
marination
89fab78027 fix: Remove "Values Out of Sync" validation from Journal Entry 
- Even if there is a difference there's not much a user can do
- Checking it at the JV level is senseless. Blindly making users post another JV will lead to more error.
- Users making JV are usually accountants who know what they are doing
- The validation computes incorrect values for an account that contributes partially to warehouse's value.
 2022-04-13 18:44:50 +05:30
Raffael Meyer
6453fb4cea
refactor!: remove DATEV integration (#30584) 
The DATEV integration follows the trend and moves into a separate app.

- the DATEV Integration will be maintained at https://github.com/alyf-de/erpnext_datev (version-14 branch)
- the German Compliance and Localization will be maintained at https://github.com/alyf-de/erpnext_germany
 2022-04-13 09:24:19 +00:00
Marica
c5247a0767
Merge branch 'develop' into pp-wo-company 2022-04-13 11:52:15 +05:30
marination
6315acc450 fix: Map correct company to PO made via Prod Plan (subcontract) 2022-04-13 11:47:58 +05:30
Ankush Menat
bfaaebde0d
Merge branch 'develop' into separate-discount-account 2022-04-12 18:38:23 +05:30
Deepesh Garg
228195ba74
Merge pull request #30689 from deepeshgarg007/disabled_gl_dimensions 
fix: Do not show disabled dimensions in reports
 2022-04-12 16:11:07 +05:30
Deepesh Garg
4f9b38a591
Merge pull request #30686 from nabinhait/ignore-permlevel-for-fields 
feat: Ignore permlevel for specific fields
 2022-04-12 15:55:28 +05:30
Noah Jacob
8261b2bb4f
refactor: trigger generate schedule when any change made in items table (#29874) 
* refactor: trigger generate schedule when any change made in items table

* chore: added serial validation on server side

* test: serials updated in schedules after save

* fix: schedule not generating after updating some fields

* feat: generate_schedule is triggered on_save when items table is changed

* test: updated tests to check other field changes on save

* chore: removed serial validation function for schedules table and added no_of_visits validation function

* test: updated for manually deleted schedele rows

* refactor: updated validate_items_table_change to return bool

* test: updated test_schedule_with_serials to cover validate_items_table_change

* fix: linting
 2022-04-12 15:30:49 +05:30
Deepesh Garg
9a1c560c82 fix: Do not show disabled dimensions in reports 2022-04-12 15:27:08 +05:30
marination
2777c5c67c fix: Map Production Plan company in subassembly WO created from it 2022-04-12 14:30:01 +05:30
Nabin Hait
993c6c0de9 feat: Ignore permlevel for specific fields 2022-04-12 12:24:47 +05:30
Ankush Menat
60fb71bd2a
fix: ignore item-less maintenance visit for sr no (#30684) 2022-04-12 11:14:02 +05:30
Deepesh Garg
7d263e9ecf
Merge pull request #30651 from deepeshgarg007/gst_download_json_key_error 
fix: Download JSON for GSTR-1 report
 2022-04-12 00:06:25 +05:30
Marica
014298a867
Merge pull request #30674 from marination/work-order-partial-transfer 
fix: Handle multiple item transfer in separate SEs against WO
 2022-04-11 17:23:57 +05:30
Deepesh Garg
79b90118e1
Merge branch 'develop' into gst_download_json_key_error 2022-04-11 17:15:04 +05:30
Marica
3f8be3ac10
Merge branch 'develop' into work-order-partial-transfer 2022-04-11 16:49:22 +05:30
marination
5aa60bb651 test: Multiple RM transfer in separate Stock Entries 
- Added test and acceptance of 0 as For Quantity in test helper
 2022-04-11 16:44:55 +05:30
Nabin Hait
e46898f5f5 fix: test cases 2022-04-11 16:37:34 +05:30
Nabin Hait
aad29ad572 fix: removed unused imports 2022-04-11 15:33:22 +05:30
marination
be2e5ce966 style: Missing Semicolon 2022-04-11 15:32:57 +05:30
Nabin Hait
c27e3ef03e fix: Show message is no employee found 2022-04-11 15:30:26 +05:30
Deepesh Garg
553178bfe7 test: Add test 2022-04-11 15:29:20 +05:30
Nabin Hait
7072dda31f fix: sider issues 2022-04-11 15:19:42 +05:30
Deepesh Garg
54eef3daad Merge branch 'develop' of https://github.com/frappe/erpnext into deferred_revenue_default_account_fixes 2022-04-11 15:09:30 +05:30
Saqib Ansari
0373347a97
Merge branch 'develop' into separate-discount-account 2022-04-11 14:55:42 +05:30
Nabin Hait
c7848089ab tests: Added unit tests for income tax computation report 2022-04-11 14:51:23 +05:30
Deepesh Garg
3ce64170db feat: Item-wise provisional accounting for service items 2022-04-11 14:35:22 +05:30
rahib-hassan
a7a5742375 fix: merge conflict(patch) 2022-04-11 14:28:36 +05:30
marination
dfff4beaf4 fix: Handle multiple item transfer in separate SEs against WO 
- Check for pending qty in child items to show/hide "Start" button
- If no qty needed to transfer (FG qty is fulfilled), but RM qty pending: map pending in SE with For Quantity = 0
 2022-04-11 14:10:57 +05:30
Ankush Menat
c3e1f0e369 refactor: ignore mandatory fields during setup 2022-04-11 13:19:17 +05:30
Ankush Menat
086d31b59f fix: dont validate currency exchange in setup 
Redues ~4-5 seconds of time and chances of setup failure.
 2022-04-11 13:19:17 +05:30
Nabin Hait
e3a53590de fix: Added filter to consider Tax Exemption Declaration if proof not submitted 2022-04-11 12:23:13 +05:30
Nabin Hait
535217a042 fix: Added income tax slab column 2022-04-11 12:23:13 +05:30
Nabin Hait
1f018a912b fix: Get exemptions from declaration only if proof not submitted 2022-04-11 12:23:13 +05:30
Nabin Hait
b4900ef220 fix: duplicate exemption amount and rounded tax 2022-04-11 12:23:13 +05:30
Nabin Hait
a74eec01ea fix: Added report link in the Payroll workspace 2022-04-11 12:23:13 +05:30
Nabin Hait
a9b5d990a4 fix: Removed designation filter 2022-04-11 12:23:13 +05:30
Nabin Hait
0480bb318e fix: Modified column width 2022-04-11 12:23:13 +05:30
Nabin Hait
f9633bbd48 feat: Income Tax Computation Report 2022-04-11 12:23:11 +05:30
HENRY Florian
03c631d723
fix: update translation (#30654) 2022-04-11 10:49:18 +05:30
Deepesh Garg
227a711d70
Merge pull request #30585 from frappe/mergify/bp/develop/pr-30575 
fix: Do not apply shipping rule for POS transactions (backport #30575)
 2022-04-10 20:12:53 +05:30
Deepesh Garg
0f414d51f4
Merge pull request #30443 from frappe/mergify/bp/develop/pr-30438 
fix: Incorrect default amount to pay for POS invoices (backport #30438)
 2022-04-10 18:56:02 +05:30
Deepesh Garg
ddbd82af95
Merge pull request #30459 from frappe/mergify/bp/develop/pr-30385 
fix(India): Auto tax fetching based on GSTIN (backport #30385)
 2022-04-10 18:55:26 +05:30
Deepesh Garg
809117229d
Merge pull request #30626 from nextchamp-saqib/einv-utgst 
feat(india): e-invoicing for intra-state union territory transactions
 2022-04-10 18:54:17 +05:30
Ankush Menat
8138e53cf3 test: flaky picklist tests 2022-04-10 17:50:57 +05:30
Deepesh Garg
a2937cffc7 fix: Implicit ignore pricing rule check on returns 
(cherry picked from commit 1b25a7fe765d334fce990d43224f8a790ccf8119)
 2022-04-09 14:46:25 +00:00
Deepesh Garg
207bf85c74
Merge pull request #30488 from Havenir/fix-project-list-in-web-view 
fix: web form filters for project
 2022-04-09 20:06:49 +05:30
Deepesh Garg
cbd8998fc1
Merge branch 'develop' into mergify/bp/develop/pr-30438 2022-04-09 20:03:23 +05:30
Deepesh Garg
02c6b898a6
Merge branch 'develop' into mergify/bp/develop/pr-30385 2022-04-09 19:57:59 +05:30
Deepesh Garg
e30cc8422c
fix: Resolve conflicts 2022-04-09 19:53:40 +05:30
Deepesh Garg
2e00678c76
Merge pull request #30542 from deepeshgarg007/disabled_tax_category 
fix: Ignore disabled tax categories
 2022-04-09 19:52:31 +05:30
mergify[bot]
51d77cd85e
fix(pos): cannot change paid amount in pos payments (#30660) 2022-04-09 16:28:10 +05:30
Rucha Mahabal
cf2e6c6c08 fix: remove hardcoded employee fields that can be updated via Promotion 2022-04-09 13:15:37 +05:30
rahib-hassan
dc2944a041 fix[minor]: removed doc assignment 2022-04-09 03:55:25 +05:30
Suraj Shetty
199419db80
Merge branch 'develop' into exotel-fixes 2022-04-08 21:37:08 +05:30
Suraj Shetty
7ff5bc9e3d test: Clean up form_dict 
To avoid failures like
https://github.com/frappe/erpnext/runs/5887687369?check_suite_focus=true#step:12:783
 2022-04-08 21:33:29 +05:30
rahib-hassan
ac16f3b71f fix: lock timeout exceeded 2022-04-08 18:20:41 +05:30
Ankush Menat
af6b07f9b9
fix: block cancellation of SL/GL entries (#30652) 
Individual GL/SLEs aren't supposed to be cancelled by users.
 2022-04-08 18:05:04 +05:30
rahib-hassan
ac7f1cbd87 fix: minor fix 2022-04-08 17:46:49 +05:30
rahib-hassan
2173c8b114 fix(pathces): added to patches.txt 2022-04-08 17:29:08 +05:30
rahib-hassan
35e875c111 fix(patch): enable discount account in buying and selling if exist in accounts settings 2022-04-08 17:27:53 +05:30
Ankush Menat
fcbd25f27a chore: formatting 2022-04-08 17:24:10 +05:30
Deepesh Garg
b532ade383 fix: Download JSON for GSTR-1 report 2022-04-08 17:14:10 +05:30
rahib-hassan
171c60ff37 fix: removed discount account field from account settings 2022-04-08 16:50:56 +05:30
rahib-hassan
786887768e fix: removed discount-accounting code from account settings 2022-04-08 16:50:36 +05:30
Jannat Patel
59ad7e037c
Merge pull request #30596 from pateljannat/remove-courses-template 2022-04-08 16:27:31 +05:30
Ankush Menat
d74181630a test: prevent cancelling RIV of cancelled voucher 2022-04-08 14:57:55 +05:30
Ankush Menat
a281998bcb fix: prevent deleting repost queue for cancelled transactions 2022-04-08 14:57:55 +05:30
Deepesh Garg
617deda2ff
Merge branch 'version-14-beta' into develop 2022-04-08 13:38:27 +05:30
Ankush Menat
49560d20bc
fix: remove bad defaults from BOM operation (#30644) 
[skip ci]
 2022-04-08 11:23:02 +05:30
rahib-hassan
1babc5f367 feat: separated discount accounting settings for sales and purchase 2022-04-08 08:05:10 +05:30
Ankush Menat
8d57c853f3
feat: barcode scanning in quotation (#30637) 2022-04-07 21:40:03 +05:30
Ankush Menat
225deb949b
fix: use empty row when batch is scanned (#30638) 2022-04-07 21:38:18 +05:30
Sam
8fbfba4f2f
chore: class selectors for customizability (#30185) 
* Update project_row.html

Really helpful those fields has own class when styling for mobile or desktop by using Website Settings --> HTML Header, Robots and Redirects

* chore: skewercase
 2022-04-07 19:27:27 +05:30
Rucha Mahabal
7ba66b0320
Merge branch 'develop' into multiple-shifts 2022-04-07 18:07:39 +05:30
Ankush Menat
f1fd4e5c27 test: cant_change validations on item 2022-04-07 17:30:12 +05:30
Ankush Menat
fba68541d6 refactor(Item): linked doc checking 2022-04-07 17:30:12 +05:30
Ankush Menat
2f1e98d1e8 feat: show Stock Reconciliation links on item dashboard 2022-04-07 17:30:12 +05:30
Sagar Vora
3b4754f3f6 fix: define tax_columns below consistency 2022-04-07 17:01:10 +05:30
Sagar Vora
fa4f57f470 fix: dont reassign mutable (list) to a different field 2022-04-07 16:51:27 +05:30
Deepesh Garg
18b1a93c7e
Merge pull request #30606 from deepeshgarg007/exchange_gain_loss_button 
fix: Exchange gain and loss button in Payment Entry
 2022-04-07 16:49:05 +05:30
Deepesh Garg
c9d6618b9b
Merge pull request #30628 from deepeshgarg007/pricng_rule_test 
test: Pricing rule test for transactions
 2022-04-07 16:37:02 +05:30
Ankush Menat
be04eaf723
fix: warehouse naming when suffix is present (#30621) 2022-04-07 13:21:08 +05:30
Deepesh Garg
22e8ae9dac test: Pricing rule test for transactions 2022-04-07 13:20:53 +05:30
Saqib Ansari
45fca6bed7 feat(india): e-invoicing for intra-state union territory transactions 2022-04-07 13:09:05 +05:30
Ankush Menat
a6e26cce87 chore: broken translations 2022-04-07 13:07:14 +05:30
Deepesh Garg
f3e6a26d34
Merge pull request #30499 from ruthra-kumar/payment_terms_status_filter 
feat: 'customer' column and more filter to Payment terms status report
 2022-04-07 13:01:16 +05:30
Rucha Mahabal
ec65af5f38 fix: show allocation history for earned leaves allocated via scheduler 2022-04-07 12:57:04 +05:30
Rucha Mahabal
6203ffc8fa fix: make New Leaves Allocated read-only if policy assignment is linked to the allocation and leave type is earned leave 2022-04-07 12:57:04 +05:30
Rucha Mahabal
f8f1c3d8b5 fix: enable Track Changes in Leave Allocation 2022-04-07 12:57:04 +05:30
Ankush Menat
e4c6d6a1a6
fix: strip html tags before checking for empty description (#30619) 2022-04-07 12:53:10 +05:30
Deepesh Garg
8feb4f08c5 fix: Exchange gain and loss button in Payment Entry 2022-04-06 20:51:51 +05:30
Ankush Menat
8e425252c4 chore: typo 2022-04-06 18:27:41 +05:30
Ankush Menat
9e2d54f9a4 chore: broken translation 
[skip ci]
 2022-04-06 18:21:28 +05:30
Ankush Menat
eebcf2a9f1
fix: only trigger onload checks on saved docs (#30603) 2022-04-06 18:13:55 +05:30
Deepesh Garg
9bf5f76ac8 fix: Deferred Revenue/Expense Account validation 2022-04-06 17:33:46 +05:30
Ankush Menat
8b090a9f7d
fix: hide pending qty only if original item is assigned (#30599) 2022-04-06 16:35:36 +05:30
Ankush Menat
ba42c87687
refactor: don't use pandas for basic reports (#30597) 2022-04-06 15:40:41 +05:30
Jannat Patel
bce1c2a028 fix: removed unused courses template 2022-04-06 14:44:10 +05:30
Ankush Menat
bb875fe217
fix: check null values in is_cancelled patch (#30594) 2022-04-06 14:20:39 +05:30
HENRY Florian
4895761d89
fix: update translation (#30474) 
* fix: update translation

* fix: update translation

* fix: update translation

* fix: update translation

* fix: update translation

* fix: update translation

* fix: update translation

* fix: update translation

* fix: update translation

* fix: update translation
 2022-04-06 14:00:05 +05:30
Deepesh Garg
a818acf66d
Merge pull request #30557 from deepeshgarg007/loan_repayment_issue 
fix: Issues on loan repayment
 2022-04-06 11:36:53 +05:30
Rucha Mahabal
00ddb4c42a
Merge branch 'develop' into multiple-shifts 2022-04-06 11:22:46 +05:30
Rucha Mahabal
c5850e3923
Revert "feat: Scheduling Multiple shifts and Auto Attendance" (#30587) 2022-04-06 11:18:47 +05:30
Deepesh Garg
4c8dae40cd
Merge branch 'develop' into loan_repayment_issue 2022-04-06 10:57:25 +05:30
Deepesh Garg
b8df82d23c
Merge pull request #30555 from deepeshgarg007/party_account_user_perm 
fix: Ignore user perm for party account company
 2022-04-06 10:57:13 +05:30
Rucha Mahabal
f208903250
feat: Scheduling Multiple shifts and Auto Attendance (#29955) 
* refactor: overlapping shifts validation

- convert raw query to frappe.qb

- check for overlapping timings if dates overlap

- translation friendly error messages with link to overlapping doc

* refactor: consider timeslots in `get_employee_shift`

* fix: handle shift grace overlap while finding current shift

* refactor: handle shifts spanning over 2 different days

* fix: fetching shift on timing boundaries

* refactor: rewrite docstrings and add type hints for functions

* refactor: Allow multiple attendance records creation for different shifts

* feat: auto attendance marking for multiple shifts on the same day

* refactor: mark absent for employees with no attendance

- break down into smaller functions

- make it work with multiple shifts

- this will mark employee as absent per shift, meaning employee can be present for one shift and absent for another on the same day

* chore: sort imports, remove unused imports

* refactor: Monthly Attendance Sheet

- split into smaller functions

- add type hints

- get rid of unnecessary db calls and loops

- add docstrings for functions

* feat: add colors for attendance status to lessen the cognitive load

- legend with colors and full form for status abbreviations

* feat: show shift-wise attendance in monthly attendance sheet

* test: monthly attendance sheet

* style: format code with black

* chore: ignore formatting changes in blame

* test: fetching shifts in Employee Checkins

* fix(test): make holiday list for shift and checkin tests

* fix: tests

* test: shift assignment creation

* fix: attendance fixes

- check half day attendance threshold before absent threshold to avoid half day getting marked as absent

- round working hours to 2 digits for better accuracy

- start and end dates for absent attendance marking

* test: Shift Type with Auto Attendance setup and working

fix test setups

* refactor: Overlapping validation for Shift Request

- commonify time overlap function between request and assignment

- add tests for shift request overlap

* chore: remove unused import

* fix: add validation for overlapping shift attendance

- skip auto attendance in case of overlapping shift attendance record

- this case won't occur in case of shift assignment, since it will not allow overlapping shifts to be assigned

- can happen if manual attendance records are created

* test: validations for duplicate and overlapping shift attendance records

* test: skip auto attendance

* fix: skip validation for overlapping shift attendance if no shift is linked

* test: add holiday related shift and attendance tests

* test: add attendance sheet tests for employee filter, half days

* fix: sider
 2022-04-06 10:56:47 +05:30
Deepesh Garg
dec0c1b5bb test: Ignore parent company account creation 2022-04-06 10:21:27 +05:30
Deepesh Garg
41a979ef34 Merge branch 'develop' of https://github.com/frappe/erpnext into party_account_user_perm 2022-04-06 10:15:16 +05:30
Deepesh Garg
631545aa32 fix: Use get instead of dot 
(cherry picked from commit 95298f04000c0299f35cdee7bce0f5f0d8c59525)
 2022-04-06 04:31:13 +00:00
Deepesh Garg
714fc08150 fix: Do not apply shipping rule for POS transactions 
(cherry picked from commit c0ebcfb39331caa678d36cc4694490a2363f10a0)

# Conflicts:
#	erpnext/public/js/controllers/taxes_and_totals.js
 2022-04-06 04:31:13 +00:00
Deepesh Garg
ec6f7040f4
Merge branch 'develop' into mergify/bp/develop/pr-30385 2022-04-06 10:00:51 +05:30
Deepesh Garg
4727e774c0
Merge branch 'develop' into loan_repayment_issue 2022-04-06 10:00:34 +05:30
Suraj Shetty
ce583c9a81
Merge branch 'develop' into exotel-fixes 2022-04-05 19:48:44 +05:30
Marica
ff7d81020c
Merge pull request #30578 from marination/e-com-acessibility 
chore: Accessibility for E-commerce Doctypes
 2022-04-05 18:11:59 +05:30
Saqib Ansari
c4b5fa8ed1
Merge pull request #30573 from frappe/mergify/bp/develop/pr-30382 
fix: Added validation for single_threshold in Tax With Holding Category (backport #30382)
 2022-04-05 15:52:28 +05:30
Saqib Ansari
7757790572
Merge pull request #30579 from nextchamp-saqib/eway-bill-dialog-fix 
fix: fetch from fields not working in eway bill dialog
 2022-04-05 15:51:38 +05:30
Saqib Ansari
c8779aa446 fix: fetch from fields not working in eway bill dialog 2022-04-05 15:44:17 +05:30
Saqib Ansari
2451452434
Merge branch 'develop' into e-inv-paid-invoice-fix 2022-04-05 13:12:08 +05:30
marination
065623ce25 chore: Add Prices, Stock and E-com Settings access from Website Item 2022-04-05 12:30:02 +05:30
marination
d4301d6d2f chore: Accessibility for E-commerce Doctypes 
- Add Website Item routing button and dashboard link in Item master
- Group Item variant buttons together
 2022-04-05 12:07:50 +05:30
ruthra kumar
16bfb930f8 test: added test cases for group filters 2022-04-05 11:08:09 +05:30
Rucha Mahabal
0e1528365d fix: sider 2022-04-04 21:31:14 +05:30
Rucha Mahabal
bd077dbb3b test: add attendance sheet tests for employee filter, half days 2022-04-04 21:26:42 +05:30
Rucha Mahabal
fec47632bc test: add holiday related shift and attendance tests 2022-04-04 21:02:22 +05:30
Suraj Shetty
ca66224d57
Merge branch 'develop' into exotel-fixes 2022-04-04 20:22:06 +05:30
Suraj Shetty
01909d2e8c test: Fix used frappe._dict to avoid AttributeError down the line 
ref: https://github.com/frappe/erpnext/runs/5816574721?check_suite_focus=true#step:12:880
 2022-04-04 20:21:36 +05:30
Rucha Mahabal
7675542926
Merge pull request #30569 from ruchamahabal/fix-leave-alloc-update 2022-04-04 20:18:55 +05:30
Marica
3c3aca9568
Merge pull request #30522 from marination/redisearch-app-install 
feat: Redisearch with consent
 2022-04-04 19:24:06 +05:30
Sherin KR
e796267214 fix: Validation for single threshold in Tax With Holding Category (#30382) 
(cherry picked from commit 0a2c72c594963f63551985a908c1c79302556e91)
 2022-04-04 13:38:43 +00:00
Rucha Mahabal
793164ac2e fix(test): set company for employee in leave allocation test setup 2022-04-04 19:08:27 +05:30
Rucha Mahabal
5499cecffd test: leave allocation validations and total value for updates done before and after submission 2022-04-04 18:32:17 +05:30
Ankush Menat
a9811c601c
Merge pull request #30564 from rohitwaghchaure/fixed-rejected-warehouse-issue-for-pr 
fix: if accepted warehouse not selected during rejection then stock ledger not created
 2022-04-04 18:26:17 +05:30
Suraj Shetty
117e5d05a3
Merge branch 'develop' into exotel-fixes 2022-04-04 18:21:46 +05:30
Rucha Mahabal
7b406f422d
Merge branch 'develop' into multiple-shifts 2022-04-04 18:14:49 +05:30
Marica
0a592e085c
Merge branch 'develop' into redisearch-app-install 2022-04-04 18:00:56 +05:30
Rohit Waghchaure
ac5df1abbe test: test case to validate rejected qty without accepted warehouse 2022-04-04 17:57:57 +05:30
Rucha Mahabal
3538656a7d fix: total leaves allocated not validated and recalculated on updates post submission 2022-04-04 17:52:30 +05:30
Ankush Menat
de83511091
fix(ux): refresh update to zero val checkbox (#30567) 2022-04-04 17:29:51 +05:30
ruthra kumar
b2ed9fd3fe refactor: use group fields from Sales Order and Sales Order Items 2022-04-04 17:00:47 +05:30
Marica
569eff4f27
Merge branch 'develop' into redisearch-app-install 2022-04-04 16:10:01 +05:30
Saqib Ansari
fed66038b5
fix(pos): do not reset search input on item selection (#30537) 2022-04-04 15:59:16 +05:30
Rohit Waghchaure
0a71cabab1 fix: if accepted warehouse not selected during rejection then stock ledger not created 2022-04-04 15:42:59 +05:30
Ankush Menat
12c01e2975
fix: maintain FIFO queue even if outgoing_rate is not found (#30560) 2022-04-04 15:22:15 +05:30
ruthra kumar
e324d668d3 refactor: item filters are linked with group filters 2022-04-04 14:52:19 +05:30
Saqib Ansari
b91bf40f1b fix: server error while viewing gst e-invoice 2022-04-04 14:40:07 +05:30
Ankush Menat
52eb0a93bb
Merge pull request #30528 from s-aga-r/is-subcontracted-fieldtype 
refactor!: change "is_subcontracted" field type from "Select" to "Check"
 2022-04-04 14:01:20 +05:30
Ankush Menat
a896895a9e fix: bulk fix (~330) missing translations 2022-04-04 13:59:51 +05:30
Sagar Sharma
e80cd29d2e
Merge branch 'develop' into is-subcontracted-fieldtype 2022-04-04 13:31:46 +05:30
Marica
bfb2fbea5f
Merge branch 'develop' into redisearch-app-install 2022-04-04 13:27:50 +05:30
Deepesh Garg
194605823e fix: Issues on loan repayment 2022-04-04 13:25:35 +05:30
marination
397b46a08b chore: Add TODOs(perf) for Redisearch Query 2022-04-04 13:24:56 +05:30
Saqib Ansari
92f632c4b1
Merge branch 'develop' into e-inv-paid-invoice-fix 2022-04-04 13:10:25 +05:30
marination
3445682563 fix: Payload incorrect data (pass item_group.name) 2022-04-04 12:33:25 +05:30
Deepesh Garg
18a3c5d536 fix: Ignore user perm for party account company 2022-04-04 12:32:33 +05:30
Saqib Ansari
0c26f9a8c8 fix(india): cannot generate e-invoice for is_pos invoices 
* If mode of payment > 18 characters, the e-invoice portal throws error
 2022-04-04 12:28:09 +05:30
Ankush Menat
cf5f37e6d8 refactor: move schema change patch higher up 2022-04-04 12:15:26 +05:30
Ankush Menat
e8118fcdf1 fix: doctype layout based on expected tab-order 2022-04-04 12:06:35 +05:30
Ankush Menat
deca1aaf06 fix: dont fetch qty in reco if batch is required 2022-04-04 12:06:35 +05:30
Ankush Menat
f83a1c1989 fix: dont reset barcode in scan mode 2022-04-04 12:06:35 +05:30
Ankush Menat
1736ab57ac feat: Barcode scanning in Stock Reconciliation 
[skip ci]
 2022-04-04 12:06:35 +05:30
marination
7ef1ccbe84 fix: Add default score of 1 to Item Group Autocompleter 
- If score 0 is inserted into suggestions, RS does not consider that suggestion
 2022-04-04 12:04:35 +05:30
marination
97e3a855f7 fix: Convert payload to string before adding to autocompleter 2022-04-04 11:32:49 +05:30
Rucha Mahabal
d9f00409b9
Merge branch 'develop' into multiple-shifts 2022-04-04 11:19:03 +05:30
Suraj Shetty
40d33b5fec test: Use FrappeAPITestCase to track coverage 2022-04-04 11:15:29 +05:30
Rucha Mahabal
1d4b1c42f2 fix: skip validation for overlapping shift attendance if no shift is linked 2022-04-04 11:14:40 +05:30
marination
ea036e4958 fix: Better Exception Handling and vaeiabl naming 
- Function to handle RS exceptions (create log and raise error)
- Handle `ResponseError` where it is anticipated
- Misc: Better variables
 2022-04-04 11:07:53 +05:30
Rucha Mahabal
62cdde9a84 test: skip auto attendance 2022-04-04 11:05:03 +05:30
Rucha Mahabal
277bda11dd test: validations for duplicate and overlapping shift attendance records 2022-04-04 11:04:24 +05:30
Rucha Mahabal
83489be7d9 fix: add validation for overlapping shift attendance 
- skip auto attendance in case of overlapping shift attendance record

- this case won't occur in case of shift assignment, since it will not allow overlapping shifts to be assigned

- can happen if manual attendance records are created
 2022-04-04 11:00:26 +05:30
Suraj Shetty
f4b8573e64 test: Fix erroneous code 2022-04-04 09:31:15 +05:30
Suraj Shetty
cfee53eb55 fix: Handle exception where no employee is returned 2022-04-04 07:38:15 +05:30
Suraj Shetty
39abfae5fe chore: Remove unused code 
- and simplify get_call_log
 2022-04-04 07:28:41 +05:30
Suraj Shetty
0e9ebad9c6 test: Refactor exotel test setup 
- Remove unnecessary code
- Move test data to separate file
- Make proper test assertions
 2022-04-04 07:23:08 +05:30
Rucha Mahabal
7bd84f2696 chore: remove unused import 2022-04-03 23:58:04 +05:30
Rucha Mahabal
58fb2f7dde refactor: Overlapping validation for Shift Request 
- commonify time overlap function between request and assignment

- add tests for shift request overlap
 2022-04-03 23:54:03 +05:30
Rucha Mahabal
6fffdcf0c7 test: Shift Type with Auto Attendance setup and working 
fix test setups
 2022-04-03 22:37:10 +05:30
Rucha Mahabal
655c1dd6ab fix: attendance fixes 
- check half day attendance threshold before absent threshold to avoid half day getting marked as absent

- round working hours to 2 digits for better accuracy

- start and end dates for absent attendance marking
 2022-04-03 21:47:32 +05:30
Suraj Shetty
6644ebd52d
Merge branch 'develop' into exotel-fixes 2022-04-03 21:17:29 +05:30
Deepesh Garg
a7e125a540 chore: format patch file 2022-04-02 20:36:36 +05:30
Deepesh Garg
c58fde2fb2 fix: Add competitor field back 2022-04-02 20:03:46 +05:30
Deepesh Garg
7e185fb0f2 Merge branch 'develop' of https://github.com/frappe/erpnext into patch-3 2022-04-02 17:42:09 +05:30
Deepesh Garg
485f5cfdfe fix: Resolve conflicts 2022-04-02 17:25:29 +05:30
Deepesh Garg
0f6d52c625 Merge branch 'develop' of https://github.com/frappe/erpnext into mergify/bp/develop/pr-30385 2022-04-02 17:24:19 +05:30
Subin Tom
e57e7bb02c fix: added tests(fixed) 2022-04-02 17:16:56 +05:30
Ankush Menat
c8ead0a7ab fix: dont send empty serial no in get_item_details 
[skip ci]
 2022-04-01 21:11:03 +05:30
Ankush Menat
6a069d6efa feat: dont trigger selector if all info is scanned 2022-04-01 21:11:03 +05:30