Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-11 12:01:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
71,061 Commits 36 Branches 190 Tags
01e7b5747d3ece7bb4623c8889ffa98ebb39bc7c
Commit Graph

3595 Commits

Author SHA1 Message Date
Philippe Grand
3f0764f282 use $outputlangs instead of $langs 2018-03-15 09:17:53 +01:00
Philippe Grand
e6d2effba1 use $outputlangs instead of $langs 2018-03-15 09:15:22 +01:00
Philippe Grand
09d0dc7ba7 use $outputlangs instead of $langs 2018-03-15 09:14:09 +01:00
Philippe Grand
f6fd03a4f3 Change $langs by $outputlangs 2018-03-15 09:06:01 +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
Philippe GRAND
743a61159d use loadLangs for translation files 2018-03-14 19:34:33 +01:00
Philippe GRAND
13ce041313 use loadLangs for translation files 2018-03-14 19:26:46 +01:00
Philippe GRAND
a5dc583906 use loadLangs for translation files 2018-03-14 19:10:22 +01:00
Laurent Destailleur
4bd05f854c Merge pull request #8371 from frederic34/pdfaddress 
add object in pdf_build_address source
 2018-03-13 14:04:49 +01:00
Laurent Destailleur
9f07ff0f9b Fix travis 2018-03-13 14:00:35 +01:00
Laurent Destailleur
e6dd312bd5 Debug ticket module 2018-03-13 13:56:45 +01:00
Frédéric FRANCE
c76dce64d3 add object in pdf_build_address source 2018-03-13 12:15:03 +01:00
Laurent Destailleur
8048259733 Work on ticket module integration 2018-03-13 12:13:47 +01:00
Laurent Destailleur
cd71e49762 Picto ticket module 2018-03-13 10:42:58 +01:00
Laurent Destailleur
78b0585798 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/taxes.php
 2018-03-12 19:09:57 +01:00
Laurent Destailleur
55d3e72463 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/contact/class/contact.class.php
	htdocs/societe/card.php
 2018-03-12 19:02:30 +01:00
Laurent Destailleur
ae82d045f8 Dolibarrize module ticket 2018-03-11 23:56:17 +01:00
Laurent Destailleur
70490e2b4b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/ticketsup/class/actions_ticketsup.class.php
 2018-03-11 18:29:19 +01:00
Laurent Destailleur
8b6dea218b Dolibarrize module 2018-03-11 18:28:27 +01:00
Laurent Destailleur
d9b55f2275 Merge branch 'develop' into dev_ticketsup 2018-03-11 18:12:47 +01:00
Laurent Destailleur
40cf236f92 Merge branch 'develop' into ticketsup_core 2018-03-11 18:10:11 +01:00
Laurent Destailleur
d6eee30ee9 Merge pull request #8336 from defrance/patch-106 
add sql log on install debug
 2018-03-11 18:06:18 +01:00
Laurent Destailleur
dea80eba4e Use a constant name starting with MAIN 2018-03-11 18:06:08 +01:00
jfefe
c3fab4c54c Fix Phpunit issue 2018-03-11 16:48:26 +01:00
florian HENRY
cfdaa7c88d ticket sup make it work 2018-03-11 16:07:13 +01:00
Laurent Destailleur
e14d2f08b8 Dolibarize 2018-03-11 11:12:38 +01:00
BENKE Charlene
bfaffe6692 Changes Done 2018-03-11 10:51:05 +01:00
jfefe
79acb79ae0 Begin integration of module « Ticketsup » 
Related to #4948
 2018-03-11 09:44:58 +01:00
Laurent Destailleur
897b3f7b79 Fix setup 2018-03-11 00:31:26 +01:00
Laurent Destailleur
64f21b8a3c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/card.php
 2018-03-11 00:10:13 +01:00
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