Laurent Destailleur
|
0ef3de98c6
|
Try to fix conflict of several stripe accounts
|
2019-12-15 17:18:09 +01:00 |
|
Laurent Destailleur
|
838633d0de
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/system/filecheck.php
htdocs/api/class/api_setup.class.php
htdocs/compta/facture/card.php
htdocs/compta/stats/index.php
htdocs/core/actions_massactions.inc.php
htdocs/install/upgrade2.php
htdocs/loan/card.php
htdocs/loan/document.php
htdocs/loan/info.php
htdocs/loan/note.php
htdocs/loan/schedule.php
htdocs/product/list.php
htdocs/ticket/card.php
htdocs/user/class/user.class.php
|
2019-12-14 14:53:49 +01:00 |
|
Laurent Destailleur
|
5d955fa7e0
|
Update 10.0.0-11.0.0.sql
|
2019-12-14 13:51:13 +01:00 |
|
Laurent Destailleur
|
7d39554797
|
FIX Bad type of sql fields
|
2019-12-13 17:16:21 +01:00 |
|
Frédéric FRANCE
|
57055bad03
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-12-13 14:36:00 +01:00 |
|
Florian Mortgat
|
b715ecd7d9
|
FIX bookmark URLs get truncated to 255 chars
|
2019-12-11 16:42:03 +01:00 |
|
Laurent Destailleur
|
df7a86dd42
|
Merge pull request #12652 from frederic34/doxygen_societe
doxygen societe class
|
2019-12-09 13:02:49 +01:00 |
|
Laurent Destailleur
|
2b5866aca2
|
WIP Complete module MRP
|
2019-12-08 23:45:06 +01:00 |
|
Frédéric FRANCE
|
48564ea760
|
doxygen societe class
|
2019-12-08 14:26:59 +01:00 |
|
Laurent Destailleur
|
3030a9fa2a
|
Fix manifest file was saved but not enabled.
|
2019-12-07 13:09:55 +01:00 |
|
Laurent Destailleur
|
18464de297
|
Clean old file
|
2019-12-04 22:08:32 +01:00 |
|
Laurent Destailleur
|
89dd74c115
|
Fix clean old files
|
2019-12-04 22:05:09 +01:00 |
|
Frédéric FRANCE
|
4c5c6b6ff1
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-12-03 17:56:43 +01:00 |
|
Laurent Destailleur
|
b678100c8d
|
Update website temp
|
2019-12-02 09:19:20 +01:00 |
|
Maxime Kohlhaas
|
83928b4708
|
Fix duration must be double(24,8) to store seconds
|
2019-12-01 18:19:22 +01:00 |
|
Frédéric FRANCE
|
25ed2b930f
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-12-01 16:10:37 +01:00 |
|
Laurent Destailleur
|
1c58cc5031
|
Clean doc
|
2019-11-30 10:59:47 +01:00 |
|
Laurent Destailleur
|
0083a3aa28
|
Update website templates
|
2019-11-28 13:04:44 +01:00 |
|
Laurent Destailleur
|
37a9c2e9ba
|
Look and feel v11
|
2019-11-28 12:40:53 +01:00 |
|
Frédéric FRANCE
|
b2912e688b
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-11-27 22:54:05 +01:00 |
|
Laurent Destailleur
|
b440f2b1f4
|
Fix a ref is not null
|
2019-11-26 08:53:54 +01:00 |
|
Frédéric FRANCE
|
4c4ae5b6e1
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-11-26 08:10:40 +01:00 |
|
Laurent Destailleur
|
6191307865
|
Debug v11
|
2019-11-22 12:22:27 +01:00 |
|
Laurent Destailleur
|
11be3b53f3
|
Fix migration
|
2019-11-21 18:39:51 +01:00 |
|
Laurent Destailleur
|
e8bc8b68c1
|
Fix missing field in migration
|
2019-11-21 18:17:40 +01:00 |
|
Laurent Destailleur
|
f7319aeefb
|
Fix size of field
|
2019-11-20 18:50:03 +01:00 |
|
Frédéric FRANCE
|
d182eee4bf
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-11-19 23:26:00 +01:00 |
|
Laurent Destailleur
|
5d7a1f1265
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/contact/card.php
htdocs/core/class/extrafields.class.php
htdocs/langs/en_US/stocks.lang
|
2019-11-19 19:02:14 +01:00 |
|
Laurent Destailleur
|
74c85b742e
|
Fix ref must be null until the generation of ref is ok
|
2019-11-18 18:09:12 +01:00 |
|
Frédéric FRANCE
|
2e5f539b2a
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-11-18 17:45:52 +01:00 |
|
Laurent Destailleur
|
ae0fdf014f
|
Debug email collector. Missing unique key. Fix initial setup.
|
2019-11-18 11:55:22 +01:00 |
|
Laurent Destailleur
|
502626156e
|
Work on MRP module
|
2019-11-17 01:23:19 +01:00 |
|
Laurent Destailleur
|
7a4647b3fb
|
Merge pull request #12458 from frederic34/doxygen_accountancy
doxygen accountancy class
|
2019-11-16 23:31:56 +01:00 |
|
Laurent Destailleur
|
6dcd1f6275
|
Fix css
|
2019-11-16 13:50:12 +01:00 |
|
Frédéric FRANCE
|
5c0976a778
|
doxygen accountancy class
|
2019-11-16 09:58:14 +01:00 |
|
Frédéric FRANCE
|
6784ea9fae
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-11-16 09:21:57 +01:00 |
|
Laurent Destailleur
|
8ef9728470
|
Fix permission on file
|
2019-11-14 17:28:23 +01:00 |
|
Scrutinizer Auto-Fixer
|
ddcc14dc16
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-14 11:09:15 +00:00 |
|
Frédéric FRANCE
|
a3e092b227
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-11-14 09:21:26 +01:00 |
|
Alexandre SPANGARO
|
1a9c430e00
|
Add migration
|
2019-11-14 04:53:13 +01:00 |
|
Frédéric FRANCE
|
9dcf53c65e
|
add tables
|
2019-11-13 20:56:36 +01:00 |
|
Laurent Destailleur
|
88d2658625
|
Merge branch 'develop' into scrutinizer-patch-2
|
2019-11-13 19:14:50 +01:00 |
|
Frédéric FRANCE
|
05ab4f79ef
|
categories for actioncomm
|
2019-11-13 18:44:11 +01:00 |
|
Laurent Destailleur
|
43ac3dc9e8
|
Merge pull request #12416 from frederic34/patch-6
Update llx_c_action_trigger.sql
|
2019-11-13 18:41:24 +01:00 |
|
Scrutinizer Auto-Fixer
|
87585c0f2a
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 17:32:11 +00:00 |
|
Laurent Destailleur
|
56c2dc2614
|
Reduce need of translations
|
2019-11-12 22:29:36 +01:00 |
|
Frédéric FRANCE
|
4f90fe0fd2
|
Update 10.0.0-11.0.0.sql
|
2019-11-12 21:34:45 +01:00 |
|
Frédéric FRANCE
|
422d893ecc
|
Update llx_c_action_trigger.sql
|
2019-11-12 21:33:42 +01:00 |
|
Laurent Destailleur
|
1153b81e6f
|
Update templates
|
2019-11-12 16:08:03 +01:00 |
|
Alexandre SPANGARO
|
812c032754
|
NEW French new regions
|
2019-11-12 15:56:11 +01:00 |
|
Laurent Destailleur
|
2c718af26c
|
Missing container type 'menu'
Fix: Add security if container is not a page
|
2019-11-12 13:55:46 +01:00 |
|
Laurent Destailleur
|
3054177e79
|
Fix type of tickets
|
2019-11-10 12:28:30 +01:00 |
|
Laurent Destailleur
|
880ecda098
|
Fix name of tables
|
2019-11-10 12:23:21 +01:00 |
|
Laurent Destailleur
|
eb378b45a4
|
Work on BOM - MO module
|
2019-11-09 20:35:45 +01:00 |
|
Laurent Destailleur
|
59d83fce59
|
Debug MRP module
|
2019-11-09 19:57:38 +01:00 |
|
Laurent Destailleur
|
a901ce932d
|
Repair
|
2019-11-07 14:19:52 +01:00 |
|
Laurent Destailleur
|
56c20b1d2b
|
Merge pull request #12350 from frederic34/patch-14
missing table product_fournisseur_price_extrafields
|
2019-11-07 11:30:51 +01:00 |
|
Laurent Destailleur
|
1ea8fed9c4
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-11-07 11:16:20 +01:00 |
|
Laurent Destailleur
|
feef992d39
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-11-07 11:16:09 +01:00 |
|
Laurent Destailleur
|
887c1a70d9
|
Fix remove annoying files
|
2019-11-06 18:46:04 +01:00 |
|
Frédéric FRANCE
|
f292b1f244
|
missing table product_fournisseur_price_extrafields
@Tim-Otte
|
2019-11-05 22:25:30 +01:00 |
|
Frédéric FRANCE
|
bbf962842e
|
add icons
|
2019-11-05 21:09:11 +01:00 |
|
Laurent Destailleur
|
7c4942b7be
|
Fix debug BOM/MO
|
2019-11-05 20:14:33 +01:00 |
|
Laurent Destailleur
|
1042cbd989
|
Fix duplicate ...
|
2019-11-05 17:20:44 +01:00 |
|
Laurent Destailleur
|
1b701f162a
|
FIX #12307
|
2019-11-05 13:16:39 +01:00 |
|
Laurent Destailleur
|
b4d72e3e96
|
Fix link to setup of social network module
|
2019-11-05 10:00:46 +01:00 |
|
Frédéric FRANCE
|
7ecdfa7c96
|
oups
|
2019-11-03 22:51:42 +01:00 |
|
Frédéric FRANCE
|
872f58f261
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-11-03 21:48:24 +01:00 |
|
Laurent Destailleur
|
ec9ce1721b
|
Last recent versions of migration at top
|
2019-11-02 17:18:34 +01:00 |
|
Laurent Destailleur
|
c63db01d5f
|
Merge branch 'develop' into patch-234
|
2019-11-02 16:20:24 +01:00 |
|
Laurent Destailleur
|
496f93911f
|
Merge pull request #11821 from Tim-Otte/develop
NEW Extrafields support in product supplier prices
|
2019-11-02 16:19:13 +01:00 |
|
Laurent Destailleur
|
935a7cffa1
|
Merge pull request #12236 from wdammak/patch-43
Remove limit time for upgrade
|
2019-11-02 13:45:39 +01:00 |
|
Laurent Destailleur
|
a971943832
|
Update upgrade2.php
|
2019-11-02 13:45:27 +01:00 |
|
stickler-ci
|
01d8c3bffd
|
Fixing style errors.
|
2019-11-02 12:20:32 +00:00 |
|
wdammak
|
378d0b0781
|
Update upgrade2.php
|
2019-11-02 13:18:48 +01:00 |
|
Laurent Destailleur
|
906f30773d
|
Merge pull request #12269 from atm-ph/new_edit_comment
New update comments is now available
|
2019-11-02 13:09:21 +01:00 |
|
Laurent Destailleur
|
45c77b4560
|
Renaming some libelle into label
|
2019-11-02 12:59:38 +01:00 |
|
Laurent Destailleur
|
68c971a2b5
|
All properties 'type_libelle' were renamed into 'type_label'.
|
2019-11-02 11:12:57 +01:00 |
|
Laurent Destailleur
|
036c1410c7
|
NEW Save user of last modification in donation record
|
2019-10-31 23:17:08 +01:00 |
|
Laurent Destailleur
|
716c2bb531
|
Work on MO
|
2019-10-31 22:46:34 +01:00 |
|
Laurent Destailleur
|
b296f62671
|
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
|
2019-10-31 02:36:31 +01:00 |
|
Laurent Destailleur
|
645390c990
|
Work on BOM templates
|
2019-10-31 02:36:16 +01:00 |
|
Frédéric FRANCE
|
f7747ed00a
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-30 20:06:43 +01:00 |
|
atm-ph
|
2f68a73a2a
|
New update comments is now available
|
2019-10-30 15:45:04 +01:00 |
|
Laurent Destailleur
|
66a288a343
|
Merge pull request #12235 from frederic34/scopeindent
clean indent
|
2019-10-30 02:57:59 +01:00 |
|
Frédéric FRANCE
|
dd5a9f4753
|
clean
|
2019-10-27 17:56:49 +01:00 |
|
Frédéric FRANCE
|
08f182fe98
|
Update llx_mrp_mo.key.sql
|
2019-10-27 17:49:41 +01:00 |
|
Frédéric FRANCE
|
0052349a6a
|
Update 10.0.0-11.0.0.sql
|
2019-10-27 17:48:11 +01:00 |
|
Frédéric FRANCE
|
e271aa6318
|
Update 10.0.0-11.0.0.sql
|
2019-10-27 17:41:40 +01:00 |
|
Frédéric FRANCE
|
136762dfcd
|
Update 10.0.0-11.0.0.sql
|
2019-10-27 17:24:36 +01:00 |
|
Frédéric FRANCE
|
1ba9612f12
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-27 17:03:50 +01:00 |
|
Laurent Destailleur
|
7f1b67f0e4
|
Add warehouse for production on MO
|
2019-10-27 16:28:03 +01:00 |
|
Frédéric FRANCE
|
ac6da28135
|
fix
|
2019-10-27 10:19:36 +01:00 |
|
Frédéric FRANCE
|
b2b057e9b5
|
clean indent
|
2019-10-27 09:51:15 +01:00 |
|
Laurent Destailleur
|
83a5cfbd1c
|
Support events on BOM
|
2019-10-27 02:05:43 +02:00 |
|
Laurent Destailleur
|
eb112d4012
|
Add qty frozen and disable stock change flag on BOM
|
2019-10-27 01:49:31 +02:00 |
|
Laurent Destailleur
|
8a22dcdbcb
|
Add sql for MO
|
2019-10-26 22:49:16 +02:00 |
|
wdammak
|
1a133bffa2
|
Remove limit time for upgrade
remove set_time_limit
|
2019-10-26 19:54:02 +02:00 |
|
Frédéric FRANCE
|
a43e6f96b5
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-25 08:12:54 +02:00 |
|
Laurent Destailleur
|
1cd1152290
|
Merge pull request #12193 from dolibarr95/patch-56
NEW: package sql data
|
2019-10-22 19:25:32 +02:00 |
|
dolibarr95
|
af8f5948f0
|
Package tables
llx_expedition_package and llx_c_shipment_package_type
|
2019-10-22 13:54:50 +02:00 |
|
ptibogxiv
|
c3fac0b8c9
|
Update llx_adherent_type.sql
|
2019-10-22 12:52:41 +02:00 |
|
ptibogxiv
|
d77215c40e
|
Update llx_adherent_type.sql
|
2019-10-22 12:52:14 +02:00 |
|
Laurent Destailleur
|
8aacfcdfbd
|
Merge branch 'develop' into patch-234
|
2019-10-22 12:46:39 +02:00 |
|
Laurent Destailleur
|
1ba9c31b37
|
Add migration of index
|
2019-10-22 12:34:03 +02:00 |
|
Laurent Léonard
|
b5aab50194
|
Add index on fk_origin_line column of llx_expeditiondet table
|
2019-10-22 06:07:11 +02:00 |
|
dolibarr95
|
c235740544
|
parcel to package
|
2019-10-21 08:58:13 +02:00 |
|
dolibarr95
|
16bd837dc7
|
create file
Dictionary of package type
|
2019-10-21 08:54:59 +02:00 |
|
dolibarr95
|
6a55aedf59
|
Create file.
List of parcels details related to an expedition.
|
2019-10-21 08:46:07 +02:00 |
|
Frédéric FRANCE
|
9ec7836387
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-20 16:37:18 +02:00 |
|
Laurent Destailleur
|
d79114c1f8
|
Clean code
|
2019-10-20 15:16:40 +02:00 |
|
Frédéric FRANCE
|
f4540dddb8
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-17 20:24:04 +02:00 |
|
Laurent Destailleur
|
2d017a6c80
|
Fix migration
|
2019-10-17 20:09:24 +02:00 |
|
Laurent Destailleur
|
005b1b12c4
|
Work on sort of permission per family+module
|
2019-10-17 19:33:06 +02:00 |
|
Laurent Destailleur
|
87ec1de78e
|
Start to work on solution to sort permissions by module
|
2019-10-17 18:43:07 +02:00 |
|
Frédéric FRANCE
|
e75f7d448c
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
|
2019-10-16 20:00:01 +02:00 |
|
Laurent Destailleur
|
e94d47daf7
|
Work on MRP module
|
2019-10-15 19:57:23 +02:00 |
|
Frédéric FRANCE
|
2351750d2b
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-14 19:02:46 +02:00 |
|
Laurent Destailleur
|
7973b03201
|
NEW Add estimated duration on the BOM module
|
2019-10-14 11:38:36 +02:00 |
|
Frédéric FRANCE
|
d9ba09bec1
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-12 19:02:24 +02:00 |
|
Laurent Destailleur
|
dfaf2ae34b
|
Trans
|
2019-10-11 19:20:52 +02:00 |
|
Frédéric FRANCE
|
367ef4acaf
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-11 16:44:25 +02:00 |
|
Laurent Destailleur
|
de107fb02e
|
NEW Can set a squarred icon on your company setup
|
2019-10-11 11:27:05 +02:00 |
|
Frédéric FRANCE
|
03bbfc6ad9
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-10 23:24:50 +02:00 |
|
Laurent Destailleur
|
28b87f9e27
|
Add image for members
|
2019-10-10 10:35:18 +02:00 |
|
Frédéric FRANCE
|
02b706f9c0
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-09 13:40:46 +02:00 |
|
Laurent Destailleur
|
29384d9a71
|
Merge branch 'develop' into patch-187
|
2019-10-09 13:02:47 +02:00 |
|
Laurent Destailleur
|
a8fbefed8c
|
Update 10.0.0-11.0.0.sql
|
2019-10-08 19:42:40 +02:00 |
|
Laurent Destailleur
|
dcc4fa6a64
|
Merge branch 'develop' into patch-255
|
2019-10-08 19:37:42 +02:00 |
|
Frédéric FRANCE
|
f253315c8d
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-08 18:30:58 +02:00 |
|
ptibogxiv
|
17198d59c2
|
Update 10.0.0-11.0.0.sql
|
2019-10-08 16:17:31 +02:00 |
|
ptibogxiv
|
552a9498be
|
Update llx_product.sql
|
2019-10-08 16:11:50 +02:00 |
|
Laurent Destailleur
|
d55b7689bb
|
Merge pull request #11920 from ptibogxiv/patch-264
NEW translation for member type
|
2019-10-08 09:00:49 +02:00 |
|
Frédéric FRANCE
|
b78187c1eb
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-08 00:07:27 +02:00 |
|
Laurent Destailleur
|
c6c498fd67
|
Merge pull request #11829 from atm-florian/dev_contactdefault
NEW : Address/Contact by default on third parties
|
2019-10-07 15:27:58 +02:00 |
|
Laurent Destailleur
|
e02794248e
|
Merge branch 'develop' into patch-264
|
2019-10-07 13:25:16 +02:00 |
|
Frédéric FRANCE
|
f80fa08a2d
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-07 07:57:05 +02:00 |
|
Laurent Destailleur
|
d4bb6490e9
|
Fix migration
|
2019-10-06 16:25:22 +02:00 |
|
Frédéric FRANCE
|
6384e7eb67
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-05 20:02:16 +02:00 |
|
Laurent Destailleur
|
b883a8092a
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/product.lib.php
htdocs/core/tpl/extrafields_list_search_input.tpl.php
htdocs/fourn/facture/card.php
htdocs/product/class/html.formproduct.class.php
|
2019-10-05 19:35:40 +02:00 |
|
florian HENRY
|
2d3dd9ed3c
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault
|
2019-10-04 18:10:16 +02:00 |
|
Frédéric FRANCE
|
0383fdbeee
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-03 18:37:14 +02:00 |
|
Frédéric FRANCE
|
91761e8185
|
fix migration script for thirdparties
|
2019-10-02 21:16:33 +02:00 |
|
Frédéric FRANCE
|
fe4629cd87
|
new migration script for thirdparties
|
2019-10-02 21:11:21 +02:00 |
|
Frédéric FRANCE
|
634fc5727c
|
new migration script for contacts
|
2019-10-02 21:08:41 +02:00 |
|
Frédéric FRANCE
|
b96911e9b7
|
new migration script for members
|
2019-10-02 21:05:19 +02:00 |
|
Frédéric FRANCE
|
cc03a0a63f
|
new migration script for user
|
2019-10-02 20:53:47 +02:00 |
|
Frédéric FRANCE
|
edf559697a
|
restore unfinished old commit
|
2019-10-01 23:47:45 +02:00 |
|
Frédéric FRANCE
|
aca9d92db8
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-01 22:03:33 +02:00 |
|
Frédéric FRANCE
|
010b2723b6
|
work on migration script
|
2019-10-01 20:14:06 +02:00 |
|
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 |
|