NextGestion
|
ace958240d
|
Merge branch 'develop' into dolibarr_partnership
|
2021-04-07 12:30:37 +01:00 |
|
Laurent Destailleur
|
fcc6431896
|
Merge pull request #17136 from aspangaro/14a35
NEW: Add deposit on supplier invoice (& somes ajustments)
|
2021-04-07 02:51:32 +02:00 |
|
Alexandre SPANGARO
|
82b652df8a
|
NEW: Add deposit on supplier invoice (& somes ajustments)
|
2021-04-06 09:15:34 +02:00 |
|
NextGestion
|
6da2c47360
|
Add template email for cancel partnership
|
2021-04-05 18:13:51 +01:00 |
|
Alexandre SPANGARO
|
f64d0377c5
|
Merge remote-tracking branch 'upstream/develop' into 14a22
|
2021-04-04 06:03:41 +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 |
|
Florian HENRY
|
4cf8c4c685
|
add conf or booth contact tab and roles
|
2021-04-02 12:06:03 +02:00 |
|
Laurent Destailleur
|
3d1c47db35
|
Fix bad table name for migration
|
2021-04-01 11:28:35 +02:00 |
|
Florian HENRY
|
73d7eefdcf
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation
|
2021-03-31 20:09:44 +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
|
c80a8517d4
|
Fix position of line for ticket group
|
2021-03-30 17:39:48 +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 |
|
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 |
|
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
|
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 |
|
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
|
37c04b794f
|
Add property "ticket group is public" in dicitonary of ticket groups.
|
2021-03-24 12:13:23 +01:00 |
|
Alexandre SPANGARO
|
0c2ada4299
|
Merge remote-tracking branch 'upstream/develop' into 14a27
|
2021-03-21 23:08:01 +01:00 |
|
Laurent Destailleur
|
e334e83a64
|
Merge branch 'develop' into 14a22
|
2021-03-20 13:42:54 +01:00 |
|
Laurent Destailleur
|
ee84bef3b2
|
Merge pull request #16828 from frederic34/membersboxfix
fix new boxes add
|
2021-03-20 11:52:19 +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 |
|
Frédéric FRANCE
|
7183bfeb94
|
fix new boxes add
|
2021-03-19 09:15:35 +01:00 |
|
Laurent Destailleur
|
27c7950417
|
Fix migration of boxes
|
2021-03-18 23:39:19 +01:00 |
|
Laurent Destailleur
|
8d19c57731
|
Add fields to know authentication method used
|
2021-03-18 12:54:49 +01:00 |
|
Laurent Destailleur
|
1685e1be79
|
Fix to keep tms not updated
|
2021-03-17 12:39:29 +01:00 |
|
Alexandre SPANGARO
|
6e17a588bb
|
Merge remote-tracking branch 'upstream/develop' into 14a22
|
2021-03-16 03:26:28 +01:00 |
|
Laurent Destailleur
|
2129adf129
|
Add more fields to llx_oauth_token
|
2021-03-15 13:25:08 +01:00 |
|
Laurent Destailleur
|
8192349320
|
Fix migration
|
2021-03-10 16:49:42 +01:00 |
|
Laurent Destailleur
|
2e4a4b527b
|
Fix migration
|
2021-03-10 16:45:28 +01:00 |
|
Laurent Destailleur
|
c2200e6ffd
|
Clean code
|
2021-03-10 16:41:48 +01:00 |
|
lmarcouiller
|
b71a8c5d6f
|
Close #15917 : boxes on ticket index
|
2021-03-08 15:26:35 +01:00 |
|
lmarcouiller
|
8c7764ed5d
|
Move of 2 graph in boxes
|
2021-03-08 12:18:55 +01:00 |
|
Laurent Destailleur
|
c483ad5dda
|
Merge branch 'develop' into develop
|
2021-03-06 11:25:52 +01:00 |
|
Laurent Destailleur
|
74d20e1b1f
|
Merge pull request #16557 from atm-gauthier/NEW_vatmigration
NEW : sql migration from llx_tva to llx_payment_vat
|
2021-03-06 10:50:59 +01:00 |
|
Laurent Destailleur
|
3ac9829a14
|
Update 13.0.0-14.0.0.sql
|
2021-03-06 10:50:27 +01:00 |
|
Laurent Destailleur
|
7a193b4c87
|
Add index on tag. Reduce tag length
|
2021-03-05 14:53:13 +01:00 |
|
Gauthier PC portable 024
|
83fa8812f9
|
NEW : sql migration from llx_tva to llx_payment_vat
|
2021-03-05 11:41:17 +01:00 |
|
Laurent Destailleur
|
525d643915
|
Fix debug split of payment salary into salary + payment
|
2021-03-04 18:57:03 +01:00 |
|
Laurent Destailleur
|
fa03cde0a5
|
Better migration script
|
2021-03-04 18:23:29 +01:00 |
|
Laurent Destailleur
|
69f76d2f9d
|
Fix migration to fill llx_salary table
|
2021-03-04 18:22:21 +01:00 |
|
Laurent Destailleur
|
b92bfb007f
|
Merge pull request #16520 from FHenry/dev_EventOrganisation
new: working on conference or booth object and event type #FoundationFunding
|
2021-03-04 17:06:57 +01:00 |
|
Laurent Destailleur
|
7d20df8054
|
Merge pull request #16177 from atm-gauthier/NEW/add_real_payments_on_salaries
NEW Salary payment request and Salary payment are 2 different steps in workflow on Salary payment recording
|
2021-03-04 16:53:54 +01:00 |
|
Florian HENRY
|
c362a16df1
|
fix sql
|
2021-03-04 07:45:02 +01:00 |
|
Florian HENRY
|
89bd9c4e05
|
fix sql
|
2021-03-04 07:44:31 +01:00 |
|
Florian HENRY
|
879e8fe5f6
|
fix sql
|
2021-03-04 07:44:00 +01:00 |
|
Florian HENRY
|
c682309817
|
migration ok
|
2021-03-03 20:27:55 +01:00 |
|
Florian HENRY
|
81f54003f6
|
set migration auto increment
|
2021-03-02 22:35:47 +01:00 |
|
Florian HENRY
|
e5e3abd685
|
class conference or booth or and table actioncomm ok
|
2021-03-02 22:23:54 +01:00 |
|
Florian HENRY
|
6862c206aa
|
merge from develop
|
2021-03-02 21:48:35 +01:00 |
|
Laurent Destailleur
|
1876cd661a
|
Remove UK from list of european countries
|
2021-03-02 16:00:10 +01:00 |
|
Florian HENRY
|
b5fd3e4984
|
on going
|
2021-03-01 17:06:03 +01:00 |
|
Florian HENRY
|
036d1d5802
|
change comlumn name
|
2021-03-01 15:36:22 +01:00 |
|
Gauthier PC portable 024
|
6da28f5e44
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
|
2021-03-01 11:12:03 +01:00 |
|
Alexandre SPANGARO
|
ca7958f273
|
Merge remote-tracking branch 'upstream/develop' into 14a22
|
2021-02-28 07:32:23 +01:00 |
|
Florian HENRY
|
d5dc95d99e
|
add status column
|
2021-02-27 15:36:36 +01:00 |
|
Florian HENRY
|
8bb0ff065a
|
add missing column on actioncomm
|
2021-02-27 14:19:02 +01:00 |
|
Florian HENRY
|
eb17ae5fe2
|
fix event type select
|
2021-02-27 14:13:42 +01:00 |
|
Florian HENRY
|
5e0ca7417e
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation_draft
|
2021-02-27 13:16:37 +01:00 |
|
Florian HENRY
|
f13ef50768
|
set good agenda type event
|
2021-02-27 13:13:42 +01:00 |
|
Laurent Destailleur
|
129120523c
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-02-26 19:20:10 +01:00 |
|
Laurent Destailleur
|
0315fb5fc3
|
Fix missing in v13
|
2021-02-26 19:19:48 +01:00 |
|
Francis Appels
|
e12db6d1f1
|
Merge remote-tracking branch 'Dolibarr/develop' into develop_mo_pmp
|
2021-02-24 15:20:45 +01:00 |
|
Gauthier PC portable 024
|
c0160a5f3b
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
|
2021-02-23 15:20:15 +01:00 |
|
Florian HENRY
|
fa65956801
|
Merge branch 'develop' into dev_EventOrganisation_draft
|
2021-02-22 21:02:22 +01:00 |
|
Florian HENRY
|
c9a51d971d
|
rename column
|
2021-02-22 21:00:54 +01:00 |
|
Alexandre SPANGARO
|
7f4040e464
|
Merge remote-tracking branch 'upstream/develop' into 14a22
|
2021-02-22 11:59:13 +01:00 |
|
Alexandre SPANGARO
|
22c936ba19
|
Merge remote-tracking branch 'upstream/develop' into 14a22
|
2021-02-22 11:28:36 +01:00 |
|
Laurent Destailleur
|
f99232e66e
|
Merge branch 'develop' into 14a21
|
2021-02-22 11:18:07 +01:00 |
|
Gauthier PC portable 024
|
939d406ab1
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
|
2021-02-22 09:10:24 +01:00 |
|
Alexandre SPANGARO
|
ae4fc565e1
|
Widget & commonobject
|
2021-02-22 05:38:31 +01:00 |
|
Alexandre SPANGARO
|
ca4023fe23
|
Migration
|
2021-02-22 05:31:01 +01:00 |
|
Alexandre SPANGARO
|
2cd181b86d
|
Code enhanced - Standardize field name #14697
|
2021-02-21 22:07:58 +01:00 |
|
Alexandre SPANGARO
|
ddea3f8a92
|
Code enhanced - Standardize field name #14697
|
2021-02-21 21:47:26 +01:00 |
|
Laurent Destailleur
|
e3419df36e
|
Merge branch 'develop' into 14a20
|
2021-02-21 20:28:06 +01:00 |
|
Florian HENRY
|
be34fb4541
|
tab event ok
|
2021-02-21 12:32:16 +01:00 |
|
Florian HENRY
|
556ba2b369
|
statart card
|
2021-02-20 23:17:48 +01:00 |
|
Laurent Destailleur
|
4b632fb24f
|
Merge branch 'develop' into 14a19
|
2021-02-20 17:08:23 +01:00 |
|
Laurent Destailleur
|
7c25f06f58
|
Merge pull request #16353 from aspangaro/14a18
Code enhanced - Standardize field name #14697
|
2021-02-20 16:51:34 +01:00 |
|
Alexandre SPANGARO
|
3dcfe40e71
|
Code enhanced - Standardize field name #14697
|
2021-02-20 08:00:27 +01:00 |
|
Alexandre SPANGARO
|
1017d480f9
|
Code enhanced - Standardize field name #14697
|
2021-02-20 07:08:37 +01:00 |
|
Laurent Destailleur
|
69eda9a5c3
|
Fix migration
|
2021-02-19 16:16:15 +01:00 |
|
Alexandre SPANGARO
|
042038d185
|
Code enhanced - Standardize field name #14697
|
2021-02-18 22:42:55 +01:00 |
|
Gauthier PC portable 024
|
134d7e00ec
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
|
2021-02-17 16:56:50 +01:00 |
|
Laurent Destailleur
|
d183a7eedf
|
Merge pull request #16288 from FHenry/dev_EventOrganisation_setuppage
wip : Event Organization module - PR-1 - setup page #FoundationFunding
|
2021-02-15 15:59:19 +01:00 |
|
Laurent Destailleur
|
67cfa05489
|
Fix missing event type
|
2021-02-15 11:48:37 +01:00 |
|
Florian HENRY
|
21a8d4d470
|
ok for setup pages
|
2021-02-14 17:06:49 +01:00 |
|
Gauthier PC portable 024
|
23f5c1c1c3
|
FIX : migration script
|
2021-02-09 14:28:55 +01:00 |
|
Francis Appels
|
d29fa04930
|
Merge remote-tracking branch 'Dolibarr/develop' into develop_mo_pmp
|
2021-02-09 10:51:34 +01:00 |
|
Laurent Destailleur
|
c0aa7e7db5
|
Merge pull request #16020 from atm-gauthier/NEW/add_real_payments_on_vat_objects
NEW VAT payment request and VAT payment are 2 different steps in workflow on VAT payment recording
|
2021-02-08 17:19:40 +01:00 |
|
Laurent Destailleur
|
ea7a0f86f7
|
Update 13.0.0-14.0.0.sql
|
2021-02-08 15:34:55 +01:00 |
|
Laurent Destailleur
|
8041ef641a
|
Merge branch 'develop' into dev_typent_jax_workcorrectly
|
2021-02-08 15:29:36 +01:00 |
|
Gauthier PC portable 024
|
e2a73e6c88
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects
|
2021-02-08 09:46:48 +01:00 |
|
Laurent Destailleur
|
e474ee4d16
|
Fix add missing field
|
2021-02-07 21:30:46 +01:00 |
|
Frédéric FRANCE
|
b2ea91e0cc
|
prefix can be null
|
2021-02-06 10:46:15 +01:00 |
|
Frédéric FRANCE
|
38863200f2
|
modules can add prefix for menu
|
2021-02-06 10:20:35 +01:00 |
|
Frédéric FRANCE
|
df67de08b1
|
modules can add prefix for menu
|
2021-02-06 10:16:07 +01:00 |
|
Florian HENRY
|
2d77787bba
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_typent_jax_workcorrectly
|
2021-02-04 09:06:36 +01:00 |
|
Florian HENRY
|
86e9398b79
|
no inner join
|
2021-02-04 09:05:58 +01:00 |
|
Francis Appels
|
b685a7549e
|
add newline at end of file
|
2021-02-02 12:19:34 +01:00 |
|
Francis Appels
|
45970ac443
|
Update database with new fields
|
2021-02-02 11:13:14 +01:00 |
|
Laurent Destailleur
|
70d04900c1
|
Several fixes in migration
Fix we must not drop a field during migration. This must be done 2 or 3 versions later.
Fix syntax of sql
|
2021-02-01 19:59:08 +01:00 |
|
Gauthier PC portable 024
|
1eb4968a29
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects
|
2021-02-01 12:00:04 +01:00 |
|
Gauthier PC portable 024
|
f1352fba97
|
FIX : migration script
|
2021-02-01 11:56:28 +01:00 |
|
Gauthier PC portable 024
|
d364755792
|
NEW : migration script
|
2021-01-28 17:20:01 +01:00 |
|
Gauthier PC portable 024
|
8a5588e518
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects
|
2021-01-28 10:28:36 +01:00 |
|
Laurent Destailleur
|
8a13ad2f26
|
Close #16075
|
2021-01-27 19:31:30 +01:00 |
|
Gauthier PC portable 024
|
f3e7adad18
|
FIX : double quotes on sql file
|
2021-01-22 16:08:46 +01:00 |
|
Gauthier PC portable 024
|
0b981743aa
|
FIX : remove backquotes
|
2021-01-22 09:15:45 +01:00 |
|
Frédéric FRANCE
|
c77c5628ca
|
add another missing undex
|
2021-01-21 21:35:30 +01:00 |
|
Frédéric FRANCE
|
7888b3d33e
|
add missing index in extrafields tables of supplier proposal
|
2021-01-21 21:19:03 +01:00 |
|
Laurent Destailleur
|
cfa593def1
|
Fix must be foreign key name, not field name.
|
2021-01-21 13:13:59 +01:00 |
|
lmarcouiller
|
3ab773c510
|
Fix #16036 Mysql syntax error
|
2021-01-21 10:51:14 +01:00 |
|
Laurent Destailleur
|
8e357bf695
|
Update 13.0.0-14.0.0.sql
|
2021-01-19 12:37:48 +01:00 |
|
Laurent Destailleur
|
67d9b38e45
|
No foreign key when field stored for a "defaut value"
|
2021-01-19 12:30:16 +01:00 |
|
Gauthier PC portable 024
|
b2eca0a314
|
FIX : VAT declaration list + migration script
|
2021-01-19 12:02:05 +01:00 |
|
Anthony Berton
|
89ac5e8803
|
1
|
2021-01-17 02:09:21 +01:00 |
|
Laurent Destailleur
|
7f04307adf
|
Merge branch 'develop' into develop#2
|
2021-01-13 17:40:21 +01:00 |
|
Laurent Destailleur
|
b7402ecf3f
|
Merge branch 'develop' into NEW_product_customer_price_ref
|
2021-01-13 13:38:19 +01:00 |
|
Marc de Lima Lucio
|
82b0f18378
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_product_customer_price_ref
|
2021-01-12 15:10:15 +01:00 |
|
Marc de Lima Lucio
|
759dd379d3
|
NEW: customer price customer ref: push back to v14
|
2021-01-12 14:43:09 +01:00 |
|
Laurent Destailleur
|
c2187b2ff1
|
Merge branch 'develop' into develop_new_workstation
|
2021-01-11 17:59:13 +01:00 |
|
Laurent Destailleur
|
8a3a59dfca
|
Merge pull request #15636 from aspangaro/14a5
NEW: Accountancy - Introduce "Level3" - Define account directly in thirdparty
|
2021-01-11 17:10:03 +01:00 |
|
Gauthier PC portable 024
|
8dfb088fc5
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_workstation
|
2021-01-11 10:34:38 +01:00 |
|
Anthony Berton
|
d3fa8b9f20
|
20210110
|
2021-01-10 01:07:27 +01:00 |
|
Laurent Destailleur
|
0448bf07cb
|
Fix field size
|
2021-01-08 00:52:26 +01:00 |
|
Laurent Destailleur
|
53da17e051
|
Add column to count pageview on website module
|
2021-01-08 00:49:58 +01:00 |
|
lmarcouiller
|
d88adb3d47
|
move line 553 of 12 to 13 migration to 13 to 14
|
2021-01-05 18:10:57 +01:00 |
|
ptibogxiv
|
9be1ce7d20
|
NEW better date_valid on invoice
need hour minutes and secondes for better order and search
|
2021-01-03 20:25:35 +01:00 |
|
Alexandre SPANGARO
|
99949c4817
|
Merge remote-tracking branch 'upstream/develop' into 14a5
|
2021-01-03 11:46:20 +01:00 |
|
Frédéric FRANCE
|
8ad9c3dbe9
|
fix migration for icstransfert
|
2021-01-02 09:07:16 +01:00 |
|
Alexandre SPANGARO
|
9f0434eb69
|
Merge remote-tracking branch 'upstream/develop' into 14a2
|
2020-12-29 04:50:32 +01:00 |
|
Alexandre SPANGARO
|
9eaeab1208
|
Merge remote-tracking branch 'upstream/develop' into 14a5
|
2020-12-28 03:30:41 +01:00 |
|
Laurent Destailleur
|
e4d7ce371e
|
Add file for #15351
|
2020-12-27 15:16:21 +01:00 |
|
Gauthier PC portable 024
|
7b739920a2
|
NEW : Workstations management
|
2020-12-21 12:28:45 +01:00 |
|
Alexandre SPANGARO
|
13f985d280
|
NEW: Accountancy - Introduce "Level3" - Define account directly in thirdparty
|
2020-12-04 04:13:42 +01:00 |
|
Alexandre SPANGARO
|
61bca50fa6
|
NEW: Dictionary for availability - Add column position
|
2020-11-05 16:56:28 +01:00 |
|