Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 097d5dfc

Von Bernd Bleßmann vor 6 Monaten hinzugefügt

  • ID 097d5dfc0ad069fa70ef4b3fa3d73a9edb72bcf5
  • Vorgänger 05088574

Verkauf: eigene Rechte für weitere Verkaufs-Berichte, …

… nämlich Auftragsartikelsuche, Finanz-Controlling und Verkaufsbericht

Unterschiede anzeigen:

SL/Controller/FinancialControllingReport.pm
16 16 
  'scalar --get_set_init' => [ qw(project_types models) ],
17 17 
);
18 18 

  		




  19
  
  
    
__PACKAGE__->run_before(sub { $::auth->assert('sales_order_edit'); });


  		




  
  19
  
    
__PACKAGE__->run_before(sub { $::auth->assert('sales_financial_controlling'); });


  		




  20
  20
  
    

  		




  21
  21
  
    
my %sort_columns = (


  		




  22
  22
  
    
  ordnumber               => t8('Order'),


  		












  

    
      SL/Controller/OrderItem.pm
    
  





  84
  84
  
    
}


  		




  85
  85
  
    

  		




  86
  86
  
    
sub check_auth {


  		




  87
  
  
    
  $::auth->assert('sales_order_edit');


  		




  
  87
  
    
  $::auth->assert('sales_order_item_search');


  		




  88
  88
  
    
}


  		




  89
  89
  
    

  		




  90
  90
  
    
1;


  		












  

    
      bin/mozilla/vk.pl
    
  





  49
  49
  
    

  		




  50
  50
  
    
