Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 59f31604

Von Cem Aydin vor etwa 2 Jahren hinzugefügt

  • ID 59f3160438266f6dd6c8109f082c94ba911f6c45
  • Vorgänger bc4fd456
  • Nachfolger 17761c8d

Design 4.0: Kunden-/Lieferanten Maske aktualisiert (customer_vendor)

Behebt den Fehler beim speichern, gemäss #516.

Die Templates zum Tab "Belege" (customer_vendor_turnover) fehlen noch komplett im neuen Design.

Unterschiede anzeigen:

templates/design40_webpages/customer_vendor/form.html
20 20 
  <div class="tabwidget" id="customer_vendor_tabs">
21 21 
    <ul class="ui-tabs">
22 22 
      <li><a href="#billing">[% 'Billing Address' | $T8 %]</a></li>
23 
      [% IF SELF.is_customer %]
24 
        <li><a href="#additional_billing_addresses">[% 'Additional Billing Addresses' | $T8 %]</a></li>
25 
      [% END %]
23 26 
      <li><a href="#bank">[% 'Bank account' | $T8 %]</a></li>
24 27 
      <li><a href="#shipto">[% 'Shipping Address' | $T8 %]</a></li>
25 28 
      <li><a href="#contacts">[% 'Contacts' | $T8 %]</a></li>
......
61 64 
    </ul>
62 65 

  		




  63
  66
  
    
    [% PROCESS "customer_vendor/tabs/billing.html" %]


  		




  
  67
  
    
    [% IF SELF.is_customer %]


  		




  
  68
  
    
      [% PROCESS "customer_vendor/tabs/additional_billing_addresses.html" %]


  		




  
  69
  
    
    [% END %]


  		




  64
  70
  
    
    [% PROCESS "customer_vendor/tabs/bank.html" %]


  		




  65
  71
  
    
    [% PROCESS "customer_vendor/tabs/shipto.html" %]


  		




  66
  72
  
    
    [% PROCESS "customer_vendor/tabs/contacts.html" %]


  		












  

    
      templates/design40_webpages/customer_vendor/tabs/additional_billing_addresses.html
    
  





  
  1
  
    
[% USE T8 %]


  		




  
  2
  
    
[% USE LxERP %]


  		




  
  3
  
    
[% USE L %]


  		




  
  4
  
    

  		




  
  5
  
    
<div id="additional_billing_addresses">


  		




  
  6
  
    
<div class="select-item control-panel">


  		




  
  7
  
    
  [% 'Billing Address' | $T8 %]


  		




  
  8
  
    
    [% L.select_tag(


  		




  
  9
  
    
        'additional_billing_address.id',


  		




  
  10
  
    
        SELF.additional_billing_addresses,


  		




  
  11
  
    
        default     = SELF.additional_billing_address.id,


  		




  
  12
  
    
        value_key   = 'id',


  		




  
  13
  
    
        title_key   = 'displayable_id',


  		




  
  14
  
    
        with_empty  = 1,


  		




  
  15
  
    
        empty_title = LxERP.t8('New address'),


  		




  
  16
  
    
        onchange    = "kivi.CustomerVendor.selectAdditionalBillingAddress({onFormSet: function(){ additionalBillingAddressMapWidget.testInputs(); kivi.reinit_widgets(); }});",


  		




  
  17
  
    
      )


  		




  
  18
  
    
    %]


  		




  
  19
  
    
</div>


  		




  
  20
  
    

  		




  
  21
  
    
<div class="wrapper">


  		




  
  22
  
    

  		




  
  23
  
    
<div class="buttons">


  		




  
  24
  
    
  [% 'Default Billing Address' | $T8 %]


  		




  
  25
  
    
  [% L.yes_no_tag('additional_billing_address.default_address', SELF.additional_billing_address.default_address) %]


  		




  
  26
  
    
</div>


  		




  
  27
  
    

  		




  
  28
  
    
