Merge branch '2013.10' into pu/2013.10-longrun
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 15 Jan 2014 15:21:20 +0000 (16:21 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 15 Jan 2014 15:21:20 +0000 (16:21 +0100)
1  2 
tests/tine20/HumanResources/ControllerTests.php
tine20/HumanResources/Model/Account.php
tine20/HumanResources/js/AccountEditDialog.js
tine20/HumanResources/translations/de.po
tine20/HumanResources/translations/template.pot
tine20/Sales/translations/de.po
tine20/Sales/translations/template.pot

@@@ -140,26 -140,11 +140,29 @@@ Tine.HumanResources.AccountEditDialog 
                              items: [[
                                  {fieldLabel: this.app.i18n._('Days to work'), name: 'working_days' },
                                  {fieldLabel: this.app.i18n._('Hours to work'), name: 'working_hours' }
+                             ], [
+                                 {fieldLabel: this.app.i18n._('Days to work after vacation and sickness'), name: 'working_days_real' },
+                                 {fieldLabel: this.app.i18n._('Hours to work after vacation and sickness'), name: 'working_hours_real' }
                              ]]
                          }]
 +                    }, {
 +                        xtype: 'fieldset',
 +                        layout: 'hfit',
 +                        autoHeight: true,
 +                        title: this.app.i18n._('Miscellaneous'),
 +                        items: [{
 +                            xtype: 'columnform',
 +                            labelAlign: 'top',
 +                            items: [[{
 +                                xtype: 'textarea',
 +                                height: 180,
 +                                disabled: false,
 +                                readOnly: false,
 +                                fieldLabel: this.app.i18n._('Description'),
 +                                name: 'description', 
 +                                columnWidth: 1 
 +                            }]]
 +                        }]
                      }]
                  }]},
                  this.extraFreeTimeGridPanel,
Simple merge