Commit Graph

51549 Commits

Author SHA1 Message Date
aspangaro
c3acee56e2 Fix #3879 Wrong translation in the new expense report module 2015-12-12 10:06:11 +01:00
Ion Agorria
57102aefde Price expression selector fix 2015-12-12 01:38:24 +01:00
Juanjo Menent
4b9e87367f Merge pull request #4206 from grandoc/develop
[Qual] Close database handler should be after Footer
2015-12-11 21:35:14 +01:00
Juanjo Menent
9e2a056221 Merge pull request #4205 from FHenry/3.8_accountancy
work on accounting
2015-12-11 19:43:54 +01:00
philippe grand
2cd49043a6 [Qual] Close database handler should be after Footer 2015-12-11 19:37:12 +01:00
Ion Agorria
26b85d7cac Remove unnecesary variable 2015-12-11 18:28:55 +01:00
Laurent Destailleur
f71225742a Merge pull request #4178 from GPCsolutions/dolibarr-3953
Better javascript rounding
2015-12-11 17:59:34 +01:00
Laurent Destailleur
519e022c98 Merge pull request #4191 from braito4/patch-1
Update list.php
2015-12-11 17:28:40 +01:00
Laurent Destailleur
da5aa0cd36 Merge pull request #4200 from GPCsolutions/dolibarr-php7
[Qual] OOP constructor
2015-12-11 17:26:08 +01:00
Laurent Destailleur
1a58624775 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-11 17:05:38 +01:00
Laurent Destailleur
f1374625f0 git push origin developMerge branch 'FHenry-develop' into develop 2015-12-11 17:04:58 +01:00
Laurent Destailleur
47fce16778 Merge branch 'develop' of https://github.com/FHenry/dolibarr into
FHenry-develop

Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
2015-12-11 17:04:19 +01:00
Laurent Destailleur
8ac189a1c3 Merge pull request #4199 from grandoc/develop
[Qual] Uniformize code
2015-12-11 16:59:25 +01:00
Laurent Destailleur
793e6e2a8f Example mut be excluded of packages 2015-12-11 16:56:25 +01:00
Laurent Destailleur
42436a37f4 Merge pull request #4194 from GPCsolutions/dolibarr-hidepass
[Security] Hide click to dial password
2015-12-11 16:46:04 +01:00
Laurent Destailleur
b85dd6647d Merge pull request #4175 from frederic34/patch-3
Update paypal.lib.php
2015-12-11 16:44:25 +01:00
Laurent Destailleur
3fea57f83b Merge pull request #4192 from GPCsolutions/3.6-3930
Fix #3930 Removed executable bit
2015-12-11 16:42:25 +01:00
Laurent Destailleur
9c20694668 Merge pull request #4203 from frederic34/patch-5
Update CSMSFile.class.php
2015-12-11 16:39:51 +01:00
Laurent Destailleur
335530b496 Merge pull request #4189 from apachler/develop
added social charges for Austria
2015-12-11 16:39:16 +01:00
philippe grand
30eb08151d [Qual] Close database handler should be after Footer 2015-12-11 14:19:38 +01:00
philippe grand
9b0dd8159e [Qual] Close database handler should be after Footer 2015-12-11 12:29:19 +01:00
Florian HENRY
8edf3c65c6 work on accounting 2015-12-11 11:46:22 +01:00
Florian HENRY
71d0024b27 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-11 11:31:37 +01:00
philippe grand
8ccafc6e36 [Qual] Uniformize code 2015-12-11 09:54:30 +01:00
Ion Agorria
f34fb0d82d More consistent check 2015-12-11 03:09:09 +01:00
Frédéric FRANCE
e193d9be97 Update CSMSFile.class.php 2015-12-10 23:08:21 +01:00
Raphaël Doursenaud
3e2309d0e6 NEW Factorized price2numjs into lib_head.js.php
Used public domain code from the MDN to provide a robust decimal
rounding implementation.

Warning for developers: the path of the javascript file has changed.
Please update your scripts.
2015-12-10 17:03:00 +01:00
Frédéric FRANCE
ac04fdbd9a Update paypal.php 2015-12-10 16:49:55 +01:00
Raphaël Doursenaud
5aaafc3f8a [Qual] OOP constructor
Using class name as constructor method is deprecated in PHP 7
2015-12-10 16:37:37 +01:00
Frédéric FRANCE
5f0c7b6c38 Update paypal.lang 2015-12-10 16:31:11 +01:00
Frédéric FRANCE
9bb9e6b787 Update paypal.php 2015-12-10 16:29:35 +01:00
Frédéric FRANCE
9e0817ac05 Update paypal.lib.php 2015-12-10 16:28:22 +01:00
philippe grand
fc8c12d6f6 [Qual] Uniformize code 2015-12-10 16:14:37 +01:00
Ion Agorria
ceb2920769 Better undefined CKEDITOR fix 2015-12-10 14:17:08 +01:00
Laurent Destailleur
3bcdc5c9c0 Merge pull request #4181 from grandoc/develop
[Qual] Uniformize code
2015-12-10 13:35:44 +01:00
Laurent Destailleur
99c99570cc Merge pull request #4177 from GPCsolutions/3.8-3953
FIX #3953 Don't round supplier price
2015-12-10 13:21:14 +01:00
Laurent Destailleur
dc2b5bd495 Merge pull request #4176 from GPCsolutions/dolibarr-composer
Updated libraries
2015-12-10 13:15:33 +01:00
Laurent Destailleur
aef427423f Merge pull request #4174 from defrance/patch-86
db->close must be do after llx_footer
2015-12-10 13:08:55 +01:00
Laurent Destailleur
c497a5e526 Merge pull request #4171 from IonAgorria/fix-dateranges
Fix date handling for hours/mins in some pages
2015-12-10 13:08:30 +01:00
Laurent Destailleur
3e3a99ad5e Merge pull request #4170 from openthink-laurent/fix-uniqueness-objects-reference
Fix uniqueness of objects reference
2015-12-10 13:07:16 +01:00
Laurent Destailleur
936116a6a0 Merge pull request #4169 from openthink-laurent/fix-decimals-payments-supplier-invoices
Fix decimals in payments of supplier invoices
2015-12-10 13:06:07 +01:00
Andreas Pachler
019bc7ba8e added austrian Regions, Departements, Forme Juridique and social charges to migration file from 3.8 to 3.9 2015-12-10 12:56:05 +01:00
Raphaël Doursenaud
4f359616ce [Security] Hide click to dial password 2015-12-09 18:16:08 +01:00
Ion Agorria
bbfd138896 Missed another CKEDITOR ref 2015-12-09 18:00:05 +01:00
Florian HENRY
b80518efb4 fix travis 2015-12-09 14:26:04 +01:00
Raphaël Doursenaud
4e9b339439 [Qual] Removed PHP closing tag 2015-12-09 13:28:45 +01:00
Raphaël Doursenaud
c0862762a5 Fix #3930 Removed executable bit
These files doesn't contain executable code and may pose a security
threat.
2015-12-09 13:28:36 +01:00
braito4
ab274ba1e3 Update list.php
Doble page title
2015-12-09 13:10:12 +01:00
Florian HENRY
96a95d6ae1 Debug accountancy on 3.9 2015-12-09 12:55:08 +01:00
Florian HENRY
ea1a81f5f4 FIX : Comptability when multiple account charts 2015-12-09 11:53:38 +01:00