Commit Graph

54329 Commits

Author SHA1 Message Date
philippe grand
0c5eaddf7a internationalization of code comment 2016-06-23 19:56:17 +02:00
Regis Houssin
25631b236b Fix: missing rename field "shortname" to "ref" 2016-06-23 16:47:21 +02:00
florian HENRY
c67fa41298 FIX : Translate group perms as it is done into user perms 2016-06-23 16:29:06 +02:00
Frédéric FRANCE
3690d11ca2 Update pdf.lib.php 2016-06-23 10:48:52 +02:00
Laurent Destailleur
d0f03d9ff6 Merge pull request #5376 from atm-florian/develop
FIX php warning method declaration
2016-06-23 10:02:13 +02:00
Laurent Destailleur
7f0ed90652 Merge pull request #5385 from simnandez/3.9
FIX: Bad column totalizing if MAIN_SHOW_HT_ON_SUMMARY activated
2016-06-23 10:01:34 +02:00
Laurent Destailleur
0662be0638 Merge pull request #5381 from grandoc/develop
internationalization of code comment
2016-06-23 10:01:00 +02:00
Laurent Destailleur
6cedec2d63 Merge pull request #5384 from frederic34/patch-8
Update mysqli.class.php
2016-06-23 09:57:36 +02:00
Laurent Destailleur
4a408e76e7 Fix download of mass generated files. 2016-06-22 21:06:08 +02:00
Laurent Destailleur
00749b2a65 Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/imports/import.php
	htdocs/includes/odtphp/odf.php
	htdocs/product/stock/product.php
	htdocs/projet/list.php
2016-06-22 20:22:22 +02:00
Laurent Destailleur
7f0062cb4c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-06-22 20:09:31 +02:00
Laurent Destailleur
7fbbf7e8f0 Fix translation missing 2016-06-22 20:09:20 +02:00
Laurent Destailleur
f514400d87 FIX a case of corrupted ODT by Word that insert <text:s> when it should
not.
2016-06-22 20:08:29 +02:00
Juanjo Menent
0d62bd704e Fix: Bad column totalizing if MAIN_SHOW_HT_ON_SUMMARY activated 2016-06-22 18:59:51 +02:00
Laurent Destailleur
7ea16ac3fa Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/theme/md/style.css.php
2016-06-22 15:31:56 +02:00
Laurent Destailleur
f72ff5ac93 FIX Responsive errors due to boxes 2016-06-22 15:23:48 +02:00
florian HENRY
dfba0638ab continue accoutancy and PG SQL compatibility 2016-06-22 11:28:21 +02:00
Frédéric FRANCE
375ce04076 Update mysqli.class.php 2016-06-22 09:53:02 +02:00
florian HENRY
e897700bb2 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2016-06-22 08:41:35 +02:00
philippe grand
cc4fe87e13 internationalization of code comment 2016-06-21 17:00:52 +02:00
Laurent Destailleur
52f414ad73 Fix selection of visible fields on customer and supplier lists. Filters
are ok now. Order of list of fields in selection is same than in output
array.
2016-06-21 15:16:33 +02:00
Laurent Destailleur
b953e8f364 Minor fix 2016-06-21 12:15:41 +02:00
Laurent Destailleur
73fb7b2615 Fix phpunit regression. phpunit test on ws invoice is cleaner. 2016-06-21 01:07:44 +02:00
florian HENRY
c34ef410e8 FIX php warning method declaration 2016-06-20 15:50:00 +02:00
Laurent Destailleur
6317cb53f2 FIX Merge of 2 thirdparties when there is one common tag. 2016-06-20 15:42:16 +02:00
Laurent Destailleur
b62be8dd0b Fix: Test table llx_expedition to allow delete of thirdparty 2016-06-20 14:17:17 +02:00
Laurent Destailleur
195fcc5653 Minor fixes 2016-06-20 11:43:53 +02:00
Laurent Destailleur
b01eed697e Fix sort on thirdparty on bank transaction list 2016-06-20 11:30:43 +02:00
Laurent Destailleur
10f2d7cd67 Fix Debug and minor fixes 2016-06-20 10:54:02 +02:00
Laurent Destailleur
8356dd1080 Fix minor 2016-06-20 10:22:08 +02:00
Laurent Destailleur
6cfc585205 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-06-20 03:21:55 +02:00
Laurent Destailleur
febf56e28c Sync transifex 2016-06-20 03:21:35 +02:00
Laurent Destailleur
7f4e163a52 Fix scrutinizer reports 2016-06-20 02:37:02 +02:00
Laurent Destailleur
a4d4cb2a4a Merge pull request #5373 from grandoc/develop
internationalization of code comment
2016-06-20 02:14:26 +02:00
Laurent Destailleur
2223d283dc Sync transifex 2016-06-20 00:45:25 +02:00
Laurent Destailleur
74f19944b9 Fix rtl language ar_SA 2016-06-20 00:13:30 +02:00
Laurent Destailleur
386b19d4b1 Fix regression. Add hidden option PROPAL_DISABLE_SIGNATURE to restore
old behaviour.
2016-06-19 17:56:34 +02:00
philippe grand
0cc990402e internationalization of code comment 2016-06-19 17:39:40 +02:00
Laurent Destailleur
8187dc2006 Fix css 2016-06-19 16:07:34 +02:00
Laurent Destailleur
e29d46f421 Better position of version 2016-06-19 13:18:21 +02:00
Laurent Destailleur
eac5cbb0dd FIX Fix the reposition on the clear target button. 2016-06-19 11:59:55 +02:00
Laurent Destailleur
0cbfb28a0f FIX using media files in dolfilemanager with spaces inside. 2016-06-19 11:45:13 +02:00
Laurent Destailleur
e08ac03618 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-06-19 11:19:30 +02:00
Laurent Destailleur
cd122462aa Fix errors on files/dir permissions on dolfilemanager. 2016-06-19 11:19:11 +02:00
Laurent Destailleur
b9982620f9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-06-18 19:49:11 +02:00
Laurent Destailleur
d0a15d32b2 Clean language files 2016-06-18 19:48:58 +02:00
Laurent Destailleur
f9509bf345 Merge pull request #5368 from grandoc/develop
international comment for code
2016-06-18 18:10:12 +02:00
Laurent Destailleur
4a6427134f Merge pull request #5367 from atm-florian/develop
FIX bug with PgSQL on GROUP BY missing column
2016-06-18 18:09:43 +02:00
Laurent Destailleur
f817b562ad Clean language files 2016-06-18 17:17:45 +02:00
Laurent Destailleur
94b7e176a6 Clean language files 2016-06-18 16:46:21 +02:00