nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 19:29:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feat/add-delivery-cutoff-date-on-so

Browse Source
This commit is contained in:
mergify[bot]
2024-01-30 09:56:24 +00:00
committed by GitHub
parent 252fae68df b14886b227
commit 12a4f2761c
105 changed files with 3049 additions and 2026 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/utilities/activation.py
View File

@@ -124,7 +124,7 @@ def get_help_messages():
doctype="Timesheet",
title=_("Add Timesheets"),
description=_(
"Timesheets help keep track of time, cost and billing for activites done by your team"
"Timesheets help keep track of time, cost and billing for activities done by your team"
),
action=_("Create Timesheet"),
route="List/Timesheet",

13
erpnext/utilities/web_form/addresses/addresses.json
View File

@@ -8,26 +8,29 @@
"allow_print": 0,
"amount": 0.0,
"amount_based_on_field": 0,
"anonymous": 0,
"apply_document_permissions": 1,
"condition_json": "[]",
"creation": "2016-06-24 15:50:33.196990",
"doc_type": "Address",
"docstatus": 0,
"doctype": "Web Form",
"idx": 0,
"is_standard": 1,
"list_columns": [],
"list_title": "",
"login_required": 1,
"max_attachment_size": 0,
"modified": "2019-10-15 06:55:30.405119",
"modified_by": "Administrator",
"modified": "2024-01-24 10:28:35.026064",
"modified_by": "rohitw1991@gmail.com",
"module": "Utilities",
"name": "addresses",
"owner": "Administrator",
"published": 1,
"route": "address",
"route_to_success_link": 0,
"show_attachments": 0,
"show_in_grid": 0,
"show_list": 1,
"show_sidebar": 0,
"sidebar_items": [],
"success_url": "/addresses",
"title": "Address",
"web_form_fields": [