Andreas Wabro
							
						 | 
						
							
							
							
							
								
							
								90291a1f42
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'website' into 'develop'
							
							
							
							
							
							
							
							Website
See merge request !1 
							
						 | 
						
							2018-08-20 08:59:38 +02:00 | 
						
					
				
					
						
							
							
								
									
								
								 Andreas Osim
							
						 | 
						
							
							
							
							
								
							
								006f9522b0
								
							
								
							
						 | 
						
							
							
								
								change layout of invoice, because of partially missing invoice date (too long?)
							
							
							
							
							
						 | 
						
							2018-08-16 14:54:12 +02:00 | 
						
					
				
					
						
							
							
								 
								Andreas Wabro
							
						 | 
						
							
							
							
							
								
							
								ff936cd97b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into website
							
							
							
							
							
						 | 
						
							2018-08-14 14:38:09 +02:00 | 
						
					
				
					
						
							
							
								 
								Andreas Wabro
							
						 | 
						
							
							
							
							
								
							
								a384297da3
								
							
								
							
						 | 
						
							
							
								
								Fügt erforderliches Modul zu Website SetupScript hinzu
							
							
							
							
							
						 | 
						
							2018-08-14 11:16:29 +02:00 | 
						
					
				
					
						
							
							
								
									
								
								 Andreas Osim
							
						 | 
						
							
							
							
							
								
							
								c6a663e997
								
							
								
							
						 | 
						
							
							
								
								change layout in invoice.xml
							
							
							
							
							
						 | 
						
							2018-08-09 16:31:59 +02:00 | 
						
					
				
					
						
							
							
								
									
								
								 Andreas Osim
							
						 | 
						
							
							
							
							
								
							
								f3a064e30b
								
							
								
							
						 | 
						
							
							
								
								change layout of invoice.xml
							
							
							
							
							
						 | 
						
							2018-08-09 16:18:47 +02:00 | 
						
					
				
					
						
							
							
								
									
								
								 Andreas Osim
							
						 | 
						
							
							
							
							
								
							
								b7120b8ccf
								
							
								
							
						 | 
						
							
							
								
								change layout of invoice.xml
							
							
							
							
							
						 | 
						
							2018-08-09 12:29:04 +02:00 | 
						
					
				
					
						
							
							
								
									
								
								 Andreas Osim
							
						 | 
						
							
							
							
							
								
							
								52bce20182
								
							
								
							
						 | 
						
							
							
								
								change layout of invoice.xml
							
							
							
							
							
						 | 
						
							2018-08-09 11:21:57 +02:00 | 
						
					
				
					
						
							
							
								
									
								
								 Andreas Osim
							
						 | 
						
							
							
							
							
								
							
								70c920bfd3
								
							
								
							
						 | 
						
							
							
								
								change layout of invoice.xml
							
							
							
							
							
						 | 
						
							2018-08-09 11:09:30 +02:00 | 
						
					
				
					
						
							
							
								
									
								
								 Andreas Osim
							
						 | 
						
							
							
							
							
								
							
								11edba3349
								
							
								
							
						 | 
						
							
							
								
								change layout of invoice.xml
							
							
							
							
							
						 | 
						
							2018-08-09 11:03:38 +02:00 | 
						
					
				
					
						
							
							
								
									
								
								 Andreas Osim
							
						 | 
						
							
							
							
							
								
							
								be86e59cd4
								
							
								
							
						 | 
						
							
							
								
								change layout of invoice.xml
							
							
							
							
							
						 | 
						
							2018-08-09 10:45:41 +02:00 | 
						
					
				
					
						
							
							
								
									
								
								 Andreas Osim
							
						 | 
						
							
							
							
							
								
							
								e60734dccd
								
							
								
							
						 | 
						
							
							
								
								change layout ov invoice.xml
							
							
							
							
							
						 | 
						
							2018-08-09 10:39:46 +02:00 | 
						
					
				
					
						
							
							
								
									
								
								 Andreas Osim
							
						 | 
						
							
							
							
							
								
							
								526e11ddad
								
							
								
							
						 | 
						
							
							
								
								change layout of invoice.xml
							
							
							
							
							
						 | 
						
							2018-08-09 10:29:56 +02:00 | 
						
					
				
					
						
							
							
								
									
								
								 Andreas Osim
							
						 | 
						
							
							
							
							
								
							
								164d87aae1
								
							
								
							
						 | 
						
							
							
								
								Change layout of invoice
							
							
							
							
							
						 | 
						
							2018-08-09 10:14:24 +02:00 | 
						
					
				
					
						
							
							
								
									
								
								 Andreas Osim
							
						 | 
						
							
							
							
							
								
							
								1dff3fc564
								
							
								
							
						 | 
						
							
							
								
								remove check for intrastat_id in lot
							
							
							
							
							
						 | 
						
							2018-08-09 09:40:20 +02:00 | 
						
					
				
					
						
							
							
								
									
								
								 Andreas Osim
							
						 | 
						
							
							
							
							
								
							
								603432e472
								
							
								
							
						 | 
						
							
							
								
								adapt padding for invoice-date
							
							
							
							
							
						 | 
						
							2018-08-08 13:54:40 +02:00 | 
						
					
				
					
						
							
							
								
									
								
								 Andreas Osim
							
						 | 
						
							
							
							
							
								
							
								9f2521822e
								
							
								
							
						 | 
						
							
							
								
								rework url-construction of goMaps
							
							
							
							
							
						 | 
						
							2018-07-31 08:39:37 +02:00 | 
						
					
				
					
						
							
							
								
									
								
								 Andreas Osim
							
						 | 
						
							
							
							
							
								
							
								719fb29d84
								
							
								
							
						 | 
						
							
							
								
								change url of GoMaps
							
							
							
							
							
						 | 
						
							2018-07-30 12:50:39 +02:00 | 
						
					
				
					
						
							
							
								
									
								
								 Andreas Osim
							
						 | 
						
							
							
							
							
								
							
								315b6125d1
								
							
								
							
						 | 
						
							
							
								
								very simple Goggle Maps integration
							
							
							
							
							
						 | 
						
							2018-07-30 12:34:04 +02:00 | 
						
					
				
					
						
							
							
								
									
								
								 Andreas Osim
							
						 | 
						
							
							
							
							
								
							
								e4caee7570
								
							
								
							
						 | 
						
							
							
								
								add more carriers to TZCarrier
							
							
							
							
							
						 | 
						
							2018-07-18 16:31:10 +02:00 | 
						
					
				
					
						
							
							
								
									
								
								 Andreas Osim
							
						 | 
						
							
							
							
							
								
							
								36d0f7ff94
								
							
								
							
						 | 
						
							
							
								
								install tracking of deliveries (Weiss)
							
							
							
							
							
						 | 
						
							2018-07-18 14:24:33 +02:00 | 
						
					
				
					
						
							
							
								 
								Ahmed Aly
							
						 | 
						
							
							
							
							
								
							
								773c0470f8
								
							
								
							
						 | 
						
							
							
								
								FB 1832: RECHNUNG 2018-000169 - Rechnungsdatum wird nicht angedruckt
							
							
							
							
							
						 | 
						
							2018-07-18 10:20:31 +02:00 | 
						
					
				
					
						
							
							
								 
								Ahmed Aly
							
						 | 
						
							
							
							
							
								
							
								fdd371b05f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/website' into website
							
							
							
							
							
						 | 
						
							2018-07-17 18:37:47 +02:00 | 
						
					
				
					
						
							
							
								 
								Ahmed Aly
							
						 | 
						
							
							
							
							
								
							
								87bfe29cf0
								
							
								
							
						 | 
						
							
							
								
								FB-001: Feedback Webshops zum Meilenstein 1
							
							
							
							
							
						 | 
						
							2018-07-17 18:37:35 +02:00 | 
						
					
				
					
						
							
							
								 
								Andreas Wabro
							
						 | 
						
							
							
							
							
								
							
								4053125bf8
								
							
								
							
						 | 
						
							
							
								
								Hinzufügen neuer Fonts rawline
							
							
							
							
							
						 | 
						
							2018-07-17 09:20:47 +02:00 | 
						
					
				
					
						
							
							
								
									
								
								 Andreas Osim
							
						 | 
						
							
							
							
							
								
							
								a7b711fd15
								
							
								
							
						 | 
						
							
							
								
								display origin at printout
							
							
							
							
							
						 | 
						
							2018-07-16 17:47:57 +02:00 | 
						
					
				
					
						
							
							
								
									
								
								 Andreas Osim
							
						 | 
						
							
							
							
							
								
							
								e6bc7fe3ba
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into develop
							
							
							
							
							
						 | 
						
							2018-07-16 17:45:39 +02:00 | 
						
					
				
					
						
							
							
								
									
								
								 Andreas Osim
							
						 | 
						
							
							
							
							
								
							
								a8098b3b0b
								
							
								
							
						 | 
						
							
							
								
								allow change of tracking number even after confirmation of delivery
							
							
							
							
							
						 | 
						
							2018-07-16 17:45:06 +02:00 | 
						
					
				
					
						
							
							
								 
								Andreas Brückl
							
						 | 
						
							
							
							
							
								
							
								2346f9384a
								
							
								
							
						 | 
						
							
							
								
								Neues Addon mobikul
							
							
							
							
							
						 | 
						
							2018-07-13 12:39:13 +02:00 | 
						
					
				
					
						
							
							
								 
								Andreas Brückl
							
						 | 
						
							
							
							
							
								
							
								18e711f86c
								
							
								
							
						 | 
						
							
							
								
								Decouple dmi-module
							
							
							
							
							
						 | 
						
							2018-07-13 08:49:22 +02:00 | 
						
					
				
					
						
							
							
								
									
								
								 Andreas Osim
							
						 | 
						
							
							
							
							
								
							
								7beeb70e6a
								
							
								
							
						 | 
						
							
							
								
								add right management for fields pg_ic_num & pg_ic_flag
							
							
							
							
							
						 | 
						
							2018-07-12 18:08:54 +02:00 | 
						
					
				
					
						
							
							
								
									
								
								 Andreas Osim
							
						 | 
						
							
							
							
							
								
							
								4ac2f0ad4b
								
							
								
							
						 | 
						
							
							
								
								IC-Invoicing (Odoo-2-PG)
							
							
							
							
							
						 | 
						
							2018-07-12 15:29:49 +02:00 | 
						
					
				
					
						
							
							
								 
								Andreas Wabro
							
						 | 
						
							
							
							
							
								
							
								76d0a2283c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'website' of ssh://gitlab.datenpol.at:122/odoo/tz-austria into website
							
							
							
							
							
						 | 
						
							2018-07-11 14:29:09 +02:00 | 
						
					
				
					
						
							
							
								 
								Andreas Wabro
							
						 | 
						
							
							
							
							
								
							
								02bb33bb9b
								
							
								
							
						 | 
						
							
							
								
								[Fix] Behebt Problem bei HTML/CSS Editor Aufruf aus Frontend. Bei diesm Funktionsaufruf wird keine Website zum Filtern der Views im Request gesetzt
							
							
							
							
							
						 | 
						
							2018-07-11 14:23:52 +02:00 | 
						
					
				
					
						
							
							
								 
								Ahmed Aly
							
						 | 
						
							
							
							
							
								
							
								4f84346b7c
								
							
								
							
						 | 
						
							
							
								
								Fall 232: Anhänge - Backend
							
							
							
							
							
						 | 
						
							2018-07-11 14:23:52 +02:00 | 
						
					
				
					
						
							
							
								 
								Ahmed Aly
							
						 | 
						
							
							
							
							
								
							
								6cf7419497
								
							
								
							
						 | 
						
							
							
								
								Fall 234: Versandarten - Webshop
							
							
							
							
							
						 | 
						
							2018-07-11 14:23:52 +02:00 | 
						
					
				
					
						
							
							
								 
								Ahmed Aly
							
						 | 
						
							
							
							
							
								
							
								e971f66cef
								
							
								
							
						 | 
						
							
							
								
								Fall 231: Bestellbestätigung
							
							
							
							
							
						 | 
						
							2018-07-11 14:23:52 +02:00 | 
						
					
				
					
						
							
							
								 
								Ahmed Aly
							
						 | 
						
							
							
							
							
								
							
								a7e3d2d779
								
							
								
							
						 | 
						
							
							
								
								update setup and fixed clarico_them
							
							
							
							
							
						 | 
						
							2018-07-11 14:23:52 +02:00 | 
						
					
				
					
						
							
							
								 
								Ahmed Aly
							
						 | 
						
							
							
							
							
								
							
								17ee7c8126
								
							
								
							
						 | 
						
							
							
								
								update setup_website script
							
							
							
							
							
						 | 
						
							2018-07-11 14:23:52 +02:00 | 
						
					
				
					
						
							
							
								 
								Ahmed Aly
							
						 | 
						
							
							
							
							
								
							
								2d3f4526fd
								
							
								
							
						 | 
						
							
							
								
								3rd party module updates + update setup config
							
							
							
							
							
						 | 
						
							2018-07-11 14:23:52 +02:00 | 
						
					
				
					
						
							
							
								 
								Andreas Wabro
							
						 | 
						
							
							
							
							
								
							
								56df0678d9
								
							
								
							
						 | 
						
							
							
								
								Produktimport für Meilenstein 1
							
							
							
							
							
						 | 
						
							2018-07-11 14:23:52 +02:00 | 
						
					
				
					
						
							
							
								 
								Ahmed Aly
							
						 | 
						
							
							
							
							
								
							
								bf1b9beae3
								
							
								
							
						 | 
						
							
							
								
								update setup function
							
							
							
							
							
						 | 
						
							2018-07-11 14:23:52 +02:00 | 
						
					
				
					
						
							
							
								 
								Ahmed Aly
							
						 | 
						
							
							
							
							
								
							
								e8af4a06e2
								
							
								
							
						 | 
						
							
							
								
								removed unnecessary data
							
							
							
							
							
						 | 
						
							2018-07-11 14:23:52 +02:00 | 
						
					
				
					
						
							
							
								 
								Ahmed Aly
							
						 | 
						
							
							
							
							
								
							
								8bd3be0421
								
							
								
							
						 | 
						
							
							
								
								230: Webshop - Zahlungsarten + 237: Integration / Anpassung - 3rd Party Module
							
							
							
							
							
						 | 
						
							2018-07-11 14:23:52 +02:00 | 
						
					
				
					
						
							
							
								 
								Andreas Wabro
							
						 | 
						
							
							
							
							
								
							
								b53acf4350
								
							
								
							
						 | 
						
							
							
								
								Adds addon "ir_rule_website"
							
							
							
							
							
						 | 
						
							2018-07-11 14:23:52 +02:00 | 
						
					
				
					
						
							
							
								 
								Andreas Wabro
							
						 | 
						
							
							
							
							
								
							
								bd054fa459
								
							
								
							
						 | 
						
							
							
								
								[FIX] Intrastat Value in Sale Order Line
							
							
							
							
							
						 | 
						
							2018-07-11 14:23:52 +02:00 | 
						
					
				
					
						
							
							
								 
								Andreas Wabro
							
						 | 
						
							
							
							
							
								
							
								887735bd83
								
							
								
							
						 | 
						
							
							
								
								Environment AW
							
							
							
							
							
						 | 
						
							2018-07-11 14:23:52 +02:00 | 
						
					
				
					
						
							
							
								 
								Andreas Brückl
							
						 | 
						
							
							
							
							
								
							
								faadf8e3f4
								
							
								
							
						 | 
						
							
							
								
								Modul website_multi_company_sale hinzugefügt
							
							
							
							
							
						 | 
						
							2018-07-11 14:23:52 +02:00 | 
						
					
				
					
						
							
							
								 
								Andreas Wabro
							
						 | 
						
							
							
							
							
								
							
								ecd40fa57f
								
							
								
							
						 | 
						
							
							
								
								[Fix] Behebt Problem bei HTML/CSS Editor Aufruf aus Frontend. Bei diesm Funktionsaufruf wird keine Website zum Filtern der Views im Request gesetzt
							
							
							
							
							
						 | 
						
							2018-07-10 12:12:40 +02:00 | 
						
					
				
					
						
							
							
								
									
								
								 Andreas Osim
							
						 | 
						
							
							
							
							
								
							
								a8cf531728
								
							
								
							
						 | 
						
							
							
								
								layout change on sale.xml and stock.xml
							
							
							
							
							
						 | 
						
							2018-07-06 15:29:57 +02:00 |