lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
77,103 Commits 43 Branches 150 Tags 886 MiB
a23bae6c96
Commit Graph

4833 Commits

Author SHA1 Message Date
wdammak
0241b0d4ee
Missing index to improve the performance of product/variants display 
https://github.com/Dolibarr/dolibarr/issues/10787
 2019-03-10 03:05:15 +01:00
Laurent Destailleur
10b9fdc1fd Fix column definition 2019-03-09 02:05:28 +01:00
Laurent Destailleur
f54eb78260 NEW Show the latest date of subscription in member statistics reports 2019-03-07 12:22:24 +01:00
Laurent Destailleur
a426c8e9bf Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/system/filecheck.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/filefunc.inc.php
	htdocs/install/upgrade2.php
	htdocs/product/class/product.class.php
 2019-03-07 11:16:24 +01:00
Laurent Destailleur
e67890bd22 NEW Can enter price with or without tax when entering expense repor line 2019-03-07 11:09:04 +01:00
Laurent Destailleur
1b0aec0847 Complete fields for template invoices 2019-03-06 20:51:07 +01:00
Laurent Destailleur
0c2a0c643b NEW Performance enhancement: Replace dirname(__FILE__) with __DIR__ 2019-03-06 14:33:05 +01:00
Laurent Destailleur
c06d2f6c3b Remove warning 2019-03-05 18:22:03 +01:00
Laurent Destailleur
925def5390 Work on BOM module 2019-03-04 13:37:00 +01:00
Laurent Destailleur
2448d1deaa fk_projet -> fk_project 2019-02-27 15:32:18 +01:00
atm-quentin
1b9a2e5cfc FIX migration 9 to 10 2019-02-27 09:27:15 +01:00
atm-quentin
f51b89def3 NEW supplier buyprice barcode 2019-02-27 09:22:34 +01:00
Laurent Destailleur
014c199173 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/tpl/extrafields_list_print_fields.tpl.php
 2019-02-27 01:28:12 +01:00
Laurent Destailleur
6373e1db84
Merge branch 'develop' into 10.0_linkedin 2019-02-27 01:16:21 +01:00
Laurent Destailleur
9e82c37963 WIP Start module BOM 2019-02-26 19:27:04 +01:00
Laurent Destailleur
3ba69fc93a Fix missing ; after sql request 2019-02-25 15:06:55 +01:00
Laurent Destailleur
1be1ee1670 Remove duplicate record 2019-02-25 14:56:28 +01:00
Laurent Destailleur
c0be66b5e5 FXI Remove duplicate record before trying to create unique key 2019-02-25 14:55:29 +01:00
Alexandre SPANGARO
2da1447a0b Merge remote-tracking branch 'upstream/develop' into 10.0_linkedin 2019-02-25 09:12:04 +01:00
Alexandre SPANGARO
acb9cfe07a NEW: Add LinkedIn field 2019-02-25 09:07:58 +01:00
Laurent Destailleur
f83f746123 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2019-02-23 16:03:40 +01:00
Laurent Destailleur
cdf85b0d00 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-23 16:02:35 +01:00
Laurent Destailleur
9ba6e3f8f5 FIX #10638 2019-02-23 15:57:57 +01:00
ptibogxiv
c54c4f8667
Update llx_commande.sql 2019-02-20 12:18:20 +01:00
ptibogxiv
d490dd4dec
NEW POS support in order 
Save informations for online / API shopping and push to invoice
 2019-02-20 12:15:43 +01:00
Laurent Destailleur
51441242bf Fix sql error 2019-02-19 13:15:11 +01:00
Laurent Destailleur
ebfb6beee3 Merge 2019-02-18 19:14:42 +01:00
Laurent Destailleur
317f3dd90b
Merge pull request #10603 from wdammak/patch-27 
Add default warehouse id for a user
 2019-02-15 15:06:21 +01:00
