Merge lp:~sandi-dirntis/openerpsl/openerpsl_20140219_2 into lp:openerpsl/7.0

[Aleksander Dirntiš]

[FIX] Fixed landing cost setting on product
[MOD] Disabled period check between stock move and supplier invoice
[ADD] Added Sale Price functionality on product

[lp:~sandi-dirntis/openerpsl/openerpsl_20140219_2]

331. By Aleksander Dirntiš on 2014-02-19

[FIX] Fixed landing cost setting on product
[MOD] Disabled period check between stock move and supplier invoice
[ADD] Added Sale Price functionality on product

=== modified file 'account_tax_period/account_move_line.py'
--- account_tax_period/account_move_line.py	2013-06-06 11:06:58 +0000
+++ account_tax_period/account_move_line.py	2014-02-19 16:12:03 +0000
@@ -31,12 +31,30 @@
                 result.append(line.id)
         return result
 
+    def _get_tax_period(self, cr, uid, context=None):
+        """
+        Return  default account period value
+        """
+        context = context or {}
+        if context.get('tax_period_id', False):
+            return context['tax_period_id']
+        account_period_obj = self.pool.get('account.period')
+        ctx = dict(context, account_period_prefer_normal=True)
+        ids = account_period_obj.find(cr, uid, context=ctx)
+        tax_period_id = False
+        if ids:
+            tax_period_id = ids[0]
+        return tax_period_id
+    
     _columns = {
-        'tax_period_id': fields.related('move_id', 'tax_period_id', string='Tax Period', type='many2one', relation='account.period', select=True,
+        'tax_period_id': fields.related('move_id', 'tax_period_id', string='Tax Period', type='many2one', relation='account.period', required=True, select=True,
                                         store = {
                                             'account.move': (_get_move_lines, ['tax_period_id'], 20)
                                         }),
         
     }
+    _defaults = {
+        'tax_period_id': _get_tax_period
+    }
     
 account_move_line()
\ No newline at end of file

=== modified file 'purchase_landing_costs/product_template.py'
--- purchase_landing_costs/product_template.py	2013-01-24 13:09:31 +0000
+++ purchase_landing_costs/product_template.py	2014-02-19 16:12:03 +0000
@@ -30,8 +30,8 @@
 class product_template(osv.osv):
     _inherit = "product.template"
     _columns = {
-        'landing_cost'           : fields.boolean('Landing Cost',  help="Used if this product is landing cost"),
-        'landing_cost_calculate' : fields.boolean('Calculate Landing Costs', help="Check this if you want to use landing cost calculation for average price for this product"), 
+        'landing_cost'          : fields.boolean('Landing Cost',  help="Used if this product is landing cost"),
+        'landing_cost_calculate': fields.boolean('Calculate Landing Costs', help="Check this if you want to use landing cost calculation for average price for this product"), 
     }
     _defaults = {
         'landing_cost': False,

=== modified file 'purchase_landing_costs/product_template_view.xml'
--- purchase_landing_costs/product_template_view.xml	2012-12-11 11:23:50 +0000
+++ purchase_landing_costs/product_template_view.xml	2014-02-19 16:12:03 +0000
@@ -8,8 +8,8 @@
             <field name="arch" type="xml">
                 <field name="price_extra" position="after">
                     <group name="landing_costs" string="Landing Costs">
-                        <field name="landing_cost" attrs="{'readonly':[('landing_cost_calculate','=',True)]}"/>
-                        <field name="landing_cost_calculate" attrs="{'readonly':[('landing_cost','=',True)]}"/>
+                        <field name="landing_cost"/>
+                        <field name="landing_cost_calculate"/>
                     </group>
                 </field>
             </field>

=== modified file 'purchase_recalculation/account_invoice.py'
--- purchase_recalculation/account_invoice.py	2014-01-19 16:54:08 +0000
+++ purchase_recalculation/account_invoice.py	2014-02-19 16:12:03 +0000
@@ -49,11 +49,8 @@
                         if len(_stock_move_ids) > 0:
                             _stock_moves = self.pool.get('stock.move').browse(cr, uid, _stock_move_ids, context)
                             for _stock_move in _stock_moves:
-                                if not _stock_move._move_check_period(context, _invoice.company_id.id, _invoice.period_id.id):
-                                    raise osv.except_osv(_('Error!'), _('Invoiced stock moves are not in same period as invoice.'))
                                 _quantity = _quantity + _stock_move.product_qty
                                 _uom_id = _stock_move.product_uom.id
-                                    
                             
                             if _line.uos_id.id == _uom_id:
                                 if _quantity != _line.quantity:

=== modified file 'purchase_recalculation/stock_move.py'
--- purchase_recalculation/stock_move.py	2013-11-18 10:17:54 +0000
+++ purchase_recalculation/stock_move.py	2014-02-19 16:12:03 +0000
@@ -86,19 +86,19 @@
                                               'credit': _move.product_qty * _move.price_unit})
         return True
 
