Merge lp:~unifield-team/unifield-wm/qt-us-first-pack into lp:unifield-wm

[jftempo]

Unmerged revisions

2409. By Quentin THEURET @Amaris on 2015-03-02

US-31 [FIX] On multiple line OST, the supplier can not be choosen

2408. By Quentin THEURET @Amaris on 2015-03-02

US-16 [FIX] Fix overlapping of origin value

2407. By Quentin THEURET @Amaris on 2015-02-23

US-34 [FIX] Put the modification on all reported lines

2406. By Quentin THEURET @Amaris on 2015-02-23

US-31 [MERGE] Merge code of US-31 - lp:~unifield-team/unifield-wm/us-31

2405. By Quentin THEURET @Amaris on 2015-02-23

US-16 [MERGE] Merge code of US-16 - lp:~unifield-team/unifield-wm/us-16

2404. By Quentin THEURET @Amaris on 2015-02-23

US-34 [MERGE] Merge code of US-34 - lp:~unifield-team/unifield-wm/us-34

2403. By Quentin THEURET @Amaris on 2015-02-23

US-66 [MERGE] Merge code of US-66 - lp:~unifield-team/unifield-wm/us-66

2402. By Quentin THEURET @Amaris on 2015-02-23

US-77 [MERGE] Merge code of US-77 - lp:~unifield-team/unifield-wm/us-77

=== 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:44: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'),
 
=== modified file 'msf_supply_doc_export/msf_supply_doc_export.py'
--- msf_supply_doc_export/msf_supply_doc_export.py	2014-11-14 10:45:42 +0000
+++ msf_supply_doc_export/msf_supply_doc_export.py	2015-03-12 10:44:53 +0000
@@ -383,9 +383,6 @@
     def getRunParmsRML(self,key):
         return self.datas['report_parms'][key]
 
-    def getPOLineHeaders(self):
-        return ['Item','Code','Description','Qty ordered','UoM','Qty received','IN','Qty backorder','Unit Price','IN unit price','Destination','Cost Center']
-       
     def printAnalyticLines(self, analytic_lines):
         res = []
         # if additional analytic lines print them here.
@@ -412,12 +409,14 @@
         # TODO the multiplier is the value populated for no change in stock_move.price_unit
         # TODO it probably should be 1
         multiplier = 1.0000100000000001 
+        po_obj = self.pool.get('purchase.order')
         pol_obj = self.pool.get('purchase.order.line')
         prod_obj = self.pool.get('product.product')
         uom_obj = self.pool.get('product.uom')
         po_line_ids = pol_obj.search(self.cr, self.uid, [('order_id','=',po_id)], order='line_number')
         po_lines = pol_obj.browse(self.cr, self.uid, po_line_ids)
         report_lines = []
+        order = po_obj.browse(self.cr, self.uid, po_id)
         for line in po_lines:
             in_lines = self.getAllLineIN(line.id)
             analytic_lines = self.getAnalyticLines(line)