Laurent Destailleur
662d707320
Update 9.0.0-10.0.0.sql 2019-02-15 15:06:00 +01:00
wdammak
2fe3b7acc7
Add default warehouse for a user 2019-02-14 19:50:57 +01:00
wdammak
0a8c72c93b
rename column default_warehouse to fk_warehouse 2019-02-14 19:36:23 +01:00
Laurent Destailleur
04942d3016
Merge branch 'develop' into patch-110 2019-02-14 16:11:56 +01:00
Laurent Destailleur
567d92f886
Update llx_prelevement_facture_demande.sql 2019-02-14 16:10:31 +01:00
Laurent Destailleur
00cfee0c37
Update 9.0.0-10.0.0.sql 2019-02-14 16:10:06 +01:00
wdammak
31bcc47b68
Add default warehouse id for a user 
This will help to organize employees and know the default warehouse for a customer.
 2019-02-14 13:47:02 +01:00
Laurent Destailleur
3050366372 Fix table of units already exists. Merge duplicate c_measuring_units 
with c_units.
 2019-02-14 13:02:44 +01:00
Laurent Destailleur
5a0d4c4cdc
Merge branch 'develop' into patch-110 2019-02-14 10:32:05 +01:00
florian HENRY
e2d13c0e1f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
dev_importproduct_measuringunit

Conflicts:
	htdocs/contact/consumption.php
	htdocs/webservices/server_productorservice.php
 2019-02-13 09:23:52 +01:00
ptibogxiv
8f3ffc6520
NEW stripe payment intent 
use it for stripe
 2019-02-12 19:03:45 +01:00
Laurent Destailleur
5fceee3048 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/mysql/migration/8.0.0-9.0.0.sql
 2019-02-12 19:02:19 +01:00
ptibogxiv
85272b8345
NEW support stripe payment prelevement 2019-02-12 18:58:57 +01:00
florian HENRY
914de5e089 fix mùigration script 2019-02-12 18:08:21 +01:00
Laurent Destailleur
f7d183f3ef Add Kosovo country 2019-02-12 17:43:38 +01:00
florian HENRY
eba4be2335 ad missing files 2019-02-12 17:03:47 +01:00
florian HENRY
5b5f96bafb NEW : measuring unit dictionnary and product size/unit import 2019-02-12 16:58:11 +01:00
Laurent Destailleur
f311d50201 Fix unique key in accounting_account 
Conflicts:
	htdocs/install/mysql/migration/8.0.0-9.0.0.sql
 2019-02-12 15:53:43 +01:00
Laurent Destailleur
a0c1e5ed84 Fix unique key in accounting_account 2019-02-12 15:43:24 +01:00
Laurent Destailleur
e054b080a5
Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing 2019-02-12 13:33:39 +01:00
Laurent Destailleur
6f6a767255
Merge pull request #10520 from aspangaro/develop 
NEW: Add subledger in various payment
 2019-02-12 13:20:58 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature 2019-02-10 10:45:49 +01:00
Alexandre SPANGARO
2ba8ae00e4 Merge remote-tracking branch 'upstream/develop' into develop 2019-02-06 21:56:01 +01:00
Frédéric FRANCE
970392adb8
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite 2019-02-03 22:41:57 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent 2019-02-03 14:29:45 +01:00
Frédéric FRANCE
f5b2cf75f2
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-02-01 18:31:44 +01:00
Alexandre SPANGARO
13cf3b1d7f Add subledger in various payment 2019-02-01 15:50:12 +01:00
Laurent Destailleur
eb3621839a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/members.lang
	htdocs/langs/fr_FR/members.lang
 2019-02-01 15:14:19 +01:00
Laurent Destailleur
57797b1309 Remove image 2019-01-31 12:48:51 +01:00
Laurent Destailleur
e18bd6f986
Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
Laurent Destailleur
e72d6c50e6
Merge pull request #10428 from frederic34/toomanylines 
PSR2.Files.EndFileNewline.TooMany
 2019-01-30 16:17:09 +01:00
Laurent Destailleur
648eea3a70
Merge branch 'develop' into nospaceaftercomma 2019-01-30 16:00:11 +01:00
Alexandre SPANGARO
cc88c4f8ff Move my email to the new one 2019-01-28 21:39:22 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Laurent Destailleur
56838bc659 Fix missing field into migration 2019-01-27 18:11:18 +01:00
Laurent Destailleur
c33860cfab
Merge pull request #10368 from ptibogxiv/patch-91 
NEW thirdparty in donation if option ON
 2019-01-27 18:07:46 +01:00
