Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
68,451 Commits 36 Branches 189 Tags
4d8e5ab0e6ce8e77e2286f59319b901b9e8d0460
Commit Graph

4384 Commits

Author SHA1 Message Date
Laurent Destailleur
4e02b134da Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2018-08-16 14:50:04 +02:00
Laurent Destailleur
4c52384609 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-08-16 14:48:42 +02:00
Laurent Destailleur
0c654bd452 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-08-16 14:47:56 +02:00
Laurent Destailleur
ec56ad752c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2018-08-15 14:26:38 +02:00
florian HENRY
20309665e6 fix : ODT project substitution 2018-08-14 10:45:08 +02:00
Laurent Destailleur
2cbbb6e622 Prepare 8.0.0 release 2018-08-13 23:04:58 +02:00
Laurent Destailleur
f96dd391fa Fix error in foreign key pointing to old table 2018-08-13 16:11:23 +02:00
Laurent Destailleur
d09850522b Fix migration 2018-08-12 22:27:54 +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
Frédéric FRANCE
62b83412ee test phpcs v3 2018-08-09 11:31:48 +02:00
Laurent Destailleur
61d7629ab1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
 2018-08-08 17:44:22 +02:00
atm-greg
be63f0dc89 add migration for desc_fourn 2018-08-07 09:49:57 +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
b1a340b193 FIX "account_parent" is linked with "account_number" instead rowid 2018-08-03 14:01:00 +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
Juanjo Menent
99f29a9764 Revert "FIX multicompany compatibility !" 2018-08-02 10:45:15 +02:00
Juanjo Menent
e6f416e745 Merge pull request #9147 from hregis/7.0_price 
FIX multicompany compatibility !
 2018-08-02 10:45:01 +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
Laurent Destailleur
8ab03c469a Fix migration 2018-07-27 13:42:32 +02:00
Laurent Destailleur
7af42c66cc Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/comm/propal/list.php
 2018-07-27 12:54:45 +02:00
Laurent Destailleur
83ae27d122 FIX Deletion of files in migration 2018-07-27 12:33:36 +02:00
Frédéric FRANCE
2dd907a8e1 extrafield totalizable 2018-07-26 09:41:44 +02:00
Laurent Destailleur
dc2fec8f57 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-24 19:37:04 +02:00
Laurent Destailleur
68ad5d780c Merge pull request #9142 from hregis/8.0_pg 
FIX missing drop old postgresql unique key
 2018-07-24 17:16:55 +02:00
Regis Houssin
835cb04631 FIX remove rowid for multicompany compatibility 2018-07-24 17:07:08 +02:00
Regis Houssin
d4920521b5 FIX multicompany compatibility ! 2018-07-24 15:44:21 +02:00
Regis Houssin
25c93de801 FIX missing drop old postgresql unique key 2018-07-24 11:23:44 +02:00
Regis Houssin
5cdc9db1f8 FIX add html comment 2018-07-20 18:45:52 +02:00
Regis Houssin
719db2574e FIX check if "confirmed" mode 2018-07-20 18:39:18 +02:00
Regis Houssin
e9d9954380 FIX do not convert llx_const if mysql encrypt/decrypt is used 2018-07-20 18:33:14 +02:00
Regis Houssin
984a8e3720 FIX disable/enable foreign key checking for avoid errors 2018-07-20 17:28:32 +02:00
Laurent Destailleur
f747cefda3 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/install/upgrade2.php
 2018-07-16 15:44:44 +02:00
Laurent Destailleur
45a45b0dec NEW Can enable a module, even external module, from command line 
Conflicts:
	htdocs/install/upgrade2.php
 2018-07-16 15:35:00 +02:00
florian HENRY
2f2ca16e2b Add DELETE Trigger action into admin event agenda log 2018-07-10 16:44:14 +02:00
Laurent Destailleur
64517d4c0b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/langs/en_US/admin.lang
 2018-07-10 14:06:51 +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
c01975a40b Merge pull request #9084 from torvista/texts-setup-en_US 
Texts corrections /langs/en_US
 2018-07-10 10:41:28 +02:00
Laurent Destailleur
d3d1b6d513 NEW Can enable a module, even external module, from command line 2018-07-09 13:02:01 +02:00
Steve
65e42522d3 minor html and css corrections (as shown by browser validation and phpstorm inspections) 2018-07-07 23:50:41 +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
9842978b85 Fix trim config values 2018-07-04 11:16:45 +02:00
Laurent Destailleur
64e778a78f Fix pgsql migration 2018-07-04 10:26:25 +02:00
Laurent Destailleur
a2f517685e Fix pgsql migration 2018-07-04 10:21:42 +02:00
Laurent Destailleur
d4d9a8d75a Fix 8.0 not 9.0 2018-07-03 20:13:30 +02:00