Sortimentsbestandteile ändern können, auch nachdem das Sortiemnt verwendet wurde

Gekoppelt an ein neues Recht

diff --git a/locale/de/all b/locale/de/all
index 7507bc2381b2540e38cc4bd4a9a6f5feefae019a..cb95769f52b5107806525c47be0b3c98296bf595 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -294,6 +294,7 @@ $self->{texts} = {
   'Already counted'             => 'Bereits erfasst',
   'Already imported entries (duplicates)' => 'Bereits importierte Einträge (Duplikate)',
   'Always edit assembly items (user can change/delete items even if assemblies are already produced)' => 'Erzeugnisbestandteile verändern (Löschen/Umsortieren) auch nachdem dieses Erzeugnis schon produziert wurde.',
+  'Always edit assortment items (user can change/delete items even if assortments are already used)' => 'Sortimentsbestandteile verändern (Löschen/Umsortieren), auch nachdem dieses Sortiment schon verwendet wurde.',
   'Always save orders with a projectnumber (create new projects)' => 'Aufträge immer mit Projektnummer speichern (neue Projekte erstellen)',
   'Amended Advance Turnover Tax Return' => 'Berichtigte Anmeldung',
   'Amount'                      => 'Betrag',

diff --git a/locale/en/all b/locale/en/all
index 65d94870e8a26297a316d6ff8c63258459d7ab24..4d3f679cdba559ef9cae45b564d7b964e56988ab 100644 (file)
--- a/locale/en/all
+++ b/locale/en/all
@@ -294,6 +294,7 @@ $self->{texts} = {
   'Already counted'             => '',
   'Already imported entries (duplicates)' => '',
   'Always edit assembly items (user can change/delete items even if assemblies are already produced)' => '',
+  'Always edit assortment items (user can change/delete items even if assortments are already used)' => '',
   'Always save orders with a projectnumber (create new projects)' => '',
   'Amended Advance Turnover Tax Return' => '',
   'Amount'                      => '',

diff --git a/sql/Pg-upgrade2-auth/right_assortment_edit.sql b/sql/Pg-upgrade2-auth/right_assortment_edit.sql
new file mode 100644 (file)
index 0000000..d0a6e07
--- /dev/null
+++ b/sql/Pg-upgrade2-auth/right_assortment_edit.sql
@@ -0,0 +1,15 @@
+-- @tag: right_assortment_edit
+-- @description: Recht zum Ändern von Sortimentsbestandteilen auch nach Verwendeung
+-- @depends: release_3_5_7 move_shop_part_edit_right
+-- @locales: Always edit assortment items (user can change/delete items even if assortments are already used)
+
+INSERT INTO auth.master_rights (position, name, description, category)
+  VALUES ((SELECT position + 10 FROM auth.master_rights WHERE name = 'assembly_edit'),
+          'assortment_edit',
+          'Always edit assortment items (user can change/delete items even if assortments are already used)',
+          FALSE);
+
+INSERT INTO auth.group_rights (group_id, "right", granted)
+  SELECT id, 'assortment_edit', true
+  FROM auth.group
+  WHERE name = 'Vollzugriff';

diff --git a/templates/webpages/part/_assortment.html b/templates/webpages/part/_assortment.html
index 55b04e83fe04982dbbc181062adddbde7e5197fe..db4330549e210105f97442af47fa10e79370537a 100644 (file)
--- a/templates/webpages/part/_assortment.html
+++ b/templates/webpages/part/_assortment.html
@@ -14,11 +14,11 @@
  <thead>
    <tr class="listheading">
      <th class="listheading" style='display:none'></th>
-     [% IF SELF.orphaned %]
+     [% IF SELF.orphaned || AUTH.assert('assortment_edit', 1) %]
      <th class="listheading" style='text-align:center' nowrap width="1"><img src="image/close.png" alt="[%- LxERP.t8('delete item') %]"></th>
      [% END %]
      <th class="listheading" nowrap width="3" >[%- 'position'     | $T8 %] </th>
-     [% IF SELF.orphaned %]
+     [% IF SELF.orphaned || AUTH.assert('assortment_edit', 1) %]
      <th class="listheading" style='text-align:center' nowrap width="1"><img src="image/updown.png" alt="[%- LxERP.t8('reorder item') %]"></th>
      [% END %]
      <th id="partnumber_header_id"  class="listheading" nowrap width="15"><a href='#' onClick='javascript:kivi.Part.reorder_items("partnumber")'> [%- 'Partnumber'  | $T8 %]</a></th>
@@ -37,7 +37,7 @@
 </tbody>
 <tbody id="assortment_input">
 <tr>
- [% IF SELF.orphaned %]
+ [% IF SELF.orphaned || AUTH.assert('assortment_edit', 1) %]
  <td></td>
  <td></td>
  <td align="right">[% 'Part' | $T8 %]:</td>
@@ -60,7 +60,7 @@
  <th id="items_sum_diff"      class="numeric">[%- LxERP.format_amount(items_sum_diff,      2, 0) %]</td>
 </tr>
 <tr>
- [% IF SELF.orphaned %]
+ [% IF SELF.orphaned || AUTH.assert('assortment_edit', 1) %]
  <td></td>
  <td></td>
  [% END %]

diff --git a/templates/webpages/part/_assortment_row.html b/templates/webpages/part/_assortment_row.html
index fcd88fd8f7f615167acce64761ca2a0038e5481a..6edd9bb75605ea9113c81428fd514357959e146c 100644 (file)
--- a/templates/webpages/part/_assortment_row.html
+++ b/templates/webpages/part/_assortment_row.html
@@ -5,11 +5,11 @@
 [%- USE P %]
   <tr class="listrow[% listrow %] assortment_item_row">
     <td style='display:none'>
-      [% IF orphaned %]
+      [% IF orphaned || AUTH.assert('assortment_edit', 1) %]
       [% L.hidden_tag("assortment_items[+].parts_id", ITEM.part.id) %]
       [% END %]
     </td>
-    <td align="center" [% UNLESS orphaned %]style='display:none'[% END %]>
+    <td align="center" [% UNLESS orphaned || AUTH.assert('assortment_edit', 1) %]style='display:none'[% END %]>
       [%- L.button_tag("kivi.Part.delete_item_row(this)",
                        LxERP.t8("X")) %] [% # , confirm=LxERP.t8("Are you sure?")) %]
     </td>
@@ -18,7 +18,7 @@
         [% HTML.escape(position) or HTML.escape(ITEM.position) %]
       </div>
     </td>
-    <td align="center" [% UNLESS orphaned %]style='display:none'[% END %]>
+    <td align="center" [% UNLESS orphaned || AUTH.assert('assortment_edit', 1) %]style='display:none'[% END %]>
       <img src="image/updown.png" alt="[%- LxERP.t8('reorder item') %]" class="dragdrop">
     </td>
     <td nowrap>
@@ -28,7 +28,7 @@
        [% HTML.escape(ITEM.part.description) %]
     </td>
     <td nowrap>
-    [% IF orphaned %]
+    [% IF orphaned || AUTH.assert('assortment_edit', 1) %]
       [%- L.input_tag("assortment_items[].qty_as_number",
                       ITEM.qty_as_number,
                       size = 10,
@@ -38,7 +38,7 @@
     [% END %]
     </td>
     <td nowrap>
-    [% IF orphaned %]
+    [% IF orphaned || AUTH.assert('assortment_edit', 1) %]
       [%- L.select_tag("assortment_items[].unit",
                       ITEM.part.available_units,
                       default = ITEM.part.unit,
@@ -50,7 +50,7 @@
     [% END %]
     </td>
     <td>
-    [% IF orphaned %]
+    [% IF orphaned || AUTH.assert('assortment_edit', 1) %]
       [% L.checkbox_tag('assortment_items[].charge', checked => ITEM.charge, class => 'checkbox', for_submit=1) %]
     [% ELSE %]
       [% IF ITEM.charge %][% 'Yes' | $T8 %][%- ELSE %][% 'No' | $T8 %][%- END %]