Commit Graph

7574 Commits

Author SHA1 Message Date
lvessiller
1f28734a83 FIX resolve conflicts 2022-07-22 08:50:50 +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
Quatadah Nasdami
1701982ab5 pushing first tempalte 2022-07-21 14:36:18 +02:00
atm-lena
7f1a17bcc9 Change fk_unit service lines management 2022-07-20 15:38:37 +02:00
Laurent Destailleur
f6176b6b61 Doc 2022-07-19 02:08:49 +02:00
Laurent Destailleur
618184deed Merge pull request #21519 from aspangaro/16p1
Move old link on data
2022-07-19 00:53:29 +02:00
Laurent Destailleur
36226c7b4b FIX Picto google plus 2022-07-18 13:17:37 +02:00
Laurent Destailleur
95ee25660e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-18 13:16:25 +02:00
Laurent Destailleur
311d69da4e FIX Picto google plus 2022-07-18 11:07:48 +02:00
Alexandre SPANGARO
576c185e0c Move old link on data 2022-07-18 09:20:54 +02:00
Laurent Destailleur
c759b56622 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-16 09:39:40 +02:00
Laurent Destailleur
14eb6c24b8 Fix php version max 2022-07-16 02:34:37 +02:00
lvessiller
8f338d84b0 FIX resolve conflicts 2022-07-15 17:35:19 +02:00
Laurent Destailleur
a55ab27c67 Fix http header 2022-07-14 15:01:16 +02:00
Laurent Destailleur
add38d0d04 Fix http header 2022-07-14 14:59:28 +02:00
Laurent Destailleur
4f54fb4f00 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-14 11:54:30 +02:00
Laurent Destailleur
a26931594c FIX #yogosha11799 2022-07-14 11:53:31 +02:00
Laurent Destailleur
d4acad4a7a FIX #yogosha11774 2022-07-14 11:51:38 +02:00
Laurent Destailleur
97acf949fc Clean message on email limit 2022-07-13 13:39:16 +02:00
atm-lena
8aa094a631 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-07-12 11:51:13 +02:00
Laurent Destailleur
57c5de5f9a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-12 11:43:58 +02:00
Laurent Destailleur
f396908c94 Update website templates 2022-07-12 11:24:46 +02:00
atm-lena
8a36e2e9d8 Màj column fk_fedault_workstatio and duration_unit 2022-07-12 09:21:51 +02:00
atm-lena
db5c5b9020 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-07-12 09:21:22 +02:00
Laurent Destailleur
f607ae40c3 Fix migration 2022-07-11 12:40:14 +02:00
Laurent Destailleur
5ba446f736 Merge pull request #21412 from ymollard/membership-rework
Membership rework
2022-07-11 12:13:34 +02:00
Laurent Destailleur
5356703f84 Update 16.0.0-17.0.0.sql 2022-07-11 11:38:52 +02:00
Laurent Destailleur
edd2be7cda Fix length of column 2022-07-11 11:32:44 +02:00
Laurent Destailleur
e29df476e6 Merge branch 'develop' into membership-rework 2022-07-11 10:56:31 +02:00
Laurent Destailleur
ae58a77208 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/product/stock/card.php
2022-07-11 00:03:39 +02:00
Laurent Destailleur
6386432263 Fix missing migration 2022-07-11 00:01:33 +02:00
Laurent Destailleur
6b07daf40f Fix missing migration 2022-07-10 20:12:56 +02:00
Laurent Destailleur
2236ab53fe Merge pull request #21321 from defrance/patch-208
NEW : Create llx_element_categorie.sql
2022-07-10 19:05:36 +02:00
Laurent Destailleur
16d04e475b Merge branch 'develop' into membership-rework 2022-07-10 18:58:49 +02:00
Laurent Destailleur
2f1ab1a003 Fix detection of version 2022-07-08 14:32:47 +02:00
Laurent Destailleur
8e9b52f919 Fix detection of version 2022-07-08 14:31:28 +02:00
Laurent Destailleur
bdfa0536a6 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-08 14:20:44 +02:00
Laurent Destailleur
3ced3378ac Prepare v17 2022-07-08 14:20:08 +02:00
Laurent Destailleur
245580bfa5 FIX Several pb in invoice remind (html detection, no event, transaction) 2022-07-08 14:11:13 +02:00
Laurent Destailleur
686f460f59 NEW Added MMK currency (Myanmar Kyat) 2022-07-08 11:58:08 +02:00
Yoan Mollard
07b5657ba1 Merge remote-tracking branch 'origin/develop' into HEAD 2022-07-08 10:11:22 +02:00
This Charlène
986c241ee1 create llx_element_categorie.key.sql 2022-07-08 08:09:40 +02:00
Laurent Destailleur
f2a6560d8f Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-07 11:45:36 +02:00
Laurent Destailleur
f2961d4bf4 Fix sql 2022-07-07 11:41:40 +02:00
Laurent Destailleur
9af4676369 Fix migration 2022-07-07 11:35:40 +02:00
atm-lena
6925dc2ae1 Edit unit bom line service 2022-07-06 15:00:07 +02:00
lvessiller
ed9c7ff251 FIX resolve conflicts 2022-07-06 09:23:44 +02:00
Laurent Destailleur
37db86183c Add field close_missing_amount on invoices 2022-07-05 20:32:26 +02:00
Laurent Destailleur
7e855eac52 Add field close_missing_amount on invoices 2022-07-05 20:22:32 +02:00