Rucha Mahabal
ef63c61ebd
Merge branch 'develop' into hr-separation
2022-06-29 12:35:51 +05:30
Marica
942aadf436
Merge branch 'develop' into make-image-field-obsolete-in-web-item
2022-06-29 12:23:41 +05:30
Devin Slauenwhite
cdf631b9de
fix: validate item dashboard material transfer entry ( #31473 )
2022-06-29 12:06:47 +05:30
Marica
1a749e2589
Merge branch 'develop' into make-image-field-obsolete-in-web-item
2022-06-29 10:25:30 +05:30
Deepesh Garg
3bbbf02ca8
Merge pull request #31460 from ruthra-kumar/bug_ar/ap_rpt_delivery_note
...
fix: 'attribute error' on AR/AP report with delivery note filter
2022-06-29 08:06:34 +05:30
Sagar Sharma
78ff1783b1
Merge branch 'develop' into subcontracting
2022-06-28 22:20:32 +05:30
Rucha Mahabal
a24cc982e2
fix: Remove HR validations from Employee master
2022-06-28 18:47:14 +05:30
Rucha Mahabal
26a8de69c9
fix: Remove Designation Skill child table
...
- moved to HRMS app, since it isn't used anywhere in ERPNext
2022-06-28 17:18:02 +05:30
Ankush Menat
080fcb91f2
ci: pin semgrep to old version
...
current version has problem with PRs originating from fork
2022-06-28 13:46:12 +05:30
Rucha Mahabal
6bee20c5e3
chore: Add Fleet Management masters in Setup module for Delivery Trip
...
- Driver, Vehicle, Driving License Category (child table)
- Removed Email Account setup for Job Applicant from setup wizard
2022-06-28 13:29:35 +05:30
Rucha Mahabal
3c059de122
chore: Remove links for Employee Hours Utilization Based On Timesheet and Project Profitability from Projects workspace
2022-06-28 12:34:01 +05:30
Rucha Mahabal
6f407d3c62
chore: fix code formatting
2022-06-28 12:29:22 +05:30
Ankush Menat
5d73697c64
fix: offset some scheduled jobs to avoid locks ( #31466 )
...
If your site has multiple background workers then there's possibility
that two jobs will execute in parallal, this creates problem when both
are on operating on same data.
This PR adds a separate section for hourly and daily jobs which have
frequency offset from default frequency to avoid such conflicts.
2022-06-28 12:22:17 +05:30
Rucha Mahabal
6a65c8aff4
Merge branch 'develop' into hr-separation
2022-06-28 11:51:59 +05:30
Ankush Menat
bedb11ee67
fix: youtube stats background sync failures
2022-06-28 10:50:44 +05:30
Nabin Hait
925b9d985e
fix: open lead and opportunities based on today's event
2022-06-27 22:13:09 +05:30
Nabin Hait
7921a1a605
fix: Restored city, state and country fields
2022-06-27 22:13:09 +05:30
Rucha Mahabal
930e557fc6
fix: remove HR/Payroll patches
2022-06-27 20:25:16 +05:30
Rucha Mahabal
c8712b02f9
patch: Delete HR/Payroll doctypes
2022-06-27 19:59:04 +05:30
Rucha Mahabal
2b255bdddb
fix: Bank Statement loan amount query
2022-06-27 19:18:13 +05:30
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
Deepesh Garg
173588e169
Merge pull request #31446 from deepeshgarg007/quotation_order_item_syn
...
fix: Quotation and Sales Order item sync
2022-06-27 11:17:48 +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
