Commit Graph

171 Commits

Author SHA1 Message Date
Laurent Destailleur
2836368017 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/filefunc.inc.php
	htdocs/takepos/css/phone.css
	htdocs/takepos/invoice.php
2020-05-28 20:20:39 +02:00
Laurent Destailleur
6cbb87f224 FIX #13995 #13994 manually. 2020-05-28 20:12:06 +02:00
Frédéric FRANCE
b41ac00b98
add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
e5fc928fda
add new rule 2020-05-21 02:02:54 +02:00
Scrutinizer Auto-Fixer
548f3007cf Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-23 16:55:10 +00:00
stickler-ci
63fa83e0c6 Fixing style errors. 2020-04-15 17:25:49 +00:00
ptibogxiv
47069a0575
Update api_thirdparties.class.php 2020-04-15 19:24:16 +02:00
ptibogxiv
d56785e9dc
Update api_thirdparties.class.php 2020-04-15 19:23:04 +02:00
stickler-ci
ec84303e8c Fixing style errors. 2020-04-15 17:05:37 +00:00
ptibogxiv
d05a00bd0a
Update api_thirdparties.class.php 2020-04-15 19:03:40 +02:00
ptibogxiv
d1957e1a05
Update api_thirdparties.class.php 2020-04-15 18:31:20 +02:00
stickler-ci
78c5011a71 Fixing style errors. 2020-04-15 16:20:42 +00:00
ptibogxiv
864205771b
NEW API filter thirdparty by category 2020-04-15 18:18:20 +02:00
Frédéric FRANCE
5933d2282c
Update api_thirdparties.class.php 2020-04-13 09:39:31 +02:00
Frédéric FRANCE
1114f0ee3d
Update api_thirdparties.class.php 2020-04-13 09:25:06 +02:00
Frédéric FRANCE
8c8afa4b46
Update api_thirdparties.class.php 2020-04-13 09:15:01 +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
2c477c7169 Fix doxygen 2020-02-20 13:54:41 +01:00
Laurent Destailleur
44eda2d4ad Fix doxygen 2020-02-20 13:42:43 +01:00
Laurent Destailleur
b6ed6df75d Remove property tha has no sense in output #12803 2020-01-13 14:14:51 +01:00
Scrutinizer Auto-Fixer
1648fc142e Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-16 22:24:29 +00:00
Frédéric FRANCE
fc55123af0
Update api_thirdparties.class.php 2019-11-14 18:31:09 +01:00
Scrutinizer Auto-Fixer
ddcc14dc16 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-14 11:09:15 +00:00
Laurent Destailleur
c03fabb789 Clean var 2019-11-02 14:26:27 +01:00
Laurent Destailleur
1cc9954f61 Clean api from bad vars 2019-11-02 14:20:43 +01:00
Laurent Destailleur
0e667776e9
Merge pull request #12225 from ptibogxiv/patch-270
NEW Get thirdparty's salesrepresentatives by API
2019-10-30 03:12:20 +01:00
Frédéric FRANCE
8f6d38ee82
clean indent 2019-10-27 17:01:23 +01:00
stickler-ci
20b518d527 Fixing style errors. 2019-10-25 15:15:58 +00:00
ptibogxiv
b449d5f7e6
NEW Get thirdparty's salesrepresentatives by API 2019-10-25 17:14:00 +02:00
Frédéric FRANCE
86f22c4563
do not ignore lines with mix od tabs and spaces 2019-10-20 17:17:22 +02:00
Cédric
29bad6c7e8
Replace $sortfield by $email in annotation 2019-10-19 16:55:12 +02:00
c3do
ae3ce37a57 copyright mentions 2019-10-19 16:45:30 +02:00
c3do
bb70db82c2 Can get thirdparty by email through API Rest 2019-10-19 16:43:10 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
ptibogxiv
0d69ae9e8c
NEW mode for list thirdparty API (add supplier)
add new mode for more universel use of the api and easy switch between customer's and supplier's modes
2019-10-15 09:52:14 +02:00
Frédéric FRANCE
352df8241e
Update api_thirdparties.class.php 2019-10-13 06:19:40 +02:00
Frédéric FRANCE
809d98129f
Update api_thirdparties.class.php 2019-10-13 06:14:45 +02:00
Laurent Destailleur
b79831ec39
Merge pull request #11952 from aspangaro/11.0_https
Move Gnu.org to https
2019-10-01 14:48:21 +02:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Frédéric FRANCE
b8dea76760
zapier api 2019-09-30 22:09:11 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Frédéric FRANCE
bd4c9a64a8
wip 2019-09-07 14:48:25 +02:00
Laurent Destailleur
529dd05226 Replace deprecated code 2019-09-06 10:53:05 +02:00
Laurent Destailleur
2a05164bb1 FIX Better PHP compatibility 2019-07-14 00:31:28 +02:00
Laurent Destailleur
fff9b7db9d Fix doxygen 2019-04-04 18:33:12 +02:00
Frédéric FRANCE
f283782445
change visibility 2019-03-04 19:57:46 +01:00
Frédéric FRANCE
62501b11e8
add visibility 2019-03-02 00:14:22 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature 2019-02-10 10:45:49 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +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
Maxime Kohlhaas
2e496ea83a QUAL rename facnumber by ref 2018-12-02 17:33:44 +01:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Laurent Destailleur
2ce1aaaebf
Update api_thirdparties.class.php 2018-10-16 21:43:40 +02:00
ptibogxiv
5e20390e15
FIX call of bankaccount class 2018-10-16 21:33:42 +02:00
Laurent Destailleur
b2576305c1 Clean code 2018-09-28 10:46:59 +02:00
Laurent Destailleur
6ea7a6bce7 Try some fix to generate mandate 2018-09-20 17:09:31 +02:00
Frédéric FRANCE
237f888356
Update api_thirdparties.class.php 2018-09-19 18:47:59 +02:00
Frédéric FRANCE
9ee88e9d35
remove superfluous spaces 2018-09-19 18:33:11 +02:00
Laurent Destailleur
cde023148a
Merge pull request #9121 from yolocodefrench/develop
Generation of the mandate file from the api
2018-09-19 14:47:25 +02:00
Laurent Destailleur
f240cd130d
Update api_thirdparties.class.php 2018-09-19 14:47:11 +02:00
Laurent Destailleur
019ba74225
Update api_thirdparties.class.php 2018-09-19 14:44:16 +02:00
Frédéric FRANCE
b03f4004ea
PSR2 FunctionClosingBrace 2018-08-29 21:25:22 +02:00
Laurent Destailleur
b1fc45fe3d
Merge branch 'develop' into develop 2018-08-28 02:43:04 +02:00
Laurent Destailleur
998dca9b9f
Update api_thirdparties.class.php 2018-08-28 02:05:37 +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
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
Frédéric FRANCE
54a078149a
function declaration 2018-08-15 17:34:35 +02:00
STAGIAIRE-PC\Pierre
61995a3e02 Ajout d'une colonne indispensable dans la requete json 2018-07-30 17:34:43 +02:00
STAGIAIRE-PC\Pierre
ff8d31925b ajout du parametre companyBankid 2018-07-30 09:37:41 +02:00
STAGIAIRE-PC\Pierre
df6ad44261 correction de l'année 2018-07-19 15:15:54 +02:00
STAGIAIRE-PC\Pierre
d8b212897b ajout de credits 2018-07-19 15:13:55 +02:00
STAGIAIRE-PC\Pierre
294f14ab63 Generation of the mandate file from the api 2018-07-19 15:09:32 +02:00
Laurent Destailleur
0f62408700 Remove duplicated code 2018-06-30 01:34:51 +02:00
Laurent Destailleur
1ff8788ff7
Merge pull request #9016 from yolocodefrench/develop
ajout de la gestion des comptes bancaires des tiers via l'api
2018-06-30 01:26:08 +02:00
STAGIAIRE-PC\Pierre
8a780b3910 Code refactorisation 2018-06-27 11:01:20 +02:00
STAGIAIRE-PC\Pierre
62f2108101 ajout de la gestion des comptes bancaires des tiers via l'api 2018-06-27 10:33:57 +02:00
Laurent Destailleur
5829014218
Merge branch 'develop' into NEW_advance_targer_filter_everywhere 2018-06-24 10:24:26 +02:00
Laurent Destailleur
2d89d9634b Fix search on extrafields 2018-06-20 23:16:06 +02:00
Laurent Destailleur
0d0da234b1 Lowercase NULL, TRUE, FALSE according to PSR2 2018-04-16 13:51:16 +02:00
Marc de Lima Lucio
9cf45266f5 NEW: supplier relative discounts 2018-02-27 16:30:39 +01:00
Marc de Lima Lucio
95be155010 FIX: supplier credit notes: harmonize discount filters 2018-02-20 12:26:29 +01:00
Laurent Destailleur
55779e3b55 Fix confusion between supplier and customer categories 2018-02-12 04:07:45 +01:00
Laurent Destailleur
d10d9f0fb2 Fix scrutinizer 2018-02-08 17:22:07 +01:00
Laurent Destailleur
f6f57aa938 Missing Api for standing proposal/orders/invoices 2018-02-01 02:29:41 +01:00
Laurent Destailleur
14ecdce650 Fix merge of thirdparties (pb when merging codes and error management) 2018-01-31 18:01:56 +01:00
Neil Orley
8d710020e9 FIX use DB PREFIX instead of llx_ 2018-01-11 12:58:41 +01:00
Laurent Destailleur
a4ab37e990 Remove deprecated field 2018-01-11 01:16:14 +01:00
Laurent Destailleur
aad0da2513 Fix maxi debug of APIs (clean output fields) 2017-12-21 16:50:18 +01:00
Laurent Destailleur
ee1996ad37 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2017-10-27 01:16:51 +02:00
Laurent Destailleur
a741a6bb3e Update api_thirdparties.class.php 2017-10-27 00:41:56 +02:00
Neil Orley
3e53a2ecff FIX merging conflict 2017-10-25 14:52:33 +02:00
Neil Orley
0f98572c2b FIX Filter didn't work for credit note
Modify the SQL request to be able to filter on credit note
2017-10-25 14:04:36 +02:00
Neil Orley
cb71e921fd NEW Get credit notes or deposits of a thirdparty
Ability to filter : available or applied
Returns a list of credit notes or deposits
2017-10-25 11:39:23 +02:00
Neil Orley
327f31611c FIX Data related to customer moved to thirparties api
Related to commit : b6825703b4
2017-10-24 14:21:22 +02:00
Laurent Destailleur
98674f6d82 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/fourn/facture/card.php
	htdocs/societe/class/api_contacts.class.php
	htdocs/societe/class/api_thirdparties.class.php
2017-10-22 15:01:35 +02:00
Laurent Destailleur
79279caa2e FIX #7619 2017-10-22 14:56:00 +02:00