Merge branch '2014.11-develop' into 2014.09
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 8 Apr 2015 16:43:45 +0000 (18:43 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 8 Apr 2015 16:43:45 +0000 (18:43 +0200)
1  2 
tine20/Crm/js/LeadEditDialog.js

@@@ -54,9 -54,8 +54,9 @@@ Tine.Crm.LeadEditDialog = Ext.extend(Ti
      appName: 'Crm',
      recordClass: Tine.Crm.Model.Lead,
      recordProxy: Tine.Crm.leadBackend,
 -    tbarItems: [{xtype: 'widget-activitiesaddbutton'}],
      showContainerSelector: true,
 +    displayNotes: true,
 +
      /**
       * ignore these models in relation grid
       * @type {Array}
              } else if (newLinkObject.relation_type === 'task') {
                  tasks.push(newLinkObject);
              } else if (newLinkObject.relation_type === 'product') {
-                 newLinkObject.remark_description = relations[i].remark.description;
-                 newLinkObject.remark_price = relations[i].remark.price;
-                 newLinkObject.remark_quantity = relations[i].remark.quantity;
+                 newLinkObject.remark_description = (relations[i].remark) ? relations[i].remark.description : '';
+                 newLinkObject.remark_price = (relations[i].remark) ? relations[i].remark.price : 0;
+                 newLinkObject.remark_quantity = (relations[i].remark) ? relations[i].remark.quantity : 1;
                  products.push(newLinkObject);
              }
          }
                                      emptyText: this.app.i18n._('Enter description')
                                  }]
                              }),
 -                            new Tine.widgets.activities.ActivitiesPanel({
 -                                app: 'Crm',
 -                                showAddNoteForm: false,
 -                                border: false,
 -                                bodyStyle: 'border:1px solid #B5B8C8;'
 -                            }),
                              new Tine.widgets.tags.TagPanel({
                                  app: 'Crm',
                                  border: false,