lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
97,975 Commits 43 Branches 150 Tags 886 MiB
fff358f040
Commit Graph

6160 Commits

Author SHA1 Message Date
NextGestion
6da2c47360 Add template email for cancel partnership 2021-04-05 18:13:51 +01:00
Laurent Destailleur
685c880e6c Debug module workstation 2021-04-05 14:56:47 +02:00
Alexandre SPANGARO
f64d0377c5 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-04-04 06:03:41 +02:00
Laurent Destailleur
e0e883b791
Merge pull request #17105 from dolibit-ut/patch-224 
Update llx_20_c_departements.sql
 2021-04-04 01:19:40 +02:00
UT from dolibit
44b8ea2b5f
Update llx_20_c_departements.sql 
Colombia Departamentos
 2021-04-03 17:38:31 +02:00
UT from dolibit
bf59287770
Update llx_10_c_regions.sql 2021-04-03 17:19:16 +02:00
Youvious
5e9ce734a7 Clean llx_accounting_account_be.sql of all 'PRODUCT' and 'SERVICE' (pcg_subtype) 2021-04-03 15:14:33 +02:00
NextGestion
21f86c05d4
Merge branch 'develop' into dolibarr_partnership 2021-04-03 09:44:21 +01:00
NextGestion
6cac5f2212 Create Partnership Module 2021-04-03 09:24:07 +01:00
Laurent Destailleur
92da23945b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/13.0.0-14.0.0.sql
 2021-04-02 22:51:14 +02:00
Laurent Destailleur
cbbaecd100 Merge branch 'pr_batch_mask' of https://github.com/altairisfr/dolibarr 
into altairisfr-pr_batch_mask

# Conflicts:
#	htdocs/install/mysql/migration/13.0.0-14.0.0.sql
 2021-04-02 22:49:49 +02:00
Laurent Destailleur
25e32c4fcd
Merge branch 'develop' into dev_EventOrganisation 2021-04-02 22:43:10 +02:00
Laurent Destailleur
d9a8673ca3
Merge pull request #17078 from dolibit-ut/patch-205 
Update llx_10_c_regions.sql
 2021-04-02 22:35:03 +02:00
UT from dolibit
473134cc46
Update llx_20_c_departements.sql 
Angola - up & fix   fk_region 'xx'
 2021-04-02 20:26:11 +02:00
UT from dolibit
9677d35aca
Update llx_10_c_regions.sql 2021-04-02 20:18:14 +02:00
Laurent Destailleur
0a03ee5cd4 Comment 2021-04-02 15:44:06 +02:00
Florian HENRY
4cf8c4c685 add conf or booth contact tab and roles 2021-04-02 12:06:03 +02:00
Christophe Battarel
0adbffd864 fix typo 2021-04-02 08:24:10 +02:00
Laurent Destailleur
4e94e2f047
Merge pull request #17069 from dolibit-ut/patch-204 
Update llx_20_c_departements.sql
 2021-04-02 01:51:54 +02:00
Laurent Destailleur
8ff15d7567 Try to fix some id parent, at least for SKR03 2021-04-02 01:28:18 +02:00
Laurent Destailleur
83ed2ffefd Fix syntax errors 2021-04-02 01:12:45 +02:00
UT from dolibit
166ed32c32
Update llx_20_c_departements.sql 
Algeria
Brazil
 2021-04-01 12:52:06 +02:00
Laurent Destailleur
3d1c47db35 Fix bad table name for migration 2021-04-01 11:28:35 +02:00
Laurent Destailleur
6fc70fba8c
Merge pull request #16981 from FHenry/dev_EventOrganisation 
new: working on conference or booth object and event type #FoundationFunding
 2021-03-31 22:29:39 +02:00
Florian HENRY
73d7eefdcf Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-31 20:09:44 +02:00
Frédéric FRANCE
6831d0e883
add dynamic 2021-03-31 18:49:19 +02:00
Frédéric FRANCE
1823fb34bb
Merge remote-tracking branch 'upstream/develop' into repairToUtf8mb4 2021-03-31 18:41:49 +02:00
Laurent Destailleur
6ba725eb5e Fix sql error 2021-03-30 21:04:12 +02:00
Laurent Destailleur
48f97d77df Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-30 19:35:25 +02:00
Laurent Destailleur
cdd3e385e7 Merge branch 'new-propal-signature-date-and-user' of 
https://github.com/OPEN-DSI/dolibarr into
OPEN-DSI-new-propal-signature-date-and-user

# Conflicts:
#	htdocs/install/mysql/migration/13.0.0-14.0.0.sql
 2021-03-30 19:34:25 +02:00
Laurent Destailleur
dc23d8316c
Merge pull request #17024 from dolibit-ut/patch-187 
Update llx_20_c_departements.sql
 2021-03-30 19:22:10 +02:00
