lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
68,627 Commits 43 Branches 150 Tags 886 MiB
289dfc7fbe
Commit Graph

68627 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ptibogxiv
289dfc7fbe
update API version 
We need to downgrade this change to V8 because some breaks occur if Stripe API is updated in dashboard to 2018-08-23
 2018-08-28 13:37:17 +02:00
Laurent Destailleur
50d50c2e10
Merge pull request #9307 from ATM-Marc/FIX_6.0_thirdparty_info 
NEW On customer/supplier card, add simple tooltip to amount boxes
 2018-08-28 02:48:05 +02:00
Laurent Destailleur
45e30271b3 Merge 2018-08-28 02:37:06 +02:00
Laurent Destailleur
9c6ce4b29d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-28 02:36:15 +02:00
Laurent Destailleur
9a14611d55
Merge pull request #8996 from grandoc/new_branch_20_06_2018 
clean and update code
 2018-08-28 02:35:59 +02:00
Laurent Destailleur
2db84a679e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/modulebuilder/index.php
 2018-08-28 02:35:45 +02:00
Laurent Destailleur
7219bac0b2
Merge pull request #9168 from frederic34/trimtrailing 
Trimtrailing
 2018-08-28 02:30:02 +02:00
Laurent Destailleur
2306f8a7c2
Merge pull request #9265 from grandoc/new_branch_18_08_2018 
Typo
 2018-08-28 02:25:24 +02:00
Laurent Destailleur
0a7ce338f9 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/commondocgenerator.class.php
 2018-08-28 02:23:34 +02:00
Laurent Destailleur
1842a4bb41
Merge pull request #9278 from grandoc/new_branch_21_08_2018 
Update and standardize code
 2018-08-28 02:13:28 +02:00
Laurent Destailleur
4369be7b39
Merge pull request #9284 from frederic34/patch-20 
Update commondocgenerator.class.php
 2018-08-28 02:11:50 +02:00
Laurent Destailleur
d725c5db1e
Merge pull request #9303 from jtraulle/develop 
NEW REST API improvements
 2018-08-28 02:09:42 +02:00
Laurent Destailleur
998dca9b9f
Update api_thirdparties.class.php 2018-08-28 02:05:37 +02:00
Laurent Destailleur
d90eed3098
Merge pull request #9291 from frederic34/patch-23 
typo
 2018-08-28 01:55:44 +02:00
Laurent Destailleur
f8811f1b6d
Merge pull request #9275 from frederic34/patch-18 
align parameters
 2018-08-28 01:44:55 +02:00
Laurent Destailleur
0d138b8fc0 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-08-28 01:43:35 +02:00
Laurent Destailleur
6f427cbed3
Merge pull request #9293 from frederic34/patch-25 
NEW Add __DAY_TEXT__ and __MONTH_TEXT__ substitutions vars
 2018-08-28 01:42:35 +02:00
Laurent Destailleur
5185d32cc9
Merge pull request #9286 from frederic34/patch-22 
Update propal.lib.php
 2018-08-28 01:40:58 +02:00
Laurent Destailleur
fc897a8b99
Merge pull request #9285 from frederic34/patch-21 
Update actions_ticket.class.php
 2018-08-28 01:40:33 +02:00
Laurent Destailleur
14dc748523
Update actions_ticket.class.php 2018-08-28 01:40:27 +02:00
Laurent Destailleur
b4652ea24b
Merge pull request #9292 from frederic34/patch-24 
Create index.html
 2018-08-28 01:37:48 +02:00
Laurent Destailleur
1f807b9216
Merge pull request #9305 from atm-gauthier/7.0_fix_altertable_charges 
FIX : table llx_chargessociales doesn't exists
 2018-08-28 01:37:31 +02:00
Laurent Destailleur
ad0cc098ee Fix alter forgot 2018-08-28 01:37:25 +02:00
Laurent Destailleur
534eadb7a2 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-08-28 01:35:43 +02:00
ptibogxiv
6556ace2bc Fix sync user->member 
add more fields
 2018-08-28 01:35:05 +02:00
ptibogxiv
ca8a22a3ad fix sync user/member 
add more fields to sync
 2018-08-28 01:35:01 +02:00
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
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