Commit Graph

835 Commits

Author SHA1 Message Date
OpenXE
51a6c07085 ticket blink eye warning hidden elements 2024-04-11 12:33:17 +02:00
OpenXE-ERP
1f14f1829b
Merge pull request #137 from exciler/matrixartikel
MatrixProdukt: Fix SQL and hide Table when no groups are defined
2024-04-08 11:42:55 +02:00
Andreas Palm
d39af1c26f MatrixProdukt: Fix SQL and hide Table when no groups are defined 2024-04-08 11:22:46 +02:00
OpenXE-ERP
d18c17c797
Merge pull request #128 from exciler/matrixartikel
Matrixartikel RC1
2024-04-07 14:39:19 +02:00
OpenXE-ERP
606cf543d1
Merge pull request #132 from exciler/bogx_configurator
Bogx configurator (Shopware6)
2024-04-07 14:38:20 +02:00
OpenXE-ERP
6fb17e9945
Merge pull request #133 from exciler/tracking_versandpakete
Tracking versandpakete
2024-04-07 14:35:51 +02:00
OpenXE-ERP
61d2e11bf1
Merge pull request #135 from exciler/followups_versandpakete
Followups versandpakete
2024-04-07 14:34:34 +02:00
OpenXE
7cfeac81aa Bugfix artikel list filter artikelkategorie 2024-04-05 11:24:35 +00:00
Andreas Palm
383f22b9f5 Remove obsolete code 2024-04-04 15:46:48 +02:00
Andreas Palm
fecf7f5923 Followup versandpakete: verkaufszahlen 2024-04-04 15:12:26 +02:00
Andreas Palm
3836b2ed0e Prestashop: Fix property accessor 2024-04-03 22:02:13 +02:00
Andreas Palm
bca6aa04ef Remove old unused code from erpapi 2024-04-03 22:02:13 +02:00
Andreas Palm
1ab2bea2f1 Fix broken ShopUpdates after move to "versandpakete" 2024-04-03 22:02:13 +02:00
Andreas Palm
17c694a23c Remove Bogx debug output 2024-03-29 21:29:58 +01:00
OpenXE
515bb51b6e bugfix import article from shop 2024-03-27 13:04:25 +00:00
Andreas Palm
59c567aa00 Improve Sendcloud error handling, prevent multiple form submission 2024-03-27 00:17:00 +01:00
OpenXE
d284b8e254 shopexport shopware6 texteuebertragen option 2024-03-26 14:04:31 +00:00
OpenXE
1817efcd44 added texteuebertragen option to shopexport 2024-03-26 11:38:39 +00:00
OpenXE
c3d60a48fd upgrade new function drop_keys 2024-03-26 10:55:53 +00:00
OpenXE-ERP
37ed5ba246
Merge pull request #130 from exciler/shopware6_improvements
Shopware6 improvements
2024-03-26 10:34:20 +01:00
Andreas Palm
10c077006d Shopware6: fix extended Prices 2024-03-25 21:25:36 +01:00
Andreas Palm
d39f9bb2fe Shopware6: improvements and fixed regarding property-groups 2024-03-25 21:25:36 +01:00
Andreas Palm
85c699f5ee Shopware6: pass through "umsatzsteuer" for variants, fix "ermaessigt" 2024-03-25 21:25:35 +01:00
Andreas Palm
9eb958a1a6 Shopware6: apply taxId on variants as well and small bug fixes (maybe for PHP8.1) 2024-03-25 21:25:35 +01:00
Andreas Palm
6feaa03b8e Shopware: Shopware TaxId can be defined in config (e.g. if multiple countries with different tax rates and a different default values are used) 2024-03-25 21:25:35 +01:00
OpenXE
00276d40bb versandpakete added projekt to lieferungen 2024-03-21 12:29:08 +00:00
OpenXE
7808e48b6c Auftrag added projekt in versanduebergabe 2024-03-21 12:21:43 +00:00
OpenXE
362d035140 bugfix verkaufszahlen 2024-03-20 14:42:54 +00:00
OpenXE
56cfc54aa5 Paketmarke autoselect product according to weight 2024-03-19 18:10:43 +00:00
OpenXE
45a75b4298 mahnung add PDF to rechnung datei 2024-03-18 10:07:07 +00:00
Andreas Palm
f442555156 Small bugfix regarding groupEdits 2024-03-15 22:22:27 +01:00
Andreas Palm
36c751d317 Improvements for BogxProductConfigurator (Shopware6) 2024-03-15 21:41:05 +01:00
OpenXE
358d36f2d0 removed defective add button on rechnung add article manually 2024-03-15 09:25:32 +00:00
OpenXE
c3e060bdd4 bugfix auftrag lieferadresse JS 2024-03-13 12:46:38 +00:00
OpenXE
0b4e0c9c2c bugfix adresse ansprechpartner 2024-03-13 12:18:08 +00:00
OpenXE
2ff37db45a bugfix send document empty recipient 2024-03-13 11:18:57 +00:00
OpenXE
da40a201df rechnung removed rechnung zu verbindlichkeit 2024-03-13 09:45:11 +00:00
Andreas Palm
5b33e09021 Add Support for BogxProductConfigurator (Shopware6) 2024-03-08 22:45:18 +01:00
OpenXE
28490aa575 bugfix buchhaltung konto from artikel 2024-03-07 12:57:52 +00:00
OpenXE-ERP
d0b414b9f6
Merge pull request #126 from exciler/Fix_ArtikelStandardbild
use "sort" field when choosing default image
2024-03-06 20:41:14 +01:00
OpenXE-ERP
4dcca0949d
Merge pull request #125 from ToniF23/master
Fix Typo
2024-03-06 20:40:50 +01:00
Andreas Palm
f2589cc0e9 use "sort" field when choosing default image 2024-03-05 23:19:05 +01:00
Andreas Palm
eca32e6d6e remove old code 2024-02-28 20:11:48 +01:00
OpenXE
42701becb1 bugfix getStyleElement = 0 2024-02-27 10:19:59 +01:00
OpenXE
4b9fa3f92a Bugfix freitext1, freitext2 sql exception CRM brief 2024-02-26 21:29:20 +01:00
Toni Friedrich
36c332a52c Fix Typo 2024-02-26 08:28:09 +01:00
OpenXE
5315817467 Angebot totals optional only when not empty 2024-02-23 17:25:11 +01:00
OpenXE
bce18dcece Merge branch 'amperios' 2024-02-19 19:40:02 +01:00
OpenXE
9fc07ca3df bugfix lieferantengutschrift positionen hinzufuegen 2024-02-19 12:50:37 +01:00
OpenXE
345bbc5a9d bugfix buchhaltung export erloes 2024-02-14 10:33:51 +01:00
OpenXE
dd713c2286 bugfix lageretiketten 2024-02-12 19:45:43 +01:00
OpenXE
c89c36e596 exportbuchhaltung added new verbindlichkeit, lieferantengutschrift 2024-02-10 18:07:29 +01:00
OpenXE
4d5b46e903 bugfix ticket htmlentities betreff 2024-02-09 21:00:57 +01:00
OpenXE
7b1d12d59b bugfix artikel instueckliste sum view 2024-02-09 14:53:14 +01:00
OpenXE
c6ee9c0faf bugfix lieferantengutschrift menge max 2024-02-09 10:49:18 +01:00
OpenXE
324c7dbf17 lieferantengutschrift sortcols 2024-02-08 20:43:58 +01:00
OpenXE
4e5011c5f5 lieferantengutschrift artikel manuell bruttopreise 2024-02-08 20:37:07 +01:00
OpenXE
885cf37d29 FirmendatenSet -> AddNeuenFirmendatenWert 2024-02-08 17:56:01 +01:00
OpenXE
e348560cf7 lieferantengutschrift artikell manuell 2024-02-08 16:15:39 +01:00
OpenXE
c3cbf0d214 bugfix verbindlichkeit positionen 2024-02-08 14:17:56 +01:00
OpenXE
c5cf7bcba4 angebot optional positions with ellipsis, added optional total 2024-02-07 20:45:34 +01:00
OpenXE
ca4e320085 lieferantengutschrift positionen 2024-02-07 17:57:11 +01:00
OpenXE
8dc86fdddf Lieferantengutschrift initial 2024-02-05 21:58:08 +01:00
OpenXE
4a5a723a15 wareneingang reopen 2024-02-05 12:18:52 +01:00
OpenXE
0360d5657f bugfix angebot Alternativ Text Preis 2024-02-05 11:58:36 +01:00
OpenXE
2efc34c280 bugfix AN AB RE GS ust ausblenden 2024-02-04 21:54:43 +01:00
OpenXE
2ff5c007c1 added belegvorlagen from OSS 20.1 2024-02-03 12:49:37 +01:00
OpenXE
4acb921b51 bugfix emailbackup testmail utf-8 2024-01-31 18:38:53 +01:00
OpenXE
40734ccd66 Bugfix emailbackup 2024-01-31 18:35:16 +01:00
OpenXE
2b29457763 mailsend bugfix UTF-8 2024-01-30 11:13:07 +01:00
Andreas Palm
b8ae1a7f23 Merge branch 'master' into matrixartikel
# Conflicts:
#	.gitignore
2024-01-25 22:34:02 +01:00
OpenXE
2dcc5b664e export buchhaltung added internet from auftrag, zahlweise 2024-01-25 19:09:53 +01:00
OpenXE
63b85f213a angebot deckungsbeitrag 2024-01-24 18:27:34 +01:00
OpenXE
24905d3674 emailbackup edit page form cleanup 2024-01-23 18:17:55 +01:00
OpenXE
4570cbc342 Bugfix rechnung abweichendebezeichnung 2024-01-23 14:38:24 +01:00
Andreas Palm
74fa1ca74e vite run 2024-01-22 22:21:01 +01:00
OpenXE
08d97478d1 bugfix rechnungslauf 2024-01-22 13:38:21 +01:00
OpenXE
ce6ffb0580 bugfix crossselling shopexport 2024-01-21 13:36:58 +01:00
OpenXE-ERP
dd8421eac6
Merge pull request #113 from creatronics-de/231225-Alternative-Rechnungs-bezeichnung-als-standard
alternative Bezeichnung für Rechnungen als Standard
2024-01-20 13:52:45 +01:00
OpenXE
3c57df65e6 wareneingang bugfix limit menge 2024-01-19 13:46:29 +01:00
OpenXE
169a5c34c5 Berichte create report from preview 2024-01-19 10:02:27 +01:00
OpenXE
567976ecda Berichte Datenbankansicht 2024-01-18 19:47:20 +01:00
OpenXE
f6129a6ef7 verbindlichkeit bugfix PDF merge error 2024-01-18 13:08:56 +01:00
OpenXE
5948b728d2 verbindlichkeit improvements 2024-01-17 17:32:14 +01:00
OpenXE
cb49810251 wareneingang impovements 2024-01-17 17:03:34 +01:00
OpenXE
5abde88596 wareneingang from bestellung with kommentar 2024-01-16 11:14:46 +01:00
OpenXE
c0de40ac86 verbindlichkeit preise 5 decimals 2024-01-16 10:26:41 +01:00
OpenXE
fdad52f168 wareneingang manuell multifilter 2024-01-15 15:24:28 +01:00
OpenXE
1baf957891 bugfix verbindlichkeit set sachkonto 2024-01-15 14:58:20 +01:00
OpenXE
b9bec98855 wareneingang add manuelle list, wareneingang filter abgeschlossene 2024-01-15 14:41:48 +01:00
OpenXE
f148fbdf08 verbindlichkeit set sachkonto of multi positions 2024-01-13 12:46:14 +01:00
OpenXE
602bc38585 verbindlichkeit added bemerkung from wareneingang 2024-01-13 12:31:33 +01:00
OpenXE
500e8b5838 verbindlichkeitstatus 'abgeschlossen', refresh status from list, auto-set if everything is ok 2024-01-13 12:18:25 +01:00
OpenXE
2cd60b0bd8 bugfix differenz_auslieferung_tage < 2 2024-01-13 10:35:45 +01:00
OpenXE
3fe8fcd8aa verbindlichkeit added icon attachment missing, change in icons, added filters 2024-01-10 21:03:04 +01:00
OpenXE
63d6f2e7d4 verbindlichkeit bugfix multi action 2024-01-10 14:32:46 +01:00
OpenXE
c764a387b4 verbindlichkeit bugfix sort belegnr, empty steuersatz 2024-01-07 10:19:27 +01:00
OpenXE
a1affd18d8 wareneingang redesign adding to packet and booking 2024-01-06 19:10:22 +01:00
OpenXE
6c1f40aab9 adresse sachkonto tpl 2024-01-05 19:30:21 +01:00
OpenXE
346ff4cc4a verbindlichkeit bugfix sachkonto / steuer 2024-01-05 19:29:50 +01:00
OpenXE
cfbecd780b verbindlichkeit positionen_edit, steuer & sachkonto auf position 2024-01-05 14:09:49 +01:00
OpenXE
4c14f266e9 verbindlichkeit brutto positionen 2024-01-04 16:09:13 +01:00
OpenXE
3a023592e9 wareneingang datum_abgeschlossen, bearbeiter_abgeschlossen, manuell mit menge 2024-01-04 14:53:21 +01:00
OpenXE
6a6aab4304 verbindlichkeit mass processing, prevent approval without positions, get conditions from address 2024-01-04 13:24:52 +01:00
OpenXE
e5393bb7de verbindlichkeit lock control 2024-01-04 10:49:46 +01:00
OpenXE
153c9652ee verbindlichkeit lookup bestellung status versendet added 2024-01-03 15:26:28 +01:00
OpenXE
2e3a7e7b73 verbindlichkeit steuersatz locked after freigabe 2024-01-03 11:23:14 +01:00
OpenXE
c582cc1423 verbindlichkeit rundungsdifferenz 2024-01-02 21:21:00 +01:00
OpenXE
580aef2bf6 bugfix bestellung ohne preise PDF 2024-01-02 19:18:27 +01:00
OpenXE
0cde94e672 ticket added javascript confirm for ticketregel 2024-01-02 16:18:18 +01:00
OpenXE
c424d79fd6 verbindlichkeit added findcols and filters 2024-01-02 13:21:06 +01:00
creatronics-de
eae4644921
Merge branch 'OpenXE-org:master' into 231225-Alternative-Rechnungs-bezeichnung-als-standard 2023-12-31 17:36:24 +01:00
OpenXE
0806785d91 verbindlichkeit positionen basic implementation (cosmetics tbd) 2023-12-31 15:00:40 +01:00
OpenXE
fe273bb832 wareneingang removed auto set lagerartikel 2023-12-31 14:56:07 +01:00
OpenXE
7029295cb3 adresse added sachkonto for verbindlichkeit 2023-12-30 14:05:16 +01:00
OpenXE
7435a0605b artikel added kontorahmen 2023-12-30 12:49:23 +01:00
OpenXE
39409b0358 artikel readded buchhaltung options 2023-12-29 14:15:34 +01:00
OpenXE
2b95a3891a restored module kostenstellen 2023-12-29 13:44:31 +01:00
OpenXE
f7c64bec79 Bugfix Warnung doppelte Seriennummern removed pointless SQL WHERE 2023-12-29 12:58:38 +01:00
OpenXE
ae377e452f bugfix GetZahlungsweise empty array 2023-12-29 11:14:28 +01:00
OpenXE
38d0ac4c49 verbindlichkeit mengebetrag 2023-12-27 19:15:42 +01:00
OpenXE
dc5de062b8 Merge branch 'verbindlichkeit' 2023-12-27 18:19:20 +01:00
OpenXE
afd60b382b verbindlichkeit version 1 2023-12-27 18:17:30 +01:00
ibs
302bfee669 alternative Bezeichnung für Rechnungen als Standard per Settings festlegen 2023-12-25 23:28:04 +01:00
OpenXE
8f9ed4d7ae zwischenstand verbindlichkeit filert, multi-action, forms 2023-12-25 21:30:58 +01:00
OpenXE
bef8e02217 api_accounts fillApiPermissions if empty 2023-12-15 19:03:16 +01:00
OpenXE
8664e16c55 zwischenstand verbindlichkeit status, forms, positions 2023-12-13 18:27:08 +01:00
OpenXE
57f0e2f627 verbindlichkeit added positionen with sachkonto 2023-12-11 22:17:28 +01:00
Andreas Palm
cd8dbbb8a9 vite run 2023-12-11 22:14:34 +01:00
Andreas Palm
a0cf65fc45 MatrixProdukt: Translations 2023-12-11 22:13:37 +01:00
Andreas Palm
0583406650 Cleanup / Copyright 2023-12-11 11:21:39 +01:00
Andreas Palm
a0d4cd1ff3 Matrixproducts first beta 2023-12-11 11:13:30 +01:00
OpenXE-ERP
33aa53b7c5
Merge pull request #103 from exciler/subscriptioncycle-zahlzyklus
Enable "Zahlzyklus" in "Abolauf"
2023-12-10 10:22:24 +01:00
OpenXE-ERP
aabdc74af6
Merge pull request #104 from exciler/shopware-multiVersion
Make Shopware-Lib compatible with 6.x
2023-12-10 10:21:55 +01:00
OpenXE-ERP
6df9ba2d00
Merge pull request #105 from exciler/prestashop-import-keywords
Prestashop: import keywords and small bugfixes
2023-12-10 10:21:30 +01:00
OpenXE
3bc0eafc51 erpapi bugfix lager_seriennummern 2023-12-09 12:25:29 +01:00
OpenXE
3e2b5f6ee8 added github link to commits history 2023-12-07 16:29:42 +01:00
OpenXE
7ffb9a86a5 upgrade added strict DB mode 2023-12-07 14:32:02 +01:00
OpenXE
5816dedbc0 lieferschein minor bugfixes 2023-12-05 15:22:11 +01:00
OpenXE
12f5ca8211 logistik ein-auslagern menu change to listview 2023-12-05 11:52:01 +01:00
OpenXE
8b9969176c lieferschein umlagern repeat 2023-12-05 11:47:15 +01:00
OpenXE
a6f742ccc0 lieferschein bugfix standardlager 2023-12-05 11:32:53 +01:00
OpenXE
2129627a5b lager lieferschein umlagern 2023-12-02 15:21:11 +01:00
OpenXE
bbf8b071c0 Zwischenstand 2023-12-02 15:05:14 +01:00
OpenXE
626c75bbc1 verbindlichkeit initial 2023-11-26 12:46:42 +01:00
OpenXE
22e411a6cc ticketregel bugfix warteschlange 0 2023-11-25 13:13:39 +01:00
OpenXE
d7db78489c ticket add spam filter from list 2023-11-25 12:58:16 +01:00
OpenXE
088ad4555c ticketregeln added adresse 2023-11-25 11:24:23 +01:00
OpenXE
2cb1f91a43 ticket system attachments on ticket header 2023-11-19 14:07:16 +01:00
OpenXE
dff342276e ticket added "mail to all" 2023-11-19 12:22:44 +01:00
OpenXE
72684cb092 auftrag deckungsbeitrag write einkaufspreis into auftrag_position 2023-11-14 11:38:14 +01:00
OpenXE
bf3dad7e83 auftrag deckungsbeitrag added umsatz, kosten 2023-11-13 10:21:45 +01:00
OpenXE
b7f8c7b359 auftrag format deckungsbeitrag 2 decimals 2023-11-12 13:18:13 +01:00
OpenXE
7d0a5a0eee Auftrag deckungsbeitrag added manual ek and status != abgeschlossen for calculate 2023-11-11 23:12:29 +01:00
OpenXE
7cfb87c2c5 Auftrag deckungsbeitrag implemented 2023-11-11 22:57:32 +01:00
OpenXE
2ae5e9f44a bugfix exportbuchhaltung steuer 2023-11-11 16:37:25 +01:00
OpenXE
c106282b13 bugfix copy projekt 2023-11-07 09:57:59 +01:00
OpenXE
2f646a7715 versand added tracking for mail variables, minor bugfixes 2023-11-02 11:56:05 +01:00
OpenXE-ERP
c67d91a7dd
Merge pull request #106 from tsgoff/testmailutf8
test mail utf8_encode
2023-11-02 10:45:42 +01:00
OpenXE
3e69b8d7e0 lieferschein added direct link paketmarke without versandmodul 2023-11-02 09:43:43 +01:00
OpenXE
77092171c3 auftrag show paket and tracking in minidetail 2023-11-01 21:07:05 +01:00
OpenXE
a03d28ac69 lieferschein added multi action to set versand_status 2023-11-01 17:34:32 +01:00
OpenXE
f55f801cee versandart added button to create versandart without modul 2023-11-01 17:20:54 +01:00
OpenXE
1fe0aea620 versandarten removed check if module is empty 2023-11-01 16:59:48 +01:00
OpenXE
e474014b8c versandpakete extended handling of lieferschein_ohne_pos, tracking is editable if no versandmodul 2023-11-01 15:42:21 +01:00
OpenXE
3e70af8466 versandpakete bugfix check completion 2023-11-01 11:48:55 +01:00
OpenXE
662410fdc8 versand process added versand_status to lieferschein and status processing 2023-10-27 15:31:58 +02:00
OpenXE
7dcaae7fbb Paketmarke changed texts 2023-10-26 20:56:18 +02:00
OpenXE
18397a03c8 Paketmarke added info text Gewicht 2023-10-26 20:51:47 +02:00
OpenXE
504f0beb54 Paketmarke added doctype to text 2023-10-26 20:46:07 +02:00
OpenXE
ecf986d33b versandpakete improvements 2023-10-26 20:23:19 +02:00
OpenXE
eb00034a79 versandpakete bugfix 2023-10-25 13:49:27 +02:00
OpenXE
a5be2e984a versandpakete improvements, added lieferungen view 2023-10-25 13:26:52 +02:00
OpenXE
fb32cda643 versand bugfix no countries defined 2023-10-22 18:41:08 +02:00
OpenXE
ca73f3dda5 versandpakete improvements 2023-10-22 18:27:01 +02:00
OpenXE
4488cf8688 versand icons and findcols 2023-10-22 16:02:11 +02:00
OpenXE
ec7dc7b8a6 versandpakete update versender on shipping 2023-10-20 15:52:55 +02:00
OpenXE
6e857e6567 delivery icons 2023-10-20 15:48:53 +02:00
OpenXE
a35ab21f7c versandpakete improvements 2023-10-20 15:47:37 +02:00
tsgoff
f794b4db74
test mail utf8_encode 2023-10-20 15:40:47 +02:00
OpenXE
e899b1c389 versandpakete intermediate 2023-10-18 14:35:35 +02:00
OpenXE
b171dd7760 restored function VersandartMindestgewicht($id=0) in erpapi 2023-10-16 21:28:43 +02:00
OpenXE
4f7eb4049b versandpakete initial 2023-10-16 21:22:21 +02:00
OpenXE
b838b63258 removed deprecated paketmarke functions from erpapi 2023-10-10 18:17:42 +02:00
OpenXE
5e1359f770 Bugfix ticket_edit betreff width 2023-10-09 19:18:24 +02:00
OpenXE
1bb701322b Wareneingang tabindex mengen 2023-10-07 13:49:26 +02:00
OpenXE
1e55ca1b3d Wareneingang enter press triggers save 2023-10-07 13:36:46 +02:00
OpenXE
b34ba86421 Wareineingang bugfix lagerartikel, added some info text 2023-10-06 12:11:17 +02:00
OpenXE
b2bf2f14f2 Wareneingang added empty and fill from bestellung 2023-10-04 12:31:02 +02:00
OpenXE
bdb05c747a Wareneingang bugfix abschliessen, removed edit from minidetail 2023-10-01 19:48:21 +02:00
OpenXE
b613a99791 Wareneingang added link to artikel 2023-10-01 19:33:05 +02:00
OpenXE
1dba7e9d7e Wareneingang save preliminary 2023-10-01 19:19:09 +02:00
OpenXE
545a39bbdc Wareneingang changed to booking all at once -> TBD: save preliminary, fill, empty 2023-09-30 11:40:59 +02:00
OpenXE
5ed516f9da ticket system betreff strip tags 2023-09-21 08:30:05 +02:00
Andreas Palm
b759e2accd Prestashop: small fix to reduce errors in log 2023-09-19 14:39:00 +02:00
Andreas Palm
5d1201637f Prestashop: Import metakeywords 2023-09-19 14:39:00 +02:00
Andreas Palm
c6dd3fdeff bugfix: check for divisionByZero 2023-09-19 14:39:00 +02:00
Andreas Palm
4dd8b01ea9 Shopware6: remove "v2" part from URL in Client-lib as well, set pseudolager default to 0 instead of empty string 2023-09-19 14:26:40 +02:00
Andreas Palm
150381a20f Enable "Zahlzyklus" in "Abolauf" 2023-09-19 14:02:01 +02:00
OpenXE
76c770aba3 Bugfix managementboard removed invalid reference RechnungslaufRechnungslauf 2023-09-11 20:42:14 +02:00