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