openerp-dev-web team mailing list archive

[jam-openerp <jam@xxxxxxxxxxx>]

jam-openerp has proposed merging lp:~openerp-dev/openobject-addons/jam-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.

Requested reviews:
  Harry (Open ERP) (hmo-tinyerp)


Hello

This are changes in proposed of branch Merging 
  + [BUG-FIX] lp:687326
  + [BUG-FIX] lp:670265

Kindly review it,

Thank You.

-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/jam-dev-addons1/+merge/43161
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/jam-dev-addons1.

=== modified file 'base_report_designer/plugin/openerp_report_designer.zip'
Binary files base_report_designer/plugin/openerp_report_designer.zip	2010-09-15 14:02:52 +0000 and base_report_designer/plugin/openerp_report_designer.zip	2010-12-09 05:52:02 +0000 differ
=== modified file 'base_report_designer/plugin/openerp_report_designer/bin/script/Change.py'
--- base_report_designer/plugin/openerp_report_designer/bin/script/Change.py	2010-10-28 06:54:18 +0000
+++ base_report_designer/plugin/openerp_report_designer/bin/script/Change.py	2010-12-09 05:52:02 +0000
@@ -54,11 +54,11 @@
     def __init__(self, aVal= None, sURL=""):
         self.win=DBModalDialog(60, 50, 120, 90, "Connect to Open ERP Server")
 
-        self.win.addFixedText("lblVariable", 38, 12, 60, 15, "Server")
+        self.win.addFixedText("lblVariable", 38, 12, 25, 15, "Server  ")
 
         self.win.addEdit("txtHost",-2,9,60,15,sURL[sURL.find("/")+2:sURL.rfind(":")])
 
-        self.win.addFixedText("lblReportName",45 , 31, 60, 15, "Port")
+        self.win.addFixedText("lblReportName",45 , 31, 15, 15, "Port  ")
         self.win.addEdit("txtPort",-2,28,60,15,sURL[sURL.rfind(":")+1:])
 
         self.win.addFixedText("lblLoginName", 2, 51, 60, 15, "Protocol Connection")
@@ -92,6 +92,8 @@
         global url
         url = self.protocol[self.win.getListBoxSelectedItem("lstProtocol")]+self.win.getEditText("txtHost")+":"+self.win.getEditText("txtPort")
         self.sock=RPCSession(url)
+        desktop=getDesktop()
+        doc = desktop.getCurrentComponent()
         docinfo=doc.getDocumentInfo()        
         docinfo.setUserFieldValue(0,url)
         res=self.sock.listdb()

=== modified file 'base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py'
--- base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py	2010-10-28 06:54:18 +0000
+++ base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py	2010-12-09 05:52:02 +0000
@@ -192,6 +192,10 @@
         Change(aVal,url)
         if aVal[1]== -1:
            self.win.getEditText("lstDatabase")
+           self.win.removeListBoxItems("lstDatabase", 0, self.win.getListBoxItemCount("lstDatabase"))
+           self.win.setEditText("txtHost",aVal[0])
+           for i in range(len(aVal[1])):
+                self.lstDatabase.addItem(aVal[1][i],i)
         elif aVal[1]==0:
             ErrorDialog(aVal[0],"")
         else:

=== modified file 'survey/survey.py'
--- survey/survey.py	2010-12-08 13:59:16 +0000
+++ survey/survey.py	2010-12-09 05:52:02 +0000
@@ -92,9 +92,13 @@
     def survey_cancel(self, cr, uid, ids, arg):
         self.write(cr, uid, ids, {'state': 'cancel' })
         return True
