altairis-noe
f7182d43fd
add entity in c_productbatch_qcstatus key
2021-04-29 13:00:47 +02:00
altairis-noe
762f41ea86
llx_c_productbatch_qcstatus as dictionnary name
2021-04-29 12:49:15 +02:00
lmarcouiller
d4fb9c7c47
knowledgemanager finished
2021-04-29 10:49:56 +02:00
Dorian Vabre
cb21131259
Merge branch 'develop' into dev_EventOrganizer_payment
2021-04-29 10:31:43 +02:00
lmarcouiller
6da32015f4
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#4
2021-04-29 09:45:30 +02:00
Antonin MARCHAL
6dafb98707
Merge branch 'develop' of https://github.com/ibuiv/dolibarr into develop
2021-04-29 01:20:42 +02:00
Antonin MARCHAL
c89830b25b
fix(sql) pmp added to create table both migration and install
2021-04-29 01:17:21 +02:00
Laurent Destailleur
b56b9aa707
Merge branch 'develop' into develop
2021-04-28 16:05:07 +02:00
antonin_tdj
0108826ee5
add column instead of just add
2021-04-28 16:03:40 +02:00
Laurent Destailleur
4ca4c5a0fc
Merge pull request #17417 from dolibit-ut/patch-304
...
Update llx_20_c_departements.sql
2021-04-28 15:08:36 +02:00
Laurent Destailleur
4a3360b992
Merge pull request #17419 from atm-gauthier/develop_fixes_on_salaries_and_vat
...
Develop fixes on salaries and vat
2021-04-28 15:04:19 +02:00
lmarcouiller
97043ca665
New module KnowledgeManagement
2021-04-28 14:57:49 +02:00
Gauthier PC portable 024
01ddc13b2e
FIX : on update current_timestamp for postgres
2021-04-28 13:06:19 +02:00
Gauthier PC portable 024
4af2f8871a
FIX : on update current_timestamp
2021-04-28 12:27:07 +02:00
UT from dolibit
26a7c2613a
Update llx_20_c_departements.sql
...
Taiwan
Slovenia (need to check SI-Id)
Panama
2021-04-28 10:03:02 +02:00
UT from dolibit
29cb154028
Update llx_10_c_regions.sql
...
China
Taiwan
sorting completed
2021-04-28 09:38:19 +02:00
altairis-noe
9fc67275fd
llx_c_productbatch_status to migration and translatable strings
2021-04-27 15:55:51 +02:00
kamel
3a673c9210
Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_00007
2021-04-27 12:29:10 +02:00
Antonin MARCHAL
5fd0c1b810
fix(code)eldy's remarks
2021-04-27 09:55:35 +02:00
Laurent Destailleur
890c053deb
Merge pull request #17353 from dolibit-ut/patch-301
...
Update llx_20_c_departements.sql
2021-04-27 01:30:17 +02:00
Laurent Destailleur
fa1ad82663
Fix id in comment
2021-04-26 23:42:49 +02:00
Laurent Destailleur
566a9da56a
Merge pull request #17367 from dolibit-ut/patch-302
...
Update llx_10_c_regions.sql
2021-04-26 23:40:33 +02:00
Laurent Destailleur
819a5bd0bd
Merge pull request #17373 from indelog/public_donationpaiement
...
Add : register donation payment when public payment
2021-04-26 22:46:48 +02:00
kamel
9c46b234cf
FIX Supplier invoices (deposit, multicurency in lines)
2021-04-26 17:43:27 +02:00
Laurent Destailleur
fd2d317b4a
Fix #yogosha5881
2021-04-25 15:55:36 +02:00
Dorian Vabre
e9b35cf36b
mail template modified to add company name and remove useless payment link
2021-04-23 16:53:34 +02:00
Indelog
eb52f5daa0
Add : register donation payment when public payment
...
- When we paid a donation whit public link, create the associated payment and
put its status to payed if all the promised amount is it.
- Set the amount to pay on public page depending to the rest to pay for
the don.
2021-04-22 16:32:05 +02:00
UT from dolibit
c43863c2a8
Update llx_10_c_regions.sql
...
Peru
Hungary
2021-04-22 11:22:40 +02:00
altairis-noe
86812c13ee
no double quote
2021-04-21 09:18:40 +02:00
altairis-noe
d340e21cb3
No translation for dictionary labels
2021-04-20 16:13:36 +02:00
altairis-noe
07cd751c59
batch status dictionnary
2021-04-20 15:51:02 +02:00
Laurent Destailleur
891de3350f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-20 13:30:43 +02:00
Laurent Destailleur
4180a9ef62
FIX pb when saving some export profiles
2021-04-20 13:30:18 +02:00
UT from dolibit
771afbc195
Update llx_20_c_departements.sql
...
Italy new
2021-04-20 13:10:29 +02:00
Laurent Destailleur
74f48d082d
Merge branch 'develop' into fix_rebuild_sequence_for_postgres
2021-04-19 21:46:49 +02:00
Laurent Destailleur
ee9c823c33
Merge pull request #17279 from aspangaro/14a38
...
NEW: Add constant MAIN_BUGTRACK_URL to add possibility to redirect to other service
2021-04-19 21:42:13 +02:00
Laurent Destailleur
da36ed5dfe
Merge pull request #17297 from dolibit-ut/patch-278
...
Update llx_20_c_departements.sql
2021-04-19 21:30:49 +02:00
NextGestion
7cab4dd19d
Manage partnership for members & code optimisation
2021-04-19 15:17:57 +01:00
UT from dolibit
0f0bd34d29
Update llx_10_c_regions.sql
...
-- Mauritius
-- Venezuela
-- United Arab Emirates
-- Portugal
-- Slovenia (correction fk_pays)
2021-04-19 15:38:44 +02:00
Laurent Destailleur
0c53198495
Easier to click
2021-04-18 20:18:38 +02:00
Laurent Destailleur
2b894e8ab3
css
2021-04-18 20:13:18 +02:00
NextGestion
5a8742b3eb
Cancel Partnership For Expired Members & Warning of partnership if Dolibarr backlink not found on partner website
2021-04-17 13:25:28 +01:00
NextGestion
f7b1ee9aba
Add property "website" on the member card
2021-04-17 13:15:16 +01:00
NextGestion
87bcb212df
Merge branch 'develop' into dolibarr_partnership
2021-04-17 13:51:21 +01:00
UT from dolibit
b9f0bc454b
Update llx_20_c_departements.sql
...
Tunisia
2021-04-16 17:00:10 +02:00
UT from dolibit
4b0e846e25
Update llx_10_c_regions.sql
...
Tunesia
Luxembourg
Morocco
2021-04-16 16:50:08 +02:00
NextGestion
f784114176
Add email template for accepted partnership
2021-04-16 13:53:12 +01:00
NextGestion
0d4a1d061a
Merge branch 'develop' into dolibarr_partnership
2021-04-16 11:01:08 +01:00
NextGestion
9304b3c474
Manage mass action "Send email" for Partnership module
2021-04-16 09:54:11 +01:00
Laurent Destailleur
8e2cc43eb1
Clean code
2021-04-15 19:19:58 +02:00
Laurent Destailleur
f2bd030f91
Clean code
2021-04-15 19:14:43 +02:00
Alexandre SPANGARO
140f098c79
NEW: Add constant MAIN_BUGTRACK_URL to add possibility to redirect to other service
2021-04-14 23:16:30 +02:00
Gauthier PC portable 024
9ca67b81f8
FIX : correction migration queries for postgres
2021-04-14 18:49:21 +02:00
Gauthier PC portable 024
4d643db4e6
FIX : travis
2021-04-14 16:14:03 +02:00
Gauthier PC portable 024
a596424328
FIX : Rebuild sequence for postgres only after query "INSERT INTO llx_salary(rowid
2021-04-14 16:01:48 +02:00
Anthony Berton
7137b3ddcc
Update llx_societe.sql
2021-04-14 11:49:37 +02:00
Laurent Destailleur
192fcb89d2
Merge pull request #17097 from NextGestion/dolibarr_partnership
...
Create Partnership Module
2021-04-13 16:33:54 +02:00
Laurent Destailleur
4edf710594
Merge pull request #17220 from dolibit-ut/patch-263
...
Update llx_10_c_regions.sql
2021-04-13 15:58:43 +02:00
Laurent Destailleur
4bbe02c209
Merge pull request #17223 from atm-gauthier/fix_migration_script
...
FIX : UPDATE query must not use alias for postgres compatibility
2021-04-13 15:37:42 +02:00
Laurent Destailleur
1bae707246
Prepare table for future enhancement
2021-04-13 11:38:37 +02:00
Laurent Destailleur
9e491ad30c
Add comment
2021-04-13 10:18:23 +02:00
Laurent Destailleur
3d681d96c4
Merge pull request #17205 from DorianVabre/dev_EventOrganizer
...
new: working on conference or booth object and event type #FoundationFunding
2021-04-12 16:06:13 +02:00
Laurent Destailleur
8a62d97b89
Remove one thousand of useless files
2021-04-12 15:57:16 +02:00
Gauthier PC portable 024
aff07ac13c
FIX : UPDATE query must not use alias for postgres compatibility
2021-04-12 14:43:28 +02:00
UT from dolibit
8faaebb05f
Update llx_10_c_regions.sql
...
add new: Denmark
2021-04-11 18:10:33 +02:00
Laurent Destailleur
c0b8aac12d
Merge pull request #17218 from dolibit-ut/patch-262
...
Update llx_10_c_regions.sql
2021-04-11 14:34:18 +02:00
UT from dolibit
ec9efd8018
Update llx_10_c_regions.sql
...
USA
Honduras
India
Indonesia
Panama
Mexique
Romania
2021-04-11 12:49:08 +02:00
UT from dolibit
051b3cf9ad
Update llx_20_c_departements.sql
...
Hungary - new sorting
2021-04-11 12:37:23 +02:00
Laurent Destailleur
421a515f75
Merge pull request #17214 from dolibit-ut/patch-260
...
Update llx_20_c_departements.sql
2021-04-10 15:29:05 +02:00
UT from dolibit
cb08151473
Update llx_20_c_departements.sql
...
Romania
2021-04-10 13:47:35 +02:00
UT from dolibit
260f39a4d2
Update llx_10_c_regions.sql
...
Switzerland/Suisse
San Salvador
Netherlands
United Kingdom
2021-04-10 13:18:57 +02:00
Laurent Destailleur
5dfebcf351
Merge pull request #17203 from dolibit-ut/patch-256
...
Update llx_20_c_departements.sql
2021-04-10 12:58:31 +02:00
Laurent Destailleur
4e6436c1bb
Merge pull request #17202 from dolibit-ut/patch-255
...
Update llx_10_c_regions.sql
2021-04-10 12:34:51 +02:00
Laurent Destailleur
19b223c484
Merge pull request #17209 from dolibit-ut/patch-258
...
Update llx_c_type_contact.sql
2021-04-10 12:34:37 +02:00
Laurent Destailleur
c86b100477
Update llx_c_type_contact.sql
2021-04-10 12:34:30 +02:00
NextGestion
2035b956a6
Fix Sql & translate files
2021-04-10 10:57:23 +01:00
UT from dolibit
0c343f1f0f
Update llx_c_type_contact.sql
2021-04-09 21:18:42 +02:00
UT from dolibit
d269e8da15
Update llx_c_socialnetworks.sql
2021-04-09 20:55:28 +02:00
Dorian Vabre
b3415f9031
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_EventOrganizer
2021-04-09 16:23:42 +02:00
Dorian Vabre
a99dd2be35
new: add attendees public registration page
2021-04-09 16:20:12 +02:00
Dorian Vabre
a590f945e9
thirdparty creation OK, wip on conforboothattendee creation
2021-04-09 16:12:25 +02:00
UT from dolibit
cf83963e5f
Update llx_20_c_departements.sql
...
Netherlands/Nederland
2021-04-09 15:07:32 +02:00
UT from dolibit
4d243ae072
Update llx_10_c_regions.sql
...
Italy
Spain
2021-04-09 14:56:52 +02:00
Laurent Destailleur
42ddb6e5f0
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/index.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/accounting.lib.php
htdocs/core/lib/website2.lib.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/paiementfourn.class.php
htdocs/public/ticket/view.php
2021-04-09 14:17:41 +02:00
Laurent Destailleur
f5881c6199
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/comm/index.php
htdocs/fourn/class/fournisseur.commande.class.php
2021-04-09 14:02:14 +02:00
NextGestion
d6e4cb7d0b
Merge branch 'develop' into dolibarr_partnership
2021-04-09 12:01:44 +01:00
Laurent Destailleur
0864daf2ad
Merge pull request #17189 from altairisfr/wh_project
...
add fk_project to warehouse table
2021-04-09 11:49:08 +02:00
Laurent Destailleur
d098bf412d
Move directory to match the one of composer package for phpspreadsheet
2021-04-08 17:35:52 +02:00
Christophe Battarel
4f413ca983
add fk_project to warehouse table
2021-04-08 16:46:52 +02:00
Laurent Destailleur
385053f107
Merge pull request #17158 from dolibit-ut/patch-239
...
Update llx_20_c_departements.sql
2021-04-08 15:34:48 +02:00
UT from dolibit
f609d03acc
Update llx_20_c_departements.sql
...
Chile
2021-04-08 15:24:59 +02:00
UT from dolibit
539c29b05f
Update llx_10_c_regions.sql
...
Chile
2021-04-08 14:38:43 +02:00
NextGestion
ace958240d
Merge branch 'develop' into dolibarr_partnership
2021-04-07 12:30:37 +01:00
UT from dolibit
efb88936fd
Update llx_10_c_regions.sql
...
Greece
2021-04-07 12:49:52 +02:00
UT from dolibit
9997ac59c7
Update llx_20_c_departements.sql
...
Honduras Departamentos
2021-04-07 12:38:49 +02: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
Laurent Destailleur
dbc1780817
Merge pull request #16376 from aspangaro/14a22
...
Code enhanced - Standardize field name #14697
2021-04-06 20:01:38 +02:00
Laurent Destailleur
435b47631d
Merge pull request #17126 from dolibit-ut/patch-229
...
Update llx_20_c_departements.sql
2021-04-06 19:32:36 +02:00
Alexandre SPANGARO
36e4f5aa22
Merge remote-tracking branch 'upstream/develop' into 14a22
2021-04-06 10:29:44 +02:00
Alexandre SPANGARO
82b652df8a
NEW: Add deposit on supplier invoice (& somes ajustments)
2021-04-06 09:15:34 +02:00
UT from dolibit
5c01b126a4
Update llx_20_c_departements.sql
...
Luxembourg
2021-04-05 20:01:05 +02:00
UT from dolibit
52ef2fefd4
Update llx_10_c_regions.sql
...
France
Germany
2021-04-05 19:47:12 +02:00
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
d0abcf594c
Merge branch 'develop' into patch-422
2021-04-04 01:38:17 +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
ptibogxiv
52bad238ff
Update 13.0.0-14.0.0.sql
2021-04-03 10:25:44 +02:00
ptibogxiv
8675484d90
Update llx_c_action_trigger.sql
2021-04-03 10:25:29 +02: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
ptibogxiv
cacc785305
Update 13.0.0-14.0.0.sql
2021-04-02 13:48:51 +02:00
ptibogxiv
5329a1792e
NEW add action trigger for member excluded
2021-04-02 13:48:27 +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
Laurent Destailleur
22eb9960fe
Merge pull request #16770 from dolibit-ut/patch-105
...
Update llx_20_c_departements.sql
2021-03-18 23:20:28 +01:00
Alexandre SPANGARO
18d247026d
NEW: Add a sub table to manage product/societe
2021-03-18 17:08:55 +01:00
Laurent Destailleur
8d19c57731
Add fields to know authentication method used
2021-03-18 12:54:49 +01:00
UT from dolibit
e33c035218
Update llx_20_c_departements.sql
2021-03-17 18:27:20 +01:00
Laurent Destailleur
1e93091a22
Merge pull request #16757 from dolibit-ut/patch-101
...
Update llx_10_c_regions.sql
2021-03-17 16:51:37 +01:00
Laurent Destailleur
9d18be0e6f
Merge pull request #16758 from dolibit-ut/patch-102
...
Update llx_20_c_departements.sql
2021-03-17 16:51:10 +01:00
Laurent Destailleur
1685e1be79
Fix to keep tms not updated
2021-03-17 12:39:29 +01:00
UT from dolibit
7a1f81f521
Update llx_20_c_departements.sql
2021-03-17 09:10:07 +01:00
UT from dolibit
c24e3006c0
Update llx_10_c_regions.sql
2021-03-17 08:46:31 +01:00
Laurent Destailleur
66a820ee15
Merge pull request #16718 from dolibit-ut/patch-88
...
Update llx_c_tva.sql
2021-03-16 10:24:08 +01:00
Alexandre SPANGARO
6e17a588bb
Merge remote-tracking branch 'upstream/develop' into 14a22
2021-03-16 03:26:28 +01:00
UT from dolibit
7d9022b71d
Update llx_c_tva.sql
...
-- EN:
-- VAT - value-added tax
-- Source: https://en.wikipedia.org/wiki/Value-added_tax
2021-03-15 21:56:21 +01:00
UT from dolibit
dcce376f4c
Update llx_c_format_cards.sql
2021-03-15 21:50:43 +01:00
Laurent Destailleur
2129adf129
Add more fields to llx_oauth_token
2021-03-15 13:25:08 +01:00
Laurent Destailleur
12f50a76d7
Fix yogosha #5627
2021-03-14 11:48:39 +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
Laurent Destailleur
514a9fb96a
Merge pull request #16561 from Hystepik/develop#1
...
Close #15917 : Improvement to ticket module
2021-03-10 15:49:20 +01:00
ksar
429992ee7f
FIX #16590
2021-03-09 10:46:11 +01:00
Laurent Destailleur
c3a047ee06
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/class/api_agendaevents.class.php
2021-03-08 19:31:47 +01:00
Laurent Destailleur
28c04a684f
Fix position of field
2021-03-08 19:09:02 +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
315e66aa5a
Merge pull request #16537 from altairisfr/pr_sn_unicity
...
Unique serial number management
2021-03-06 11:22:44 +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
56cbf04e77
Update llx_accounting_abc.sql
2021-03-06 10:43:01 +01:00
David
ba6d2c3444
Create llx_accounting_account_mx.sql
...
Hi, i propose add the 'Catalogo y codigo agrupador fiscal del 2019' it's a list taken from the oficial accounts for the electronic accounting in Mexico indicated by government since 2019
And here is the 'oficial' publication: https://dof.gob.mx/nota_detalle.php?codigo=5559612&fecha=07/05/2019
2021-03-05 14:14:18 -08:00
David
fd17f80bb6
Update llx_accounting_abc.sql
...
Hi, i propose add the 'Catalogo y codigo agrupador fiscal del 2019' it's a list taken from the oficial accounts for the electronic accounting in Mexico indicated by government since 2019
And here is the 'oficial' publication: https://dof.gob.mx/nota_detalle.php?codigo=5559612&fecha=07/05/2019
2021-03-05 13:34:51 -08: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
Christophe Battarel
a4dcf603ed
fix repair batch stock for batch=2
2021-03-04 15:33:06 +01:00
Florian HENRY
ecd1915c0a
fix sql
2021-03-04 07:45:27 +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
c2d8dde4b1
Merge branch 'develop' of github.com:FHenry/dolibarr into develop
2021-03-02 22:33:36 +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
0f51072222
Merge HEAD, branch 'develop' of github.com:Dolibarr/dolibarr into develop
2021-03-02 11:01:02 +01:00
Florian HENRY
17c8a32780
fix civility createion PK
2021-03-02 11:00:16 +01:00
Laurent Destailleur
7f209f7cc7
Clean code
2021-03-02 02:55:24 +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
Florian HENRY
e101ff0d6d
change comlumn name
2021-03-01 15:34:02 +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
Frédéric FRANCE
8548715a18
add experimental repair script to utf8mb4
2021-02-27 15:48:41 +01:00
Florian HENRY
d5dc95d99e
add status column
2021-02-27 15:36:36 +01:00
Florian HENRY
5221b59539
set correct field name as conference or booth are in actioncomm table
2021-02-27 15:34:28 +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
5c0ea476e1
Look and feel v14
2021-02-27 12:45:07 +01:00
Laurent Destailleur
338ee6563b
Merge pull request #16463 from frederic34/hrm_code_syntax
...
code syntax hrm imports install intracommreport loan directory
2021-02-26 19:24:03 +01:00
Laurent Destailleur
dd72a52e8f
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/balancebymonth.php
htdocs/accountancy/class/accountancyexport.class.php
2021-02-26 19:23:23 +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
Laurent Destailleur
d5566dbf8f
FIX #16431
2021-02-26 19:18:03 +01:00
Frédéric FRANCE
6cef78befb
code syntax hrm imports install intracommreport loan directory
2021-02-26 18:20:21 +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
stickler-ci
eac95a1a29
Fixing style errors.
2021-02-22 14:18:47 +00:00
Frédéric FRANCE
858a65a173
code syntax
2021-02-22 15:18:01 +01:00
Frédéric FRANCE
93aa12a573
remove space and code syntax
2021-02-22 14:41:20 +01:00
Laurent Destailleur
40d23c5082
Update inc.php
2021-02-22 14:15:06 +01:00
BENKE Charlene
8c95bc399a
fix Notice error on install
2021-02-22 13:12:06 +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
e8e6ecb42e
Merge pull request #16352 from aspangaro/14a17
...
NEW: Update list of taxes by default for France
2021-02-19 17:35:19 +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
Alexandre SPANGARO
3f08a9dcde
Add IS
2021-02-18 22:08:31 +01:00
Alexandre SPANGARO
8696bebee1
NEW: Update list of taxes by default for France
2021-02-18 22:05:46 +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
bfe71e8509
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-17 14:28:19 +01:00
Laurent Destailleur
0d841ecb1e
Reduce field size
2021-02-16 19:36:14 +01:00
Laurent Destailleur
532734a2bb
Add regions of TW
2021-02-16 17:45:09 +01:00
Laurent Destailleur
dbe6d43dcd
Add states of TW
2021-02-16 17:39:27 +01:00
Laurent Destailleur
d16276ea2c
Clean code
2021-02-16 11:15:42 +01:00
Laurent Destailleur
d02a75e5fc
Comment
2021-02-15 20:14:57 +01:00
Laurent Destailleur
32370bf63d
Look and feel v14
2021-02-15 20:13:38 +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
026259ebd7
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/ajax.lib.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/product/fournisseurs.php
2021-02-15 13:12:27 +01:00
Laurent Destailleur
6e21839169
Fix migration
2021-02-15 11:50:59 +01:00
Laurent Destailleur
b2826025f6
Fix missing event type
2021-02-15 11:48:48 +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
Florian HENRY
b5055a5edb
config pages ok
2021-02-14 16:41:57 +01:00
Laurent Destailleur
5392e11370
Add missing ethiopian birr currency
2021-02-11 23:05:01 +01:00
Laurent Destailleur
e1334f34b6
Complete repair to clean not correctly available extrafields on proposal
2021-02-11 18:08:01 +01:00
Laurent Destailleur
2615d63024
Complete repair to clean not correctly available extrafields on proposal
2021-02-11 18:02:21 +01:00
Gauthier PC portable 024
23f5c1c1c3
FIX : migration script
2021-02-09 14:28:55 +01:00
Gauthier PC portable 024
14f0b225bb
Merge branch '12.0_new_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries
2021-02-09 11:27:21 +01:00
Gauthier PC portable 024
9b18b15d8a
FIX : several fixes
2021-02-09 11:25:30 +01:00
Francis Appels
d29fa04930
Merge remote-tracking branch 'Dolibarr/develop' into develop_mo_pmp
2021-02-09 10:51:34 +01:00
Gauthier PC portable 024
cd3ac694bb
FIX : tables
2021-02-09 10:38:35 +01:00
Gauthier PC portable 024
d106fe7e90
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-02-09 09:50:46 +01:00
Laurent Destailleur
401b4f641d
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/card.php
2021-02-08 22:13:50 +01:00
Laurent Destailleur
d073e809e7
FIX removed no more used proc update_modified_column_date_m on pgsql
2021-02-08 17:32:36 +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
Adrien Jussak
ee1a4ee54f
FIX #16143
...
Remove the function update_modified_column_date_m is required because old triggers can throw errors during PDF generation
2021-02-08 16:47:46 +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
41af1a59f4
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-02-08 10:37:01 +01:00
Gauthier PC portable 024
4aab970e87
FIX : sql migration
2021-02-08 10:36:10 +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
Laurent Destailleur
3dedd81f37
Same width for all picto of menu
2021-02-06 11:56:27 +01:00
Frédéric FRANCE
b2ea91e0cc
prefix can be null
2021-02-06 10:46:15 +01:00
Frédéric FRANCE
874c60035f
modules can add prefix for menu
2021-02-06 10:23:17 +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
Gauthier PC portable 024
8784e5d043
FIX : several merge errors
2021-02-05 11:12:55 +01:00
Gauthier PC portable 024
df8ca1ef84
Merge branch '12.0_new_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries
2021-02-05 09:29:20 +01:00
Gauthier PC portable 024
e188ec6cd7
NEW : add real payments on salaries objects
2021-02-04 17:21:08 +01:00
Laurent Destailleur
eee49b9132
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/delais.php
2021-02-04 13:50:07 +01:00
Laurent Destailleur
eca010937f
FIX Trigger on expense report was not fired
...
FIX Bad dates on info tabs
2021-02-04 11:56:53 +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
Laurent Destailleur
f301635681
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formmail.class.php
2021-02-03 21:02:32 +01:00
Laurent Destailleur
3b8b0d59ba
Merge pull request #16142 from OPEN-DSI/fix_erreur_facture_fourn
...
FIX: Select transport mode function when create a supplier invoice and add unique key to the table llx_c_transport_mode in migrate sql
2021-02-03 20:24:44 +01:00
Laurent Destailleur
348fd0fcb5
FIX #16160
2021-02-03 19:36:10 +01:00
Laurent Destailleur
217989d0e2
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-02 15:37:40 +01:00
Laurent Destailleur
3021c22198
Clean files
2021-02-02 13:49:03 +01:00
Laurent Destailleur
6b32fd33fd
Fix export with excell
2021-02-02 13:33:44 +01:00
Francis Appels
b685a7549e
add newline at end of file
2021-02-02 12:19:34 +01:00
Francis Appels
dae997dd4c
Merge remote-tracking branch 'Dolibarr/develop' into develop_mo_pmp
2021-02-02 12:18:19 +01:00
Francis Appels
45970ac443
Update database with new fields
2021-02-02 11:13:14 +01:00
kamel
506ba822e9
FIX: Select transport mode function when create a supplier invoice and add unique key to the table llx_c_transport_mode in migrate sql
2021-02-02 11:06:01 +01:00
Laurent Destailleur
2e9656a5b2
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formactions.class.php
htdocs/filefunc.inc.php
2021-02-02 03:26:20 +01:00
Laurent Destailleur
a19eec7791
FIX #16135
2021-02-02 00:41:44 +01:00
Laurent Destailleur
daf88944f8
FIX #16118 Timezone problem on some fields
2021-02-02 00:19:41 +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
a9d4390a47
Merge branch '12.0_new_payments_on_vat' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_vat_objects
2021-02-01 11:52:56 +01:00
Gauthier PC portable 024
509e9d597e
FIX : table name for VAT payments must be llx_payment_vat
2021-02-01 11:47:43 +01:00
Laurent Destailleur
b24aac1e6b
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/commande/list.php
2021-01-31 12:03:39 +01:00
Laurent Destailleur
2b59a20ce1
Merge pull request #15988 from atm-lena/13.0_FIX_Merge_Societe
...
FIX Societe Merge : "unknow column fk_soc" + "Delivery" label
2021-01-30 13:22:00 +01:00
atm-lena
cfca26a727
Fix fix
2021-01-29 16:20:43 +01:00
Gauthier PC portable 024
5adcc3361b
FIX : credits
2021-01-28 17:24:47 +01:00
Gauthier PC portable 024
d364755792
NEW : migration script
2021-01-28 17:20:01 +01:00
Gauthier PC portable 024
0c43ea1e9b
Merge branch 'NEW/fk_user_on_social_charge' of github.com:atm-gauthier/dolibarr into NEW_develop/fk_user_on_social_charge
2021-01-28 17:16:24 +01:00
Gauthier PC portable 024
cce38a9e6d
NEW : fk_user on social charge
2021-01-28 16:58:55 +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
Laurent Destailleur
599d69b07c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-22 13:40:08 +01:00
Laurent Destailleur
e1b6f33894
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contact/card.php
htdocs/contact/class/contact.class.php
htdocs/langs/fr_FR/stocks.lang
htdocs/modulebuilder/template/myobject_list.php
2021-01-22 13:40:00 +01:00
Laurent Destailleur
ad2f5ea7c1
Update website template
2021-01-22 12:39:59 +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
3926d102b9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-19 16:22:38 +01:00
Laurent Destailleur
113ef1a02b
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/user/class/user.class.php
2021-01-19 16:21:53 +01:00
Laurent Destailleur
803ae91136
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-01-19 16:20:19 +01:00
Laurent Destailleur
a81b3a0d61
FIX #15946
2021-01-19 15:23:36 +01:00
Laurent Destailleur
14ef211ed5
Merge pull request #15997 from bb2a/warehouse_on_thirparty
...
NEW Add Warehouse affect on Thirparty
2021-01-19 12:38:33 +01:00
Laurent Destailleur
8e357bf695
Update 13.0.0-14.0.0.sql
2021-01-19 12:37:48 +01:00
Laurent Destailleur
7472b102e4
Fix name of constraints
2021-01-19 12:32:37 +01:00
Laurent Destailleur
3033b1d5da
Update llx_societe.key.sql
2021-01-19 12:30:50 +01:00
Laurent Destailleur
67d9b38e45
No foreign key when field stored for a "defaut value"
2021-01-19 12:30:16 +01:00
Laurent Destailleur
f54efca075
Clean code
2021-01-19 12:25:05 +01:00
Gauthier PC portable 024
b2eca0a314
FIX : VAT declaration list + migration script
2021-01-19 12:02:05 +01:00
Gauthier PC portable 024
e2abbbcece
Merge branch '12.0_new_payments_on_vat' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_vat_objects
2021-01-19 08:57:24 +01:00
Gauthier PC portable 024
2cfaf5fbd6
NEW : add real payments on vat objects
2021-01-18 17:08:17 +01:00
Laurent Destailleur
250b530b29
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/filefunc.inc.php
2021-01-18 11:07:46 +01:00
Frederick Jost Zweig
267caf7ac8
Added 'US-BASE' and 'CA-ENG-BASE' to models list
...
Added 'US-BASE' and 'CA-ENG-BASE' chart of accounts names to the 'Chart of accounts models' list.
2021-01-18 02:22:23 +01:00
Frederick Jost Zweig
ed796cd500
Removed 'pcg_subtype' column
...
The 'pcg_subtype' column of the table 'llx_accounting_account' has been removed in recent Dolibarr versions, so it has to be removed in this file also. Otherwise, the US chart of account can't be enabled.
2021-01-18 02:22:16 +01:00
Anthony Berton
89ac5e8803
1
2021-01-17 02:09:21 +01:00
Laurent Destailleur
a4109d3fd0
Merge pull request #15600 from Hystepik/develop#2
...
Close #15384 : New widget stat database
2021-01-16 18:42:50 +01:00
Laurent Destailleur
4c50f25c12
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-15 11:41:45 +01:00
Laurent Destailleur
c6c7cbf208
Fix trans
2021-01-15 11:21:47 +01:00
atm-lena
e2696d7718
FIX Societe Merge : "unknow column fk_soc" + "Delivery" label
2021-01-15 09:58:04 +01:00
Laurent Destailleur
aaddda9a6e
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/list.php
htdocs/accountancy/bookkeeping/listbysubaccount.php
htdocs/accountancy/class/accountancyexport.class.php
htdocs/user/class/usergroup.class.php
2021-01-14 14:13:08 +01:00
Laurent Destailleur
ea60a824ee
Comment
2021-01-14 11:07:48 +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
8fca2ce2eb
Fix field size
2021-01-08 00:52:38 +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
Laurent Destailleur
55b46ca149
Merge pull request #15318 from bafbes/abb120353
...
New: add notification on ACTION_CREATE event
2021-01-07 11:17:33 +01:00
Laurent Destailleur
ba68c958e1
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-05 19:12:57 +01:00
UT from dolibit
a370ba1bbc
Update check.php
...
$arrayphpminversionwarning = array(5, 6, 0);
2021-01-05 18:53:19 +01:00
lmarcouiller
d88adb3d47
move line 553 of 12 to 13 migration to 13 to 14
2021-01-05 18:10:57 +01:00
lmarcouiller
6aa2241617
Merge remote-tracking branch 'doligithub/develop' into develop#2
2021-01-05 18:07:34 +01:00
Marc de Lima Lucio
f03f5701f6
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_product_customer_price_ref
2021-01-05 16:01:31 +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
Laurent Destailleur
7f0f72ca47
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-02 16:19:18 +01:00
Laurent Destailleur
1ab459e854
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-02 16:19:08 +01:00
Laurent Destailleur
601d4618d4
Missing vat rates
2021-01-02 14:52:37 +01:00
Frédéric FRANCE
8ad9c3dbe9
fix migration for icstransfert
2021-01-02 09:07:16 +01:00
Laurent Destailleur
3cb71ef53e
Code comment
2021-01-01 22:55:22 +01:00
Laurent Destailleur
b88ee6eff4
Merge pull request #15815 from FHenry/dev_add_tag_on_massaction
...
NEW: Add mass action add tag for product/service, user, thirdparty, warehouse, project, bank account, members
2021-01-01 21:36:15 +01:00
Laurent Destailleur
71e4a672f5
Merge branch 'develop' into develop_patch-1
2021-01-01 20:52:43 +01:00
Laurent Destailleur
8149478c77
Merge pull request #15308 from aspangaro/14a2
...
NEW: Dictionary for availability - Add column position
2020-12-30 13:12:27 +01:00
Laurent Destailleur
17b68a30d7
Merge branch 'develop' into dev_add_tag_on_massaction
2020-12-30 13:10:02 +01:00
Alexandre SPANGARO
a843d7fac3
Merge remote-tracking branch 'upstream/develop' into 14a5
2020-12-29 21:10:25 +01:00
Alexandre SPANGARO
9f0434eb69
Merge remote-tracking branch 'upstream/develop' into 14a2
2020-12-29 04:50:32 +01:00
Florian HENRY
806b40662f
merge develop
2020-12-28 21:15:25 +01:00
Alexandre SPANGARO
5001cfce71
NEW: Accountancy - Format FEC - Add new field DateLimitReglmt
2020-12-28 04:12:23 +01:00
Alexandre SPANGARO
9eaeab1208
Merge remote-tracking branch 'upstream/develop' into 14a5
2020-12-28 03:30:41 +01:00
Laurent Destailleur
4a8e72c997
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/ecm/file_card.php
2020-12-27 21:00:07 +01:00
Laurent Destailleur
5ff53691a5
Fix migration
2020-12-27 19:13:09 +01:00
Laurent Destailleur
96040980d7
Fix upgrade
2020-12-27 19:06:56 +01:00
Laurent Destailleur
30d2c8fb56
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-12-27 15:19:07 +01:00
Laurent Destailleur
f8b179a1be
Merge pull request #15351 from frederic34/patch-13
...
separate ref and rowid in members
2020-12-27 15:18:55 +01:00
Laurent Destailleur
e4d7ce371e
Add file for #15351
2020-12-27 15:16:21 +01:00
Laurent Destailleur
4c9a597c8a
Update 12.0.0-13.0.0.sql
2020-12-27 15:13:20 +01:00
Laurent Destailleur
1546805b9e
Merge pull request #15500 from frederic34/patch-10
...
NEW add db fields note_public note_private for ecm
2020-12-27 15:07:51 +01:00
Florian HENRY
5ae5f3e7ac
let societe project acctioncomme website accounr
2020-12-24 00:32:54 +01:00
Laurent Destailleur
6d1799eb25
Merge branch 'develop' into fixphpcs_2020_12
2020-12-21 18:08:20 +01:00
Gauthier PC portable 024
5116337e0b
FIX : stickler feedbacks
2020-12-21 13:29:44 +01:00
Laurent Destailleur
0195c11437
Add missing field required for real funnel of prospection.
2020-12-21 12:58:03 +01:00
Gauthier PC portable 024
7b739920a2
NEW : Workstations management
2020-12-21 12:28:45 +01:00
Laurent Destailleur
d3bd709ad6
Fix phpcs
2020-12-20 18:51:17 +01:00
Frédéric FRANCE
f9ea75df3d
fix phpcs
2020-12-20 10:28:06 +01:00
Laurent Destailleur
5cbdad7fa7
Fix autofill pass
2020-12-19 16:33:58 +01:00
Laurent Destailleur
9c759e91f0
Fix debug management of docs in ticket module
2020-12-16 19:01:26 +01:00
Laurent Destailleur
e4c853b162
Enable module product batch
2020-12-16 17:00:14 +01:00
Laurent Destailleur
6f75e24fd7
Fix better error management in migration
2020-12-16 15:10:11 +01:00
Laurent Destailleur
812fd22629
Merge branch 'develop' into develop#2
2020-12-15 14:09:29 +01:00
Alexandre SPANGARO
593f5bcb7a
Merge remote-tracking branch 'upstream/develop' into 14a5
2020-12-15 06:50:22 +01:00
Laurent Destailleur
acb73966f7
Clean code. Removed phpexcel library.
2020-12-13 16:27:44 +01:00
Laurent Destailleur
5778b1f022
Merge pull request #15744 from frederic34/mycompanysocialnetworks
...
my company social networks
2020-12-13 12:54:22 +01:00
Frédéric FRANCE
4c09e14c49
fix sql error
2020-12-13 10:32:23 +01:00
Frédéric FRANCE
1b75ac9ffe
add github
2020-12-12 21:17:18 +01:00
Laurent Destailleur
bfa8383bed
Fix migration script
2020-12-12 12:30:13 +01:00
Laurent Destailleur
33bb1919f0
Merge branch 'develop' into develop#3
2020-12-12 12:23:33 +01:00
Laurent Destailleur
4fa1248d15
Fix avoid duplicate rows after double migration
2020-12-11 16:53:03 +01:00
lmarcouiller
a5cf177025
Close #15729 : first push
2020-12-11 15:22:29 +01:00
Laurent Destailleur
59938147b6
Prepare v13
2020-12-10 13:38:12 +01:00
Laurent Destailleur
d040f53dc2
Update web templates
2020-12-10 13:02:51 +01:00
Laurent Destailleur
a5eb2e56cb
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/card.php
2020-12-08 22:27:27 +01:00
Laurent Destailleur
75b8794d72
Fix column must be NULL
2020-12-08 22:23:24 +01:00
Laurent Destailleur
0f2a8d0262
Fix timestamp field
2020-12-08 17:20:45 +01:00
Alexandre SPANGARO
78dc1eaa83
Merge remote-tracking branch 'upstream/develop' into 14a5
2020-12-08 13:51:01 +01:00
Hystepik
3d674abfae
Merge branch 'develop' into develop#2
2020-12-08 09:01:20 +01:00
Hystepik
2ac98d06f5
Merge branch 'develop' into develop#3
2020-12-07 09:03:59 +01:00
Frédéric FRANCE
a2eab824c1
Merge remote-tracking branch 'upstream/develop' into patch-10
2020-12-04 20:42:22 +01:00
Frédéric FRANCE
914d2ae7f7
Merge remote-tracking branch 'upstream/develop' into patch-13
2020-12-04 20:40:35 +01:00
Laurent Destailleur
4ba31ae52e
Debug missing column packaging
2020-12-04 19:40:56 +01:00
Laurent Destailleur
10bef6eb03
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/opensurvey/class/opensurveysondage.class.php
htdocs/product/class/product.class.php
htdocs/supplier_proposal/card.php
2020-12-04 19:24:29 +01:00
Florian HENRY
7a5a6a14f0
fix At install insert shipment mode failed
2020-12-04 09:10:36 +01:00
Alexandre SPANGARO
13f985d280
NEW: Accountancy - Introduce "Level3" - Define account directly in thirdparty
2020-12-04 04:13:42 +01:00
Laurent Destailleur
8a7f7b3551
FIX Request on purchase orders in timeout even on very small databases
2020-12-03 18:38:18 +01:00
Laurent Destailleur
210ccc4b43
FIX Missing very important performance indexes
2020-12-03 18:34:32 +01:00
Laurent Destailleur
bfe4eb7309
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/emailcollector_card.php
htdocs/core/modules/modProduct.class.php
2020-12-03 11:26:53 +01:00
Hystepik
4830f4a3b4
Merge branch 'develop' into develop#2
2020-12-03 11:05:00 +01:00
lmarcouiller
647294e88e
fix #15384 migration
2020-12-03 11:04:24 +01:00
lmarcouiller
e08f6aeb2b
Fix #15383
2020-12-03 11:00:29 +01:00
Hystepik
7fc050e3ce
Merge branch 'develop' into develop#3
2020-12-03 10:39:25 +01:00
Laurent Destailleur
56d5cd0402
Fix missing .php into name of boxes added into llx_boxes_def
2020-12-03 10:22:53 +01:00
Hystepik
ecb5a3b028
Merge branch 'develop' into develop#3
2020-12-03 10:12:19 +01:00
lmarcouiller
032116b235
changes to not diplay won and lost and add on migration
2020-12-03 10:11:16 +01:00
Laurent Destailleur
450aa7cbea
Merge pull request #15597 from dolibit-ut/patch-51
...
Update llx_accounting_abc.sql
2020-12-02 19:47:19 +01:00
Laurent Destailleur
4c8043bd9f
Merge pull request #15598 from dolibit-ut/patch-52
...
Update llx_const.sql
2020-12-02 19:17:31 +01:00
Laurent Destailleur
37b6a15dbb
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-12-02 19:13:44 +01:00
Laurent Destailleur
d88173d7ba
Fix bad column
2020-12-02 19:13:32 +01:00
Laurent Destailleur
9d2a78003e
Merge pull request #15606 from Zebedeu/develop
...
New add VAT RAT for Angola
2020-12-02 18:34:32 +01:00
Laurent Destailleur
38b67b0de6
Merge pull request #15616 from dolibit-ut/patch-54
...
Update llx_accounting_account_ca.sql
2020-12-02 18:31:58 +01:00
Laurent Destailleur
409b73fe2c
FIX #15582
2020-12-02 15:16:04 +01:00
Marcio Zebedeu
561c7438bc
New Add Angola City name
...
Angola province/city support added
2020-12-02 12:36:15 +01:00
Marcio Zebedeu
73edd081dd
New Support for Angolan currency added
...
Support for Region Angola added
2020-12-02 12:04:35 +01:00
UT from dolibit
8944670c03
Update llx_accounting_account_ca.sql
...
subtype_pcg removed
2020-12-02 08:28:16 +01:00
Stephane Lesage
1c4876b417
more transporters in llx_c_shipment_mode.sql
2020-12-01 21:17:03 +01:00
Marcio Zebedeu
f7a8a02b98
Update llx_c_tva.sql
2020-12-01 20:07:58 +01:00
Marcio Zebedeu
de9a32972f
New currency for Angolan added
...
Support for Angolan currency added
2020-12-01 19:48:49 +01:00
Marcio Zebedeu
ea1393a7cb
New add VAT RAT for Angola
...
VAT rate support for Angola was added.
2020-12-01 19:29:11 +01:00
lmarcouiller
bca89fc204
add dolibarr_state_board in migration
2020-12-01 15:57:15 +01:00
UT from dolibit
9d1da25f03
Update llx_const.sql
2020-12-01 13:57:33 +01:00
UT from dolibit
f847425f23
Update llx_accounting_abc.sql
2020-12-01 13:48:18 +01:00
Laurent Destailleur
00ad6df395
Fight against $_POST
2020-11-30 14:47:07 +01:00
Laurent Destailleur
7634212811
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/system/phpinfo.php
htdocs/commande/stats/index.php
htdocs/compta/facture/stats/index.php
2020-11-29 21:35:03 +01:00
Laurent Destailleur
6a8ddacb33
Prepare database to allow to disconnect other session after a password
...
change
2020-11-29 21:01:57 +01:00
Laurent Destailleur
de98ef1718
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2020-11-29 20:57:43 +01:00
Laurent Destailleur
d45fe6c17f
FIx #15551
2020-11-29 20:39:39 +01:00
Laurent Destailleur
fab9b3d50c
Fix warning
2020-11-28 18:34:13 +01:00
Laurent Destailleur
574919de52
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
htdocs/accountancy/bookkeeping/balance.php
htdocs/adherents/class/subscription.class.php
htdocs/compta/bank/categ.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/boxes/box_task.php
htdocs/core/class/commondocgenerator.class.php
htdocs/core/class/interfaces.class.php
htdocs/core/lib/project.lib.php
htdocs/core/modules/modCategorie.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fichinter/class/fichinterrec.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/install/repair.php
htdocs/main.inc.php
htdocs/product/price.php
htdocs/projet/tasks/time.php
htdocs/reception/card.php
2020-11-27 15:45:12 +01:00
Laurent Destailleur
4a5cdd0092
Several fixes in export and repair tool
2020-11-27 15:27:35 +01:00
Frédéric FRANCE
1704de39bb
Merge remote-tracking branch 'upstream/develop' into patch-10
2020-11-27 11:18:04 +01:00
Frédéric FRANCE
9a2f945807
Merge remote-tracking branch 'upstream/develop' into patch-13
2020-11-27 11:15:10 +01:00
BENKE Charlene
c2bd30a7e9
working progress
2020-11-26 11:59:00 +01:00
BENKE Charlene
c860c0dc4a
Add default BOM
2020-11-26 11:47:45 +01:00
Laurent Destailleur
e1a6e8f2fc
CSS
...
Security: Add param to fight against Clickjacking attacks
2020-11-26 11:29:16 +01:00
Laurent Destailleur
d8bf7b2714
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
2020-11-25 18:04:06 +01:00
Laurent Destailleur
ac859bc38e
Merge pull request #15531 from FHenry/develop
...
Fix bank transfert supplier
2020-11-25 13:06:10 +01:00
Frédéric FRANCE
c09a6d1435
Merge remote-tracking branch 'upstream/develop' into patch-10
2020-11-25 12:59:32 +01:00
Florian HENRY
e2b96a834d
add SCOP and SCIC in ent form juridique
2020-11-25 12:11:00 +01:00
Florian HENRY
12ef03f06d
fix banck tranfert supplier
2020-11-25 10:58:34 +01:00
Jean-Sébastien Pédron
9b1dbf8d2a
llx_accounting_account_fr.sql: Remove left over field data
...
In commit 86d9622360 , the `pcg_subtype`
was removed from the inserted values.
In commit a85dfaf71e , values associated
with this field were removed. However, at least two lines in the
PCG99-BASE accounting accounts still had that field values.
This led to errors when importing the PCG99-BASE accounts. This patch
fixes the problem and the accounts can be imported successfully.
2020-11-24 22:19:21 +01:00
Laurent Destailleur
47cfdb4ef2
Prepare database to be ready for a future fix on sessions
2020-11-24 11:38:05 +01:00
Frédéric FRANCE
2225ff0ba4
Update 12.0.0-13.0.0.sql
2020-11-23 23:59:37 +01:00
Frédéric FRANCE
909a723d48
Update llx_ecm_files.sql
2020-11-23 23:57:56 +01:00
Frédéric FRANCE
886945829e
Update llx_ecm_directories.sql
2020-11-23 23:56:03 +01:00
Laurent Destailleur
9004be1df2
Debug feature to send remind by email
2020-11-21 17:42:07 +01:00
Laurent Destailleur
32ae1bf350
Sync transifex
2020-11-18 15:56:06 +01:00
Laurent Destailleur
6c42535eb2
Maxi debug v13
2020-11-16 12:20:18 +01:00
UT from dolibit
1f8a8459fa
Update llx_c_currencies.sql
2020-11-13 11:25:58 +01:00
Laurent Destailleur
b71cd0edea
Merge pull request #15378 from orebd/debug_ticket
...
Fix some tickets issue
2020-11-13 09:58:57 +01:00
Laurent Destailleur
6d4d3c618d
FIX #15369 and standardize permission "readall"
2020-11-13 09:55:53 +01:00
Aurélien
d9d32524f7
Fix #14460
2020-11-13 00:36:25 +01:00
Laurent Destailleur
7be3a2267e
Add missing vat rates
2020-11-12 22:23:21 +01:00
jcp
10ae18fe44
Update SQL migration
2020-11-12 19:42:20 +01:00
Frédéric FRANCE
1b6dfee2bd
modify sql
2020-11-11 13:56:45 +01:00
Laurent Destailleur
42ea51be49
Fix migration
2020-11-11 07:43:45 +01:00
Frédéric FRANCE
c796d3e3e7
do not reset ref if already entered
2020-11-10 23:10:42 +01:00
Frédéric FRANCE
016c9915ef
Update 12.0.0-13.0.0.sql
...
add ref in class
add ref in getNomUrl
add ref on card
2020-11-10 23:03:03 +01:00
Frédéric FRANCE
22713ae9fb
Update llx_adherent.key.sql
2020-11-10 22:19:21 +01:00
Frédéric FRANCE
87678bff7f
Update 12.0.0-13.0.0.sql
2020-11-10 22:14:37 +01:00
Frédéric FRANCE
8650054c34
Update llx_adherent.sql
2020-11-10 22:11:03 +01:00
Alexandre SPANGARO
82d1f99010
Merge remote-tracking branch 'upstream/develop' into 14a2
2020-11-10 04:09:00 +01:00
jcp
eb0fd1674d
Update ICS
2020-11-09 18:40:57 +01:00
bahfir abbes
11099132da
New: add notification on ACTION_CREATE event
2020-11-06 00:48:23 +01:00
Laurent Destailleur
529d7ca9cb
Merge pull request #15305 from fappels/13_fix_reception_update
...
Fix sql error reception update, tms is auto timestamp
2020-11-05 19:22:55 +01:00
Regis Houssin
6348a64369
FIX missing rename file date_m to tms
2020-11-05 18:45:30 +01:00
Alexandre SPANGARO
61bca50fa6
NEW: Dictionary for availability - Add column position
2020-11-05 16:56:28 +01:00
Francis Appels
1ca0083eb8
Fix sql error reception update, tms is auto timestamp
...
remove deprecated
2020-11-05 14:30:30 +01:00
Laurent Destailleur
c399721345
Update doc
2020-11-05 09:16:51 +01:00
Laurent Destailleur
e0ed89c514
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/productaccount.php
htdocs/compta/facture/card.php
htdocs/contrat/class/contrat.class.php
htdocs/core/actions_addupdatedelete.inc.php
htdocs/product/class/product.class.php
htdocs/product/price.php
htdocs/projet/tasks/time.php
2020-11-01 17:58:41 +01:00
Laurent Destailleur
49ccf2a3cb
Update doc
2020-11-01 15:55:51 +01:00
Scrutinizer Auto-Fixer
ab25e047c0
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 17:51:30 +00:00
Scrutinizer Auto-Fixer
7f52920716
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 13:32:18 +00:00
Laurent Destailleur
0a9c7fc577
Look and feel v13
2020-10-31 04:19:22 +01:00
Laurent Destailleur
cb3e204281
Fix use of dolibarr_main_distrib
2020-10-30 13:06:55 +01:00
Scrutinizer Auto-Fixer
208740c9c4
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-28 16:49:52 +00:00
Laurent Destailleur
19b82047f0
Fix sql
2020-10-27 10:00:35 +01:00
Laurent Destailleur
07729ec431
Merge pull request #15150 from FHenry/dev_fix_migration_livraison_to_delivery
...
fix migration livraison to delivery
2020-10-26 19:28:59 +01:00
Laurent Destailleur
0abce469e9
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-10-26 19:09:08 +01:00
Laurent Destailleur
f18a13b2d4
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/product/class/productcustomerprice.class.php
2020-10-26 19:08:11 +01:00
Laurent Destailleur
3ee618d736
FIX Clean orphan records in llx_ecm_files into repair script.
2020-10-26 18:31:12 +01:00
Marc de Lima Lucio
f4e63bb046
NEW: ref in product customer price: add fields in database
2020-10-26 10:52:22 +01:00
Florian HENRY
949be12e19
fix migration livraison to delivery
2020-10-25 17:26:15 +01:00
Laurent Destailleur
8578a7cd7c
Fix regressions
2020-10-25 17:02:25 +01:00
Laurent Destailleur
cd4d738a56
Merge branch 'translateModLivraison2ModDelivery' of
...
https://github.com/orebd/dolibarr into develop
# Conflicts:
# htdocs/install/mysql/migration/12.0.0-13.0.0.sql
2020-10-25 16:01:18 +01:00
Drosis Nikos
6ea9befb48
Add & Update tva for Greece
2020-10-16 15:20:12 +03:00
Laurent Destailleur
64b1a31e45
Merge pull request #15018 from FHenry/dev_add_dict_NatureOfProductType
...
NEW : Nature of product is now a dictionay
2020-10-15 21:07:42 +02:00
Laurent Destailleur
a1913995df
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/boxes/box_services_contracts.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/expensereport/class/expensereport.class.php
2020-10-15 21:05:00 +02:00
Laurent Destailleur
e7992131ec
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/boxes/box_services_contracts.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
2020-10-15 21:00:49 +02:00
Laurent Destailleur
6277422115
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/contrat/class/contrat.class.php
htdocs/core/boxes/box_services_contracts.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/expensereport/class/expensereport.class.php
2020-10-15 20:38:32 +02:00
Florian HENRY
a0d1e96bfd
fix table creation for intracom and change reserved name column name
2020-10-15 11:37:44 +02:00
Florian HENRY
0597768ea8
fix review
2020-10-15 08:28:38 +02:00
Florian HENRY
50a9bd368c
review
2020-10-14 18:15:48 +02:00
Florian HENRY
940d478aec
UI and db OK
2020-10-14 15:54:48 +02:00
Florian HENRY
77de8c242c
commit add table
2020-10-14 12:24:35 +02:00
Laurent Destailleur
805fa00422
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-10-13 15:09:24 +02:00
Laurent Destailleur
035325152f
Fix migration
2020-10-13 15:02:05 +02:00
Aurélien
abfcb73a45
FIX unkwown columm tms #14947
2020-10-13 12:10:06 +02:00
Laurent Destailleur
726fd1b631
Merge pull request #11227 from aspangaro/10.0_intracommreport
...
NEW module Intracomm report
2020-10-12 13:35:58 +02:00
Laurent Destailleur
45e2a6409e
Missing field
2020-10-12 11:30:53 +02:00
Laurent Destailleur
b36b9170b2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-10-10 15:45:22 +02:00
Laurent Destailleur
437eead694
Fix bad permission
2020-10-10 15:45:04 +02:00
Alexandre SPANGARO
8876457b54
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2020-10-10 06:47:05 +02:00
Francis Appels
4fb83a0dd6
Fix migration
2020-10-09 15:35:09 +02:00
Alexandre SPANGARO
ca7ad35342
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2020-10-09 06:39:42 +02:00
Aurélien
3daf530a92
Revert "update dependencies migration12->13.sql #14697 "
...
This reverts commit 5fa481422a .
2020-10-08 18:52:17 +02:00
Aurélien
b6283c1a5d
Merge remote-tracking branch 'upstream/develop' into translateModLivraison2ModDelivery
2020-10-08 16:19:10 +02:00
Aurélien
5fa481422a
update dependencies migration12->13.sql #14697
2020-10-08 15:56:44 +02:00
Regis Houssin
111f73bd86
FIX add default value of timestamp for avoid error
2020-10-08 12:29:01 +02:00
Laurent Destailleur
4674eda45a
Standardize columns comment
2020-10-08 10:13:44 +02:00
Aurélien
9c02390066
fix migration12->13.sql #14697
...
fix drop constraint
fix error on update extrafields
2020-10-07 21:50:54 +02:00
Aurélien
16e076d182
fix UPDATE llx_extrafields.elementtype = livraison to delivery #14697
2020-10-07 20:54:56 +02:00
Laurent Destailleur
c7ca99accb
Fix default value of enabled property of menu entry
2020-10-07 15:38:07 +02:00
AurelienBinard
39d538befc
Merge branch 'develop' into translateModLivraison2ModDelivery
2020-10-06 16:20:25 +02:00
Aurélien
d103a9aede
rename table on migration #14697
2020-10-06 14:35:27 +02:00
Aurélien
af7c23b2ac
rename folder admin/livraison.php and dependencies #14697
2020-10-06 12:05:24 +02:00
Aurélien
140200213e
change table into DB and ref #14697
2020-10-06 11:04:31 +02:00
Alexandre SPANGARO
d83d9895e0
NEW Vat report - Invert constant to show by default zero vat in reports
2020-10-05 20:52:31 +02:00
Laurent Destailleur
1c34868028
Fix field must be null because there is no numbering ref module yet
2020-10-03 11:16:31 +02:00
Laurent Destailleur
c2fed95dc4
FIX #14877
2020-10-02 19:54:06 +02:00
Frédéric FRANCE
b78e506e39
add files
2020-10-02 00:25:44 +02:00
Frédéric FRANCE
7afb62c55d
Merge remote-tracking branch 'upstream/develop' into ecm_extrafields
2020-10-02 00:24:48 +02:00
Frédéric FRANCE
f057488ae3
add extrafields on ecm
2020-10-02 00:21:13 +02:00
Laurent Destailleur
14736bee63
Merge pull request #14852 from inovea-conseil/newfieldwebsite
...
NEW website page fields
2020-10-01 19:31:14 +02:00
Florian
c89f8b323b
Rename fk_typeobject to type_object
2020-10-01 15:18:19 +02:00
Laurent Destailleur
8b2ba8cbba
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
htdocs/bom/bom_card.php
htdocs/core/class/ldap.class.php
htdocs/core/lib/files.lib.php
htdocs/fichinter/class/fichinterrec.class.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/admin.lang
2020-09-29 13:28:22 +02:00
Laurent Destailleur
29414251f5
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/lib/files.lib.php
2020-09-29 13:19:03 +02:00
Nicolas
dfba9a06ad
NEW Field to link website page to an other object
2020-09-28 20:39:02 +02:00
Inovea Conseil
789defa46f
Merge remote-tracking branch 'Dolibarr/develop' into newfieldwebsite
2020-09-28 20:08:22 +02:00
Laurent Destailleur
4cf6e483ca
Fix export of various payments.
2020-09-28 18:49:20 +02:00
Florian
bdb38da9d3
Add 2 new field typeObject and ObjectId to website
2020-09-28 18:17:23 +02:00
Laurent Destailleur
0dcd85485a
Fix migration
2020-09-25 12:36:32 +02:00
Laurent Destailleur
7a9332815c
Fix migration
2020-09-25 12:22:24 +02:00
Laurent Destailleur
83bdd530cd
Fix sql error in menu edition, column too short
2020-09-25 10:13:45 +02:00
Laurent Destailleur
bc7b5b1468
Update website templates for v13
2020-09-24 21:37:21 +02:00
Laurent Destailleur
80ec1ad69f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-09-23 19:29:07 +02:00
zecsn
98dc0bbb6e
Reformat comments
2020-09-23 16:53:04 +05:00
zecsn
a4c8a5a69d
Fix SQL Error
...
Fix SQL Error DB_ERROR_SYNTAX on Installation
2020-09-23 16:43:53 +05:00
atm-lena
0fc6e9b84f
FIX - Backtick not work with postgresql
2020-09-23 10:54:49 +02:00
Laurent Destailleur
5f4547bf7c
Prepare table for future features
2020-09-22 10:38:16 +02:00
Laurent Destailleur
c4ef21a8f2
Increase timeout delay for install
2020-09-21 14:04:46 +02:00
Laurent Destailleur
84cc04a2c6
Increase timeout delay for install
2020-09-21 14:04:07 +02:00
Laurent Destailleur
d38168f49e
Fix escape
2020-09-19 22:59:04 +02:00
Laurent Destailleur
c4b5f5a249
Maxi clean of code
2020-09-18 01:29:17 +02:00
Laurent Destailleur
8029b80f08
Fix install hangs
2020-09-17 13:03:34 +02:00
Laurent Destailleur
b690bab1a8
Fix regression: missing column
2020-09-16 01:06:54 +02:00
Laurent Destailleur
5c31593d43
Add date of birth in candidatures
2020-09-16 00:47:44 +02:00
Laurent Destailleur
1015d3c026
Merge pull request #14716 from 99Deon/develop
...
fix bug in "llx_c_ticket_category.sql" table .
2020-09-14 00:17:16 +02:00
Cédric
29931bbded
Update 12.0.0-13.0.0.sql
2020-09-12 18:55:26 +02:00
Cédric
1f5419c883
Update llx_paiement.sql
2020-09-12 18:53:02 +02:00
chkernit
7252022afe
fix problem in table "llx_c_ticket_category.sql"
...
when install dolibarr project the step of creation tables does not completed because there are a bug in create llx_c_ticket_category.sql table .
2020-09-12 16:33:07 +01:00
Laurent Destailleur
1f8278c8ca
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
htdocs/core/class/html.formmail.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/langs/en_US/other.lang
htdocs/product/class/product.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-09-12 04:42:59 +02:00
Laurent Destailleur
05a2fc6186
Fix rate for tunisia
2020-09-10 19:40:03 +02:00
Laurent Destailleur
177ec5eb39
Fix mandatory field
2020-09-09 19:25:16 +02:00
Laurent Destailleur
e439eb636e
Merge pull request #14660 from FHenry/dev_updatedocker
...
Update Docker build to new standard (version 3 of docker-compose)
2020-09-09 15:26:06 +02:00
Laurent Destailleur
86ed4dfa2b
Debug hidden option MAIN_USE_EXPENSE_IK
2020-09-08 11:51:36 +02:00
Laurent Destailleur
c91338198d
Add some fields in candidature
...
Look and feel v13
2020-09-08 01:53:37 +02:00
Florian HENRY
07242a1c5d
Merge branch 'develop' into dev_updatedocker
2020-09-07 15:43:03 +02:00
Scrutinizer Auto-Fixer
b78ff67d7e
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-09-07 08:18:17 +00:00
Laurent Destailleur
52fe2a4d96
Merge pull request #14642 from nlouahedj/develop
...
NEW Algeria data (tva and forme_juridique)
2020-09-05 11:36:47 +02:00
Noureddine LOUAHEDJ
8d7bbe3dcb
NEW tva Algerie
2020-09-05 08:58:51 +01:00
Noureddine LOUAHEDJ
ebf718fdae
NEW forme_juridique Algerie
2020-09-05 08:58:29 +01:00
Laurent Destailleur
84f4020f49
Update llx_facturedet.sql
2020-09-04 23:12:12 +02:00
Laurent Destailleur
02e07c13c8
Merge branch 'develop' into patch-8
2020-09-04 23:11:00 +02:00
Cédric
c5fda967c7
add field ref_ext in llx_facturedet
2020-09-04 22:57:21 +02:00
Laurent Destailleur
b2c20c3dfd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-09-04 22:42:48 +02:00
Laurent Destailleur
451c878cfc
Fix add missing field
2020-09-04 22:42:37 +02:00
Cédric
e9d6e04c25
NEW field ref_ext in llx_commandedet
2020-09-04 21:36:01 +02:00
Cédric
38bc98cf7d
ADD ref_ext field in llx_facturedet
2020-09-04 19:38:24 +02:00
Laurent Destailleur
092b66a7f1
Add variation_ref_ext field
2020-09-04 13:35:16 +02:00
Laurent Destailleur
1ceb7c8677
Add ref_ext to product_attribute.
2020-09-04 12:41:56 +02:00
Laurent Destailleur
5d40380a07
Add index on status
2020-09-01 15:17:52 +02:00
Florian HENRY
0099d98096
Merge remote-tracking branch 'origin/develop' into dev_updatedocker
2020-09-01 14:32:49 +02:00
Laurent Destailleur
887d4e0603
Add unique key on table of inventory details
2020-08-31 20:02:06 +02:00
Florian HENRY
9614dcf9ec
fix comment
2020-08-29 18:38:26 +02:00
Laurent Destailleur
b721930b3b
Merge pull request #14568 from atm-lena/NEW_AgendaEvent_Remind
...
Agenda Remind (Part 1)
2020-08-29 05:19:21 +02:00
Laurent Destailleur
8e70a731d3
doc
2020-08-29 04:42:14 +02:00
Laurent Destailleur
c6bdd27d4c
FIX #14530
2020-08-27 21:52:25 +02:00
Laurent Destailleur
8f34f4c1c5
FIX #14530
2020-08-27 21:46:28 +02:00
Laurent Destailleur
5c1680e9c5
Merge branch 'develop' into master
2020-08-27 19:58:29 +02:00
ATM john
236d2862af
Fix install table
2020-08-26 21:56:50 +02:00
atm-lena
cc29654f47
WIP : rename fk_project to fk_actioncomm + add line to sql file to install
2020-08-26 16:48:09 +02:00
atm-lena
a01d1b58c7
Add fk_email_template
2020-08-26 16:06:20 +02:00
atm-lena
cf9337b644
Add fk_project to actioncommreminder object
2020-08-26 15:58:14 +02:00
atm-lena
552e655668
Add field "entity" in actioncommrminder object and table
2020-08-26 15:22:32 +02:00
Laurent Destailleur
7c39543c72
Support trigger in module recruitment
...
Enhance generic code of automatic recording events
2020-08-25 12:47:38 +02:00
Laurent Destailleur
60d76000d7
Fix bad column name
2020-08-24 17:23:33 +02:00
andreubisquerra
e032ddc035
Change variable to pos_change
2020-08-23 22:27:18 +02:00
andreubisquerra
ec2479a41a
Update 12.0.0-13.0.0.sql
2020-08-23 22:26:22 +02:00
Laurent Destailleur
b600478a5a
Work on recruitment module
2020-08-23 22:11:16 +02:00
Laurent Destailleur
3fe0ffe7e2
Add unique index on email_msgid of candidatures
2020-08-23 15:18:31 +02:00
Laurent Destailleur
ca2a34a4c9
Standardize code: Rename fields date_m into tms. All timestamp fields
...
are now name "tms".
2020-08-23 15:15:47 +02:00
Laurent Destailleur
a265bec7ca
NEW Events in agenda for contact
...
FIX Saving contacts of an events
2020-08-23 02:38:56 +02:00
jove@bisquerra.com
d9cbd8f998
NEW: Print payment method and change in TakePOS
2020-08-22 18:28:15 +02:00
Laurent Destailleur
03af14294a
Standardize code. Debug module HRM
2020-08-22 15:29:19 +02:00
Laurent Destailleur
dabe804299
Add numbering modules for candidatures. Mass action Validate.
2020-08-22 03:49:46 +02:00
Laurent Destailleur
a508e7ae08
Migration
2020-08-21 22:17:20 +02:00
Laurent Destailleur
e6616563d2
Fix size of field
2020-08-21 22:01:28 +02:00
Laurent Destailleur
220fc6db98
Work on recruitment module
2020-08-21 13:00:12 +02:00
Laurent Destailleur
ad0625b6ec
Debug posting message from ticket page
2020-08-21 01:11:22 +02:00
Laurent Destailleur
0390111132
Add column bomtype
2020-08-20 23:32:35 +02:00
Laurent Destailleur
eb15a8e4db
Enhance email collector module
2020-08-20 23:03:57 +02:00
Laurent Destailleur
2f18ab0ea9
Debug generation of document for warehouse
2020-08-18 14:55:56 +02:00
Laurent Destailleur
58e25768a7
NEW Add PDF document templates for warehouses (list of stock)
2020-08-18 14:02:36 +02:00
Laurent Destailleur
816aeadcba
Merge pull request #14465 from atm-john/develop_declinaison_price_multiple_merge
...
NEW : Declinaison price level compatibility
2020-08-16 23:18:49 +02:00
Alexandre SPANGARO
27c36713d3
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2020-08-16 22:10:02 +02:00
John Botella
41cbe6db12
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_declinaison_price_multiple_merge
2020-08-12 10:39:21 +02:00
John Botella
f0268b4aaf
Add declinaison price level
2020-08-12 10:14:29 +02:00
atm-thibaultf
10810bc5bb
Modify int to float for stock limit alert and desired stock
2020-08-12 09:09:59 +02:00
Laurent Destailleur
4e6158d23c
Work on recruitment module
2020-08-08 02:54:14 +02:00
Laurent Destailleur
dd510901a4
Fix duplicate field
2020-08-07 14:05:15 +02:00
Laurent Destailleur
e72e05d5f5
Add field default_lang for users
2020-08-07 13:31:23 +02:00
Laurent Destailleur
7a03521664
Doc
2020-08-07 12:07:34 +02:00
Laurent Destailleur
561520b44c
WIP Recruitment module
2020-08-06 16:06:15 +02:00
Laurent Destailleur
43b23994e4
WIP Recruitment module
2020-08-06 15:55:04 +02:00
Laurent Destailleur
e830e7f3d3
Work on recruitment module
2020-08-06 13:14:43 +02:00
Laurent Destailleur
d9818405c6
Fix regression for v13
2020-08-02 22:30:23 +02:00
Laurent Destailleur
7297950308
Merge pull request #13759 from OPEN-DSI/stcommcontact
...
NEW: Add prospect status managment for the contact with managment of custom icon
2020-08-02 22:01:00 +02:00
Laurent Destailleur
aca20c89f9
Can use a generic email for recruitment
2020-08-02 18:45:42 +02:00
Laurent Destailleur
be34a2c607
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/cashdesk.lang
htdocs/product/stock/list.php
2020-08-02 16:06:51 +02:00
Laurent Destailleur
ecfdb4bbac
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-08-02 16:02:09 +02:00
kkhelifa-opendsi
fe0f77b967
Merge branch 'develop' into stcommcontact
2020-07-31 16:41:17 +02:00
Laurent Destailleur
2687666579
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-07-29 13:54:12 +02:00
Laurent Destailleur
44cfb77622
FIX #14292
2020-07-29 12:43:53 +02:00
Laurent Destailleur
81cb5501bc
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/system/database-tables.php
2020-07-28 10:32:27 +02:00
Laurent Destailleur
4e4f0a4575
Use same case for all sql files
2020-07-28 09:44:48 +02:00
Laurent Destailleur
6e36fba4f3
NEW Development of module Recruitment
2020-07-24 11:54:57 +02:00
Laurent Destailleur
895fe63d3b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-07-24 01:53:51 +02:00
Laurent Destailleur
431b207dab
Fix to solve sql error on some databases
2020-07-24 01:02:07 +02:00
ATM john
921e904acc
Fix MySQL rank usage for column
2020-07-23 20:34:11 +02:00
Laurent Destailleur
8d26329653
Merge branch '12.0' of https://github.com/dolibarr/dolibarr into develop
...
Conflicts:
htdocs/core/lib/price.lib.php
htdocs/projet/activity/perday.php
2020-07-19 02:24:26 +02:00
Laurent Destailleur
d598039f20
Merge pull request #14218 from Ahuahuachi/12.0
...
Update Mexico City name
2020-07-19 02:01:12 +02:00
Laurent Destailleur
48adeb9dd7
FIX #14256
2020-07-19 01:38:38 +02:00
Laurent Destailleur
31cb57afc9
Fix regression with ecoterm
2020-07-18 23:27:43 +02:00
Laurent Destailleur
179f3d44c6
Merge pull request #14238 from dolibit-ut/patch-32
...
Update llx_c_incoterms.sql
2020-07-18 19:09:26 +02:00
UT from dolibit
60f904bbd3
Update llx_c_incoterms.sql
...
add column label for short standard term in english
(libelle to use for long description (in user language))
2020-07-14 14:15:44 +02:00
UT from dolibit
7184fba8c6
Update llx_c_incoterms.sql
...
add column 'label' for short term description in english
add new Incoterm DPU (DAT is obsolete , but let it stay for older documents)
2020-07-14 13:59:16 +02:00
Alfredo Altamirano
6aae68bb07
Change Mexico City name
...
Mexico City official name and code changed since 2016
2020-07-11 10:49:05 -05:00
Laurent Destailleur
eede2f9944
Add telangana province for india
2020-07-11 10:39:12 +02:00
Alexandre SPANGARO
1855d54019
Fix data insertion
2020-07-06 04:31:32 +02:00
Alexandre SPANGARO
0525dd3c1f
Fix migration - Move to v13
2020-07-06 03:28:53 +02:00
Alexandre SPANGARO
59ee22537d
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2020-07-06 03:24:27 +02:00
Laurent Destailleur
344098fe23
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contrat/card.php
htdocs/core/actions_fetchobject.inc.php
htdocs/langs/fr_FR/contracts.lang
htdocs/langs/fr_FR/loan.lang
htdocs/langs/fr_FR/stocks.lang
2020-07-05 13:01:00 +02:00
Laurent Destailleur
1c19c97cf2
FIX missing setup of extrafields for MO
...
FIX all extrafields cleared after update of one of them
FIX Update of extrafields date
FIX Update of extrafiels on draft object
FIX Sql type
Fix trans on BOM
2020-07-04 16:14:53 +02:00
Laurent Destailleur
6a37d12bd9
Fix sql type
2020-07-04 16:10:13 +02:00
Laurent Destailleur
83eaddb17b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/class/evalmath.class.php
htdocs/core/class/extrafields.class.php
htdocs/install/mysql/migration/11.0.0-12.0.0.sql
htdocs/langs/en_US/cashdesk.lang
htdocs/societe/class/societe.class.php
2020-07-04 13:13:17 +02:00
Laurent Destailleur
26c6e2d92e
Clean code
2020-07-02 03:34:28 +02:00
Laurent Destailleur
5afd518718
Update vat rate for Congo
2020-06-30 13:06:44 +02:00
Laurent Destailleur
146c521efd
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/security.lib.php
htdocs/filefunc.inc.php
2020-06-29 18:06:42 +02:00
Laurent Destailleur
600a24346a
Some people are missing this table
2020-06-28 22:09:17 +02:00
Laurent Destailleur
ab88890f3a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-28 21:48:28 +02:00
Laurent Destailleur
2de1433818
FIX #14142
2020-06-28 21:05:36 +02:00
Laurent Destailleur
e2b1b853c0
Minor performance enhancements
2020-06-26 01:44:21 +02:00
Laurent Destailleur
333d4873c3
Properties ->contactid has been renamed into ->contact_id
2020-06-25 12:17:47 +02:00
Laurent Destailleur
6d25b8630b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/prelevement.php
htdocs/core/class/rssparser.class.php
2020-06-23 11:38:20 +02:00
Laurent Destailleur
566c1aaf84
Fix for credit transfer module
2020-06-22 22:54:33 +02:00
Laurent Destailleur
c54294285a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
2020-06-20 12:28:14 +02:00
Laurent Destailleur
989737af6b
Update website templates
2020-06-19 10:36:19 +02:00
Laurent Destailleur
6c2d70d43b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-17 19:27:39 +02:00
Laurent Destailleur
2f687a3c40
FIX #14033
2020-06-17 17:57:32 +02:00
Laurent Destailleur
f0e4fa40f8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-16 22:42:07 +02:00
Laurent Destailleur
b90a45ed7a
Complete #14078
2020-06-16 22:41:50 +02:00
Laurent Destailleur
faf4da0d68
Merge branch 'develop' into fixloan2
2020-06-16 22:40:45 +02:00
Laurent Destailleur
15dd1bd705
Merge
2020-06-14 21:50:40 +02:00
Laurent Destailleur
2d5c35b12a
Fix debug sepa module
2020-06-14 21:46:32 +02:00
DEMAREST Maxime (Indelog)
4df658ccb2
Fix and improvement on Loan module
...
* Fix page redirection on loan delete.
* Add dedicated status for loan with started payment (show if payment is
started on loan card).
* Add fk_payment_loan property for loan_schedule and add link to loan payment
on shedule page for paid line.
* Make it not possible to use schedule if start loan payment without it (else
values in schedule can't be good).
* If modify capital in payment with schedule set, automatically updates it
with the new value.
* Can't modify interest in payment if schedule is used (causes the
inconsistency for value in schedule).
* User right verification on schedule page.
2020-06-13 09:32:44 +02:00
Laurent Destailleur
dc87d89204
Update 12.0.0-13.0.0.sql
2020-06-12 01:03:58 +02:00
Laurent Destailleur
c27eb5e623
Update llx_const.sql
2020-06-12 01:03:34 +02:00
Laurent Destailleur
fa3ca5c644
Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE
2020-06-12 01:00:15 +02:00
Laurent Destailleur
77c1c46285
Merge pull request #14032 from ptibogxiv/patch-343
...
NEW convert all subscription in datetime
2020-06-12 00:47:55 +02:00
Anthony Berton
c00b55c980
Update 11.0.0-12.0.0.sql
2020-06-11 18:45:35 +02:00
Anthony Berton
bda4753e41
Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE
2020-06-11 18:44:38 +02:00
Anthony Berton
ce7767a154
Create 11.0.0-12.0.0.sql
2020-06-11 18:39:44 +02:00
Anthony Berton
3214b5f199
Merge branch 'PRODUCT_PRICE_BASE_TYPE' of https://github.com/bb2a/dolibarr into PRODUCT_PRICE_BASE_TYPE
2020-06-11 18:37:25 +02:00
Anthony Berton
4a77d06b1e
o
2020-06-11 15:45:31 +02:00
Anthony Berton
848c9df537
Add files via upload
2020-06-11 15:38:05 +02:00
Laurent Destailleur
a70e493c5d
Migration
2020-06-08 11:43:00 +02:00
Laurent Destailleur
6f12488e30
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/filefunc.inc.php
2020-06-07 19:55:48 +02:00
Laurent Destailleur
d1dba53f61
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/admin/modules.php
htdocs/install/mysql/migration/repair.sql
2020-06-07 19:40:17 +02:00
Laurent Destailleur
941362e683
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/compta/facture/class/facture.class.php
2020-06-07 18:59:49 +02:00
Laurent Destailleur
180a0a4557
Info for debug
2020-06-07 18:30:46 +02:00
Laurent Destailleur
f19064abfa
Merge pull request #14044 from dolibit-ut/patch-29
...
create index.html
2020-06-06 21:08:11 +02:00
Laurent Destailleur
da672c8776
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
htdocs/admin/translation.php
htdocs/core/class/html.formfile.class.php
htdocs/societe/card.php
2020-06-06 11:57:31 +02:00
Laurent Destailleur
a305c43901
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/societe/card.php
htdocs/ticket/card.php
2020-06-06 11:51:39 +02:00
Laurent Destailleur
5dd9f4e4c4
Fix travis false positive
2020-06-06 11:36:24 +02:00
UT from dolibit
38b359392a
create index.html
2020-06-06 02:06:55 +02:00
Laurent Destailleur
ca3f62e4ac
Doc repair Row size too large
2020-06-05 17:47:52 +02:00
Laurent Destailleur
c7a614bd50
Fix clean data
2020-06-04 17:07:22 +02:00
ptibogxiv
319710d6aa
Update 12.0.0-13.0.0.sql
2020-06-04 16:50:24 +02:00
ptibogxiv
7da6a063f9
Update llx_subscription.sql
2020-06-04 16:46:36 +02:00
Laurent Destailleur
2324834b73
Debug modulebuilder for doc generation
...
Conflicts:
htdocs/core/class/html.formfile.class.php
htdocs/modulebuilder/template/admin/setup.php
2020-06-01 16:47:50 +02:00
Laurent Destailleur
58e76947ac
Debug modulebuilder for doc generation
2020-06-01 16:44:22 +02:00
Laurent Destailleur
f63aa7f527
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
2020-05-31 23:27:20 +02:00
Laurent Destailleur
67f007ea40
Fix length of field. Make some module die.
2020-05-31 23:12:26 +02:00
Laurent Destailleur
8dbc0ff040
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/prelevement.php
htdocs/admin/system/phpinfo.php
htdocs/modulebuilder/index.php
2020-05-31 00:31:14 +02:00
Laurent Destailleur
c2a9819daa
Debug establishment management
2020-05-29 21:45:50 +02:00
Laurent Destailleur
5a9d968a75
Fix MAIN_BUGTRACK_ENABLELINK and MAIN_HELP_DISABLELINK setting
2020-05-29 00:02:03 +02:00
Laurent Destailleur
2836368017
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/filefunc.inc.php
htdocs/takepos/css/phone.css
htdocs/takepos/invoice.php
2020-05-28 20:20:39 +02:00
Laurent Destailleur
9d7a4cae00
Fix default value
2020-05-28 17:49:56 +02:00
Christian Foellmann
50bac41399
fix #13988 - missing batch field extension
2020-05-28 15:19:48 +02:00
Laurent Destailleur
a2a15ceb5b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/create.php
htdocs/compta/prelevement/demandes.php
htdocs/core/class/html.form.class.php
2020-05-27 23:07:18 +02:00
Laurent Destailleur
15f2165c12
Fix work on payment by bank transfer (avoid confusion between record)
2020-05-27 20:14:11 +02:00
Laurent Destailleur
2f1e653f2f
Fix css
2020-05-27 15:29:09 +02:00
Laurent Destailleur
34d7dbe7e9
Fix css
2020-05-27 14:42:17 +02:00
Laurent Destailleur
40816c02ce
Merge branch 'develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-25 22:40:59 +02:00
Laurent Destailleur
17382051c2
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-25 22:19:50 +02:00
Laurent Destailleur
02b9ce5901
Fix length of title
2020-05-25 18:16:36 +02:00
Laurent Destailleur
0b9e1e6ec6
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-25 13:01:49 +02:00
Laurent Destailleur
0409ec00d7
CSS
2020-05-25 13:01:32 +02:00
Laurent Destailleur
0041bca82f
Fix ambiguous param
2020-05-24 23:49:33 +02:00
Frédéric FRANCE
5aa84c64d0
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-23 18:54:33 +02:00
Laurent Destailleur
bf0327952b
Merge pull request #13875 from ptibogxiv/patch-339
...
NEW Date shipment from order accepts hours
2020-05-23 15:42:24 +02:00
Laurent Destailleur
aec5200a98
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/variants/class/ProductCombination.class.php
2020-05-23 15:37:00 +02:00
Laurent Destailleur
4913d10724
Merge branch 'develop' into patch-339
2020-05-23 15:14:06 +02:00
Francis Appels
875230ed13
Fix missing batch update to varchar(128)
2020-05-23 10:23:26 +02:00
Frédéric FRANCE
b41ac00b98
add new rule
2020-05-21 15:05:19 +02:00
Frédéric FRANCE
a636f81eac
add new rule
2020-05-21 02:17:21 +02:00
Laurent Destailleur
15f3c97fff
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-20 23:59:11 +02:00
Laurent Destailleur
662970f232
Clean sql file
2020-05-20 23:42:28 +02:00
Laurent Destailleur
92cbff7749
Clean code
2020-05-20 23:40:04 +02:00
Laurent Destailleur
954d928467
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-20 20:11:13 +02:00
Laurent Destailleur
cce72ad8d6
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/tpl/objectline_title.tpl.php
htdocs/langs/en_US/bills.lang
htdocs/projet/class/project.class.php
2020-05-20 20:10:48 +02:00
Laurent Destailleur
6f52c62f2a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/install/mysql/migration/repair.sql
htdocs/langs/en_US/bills.lang
2020-05-20 19:53:28 +02:00
Laurent Destailleur
434341316b
suggest some fix to debug situation invoices
2020-05-20 19:51:04 +02:00
Laurent Destailleur
2f7786f50f
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-20 10:37:43 +02:00
Laurent Destailleur
51ed77fbf7
Fix
2020-05-20 09:59:01 +02:00
Anthony Berton
702627155c
Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE
2020-05-19 15:20:18 +02:00
Laurent Destailleur
514009ca6d
Add field position in llx_website
2020-05-18 15:47:21 +02:00
Anthony Berton
ceb3ba0e33
Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE
2020-05-16 16:42:20 +02:00
Anthony Berton
e1f8b50961
Delete 11.0.0-12.0.0.sql
2020-05-16 15:39:49 +02:00
Anthony Berton
ddb413c025
Create 12.0.0-13.0.0.sql
2020-05-16 15:37:13 +02:00
ptibogxiv
8d242cacae
Update 12.0.0-13.0.0.sql
...
update sql
2020-05-15 16:04:36 +02:00
ptibogxiv
e00152a845
Rename 12.0.0.-13.0.0.sql to 12.0.0-13.0.0.sql
2020-05-15 16:03:38 +02:00
ptibogxiv
6a0bc86ea6
Create 12.0.0.-13.0.0.sql
2020-05-15 16:03:03 +02:00
ptibogxiv
703fee0635
Update llx_commande.sql
2020-05-15 15:58:01 +02:00
ptibogxiv
1453b8469e
Update 11.0.0-12.0.0.sql
2020-05-15 15:56:16 +02:00
Laurent Destailleur
215cf9e6f8
Prepare v13
2020-05-14 16:45:32 +02:00
Laurent Destailleur
adcc9e14f6
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-14 16:35:39 +02:00
Laurent Destailleur
92b245ae93
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/facture/card.php
2020-05-14 16:34:24 +02:00
Laurent Destailleur
49cfc1afd8
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/install/upgrade2.php
2020-05-14 16:20:04 +02:00
Laurent Destailleur
b26c1757e6
Prepare v13
2020-05-14 16:07:23 +02:00
Laurent Destailleur
cf039b26f9
Merge pull request #13887 from atm-florianm/FIX_9.0_fatal_during_migration_from_dolibarr_3.1_if_php7
...
FIX 9.0 - fatal during migration from 3.1 using PHP 7
2020-05-14 15:49:08 +02:00
Anthony Berton
06c08ad045
Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE
2020-05-14 15:26:58 +02:00
Laurent Destailleur
68512e0281
Look and feel v12
2020-05-14 14:56:15 +02:00
Laurent Destailleur
a796122f7b
Fix to solve feedbacks of
...
https://www.dolibarr.fr/forum/t/email-collector-avec-office-365-bug-et-contournement/32726
2020-05-14 14:30:32 +02:00
Laurent Destailleur
1bd00b0e8c
Fix to solve feedbacks of
...
https://www.dolibarr.fr/forum/t/email-collector-avec-office-365-bug-et-contournement/32726
2020-05-14 12:28:17 +02:00
Florian Mortgat
bd3504c473
FIX 9.0 - delete unused mandatory argument from migrate_clean_association: argument count mismatch causes a fatal error since php7
2020-05-13 10:26:44 +02:00
ptibogxiv
c6e7b2e6a3
Fix date shipment from order
...
better for pickup collection with date and hour from order
2020-05-12 13:39:02 +02:00
Laurent Destailleur
310c5f9eb6
Fix size of field
2020-05-09 21:56:51 +02:00
Laurent Destailleur
bba8ab657e
Fix add missing migration
2020-05-08 18:57:15 +02:00
Laurent Destailleur
c98663be4a
Fix sql
2020-05-08 14:05:04 +02:00
Laurent Destailleur
94d47c2acd
Fix sql
2020-05-08 14:04:17 +02:00
Laurent Destailleur
206b16410e
Revert the option to avoid to introduce a feature that is duplicate with
...
already existing view "Events/Agenda". It also keeps a common behaviour
between other tools.
Maxi debug on messages of tickets
2020-05-07 22:52:32 +02:00
Anthony Berton
00b9f8445f
Add default const
2020-05-04 17:11:44 +02:00
Laurent Destailleur
4d6a45d491
Major doxygen fix
2020-05-03 22:48:35 +02:00
Laurent Destailleur
c2c0e6517f
Fix init data of units D and H.
2020-05-01 22:44:46 +02:00
Laurent Destailleur
3957b74d9a
Revert "FIX: add auto incrementation to llx_c_typent.sql"
...
This reverts commit 14a3aa2165 .
2020-05-01 22:17:33 +02:00