diff --git a/workflow/auftrag-de-2.0.6.bpmn b/workflow/auftrag-de-2.0.6.bpmn index 7ea4e85..5f41f34 100644 --- a/workflow/auftrag-de-2.0.6.bpmn +++ b/workflow/auftrag-de-2.0.6.bpmn @@ -28,6 +28,7 @@ + @@ -691,7 +692,11 @@ Vereinbarung: _startdate - _enddate - + + contact.ref + (^contact\.) + false +]]> @@ -860,11 +865,16 @@ Vereinbarung: _startdate - _enddate - + + contact.ref + (^contact\.) + false + + rechnungsausgang-2.0 1000 101 - txtprocessref,txtspaceref,txtspacerefmain,txtspacerefsub,namteam,_supplier,_currency,_firstname,_lastname,_subject,_address,datdate,datto,_angebot,_capacity|banf_capacity,_description,numsequencenumber|banf_numsequencenumber,namcreator|banf_namcreator + process.ref,space.ref,(^contact\.),contact.ref,namteam,_supplier,_currency,_firstname,_lastname,_subject,_address,datdate,datto,_angebot,_capacity|banf_capacity,_description,numsequencenumber|banf_numsequencenumber,namcreator|banf_namcreator /pages/workitems/workitem.jsf?id=$uniqueid ]]> @@ -1130,9 +1140,6 @@ if (team && team.length>1) { - - - @@ -1142,9 +1149,6 @@ if (team && team.length>1) { - - - @@ -1160,9 +1164,6 @@ if (team && team.length>1) { - - - @@ -1193,9 +1194,6 @@ if (team && team.length>1) { - - - @@ -1407,6 +1405,18 @@ if (team && team.length>1) { + + + + + + + + + + + + diff --git a/workflow/kontakt-imixs-de-1.0.5.bpmn b/workflow/contact-de-1.0.0.bpmn similarity index 79% rename from workflow/kontakt-imixs-de-1.0.5.bpmn rename to workflow/contact-de-1.0.0.bpmn index 7ff6a78..8193d17 100644 --- a/workflow/kontakt-imixs-de-1.0.5.bpmn +++ b/workflow/contact-de-1.0.0.bpmn @@ -1,14 +1,22 @@ - + + - + - + - + @@ -28,6 +36,7 @@ + @@ -44,11 +53,16 @@ true - - - + + + + + + - + @@ -142,7 +156,7 @@ - + sequenceFlow_gEY29g sequenceFlow_AWYxog sequenceFlow_Som2Nw @@ -217,7 +231,7 @@ true - + @@ -264,7 +278,7 @@ true - + @@ -312,7 +326,7 @@ _subject: _firstname _lastname ]]> - + sequenceFlow_5RJFWQ sequenceFlow_093EOg sequenceFlow_qvtn8Q @@ -350,15 +364,16 @@ _subject: _firstname _lastname ]]> - + sequenceFlow_iWjb0A sequenceFlow_KciUFA - + sequenceFlow_JE4vvA - + @@ -392,13 +407,13 @@ - + - + @@ -431,10 +446,11 @@ function validateEmail(fieldName) { }]]> - + sequenceFlow_NWB98Q - + @@ -465,7 +481,7 @@ function validateEmail(fieldName) { - + home]]> @@ -483,12 +499,13 @@ function validateEmail(fieldName) { false - - + + sequenceFlow_9IGokQ sequenceFlow_83abig - + @@ -544,16 +561,16 @@ Mobil: _Phone2 - + - + - + @@ -563,13 +580,13 @@ Mobil: _Phone2 - + - + @@ -587,12 +604,13 @@ Mobil: _Phone2 false - - + + sequenceFlow_y2hxwQ sequenceFlow_5ihk6Q - + @@ -623,7 +641,7 @@ Mobil: _Phone2 - + home]]> @@ -641,12 +659,13 @@ Mobil: _Phone2 false - - + + sequenceFlow_9JBeUw sequenceFlow_nxTqng - + @@ -702,7 +721,7 @@ Mobil: _Phone2 - + @@ -712,13 +731,13 @@ Mobil: _Phone2 - + - + @@ -730,36 +749,37 @@ Mobil: _Phone2 - + false - - + + sequenceFlow_3dci7g - - + + sequenceFlow_5RJFWQ - - + + sequenceFlow_83abig - - + + sequenceFlow_nxTqng - + sequenceFlow_093EOg - + @@ -793,7 +813,7 @@ Mobil: _Phone2 - + @@ -814,7 +834,7 @@ Mobil: _Phone2 false - + txtproduct]]> @@ -839,12 +859,13 @@ Ihre Nachricht: - - + + sequenceFlow_l8kaUQ sequenceFlow_9G1GgA - + @@ -878,13 +899,13 @@ Ihre Nachricht: - + - + @@ -899,7 +920,7 @@ Ihre Nachricht: false - + @@ -931,21 +952,22 @@ Email: info@imixs.com Web: http://www.imixs.com/]]> - + - + - + - - + + sequenceFlow_wJuq7A sequenceFlow_aiAXtQ - + @@ -979,7 +1001,7 @@ Web: http://www.imixs.com/]]> - + @@ -1024,13 +1046,14 @@ function validateEmail(fieldName) { ]]> - - + + sequenceFlow_3KSqjQ sequenceFlow_URPESw sequenceFlow_G5TErw - + @@ -1064,13 +1087,13 @@ function validateEmail(fieldName) { - + - + @@ -1103,10 +1126,11 @@ function validateEmail(fieldName) { }]]> - + sequenceFlow_KtTi0Q - + @@ -1140,13 +1164,13 @@ function validateEmail(fieldName) { - + - + @@ -1161,10 +1185,10 @@ function validateEmail(fieldName) { false - + - + sequenceFlow_Som2Nw @@ -1201,7 +1225,7 @@ function validateEmail(fieldName) { - + @@ -1222,15 +1246,16 @@ function validateEmail(fieldName) { false - + - + sequenceFlow_X4StzA sequenceFlow_0U63Xg - + @@ -1264,13 +1289,13 @@ function validateEmail(fieldName) { - + - + @@ -1285,13 +1310,14 @@ function validateEmail(fieldName) { false - + - + sequenceFlow_0TnfoQ - + @@ -1325,7 +1351,7 @@ function validateEmail(fieldName) { - + @@ -1346,15 +1372,16 @@ function validateEmail(fieldName) { false - + - - + + sequenceFlow_4xsZVA sequenceFlow_5dyrCw - + @@ -1388,7 +1415,7 @@ function validateEmail(fieldName) { - + @@ -1409,15 +1436,16 @@ function validateEmail(fieldName) { false - + - + sequenceFlow_wNNYTg sequenceFlow_J302HQ - + @@ -1451,13 +1479,13 @@ function validateEmail(fieldName) { - + - + @@ -1472,25 +1500,25 @@ function validateEmail(fieldName) { false - + - + sequenceFlow_qvtn8Q sequenceFlow_wUl8fQ - - + + sequenceFlow_wUl8fQ - - + + sequenceFlow_W3nNQg - + sequenceFlow_KciUFA @@ -1527,13 +1555,13 @@ function validateEmail(fieldName) { - + - + @@ -1548,14 +1576,15 @@ function validateEmail(fieldName) { false - + sequenceFlow_fVPzsg sequenceFlow_iWjb0A - + @@ -1589,13 +1618,13 @@ function validateEmail(fieldName) { - + - + @@ -1610,7 +1639,7 @@ function validateEmail(fieldName) { false - + @@ -1642,194 +1671,229 @@ Email: info@imixs.com Web: http://www.imixs.com/]]> - + - + - + - - + + sequenceFlow_M8DAJA sequenceFlow_nQsrjA - - + + sequenceFlow_cCo6eA - + sequenceFlow_UofRxg sequenceFlow_y2hxwQ sequenceFlow_9IGokQ sequenceFlow_X4StzA - + sequenceFlow_AWYxog sequenceFlow_9JBeUw sequenceFlow_wNNYTg sequenceFlow_G5TErw - + sequenceFlow_5ihk6Q sequenceFlow_gEY29g sequenceFlow_5dyrCw - + sequenceFlow_9G1GgA sequenceFlow_nQsrjA sequenceFlow_aiAXtQ - + sequenceFlow_M8DAJA sequenceFlow_wJuq7A sequenceFlow_ET5SWw - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + - - + + - - + + - + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + - - + + - - + + - - + + - - + + - - - - + + + + - - + + @@ -1838,473 +1902,561 @@ Web: http://www.imixs.com/]]> - - - - - + + + + + ]]> - + - + - + - + - + - + - + - + - + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - + - + - - + + - + - - + + - + - - + + - + - + - - + + - + - - + + - + - - + + - + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - + - - + + - + - - + + - + - - + + - + - + - + - + - - + + - + - - + + - + - - + + - + - - + + - + - + - + - + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - + - + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - - - + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - + - + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - + \ No newline at end of file diff --git a/workflow/rechnungsausgang-2.0.8.bpmn b/workflow/rechnungsausgang-2.0.8.bpmn index 8db9073..6fcb97d 100644 --- a/workflow/rechnungsausgang-2.0.8.bpmn +++ b/workflow/rechnungsausgang-2.0.8.bpmn @@ -47,7 +47,7 @@ - + true @@ -101,8 +101,6 @@ event_i5iW9Q event_9pzVlg event_woHBoQ - gateway_Pf3aGQ - gateway_kvOQeg event_3kt5mw event_PiYZSw dataObject_whd3gQ @@ -1507,7 +1505,7 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com template-rechnung -R$created-sequencenumber.ods +sequencenumber.xlsx true]]> @@ -1529,7 +1527,7 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com sequenceFlow_tR3DKg - sequenceFlow_4W9f1A + sequenceFlow_qWWsTA @@ -1550,18 +1548,6 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com - - - - - - - - - - - - @@ -1631,12 +1617,12 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com - - - + + - - - @@ -1718,23 +1702,43 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com - .*numsequencenumber\.ods - - G19 + sequencenumber.xlsx + + G11 $modified - - - G20 + + + G12 _period - - - G22 + + + G8 _invoicedate - - - E22 - $createdsequencenumber - + + + C17 + sequencenumber + + + G7 + sequencenumber + + + + A7 + contact.company + + + A8 + contact.address + + + A10 + contact.country-contact.zip contact.city + + +TOTAL_NET;TAX;TOTAL + ]]> @@ -1743,23 +1747,20 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com sequenceFlow_nHNvIw - sequenceFlow_a0bMyg + sequenceFlow_tR3DKg - - - - _amount (Brutto € _amount_bruttosequenceFlow_hweXaw sequenceFlow_Vt3rIg - - - - - - @@ -2331,7 +2326,7 @@ http://www.shareyourwork.org/syw/]]> https://collabora-hub.imixs.com/cool/convert-to/ -R$created-numsequencenumber.ods +sequencenumber.xlsx pdf]]> @@ -2487,25 +2482,6 @@ if ( workitem.getItemValueString('invoice.email')==='' ) { - - - - - - sequenceFlow_qWWsTA - sequenceFlow_4W9f1A - - - - - - - sequenceFlow_tR3DKg - sequenceFlow_a0bMyg - - - - @@ -3270,10 +3246,34 @@ datev.gegenkonto]]> + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -3432,43 +3432,43 @@ Geschaeftsführer: Gaby Heinle u. Ralph Soika - + - + - + - + - + - + - + - + - + @@ -3511,22 +3511,22 @@ Geschaeftsführer: Gaby Heinle u. Ralph Soika - + - + - + - + @@ -3548,13 +3548,13 @@ Geschaeftsführer: Gaby Heinle u. Ralph Soika - + - + - + - + @@ -3616,34 +3616,42 @@ Geschaeftsführer: Gaby Heinle u. Ralph Soika - - + + + + - + - + - - + + + + - - + + + + - - + + + + - - + + - + - + @@ -3671,13 +3679,13 @@ Geschaeftsführer: Gaby Heinle u. Ralph Soika - + - + - + @@ -3828,26 +3836,6 @@ Geschaeftsführer: Gaby Heinle u. Ralph Soika - - - - - - - - - - - - - - - - - - - - @@ -3974,17 +3962,19 @@ Geschaeftsführer: Gaby Heinle u. Ralph Soika - + - - + + + + - + @@ -4021,16 +4011,20 @@ Geschaeftsführer: Gaby Heinle u. Ralph Soika - - + + + + - - + + - - + + + +