Laurent Destailleur
5b8006a6bb
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/public/payment/paymentok.php
htdocs/public/paypal/paymentok.php
2018-03-08 16:37:17 +01:00
Regis Houssin
0f574579eb
Fix: avoid error if type is not numeric
2018-03-07 12:27:13 +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
82ae65b18d
NEW Can get template of email from its label
2018-02-23 11:23:36 +01:00
Laurent Destailleur
d8f8e76bee
Provide context to trigger
2018-02-23 10:39:39 +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
60a848de5a
Fix bad list of id for supplier categories
2018-02-12 04:09:15 +01:00
Laurent Destailleur
f637269a27
Fix bad list of id for supplier categories
2018-02-12 04:05:13 +01:00
Laurent Destailleur
5512e279ca
Merge pull request #8165 from atm-quentin/6.0
...
NEW doActions on categorycard
2018-02-12 02:55:31 +01:00
atm-quentin
6fb08dcc53
NEW doActions on categorycard
2018-02-09 11:50:33 +01:00
Laurent Destailleur
7f9d6a5458
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/public/paybox/newpayment.php
htdocs/public/payment/newpayment.php
htdocs/public/paypal/newpayment.php
htdocs/public/stripe/newpayment.php
2018-01-31 20:25:24 +01:00
Laurent Destailleur
d6317a26d2
Fix for multicompany
2018-01-30 15:48:09 +01:00
Laurent Destailleur
34140ca3f0
Merge pull request #7983 from AlainRnet/patch-6
...
NEW Show total number of records by category
2018-01-26 18:04:18 +01:00
Laurent Destailleur
aad0da2513
Fix maxi debug of APIs (clean output fields)
2017-12-21 16:50:18 +01:00
AlainRnet
e308124ed6
Show total number of records by category
...
There is so much information missing in these categories and it is also not possible to sort or display other information than currently displayed.
Here is a small hack to display the total number of record(s) in the list header of each category.
2017-12-20 17:41:26 +01:00
Laurent Destailleur
ce32da6217
Fix debugs APIs
2017-12-01 15:39:18 +01:00
Laurent Destailleur
77509ee37a
Removed deprecated apis
2017-11-25 13:14:28 +01:00
Laurent Destailleur
0b9a3087ea
Fix bug reported by scrutinizer
2017-11-25 12:11:02 +01:00
Laurent Destailleur
a72703d316
Fix deprecated code
2017-11-03 17:29:25 +01:00
Laurent Destailleur
9f0f5eb5e8
Fix translation of extrafields type
2017-10-24 18:05:43 +02:00
Laurent Destailleur
c6e5115d34
Set default limit to 100 on all rest api that list
2017-10-22 15:42:19 +02:00
Laurent Destailleur
87814af7b6
Move function colorIsLight into functions.lib.php
...
Fix scrutinizer bugs.
2017-10-16 09:29:10 +02:00
Laurent Destailleur
6540bc0061
Fix doxygen
2017-10-04 19:48:11 +02:00
Regis Houssin
4537e5472b
Fix: refactorization of "getListForItem" function
2017-10-03 19:01:54 +02:00
Regis Houssin
f8f4ff6d21
Fix: missing include api_categories class
2017-10-03 13:07:07 +02:00
Regis Houssin
db8d27f0fe
Fix: wrong type value
2017-10-03 12:08:25 +02:00
Laurent Destailleur
5e34b121dd
Add more robust php unit to detect not escaped sql. Fix not escaped sql
2017-09-15 15:41:07 +02:00
Laurent Destailleur
0873260b8a
USe second parameter in GETPOST
2017-09-15 10:50:50 +02:00
Laurent Destailleur
affaec2a6f
Fix count into loop
2017-09-14 21:35:14 +02:00
Laurent Destailleur
2cdea7e37c
Fix bug reported by scrutinizer
2017-09-12 19:21:26 +02:00
Laurent Destailleur
a4665e17d4
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/customer/index.php
htdocs/accountancy/expensereport/index.php
htdocs/compta/facture/class/facture-rec.class.php
htdocs/fichinter/class/fichinter.class.php
htdocs/societe/class/societe.class.php
htdocs/societe/list.php
2017-09-12 13:26:25 +02:00
florian HENRY
1a389b6faf
fix upload photo for categ
2017-09-08 10:36:45 +02:00
florian HENRY
34f08ce082
fix travis
2017-09-08 10:36:11 +02:00
florian HENRY
20ed279489
better fix
2017-09-08 10:34:38 +02:00
florian HENRY
da2f971345
fix upload images on category
2017-09-08 10:33:00 +02:00
Laurent Destailleur
502ac19a0a
Fix regression on categories
2017-08-27 12:28:59 +02:00
Laurent Destailleur
dac0b6c2a7
Fix regression
2017-07-26 13:46:27 +02:00
Laurent Destailleur
6fcb54b2d6
FIX #7072
2017-07-25 19:57:51 +02:00
Laurent Destailleur
43f6eab2ea
FIX #7146
2017-07-13 15:16:17 +02:00
fappels
f85fcbd216
Fix categorie navigation
2017-07-10 12:47:21 +02:00
Laurent Destailleur
00e1fab1af
Fix bad var
2017-07-08 19:01:09 +02:00
Laurent Destailleur
252d8da8fc
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/categories/class/categorie.class.php
htdocs/core/class/commondocgenerator.class.php
htdocs/core/lib/functions.lib.php
htdocs/core/modules/DolibarrModules.class.php
htdocs/filefunc.inc.php
htdocs/societe/class/societe.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2017-07-07 15:11:53 +02:00
Laurent Destailleur
e7e4252244
Fix deletion of category
2017-07-05 01:23:42 +02:00
Laurent Destailleur
e199864fce
Better log
2017-07-05 00:09:35 +02:00
Laurent Destailleur
95cf36c43b
Fix use the getUrl function instead of hard coded curl
2017-07-04 10:55:53 +02:00
Laurent Destailleur
c7a6a67e20
Fix remove warnings
2017-06-22 11:04:29 +02:00
Laurent Destailleur
4102403482
Look and feel v6
2017-06-21 11:37:34 +02:00
Laurent Destailleur
e93cefbbf0
FIX #6985
2017-06-11 10:37:58 +02:00
