Commit Graph

444 Commits

Author SHA1 Message Date
Frédéric FRANCE
77d4ca81dc
Merge remote-tracking branch 'upstream/develop' into socid 2019-11-02 09:14:15 +01:00
Laurent Destailleur
8c90c80107 Clean code 2019-11-02 01:30:51 +01:00
Laurent Destailleur
cea2c3a9f4 Look and feel v11 2019-11-01 23:58:14 +01:00
Frédéric FRANCE
dbed10a701
Merge remote-tracking branch 'upstream/develop' into socid 2019-11-01 21:39:20 +01:00
Laurent Destailleur
e3b5be7475 All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
2019-11-01 12:52:03 +01:00
Laurent Destailleur
036c1410c7 NEW Save user of last modification in donation record 2019-10-31 23:17:08 +01:00
Laurent Destailleur
c215d534fc Fix phpcs 2019-10-31 21:16:41 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Philippe GRAND
b7e1a849a0 fix payment mode issue 2019-10-30 15:23:24 +01:00
Laurent Destailleur
d5e5cdb1a2
Merge pull request #12230 from grandoc/new_branch_25_10_2019
useless code
2019-10-30 03:07:20 +01:00
Laurent Destailleur
ad608d0cb9
Update payment.php 2019-10-30 03:07:02 +01:00
Laurent Destailleur
66a288a343
Merge pull request #12235 from frederic34/scopeindent
clean indent
2019-10-30 02:57:59 +01:00
Philippe GRAND
bd1969e193 missing error message 2019-10-29 11:26:28 +01:00
Philippe GRAND
d79a2f4733 missing error message 2019-10-29 11:20:24 +01:00
Frédéric FRANCE
5006001753
clean indent 2019-10-27 08:50:32 +01:00
Philippe GRAND
e5c17faf94 useless code 2019-10-25 19:27:42 +02:00
stickler-ci
5ab6228adb Fixing style errors. 2019-10-22 15:12:42 +00:00
Philippe GRAND
ce255b6f36 Merge remote-tracking branch 'origin/new_branch_22_10_2019' into new_branch_22_10_2019 2019-10-22 17:12:06 +02:00
Philippe GRAND
9b2905fb43 Typo and comment 2019-10-22 17:10:52 +02:00
stickler-ci
c176044379 Fixing style errors. 2019-10-22 14:26:26 +00:00
Philippe GRAND
4dd5c00ec0 Internationalization 2019-10-22 16:25:10 +02:00
Laurent Destailleur
5ad7ca5620 Code more generic around setting projet on a card 2019-10-22 13:43:24 +02:00
Laurent Destailleur
5bcc4613a3
Merge pull request #12168 from frederic34/patch-15
Update card.php
2019-10-20 13:30:18 +02:00
Frédéric FRANCE
dce48c2390
Update don.class.php 2019-10-17 23:35:30 +02:00
Frédéric FRANCE
e7646b5526
Update card.php
icon invoicing doesn't exists, other views of donation use generic
2019-10-17 23:15:46 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +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
Laurent Destailleur
24570f7165 Look and feel v11. Picto are fontawesome. 2019-10-02 18:14:41 +02:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Alexandre SPANGARO
aec50d3ac9 NEW Add fa_icon on load_fiche_titre 2019-09-30 10:14:55 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Alexandre SPANGARO
1c13a38ce9 Typo abscissa 2019-09-23 21:45:23 +02:00
Laurent Destailleur
529dd05226 Replace deprecated code 2019-09-06 10:53:05 +02:00
Jean Traullé
c32c7d48ba
Fix Wrongly catched examples by Doxygen 2019-08-30 17:14:59 +02:00
Laurent Destailleur
05c9e97fe4 The deprecated method get_OutstandingBill has been removed. You can use
getOutstandingBills() instead.
2019-08-29 00:45:02 +02:00
Laurent Destailleur
2fee41f712 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-04 12:27:00 +02:00
Laurent Destailleur
10e3e37c6c
Update don.class.php 2019-07-04 10:39:30 +02:00
Alexandre SPANGARO
ab7cb7bb2e FIX Nowrap on amount 2019-07-02 12:01:50 +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
2218994958 FIX Duplicate encoding on error message 2019-05-29 09:51:45 +02:00
Laurent Destailleur
22e897b1a1 Clean and prepare code to fix a SQL injection 2019-05-21 17:22:38 +02:00
Laurent Destailleur
5f23cf7e2a CSS 2019-05-19 13:51:47 +02:00
Laurent Destailleur
11fea03074
Merge pull request #11026 from atm-john/new_look_and_feel_title_button
NEW : look and feel title button
2019-05-18 16:04:47 +02:00
Laurent Destailleur
091132de2f Signatures of methods createFromClone() has been standardized. All
methods requires the object User as first parameter.
2019-04-25 12:11:32 +02:00
Laurent Destailleur
e6ffaeefe5 CSS 2019-04-17 10:39:30 +02:00
ATM john
292d9c38a5 Appli function to links 2019-04-15 00:21:58 +02:00
ATM john
bc4db54722 add more class 2019-04-11 21:29:01 +02:00
ATM john
29b31bd7ab New title button first step 2019-04-11 00:38:44 +02:00
Laurent Destailleur
7b01e76d2b Fix doxygen 2019-04-08 16:04:15 +02:00
Laurent Destailleur
ec9fdc1321 Fix regression with class="right". Style of amount lost. 2019-03-31 11:25:29 +02:00
Laurent Destailleur
1b2826f476 Look and feel v10 2019-03-29 13:26:26 +01:00
Laurent Destailleur
f27f65e8bf Responsive 2019-03-25 10:09:02 +01:00
ptibogxiv
c4a7e63aea
Update list.php 2019-03-18 12:38:58 +01:00
ptibogxiv
aa98f79e51
Update list.php 2019-03-18 00:59:12 +01:00
ptibogxiv
c7f162a056
Update list.php 2019-03-17 17:59:46 +01:00
ptibogxiv
98b893c14c
Update list.php 2019-03-17 17:57:06 +01:00
Laurent Destailleur
e5c08978c3 FIX Param keepn must be 1 when dol_escape_htmltag used for textarea 2019-03-15 15:13:28 +01:00
Frédéric FRANCE
13042ade53
replace html by html5 in expedition 2019-03-10 09:13:13 +01:00
Frédéric FRANCE
43aacbd55a
replace html by html5 in donation 2019-03-10 09:00:59 +01:00
Frédéric FRANCE
f283782445
change visibility 2019-03-04 19:57:46 +01:00
Laurent Destailleur
06a40726bb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-04 16:29:23 +01:00
Laurent Destailleur
27402f432a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/don/class/don.class.php
	htdocs/product/stock/card.php
	htdocs/theme/eldy/style.css.php
