Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
115,678 Commits 36 Branches 189 Tags
f85c239e4f0482d96cfef1743494b51f00b90509
Commit Graph

5338 Commits

Author SHA1 Message Date
OPEN\s.takeuchi
984c125720 Rev+Add: Japan departments, accountings 2022-07-26 11:30:23 +09:00
Laurent Destailleur
c4eccd262d Add ip into ticket table 2022-07-25 13:15:22 +02:00
Laurent Destailleur
ab81492fa4 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formwebsite.class.php
	htdocs/core/lib/cron.lib.php
 2022-07-24 22:17:25 +02:00
Laurent Destailleur
da8a9e6082 Merge pull request #20625 from Easya-Solutions/new-inventory-category-field 
NEW Can use products categories to make inventory
 2022-07-24 22:06:55 +02:00
Laurent Destailleur
60117bbaee Debug v16 2022-07-24 19:45:37 +02:00
Laurent Destailleur
cf0a1d1e14 Merge 2022-07-24 11:26:10 +02:00
Laurent Destailleur
252c581ea6 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-07-24 11:23:52 +02:00
Laurent Destailleur
58923ec3d7 Merge 2022-07-24 11:21:02 +02:00
Laurent Destailleur
c7fd9f5a3a Trans 2022-07-24 10:57:46 +02:00
Chl
b4d4c42cfb FIX #20476 discrepancy between MySQL & PostgreSQL default value 2022-07-22 21:10:23 +02:00
Chl
50e1597ef1 FIX #20476 migration postgresql 13.0.x to 14.0.x packaging type 2022-07-22 21:09:19 +02:00
Chl
1dec64e320 FIX #20476 migration postgresql 13.0.x to 14.0.x packaging type 
Taken from ff35bf8d47
 2022-07-22 19:17:03 +02:00
Laurent Destailleur
24f8e9c401 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-22 18:09:38 +02:00
lvessiller
1f28734a83 FIX resolve conflicts 2022-07-22 08:50:50 +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
lvessiller
8f338d84b0 FIX resolve conflicts 2022-07-15 17:35:19 +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
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
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