lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
57,387 Commits 43 Branches 150 Tags 886 MiB
4349eac7ea
Commit Graph

57387 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
4349eac7ea Merge pull request #6225 from aspangaro/5.0-18 
Expense report - Better presentation - return lines order by date
 2017-01-12 11:37:31 +01:00
Laurent Destailleur
9671810d13 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-12 11:33:25 +01:00
Laurent Destailleur
2c6672d17a Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/tpl/login.tpl.php
 2017-01-12 11:32:51 +01:00
Laurent Destailleur
b28ba7a5ff Merge pull request #6252 from gnovaro/develop 
Improve cashdesk code style. Ticket now have ticket.css file
 2017-01-12 11:31:51 +01:00
Laurent Destailleur
32a3f74ea1 Merge pull request #6108 from defrance/patch-51 
NEW Can send contract by mail from contract card
 2017-01-12 11:26:44 +01:00
Laurent Destailleur
4d134a4a4e Merge pull request #6085 from defrance/patch-49 
NEW Extend option PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES to change supplier ref display mode in PDF
 2017-01-12 11:19:54 +01:00
Laurent Destailleur
25dcb10c1d Merge pull request #6066 from atm-florian/dev_exportthirdparty 
NEW : Can export thirdparty with sale representative that is a subordinate (Need hidden option SOCIETE_EXPORT_SUBORDINATES_CHILDS)
 2017-01-12 11:17:15 +01:00
Laurent Destailleur
0548e9cc4e Merge pull request #6226 from aspangaro/5.0-19 
NEW Expense report now send email on different validatin steps (Remove DEPLACEMENT_TO_CLEAN)
 2017-01-12 11:15:14 +01:00
Laurent Destailleur
64b932f78c Merge pull request #6261 from GPCsolutions/travis-php7.1 
[Qual] Add PHP 7.1 to Travis test matrix
 2017-01-12 11:12:25 +01:00
Laurent Destailleur
c42b48636a Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/commande/class/api_commande.class.php
	htdocs/core/class/CMailFile.class.php
	htdocs/societe/class/api_contact.class.php
 2017-01-12 11:06:24 +01:00
Laurent Destailleur
762dd8030e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-01-12 10:59:41 +01:00
Laurent Destailleur
7476a3c8ae Fix error during migration 2017-01-12 10:59:27 +01:00
Laurent Destailleur
e802ff3385 Fix POO declaration 2017-01-12 10:57:15 +01:00
Laurent Destailleur
5e71ff816f Increase limit for better backward compatibility without loosing minimum 
security.
 2017-01-12 10:51:31 +01:00
Laurent Destailleur
351c416ed8 Merge pull request #6265 from hregis/4.0_bug 
Fix: avoid errors if constants values not exists
 2017-01-12 10:49:23 +01:00
Laurent Destailleur
721534d676 Merge pull request #6264 from atm-florian/5.0 
fix : warehouse creation failed with mysql 5.7 (string 'NULL' instead of "NULL")
 2017-01-12 10:39:13 +01:00
Laurent Destailleur
97f71d33ce Merge pull request #6263 from aspangaro/6.0-1 
New : Loan - Edit mode more complete
 2017-01-12 10:35:42 +01:00
Laurent Destailleur
f408c886b6 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-01-12 10:16:32 +01:00
Laurent Destailleur
3d8c5b377b Fix string not translated 2017-01-12 10:16:19 +01:00
Laurent Destailleur
29a8c8105e Merge pull request #6258 from aljawaid/patch-1 
Fix: User-friendly Tooltip
 2017-01-12 10:12:51 +01:00
Laurent Destailleur
46e330f749 Merge pull request #6256 from aspangaro/5.0-23 
Fix : Bank - Presentation, no titlefield in a list
 2017-01-12 10:09:38 +01:00
Laurent Destailleur
7a8a95c815 Merge pull request #6249 from KiteAtao/4.0 
Fix #6247 #6248 Contact and Commands REST WebServices failed
 2017-01-12 10:08:32 +01:00
Laurent Destailleur
4ea78d20f0 Merge pull request #6251 from aspangaro/5.0-22 
Fix : Bank - Missing language file
 2017-01-12 10:06:42 +01:00
Laurent Destailleur
14fb01da11 Merge pull request #6250 from gnovaro/patch-6 
Bug: Fix missing ,
 2017-01-12 10:06:01 +01:00
Laurent Destailleur
749f8cf252 Fix translation 2017-01-12 00:15:00 +01:00
Laurent Destailleur
94f14f529b Fix pb with double quote 2017-01-11 22:02:08 +01:00
Regis Houssin
5898d27609 Fix: avoid errors if constants values not exists 2017-01-11 16:47:17 +01:00
Laurent Destailleur
5553be4aa9 Fix code comment 2017-01-11 16:08:04 +01:00
florian HENRY
2c2bb366bd fix : warehouse creation failed with mysql 5.7 (string 'NULL' instead of 
"NULL")
 2017-01-11 09:19:07 +01:00
aspangaro
9154843c1b Merge remote-tracking branch 'Upstream/develop' into 5.0-24 
Conflicts:
	htdocs/loan/card.php
 2017-01-11 05:25:57 +01:00
aspangaro
dcae6e644d New : Loan - Add control and edit mode more complete 2017-01-11 05:12:48 +01:00
Raphaël Doursenaud
0f89fa2b11
[Qual] Add PHP 7.1 to Travis test matrix 2017-01-10 11:44:21 +01:00
Laurent Destailleur
cb7cd3baaf Use mariadb as default to be debian compliant with 
https://wiki.debian.org/Teams/MySQL/virtual-mysql-server
 2017-01-10 10:23:50 +01:00
Laurent Destailleur
1559c45a61 FIX link for not found photo when using gravatar. Must use external url 2017-01-10 09:24:55 +01:00
Laurent Destailleur
70e6c2d41f Fix bad count of nb of contacts in statistics 2017-01-10 00:42:28 +01:00
Laurent Destailleur
5c233a41b3 NEW Add hook "formatNotificationMessage" 2017-01-09 23:55:53 +01:00
Laurent Destailleur
93ab224614 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-09 23:33:36 +01:00
Laurent Destailleur
c4ff1f983c Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-09 23:32:36 +01:00
Laurent Destailleur
decbda3e23 Fix inversion application name - company name 2017-01-09 23:26:31 +01:00
Laurent Destailleur
a9354e5f27 Fix generic text must be set before specific for notification 2017-01-09 21:07:54 +01:00
IJ
635abe58be User-friendly tooltip 2017-01-09 10:14:11 +00:00
Laurent Destailleur
8ab0ad3b72 Fix css 2017-01-09 10:36:24 +01:00
Laurent Destailleur
c9cce66d98 Merge remote-tracking branch 'origin/5.0' into develop 2017-01-09 10:25:05 +01:00
Laurent Destailleur
52666ea971 Merge remote-tracking branch 'origin/5.0' into develop 2017-01-09 10:22:20 +01:00
Laurent Destailleur
fd008f88b1 Add github tools 2017-01-09 10:21:59 +01:00
Laurent Destailleur
03aa8343fd Fix css 2017-01-09 10:21:35 +01:00
Laurent Destailleur
62a668d899 Fix https link 2017-01-09 10:02:17 +01:00
aspangaro
a583fd7a3b Fix : Bank - Presentation, no titlefield in a list 2017-01-08 20:52:42 +01:00
Laurent Destailleur
dba777c57b Fix missing field alias 2017-01-08 12:10:07 +01:00
Laurent Destailleur
1856b5cfb8 Fix filter on status for third parties 2017-01-08 11:50:43 +01:00