Laurent Destailleur
f30a3d59ba
Merge branch 'develop' into toomanylines 2019-01-27 17:59:13 +01:00
Laurent Destailleur
4f9f0fd7b5
Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
496fa9b0fb
PSR2.Files.EndFileNewline.TooMany 2019-01-27 14:10:35 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
Laurent Destailleur
70c52e6417 Add field calling_duration in table llx_actioncomm 2019-01-26 01:17:41 +01:00
Laurent Destailleur
b1a4e3abd5 To be sure table is dropped 2019-01-21 16:44:51 +01:00
Laurent Destailleur
0f61a99cc6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-21 05:51:35 +01:00
Laurent Destailleur
f8b205aae3 Fix missing index 2019-01-21 05:16:23 +01:00
Laurent Destailleur
95bfecdd60 Fix missing index in migration 2019-01-21 05:03:31 +01:00
Laurent Destailleur
9c1339ae06 Fix migration with pgsql 2019-01-21 04:27:30 +01:00
Laurent Destailleur
f53232e2f9 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-21 02:56:32 +01:00
Laurent Destailleur
2e9e413e17 Try pgsql fix 2019-01-21 01:51:28 +01:00
Laurent Destailleur
7493ba018a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/8.0.0-9.0.0.sql
 2019-01-20 20:38:26 +01:00
Laurent Destailleur
3ddfcbe3bb Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.travis.yml
	dev/setup/codesniffer/ruleset.xml
 2019-01-20 20:36:45 +01:00
Laurent Destailleur
c26f264cac
Merge pull request #10369 from mwelters/mwelters/addays 
Add configurable days to SEPA Withdrawal  Execution Date
 2019-01-20 19:47:57 +01:00
Laurent Destailleur
f7c11ec7f4 Fix unit test on accounting 2019-01-20 17:06:24 +01:00
markus
a45ea9239d Rename consts and cleanup 2019-01-19 14:24:20 +01:00
ptibogxiv
754714abf7
Update llx_don.sql 2019-01-18 11:23:59 +01:00
ptibogxiv
a36cf5f2c7
Update 9.0.0-10.0.0.sql 2019-01-17 20:34:45 +01:00
ptibogxiv
389b44faa3
Update llx_subscription.sql 2019-01-17 17:41:45 +01:00
ptibogxiv
ee595ca9b5
Update 9.0.0-10.0.0.sql 2019-01-17 17:40:47 +01:00
Laurent Destailleur
e7943ae844 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-16 16:48:52 +01:00
Laurent Destailleur
d3828130ab Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/adherents/class/adherent.class.php
 2019-01-16 16:48:21 +01:00
Regis Houssin
41a38b3a0a FIX avoid php warning 
Signed-off-by: Regis Houssin <regis.houssin@inodbox.com>
 2019-01-15 15:44:45 +01:00
Laurent Destailleur
003f499eb0 Add url_id into unique index of bank_url 2019-01-09 13:02:19 +01:00
ldestailleur
451b3e30cc Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/functions.lib.php
	htdocs/langs/en_US/cashdesk.lang
 2019-01-04 19:36:20 +01:00
ldestailleur
5f9bbbcdd7 Fix migration 2019-01-03 11:12:14 +01:00
ldestailleur
bc00fb177a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-02 19:42:15 +01:00
ldestailleur
a9e8e13bb6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	ChangeLog
	htdocs/user/param_ihm.php
 2019-01-02 19:41:39 +01:00
Laurent Destailleur
63beb50465 Fix missing migration of external site module 2018-12-26 21:22:12 +01:00
Laurent Destailleur
5c516fdae2 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2018-12-26 19:43:01 +01:00
Laurent Destailleur
e7b3c91645 Fix dump file 2018-12-26 19:10:22 +01:00
Laurent Destailleur
9d5a91b6e8
Merge pull request #10235 from torvista/sql-install 
Added Andorra, Hungary, Portugal, Slovenia. Spain postcodes
 2018-12-17 21:14:48 +01:00