2019-03-04 16:29:16 +01:00
ptibogxiv
d18b1dd9dc
Update don.class.php 2019-03-03 22:36:34 +01:00
ptibogxiv
c05552e1cc
Fixe date on fetch don.class.php
v 10
2019-03-03 21:42:28 +01:00
ptibogxiv
ad18077567
Fixe date on fetch don.class.php 2019-03-03 21:38:06 +01:00
Frédéric FRANCE
5a4ac82880
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-02-27 08:23:29 +01:00
Laurent Destailleur
0522f6649c
Merge pull request #10696 from ptibogxiv/patch-132
FIX; donation api checkressource
2019-02-27 01:14:54 +01:00
Laurent Destailleur
60d01771b3
Merge pull request #10697 from ptibogxiv/patch-133
FIX dolibarize  don.class.php
2019-02-27 01:09:00 +01:00
Laurent Destailleur
53a4a57e91
Merge pull request #10699 from ptibogxiv/patch-134
FIX dolibarize fk_soc socid
2019-02-27 01:06:24 +01:00
ptibogxiv
70fc33e8bb
Update don.class.php 2019-02-27 00:14:11 +01:00
Frédéric FRANCE
81f2f99db5
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-02-26 21:16:01 +01:00
Laurent Destailleur
3ec2338c2d Look and feel v10 2019-02-26 19:37:32 +01:00
ptibogxiv
aa6e18f66f
FIX dolibarize fk_soc socid 2019-02-26 18:45:02 +01:00
ptibogxiv
70e451a886
Update don.class.php 2019-02-26 18:44:07 +01:00
ptibogxiv
085aa8a247
FIX dolibarize fk_soc / socid 2019-02-26 18:31:00 +01:00
ptibogxiv
a013b2a814
FIX; donation api checkressource 2019-02-26 18:19:44 +01:00
Frédéric FRANCE
1c07006015
wip 2019-02-25 21:36:27 +01:00
Frédéric FRANCE
6ee186096c
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-02-24 23:48:51 +01:00
Frédéric FRANCE
041310c4ee
wip 2019-02-24 23:47:00 +01:00
Laurent Destailleur
14b9a06e57
Merge pull request #10680 from ptibogxiv/patch-130
FIX donations API
2019-02-24 20:50:32 +01:00
ptibogxiv
c2d05141bf
FIX donations API 2019-02-24 16:36:06 +01:00
Frédéric FRANCE
167a857f4c
replace html code by html5 in contact 2019-02-24 14:47:47 +01:00
Laurent Destailleur
42bb96dc27 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-12 19:44:30 +01:00
Laurent Destailleur
6a8504e1f8 Fix missing constant 2019-02-12 19:44:12 +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
Frédéric FRANCE
970392adb8
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite 2019-02-03 22:41:57 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent 2019-02-03 14:29:45 +01:00
Laurent Destailleur
648eea3a70
Merge branch 'develop' into nospaceaftercomma 2019-01-30 16:00:11 +01:00
Alexandre SPANGARO
cc88c4f8ff Move my email to the new one 2019-01-28 21:39:22 +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
c33860cfab
Merge pull request #10368 from ptibogxiv/patch-91
NEW thirdparty in donation if option ON
2019-01-27 18:07:46 +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
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
ptibogxiv
e5d1466ec5
Update card.php 2019-01-22 18:44:28 +01:00