Commit Graph

191 Commits

Author SHA1 Message Date
Laurent Destailleur
c02cd80b75 Clean code 2019-11-12 10:11:30 +01:00
Scrutinizer Auto-Fixer
df664e790b Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-11 23:15:34 +00:00
Philippe GRAND
f13f148d7f add some comment 2019-11-10 12:14:39 +01:00
Scrutinizer Auto-Fixer
2ecfe41810 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-08 09:53:31 +00:00
Laurent Destailleur
d8e30c5ac7
Merge pull request #12352 from frederic34/patch-16
Update list.php reception
2019-11-07 11:32:34 +01:00
Frédéric FRANCE
a278500b64
Update list.php 2019-11-05 22:56:31 +01:00
Frédéric FRANCE
35751a80ab
100% centpercent 2019-11-05 21:24:41 +01:00
Laurent Destailleur
94bd0f71d9 Fix pb with permission 2019-11-05 19:41:30 +01:00
Laurent Destailleur
bad5daee13 Fix dead code 2019-11-05 19:04:32 +01:00
Laurent Destailleur
5d41268d1e CSS 2019-11-04 19:28:04 +01:00
Laurent Destailleur
6f82c212a0 Finished migration to the new architecture of extrafields 2019-11-02 17:38:19 +01:00
Laurent Destailleur
e087ac434d
Merge pull request #12283 from frederic34/socid
replace deprecated user->societe_id by user->socid
2019-11-02 13:34:21 +01:00
Laurent Destailleur
6d9da08407
Merge pull request #12272 from frederic34/patch-5
css
2019-11-02 13:30:47 +01:00
Laurent Destailleur
25e64b0610
Merge branch 'develop' into socid 2019-11-02 12:01:06 +01:00
Laurent Destailleur
68691ddd8a
Merge pull request #12265 from grandoc/new_branch_30_10_2019
add comment
2019-11-02 11:49:28 +01:00
stickler-ci
dc97a54d82 Fixing style errors. 2019-11-02 09:39:05 +00:00
Philippe GRAND
3ff5389c4e add some comment 2019-11-02 10:35:43 +01:00
Frédéric FRANCE
77d4ca81dc
Merge remote-tracking branch 'upstream/develop' into socid 2019-11-02 09:14:15 +01:00
Laurent Destailleur
cea2c3a9f4 Look and feel v11 2019-11-01 23:58:14 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Frédéric FRANCE
d01419bbfd
css 2019-10-30 18:44:53 +01:00
stickler-ci
d0a468e11b Fixing style errors. 2019-10-30 09:10:12 +00:00
Philippe GRAND
7eb3e2ff3c add some comment 2019-10-30 10:09:08 +01:00
Frédéric FRANCE
e203f87c84
clean indent 2019-10-27 11:18:36 +01:00
Laurent Destailleur
2e573fd794 Fix save of units
Conflicts:
	htdocs/expedition/card.php
	htdocs/product/card.php
	htdocs/product/class/product.class.php
2019-10-23 03:03:55 +02:00
Laurent Destailleur
f0355b3057 Debug option PRODUCT_ADD_NET_MEASURE 2019-10-23 02:58:39 +02:00
Laurent Destailleur
c4be61c55c FIX Better compatible fix for the trouble of weight / size units
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/product/card.php
2019-10-22 18:42:59 +02:00
Laurent Destailleur
e7e9898e0d FIX Better compatible fix for the trouble of weight / size units 2019-10-22 18:36:36 +02:00
Laurent Destailleur
b88968520b Move code of extrafields to the new architecture 2019-10-22 17:08:37 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
e07e01580d Replace deprecated code with new one 2019-10-16 03:34:32 +02:00
Laurent Destailleur
b6c600c171 css 2019-10-10 11:44:03 +02:00
Laurent Destailleur
43a70e5548 Clean code to use the new $extrafields->attributes array 2019-10-08 09:28:50 +02:00
Laurent Destailleur
866dcf18fe Look and feel v11 2019-10-06 15:34:22 +02:00
Laurent Destailleur
2b66282b61 NEW Code for extrafields uses the new array $extrafields->attributes 2019-10-06 14:41:52 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
09d6826e62 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/supplier_order.php
	htdocs/langs/en_US/admin.lang
2019-09-06 14:27:01 +02:00
Laurent Destailleur
c0b8315e19 Replace deprecated code 2019-09-06 02:45:00 +02:00
Laurent Destailleur
626e3fd90e Fix look and feel v10 2019-09-06 02:34:24 +02:00
Laurent Destailleur
fbbe49d6dc Replace deprecated code 2019-09-06 02:12:56 +02:00
Laurent Destailleur
613886f86b Fix translation 2019-09-06 02:09:37 +02:00
Laurent Destailleur
80daf29d79 Fix conflict between new module reception and old process
Fix inventory record does not need status at creation

Conflicts:
	htdocs/fourn/commande/card.php
