Commit Graph

54329 Commits

Author SHA1 Message Date
Laurent Destailleur
de76f2a9aa Clean language files 2016-06-18 15:50:37 +02:00
Laurent Destailleur
d192438eae Enhance tool to clean language files 2016-06-18 12:50:15 +02:00
philippe grand
e28bac3464 Merge remote-tracking branch 'upstream/develop' into develop
update from upstream
2016-06-18 11:59:27 +02:00
philippe grand
cbdb9f9b2a internationalization of code comment 2016-06-18 11:52:41 +02:00
Laurent Destailleur
4382f2a437 Clean language files 2016-06-18 11:06:11 +02:00
Laurent Destailleur
33dc2d5ec3 Sync lang 2016-06-17 19:29:58 +02:00
Laurent Destailleur
988ed3947c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-06-17 16:28:28 +02:00
Laurent Destailleur
34c741bf0d FIX CSS and responsive behaviour (feature with a menu hider is on on
smarpthone)
2016-06-17 16:28:16 +02:00
Laurent Destailleur
243a30e5de Code comment 2016-06-17 15:51:09 +02:00
philippe grand
388cd202aa international comment for code 2016-06-17 14:19:54 +02:00
florian HENRY
93417a08b3 FIX : Add comment because accoutancy cannot work with PgSQL 2016-06-17 13:49:44 +02:00
florian HENRY
d94953c4d7 FIX bug with PgSQL on GROUP BY missing column 2016-06-17 13:33:48 +02:00
Laurent Destailleur
48f30b5ef1 Cleaner menu 2016-06-17 12:39:00 +02:00
Laurent Destailleur
d717757594 Protect against bad value of accurancy to avoid javascript error 2016-06-17 10:40:11 +02:00
Laurent Destailleur
76df7afa85 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-06-17 10:35:30 +02:00
Laurent Destailleur
a3d53b269f FIX javascript error with german-switzerland language 2016-06-17 10:35:18 +02:00
Laurent Destailleur
19eacba248 Merge pull request #5348 from frederic34/patch-8
FIX Bad name of table into sql request llx_accountingaccount instead of llx_accounting_account
2016-06-16 20:35:21 +02:00
Laurent Destailleur
b3bc89ca9b Merge pull request #5324 from GPCsolutions/markdown-editorconfig
Added Markdown rule to editorconfig
2016-06-16 20:27:36 +02:00
Laurent Destailleur
4ceba62116 Merge pull request #5320 from novalore/develop
fixes and typos in en_US lang files
2016-06-16 20:27:00 +02:00
Laurent Destailleur
4c29e87a78 Merge pull request #5318 from BoboTiG/develop
Fix status icon of unpaid invoices box
2016-06-16 20:25:25 +02:00
Laurent Destailleur
c9d743ac26 Merge pull request #5330 from atm-alexis/FIX_large_expense_note_and_large_logo
FIX 3.8 large expense note
2016-06-16 20:24:39 +02:00
Laurent Destailleur
e4923fa18a Merge pull request #5346 from damirugrin/develop
Conflict with ModSecurity solved in facture.php.
2016-06-16 20:21:24 +02:00
Laurent Destailleur
b4384c13e1 Merge pull request #5349 from atm-maxime/3.9
FIX #5343
2016-06-16 20:19:08 +02:00
Frédéric FRANCE
bc22f39aa4 Update import.php 2016-06-16 20:18:58 +02:00
Laurent Destailleur
8e8b14af78 Merge pull request #5347 from olsesacl/develop-fix-install
Fix: install with mysql 5.7.9
2016-06-16 20:11:56 +02:00
Laurent Destailleur
252ca09717 Merge pull request #5358 from ndrosis/patch-24
Greece VAT 23 -> 24
2016-06-16 20:09:11 +02:00
Laurent Destailleur
a1c2f35ebb Merge pull request #5357 from ndrosis/patch-23
New TVA for Greece 24%
2016-06-16 20:08:16 +02:00
Laurent Destailleur
84e13c153d Merge pull request #5354 from atm-maxime/fix_travis
FIX PHP 5.3 compatibility
2016-06-16 20:07:59 +02:00
Laurent Destailleur
f45fcc93b7 Merge pull request #5360 from GPCsolutions/5350
Fix #5350 date_pointoftax prevented creating invoices
2016-06-16 20:06:52 +02:00
Laurent Destailleur
255867b905 Merge pull request #5361 from atm-alexis/FIX_develop_Link_no_inclusion
FIX a task without project inclusion call a non included object Link
2016-06-16 20:06:12 +02:00
Alexis Algoud
25fe110a34 FIX a task without project inclusion call a non included object Link 2016-06-16 14:08:14 +02:00
Raphaël Doursenaud
eb54c3f8af Fix #5350 date_pointoftax prevented creating invoices 2016-06-16 13:09:11 +02:00
Drosis Nikos
5a51850d54 Greece VAT 23 -> 24 2016-06-16 14:03:11 +03:00
Laurent Destailleur
f94d140d2a Fix bad sql field name 2016-06-16 13:00:23 +02:00
Drosis Nikos
2ef3d7cedb New TVA for Greece 24% 2016-06-16 13:50:35 +03:00
Laurent Destailleur
9781baa743 FIX Filter on opportunity amount and budget 2016-06-16 12:42:21 +02:00
Laurent Destailleur
49d515be7e Fix debug info was visible 2016-06-16 12:22:55 +02:00
Laurent Destailleur
3720c95a52 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2016-06-16 09:50:45 +02:00
Maxime Kohlhaas
31f6cd7353 Merge branch '3.9' of https://github.com/Dolibarr/dolibarr into 3.9 2016-06-16 09:26:16 +02:00
Laurent Destailleur
232f525f29 Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/core/lib/project.lib.php
2016-06-15 18:31:43 +02:00
Laurent Destailleur
a13c0e5462 Merge remote-tracking branch 'origin/3.8' into 3.9 2016-06-15 18:28:59 +02:00
Maxime Kohlhaas
af5a75c39b Merge branch '3.9' of https://github.com/Dolibarr/dolibarr into 3.9 2016-06-15 18:25:45 +02:00
Laurent Destailleur
630a063283 FIX Can't create thirdparty or validate invoice if profid is mandatory
and profid does not exists for other countries

Conflicts:
	htdocs/compta/facture.php
2016-06-15 18:24:15 +02:00
Laurent Destailleur
4c922f073b FIX Can't create thirdparty or validate invoice if profid is mandatory
and profid does not exists for other countries
2016-06-15 18:21:58 +02:00
Laurent Destailleur
b5c4bd9b82 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-06-15 17:20:12 +02:00
Laurent Destailleur
2395099d0f Debug Oauth 2016-06-15 17:20:00 +02:00
Maxime Kohlhaas
748b3bb2ba Fix travis error for GETPOST in empty 2016-06-15 14:16:56 +02:00
Laurent Destailleur
5b5b7a2bf9 FIX Bad value used for task warning delay
FIX Compatibility datee and date_end for warning of tasks
2016-06-15 14:05:48 +02:00
Maxime Kohlhaas
f51386c59f FIX #5343 2016-06-15 08:06:22 +02:00
Laurent Destailleur
6711b7fbd1 Fix css entries added when not required 2016-06-14 23:46:07 +02:00