From: Vincent Date: Mon, 16 Feb 2026 13:53:53 +0000 (+0100) Subject: Merge branch 'after-close-2025' X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=ba36930b663b467593697f8ec452f6531da34d1f;p=cubedesigners-oxygene.git Merge branch 'after-close-2025' # Conflicts: # PAIE/CUBE.$SO/BulletinsPDF/202601/AIS 202601.pdf # PAIE/CUBE.$SO/BulletinsPDF/202601/DEY 202601.pdf # PAIE/CUBE.$SO/BulletinsPDF/202601/ETL 202601.pdf # PAIE/CUBE.$SO/BulletinsPDF/202601/STM 202601.pdf # PAIE/CUBE.$SO/BulletinsPDF/202601/VLV 202601.pdf # PAIE/CUBE.$SO/DSN/DSN202601_01.DSN # PAIE/CUBE.$SO/NUMEROS.$D1 # PAIE/CUBE.$SO/NUMEROS.B00 # PAIE/CUBE.$SO/PA_ABSEN.$D1 # PAIE/CUBE.$SO/PA_BULLE.$D1 # PAIE/CUBE.$SO/PA_BULLE.B01 # PAIE/CUBE.$SO/PA_BULLE.B27 # PAIE/CUBE.$SO/PA_BULLE.B28 # PAIE/CUBE.$SO/PA_BULLE.B29 # PAIE/CUBE.$SO/PA_BULLE.B2a # PAIE/CUBE.$SO/PA_BULLE.B2b # PAIE/CUBE.$SO/PA_BULLE.B2c # PAIE/CUBE.$SO/PA_BULLE.B2d # PAIE/CUBE.$SO/PA_BULLE.H00 # PAIE/CUBE.$SO/PA_BUL_R.$D1 # PAIE/CUBE.$SO/PA_BUL_R.B00 # PAIE/CUBE.$SO/PA_BUL_R.B0d # PAIE/CUBE.$SO/PA_BUL_R.B0e # PAIE/CUBE.$SO/PA_BUL_R.B0f # PAIE/CUBE.$SO/PA_BUL_R.B10 # PAIE/CUBE.$SO/PA_BUL_R.B11 # PAIE/CUBE.$SO/PA_BUL_R.B12 # PAIE/CUBE.$SO/PA_CAT_E.$D1 # PAIE/CUBE.$SO/PA_CAT_E.B00 # PAIE/CUBE.$SO/PA_CAT_E.B03 # PAIE/CUBE.$SO/PA_CICE.$D1 # PAIE/CUBE.$SO/PA_CICE.B00 # PAIE/CUBE.$SO/PA_CICE.B01 # PAIE/CUBE.$SO/PA_CICE2.$D1 # PAIE/CUBE.$SO/PA_CICE2.B00 # PAIE/CUBE.$SO/PA_CICE2.B01 # PAIE/CUBE.$SO/PA_CICE2.B02 # PAIE/CUBE.$SO/PA_CICE2.B09 # PAIE/CUBE.$SO/PA_CONSH.$D1 # PAIE/CUBE.$SO/PA_CONSH.B01 # PAIE/CUBE.$SO/PA_CONSH.B09 # PAIE/CUBE.$SO/PA_CONSH.B0a # PAIE/CUBE.$SO/PA_CONSH.H00 # PAIE/CUBE.$SO/PA_CONST.$D1 # PAIE/CUBE.$SO/PA_CONSV.$D1 # PAIE/CUBE.$SO/PA_DS_M_R.$D1 # PAIE/CUBE.$SO/PA_DS_M_R.B00 # PAIE/CUBE.$SO/PA_DS_M_R.B01 # PAIE/CUBE.$SO/PA_DS_M_R.B0a # PAIE/CUBE.$SO/PA_DS_M_S.$D1 # PAIE/CUBE.$SO/PA_DS_M_S.B00 # PAIE/CUBE.$SO/PA_DS_M_S.B01 # PAIE/CUBE.$SO/PA_DS_M_S.B02 # PAIE/CUBE.$SO/PA_DS_M_S.B04 # PAIE/CUBE.$SO/PA_DS_M_S.B1e # PAIE/CUBE.$SO/PA_ELE_V.$D1 # PAIE/CUBE.$SO/PA_ELE_V.B00 # PAIE/CUBE.$SO/PA_EPERE.$D1 # PAIE/CUBE.$SO/PA_EPERE.B01 # PAIE/CUBE.$SO/PA_EPERE.B06 # PAIE/CUBE.$SO/PA_EPERE.H00 # PAIE/CUBE.$SO/PA_EPERE.H02 # PAIE/CUBE.$SO/PA_EVAR_E.$D1 # PAIE/CUBE.$SO/PA_EVAR_L.B00 # PAIE/CUBE.$SO/PA_LEXIQ.$D1 # PAIE/CUBE.$SO/PA_LEXIQ.B01 # PAIE/CUBE.$SO/PA_LEXIQ.H00 # PAIE/CUBE.$SO/PA_LEX_L.$D1 # PAIE/CUBE.$SO/PA_LEX_L.B00 # PAIE/CUBE.$SO/PA_ORG_N3.$D1 # PAIE/CUBE.$SO/PA_ORG_N3.B01 # PAIE/CUBE.$SO/PA_ORG_N3.B06 # PAIE/CUBE.$SO/PA_ORG_N3.H00 # PAIE/CUBE.$SO/PA_ORG_R.$D1 # PAIE/CUBE.$SO/PA_ORG_R.B02 # PAIE/CUBE.$SO/PA_ORG_R.B06 # PAIE/CUBE.$SO/PA_ORG_R.H00 # PAIE/CUBE.$SO/PA_RUBRI.$D1 # PAIE/CUBE.$SO/PA_RUB_O.$D1 # PAIE/CUBE.$SO/PA_RUB_O.B00 # PAIE/CUBE.$SO/PA_RUB_O.B02 # PAIE/CUBE.$SO/PA_RUB_O.B03 # PAIE/CUBE.$SO/PA_RUB_O.B04 # PAIE/CUBE.$SO/PA_SALAE.$D1 # PAIE/CUBE.$SO/PA_SALAR.$D1 # PAIE/CUBE.$SO/PA_SALARH.$D1 # PAIE/CUBE.$SO/PA_SALARH.B00 # PAIE/CUBE.$SO/PA_SALARH.B01 # PAIE/CUBE.$SO/PA_SALARH.B03 # PAIE/CUBE.$SO/PA_SALARH.B04 # PAIE/CUBE.$SO/PA_SOCIE.$D1 # PAIE/CUBE.$SO/PA_SOC_O.$D1 # PAIE/CUBE.$SO/TRACE_EVENT.$D1 # PAIE/CUBE.$SO/TRACE_EVENT.B01 # PAIE/CUBE.$SO/TRACE_EVENT.H00 # oxygene.quota # systeme/$$-PREF.$D1 # systeme/$$-frmt.$d1 # systeme/$$-frmt.b01 # systeme/CONNEXION.$D1 # systeme/COURS.$D1 # systeme/COURS.B01 # systeme/COURS.B02 # systeme/COURS.B06 # systeme/NUMCOURS.$D1 # systeme/SYSNUMS.$D1 # systeme/licences/suscribe.data --- ba36930b663b467593697f8ec452f6531da34d1f diff --cc PAIE/CUBE.$SO/DSN/DSN202601_01.DSN index 6222fc80,25d44af7..18656dc3 --- a/PAIE/CUBE.$SO/DSN/DSN202601_01.DSN +++ b/PAIE/CUBE.$SO/DSN/DSN202601_01.DSN @@@ -18,9 -18,9 +18,15 @@@ S10.G00.02.005,'0144241853 S20.G00.05.001,'01' S20.G00.05.002,'01' S20.G00.05.003,'11' ++<<<<<<< HEAD +S20.G00.05.004,'20260126160914' +S20.G00.05.005,'01012026' +S20.G00.05.007,'26012026' ++======= + S20.G00.05.004,'20260216144522' + S20.G00.05.005,'01012026' + S20.G00.05.007,'16022026' ++>>>>>>> after-close-2025 S20.G00.05.008,'01' S20.G00.05.010,'01' S20.G00.07.001,'CASTEL Jean-François' @@@ -674,9 -674,9 +680,15 @@@ S21.G00.86.005,'201100000004 S20.G00.05.001,'01' S20.G00.05.002,'01' S20.G00.05.003,'11' ++<<<<<<< HEAD +S20.G00.05.004,'20260126160914' +S20.G00.05.005,'01012026' +S20.G00.05.007,'26012026' ++======= + S20.G00.05.004,'20260216144522' + S20.G00.05.005,'01012026' + S20.G00.05.007,'16022026' ++>>>>>>> after-close-2025 S20.G00.05.008,'01' S20.G00.05.010,'01' S20.G00.07.001,'CASTEL Jean-François' diff --cc oxygene.quota index 5d67b8db,d7e2d96a..4e86b18f --- a/oxygene.quota +++ b/oxygene.quota @@@ -1,5 -1,10 +1,15 @@@ [quotainfo] disk=C:\Program Files (x86)\Memsoft Oxygene\oxydev\systeme\bin size=63751319552 ++<<<<<<< HEAD +avail=2380099584 +useravail=2380099584 ++======= + <<<<<<< after-close-2025 + avail=3655540736 + useravail=3655540736 + ======= + avail=4175458304 + useravail=4175458304 + >>>>>>> local ++>>>>>>> after-close-2025 diff --cc systeme/licences/suscribe.data index d4e11aa4,aace444e..3de7c086 --- a/systeme/licences/suscribe.data +++ b/systeme/licences/suscribe.data @@@ -1,8 -1,13 +1,18 @@@ [status] <<<<<<< HEAD ++<<<<<<< HEAD +93130=7D815F160436713CB619A414883A599E574A2B37AF97857EED85181F3F17EF0AE80D6D74696A8BE3 +130=315A4E6E18FDA98C0C187624F3BB2491E2FCA54269E185E2A502CFBD9FBDF0B6ADAACD35A3828741 +======= + <<<<<<< after-close-2025 + 93130=7D815F160436713CB619A414883A599E574A2B37AF97857EED85181F3F17EF0A71460D34BD760E2A + 130=315A4E6E18FDA98C0C187624F3BB2491E2FCA54269E185E2A502CFBD9FBDF0B6ADAACD35A3828741 + ======= + 93130=7D815F160436713CB619A414883A599E574A2B37AF97857EED85181F3F17EF0AA9019B0300E220F9 + 130=315A4E6E18FDA98C0C187624F3BB2491E2FCA54269E185E2A502CFBD9FBDF0B6ADAACD35A3828741 + >>>>>>> local ++>>>>>>> after-close-2025 + ======= 93130=7D815F160436713C0FC43C33E823A67E977DC3E5E78A5F1335B3F97F01546B9678D40DF6A7AACB6B 130=315A4E6E18FDA98C4F6EB65560CDA22A9EDEA5A119871226C7F17330CB9DA81778D40DF6A7AACB6B nbd=4