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

4636 Commits

Author SHA1 Message Date
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
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