@@ -438,6 +437,10 @@
             # Display information of the initial reception
             if not same_product_same_uom:
                 report_line = {
+                    'order_ref': order.name or '',
+                    'order_created': order.date_order or '',
+                    'order_confirmed_date': order.delivery_confirmed_date or '',
+                    'order_status': self._get_states().get(order.state, ''),
                     'item': line.line_number or '',
                     'code': line.product_id.default_code or '',
                     'description': line.product_id.name or '',
@@ -457,6 +460,10 @@
 
             for spsul in same_product_same_uom:
                 report_line = {
+                    'order_ref': order.name or '',
+                    'order_created': order.date_order or '',
+                    'order_confirmed_date': order.delivery_confirmed_date or '',
+                    'order_status': self._get_states().get(order.state, ''),
                     'item': first_line and line.line_number or '',
                     'code': first_line and line.product_id.default_code or '',
                     'description': first_line and line.product_id.name or '',
@@ -481,6 +488,10 @@
 
             for spl in same_product:
                 report_line = {
+                    'order_ref': order.name or '',
+                    'order_created': order.date_order or '',
+                    'order_confirmed_date': order.delivery_confirmed_date or '',
+                    'order_status': self._get_states().get(order.state, ''),
                     'item': first_line and line.line_number or '',
                     'code': first_line and line.product_id.default_code or '',
                     'description': first_line and line.product_id.name or '',
@@ -505,6 +516,10 @@
             for ol in other_product:
                 prod_brw = prod_obj.browse(self.cr, self.uid, ol.get('product_id'))
                 report_line = {
+                    'order_ref': order.name or '',
+                    'order_created': order.date_order or '',
+                    'order_confirmed_date': order.delivery_confirmed_date or '',
+                    'order_status': self._get_states().get(order.state, ''),
                     'item': line.line_number or '',
                     'code': prod_brw.default_code or '',
                     'description': prod_brw.name or '',
@@ -560,7 +575,7 @@
         return self.datas.get('report_header')[1]
 
     def getPOLineHeaders(self):
-        return ['Item','Code','Description','Qty ordered','UoM','Qty received','IN','Qty backorder','Unit Price','IN unit price','Destination','Cost Center']
+        return ['Order Ref', 'Item','Code','Description','Qty ordered','UoM','Qty received','IN','Qty backorder','Unit Price','IN unit price', 'Created', 'Confirmed Delivery', 'Status', 'Destination','Cost Center']
       
 
 
 
=== modified file 'msf_supply_doc_export/report/report_po_follow_up_xls.mako'
--- msf_supply_doc_export/report/report_po_follow_up_xls.mako	2014-11-07 10:52:52 +0000
+++ msf_supply_doc_export/report/report_po_follow_up_xls.mako	2015-03-12 10:44:53 +0000
@@ -81,6 +81,8 @@
 ## definition of the columns' size
 <% nb_of_columns = 12 %>
 <Table x:FullColumns="1" x:FullRows="1">
+    # Order name
+    <Column ss:AutoFitWidth="1" ss:Width="65" />
     # Item
     <Column ss:AutoFitWidth="1" ss:Width="40" />
     # Code
@@ -101,6 +103,12 @@
     <Column ss:AutoFitWidth="1" ss:Width="95" />
     # IN Unit Price
     <Column ss:AutoFitWidth="1" ss:Width="95" />
+    # Created (order)
+    <Columns ss:AutoFitWidth="1" ss:Width="95" />
+    # Delivery Confirmed (order)
+    <Columns ss:AutoFitWidth="1" ss:Width="95" />
+    # Status (order)
+    <Columns ss:AutoFitWidth="1" ss:Width="95" />
     # Destination
     <Column ss:AutoFitWidth="1" ss:Width="95" />
     # Cost Center
@@ -116,16 +124,6 @@
    <Cell ss:MergeAcross="1" ss:StyleID="mainheader"><Data ss:Type="String">Supplier: ${getRunParms()['supplier'] or '' |x}</Data></Cell>
    <Cell ss:MergeAcross="2" ss:StyleID="mainheader"><Data ss:Type="String">PO State: ${getRunParms()['state'] or '' | x}</Data></Cell>
 </Row>
-<Row></Row>
-<Row></Row>
-
-% for o in objects:
-    
-    <Row ss:AutoFitHeight="0" ss:Height="36">
-       % for header in getHeaderLine(o):
-    	  <Cell ss:MergeAcross="1" ss:StyleID="poheader"><Data ss:Type="String">${header |x}</Data></Cell>
-       % endfor
-    </Row>
 
     <Row ss:AutoFitHeight="1" > 
       % for header in getPOLineHeaders():
@@ -133,8 +131,11 @@
        % endfor       
     </Row>
     
+% for o in objects:
+    
     % for line in getPOLines(o.id):
     <Row ss:AutoFitHeight="1">
+        <Cell ss:StyleID="line"><Data ss:Type="String">${(line['order_ref'])|x}</Data></Cell>
         <Cell ss:StyleID="line"><Data ss:Type="Number">${(line['item'])|x}</Data></Cell>
         <Cell ss:StyleID="line"><Data ss:Type="String">${(line['code'])|x}</Data></Cell>
         <Cell ss:StyleID="line"><Data ss:Type="String">${(line['description'])|x}</Data></Cell>
@@ -145,6 +146,9 @@
         <Cell ss:StyleID="line"><Data ss:Type="Number">${(line['qty_backordered'])|x}</Data></Cell>
         <Cell ss:StyleID="line"><Data ss:Type="Number">${(line['unit_price'])|x}</Data></Cell>
         <Cell ss:StyleID="line"><Data ss:Type="Number">${(line['in_unit_price'])|x}</Data></Cell>
+        <Cell ss:StyleID="line"><Data ss:Type="String">${(line['order_created'])|x}</Data></Cell>
+        <Cell ss:StyleID="line"><Data ss:Type="String">${(line['order_confirmed_date'])|x}</Data></Cell>
+        <Cell ss:StyleID="line"><Data ss:Type="String">${(line['order_status'])|x}</Data></Cell>
         <Cell ss:StyleID="line"><Data ss:Type="String">${(line['destination'])|x}</Data></Cell>
         <Cell ss:StyleID="line"><Data ss:Type="String">${(line['cost_centre'])|x}</Data></Cell>
     </Row>
 
=== modified file 'sale_override/sale.py'
--- sale_override/sale.py	2015-01-28 17:26:00 +0000
+++ sale_override/sale.py	2015-03-12 10:44:53 +0000
@@ -855,6 +855,16 @@
         # 1/ Check validity of analytic distribution
         self.analytic_distribution_checks(cr, uid, order_brw_list)
 
+        no_price_lines = line_obj.search(cr, uid, [
+            ('order_id', '=', ids),
+            ('price_unit', '=', 0.00),
+        ])
+        if no_price_lines:
+            raise osv.except_osv(
+                _('Warning'),
+                _('FO cannot be validated as line cannot have unit price of zero.'),
+            )
+
         for order in order_brw_list:
             # 2/ Check if there is lines in order
             if len(order.order_line) < 1:
 
=== modified file 'sourcing/sale_order_line.py'
--- sourcing/sale_order_line.py	2014-10-22 08:44:42 +0000
+++ sourcing/sale_order_line.py	2015-03-12 10:44:53 +0000
@@ -48,32 +48,6 @@
     _inherit = 'sale.order.line'
     _description = 'Sales Order Line'
 
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        if context is None:
-            context = {}
-
-        '''
-            !!!!! ATTENTION ATTENTION!!!!!!
-            UTP-1021: This solution is NOT stable and could be dangerous!!!!
-            need to have a proper fix for this,
-            currently we have only 3 tree views for sale.order.line
-            so I use the value in the context to identify that it is not the
-            view of wizard, but this assumption could be totally WRONG!
-            But in this current version, it works!
-        '''
-        if not context.get('search_default_need_sourcing', False) and \
-            view_type == 'tree':
-            if '_terp_view_name' in context:
-                '''
-                UFTP-346: HACK ON HACK UTP-1021
-                '_terp_view_name' not set if grouping
-                and we do not want special view when grouping
-                '''
-                view_id = self.pool.get('ir.model.data').get_object_reference(
-                    cr, uid, 'sourcing', 'sourcing_line_special_tree_view')[1]
-        return super(sale_order_line, self).fields_view_get(cr, uid, view_id,
-            view_type, context, toolbar, submenu)
-
     """
     Other methods
     """
@@ -1047,6 +1021,17 @@
                 _('A location must be chosen before sourcing the line.'),
             )
 
+        no_price = self.search(cr, uid, [
+            ('id', 'in', ids),
+            ('price_unit', '=', 0.00),
+            ('order_id.procurement_request', '=', False),
+        ], count=True, context=context)
+        if no_price:
+            raise osv.except_osv(
+                _('Warning'),
+                _('You cannot confirm the sourcing of a line with unit price as zero.'),
+            )
+
         order_to_check = {}
         for line in self.read(cr, uid, ids, ['order_id', 'estimated_delivery_date'], context=context):
             order_proc = order_obj.read(cr, uid, line['order_id'][0], ['procurement_request'], context=context)['procurement_request']
 
=== modified file 'sourcing/wizard/multiple_sourcing.py'
--- sourcing/wizard/multiple_sourcing.py	2014-10-10 12:26:59 +0000
+++ sourcing/wizard/multiple_sourcing.py	2015-03-12 10:44:53 +0000
@@ -53,7 +53,7 @@
             'stock.location',
             string='Location',
         ),
-        'supplier': fields.many2one(
+        'supplier_id': fields.many2one(
             'res.partner',
             string='Supplier',
             help="If you have choose lines coming from Field Orders, only External/ESC suppliers will be available.",
@@ -124,7 +124,7 @@
         if loc != -1:
             res['location_id'] = loc
         if supplier != -1:
-            res['supplier'] = supplier
+            res['supplier_id'] = supplier
 
         if not res['line_ids']:
             raise osv.except_osv(_('Error'), _('No non-sourced lines are selected. Please select non-sourced lines'))
@@ -146,7 +146,7 @@
             if wiz.type == 'make_to_order':
                 if not wiz.po_cft:
                     raise osv.except_osv(_('Error'), _('The Procurement method should be filled !'))
-                elif wiz.po_cft != 'cft' and not wiz.supplier:
+                elif wiz.po_cft != 'cft' and not wiz.supplier_id:
                     raise osv.except_osv(_('Error'), _('You should select a supplier !'))
 
             errors = {}
@@ -159,7 +159,7 @@
                     try:
                         line_obj.write(cr, uid, [line.id], {'type': wiz.type,
                                                             'po_cft': wiz.po_cft,
-                                                            'supplier': wiz.supplier and wiz.supplier.id or False,
+                                                            'supplier': wiz.supplier_id and wiz.supplier_id.id or False,
                                                             'location_id': wiz.location_id.id and wiz.location_id.id or False},
                                                              context=context)
                     except osv.except_osv, e:
@@ -227,7 +227,7 @@
         if l_type == 'make_to_order':
             return {'value': {'location_id': False}}
 
-        res = {'value': {'po_cft': False, 'supplier': False}}
+        res = {'value': {'po_cft': False, 'supplier_id': False}}
         if not context or not context[0] or not context[0][2]:
             return res
 
@@ -248,15 +248,15 @@
                 all_line_empty = False
 
         if all_line_empty: # by default, and if all lines has no location, then set by default Stock
-            return {'value': {'po_cft': False, 'supplier': False, 'location_id': stock_loc}}
-        return {'value': {'po_cft': False, 'supplier': False}}
+            return {'value': {'po_cft': False, 'supplier_id': False, 'location_id': stock_loc}}
+        return {'value': {'po_cft': False, 'supplier_id': False}}
 
     def change_po_cft(self, cr, uid, ids, po_cft, context=None):
         '''
         Unset the supplier if tender is choosen
         '''
         if po_cft == 'cft':
-            return {'value': {'supplier': False}}
+            return {'value': {'supplier_id': False}}
 
         return {}
 
@@ -278,16 +278,16 @@
                 }
         return result
 
-    def change_location(self, cr, uid, ids, location_id, context=None):
+    def change_location(self, cr, uid, ids, location_id, line_ids, context=None):
         res = {'value': {}}
         if not location_id:
             return res
 
-        if not context or not context[0] or not context[0][2]:
+        if not line_ids or not line_ids[0] or not line_ids[0][2]:
             return res
 
         line_obj = self.pool.get('sale.order.line')
-        active_ids = context[0][2]
+        active_ids = line_ids[0][2]
 
         context = {}
         context.update({'from_multiple_line_sourcing': False})
 
=== modified file 'sourcing/wizard/multiple_sourcing_view.xml'
--- sourcing/wizard/multiple_sourcing_view.xml	2014-10-09 13:19:51 +0000
+++ sourcing/wizard/multiple_sourcing_view.xml	2015-03-12 10:44:53 +0000
@@ -15,35 +15,24 @@
                     </group>
                     <group colspan="4" col="4">
                         <separator colspan="4" string="Selected lines to source" />
-                        <field name="line_ids" nolabel="1" colspan="4">
-                            <tree string="Lines to source" hide_new_button="True" noteditable="True">
-                                <field name="order_id" string="Order reference" />
-                                <field name="line_number" />
-                                <field name="product_id" />
-                                <field name="product_uom_qty" />
-                                <field name="product_uom" />
-                                <field name="real_stock" />
-                                <field name="available_stock" />
-                                <field name="virtual_stock" />
-                            </tree>
-                        </field>
+                        <field name="line_ids" nolabel="1" colspan="4" />
                         <separator colspan="4" string="Procurement method" />
                         <field name="type" 
-                               on_change="change_type(type, line_ids)"/>
+                               on_change="change_type(type)"/>
                         <field name="po_cft" attrs="{'readonly': [('type', '=', 'make_to_stock')]}"
                                on_change="change_po_cft(po_cft)"/>
                         <separator colspan="4" string="Supplier selection" />
-                        <field name="supplier"
+                        <field name="supplier_id"
                                domain="[('id', '!=', company_id), ('available_for_dpo', '=', po_cft), ('line_contains_fo', '=', line_ids)]"
                                attrs="{'readonly': ['|', ('po_cft', '=', 'cft'), ('type', '=', 'make_to_stock')]}"
-                               on_change="change_supplier(supplier)"
+                               on_change="change_supplier(supplier_id)"
                         />
 
 
                    <field name="location_id"  domain="[('usage', '=', 'internal'), ('quarantine_location', '=', False), 
                                                       ('scrap_location', '=', False), ('destruction_location', '=', False), 
                                                       ('output_ok', '=', False), ('input_ok', '=', False)]" 
-                              attrs="{'readonly': [('type', '!=', 'make_to_stock')]}" 
+                                                      attrs="{'readonly': [('type', '!=', 'make_to_stock')]}" 
                               on_change="change_location(location_id, line_ids)" />
 
                     </group>
@@ -59,8 +48,8 @@
         <record id="sourcing_line_special_tree_view" model="ir.ui.view">
             <field name="name">sourcing.line.special.tree.view</field>
             <field name="model">sale.order.line</field>
-            <field name="type">form</field>
-            <field name="priority" eval="5000" />
+            <field name="type">tree</field>
+            <field name="priority" eval="10" />
             <field name="arch" type="xml">
                 <tree string="Lines to source" hide_new_button="True" noteditable="True">
                     <field name="order_id" string="Order reference" />
 
=== modified file 'stock_override/report/internal_move.rml'
--- stock_override/report/internal_move.rml	2014-04-08 12:14:42 +0000
+++ stock_override/report/internal_move.rml	2015-03-12 10:44:53 +0000
@@ -9,7 +9,7 @@
             </pageGraphics>
         </pageTemplate>-->
 
-        <pageTemplate>
+        <pageTemplate id="first">
             <frame id="first" x1="28.0" y1="28.0" width="786" height="525"/>
             <pageGraphics>
                 <image x="28.0" y="510" height="35.0" >[[ company.logo or removeParentNode('image') ]]</image>
@@ -23,6 +23,19 @@
                 <lines>25 550 818 550</lines>
             </pageGraphics>
         </pageTemplate>
+        <pageTemplate id="second">
+            <frame id="second" x1="28.0" y1="28.0" width="786" height="525"/>
+            <pageGraphics>
+                <fill color="black"/>
+                <stroke color="black"/>
+                <setFont name="DejaVu Sans" size="8"/>
+                <drawString x="25" y="555"> [[ formatLang(time.strftime("%Y-%m-%d"), date=True) ]]  [[ time.strftime("%H:%M") ]]</drawString>
+                <setFont name="DejaVu Sans Bold" size="10"/>
+                <drawString x="382" y="555">[[ company.partner_id.name ]]</drawString>
+                <stroke color="#000000"/>
+                <lines>25 550 818 550</lines>
+            </pageGraphics>
+        </pageTemplate>
 
     </template>
 
@@ -36,6 +49,7 @@
         <blockTableStyle id="HeaderInfo">
             <blockValign value="MIDDLE" />
             <lineStyle kind="GRID" colorName="#f2f2f2" />
+            <blockSpan start="1,-1" stop="-1,-1" />
         </blockTableStyle>
 
         <blockTableStyle id="LineHeader">
@@ -88,7 +102,7 @@
         </para>
 
         <!-- Header Information -->
-        <blockTable colWidths="120.0,120.0,120.0,120.0,120.0,120.0" style="HeaderInfo">
+        <blockTable colWidths="100.0,100.0,100.0,200.0,120.0,100.0" style="HeaderInfo">
             <tr>
                 <td>
                     <para style="HeaderRight">Reference :</para>
@@ -97,10 +111,10 @@
                     <para style="Header">[[ picking.name ]]</para>
                 </td>
                 <td>
-                    <para style="HeaderRight">Origin :</para>
+                    <para style="HeaderRight">Order Category :</para>
                 </td>
                 <td>
-                    <para style="Header">[[ picking.origin ]]</para>
+                    <para style="Header">[[ get_selec(picking, 'order_category') ]]</para>
                 </td>
                 <td>
                     <para style="HeaderRight">Actual Receipt Date :</para>
@@ -131,12 +145,6 @@
             </tr>
             <tr>
                 <td>
-                    <para style="HeaderRight">Order Category :</para>
-                </td>
-                <td>
-                    <para style="Header">[[ get_selec(picking, 'order_category') ]]</para>
-                </td>
-                <td>
                     <para style="HeaderRight">State :</para>
                 </td>
                 <td>
@@ -148,6 +156,20 @@
                 <td>
                     <para style="Header"> </para>
                 </td>
+                <td>
+                    <para style="HeaderRight"> </para>
+                </td>
+                <td>
+                    <para style="Header"> </para>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <para style="HeaderRight">Origin :</para>
+                </td>
+                <td>
+                    <para style="Header">[[ picking.origin ]]</para>
+                </td>
             </tr>
         </blockTable>
 
@@ -155,6 +177,7 @@
             <font color="white"> </font>
         </para>
 
+        <setNextTemplate name="second" />
 
         <section>
         <blockTable colWidths="25.0,70.0,120.0,60.0,45.0,40.0,70.0,70.0,70.0,80.0,80.0,80.0" style="LineHeader" repeatRows="1">
@@ -242,7 +265,7 @@
         <para style="Header">
             <font color="white"> </font>
         </para>
-        
+
         <blockTable colWidths="44.0,169.0,169.0,169.0,169.0" style="FooterInfo" keepWithNext="1">
             <tr>
                 <td>
 
=== modified file 'unifield_tests/master_data/070_products.yml'
--- unifield_tests/master_data/070_products.yml	2014-10-09 06:56:59 +0000
+++ unifield_tests/master_data/070_products.yml	2015-03-12 10:44:53 +0000
@@ -4,7 +4,7 @@
   Create Product PL1
 -
   !record {model: product.product, id: prod_log_1}:
-    code: PL1 (Test)
+    default_code: PL1 (Test)
     name: PL1 (Test)
     supply_method: buy
     type: product
@@ -18,7 +18,7 @@
   Create Product PL2
 -
   !record {model: product.product, id: prod_log_2}:
-    code: PL2 (Test)
+    default_code: PL2 (Test)
     name: PL2 (Test)
     supply_method: buy
     type: product
@@ -32,7 +32,7 @@
   Create Product PL3
 -
   !record {model: product.product, id: prod_log_3}:
-    code: PL3 (Test)
+    default_code: PL3 (Test)
     name: PL3 (Test)
     supply_method: buy
     type: product
@@ -46,7 +46,7 @@
   Create Product PL4
 -
   !record {model: product.product, id: prod_log_4}:
-    code: PL4 (Test)
+    default_code: PL4 (Test)
     name: PL4 (Test)
     supply_method: buy
     type: product
@@ -60,7 +60,7 @@
   Create Product PL5
 -
   !record {model: product.product, id: prod_log_5}:
-    code: PL5 (Test)
+    default_code: PL5 (Test)
     name: PL5 (Test)
     supply_method: buy
     type: product
@@ -76,7 +76,7 @@
   Create Product PM1
 -
   !record {model: product.product, id: prod_med_1}:
-    code: PM1 (Test)
+    default_code: PM1 (Test)
     name: PM1 (Test)
     supply_method: buy
     type: product
@@ -90,7 +90,7 @@
   Create Product PM
 -
   !record {model: product.product, id: prod_med_2}:
-    code: PM2 (Test)
+    default_code: PM2 (Test)
     name: PM2 (Test)
     supply_method: buy
     type: product
@@ -104,7 +104,7 @@
   Create Product PM3
 -
   !record {model: product.product, id: prod_med_3}:
-    code: PM3 (Test)
+    default_code: PM3 (Test)
     name: PM3 (Test)
     supply_method: buy
     type: product
@@ -118,7 +118,7 @@
   Create Product PM4
 -
   !record {model: product.product, id: prod_med_4}:
-    code: PM4 (Test)
+    default_code: PM4 (Test)
     name: PM4 (Test)
     supply_method: buy
     type: product
@@ -132,7 +132,7 @@
   Create Product PM5
 -
   !record {model: product.product, id: prod_med_5}:
-    code: PM5 (Test)
+    default_code: PM5 (Test)
     name: PM5 (Test)
     supply_method: buy
     type: product
 
=== added file 'unifield_tests/tests/test_fo.py'
--- unifield_tests/tests/test_fo.py	1970-01-01 00:00:00 +0000
+++ unifield_tests/tests/test_fo.py	2015-03-12 10:44:53 +0000
@@ -0,0 +1,76 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+from __future__ import print_function
+from unifield_test import UnifieldTest
+from oerplib.error import RPCError
+
+import time
+
+
+class FOTest(UnifieldTest):
+
+    def setUp(self):
+        self.used_db = self.c1
+        db = self.used_db
+        self.fo_obj = db.get('sale.order')
+        self.fol_obj = db.get('sale.order.line')
+
+    def test_validation_no_price_unit(self):
+        """
+        Create a FO with two lines. One of these lines have no price unit.
+        Expected result: An error must be raised
+        """
+        partner_id = self.get_record(self.used_db, 'ext_customer_1')
+        order_type = 'regular'
+
+        # Get the analytic distribution
+        distrib_id = self.get_record(self.used_db, 'distrib_1')
+
+        order_values = self.fo_obj.\
+            onchange_partner_id(None, partner_id, order_type).get('value', {})
+        order_values.update({
+            'order_type': order_type,
+            'procurement_request': False,
+            'partner_id': partner_id,
+            'ready_to_ship_date': time.strftime('%Y-%m-%d'),
+            'analytic_distribution_id': distrib_id,
+        })
+        order_id = self.fo_obj.create(order_values)
+
+        # Create order lines
+        prod_log1_id = self.get_record(self.used_db, 'prod_log_1')
+        prod_log2_id = self.get_record(self.used_db, 'prod_log_2')
+        uom_pce_id = self.get_record(
+            self.used_db,
+            'product_uom_unit',
+            module='product'
+        )
+
+        line_values = {
+            'order_id': order_id,
+            'product_id': prod_log1_id,
+            'product_uom': uom_pce_id,
+            'product_uom_qty': 10.0,
+            'type': 'make_to_order',
+            'price_unit': 10.0,
+        }
+        self.fol_obj.create(line_values)
+
+        line_values.update({
+            'product_id': prod_log2_id,
+            'price_unit': 0.0,
+        })
+        self.fol_obj.create(line_values)
+
+        try:
+            self.c1.exec_workflow('sale.order', 'order_validated', order_id)
+            self.assert_(
+                False,
+                'No error message at FO validation with line with no price.',
+            )
+        except RPCError as e:
+            return True
+
+
+def get_test_class():
+    return FOTest
 
=== modified file 'unifield_tests/tests/test_uftp_324.py'
--- unifield_tests/tests/test_uftp_324.py	2014-10-17 14:14:49 +0000
+++ unifield_tests/tests/test_uftp_324.py	2015-03-12 10:44:53 +0000
@@ -112,6 +112,17 @@
         # Validate the sale order
         self.c1.exec_workflow('sale.order', 'order_validated', self.c_so_id)
 
+    def test_utp_324(self):
+        """
+        Cancel the PO at coordo side, synchronize and check the state of the PO at
+        project side.
+        :return:
+        """
+        wiz_model = 'purchase.order.cancel.wizard'
+        c_wiz_obj = self.c1.get(wiz_model)
+        c_lc_wiz_obj = self.c1.get('sale.order.leave.close')
+        c_cancel_so_wiz_obj = self.c1.get('sale.order.cancelation.wizard')
+        
         # Source all lines on a Purchase Order to ext_supplier_1
         line_ids = self.c_sol_obj.search([('order_id', '=', self.c_so_id)])
         self.c_sol_obj.write(line_ids, {
@@ -147,17 +158,6 @@
 
             self.c_po_id = po_line['order_id'][0]
 
-    def test_utp_324(self):
-        """
-        Cancel the PO at coordo side, synchronize and check the state of the PO at
-        project side.
-        :return:
-        """
-        wiz_model = 'purchase.order.cancel.wizard'
-        c_wiz_obj = self.c1.get(wiz_model)
-        c_lc_wiz_obj = self.c1.get('sale.order.leave.close')
-        c_cancel_so_wiz_obj = self.c1.get('sale.order.cancelation.wizard')
-
         # Cancel PO at coordo side
         c_res = self.c_po_obj.purchase_cancel(self.c_po_id)
         # Validate cancellation
@@ -192,4 +192,4 @@
         )
 
 def get_test_class():
-    return UFTP324Test
 \ No newline at end of file
+    return UFTP324Test