<div class="item">


  		




  
  29
  
    
  


  		




  
  30
  
    
  <table id="additional_billing_address_table" class="tbl-horizontal">


  		




  
  31
  
    
    <caption>[% 'Name and Address' | $T8 %]</caption>


  		




  
  32
  
    
    <tbody>


  		




  
  33
  
    
      <tr>


  		




  
  34
  
    
        <th>[% 'Name' | $T8 %]</th>


  		




  
  35
  
    
        <td>[% L.input_tag('additional_billing_address.name', SELF.additional_billing_address.name, class="wi-wide") %]</td>


  		




  
  36
  
    
      </tr>


  		




  
  37
  
    
      <tr>


  		




  
  38
  
    
        <th>[% 'Department' | $T8 %]</th>


  		




  
  39
  
    
        <td>


  		




  
  40
  
    
          [% L.input_tag('additional_billing_address.department_1', SELF.additional_billing_address.department_1, class="wi-wide") %]<br>


  		




  
  41
  
    
          [% L.input_tag('additional_billing_address.department_2', SELF.additional_billing_address.department_2, class="wi-wide addition") %]


  		




  
  42
  
    
        </td>


  		




  
  43
  
    
      </tr>


  		




  
  44
  
    
      <tr>


  		




  
  45
  
    
        <th>[% 'Street' | $T8 %]</th>


  		




  
  46
  
    
        <td>


  		




  
  47
  
    
          [% L.input_tag('additional_billing_address.street', SELF.additional_billing_address.street, class="wi-wide") %]


  		




  
  48
  
    

  		




  
  49
  
    
          <span id="additional_billing_address_map"></span>


  		




  
  50
  
    
          <script type="text/javascript">


  		




  
  51
  
    
            additionalBillingAddressMapWidget = new kivi.CustomerVendor.MapWidget('additional_billing_address_');


  		




  
  52
  
    
            $(function() {


  		




  
  53
  
    
              additionalBillingAddressMapWidget.render($('#additional_billing_address_map'));


  		




  
  54
  
    
            });


  		




  
  55
  
    
          </script>


  		




  
  56
  
    
        </td>


  		




  
  57
  
    
      </tr>


  		




  
  58
  
    
      <tr>


  		




  
  59
  
    
        <th>[% 'Zipcode' | $T8 %]/[% 'City' | $T8 %]</th>


  		




  
  60
  
    
        <td>


  		




  
  61
  
    
          [% L.input_tag('additional_billing_address.zipcode', SELF.additional_billing_address.zipcode, class="wi-verysmall") %][% L.input_tag('additional_billing_address.city', SELF.additional_billing_address.city, class="wi-wide--verysmall") %]


  		




  
  62
  
    
        </td>


  		




  
  63
  
    
      </tr>


  		




  
  64
  
    
      <tr>


  		




  
  65
  
    
        <th>[% 'Country' | $T8 %]</th>


  		




  
  66
  
    
        <td>[% L.input_tag('additional_billing_address.country', SELF.additional_billing_address.country, class="wi-wide") %]</td>


  		




  
  67
  
    
      </tr>


  		




  
  68
  
    
      <tr>


  		




  
  69
  
    
        <th>[% 'GLN' | $T8 %]</th>


  		




  
  70
  
    
        <td>[% L.input_tag('additional_billing_address.gln', SELF.additional_billing_address.gln, class="wi-wide") %]</td>


  		




  
  71
  
    
      </tr>


  		




  
  72
  
    
    </tbody>


  		




  
  73
  
    
  </table>


  		




  
  74
  
    

  		




  
  75
  
    
  <table class="tbl-horizontal">


  		




  
  76
  
    
    <caption>[% 'Communication' | $T8 %]</caption>


  		




  
  77
  
    
    <tbody>


  		




  
  78
  
    
      <tr>


  		




  
  79
  
    
        <th>[% 'Contact' | $T8 %]</th>


  		




  
  80
  
    
        <td>[% L.input_tag('additional_billing_address.contact', SELF.additional_billing_address.contact, class="wi-wide") %]</td>


  		




  
  81
  
    
      </tr>


  		




  
  82
  
    
      <tr>


  		




  
  83
  
    
        <th>[% 'Phone' | $T8 %]</th>


  		




  
  84
  
    
        <td>[% L.input_tag('additional_billing_address.phone', SELF.additional_billing_address.phone, class="wi-wide") %]</td>


  		




  
  85
  
    
      </tr>


  		




  
  86
  
    
      <tr>


  		




  
  87
  
    
        <th>[% 'Fax' | $T8 %]</th>


  		




  
  88
  
    
        <td>[% L.input_tag('additional_billing_address.fax', SELF.additional_billing_address.fax, class="wi-wide") %]</td>


  		




  
  89
  
    
      </tr>


  		




  
  90
  
    
      <tr>


  		




  
  91
  
    
        <th>[% 'E-mail' | $T8 %]</th>


  		




  
  92
  
    
        <td>[% L.input_tag('additional_billing_address.email', SELF.additional_billing_address.email, class="wi-wide") %]</td>


  		




  
  93
  
    
      </tr>


  		




  
  94
  
    
    </tbody>


  		




  
  95
  
    
  </table>


  		




  
  96
  
    

  		




  
  97
  
    
