Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-07 18:18:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
69,068 Commits 36 Branches 190 Tags
cefaeb583ff12ad09c836fcbf6b39d01209e901b
Commit Graph

3264 Commits

Author SHA1 Message Date
BENKE Charlene
923bad4da6 add sql log on install debug 
new global variable INSTALL_DISPLAY_SQL_LOG to display sql log on module install
 2018-03-10 23:59:34 +01:00
Maxime Kohlhaas
c008853842 Fix #8057 2018-03-10 23:05:33 +01:00
Laurent Destailleur
d00b549f91 Remove duplicate perm 2018-03-10 12:46:45 +01:00
Laurent Destailleur
6ff3ac82c6 Merge pull request #8309 from ATM-Marc/NEW_syslog_file_autoclean 
NEW: syslog file autoclean
 2018-03-09 22:34:30 +01:00
Laurent Destailleur
d858426b7b Update modSyslog.class.php 2018-03-09 22:33:39 +01:00
Marc de Lima Lucio
d6b4bc14e4 NEW: syslog file autoclean 2018-03-09 16:52:06 +01:00
Regis Houssin
3eeeaf2d2d Fix: REST API must be enabled for all entities 2018-03-09 12:54:34 +01:00
florian HENRY
f37d482331 fix warning and sql error 2018-03-09 11:37:23 +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
Laurent Destailleur
5b8006a6bb Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/public/payment/paymentok.php
	htdocs/public/paypal/paymentok.php
 2018-03-08 16:37:17 +01:00
Regis Houssin
93a9430e49 Fix: regression, restore primary key 2018-03-08 07:41:54 +01:00
Laurent Destailleur
8c128a2985 Stripe has drop PHP 5.3 2018-03-07 19:28:04 +01:00
Regis Houssin
a0774d523d Fix: avoid conflict between invoice and invoicenumber sharings 2018-03-07 15:24:23 +01:00
Laurent Destailleur
05c1150477 Fix bad links 2018-03-07 15:13:22 +01:00
Laurent Destailleur
a597dc8b11 Merge pull request #8281 from ptibogxiv/patch-10 
NEW: add link to stripe's info in bank menu
 2018-03-07 15:09:46 +01:00
Laurent Destailleur
62a339e582 Minor fix in multicurrency for supplier prices 2018-03-07 14:13:46 +01:00
Laurent Destailleur
7e6ba51780 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/projet/tasks/comment.php
 2018-03-07 13:06:29 +01:00
Laurent Destailleur
004839b368 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-07 13:03:40 +01:00
Laurent Destailleur
8b9041b93e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-03-07 13:02:18 +01:00
Laurent Destailleur
4caefbe926 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2018-03-07 12:59:52 +01:00
Marc de Lima Lucio
dd208348c4 FIX: add planned delivery to order exports 2018-03-07 12:18:08 +01:00
ptibogxiv
afa8b37239 NEW: add link to stripe's info in bank menu 2018-03-05 19:45:55 +01:00
Laurent Destailleur
0270e21289 Merge pull request #8242 from hregis/develop_multicompany 
Fix: use "multidir_output" instead "dir_output" (propal)
 2018-03-02 17:49:25 +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
Laurent Destailleur
a01287b211 Fix template donation 2018-03-02 12:25:43 +01:00
Laurent Destailleur
2368cb615f Look and feel v8 2018-03-01 11:51:25 +01:00
Laurent Destailleur
04934cc4aa Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/projet/tasks/time.php
 2018-02-27 19:18:43 +01:00
Regis Houssin
093ea49cc6 Fix: use "multidir_output" instead "dir_output" 2018-02-26 11:35:30 +01:00
Laurent Destailleur
41638e6dff Fix back link of look and feel v7 2018-02-26 09:20:05 +01:00
Laurent Destailleur
003827eb06 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-25 15:01:19 +01:00
Laurent Destailleur
1f60d9ba81 Fix travis 2018-02-25 13:14:55 +01:00
Laurent Destailleur
6c16f2af1e Merge pull request #8226 from hregis/7.0_multicompany 
Fix: differentiate sharing of "member" and "member_type"
 2018-02-25 12:54:51 +01:00
Laurent Destailleur
029ef534d0 Clean deprecated code (property "special" removed from mod descriptor) 2018-02-25 10:55:02 +01:00
Laurent Destailleur
619e0d3792 FIX Bad var for substitution of free text 2018-02-24 14:03:27 +01:00
Laurent Destailleur
e2e0f23d29 FIX Bad var for substitution of free text 2018-02-24 14:01:52 +01:00
Laurent Destailleur
38d1fc27e0 Start to introduce common substitution rules for odt substitutions 2018-02-24 13:41:01 +01:00
Laurent Destailleur
c8078b54b5 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
 2018-02-24 12:52:57 +01:00
Laurent Destailleur
03d9bf1376 Restore deprecated var 2018-02-24 12:35:36 +01:00
Laurent Destailleur
cbfe241c1b FIX Can use odx templates that does not include lines tags 2018-02-24 12:34:15 +01:00
Laurent Destailleur
daeebae647 FIX Can use odx templates that does not include lines tags 2018-02-24 12:32:48 +01:00
Regis Houssin
4c06384197 Fix: differentiate sharing of "member" and "member_type" 2018-02-24 11:13:14 +01:00
Laurent Destailleur
812911bd44 Fix type of expense report output in PDF 2018-02-23 15:33:42 +01:00
Laurent Destailleur
f002c84a76 Fix type of expense report output in PDF 2018-02-23 15:33:00 +01:00
Laurent Destailleur
0d0451e5c7 Code comment 2018-02-21 22:43:03 +01:00
Laurent Destailleur
b4446764f8 Clean code of deprecated usage 2018-02-21 14:48:25 +01:00
Laurent Destailleur
0ff148da1f Fix import of chart account 2018-02-21 11:22:27 +01:00
Laurent Destailleur
15ba0c3b49 Close #7989 Merge manually in existing class 2018-02-20 15:35:42 +01:00
Laurent Destailleur
6b74c79798 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/website.lang
 2018-02-15 15:34:17 +01:00
Laurent Destailleur
7722f004c8 FIX #8153 2018-02-15 14:08:42 +01:00