Frédéric FRANCE
|
9755d15f52
|
work on migration script
|
2019-10-01 17:51:44 +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 |
|
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
|
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
|
07b555b965
|
Merge branch 'develop' into patch-255
|
2019-09-27 15:23:15 +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
|
41cb628d05
|
Merge remote-tracking branch 'upstream/develop' into zapier
|
2019-09-25 08:06:44 +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 |
|
atm-quentin
|
c09f2d8c4e
|
NEW stock categories
|
2019-09-19 16:21:03 +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 |
|
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
|
bed959bb38
|
add entity
|
2019-09-12 21:17:52 +02:00 |
|
Frédéric FRANCE
|
3e11476810
|
add socialnetworks dictionary
|
2019-09-11 23:09:20 +02:00 |
|
Frédéric FRANCE
|
3fddef0c9e
|
add socialnetworks dictionary
|
2019-09-11 22:27:09 +02:00 |
|
ptibogxiv
|
651fbde64d
|
Merge branch 'develop' into patch-187
|
2019-09-10 20:46:54 +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 |
|
Frédéric FRANCE
|
4054ebaf27
|
wip
|
2019-09-07 15:12:07 +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
|
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
|
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
|
d668b79738
|
NEW Add column tms into the table of targets for emailing
|
2019-08-28 18:14:46 +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
|
869e497a48
|
NEW : Platforme compliance with Stripe Connect
|
2019-08-21 16:41:36 +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
|
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
|
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
|
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 |
|
Alexandre SPANGARO
|
2c74caff90
|
WIP
|
2019-07-22 06:56:55 +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 |
|
Alexandre SPANGARO
|
8b8aaafc05
|
Merge branch 'develop' into 10.0_intracommreport
|
2019-07-20 05:47:31 +02:00 |
|
Alexandre SPANGARO
|
9ab0734415
|
NEW Extrafields on salaries
|
2019-07-19 23:08:24 +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
|
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
|
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 |
|
Alexandre SPANGARO
|
9da91c06ed
|
Merge branch 'develop' into 10.0_intracommreport
|
2019-06-26 15:11:43 +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 |
|
John Botella
|
7b6925b8f7
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
|
2019-06-24 10:29:43 +02:00 |
|
Alexandre SPANGARO
|
4a84dcaa62
|
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
|
2019-06-23 21:47:34 +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 |
|
Alexandre SPANGARO
|
20b516885f
|
WIP
|
2019-06-20 09:33:01 +02:00 |
|
Laurent Destailleur
|
40023c8ba2
|
Merge branch 'develop' into patch-174
|
2019-06-20 03:56:29 +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 |
|
Alexandre SPANGARO
|
abfb708044
|
Merge branch 'develop' into 10.0_intracommreport
|
2019-06-19 21:43:40 +02:00 |
|
Laurent Destailleur
|
13abfc3140
|
Code comment
|
2019-06-18 16:46:12 +02:00 |
|
Nicolas ZABOURI
|
96c6994827
|
FIX 2 déclarations of date_valid in SQL
|
2019-06-18 10:55:16 +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 |
|
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
|
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 |
|
Alexandre SPANGARO
|
ba4bd274c0
|
WIP
|
2019-05-20 14:52:06 +02:00 |
|
Alexandre SPANGARO
|
e81dcb6060
|
WIP Update database
|
2019-05-19 21:26:49 +02:00 |
|
florian HENRY
|
c3dbbe51cf
|
fix missing migration sql for ticket now stable on 10
|
2019-05-18 23:57:00 +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 |
|
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
|
95bb8a1f75
|
Update llx_c_shipment_mode.key.sql
|
2019-05-08 01:57:39 +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 |
|
Laurent Destailleur
|
3a8d645fb9
|
Debug module ticket
|
2019-05-01 20:55:46 +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 |
|
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
|
fae2983c2a
|
Merge branch 'develop' into new_user_hr_fields
|
2019-04-11 18:27:58 +02:00 |
|
Laurent Destailleur
|
65e931cfe2
|
Work on email collector
|
2019-04-08 21:22:10 +02:00 |
|
ptibogxiv
|
63ad6b779a
|
Update llx_adherent_type.sql
|
2019-03-27 12:49:26 +01:00 |
|
Laurent Destailleur
|
4c4ad0548d
|
Fix for creation of index composed with type
|
2019-03-26 17:56:46 +01:00 |
|
Laurent Destailleur
|
8ca5b2e45f
|
Rename field
|
2019-03-22 17:43:53 +01:00 |
|
Laurent Destailleur
|
ae2f76f6bd
|
Update llx_product.sql
|
2019-03-21 18:32:40 +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 |
|
Maxime Kohlhaas
|
0a0e29a089
|
New fields on user object for hrm purpose
|
2019-03-16 08:53:06 +01:00 |
|
Laurent Destailleur
|
bca18f22ae
|
Prepare link with expense report line and document
|
2019-03-15 16:23:38 +01:00 |
|
Laurent Destailleur
|
8f65ee2296
|
Merge branch 'develop' into NEW_develop_supplier_buyprice_barcode
|
2019-03-14 17:48:44 +01:00 |
|
Laurent Destailleur
|
6ae36ce6a7
|
Work on BOM
|
2019-03-12 19:20:01 +01:00 |
|
Laurent Destailleur
|
9c8aff0a28
|
FIX #10787
|
2019-03-11 17:47:53 +01:00 |
|
Laurent Destailleur
|
10b9fdc1fd
|
Fix column definition
|
2019-03-09 02:05:28 +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
|
925def5390
|
Work on BOM module
|
2019-03-04 13:37:00 +01:00 |
|
atm-quentin
|
f51b89def3
|
NEW supplier buyprice barcode
|
2019-02-27 09:22:34 +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 |
|
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 |
|
ptibogxiv
|
c54c4f8667
|
Update llx_commande.sql
|
2019-02-20 12:18:20 +01:00 |
|
Laurent Destailleur
|
51441242bf
|
Fix sql error
|
2019-02-19 13:15:11 +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 |
|
wdammak
|
2fe3b7acc7
|
Add default warehouse for a user
|
2019-02-14 19:50:57 +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
|
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 |
|
ptibogxiv
|
8f3ffc6520
|
NEW stripe payment intent
use it for stripe
|
2019-02-12 19:03:45 +01:00 |
|
florian HENRY
|
eba4be2335
|
ad missing files
|
2019-02-12 17:03:47 +01:00 |
|
Alexandre SPANGARO
|
13cf3b1d7f
|
Add subledger in various payment
|
2019-02-01 15:50:12 +01:00 |
|
Alexandre SPANGARO
|
cc88c4f8ff
|
Move my email to the new one
|
2019-01-28 21:39:22 +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
|
70c52e6417
|
Add field calling_duration in table llx_actioncomm
|
2019-01-26 01:17:41 +01:00 |
|
ptibogxiv
|
754714abf7
|
Update llx_don.sql
|
2019-01-18 11:23:59 +01:00 |
|
ptibogxiv
|
389b44faa3
|
Update llx_subscription.sql
|
2019-01-17 17:41:45 +01:00 |
|
Laurent Destailleur
|
003f499eb0
|
Add url_id into unique index of bank_url
|
2019-01-09 13:02:19 +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
|
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 |
|
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 |
|
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
|
27f8096afa
|
Merge branch 'develop' into PR_NEW_reception
|
2018-12-15 12:50:31 +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
|
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 |
|
andreubisquerra
|
939f31c71f
|
First CashControl version
|
2018-12-08 21:33:54 +01:00 |
|
Laurent Destailleur
|
21b3bbc2e6
|
Merge
|
2018-12-08 11:55:27 +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 |
|
Maxime Kohlhaas
|
2e496ea83a
|
QUAL rename facnumber by ref
|
2018-12-02 17:33:44 +01:00 |
|
Laurent Destailleur
|
c3e2f73e48
|
FIX #10144
|
2018-12-01 19:45:30 +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
|
200de22807
|
Missing image in container
|
2018-11-20 16:48:34 +01:00 |
|
Alexandre SPANGARO
|
2d55666a0b
|
NEW Add gender in member card
|
2018-11-18 21:50:58 +01:00 |
|
Laurent Destailleur
|
6d640ab83c
|
Fix feature to drag and drop rows of table (not generic)
|
2018-11-15 19:58:06 +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
|
f022be3a47
|
FIX #9992
|
2018-11-11 17:28:17 +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
|
28d5f1d50b
|
Fix sql syntax error
|
2018-11-03 11:30:32 +01:00 |
|
Laurent Destailleur
|
970f501147
|
Debug modulebuilder
|
2018-10-31 20:10:20 +01:00 |
|
Regis Houssin
|
569d59d251
|
FIX change my deprecated email
|
2018-10-27 14:43:12 +02:00 |
|
Laurent Destailleur
|
d3893b8b95
|
Debug v9
|
2018-10-26 19:00:24 +02:00 |
|
Laurent Destailleur
|
8b601bd7fd
|
Fix numbering of holidays
|
2018-10-25 18:50:53 +02:00 |
|
Laurent Destailleur
|
36323752ed
|
Project must be on a dedicated field
|
2018-10-24 12:00:54 +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 |
|
Laurent Destailleur
|
eff0e959b3
|
Fix duplicate column
|
2018-10-10 13:06:54 +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
|
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 |
|
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 |
|
Frédéric FRANCE
|
2b8ec8db1f
|
Update llx_takepos_floor_tables.sql
|
2018-09-30 10:33:52 +02:00 |
|
Laurent Destailleur
|
a4ec613d73
|
Move sql table
|
2018-09-28 19:40:44 +02:00 |
|
ptibogxiv
|
78b8881c44
|
Prepare for more stripe function
support refund, dispute, capture....
|
2018-09-27 10:43:43 +02: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 |
|
Laurent Destailleur
|
e6be047178
|
Work on new management for website module
|
2018-09-25 15:00:37 +02:00 |
|
Laurent Destailleur
|
72895bebbf
|
Add field twitter and facebook
|
2018-09-12 13:18:03 +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
|
bf6463b152
|
Revert old behaviour
|
2018-09-03 12:54:20 +02:00 |
|
Laurent Destailleur
|
1b20d6feab
|
Merge pull request #9214 from atm-greg/Add_supplier_product_description
NEW Can record the supplier product description
|
2018-08-12 18:56:27 +02:00 |
|
John BOTELLA
|
d6d8f98f38
|
add retained warranty cond field and add forms
|
2018-08-10 15:06:00 +02:00 |
|
John BOTELLA
|
06be98c638
|
add date field
|
2018-08-08 17:36:39 +02:00 |
|
John BOTELLA
|
3036c94198
|
Add new situation retained warranty field
|
2018-08-07 15:18:42 +02:00 |
|
atm-greg
|
ad5f59822e
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into Add_supplier_product_description
|
2018-08-07 09:33:30 +02:00 |
|
atm-greg
|
fc705e8510
|
Merge branch '8.0' of github.com:Dolibarr/dolibarr into Add_supplier_product_description
|
2018-08-07 09:31:41 +02:00 |
|
atm-greg
|
7063850034
|
add sql field
|
2018-08-06 16:32:25 +02:00 |
|
Regis Houssin
|
fa32e48b8a
|
FIX change column "account_parent" and missing modify column
|
2018-08-03 13:53:12 +02:00 |
|
Juanjo Menent
|
788060aa28
|
Merge pull request #9178 from aspangaro/9.0_a3
NEW : Add project on salaries
|
2018-08-02 11:19:34 +02:00 |
|
Alexandre SPANGARO
|
0509a176ca
|
Merge branch 'develop' into 9.0_a3
|
2018-07-31 07:47:43 +02:00 |
|
Alexandre SPANGARO
|
b0e2e69ed0
|
New : Add project on salaries
|
2018-07-31 07:45:03 +02:00 |
|
Frédéric FRANCE
|
2dd907a8e1
|
extrafield totalizable
|
2018-07-26 09:41:44 +02:00 |
|
Laurent Destailleur
|
5f52dfa873
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-07-10 14:02:40 +02:00 |
|
Laurent Destailleur
|
cbc17d4658
|
Fix ecm when using multicompany
|
2018-07-10 12:03:51 +02:00 |
|
Laurent Destailleur
|
3a593f88f1
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/install/upgrade2.php
|
2018-07-05 10:28:24 +02:00 |
|
Laurent Destailleur
|
5883899bc7
|
Little debug of option WEBSITE_USE_WEBSITE_ACCOUNTS
|
2018-07-05 02:33:39 +02:00 |
|
Laurent Destailleur
|
12c43d7722
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-07-03 12:33:17 +02:00 |
|
Laurent Destailleur
|
c2499f298c
|
Fix bad name of field
|
2018-07-02 18:08:55 +02:00 |
|
Laurent Destailleur
|
0f77e3c05c
|
Fix bad name of field
|
2018-07-02 17:57:32 +02:00 |
|
Laurent Destailleur
|
63f3143718
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-07-02 12:18:34 +02:00 |
|
Laurent Destailleur
|
7bf33b1bac
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/hrm/index.php
htdocs/install/mysql/tables/llx_website_account.key.sql
htdocs/modulebuilder/template/myobject_card.php
|
2018-07-02 12:16:51 +02:00 |
|
Laurent Destailleur
|
d8c7c61951
|
Merge branch '8.0_canvas' of https://github.com/hregis/dolibarr into
hregis-8.0_canvas
# Conflicts:
# htdocs/product/canvas/product/tpl/list.tpl.php
|
2018-06-30 18:29:08 +02:00 |
|
Regis Houssin
|
718cbce8eb
|
Fix: use "visible" field name instead "checked"
|
2018-06-30 10:58:08 +02:00 |
|
Regis Houssin
|
4c90ff9917
|
NEW add "checked" field for new list engine compatibility
|
2018-06-30 10:54:22 +02:00 |
|
Laurent Destailleur
|
a9e78f27d9
|
Merge branch 'develop' into patch-115
|
2018-06-30 01:21:58 +02:00 |
|
Laurent Destailleur
|
3112244529
|
Merge pull request #8884 from defrance/patch-117
New : fichinter models (like factureRec)
|
2018-06-30 01:19:03 +02:00 |
|
Laurent Destailleur
|
60c62895bf
|
WIP Can add tooltips on extrafields
|
2018-06-28 19:13:23 +02:00 |
|
Laurent Destailleur
|
aa37786596
|
Fix migration errors reported by Softaculous
|
2018-06-26 11:51:49 +02:00 |
|
Regis Houssin
|
a6729b0bd1
|
Fix: change field name and remove obsolete data
|
2018-06-25 09:10:24 +02:00 |
|
Laurent Destailleur
|
5829014218
|
Merge branch 'develop' into NEW_advance_targer_filter_everywhere
|
2018-06-24 10:24:26 +02:00 |
|
atm-quentin
|
d53aa71673
|
NEW advance target filtering can be used everywhere with tpl and fk_element
|
2018-06-22 10:54:00 +02:00 |
|
hythamsoliman81
|
f461ab5f96
|
SQL synatx error at llx_website_page.sql
|
2018-06-17 00:12:06 +02:00 |
|
Laurent Destailleur
|
64537ba9bf
|
Fix missing field in install
|
2018-06-11 09:20:26 +02:00 |
|
Laurent Destailleur
|
87d073b5cd
|
Fix conflict with external ticketsup module
|
2018-06-04 21:49:29 +02:00 |
|
Laurent Destailleur
|
01c8b33483
|
FIX 8870
|
2018-05-29 10:18:45 +02:00 |
|
BENKE Charlene
|
a85ba00d2e
|
Create llx_fichinterdet_rec.sql
|
2018-05-28 16:42:19 +02:00 |
|
BENKE Charlene
|
0b7342f34b
|
Create llx_fichinter_rec.key.sql
|
2018-05-28 16:41:45 +02:00 |
|
BENKE Charlene
|
17016d03fe
|
Create llx_fichinter_rec.sql
|
2018-05-28 16:40:36 +02:00 |
|
Alexandre SPANGARO
|
cb815e5e3b
|
Update works
|
2018-05-13 07:50:24 +02:00 |
|
BENKE Charlene
|
468635867d
|
Add dateemployementend
|
2018-05-12 17:52:56 +02:00 |
|
Laurent Destailleur
|
9aaf5b95a7
|
Merge pull request #8745 from wdammak/patch-5
Update llx_entrepot add model_pdf
|
2018-05-05 12:50:36 +02:00 |
|
wdammak
|
468f970d32
|
Update llx_stock_mouvement Add model_pdf
|
2018-05-04 18:10:55 +01:00 |
|
wdammak
|
e34bd1a222
|
Update llx_entrepot add model_pdf
|
2018-05-04 18:08:04 +01:00 |
|
florian HENRY
|
c84f44a508
|
fix accountanty in multientity
|
2018-05-01 12:30:22 +02:00 |
|
Laurent Destailleur
|
fb81ce5117
|
Some fixes for postgresl migration
|
2018-04-17 18:32:04 +02:00 |
|
Laurent Destailleur
|
3078b890d4
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/stripe/admin/stripe.php
|
2018-04-13 00:45:39 +02:00 |
|
Laurent Destailleur
|
ecd18da137
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2018-04-13 00:43:37 +02:00 |
|
florian HENRY
|
cd2f6616be
|
fix index creation with unique name for pgSQL
|
2018-04-12 16:41:53 +02:00 |
|
Laurent Destailleur
|
0bf4381226
|
NEW The field "visible" on extrafield can accept expression as condition
|
2018-04-10 15:39:11 +02:00 |
|
Laurent Destailleur
|
a231074012
|
Save search criteria when using "back to" on accounting account
Change type of foreign key to be an integer to avoid CAST in requests
|
2018-04-09 11:31:24 +02:00 |
|
Alexandre SPANGARO
|
3e66f5e25b
|
Update works
|
2018-04-06 06:04:03 +02:00 |
|
Alexandre SPANGARO
|
619805c7a5
|
Update works
|
2018-04-05 20:40:41 +02:00 |
|
Alexandre SPANGARO
|
2a50e9e6c4
|
Merge remote-tracking branch 'uptream/develop' into 8.0-a13
|
2018-04-02 19:54:30 +02:00 |
|
Alexandre SPANGARO
|
3779b6ff1c
|
Update work on assets type
|
2018-04-02 08:22:26 +02:00 |
|
Alexandre SPANGARO
|
a5428cc8c7
|
NEW Module Assets
|
2018-04-01 21:26:52 +02:00 |
|
Laurent Destailleur
|
a9ac7e1f29
|
Debug inventory module
|
2018-03-31 19:20:38 +02:00 |
|
Laurent Destailleur
|
6d796cfd26
|
Update llx_product.sql
|
2018-03-29 13:50:29 +02:00 |
|
Marc de Lima Lucio
|
3646374976
|
NEW: default warehouse field for products + prefill warehouses when dispatching supplier orders
|
2018-03-28 11:54:21 +02:00 |
|
Laurent Destailleur
|
e9c4ae8f01
|
Add type product/service in type of expense report
|
2018-03-26 14:52:20 +02:00 |
|
Laurent Destailleur
|
7363ae17ee
|
Move setup of email for module module into email templates
|
2018-03-23 16:09:46 +01:00 |
|
Laurent Destailleur
|
c9566e9501
|
Merge pull request #8392 from aspangaro/8.0-a9
NEW Add stats in salaries module
|
2018-03-15 14:28:35 +01:00 |
|
Laurent Destailleur
|
db18db9488
|
Clean code
|
2018-03-15 11:27:39 +01:00 |
|
Alexandre SPANGARO
|
9ce6ab915c
|
Merge remote-tracking branch 'uptream/develop' into 8.0-a9
|
2018-03-15 06:24:51 +01:00 |
|
Alexandre SPANGARO
|
5eccc6bcbc
|
NEW Add stats in salaries module
|
2018-03-15 06:23:20 +01:00 |
|
Laurent Destailleur
|
268b07bcf0
|
Can add/delete credit card localy
|
2018-03-14 11:51:13 +01:00 |
|
Laurent Destailleur
|
944ba69cd8
|
Add unique key. Dolibarrize view of stripe card.
|
2018-03-13 17:32:49 +01:00 |
|
Laurent Destailleur
|
8048259733
|
Work on ticket module integration
|
2018-03-13 12:13:47 +01:00 |
|
Laurent Destailleur
|
5d512af4b4
|
Fix migration
|
2018-03-13 09:53:33 +01:00 |
|
ptibogxiv
|
d6be9651a0
|
ADD key_account variable for stripe or other gateway
|
2018-03-13 00:29:28 +01:00 |
|
Laurent Destailleur
|
7362b3f3d7
|
Add table to store thirparty account in external web sites
|
2018-03-12 15:59:03 +01:00 |
|
Laurent Destailleur
|
18b6b70f45
|
Merge pull request #8358 from frederic34/patch-2
Update llx_ticketsup.sql
|
2018-03-12 12:28:40 +01:00 |
|
Laurent Destailleur
|
98b7d4c2e2
|
NEW Can set the start/end date of service line in invoice templates
|
2018-03-12 12:27:40 +01:00 |
|
Frédéric FRANCE
|
478b3dfa42
|
Update llx_ticketsup.sql
|
2018-03-12 08:34:47 +01:00 |
|