sub search_invoice {


  		




  51
  51
  
    
  $main::lxdebug->enter_sub();


  		




  52
  
  
    
  $main::auth->assert('ar_transactions | ap_transactions | invoice_edit');


  		




  
  52
  
    
  $main::auth->assert('sales_report');


  		




  53
  53
  
    

  		




  54
  54
  
    
  my $form     = $main::form;


  		




  55
  55
  
    
  my %myconfig = %main::myconfig;


  		




  ......




  88
  88
  
    
sub invoice_transactions {


  		




  89
  89
  
    
  $main::lxdebug->enter_sub();


  		




  90
  90
  
    

  		




  91
  
  
    
  $main::auth->assert('ar_transactions | ap_transactions | invoice_edit');


  		




  
  91
  
    
  $main::auth->assert('sales_report');


  		




  92
  92
  
    

  		




  93
  93
  
    
  my $form     = $main::form;


  		




  94
  94
  
    
  my %myconfig = %main::myconfig;


  		












  

    
      doc/changelog
    
  





  33
  33
  
    
  - Neues Feld Beschreibung bei den Backgroundjob. Dient zur besseren


  		




  34
  34
  
    
    Unterscheidung.


  		




  35
  35
  
    
  - Dialogbuchungen als "als neu verwenden" können.


  		




  36
  
  
    

  		




  
  36
  
    
  - eigene Zugriffsrechte für die Verkaufs-Berichte "Auftragsartikelsuche",


  		




  
  37
  
    
    "Finanz-Controlling" und "Verkaufsbericht".


  		




  37
  38
  
    

  		




  38
  39
  
    
Bugfixes (Tracker: https://www.kivitendo.de/redmine):


  		




  39
  40
  
    
  -


  		












  

    
      locale/de/all
    
  





  3718
  3718
  
    
  'Show record tab in vendor'   => 'Zeige Tab Belege in den Lieferantenstammdaten',


  		




  3719
  3719
  
    
  'Show requirement spec'       => 'Pflichtenheft anzeigen',


  		




  3720
  3720
  
    
  'Show requirement spec template' => 'Pflichtenheftvorlage anzeigen',


  		




  
  3721
  
    
  'Show sales financial controlling' => 'Finanzcontrollingbericht anzeigen',


  		




  3721
  3722
  
    
  'Show sales letters report'   => 'Verkaufsbrief anzeigen',


  		




  
  3723
  
    
  'Show sales order item search' => 'Auftragsartikelsuche anzeigen',


  		




  3722
  3724
  
    
  'Show sales order reports with amounts (and links to open documents)' => 'Berichte Verkaufsaufträge mit Beträgen (und Links zum Öffnen der Belege)',


  		




  
  3725
  
    
  'Show sales report'           => 'Verkaufsbericht anzeigen',


  		




  3723
  3726
  
    
  'Show settings'               => 'Einstellungen anzeigen',


  		




  3724
  3727
  
    
  'Show subtotals'              => 'Zwischensummen anzeigen',


  		




  3725
  3728
  
    
  'Show the picture in the part form' => 'Bild in Warenmaske anzeigen',


  		












  

    
      locale/en/all
    
  





  3717
  3717
  
    
  'Show record tab in vendor'   => '',


  		




  3718
  3718
  
    
  'Show requirement spec'       => '',


  		




  3719
  3719
  
    
  'Show requirement spec template' => '',


  		




  
  3720
  
    
  'Show sales financial controlling' => '',


  		




  3720
  3721
  
    
  'Show sales letters report'   => '',


  		




  
  3722
  
    
  'Show sales order item search' => '',


  		




  3721
  3723
  
    
  'Show sales order reports with amounts (and links to open documents)' => '',


  		




  
  3724
  
    
  'Show sales report'           => '',


  		




  3722
  3725
  
    
  'Show settings'               => '',


  		




  3723
  3726
  
    
  'Show subtotals'              => '',


  		




  3724
  3727
  
    
  'Show the picture in the part form' => '',


  		












  

    
      menus/user/00-erp.yaml
    
  





  330
  330
  
    
  id: ar_reports_sales_report


  		




  331
  331
  
    
  name: Sales Report


  		




  332
  332
  
    
  order: 600


  		




  333
  
  
    
  access: invoice_edit


  		




  
  333
  
    
  access: sales_report


  		




  334
  334
  
    
  module: vk.pl


  		




  335
  335
  
    
  params:


  		




  336
  336
  
    
    action: search_invoice


  		




  ......




  348
  348
  
    
  id: ar_order_item_search


  		




  349
  349
  
    
  name: Order item search


  		




  350
  350
  
    
  order: 750


  		




  351
  
  
    
  access: sales_order_edit


  		




  
  351
  
    
  access: sales_order_item_search


  		




  352
  352
  
    
  params:


  		




  353
  353
  
    
    action: OrderItem/search


  		




  354
  354
  
    
- parent: ar_reports


  		




  ......




  371
  371
  
    
  id: ar_reports_financial_controlling


  		




  372
  372
  
    
  name: Financial Controlling


  		




  373
  373
  
    
  order: 1000


  		




  374
  
  
    
  access: sales_order_edit


  		




  
  374
  
    
  access: sales_financial_controlling


  		




  375
  375
  
    
  params:


  		




  376
  376
  
    
    action: FinancialControllingReport/list


  		




  377
  377
  
    
- parent: ar_reports


  		












  

    
      sql/Pg-upgrade2-auth/right_financial_controlling.sql
    
  





  
  1
  
    
-- @tag: right_financial_controlling


  		




  
  2
  
    
-- @description: eigenes Recht für Finanz-Controlling-Bericht


  		




  
  3
  
    
-- @depends: release_3_9_0 add_master_rights master_rights_position_gaps


  		




  
  4
  
    
-- @locales: Show sales financial controlling


  		




  
  5
  
    

  		




  
  6
  
    
INSERT INTO auth.master_rights (position, name, description, category)


  		




  
  7
  
    
  VALUES ((SELECT position - 40 FROM auth.master_rights WHERE name = 'delivery_plan'),


  		




  
  8
  
    
          'sales_financial_controlling',


  		




  
  9
  
    
          'Show sales financial controlling',


  		




  
  10
  
    
          FALSE);


  		




  
  11
  
    

  		




  
  12
  
    
INSERT INTO auth.group_rights (group_id, "right", granted)


  		




  
  13
  
    
  SELECT DISTINCT(id), 'sales_financial_controlling', TRUE


  		




  
  14
  
    
    FROM auth.group


  		




  
  15
  
    
    LEFT JOIN auth.group_rights ON (auth.group.id = auth.group_rights.group_id)


  		




  
  16
  
    
    WHERE "right" LIKE 'sales_order_edit' AND granted IS TRUE;


  		












  

    
      sql/Pg-upgrade2-auth/right_sales_order_item_search.sql
    
  





  
  1
  
    
-- @tag: right_sales_order_item_search


  		




  
  2
  
    
-- @description: eigenes Recht für Auftragsartikelsuche


  		




  
  3
  
    
-- @depends: release_3_9_0 add_master_rights master_rights_position_gaps


  		




  
  4
  
    
-- @locales: Show sales order item search


  		




  
  5
  
    

  		




  
  6
  
    
INSERT INTO auth.master_rights (position, name, description, category)


  		




  
  7
  
    
  VALUES ((SELECT position - 50 FROM auth.master_rights WHERE name = 'delivery_plan'),


  		




  
  8
  
    
          'sales_order_item_search',


  		




  
  9
  
    
          'Show sales order item search',


  		




  
  10
  
    
          FALSE);


  		




  
  11
  
    

  		




  
  12
  
    
INSERT INTO auth.group_rights (group_id, "right", granted)


  		




  
  13
  
    
  SELECT DISTINCT(id), 'sales_order_item_search', TRUE


  		




  
  14
  
    
    FROM auth.group


  		




  
  15
  
    
    LEFT JOIN auth.group_rights ON (auth.group.id = auth.group_rights.group_id)


  		




  
  16
  
    
    WHERE "right" LIKE 'sales_order_edit' AND granted IS TRUE;


  		












  

    
      sql/Pg-upgrade2-auth/right_sales_report.sql
    
  





  
  1
  
    
-- @tag: right_sales_report


  		




  
  2
  
    
-- @description: eigenes Recht für Verkaufsbericht


  		




  
  3
  
    
-- @depends: release_3_9_0 add_master_rights master_rights_position_gaps


  		




  
  4
  
    
-- @locales: Show sales report


  		




  
  5
  
    

  		




  
  6
  
    
INSERT INTO auth.master_rights (position, name, description, category)


  		




  
  7
  
    
  VALUES ((SELECT position - 30 FROM auth.master_rights WHERE name = 'delivery_plan'),


  		




  
  8
  
    
          'sales_report',


  		




  
  9
  
    
          'Show sales report',


  		




  
  10
  
    
          FALSE);


  		




  
  11
  
    

  		




  
  12
  
    
INSERT INTO auth.group_rights (group_id, "right", granted)


  		




  
  13
  
    
  SELECT DISTINCT(id), 'sales_report', TRUE


  		




  
  14
  
    
    FROM auth.group


  		




  
  15
  
    
    LEFT JOIN auth.group_rights ON (auth.group.id = auth.group_rights.group_id)


  		




  
  16
  
    
    WHERE "right" LIKE 'invoice_edit' AND granted IS TRUE;


  		












Auch abrufbar als:  Unified diff