erp_app 3.1.0 → 3.1.1

data/app/controllers/erp_app/organizer/crm/base_controller.rb

@@ -84,7 +84,7 @@ module ErpApp
           business_party_data[:current_passport_expire_date] = Date.strptime(business_party_data[:current_passport_expire_date], @@date_format) unless business_party_data[:current_passport_expire_date].blank?
 
           klass = party_type.constantize
-          business_party = klass.find(businesss_party_id)
+          business_party = klass.find(business_party_id)
 
           business_party_data.each do |key,value|
             key = key.gsub("business_party.", "")

data/lib/erp_app/version.rb

@@ -2,7 +2,7 @@ module ErpApp
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 1
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
   end

data/public/javascripts/erp_app/organizer/applications/crm/base.js

@@ -156,15 +156,15 @@ Compass.ErpApp.Organizer.Applications.Crm.Base = function (config) {
             'postaladdressgrid',
             'shared_notesgrid'
         ];
-
+		
+		for (i = 0; i < xtypes.length; i += 1) {
+            panelSouthItems.push({
+              xtype:xtypes[i],
+              partyId:partyId
+            });
+        }
+		
         if (party_type == 'Individual') {
-            for (i = 0; i < xtypes.length; i += 1) {
-                panelSouthItems.push({
-                    xtype:xtypes[i],
-                    partyId:partyId
-                });
-            }
-
             var current_passport_expire_date = party.get('current_passport_expire_date');
             if (!Compass.ErpApp.Utility.isBlank(current_passport_expire_date)) {
                 current_passport_expire_date = Ext.Date.format(current_passport_expire_date, 'm/d/Y');
@@ -173,12 +173,6 @@ Compass.ErpApp.Organizer.Applications.Crm.Base = function (config) {
             tabtitle = party.get('current_first_name') + ' ' + party.get('current_last_name');
         }
         else {
-            for (i = 0; i < xtypes.length; i += 1) {
-                panelSouthItems.push({
-                    xtype:xtypes[i]
-                });
-            }
-
             tabtitle = party.get('description');
         }
 
@@ -198,397 +192,6 @@ Compass.ErpApp.Organizer.Applications.Crm.Base = function (config) {
         loadPartyDetails(partyId);
     };
 
-    var individualFormFields = [
-        {
-            xtype:'textfield',
-            fieldLabel:'Enterprise Identifier',
-            allowBlank:true,
-            name:'enterprise_identifier'
-        },
-        {
-            xtype:'textfield',
-            fieldLabel:'Title',
-            allowBlank:true,
-            name:'current_personal_title'
-        },
-        {
-            xtype:'textfield',
-            fieldLabel:'First Name',
-            allowBlank:false,
-            name:'current_first_name'
-        },
-        {
-            xtype:'textfield',
-            fieldLabel:'Middle Name',
-            allowBlank:true,
-            name:'current_middle_name'
-        },
-        {
-            xtype:'textfield',
-            fieldLabel:'Last Name',
-            allowBlank:false,
-            name:'current_last_name'
-        },
-        {
-            xtype:'textfield',
-            fieldLabel:'Suffix',
-            allowBlank:true,
-            name:'current_suffix'
-        },
-        {
-            xtype:'textfield',
-            fieldLabel:'Nickname',
-            allowBlank:true,
-            name:'current_nickname'
-        },
-        {
-            xtype:'textfield',
-            fieldLabel:'Passport Number',
-            allowBlank:true,
-            name:'current_passport_number'
-        },
-        {
-            xtype:'datefield',
-            fieldLabel:'Passport Expiration Date',
-            allowBlank:true,
-            name:'current_passport_expire_date'
-        },
-        {
-            xtype:'datefield',
-            fieldLabel:'DOB',
-            allowBlank:false,
-            name:'birth_date'
-        },
-        {
-            xtype:'combobox',
-            fieldLabel:'Gender',
-            store:Ext.create('Ext.data.Store', {
-                fields:['v', 'k'],
-                data:[
-                    {"v":"m", "k":"Male"},
-                    {"v":"f", "k":"Female"}
-                ]
-            }),
-            displayField:'k',
-            valueField:'v',
-            name:'gender'
-        },
-        {
-            xtype:'textfield',
-            fieldLabel:'Total Yrs Work Exp',
-            allowBlank:true,
-            name:'total_years_work_experience'
-        },
-        {
-            xtype:'textfield',
-            fieldLabel:'Marital Status',
-            allowBlank:true,
-            name:'marital_status'
-        },
-        {
-            xtype:'textfield',
-            fieldLabel:'Social Security Number',
-            allowBlank:true,
-            name:'social_security_number'
-        }
-    ];
-
-    var editIndividualFormFields = [
-        {
-            xtype:'hiddenfield',
-            name:'id'
-        },
-        {
-            xtype:'hiddenfield',
-            name:'business_party_id'
-        }
-    ];
-
-    var addIndividualWindow = Ext.create("Ext.window.Window", {
-        layout:'fit',
-        width:375,
-        title:'New Individual',
-        height:500,
-        buttonAlign:'center',
-        items:new Ext.FormPanel({
-            labelWidth:110,
-            frame:false,
-            bodyStyle:'padding:5px 5px 0',
-            width:425,
-            url:'/erp_app/organizer/crm/create_party',
-            defaults:{
-                width:225
-            },
-            items:[ individualFormFields ]
-        }),
-        buttons:[
-            {
-                text:'Submit',
-                listeners:{
-                    'click':function (button) {
-                        var window = button.findParentByType('window');
-                        var formPanel = window.query('form')[0];
-                        formPanel.getForm().submit({
-                            reset:true,
-                            params:{
-                                party_type:'Individual'
-                            },
-                            waitMsg:'Creating Individual',
-                            success:function (form, action) {
-                                var response = Ext.decode(action.response.responseText);
-                                Ext.Msg.alert("Status", response.message);
-                                if (response.success) {
-                                    var individualName = response.individualName;
-                                    addIndividualWindow.hide();
-                                    var individualsSearchGrid = Ext.ComponentMgr.get('individualSearchGrid');
-                                    individualsSearchGrid.store.proxy.extraParams.party_name = individualName;
-                                    individualsSearchGrid.store.load();
-                                }
-                            },
-                            failure:function (form, action) {
-                                var message = 'Error adding individual';
-                                if (action.response != null) {
-                                    var response = Ext.decode(action.response.responseText);
-                                    message = response.message;
-                                }
-                                Ext.Msg.alert("Status", message);
-                            }
-                        });
-                    }
-                }
-            },
-            {
-                text:'Close',
-                handler:function () {
-                    addIndividualWindow.hide();
-                }
-            }
-        ]
-    });
-
-    var editIndividualWindow = Ext.create("Ext.window.Window", {
-        layout:'fit',
-        width:375,
-        title:'Edit Individual',
-        height:500,
-        buttonAlign:'center',
-        items:new Ext.FormPanel({
-            id:'editIndividualFormPanel',
-            labelWidth:110,
-            frame:false,
-            bodyStyle:'padding:5px 5px 0',
-            width:425,
-            url:'/erp_app/organizer/crm/update_party',
-            defaults:{
-                width:225
-            },
-            items:[ individualFormFields.concat(editIndividualFormFields) ]
-        }),
-        buttons:[
-            {
-                text:'Submit',
-                listeners:{
-                    'click':function (button) {
-                        partyId = Ext.getCmp('editIndividualFormPanel').getForm().findField('id').getValue();
-
-                        var window = button.findParentByType('window');
-                        var formPanel = window.query('form')[0];
-                        formPanel.getForm().submit({
-                            reset:true,
-                            params:{
-                                party_type:'Individual'
-                            },
-                            waitMsg:'Updating Individual',
-                            success:function (form, action) {
-                                var response = Ext.decode(action.response.responseText);
-                                Ext.Msg.alert("Status", response.message);
-                                if (response.success) {
-                                    updatePartyDetails(partyId);
-                                    editIndividualWindow.hide();
-                                    Ext.getCmp('individualSearchGrid').store.load();
-                                }
-                            },
-                            failure:function (form, action) {
-                                var message = 'Error updating individual';
-                                if (action.response != null) {
-                                    var response = Ext.decode(action.response.responseText);
-                                    message = response.message;
-                                }
-                                Ext.Msg.alert("Status", message);
-                            }
-                        });
-                    }
-                }
-            },
-            {
-                text:'Close',
-                handler:function () {
-                    editIndividualWindow.hide();
-                }
-            }
-        ]
-    });
-
-    var organizationFormFields = [
-        {
-            xtype:'textfield',
-            fieldLabel:'Enterprise Identifier',
-            allowBlank:true,
-            name:'enterprise_identifier'
-        },
-        {
-            xtype:'textfield',
-            fieldLabel:'Tax ID',
-            allowBlank:true,
-            name:'tax_id_number'
-        },
-        {
-            xtype:'textfield',
-            fieldLabel:'Description',
-            allowBlank:true,
-            name:'description'
-        }
-    ];
-
-    var editOrganizationFormFields = [
-        {
-            xtype:'hiddenfield',
-            name:'id'
-        },
-        {
-            xtype:'hiddenfield',
-            name:'business_party_id'
-        }
-    ];
-
-    var addOrganizationWindow = Ext.create("Ext.window.Window", {
-        layout:'fit',
-        width:375,
-        title:'New Organization',
-        height:160,
-        buttonAlign:'center',
-        items:new Ext.FormPanel({
-            labelWidth:110,
-            frame:false,
-            bodyStyle:'padding:5px 5px 0',
-            width:425,
-            url:'/erp_app/organizer/crm/create_party',
-            defaults:{
-                width:225
-            },
-            items:[ organizationFormFields ]
-        }),
-        buttons:[
-            {
-                text:'Submit',
-                listeners:{
-                    'click':function (button) {
-                        var window = button.findParentByType('window');
-                        var formPanel = window.query('form')[0];
-                        formPanel.getForm().submit({
-                            reset:true,
-                            waitMsg:'Creating Organization',
-                            params:{
-                                party_type:'Organization'
-                            },
-                            success:function (form, action) {
-                                var response = Ext.decode(action.response.responseText);
-                                Ext.Msg.alert("Status", response.message);
-                                if (response.success) {
-                                    var organizationName = response.organizationName;
-                                    addOrganizationWindow.hide();
-                                    var organizationSearchGrid = Ext.ComponentMgr.get('organizationSearchGrid');
-                                    organizationSearchGrid.store.proxy.extraParams.party_name = organizationName;
-                                    organizationSearchGrid.store.load();
-                                }
-                            },
-                            failure:function (form, action) {
-                                var message = "Error adding organization";
-                                if (action.response != null) {
-                                    var response = Ext.decode(action.response.responseText);
-                                    message = response.message;
-                                }
-                                Ext.Msg.alert("Status", message);
-                            }
-                        });
-                    }
-                }
-            },
-            {
-                text:'Close',
-                handler:function () {
-                    addOrganizationWindow.hide();
-                }
-            }
-        ]
-    });
-
-    var editOrganizationWindow = Ext.create("Ext.window.Window", {
-        layout:'fit',
-        width:375,
-        title:'Edit Organization',
-        height:160,
-        buttonAlign:'center',
-        items:new Ext.FormPanel({
-            id:'editOrganizationFormPanel',
-            labelWidth:110,
-            frame:false,
-            bodyStyle:'padding:5px 5px 0',
-            width:425,
-            url:'/erp_app/organizer/crm/update_party',
-            defaults:{
-                width:225
-            },
-            items:[ organizationFormFields.concat(editOrganizationFormFields) ]
-        }),
-        buttons:[
-            {
-                text:'Submit',
-                listeners:{
-                    'click':function (button) {
-                        partyId = Ext.getCmp('editOrganizationFormPanel').getForm().findField('id').getValue();
-
-                        var window = button.findParentByType('window');
-                        var formPanel = window.query('form')[0];
-                        formPanel.getForm().submit({
-                            reset:true,
-                            waitMsg:'Updating Organization',
-                            params:{
-                                party_type:'Organization'
-                            },
-                            success:function (form, action) {
-                                var response = Ext.decode(action.response.responseText);
-                                Ext.Msg.alert("Status", response.message);
-                                if (response.success) {
-                                    updatePartyDetails(partyId);
-                                    var organizationName = response.organizationName;
-                                    editOrganizationWindow.hide();
-                                    var organizationSearchGrid = Ext.ComponentMgr.get('organizationSearchGrid');
-                                    organizationSearchGrid.store.proxy.extraParams.party_name = organizationName;
-                                    organizationSearchGrid.store.load();
-                                }
-                            },
-                            failure:function (form, action) {
-                                var message = "Error adding organization";
-                                if (action.response != null) {
-                                    var response = Ext.decode(action.response.responseText);
-                                    message = response.message;
-                                }
-                                Ext.Msg.alert("Status", message);
-                            }
-                        });
-                    }
-                }
-            },
-            {
-                text:'Close',
-                handler:function () {
-                    editOrganizationWindow.hide();
-                }
-            }
-        ]
-    });
-
     var treeMenuStore = Ext.create('Compass.ErpApp.Organizer.DefaultMenuTreeStore', {
         url:'/erp_app/organizer/crm/menu',
         rootText:'Customers',
@@ -618,7 +221,7 @@ Compass.ErpApp.Organizer.Applications.Crm.Base = function (config) {
                                     iconCls:'icon-add',
                                     listeners:{
                                         'click':function () {
-                                            addIndividualWindow.show();
+                                           Ext.create("Compass.ErpApp.Organizer.Applications.Crm.AddIndividualWindow").show();
                                         }
                                     }
                                 }
@@ -633,7 +236,7 @@ Compass.ErpApp.Organizer.Applications.Crm.Base = function (config) {
                                     iconCls:'icon-add',
                                     listeners:{
                                         'click':function () {
-                                            addOrganizationWindow.show();
+                                            Ext.create("Compass.ErpApp.Organizer.Applications.Crm.AddOrganizationWindow").show();
                                         }
                                     }
                                 }
@@ -653,13 +256,13 @@ Compass.ErpApp.Organizer.Applications.Crm.Base = function (config) {
         partyType:'Individual',
         listeners:{
             'addpartybtnclick':function (btn, grid) {
-                addIndividualWindow.show();
+				Ext.create("Compass.ErpApp.Organizer.Applications.Crm.AddIndividualWindow").show();
             },
             'editpartybtnclick':function (btn, rec) {
-                //rec = grid.getSelectionModel().getSelection()[0];
                 if (rec) {
-                    Ext.getCmp('editIndividualFormPanel').getForm().loadRecord(rec);
-                    editIndividualWindow.show();
+					var editIndividualWindow = Ext.create("Compass.ErpApp.Organizer.Applications.Crm.EditIndividualWindow");
+					editIndividualWindow.show();
+					editIndividualWindow.down('form').getForm().loadRecord(rec);
                 }
                 else {
                     Ext.Msg.alert('Please select a record to edit.');
@@ -685,13 +288,14 @@ Compass.ErpApp.Organizer.Applications.Crm.Base = function (config) {
         partyType:'Organization',
         listeners:{
             'addpartybtnclick':function (btn, grid) {
-                addOrganizationWindow.show();
+            	Ext.create("Compass.ErpApp.Organizer.Applications.Crm.AddOrganizationWindow").show();
             },
             'editpartybtnclick':function (btn, rec) {
                 //rec = grid.getSelectionModel().getSelection()[0];
                 if (rec) {
-                    Ext.getCmp('editOrganizationFormPanel').getForm().loadRecord(rec);
-                    editOrganizationWindow.show();
+                    var editIndividualWindow = Ext.create("Compass.ErpApp.Organizer.Applications.Crm.EditOrganizationWindow");
+					editIndividualWindow.show();
+					editIndividualWindow.down('form').getForm().loadRecord(rec);
                 }
                 else {
                     Ext.Msg.alert('Please select a record to edit.');

data/public/javascripts/erp_app/organizer/applications/crm/individual_windows.js

@@ -0,0 +1,237 @@
+var individualFormFields = [
+    {
+        xtype:'textfield',
+        fieldLabel:'Enterprise Identifier',
+        allowBlank:true,
+        name:'enterprise_identifier'
+    },
+    {
+        xtype:'textfield',
+        fieldLabel:'Title',
+        allowBlank:true,
+        name:'current_personal_title'
+    },
+    {
+        xtype:'textfield',
+        fieldLabel:'First Name',
+        allowBlank:false,
+        name:'current_first_name'
+    },
+    {
+        xtype:'textfield',
+        fieldLabel:'Middle Name',
+        allowBlank:true,
+        name:'current_middle_name'
+    },
+    {
+        xtype:'textfield',
+        fieldLabel:'Last Name',
+        allowBlank:false,
+        name:'current_last_name'
+    },
+    {
+        xtype:'textfield',
+        fieldLabel:'Suffix',
+        allowBlank:true,
+        name:'current_suffix'
+    },
+    {
+        xtype:'textfield',
+        fieldLabel:'Nickname',
+        allowBlank:true,
+        name:'current_nickname'
+    },
+    {
+        xtype:'textfield',
+        fieldLabel:'Passport Number',
+        allowBlank:true,
+        name:'current_passport_number'
+    },
+    {
+        xtype:'datefield',
+        fieldLabel:'Passport Expiration Date',
+        allowBlank:true,
+        name:'current_passport_expire_date'
+    },
+    {
+        xtype:'datefield',
+        fieldLabel:'DOB',
+        allowBlank:false,
+        name:'birth_date'
+    },
+    {
+        xtype:'combobox',
+        fieldLabel:'Gender',
+        store:Ext.create('Ext.data.Store', {
+            fields:['v', 'k'],
+            data:[
+                {"v":"m", "k":"Male"},
+                {"v":"f", "k":"Female"}
+            ]
+        }),
+        displayField:'k',
+        valueField:'v',
+        name:'gender'
+    },
+    {
+        xtype:'textfield',
+        fieldLabel:'Total Yrs Work Exp',
+        allowBlank:true,
+        name:'total_years_work_experience'
+    },
+    {
+        xtype:'textfield',
+        fieldLabel:'Marital Status',
+        allowBlank:true,
+        name:'marital_status'
+    },
+    {
+        xtype:'textfield',
+        fieldLabel:'Social Security Number',
+        allowBlank:true,
+        name:'social_security_number'
+    }
+];
+
+Ext.define("Compass.ErpApp.Organizer.Applications.Crm.AddIndividualWindow", {
+	extend:"Ext.window.Window",
+    alias:'widget.crm-addindividualwindow',
+	title:'New Individual',
+	layout:'fit',
+	buttonAlign:'center',
+	initComponent: function () {
+		Ext.apply(this, {
+	    	items: Ext.create('Ext.form.Panel', {
+				items:individualFormFields,
+				labelWidth:110,
+				closeAction:'hide',
+		        bodyStyle:'padding:5px 5px 0',
+		        url:'/erp_app/organizer/crm/create_party',
+		        defaults:{
+		            width:225
+		        }
+			})
+	   	});
+	    this.callParent(arguments);
+	},
+    buttons:[
+        {
+            text:'Submit',
+            listeners:{
+                'click':function (button) {
+                    var window = button.up('crm-addindividualwindow');
+                    var formPanel = window.down('form');
+                    formPanel.getForm().submit({
+                        reset:true,
+                        params:{
+                            party_type:'Individual'
+                        },
+                        waitMsg:'Creating Individual',
+                        success:function (form, action) {
+                            var response = Ext.decode(action.response.responseText);
+                            Ext.Msg.alert("Status", response.message);
+                            if (response.success) {
+                                var individualName = response.individualName;
+                                addIndividualWindow.hide();
+                                var individualsSearchGrid = Ext.ComponentMgr.get('individualSearchGrid');
+                                individualsSearchGrid.store.proxy.extraParams.party_name = individualName;
+                                individualsSearchGrid.store.load();
+                            }
+                        },
+                        failure:function (form, action) {
+                            var message = 'Error adding individual';
+                            if (action.response != null) {
+                                var response = Ext.decode(action.response.responseText);
+                                message = response.message;
+                            }
+                            Ext.Msg.alert("Status", message);
+                        }
+                    });
+                }
+            }
+        },
+        {
+            text:'Close',
+            handler:function (btn) {
+                btn.up('crm-addindividualwindow').close();
+            }
+        }
+    ]
+});
+
+var editIndividualFormFields = [
+    {
+        xtype:'hiddenfield',
+        name:'id'
+    },
+    {
+        xtype:'hiddenfield',
+        name:'business_party_id'
+    }
+];
+
+
+Ext.define("Compass.ErpApp.Organizer.Applications.Crm.EditIndividualWindow", {
+	extend:"Ext.window.Window",
+    alias:'widget.crm-editindividualwindow',
+    layout:'fit',
+    title:'Edit Individual',
+    buttonAlign:'center',
+    initComponent: function () {
+		Ext.apply(this, {
+	    	items: Ext.create('Ext.form.Panel', {
+				items:individualFormFields.concat(editIndividualFormFields),
+				labelWidth:110,
+		        frame:false,
+		        bodyStyle:'padding:5px 5px 0',
+		        url:'/erp_app/organizer/crm/update_party',
+		        defaults:{
+		            width:225
+		        }
+			})
+	   	});
+	    this.callParent(arguments);
+	},
+    buttons:[
+        {
+            text:'Submit',
+            listeners:{
+                'click':function (button) {
+                    var window = button.up('crm-editindividualwindow');
+                    var formPanel = window.down('form');
+					var partyId = formPanel.getForm().findField('id').getValue();
+                    formPanel.getForm().submit({
+                        reset:false,
+                        params:{
+                            party_type:'Individual'
+                        },
+                        waitMsg:'Updating Individual',
+                        success:function (form, action) {
+                            var response = Ext.decode(action.response.responseText);
+                            Ext.Msg.alert("Status", response.message);
+                            if (response.success) {
+                                updatePartyDetails(partyId);
+                                editIndividualWindow.hide();
+                                Ext.getCmp('individualSearchGrid').store.load();
+                            }
+                        },
+                        failure:function (form, action) {
+                            var message = 'Error updating individual';
+                            if (action.response != null) {
+                                var response = Ext.decode(action.response.responseText);
+                                message = response.message;
+                            }
+                            Ext.Msg.alert("Status", message);
+                        }
+                    });
+                }
+            }
+        },
+        {
+            text:'Close',
+            handler:function (btn) {
+                btn.up('crm-editindividualwindow').close();
+            }
+        }
+    ]
+});

data/public/javascripts/erp_app/organizer/applications/crm/organization_windows.js

@@ -0,0 +1,167 @@
+var organizationFormFields = [
+    {
+        xtype:'textfield',
+        fieldLabel:'Enterprise Identifier',
+        allowBlank:true,
+        name:'enterprise_identifier'
+    },
+    {
+        xtype:'textfield',
+        fieldLabel:'Tax ID',
+        allowBlank:true,
+        name:'tax_id_number'
+    },
+    {
+        xtype:'textfield',
+        fieldLabel:'Description',
+        allowBlank:true,
+        name:'description'
+    }
+];
+
+var editOrganizationFormFields = [
+    {
+        xtype:'hiddenfield',
+        name:'id'
+    },
+    {
+        xtype:'hiddenfield',
+        name:'business_party_id'
+    }
+];
+
+Ext.define("Compass.ErpApp.Organizer.Applications.Crm.AddOrganizationWindow", {
+	extend:"Ext.window.Window",
+    alias:'widget.crm-addorganizationwindow',
+    layout:'fit',
+    title:'New Organization',
+    buttonAlign:'center',
+	initComponent: function () {
+		Ext.apply(this, {
+	    	items: Ext.create('Ext.form.Panel', {
+				items:organizationFormFields,
+				labelWidth:110,
+		        frame:false,
+		        bodyStyle:'padding:5px 5px 0',
+		        url:'/erp_app/organizer/crm/create_party',
+		        defaults:{
+		            width:225
+		        }
+			})
+	   	});
+	    this.callParent(arguments);
+	},
+    buttons:[
+        {
+            text:'Submit',
+            listeners:{
+                'click':function (button) {
+                    var window = button.up('crm-editorganizationwindow');
+                    var formPanel = window.down('form');
+                    formPanel.getForm().submit({
+                        reset:true,
+                        waitMsg:'Creating Organization',
+                        params:{
+                            party_type:'Organization'
+                        },
+                        success:function (form, action) {
+                            var response = Ext.decode(action.response.responseText);
+                            Ext.Msg.alert("Status", response.message);
+                            if (response.success) {
+                                var organizationName = response.organizationName;
+                                addOrganizationWindow.hide();
+                                var organizationSearchGrid = Ext.ComponentMgr.get('organizationSearchGrid');
+                                organizationSearchGrid.store.proxy.extraParams.party_name = organizationName;
+                                organizationSearchGrid.store.load();
+                            }
+                        },
+                        failure:function (form, action) {
+                            var message = "Error adding organization";
+                            if (action.response != null) {
+                                var response = Ext.decode(action.response.responseText);
+                                message = response.message;
+                            }
+                            Ext.Msg.alert("Status", message);
+                        }
+                    });
+                }
+            }
+        },
+        {
+            text:'Close',
+            handler:function (btn) {
+                btn.up('crm-addorganizationwindow').close();
+            }
+        }
+    ]
+});
+
+Ext.define("Compass.ErpApp.Organizer.Applications.Crm.EditOrganizationWindow", {
+	extend:"Ext.window.Window",
+    alias:'widget.crm-editorganizationwindow',
+    layout:'fit',
+    title:'Edit Organization',
+    buttonAlign:'center',
+	initComponent: function () {
+		Ext.apply(this, {
+	    	items: Ext.create('Ext.form.Panel', {
+				items:organizationFormFields.concat(editOrganizationFormFields),
+				id:'editOrganizationFormPanel',
+		        labelWidth:110,
+		        frame:false,
+		        bodyStyle:'padding:5px 5px 0',
+		        url:'/erp_app/organizer/crm/update_party',
+		        defaults:{
+		            width:225
+		        }
+			})
+	   	});
+	    this.callParent(arguments);
+	},
+    buttons:[
+        {
+            text:'Submit',
+            listeners:{
+                'click':function (button) {
+                    partyId = Ext.getCmp('editOrganizationFormPanel').getForm().findField('id').getValue();
+
+                    var window = button.up('crm-editorganizationwindow');
+                    var formPanel = window.down('form');
+                    formPanel.getForm().submit({
+                        reset:true,
+                        waitMsg:'Updating Organization',
+                        params:{
+                            party_type:'Organization'
+                        },
+                        success:function (form, action) {
+                            var response = Ext.decode(action.response.responseText);
+                            Ext.Msg.alert("Status", response.message);
+                            if (response.success) {
+                                updatePartyDetails(partyId);
+                                var organizationName = response.organizationName;
+                                editOrganizationWindow.hide();
+                                var organizationSearchGrid = Ext.ComponentMgr.get('organizationSearchGrid');
+                                organizationSearchGrid.store.proxy.extraParams.party_name = organizationName;
+                                organizationSearchGrid.store.load();
+                            }
+                        },
+                        failure:function (form, action) {
+                            var message = "Error adding organization";
+                            if (action.response != null) {
+                                var response = Ext.decode(action.response.responseText);
+                                message = response.message;
+                            }
+                            Ext.Msg.alert("Status", message);
+                        }
+                    });
+                }
+            }
+        },
+        {
+            text:'Close',
+            handler:function(btn){
+                btn.up('crm-editorganizationwindow').close();
+            }
+        }
+    ]
+});

data/public/javascripts/erp_app/shared/profile_management_panel.js

@@ -68,7 +68,7 @@ Ext.define("Compass.ErpApp.Shared.ProfileManagementPanel", {
             buttonAlign:'left',
             url:'/users/update_password',
             defaults:{
-                width:225
+                width:300
             },
             items:[
                 {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erp_app
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -1652,6 +1652,8 @@ files:
 - public/javascripts/erp_app/mobile/mobile_base.js
 - public/javascripts/erp_app/organizer/applications/crm/base.js
 - public/javascripts/erp_app/organizer/applications/crm/contact_mechanism_grid.js
+- public/javascripts/erp_app/organizer/applications/crm/individual_windows.js
+- public/javascripts/erp_app/organizer/applications/crm/organization_windows.js
 - public/javascripts/erp_app/organizer/applications/crm/party_grid.js
 - public/javascripts/erp_app/organizer/applications/crm/relationship_grid.js
 - public/javascripts/erp_app/organizer/applications/crm/userinfo.js
@@ -6605,6 +6607,7 @@ files:
 - public/stylesheets/sencha_touch/resources/themes/stylesheets/sencha-touch/default/widgets/_toolbar.scss
 - public/stylesheets/sencha_touch/resources/themes/templates/project/manifest.rb
 - public/stylesheets/sencha_touch/resources/themes/templates/project/sencha-touch.scss
+- public/stylesheets/sencha_touch/resources/themes/vendor/compass-recipes/compass-recipes-0.3.0.alpha.1.gem
 - public/stylesheets/sencha_touch/resources/themes/vendor/compass-recipes/compass-recipes.gemspec
 - public/stylesheets/sencha_touch/resources/themes/vendor/compass-recipes/config.rb
 - public/stylesheets/sencha_touch/resources/themes/vendor/compass-recipes/fonts/heydings/heydings_icons.ttf
@@ -7050,18 +7053,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4057907889958183206
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4057907889958183206
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24