</div><!-- /.item -->


  		




  
  98
  
    

  		




  
  99
  
    
<div class="buttons">


  		




  
  100
  
    
  [% L.button_tag('submitInputButton("delete_additional_billing_address");', LxERP.t8('Delete address'), class = 'submit') %]


  		




  
  101
  
    
</div>


  		




  
  102
  
    

  		




  
  103
  
    
</div><!-- /.wrapper -->


  		




  
  104
  
    
[% IF ( !SELF.additional_billing_address.id ) %]


  		




  
  105
  
    
  <script type="text/javascript">


  		




  
  106
  
    
    $('#action_delete_additional_billing_address').hide();


  		




  
  107
  
    
  </script>


  		




  
  108
  
    
[% END %]


  		




  
  109
  
    
</div>


  		












  

    
      templates/design40_webpages/customer_vendor/tabs/billing.html
    
  





  134
  134
  
    
  <caption>[% IF ( SELF.is_vendor() ) %][% 'Vendor' | $T8 %][% ELSE %][% 'Customer' | $T8 %][% END %] [% 'Info & Status' | $T8 %]</caption>


  		




  135
  135
  
    
  <colgroup> <col class="wi-small"><col class="wi-lightwide"> </colgroup>


  		




  136
  136
  
    
  <tbody>


  		




  137
  
  
    
    [% IF ( INSTANCE_CONF.get_vertreter ) %]


  		




  
  137
  
    
    [% IF ( 0 && INSTANCE_CONF.get_vertreter ) %]


  		




  138
  138
  
    
      <tr>


  		




  139
  139
  
    
        <th>[% IF SELF.is_vendor() %] [% 'Type of Vendor' | $T8 %] [% ELSE %] [% 'Type of Customer' | $T8 %] [% END %]</th>


  		




  140
  140
  
    
        <td>[% L.select_tag('cv.business_id', SELF.all_business, value_key = 'id', title_key = 'description', default = SELF.cv.business_id, with_empty=1, class='wi-lightwide') %]</td>


  		




  ......




  199
  199
  
    
      <th>[% 'sales tax identification number' | $T8 %]</th>


  		




  200
  200
  
    
      <td>[% L.input_tag('cv.ustid', SELF.cv.ustid, class='wi-normal' ) %]</td>


  		




  201
  201
  
    
    </tr>


  		




  202
  
  
    
    <tr>


  		




  203
  
  
    
      [% IF ( SELF.is_vendor() ) %]


  		




  204
  
  
    
        <th>[% 'Customer Number' | $T8 %]</th>


  		




  205
  
  
    
        <td>[% L.input_tag('cv.v_customer_id', SELF.cv.v_customer_id, class='wi-normal') %]</td>


  		




  206
  
  
    
      [% ELSE %]


  		




  
  202
  
    
    [% IF ( SELF.is_vendor() ) %]


  		




  
  203
  
    
      <tr>


  		




  
  204
  
    
          <th>[% 'Customer Number' | $T8 %]</th>


  		




  
  205
  
    
          <td>[% L.input_tag('cv.v_customer_id', SELF.cv.v_customer_id, class='wi-normal') %]</td>


  		




  
  206
  
    
      </tr>


  		




  
  207
  
    
    [% ELSE %]


  		




  
  208
  
    
      <tr>


  		




  207
  209
  
    
        <th>[% 'our vendor number at customer' | $T8 %]</th>


  		




  208
  210
  
    
        <td>[% L.input_tag('cv.c_vendor_id', SELF.cv.c_vendor_id, class='wi-normal') %]</td>


  		




  
  211
  
    
      </tr>


  		




  
  212
  
    
      <tr>


  		




  209
  213
  
    
        <th>[% 'Our routing id at customer' | $T8 %]</th>


  		




  210
  214
  
    
        <td>[% L.input_tag('cv.c_vendor_routing_id', SELF.cv.c_vendor_routing_id, size = 20) %]</td>


  		




  211
  
  
    
      [% END %]


  		




  212
  
  
    
    </tr>


  		




  
  215
  
    
      </tr>


  		




  
  216
  
    
    [% END %]


  		




  213
  217
  
    
