Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
68,865 Commits 36 Branches 189 Tags
c3438b79c8e2ab4dc49b9cc96873c9ff5b51f92c
Commit Graph

68865 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frédéric FRANCE
faa29f9ae0 Update antivir.class.php 2018-08-28 01:34:42 +02:00
Norbert Penel
f9c1dd8edd There is a begin transaction without rollback 
In this Select, there is no need of this Begin Transaction on my understanding.
Don't know why this line code is here for.
 2018-08-28 01:32:55 +02:00
Laurent Destailleur
aadc278fb4 Merge pull request #9294 from homer8173/patch-3 
FIX There is a begin transaction without rollback
 2018-08-28 01:32:21 +02:00
Laurent Destailleur
0d91aff32c Merge pull request #9304 from atm-ph/fix_attributes_missing_for_api 
Fix datec and tms missing in fetch method for API
 2018-08-28 01:30:56 +02:00
Laurent Destailleur
751fc512af Merge pull request #9301 from frederic34/patch-26 
FIX sql error
 2018-08-28 01:30:25 +02:00
Laurent Destailleur
e00d6eda7e Update productlot_list.php 2018-08-28 01:29:33 +02:00
Laurent Destailleur
004b352e8e Merge pull request #9279 from frederic34/patch-11 
FIX Error message when sending a file with .virus extension
 2018-08-28 01:26:04 +02:00
Laurent Destailleur
61254dd5c6 Merge pull request #9288 from ptibogxiv/patch-39 
FIX sync user->member
 2018-08-28 01:21:51 +02:00
Laurent Destailleur
3032ba4acf Merge pull request #9287 from ptibogxiv/patch-38 
FIX sync member->user
 2018-08-28 01:21:23 +02:00
Steve
6ecc6b8b48 Merge pull request #1 from Dolibarr/develop 
update fork
 2018-08-28 00:10:26 +02:00
Laurent Destailleur
0300991389 Fix trans 2018-08-27 23:42:47 +02:00
Laurent Destailleur
90c3f8afce Fix trans 2018-08-27 23:39:11 +02:00
Laurent Destailleur
d2154e72c0 Fix trans 2018-08-27 23:23:49 +02:00
Marc de Lima Lucio
d09f9b2543 FIX: customer/supplier card: add simple tooltip to amount boxes 2018-08-27 18:19:42 +02:00
gauthier
79aa390fe8 FIX : table llx_chargessociales doesn't exists 2018-08-27 15:07:19 +02:00
Laurent Destailleur
8cacda1c1e Fix error message 2018-08-27 14:45:20 +02:00
atm-ph
d9beb3f882 Fix tms missing in fetch propal 2018-08-27 10:19:07 +02:00
Jean Traullé
e0c2dd0c3c Fix of an oversight when swapping parameters 2018-08-26 21:57:07 +02:00
Jean Traullé
d348ac83bb Fix Travis CI Code reported coding style issues 2018-08-26 20:16:21 +02:00
Jean Traullé
e035a688f0 Keep params order in sync between @parm, @url annotations and function signature. 2018-08-26 19:41:32 +02:00
Jean Traullé
cc7ca8c7fa Opening brakets should be on new lines 2018-08-26 18:15:14 +02:00
atm-ph
eb4e42bc40 Fix datec and tms missing in fetch method for API 2018-08-26 18:08:10 +02:00
Jean Traullé
d8e15e529c New REST API improvements to thirdparties bank accounts and gateways 
- API endpoints has been added and documented to allow user to add, update and delete payment gateways like the one used by Stripe module (stored in table llx_societe_account)
- API endpoints for CompanyBankAccounts has been slightly modified to be harmonized with other API endpoints (this should not be a problem since these methods are not yet in Dolibarr latest stable version (aka 8.0))
- Some documentation has been improved (to be shown in REST explorer)
- societeaccount.class.php has been slightly modified to include missing $login member ; notnull value of member fk_website is now -1 to put it to NULL when updating the record.
 2018-08-26 17:29:04 +02:00
Jean Traullé
c0f98ab4c8 New REST API Explorer branding and improvements 
- Header of REST API Explorer has been Dolibarr colored
- API Methods are now sorted alphabetically
- API endpoints with same names are now sorted in this order (GET, POST, PUT, PATCH, DELETE)
 2018-08-26 17:13:19 +02:00
Frédéric FRANCE
27978ed9a0 Update productlot_list.php 
https://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/62492-dolibarr-8-erreur-sql-avec-le-menu-lots-series
 2018-08-26 07:47:33 +02:00
Frédéric FRANCE
d8bf4a0ecf Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-25 09:07:04 +02:00
Jean Traullé
13255df4b7 Merge pull request #1 from Dolibarr/develop 
Merge from upstream
 2018-08-24 23:53:27 +02:00
ksar-ksar
a844855ade Update hook formConfirm 
The hook should be called when the $formconfirm is not empty
 2018-08-24 16:40:26 +02:00
Laurent Destailleur
a896fb419f Fix preselected language 2018-08-24 15:28:53 +02:00
Laurent Destailleur
e67e32c023 Add forcecombo on select language 2018-08-24 15:25:18 +02:00
Laurent Destailleur
b22d9db1a5 Fix tdclass 2018-08-24 15:18:19 +02:00
Laurent Destailleur
4885e61240 Fix tdclass 2018-08-24 15:16:03 +02:00
Laurent Destailleur
9f92974e98 Fix tdclass 2018-08-24 15:13:34 +02:00
Laurent Destailleur
32bde2c375 Add tdclass to form confirm for more control 2018-08-24 15:12:47 +02:00
Laurent Destailleur
d2a7c9976b Fix syntax error 2018-08-24 15:05:57 +02:00
Laurent Destailleur
07407f46a7 Remove colspan 2018-08-24 15:02:19 +02:00
Laurent Destailleur
79aa0bbd1c Fix duplicate load 2018-08-24 12:28:44 +02:00
Laurent Destailleur
a153b2f121 Fix bad link 2018-08-24 11:54:04 +02:00
Laurent Destailleur
085f8cf604 Fix bad link 2018-08-24 11:51:06 +02:00
Laurent Destailleur
89d55f3b46 Fix lib in modulebuilder 2018-08-24 11:45:22 +02:00
Laurent Destailleur
32594e8048 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-24 10:47:10 +02:00
Laurent Destailleur
a82d86cec4 FIX warning for late template invoices to remove when suspended 2018-08-24 10:46:47 +02:00
Frédéric FRANCE
85ae8f3901 Update card.php 2018-08-24 09:29:17 +02:00
Laurent Destailleur
64427dafb6 Fix back to page when canceling an edit in the module template 2018-08-23 20:21:27 +02:00
Laurent Destailleur
781a55429a FIX API template to delete a record 2018-08-23 20:03:41 +02:00
Laurent Destailleur
7a35b560a6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-23 19:51:52 +02:00
Laurent Destailleur
499d93b8c4 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/html.formmail.class.php
	htdocs/projet/class/task.class.php
	htdocs/projet/tasks/task.php
 2018-08-23 19:50:58 +02:00
Laurent Destailleur
62b2981e42 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-08-23 19:47:31 +02:00
Laurent Destailleur
019ff534a0 FIX api template for list in module builder 2018-08-23 19:46:08 +02:00
Laurent Destailleur
8757392e6b FIX remove internal property isextrafieldmanaged from API returns 2018-08-23 19:24:00 +02:00