Commit Graph

7258 Commits

Author SHA1 Message Date
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
atm-lena
4e1dc2792c Add default workstation in service card 2022-07-05 13:58:35 +02:00
Laurent Destailleur
51d630433e Fix migration script detection 2022-07-05 10:04:12 +02:00
Laurent Destailleur
de71df9df2 Debug install v16 with php 8.1 2022-07-04 03:06:56 +02:00
Alexandre SPANGARO
32a9e53382 Merge remote-tracking branch 'upstream/develop' into 17p1 2022-07-03 07:29:41 +02:00
Yoan Mollard
5af4e81140 Delay caneditamount feature to v17 2022-07-01 17:39:56 +02:00
Yoan Mollard
1e6df0c6d9 Merge remote-tracking branch 'origin/develop' into membership-rework 2022-07-01 17:38:47 +02:00
Laurent Destailleur
1b5eb2de22 Merge pull request #21411 from defrance/patch-213
introduce barcode on warehouse place
2022-07-01 17:24:25 +02:00
Laurent Destailleur
cd2df7caef Debug v16 2022-06-30 12:47:36 +02:00
Laurent Destailleur
7acf02d6da Debug v16 2022-06-30 12:37:41 +02:00
Yoan Mollard
3dcf7db198 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into membership-rework 2022-06-29 16:12:05 +02:00
This Charlène
f6b1c91f21 Update 15.0.0-16.0.0.sql 2022-06-29 14:44:17 +02:00
This Charlène
08bffca31b introduce barcode on warehouse place 2022-06-29 14:41:50 +02:00
Yoan Mollard
5998999f18 NEW: Add free membership amounts at the membership type level 2022-06-28 02:33:17 +02:00
Laurent Destailleur
3eec5f0e69 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-06-27 12:16:17 +02:00
Alexandre SPANGARO
667fda9d16 Fix Problem on trema 2022-06-26 08:14:04 +02:00
Alexandre SPANGARO
2dd3faa258 NEW Add chart of accounts PCN2020 for Luxemburg 2022-06-26 07:54:45 +02:00