Commit Graph

1777 Commits

Author SHA1 Message Date
Laurent Destailleur
9cfb0ac969 Clean API 2020-12-04 23:55:47 +01:00
stickler-ci
d6ac26dd85 Fixing style errors. 2020-12-04 03:23:48 +00:00
Alexandre SPANGARO
13f985d280 NEW: Accountancy - Introduce "Level3" - Define account directly in thirdparty 2020-12-04 04:13:42 +01:00
Laurent Destailleur
5bdd52500d Fix warning 2020-12-02 15:47:56 +01:00
Laurent Destailleur
3632a7a02a Fix warning 2020-12-01 15:50:59 +01:00
Laurent Destailleur
99e4aab46e CSS 2020-11-30 20:31:22 +01:00
Laurent Destailleur
574919de52 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	.travis.yml
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/adherents/class/subscription.class.php
	htdocs/compta/bank/categ.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/boxes/box_task.php
	htdocs/core/class/commondocgenerator.class.php
	htdocs/core/class/interfaces.class.php
	htdocs/core/lib/project.lib.php
	htdocs/core/modules/modCategorie.class.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/fichinter/class/fichinterrec.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/install/repair.php
	htdocs/main.inc.php
	htdocs/product/price.php
	htdocs/projet/tasks/time.php
	htdocs/reception/card.php
2020-11-27 15:45:12 +01:00
Laurent Destailleur
ac3c129735 Clean code 2020-11-27 14:24:15 +01:00
Laurent Destailleur
42c30584f4 Merge pull request #15522 from frederic34/patch-15
Update api_thirdparties.class.php
2020-11-25 12:53:36 +01:00
Laurent Destailleur
7bb6b24b96 Merge pull request #15505 from ptibogxiv/patch-394
Fix api contact
2020-11-25 12:52:45 +01:00
Frédéric FRANCE
9203cb1d88 fix api generateBankAccountDocument 2020-11-25 00:16:36 +01:00
Frédéric FRANCE
ba3ba7dd06 Update api_thirdparties.class.php
The variable $errors does not exist. Did you maybe mean $error?
2020-11-24 23:19:19 +01:00
ptibogxiv
51eed3efe5 Fix api contact 2020-11-24 12:03:31 +01:00
stickler-ci
11704ea6fb Fixing style errors. 2020-11-23 22:33:45 +00:00
ptibogxiv
0d50402803 Update api_contacts.class.php 2020-11-23 23:31:46 +01:00
stickler-ci
c1ba61e548 Fixing style errors. 2020-11-23 21:55:36 +00:00
ptibogxiv
f227d5e72a Update api_contacts.class.php 2020-11-23 22:53:56 +01:00
ptibogxiv
28e4be3b0e Fix contact API
Get roles by API (without GET this data, we can't add this to POST, so data was deleted 👎 )
2020-11-22 16:25:38 +01:00
Scrutinizer Auto-Fixer
f6e3f58fcb Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-11-09 14:18:56 +00:00
Laurent Destailleur
a9fbe9dd6c Fix remove warning 2020-11-08 00:18:41 +01:00
Laurent Destailleur
eba73101b9 Merge pull request #15210 from frederic34/zapieruser
work on zapier
2020-11-06 18:49:23 +01:00
Frédéric FRANCE
5940fb1391 doxygen 2020-11-05 23:03:44 +01:00
Frédéric FRANCE
6e7448a1d0 Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-11-04 19:00:10 +01:00
Laurent Destailleur
83a7b19333 Look and feel v13 2020-11-02 11:41:07 +01:00
Frédéric FRANCE
49390a596c Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-10-31 20:33:59 +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
Frédéric FRANCE
be4a4cb54b Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-10-31 16:10:16 +01:00
Frédéric FRANCE
8bf2b1797c tabs 2020-10-31 15:59:33 +01: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
Laurent Destailleur
1af3709793 Merge pull request #15232 from frederic34/patch-6
doxygen
2020-10-31 13:50:28 +01:00
Frédéric FRANCE
c4a7e58435 Update societe.class.php 2020-10-31 13:22:04 +01:00
Frédéric FRANCE
ae351a5659 doxygen 2020-10-31 13:13:55 +01:00
Frédéric FRANCE
72c443868c Update api_thirdparties.class.php 2020-10-31 11:57:35 +01:00
Frédéric FRANCE
25741a618e fix result is a resource 2020-10-31 09:50:50 +01:00
Frédéric FRANCE
0b9c866825 Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-10-31 09:08:07 +01:00
Frédéric FRANCE
bdfc164130 Merge remote-tracking branch 'upstream/develop' into apiclean 2020-10-30 18:02:58 +01:00
Frédéric FRANCE
8190711342 doxygen 2020-10-30 18:01:01 +01:00
Frédéric FRANCE
2cbbf86a5b Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-10-30 17:48:00 +01:00
Frédéric FRANCE
782e062ec7 Update api_thirdparties.class.php 2020-10-30 15:24:29 +01:00
Frédéric FRANCE
ace1dc16f1 Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-10-30 14:47:09 +01:00
Laurent Destailleur
64b9afc509 Fix bad column name 2020-10-30 14:33:16 +01:00
Frédéric FRANCE
e4af61a587 Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-10-30 08:17:53 +01:00
Laurent Destailleur
a24071492e Start fix for php8 compatibility 2020-10-30 05:56:07 +01:00
Frédéric FRANCE
30b67aaa4f get thirdparty specimen with api 2020-10-29 23:56:42 +01:00
Frédéric FRANCE
fcb343e891 Update societe.class.php 2020-10-28 20:53:29 +01:00
Frédéric FRANCE
0ff32c7074 Update societe.class.php 2020-10-27 20:50:11 +01:00
Frédéric FRANCE
4f3b732ed5 Update societe.class.php 2020-10-27 20:14:42 +01:00
Laurent Destailleur
cd4d738a56 Merge branch 'translateModLivraison2ModDelivery' of
https://github.com/orebd/dolibarr into develop

# Conflicts:
#	htdocs/install/mysql/migration/12.0.0-13.0.0.sql
2020-10-25 16:01:18 +01:00
Laurent Destailleur
7b20e703ee Clean code 2020-10-17 15:53:31 +02:00
Laurent Destailleur
27282d7e3d FIX Include the ticket and mo table in merge process of thirdparty 2020-10-16 17:08:23 +02:00