Laurent Destailleur
623afd1020 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/website.lang
 2018-12-17 18:50:06 +01:00
Laurent Destailleur
ffaff4dc7f Debug website module 2018-12-17 17:29:04 +01:00
Laurent Destailleur
6ee484e2a2 Fix migration 2018-12-17 09:38:36 +01:00
Laurent Destailleur
e0e298f07b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-17 03:26:15 +01:00
Laurent Destailleur
bf9ee18bed Standardize code. 2018-12-17 03:25:45 +01:00
torvista
54c56ff069 minor error 2018-12-16 22:15:44 +01:00
torvista
6ce76903a5 removed double quotes as per Travis failure 2018-12-16 21:22:31 +01:00
torvista
f5d1eea4dc added regions and provinces for Andorra, Hungary, Portugal, Slovenia. 
Spain added postcodes and re-ordered sql in province order to make a logical drop-down picking list.
 2018-12-16 18:28:11 +01:00
Laurent Destailleur
54a4a54afe Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/langs/en_US/banks.lang
 2018-12-15 20:00:31 +01:00
Laurent Destailleur
1c49599a47 Work on cash fence feature 2018-12-15 19:46:51 +01:00
Laurent Destailleur
54ffba793f Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/install/mysql/migration/8.0.0-9.0.0.sql
	htdocs/langs/en_US/admin.lang
 2018-12-15 18:21:37 +01:00
Laurent Destailleur
33a91ff707 Add missing POS closure feature 2018-12-15 16:47:06 +01:00
andreubisquerra
cdaf048766 First CashControl version 2018-12-15 16:45:36 +01:00
Laurent Destailleur
1167d9aecb
Merge pull request #10206 from andreubisquerra/master 
First CashControl version
 2018-12-15 16:44:24 +01:00
Laurent Destailleur
6761e21921
Update 8.0.0-9.0.0.sql 2018-12-15 12:52:09 +01:00
Laurent Destailleur
27f8096afa
Merge branch 'develop' into PR_NEW_reception 2018-12-15 12:50:31 +01:00
Laurent Destailleur
015567afa6
Merge pull request #10034 from frederic34/oldfiles 
remove Old files on upgrade
 2018-12-14 19:25:01 +01:00
Alexandre SPANGARO
60f56fcf8d
Merge branch 'develop' into 10.0_members 2018-12-14 11:39:02 +01:00
Laurent Destailleur
63aa7ac1ec Fix name of key 2018-12-14 11:16:05 +01:00
Laurent Destailleur
2f075147a3 Migrate to 10 2018-12-14 11:13:48 +01:00
Laurent Destailleur
3765db422a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/tables/llx_loan.sql
 2018-12-14 10:57:11 +01:00
Laurent Destailleur
6eaa6a1d28 Add missing column 2018-12-14 10:56:13 +01:00
Laurent Destailleur
fec64a78ab
Merge branch 'develop' into New_manage_loan_schedule 2018-12-14 10:54:09 +01:00
Laurent Destailleur
f97b561af0
Merge branch 'develop' into qual_rename_facnumber 2018-12-13 20:24:12 +01:00
Laurent Destailleur
0ecdb0f3bb Code comment 2018-12-12 13:02:18 +01:00
Laurent Destailleur
ea041693b6 Code comment 2018-12-12 12:54:10 +01:00
Laurent Destailleur
b47e7b2267 Work on new unsubscribe process 2018-12-11 09:49:46 +01:00
Laurent Destailleur
b27ec54379 A better way to manage unsubscribed emails 2018-12-10 14:35:33 +01:00
Laurent Destailleur
42d4cf9992 Fix sql 2018-12-10 10:17:54 +01:00
andreubisquerra
939f31c71f First CashControl version 2018-12-08 21:33:54 +01:00
Laurent Destailleur
cd3716ff9f Dolibarize module ticket 2018-12-08 16:37:41 +01:00
Laurent Destailleur
21b3bbc2e6 Merge 2018-12-08 11:55:27 +01:00
Laurent Destailleur
b43c2ce839 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2018-12-08 11:52:12 +01:00
Laurent Destailleur
930312b425 FIX Migration do not create not used table 2018-12-08 11:51:46 +01:00
Laurent Destailleur
9ed34e2b35 FIX Can relaunch install on v8 2018-12-08 11:51:01 +01:00
Laurent Destailleur
a915d82883 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2018-12-08 11:42:30 +01:00
Laurent Destailleur
d2f0c87d8f FIX Removed not use table 2018-12-08 11:41:08 +01:00
Laurent Destailleur
a44dca7e71 Removed deprecated table 2018-12-08 11:37:47 +01:00
Laurent Destailleur
d0a1c523ca FIX several critical bugs in migration of directory of users 2018-12-07 19:53:02 +01:00
Laurent Destailleur
f99d9a7da9 FIX several critical bugs in migration of directory of users 2018-12-07 19:35:38 +01:00
Laurent Destailleur
2621af96d6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/install/upgrade2.php
 2018-12-07 19:08:53 +01:00
