Commit Graph

744 Commits

Author SHA1 Message Date
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
OpenXE
c9aee26df7 removed .woff2 fonts 2023-08-31 10:31:54 +02:00
OpenXE
91c2dc88ba document send preselect default mail address from firmendaten 2023-08-15 12:37:16 +02:00
OpenXE
be222cc581 bugfix wareneingang bemerkung 2023-08-14 20:57:21 +02:00
OpenXE
a9f3292f8f Bugfix thousand separator and rounding in stueckliste 2023-08-10 21:38:09 +02:00
Roland Rusch
7a29151bdd #8 Positions-Menge wird immer auf 1 aufgerundet 2023-08-04 14:08:31 +02:00
OpenXE
0262c31e93 Added ticketregel from ticket button 2023-08-02 14:25:38 +02:00
OpenXE-ERP
5557c54fd6
Merge pull request #89 from exciler/prestashop-improve-import
Prestashop improve import
2023-07-27 10:56:14 +02:00
Andreas Palm
7df897d9d7 Prestashop: import meta infos 2023-07-26 18:47:44 +02:00
Andreas Palm
1a94af6b0b Prestashop: import support combinations 2023-07-26 15:26:01 +02:00
Andreas Palm
fa4125d63b Prestashop: strip html tags from short description 2023-07-26 12:38:41 +02:00
OpenXE-ERP
f430b7f5ac
Merge pull request #83 from RETROTEC-AG/pr/#9_.htaccess-verbietet-den-Download-der-woff,-woff2-und-js.map-files
.htaccess verbietet den Download der woff, woff2 und js.map files
2023-07-25 11:54:26 +02:00
Roland Rusch
a32c201a91
Add missing $ 2023-07-25 11:29:26 +02:00
Andreas Palm
cb2b75a3ca Prestashop: Improve article import 2023-07-25 00:05:17 +02:00
OpenXE
1f27f9a5f5 bugfixes shopimporter_shopify 2023-07-22 13:14:43 +02:00
Roland Rusch
5b49171a74
Update .htaccess 2023-07-19 20:51:31 +02:00
OpenXE-ERP
869c888947
Merge pull request #86 from RETROTEC-AG/pr/#7_Shopify-interface-does-not-work
shopify interface does not work
2023-07-19 18:13:17 +02:00
OpenXE-ERP
322ca715eb
Merge pull request #85 from RETROTEC-AG/feature/#12_Logfile-addLogFile-does-not-escape-the-given-parameters
Logfile::addLogFile() does not escape the given parameters
2023-07-19 18:11:20 +02:00
Roland Rusch
ab4e9f001e #7 Shopify interface does not work 2023-07-19 17:54:59 +02:00
Roland Rusch
51b70aed0d #7 Shopify interface does not work 2023-07-19 17:54:59 +02:00
Roland Rusch
64241842f6 #7 Shopify interface does not work 2023-07-19 17:54:58 +02:00
Roland Rusch
e6960f0030 #12 Logfile::addLogFile() does not escape the given parameters 2023-07-19 15:31:09 +02:00
Roland Rusch
b02da95c2f #12 Logfile::addLogFile() does not escape the given parameters 2023-07-19 15:18:04 +02:00
Roland Rusch
9994f8c18d #12 Logfile::addLogFile() does not escape the given parameters 2023-07-19 15:14:18 +02:00
Roland Rusch
ce5f359a75 #5 Syntax error in SQL when creating new address 2023-07-19 14:58:28 +02:00
Roland Rusch
57e398e7d4 #9 .htaccess verbietet den Download der woff, woff2 und js.map files 2023-07-19 14:43:46 +02:00
OpenXE
2eabd85b91 added message to do db upgrade after install 2023-07-10 19:10:31 +02:00
OpenXE
56e743334a added rechnung_anzahlpapier_abweichend option for adresse 2023-06-26 19:59:25 +02:00
OpenXE
e125a29fa9 bugfix kalender user intern 2023-06-26 09:56:01 +02:00
OpenXE
63a99b1a6e bugfix autoversand print number of invoices according to setting in adresse 2023-06-25 15:32:15 +02:00
OpenXE
1ea3d3a175 bugfix lager seriennummern typo 2023-06-25 15:04:02 +02:00
OpenXE
fcb9b0aeb7 bugfix rechnung mahnwesen minidetail 2023-06-24 10:57:59 +02:00
OpenXE
2b2f84a020 emailbackup_edit minor GUI improvements 2023-06-23 08:42:45 +02:00
OpenXE
4b40c27c84 bugfix scrolling to middle of page 2023-06-17 12:27:32 +02:00
OpenXE
265d815534 mahnwesen bugfix delete 2023-06-16 14:09:57 +02:00
OpenXE
7c17b2aed9 Merge remote-tracking branch 'github/master' 2023-06-16 14:04:36 +02:00
OpenXE
174909c178 bugfix mahnwesen status, error on mail 2023-06-16 14:02:58 +02:00
OpenXE
b8cfa9efbb bugfix rechnung rechnung_zahlstatus_berechnen 2023-06-16 12:29:50 +02:00
OpenXE
5da0490260 bugfix mahnwesen neu 2023-06-16 12:20:21 +02:00
OpenXE
9fbd0eb85a mahnwesen added e-mail 2023-06-15 17:26:44 +02:00
OpenXE
1c1c7034f1 mahnwesen added CRM for printed dokumente (email not yet implemented) 2023-06-15 17:03:42 +02:00
OpenXE
2c7f113d6b mahnwesen initial 2023-06-13 18:35:59 +02:00
OpenXE
1f6caa8632 mahnwesen initial 2023-06-08 15:35:46 +02:00
OpenXE
73725a31bb rechnung calculate payment status with skonto 2023-06-07 15:40:36 +02:00
OpenXE
06686a6020 removed language selection from login 2023-06-05 14:41:39 +02:00
tsgoff
62cca6fe3c
tooltip link 2023-06-04 22:00:20 +02:00
OpenXE
bf10c0d807 bugfix systemhealth db version 2023-06-01 14:15:11 +02:00
OpenXE
d9ff872a98 artikelkategorien & artikelbaum 2023-05-31 17:46:03 +02:00
OpenXE
05699986eb .htaccess added ico and css.map 2023-05-31 14:45:22 +02:00
OpenXE
33b5c1e171 ticket system increased and colored red hidden eye icon 2023-05-25 15:55:57 +02:00
OpenXE
1ebaa24473 .htaccess include robots.txt 2023-05-24 15:44:15 +02:00
OpenXE
5ca3a7297b bugfix exportbuchhaltung date of differences 2023-05-24 10:35:56 +02:00
OpenXE
88e1e2ebc2 ticket system show ... ih subject of message is empty 2023-05-23 11:27:47 +02:00
OpenXE
d294daa08b ticket system show embedded cid images in ticket view (insecure view) 2023-05-22 20:51:38 +02:00
OpenXE
75bd00770c ticket system show user's tickets and all tickets separately in sidebar 2023-05-22 18:42:20 +02:00
OpenXE
674c7b9958 bugfix send document with ',' in name 2023-05-22 14:01:34 +02:00
OpenXE
2e70e1f2dc bugfix lager lager_bestand menue wrong id 2023-05-21 12:16:54 +02:00
OpenXE
7548c601f5 auftrag refresh PDF and protokoll on teillieferung (teilauftrag) 2023-05-21 11:32:35 +02:00
OpenXE
ac8407faed exportbuchhaltung add ignore / export of differences 2023-05-20 14:15:25 +02:00
OpenXE
14e727500e projekt added additional option for calculation of brutto 2023-05-15 12:31:17 +02:00
OpenXE
011f2915c1 bugfix fibu_buchungen rounding 2023-05-12 12:23:43 +02:00
OpenXE
38cf7c3bc2 ticket system bugfix address with subdomain 2023-05-12 11:59:28 +02:00
OpenXE
209364f8c3 artikel stueckliste added referenz column 2023-05-09 10:33:49 +02:00
OpenXE
fea7a173dc produktion bugfix display of used parts, bugfix produktion list 2023-05-08 17:24:49 +02:00
OpenXE
33d2ca9497 bestellung show wareneingang in minidetail 2023-05-07 19:02:58 +02:00
OpenXE
9002a66085 wareneingang expanded minidetail 2023-05-05 14:46:16 +02:00
OpenXE
c8426bcbc0 wareneingang bugfix bestellung 2023-05-05 14:34:08 +02:00
OpenXE
25cf7de75b wareneingang usability improvements 2023-05-05 14:25:56 +02:00
OpenXE
2d938e96a0 wareneingang added column bestellung 2023-05-05 13:39:03 +02:00
OpenXE
4ffeafa5ac bugfix gruppensumme PDF Briefpapier::Cell_typed(): Argument #3 ($txt) must be of type string, null given 2023-05-05 09:58:15 +02:00
OpenXE
51d7ad7f17 bestellvorschlag bugfix html 2023-05-04 14:15:31 +02:00
OpenXE
f6d71cbbc8 ticket system bugfix sent mails insecure display enabled 2023-05-03 08:45:57 +02:00
OpenXE
1bf58aa8ba ticket system clean tags 2023-05-02 21:05:32 +02:00
OpenXE
63dbedc1a8 report exclude readonly reports as default, added row preview 2023-05-02 18:57:13 +02:00
OpenXE
cd3c0f2113 stueckliste import moved to importvorlage 2023-04-28 16:22:39 +02:00
OpenXE
b497d65d81 cronjob lagerzahlen set cache_lagerplatzinhaltmenge only on success 2023-04-27 18:07:08 +02:00
OpenXE
87a884bd8a Bugfix auftrag vorkasse_ok 2023-04-26 11:10:07 +02:00
OpenXE
62f6df1aeb fibu_buchungen added error when startdate is not set 2023-04-23 17:18:51 +02:00
OpenXE
828c1b1a75 Kontoauszuege removed "new" button. 2023-04-23 16:54:52 +02:00
OpenXE
7de88ca3b5 gutschrift freigabe with our without offsettung against rechnung, with offsetting creates fibu_buchung 2023-04-21 14:59:02 +02:00
OpenXE
1a28b5d75b Prerelease 1.9, added EGPL 2023-04-18 19:14:59 +02:00
OpenXE
50df55e35e bugfix auftrag offene status <> 'storniert' 2023-04-17 13:45:34 +02:00
OpenXE
4720cc8e94 fibu_buchungen einzelzuordnen multifilter 2023-04-15 18:45:09 +02:00
OpenXE
64d6b90312 fibu_buchungen usability improvements 2023-04-15 10:48:47 +02:00
OpenXE
17bdb1c5e1 auftrag set vorkasse_ok according to fibu_buchungen 2023-04-13 21:58:11 +02:00
OpenXE
c4eaaa966a removed fints-hbci, white-cup-filled-by-coffee.jpg 2023-04-12 22:16:52 +02:00
OpenXE
a43ac720b6 fibu_buchungen single with sachkonto 2023-04-11 19:52:58 +02:00
OpenXE
ea6a6a5dda rechnung removed all updates of ist, except from fibu_buchungen 2023-04-11 15:40:23 +02:00
OpenXE
69172672b2 fibu_buchhaltung belege zuordnen multi option 2023-04-11 15:20:40 +02:00
OpenXE
667b70eaf5 fibu_buchungen booking to kontorahmen 2023-04-08 17:48:39 +02:00
OpenXE
44af8f3b3d Bugfix erpapi lagernummern typo 2023-04-07 18:17:57 +02:00
OpenXE
82fc367405 fibu_buchungen einzelzuordnung 2023-04-06 15:33:53 +02:00