Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision c6043e02

Von Bernd Bleßmann vor fast 11 Jahren hinzugefügt

  • ID c6043e021963ec66ad8c6e201f6c479de8c16257
  • Vorgänger 5a9a14d7
  • Nachfolger fa7c3cb5

Hilfstext erweitert und geändert.

Unterschiede anzeigen:

SL/Controller/CsvImport/Order.pm
95 95
  $self->SUPER::setup_displayable_columns;
96 96

  
97 97
  $self->add_displayable_columns($self->_order_column,
98
                                 { name => 'datatype',         description => $self->_order_column                              },
99
                                 { name => 'closed',           description => $::locale->text('Closed')                         },
100
                                 { name => 'currency',         description => $::locale->text('Currency')                       },
101
                                 { name => 'currency_id',      description => $::locale->text('Currency (database ID)')         },
102
                                 { name => 'cusordnumber',     description => $::locale->text('Customer Order Number')          },
103
                                 { name => 'delivered',        description => $::locale->text('Delivered')                      },
104
                                 { name => 'employee_id',      description => $::locale->text('Employee (database ID)')         },
105
                                 { name => 'intnotes',         description => $::locale->text('Internal Notes')                 },
106
                                 { name => 'marge_percent',    description => $::locale->text('Margepercent')                   },
107
                                 { name => 'marge_total',      description => $::locale->text('Margetotal')                     },
108
                                 { name => 'notes',            description => $::locale->text('Notes')                          },
109
                                 { name => 'ordnumber',        description => $::locale->text('Order Number')                   },
110
                                 { name => 'quonumber',        description => $::locale->text('Quotation Number')               },
111
                                 { name => 'reqdate',          description => $::locale->text('Reqdate')                        },
112
                                 { name => 'salesman_id',      description => $::locale->text('Salesman (database ID)')         },
113
                                 { name => 'shippingpoint',    description => $::locale->text('Shipping Point')                 },
114
                                 { name => 'shipvia',          description => $::locale->text('Ship via')                       },
115
                                 { name => 'transaction_description', description => $::locale->text('Transaction description') },
116
                                 { name => 'transdate',        description => $::locale->text('Order Date')                     },
117
                                 { name => 'verify_amount',    description => $::locale->text('Amount (for verification)')      },
118
                                 { name => 'verify_netamount', description => $::locale->text('Net amount (for verification)')  },
119
                                 { name => 'taxincluded',      description => $::locale->text('Tax Included')                   },
120
                                 { name => 'customer',         description => $::locale->text('Customer (name)')                },
121
                                 { name => 'customernumber',   description => $::locale->text('Customer Number')                },
122
                                 { name => 'customer_id',      description => $::locale->text('Customer (database ID)')         },
123
                                 { name => 'vendor',           description => $::locale->text('Vendor (name)')                  },
124
                                 { name => 'vendornumber',     description => $::locale->text('Vendor Number')                  },
125
                                 { name => 'vendor_id',        description => $::locale->text('Vendor (database ID)')           },
126
                                 { name => 'language_id',      description => $::locale->text('Language (database ID)')         },
127
                                 { name => 'language',         description => $::locale->text('Language (name)')                },
128
                                 { name => 'payment_id',       description => $::locale->text('Payment terms (database ID)')    },
129
                                 { name => 'payment',          description => $::locale->text('Payment terms (name)')           },
130
                                 { name => 'taxzone_id',       description => $::locale->text('Tax zone (database ID)')         },
131
                                 { name => 'taxzone',          description => $::locale->text('Tax zone (description)')         },
132
                                 { name => 'cp_id',            description => $::locale->text('Contact Person (database ID)')   },
133
                                 { name => 'contact',          description => $::locale->text('Contact Person (name)')          },
134
                                 { name => 'department_id',    description => $::locale->text('Department (database ID)')       },
135
                                 { name => 'department',       description => $::locale->text('Department (description)')       },
136
                                 { name => 'globalproject_id', description => $::locale->text('Document Project (database ID)') },
137
                                 { name => 'globalprojectnumber', description => $::locale->text('Document Project (number)')   },
138
                                 { name => 'globalproject',    description => $::locale->text('Document Project (description)') },
139
                                 { name => 'shipto_id',        description => $::locale->text('Ship to (database ID)')          },
98
                                 { name => 'datatype',                description => $self->_order_column . ' [1]'                            },
99
                                 { name => 'closed',                  description => $::locale->text('Closed')                                },
100
                                 { name => 'currency',                description => $::locale->text('Currency')                              },
101
                                 { name => 'currency_id',             description => $::locale->text('Currency (database ID)')                },
102
                                 { name => 'cusordnumber',            description => $::locale->text('Customer Order Number')                 },
103
                                 { name => 'delivered',               description => $::locale->text('Delivered')                             },
104
                                 { name => 'employee_id',             description => $::locale->text('Employee (database ID)')                },
105
                                 { name => 'intnotes',                description => $::locale->text('Internal Notes')                        },
106
                                 { name => 'marge_percent',           description => $::locale->text('Margepercent')                          },
107
                                 { name => 'marge_total',             description => $::locale->text('Margetotal')                            },
108
                                 { name => 'notes',                   description => $::locale->text('Notes')                                 },
109
                                 { name => 'ordnumber',               description => $::locale->text('Order Number')                          },
110
                                 { name => 'quonumber',               description => $::locale->text('Quotation Number')                      },
111
                                 { name => 'reqdate',                 description => $::locale->text('Reqdate')                               },
112
                                 { name => 'salesman_id',             description => $::locale->text('Salesman (database ID)')                },
113
                                 { name => 'shippingpoint',           description => $::locale->text('Shipping Point')                        },
114
                                 { name => 'shipvia',                 description => $::locale->text('Ship via')                              },
115
                                 { name => 'transaction_description', description => $::locale->text('Transaction description')               },
116
                                 { name => 'transdate',               description => $::locale->text('Order Date')                            },
117
                                 { name => 'verify_amount',           description => $::locale->text('Amount (for verification)') . ' [2]'    },
118
                                 { name => 'verify_netamount',        description => $::locale->text('Net amount (for verification)') . ' [2]'},
119
                                 { name => 'taxincluded',             description => $::locale->text('Tax Included')                          },
120
                                 { name => 'customer',                description => $::locale->text('Customer (name)')                       },
121
                                 { name => 'customernumber',          description => $::locale->text('Customer Number')                       },
122
                                 { name => 'customer_id',             description => $::locale->text('Customer (database ID)')                },
123
                                 { name => 'vendor',                  description => $::locale->text('Vendor (name)')                         },
124
                                 { name => 'vendornumber',            description => $::locale->text('Vendor Number')                         },
125
                                 { name => 'vendor_id',               description => $::locale->text('Vendor (database ID)')                  },
126
                                 { name => 'language_id',             description => $::locale->text('Language (database ID)')                },
127
                                 { name => 'language',                description => $::locale->text('Language (name)')                       },
128
                                 { name => 'payment_id',              description => $::locale->text('Payment terms (database ID)')           },
129
                                 { name => 'payment',                 description => $::locale->text('Payment terms (name)')                  },
130
                                 { name => 'taxzone_id',              description => $::locale->text('Tax zone (database ID)')                },
131
                                 { name => 'taxzone',                 description => $::locale->text('Tax zone (description)')                },
132
                                 { name => 'cp_id',                   description => $::locale->text('Contact Person (database ID)')          },
133
                                 { name => 'contact',                 description => $::locale->text('Contact Person (name)')                 },
134
                                 { name => 'department_id',           description => $::locale->text('Department (database ID)')              },
135
                                 { name => 'department',              description => $::locale->text('Department (description)')              },
136
                                 { name => 'globalproject_id',        description => $::locale->text('Document Project (database ID)')        },
137
                                 { name => 'globalprojectnumber',     description => $::locale->text('Document Project (number)')             },
138
                                 { name => 'globalproject',           description => $::locale->text('Document Project (description)')        },
139
                                 { name => 'shipto_id',               description => $::locale->text('Ship to (database ID)')                 },
140 140
                                );