Laurent Destailleur
3538e9ab3b Fix migration 2018-12-07 19:05:24 +01:00
Laurent Destailleur
37fe8afea3 Code comment 2018-12-07 14:54:40 +01:00
Laurent Destailleur
65d492efed Minor fix 2018-12-07 14:53:49 +01:00
Laurent Destailleur
e7c87c31b6 Code comment 2018-12-06 21:32:39 +01:00
Laurent Destailleur
30abedbcbd Minor fix 2018-12-06 19:29:11 +01:00
Maxime Kohlhaas
b37209565f Correct sql index change 2018-12-05 16:50:02 +01:00
Laurent Destailleur
d2e8aeb8c1
Merge pull request #10173 from hregis/develop_upgrade 
FIX wrong path, multidir_output[] for each entity is construct by the multicompany module
 2018-12-04 13:39:05 +01:00
Laurent Destailleur
c27c322457
Merge pull request #10172 from hregis/develop_virtualmin 
FIX possibility to force install lock with GET/POST or script
 2018-12-04 13:38:23 +01:00
Laurent Destailleur
d9bb39970f Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/barcode.php
 2018-12-04 13:20:40 +01:00
Laurent Destailleur
5061a9b0c2 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/install/mysql/tables/llx_paiementfourn.sql
 2018-12-04 13:17:25 +01:00
Laurent Destailleur
347384734d Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/install/mysql/tables/llx_paiementfourn.sql
 2018-12-04 13:15:32 +01:00
Regis Houssin
aa3e520725 FIX wrong path, multidir_output[] for each entity is construct by the 
multicompany module
 2018-12-04 09:12:36 +01:00
Maxime Kohlhaas
79b6719b88 Change index 2018-12-04 09:00:53 +01:00
Regis Houssin
dcbb7c49fc FIX wrong value for instal lock 2018-12-03 13:31:28 +01:00
Regis Houssin
a2f514d4a1 FIX possibility to force install lock with GET/POST or script 2018-12-03 13:12:42 +01:00
Maxime Kohlhaas
2e496ea83a QUAL rename facnumber by ref 2018-12-02 17:33:44 +01:00
Maxime Kohlhaas
72225f6524 Migration of user photo paths 2018-12-01 23:57:15 +01:00
Laurent Destailleur
c3e2f73e48 FIX #10144 2018-12-01 19:45:30 +01:00
Laurent Destailleur
6d84036f66 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/contact/list.php
	htdocs/core/class/html.form.class.php
	htdocs/expensereport/card.php
	htdocs/install/doctemplates/shipment/template_shipment.odt
	htdocs/public/payment/newpayment.php
 2018-12-01 19:23:06 +01:00
Laurent Destailleur
cb9ada2119 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/class/html.formmail.class.php
	htdocs/core/modules/modSociete.class.php
	htdocs/product/price.php
 2018-12-01 18:19:45 +01:00