<!-- </tbody> -->


  		




  214
  218
  
    
<!-- </table> -->


  		




  215
  219
  
    
<!--


  		












  

    
      templates/design40_webpages/customer_vendor/tabs/price_list.html
    
  





  
  1
  
    
[% USE T8 %]


  		




  
  2
  
    
[% USE LxERP %]


  		




  
  3
  
    
[% USE HTML %]


  		




  
  4
  
    
[% USE L %]


  		




  
  5
  
    

  		




  
  6
  
    
<div id="price_list">


  		




  
  7
  
    
<div class="wrapper">


  		




  
  8
  
    
  [%- LxERP.t8("Loading...") %]


  		




  
  9
  
    
</div><!-- /.wrapper -->


  		




  
  10
  
    
</div><!-- /#price_list -->


  		












  

    
      templates/design40_webpages/customer_vendor/tabs/vcnotes.html
    
  





  1
  1
  
    
[% USE T8 %]


  		




  2
  2
  
    
[% USE HTML %]


  		




  3
  3
  
    
[% USE L %]


  		




  
  4
  
    
[% USE LxERP %]


  		




  4
  5
  
    
[% USE date %]


  		




  5
  6
  
    

  		




  6
  7
  
    
<div id="vcnotes">


  		




  ......




  36
  37
  
    
        <td>[% row.itime.to_kivitendo | html %]</td>


  		




  37
  38
  
    
        <td>[% row.employee.safe_name | html %]</td>


  		




  38
  39
  
    
        <td>[% row.follow_up.follow_up_date.to_kivitendo | html %]</td>


  		




  39
  
  
    
        <td>[% row.follow_up.created_for_employee.safe_name | html %]</td>


  		




  
  40
  
    
        <td>


  		




  
  41
  
    
          [% FOREACH employee = row.follow_up.created_for_employees -%]


  		




  
  42
  
    
            [% employee.safe_name | html %][% IF !loop.last %]<br>[% END -%]


  		




  
  43
  
    
          [% END %]


  		




  
  44
  
    
        </td>


  		




  40
  45
  
    
        <td>


  		




  41
  46
  
    
          [% IF ( row.follow_up.follow_up_date ) %]


  		




  42
  47
  
    
            [% IF ( row.follow_up.done ) %]


  		




  ......




  63
  68
  
    
    [% END %]


  		




  64
  69
  
    
  </caption>


  		




  65
  70
  
    
  <tbody>


  		




  
  71
  
    
    [% IF SELF.note_followup.done -%]


  		




  
  72
  
    
    <tr class="fu_finished">


  		




  
  73
  
    
      <th>[% 'Finished' | $T8 %]</th>


  		




  
  74
  
    
      <td>[% 'by' | $T8 %] [% HTML.escape(SELF.note_followup.done.employee.safe_name) %]</td>


  		




  
  75
  
    
      <td colspan="2">[% 'at' | $T8 %] [% HTML.escape(SELF.note_followup.done.done_at_as_timestamp_s) %]</td>


  		




  
  76
  
    
    </tr>


  		




  
  77
  
    
    [% END %]


  		




  66
  78
  
    
    <tr>


  		




  67
  79
  
    
      <th>[% 'Subject' | $T8 %]</th>


  		




  68
  80
  
    
      <td>[% L.input_tag('note.subject', SELF.note.subject, class="wi-verywide") %]</td>


  		




  ......




  74
  86
  
    
        [% L.date_tag('note_followup.follow_up_date', thedate, class="wi-date") %]


  		




  75
  87
  
    
      </td>


  		




  76
  88
  
    
    </tr>


  		




  77
  
  
    
    <tr>


  		




  78
  
  
    
      <th>[% 'for' | $T8 %]</th>


  		




  79
  
  
    
      <td>[% L.select_tag(


  		




  80
  
  
    
             'note_followup.created_for_user',


  		




  81
  
  
    
             SELF.all_employees,


  		




  82
  
  
    
             default = SELF.note_followup.created_for_user,


  		




  83
  
  
    
             title_key = 'safe_name',


  		




  84
  
  
    
             class='wi-lightwide' ) %]


  		




  85
  
  
    
      </td>


  		




  86
  
  
    
    </tr>


  		




  87
  89
  
    
    <tr>


  		




  88
  90
  
    
      <th><label for="note_followup_done" title="[% 'Follow-Up done' | $T8 %]">[% 'Done' | $T8 %]</label></th>


  		




  89
  91
  
    
      <td>[% L.checkbox_tag('note_followup.done', checked = SELF.note_followup.done) %]</td>


  		




  90
  92
  
    
    </tr>


  		




  91
  93
  
    
    <tr>


  		




  92
  94
  
    
      <th>[% 'Body' | $T8 %]</th>


  		




  93
  
  
    
      <td >[% L.textarea_tag('note.body', SELF.note.body, rows=20, class="wi-verywide") %]</td>


  		




  
  95
  
    
      <td >[% L.textarea_tag('note.body', SELF.note.body, rows=10, class="wi-verywide") %]</td>


  		




  
  96
  
    
    </tr>


  		




  
  97
  
    
    <tr>


  		




  
  98
  
    
      <td>[% 'for' | $T8 %]</td>


  		




  
  99
  
    
      <td>


  		




  
  100
  
    
        <table>


  		




  
  101
  
    
          <tr class="listheading">


  		




  
  102
  
    
            <th>[% L.checkbox_tag('checkall_checkboxes', label=LxERP.t8('All users'), id='ckeckall', checkall="[data-checkall=1]") %]</th>


  		




  
  103
  
    
          </tr>


  		




  
  104
  
    
          [% FOREACH employee = SELF.all_employees %]


  		




  
  105
  
    
            [% SET checked = 0 %]


  		




  
  106
  
    
            [% FOREACH cfe = SELF.note_followup.created_for_employees %]


  		




  
  107
  
    
              [% IF cfe.id == employee.id %][% SET checked = 1 %][% LAST %][% END %]


  		




  
  108
  
    
            [% END %]


  		




  
  109
  
    
            <tr class="listrow">


  		




  
  110
  
    
              <td>[% L.checkbox_tag('note_followup.created_for_employees[]', value=employee.id, checked=checked,


  		




  
  111
  
    
                                    "data-checkall"=1, class="employee_check", label=employee.safe_name) %]</td>


  		




  
  112
  
    
            </tr>


  		




  
  113
  
    
          [% END %]


  		




  
  114
  
    
        </table>


  		




  
  115
  
    
      <td>


  		




  
  116
  
    
      <td>


  		




  
  117
  
    
        <table>


  		




  
  118
  
    
          <tr class="listheading">


  		




  
  119
  
    
            <th>[% LxERP.t8('Users that are a member in this group') %]<br>([% LxERP.t8('click on a group to add the group\'s users') %])</th>


  		




  
  120
  
    
          </tr>


  		




  
  121
  
    
          [% FOREACH auth_group = SELF.all_auth_groups %]


  		




  
  122
  
    
            <tr onclick="follow_up_do_select(this)" data-ids='[% FOREACH employee = auth_group.get_employees %][% employee.id %][% IF !loop.last %],[% END%][% END%]' class="interactive cursor-pointer">


  		




  
  123
  
    
              <td class="listrow1"><b>←&nbsp;[% auth_group.name %]</b>: [% auth_group.description %]</td>


  		




  
  124
  
    
            </tr>


  		




  
  125
  
    
            [% FOREACH employee = auth_group.get_employees %]


  		




  
  126
  
    
              <tr class="listrow0"><td>&nbsp;&nbsp;&nbsp;[% employee.safe_name %]</td></tr>


  		




  
  127
  
    
            [% END %]


  		




  
  128
  
    
          [% END %]


  		




  
  129
  
    
        </table>


  		




  
  130
  
    
      </td>


  		




  94
  131
  
    
    </tr>


  		




  95
  132
  
    
  </tbody>


  		




  96
  133
  
    
</table>


  		












Auch abrufbar als:  Unified diff