Frédéric FRANCE
|
f09fa5226a
|
Rename llx_c_shipment_package_type to llx_c_shipment_package_type.sql
|
2020-04-20 18:43:05 +02:00 |
|
Laurent Destailleur
|
e050429854
|
Update llx_commandedet.key.sql
|
2020-04-18 15:48:45 +02:00 |
|
oscim
|
f4c346cdbb
|
Update llx_commandedet.key.sql
add external key
|
2020-04-14 07:48:34 +02:00 |
|
Laurent Destailleur
|
52b467d2fc
|
FIX #13550 Removed not used table
|
2020-04-12 19:06:44 +02:00 |
|
Laurent Destailleur
|
51eea01505
|
Merge pull request #13584 from pstructures/develop
Installation issue
|
2020-04-12 16:38:08 +02:00 |
|
Matt Sidnell
|
7c72e40659
|
Installation issue
Installation SQL issue due to a ';' instead of a ','.
|
2020-04-12 15:21:14 +01:00 |
|
Frédéric FRANCE
|
33a926e251
|
Update llx_categorie_website_page.key.sql
|
2020-04-12 09:08:27 +02:00 |
|
Laurent Destailleur
|
6a955da4e9
|
Merge pull request #13546 from oscim/patch-33
Update llx_societe.key.sql
|
2020-04-11 01:31:29 +02:00 |
|
Laurent Destailleur
|
47f00f8bc8
|
Update llx_societe.key.sql
Keep only fields that are enough discriminent for new indexes
|
2020-04-11 01:31:03 +02:00 |
|
Laurent Destailleur
|
6960f79e40
|
Update llx_ticket.key.sql
|
2020-04-10 19:59:45 +02:00 |
|
philazerty
|
0aab98abff
|
Index optimization for ticket
When there are a lot of tickets, the search can be long without these indexes.
|
2020-04-10 17:05:53 +02:00 |
|
Laurent Destailleur
|
8567001a46
|
Merge pull request #13549 from oscim/patch-34
Update llx_societe_rib.key.sql
|
2020-04-10 11:11:13 +02:00 |
|
oscim
|
2887ae3f00
|
Update llx_societe_rib.key.sql
fix key in table
|
2020-04-10 08:54:39 +02:00 |
|
oscim
|
2df7d79421
|
Update llx_societe.key.sql
Add index in table for optimise search in big database
|
2020-04-09 15:54:25 +02:00 |
|
Laurent Destailleur
|
87ff94fc64
|
Add generic fields
|
2020-04-05 03:59:23 +02:00 |
|
Laurent Destailleur
|
8454598722
|
WIP Add tables to manage categories of website pages.
|
2020-04-04 18:59:26 +02:00 |
|
Laurent Destailleur
|
9849afd3dd
|
WIP Add tables to manage categories of website pages.
|
2020-04-04 18:53:38 +02:00 |
|
Laurent Destailleur
|
99ddd25ad5
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/product/stock/class/mouvementstock.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
|
2020-04-02 16:51:50 +02:00 |
|
Laurent Destailleur
|
6f0071bebe
|
FIX sort on company on member list
|
2020-03-31 17:54:48 +02:00 |
|
Laurent Destailleur
|
be3cc164c6
|
Increase size for unalterable logs record.
|
2020-03-30 18:41:21 +02:00 |
|
Laurent Destailleur
|
398812afa5
|
Add field to store version of encoding of line in blockedlog
|
2020-03-30 17:47:29 +02:00 |
|
Laurent Destailleur
|
c27592bad2
|
Clean deprecated params on all fetch_optionals()
|
2020-03-27 16:02:58 +01:00 |
|
Laurent Destailleur
|
fa3bba942f
|
Start to save the VAT src code into table of discounts to reuse them
later
|
2020-03-26 02:01:30 +01:00 |
|
Laurent Destailleur
|
e937b22721
|
Increase batch number to 128
|
2020-03-25 19:34:52 +01:00 |
|
Laurent Destailleur
|
226f4695cd
|
Fix migration of type of field
|
2020-03-22 19:48:53 +01:00 |
|
Laurent Destailleur
|
6b3826cbb8
|
Merge branch 'develop' into patch-25
|
2020-03-18 19:47:25 +01:00 |
|
Anthony Berton
|
82058f3a78
|
add phone
|
2020-03-18 01:17:54 +01:00 |
|
Alexandre SPANGARO
|
af5444806d
|
Work on reconcilation of accouting account
|
2020-03-16 06:41:14 +01:00 |
|
Alexandre SPANGARO
|
bc717bc6ae
|
Work on reconciliation of accouting account
|
2020-03-15 07:49:24 +01:00 |
|
Laurent Destailleur
|
6f636d6d69
|
NEW Add field author public alias for blog post on website module
|
2020-03-12 20:50:36 +01:00 |
|
Alexandre SPANGARO
|
d9b9913e8a
|
NEW: Accountancy - Add mode intra & export for product or service bought
|
2020-03-01 04:52:12 +01:00 |
|
Alexandre SPANGARO
|
86d9622360
|
NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality
|
2020-02-27 10:44:04 +01:00 |
|
Laurent Destailleur
|
ca39c680c7
|
Rename field documentpdf into printable (this field already exists due
to a very old PR nofinished for same goal).
|
2020-02-23 23:03:17 +01:00 |
|
Laurent Destailleur
|
c14daa2790
|
Can set main language and sublanguages of a website
|
2020-02-19 18:32:04 +01:00 |
|
Laurent Destailleur
|
058524ff82
|
Comment
|
2020-02-10 02:29:09 +01:00 |
|
Laurent Destailleur
|
f114ca9479
|
Missing column import_key on ticket table
|
2020-02-07 15:53:50 +01:00 |
|
Laurent Destailleur
|
4e4fd4c76c
|
Remove code using a no more used field
|
2020-02-07 13:15:51 +01:00 |
|
Laurent Destailleur
|
cd58822d98
|
Can edit a table of resolution code for tickets
|
2020-02-07 12:48:41 +01:00 |
|
Laurent Destailleur
|
db43b2d3dd
|
Fix unique key on llx_holiday_users
|
2020-02-05 13:53:35 +01:00 |
|
Alexandre SPANGARO
|
d6d3fff9dc
|
Merge branch 'develop' into 10.0_intracommreport
|
2020-02-03 21:15:07 +01:00 |
|
Laurent Destailleur
|
d827e3289a
|
Removed no more used field "amount" in llx_facture
|
2020-01-31 15:12:17 +01:00 |
|
Laurent Destailleur
|
f22ad9a9bf
|
Add column eec in table of countries
|
2020-01-22 00:36:04 +01:00 |
|
Laurent Destailleur
|
92856788a3
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-20 18:39:46 +01:00 |
|
Laurent Destailleur
|
cfc74db5bc
|
FIX field 'private' on email templates was not managed.
|
2020-01-20 18:38:53 +01:00 |
|
Laurent Destailleur
|
206cfcd7fe
|
Clean code for inventory
|
2020-01-20 02:07:47 +01:00 |
|
Laurent Destailleur
|
3f79c00542
|
Merge branch 'develop' into actioncomm_category
|
2020-01-15 14:21:06 +01:00 |
|
Laurent Destailleur
|
64564e75ae
|
Add entity into unique key
|
2020-01-15 13:55:17 +01:00 |
|
Laurent Destailleur
|
ef540c6c72
|
Merge branch 'develop' into FIX_develop_urls_longer_than_255_chars_get_truncated_in_bookmarks
|
2020-01-15 13:50:03 +01:00 |
|
Laurent Destailleur
|
5772dce460
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/functions.lib.php
|
2020-01-15 12:09:21 +01:00 |
|
atm-ph
|
a088c78279
|
Fix column type to be as llx_facture
|
2020-01-15 09:52:12 +01:00 |
|
Laurent Destailleur
|
22b6828e09
|
Merge pull request #12792 from aspangaro/12.0_a5
NEW Accountancy - Add possibility to manage an short alternative label for account - Use to simplify accountancy
|
2020-01-10 00:23:54 +01:00 |
|
Laurent Destailleur
|
e8e82ca08c
|
Standardize columns
|
2020-01-09 20:11:03 +01:00 |
|
Laurent Destailleur
|
97f62c68f2
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-08 13:38:03 +01:00 |
|
Laurent Destailleur
|
20c9035837
|
Debug MRP
|
2020-01-07 22:17:40 +01:00 |
|
Laurent Destailleur
|
b9e0f8999f
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/filefunc.inc.php
|
2020-01-04 14:03:21 +01:00 |
|
Alexandre SPANGARO
|
c3518426bd
|
NEW Accountancy - Add possibility to manage an short alternative label - use to simplify
|
2020-01-03 22:05:49 +01:00 |
|
Laurent Destailleur
|
d93de4b931
|
FIX Import of customer prices per segment was not possible
|
2020-01-02 20:08:43 +01:00 |
|
Frédéric FRANCE
|
90235d0528
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-12-31 13:57:40 +01:00 |
|
Alexandre SPANGARO
|
c664a1e42d
|
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
|
2019-12-31 08:34:37 +01:00 |
|
Laurent Destailleur
|
8838dc38db
|
Merge branch 'develop' into FIX_develop_urls_longer_than_255_chars_get_truncated_in_bookmarks
|
2019-12-30 22:25:06 +01:00 |
|
Laurent Destailleur
|
ece8390277
|
Add tables to store translation of all objects (like llx_product_lang)
|
2019-12-26 13:23:18 +01:00 |
|
Laurent Destailleur
|
4333cf2040
|
Show the stripe accoutn of a cu_ and a card_
|
2019-12-24 12:53:10 +01:00 |
|
Florian Mortgat
|
cbca0f389a
|
Merge branch 'develop' into FIX_develop_urls_longer_than_255_chars_get_truncated_in_bookmarks
|
2019-12-24 10:00:20 +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
|
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 |
|
Laurent Destailleur
|
0ef3de98c6
|
Try to fix conflict of several stripe accounts
|
2019-12-15 17:18:09 +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 |
|
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
|
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 |
|
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
|
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
|
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 |
|
Frédéric FRANCE
|
9dcf53c65e
|
add tables
|
2019-11-13 20:56:36 +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
|
7c4942b7be
|
Fix debug BOM/MO
|
2019-11-05 20:14:33 +01:00 |
|
Laurent Destailleur
|
1b701f162a
|
FIX #12307
|
2019-11-05 13:16:39 +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
|
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
|
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
|
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
|
08f182fe98
|
Update llx_mrp_mo.key.sql
|
2019-10-27 17:49:41 +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
|
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 |
|
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 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
|
f4540dddb8
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-17 20:24:04 +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
|
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
|
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
|
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
|
e02794248e
|
Merge branch 'develop' into patch-264
|
2019-10-07 13:25:16 +02:00 |
|
Frédéric FRANCE
|
aca9d92db8
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-01 22:03:33 +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 |
|
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 |
|
Laurent Destailleur
|
ae82d045f8
|
Dolibarrize module ticket
|
2018-03-11 23:56:17 +01:00 |
|
florian HENRY
|
cfdaa7c88d
|
ticket sup make it work
|
2018-03-11 16:07:13 +01:00 |
|
jfefe
|
79acb79ae0
|
Begin integration of module « Ticketsup »
Related to #4948
|
2018-03-11 09:44:58 +01:00 |
|
Laurent Destailleur
|
3ad95e46c0
|
Fix phpunit
|
2018-03-08 22:40:42 +01:00 |
|
Laurent Destailleur
|
489dde4db4
|
Prepare database to store payment modes of customers
|
2018-03-08 22:26:42 +01:00 |
|
Laurent Destailleur
|
1c9e7145e7
|
Merge pull request #8276 from ATM-Consulting/develop_atm
NEW: supplier credit notes & discounts (absolute and relative)
|
2018-03-08 20:06:37 +01:00 |
|
Laurent Destailleur
|
235db1f405
|
Enhance OAuth module to store the stripe account in llx_oauth_token
|
2018-03-08 19:51:18 +01:00 |
|
Regis Houssin
|
93a9430e49
|
Fix: regression, restore primary key
|
2018-03-08 07:41:54 +01:00 |
|
Laurent Destailleur
|
94140b04ca
|
FIX Missing primary key on payment modes
|
2018-03-07 15:28:50 +01:00 |
|
Laurent Destailleur
|
a086bd0137
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/actions_linkedfiles.inc.php
htdocs/core/class/utils.class.php
|
2018-03-06 09:20:45 +01:00 |
|
Marc de Lima Lucio
|
1765b09fda
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
|
2018-03-05 11:05:38 +01:00 |
|
Laurent Destailleur
|
1f67e115d7
|
Merge pull request #8239 from hregis/develop_bug2
Fix: syntax error
|
2018-03-02 17:45:31 +01:00 |
|
florian HENRY
|
3490d3779b
|
Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0
|
2018-03-02 17:31:39 +01:00 |
|
florian HENRY
|
473c16ede5
|
fix pgSQL install
|
2018-03-02 17:30:46 +01:00 |
|
Laurent Destailleur
|
b87db9d32d
|
Fix missing ;
|
2018-03-02 16:38:56 +01:00 |
|
Laurent Destailleur
|
e073fa15f7
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-03-02 14:00:27 +01:00 |
|
Laurent Destailleur
|
8d11f1efa1
|
FIX Payment mode not correctly set in donation and document
|
2018-03-02 12:32:49 +01:00 |
|
Marc de Lima Lucio
|
059801fe03
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
|
2018-03-01 10:22:21 +01:00 |
|
Laurent Destailleur
|
e2c7585ae7
|
NEW Support alternative aliases of page name in website
|
2018-02-28 14:36:22 +01:00 |
|
Marc de Lima Lucio
|
7cd1b2caa9
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
|
2018-02-27 16:45:01 +01:00 |
|
Marc de Lima Lucio
|
9cf45266f5
|
NEW: supplier relative discounts
|
2018-02-27 16:30:39 +01:00 |
|
Regis Houssin
|
ef60d095c0
|
Fix: syntax error
|
2018-02-25 19:55:10 +01:00 |
|
Laurent Destailleur
|
2cd5ed65a6
|
Clean deprecated (field unit_charge in supplier price)
|
2018-02-25 14:13:09 +01:00 |
|
Laurent Destailleur
|
787a137509
|
Add column for accounting doc
|
2018-02-23 15:38:39 +01:00 |
|
Laurent Destailleur
|
1ee128ff13
|
NEW Add type of website container/page into dictionary
|
2018-02-19 19:48:53 +01:00 |
|
Marc de Lima Lucio
|
daca27b2ed
|
NEW: supplier credit notes: split display in thirdparty discount page + fixes + refactoring
|
2018-02-14 18:02:40 +01:00 |
|
Laurent Destailleur
|
475b89bac1
|
Merge branch 'develop' into new_order_min_amount
|
2018-02-08 14:20:53 +01:00 |
|
Laurent Destailleur
|
0cc6654b06
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/extrafields.class.php
|
2018-02-04 13:25:00 +01:00 |
|
Laurent Destailleur
|
30c68aecf2
|
Code comment
|
2018-02-03 19:52:09 +01:00 |
|
Laurent Destailleur
|
5ab5c12a7b
|
Code comments
|
2018-02-03 19:42:00 +01:00 |
|
Laurent Destailleur
|
12aec8f806
|
Prepare database for invoicing of projects
|
2018-02-02 15:19:04 +01:00 |
|
Laurent Destailleur
|
eb3eee9b6a
|
Code comment
|
2018-01-26 15:25:47 +01:00 |
|
Maxime Kohlhaas
|
6f248a6590
|
New allow to define order min amount
|
2018-01-20 20:17:56 +01:00 |
|
Laurent Destailleur
|
7a88afe962
|
Fix field enabled and perms must differs
|
2018-01-13 13:16:33 +01:00 |
|
florian HENRY
|
320465aeb9
|
fix : #8003
|
2018-01-02 09:46:45 +01:00 |
|
Laurent Destailleur
|
ce680af357
|
Fix field name and length (database portabilit)
|
2017-12-28 11:16:27 +01:00 |
|
Laurent Destailleur
|
e6c7f9e69b
|
Debug module inventory
|
2017-12-22 21:29:09 +01:00 |
|
Laurent Destailleur
|
2b056b0177
|
BUG Fix of old hidden feature price per quantity
|
2017-12-22 12:53:46 +01:00 |
|
Laurent Destailleur
|
01c99b780e
|
Fix missing index
|
2017-12-19 16:22:47 +01:00 |
|
Laurent Destailleur
|
98b82d712a
|
NEW Revenue stamp can be a percent
FIX Revenue stamp not visible on the transfer payment page
|
2017-12-18 12:43:03 +01:00 |
|
Laurent Destailleur
|
929893bd49
|
Fix regression introduced with task comments
|
2017-12-15 20:07:35 +01:00 |
|
Alexandre SPANGARO
|
ff9c714f88
|
FIX : v7 sql error on init database
|
2017-12-10 08:02:57 +01:00 |
|
Laurent Destailleur
|
dc04ab3164
|
Missing field in website module
|
2017-12-02 13:24:21 +01:00 |
|
Laurent Destailleur
|
6796c08cb8
|
Debug/rewrite Blockedlog
|
2017-11-30 14:21:55 +01:00 |
|
Laurent Destailleur
|
6a8388dd57
|
Add table for online signature
|
2017-11-25 14:11:34 +01:00 |
|
Laurent Destailleur
|
e22d13cf55
|
Merge pull request #7860 from IonAgorria/resources-country
Add country to resource
|
2017-11-24 16:35:52 +01:00 |
|
Laurent Destailleur
|
831099fef8
|
Debug modulebuilder
|
2017-11-24 16:24:42 +01:00 |
|
Laurent Destailleur
|
9f235e1ff6
|
Standardize database: field ref of warehouse was renamed label -> ref
|
2017-11-24 15:27:00 +01:00 |
|
Ion
|
6428c2157c
|
Add country to resource
|
2017-11-23 00:26:25 +01:00 |
|
Laurent Destailleur
|
cf0d67d71c
|
Generation of pdf become default value
|
2017-11-17 23:57:32 +01:00 |
|
Laurent Destailleur
|
f708450276
|
Fix sql error
|
2017-11-16 22:57:25 +01:00 |
|
Laurent Destailleur
|
2d78136781
|
Standardize field length
|
2017-11-13 18:04:14 +01:00 |
|
Frédéric FRANCE
|
6f647f8a40
|
generate doc on cron jobs
|
2017-11-09 23:39:28 +01:00 |
|
Laurent Destailleur
|
fa999dfa65
|
Merge pull request #7742 from aspangaro/7.0-accountancyproductvariant
NEW Accountancy Add variant on sell account for intracommunity sales & export sales
|
2017-11-06 09:25:14 +01:00 |
|
Alexandre SPANGARO
|
26cb4bc6f6
|
FIX Missing fields for the table bookeeping_tmp on migration
|
2017-11-04 08:10:05 +01:00 |
|
Alexandre SPANGARO
|
7e3103356b
|
Merge remote-tracking branch 'uptream/develop' into 7.0-accountancyproductvariant
# Conflicts:
# htdocs/install/mysql/migration/6.0.0-7.0.0.sql
|
2017-11-04 07:14:28 +01:00 |
|
Laurent Destailleur
|
a346a1a5e9
|
Work on website module
|
2017-11-03 15:56:16 +01:00 |
|
Laurent Destailleur
|
55386a3ae2
|
Work on website module
|
2017-11-03 13:52:03 +01:00 |
|
Laurent Destailleur
|
fa1fbe7db7
|
Work on websiteaccounts
|
2017-11-03 13:25:49 +01:00 |
|
Alexandre SPANGARO
|
2d17e4094c
|
Merge remote-tracking branch 'uptream/develop' into 7.0-accountancyproductvariant
# Conflicts:
# htdocs/install/mysql/migration/6.0.0-7.0.0.sql
|
2017-11-03 06:18:27 +01:00 |
|
Laurent Destailleur
|
d137cef843
|
Merge pull request #7707 from aspangaro/7.0-SPEC1
SPEC #7013 : use database type "double" to store monetary values
|
2017-11-02 09:54:34 +01:00 |
|
Laurent Destailleur
|
9458c80c48
|
Work on reminders
|
2017-10-31 23:10:29 +01:00 |
|
Alexandre SPANGARO
|
cc26095467
|
Update database
|
2017-10-31 22:04:50 +01:00 |
|
Alexandre SPANGARO
|
e7832e3c44
|
Correct PR
|
2017-10-29 07:16:04 +01:00 |
|
Alexandre SPANGARO
|
63707dbe10
|
Merge remote-tracking branch 'uptream/develop' into 7.0-SPEC1
|
2017-10-29 06:58:04 +01:00 |
|
Alexandre SPANGARO
|
16e4e8ada1
|
Fix SPEC1
|
2017-10-29 06:56:05 +01:00 |
|
Laurent Destailleur
|
d1e7577eed
|
Fix sql field can't be named 'offset' (reserved word).
|
2017-10-26 18:30:01 +02:00 |
|
Laurent Destailleur
|
8058712d47
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/customer/index.php
htdocs/contrat/class/contrat.class.php
htdocs/product/list.php
|
2017-10-26 17:06:11 +02:00 |
|
Laurent Destailleur
|
5f5cbec1cf
|
Debug module website
|
2017-10-26 13:09:11 +02:00 |
|
Laurent Destailleur
|
66d2c29fe1
|
Work on modulebuilder and website module
|
2017-10-26 01:02:13 +02:00 |
|
Laurent Destailleur
|
bb996019c2
|
NEW Support visibility on extrafields
|
2017-10-25 11:42:14 +02:00 |
|
Alexandre SPANGARO
|
ecbc393c96
|
FIX SPEC #7013 : use database type "numeric" to store monetary values
|
2017-10-24 21:14:31 +02:00 |
|
Laurent Destailleur
|
72441de1ec
|
Fix length of fk_mainmenu and fk_leftmenu
|
2017-10-24 17:35:53 +02:00 |
|
Laurent Destailleur
|
d2f723045c
|
Work on website and modulebuilder
|
2017-10-24 17:30:05 +02:00 |
|
Laurent Destailleur
|
f083ac5e6b
|
Prepare database to store country int accounting_system table
|
2017-10-23 18:56:09 +02:00 |
|
Laurent Destailleur
|
1fe1cb986a
|
Fix AUTO_INCREMENT PRIMARY KEY does not need NOT NULL
|
2017-10-22 15:51:07 +02:00 |
|
Laurent Destailleur
|
efb369f857
|
Merge pull request #7497 from atm-florian/dev_accountancy
NEW : lettrage in accountancy
|
2017-10-22 15:28:53 +02:00 |
|
Laurent Destailleur
|
611f5f638d
|
FIX #7616
|
2017-10-22 15:07:41 +02:00 |
|
Laurent Destailleur
|
19a5780f7f
|
Clean code
|
2017-10-20 23:49:20 +02:00 |
|
Laurent Destailleur
|
9c45e86a1c
|
Introduce main_doc into table of objects to know what is main doc.
Work on option PROPOSAL_USE_ONLINE_SIGN
|
2017-10-19 11:40:40 +02:00 |
|
Laurent Destailleur
|
30dad0be12
|
Split file of chart of account to prepare to load files after install
|
2017-10-19 09:28:59 +02:00 |
|
florian HENRY
|
4273e507c5
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into
dev_accountancy
Conflicts:
htdocs/accountancy/bookkeeping/thirdparty_lettrage.php
htdocs/accountancy/bookkeeping/thirdparty_lettrage_supplier.php
htdocs/accountancy/class/lettering.class.php
|
2017-10-18 09:52:56 +02:00 |
|
Laurent Destailleur
|
1fba58b9ce
|
Fix bookmark list
|
2017-10-12 17:09:17 +02:00 |
|
Laurent Destailleur
|
56be9e2b60
|
Introduce table c_email_senderprofile to have several profils
|
2017-10-11 19:41:45 +02:00 |
|
Laurent Destailleur
|
ce7ce82801
|
Enhance email template editor
|
2017-10-08 14:51:10 +02:00 |
|
Laurent Destailleur
|
06b18a740e
|
NEW Add date of birth on user card.
NEW Show expected worked hours on the timesheet form.
|
2017-10-06 12:08:01 +02:00 |
|
Laurent Destailleur
|
f2e0ff0d30
|
Merge branch 'develop_dict' of https://github.com/hregis/dolibarr into hregis-develop_dict
|
2017-10-03 17:25:01 +02:00 |
|
Laurent Destailleur
|
fef6440ff2
|
FIX #7541
|
2017-10-03 16:23:30 +02:00 |
|
Laurent Destailleur
|
0f194d6715
|
Update llx_holiday.sql
|
2017-10-03 16:21:44 +02:00 |
|
Frédéric FRANCE
|
dd76672c27
|
ref can be null
|
2017-10-03 00:30:42 +02:00 |
|
Laurent Destailleur
|
97d399595f
|
Add unique key on table to follow leave request counter per type
|
2017-10-02 17:45:01 +02:00 |
|
Regis Houssin
|
09e71f1390
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
|
2017-10-02 11:51:27 +02:00 |
|
Laurent Destailleur
|
94ae6c62e6
|
Add htmlheader field for each page
|
2017-10-02 00:08:00 +02:00 |
|
Laurent Destailleur
|
9654c4f168
|
New extrafields are visible into list by default
|
2017-09-29 13:29:48 +02:00 |
|
Laurent Destailleur
|
8242469e40
|
FIX The unique index on email templates can work now.
|
2017-09-27 18:16:28 +02:00 |
|
Regis Houssin
|
20684b4505
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
Conflicts:
htdocs/core/modules/rapport/pdf_paiement.class.php
htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
|
2017-09-27 17:22:18 +02:00 |
|
Laurent Destailleur
|
f1a563625b
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
|
2017-09-26 22:11:00 +02:00 |
|
Laurent Destailleur
|
15c8515d53
|
Fix default
|
2017-09-26 19:08:04 +02:00 |
|
Laurent Destailleur
|
4f76545b62
|
Add missing fields to manage localtax on supplier products
|
2017-09-26 10:47:08 +02:00 |
|
Regis Houssin
|
d592664150
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
|
2017-09-25 06:48:26 +02:00 |
|
Laurent Destailleur
|
57358f0ce5
|
NEW Provide a way to download a file from a public URL for files in ECM
|
2017-09-21 14:02:42 +02:00 |
|
Regis Houssin
|
a03ef95eaa
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
Conflicts:
htdocs/install/mysql/tables/llx_c_payment_term.sql
|
2017-09-18 09:11:04 +02:00 |
|
Laurent Destailleur
|
d1fd1df345
|
Add column position on some dictionaries table
|
2017-09-17 22:52:29 +02:00 |
|
Laurent Destailleur
|
ab5724e7ff
|
Mutualize code for forms to send emails. Remove thousand line of code.
|
2017-09-17 17:12:14 +02:00 |
|
Laurent Destailleur
|
a4086b52ef
|
NEW Can send email from contract card
|
2017-09-16 01:34:15 +02:00 |
|
Laurent Destailleur
|
ffb3823655
|
Allow null in stock alert threshold to be compatible with #7162
|
2017-09-15 23:38:03 +02:00 |
|
Regis Houssin
|
a494e01f00
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
Conflicts:
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
|
2017-09-14 12:07:19 +02:00 |
|
Laurent Destailleur
|
cda8c6e41a
|
Fix ref must be 50
|
2017-09-12 11:51:51 +02:00 |
|
Laurent Destailleur
|
f0f6df4c90
|
Fix tables declaration
|
2017-09-11 15:23:49 +02:00 |
|
Laurent Destailleur
|
1f56800a50
|
Merge pull request #7341 from atm-arnaud/NEW_task_discussion
New task discussion
|
2017-09-11 15:20:13 +02:00 |
|
Laurent Destailleur
|
dcc9cb4a16
|
Some fixes in various payment
|
2017-09-11 14:29:27 +02:00 |
|
Regis Houssin
|
b5de8da3a6
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
Conflicts:
htdocs/core/modules/modFacture.class.php
|
2017-09-11 08:07:55 +02:00 |
|
Laurent Destailleur
|
974f99ddb2
|
Increase length of title field
|
2017-09-11 02:54:21 +02:00 |
|
Laurent Destailleur
|
2ae135baf1
|
NEW Add view of status of template invoice
|
2017-09-10 20:47:45 +02:00 |
|
Laurent Destailleur
|
e7abb39ee2
|
NEW Template invoices are visible on the customer tab
|
2017-09-10 19:28:20 +02:00 |
|
Laurent Destailleur
|
01664a135d
|
Removed not used field
|
2017-09-10 18:01:34 +02:00 |
|
Laurent Destailleur
|
b7197530c2
|
NEW Each user can edit its own email template (menu tools)
|
2017-09-08 12:48:01 +02:00 |
|
arnaud
|
8906c95eea
|
NEW comments system on task
|
2017-09-07 16:23:51 +02:00 |
|
Regis Houssin
|
66e548427c
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
Conflicts:
htdocs/compta/resultat/clientfourn.php
htdocs/core/lib/functions.lib.php
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
|
2017-09-07 10:50:35 +02:00 |
|
Laurent Destailleur
|
2ab12f54ff
|
Fix install error due to too large column with index
|
2017-08-31 22:42:14 +02:00 |
|
Regis Houssin
|
8e8f94df11
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
Conflicts:
htdocs/compta/facture/card.php
htdocs/compta/facture/class/facture-rec.class.php
|
2017-08-30 19:33:23 +02:00 |
|
Alexandre SPANGARO
|
e081653cef
|
Add fk_projet in table various_payment
|
2017-08-30 06:38:33 +02:00 |
|
Laurent Destailleur
|
9312005318
|
NEW Move accountancy features into a dedicated menu
|
2017-08-29 12:43:47 +02:00 |
|
Laurent Destailleur
|
b4769d37d6
|
Increase emailing title length
|
2017-08-28 00:06:38 +02:00 |
|
Laurent Destailleur
|
3f7eea2e0a
|
NEW Can set language on extrafields
|
2017-08-27 12:12:02 +02:00 |
|
Laurent Destailleur
|
c573df4f0e
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/user/card.php
|
2017-08-26 22:33:56 +02:00 |
|
Laurent Destailleur
|
03eb870576
|
Fix sql syntax error
|
2017-08-26 20:16:12 +02:00 |
|
Laurent Destailleur
|
49a2f4f0c6
|
Fix sql
|
2017-08-26 20:13:01 +02:00 |
|
John
|
0653a5d177
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_develop_extrafields_facture_rec
|
2017-08-24 14:35:01 +02:00 |
|
Regis Houssin
|
ad39c30c21
|
Fix: change old email
|
2017-08-23 21:23:18 +02:00 |
|
Regis Houssin
|
1befd9c67f
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
Conflicts:
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
|
2017-08-23 21:05:36 +02:00 |
|
Laurent Destailleur
|
4c243d3b9e
|
Fix index declaration must be moved into the .key.sql files.
|
2017-08-23 15:18:54 +02:00 |
|
Regis Houssin
|
2f537a1ade
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
Conflicts:
htdocs/compta/charges/index.php
htdocs/compta/paiement/list.php
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
|
2017-08-22 18:49:40 +02:00 |
|
John
|
b18104788e
|
New extrafield on facture_rec
|
2017-08-22 15:22:41 +02:00 |
|
Laurent Destailleur
|
927da89c89
|
Revert bad change
|
2017-08-22 11:52:34 +02:00 |
|
Laurent Destailleur
|
681623c3ab
|
Merge branch 'develop' into patch-1
|
2017-08-22 11:43:25 +02:00 |
|
Laurent Destailleur
|
188653a85d
|
Work on website module
|
2017-08-20 18:50:51 +02:00 |
|
Laurent Destailleur
|
a8d9dff506
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-07-31 19:32:08 +02:00 |
|
Laurent Destailleur
|
d2b662c671
|
Add field fk_user in bookkeeping (the user who valiated the accounting
document. Will be used for statistics purpose only).
|
2017-07-31 19:31:52 +02:00 |
|
Regis Houssin
|
0dc0fe81fc
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
|
2017-07-31 07:40:01 +02:00 |
|
Laurent Destailleur
|
69357dd91c
|
Merge pull request #7113 from atm-ph/new_develop_expense_report
NEW Add expense report rules and ik
|
2017-07-31 02:33:49 +02:00 |
|
Laurent Destailleur
|
46586f3055
|
Can export Websites pages.
Work on export to be able to use the generic declaration of fields.
|
2017-07-28 14:54:13 +02:00 |
|
atm-ph
|
1f3f9e40b1
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_develop_expense_report
|
2017-07-27 16:01:53 +02:00 |
|
Regis Houssin
|
acd5780e32
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
|
2017-07-26 08:58:56 +02:00 |
|
Laurent Destailleur
|
c5267154b9
|
Merge branch 'develop' into Bookkeeping-V6
|
2017-07-25 20:54:37 +02:00 |
|
Laurent Destailleur
|
6c9242b605
|
Merge pull request #7201 from atm-florian/dev_extrafields_table_uniformisation
NEW new columns into extrafields table to get update create information
|
2017-07-25 20:04:50 +02:00 |
|
florian HENRY
|
d2ecebdddd
|
new :new column into extrafeild table to get update create information
|
2017-07-25 11:57:36 +02:00 |
|
Laurent Destailleur
|
67a442cd9a
|
Uniformize fields
|
2017-07-24 11:53:57 +02:00 |
|
Laurent Destailleur
|
25b107defb
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/contrat/list.php
htdocs/fichinter/list.php
|
2017-07-23 19:09:00 +02:00 |
|
Regis Houssin
|
2efb86b5d8
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
|
2017-07-23 10:36:14 +02:00 |
|
Laurent Destailleur
|
437d620fe4
|
Add support of language in website module
|
2017-07-22 20:01:29 +02:00 |
|
Regis Houssin
|
26df1389f4
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
Conflicts:
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
|
2017-07-21 20:42:21 +02:00 |
|
Laurent Destailleur
|
3716645b8b
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-07-21 15:03:21 +02:00 |
|
Laurent Destailleur
|
d07741ada1
|
Merge branch 'develop' into patch-rib
|
2017-07-21 14:58:33 +02:00 |
|
Laurent Destailleur
|
aacef21cb8
|
Can clone a page
|
2017-07-21 13:38:13 +02:00 |
|
Laurent Destailleur
|
6e77dab832
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-07-18 15:13:15 +02:00 |
|
Maxime Kohlhaas
|
d35dbdea92
|
Change column size in sql table creation also
|
2017-07-18 10:16:59 +02:00 |
|
Regis Houssin
|
200f232164
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
|
2017-07-16 07:51:20 +02:00 |
|
Laurent Destailleur
|
75ec7a309c
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-07-15 21:25:14 +02:00 |
|
Laurent Destailleur
|
c6dcccba18
|
Fix better warning when record will be saved into a waiting account.
|
2017-07-15 14:55:04 +02:00 |
|
Laurent Destailleur
|
cb87b314be
|
FIX Maxi debug of journalization of bank journal.
|
2017-07-15 03:41:07 +02:00 |
|
Laurent Destailleur
|
3ac85e10c5
|
NEW Add mass action "validate" on supplier invoices.
NEW Add date_valid and date_pointoftax on supplier invoices.
|
2017-07-14 14:40:09 +02:00 |
|
Laurent Destailleur
|
3db7bd7624
|
Fix look and feel v6
|
2017-07-13 17:44:12 +02:00 |
|
Laurent Destailleur
|
10337b4914
|
Update llx_mailing_cibles.sql
|
2017-07-13 14:25:42 +02:00 |
|
florian HENRY
|
67664331e3
|
Merge branch '6.0' of local repository into 6.0_fix_advtargetmailing
|
2017-07-12 17:49:44 +02:00 |
|
Regis Houssin
|
cb6b81d897
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
|
2017-07-11 19:10:22 +02:00 |
|
florian HENRY
|
c85bf18f0e
|
Fix AdvtargetEmailing
|
2017-07-11 14:47:37 +02:00 |
|
Laurent Destailleur
|
be09c911ce
|
Debug module websites
|
2017-07-10 23:44:46 +02:00 |
|
Laurent Destailleur
|
3c576dcf21
|
Fix bad name of tables
|
2017-07-09 20:57:45 +02:00 |
|
Laurent Destailleur
|
a562e5a919
|
Maxi debug of accountancy ledger page.
|
2017-07-08 20:52:53 +02:00 |
|
Laurent Destailleur
|
0a7a092080
|
FIX Missing ref
|
2017-07-07 19:17:53 +02:00 |
|
phf
|
6ab0ec4b1b
|
Fix travis and rename 2 fields
|
2017-07-07 10:22:37 +02:00 |
|
phf
|
b8865c425f
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_develop_expense_report
|
2017-07-05 10:48:01 +02:00 |
|
phf
|
1beec51928
|
New expense report rules and ik (index kilometers) - MAIN_USE_EXPENSE_IK - MAIN_USE_EXPENSE_RULE
|
2017-07-05 10:44:52 +02:00 |
|
Regis Houssin
|
3f882cb33a
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
|
2017-07-03 09:24:05 +02:00 |
|
Darkjeff
|
30153f8c2e
|
add in bookkeeping date lim reglement
Date lim reglement for export Sage and Iris
correct avoir when write in bookkeeping
|
2017-07-03 07:21:15 +02:00 |
|
Laurent Destailleur
|
aa1351d483
|
Fix to be sure database is not created using utf8mb4 (not yet supported)
|
2017-07-03 01:10:09 +02:00 |
|
Regis Houssin
|
fa247ffd98
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
|
2017-06-29 08:51:42 +02:00 |
|
Laurent Destailleur
|
fed5999a6c
|
Update doc
|
2017-06-24 16:57:42 +02:00 |
|
Regis Houssin
|
2fffd2fa6f
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
|
2017-06-20 23:26:21 +02:00 |
|
Laurent Destailleur
|
f1701469e0
|
NEW data files are now also parsed by phpunit for sql syntax
|
2017-06-20 13:28:34 +02:00 |
|
Laurent Destailleur
|
095155a58b
|
Enhance sql quality. Refused double quotes into sql content.
|
2017-06-20 10:06:17 +02:00 |
|
Regis Houssin
|
909826e24f
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
|
2017-06-20 06:25:35 +02:00 |
|
Laurent Destailleur
|
099ef585b2
|
Fix pgsql
|
2017-06-19 20:07:33 +02:00 |
|
Alexandre SPANGARO
|
e9b6afd2aa
|
Add last session coding - Add temporaly ledger
|
2017-06-18 22:17:32 +02:00 |
|
Regis Houssin
|
dcc152d4a4
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
|
2017-06-18 06:52:20 +02:00 |
|
Regis Houssin
|
a0299042e4
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
|
2017-06-17 12:05:33 +02:00 |
|
Laurent Destailleur
|
81f1a34112
|
Revert "Fix SPEC #7013 : use database type "numeric" to store monetary values"
|
2017-06-16 13:06:35 +02:00 |
|
Laurent Destailleur
|
549bb2c55f
|
Merge pull request #7020 from aspangaro/7.0-1
Fix SPEC #7013 : use database type "numeric" to store monetary values
|
2017-06-16 12:59:52 +02:00 |
|
Laurent Destailleur
|
e813fd2dfa
|
Fix missing key import_key and extraparams
|
2017-06-16 12:57:30 +02:00 |
|
Alexandre SPANGARO
|
f424f96589
|
Fix SPEC #7013 : use database type "numeric" to store monetary values
|
2017-06-16 05:15:00 +02:00 |
|
Laurent Destailleur
|
8b7ca1f280
|
Fix missing vat_src_code into table of expense report
|
2017-06-15 21:27:20 +02:00 |
|
Laurent Destailleur
|
71c0be20b9
|
Change data structure for bookkeeping v6
|
2017-06-15 10:30:32 +02:00 |
|
Regis Houssin
|
773abff80e
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
|
2017-06-12 21:24:10 +02:00 |
|
Laurent Destailleur
|
ecf29332f3
|
Merge pull request #6989 from atm-alexis/NEW_blocklog_develop_refactor
NEW Blokedlog stuff
|
2017-06-12 17:44:27 +02:00 |
|
Alexis Algoud
|
0312d2479d
|
add block info popin, translation, hidden authority feature
|
2017-06-12 10:26:24 +02:00 |
|
Regis Houssin
|
8b0354cfdf
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
Conflicts:
htdocs/compta/paiement/class/paiement.class.php
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
|
2017-06-11 16:43:31 +02:00 |
|
Laurent Destailleur
|
5471170a97
|
Merge pull request #6969 from atm-alexis/NEW_blocklog_develop_refactor
NEW blockedlog hash and authority
|
2017-06-11 15:54:47 +02:00 |
|
Regis Houssin
|
3445c9d329
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
Conflicts:
htdocs/core/lib/functions.lib.php
|
2017-06-11 06:27:49 +02:00 |
|
Alexis Algoud
|
11d2a5538b
|
fix entity default value and add link to download blockchain
|
2017-06-11 00:03:01 +02:00 |
|
Laurent Destailleur
|
36b18f0300
|
Save MAIN_VERSION_FIRST_INSTALL that is not erased.
|
2017-06-10 22:11:12 +02:00 |
|
Alexis Algoud
|
3d5899edf3
|
final blockedlog init
|
2017-06-10 09:25:32 +02:00 |
|
Regis Houssin
|
ade915af5f
|
New: add dictionnary sharing (multicompany)
|
2017-06-08 16:36:42 +02:00 |
|
Regis Houssin
|
1baa620688
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
|
2017-06-08 10:33:26 +02:00 |
|
Regis Houssin
|
44dba391c1
|
New: add dictionnary sharing (multicompany)
|
2017-06-08 10:24:16 +02:00 |
|
Regis Houssin
|
bb37c2f980
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_transverse
|
2017-06-06 13:54:33 +02:00 |
|
Laurent Destailleur
|
4bda7fcafc
|
Merge pull request #6949 from aspangaro/6.0-vat2
NEW : VAT payment v6 look and feel
|
2017-06-06 11:08:50 +02:00 |
|
Regis Houssin
|
7ed0643b52
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_transverse
|
2017-06-06 10:54:16 +02:00 |
|
Regis Houssin
|
b66da3d148
|
New: big refactorization of multicompany transverse mode
|
2017-06-06 10:23:33 +02:00 |
|
Alexandre SPANGARO
|
e547aa8aee
|
NEW : VAT payment v6 look and feel
|
2017-06-05 15:41:33 +02:00 |
|
Alexandre SPANGARO
|
806d25ae41
|
Activate multi-journal on expensereport journal
|
2017-06-05 06:44:53 +02:00 |
|
Alexandre SPANGARO
|
ef9275d031
|
Merge remote-tracking branch 'uptream/develop' into 6.0-multijournal
# Conflicts:
# htdocs/core/menus/standard/eldy.lib.php
|
2017-06-03 07:48:50 +02:00 |
|
Alexandre SPANGARO
|
90c1a38486
|
Accountancy - Activate multijournal on bank_journal
|
2017-06-03 07:23:14 +02:00 |
|
florian HENRY
|
b0f2db7aaa
|
NEW : Add calculation function for Loan schedule
|
2017-06-02 17:48:29 +02:00 |
|
Laurent Destailleur
|
9b4c929d79
|
NEW Add phpunit to check the engine is defined into sql create files.
|
2017-06-01 16:09:09 +02:00 |
|
Laurent Destailleur
|
d2813eabbc
|
FIX #6877
Conflicts:
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
|
2017-05-29 13:41:59 +02:00 |
|
Laurent Destailleur
|
4824942369
|
FIX #6877
|
2017-05-29 13:39:07 +02:00 |
|
Laurent Destailleur
|
e5fe629a0e
|
NEW Extrafields support formulas to be computed using PHP expressions
|
2017-05-24 22:48:44 +02:00 |
|
Laurent Destailleur
|
80ce8da7a3
|
Fix migration errors and responsive design
|
2017-05-23 15:13:52 +02:00 |
|
Laurent Destailleur
|
80cbc28385
|
NEW Add REST API to push a file.
|
2017-05-20 15:52:36 +02:00 |
|