Commit Graph

42676 Commits

Author SHA1 Message Date
Laurent Destailleur
9ef3683acc I grouped rules by Standard (PEAR, Generic, Zend, ...)
If a standard bring a rule that is duplicate than the other, we must
keep it commented saying duplicate with.
So at any time we know which rule we match for each standard.
2014-07-26 15:07:30 +02:00
Laurent Destailleur
3b9cfea8c9 Better function is_ip 2014-07-26 14:16:09 +02:00
Laurent Destailleur
8f6023ab5f Fix: phpunit test 2014-07-26 14:07:37 +02:00
Laurent Destailleur
31fb2e9293 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-07-26 14:05:26 +02:00
Laurent Destailleur
76d4dee411 Merge pull request #1751 from marcosgdf/optimization
Optimized is_ip dolibarr function
2014-07-26 14:05:14 +02:00
Laurent Destailleur
4d331aeef5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-07-26 13:23:40 +02:00
Laurent Destailleur
289a2c6312 Maj readme 2014-07-26 13:23:22 +02:00
Laurent Destailleur
5aa4d61afe Merge pull request #1773 from icfr/patch-1
erreur de frappe
2014-07-25 22:20:43 +02:00
Laurent Destailleur
f1d8f3cb8e Merge pull request #1768 from mika31/patch-1
Webservice thirdparty / sale representative
2014-07-25 22:18:57 +02:00
Laurent Destailleur
f9dc010b3c Merge pull request #1767 from frederic34/patch-1
Update html.form.class.php
2014-07-25 22:18:19 +02:00
Laurent Destailleur
ed47b27ed9 Merge pull request #1764 from frederic34/patch-3
Update main.lang
2014-07-25 22:17:23 +02:00
Laurent Destailleur
5caa7ccd13 Merge pull request #1765 from marcosgdf/patch-3
Added formConfirm and doAction for supplier invoice card
2014-07-25 22:17:09 +02:00
Laurent Destailleur
6dddcbfe49 Merge pull request #1763 from frederic34/patch-2
Update main.lang
2014-07-25 22:15:30 +02:00
icfr
d61d4778fb erreur de frappe 2014-07-25 19:03:31 +02:00
mika31
f96f8384e6 Webservice thirdparty / sale representative
Little patch to add capability to associate (one) sale representative on thirdparty creation.
2014-07-23 20:23:37 +02:00
Laurent Destailleur
a2760aeacb Typo 2014-07-23 10:26:43 +02:00
frederic34
5239620356 Update main.lang 2014-07-23 10:02:33 +02:00
frederic34
c28c6e578e Update main.lang 2014-07-23 10:00:32 +02:00
frederic34
5ef626813c Update html.form.class.php 2014-07-23 09:49:58 +02:00
Marcos García de La Fuente
f3cbe1beac Task #1511 and updated changelog 2014-07-23 06:20:17 +02:00
Marcos García de La Fuente
1a254b310e Merge remote-tracking branch 'upstream/develop' into optimization
Conflicts:
	test/phpunit/Functions2LibTest.php
