Commit Graph

47328 Commits

Author SHA1 Message Date
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
349ce5c18f Merge pull request #2672 from atm-maxime/3.7
Fix : prevelement with SEPA
3.7.0
2015-04-19 01:59:54 +02:00
Laurent Destailleur
df9973f462 Merge pull request #2671 from aternatik/img_title
Picto war S01E02
2015-04-19 01:59:44 +02:00
Maxime Kohlhaas
54a68116e4 Fix : prevelement with SEPA 2015-04-19 01:55:35 +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
Laurent Destailleur
b7ffdba55f Merge remote-tracking branch 'origin/3.6' into 3.7 2015-04-19 01:00:48 +02:00
Laurent Destailleur
fdd34c582c Merge pull request #2665 from atm-maxime/3.6
Fix : include facture class for outstanding bill
2015-04-19 00:59:21 +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
Maxime Kohlhaas
0112cbaaf0 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2015-04-19 00:28:15 +02:00
Laurent Destailleur
2f853a56af Merge pull request #2664 from aternatik/img_title
Picto war!
2015-04-19 00:27:06 +02:00
Maxime Kohlhaas
5a66e1f98a Fix : include facture class for outstanding bill 2015-04-19 00:26:05 +02:00
Laurent Destailleur
5b29c87933 Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/compta/deplacement/fiche.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/expedition/fiche.php
2015-04-19 00:23:46 +02:00
Laurent Destailleur
ab77158757 Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
	htdocs/expedition/fiche.php
2015-04-18 23:55:17 +02:00
jfefe
57d04c601f Add title picto for project section 2015-04-18 23:39:04 +02:00
Marcos García de La Fuente
87f97ed545 Merge branch 'develop' into units
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/admin/product.php
	htdocs/product/card.php
2015-04-18 23:38:14 +02:00
Laurent Destailleur
b8c512a3d5 Merge branch '3.5' of github.com:Dolibarr/dolibarr into 3.5 2015-04-18 23:34:42 +02:00
jfefe
73ef3d73c2 Change size of generic title picto 2015-04-18 23:28:20 +02:00
jfefe
23e5bc4f53 Add title image for bank section 2015-04-18 23:17:47 +02:00
jfefe
22c3406498 Change title images for accountancy section 2015-04-18 23:17:47 +02:00
jfefe
25812f0071 Add picto for commercial pages titles 2015-04-18 23:17:44 +02:00
jfefe
3825b89ead Change companies and product title picto 2015-04-18 23:13:48 +02:00
jfefe
c905f88498 Change generic and setup image title 2015-04-18 23:13:48 +02:00
Maxime Kohlhaas
098f2ab0b1 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2015-04-18 23:09:24 +02:00
Maxime Kohlhaas
bcf9e7fb37 Fix : use getentity for stock sharing 2015-04-18 23:08:21 +02:00
Laurent Destailleur
5c80d46b74 Merge pull request #2663 from FHenry/develop
fix bug #2652
2015-04-18 23:06:19 +02:00
Florian HENRY
11e1d0310c typo 2015-04-18 23:00:22 +02:00
Florian HENRY
f2018b7946 fix bug #2652 2015-04-18 22:59:20 +02:00
Juanjo Menent
065711df3b Merge pull request #2662 from marcosgdf/fk_soc
Fixed problem with u.fk_soc in PR #2654
2015-04-18 22:52:29 +02:00
Marcos García de La Fuente
2a8cf5f8be Fixed problem with last PR #2654 2015-04-18 22:50:40 +02:00
Florian HENRY
adad1f4a3b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-18 22:43:56 +02:00
Juanjo Menent
21a68b2cf2 Merge pull request #2661 from Diciannove/langtool
fixes issue #2584
2015-04-18 22:38:43 +02:00
Tommaso Basilici
38cfbe4897 issue #2584 - added a counter 2015-04-18 22:37:23 +02:00
Florian HENRY
c678a31d97 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-18 22:24:55 +02:00