-    def _move_check_period(self, cr, uid, ids, context, company_id, period_id):
-        if context is None:
-            context = {}
-        period_obj = self.pool.get('account.period')
-        ctx = context.copy()
-        ctx.update({'company_id': company_id, 'account_period_prefer_normal': True})
-        _match = True
-        _moves = self.pool.get('stock.move').browse(cr, uid, ids, context)
-        for _move in _moves:
-            _move_period_id = period_obj.find(cr, uid, _move.date, context=ctx)[0] 
-            if _move_period_id != period_id:
-                _match = False
-        return _match        
+#     def _move_check_period(self, cr, uid, ids, context, company_id, period_id):
+#         if context is None:
+#             context = {}
+#         period_obj = self.pool.get('account.period')
+#         ctx = context.copy()
+#         ctx.update({'company_id': company_id, 'account_period_prefer_normal': True})
+#         _match = True
+#         _moves = self.pool.get('stock.move').browse(cr, uid, ids, context)
+#         for _move in _moves:
+#             _move_period_id = period_obj.find(cr, uid, _move.date, context=ctx)[0] 
+#             if _move_period_id != period_id:
+#                 _match = False
+#         return _match
 
     def write(self, cr, uid, ids, vals, context=None):
         if isinstance(ids, (int, long)):

=== modified file 'sale_order_extensions/__init__.py'
--- sale_order_extensions/__init__.py	2014-01-12 20:54:03 +0000
+++ sale_order_extensions/__init__.py	2014-02-19 16:12:03 +0000
@@ -23,4 +23,5 @@
 import sale_shop
 import sale_order
 import sale_order_line
-import product_product
\ No newline at end of file
+import product_product
+import res_partner
\ No newline at end of file

