Commit Graph

49634 Commits

Author SHA1 Message Date
Laurent Destailleur
2236d47da2 Merge pull request #3658 from frederic34/optioncss
Optioncss not kept in list
2015-10-04 19:56:59 +02:00
Laurent Destailleur
77218194c6 Merge pull request #3657 from frederic34/patch-16
Fix: #3552
2015-10-04 19:56:22 +02:00
Laurent Destailleur
ba29eef9d6 Merge pull request #3659 from frederic34/cphoto
Add contact photo
2015-10-04 19:55:26 +02:00
frederic34
7f86797f73 Add contact photo 2015-10-04 17:25:46 +02:00
frederic34
1e8ff69267 Optioncss 2015-10-04 13:34:55 +02:00
frederic34
f2d7523091 Optioncss 2015-10-04 12:31:32 +02:00
frederic34
1108458de8 Optioncss 2015-10-04 11:45:02 +02:00
frederic34
ed917ab447 Optioncss 2015-10-04 11:30:28 +02:00
frederic34
835633f92a Optioncss cotisations adhérent 2015-10-04 11:17:19 +02:00
frederic34
9a021e6de4 Optioncss not kept in list 2015-10-04 10:45:57 +02:00
Juanjo Menent
5deedcdb6f Merge pull request #3577 from simnandez/dolibarr-3509
Issue #3509: Ready for customers
2015-10-03 23:58:12 +02:00
Juanjo Menent
31230d296d Merge remote-tracking branch 'upstream/3.8' into develop 2015-10-03 23:51:38 +02:00
Frédéric FRANCE
6f513fabef Update DolibarrModules.class.php 2015-10-03 23:45:25 +02:00
Frédéric FRANCE
b3fb320796 Update errors.lang 2015-10-03 23:44:17 +02:00
Juanjo Menent
8f28e7cf1c Merge remote-tracking branch 'upstream/3.8' into 3.8 2015-10-03 23:34:37 +02:00
Juanjo Menent
8febf25c23 Fix: #3566 2015-10-03 23:34:10 +02:00
Juanjo Menent
7bc6f14736 Merge pull request #3608 from All-3kcis/develop-patch-7
fix dangerous sql injection
2015-10-03 23:16:04 +02:00
Juanjo Menent
bc01d28061 Fix: formconfirm printing 2015-10-03 22:59:22 +02:00
Laurent Destailleur
bea789edfe Make process to update launchpad easier. 2015-10-03 20:09:54 +02:00
Laurent Destailleur
d737fd1fd2 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-10-03 19:06:44 +02:00
Laurent Destailleur
c4c8ffd675 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-10-03 19:05:25 +02:00
Laurent Destailleur
00911d1afe Fix bad param 2015-10-03 19:05:13 +02:00
Laurent Destailleur
31acab92a6 Doc comments 2015-10-03 18:48:51 +02:00
Laurent Destailleur
474bf611ad FIX product type must be defined before used for vat calculation. 2015-10-03 18:33:46 +02:00
Juanjo Menent
9d60dee781 Issue #3509: Ready for customers 2015-10-03 17:15:25 +02:00
Juanjo Menent
03a2fd740d Issue #3509: Ready for customers 2015-10-03 16:58:46 +02:00
Juanjo Menent
92f4c0d015 Merge remote-tracking branch 'upstream/develop' into dolibarr-3509 2015-10-03 16:01:24 +02:00
Juanjo Menent
2d94e3635e Merge pull request #3646 from frederic34/patch-16
Typo
2015-10-03 15:59:35 +02:00
Juanjo Menent
ad0d6f2c75 Merge pull request #3645 from frederic34/patch-15
Typo
2015-10-03 15:59:15 +02:00
Juanjo Menent
5d10fc2c77 Merge pull request #3644 from frederic34/patch-14
can't access documents for bank
2015-10-03 15:57:58 +02:00
Juanjo Menent
553c8c0bd0 Merge pull request #3643 from frederic34/patch-12
Typo (broken facture.php)
2015-10-03 15:57:04 +02:00
Juanjo Menent
d1a52119e4 Merge pull request #3642 from frederic34/patch-11
Update suppliers.lang
2015-10-03 15:56:35 +02:00
Juanjo Menent
fbc3efb5a9 Merge pull request #3641 from grandoc/3.8
fix : Typo
2015-10-03 15:55:56 +02:00
Juanjo Menent
8da8b66693 Issue #3509: Init works 2015-10-03 15:53:36 +02:00
Juanjo Menent
67d28d6991 Merge remote-tracking branch 'upstream/develop' into dolibarr-3509
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
2015-10-03 14:59:56 +02:00
Laurent Destailleur
c0c0cc2415 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/interventions.lang
	htdocs/theme/md_exp/style.css.php
2015-10-03 14:28:31 +02:00
Laurent Destailleur
9e7ded94af Clean init/demo file. Demo init must contains real and clean values 2015-10-03 13:00:44 +02:00
Laurent Destailleur
a9e55fd08f FIX Missing contracts into list in page of Refering objects of a
thirdparty.
2015-10-03 12:57:58 +02:00
philippe grand
d19a9f66b3 Merge branch '3.8' of https://github.com/Dolibarr/dolibarr.git into 3.8 2015-10-03 12:43:38 +02:00
Laurent Destailleur
996c9ca2ba FIX Can't change state on a contact 2015-10-03 12:21:27 +02:00
Laurent Destailleur
b6a83ed5a6 FIX Can't delete thirdparty if there is some discounts 2015-10-03 12:20:50 +02:00
Laurent Destailleur
10b481f47f Fix colspan 2015-10-03 11:15:12 +02:00
Laurent Destailleur
e444cb57d4 Fix bad print 2015-10-03 00:35:26 +02:00
Laurent Destailleur
5acf961f23 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-10-03 00:10:19 +02:00
Frédéric FRANCE
f643613d69 Typo 2015-10-02 17:07:22 +02:00
Frédéric FRANCE
f295b38ccb Typo 2015-10-02 17:05:58 +02:00
Laurent Destailleur
920803518f Removed not used table 2015-10-02 16:31:34 +02:00
Frédéric FRANCE
d451051d97 can't access documents for bank 2015-10-02 16:29:54 +02:00
Laurent Destailleur
43f09dfccf Work on theme 2015-10-02 16:26:08 +02:00
Frédéric FRANCE
8a984980ca Type (broken facture.php) 2015-10-02 16:16:05 +02:00