Laurent Destailleur
fd410adcf3
Update llx_20_c_departements.sql 2021-03-30 19:22:02 +02:00
Laurent Destailleur
0a28db619b
Merge pull request #17022 from dolibit-ut/patch-186 
Update llx_10_c_regions.sql
 2021-03-30 19:17:20 +02:00
Laurent Destailleur
ab58ba80c9
Update llx_10_c_regions.sql 2021-03-30 19:17:12 +02:00
Laurent Destailleur
be6bb3a756 FIX #yogosha5746 - next step (work in progress) 2021-03-30 19:12:07 +02:00
Laurent Destailleur
fae3cca494 FIX #yogosha5746 - next step (work in progress) 2021-03-30 17:45:15 +02:00
Laurent Destailleur
c80a8517d4 Fix position of line for ticket group 2021-03-30 17:39:48 +02:00
Laurent Destailleur
6e422d26f3 FIX #yogosha5746 - next step (wip) 2021-03-30 16:20:18 +02:00
UT from dolibit
a9bc37c63e
Update llx_20_c_departements.sql 2021-03-30 16:19:07 +02:00
UT from dolibit
d098ca7bec
Update llx_10_c_regions.sql 
LICENSE

Australia
Barbados
Brazil
Canada
 2021-03-30 16:01:35 +02:00
Laurent Destailleur
08c7458dd9 FIX #yogosha5746 2021-03-30 11:36:50 +02:00
lvessiller
85fff685db Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-propal-signature-date-and-user 2021-03-30 08:19:54 +02:00
lvessiller
d0ce60ff49 Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-propal-signature-date-and-user 2021-03-30 08:04:19 +02:00
Laurent Destailleur
fb84608586 Clean sql 2021-03-30 03:37:54 +02:00
Laurent Destailleur
2d83686ddd Keep copyright in same section than licence 2021-03-29 23:53:27 +02:00
Laurent Destailleur
2885ecbccf
Merge pull request #17004 from dolibit-ut/patch-176 
Update llx_holiday_extrafields.sql
 2021-03-29 23:46:31 +02:00
Laurent Destailleur
6d8c4984a8
Merge pull request #17013 from dolibit-ut/patch-184 
Update llx_10_c_regions.sql
 2021-03-29 23:45:11 +02:00
UT from dolibit
f2e0e54024
Update llx_10_c_regions.sql 
Argentina
 2021-03-29 23:06:14 +02:00
UT from dolibit
ed1107f095
Update llx_20_c_departements.sql 
Argentina
 2021-03-29 23:01:35 +02:00
UT from dolibit
f46dadcd89
Update llx_holiday_extrafields.sql 
LICENSE 
https
 2021-03-29 22:12:09 +02:00
Laurent Destailleur
a4987c6e4f
Merge branch 'develop' into 14a22 2021-03-29 20:35:35 +02:00
Florian HENRY
11dcf656c6 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-29 20:30:31 +02:00
Florian HENRY
1f08e37a03 more feature 2021-03-29 20:28:29 +02:00
Laurent Destailleur
5bbfe7ed19
Merge pull request #16930 from aspangaro/14a27 
NEW: Add a sub table to manage accountancy on product/company
 2021-03-29 20:11:02 +02:00
Laurent Destailleur
92e479955f
Merge pull request #16969 from dolibit-ut/patch-168 
Update llx_20_c_departements.sql
 2021-03-29 19:24:32 +02:00
Laurent Destailleur
9183c73846
Merge pull request #16968 from dolibit-ut/patch-167 
Update llx_10_c_regions.sql
 2021-03-29 19:23:58 +02:00
Christophe Battarel
bbc263f4b3 llx_product batch_mask definition 2021-03-29 18:39:22 +02:00
Florian HENRY
14a90a3a9d on goung 2021-03-29 17:26:43 +02:00
Alexandre SPANGARO
2a1cc04b66 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-03-28 06:16:33 +02:00
Alexandre SPANGARO
22f809c517 Move to _PERENTITY 2021-03-27 05:23:20 +01:00
Alexandre SPANGARO
6422b0a6c0 Merge remote-tracking branch 'upstream/develop' into 14a27 2021-03-27 05:02:55 +01:00
Florian HENRY
a254bbcc02 fix translation 2021-03-26 19:05:55 +01:00
Florian HENRY
f87711bf2f Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-26 18:30:08 +01:00
lvessiller
8a2e49d6e7 NEW date and user signature on proposal (Issue 16062) 2021-03-26 17:44:41 +01:00
Laurent Destailleur
cfd992b930 Add call of rebuild_sequence with pgsql. 2021-03-26 13:10:06 +01:00
UT from dolibit
7248ffa4dd
Update llx_20_c_departements.sql 
Canada
 2021-03-25 13:57:23 +01:00
