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

47112 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
f06255e9d2 Complete the mailmap file. 2015-04-21 16:57:45 +02:00
Laurent Destailleur
fab2c4a0c9 Merge pull request #2689 from GPCsolutions/mailmap 
Added a mailmap for better git statistics
 2015-04-21 16:08:51 +02:00
Laurent Destailleur
96a33bbe8a First clean of code after devcamp 2015-04-21 15:49:58 +02:00
Raphaël Doursenaud
d5e40057e7 Added a mailmap for better git statistics 2015-04-21 14:29:53 +02:00
Laurent Destailleur
1c8e1638c7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-21 12:08:56 +02:00
Laurent Destailleur
a690276060 Fix js warnings, select2 css was not loaded. 2015-04-21 12:08:36 +02:00
Laurent Destailleur
5a9c40eb59 Fix minor look and security errors 2015-04-21 12:03:51 +02:00
Laurent Destailleur
7a4d1d990e Fix security hole 2015-04-21 11:41:21 +02:00
Laurent Destailleur
e476b57795 Merge pull request #2678 from defrance69/patch-60 
add tab management on salarie payement
 2015-04-21 11:15:20 +02:00
Laurent Destailleur
9d1c609c4f Merge pull request #2538 from marcosgdf/units 
NEW [ task 977 ] New option to manage product unit Migrated code from GPCSolutions/dolibarr:3.2-units branch and adapted for 3.8 with some improvements
 2015-04-21 11:14:50 +02:00
Laurent Destailleur
616e28eecd Merge pull request #2684 from aternatik/fix_odt_lines_type 
Add missing value into ODT for object line type (product or service)
 2015-04-21 11:13:02 +02:00
Laurent Destailleur
819e463255 Merge pull request #2685 from frederic34/patch-8 
test for mysql 5.6
 2015-04-21 11:12:08 +02:00
Frédéric FRANCE
9f899c93ef Update .travis.yml 2015-04-20 17:11:09 +02:00
jfefe
f2d05ce754 Add missing value for object line type (product or service) 2015-04-20 16:20:04 +02:00
Laurent Destailleur
94589b9935 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-19 23:15:39 +02:00
Laurent Destailleur
65dafeee55 Uniformize feature between invoice and merging tool 2015-04-19 23:15:24 +02:00
Marcos García de La Fuente
2967bc7df7 Merge branch 'develop' into units 2015-04-19 17:19:59 +02:00
Marcos García de La Fuente
7be7a770c1 Implemented units for CommandeFournisseur and FactureFournisseur 2015-04-19 16:46:24 +02:00
Laurent Destailleur
560fcb1b24 Remove external module 2015-04-19 15:27:30 +02:00
Laurent Destailleur
ba706ec8e1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-19 13:34:09 +02:00
BENKE Charlie
51cb680f19 Create info.php 
add info tabs
 2015-04-19 13:32:59 +02:00
Laurent Destailleur
d4924b40cf Merge pull request #2677 from GPCsolutions/minified-select2 
Use minified select2 js lib
 2015-04-19 13:32:36 +02:00
Laurent Destailleur
89412082ab Change to debug mysql 2015-04-19 13:31:20 +02:00
BENKE Charlie
a151defc4b Add tabs management 2015-04-19 13:28:51 +02:00
BENKE Charlie
5a68cba013 Create salaries.lib.php 
add lib salaries for menu management
 2015-04-19 13:25:43 +02:00
Laurent Destailleur
38dc5b2555 Change to debug travis 2015-04-19 13:21:33 +02:00
Raphaël Doursenaud
e7a21de11d Use minified select2 js lib 2015-04-19 12:58:47 +02:00
Laurent Destailleur
935f94fd62 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-19 12:25:36 +02:00
Laurent Destailleur
207b372930 CSS 2015-04-19 12:06:21 +02:00
Juanjo Menent
9efdc09c32 Merge pull request #2674 from atm-maxime/develop 
Fix : multi upload of files in document tabs
 2015-04-19 10:03:27 +02:00
Laurent Destailleur
22921ad26b Fix phpunit 2015-04-19 04:43:28 +02:00
Maxime Kohlhaas
e692950627 Fix : multi upload of files in document tabs 2015-04-19 04:04:43 +02:00
Laurent Destailleur
d723a5873f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-19 04:02:47 +02:00
Laurent Destailleur
72845b21c7 Add log 2015-04-19 04:01:31 +02:00
Laurent Destailleur
e87627e7f5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-19 03:36:45 +02:00
Laurent Destailleur
6db76830fd Fix load module by test 2015-04-19 03:36:27 +02:00
Laurent Destailleur
111b54d82c Fix phpcs 2015-04-19 03:02:49 +02:00
Laurent Destailleur
df9973f462 Merge pull request #2671 from aternatik/img_title 
Picto war S01E02
 2015-04-19 01:59:44 +02:00
Laurent Destailleur
a091a24657 Fix phpcs 2015-04-19 01:52:15 +02:00
Laurent Destailleur
3a4ad7c038 Bad colspan 2015-04-19 01:09:30 +02:00
Marcos García de La Fuente
270bca740c Merge branch 'develop' into units 
Conflicts:
	htdocs/compta/facture/fiche-rec.php
 2015-04-19 00:59:04 +02:00
Laurent Destailleur
5597e4a8b6 Merge pull request #2668 from GPCsolutions/typo 
Fixed wrong field
 2015-04-19 00:59:01 +02:00
Laurent Destailleur
6d07b74ce6 Merge pull request #2669 from atm-maxime/develop 
Fix : use getentity for stock sharing
 2015-04-19 00:58:20 +02:00
Laurent Destailleur
b0ad595f00 Add filelist 2015-04-19 00:54:44 +02:00
Laurent Destailleur
4b84e191a6 Use popup for confirm 2015-04-19 00:49:55 +02:00
Maxime Kohlhaas
ee8b5be43b Typo 2015-04-19 00:46:30 +02:00
Raphaël Doursenaud
19d9af4cf5 Fixed wrong field 2015-04-19 00:44:39 +02:00
jfefe
c90801c0ad Add home picto for index page title 2015-04-19 00:41:29 +02:00
jfefe
c9d377f07f Modify generic picto 2015-04-19 00:38:29 +02:00
jfefe
c3e81c2d21 Modify accountancy picto for titles 2015-04-19 00:33:36 +02:00