mirror of
				https://github.com/paperless-ngx/paperless-ngx.git
				synced 2025-11-03 03:16:10 -06:00 
			
		
		
		
	Merge branch 'dev' into beta
This commit is contained in:
		@@ -2144,6 +2144,10 @@
 | 
			
		||||
          <context context-type="sourcefile">src/app/components/common/custom-fields-dropdown/custom-fields-dropdown.component.html</context>
 | 
			
		||||
          <context context-type="linenumber">6</context>
 | 
			
		||||
        </context-group>
 | 
			
		||||
        <context-group purpose="location">
 | 
			
		||||
          <context context-type="sourcefile">src/app/components/manage/custom-fields/custom-fields.component.html</context>
 | 
			
		||||
          <context context-type="linenumber">1</context>
 | 
			
		||||
        </context-group>
 | 
			
		||||
      </trans-unit>
 | 
			
		||||
      <trans-unit id="4462691404891390153" datatype="html">
 | 
			
		||||
        <source>Consumption templates</source>
 | 
			
		||||
@@ -5287,6 +5291,13 @@
 | 
			
		||||
          <context context-type="linenumber">87</context>
 | 
			
		||||
        </context-group>
 | 
			
		||||
      </trans-unit>
 | 
			
		||||
      <trans-unit id="3789574458951567089" datatype="html">
 | 
			
		||||
        <source>Consumption Templates</source>
 | 
			
		||||
        <context-group purpose="location">
 | 
			
		||||
          <context context-type="sourcefile">src/app/components/manage/consumption-templates/consumption-templates.component.html</context>
 | 
			
		||||
          <context context-type="linenumber">1</context>
 | 
			
		||||
        </context-group>
 | 
			
		||||
      </trans-unit>
 | 
			
		||||
      <trans-unit id="7308826808299076537" datatype="html">
 | 
			
		||||
        <source>Add Template</source>
 | 
			
		||||
        <context-group purpose="location">
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
<pngx-page-header title="Consumption Templates">
 | 
			
		||||
<pngx-page-header title="Consumption Templates" i18n-title>
 | 
			
		||||
    <button type="button" class="btn btn-sm btn-outline-primary ms-4" (click)="editTemplate()" *pngxIfPermissions="{ action: PermissionAction.Add, type: PermissionType.ConsumptionTemplate }">
 | 
			
		||||
      <svg class="sidebaricon me-1" fill="currentColor">
 | 
			
		||||
        <use xlink:href="assets/bootstrap-icons.svg#plus-circle" />
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
<pngx-page-header title="Custom Fields">
 | 
			
		||||
<pngx-page-header title="Custom Fields" i18n-title>
 | 
			
		||||
    <button type="button" class="btn btn-sm btn-outline-primary ms-4" (click)="editField()" *pngxIfPermissions="{ action: PermissionAction.Add, type: PermissionType.CustomField }">
 | 
			
		||||
      <svg class="sidebaricon me-1" fill="currentColor">
 | 
			
		||||
        <use xlink:href="assets/bootstrap-icons.svg#plus-circle" />
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user