Commit Graph

51549 Commits

Author SHA1 Message Date
aspangaro
5cd5413836 Accountancy add a column in table bookkeeping to validate operations 2015-12-16 05:22:50 +01:00
aspangaro
dfbc2814e7 Fix: Add an empty field for list of parent account - This value can be null 2015-12-15 21:10:53 +01:00
aspangaro
36bc1321cb Merge remote-tracking branch 'Upstream/develop' into develop-remove_zero 2015-12-15 20:50:49 +01:00
aspangaro
c1e77daeb1 New: Accountancy add a function to remove all zero at the right of the account.
Thanks to Florian
2015-12-15 20:48:06 +01:00
Laurent Destailleur
90dbfc4870 Fix: to avoid confusion between amount of payment and amount distributed
on invoice when a payment is done for several invoices, export of
payment can export both fields.
2015-12-15 15:52:20 +01:00
Sof
011f0fbb0b FIX : Typo error 2015-12-15 14:04:52 +01:00
BENKE Charlie
23e727048e Add some new translations for export feature 2015-12-15 10:35:11 +01:00
Laurent Destailleur
af85ade7ff Minor css fix 2015-12-15 10:24:31 +01:00
Laurent Destailleur
3e3dbf850f Fix: bad case for function 2015-12-15 09:44:17 +01:00
Laurent Destailleur
40269c3c70 Fix Remove syntax warnings 2015-12-15 09:43:39 +01:00
Laurent Destailleur
750443040a Enhance ruleset.xml description 2015-12-15 09:29:21 +01:00
aspangaro
5770407464 Complete information on FEC format - french law 2015-12-15 06:10:33 +01:00
aspangaro
687370071b A function to remove zero at the end of the account 2015-12-14 21:38:30 +01:00
fappels
9fa742ceb2 [QUAL] Shipment error handling 2015-12-14 21:38:26 +01:00
Laurent Destailleur
ed88a4c398 Fix css 2015-12-14 21:38:04 +01:00
philippe grand
0fe64c6091 [Qual] Uniformize code 2015-12-14 20:54:55 +01:00
fappels
7c3779f39b Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop 2015-12-14 19:21:57 +01:00
Sof
4c60569cc4 FIX : Fatal error: Cannot access empty property 2015-12-14 15:42:21 +01:00
Bahfir Abbes
e415a3ddf2 Update facture.php
fix change customer function in customer invoices - include customers or prospects only
2015-12-14 15:01:29 +01:00
Laurent Destailleur
b9aa80c4ca Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-12-14 10:33:32 +01:00
Laurent Destailleur
84ee18a11b Fix bad management of second level approvement 2015-12-14 10:33:18 +01:00
Frédéric FRANCE
af5bcc5312 Update mouvement.php 2015-12-14 09:31:40 +01:00
Laurent Destailleur
0ec62c05cc Fix bad var name. Removed warning. 2015-12-14 09:14:34 +01:00
Laurent Destailleur
96d1486358 Merge pull request #4209 from GPCsolutions/dolibarr-travis
Better Travis CI
2015-12-14 01:11:55 +01:00
Raphaël Doursenaud
bbe7498de6 Better Travis CI
NEW:
Cleaned up routines for better readability of both declaration and results.
PHP versions now really covered.
    The old code forced install of PHP and didn't use Travis provided versions.
    This resulted in the process not being executed with the declared PHP version.
Dropped MySQL in favor of MariaDB.
    This is now the FLOSS community standard.
    This should help avoid problems with buggy MySQL releases.
Fast finish enabled to show results faster.
Optimized tools installation with composer.
    The right version of the tool is installed for the PHP version under test.
New PHP linter to check for syntax errors.
    Parallelized for better speed.
Apache + PHP FPM for testing webservices.
    The previous mod_php configuration was not supported on Travis.
New global DEBUG environment variable to show verbose output with configuration files content.
IRC notification on #dolibarr@freenode for community awareness.

FIXES:
Bug in scripts preventing execution with environmentalized PHP.
Wrong detection of MAIN_URL_ROOT under specific circumstances.
    $_SERVER["DOCUMENT_ROOT"] empty and $_SERVER["SCRIPT_NAME"] populated.
