Laurent Destailleur
|
a6eb14f68b
|
Merge pull request #15585 from cfoellmann/fckeditor-notes
NEW Can toggle FCKeditor on public/private notes
|
2020-12-27 15:06:35 +01:00 |
|
Frédéric FRANCE
|
4e18f46f28
|
doxygen
|
2020-12-05 23:53:55 +01:00 |
|
Christian Foellmann
|
f801dd7d66
|
PR toggle FCKeditor on public/private notes
|
2020-11-30 16:39:14 +01:00 |
|
Laurent Destailleur
|
00ad6df395
|
Fight against $_POST
|
2020-11-30 14:47:07 +01:00 |
|
Laurent Destailleur
|
9fbbd18254
|
Merge pull request #15487 from frederic34/patch-14
remove header() no more needed
|
2020-11-23 21:55:53 +01:00 |
|
Laurent Destailleur
|
bc1d286673
|
Merge pull request #15495 from Givriz/dev
Feature : creation of a "button-cancel" class
|
2020-11-23 21:53:45 +01:00 |
|
Givriz
|
dca4cf5987
|
Feature : ajout de la class "button-cancel"
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
|
2020-11-23 15:12:52 +01:00 |
|
Frédéric FRANCE
|
02e36c7694
|
Update card.php
|
2020-11-22 21:16:02 +01:00 |
|
Frédéric FRANCE
|
432adaa47f
|
Update don.class.php
|
2020-11-22 21:13:11 +01:00 |
|
Frédéric FRANCE
|
2b93f114cd
|
remove warnings
|
2020-11-22 20:59:34 +01:00 |
|
Laurent Destailleur
|
032b53dbb2
|
Merge pull request #15451 from frederic34/patch-14
remove warnings
|
2020-11-21 23:44:55 +01:00 |
|
Laurent Destailleur
|
09cb472121
|
Update card.php
|
2020-11-20 13:34:40 +01:00 |
|
Frédéric FRANCE
|
29dae5d9f0
|
remove warnings
|
2020-11-19 21:09:29 +01:00 |
|
Givriz
|
c48129e279
|
Ajout de la class "button-save"
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
|
2020-11-19 20:23:38 +01:00 |
|
Laurent Destailleur
|
ed8a0093ff
|
Debug v13
|
2020-11-05 22:25:14 +01:00 |
|
Laurent Destailleur
|
b0e2d40533
|
Debug and fix v13
|
2020-11-03 14:19:54 +01:00 |
|
Laurent Destailleur
|
9e967a578e
|
FIX #14985 - I vertion option RELOAD_PAGE_ON_CUSTOMER_CHANGE
|
2020-11-03 02:17:51 +01:00 |
|
Scrutinizer Auto-Fixer
|
ab25e047c0
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-31 17:51:30 +00:00 |
|
Scrutinizer Auto-Fixer
|
7f52920716
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-31 13:32:18 +00:00 |
|
Frédéric FRANCE
|
8190711342
|
doxygen
|
2020-10-30 18:01:01 +01:00 |
|
Scrutinizer Auto-Fixer
|
a2a9c51e50
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-27 18:46:07 +00:00 |
|
Frédéric FRANCE
|
5a3780e062
|
end of dol_fiche_end
|
2020-10-27 18:19:31 +01:00 |
|
Laurent Destailleur
|
5e19483c99
|
Update don.class.php
|
2020-10-26 19:26:55 +01:00 |
|
Frédéric FRANCE
|
3257e65d09
|
Update don.class.php
|
2020-10-25 18:51:05 +01:00 |
|
Laurent Destailleur
|
6fa174d13f
|
Merge pull request #15051 from laudeco/feature/11878_select_bank_account
11878 - select the only bank account
|
2020-10-25 14:56:08 +01:00 |
|
Laurent De Coninck
|
1d62834b2c
|
use the second version for default bank account
|
2020-10-24 17:15:48 +02:00 |
|
Frédéric FRANCE
|
ae3228b9e0
|
retrieve the spelling 🎉
|
2020-10-23 20:08:35 +02:00 |
|
Frédéric FRANCE
|
9a470fa42d
|
replace deprecated
|
2020-10-22 22:50:03 +02:00 |
|
Laurent De Coninck
|
d2e2cad028
|
select by default, remove the show empty everywhere the field is required
|
2020-10-17 21:15:52 +02:00 |
|
Laurent Destailleur
|
520645a02c
|
Renamed all methods valide() into validate()
|
2020-10-15 10:15:37 +02:00 |
|
Florian HENRY
|
042b3f1843
|
fix donation payment with autocomplete
|
2020-10-12 09:42:35 +02:00 |
|
Laurent Destailleur
|
7b3a7c9921
|
Add token on all url with action=delete
|
2020-10-01 10:50:54 +02:00 |
|
Laurent Destailleur
|
f442dac2c9
|
Add token on most GET url for admin action
|
2020-09-30 15:13:28 +02:00 |
|
Laurent Destailleur
|
f57b4fd2fd
|
Fix escaping
|
2020-09-20 02:30:53 +02:00 |
|
Laurent Destailleur
|
216b3c885d
|
Fix escaping
|
2020-09-20 01:30:36 +02:00 |
|
Laurent Destailleur
|
4e2aff2cdc
|
Fix sql injection when forging requests with IN
|
2020-09-18 17:28:02 +02:00 |
|
Laurent Destailleur
|
2d38644ae1
|
Sanitize sortfield
|
2020-09-18 17:13:01 +02:00 |
|
Laurent Destailleur
|
c4b5f5a249
|
Maxi clean of code
|
2020-09-18 01:29:17 +02:00 |
|
Laurent Destailleur
|
13646ff41e
|
Fix #yogosha4516
|
2020-09-17 23:16:48 +02:00 |
|
Laurent Destailleur
|
9a758b7edd
|
FIX #yogosha4483
|
2020-09-17 14:31:25 +02:00 |
|
Laurent Destailleur
|
bfbb217607
|
Fix GETPOST on 'action'
|
2020-09-16 19:39:50 +02:00 |
|
Laurent Destailleur
|
64b28020c8
|
Look and feel v13
|
2020-09-11 13:14:14 +02:00 |
|
Laurent Destailleur
|
b8fe2188a6
|
Standardize code around model_pdf
|
2020-09-10 01:49:09 +02:00 |
|
Scrutinizer Auto-Fixer
|
b78ff67d7e
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-09-07 08:18:17 +00:00 |
|
Laurent Destailleur
|
964c4ef0d2
|
Standardize code. Use model_pdf.
|
2020-08-18 14:48:38 +02:00 |
|
Laurent Destailleur
|
a607ff4c1a
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/functions2.lib.php
htdocs/core/lib/project.lib.php
htdocs/langs/fr_FR/bills.lang
htdocs/langs/fr_FR/products.lang
htdocs/langs/fr_FR/stocks.lang
htdocs/langs/fr_FR/ticket.lang
htdocs/mrp/mo_card.php
|
2020-06-18 15:50:31 +02:00 |
|
Laurent Destailleur
|
eef07afc90
|
Try to solve pb with too many columns. Merge 2 columns of amounts in 1
|
2020-06-18 03:32:13 +02:00 |
|
Frédéric FRANCE
|
b41ac00b98
|
add new rule
|
2020-05-21 15:05:19 +02:00 |
|
Frédéric FRANCE
|
ae06b35c63
|
add new rule
|
2020-05-21 02:06:40 +02:00 |
|
Laurent Destailleur
|
af46108cc4
|
Look and feel v12
|
2020-05-17 13:34:16 +02:00 |
|
Laurent Destailleur
|
91f87d6834
|
Fix bad param of getNomUrl
|
2020-05-15 13:52:35 +02:00 |
|
Laurent Destailleur
|
a88ab40384
|
Clean phpcs
|
2020-05-02 15:18:59 +02:00 |
|
Laurent Destailleur
|
7c6dc930d2
|
Fix var not defined
|
2020-05-02 03:25:34 +02:00 |
|
Laurent Destailleur
|
731864eb4a
|
Removed useless translation keys
|
2020-04-25 12:43:41 +02:00 |
|
Laurent Destailleur
|
3ed11f374a
|
Look and feel v12
|
2020-04-24 23:56:57 +02:00 |
|
Laurent Destailleur
|
72c6ac1c72
|
Complete #13708, normalization of code
|
2020-04-23 13:21:39 +02:00 |
|
Laurent Destailleur
|
67a7d6b77d
|
Look and feel v12
|
2020-04-20 15:57:15 +02:00 |
|
Laurent Destailleur
|
16e46c672c
|
Clean code
|
2020-04-20 15:06:27 +02:00 |
|
Scrutinizer Auto-Fixer
|
444c293c01
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-04-10 08:59:32 +00:00 |
|
Laurent Destailleur
|
a4797634d5
|
FIX Bad position of total in column
|
2020-03-27 19:08:39 +01:00 |
|
Laurent Destailleur
|
f4a52470e3
|
Graph use color of status
|
2020-03-23 19:46:43 +01:00 |
|
Scrutinizer Auto-Fixer
|
e8083e2a65
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-03-23 14:54:02 +00:00 |
|
Laurent Destailleur
|
33c5db9cc3
|
Prepare code for the new pagination possibility
|
2020-03-13 13:07:11 +01:00 |
|
Scrutinizer Auto-Fixer
|
f413ce6aac
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-03-12 11:45:44 +00:00 |
|
Laurent Destailleur
|
0bd2740779
|
NEW Can force position of legend of graph on right (instead of top)
|
2020-03-05 17:23:19 +01:00 |
|
Laurent Destailleur
|
1a9506150e
|
NEW Can filter on donation status in list
|
2020-03-05 03:04:53 +01:00 |
|
Laurent Destailleur
|
fc31680bd0
|
Several fix for chart.js graphs
|
2020-03-05 02:55:06 +01:00 |
|
Laurent Destailleur
|
7234d841e1
|
Fix doxygen
|
2020-02-20 12:59:53 +01:00 |
|
Laurent Destailleur
|
ce3e977fc3
|
Merge pull request #13141 from Dolibarr/scrutinizer-patch-5
Scrutinizer Auto-Fixes
|
2020-02-18 23:49:10 +01:00 |
|
Laurent Destailleur
|
88b104bc2f
|
Merge pull request #13121 from aspangaro/12.0_a14
NEW: Donation - Update FR CERFA to 11580*04
|
2020-02-18 23:48:08 +01:00 |
|
Scrutinizer Auto-Fixer
|
fd48877dc6
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-02-18 22:47:25 +00:00 |
|
Alexandre SPANGARO
|
76a369d351
|
NEW: Donation - Update FR CERFA to 11580*04
|
2020-02-17 07:43:24 +01:00 |
|
Laurent Destailleur
|
f4f3efec62
|
Fight against $_POST
|
2020-02-16 19:33:58 +01:00 |
|
Laurent Destailleur
|
f44b85f557
|
Fix $_SESSION['newtoken'] must be newToken()
|
2019-12-18 23:12:31 +01:00 |
|
Scrutinizer Auto-Fixer
|
455178ff73
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-12-18 14:20:36 +00:00 |
|
Frédéric FRANCE
|
9e4fb8d4fe
|
doxygen
|
2019-12-15 10:02:20 +01:00 |
|
Laurent Destailleur
|
835d22f556
|
Merge branch 'develop' into doxygen_todo
|
2019-12-14 13:46:40 +01:00 |
|
Laurent Destailleur
|
a612aefab7
|
Fix HTML5
|
2019-12-12 11:11:08 +01:00 |
|
Frédéric FRANCE
|
f30d1394dd
|
doxygen
|
2019-12-11 23:30:54 +01:00 |
|
Frédéric FRANCE
|
f379f510fa
|
Update paymentdonation.class.php
|
2019-12-07 15:44:13 +01:00 |
|
Frédéric FRANCE
|
f93e114688
|
do not trim int
|
2019-12-07 15:37:15 +01:00 |
|
Laurent Destailleur
|
2689f7515c
|
Fix pb with colspan and extrafields.
Fix remove empty id
|
2019-11-16 14:38:05 +01:00 |
|
Laurent Destailleur
|
171b94fc5c
|
Merge pull request #12429 from Dolibarr/scrutinizer-patch-5
Scrutinizer Auto-Fixes
|
2019-11-14 08:50:24 +01:00 |
|
Scrutinizer Auto-Fixer
|
b40ecc3933
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:37:08 +00:00 |
|
Scrutinizer Auto-Fixer
|
ac40dd8bbe
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:35:39 +00: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 |
|
Scrutinizer Auto-Fixer
|
812d0af1d9
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-08 14:51:54 +00: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
|
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 |
|
Laurent Destailleur
|
f9031cdbfd
|
Clean code
|
2019-11-02 11:36:48 +01:00 |
|
Laurent Destailleur
|
68c971a2b5
|
All properties 'type_libelle' were renamed into 'type_label'.
|
2019-11-02 11:12:57 +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
|
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 |
|
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 |
|