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
ptibogxiv
4d2231a6a2
Fix double <
2019-01-21 23:53:17 +01:00
Laurent Destailleur
844643c37d
Merge pull request #10375 from grandoc/new_branch_19_01_2019
...
update with html5 compliant code
2019-01-20 19:48:32 +01:00
Laurent Destailleur
300889f53a
# WARNING: head commit changed in the meantime
...
Fix
2019-01-19 13:22:38 +01:00
Laurent Destailleur
2bbaae88d6
Fix standardize 'createfromclone' param when cloning
2019-01-19 12:46:38 +01:00
Philippe GRAND
29fdad144d
update with html5 compliant code
2019-01-19 12:40:17 +01:00
ptibogxiv
a3153889b8
fix
2019-01-19 11:31:40 +01:00
Laurent Destailleur
302a838673
Merge pull request #10365 from ptibogxiv/patch-89
...
NEW Add option DONATION_USE_THIRDPARTIES in admin of membership module
2019-01-19 11:25:25 +01:00
ptibogxiv
d6cfd15102
NEW add API REST for donations
2019-01-18 17:56:56 +01:00
ptibogxiv
e74bccca21
Update don.class.php
2019-01-18 17:51:42 +01:00
ptibogxiv
c2c238ec24
Update don.class.php
2019-01-18 16:32:13 +01:00
ptibogxiv
d961ae3225
Update card.php
2019-01-18 16:31:26 +01:00
ptibogxiv
8fcdb3bb6d
Update card.php
2019-01-18 16:30:28 +01:00
ptibogxiv
89e348515a
Update don.class.php
2019-01-18 14:14:38 +01:00
ptibogxiv
4b447d7799
Update card.php
2019-01-18 14:13:55 +01:00
ptibogxiv
09567ebaaf
Update card.php
2019-01-18 11:28:29 +01:00
ptibogxiv
af03f108a1
Update card.php
2019-01-18 11:28:09 +01:00
ptibogxiv
5232024de9
ADD thirdparty support
2019-01-18 11:26:12 +01:00
ptibogxiv
c7bedbe7dc
Update for thirdparty support
2019-01-18 11:22:33 +01:00
ptibogxiv
f20dd80194
FIX: better thirparty support
2019-01-18 11:20:36 +01:00
ptibogxiv
9ae08d7897
FIX constant DONATION_USE_THIRDPARTIES in admin
2019-01-17 22:22:31 +01:00
Laurent Destailleur
58bda12e22
css
2019-01-17 19:31:01 +01:00
ldestailleur
f5b3ba231f
Fix phpcs
2019-01-02 20:00:08 +01:00
ptibogxiv
4b1ea18e32
Update donation.php
2018-12-30 17:35:50 +01:00
ptibogxiv
e503e7e698
Fix ajax toogle in donation.php
2018-12-30 17:34:44 +01:00
Laurent Destailleur
2011afe6fb
Merge branch 'develop' into actionrefused
2018-12-14 15:48:24 +01:00
Laurent Destailleur
ca1f9c7e60
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/don/class/don.class.php
htdocs/langs/es_ES/admin.lang
htdocs/langs/es_ES/sendings.lang
htdocs/langs/es_ES/stocks.lang
2018-11-28 16:57:39 +01:00
ptibogxiv
21f4d474b4
Fix sql don.class.php
2018-11-28 16:11:10 +01:00
Laurent Destailleur
0373cad2cd
FIX Method setValid not found
2018-11-28 16:11:00 +01:00
ptibogxiv
fe30eee16e
Fix sql don.class.php
2018-11-21 19:50:55 +01:00
Frédéric FRANCE
731d19a29b
add tooltip to butActionRefused
2018-11-13 21:40:17 +01:00
Regis Houssin
569d59d251
FIX change my deprecated email
2018-10-27 14:43:12 +02:00
Laurent Destailleur
852b069785
Fix reponsive in stats pages
2018-10-26 15:46:17 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
2018-10-24 23:04:26 +02:00
Philippe GRAND
c2f73ddf13
Standardize and update code
2018-10-10 09:20:50 +02:00
Philippe GRAND
596dba9ce1
Standardize code
2018-10-06 12:14:47 +02:00
Philippe GRAND
b3925dd2bd
Standardize code
2018-10-05 16:04:10 +02:00
Philippe Grand
031b3b44c5
Merge branch 'develop' into new_branch_13_09_2018
2018-09-27 09:42:58 +02:00
Laurent Destailleur
6ba2127377
Merge pull request #9516 from grandoc/new_branch_15_09_2018
...
New branch 15 09 2018
2018-09-15 23:59:10 +02:00
Philippe GRAND
5c3a24a00c
Standardize and update code
2018-09-15 11:51:21 +02:00
Philippe GRAND
3da762a59d
Standardize and update code
2018-09-13 15:06:06 +02:00
Frédéric FRANCE
c38239b6f9
Update don.class.php
2018-09-12 22:43:14 +02:00
Frédéric FRANCE
987fdbe73c
Merge remote-tracking branch 'upstream/develop' into patch-6
2018-09-12 21:29:41 +02:00
Frédéric FRANCE
3e71f4e6b0
Merge remote-tracking branch 'upstream/develop' into patch-6
2018-09-12 18:36:49 +02:00
Frédéric FRANCE
998b67fa98
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-12 18:32:15 +02:00
Laurent Destailleur
a3881bfbce
NEW hidden constant to be able to use a thirdparty for donation
2018-09-12 18:04:33 +02:00
Laurent Destailleur
2974ea72c4
Fix sql error
2018-09-12 17:45:38 +02:00
Laurent Destailleur
10becd2046
Merge pull request #9483 from ptibogxiv/patch-54
...
New donation module
2018-09-12 17:34:21 +02:00
ptibogxiv
50e40669bf
use thirdparty
2018-09-12 17:24:11 +02:00
Frédéric FRANCE
f02b2f0239
Merge remote-tracking branch 'upstream/develop' into patch-6
2018-09-09 13:35:58 +02:00
Frédéric FRANCE
a558c3bdac
replace select_date
2018-09-09 11:25:59 +02:00
Frédéric FRANCE
a3fa13994b
replace select_date
2018-09-09 09:36:12 +02:00
Frédéric FRANCE
80880d8fb9
replace select_date by selectDate
2018-09-08 13:00:39 +02:00
Frédéric FRANCE
2b62c4ca8f
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-08 10:50:27 +02:00
ptibogxiv
639f24a95b
Add online payment link
2018-09-05 17:36:28 +02:00
Philippe GRAND
11d75573be
Standardize and update code
2018-09-05 12:21:13 +02:00
Frédéric FRANCE
65b74ad30f
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-04 20:48:35 +02:00
Frédéric FRANCE
03a5aba8a2
move phpcs:ignore
2018-09-02 18:49:23 +02:00
Philippe GRAND
7b0d3c32ab
Standardize and Update code
2018-09-01 22:55:10 +02:00
Philippe GRAND
5d273960dc
fix conflict
2018-09-01 22:40:38 +02:00
Philippe GRAND
f77dd2ebc7
Standardize and update code
2018-09-01 15:13:59 +02:00
Frédéric FRANCE
57fb3dc2f4
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-09-01 13:52:51 +02:00
Frédéric FRANCE
6aee680a4f
PSR2 ClassDeclaration
2018-08-29 22:06:05 +02:00
Frédéric FRANCE
b03f4004ea
PSR2 FunctionClosingBrace
2018-08-29 21:25:22 +02:00
Frédéric FRANCE
cbdc669ba9
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-29 18:45:36 +02:00
Frédéric FRANCE
fe4260a014
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-28 09:34:53 +02:00
Frédéric FRANCE
1182f29864
trimtrailing
2018-08-28 08:33:02 +02:00
Laurent Destailleur
7219bac0b2
Merge pull request #9168 from frederic34/trimtrailing
...
Trimtrailing
2018-08-28 02:30:02 +02:00
Philippe GRAND
87067b2bc9
Standardize and update code
2018-08-23 18:35:45 +02:00
Philippe GRAND
06da7f54a2
Update and standardize code
2018-08-22 18:48:53 +02:00
Frédéric FRANCE
850ac34020
mark non camelCaps function
2018-08-13 17:26:32 +02:00
Frédéric FRANCE
6f74ecceaf
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-12 18:21:59 +02:00
Philippe GRAND
948647f3f9
comment translation
2018-08-04 14:17:51 +02:00
Frédéric FRANCE
b90d125fda
trim trailing
2018-07-26 20:19:52 +02:00
Philippe GRAND
1bb91c7860
update and clean code
2018-06-24 16:20:27 +02:00
Laurent Destailleur
27a27e02a1
Fix css
2018-06-22 22:53:53 +02:00
Philippe GRAND
ddbf5e59e1
clean and update code
2018-06-18 10:12:19 +02:00
Laurent Destailleur
4a5fd35e11
Look and feel v8
2018-06-13 22:57:41 +02:00
Mavyre
6ba6258d14
Fixed Classify abandonned not displaying
2018-05-29 17:36:24 +02:00
Frédéric FRANCE
f5605bdd7d
loadlangs
2018-05-26 20:51:17 +02:00
Laurent Destailleur
ef395fc36b
Fix scrutinizer bugs
2018-05-16 15:23:52 +02:00
Laurent Destailleur
0c35bc5284
Standardize code
2018-05-10 14:15:52 +02:00
Laurent Destailleur
3374c50e2d
CSS
2018-05-01 10:42:09 +02:00
Laurent Destailleur
461ae46cc4
FIX When on a high page and searching for a small result, list was not
...
visible.
2018-04-24 11:37:57 +02:00
Laurent Destailleur
69adf73f4f
Clean code from $var = True
2018-04-22 19:27:37 +02:00
Laurent Destailleur
fec9303d18
Remove useless $var
2018-04-22 18:51:03 +02:00
Laurent Destailleur
912d5c53f2
Standardize code
2018-04-21 15:54:05 +02:00
Laurent Destailleur
ccd9aa8059
Fight against dolibarr warnings
2018-04-21 12:16:12 +02:00
Laurent Destailleur
bbfc4a3e17
NEW Look and feel v8 - Show Picto "+" on all links "Add record"
2018-04-18 03:26:15 +02:00
Laurent Destailleur
8fbde88872
Look and feel v8
2018-04-15 17:37:49 +02:00
Laurent Destailleur
be965bdbab
Clean code
2018-04-13 13:28:48 +02:00
Laurent Destailleur
1521b0595b
Clean code
2018-04-13 11:03:03 +02:00
All-3kcis
880fa55dd5
display user-friendly filesize
2018-04-12 15:29:22 +02:00
Laurent Destailleur
7108f68db9
Remove old deprecated hook insertExtraFields. Triggers must be used for
...
action on CRUD events.
2018-04-10 12:03:01 +02:00
Laurent Destailleur
4d94327ead
Look and feel v8
2018-04-07 16:17:40 +02:00
Marc de Lima Lucio
0366e645d5
NEW: generalize button to create object from list, for most of the lists
2018-03-30 16:54:38 +02:00
Regis Houssin
73a63c1abc
Fix: syntax error
2018-03-08 11:57:38 +01:00
Regis Houssin
93a9430e49
Fix: regression, restore primary key
2018-03-08 07:41:54 +01:00
Laurent Destailleur
e073fa15f7
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-02 14:00:27 +01:00
Laurent Destailleur
8d11f1efa1
FIX Payment mode not correctly set in donation and document
2018-03-02 12:32:49 +01:00
Laurent Destailleur
c478ab952f
Fix block to generate donation document missing
2018-03-02 11:57:39 +01:00
Laurent Destailleur
04934cc4aa
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/class/contrat.class.php
htdocs/core/lib/functions.lib.php
htdocs/projet/tasks/time.php
2018-02-27 19:18:43 +01:00
Laurent Destailleur
41638e6dff
Fix back link of look and feel v7
2018-02-26 09:20:05 +01:00
Laurent Destailleur
b4446764f8
Clean code of deprecated usage
2018-02-21 14:48:25 +01:00
Laurent Destailleur
c4130730cb
Clean code around fetch_optionals()
2018-02-20 19:38:18 +01:00
Laurent Destailleur
92f8fc8b85
Fix scrutinizer
2018-01-12 15:26:50 +01:00
Laurent Destailleur
f653adeb71
Fix phpcs
2018-01-08 02:00:06 +01:00
Laurent Destailleur
332ee53c22
Fix module blockedlog for donation
2018-01-05 12:43:53 +01:00
Laurent Destailleur
dbf7603118
Debug blockedlog for loi finance 2016
2018-01-05 04:31:48 +01:00
Laurent Destailleur
1351a43a30
FIX Maxi debug of permission for users external or restricted to sales
...
representatives
2017-12-18 16:13:05 +01:00
Laurent Destailleur
af1028576d
Fix on search all (trim search + search from smartphone).
2017-12-12 11:31:30 +01:00
Laurent Destailleur
95cb5025a2
Fix length of month too large
...
More complete template
2017-12-08 16:15:41 +01:00
Laurent Destailleur
3b98a06ebb
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/mailings/fraise.modules.php
2017-11-28 12:18:01 +01:00
ptibogxiv
2e9952439e
Fix stat don in multicompany
2017-11-27 15:03:34 +01:00
Scrutinizer Auto-Fixer
aab2799981
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-11-27 13:48:36 +00:00
Laurent Destailleur
9c22b5f335
Replace deprecated dol_print_graph with DolGraph
2017-11-23 20:24:05 +01:00
Laurent Destailleur
b93e35cdd2
Fix a lot of request to use the IN getentity instead of =
...
Fix a lot of request to use left join on type of payment table
2017-11-23 15:06:16 +01:00
ptibogxiv
5d6555b9dd
Update list.php
2017-11-19 21:54:14 +01:00
ptibogxiv
3f360601af
Fix entity
...
Fix entity in list.php
2017-11-19 21:52:18 +01:00
Laurent Destailleur
4ad0d5df43
Fix scrutinizer issues
2017-11-19 16:55:28 +01:00
Laurent Destailleur
836f6bf3c9
Fix search filter when using extrafields 'links'
2017-11-12 12:39:23 +01:00
Laurent Destailleur
202712be94
Work on module builder
2017-10-25 22:02:07 +02:00
Laurent Destailleur
9f0f5eb5e8
Fix translation of extrafields type
2017-10-24 18:05:43 +02:00
Laurent Destailleur
7f85d73001
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/contrat/card.php
htdocs/expensereport/card.php
htdocs/fichinter/list.php
htdocs/fourn/commande/card.php
htdocs/fourn/commande/list.php
htdocs/fourn/facture/card.php
htdocs/fourn/paiement/card.php
htdocs/livraison/card.php
htdocs/modulebuilder/template/myobject_list.php
htdocs/societe/rib.php
htdocs/supplier_proposal/list.php
htdocs/user/card.php
2017-10-18 19:51:29 +02:00
Laurent Destailleur
8626d6279a
Fix perm to delete files
2017-10-18 17:21:30 +02:00
Regis Houssin
9823d6622c
Fix: use default $shared value
2017-09-27 17:40:02 +02:00
Regis Houssin
d592664150
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-09-25 06:48:26 +02:00
Regis Houssin
a03ef95eaa
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/install/mysql/tables/llx_c_payment_term.sql
2017-09-18 09:11:04 +02:00
BENKE Charlene
ae2e0a70ae
Update card.php
2017-09-17 20:45:00 +02:00
BENKE Charlene
7ee0b1061b
Link feature on donation
2017-09-17 20:43:42 +02:00
Regis Houssin
db17eb80ec
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/facture/class/paymentterm.class.php
2017-09-15 16:45:49 +02:00
Laurent Destailleur
5f0819d3b4
Merge branch 'develop' into develop
2017-09-15 15:50:28 +02:00
Laurent Destailleur
0873260b8a
USe second parameter in GETPOST
2017-09-15 10:50:50 +02:00
ptibogxiv
5cba2f0daf
Update list.php
2017-09-15 01:58:55 +02:00
Regis Houssin
b5de8da3a6
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/core/modules/modFacture.class.php
2017-09-11 08:07:55 +02:00
Laurent Destailleur
03fe9d4e97
Escape all status
2017-09-08 13:23:12 +02:00
Regis Houssin
66e548427c
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/resultat/clientfourn.php
htdocs/core/lib/functions.lib.php
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-09-07 10:50:35 +02:00
Laurent Destailleur
33e2179b65
FIX SQL injection
2017-09-06 18:17:57 +02:00
Regis Houssin
1befd9c67f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-08-23 21:05:36 +02:00
Laurent Destailleur
f3ef6448d7
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/admin/supplier_payment.php
htdocs/core/lib/ajax.lib.php
htdocs/don/admin/donation.php
htdocs/product/admin/product.php
2017-08-23 16:11:51 +02:00
Regis Houssin
2492b9968a
Fix: missing scandir
2017-08-23 10:21:10 +02:00
Regis Houssin
6dda2f3670
Fix: "scandir" in url is blocked in some providers
2017-08-23 10:07:00 +02:00
Regis Houssin
2f537a1ade
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/charges/index.php
htdocs/compta/paiement/list.php
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-08-22 18:49:40 +02:00
Laurent Destailleur
5b1f5b0f20
Fix translation done twice into field title of array
2017-08-02 13:31:53 +02:00
Regis Houssin
200f232164
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-16 07:51:20 +02:00
Laurent Destailleur
2870798d07
Fix remove warnings
2017-07-13 00:35:10 +02:00
Regis Houssin
544d051fe3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-19 07:06:57 +02:00
Laurent Destailleur
996ec4926b
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/core/lib/files.lib.php
htdocs/don/card.php
2017-06-18 22:16:34 +02:00
Laurent Destailleur
8debefa8ad
Fix php sanitazing
2017-06-18 21:53:06 +02:00
Regis Houssin
cc75916599
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-06-11 11:26:24 +02:00
Laurent Destailleur
e93cefbbf0
FIX #6985
2017-06-11 10:37:58 +02:00
Regis Houssin
3445c9d329
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/core/lib/functions.lib.php
2017-06-11 06:27:49 +02:00
Laurent Destailleur
7c0de18ac1
Fix code comment
2017-06-10 12:56:28 +02:00
Regis Houssin
fa58f0f3e8
Fix: add entity filter
2017-06-09 09:25:15 +02:00
Regis Houssin
2b36135641
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_mc
2017-06-07 20:14:03 +02:00
Laurent Destailleur
1820649175
Maxi debug of v6
2017-06-07 19:28:31 +02:00
Regis Houssin
bfd6116e5b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc
2017-06-06 15:03:36 +02:00
Laurent Destailleur
02b5d9e6f7
FIX #6945
2017-06-06 10:53:53 +02:00
Regis Houssin
2df33d1df3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_mc
2017-06-03 11:45:15 +02:00
Laurent Destailleur
733d1caac6
Correct usage of parameter 'none' in GETPOST
2017-06-01 12:37:16 +02:00
Regis Houssin
5c5663c5ae
New: getEntity function use true $shared value by default
2017-05-30 18:50:54 +02:00
Alexandre SPANGARO
1f079fac9d
Move html.formventilation.class.php to html.formaccounting.class.php
2017-05-25 06:57:28 +02:00
Laurent Destailleur
b3dc73e611
Look and feel v6
2017-05-21 02:43:51 +02:00
Laurent Destailleur
7dbe3b1da9
Merge pull request #6843 from aspangaro/6.0-multijournal
...
Fix : Sql error on salaries index for accountancy multijournal + debug
2017-05-18 17:45:21 +02:00
Laurent Destailleur
68e333879f
Fix var not sanitized
2017-05-16 13:27:32 +02:00
Alexandre SPANGARO
93554b7e30
Typo searchpicto
2017-05-14 21:06:33 +02:00
philippe grand
1e825e9f1e
Update code using new css class
2017-05-13 17:25:35 +02:00
Laurent Destailleur
fa290c34fa
Fix against SQL injection. Add phpunit to detect missing escapement.
2017-05-12 16:55:11 +02:00
Laurent Destailleur
e5c898e0d6
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
build/makepack-dolibarr.pl
htdocs/fichinter/list.php
htdocs/product/list.php
htdocs/projet/tasks/list.php
2017-05-10 00:48:27 +02:00
Laurent Destailleur
6d01bd712d
FIX Better sanitizing of search all parameter.
2017-05-09 19:36:10 +02:00
Laurent Destailleur
846204bdb4
Replace usage of $bc[$var] with class="oddeven"
2017-04-14 13:02:29 +02:00
Laurent Destailleur
39ebaec064
Replace usage of $bc[$var] with class="oddeven"
2017-04-14 11:22:48 +02:00
Laurent Destailleur
26a9999fbf
Support of preview for pdf with several pages
2017-04-12 11:38:55 +02:00
Laurent Destailleur
d975e7f442
Work on 6.0 look and feel
2017-04-01 12:46:47 +02:00
Laurent Destailleur
93687997c9
Work on 6.0 look and feel
2017-03-31 18:40:53 +02:00
Laurent Destailleur
fd3837e1d5
Merge pull request #6492 from aspangaro/6.0-donation
...
NEW Add donations statistics in home statistics
2017-03-10 12:31:46 +01:00
Laurent Destailleur
184d52525a
PHP code to manage pair/impair is replaced by native CSS.
2017-03-07 22:45:22 +01:00
Alexandre SPANGARO
fd0a46c5cf
New : add donations statistics in home statistics
2017-03-07 22:31:34 +01:00
Laurent Destailleur
19e60f03b9
Add MAIN_SEARCH_FORM_ON_HOME_AREAS to disable useless search forms
2017-02-21 14:17:44 +01:00
Laurent Destailleur
e58743ea5b
Fix regression: Textarea to enter data was crushed.
2017-02-07 01:13:04 +01:00
Marcos García de La Fuente
a94a951a89
Little improvements to admin pages where a FREE_TEXT or a watermark constant was set
2017-02-03 19:38:33 +01:00
Laurent Destailleur
65f7de8f64
Fix css and look 5.0
2017-01-22 12:13:32 +01:00
Laurent Destailleur
d14e4dbaba
Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on
2017-01-15 20:49:20 +01:00
aspangaro
ab8341cc8b
Presentation
2016-12-23 06:33:58 +01:00
aspangaro
eb2d85ab78
Donation : Complete work on dol_banner & Fix project selector
2016-12-20 21:39:42 +01:00
Laurent Destailleur
e50bbb05fa
Fix security bugs
2016-12-18 13:04:24 +01:00
Laurent Destailleur
dce3d5d888
Merge pull request #6055 from aspangaro/5.0-p37
...
Fix: Presentation of donation card
2016-11-29 23:21:46 +01:00
Laurent Destailleur
bd8f923cee
Several fixes in filter on lists
2016-11-29 22:52:16 +01:00
aspangaro
85a37eb0ba
Fix: Presentation of donation card
2016-11-28 20:48:43 +01:00
Laurent Destailleur
2c9edd4205
Maxi debug on list. Fix responsive design.
2016-11-27 13:49:46 +01:00
Laurent Destailleur
16ce156631
Fix responsive design
2016-11-25 18:32:52 +01:00
Laurent Destailleur
ab269bd7a6
Better responsive
2016-11-11 01:15:41 +01:00
Laurent Destailleur
341e014a3d
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/don/document.php
2016-11-08 11:36:31 +01:00
Laurent Destailleur
bb5df3beeb
Fix missing tab
2016-11-07 04:02:16 +01:00
Laurent Destailleur
7d182c286c
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/step1.php
htdocs/projet/tasks/time.php
2016-10-26 10:40:03 +02:00
Laurent Destailleur
6338b04ac0
Remove call of a deprecated function
2016-10-24 11:27:39 +02:00
Rembert Oldenboom
65b986d9ec
Revert "Cleanup"
...
This reverts commit 070980f5a6
2016-10-23 17:04:21 +02:00
Rembert Oldenboom
070980f5a6
Cleanup
2016-10-23 16:59:57 +02:00
Rembert Oldenboom
9c6933a796
Fix pager
2016-10-23 16:53:45 +02:00
Laurent Destailleur
9175ff80a0
Fix download of files uploaded on donation
2016-10-16 17:25:33 +02:00
Laurent Destailleur
d27dea8320
NEW Can rename uploaded or generated files on all "documents" tabs.
2016-10-14 18:09:24 +02:00
Laurent Destailleur
6232e59fd2
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
2016-09-26 14:17:36 +02:00
Laurent Destailleur
3eaec4d4b8
Uniformise fields in tables
2016-09-23 10:55:44 +02:00
Laurent Destailleur
c6ef3778b7
FIX Creation of donation should go back on card after creation
2016-09-23 09:55:49 +02:00
Laurent Destailleur
8cfac3b5c3
FIX Several problems when using smartphone
2016-08-31 12:38:54 +02:00
aspangaro
9f40f346cb
Fix: Presentation of Donations Area and add search
2016-08-26 13:23:00 +02:00
Laurent Destailleur
bb99209b5e
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0
2016-08-01 15:06:22 +02:00
Laurent Destailleur
97dd1f4bbb
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
htdocs/filefunc.inc.php
2016-08-01 15:03:59 +02:00
Laurent Destailleur
803fe68061
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
htdocs/filefunc.inc.php
2016-08-01 15:01:14 +02:00
aspangaro
0b7a5a4af9
Uniformize presentation donation
2016-08-01 07:34:55 +02:00
Laurent Destailleur
45e38efdfa
FIX #5473
2016-07-29 17:20:14 +02:00
Laurent Destailleur
774e327831
Merge remote-tracking branch 'origin/3.9' into 4.0
...
Conflicts:
htdocs/comm/remx.php
htdocs/compta/facture.php
htdocs/langs/en_US/companies.lang
2016-07-21 10:30:51 +02:00
Laurent Destailleur
972d998f7e
Merge remote-tracking branch 'origin/3.8' into 3.9
2016-07-21 10:25:03 +02:00
Juanjo Menent
1232e25859
FIX #5474 Country_id of "Don" object is still empty
2016-07-16 20:00:55 +02:00
Laurent Destailleur
b12bd9b070
Merge remote-tracking branch 'origin/3.9' into develop
2016-07-01 03:51:59 +02:00
Laurent Destailleur
f8b1d0d7ca
Merge remote-tracking branch 'origin/3.8' into 3.9
2016-07-01 03:51:23 +02:00
Alexis Algoud
eb9d26a9e0
FIX #5383 bad object id on don delete
2016-06-27 11:36:13 +02:00
Laurent Destailleur
8187dc2006
Fix css
2016-06-19 16:07:34 +02:00
philippe grand
388cd202aa
international comment for code
2016-06-17 14:19:54 +02:00
Marcos García de La Fuente
e2c86d3fd8
NEW Removed deprecated CommonObject::client property. Please use CommonObject::thirdparty instead
2016-04-17 15:24:22 +02:00
Laurent Destailleur
5101c96223
Restore button to create object from the project view.
2016-04-04 15:25:08 +02:00
Laurent Destailleur
e1bec46a34
FIX The include file for action on files should not be a template file
...
but an action include file.
2016-04-02 14:16:16 +02:00
aspangaro
642d7473a8
FIX: Donation || Don't show project icon if fk_project is empty
2016-03-25 15:54:09 +01:00
Laurent Destailleur
91caea5707
Code was corrupted with very bad commits. I restore files manually.
2016-03-25 15:53:44 +01:00
Laurent Destailleur
630f5a632d
Revert "Corrected non-static usages of Form::selectarray function"
...
This reverts commit 87cd6e1e40
2016-03-25 15:34:37 +01:00
Laurent Destailleur
26de415b77
Revert commit that break compatibility of 100% of modules
2016-03-25 15:24:57 +01:00
Marcos García de La Fuente
89bd173c2f
NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate
2016-03-21 21:51:29 +01:00
Juanjo Menent
187a04854f
Merge pull request #4862 from marcosgdf/form-selectarray2
...
Corrected non-static usages of several Form functions
2016-03-21 20:21:29 +01:00
Juanjo Menent
5fabb7b1e1
Merge pull request #4865 from aspangaro/3.9-p20
...
FIX: Donation || Don't show project icon if fk_project is empty
2016-03-21 20:12:32 +01:00
aspangaro
8f1cbe9ed8
FIX: Donation || Don't show project icon if fk_project is empty
2016-03-21 12:59:30 +01:00
Marcos García de La Fuente
5a046125db
Missing changes from previous commits
2016-03-20 14:24:49 +01:00
Marcos García de La Fuente
4d78932fe8
NEW Converted Form::textwithtooltip and Form::textwithpicto to static functions
2016-03-20 14:15:21 +01:00
Marcos García de La Fuente
87cd6e1e40
Corrected non-static usages of Form::selectarray function
2016-03-20 14:15:17 +01:00
Laurent Destailleur
3a58613e45
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/listbyyear.php
htdocs/accountancy/journal/bankjournal.php
htdocs/compta/facture/list.php
htdocs/filefunc.inc.php
htdocs/fourn/facture/list.php
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
htdocs/projet/activity/index.php
2016-03-02 23:40:11 +01:00
Laurent Destailleur
a26f880843
Fix missing declarion of form
...
Fix by adding MAIN_USE_OLD_SEARCH_FORM to restore a way for backward
compatibility
Fix to have delay for payment term at least 1 day (to avoid immediate
warning after creation of an invoice)
2016-03-01 00:59:42 +01:00
Laurent Destailleur
a4628e4bd1
Clean deprecated files
2016-02-16 00:41:30 +01:00
Laurent Destailleur
9da0164d90
Uniformize code for lists
2016-02-07 15:50:48 +01:00
Laurent Destailleur
8653e7fa5c
Merge remote-tracking branch 'origin/3.9' into develop
2016-01-10 00:12:51 +01:00
Laurent Destailleur
a0d11e157b
Fix select2 component go over parent container so we introduce option to
...
deal this.
2016-01-08 23:17:45 +01:00
aspangaro
e0da56bcd0
Accountancy Add a list to select accounting account on donation admin
2015-12-26 05:56:14 +01:00
Laurent Destailleur
db7a98f0ef
Fix: When a payment mode was disabled, it was not visible on old
...
records.
Fix: init of $limit not correctly set according to 3.9 rules on most
pages.
2015-12-21 13:56:59 +01:00
Laurent Destailleur
a2ae9b9cfc
Fix forget password page must have a different title then login page
...
Fix Missing translations
2015-12-21 00:47:44 +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
philippe grand
2cd49043a6
[Qual] Close database handler should be after Footer
2015-12-11 19:37:12 +01:00
Laurent Destailleur
374480043e
Add maxwidth300 on combo list for users and sale representatives
2015-12-06 00:37:58 +01:00