Relative ignore directive in coding style ruleset to avoid bypassing test.
Unit test errors without an exit status.
    This prevented the CI from properly detecting and reporting the error.

TODOS:
PostgreSQL support.
    This one is tricky since we only have a MySQL dump and the syntax is not directly compatible.
SQLite support.
    Disabled in core at the moment.
Nginx + PHP FPM support.
    Test webservices on the second most popular webserver.
Run dev/* checks.
    We have a nice collection of scripts we could leverage.
Check Javascript.
Check CSS.
Check SQL.
2015-12-13 21:34:36 +01:00
Frédéric FRANCE
1aa232c4a7 Update CSMSFile.class.php 2015-12-13 21:14:53 +01:00
Frédéric FRANCE
65cebe37f3 Update sms.php 2015-12-13 21:12:08 +01:00
Laurent Destailleur
dc6ec91b2c Merge pull request #4183 from IonAgorria/patch-3
JS error preventing hiding of dates at object line
2015-12-13 19:57:37 +01:00
Laurent Destailleur
c5054c41cf Merge pull request #4211 from aspangaro/3.8-3879
Fix #3879 Wrong translation in the new expense report module
2015-12-13 19:56:55 +01:00
Laurent Destailleur
da8e38b253 Merge pull request #4213 from grandoc/develop
[Qual] Uniformize code
2015-12-13 19:56:43 +01:00
Laurent Destailleur
b949468b75 Merge pull request #4210 from IonAgorria/pricesel-fix
Price expression selector fix
2015-12-13 19:56:32 +01:00
Laurent Destailleur
4d11c8b733 Merge pull request #4212 from frederic34/patch-7
typo
2015-12-13 19:40:08 +01:00
Laurent Destailleur
646a198399 Merge pull request #4214 from frederic34/patch-8
typo
2015-12-13 19:39:56 +01:00
Laurent Destailleur
e37fc87cd5 Merge remote-tracking branch 'origin/3.7' into 3.8 2015-12-13 17:34:06 +01:00
Laurent Destailleur
1978eebb69 Fix bad merge 2015-12-13 17:33:20 +01:00
Laurent Destailleur
ef13bd43b0 Fix bad merge 2015-12-13 17:27:55 +01:00
Laurent Destailleur
3b595f0247 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/core/lib/date.lib.php
	htdocs/core/lib/report.lib.php
	htdocs/langs/en_US/accountancy.lang
2015-12-13 16:23:33 +01:00
Laurent Destailleur
4b741c6b9c Fix permissions 2015-12-13 16:16:30 +01:00
Laurent Destailleur
a462cd232d Merge remote-tracking branch 'origin/3.7' into 3.8 2015-12-13 16:09:09 +01:00
Laurent Destailleur
4a88c9ea9f Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/product/class/product.class.php
2015-12-13 15:53:57 +01:00
Laurent Destailleur
7db6ac592f FIX Option start tls of ldap was not correctly supported. 2015-12-13 15:51:52 +01:00
Laurent Destailleur
ef33691818 FIX Removed hard coded parameters for asterisk setup 2015-12-13 15:21:46 +01:00
Laurent Destailleur
3680202c1c Fix do not share color for title of table and title of pages 2015-12-13 14:39:12 +01:00
Frédéric FRANCE
9cc77787c5 typo 2015-12-12 16:10:36 +01:00
Laurent Destailleur
2a6fbe3526 Fix debug shipment doc generation (bad position of fields, code
differences, text size, ...)
2015-12-12 14:55:32 +01:00
Laurent Destailleur
0330d8237f Fix: Color too dark 2015-12-12 14:13:45 +01:00
Laurent Destailleur
84205b5be4 Fix: text too long 2015-12-12 14:12:53 +01:00
Laurent Destailleur
5f4be14dd2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-12 13:19:55 +01:00
philippe grand
de0a13ae8f [Qual] Uniformize code 2015-12-12 10:59:02 +01:00
Frédéric FRANCE
442f669dc7 typo 2015-12-12 10:45:33 +01:00