Merge lp:~unifield-team/unifield-wm/us-77 into lp:unifield-wm

[jftempo]

=== modified file 'msf_partner/partner.py'
--- msf_partner/partner.py	2015-02-06 11:07:42 +0000
+++ msf_partner/partner.py	2015-03-12 10:47:53 +0000
@@ -215,6 +215,26 @@
             view_load=True,
             required=True,
             help="This currency will be used, instead of the default one, for field orders to the current partner"),
+        'property_stock_customer': fields.property(
+            'stock.location',
+            type='many2one',
+            relation='stock.location',
+            string='Customer Location',
+            method=True,
+            view_load=True,
+            required=True,
+            help="This stock location will be used, instead of the default one, as the destination location for goods you send to this partner.",
+        ),
+        'property_stock_supplier': fields.property(
+            'stock.location',
+            type='many2one',
+            relation='stock.location',
+            string='Supplier Location',
+            method=True,
+            view_load=True,
+            required=True,
+            help="This stock location will be used, instead of the default one, as the source location for goods you receive from the current partner.",
+        ),
         'price_unit': fields.function(_get_price_info, method=True, type='float', string='Unit price', multi='info'),
         'valide_until_date' : fields.function(_get_price_info, method=True, type='char', string='Valid until date', multi='info'),
         'price_currency': fields.function(_get_price_info, method=True, type='many2one', relation='res.currency', string='Currency', multi='info'),