Fall 4608: Change Requests - Workshop vom 09.01.2018, US02 umgesetzt.
							parent
							
								
									d90bee85e6
								
							
						
					
					
						commit
						979e07bf70
					
				|  | @ -107,6 +107,9 @@ | ||||||
|                                     </span> |                                     </span> | ||||||
|                                     <br/> |                                     <br/> | ||||||
|                                     <span t-field="order_line.name"/> |                                     <span t-field="order_line.name"/> | ||||||
|  |                                     <t t-if="order_line.delivery_date"> | ||||||
|  |                                         <br/><strong>Lieferdatum: </strong><span t-field="order_line.delivery_date"/> | ||||||
|  |                                     </t> | ||||||
|                                 </td> |                                 </td> | ||||||
| 
 | 
 | ||||||
|                                 <td rowspan="2" class="text-right" t-if="discount_is_set"> |                                 <td rowspan="2" class="text-right" t-if="discount_is_set"> | ||||||
|  |  | ||||||
|  | @ -0,0 +1,27 @@ | ||||||
|  | Odoo Proprietary License v1.0 | ||||||
|  | 
 | ||||||
|  | This software and associated files (the "Software") may only be used (executed, | ||||||
|  | modified, executed after modifications) if you have purchased a valid license | ||||||
|  | from the authors, typically via Odoo Apps, or if you have received a written | ||||||
|  | agreement from the authors of the Software (see the COPYRIGHT file). | ||||||
|  | 
 | ||||||
|  | You may develop Odoo modules that use the Software as a library (typically by | ||||||
|  | depending on it, importing it and using its resources), but without copying any | ||||||
|  | source code or material from the Software. You may distribute those modules | ||||||
|  | under the license of your choice, provided that this license is compatible with | ||||||
|  | the terms of the Odoo Proprietary License (For example: LGPL, MIT, | ||||||
|  | or proprietary licenses similar to this one). | ||||||
|  | 
 | ||||||
|  | It is forbidden to publish, distribute, sublicense, or sell copies of the Software | ||||||
|  | or modified copies of the Software. | ||||||
|  | 
 | ||||||
|  | The above copyright notice and this permission notice must be included | ||||||
|  | in all copies or substantial portions of the Software. | ||||||
|  | 
 | ||||||
|  | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||||||
|  | IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||||||
|  | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. | ||||||
|  | IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, | ||||||
|  | DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, | ||||||
|  | ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | ||||||
|  | DEALINGS IN THE SOFTWARE. | ||||||
|  | @ -0,0 +1 @@ | ||||||
|  | from . import models | ||||||
|  | @ -0,0 +1,22 @@ | ||||||
|  | # Copyright 2018-Today datenpol gmbh(<http://www.datenpol.at>) | ||||||
|  | # License OPL-1 or later (https://www.odoo.com/documentation/user/11.0/legal/licenses/licenses.html#licenses). | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | # noinspection PyStatementEffect | ||||||
|  | { | ||||||
|  |     'name': 'Dp Sale Delivery Date', | ||||||
|  |     'summary' : 'Shows the delivery date in the sale order', | ||||||
|  |     'version': '11.0.1.0.0', | ||||||
|  |     'license': 'OPL-1', | ||||||
|  |     'author': 'datenpol gmbh', | ||||||
|  |     'support': 'office@datenpol.at', | ||||||
|  |     'website': 'https://www.datenpol.at', | ||||||
|  |     'depends': [ | ||||||
|  |         'sale_stock', | ||||||
|  |     ], | ||||||
|  |     'data': [ | ||||||
|  |         'views/sale_order_line.xml', | ||||||
|  |     ], | ||||||
|  |     'installable': True, | ||||||
|  |     'auto_install': False, | ||||||
|  | } | ||||||
|  | @ -0,0 +1 @@ | ||||||
|  | from . import sale_order_line | ||||||
|  | @ -0,0 +1,20 @@ | ||||||
|  | # Copyright 2018-Today datenpol gmbh (<http://www.datenpol.at>) | ||||||
|  | # License OPL-1 or later (https://www.odoo.com/documentation/user/11.0/legal/licenses/licenses.html#licenses). | ||||||
|  | 
 | ||||||
|  | from odoo import api, fields, models, _ | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | class SaleOrderLine(models.Model): | ||||||
|  |     _inherit = 'sale.order.line' | ||||||
|  | 
 | ||||||
|  |     delivery_date = fields.Date('Lieferdatum', compute='_compute_delivery_date') | ||||||
|  | 
 | ||||||
|  |     @api.multi | ||||||
|  |     def _compute_delivery_date(self): | ||||||
|  |         for line in self: | ||||||
|  |             stock_move = self.env['stock.move'] | ||||||
|  |             move = stock_move.search([('sale_line_id', '=', line.id), ('state', 'not in', ['cancel'])]) | ||||||
|  |             if move: | ||||||
|  |                 line.delivery_date = move[0].date | ||||||
|  |             else: | ||||||
|  |                 line.delivery_date = False | ||||||
										
											Binary file not shown.
										
									
								
							| After Width: | Height: | Size: 2.2 KiB | 
										
											Binary file not shown.
										
									
								
							| After Width: | Height: | Size: 26 KiB | 
|  | @ -0,0 +1,18 @@ | ||||||
|  | <?xml version="1.0" encoding="utf-8"?> | ||||||
|  | <!-- Copyright 2018-Today datenpol gmbh(<http://www.datenpol.at>) | ||||||
|  |      License OPL-1 or later (https://www.odoo.com/documentation/user/11.0/legal/licenses/licenses.html#licenses). --> | ||||||
|  | 
 | ||||||
|  | <odoo> | ||||||
|  | 
 | ||||||
|  |     <record id="view_sale_order_form" model="ir.ui.view"> | ||||||
|  |         <field name="name">view_sale_order_form</field> | ||||||
|  |         <field name="model">sale.order</field> | ||||||
|  |         <field name="inherit_id" ref="sale.view_order_form"/> | ||||||
|  |         <field name="arch" type="xml"> | ||||||
|  |             <xpath expr="//field[@name='order_line']/tree//field[@name='discount']" position="after"> | ||||||
|  |                 <field name="delivery_date"/> | ||||||
|  |             </xpath> | ||||||
|  |         </field> | ||||||
|  |     </record> | ||||||
|  | 
 | ||||||
|  | </odoo> | ||||||
		Loading…
	
		Reference in New Issue