2014-07-22 04:42:50 +02:00
Marcos García de La Fuente
203dc5518a Merge branch 'develop' into optimization 2014-07-22 04:39:31 +02:00
Marcos García de La Fuente
f5d1d1563b Corrected indentation (again) 2014-07-22 04:27:41 +02:00
Marcos García de La Fuente
c813077f82 Corrected indentation 2014-07-22 04:25:44 +02:00
Marcos García de La Fuente
4f582609f4 Added formConfirm and doAction for supplier invoice card 2014-07-22 04:24:08 +02:00
Laurent Destailleur
76f72d5bcc Fix: pb with pgsql 2014-07-21 23:51:13 +02:00
Laurent Destailleur
0327738aa9 phpcs 2014-07-21 21:07:30 +02:00
frederic34
a01c985018 Update main.lang 2014-07-21 19:21:08 +02:00
frederic34
f0bfe46ebc Update main.lang 2014-07-21 19:19:04 +02:00
Laurent Destailleur
8613cdf24a Merge pull request #1762 from eldy/develop
A smaller PR from scrutinizer with good advices on doc
2014-07-21 19:10:10 +02:00
Laurent Destailleur
94e1f41849 Merge pull request #3 from eldy/revert-1-scrutinizer-patch-1
Revert "Scrutinizer Auto-Fixes"
2014-07-21 19:08:11 +02:00
Laurent Destailleur
161f5eadd4 Revert "Scrutinizer Auto-Fixes" 2014-07-21 19:07:56 +02:00
Laurent Destailleur
d5ab896782 Merge pull request #2 from eldy/scrutinizer-patch-2
Scrutinizer Auto-Fixes
2014-07-21 19:04:56 +02:00
Laurent Destailleur
c024037c62 Merge pull request #1761 from frederic34/patch-1
Update facture.php
2014-07-21 19:01:25 +02:00
Scrutinizer Auto-Fixer
42a4af3b6e Scrutinizer Auto-Fixes
This patch was automatically generated as part of the following inspection:
https://scrutinizer-ci.com/g/eldy/dolibarr/inspections/dce98b05-0037-4277-b1e9-7fd6405a6cd6

Enabled analysis tools:
 - PHP Analyzer
2014-07-21 18:42:17 +02:00
Juanjo Menent
acaca341ab Fix: [ bug #1521 ] The second order's page from a provider shows all
orders

Conflicts:
	ChangeLog
2014-07-21 17:00:59 +02:00
frederic34
f08f4d7c5e Update facture.php
Remove a space
2014-07-21 09:18:14 +02:00
Laurent Destailleur
70a83f5ef9 Merge pull request #1 from eldy/scrutinizer-patch-1
Scrutinizer Auto-Fixes
2014-07-20 23:47:40 +02:00
Scrutinizer Auto-Fixer
2fdda8cbfb Scrutinizer Auto-Fixes
This patch was automatically generated as part of the following inspection:
https://scrutinizer-ci.com/g/eldy/dolibarr/inspections/128b4bb3-f689-4974-8fd7-a7b93d012d3f

Enabled analysis tools:
 - PHP Analyzer
2014-07-20 23:46:38 +02:00
Laurent Destailleur
7ac4a6f43c New: Show amount and status of supplier invoice also on document tab. 2014-07-20 19:35:45 +02:00
Laurent Destailleur
8bc655b44f Fix: Bad alignement of cells 2014-07-20 19:35:00 +02:00
Laurent Destailleur
9eb54ffb4b Fix: Bad merge 2014-07-20 16:14:25 +02:00
Laurent Destailleur
5572364d2b Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
	dev/codesniffer/ruleset.xml
2014-07-20 16:09:42 +02:00
Laurent Destailleur
8d46b02d67 Fix: missing property 2014-07-20 15:58:05 +02:00
Laurent Destailleur
85ccb094b4 Fix: More complete exclusion list 2014-07-20 15:54:37 +02:00
Laurent Destailleur
0452c2d68e Qual: Enhance PHPCS sheet. 2014-07-20 15:39:38 +02:00
Laurent Destailleur
dec7fe42af Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/fourn/commande/fiche.php
2014-07-20 15:37:50 +02:00
Laurent Destailleur
d7163fe543 Qual: Start to fight deprecated code use reported by
https://scrutinizer-ci.com/g/eldy/dolibarr/issues/develop?orderField=path&order=asc
2014-07-20 15:34:33 +02:00
Laurent Destailleur
cfc337a79a Qual: Enable php checkstyle rule Zend.Files.ClosingTag
Fix: Solve a lot of checkstyle errors.
2014-07-20 15:27:38 +02:00
Laurent Destailleur
ad104470d8 Fix: CheckStyle 2014-07-20 14:55:18 +02:00