Commit Graph

42805 Commits

Author SHA1 Message Date
Laurent Destailleur
8d47a307bb Better use of space 2015-10-06 21:52:42 +02:00
Laurent Destailleur
f54a1ca367 CSS enhancement 2015-10-06 01:03:31 +02:00
Laurent Destailleur
b45f5039ed Fix syntax error 2015-10-05 09:02:03 +02:00
Laurent Destailleur
68d4a9fc63 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/societe/list.php
2015-10-04 20:57:00 +02:00
Laurent Destailleur
c20296f963 Merge remote-tracking branch 'origin/3.7' into 3.8 2015-10-04 20:46:17 +02:00
Laurent Destailleur
b5ec3b7085 Merge pull request #3546 from GPCsolutions/badincludepath
Fix Do not always append htdocs to include path
2015-10-04 20:14:13 +02:00
Laurent Destailleur
c74bf517e2 Merge pull request #3656 from frederic34/patch-15
Update index.php
2015-10-04 20:11:55 +02:00
Laurent Destailleur
e4014bf01d Merge pull request #3655 from frederic34/patch-14
Update index.php
2015-10-04 20:11:09 +02:00
Laurent Destailleur
a65d10de90 Merge pull request #3654 from frederic34/patch-12
Update index.php
2015-10-04 20:10:54 +02:00
Laurent Destailleur
39671d5c53 Merge pull request #3653 from frederic34/patch-11
Autocomplete with last conciliate number
2015-10-04 20:09:25 +02:00
Laurent Destailleur
17416dba89 Merge pull request #3651 from frederic34/patch-20
Add badge for number of files in bank's tab
2015-10-04 20:03:41 +02:00
Laurent Destailleur
839d4c2a9a Merge pull request #3650 from frederic34/patch-19
Update printing.php
2015-10-04 20:03:21 +02:00
Laurent Destailleur
f4b26285a2 Merge pull request #3649 from frederic34/patch-18
Lost search_status on next page button
2015-10-04 20:02:37 +02:00
Laurent Destailleur
229f689a08 Merge pull request #3648 from frederic34/patch-17
Update style.css.php
2015-10-04 20:02:20 +02:00
Laurent Destailleur
c2cc9711f7 FIX Thirdparty is missing on card 2015-10-04 20:01:08 +02:00
Frédéric FRANCE
780a5a1996 Update files.lib.php 2015-10-04 19:59:26 +02:00
Laurent Destailleur
406b271275 Merge pull request #3635 from FHenry/3.7
FIX : Mass Mailing activity don't display all status
2015-10-04 19:57:29 +02:00
Laurent Destailleur
85a5b0fc69 Merge pull request #3652 from grandoc/develop
FIX : typo
2015-10-04 19:57:12 +02:00
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
0df42bc5ea FIX Filter on status of thirdparty list and bad encoding of url 2015-10-04 19:37:49 +02:00
frederic34
7f86797f73 Add contact photo 2015-10-04 17:25:46 +02:00
Laurent Destailleur
75e337e8d9 FIX select of project using ajax autocomplete option 2015-10-04 16:02:50 +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
Frédéric FRANCE
85186ee1a3 Update index.php 2015-10-03 23:06:05 +02:00
Juanjo Menent
bc01d28061 Fix: formconfirm printing 2015-10-03 22:59:22 +02:00
Frédéric FRANCE
0cfa112cf2 Update index.php 2015-10-03 22:35:26 +02:00
Frédéric FRANCE
ebe937f8b7 Update index.php 2015-10-03 21:32:43 +02:00
Frédéric FRANCE
c077e69047 Autocomplete with last conciliate number 2015-10-03 20:54:27 +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
philippe grand
322928fbae Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2015-10-03 16:33:16 +02:00
Juanjo Menent
92f4c0d015 Merge remote-tracking branch 'upstream/develop' into dolibarr-3509 2015-10-03 16:01:24 +02:00