-
-    def copy(self, cr, uid, id, default=None,context={}):
-        raise osv.except_osv(_('Warning !'),_('You cannot duplicate the resource!'))
+        
+    def copy(self, cr, uid, ids, default=None, context={}):
+        vals = {}
+        current_rec = self.read(cr, uid, ids, context=context)
+        title = current_rec.get('title') + ' (Copy)'
+        vals.update({'title':title})
+        return super(survey, self).copy(cr, uid, ids, vals, context=context)
 
     def action_print_survey(self, cr, uid, ids, context=None):
         """
@@ -196,8 +200,12 @@
             'context': context
         }
 
-    def copy(self, cr, uid, id, default=None, context={}):
-        raise osv.except_osv(_('Warning !'),_('You cannot duplicate the resource!'))
+    def copy(self, cr, uid, ids, default=None, context={}):
+        vals = {}
+        current_rec = self.read(cr, uid, ids, context=context)
+        title = current_rec.get('title') + ' (Copy)'
+        vals.update({'title':title})
+        return super(survey_page, self).copy(cr, uid, ids, vals, context=context)
 
 survey_page()
 

=== modified file 'thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Account.png'
Binary files thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Account.png	2010-11-26 12:53:42 +0000 and thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Account.png	2010-12-09 05:52:02 +0000 differ
=== modified file 'thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Archive.png'
Binary files thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Archive.png	2010-11-26 12:53:42 +0000 and thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Archive.png	2010-12-09 05:52:02 +0000 differ
=== modified file 'thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Case.png'
Binary files thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Case.png	2010-11-26 12:53:42 +0000 and thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Case.png	2010-12-09 05:52:02 +0000 differ
=== modified file 'thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Contact.png'
Binary files thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Contact.png	2010-11-26 12:53:42 +0000 and thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Contact.png	2010-12-09 05:52:02 +0000 differ
=== modified file 'thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Create.png'
Binary files thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Create.png	2010-11-26 12:53:42 +0000 and thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Create.png	2010-12-09 05:52:02 +0000 differ
=== modified file 'thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Invoice.png'
Binary files thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Invoice.png	2010-11-26 12:53:42 +0000 and thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Invoice.png	2010-12-09 05:52:02 +0000 differ
=== modified file 'thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/MoveDown.png'
Binary files thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/MoveDown.png	2010-11-26 12:53:42 +0000 and thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/MoveDown.png	2010-12-09 05:52:02 +0000 differ
=== modified file 'thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/MoveLeft.png'
Binary files thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/MoveLeft.png	2010-11-26 12:53:42 +0000 and thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/MoveLeft.png	2010-12-09 05:52:02 +0000 differ
=== modified file 'thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/NEWT.png'
Binary files thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/NEWT.png	2010-11-26 12:53:42 +0000 and thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/NEWT.png	2010-12-09 05:52:02 +0000 differ
=== modified file 'thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/NEWT1.png'
Binary files thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/NEWT1.png	2010-11-26 12:53:42 +0000 and thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/NEWT1.png	2010-12-09 05:52:02 +0000 differ
=== modified file 'thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Partner.png'
Binary files thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Partner.png	2010-11-26 12:53:42 +0000 and thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Partner.png	2010-12-09 05:52:02 +0000 differ
=== modified file 'thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Product.png'
Binary files thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Product.png	2010-11-26 12:53:42 +0000 and thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Product.png	2010-12-09 05:52:02 +0000 differ
=== modified file 'thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Project.png'
Binary files thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Project.png	2010-11-26 12:53:42 +0000 and thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Project.png	2010-12-09 05:52:02 +0000 differ
=== modified file 'thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Sale.png'
Binary files thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Sale.png	2010-11-26 12:53:42 +0000 and thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Sale.png	2010-12-09 05:52:02 +0000 differ
=== modified file 'thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Task.png'
Binary files thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Task.png	2010-11-26 12:53:42 +0000 and thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Task.png	2010-12-09 05:52:02 +0000 differ
=== modified file 'thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/developped_by.png'
Binary files thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/developped_by.png	2010-11-26 12:53:42 +0000 and thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/developped_by.png	2010-12-09 05:52:02 +0000 differ
=== modified file 'thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/document-new.png' (properties changed: -x to +x)
Binary files thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/document-new.png	2010-11-26 12:53:42 +0000 and thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/document-new.png	2010-12-09 05:52:02 +0000 differ
=== modified file 'thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/openerp-icon.png'
Binary files thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/openerp-icon.png	2010-11-26 12:53:42 +0000 and thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/openerp-icon.png	2010-12-09 05:52:02 +0000 differ
=== modified file 'thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/partner_icon.png'
Binary files thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/partner_icon.png	2010-11-26 12:53:42 +0000 and thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/partner_icon.png	2010-12-09 05:52:02 +0000 differ
=== modified file 'thunderbird/plugin/openerp_plugin/defaults/preferences/tiny.js'
--- thunderbird/plugin/openerp_plugin/defaults/preferences/tiny.js	2010-11-16 10:24:08 +0000
+++ thunderbird/plugin/openerp_plugin/defaults/preferences/tiny.js	2010-12-09 05:52:02 +0000
@@ -24,7 +24,7 @@
 pref("extensions.tiny.officeno","");
 pref("extensions.tiny.phoneno","");
 pref("extensions.tiny.address","");
-pref("extensions.tiny.listobject","Partner,Accout Invoice,Product,Sale Order,Lead and opportunities");
+pref("extensions.tiny.listobject","Partner,Account Invoice,Product,Sale Order,Lead and opportunities");
 pref("extensions.tiny.object","res.partner,account.invoice,product.product,sale.order,crm.lead");
 pref("extensions.tiny.imagename","chrome://openerp_plugin/skin/Partner.png,chrome://openerp_plugin/skin/Invoice.png,chrome://openerp_plugin/skin/Product.png,chrome://openerp_plugin/skin/Sale.png,chrome://openerp_plugin/skin/Case.png");
 pref("extensions.tiny.attachmentlength","");