Laurent Destailleur
|
07c1a5717e
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/facture_situation.php
htdocs/core/class/html.formother.class.php
|
2019-12-23 14:16:34 +01:00 |
|
Laurent Destailleur
|
9a08a6bf6d
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/categories/traduction.php
htdocs/compta/facture/class/facture.class.php
htdocs/contact/card.php
htdocs/core/modules/modSociete.class.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/langs/en_US/products.lang
htdocs/margin/agentMargins.php
htdocs/margin/customerMargins.php
htdocs/margin/productMargins.php
htdocs/margin/tabs/productMargins.php
htdocs/margin/tabs/thirdpartyMargins.php
|
2019-12-23 14:13:26 +01:00 |
|
Laurent Destailleur
|
eb32e98127
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2019-12-23 14:01:44 +01:00 |
|
Laurent Destailleur
|
36e6036e9e
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-12-23 14:01:00 +01:00 |
|
Laurent Destailleur
|
a076c3c20c
|
Add mig file for v12
|
2019-12-23 13:48:38 +01:00 |
|
Laurent Destailleur
|
22f3b69666
|
Fix default value for situation invoice
|
2019-12-22 11:59:38 +01:00 |
|
Laurent Destailleur
|
c0ef3b46ad
|
Work on MRP module
|
2019-12-20 15:31:05 +01:00 |
|
Laurent Destailleur
|
d1fdd11b37
|
Close #10907
|
2019-12-19 11:32:10 +01:00 |
|
Laurent Destailleur
|
4a734e53a6
|
Fix column too low.
Fix automatic event not found if from a module with several objects
|
2019-12-17 14:47:58 +01:00 |
|
Francis Appels
|
95b56f0518
|
Update 6.0.0-7.0.0.sql
timestamp NOT NULL can cause SQL error.
|
2019-12-17 12:19:35 +01:00 |
|
Laurent Destailleur
|
0ef3de98c6
|
Try to fix conflict of several stripe accounts
|
2019-12-15 17:18:09 +01:00 |
|
Laurent Destailleur
|
5d955fa7e0
|
Update 10.0.0-11.0.0.sql
|
2019-12-14 13:51:13 +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
|
2b5866aca2
|
WIP Complete module MRP
|
2019-12-08 23:45:06 +01:00 |
|
Laurent Destailleur
|
3030a9fa2a
|
Fix manifest file was saved but not enabled.
|
2019-12-07 13:09:55 +01:00 |
|
Frédéric FRANCE
|
4c5c6b6ff1
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-12-03 17:56:43 +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
|
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 |
|
Frédéric FRANCE
|
5c0976a778
|
doxygen accountancy class
|
2019-11-16 09:58:14 +01: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
|
05ab4f79ef
|
categories for actioncomm
|
2019-11-13 18:44:11 +01:00 |
|
Frédéric FRANCE
|
4f90fe0fd2
|
Update 10.0.0-11.0.0.sql
|
2019-11-12 21:34:45 +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
|
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 |
|
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 |
|
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
|
c63db01d5f
|
Merge branch 'develop' into patch-234
|
2019-11-02 16:20:24 +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
|
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 |
|
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 |
|
Frédéric FRANCE
|
dd5a9f4753
|
clean
|
2019-10-27 17:56:49 +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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
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
|
edf559697a
|
restore unfinished old commit
|
2019-10-01 23:47:45 +02:00 |
|
Frédéric FRANCE
|
9755d15f52
|
work on migration script
|
2019-10-01 17:51:44 +02:00 |
|
Laurent Destailleur
|
22f07fe54d
|
Merge branch 'develop' into patch-234
|
2019-09-30 18:09:05 +02:00 |
|
ptibogxiv
|
f132f2f947
|
Update 10.0.0-11.0.0.sql
|
2019-09-29 15:40:26 +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 |
|
Frédéric FRANCE
|
03086026b8
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-09-27 08:06:13 +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 |
|
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 |
|
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 |
|
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
|
904d0ecaee
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-09-14 18:42:31 +02:00 |
|
Laurent Destailleur
|
54f0532073
|
Work on #4432
|
2019-09-14 16:51:57 +02:00 |
|
Frédéric FRANCE
|
230c14e189
|
add social networks
|
2019-09-12 22:32:41 +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 |
|
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 |
|
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
|
ca71f02d41
|
Merge branch 'develop' into develop_pdf
|
2019-09-06 23:30:12 +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 |
|
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 |
|
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 |
|
ptibogxiv
|
60a7ba463c
|
Update 10.0.0-11.0.0.sql
|
2019-08-23 14:53:40 +02:00 |
|
ptibogxiv
|
e43d996780
|
Update 10.0.0-11.0.0.sql
|
2019-08-21 16:45:53 +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 |
|
Frédéric FRANCE
|
d55377981c
|
Update 10.0.0-11.0.0.sql
|
2019-08-07 13:27:55 +02:00 |
|
Laurent Destailleur
|
85dbec6ae7
|
Move sql in correct migration file
|
2019-08-01 16:33:34 +02:00 |
|
ptibogxiv
|
ace01f7442
|
Fix wrong sql update version
|
2019-08-01 16:29:42 +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
|
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
|
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 |
|
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 |
|
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
|
a55da8f8f8
|
Fix migration
|
2019-07-19 17:20:33 +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
|
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
|
46f590f0be
|
Add column iplastlogin and ippreviouslogin
|
2019-07-01 15:44:34 +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
|
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
|
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
|
77a45b878b
|
Fix migration
|
2019-06-20 03:56:42 +02:00 |
|
Laurent Destailleur
|
d8c2007d92
|
Prepare v11 alpha
|
2019-06-20 03:53:33 +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
|
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 |
|
Laurent Destailleur
|
badfd47ee7
|
Fix migration
|
2019-06-16 17:25:42 +02:00 |
|
Laurent Destailleur
|
f41606ba15
|
Merge branch '10.0' into 10.0_Differentiated_export
|
2019-06-12 13:27:49 +02:00 |
|
Laurent Destailleur
|
a70a14b145
|
Fix migration
|
2019-06-04 20:06:44 +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
|
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 |
|
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
|
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 |
|
ATM-Marc
|
2c104ccc4a
|
NEW: contact types for supplier proposals
|
2019-05-18 14:22:04 +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 |
|