141 141

  
142 142
  $self->add_cvar_columns_to_displayable_columns($self->_item_column);
143 143

  
144 144
  $self->add_displayable_columns($self->_item_column,
145
                                 { name => 'datatype',        description => $self->_item_column                           },
145
                                 { name => 'datatype',        description => $self->_item_column . ' [1]'                  },
146 146
                                 { name => 'cusordnumber',    description => $::locale->text('Customer Order Number')      },
147 147
                                 { name => 'description',     description => $::locale->text('Description')                },
148 148
                                 { name => 'discount',        description => $::locale->text('Discount')                   },
locale/de/all
1055 1055
  'II'                          => 'II',
1056 1056
  'III'                         => 'III',
1057 1057
  'IV'                          => 'IV',
1058
  'If amounts differ more than "Maximal amount difference" (settings), this item is marked as invalid.' => 'Weichen die Beträge mehr als die "maximale Betragsabweichung" in den Einstellungen ab, so wird diese Position als ungültig markiert.',
1058
  'If amounts differ more than "Maximal amount difference" (see settings), this item is marked as invalid.' => 'Weichen die Beträge mehr als die "maximale Betragsabweichung" (siehe Einstellungen) ab, so wird diese Position als ungültig markiert.',
1059 1059
  'If checked the taxkey will not be exported in the DATEV Export, but only IF chart taxkeys differ from general ledger taxkeys' => 'Falls angehakt wird der DATEV-Steuerschlüssel bei Buchungen auf dieses Konto nicht beim DATEV-Export mitexportiert, allerdings nur wenn zusätzlich der Konto-Steuerschlüssel vom Buchungs (Hauptbuch) Steuerschlüssel abweicht',
1060 1060
  'If configured this bin will be preselected for all new parts. Also this bin will be used as the master default bin, if default transfer out with master bin is activated.' => 'Falls konfiguriert, wird dieses Lager mit Lagerplatz für neu angelegte Waren vorausgewählt.',
1061 1061
  'If the article type is set to \'mixed\' then a column called \'type\' must be present.' => 'Falls der Artikeltyp auf \'gemischt\' gestellt wird, muss eine Spalte namens \'type\' vorhanden sein.',
......
1444 1444
  'Order Number'                => 'Auftragsnummer',
1445 1445
  'Order Number missing!'       => 'Auftragsnummer fehlt!',
1446 1446
  'Order deleted!'              => 'Auftrag gelöscht!',
1447
  'Order/Item columns'          => 'Auftrag-/Positions-Spalten',
1447
  'Order/Item row name'         => 'Name der Auftrag-/Positions-Zeilen',
1448 1448
  'OrderItem'                   => 'Position',
1449 1449
  'Ordered'                     => 'Von Kunden bestellt',
1450 1450
  'Orders'                      => 'Aufträge',
......
2071 2071
  'The client has been created.' => 'Der Mandant wurde angelegt.',
2072 2072
  'The client has been deleted.' => 'Der Mandant wurde gelöscht.',
2073 2073
  'The client has been saved.'  => 'Der Mandant wurde gespeichert.',
2074
  'The column "datatype" must be present and must be the first column. The values must be the row names (see settings) for order and item data respectively.' => 'Die Spalte "datatype" muss vorhanden sein und sie muss die erste Spalte sein. Die Werte in dieser Spalte müssen die Namen der Auftrag-/Positions-Zeilen (siehe Einstellungen) sein.',
2074 2075
  'The column "make_X" can contain either a vendor\'s database ID, a vendor number or a vendor\'s name.' => 'Die Spalte "make_X" can entweder die Datenbank-ID des Lieferanten, eine Lieferantennummer oder einen Lieferantennamen enthalten.',
2075 2076
  'The column triplets can occur multiple times with different numbers "X" each time (e.g. "make_1", "model_1", "lastcost_1", "make_2", "model_2", "lastcost_2", "make_3", "model_3", "lastcost_3" etc).' => 'Die Spalten-Dreiergruppen können mehrfach auftreten, sofern sie unterschiedliche Nummern "X" verwenden (z.B. "make_1", "model_1", "lastcost_1", "make_2", "model_2", "lastcost_2", "make_3", "model_3", "lastcost_3" etc).',
2076 2077
  'The columns "Dunning Duedate", "Total Fees" and "Interest" show data for the previous dunning created for this invoice.' => 'Die Spalten "Zahlbar bis", "Kumulierte Gebühren" und "Zinsen" zeigen Daten der letzten für diese Rechnung erzeugten Mahnung.',
locale/en/all
1055 1055
  'II'                          => '',
1056 1056
  'III'                         => '',
1057 1057
  'IV'                          => '',
1058
  'If amounts differ more than "Maximal amount difference" (settings), this item is marked as invalid.' => '',
1058
  'If amounts differ more than "Maximal amount difference" (see settings), this item is marked as invalid.' => '',
1059 1059
  'If checked the taxkey will not be exported in the DATEV Export, but only IF chart taxkeys differ from general ledger taxkeys' => '',
1060 1060
  'If configured this bin will be preselected for all new parts. Also this bin will be used as the master default bin, if default transfer out with master bin is activated.' => '',
1061 1061
  'If the article type is set to \'mixed\' then a column called \'type\' must be present.' => '',
......
1444 1444
  'Order Number'                => '',
1445 1445
  'Order Number missing!'       => '',
1446 1446
  'Order deleted!'              => '',
1447
  'Order/Item columns'          => '',
1447
  'Order/Item row name'         => '',
1448 1448
  'OrderItem'                   => '',
1449 1449
  'Ordered'                     => '',
1450 1450
  'Orders'                      => '',
......
2070 2070
  'The client has been created.' => '',
2071 2071
  'The client has been deleted.' => '',
2072 2072
  'The client has been saved.'  => '',
2073
  'The column "datatype" must be present and must be the first column. The values must be the row names (see settings) for order and item data respectively.' => '',
2073 2074
  'The column "make_X" can contain either a vendor\'s database ID, a vendor number or a vendor\'s name.' => '',
2074 2075
  'The column triplets can occur multiple times with different numbers "X" each time (e.g. "make_1", "model_1", "lastcost_1", "make_2", "model_2", "lastcost_2", "make_3", "model_3", "lastcost_3" etc).' => '',
2075 2076
  'The columns "Dunning Duedate", "Total Fees" and "Interest" show data for the previous dunning created for this invoice.' => '',
templates/webpages/csv_import/_form_orders.html
1 1
[% USE LxERP %]
2 2
[% USE L %]
3 3
<tr>
4
 <th align="right">[%- LxERP.t8('Order/Item columns') %]:</th>
4
 <th align="right">[%- LxERP.t8('Order/Item row name') %]:</th>
5 5
 <td colspan="10">
6 6
  [% L.input_tag('settings.order_column', SELF.profile.get('order_column'), size => "10") %]
7 7
  [% L.input_tag('settings.item_column',  SELF.profile.get('item_column'),  size => "10") %]
templates/webpages/csv_import/form.html
127 127

  
128 128
[%- ELSIF SELF.type == 'orders' %]
129 129
   <p>
130
     [%- LxERP.t8('Amount and net amount are calculated by kivitendo. "verify_amount" and "verify_netamount" can be used for sanity checks.') %]<br>
131
     [%- LxERP.t8('If amounts differ more than "Maximal amount difference" (settings), this item is marked as invalid.') %]<br>
130
    [1]:
131
    [% LxERP.t8('The column "datatype" must be present and must be the first column. The values must be the row names (see settings) for order and item data respectively.') %]
132
   </p>
133
   <p>
134
    [2]:
135
    [%- LxERP.t8('Amount and net amount are calculated by kivitendo. "verify_amount" and "verify_netamount" can be used for sanity checks.') %]<br>
136
    [%- LxERP.t8('If amounts differ more than "Maximal amount difference" (see settings), this item is marked as invalid.') %]<br>
132 137
   </p>
133 138
[%- END %]
134 139

  

Auch abrufbar als: Unified diff