ooor 1.3.1 → 1.3.2

data/lib/app/models/open_object_resource.rb

@@ -348,7 +348,7 @@ class OpenObjectResource < ActiveResource::Base
       load(attributes)
     else
       self.class.reload_fields_definition() unless self.class.fields_defined
-      default_get_list ||= Set.new(self.class.many2one_relations.collect {|k, field| self.class.const_get(field.relation).fields.keys}.flatten + self.class.fields.keys).to_a
+      default_get_list ||= Set.new(self.class.many2one_relations.reject {|k, v| attributes.keys.index(k.to_sym)}.collect {|k, field| self.class.const_get(field.relation).fields.keys}.flatten + self.class.fields.keys).to_a
       load(self.class.rpc_execute("default_get", default_get_list, context).symbolize_keys!.merge(attributes.symbolize_keys!))
     end
   end

data/spec/ooor_spec.rb

@@ -9,7 +9,7 @@ describe Ooor do
     @username = 'admin'
     @password = 'admin'
     @database = 'ooor_test'
-    @ooor = Ooor.new(:url => @url, :username => @username, :admin => @password)
+    @ooor = Ooor.new(:url => @url, :username => @username, :password => @password)
   end
 
   it "should keep quiet if no database is mentioned" do
@@ -30,7 +30,7 @@ describe Ooor do
   
   describe "Configure existing database" do
     before(:all) do
-      @ooor = Ooor.new(:url => @url, :username => @username, :admin => @password, :database => @database)
+      @ooor = Ooor.new(:url => @url, :username => @username, :password => @password, :database => @database)
     end
 
     it "should be able to load a profile" do
@@ -59,7 +59,7 @@ describe Ooor do
 
   describe "Do operations on configured database" do
     before(:all) do
-      @ooor = Ooor.new(:url => @url, :username => @username, :admin => @password, :database => @database,
+      @ooor = Ooor.new(:url => @url, :username => @username, :password => @password, :database => @database,
         :models => ['res.user', 'res.partner', 'product.product',  'sale.order', 'account.invoice', 'product.category', 'stock.move', 'ir.ui.menu'])
     end
 
@@ -191,6 +191,10 @@ describe Ooor do
         p = ProductProduct.new
         p.sale_delay.should be_kind_of(Integer)
       end
+
+      it "should skipped inherited default fields properly, for instance at product variant creation" do
+        ProductProduct.create(:product_tmpl_id => 25, :code => 'OOOR variant').should be_kind_of(ProductProduct)
+      end
     end
 
     describe "Basic updates" do
@@ -287,7 +291,7 @@ describe Ooor do
 
   describe "Offer Web Client core features" do
     before(:all) do
-      @ooor = Ooor.new(:url => @url, :username => @username, :admin => @password, :database => @database,
+      @ooor = Ooor.new(:url => @url, :username => @username, :password => @password, :database => @database,
         :models => ['res.user', 'res.partner', 'product.product',  'sale.order', 'account.invoice', 'product.category', 'stock.move', 'ir.ui.menu'])
     end
 
@@ -318,7 +322,7 @@ describe Ooor do
 
   describe "UML features" do
     before(:all) do
-      @ooor = Ooor.new(:url => @url, :username => @username, :admin => @password, :database => @database,
+      @ooor = Ooor.new(:url => @url, :username => @username, :password => @password, :database => @database,
         :models => ['res.user', 'res.partner', 'product.product',  'sale.order', 'account.invoice', 'product.category', 'stock.move', 'ir.ui.menu'])
     end
 
@@ -338,8 +342,8 @@ describe Ooor do
 
   describe "Multi-instance and class name scoping" do
     before(:all) do
-      @ooor1 = Ooor.new(:url => @url, :username => @username, :admin => @password, :database => @database, :scope_prefix => 'OE1', :models => ['product.product'])
-      @ooor2 = Ooor.new(:url => @url, :username => @username, :admin => @password, :database => @database, :scope_prefix => 'OE2', :models => ['product.product'])
+      @ooor1 = Ooor.new(:url => @url, :username => @username, :password => @password, :database => @database, :scope_prefix => 'OE1', :models => ['product.product'])
+      @ooor2 = Ooor.new(:url => @url, :username => @username, :password => @password, :database => @database, :scope_prefix => 'OE2', :models => ['product.product'])
     end
 
     it "should still be possible to find a ressource using an absolute id" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 3
-  - 1
-  version: 1.3.1
+  - 2
+  version: 1.3.2
 platform: ruby
 authors: 
 - Raphael Valyi - www.akretion.com
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-10 00:00:00 -03:00
+date: 2010-03-12 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency