Commit Graph

622 Commits (c97334b54ecb3a211c393868ddd140d7705d8793)

Author SHA1 Message Date
Andreas Osim 408c64df44 change behaviour of global dicount (allow use for draft & sent)
Display weight in order_view
correct misspelling
2018-10-03 11:16:13 +02:00
Ahmed Aly 60665a2738 Updated setup_website script 2018-09-25 10:42:46 +02:00
Ahmed Aly f546f09ef9 Fix in 3rd-party Addon, when saving the res.settings 2018-09-25 10:41:06 +02:00
Andreas Osim 96b4126d59 change order of printout (serial_no after description) 2018-09-14 11:54:10 +02:00
Andreas Osim fc77bdd8ad Merge remote-tracking branch 'origin/develop' into develop 2018-09-14 11:34:49 +02:00
Andreas Osim 8dd72576ac print serial_no on invoice if a product has serial_no_tracking 2018-09-14 11:34:26 +02:00
Andreas Osim 85bfc5dc0c allow entry of intrastat_id even if there is no lot 2018-09-14 11:33:27 +02:00
Andreas Wabro 7b0e135f9a Fügt neues Environment für Instanz allinonept hinzu 2018-09-11 16:17:42 +02:00
Ahmed Aly a602a65275 singelton error bugfix 2018-09-07 12:11:09 +02:00
Andreas Wabro 39db8a6baf FB-013 E-Mailversand - Lieferschein bestätigen: Deaktiviert automatische Versandbestätigung 2018-09-06 14:09:34 +02:00
Roman Widmann 8f1968f9c6 US-009 (481), FB-010: Support - TZ-Austria 2018-09-05 16:31:01 +02:00
Roman Widmann db3c36b72c US-009 (481), FB-012: Rechnung von ATOC18-000502 2018-09-05 15:27:47 +02:00
Roman Widmann 5f3a0ecadf RW development setup 2018-09-05 15:26:43 +02:00
Ahmed Aly 2542eb56b0 Merge branch 'sale_report_fix' into develop 2018-09-05 12:15:24 +02:00
Ahmed Aly aacf4c2653 Fix sale_report: white rectangle in some sites under the image 2018-09-05 12:14:02 +02:00
Andreas Osim c5c3ed3b72 show description of product in delivery form 2018-09-04 17:59:50 +02:00
Andreas Osim 44a67edb19 print 'default_code' according to setting in 'material_type'
(offer/order/invoice)
2018-09-04 15:57:54 +02:00
Ahmed Aly c9dd3f6c67 FB-011: Rechnungsvorlagen - Weiße Rechtecke 2018-09-03 14:29:34 +02:00
Andreas Osim 6605232d1d Merge remote-tracking branch 'origin/develop' into develop 2018-09-03 13:29:37 +02:00
Andreas Osim 79a27dec17 adapt interface SST-3 for 'assembled' in lot 2018-09-03 13:29:23 +02:00
Ahmed Aly e7e753b2d1 FB-004: Bilder werden im TEST zu groß angezeigt 2018-09-03 11:36:29 +02:00
Andreas Osim ce46936b56 add field 'assembled' to LOT 2018-09-03 10:52:59 +02:00
Andreas Osim 62e07dd6a5 Anpassung Angebot/Auftrag keine on-the-fly Anlage von Produkten 2018-08-27 14:46:06 +02:00
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