UT from dolibit
045db51811
Update llx_10_c_regions.sql 2021-03-25 13:52:51 +01:00
Laurent Destailleur
ab04c0a904
Merge pull request #16935 from dolibit-ut/patch-162 
Update llx_c_forme_juridique.sql
 2021-03-25 01:10:23 +01:00
Florian HENRY
e898fbb834 almost done 2021-03-24 21:21:53 +01:00
Florian HENRY
373a52063d add commit 2021-03-24 20:13:30 +01:00
Laurent Destailleur
a5034d44f7 $_POST war 2021-03-24 19:53:31 +01:00
Laurent Destailleur
37c04b794f Add property "ticket group is public" in dicitonary of ticket groups. 2021-03-24 12:13:23 +01:00
Laurent Destailleur
bc9b4fa637 Fix id 2021-03-23 00:35:30 +01:00
Laurent Destailleur
3f07317f30 FIx #yogosha5695 2021-03-22 19:19:18 +01:00
UT from dolibit
4ebcfb558c
Update llx_c_forme_juridique.sql 2021-03-22 13:06:18 +01:00
Laurent Destailleur
6063b02bf4 Fix #ygosha5698 2021-03-22 12:47:23 +01:00
Alexandre SPANGARO
0c2ada4299 Merge remote-tracking branch 'upstream/develop' into 14a27 2021-03-21 23:08:01 +01:00
Laurent Destailleur
2e6c8f2479
Merge pull request #16920 from dolibit-ut/patch-153 
Update llx_20_c_departements.sql
 2021-03-21 22:11:00 +01:00
UT from dolibit
80810ba0b2
Update llx_20_c_departements.sql 2021-03-21 22:06:06 +01:00
UT from dolibit
bd0dbe6538
Update llx_10_c_regions.sql 2021-03-21 22:00:57 +01:00
Laurent Destailleur
0f9b88d828
Merge pull request #16899 from daraelmin/daraelmin-status-exclu 
Close #16255 Add new status "excluded" in membership management module
 2021-03-21 20:56:07 +01:00
UT from dolibit
065561b2be
Update llx_20_c_departements.sql 
Australia
 2021-03-21 12:46:53 +01:00
daraelmin
4d8ed4bd40 merge develop 2021-03-20 15:34:30 +01:00
Laurent Destailleur
e334e83a64
Merge branch 'develop' into 14a22 2021-03-20 13:42:54 +01:00
Chl
36baf9b76b FIX #16143 Old PG requires "()" on DROP FUNCTION 
On PostgreSQL 9.6 and previous, the upgrade script fails with a syntax
error if the dropped function's name is not followed by parentheses.

Patch tested on 9.6 and 13.2.
 2021-03-20 11:56:19 +01:00
Laurent Destailleur
7565937a3b
Merge pull request #16820 from bugness-chl/develop 
FIX #16143 Old PG requires "()" on DROP FUNCTION
 2021-03-20 11:55:04 +01:00
Laurent Destailleur
ee84bef3b2
Merge pull request #16828 from frederic34/membersboxfix 
fix new boxes add
 2021-03-20 11:52:19 +01:00
Laurent Destailleur
329bb7bf88
Merge pull request #16841 from dolibit-ut/patch-132 
Update llx_20_c_departements.sql
 2021-03-20 11:46:16 +01:00
Laurent Destailleur
7b7db14473 Fix regression 2021-03-20 11:23:32 +01:00
Alexandre SPANGARO
0b23ea072b FIX SQL Error on fresh install 2021-03-20 08:15:16 +01:00
Alexandre SPANGARO
74c4f97040 FIX SQL Error on fresh install 2021-03-20 08:15:05 +01:00
Alexandre SPANGARO
17d3b85ec4 Merge remote-tracking branch 'upstream/develop' into 14a27 2021-03-20 07:47:54 +01:00
Alexandre SPANGARO
00e21caa42 NEW: Add a sub table to manage accountancy on product/company 2021-03-20 07:42:16 +01:00
UT from dolibit
91ed200a1f
Update llx_20_c_departements.sql 2021-03-19 09:51:27 +01:00
Frédéric FRANCE
7183bfeb94
fix new boxes add 2021-03-19 09:15:35 +01:00
Chl
6cf970df8e FIX #16143 Old PG requires "()" on DROP FUNCTION 
On PostgreSQL 9.6 and previous, the upgrade script fails with a syntax
error if the dropped function's name is not followed by parentheses.

Patch tested on 9.6 and 13.2.
 2021-03-19 03:20:01 +01:00
Laurent Destailleur
e9f9cf62af Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-18 23:59:03 +01:00
Laurent Destailleur
27c7950417 Fix migration of boxes 2021-03-18 23:39:19 +01:00
daraelmin
529edb167a merge develop 2021-03-18 23:33:02 +01:00
daraelmin
e290884552 update subscription and type 2021-03-18 23:23:57 +01:00