2019-09-06 01:55:22 +02:00
Laurent Destailleur
04adbd8c80 Fix conflict between new module reception and old process
Fix inventory record does not need status at creation
2019-09-06 01:52:51 +02:00
Laurent Destailleur
11e3aa5860 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-29 11:07:11 +02:00
Laurent Destailleur
7931f0b422 Fix sql error 2019-07-29 11:06:39 +02:00
Laurent Destailleur
a5e3adc6f1 Fix travis 2019-07-29 10:51:17 +02:00
Laurent Destailleur
db461792a0 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-29 01:36:35 +02:00
Laurent Destailleur
9a7113f4f5 FIX Update the file index table when we validate/rename a ref. 2019-07-28 22:26:55 +02:00
Laurent Destailleur
f5cc29417d Translation lignes -> lines 2019-07-05 21:50:35 +02:00
Laurent Destailleur
0a7d70829f Translation of some comments 2019-07-05 21:37:25 +02:00
Laurent Destailleur
adb3062a9f Work on nblignes -> nblines 2019-06-29 16:38:14 +02:00
Laurent Destailleur
fa476b4994 Properties ->libelle_incoterms were renamed into ->label_incoterms 2019-06-25 13:00:02 +02:00
Laurent Destailleur
5675e7c50e Clean code of deprecated method 2019-06-22 18:19:40 +02:00
ICstage
820c420ae5 FIX Missing hooks 2019-06-18 14:07:52 +02:00
Laurent Destailleur
22e897b1a1 Clean and prepare code to fix a SQL injection 2019-05-21 17:22:38 +02:00
Francis Appels
a2d4a59321 Merge branch 'develop' into clean_10_beta 2019-05-13 21:27:13 +02:00
Laurent Destailleur
1c558c685c Fix class not found 2019-05-09 17:16:35 +02:00
Francis Appels
18c5c586ab Cleanup set_draft in syslog 2019-05-01 09:38:27 +02:00
Laurent Destailleur
2b87c8b663
Merge pull request #10810 from mwelters/patch-1
NEW improve Expensereport, Inverse Receiver
2019-04-08 14:04:08 +02:00
Laurent Destailleur
fff9b7db9d Fix doxygen 2019-04-04 18:33:12 +02:00
Philippe GRAND
869a585913 fix : typo 2019-03-26 12:33:41 +01:00
Laurent Destailleur
f27f65e8bf Responsive 2019-03-25 10:09:02 +01:00
markus
f942917f53 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into patch-1 2019-03-24 17:42:49 +01:00
Laurent Destailleur
1a8902f23e Fix migration for compatibility 2019-03-19 12:03:02 +01:00
Laurent Destailleur
c0b6699b25 All methods set_draft() were renamed into setDraft() 2019-03-15 19:01:40 +01:00
Laurent Destailleur
cdf6e4b65a Fix some PSR rules 2019-03-14 16:43:27 +01:00
markus
c905575d3e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2019-03-04 17:26:40 +01:00
Laurent Destailleur
4f9981063f Merge branch 'Squiz.Scope.MethodScope.Missing' of https://github.com/frederic34/dolibarr into frederic34-Squiz.Scope.MethodScope.Missing 2019-03-02 18:26:50 +01:00
Laurent Destailleur
56d921ea52 CSS 2019-03-02 12:57:07 +01:00
Frédéric FRANCE
014f69850e
add visibility 2019-03-01 23:08:57 +01:00
Laurent Destailleur
3ec2338c2d Look and feel v10 2019-02-26 19:37:32 +01:00
markus
d38bff6f14 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2019-02-26 12:31:24 +01:00
Frédéric FRANCE
48de805bce
replace html code by html5 in admin 2019-02-23 21:57:35 +01:00
Frédéric FRANCE
0ca5e6e275
replace html code by html5 in reception 2019-02-23 21:47:04 +01:00
markus
01b12793d2 fix typo in comment 2019-02-12 13:59:55 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature 2019-02-10 10:45:49 +01:00
Frédéric FRANCE
580e5c42d2
GenericFunctionsFunctionCallArgumentSpacing 2019-02-09 12:00:49 +01:00
Laurent Destailleur
a6dde3d6bd
Merge branch 'develop' into nospaceaftercomma 2019-02-03 19:27:16 +01:00
markus
ef1838d679 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2019-02-03 19:04:51 +01:00
markus
bc2c6282d9 Merge branch 'develop' of https://github.com/mwelters/dolibarr into develop 2019-02-03 17:48:04 +01:00
Frédéric FRANCE
273d68381c
psr2 end file new line none found 2019-02-03 15:21:21 +01:00
Laurent Destailleur
e18bd6f986
Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Laurent Destailleur
f30a3d59ba
Merge branch 'develop' into toomanylines 2019-01-27 17:59:13 +01:00
Laurent Destailleur
4f9f0fd7b5
Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
496fa9b0fb
PSR2.Files.EndFileNewline.TooMany 2019-01-27 14:10:35 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
markus
00597477e4 Fix #10263 2019-01-26 16:06:40 +01:00
Philippe GRAND
8263b65841 update with html5 compliant code 2019-01-21 10:06:44 +01:00
Philippe GRAND
64875b670c Clean code 2019-01-16 13:40:44 +01:00
Philippe GRAND
88e90f9020 Clean and update code 2019-01-16 13:36:38 +01:00
Laurent Destailleur
71890cbb08 Fix phpcs 2018-12-17 03:14:31 +01:00
Laurent Destailleur
85cd23caaf Fix phpcs 2018-12-15 18:31:36 +01:00
Laurent Destailleur
2a87521da8 Fix phpcs 2018-12-15 16:37:00 +01:00
Laurent Destailleur
39d244eeb2 Fix phpcs 2018-12-15 15:43:30 +01:00
Laurent Destailleur
2e1b762596 Fix phpcs 2018-12-15 15:07:35 +01:00
Laurent Destailleur
1bce3f6c6b Fix phpcs 2018-12-15 14:54:10 +01:00
Laurent Destailleur
4ff28d4580 Fix phpcs 2018-12-15 14:11:59 +01:00