Laurent Destailleur
74293cd7cc
git push origin developMerge branch 'GPCsolutions-dolibarr-cifix' into develop
2015-12-18 17:05:19 +01:00
Laurent Destailleur
d0ec3f1152
Merge branch 'dolibarr-cifix' of
...
https://github.com/GPCsolutions/dolibarr into
GPCsolutions-dolibarr-cifix
Conflicts:
htdocs/product/card.php
2015-12-18 17:05:04 +01:00
Laurent Destailleur
98cd4f8307
Fix message so it is more clear what the feature can do or not.
...
Fix list of email templates must be hidden for templates of disabled
modules.
2015-12-18 12:48:20 +01:00
Laurent Destailleur
b10f9d4ca3
Fix: when doing an export of extrafields, we must use different table
...
alias for each extrafield table.
2015-12-17 20:40:33 +01:00
Laurent Destailleur
5eea1ce7d9
Fix several warnings
2015-12-17 19:37:24 +01:00
Laurent Destailleur
92343901d6
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-12-17 14:01:34 +01:00
Laurent Destailleur
ba3c8de785
Update doc comment to make things cleaner to avoid confusion between old
...
deprecated doActions of canvas and doActions of triggers.
2015-12-17 14:01:22 +01:00
Raphaël Doursenaud
c2642acdba
Fix CI build 578 (Syntax error)
...
empty() only supports variables in PHP < 5.5
2015-12-17 10:03:42 +01:00
Laurent Destailleur
34f4e913d4
Merge pull request #4240 from frederic34/patch-9
...
Fix when PRODUIT_MULTIPRICES is set, label for each level was not visible
2015-12-16 19:58:48 +01:00
Laurent Destailleur
9973315a07
Fix we muste have ($limit = $conf->liste_limite; $offset = $limit *
...
$page) and not ($offset = $conf->liste_limite * $page).
In a future $limit that could be overwrite from search post form.
2015-12-16 19:38:40 +01:00
Laurent Destailleur
6133298e58
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-12-16 19:27:23 +01:00
Laurent Destailleur
f87ccc97e2
Miscellaneous fixes
2015-12-16 19:26:50 +01:00
Laurent Destailleur
33ea5c83b7
Merge pull request #4238 from fappels/develop
...
Fix product list page offset calculation
2015-12-16 19:26:32 +01:00
Laurent Destailleur
acc4623b74
Merge pull request #4236 from defrance/patch-90
...
fix ErrorBadValueForParamNotAString shit one again...
2015-12-16 19:25:39 +01:00
Laurent Destailleur
609b8a8506
Merge pull request #4234 from aspangaro/develop-a3
...
Accountancy- Add a column in table bookkeeping to validate operations
2015-12-16 19:15:13 +01:00
Laurent Destailleur
516e071363
Merge pull request #4232 from aspangaro/develop-remove_zero
...
New: Accountancy add a function to remove all zero at the right of the account
2015-12-16 19:13:43 +01:00
Laurent Destailleur
710a8bb6a9
Merge pull request #4231 from mrsof/patch-2
...
Typo
2015-12-16 19:11:24 +01:00
Laurent Destailleur
c03320ff0b
Merge pull request #4224 from aspangaro/develop-fec
...
Complete information on FEC format - french law
2015-12-16 19:10:17 +01:00
Laurent Destailleur
cd70b296c1
Merge pull request #4223 from fappels/develop-shipment-error-handling
...
Fix not complete output of error messages in shipment
2015-12-16 19:09:35 +01:00
Laurent Destailleur
d95be87e64
Merge pull request #4222 from grandoc/develop
...
Fix not complete output of error messages
2015-12-16 19:08:06 +01:00
Laurent Destailleur
7b17d2ce0c
Merge pull request #4221 from mrsof/patch-1
...
FIX : Fatal error: Cannot access empty property
2015-12-16 19:07:24 +01:00
Laurent Destailleur
b2640498c4
Merge pull request #4219 from bafbes/patch-10
...
Fix the list of thirdparty must be restricted to customer for invoices
2015-12-16 19:04:01 +01:00
Laurent Destailleur
77e9ab763b
Merge pull request #4216 from frederic34/patch-8
...
FIX option MAIN_DISABLE_FULL_SCANLIST was not working for stock movements
2015-12-16 19:02:53 +01:00
Laurent Destailleur
4ef832b94b
Merge pull request #4215 from frederic34/patch-7
...
Update sms.php
2015-12-16 19:02:07 +01:00
Frédéric FRANCE
9e6698c6ca
Update multiprix.php
2015-12-16 18:18:02 +01:00
Francis Appels
3568b889bf
Update list.php
...
Fix page offset calculation
2015-12-16 15:42:24 +01:00
fappels
973339e071
Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop
2015-12-16 15:38:02 +01:00
BENKE Charlie
afe3e6ac27
fix ErrorBadValueForParamNotAString shit one again...
2015-12-16 12:38:32 +01:00
aspangaro
5cd5413836
Accountancy add a column in table bookkeeping to validate operations
2015-12-16 05:22:50 +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
Laurent Destailleur
af85ade7ff
Minor css fix
2015-12-15 10:24:31 +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
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
