Commit Graph

136 Commits

Author SHA1 Message Date
vmaury
28ebd3a323 Fix #24766 ODT - Supplier orders - mod ODT Doc Template 2023-06-10 16:49:24 +02:00
Laurent Destailleur
ab92bd5860 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-03-24 19:52:32 +01:00
Laurent Destailleur
e247337fc2 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-03-24 19:47:24 +01:00
Laurent Destailleur
8e97adf456 Removed useless files 2023-03-24 19:39:59 +01:00
Laurent Destailleur
b2afcad3f5 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-03-16 09:43:30 +01:00
Laurent Destailleur
f1fb8b2440 Removed unexpected files 2023-03-16 09:28:09 +01:00
Laurent Destailleur
dade946160 Removed unexpected files 2023-03-16 09:26:03 +01:00
Laurent Destailleur
7f8b09f0b6 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-03-02 10:48:36 +01:00
Laurent Destailleur
8612a88a2f Sync transifex
Debug v17
2023-03-02 10:38:45 +01:00
Laurent Destailleur
0b4cacd291 Use dolChmod 2023-02-17 20:01:53 +01:00
Laurent Destailleur
a863742eb5 Merge pull request #22841 from artemChernitsov/new-odt-abbility-to-supplier-invoices
NEW Add abbility of ODT support to supplier invoices
2022-12-27 00:33:25 +01:00
Alexandre SPANGARO
c683fb318a Add template recruitment odt 2022-11-30 22:18:39 +01:00
Alexandre SPANGARO
bf3a5850bf Typo in proposal odt 2022-11-30 21:12:21 +01:00
Artem Chernitsov
85e282b056 Merge branch 'Dolibarr:develop' into new-odt-abbility-to-supplier-invoices 2022-11-22 10:54:26 +02:00
Laurent Destailleur
c2d0f97063 Website 2022-11-20 15:13:40 +01:00
Laurent Destailleur
1aa304c758 Debug v17 2022-11-20 15:01:07 +01:00
Artem Chernitsov
bbd9f0bc8d Merge branch 'develop' into new-odt-abbility-to-supplier-invoices 2022-11-14 18:44:54 +02:00
Artem Chernitsov
8ce49001a7 Add abbility of ODT support to supplier invoices 2022-11-14 18:10:31 +02:00
Florian HENRY
b6452bd2c7 fix travis (website template) 2022-10-09 14:52:15 +02:00
Laurent Destailleur
fe40875aa9 Enahnce web site templates 2022-10-09 13:00:34 +02:00
Laurent Destailleur
6549bcaf77 Rename templates 2022-10-09 12:38:09 +02:00
Laurent Destailleur
fb24a1ee55 Clean code 2022-10-08 20:41:45 +02:00
Laurent Destailleur
4a9181b5bc Clean code 2022-10-08 20:22:59 +02:00
Laurent Destailleur
a32ed5b07d Clean code 2022-10-08 20:21:03 +02:00
Laurent Destailleur
3ecd79b915 Clean code 2022-10-08 19:39:34 +02:00
Laurent Destailleur
6729ddbbb6 NEW Templates of websites are now directories and not zip into core repo 2022-10-08 13:48:25 +02:00
Laurent Destailleur
c513a767f3 Merge pull request #22457 from Quatadah/dolicloud-template01-revisited
#FIX template01 css corrected
2022-10-06 11:58:32 +02:00
Quatadah Nasdami
a048fa4b6d template01 css corrected 2022-09-29 12:13:48 +02:00
Laurent Destailleur
e96befe783 Merge pull request #22410 from Quatadah/dolicloud-template02
#FIX Dolicloud template02
2022-09-28 20:53:25 +02:00
Laurent Destailleur
b751d79153 Merge pull request #22409 from Quatadah/dolicloud-template03
#FIX tempalte 03 css
2022-09-28 20:49:45 +02:00
Quatadah Nasdami
6479c73a29 fix css in template02 2022-09-26 13:59:51 +02:00
Quatadah Nasdami
9e03e11126 fix template03 css 2022-09-26 13:53:09 +02:00
Laurent Destailleur
1ded74972a Merge pull request #21847 from Quatadah/dolicloud-qnasdami-template04
NEW : Template 04 improved according to #21775
2022-08-23 15:42:45 +02:00
Quatadah Nasdami
f2dd9904ea template 04 improved 2022-08-23 13:19:10 +02:00
Laurent Destailleur
b0ccccdc27 Merge pull request #21835 from Quatadah/dolicloud-template03
NEW #21775 : Template 03 manages send mails
2022-08-22 23:24:42 +02:00
Laurent Destailleur
c9cd908ad2 Close #21775 2022-08-22 23:23:43 +02:00
Quatadah Nasdami
7b5cdbc3a2 template 03 now manages sending mails 2022-08-22 16:04:45 +02:00
Laurent Destailleur
6e800fe342 Close #21786 Merged manually to solve conflict on binary file 2022-08-22 12:17:26 +02:00
Laurent Destailleur
8dafaf4695 Merge pull request #21789 from Quatadah/dolicloud-template03
FIX Template 01 in #21775
2022-08-18 22:18:12 +02:00
Quatadah Nasdami
0b4a6f07f4 reexporting template 03 2022-08-18 14:48:45 +02:00
Laurent Destailleur
4d313978fb Merge pull request #21763 from Quatadah/dolicloud-qnasdami-template04
#NEW Template 04
2022-08-16 20:37:48 +02:00
Quatadah Nasdami
f992b2de5b template 04 2022-08-16 16:30:06 +02:00
Laurent Destailleur
2d29568231 Merge pull request #21584 from Quatadah/template1
NEW: Adding template 01
2022-08-11 23:24:33 +02:00
Quatadah Nasdami
4090ce9227 changing the zip folder of the template style 02 2022-08-04 11:51:47 +02:00
Laurent Destailleur
f731fcc7d1 Use good format for image templates 2022-08-03 21:30:59 +02:00
Laurent Destailleur
5f5c26f3a6 Merge branch 'develop' into template1 2022-08-03 19:26:38 +02:00
Quatadah Nasdami
0c0c4844c6 Adding template 03 2022-07-27 01:13:53 +02:00
Quatadah Nasdami
36bae800ce website template 01 2022-07-27 00:27:24 +02:00
Laurent Destailleur
0c524f17f1 Merge pull request #21546 from Quatadah/template01
#NEW template
2022-07-21 16:18:56 +02:00
Quatadah Nasdami
82eaf4524a adding second template 2022-07-21 15:01:53 +02:00