florian HENRY
589511f38c fix #9999 2018-12-01 16:23:40 +01:00
Frédéric FRANCE
335327827d
Update 6.0.0-7.0.0.sql 2018-12-01 00:34:17 +01:00
Frédéric FRANCE
0270da7d8c
Update 5.0.0-6.0.0.sql 2018-12-01 00:28:58 +01:00
Frédéric FRANCE
6ab12b5911
Update llx_paiementfourn.sql 2018-12-01 00:26:51 +01:00
Maxime Kohlhaas
7585461486 Fix #9070 2018-11-30 22:16:17 +01:00
Laurent Destailleur
bfc2f6e84c Add template 2018-11-29 00:48:47 +01:00
Laurent Destailleur
dbef8fc380 FIX Add field for data becoming mandatory by some online payment system 2018-11-28 13:13:38 +01:00
Laurent Destailleur
2f2df12f59 Complete dictionary 2018-11-26 18:02:25 +01:00
Laurent Destailleur
9f610c2279 Add website template 2018-11-23 12:46:32 +01:00
Laurent Destailleur
200de22807 Missing image in container 2018-11-20 16:48:34 +01:00
Laurent Destailleur
f455e32bef FIX Some modules templates were visible when it should not 2018-11-20 16:22:16 +01:00
Laurent Destailleur
39621ec686 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2018-11-19 20:07:51 +01:00
Laurent Destailleur
fb6aa01207 FIX #10030 better german chart 2018-11-19 20:04:31 +01:00
Frédéric FRANCE
8f7e90da8c
clean clean 2018-11-19 19:08:14 +01:00
Alexandre SPANGARO
2d55666a0b NEW Add gender in member card 2018-11-18 21:50:58 +01:00
Laurent Destailleur
7f33403d43 Fix translation 2018-11-17 22:55:13 +01:00
Frédéric FRANCE
35142ac2fb
wip 2018-11-16 17:58:14 +01:00
Laurent Destailleur
6d640ab83c Fix feature to drag and drop rows of table (not generic) 2018-11-15 19:58:06 +01:00
markus
ac0f46f9e5 for Denmark: forme_jurisdisque additions 2018-11-15 11:10:54 +01:00
Laurent Destailleur
7aa042172e Fix sql error 2018-11-14 13:06:40 +01:00
Laurent Destailleur
84983140b6
Merge pull request #9896 from hregis/develop_email 
FIX change my deprecated email
 2018-11-11 17:35:35 +01:00
Laurent Destailleur
4f7d3e794a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-11 17:28:29 +01:00
Laurent Destailleur
f022be3a47 FIX #9992 2018-11-11 17:28:17 +01:00
Laurent Destailleur
2985d9cfbf
Update 8.0.0-9.0.0.sql 2018-11-11 17:27:16 +01:00
delcroix Patrick
52f35d8038
to support proposal_supplier insert 
proposal_supplier has 17 char when the elementtype column can take only 16 char
 2018-11-10 14:59:46 +01:00
Laurent Destailleur
f1287578f3 Work on emailcollector 2018-11-09 18:18:17 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
Laurent Destailleur
193b153fbf Work on email collector 2018-11-07 18:02:08 +01:00
Laurent Destailleur
eb9defcf1d Debug emailcollector 2018-11-05 16:42:29 +01:00
Laurent Destailleur
52d4426e87 Debug new modules 2018-11-05 16:38:07 +01:00
Laurent Destailleur
d65bf1fbc7 Fix emailcollector 2018-11-05 15:31:41 +01:00
Laurent Destailleur
0c7f33e1ba Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-05 09:58:19 +01:00
Laurent Destailleur
2900947019 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-11-05 09:56:57 +01:00
Laurent Destailleur
98a3af620b FIX #9934 2018-11-05 09:26:23 +01:00
Laurent Destailleur
67fbb3dbb6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/class/notify.class.php
	htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
 2018-11-03 19:15:52 +01:00
Laurent Destailleur
28d5f1d50b Fix sql syntax error 2018-11-03 11:30:32 +01:00
Maxime Kohlhaas
d1133916e0 Fix tracking field in dictionnary should not be mandatory 2018-11-01 15:33:14 +01:00
Laurent Destailleur
970f501147 Debug modulebuilder 2018-10-31 20:10:20 +01:00
Laurent Destailleur
c9ef298839 Fix setup template emails 2018-10-31 11:38:04 +01:00
Regis Houssin
9589f69574 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_email

Conflicts:
	htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
 2018-10-30 18:29:28 +01:00