Frédéric FRANCE
|
2ac908ffcf
|
work on migration script
|
2019-10-01 19:59:49 +02:00 |
|
florian HENRY
|
d48f0fa791
|
resolve conflixt
|
2019-10-01 18:07:59 +02:00 |
|
Frédéric FRANCE
|
9755d15f52
|
work on migration script
|
2019-10-01 17:51:44 +02:00 |
|
Laurent Destailleur
|
b79831ec39
|
Merge pull request #11952 from aspangaro/11.0_https
Move Gnu.org to https
|
2019-10-01 14:48:21 +02:00 |
|
Frédéric FRANCE
|
3b9bf2b06a
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-01 12:25:34 +02:00 |
|
Laurent Destailleur
|
956b46d920
|
Fix warnings
|
2019-10-01 11:37:15 +02:00 |
|
Frédéric FRANCE
|
6a7170f725
|
Merge remote-tracking branch 'upstream/develop' into phpcalendar
|
2019-10-01 07:55:09 +02:00 |
|
Frédéric FRANCE
|
c57c8eee88
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-01 07:41:10 +02:00 |
|
Alexandre SPANGARO
|
16c6c9ae75
|
Merge remote-tracking branch 'upstream/develop' into 11.0_https
|
2019-10-01 06:12:24 +02:00 |
|
Alexandre SPANGARO
|
91b3bf76fd
|
Merge branch 'develop' into 11.0_https
|
2019-10-01 06:11:43 +02:00 |
|
Laurent Destailleur
|
91b7e81085
|
Fix warnings
|
2019-09-30 21:51:42 +02:00 |
|
Frédéric FRANCE
|
31418c2e42
|
check php-calendar extension
|
2019-09-30 21:14:25 +02:00 |
|
Laurent Destailleur
|
3ca1a9ba28
|
Merge branch 'test_pgsql_installation' of https://github.com/atm-greg/dolibarr into atm-greg-test_pgsql_installation
|
2019-09-30 19:59:52 +02:00 |
|
Frédéric FRANCE
|
b87610adcc
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-09-30 19:34:35 +02:00 |
|
Laurent Destailleur
|
22f07fe54d
|
Merge branch 'develop' into patch-234
|
2019-09-30 18:09:05 +02:00 |
|
Frédéric FRANCE
|
258424416e
|
Merge remote-tracking branch 'upstream/develop' into zapier
|
2019-09-30 07:49:52 +02:00 |
|
ptibogxiv
|
f132f2f947
|
Update 10.0.0-11.0.0.sql
|
2019-09-29 15:40:26 +02:00 |
|
ptibogxiv
|
d0b06a1eab
|
Update llx_facture.sql
|
2019-09-29 15:39:59 +02:00 |
|
Frédéric FRANCE
|
cea3669ffa
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-09-28 00:35:14 +02:00 |
|
florian HENRY
|
885d958e63
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault
|
2019-09-27 20:12:09 +02:00 |
|
Laurent Destailleur
|
d0d884742f
|
FIX #11861 Not consistent code to manage measuring units
|
2019-09-27 19:45:33 +02:00 |
|
Laurent Destailleur
|
07b555b965
|
Merge branch 'develop' into patch-255
|
2019-09-27 15:23:15 +02:00 |
|
Laurent Destailleur
|
f5c839217a
|
Merge pull request #11914 from fmarcet/develop
Fix: Load invoices only if showed
|
2019-09-27 14:34:16 +02:00 |
|
Laurent Destailleur
|
6858dce344
|
Rename table for categorie of warehouses
|
2019-09-27 13:28:28 +02:00 |
|
Laurent Destailleur
|
a79c4608d6
|
Merge pull request #11934 from atm-quentin/NEW_stock_categories
NEW Categories/Tags are also available on warehouses
|
2019-09-27 12:41:28 +02:00 |
|
Frédéric FRANCE
|
03086026b8
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-09-27 08:06:13 +02:00 |
|
Frédéric FRANCE
|
5eb0fb462b
|
Merge remote-tracking branch 'upstream/develop' into zapier
|
2019-09-27 07:59:02 +02:00 |
|
Laurent Destailleur
|
72f9073337
|
Clean vat code samples to have cleaner rules for rowid.
|
2019-09-26 12:44:44 +02:00 |
|
Frédéric FRANCE
|
41cb628d05
|
Merge remote-tracking branch 'upstream/develop' into zapier
|
2019-09-25 08:06:44 +02:00 |
|
Laurent Destailleur
|
19c78d42e9
|
Fix az09 -> aZ09
|
2019-09-24 14:20:29 +02:00 |
|
Laurent Destailleur
|
db334a3b94
|
FIX Var not enough sanitized
|
2019-09-24 14:16:24 +02:00 |
|
Ferran Marcet
|
a8cc11d232
|
Merge branch 'developup' into develop
|
2019-09-24 13:38:11 +02:00 |
|
Laurent Destailleur
|
7b3e64d67f
|
NEW Support of Extrafields on Leave requests.
|
2019-09-24 12:01:18 +02:00 |
|
Alexandre SPANGARO
|
02dbc11f98
|
Move Gnu.org to https
|
2019-09-23 21:55:30 +02:00 |
|
Laurent Destailleur
|
64fc735340
|
Fix length of fields to card saved with setupintent
|
2019-09-23 18:12:58 +02:00 |
|
Laurent Destailleur
|
1584a4bf79
|
Add trigger event USER_SENTBYMAIL in agenda
|
2019-09-23 12:27:51 +02:00 |
|
atm-quentin
|
c09f2d8c4e
|
NEW stock categories
|
2019-09-19 16:21:03 +02:00 |
|
Frédéric FRANCE
|
61e358bb9d
|
Merge remote-tracking branch 'upstream/develop' into zapier
|
2019-09-18 21:23:26 +02:00 |
|
Laurent Destailleur
|
a43253eab8
|
Fix for deposit not correctly closed
|
2019-09-17 18:49:56 +02:00 |
|
ptibogxiv
|
b969de46bc
|
Update 10.0.0-11.0.0.sql
|
2019-09-17 14:05:39 +02:00 |
|
ptibogxiv
|
4c59f6bffa
|
Update llx_adherent_type_lang.sql
|
2019-09-17 14:03:55 +02:00 |
|
ptibogxiv
|
430ffae8ad
|
Delete llx_adherent_type_lang.php
|
2019-09-17 14:03:22 +02:00 |
|
ptibogxiv
|
afb055c8a6
|
Create llx_adherent_type_lang.sql
|
2019-09-17 14:03:09 +02:00 |
|
ptibogxiv
|
50be1a634c
|
Create llx_adherent_type_lang.php
|
2019-09-17 14:02:19 +02:00 |
|
Ferran Marcet
|
e4984492b3
|
Dejarlo igual que develop
|
2019-09-17 09:32:43 +02:00 |
|
Ferran Marcet
|
c48fc3a2cf
|
Merge branch 'developup' into develop
# Conflicts:
# htdocs/compta/facture/fiche-rec.php
# htdocs/install/mysql/migration/9.0.0-10.0.0.sql
|
2019-09-17 09:27:42 +02:00 |
|
Frédéric FRANCE
|
850b9fd52a
|
Merge remote-tracking branch 'upstream/develop' into zapier
|
2019-09-17 08:24:31 +02:00 |
|
Maxime Kohlhaas
|
48cbcdc757
|
Fix #11876
|
2019-09-15 17:08:21 +02:00 |
|
Frédéric FRANCE
|
904d0ecaee
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-09-14 18:42:31 +02:00 |
|
Frédéric FRANCE
|
1e652a41af
|
Merge remote-tracking branch 'upstream/develop' into zapier
|
2019-09-14 18:41:51 +02:00 |
|
Laurent Destailleur
|
54f0532073
|
Work on #4432
|
2019-09-14 16:51:57 +02:00 |
|
Frédéric FRANCE
|
c9c7d60fc0
|
Merge remote-tracking branch 'upstream/develop' into zapier
|
2019-09-14 16:37:10 +02:00 |
|
Frédéric FRANCE
|
230c14e189
|
add social networks
|
2019-09-12 22:32:41 +02:00 |
|
Frédéric FRANCE
|
de3a67f5bd
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-09-12 21:52:06 +02:00 |
|
Frédéric FRANCE
|
bed959bb38
|
add entity
|
2019-09-12 21:17:52 +02:00 |
|
Frédéric FRANCE
|
6f33874d75
|
add entity
|
2019-09-12 21:13:00 +02:00 |
|
Laurent Destailleur
|
56a99f6e6d
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-09-12 11:22:13 +02:00 |
|
Frédéric FRANCE
|
3e11476810
|
add socialnetworks dictionary
|
2019-09-11 23:09:20 +02:00 |
|
Frédéric FRANCE
|
e0f17cc71c
|
add socialnetworks dictionary
|
2019-09-11 22:47:23 +02:00 |
|
Frédéric FRANCE
|
3fddef0c9e
|
add socialnetworks dictionary
|
2019-09-11 22:27:09 +02:00 |
|
Laurent Destailleur
|
eeaeefe20c
|
FIX Add repair.php option 'restore' to restore user picture after v10
|
2019-09-11 15:46:37 +02:00 |
|
ptibogxiv
|
651fbde64d
|
Merge branch 'develop' into patch-187
|
2019-09-10 20:46:54 +02:00 |
|
florian HENRY
|
d081a73dca
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault
|
2019-09-10 08:36:54 +02:00 |
|
Laurent Destailleur
|
61cf47aa16
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-09-10 00:14:07 +02:00 |
|
florian HENRY
|
617e430998
|
fix stravis and sticker
|
2019-09-09 12:31:17 +02:00 |
|
florian HENRY
|
63a83a0fa5
|
resolve conflict
|
2019-09-09 11:35:37 +02:00 |
|
Laurent Destailleur
|
8381b93e80
|
Fix init of public holidays
|
2019-09-09 11:06:54 +02:00 |
|
Laurent Destailleur
|
15eaa5cbd8
|
NEW Public holidays are now in a table (no more hard coded per country)
|
2019-09-09 10:27:56 +02:00 |
|
florian HENRY
|
bdb297a380
|
resolve conflict
|
2019-09-09 10:15:44 +02:00 |
|
Laurent Destailleur
|
47f72fb74c
|
Update data file
|
2019-09-08 21:21:58 +02:00 |
|
Frédéric FRANCE
|
4054ebaf27
|
wip
|
2019-09-07 15:12:07 +02:00 |
|
Laurent Destailleur
|
bdbae9b3bc
|
Fix phpcs
|
2019-09-06 23:51:33 +02:00 |
|
Laurent Destailleur
|
ca71f02d41
|
Merge branch 'develop' into develop_pdf
|
2019-09-06 23:30:12 +02:00 |
|
Laurent Destailleur
|
a5f7211730
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
htdocs/install/repair.php
|
2019-09-06 16:10:55 +02:00 |
|
Laurent Destailleur
|
e1ee70fd8f
|
Start to implement date selection of supplier proposals
|
2019-09-06 12:45:27 +02:00 |
|
ptibogxiv
|
ead8d29ed3
|
Update 10.0.0-11.0.0.sql
|
2019-09-06 11:32:46 +02:00 |
|
ptibogxiv
|
e55c7bc378
|
Update llx_facture.sql
|
2019-09-06 11:22:22 +02:00 |
|
florian HENRY
|
dff7be59c8
|
mostlyDone
|
2019-09-06 09:22:53 +02:00 |
|
Laurent Destailleur
|
37a32af7b0
|
NEW Add dictionary to store public holidays.
|
2019-09-05 20:19:13 +02:00 |
|
Regis Houssin
|
ecaa2df0b8
|
FIX change "rowid" type in llx_accounting_account (bigint instead int)
|
2019-09-05 10:37:09 +02:00 |
|
Laurent Destailleur
|
7aaf3ac629
|
Typo
|
2019-09-04 15:41:09 +02:00 |
|
Tim Otte
|
54d0b94b6d
|
Added extrafield support to the product supplier price lines
|
2019-09-04 15:13:42 +02:00 |
|
florian HENRY
|
73c5b9617f
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault
|
2019-09-03 17:07:59 +02:00 |
|
Laurent Destailleur
|
c4a4efe0dc
|
Merge pull request #11769 from Tim-Otte/develop
NEW: Added odt support to supplier orders
|
2019-09-03 13:04:33 +02:00 |
|
florian HENRY
|
405c92640c
|
on going
|
2019-09-02 14:47:32 +02:00 |
|
florian HENRY
|
b535bc0cb9
|
start dev
|
2019-09-02 11:27:04 +02:00 |
|
Laurent Destailleur
|
04057cd83e
|
Prepare reengeneering of project usage
|
2019-09-01 02:02:38 +02:00 |
|
Laurent Destailleur
|
8366d89b41
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/install/mysql/migration/10.0.0-11.0.0.sql
|
2019-08-28 18:15:22 +02:00 |
|
Laurent Destailleur
|
d668b79738
|
NEW Add column tms into the table of targets for emailing
|
2019-08-28 18:14:46 +02:00 |
|
Laurent Destailleur
|
27b61eca32
|
NEW Add column tms into the table of targets for emailing
|
2019-08-28 18:12:02 +02:00 |
|
Tim Otte
|
5abfc04900
|
Merge branch 'develop' into develop
|
2019-08-27 16:37:41 +02:00 |
|
Tim Otte
|
75152cb210
|
Added odt support to supplier orders
|
2019-08-27 16:22:16 +02:00 |
|
Laurent Destailleur
|
69688a22e0
|
Merge
|
2019-08-27 12:33:42 +02:00 |
|
Laurent Destailleur
|
c2c9e1d042
|
Fix warning
|
2019-08-27 12:15:29 +02:00 |
|
Laurent Destailleur
|
047298cded
|
Merge pull request #11511 from atm-florianm/9.0_FIX_dispatched-products-array-bug
9.0 fix dispatched products array bug
|
2019-08-26 23:58:40 +02:00 |
|
Laurent Destailleur
|
1463302bdd
|
Add option to disable the anonymous ping
|
2019-08-23 16:23:31 +02:00 |
|
Laurent Destailleur
|
bc269462a7
|
FIX Do not autocomplete pass on first installation.
|
2019-08-23 15:30:48 +02:00 |
|
ptibogxiv
|
01f0a6a19f
|
Update llx_adherent_type.sql
|
2019-08-23 14:56:59 +02:00 |
|
ptibogxiv
|
b8fce830f7
|
Update llx_adherent_type.sql
|
2019-08-23 14:56:38 +02:00 |
|
ptibogxiv
|
60a7ba463c
|
Update 10.0.0-11.0.0.sql
|
2019-08-23 14:53:40 +02:00 |
|
Florian Mortgat
|
fa29415e6a
|
Moved repair payload from a specific script to install/repair.php
|
2019-08-22 14:06:18 +02:00 |
|
ptibogxiv
|
e43d996780
|
Update 10.0.0-11.0.0.sql
|
2019-08-21 16:45:53 +02:00 |
|
ptibogxiv
|
869e497a48
|
NEW : Platforme compliance with Stripe Connect
|
2019-08-21 16:41:36 +02:00 |
|
Laurent Destailleur
|
23b1c24bf7
|
Fix template
|
2019-08-16 06:28:25 +02:00 |
|
Laurent Destailleur
|
5d1bfdaa29
|
Merge pull request #11678 from atm-greg/develop_fk_projet_on_stock_movement
NEW Add fk projet on stock movement
|
2019-08-15 19:27:06 +02:00 |
|
Laurent Destailleur
|
14030affe5
|
Update website templates
|
2019-08-15 02:57:00 +02:00 |
|
Laurent Destailleur
|
bb35d9be0c
|
Fix copy of templates during activation of module
|
2019-08-15 01:50:01 +02:00 |
|
Laurent Destailleur
|
f81463af0c
|
Update templates
|
2019-08-15 00:55:47 +02:00 |
|
Laurent Destailleur
|
dfe2c3de74
|
Add template stellar
|
2019-08-15 00:31:37 +02:00 |
|
Laurent Destailleur
|
f753799810
|
FIX Support #tag into url of website module
|
2019-08-14 23:27:34 +02:00 |
|
Laurent Destailleur
|
bb4618e2cf
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/website.lib.php
htdocs/website/index.php
|
2019-08-14 04:12:37 +02:00 |
|
Laurent Destailleur
|
77c96a49e1
|
Update website template
|
2019-08-13 04:53:47 +02:00 |
|
Laurent Destailleur
|
8ad2081555
|
NEW Can select website templates from available default templates
|
2019-08-12 22:19:24 +02:00 |
|
atm-greg
|
7c136e77ec
|
bad migration file
|
2019-08-12 15:18:40 +02:00 |
|
atm-greg
|
f8ad8d72c0
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_fk_projet_on_stock_movement
|
2019-08-12 15:16:43 +02:00 |
|
atm-greg
|
acdf13d769
|
add fk_projet on stock movements
|
2019-08-12 15:08:15 +02:00 |
|
Laurent Destailleur
|
86d39b435b
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-08-12 02:42:11 +02:00 |
|
Laurent Destailleur
|
5ca988b3d2
|
Fix position of requests
|
2019-08-12 02:36:15 +02:00 |
|
Frédéric FRANCE
|
d55377981c
|
Update 10.0.0-11.0.0.sql
|
2019-08-07 13:27:55 +02:00 |
|
Frédéric FRANCE
|
28100f67ac
|
Update llx_c_price_expression.sql
|
2019-08-07 13:25:14 +02:00 |
|
ptibogxiv
|
f7134340e8
|
Update llx_product.sql
|
2019-08-04 13:22:01 +02:00 |
|
Laurent Destailleur
|
f8e19beb5a
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-08-01 18:30:59 +02:00 |
|
Laurent Destailleur
|
808d6ba389
|
Fix phpcs
|
2019-08-01 18:30:39 +02:00 |
|
Laurent Destailleur
|
85dbec6ae7
|
Move sql in correct migration file
|
2019-08-01 16:33:34 +02:00 |
|
Laurent Destailleur
|
25725a5a6a
|
Merge pull request #11615 from ptibogxiv/patch-202
Fix wrong sql update version retained_warranty
|
2019-08-01 16:32:00 +02:00 |
|
Laurent Destailleur
|
3d8f6dca76
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-08-01 16:30:32 +02:00 |
|
ptibogxiv
|
ace01f7442
|
Fix wrong sql update version
|
2019-08-01 16:29:42 +02:00 |
|
Laurent Destailleur
|
6693f9fbca
|
Fix phpcs
|
2019-08-01 16:24:19 +02:00 |
|
Laurent Destailleur
|
a7390e7e47
|
Merge pull request #11396 from ATM-Consulting/New_retained_warranty_develop
NEW Management of retained warranty on situation invoices
|
2019-07-30 21:53:09 +02:00 |
|
Laurent Destailleur
|
34f78c555d
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-30 20:55:35 +02:00 |
|
Laurent Destailleur
|
192fb45ce7
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/accountancy/bookkeeping/card.php
htdocs/accountancy/bookkeeping/list.php
htdocs/adherents/card.php
htdocs/compta/sociales/list.php
htdocs/compta/sociales/payments.php
htdocs/core/modules/import/import_csv.modules.php
htdocs/core/modules/import/import_xlsx.modules.php
htdocs/holiday/class/holiday.class.php
htdocs/viewimage.php
|
2019-07-30 20:55:15 +02:00 |
|
Laurent Destailleur
|
5f2439bf0a
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-07-30 20:37:44 +02:00 |
|
Florian Mortgat
|
de293c4ef2
|
FIX issue #9300: install error with PostgreSQL when using custom table prefix
|
2019-07-30 14:09:03 +02:00 |
|
Laurent Destailleur
|
9f7d118f6f
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-27 02:40:56 +02:00 |
|
Laurent Destailleur
|
3a740313fe
|
Merge branch '10.0' into 10.0
|
2019-07-25 18:31:26 +02:00 |
|
Laurent Destailleur
|
a46bfc7a29
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/project.lib.php
|
2019-07-25 17:54:14 +02:00 |
|
Laurent Destailleur
|
e88ca8ae89
|
Fix migration
|
2019-07-25 15:07:24 +02:00 |
|
Laurent Destailleur
|
4833c2bf49
|
Merge
|
2019-07-22 18:50:17 +02:00 |
|
Laurent Destailleur
|
f5afc50067
|
Merge branch '11.0_salaries' of https://github.com/aspangaro/dolibarr into aspangaro-11.0_salaries
|
2019-07-22 18:47:35 +02:00 |
|
Laurent Destailleur
|
a379d7804c
|
Merge pull request #11535 from aspangaro/11.0_p1
QUAL Move ligne.php to line.php
|
2019-07-22 18:33:06 +02:00 |
|
jcp
|
cfaf9ce0ea
|
SET special_code=4 for existing records
|
2019-07-22 11:44:18 +02:00 |
|
Laurent Destailleur
|
5d1a50bcb4
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-20 14:03:18 +02:00 |
|
Laurent Destailleur
|
ac8a776113
|
FIX Column 'paid' missing in expense report
|
2019-07-20 14:02:53 +02:00 |
|
Laurent Destailleur
|
826851e1a9
|
Fix migration
|
2019-07-20 14:01:00 +02:00 |
|
Laurent Destailleur
|
865ebb9de2
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/ticket/class/ticket.class.php
|
2019-07-20 13:29:10 +02:00 |
|
Alexandre SPANGARO
|
5f042cf6ad
|
QUAL Move ligne.php to line.php
|
2019-07-19 23:19:06 +02:00 |
|
Alexandre SPANGARO
|
0af1206892
|
Merge branch 'develop' into 11.0_salaries
|
2019-07-19 23:11:06 +02:00 |
|
Alexandre SPANGARO
|
9ab0734415
|
NEW Extrafields on salaries
|
2019-07-19 23:08:24 +02:00 |
|
Laurent Destailleur
|
fafb7956de
|
Fix position of triggers
|
2019-07-19 18:52:44 +02:00 |
|
Laurent Destailleur
|
a55da8f8f8
|
Fix migration
|
2019-07-19 17:20:33 +02:00 |
|
Alexandre SPANGARO
|
21bd46fc15
|
Merge remote-tracking branch 'upstream/develop' into 11.0_salaries
|
2019-07-17 14:09:46 +02:00 |
|
Alexandre SPANGARO
|
79d8351dda
|
NEW Extrafields on salaries
|
2019-07-17 14:09:25 +02:00 |
|
Laurent Destailleur
|
fed598236c
|
Add field
|
2019-07-17 01:12:48 +02:00 |
|
Laurent Destailleur
|
61a574701b
|
New Add field prefix_session in llx_events
|
2019-07-17 01:11:10 +02:00 |
|
Laurent Destailleur
|
adfbd62f8b
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-14 00:44:35 +02:00 |
|
Laurent Destailleur
|
e0095871aa
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/compta/stats/byratecountry.php
htdocs/core/class/html.form.class.php
|
2019-07-14 00:19:56 +02:00 |
|
Regis Houssin
|
332abd2a9f
|
FIX __INFOS__ tag not exists
|
2019-07-13 11:02:45 +02:00 |
|
Laurent Destailleur
|
e5d34de877
|
FIX compatibility mysql 8. rank is reserved
FIX Permission for BOM menu
|
2019-07-09 00:14:01 +02:00 |
|
Laurent Destailleur
|
4387d40b9a
|
Translation lignes -> lines
|
2019-07-05 21:55:08 +02:00 |
|
Laurent Destailleur
|
f5cc29417d
|
Translation lignes -> lines
|
2019-07-05 21:50:35 +02:00 |
|
Laurent Destailleur
|
46f590f0be
|
Add column iplastlogin and ippreviouslogin
|
2019-07-01 15:44:34 +02:00 |
|
Laurent Destailleur
|
c9477f5c4f
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/filefunc.inc.php
|
2019-07-01 13:29:33 +02:00 |
|
Laurent Destailleur
|
511b21ca9c
|
Fix for doliwamp
|
2019-07-01 00:22:28 +02:00 |
|
Laurent Destailleur
|
46ced373be
|
Fix for doliwamp
|
2019-06-30 23:52:28 +02:00 |
|
Laurent Destailleur
|
8f5b575b19
|
Fix missing php-intl is not blocking (not working on windows)
|
2019-06-30 16:19:26 +02:00 |
|
John Botella
|
7e14a598e2
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
|
2019-06-26 09:43:43 +02:00 |
|
Laurent Destailleur
|
51a1550dbb
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
|
2019-06-25 23:14:49 +02:00 |
|
Laurent Destailleur
|
83f5b23ade
|
Doc
|
2019-06-25 22:39:04 +02:00 |
|
Laurent Destailleur
|
85919d8324
|
Code comment
|
2019-06-25 22:02:19 +02:00 |
|
Laurent Destailleur
|
33ce52364a
|
Drop no more used column
|
2019-06-25 16:08:22 +02:00 |
|
Laurent Destailleur
|
06b3f6a62f
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/adherents/subscription/list.php
|
2019-06-25 13:03:54 +02:00 |
|
Laurent Destailleur
|
b8b0ad0d27
|
Fix migration
|
2019-06-25 11:22:35 +02:00 |
|
John Botella
|
7b6925b8f7
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
|
2019-06-24 10:29:43 +02:00 |
|
Laurent Destailleur
|
c1f6b76a6a
|
Remove deprecated
|
2019-06-22 18:29:24 +02:00 |
|
Laurent Destailleur
|
db241b22dd
|
Fix clean of database
|
2019-06-22 14:33:31 +02:00 |
|
Laurent Destailleur
|
fdff737329
|
Fix clean of database
|
2019-06-22 14:33:04 +02:00 |
|
Laurent Destailleur
|
c089a47b4c
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-06-22 14:15:30 +02:00 |
|
Laurent Destailleur
|
e6ea9cc448
|
Clean widget not correctly removed
|
2019-06-22 14:15:10 +02:00 |
|
Laurent Destailleur
|
22b91f3693
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-06-22 13:28:44 +02:00 |
|
Laurent Destailleur
|
64de57d781
|
FIX bad request
|
2019-06-22 13:28:20 +02:00 |
|
Laurent Destailleur
|
8da5794777
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/accounting.lib.php
htdocs/product/stock/class/entrepot.class.php
|
2019-06-20 18:24:43 +02:00 |
|
Laurent Destailleur
|
faadae8157
|
Code comment
|
2019-06-20 15:59:45 +02:00 |
|
Laurent Destailleur
|
06e5fbd649
|
Merge pull request #11132 from ptibogxiv/patch-174
NEW add API shipment mode dictionnary
|
2019-06-20 03:56:59 +02:00 |
|
Laurent Destailleur
|
77a45b878b
|
Fix migration
|
2019-06-20 03:56:42 +02:00 |
|
Laurent Destailleur
|
40023c8ba2
|
Merge branch 'develop' into patch-174
|
2019-06-20 03:56:29 +02:00 |
|
Laurent Destailleur
|
5fe91afdc2
|
Update 9.0.0-10.0.0.sql
|
2019-06-20 03:54:50 +02:00 |
|
Laurent Destailleur
|
d8c2007d92
|
Prepare v11 alpha
|
2019-06-20 03:53:33 +02:00 |
|
Laurent Destailleur
|
a264a4766a
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-06-20 03:45:04 +02:00 |
|
Laurent Destailleur
|
d152354022
|
Merge pull request #11295 from OPEN-DSI/new-warehouse-extrafield
NEW add extrafields in warehouses
|
2019-06-20 03:16:49 +02:00 |
|
Laurent Destailleur
|
b4cb440b0f
|
Merge pull request #11359 from inoveaconseil/FIX_BOM_sql
Fix bom sql
|
2019-06-20 02:58:24 +02:00 |
|
Laurent Destailleur
|
13abfc3140
|
Code comment
|
2019-06-18 16:46:12 +02:00 |
|
Laurent Destailleur
|
1dc247705d
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/expensereport/list.php
htdocs/holiday/list.php
|
2019-06-18 16:11:16 +02:00 |
|
Laurent Destailleur
|
ae00743590
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-06-18 16:04:48 +02:00 |
|
Laurent Destailleur
|
6afda6a47a
|
FIX invalid link on user.fk_user
|
2019-06-18 15:57:22 +02:00 |
|
Laurent Destailleur
|
8835b49f3f
|
Debug the accounting-file tool
|
2019-06-18 14:30:13 +02:00 |
|
Nicolas ZABOURI
|
96c6994827
|
FIX 2 déclarations of date_valid in SQL
|
2019-06-18 10:55:16 +02:00 |
|
Laurent Destailleur
|
4f03d4f642
|
Merge branch '10.0' into patch-189
|
2019-06-16 17:26:41 +02:00 |
|
Laurent Destailleur
|
badfd47ee7
|
Fix migration
|
2019-06-16 17:25:42 +02:00 |
|
ptibogxiv
|
d838ced12e
|
Update 9.0.0-10.0.0.sql
|
2019-06-14 18:41:38 +02:00 |
|
ptibogxiv
|
cd5c2c3249
|
Update llx_bom_bom.sql
|
2019-06-14 18:39:05 +02:00 |
|
ptibogxiv
|
c6ab092af1
|
add capacity value for product
|
2019-06-14 09:12:53 +02:00 |
|
Laurent Destailleur
|
f41606ba15
|
Merge branch '10.0' into 10.0_Differentiated_export
|
2019-06-12 13:27:49 +02:00 |
|
Laurent Destailleur
|
73326cfbf9
|
Removed bad commited files
|
2019-06-07 16:56:08 +02:00 |
|
Laurent Destailleur
|
8ef7a3abf2
|
Clean demofile for v10
|
2019-06-05 11:56:57 +02:00 |
|
Laurent Destailleur
|
d3d0ce4649
|
Better error message when missing grant privileges
|
2019-06-05 10:42:59 +02:00 |
|
Laurent Destailleur
|
a70a14b145
|
Fix migration
|
2019-06-04 20:06:44 +02:00 |
|
Laurent Destailleur
|
21a1e0d7b3
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/categories/index.php
htdocs/comm/action/list.php
htdocs/comm/action/rapport/index.php
htdocs/compta/paiement.php
htdocs/compta/sociales/document.php
htdocs/compta/tva/document.php
htdocs/core/actions_massactions.inc.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/facture/paiement.php
htdocs/loan/document.php
htdocs/main.inc.php
|
2019-06-04 19:03:27 +02:00 |
|
John BOTELLA
|
d7a393bbd3
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
|
2019-06-04 14:00:18 +02:00 |
|
Laurent Destailleur
|
664e0b81d8
|
Debug module BOM
|
2019-06-03 22:07:34 +02:00 |
|
Lionel VESSILLER
|
439eafb637
|
NEW add extrafields in warehouses
- create table
- admin extrafields
- object fecth, insert, update and delete extrafields
- card and list
|
2019-06-03 15:44:17 +02:00 |
|
Laurent Destailleur
|
3cda0d2dc5
|
Fix phpcs
|
2019-06-02 15:49:10 +02:00 |
|
Laurent Destailleur
|
57cfb4b007
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/website/class/website.class.php
|
2019-06-02 12:36:07 +02:00 |
|
Laurent Destailleur
|
300f46cb01
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-06-02 12:30:25 +02:00 |
|
Laurent Destailleur
|
ea58f8a617
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-06-02 11:49:49 +02:00 |
|
Laurent Destailleur
|
5f0fbcea9a
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/admin/productaccount.php
htdocs/contact/card.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/extrafields.class.php
|
2019-06-02 11:49:33 +02:00 |
|
Maxime Kohlhaas
|
15fd24a511
|
Fix : remove hardcoded llx_ prefix
|
2019-05-31 12:14:51 +02:00 |
|
Regis Houssin
|
063fe35c97
|
FIX missing encrypt llx_const fields
|
2019-05-30 11:45:55 +02:00 |
|
Regis Houssin
|
bdd54ae245
|
FIX missing llx_const encrypt
|
2019-05-30 11:42:28 +02:00 |
|
Laurent Destailleur
|
ae597e7b63
|
Merge pull request #11252 from KlaasOl/patch-2
Create llx_accounting_account_nl.sql
|
2019-05-29 12:25:42 +02:00 |
|
Laurent Destailleur
|
8c97fc164f
|
Merge pull request #11253 from KlaasOl/patch-3
Update llx_accounting_abc.sql
|
2019-05-29 12:25:08 +02:00 |
|
Laurent Destailleur
|
05063016e8
|
FIX #11244 Enhance repair tool
|
2019-05-29 12:21:51 +02:00 |
|
Laurent Destailleur
|
2218994958
|
FIX Duplicate encoding on error message
|
2019-05-29 09:51:45 +02:00 |
|
KlaasOl
|
4301cd5b7a
|
Update llx_accounting_abc.sql
Adding chart of account NL VERKORT
|
2019-05-26 15:40:44 +02:00 |
|
KlaasOl
|
f879225032
|
Create llx_accounting_account_nl.sql
First accounting account scheme for Dutch accounting
|
2019-05-26 15:29:50 +02:00 |
|
Laurent Destailleur
|
b7a3cdd7c6
|
Debug BOM module
|
2019-05-26 01:31:54 +02:00 |
|
Laurent Destailleur
|
9f9f3bda63
|
Debug BOM module
|
2019-05-26 01:06:19 +02:00 |
|
Laurent Destailleur
|
a5865d3e4a
|
Debug BOM
|
2019-05-25 19:29:33 +02:00 |
|
Alexandre SPANGARO
|
d9e9cb2ea9
|
Merge branch 'develop' into 10.0_Differentiated_export
|
2019-05-20 15:02:05 +02:00 |
|
florian HENRY
|
c3dbbe51cf
|
fix missing migration sql for ticket now stable on 10
|
2019-05-18 23:57:00 +02:00 |
|
Laurent Destailleur
|
a1ec074d03
|
Merge pull request #11205 from ATM-Marc/NEW_supplier_proposal_contact_type
FIX: add contact types for supplier proposals (Issue #10949)
|
2019-05-18 16:56:40 +02:00 |
|
ATM-Marc
|
2c104ccc4a
|
NEW: contact types for supplier proposals
|
2019-05-18 14:22:04 +02:00 |
|
Laurent Destailleur
|
9e38f3122d
|
Update for pgsql
|
2019-05-18 01:26:44 +02:00 |
|
Norbert Penel / OSCSS
|
13b75e35a0
|
FIx tms field made with modulebuilder
all new module appear to have a bug on tms, no data can be inserted due to tms default value that can't be null
|
2019-05-18 00:20:44 +02:00 |
|
Laurent Destailleur
|
bd1ed4f7ac
|
Merge branch 'develop' into 10.0_Differentiated_export
|
2019-05-16 21:26:20 +02:00 |
|
Laurent Destailleur
|
0d6841dacb
|
Merge pull request #11176 from aspangaro/10.0_FEC
FIX FEC Remove useless field 'validated'
|
2019-05-16 21:20:20 +02:00 |
|
Alexandre SPANGARO
|
60d00e2f5c
|
FIX FEC Remove useless field 'validated'
|
2019-05-14 06:46:06 +02:00 |
|
Alexandre SPANGARO
|
7c9ccee64d
|
NEW Accountancy - Differentiated export
|
2019-05-14 05:45:36 +02:00 |
|
Laurent Destailleur
|
7a75567ad9
|
FIX Debug ticket module
|
2019-05-12 16:34:49 +02:00 |
|
Laurent Destailleur
|
cdebca14a7
|
Fix migration
|
2019-05-09 17:32:13 +02:00 |
|
Laurent Destailleur
|
1c558c685c
|
Fix class not found
|
2019-05-09 17:16:35 +02:00 |
|
Laurent Destailleur
|
95bb8a1f75
|
Update llx_c_shipment_mode.key.sql
|
2019-05-08 01:57:39 +02:00 |
|
Laurent Destailleur
|
249893a4ab
|
Update 9.0.0-10.0.0.sql
|
2019-05-08 01:57:23 +02:00 |
|
Laurent Destailleur
|
53b1dec317
|
Update 9.0.0-10.0.0.sql
|
2019-05-08 01:56:52 +02:00 |
|
ptibogxiv
|
e65c8399e6
|
Update 9.0.0-10.0.0.sql
|
2019-05-05 19:14:09 +02:00 |
|
ptibogxiv
|
499798b2e0
|
Update llx_c_shipment_mode.key.sql
|
2019-05-05 19:11:18 +02:00 |
|
ptibogxiv
|
15cff25bbc
|
Update llx_c_shipment_mode.sql
|
2019-05-05 19:10:39 +02:00 |
|
ptibogxiv
|
f0fd0ece60
|
Update 9.0.0-10.0.0.sql
|
2019-05-05 15:06:10 +02:00 |
|
ptibogxiv
|
7033243572
|
FIX url lettre max & colissimo
|
2019-05-05 15:02:00 +02:00 |
|
Laurent Destailleur
|
3a8d645fb9
|
Debug module ticket
|
2019-05-01 20:55:46 +02:00 |
|
Ferran Marcet
|
7a651b5071
|
New: Add ref_client field on template invoice
|
2019-04-26 13:53:22 +02:00 |
|
Laurent Destailleur
|
10dde837d0
|
Debug email collector
|
2019-04-25 19:32:48 +02:00 |
|
Laurent Destailleur
|
6884999ee3
|
Merge pull request #10925 from ptibogxiv/patch-146
NEW morphy value in member type
|
2019-04-25 03:00:25 +02:00 |
|
Laurent Destailleur
|
68d438b697
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/fourn/commande/card.php
htdocs/user/class/user.class.php
|
2019-04-25 01:50:48 +02:00 |
|
Laurent Destailleur
|
becf096bf8
|
FIX ref for table without ref manager are set to NULL.
|
2019-04-25 01:37:08 +02:00 |
|
Laurent Destailleur
|
691159c56b
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-04-24 10:24:55 +02:00 |
|
Laurent Destailleur
|
1264857211
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/core/js/timesheet.js
|
2019-04-24 10:24:32 +02:00 |
|
Laurent Destailleur
|
8025fb1ac1
|
Fix size of column
|
2019-04-24 10:07:58 +02:00 |
|
Laurent Destailleur
|
e0b71fd258
|
Fix size of column
|
2019-04-24 10:07:34 +02:00 |
|
atm-greg
|
3231e54abd
|
fix actioncomm module for long trigger names
|
2019-04-23 16:19:58 +02:00 |
|
Laurent Destailleur
|
c0c723a207
|
Work on inventory feature
|
2019-04-23 11:00:28 +02:00 |
|
Laurent Destailleur
|
9930b276ff
|
Fix image link
|
2019-04-22 17:29:02 +02:00 |
|
Laurent Destailleur
|
fae2983c2a
|
Merge branch 'develop' into new_user_hr_fields
|
2019-04-11 18:27:58 +02:00 |
|
Laurent Destailleur
|
2eeb4b8734
|
Debug ticket module
|
2019-04-10 15:45:55 +02:00 |
|
Laurent Destailleur
|
1f6f6f6edb
|
Track action close for ticket
|
2019-04-10 13:21:06 +02:00 |
|
Laurent Destailleur
|
ff629b2355
|
NEW Color for hover and for checked line is on by default
|
2019-04-09 15:57:26 +02:00 |
|
Laurent Destailleur
|
65e931cfe2
|
Work on email collector
|
2019-04-08 21:22:10 +02:00 |
|
Laurent Destailleur
|
321ffb859b
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
htdocs/projet/activity/perday.php
htdocs/projet/activity/perweek.php
|
2019-04-08 14:09:18 +02:00 |
|
Laurent Destailleur
|
b23f74eab1
|
FIX Status of opportunity should never be -1
|
2019-04-08 12:17:57 +02:00 |
|
Laurent Destailleur
|
fad2fa48dd
|
NEW Introduce a config parameter $dolibarr_main_instance_unique_id
|
2019-04-07 15:44:17 +02:00 |
|
Laurent Destailleur
|
302a42a603
|
PHP 5.4 is no more supported. Minimum PHP is now 5.5+.
|
2019-04-06 13:20:26 +02:00 |
|
Laurent Destailleur
|
9c7464d157
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/product/list.php
htdocs/societe/card.php
|
2019-04-04 17:42:12 +02:00 |
|
Laurent Destailleur
|
1ac51b6e06
|
More complete example to fix migration error from v8
|
2019-04-04 13:46:01 +02:00 |
|
Laurent Destailleur
|
56f8c42b0a
|
The PHP extension php-intl is not mandatory but should be installed to
have new features working correctly.
|
2019-04-03 19:37:54 +02:00 |
|
Laurent Destailleur
|
333ba7b549
|
Save files for website template
|
2019-04-03 16:28:16 +02:00 |
|
ptibogxiv
|
3723da43ca
|
Update 9.0.0-10.0.0.sql
|
2019-03-27 12:50:16 +01:00 |
|
ptibogxiv
|
63ad6b779a
|
Update llx_adherent_type.sql
|
2019-03-27 12:49:26 +01:00 |
|
Laurent Destailleur
|
e7dea3cfe7
|
Merge pull request #10911 from leangjia/develop
Add China regions.
|
2019-03-26 19:23:08 +01:00 |
|
Laurent Destailleur
|
4c4ad0548d
|
Fix for creation of index composed with type
|
2019-03-26 17:56:46 +01:00 |
|
liAnGjiA
|
62767fc059
|
Update llx_10_c_regions.sql
|
2019-03-25 10:16:41 +08:00 |
|
leangjia
|
a207a699b6
|
Add China regions.
|
2019-03-25 00:21:09 +08:00 |
|
Laurent Destailleur
|
8ca5b2e45f
|
Rename field
|
2019-03-22 17:43:53 +01:00 |
|
Laurent Destailleur
|
d8e3624d65
|
Merge pull request #10851 from wdammak/patch-37
Add fk_project to product table
|
2019-03-21 18:32:49 +01:00 |
|
Laurent Destailleur
|
ae2f76f6bd
|
Update llx_product.sql
|
2019-03-21 18:32:40 +01:00 |
|
Laurent Destailleur
|
52b91499ba
|
Update 9.0.0-10.0.0.sql
|
2019-03-21 18:31:13 +01:00 |
|
atm-greg
|
d809c017ca
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into test_pgsql_installation
|
2019-03-20 06:10:53 +01:00 |
|
Laurent Destailleur
|
9a3c66b057
|
Merge pull request #10846 from grandoc/new_branch_15_03_2019
New branch 15 03 2019
|
2019-03-19 12:13:02 +01:00 |
|
Laurent Destailleur
|
1a8902f23e
|
Fix migration for compatibility
|
2019-03-19 12:03:02 +01:00 |
|
Laurent Destailleur
|
6970d066f8
|
Better compatibility
|
2019-03-19 11:23:38 +01:00 |
|
Laurent Destailleur
|
a4372e24bf
|
Migration
|
2019-03-19 11:21:55 +01:00 |
|
Laurent Destailleur
|
77b675bec1
|
Merge pull request #10876 from ptibogxiv/patch-143
FIX support duration/time units with services
|
2019-03-19 11:20:13 +01:00 |
|
Laurent Destailleur
|
81fb18befe
|
Complete unit table
|
2019-03-19 11:19:46 +01:00 |
|
wdammak
|
56bee8a20f
|
Update llx_product.key.sql
|
2019-03-18 20:23:45 +01:00 |
|
wdammak
|
cf0bc88601
|
Update llx_product.sql
|
2019-03-18 20:19:30 +01:00 |
|
ptibogxiv
|
eb196ba8e6
|
Update 9.0.0-10.0.0.sql
|
2019-03-18 14:25:13 +01:00 |
|
ptibogxiv
|
9178939fe6
|
ADD week, month, year
|
2019-03-18 14:21:36 +01:00 |
|
ptibogxiv
|
030048db28
|
FIX compatibility of minute with php unit value
|
2019-03-18 14:07:31 +01:00 |
|
atm-ph
|
466a5e2e81
|
Fix postgreSQL migration
|
2019-03-18 10:47:56 +01:00 |
|
Maxime Kohlhaas
|
0a0e29a089
|
New fields on user object for hrm purpose
|
2019-03-16 08:53:06 +01:00 |
|
wdammak
|
5ee749c19d
|
Update 9.0.0-10.0.0.sql
|
2019-03-15 20:46:38 +01:00 |
|
wdammak
|
c9f89f3854
|
Add fk_project to product table
Prepare the generation of a product from a project.
|
2019-03-15 20:28:28 +01:00 |
|
Laurent Destailleur
|
bca18f22ae
|
Prepare link with expense report line and document
|
2019-03-15 16:23:38 +01:00 |
|
Philippe GRAND
|
2e4bf72382
|
update with html5 compliant code
|
2019-03-15 09:45:48 +01:00 |
|
Philippe GRAND
|
3d93fba4b8
|
update with html5 compliant code
|
2019-03-15 09:45:01 +01:00 |
|
Philippe GRAND
|
404872298f
|
update with html5 compliant code
|
2019-03-15 09:44:17 +01:00 |
|
Philippe GRAND
|
f028f74c7c
|
update with html5 compliant code
|
2019-03-15 09:43:33 +01:00 |
|
Laurent Destailleur
|
8f65ee2296
|
Merge branch 'develop' into NEW_develop_supplier_buyprice_barcode
|
2019-03-14 17:48:44 +01:00 |
|
Laurent Destailleur
|
7e31e6b4f6
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/notify.class.php
|
2019-03-13 19:30:25 +01:00 |
|
Laurent Destailleur
|
c32551cb62
|
Fix size of varchar
|
2019-03-13 13:42:14 +01:00 |
|
Laurent Destailleur
|
88c02143fa
|
Fix missing fields
|
2019-03-13 13:40:57 +01:00 |
|
Laurent Destailleur
|
6ae36ce6a7
|
Work on BOM
|
2019-03-12 19:20:01 +01:00 |
|
Laurent Destailleur
|
f356d534cd
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-03-11 17:48:03 +01:00 |
|
Laurent Destailleur
|
9c8aff0a28
|
FIX #10787
|
2019-03-11 17:47:53 +01:00 |
|
Laurent Destailleur
|
def8e770ca
|
Fix name of indexes
|
2019-03-11 17:47:19 +01:00 |
|
wdammak
|
fa3246e70b
|
Missing index to improve the performance of product/variants display
|
2019-03-10 03:09:23 +01:00 |
|
wdammak
|
0241b0d4ee
|
Missing index to improve the performance of product/variants display
https://github.com/Dolibarr/dolibarr/issues/10787
|
2019-03-10 03:05:15 +01:00 |
|
Laurent Destailleur
|
10b9fdc1fd
|
Fix column definition
|
2019-03-09 02:05:28 +01:00 |
|
Laurent Destailleur
|
f54eb78260
|
NEW Show the latest date of subscription in member statistics reports
|
2019-03-07 12:22:24 +01:00 |
|
Laurent Destailleur
|
a426c8e9bf
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/system/filecheck.php
htdocs/compta/facture/class/facture.class.php
htdocs/filefunc.inc.php
htdocs/install/upgrade2.php
htdocs/product/class/product.class.php
|
2019-03-07 11:16:24 +01:00 |
|
Laurent Destailleur
|
e67890bd22
|
NEW Can enter price with or without tax when entering expense repor line
|
2019-03-07 11:09:04 +01:00 |
|
Laurent Destailleur
|
1b0aec0847
|
Complete fields for template invoices
|
2019-03-06 20:51:07 +01:00 |
|
Laurent Destailleur
|
0c2a0c643b
|
NEW Performance enhancement: Replace dirname(__FILE__) with __DIR__
|
2019-03-06 14:33:05 +01:00 |
|
Laurent Destailleur
|
c06d2f6c3b
|
Remove warning
|
2019-03-05 18:22:03 +01:00 |
|
Laurent Destailleur
|
925def5390
|
Work on BOM module
|
2019-03-04 13:37:00 +01:00 |
|
Laurent Destailleur
|
2448d1deaa
|
fk_projet -> fk_project
|
2019-02-27 15:32:18 +01:00 |
|
atm-quentin
|
1b9a2e5cfc
|
FIX migration 9 to 10
|
2019-02-27 09:27:15 +01:00 |
|
atm-quentin
|
f51b89def3
|
NEW supplier buyprice barcode
|
2019-02-27 09:22:34 +01:00 |
|
Laurent Destailleur
|
014c199173
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/tpl/extrafields_list_print_fields.tpl.php
|
2019-02-27 01:28:12 +01:00 |
|
Laurent Destailleur
|
6373e1db84
|
Merge branch 'develop' into 10.0_linkedin
|
2019-02-27 01:16:21 +01:00 |
|
Laurent Destailleur
|
9e82c37963
|
WIP Start module BOM
|
2019-02-26 19:27:04 +01:00 |
|
Laurent Destailleur
|
3ba69fc93a
|
Fix missing ; after sql request
|
2019-02-25 15:06:55 +01:00 |
|
Laurent Destailleur
|
1be1ee1670
|
Remove duplicate record
|
2019-02-25 14:56:28 +01:00 |
|
Laurent Destailleur
|
c0be66b5e5
|
FXI Remove duplicate record before trying to create unique key
|
2019-02-25 14:55:29 +01:00 |
|
Alexandre SPANGARO
|
2da1447a0b
|
Merge remote-tracking branch 'upstream/develop' into 10.0_linkedin
|
2019-02-25 09:12:04 +01:00 |
|
Alexandre SPANGARO
|
acb9cfe07a
|
NEW: Add LinkedIn field
|
2019-02-25 09:07:58 +01:00 |
|
Laurent Destailleur
|
f83f746123
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/compta/facture/class/facture.class.php
|
2019-02-23 16:03:40 +01:00 |
|
Laurent Destailleur
|
cdf85b0d00
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-23 16:02:35 +01:00 |
|
Laurent Destailleur
|
9ba6e3f8f5
|
FIX #10638
|
2019-02-23 15:57:57 +01:00 |
|
ptibogxiv
|
c54c4f8667
|
Update llx_commande.sql
|
2019-02-20 12:18:20 +01:00 |
|
ptibogxiv
|
d490dd4dec
|
NEW POS support in order
Save informations for online / API shopping and push to invoice
|
2019-02-20 12:15:43 +01:00 |
|
Laurent Destailleur
|
51441242bf
|
Fix sql error
|
2019-02-19 13:15:11 +01:00 |
|
Laurent Destailleur
|
ebfb6beee3
|
Merge
|
2019-02-18 19:14:42 +01:00 |
|
Laurent Destailleur
|
317f3dd90b
|
Merge pull request #10603 from wdammak/patch-27
Add default warehouse id for a user
|
2019-02-15 15:06:21 +01:00 |
|
Laurent Destailleur
|
662d707320
|
Update 9.0.0-10.0.0.sql
|
2019-02-15 15:06:00 +01:00 |
|
wdammak
|
2fe3b7acc7
|
Add default warehouse for a user
|
2019-02-14 19:50:57 +01:00 |
|
wdammak
|
0a8c72c93b
|
rename column default_warehouse to fk_warehouse
|
2019-02-14 19:36:23 +01:00 |
|
Laurent Destailleur
|
04942d3016
|
Merge branch 'develop' into patch-110
|
2019-02-14 16:11:56 +01:00 |
|
Laurent Destailleur
|
567d92f886
|
Update llx_prelevement_facture_demande.sql
|
2019-02-14 16:10:31 +01:00 |
|
Laurent Destailleur
|
00cfee0c37
|
Update 9.0.0-10.0.0.sql
|
2019-02-14 16:10:06 +01:00 |
|
wdammak
|
31bcc47b68
|
Add default warehouse id for a user
This will help to organize employees and know the default warehouse for a customer.
|
2019-02-14 13:47:02 +01:00 |
|
Laurent Destailleur
|
3050366372
|
Fix table of units already exists. Merge duplicate c_measuring_units
with c_units.
|
2019-02-14 13:02:44 +01:00 |
|
Laurent Destailleur
|
5a0d4c4cdc
|
Merge branch 'develop' into patch-110
|
2019-02-14 10:32:05 +01:00 |
|
florian HENRY
|
e2d13c0e1f
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
dev_importproduct_measuringunit
Conflicts:
htdocs/contact/consumption.php
htdocs/webservices/server_productorservice.php
|
2019-02-13 09:23:52 +01:00 |
|
ptibogxiv
|
8f3ffc6520
|
NEW stripe payment intent
use it for stripe
|
2019-02-12 19:03:45 +01:00 |
|
Laurent Destailleur
|
5fceee3048
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/install/mysql/migration/8.0.0-9.0.0.sql
|
2019-02-12 19:02:19 +01:00 |
|
ptibogxiv
|
85272b8345
|
NEW support stripe payment prelevement
|
2019-02-12 18:58:57 +01:00 |
|
florian HENRY
|
914de5e089
|
fix mùigration script
|
2019-02-12 18:08:21 +01:00 |
|
Laurent Destailleur
|
f7d183f3ef
|
Add Kosovo country
|
2019-02-12 17:43:38 +01:00 |
|
florian HENRY
|
eba4be2335
|
ad missing files
|
2019-02-12 17:03:47 +01:00 |
|
florian HENRY
|
5b5f96bafb
|
NEW : measuring unit dictionnary and product size/unit import
|
2019-02-12 16:58:11 +01:00 |
|
Laurent Destailleur
|
f311d50201
|
Fix unique key in accounting_account
Conflicts:
htdocs/install/mysql/migration/8.0.0-9.0.0.sql
|
2019-02-12 15:53:43 +01:00 |
|
Laurent Destailleur
|
a0c1e5ed84
|
Fix unique key in accounting_account
|
2019-02-12 15:43:24 +01:00 |
|
Laurent Destailleur
|
e054b080a5
|
Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing
|
2019-02-12 13:33:39 +01:00 |
|
Laurent Destailleur
|
6f6a767255
|
Merge pull request #10520 from aspangaro/develop
NEW: Add subledger in various payment
|
2019-02-12 13:20:58 +01:00 |
|
Frédéric FRANCE
|
1e43f8e54a
|
PEAR FunctionCallSignature
|
2019-02-10 10:45:49 +01:00 |
|
Alexandre SPANGARO
|
2ba8ae00e4
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2019-02-06 21:56:01 +01:00 |
|
Frédéric FRANCE
|
970392adb8
|
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
|
2019-02-03 22:41:57 +01:00 |
|
Frédéric FRANCE
|
80a12fcd1c
|
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
|
2019-02-03 14:29:45 +01:00 |
|
Frédéric FRANCE
|
f5b2cf75f2
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-02-01 18:31:44 +01:00 |
|
Alexandre SPANGARO
|
13cf3b1d7f
|
Add subledger in various payment
|
2019-02-01 15:50:12 +01:00 |
|
Laurent Destailleur
|
eb3621839a
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/members.lang
htdocs/langs/fr_FR/members.lang
|
2019-02-01 15:14:19 +01:00 |
|
Laurent Destailleur
|
57797b1309
|
Remove image
|
2019-01-31 12:48:51 +01:00 |
|
Laurent Destailleur
|
e18bd6f986
|
Merge branch 'develop' into nospaceaftercomma
|
2019-01-30 18:27:35 +01:00 |
|
Laurent Destailleur
|
e72d6c50e6
|
Merge pull request #10428 from frederic34/toomanylines
PSR2.Files.EndFileNewline.TooMany
|
2019-01-30 16:17:09 +01:00 |
|
Laurent Destailleur
|
648eea3a70
|
Merge branch 'develop' into nospaceaftercomma
|
2019-01-30 16:00:11 +01:00 |
|
Alexandre SPANGARO
|
cc88c4f8ff
|
Move my email to the new one
|
2019-01-28 21:39:22 +01:00 |
|
Frédéric FRANCE
|
b10558bacd
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-01-27 23:23:38 +01:00 |
|
Laurent Destailleur
|
56838bc659
|
Fix missing field into migration
|
2019-01-27 18:11:18 +01:00 |
|
Laurent Destailleur
|
c33860cfab
|
Merge pull request #10368 from ptibogxiv/patch-91
NEW thirdparty in donation if option ON
|
2019-01-27 18:07:46 +01:00 |
|
Laurent Destailleur
|
f30a3d59ba
|
Merge branch 'develop' into toomanylines
|
2019-01-27 17:59:13 +01:00 |
|
Laurent Destailleur
|
4f9f0fd7b5
|
Merge branch 'develop' into elseif
|
2019-01-27 17:54:06 +01:00 |
|
Frédéric FRANCE
|
f0cdf300d1
|
Squiz.Functions.FunctionDeclarationArgumentSpacing
|
2019-01-27 15:20:16 +01:00 |
|
Frédéric FRANCE
|
496fa9b0fb
|
PSR2.Files.EndFileNewline.TooMany
|
2019-01-27 14:10:35 +01:00 |
|
Frédéric FRANCE
|
7ee086b402
|
PSR2 space after comma in function call
|
2019-01-27 11:55:16 +01:00 |
|
Frédéric FRANCE
|
6e91b3cefc
|
PSR2 usage of else if is discouraged
|
2019-01-27 10:49:34 +01:00 |
|
Laurent Destailleur
|
70c52e6417
|
Add field calling_duration in table llx_actioncomm
|
2019-01-26 01:17:41 +01:00 |
|
Laurent Destailleur
|
b1a4e3abd5
|
To be sure table is dropped
|
2019-01-21 16:44:51 +01:00 |
|
Laurent Destailleur
|
0f61a99cc6
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-01-21 05:51:35 +01:00 |
|
Laurent Destailleur
|
f8b205aae3
|
Fix missing index
|
2019-01-21 05:16:23 +01:00 |
|
Laurent Destailleur
|
95bfecdd60
|
Fix missing index in migration
|
2019-01-21 05:03:31 +01:00 |
|
Laurent Destailleur
|
9c1339ae06
|
Fix migration with pgsql
|
2019-01-21 04:27:30 +01:00 |
|
Laurent Destailleur
|
f53232e2f9
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-01-21 02:56:32 +01:00 |
|
Laurent Destailleur
|
2e9e413e17
|
Try pgsql fix
|
2019-01-21 01:51:28 +01:00 |
|
Laurent Destailleur
|
7493ba018a
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/install/mysql/migration/8.0.0-9.0.0.sql
|
2019-01-20 20:38:26 +01:00 |
|
Laurent Destailleur
|
3ddfcbe3bb
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
.travis.yml
dev/setup/codesniffer/ruleset.xml
|
2019-01-20 20:36:45 +01:00 |
|
Laurent Destailleur
|
c26f264cac
|
Merge pull request #10369 from mwelters/mwelters/addays
Add configurable days to SEPA Withdrawal Execution Date
|
2019-01-20 19:47:57 +01:00 |
|
Laurent Destailleur
|
f7c11ec7f4
|
Fix unit test on accounting
|
2019-01-20 17:06:24 +01:00 |
|
markus
|
a45ea9239d
|
Rename consts and cleanup
|
2019-01-19 14:24:20 +01:00 |
|
ptibogxiv
|
754714abf7
|
Update llx_don.sql
|
2019-01-18 11:23:59 +01:00 |
|
ptibogxiv
|
a36cf5f2c7
|
Update 9.0.0-10.0.0.sql
|
2019-01-17 20:34:45 +01:00 |
|
ptibogxiv
|
389b44faa3
|
Update llx_subscription.sql
|
2019-01-17 17:41:45 +01:00 |
|
ptibogxiv
|
ee595ca9b5
|
Update 9.0.0-10.0.0.sql
|
2019-01-17 17:40:47 +01:00 |
|
Laurent Destailleur
|
e7943ae844
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-01-16 16:48:52 +01:00 |
|
Laurent Destailleur
|
d3828130ab
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/adherents/class/adherent.class.php
|
2019-01-16 16:48:21 +01:00 |
|
Regis Houssin
|
41a38b3a0a
|
FIX avoid php warning
Signed-off-by: Regis Houssin <regis.houssin@inodbox.com>
|
2019-01-15 15:44:45 +01:00 |
|
Laurent Destailleur
|
003f499eb0
|
Add url_id into unique index of bank_url
|
2019-01-09 13:02:19 +01:00 |
|
ldestailleur
|
451b3e30cc
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/core/lib/functions.lib.php
htdocs/langs/en_US/cashdesk.lang
|
2019-01-04 19:36:20 +01:00 |
|
ldestailleur
|
5f9bbbcdd7
|
Fix migration
|
2019-01-03 11:12:14 +01:00 |
|
ldestailleur
|
bc00fb177a
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-01-02 19:42:15 +01:00 |
|
ldestailleur
|
a9e8e13bb6
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
ChangeLog
htdocs/user/param_ihm.php
|
2019-01-02 19:41:39 +01:00 |
|
Laurent Destailleur
|
63beb50465
|
Fix missing migration of external site module
|
2018-12-26 21:22:12 +01:00 |
|
Laurent Destailleur
|
5c516fdae2
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.form.class.php
|
2018-12-26 19:43:01 +01:00 |
|
Laurent Destailleur
|
e7b3c91645
|
Fix dump file
|
2018-12-26 19:10:22 +01:00 |
|
Laurent Destailleur
|
9d5a91b6e8
|
Merge pull request #10235 from torvista/sql-install
Added Andorra, Hungary, Portugal, Slovenia. Spain postcodes
|
2018-12-17 21:14:48 +01:00 |
|
Laurent Destailleur
|
623afd1020
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/website.lang
|
2018-12-17 18:50:06 +01:00 |
|
Laurent Destailleur
|
ffaff4dc7f
|
Debug website module
|
2018-12-17 17:29:04 +01:00 |
|
Laurent Destailleur
|
6ee484e2a2
|
Fix migration
|
2018-12-17 09:38:36 +01:00 |
|
Laurent Destailleur
|
e0e298f07b
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-12-17 03:26:15 +01:00 |
|
Laurent Destailleur
|
bf9ee18bed
|
Standardize code.
|
2018-12-17 03:25:45 +01:00 |
|
torvista
|
54c56ff069
|
minor error
|
2018-12-16 22:15:44 +01:00 |
|
torvista
|
6ce76903a5
|
removed double quotes as per Travis failure
|
2018-12-16 21:22:31 +01:00 |
|
torvista
|
f5d1eea4dc
|
added regions and provinces for Andorra, Hungary, Portugal, Slovenia.
Spain added postcodes and re-ordered sql in province order to make a logical drop-down picking list.
|
2018-12-16 18:28:11 +01:00 |
|
Laurent Destailleur
|
54a4a54afe
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/langs/en_US/banks.lang
|
2018-12-15 20:00:31 +01:00 |
|
Laurent Destailleur
|
1c49599a47
|
Work on cash fence feature
|
2018-12-15 19:46:51 +01:00 |
|
Laurent Destailleur
|
54ffba793f
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/install/mysql/migration/8.0.0-9.0.0.sql
htdocs/langs/en_US/admin.lang
|
2018-12-15 18:21:37 +01:00 |
|
Laurent Destailleur
|
33a91ff707
|
Add missing POS closure feature
|
2018-12-15 16:47:06 +01:00 |
|
andreubisquerra
|
cdaf048766
|
First CashControl version
|
2018-12-15 16:45:36 +01:00 |
|
Laurent Destailleur
|
1167d9aecb
|
Merge pull request #10206 from andreubisquerra/master
First CashControl version
|
2018-12-15 16:44:24 +01:00 |
|
Laurent Destailleur
|
6761e21921
|
Update 8.0.0-9.0.0.sql
|
2018-12-15 12:52:09 +01:00 |
|
Laurent Destailleur
|
27f8096afa
|
Merge branch 'develop' into PR_NEW_reception
|
2018-12-15 12:50:31 +01:00 |
|
Laurent Destailleur
|
015567afa6
|
Merge pull request #10034 from frederic34/oldfiles
remove Old files on upgrade
|
2018-12-14 19:25:01 +01:00 |
|
Alexandre SPANGARO
|
60f56fcf8d
|
Merge branch 'develop' into 10.0_members
|
2018-12-14 11:39:02 +01:00 |
|
Laurent Destailleur
|
63aa7ac1ec
|
Fix name of key
|
2018-12-14 11:16:05 +01:00 |
|
Laurent Destailleur
|
2f075147a3
|
Migrate to 10
|
2018-12-14 11:13:48 +01:00 |
|
Laurent Destailleur
|
3765db422a
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/install/mysql/tables/llx_loan.sql
|
2018-12-14 10:57:11 +01:00 |
|
Laurent Destailleur
|
6eaa6a1d28
|
Add missing column
|
2018-12-14 10:56:13 +01:00 |
|
Laurent Destailleur
|
fec64a78ab
|
Merge branch 'develop' into New_manage_loan_schedule
|
2018-12-14 10:54:09 +01:00 |
|
Laurent Destailleur
|
f97b561af0
|
Merge branch 'develop' into qual_rename_facnumber
|
2018-12-13 20:24:12 +01:00 |
|
Laurent Destailleur
|
0ecdb0f3bb
|
Code comment
|
2018-12-12 13:02:18 +01:00 |
|
Laurent Destailleur
|
ea041693b6
|
Code comment
|
2018-12-12 12:54:10 +01:00 |
|
Laurent Destailleur
|
b47e7b2267
|
Work on new unsubscribe process
|
2018-12-11 09:49:46 +01:00 |
|
Laurent Destailleur
|
b27ec54379
|
A better way to manage unsubscribed emails
|
2018-12-10 14:35:33 +01:00 |
|
Laurent Destailleur
|
42d4cf9992
|
Fix sql
|
2018-12-10 10:17:54 +01:00 |
|
andreubisquerra
|
939f31c71f
|
First CashControl version
|
2018-12-08 21:33:54 +01:00 |
|
Laurent Destailleur
|
cd3716ff9f
|
Dolibarize module ticket
|
2018-12-08 16:37:41 +01:00 |
|
Laurent Destailleur
|
21b3bbc2e6
|
Merge
|
2018-12-08 11:55:27 +01:00 |
|
Laurent Destailleur
|
b43c2ce839
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2018-12-08 11:52:12 +01:00 |
|
Laurent Destailleur
|
930312b425
|
FIX Migration do not create not used table
|
2018-12-08 11:51:46 +01:00 |
|
Laurent Destailleur
|
9ed34e2b35
|
FIX Can relaunch install on v8
|
2018-12-08 11:51:01 +01:00 |
|
Laurent Destailleur
|
a915d82883
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2018-12-08 11:42:30 +01:00 |
|
Laurent Destailleur
|
d2f0c87d8f
|
FIX Removed not use table
|
2018-12-08 11:41:08 +01:00 |
|
Laurent Destailleur
|
a44dca7e71
|
Removed deprecated table
|
2018-12-08 11:37:47 +01:00 |
|
Laurent Destailleur
|
d0a1c523ca
|
FIX several critical bugs in migration of directory of users
|
2018-12-07 19:53:02 +01:00 |
|
Laurent Destailleur
|
f99d9a7da9
|
FIX several critical bugs in migration of directory of users
|
2018-12-07 19:35:38 +01:00 |
|
Laurent Destailleur
|
2621af96d6
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/filefunc.inc.php
htdocs/install/upgrade2.php
|
2018-12-07 19:08:53 +01:00 |
|
Laurent Destailleur
|
3538e9ab3b
|
Fix migration
|
2018-12-07 19:05:24 +01:00 |
|
Laurent Destailleur
|
37fe8afea3
|
Code comment
|
2018-12-07 14:54:40 +01:00 |
|
Laurent Destailleur
|
65d492efed
|
Minor fix
|
2018-12-07 14:53:49 +01:00 |
|
Laurent Destailleur
|
e7c87c31b6
|
Code comment
|
2018-12-06 21:32:39 +01:00 |
|
Laurent Destailleur
|
30abedbcbd
|
Minor fix
|
2018-12-06 19:29:11 +01:00 |
|
Maxime Kohlhaas
|
b37209565f
|
Correct sql index change
|
2018-12-05 16:50:02 +01:00 |
|
Laurent Destailleur
|
d2e8aeb8c1
|
Merge pull request #10173 from hregis/develop_upgrade
FIX wrong path, multidir_output[] for each entity is construct by the multicompany module
|
2018-12-04 13:39:05 +01:00 |
|
Laurent Destailleur
|
c27c322457
|
Merge pull request #10172 from hregis/develop_virtualmin
FIX possibility to force install lock with GET/POST or script
|
2018-12-04 13:38:23 +01:00 |
|
Laurent Destailleur
|
d9bb39970f
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/barcode.php
|
2018-12-04 13:20:40 +01:00 |
|
Laurent Destailleur
|
5061a9b0c2
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/install/mysql/tables/llx_paiementfourn.sql
|
2018-12-04 13:17:25 +01:00 |
|
Laurent Destailleur
|
347384734d
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/install/mysql/tables/llx_paiementfourn.sql
|
2018-12-04 13:15:32 +01:00 |
|
Regis Houssin
|
aa3e520725
|
FIX wrong path, multidir_output[] for each entity is construct by the
multicompany module
|
2018-12-04 09:12:36 +01:00 |
|
Maxime Kohlhaas
|
79b6719b88
|
Change index
|
2018-12-04 09:00:53 +01:00 |
|
Regis Houssin
|
dcbb7c49fc
|
FIX wrong value for instal lock
|
2018-12-03 13:31:28 +01:00 |
|
Regis Houssin
|
a2f514d4a1
|
FIX possibility to force install lock with GET/POST or script
|
2018-12-03 13:12:42 +01:00 |
|
Maxime Kohlhaas
|
2e496ea83a
|
QUAL rename facnumber by ref
|
2018-12-02 17:33:44 +01:00 |
|
Maxime Kohlhaas
|
72225f6524
|
Migration of user photo paths
|
2018-12-01 23:57:15 +01:00 |
|
Laurent Destailleur
|
c3e2f73e48
|
FIX #10144
|
2018-12-01 19:45:30 +01:00 |
|
Laurent Destailleur
|
6d84036f66
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/action/index.php
htdocs/contact/list.php
htdocs/core/class/html.form.class.php
htdocs/expensereport/card.php
htdocs/install/doctemplates/shipment/template_shipment.odt
htdocs/public/payment/newpayment.php
|
2018-12-01 19:23:06 +01:00 |
|
Laurent Destailleur
|
cb9ada2119
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/class/html.formmail.class.php
htdocs/core/modules/modSociete.class.php
htdocs/product/price.php
|
2018-12-01 18:19:45 +01:00 |
|
florian HENRY
|
589511f38c
|
fix #9999
|
2018-12-01 16:23:40 +01:00 |
|
Frédéric FRANCE
|
335327827d
|
Update 6.0.0-7.0.0.sql
|
2018-12-01 00:34:17 +01:00 |
|
Frédéric FRANCE
|
0270da7d8c
|
Update 5.0.0-6.0.0.sql
|
2018-12-01 00:28:58 +01:00 |
|
Frédéric FRANCE
|
6ab12b5911
|
Update llx_paiementfourn.sql
|
2018-12-01 00:26:51 +01:00 |
|
Maxime Kohlhaas
|
7585461486
|
Fix #9070
|
2018-11-30 22:16:17 +01:00 |
|
Laurent Destailleur
|
bfc2f6e84c
|
Add template
|
2018-11-29 00:48:47 +01:00 |
|
Laurent Destailleur
|
dbef8fc380
|
FIX Add field for data becoming mandatory by some online payment system
|
2018-11-28 13:13:38 +01:00 |
|
Laurent Destailleur
|
2f2df12f59
|
Complete dictionary
|
2018-11-26 18:02:25 +01:00 |
|
Laurent Destailleur
|
9f610c2279
|
Add website template
|
2018-11-23 12:46:32 +01:00 |
|
Laurent Destailleur
|
200de22807
|
Missing image in container
|
2018-11-20 16:48:34 +01:00 |
|
Laurent Destailleur
|
f455e32bef
|
FIX Some modules templates were visible when it should not
|
2018-11-20 16:22:16 +01:00 |
|
Laurent Destailleur
|
39621ec686
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/commonobject.class.php
|
2018-11-19 20:07:51 +01:00 |
|
Laurent Destailleur
|
fb6aa01207
|
FIX #10030 better german chart
|
2018-11-19 20:04:31 +01:00 |
|
Frédéric FRANCE
|
8f7e90da8c
|
clean clean
|
2018-11-19 19:08:14 +01:00 |
|
Alexandre SPANGARO
|
2d55666a0b
|
NEW Add gender in member card
|
2018-11-18 21:50:58 +01:00 |
|
Laurent Destailleur
|
7f33403d43
|
Fix translation
|
2018-11-17 22:55:13 +01:00 |
|
Frédéric FRANCE
|
35142ac2fb
|
wip
|
2018-11-16 17:58:14 +01:00 |
|
Laurent Destailleur
|
6d640ab83c
|
Fix feature to drag and drop rows of table (not generic)
|
2018-11-15 19:58:06 +01:00 |
|
markus
|
ac0f46f9e5
|
for Denmark: forme_jurisdisque additions
|
2018-11-15 11:10:54 +01:00 |
|
Laurent Destailleur
|
7aa042172e
|
Fix sql error
|
2018-11-14 13:06:40 +01:00 |
|
Laurent Destailleur
|
84983140b6
|
Merge pull request #9896 from hregis/develop_email
FIX change my deprecated email
|
2018-11-11 17:35:35 +01:00 |
|
Laurent Destailleur
|
4f7d3e794a
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-11-11 17:28:29 +01:00 |
|
Laurent Destailleur
|
f022be3a47
|
FIX #9992
|
2018-11-11 17:28:17 +01:00 |
|
Laurent Destailleur
|
2985d9cfbf
|
Update 8.0.0-9.0.0.sql
|
2018-11-11 17:27:16 +01:00 |
|
delcroix Patrick
|
52f35d8038
|
to support proposal_supplier insert
proposal_supplier has 17 char when the elementtype column can take only 16 char
|
2018-11-10 14:59:46 +01:00 |
|
Laurent Destailleur
|
f1287578f3
|
Work on emailcollector
|
2018-11-09 18:18:17 +01:00 |
|
Regis Houssin
|
89389baeac
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email
|
2018-11-09 15:37:29 +01:00 |
|
Laurent Destailleur
|
193b153fbf
|
Work on email collector
|
2018-11-07 18:02:08 +01:00 |
|
Laurent Destailleur
|
eb9defcf1d
|
Debug emailcollector
|
2018-11-05 16:42:29 +01:00 |
|
Laurent Destailleur
|
52d4426e87
|
Debug new modules
|
2018-11-05 16:38:07 +01:00 |
|
Laurent Destailleur
|
d65bf1fbc7
|
Fix emailcollector
|
2018-11-05 15:31:41 +01:00 |
|
Laurent Destailleur
|
0c7f33e1ba
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-11-05 09:58:19 +01:00 |
|
Laurent Destailleur
|
2900947019
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2018-11-05 09:56:57 +01:00 |
|
Laurent Destailleur
|
98a3af620b
|
FIX #9934
|
2018-11-05 09:26:23 +01:00 |
|
Laurent Destailleur
|
67fbb3dbb6
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/core/class/notify.class.php
htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
|
2018-11-03 19:15:52 +01:00 |
|
Laurent Destailleur
|
28d5f1d50b
|
Fix sql syntax error
|
2018-11-03 11:30:32 +01:00 |
|
Maxime Kohlhaas
|
d1133916e0
|
Fix tracking field in dictionnary should not be mandatory
|
2018-11-01 15:33:14 +01:00 |
|
Laurent Destailleur
|
970f501147
|
Debug modulebuilder
|
2018-10-31 20:10:20 +01:00 |
|
Laurent Destailleur
|
c9ef298839
|
Fix setup template emails
|
2018-10-31 11:38:04 +01:00 |
|
Regis Houssin
|
9589f69574
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_email
Conflicts:
htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
|
2018-10-30 18:29:28 +01:00 |
|
Regis Houssin
|
28360f6710
|
FIX add to migrate_delete_old_files
|
2018-10-28 09:41:11 +01:00 |
|
Regis Houssin
|
569d59d251
|
FIX change my deprecated email
|
2018-10-27 14:43:12 +02:00 |
|
Laurent Destailleur
|
622f31fd1e
|
Fix ref
|
2018-10-26 19:01:42 +02:00 |
|
Laurent Destailleur
|
d3893b8b95
|
Debug v9
|
2018-10-26 19:00:24 +02:00 |
|
Laurent Destailleur
|
0e464ea4f5
|
Merge pull request #9866 from frederic34/emptylines
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
|
2018-10-26 15:31:24 +02:00 |
|
Laurent Destailleur
|
8b601bd7fd
|
Fix numbering of holidays
|
2018-10-25 18:50:53 +02:00 |
|
Laurent Destailleur
|
25a374bd9a
|
NEW Notification module support expense report+holiday validation and
approval event.
|
2018-10-25 12:45:13 +02:00 |
|
Frédéric FRANCE
|
86d854f3f4
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
|
2018-10-24 23:04:26 +02:00 |
|
Laurent Destailleur
|
36323752ed
|
Project must be on a dedicated field
|
2018-10-24 12:00:54 +02:00 |
|
Laurent Destailleur
|
01adaf253c
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/bank/class/account.class.php
htdocs/product/list.php
|
2018-10-24 03:35:44 +02:00 |
|
atm-quentin
|
96d0bb8f2e
|
FIX adapt develop
|
2018-10-23 14:31:58 +02:00 |
|
Laurent Destailleur
|
b7d91c30d9
|
FIX missing symbol for indian rupies
|
2018-10-23 12:38:12 +02:00 |
|
atm-quentin
|
8442b405b2
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into PR_NEW_reception
|
2018-10-23 10:27:46 +02:00 |
|
atm-greg
|
ff92572d56
|
add insurance amount on loan
|
2018-10-18 17:03:49 +02:00 |
|
atm-quentin
|
83c8a78628
|
NEW auto event msg
|
2018-10-15 17:08:28 +02:00 |
|
Laurent Destailleur
|
eff0e959b3
|
Fix duplicate column
|
2018-10-10 13:06:54 +02:00 |
|
Laurent Destailleur
|
8f4b74733c
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/adherents/class/adherent.class.php
|
2018-10-10 01:51:54 +02:00 |
|
Laurent Destailleur
|
df0ec95b22
|
Code comment and better error message
|
2018-10-09 21:21:10 +02:00 |
|
Laurent Destailleur
|
9fe3e7b6c0
|
Fix phpunit
|
2018-10-09 17:09:33 +02:00 |
|
Laurent Destailleur
|
1d04ce2185
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/functions.lib.php
|
2018-10-09 17:07:32 +02:00 |
|
Laurent Destailleur
|
dc498173c8
|
Code comment
|
2018-10-09 16:58:55 +02:00 |
|
Laurent Destailleur
|
c401739fed
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-10-09 16:28:03 +02:00 |
|
Laurent Destailleur
|
b4b82ce3d6
|
Drop both contraint and index
|
2018-10-09 16:25:57 +02:00 |
|
Laurent Destailleur
|
bde5ee1232
|
Merge pull request #9621 from ptibogxiv/patch-69
Prepare for more stripe function
|
2018-10-09 16:15:23 +02:00 |
|
Laurent Destailleur
|
b68f6c0fca
|
Use more generic name
|
2018-10-09 16:15:12 +02:00 |
|
Laurent Destailleur
|
422af361b4
|
Merge pull request #9622 from ptibogxiv/patch-68
Prepare for more stripe function
|
2018-10-09 16:14:35 +02:00 |
|
Laurent Destailleur
|
65b48b06d9
|
Update llx_paiement.sql
|
2018-10-09 16:14:28 +02:00 |
|
Laurent Destailleur
|
94743d50be
|
Merge pull request #9707 from aspangaro/9.0_FEC
NEW Add FEC Export in accountancy
|
2018-10-09 13:05:20 +02:00 |
|
Laurent Destailleur
|
41f2289ffa
|
Save pos station into invoice
|
2018-10-08 22:28:30 +02:00 |
|
Alexandre SPANGARO
|
75b9862c14
|
New : Add FEC Export in accountancy
|
2018-10-08 21:01:21 +02:00 |
|
Laurent Destailleur
|
f9f93f58df
|
Add field to track source module of invoice
|
2018-10-07 13:49:09 +02:00 |
|
Laurent Destailleur
|
402a383c83
|
Uniformize field os social networks
|
2018-10-07 13:31:40 +02:00 |
|
Laurent Destailleur
|
3a0d777df7
|
Merge pull request #9649 from lex111/replaces-load
Replace multiple load calls with loadLangs method
|
2018-10-04 17:05:48 +02:00 |
|
Laurent Destailleur
|
111d589474
|
NEW Can mix offset before and after with rules for due date of invoices
|
2018-10-04 16:06:26 +02:00 |
|
atm-quentin
|
00f532c436
|
validation modèle de données
|
2018-10-04 09:50:39 +02:00 |
|
atm-quentin
|
52717dbb65
|
NEW debut rename stock conf
|
2018-10-03 18:05:22 +02:00 |
|
atm-quentin
|
41d8cb87a3
|
debut reception setup page
|
2018-10-03 12:22:41 +02:00 |
|
Laurent Destailleur
|
56cb0763d1
|
Add maincolor property on website
|
2018-10-02 16:46:54 +02:00 |
|
Laurent Destailleur
|
53b0ac8217
|
Rename template
|
2018-10-01 21:25:51 +02:00 |
|
Laurent Destailleur
|
af497271a4
|
Rename template website
|
2018-10-01 21:00:54 +02:00 |
|
Laurent Destailleur
|
a8f16f6570
|
Update template web site
|
2018-10-01 20:59:17 +02:00 |
|
Alexey Pyltsyn
|
49de7a5881
|
Replace multiple load calls with loadLangs method
|
2018-10-01 09:22:23 +03:00 |
|
Frédéric FRANCE
|
2b8ec8db1f
|
Update llx_takepos_floor_tables.sql
|
2018-09-30 10:33:52 +02:00 |
|
Frédéric FRANCE
|
6f48f37fa0
|
Update 8.0.0-9.0.0.sql
|
2018-09-30 10:31:08 +02:00 |
|
Laurent Destailleur
|
a4ec613d73
|
Move sql table
|
2018-09-28 19:40:44 +02:00 |
|
ptibogxiv
|
a05bdccb06
|
Prepare for more stripe function
|
2018-09-27 10:47:58 +02:00 |
|
ptibogxiv
|
78b8881c44
|
Prepare for more stripe function
support refund, dispute, capture....
|
2018-09-27 10:43:43 +02:00 |
|
Carsten Brandt
|
fee46ac845
|
Update german accounting file to use rowid
- fix "TODO Fix this file to use rowid"
|
2018-09-27 09:39:00 +02:00 |
|
Laurent Destailleur
|
0004cbde96
|
Merge pull request #9617 from cebe/fix-german-account-rowids
Update german accounting file to use rowid
|
2018-09-27 09:36:09 +02:00 |
|
Carsten Brandt
|
73ed340766
|
Update german accounting file to use rowid
- fix "TODO Fix this file to use rowid"
|
2018-09-26 11:52:06 +02:00 |
|
IJ
|
68dc213601
|
Correct Google+ to plus
|
2018-09-26 07:36:22 +01:00 |
|
IJ
|
9fd7d98c26
|
Add social fields
|
2018-09-26 07:35:26 +01:00 |
|
IJ
|
d063f6fdeb
|
Add social fields
|
2018-09-26 07:34:09 +01:00 |
|
IJ
|
c90cd4ae29
|
Add more social fields
|
2018-09-26 07:21:21 +01:00 |
|
Laurent Destailleur
|
c2335c0a5e
|
Update websote template
|
2018-09-26 00:17:53 +02:00 |
|
Laurent Destailleur
|
e6be047178
|
Work on new management for website module
|
2018-09-25 15:00:37 +02:00 |
|
Laurent Destailleur
|
e07ce644e8
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/admin.lib.php
htdocs/langs/en_US/admin.lang
|
2018-09-18 11:49:35 +02:00 |
|
Laurent Destailleur
|
2d8eb034e3
|
FIX Maxi debug to allow to load chart of account with multicompany
|
2018-09-17 21:02:07 +02:00 |
|
Laurent Destailleur
|
b4264ee0a0
|
Use font awesome for sort image
|
2018-09-12 21:57:32 +02:00 |
|
Laurent Destailleur
|
f5074f4962
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-09-12 18:12:17 +02:00 |
|
Laurent Destailleur
|
b341cb9245
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/compta/facture/list.php
htdocs/core/tpl/objectline_view.tpl.php
|
2018-09-12 18:11:51 +02:00 |
|
Laurent Destailleur
|
fd93a22dca
|
Fix missing field
|
2018-09-12 16:45:12 +02:00 |
|
Laurent Destailleur
|
72895bebbf
|
Add field twitter and facebook
|
2018-09-12 13:18:03 +02:00 |
|
Laurent Destailleur
|
af2e19eba8
|
Replace skype module with social networks module to support more fields
|
2018-09-12 10:55:45 +02:00 |
|
Laurent Destailleur
|
538a2cc647
|
NEW Add first template of website
|
2018-09-08 13:55:15 +02:00 |
|
Laurent Destailleur
|
ab8155f170
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture/card.php
htdocs/filefunc.inc.php
|
2018-09-04 21:35:43 +02:00 |
|
Laurent Destailleur
|
69cf7026eb
|
NEW Close #9296 Add field ref_ext into llx_categorie
|
2018-09-04 11:29:52 +02:00 |
|
Laurent Destailleur
|
f2ec94e9fd
|
FIX #9353 Bug: html error - div inside span on graphs
|
2018-09-04 11:13:54 +02:00 |
|
Laurent Destailleur
|
6b3ccddb65
|
FIX #9396
|
2018-09-04 10:14:45 +02:00 |
|
Laurent Destailleur
|
540999faa5
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/core/lib/company.lib.php
|
2018-09-03 14:06:51 +02:00 |
|
Laurent Destailleur
|
47655f0725
|
Add comment as FIXME
|
2018-09-03 14:00:12 +02:00 |
|
Laurent Destailleur
|
d050c0654b
|
FIX Add "-- ADD xxx to rowd" to avoid rowid conflict on account chart
|
2018-09-03 13:14:25 +02:00 |
|
Laurent Destailleur
|
c5c0491ea7
|
Fix restaure behavior account_parent point ro rowid
|
2018-09-03 12:59:20 +02:00 |
|
Laurent Destailleur
|
bf6463b152
|
Revert old behaviour
|
2018-09-03 12:54:20 +02:00 |
|
Laurent Destailleur
|
c423aebdad
|
Revert "FIX "account_parent" is linked with "account_number" instead rowid"
This reverts commit b1a340b193.
|
2018-09-03 12:51:20 +02:00 |
|
Laurent Destailleur
|
e9f3c131ec
|
Add the line -- ADD xxx to rowid
|
2018-09-03 12:42:26 +02:00 |
|
Laurent Destailleur
|
3593b5ac51
|
Revert "Revert " New:Algerian Chart of accounts""
This reverts commit 1d644a33a3.
|
2018-09-03 12:39:01 +02:00 |
|
Laurent Destailleur
|
1d644a33a3
|
Revert " New:Algerian Chart of accounts"
|
2018-09-03 11:42:01 +02:00 |
|
Bahfir Abbes
|
09b75fc53e
|
Update llx_accounting_account_dz.sql
|
2018-09-02 16:52:41 +01:00 |
|
Abbes Bahfir
|
28a146fb5e
|
New:Algerian Chart of accounts - First version
|
2018-09-02 16:44:07 +01:00 |
|
Laurent Destailleur
|
bcee0ef0ae
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/fourn/commande/dispatch.php
htdocs/societe/class/societe.class.php
htdocs/stripe/config.php
|
2018-09-01 14:16:57 +02:00 |
|
Laurent Destailleur
|
bb2f5ad588
|
Fix missing migration
|
2018-09-01 11:30:14 +02:00 |
|
Laurent Destailleur
|
ca2e9f20f6
|
Fix missing extrafield table
|
2018-08-31 18:39:13 +02:00 |
|
Laurent Destailleur
|
872273ef95
|
Update fileconf.php
|
2018-08-29 21:46:39 +02:00 |
|
Steve
|
642f5fd343
|
Merge pull request #2 from Dolibarr/develop
update 28/8/2018
|
2018-08-28 08:29:09 +02:00 |
|
Laurent Destailleur
|
9c6ce4b29d
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-08-28 02:36:15 +02:00 |
|