=== modified file 'sale_order_extensions/__openerp__.py'
--- sale_order_extensions/__openerp__.py	2014-01-12 20:54:03 +0000
+++ sale_order_extensions/__openerp__.py	2014-02-19 16:12:03 +0000
@@ -22,7 +22,7 @@
 
 {
     'name': 'Sale Order Extensions',
-    'version': '1.4',
+    'version': '1.5',
     'category': 'Sale',
     'description': """
     This module adds following extensions to Sale Order: \n
@@ -35,10 +35,13 @@
     - adds field shop_production on shop for filtering shops \n
     - adds quotations view for quotations from production shop with less fields \n
     - adds quantity returned on sale order line for automatic product returns \n
+    - adds sale price functionality on partners and products \n
     """,
     'author': 'Mentis d.o.o.',
     'depends': ['sale_stock'],
     'data': [
+        'product_product_view.xml',
+        'res_partner_view.xml',
         'sale_shop_view.xml',
         'sale_order_view.xml',
         'sale_order_workflow.xml'

=== modified file 'sale_order_extensions/i18n/en_US.po'
--- sale_order_extensions/i18n/en_US.po	2014-01-26 20:34:35 +0000
+++ sale_order_extensions/i18n/en_US.po	2014-02-19 16:12:03 +0000
@@ -153,3 +153,19 @@
 #: model:ir.model,name:sale_order_extensions.model_sale_order_line
 msgid "Sales Order Line"
 msgstr ""
+
+#. module: sale_order_extensions
+#: view:product.product:0
+#: field:res.partner,sale_prices:0
+msgid "Sale Prices"
+msgstr ""
+
+#. module: sale_order_extensions
+#: field:product.product,sale_price:0
+msgid "Sale Price"
+msgstr ""
+
+#. module: sale_order_extensions
+#: field:product.product,sale_enabled:0
+msgid "Sale Enabled"
+msgstr ""

=== modified file 'sale_order_extensions/i18n/sale_order_extensions.pot'
--- sale_order_extensions/i18n/sale_order_extensions.pot	2014-01-26 20:34:35 +0000
+++ sale_order_extensions/i18n/sale_order_extensions.pot	2014-02-19 16:12:03 +0000
@@ -153,3 +153,19 @@
 #: model:ir.model,name:sale_order_extensions.model_sale_order_line
 msgid "Sales Order Line"
 msgstr ""
+
+#. module: sale_order_extensions
+#: view:product.product:0
+#: field:res.partner,sale_prices:0
+msgid "Sale Prices"
+msgstr ""
+
+#. module: sale_order_extensions
+#: field:product.product,sale_price:0
+msgid "Sale Price"
+msgstr ""
+
+#. module: sale_order_extensions
+#: field:product.product,sale_enabled:0
+msgid "Sale Enabled"
+msgstr ""

=== removed file 'sale_order_extensions/i18n/sl.po'
--- sale_order_extensions/i18n/sl.po	2014-01-26 20:34:35 +0000
+++ sale_order_extensions/i18n/sl.po	1970-01-01 00:00:00 +0000
@@ -1,161 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* sale_order_extensions
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 7.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-21 16:41+0000\n"
-"PO-Revision-Date: 2014-01-21 16:41+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: sale_order_extensions
-#: field:sale.shop,shop_production:0
-msgid "Production Shop"
-msgstr "Prodaja iz proizvodnje"
-
-#. module: sale_order_extensions
-#: code:addons/sale_order_extensions/sale_order.py:141
-#, python-format
-msgid "Type \"service\" not set on next return products:"
-msgstr "Izdelki za vračilo, ki niso vrste \"storitev\":"
-
-#. module: sale_order_extensions
-#: model:ir.model,name:sale_order_extensions.model_product_product
-msgid "Product"
-msgstr "Izdelek"
-
-#. module: sale_order_extensions
-#: model:ir.model,name:sale_order_extensions.model_sale_order
-msgid "Sales Order"
-msgstr "Prodajni nalog"
-
-#. module: sale_order_extensions
-#: view:sale.order:0
-msgid "Confirm Sale"
-msgstr "Potrdi prodajo"
-
-#. module: sale_order_extensions
-#: view:sale.order:0
-msgid "Prepare"
-msgstr "Pripravi"
-
-#. module: sale_order_extensions
-#: selection:sale.order,state:0
-msgid "Prepared for Confirm"
-msgstr "Pripravljeno"
-
-#. module: sale_order_extensions
-#: code:addons/sale_order_extensions/sale_order.py:133
-#, python-format
-msgid "Tax not set for next products:"
-msgstr "Davek ni določen za izdelke:"
-
-#. module: sale_order_extensions
-#: model:ir.actions.act_window,name:sale_order_extensions.action_surplus_quotations
-#: model:ir.ui.menu,name:sale_order_extensions.menu_sale_surplus_quotations
-msgid "Quotations - Surplus"
-msgstr "Ponudbe - Viški"
-
-#. module: sale_order_extensions
-#: model:ir.actions.act_window,name:sale_order_extensions.action_production_quotations
-#: model:ir.ui.menu,name:sale_order_extensions.menu_sale_production_quotations
-msgid "Quotations - Production"
-msgstr "Ponudbe - Proizvodnja"
-
-#. module: sale_order_extensions
-#: model:ir.actions.act_window,name:sale_order_extensions.action_surplus_orders
-#: model:ir.ui.menu,name:sale_order_extensions.menu_sale_surplus_orders
-msgid "Sales Orders - Surplus"
-msgstr "Prodajni nalogi - Viški"
-
-#. module: sale_order_extensions
-#: model:ir.actions.act_window,name:sale_order_extensions.action_production_orders
-#: model:ir.ui.menu,name:sale_order_extensions.menu_sale_production_orders
-msgid "Sales Orders - Production"
-msgstr "Prodajni nalogi - Proizvodnja"
-
-#. module: sale_order_extensions
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr "Nepotrjeni prodajni nalogi"
-
-#. module: sale_order_extensions
-#: view:sale.order:0
-msgid "Prepared"
-msgstr "Pripravljeno"
-
-#. module: sale_order_extensions
-#: code:addons/sale_order_extensions/sale_order.py:120
-#: code:addons/sale_order_extensions/sale_order.py:128
-#: code:addons/sale_order_extensions/sale_order.py:136
-#: code:addons/sale_order_extensions/sale_order.py:144
-#, python-format
-msgid "Error!"
-msgstr "Napaka!"
-
-#. module: sale_order_extensions
-#: model:ir.actions.act_window,help:sale_order_extensions.action_production_quotations
-#: model:ir.actions.act_window,help:sale_order_extensions.action_surplus_quotations
-msgid "<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a quotation, the first step of a new sale.\n"
-"              </p><p>\n"
-"                OpenERP will help you handle efficiently the complete sale flow:\n"
-"                from the quotation to the sales order, the\n"
-"                delivery, the invoicing and the payment collection.\n"
-"              </p><p>\n"
-"                The social feature helps you organize discussions on each sales\n"
-"                order, and allow your customers to keep track of the evolution\n"
-"                of the sales order.\n"
-"              </p>\n"
-"            "
-msgstr "<p class=\"oe_view_nocontent_create\">\n"
-"                Kliknite za izdelavo nove ponudbe.\n"
-"              </p><p>\n"
-"                OpenERP vam bo pomagal pri celotnem postopku prodaje:\n"
-"                od ponudbe do prodajnega naloga, dostave ter izdaje računa in plačil.\n"
-"              </p><p>\n"
-"            "
-
-#. module: sale_order_extensions
-#: model:ir.model,name:sale_order_extensions.model_sale_shop
-msgid "Sales Shop"
-msgstr "Trgovina"
-
-#. module: sale_order_extensions
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Vrni v pripravo"
-
-#. module: sale_order_extensions
-#: code:addons/sale_order_extensions/sale_order.py:117
-#, python-format
-msgid "Price not set for next products:"
-msgstr "Cena ni določena za izdelke:"
-
-#. module: sale_order_extensions
-#: view:sale.order:0
-msgid "context.get('shop_production', False)"
-msgstr ""
-
-#. module: sale_order_extensions
-#: view:sale.order:0
-msgid "Quotations"
-msgstr "Ponudbe"
-
-#. module: sale_order_extensions
-#: code:addons/sale_order_extensions/sale_order.py:125
-#, python-format
-msgid "Quantity not set for next products:"
-msgstr "Količina ni določena za izdelke:"
-
-#. module: sale_order_extensions
-#: model:ir.model,name:sale_order_extensions.model_sale_order_line
-msgid "Sales Order Line"
-msgstr "Postavka prodajnega naloga"

=== added file 'sale_order_extensions/i18n/sl_SI.po'
--- sale_order_extensions/i18n/sl_SI.po	1970-01-01 00:00:00 +0000
+++ sale_order_extensions/i18n/sl_SI.po	2014-02-19 16:12:03 +0000
@@ -0,0 +1,177 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* sale_order_extensions
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-01-21 16:41+0000\n"
+"PO-Revision-Date: 2014-01-21 16:41+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: sale_order_extensions
+#: field:sale.shop,shop_production:0
+msgid "Production Shop"
+msgstr "Prodaja iz proizvodnje"
+
+#. module: sale_order_extensions
+#: code:addons/sale_order_extensions/sale_order.py:141
+#, python-format
+msgid "Type \"service\" not set on next return products:"
+msgstr "Izdelki za vračilo, ki niso vrste \"storitev\":"
+
+#. module: sale_order_extensions
+#: model:ir.model,name:sale_order_extensions.model_product_product
+msgid "Product"
+msgstr "Izdelek"
+
+#. module: sale_order_extensions
+#: model:ir.model,name:sale_order_extensions.model_sale_order
+msgid "Sales Order"
+msgstr "Prodajni nalog"
+
+#. module: sale_order_extensions
+#: view:sale.order:0
+msgid "Confirm Sale"
+msgstr "Potrdi prodajo"
+
+#. module: sale_order_extensions
+#: view:sale.order:0
+msgid "Prepare"
+msgstr "Pripravi"
+
+#. module: sale_order_extensions
+#: selection:sale.order,state:0
+msgid "Prepared for Confirm"
+msgstr "Pripravljeno"
+
+#. module: sale_order_extensions
+#: code:addons/sale_order_extensions/sale_order.py:133
+#, python-format
+msgid "Tax not set for next products:"
+msgstr "Davek ni določen za izdelke:"
+
+#. module: sale_order_extensions
+#: model:ir.actions.act_window,name:sale_order_extensions.action_surplus_quotations
+#: model:ir.ui.menu,name:sale_order_extensions.menu_sale_surplus_quotations
+msgid "Quotations - Surplus"
+msgstr "Ponudbe - Viški"
+
+#. module: sale_order_extensions
+#: model:ir.actions.act_window,name:sale_order_extensions.action_production_quotations
+#: model:ir.ui.menu,name:sale_order_extensions.menu_sale_production_quotations
+msgid "Quotations - Production"
+msgstr "Ponudbe - Proizvodnja"
+
+#. module: sale_order_extensions
+#: model:ir.actions.act_window,name:sale_order_extensions.action_surplus_orders
+#: model:ir.ui.menu,name:sale_order_extensions.menu_sale_surplus_orders
+msgid "Sales Orders - Surplus"
+msgstr "Prodajni nalogi - Viški"
+
+#. module: sale_order_extensions
+#: model:ir.actions.act_window,name:sale_order_extensions.action_production_orders
+#: model:ir.ui.menu,name:sale_order_extensions.menu_sale_production_orders
+msgid "Sales Orders - Production"
+msgstr "Prodajni nalogi - Proizvodnja"
+
+#. module: sale_order_extensions
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr "Nepotrjeni prodajni nalogi"
+
+#. module: sale_order_extensions
+#: view:sale.order:0
+msgid "Prepared"
+msgstr "Pripravljeno"
+
+#. module: sale_order_extensions
+#: code:addons/sale_order_extensions/sale_order.py:120
+#: code:addons/sale_order_extensions/sale_order.py:128
+#: code:addons/sale_order_extensions/sale_order.py:136
+#: code:addons/sale_order_extensions/sale_order.py:144
+#, python-format
+msgid "Error!"
+msgstr "Napaka!"
+
+#. module: sale_order_extensions
+#: model:ir.actions.act_window,help:sale_order_extensions.action_production_quotations
+#: model:ir.actions.act_window,help:sale_order_extensions.action_surplus_quotations
+msgid "<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale flow:\n"
+"                from the quotation to the sales order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each sales\n"
+"                order, and allow your customers to keep track of the evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr "<p class=\"oe_view_nocontent_create\">\n"
+"                Kliknite za izdelavo nove ponudbe.\n"
+"              </p><p>\n"
+"                OpenERP vam bo pomagal pri celotnem postopku prodaje:\n"
+"                od ponudbe do prodajnega naloga, dostave ter izdaje računa in plačil.\n"
+"              </p><p>\n"
+"            "
+
+#. module: sale_order_extensions
+#: model:ir.model,name:sale_order_extensions.model_sale_shop
+msgid "Sales Shop"
+msgstr "Trgovina"
+
+#. module: sale_order_extensions
+#: view:sale.order:0
+msgid "Set to Draft"
+msgstr "Vrni v pripravo"
+
+#. module: sale_order_extensions
+#: code:addons/sale_order_extensions/sale_order.py:117
+#, python-format
+msgid "Price not set for next products:"
+msgstr "Cena ni določena za izdelke:"
+
+#. module: sale_order_extensions
+#: view:sale.order:0
+msgid "context.get('shop_production', False)"
+msgstr ""
+
+#. module: sale_order_extensions
+#: view:sale.order:0
+msgid "Quotations"
+msgstr "Ponudbe"
+
+#. module: sale_order_extensions
+#: code:addons/sale_order_extensions/sale_order.py:125
+#, python-format
+msgid "Quantity not set for next products:"
+msgstr "Količina ni določena za izdelke:"
+
+#. module: sale_order_extensions
+#: model:ir.model,name:sale_order_extensions.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Postavka prodajnega naloga"
+
+#. module: sale_order_extensions
+#: view:product.product:0
+#: field:res.partner,sale_prices:0
+msgid "Sale Prices"
+msgstr "Uporaba akcijskih cen"
+
+#. module: sale_order_extensions
+#: field:product.product,sale_price:0
+msgid "Sale Price"
+msgstr "Akcijska cena"
+
+#. module: sale_order_extensions
+#: field:product.product,sale_enabled:0
+msgid "Sale Enabled"
+msgstr "Akcija omogočena"

=== modified file 'sale_order_extensions/product_product.py'
--- sale_order_extensions/product_product.py	2014-01-06 20:29:28 +0000
+++ sale_order_extensions/product_product.py	2014-02-19 16:12:03 +0000
@@ -24,9 +24,19 @@
 from openerp import netsvc
 from tools.translate import _
 from lxml import etree
+import decimal_precision as dp
 
 class product_product(osv.Model):
     _inherit = 'product.product'
+    
+    _columns = {
+        'sale_enabled': fields.boolean('Sale Enabled'),
+        'sale_price'  : fields.float('Sale Price', digits_compute=dp.get_precision('Product Price'), ),
+    }
+    _defaults = {
+        'sale_enabled': False,
+        'sale_price':   0.0
+    }
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         res = super(product_product, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu)

=== added file 'sale_order_extensions/product_product_view.xml'
--- sale_order_extensions/product_product_view.xml	1970-01-01 00:00:00 +0000
+++ sale_order_extensions/product_product_view.xml	2014-02-19 16:12:03 +0000
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	
+        <record id="product_sale_form_view" model="ir.ui.view">
+            <field name="name">product.sale.form</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="arch" type="xml">
+                <xpath expr="//page[@string='Sales']" position="inside">
+                	<group string="Sale Prices">
+                		<field name="sale_enabled"/>
+                		<field name="sale_price"/>
+                	</group>
+                </xpath>
+            </field>
+        </record>
+
+    </data>    
+</openerp>
\ No newline at end of file

=== added file 'sale_order_extensions/res_partner.py'
--- sale_order_extensions/res_partner.py	1970-01-01 00:00:00 +0000
+++ sale_order_extensions/res_partner.py	2014-02-19 16:12:03 +0000
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-TODAY OpenERP s.a. (<http://www.openerp.com>).
+#    Copyright (C) 2013-TODAY Mentis d.o.o. (<http://www.mentis.si/openerp>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import osv, fields
+from tools.translate import _
+
+class res_partner(osv.osv):
+    _inherit = 'res.partner'
+    
+    _columns = {
+        'sale_prices': fields.boolean('Sale Prices'),
+    }
+    _defaults = {
+        'sale_prices': True,
+    }
\ No newline at end of file

=== added file 'sale_order_extensions/res_partner_view.xml'
--- sale_order_extensions/res_partner_view.xml	1970-01-01 00:00:00 +0000
+++ sale_order_extensions/res_partner_view.xml	2014-02-19 16:12:03 +0000
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	
+        <record id="view_partner_sale_form" model="ir.ui.view">
+            <field name="name">res.partner.sale.form</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//page[@string='Sales &amp; Purchases']/group" position="inside">
+                	<group>
+                		<field name="sale_prices"/>
+                	</group>
+                </xpath>
+            </field>
+        </record>
+
+    </data>    
+</openerp>
\ No newline at end of file

=== modified file 'sale_order_extensions/sale_order.py'
--- sale_order_extensions/sale_order.py	2014-01-27 21:03:32 +0000
+++ sale_order_extensions/sale_order.py	2014-02-19 16:12:03 +0000
@@ -79,16 +79,27 @@
     }
 
     def date_order_change(self, cr, uid, ids, order_lines=False, date_order=False, pricelist=False, partner=False, fiscal_position=False, context=None):
+        if context is None:
+            context = {}
+            
         res = {}
         
         if date_order:
             self.pool.get('ir.values').set_default(cr, uid, 'sale.order', 'date_order', date_order, False, True, False)
 
+        _partner_id = False
+        if partner:
+            _partner_id = self.pool.get('res.partner').browse(cr, uid, partner, context)
+
         _dp = self.pool.get('decimal.precision').precision_get(cr, uid, 'Product Price')
-        
         if not ids:
             for _line in order_lines:
-                if pricelist:
+                _product_id = self.pool.get('product.product').browse(cr, uid, _line[2]['product_id'], context)
+                if _product_id and _product_id.sale_enabled \
+                   and _partner_id and _partner_id.sale_prices:
+                    _price = _product_id.sale_price
+                    _line[2]['price_unit'] = round(_price, _dp)
+                elif pricelist:
                     _price = self.pool.get('product.pricelist').price_get(cr, uid, [pricelist],
                                  _line[2]['product_id'], _line[2]['product_uom_qty'] or 1.0, partner, {
                                  'uom': _line[2]['product_uom'] or result.get('product_uom'),
@@ -101,7 +112,12 @@
             lines = []
             for _order in self.browse(cr, uid, ids, context):
                 for _line in _order.order_line:
-                    if pricelist:
+                    if _line.product_id.sale_enabled and _partner_id.sale_prices:
+                        _price = _line.product_id.sale_price
+                        res = {'price_unit': round(_price, _dp),
+                               'price_subtotal': False}
+                        lines.append((1, _line.id, res))
+                    elif pricelist:
                         _price = self.pool.get('product.pricelist').price_get(cr, uid, [pricelist],
                                      _line.product_id.id, _line.product_uom_qty or 1.0, partner, {
                                      'uom': _line.product_uom.id or result.get('product_uom'),
@@ -177,10 +193,21 @@
 
     def _get_line_price(self, cr, uid, partner, pricelist, date_order, product, uom, uom_quantity):
         _dp = self.pool.get('decimal.precision').precision_get(cr, uid, 'Product Price')
-        _price = self.pool.get('product.pricelist').price_get(cr, uid, [pricelist], product, uom_quantity or 1.0, partner,
-                                                              {'uom': uom or result.get('uom'),
-                                                               'date': date_order}
-                                                              )[pricelist] or 0.0
+
+        _partner_id = False
+        _product_id = False
+        if partner and product:
+            _partner_id = self.pool.get('res.partner').browse(cr, uid, partner, None)
+            _product_id = self.pool.get('product.product').browse(cr, uid, product, None)
+
+        if _product_id and _product_id.sale_enabled \
+           and _partner_id and _partner_id.sale_prices:
+            _price = _product_id.sale_price
+        else:
+            _price = self.pool.get('product.pricelist').price_get(cr, uid, [pricelist], product, uom_quantity or 1.0, partner,
+                                                                  {'uom': uom or result.get('uom'),
+                                                                   'date': date_order}
+                                                                  )[pricelist] or 0.0
         return _price
 
 sale_order()