lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
109,623 Commits 43 Branches 150 Tags 886 MiB
develop
Commit Graph

1581 Commits

Author SHA1 Message Date
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
Florian HENRY
0cb04d14d7 NEW: Thirdparty module : box on customer/supplier tab for outsantding amount late 2020-10-15 12:20:37 +02:00
Laurent Destailleur
a0b17635fd NEW When creating a user from a member linked to a thirdparty, you can 
decide if it is an internal or external (default) user.
 2020-10-14 14:02:07 +02:00
Alexandre SPANGARO
ca7ad35342 Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-10-09 06:39:42 +02:00
Aurélien
b6283c1a5d
Merge remote-tracking branch 'upstream/develop' into translateModLivraison2ModDelivery 2020-10-08 16:19:10 +02:00
Laurent Destailleur
ed3a4de438 Fix security hole 2020-10-08 14:30:59 +02:00
AurelienBinard
39d538befc
Merge branch 'develop' into translateModLivraison2ModDelivery 2020-10-06 16:20:25 +02:00
Laurent Destailleur
7c6c319607 Trans 2020-10-06 09:31:54 +02:00
Aurélien
bdd095f6bb
translate livraison2delivery => change folder, filename and class ref into all dependencies #14697 2020-10-05 13:59:59 +02:00
Laurent Destailleur
1b83b55995 Fix to exclude possible sql injection 2020-09-25 17:11:54 +02:00
Laurent Destailleur
ba69fab76a
Merge pull request #14780 from ptibogxiv/patch-363 
NEW fetch contact by email with REST API
 2020-09-20 17:17:03 +02:00
Laurent Destailleur
e5cca13ea0 Fix escaping 2020-09-20 03:32:43 +02:00
Laurent Destailleur
216b3c885d Fix escaping 2020-09-20 01:30:36 +02:00
stickler-ci
f9b4a0f68b Fixing style errors. 2020-09-18 15:54:37 +00:00
ptibogxiv
206b1189c9
NEW fetch contact by email with REST API 2020-09-18 17:52:48 +02:00
Sekan, Tobias
ac1fdb4a59 Use new table function for comm/propal + cleanup 2020-09-16 10:51:19 +02:00
Laurent Destailleur
e5191cad24 Move code of incoterm into the Incoterm Trait. 2020-09-16 02:50:18 +02:00
Laurent Destailleur
1f8278c8ca Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/core/class/html.formmail.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/langs/en_US/other.lang
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-09-12 04:42:59 +02:00
Laurent Destailleur
5ea3f09e17 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/class/translate.class.php
 2020-09-12 04:29:28 +02:00
Laurent Destailleur
f06737097f Look and feel v13 2020-09-10 16:37:42 +02:00
Laurent Destailleur
b8fe2188a6 Standardize code around model_pdf 2020-09-10 01:49:09 +02:00
Laurent Destailleur
f5eb8b0108 Look and feel v13 2020-09-08 04:21:35 +02:00
John Botella
c17bc8b3c8 Fix missing param for hook 2020-09-03 10:45:03 +02:00
ptibogxiv
477f33f56c
NEW standardizes API thirdparties by email with other object 2020-08-31 21:45:51 +02:00
ptibogxiv
12676d020a
Update api_thirdparties.class.php 2020-08-29 11:43:56 +02:00
stickler-ci
26f812b73b Fixing style errors. 2020-08-29 09:39:10 +00:00
ptibogxiv
a68d2fe91e
NEW API get thirdparty by barcode 2020-08-29 11:37:16 +02:00
ptibogxiv
00d619d08e
Update societe.class.php 2020-08-28 23:04:05 +02:00
ptibogxiv
8286978ce8
New fetch thirdparty by barcode 
ie: usefull for fidelity card with barcode/qrcode
if this PR ok, i will push PR for get thirdparty by barcode  and change thirdparty by barcode in takepos
 2020-08-28 22:44:58 +02:00
Laurent Destailleur
d40f90fecb Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-08-27 22:00:38 +02:00
Laurent Destailleur
ad63434f3e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/compta/prelevement/index.php
 2020-08-27 22:00:10 +02:00
Laurent Destailleur
00fce1d18a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-08-27 21:58:23 +02:00
lvessiller
9268955256 FIX set sales representatives on create company card 2020-08-26 09:40:20 +02:00
Laurent Destailleur
964c4ef0d2 Standardize code. Use model_pdf. 2020-08-18 14:48:38 +02:00
Alexandre SPANGARO
27c36713d3 Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-08-16 22:10:02 +02:00
Laurent Destailleur
fb811a1656 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/system/database-tables.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/langs/fr_FR/withdrawals.lang
	htdocs/societe/class/societe.class.php
 2020-08-03 14:44:01 +02:00
Laurent Destailleur
8c34acbf55 FIX Warning if no bank account defined 2020-08-03 14:11:15 +02:00
Laurent Destailleur
7297950308
Merge pull request #13759 from OPEN-DSI/stcommcontact 
NEW: Add prospect status managment for the contact with managment of custom icon
 2020-08-02 22:01:00 +02:00
Laurent Destailleur
75d8455789
Merge pull request #14328 from marc-dll/NEW_api_thirdparty_price_level 
NEW: thirdparty REST API: endpoint to set price level
 2020-08-02 01:20:05 +02:00
Marc DLL
5087d35f86 NEW: thirdparty REST API: endpoint to set price level 2020-07-31 17:48:44 +02:00
kkhelifa-opendsi
fe0f77b967
Merge branch 'develop' into stcommcontact 2020-07-31 16:41:17 +02:00
abb
5aa4e2353a fix:fetch and update model_pdf attribute for societe 2020-07-27 15:40:25 +01:00
Laurent Destailleur
42234ba506 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/price.lib.php
 2020-07-24 00:07:57 +02:00
florian HENRY
045fbad616 fix extrafields linnktoObject Thirdpary option showAdress 2020-07-13 17:48:21 +02:00
Laurent Destailleur
87913e8a5c Fix prospect before customer 2020-07-10 02:11:23 +02:00
Alexandre SPANGARO
59ee22537d Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-07-06 03:24:27 +02:00
Laurent Destailleur
83eaddb17b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/evalmath.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/install/mysql/migration/11.0.0-12.0.0.sql
	htdocs/langs/en_US/cashdesk.lang
	htdocs/societe/class/societe.class.php
 2020-07-04 13:13:17 +02:00
Laurent Destailleur
ae0c738980 FIX Entry from stripe intent were reported into SEPA payments 
FIX Label of popup on thirdparty
FIX Missing the tooltip when creating bank account
 2020-07-01 19:42:28 +02:00
lvessiller
caa3661eeb NEW add order by lastname and firstname by default in get sales representatives 2020-07-01 09:16:44 +02:00
Laurent Destailleur
6c2d70d43b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-17 19:27:39 +02:00
Laurent Destailleur
13cdd5bc45 FIX #14095 2020-06-17 15:42:55 +02:00
Laurent Destailleur
90b5ed9908 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/website.lib.php
 2020-06-11 23:41:35 +02:00
Laurent Destailleur
ee611fa7a0 Fix bad definition of field for parent 2020-06-11 18:32:05 +02:00
Laurent Destailleur
c289001507 Fix bad definition of field for parent 2020-06-11 18:31:26 +02:00
Laurent Destailleur
5b882e333d Fix tooltip on localtaxes 2020-06-10 23:00:17 +02:00
Laurent Destailleur
7d3039d41f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/user/card.php
 2020-06-06 23:04:55 +02:00
Laurent Destailleur
b386400365 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-06-06 21:52:55 +02:00
Laurent Destailleur
38d95aa5cd
Update societe.class.php 2020-06-06 21:45:53 +02:00
Laurent Destailleur
af440b7c49
Update societe.class.php 2020-06-06 21:32:25 +02:00
stickler-ci
e9b17aac8d Fixing style errors. 2020-06-04 18:20:48 +00:00
florian HENRY
7115bd7033 better fix 2020-06-04 20:14:19 +02:00
florian HENRY
2337d75d92 better fix for #13968 2020-06-01 10:43:57 +02:00
florian HENRY
face2d644e Merge branch '11.0' of github.com:Dolibarr/dolibarr into 11.0 2020-06-01 10:05:07 +02:00
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
Laurent Destailleur
8aba46a5ed Fix doc 2020-05-27 23:08:33 +02:00
Laurent Destailleur
00484d5938 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-26 23:23:31 +02:00
Laurent Destailleur
9aeb79e80c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-05-26 23:22:45 +02:00
Laurent Destailleur
e02aa4e41b FIX Default bank account was not loaded for document generation. 2020-05-26 23:22:14 +02:00
florian HENRY
ceb0a5b0b5 space 2020-05-26 21:32:18 +02:00
florian HENRY
e5edc06f3d spelling 2020-05-26 21:29:47 +02:00
florian HENRY
7ada0de654 FIX : #13968 2020-05-26 21:27:46 +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
Laurent Destailleur
8a6ae84fb0 Fix getStructuredData for organization 2020-05-17 20:02:01 +02:00
kamel
28d330996c Correction pour validation Stickler CI / stickler-ci 2020-04-27 18:01:07 +02:00
kamel
9cb90cb384 NEW: Add prospect status managment for the contact with managment of custom icon 2020-04-27 17:35:14 +02:00
Scrutinizer Auto-Fixer
1bf5745286 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-25 11:52:07 +00: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
Laurent Destailleur
72c6ac1c72 Complete #13708, normalization of code 2020-04-23 13:21:39 +02:00
Laurent Destailleur
8f8ae5a4db Fix typo 2020-04-23 12:33:22 +02:00
Laurent Destailleur
18d3d68cae Fix def 2020-04-23 12:22:24 +02:00
Laurent Destailleur
da02863242 Code comment 2020-04-23 12:19:51 +02:00
Laurent Destailleur
7d9c10251c
Merge pull request #13622 from ptibogxiv/patch-330 
NEW API filter contacts by category
 2020-04-16 01:00:33 +02: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
ptibogxiv
03655ffe8d
Update api_contacts.class.php 2020-04-15 18:30:51 +02:00
stickler-ci
81bed88cb1 Fixing style errors. 2020-04-15 16:28:02 +00:00
ptibogxiv
9b100cb806
NEW API filter contacts by category 2020-04-15 18:26:07 +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
Josep Lluís
eda398b1cb
FIX translation key ErrorPrefixRequired 
The correct translation key is ErrorPrefixRequired
 2020-04-14 07:01:53 +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
Laurent Destailleur
596ba8d679 Clean deprecated code. 2020-04-13 01:10:35 +02:00
Laurent Destailleur
52b467d2fc FIX #13550 Removed not used table 2020-04-12 19:06:44 +02:00
Laurent Destailleur
7d430c08d0 Look and feel v12 2020-04-12 16:36:25 +02:00
Laurent Destailleur
d7784887d1 More font awesome picto 2020-04-12 14:58:50 +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
4ff503d20a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/list.php
	htdocs/supplier_proposal/list.php
 2020-04-10 02:07:51 +02:00
Laurent Destailleur
92cd0372db Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/societe/class/societe.class.php
 2020-04-10 02:04:26 +02:00
Laurent Destailleur
a1e714f123 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/societe/class/societe.class.php
 2020-04-10 02:03:12 +02:00
Laurent Destailleur
c4d898e155 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/societe/class/societe.class.php
 2020-04-10 02:01:31 +02:00
Regis Houssin
34e434a17e FIX missing member entity 2020-04-06 16:36:11 +02:00
Laurent Destailleur
33d2b61c19 Work on extralanguages 2020-04-01 16:21:03 +02:00
Laurent Destailleur
fa3bba942f Start to save the VAT src code into table of discounts to reuse them 
later
 2020-03-26 02:01:30 +01:00
Laurent Destailleur
700e384639 WIP Edit fields into alternate language 2020-03-22 19:11:21 +01:00
Scrutinizer Auto-Fixer
f413ce6aac Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-03-12 11:45:44 +00:00
Laurent Destailleur
054ffb7547 Depreciate variables not used by Dolibarr. 2020-03-06 14:38:06 +01:00
Laurent Destailleur
457d0668c8 Look and feel v12 2020-02-24 05:23:34 +01:00
Scrutinizer Auto-Fixer
e44865d8b5 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-21 16:53:37 +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
7931734ecb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modUser.class.php
 2020-02-12 20:30:20 +01:00
Thomas
9b0b5f755b Fixed missing trigger on contact delete 2020-02-12 18:24:37 +01:00
Laurent Destailleur
74d3912763 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/class/fournisseur.facture.class.php
 2020-02-11 16:52:58 +01:00
Laurent Destailleur
9f5f460ae2 Fix field def 2020-02-11 16:42:48 +01:00
Laurent Destailleur
918e570e7a FIX Picture of contact not visible in tooltip 2020-02-10 12:56:08 +01:00
Laurent Destailleur
3a74c3d7e9 Enhance property ->ismulticompanymanaged to define an object with entity 
on its parent.
 2020-02-08 14:40:30 +01:00
Laurent Destailleur
56079f928f Label of field 2020-02-08 11:34:25 +01:00
Laurent Destailleur
cffc56b80b Declaration of property fields of thirdparties 2020-02-08 11:32:38 +01:00
Alexandre SPANGARO
d6d3fff9dc Merge branch 'develop' into 10.0_intracommreport 2020-02-03 21:15:07 +01:00
Laurent Destailleur
f752551914 WIP Generic stats page 2020-01-31 14:53:47 +01:00
Laurent Destailleur
27a0858050 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/class/mouvementstock.class.php
 2020-01-23 17:41:31 +01:00
Laurent Destailleur
040f8bef5a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/societe/class/societe.class.php
 2020-01-22 16:29:04 +01:00
Laurent Destailleur
381f2d5eee Fix typo 2020-01-22 16:24:16 +01:00
Laurent Destailleur
7964699674 FIX Check on unicity on prof id was not triggered sometimes 2020-01-22 16:22:53 +01:00
Laurent Destailleur
5772dce460 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2020-01-15 12:09:21 +01:00
Laurent Destailleur
b6ed6df75d Remove property tha has no sense in output #12803 2020-01-13 14:14:51 +01:00
Laurent Destailleur
ed2c75a2f8
Merge pull request #12776 from aspangaro/12.0_a4 
NEW Add social networks of the company
 2020-01-13 13:38:16 +01:00
Laurent Destailleur
b47db086cb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/inventory/class/inventory.class.php
	htdocs/product/inventory/list.php
 2020-01-10 14:30:42 +01:00
Laurent Destailleur
d97a59ac4a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	ChangeLog
	htdocs/comm/remise.php
	htdocs/core/class/html.form.class.php
	htdocs/filefunc.inc.php
	htdocs/product/list.php
	htdocs/variants/combinations.php
 2020-01-10 14:25:26 +01:00
ptibogxiv
5a1f123994
Update societe.class.php 2020-01-07 13:10:10 +01:00
Laurent Destailleur
b9e0f8999f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2020-01-04 14:03:21 +01:00
Laurent Destailleur
298f6d0683 Look and feel v11 2020-01-02 20:36:35 +01:00
Laurent Destailleur
5cb8cceb82 FIX Do not update timestamp when we set the "default" to another record 2020-01-02 20:29:19 +01:00
Laurent Destailleur
52767c4324 NEW Can enter and edit stripe credit card using the Stripe card ID 2020-01-02 15:45:25 +01:00
Alexandre SPANGARO
c664a1e42d Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2019-12-31 08:34:37 +01:00
Alexandre SPANGARO
9879a43cf4 NEW Add social networks of the company 2019-12-30 21:17:41 +01:00
Laurent Destailleur
4333cf2040 Show the stripe accoutn of a cu_ and a card_ 2019-12-24 12:53:10 +01:00
Scrutinizer Auto-Fixer
455178ff73 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-18 14:20:36 +00:00
Scrutinizer Auto-Fixer
404ae0c209 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-17 02:00:52 +00:00
Laurent Destailleur
95fc14475c Fix show correct stripe publishable_key on payment mode page 2019-12-15 17:32:45 +01:00
Laurent Destailleur
cb71d5a7bb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-15 17:18:21 +01:00
Laurent Destailleur
0ef3de98c6 Try to fix conflict of several stripe accounts 2019-12-15 17:18:09 +01:00
stickler-ci
380b698c6f Fixing style errors. 2019-12-12 16:09:23 +00:00
Anthony Berton
43f150dc42
Update societe.class.php 2019-12-12 17:02:59 +01:00
Frédéric FRANCE
48564ea760
doxygen societe class 2019-12-08 14:26:59 +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
Scrutinizer Auto-Fixer
87585c0f2a Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 17:32:11 +00:00
Laurent Destailleur
c02cd80b75 Clean code 2019-11-12 10:11:30 +01:00
stickler-ci
b892ed05ba Fixing style errors. 2019-11-10 11:17:19 +00:00
Philippe GRAND
d907f36bb6 add some comment 2019-11-10 12:16:51 +01:00
Laurent Destailleur
e885345ef7 FIX Check on duplicate profid was not triggered. 2019-11-06 00:27:36 +01:00
Frédéric FRANCE
872f58f261
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-11-03 21:48:24 +01:00
Laurent Destailleur
c03fabb789 Clean var 2019-11-02 14:26:27 +01:00
Laurent Destailleur
c9a620d1a6 Renamed property of thirdparty "statut_commercial" into 
"status_prospect_label"
 2019-11-02 14:25:52 +01:00
Laurent Destailleur
1cc9954f61 Clean api from bad vars 2019-11-02 14:20:43 +01:00
Laurent Destailleur
25e64b0610
Merge branch 'develop' into socid 2019-11-02 12:01:06 +01:00
Laurent Destailleur
68691ddd8a
Merge pull request #12265 from grandoc/new_branch_30_10_2019 
add comment
 2019-11-02 11:49:28 +01:00
stickler-ci
dc97a54d82 Fixing style errors. 2019-11-02 09:39:05 +00:00
Philippe GRAND
3ff5389c4e add some comment 2019-11-02 10:35:43 +01:00
Frédéric FRANCE
dbed10a701
Merge remote-tracking branch 'upstream/develop' into socid 2019-11-01 21:39:20 +01:00
Laurent Destailleur
e3b5be7475 All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed 
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
 2019-11-01 12:52:03 +01:00
Laurent Destailleur
68a4ddceed Look and feel v11 2019-10-31 23:29:17 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Frédéric FRANCE
f7747ed00a
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-30 20:06:43 +01:00
Philippe GRAND
502d08af0c add some comment 2019-10-30 10:10:22 +01:00
Laurent Destailleur
8f5b0f5d4d
Merge pull request #12207 from altatof/sortcontact 
Sort contacts by lastname, firstname instead of nothing
 2019-10-30 03:27:42 +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
Laurent Destailleur
488edec3a8
Merge pull request #12226 from ptibogxiv/patch-271 
NEW add office phone & job on user tooltips
 2019-10-30 03:11:28 +01:00
Frédéric FRANCE
8f6d38ee82
clean indent 2019-10-27 17:01:23 +01:00
ptibogxiv
bb89a16c1a
Update societe.class.php 2019-10-26 14:59:43 +02:00
stickler-ci
20b518d527 Fixing style errors. 2019-10-25 15:15:58 +00:00
ptibogxiv
a79283c490
NEW add office phone for salespresentatives 
for complete https://github.com/Dolibarr/dolibarr/pull/12225
 2019-10-25 17:15:34 +02:00
ptibogxiv
b449d5f7e6
NEW Get thirdparty's salesrepresentatives by API 2019-10-25 17:14:00 +02:00
Frédéric FRANCE
a43e6f96b5
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-25 08:12:54 +02:00
Laurent Destailleur
6855f588b5 Use dolGetStatus 2019-10-24 16:38:06 +02:00
altairis
0481e0b0d1 sort contact list on lastname 2019-10-23 17:31:26 +02:00
Laurent Destailleur
9be9f912af
Merge pull request #12192 from Ahuahuachi/develop 
Translate documentation and minor code improvement
 2019-10-22 12:32:40 +02:00
Alfredo Altamirano
0c5fbdf29d Translate french documentation 2019-10-20 19:18:39 -05:00
Frédéric FRANCE
86f22c4563
do not ignore lines with mix od tabs and spaces 2019-10-20 17:17:22 +02:00
Frédéric FRANCE
9ec7836387
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-20 16:37:18 +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
f4540dddb8
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-17 20:24:04 +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
d1d9b1ed85
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-15 09:39:57 +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
Frédéric FRANCE
9eaad23564
Update api_contacts.class.php 2019-10-13 06:12:53 +02:00
Frédéric FRANCE
367ef4acaf
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-11 16:44:25 +02:00
Laurent Destailleur
de107fb02e NEW Can set a squarred icon on your company setup 2019-10-11 11:27:05 +02:00
Frédéric FRANCE
98023353fe
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-03 17:21:31 +02:00
Laurent Destailleur
b60ee4c18c css 2019-10-03 09:58:49 +02:00
Frédéric FRANCE
aca9d92db8
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-01 22:03:33 +02:00
Frédéric FRANCE
010b2723b6
work on migration script 2019-10-01 20:14:06 +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
Frédéric FRANCE
3b9bf2b06a
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-01 12:25:34 +02:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Frédéric FRANCE
b8dea76760
zapier api 2019-09-30 22:09:11 +02:00
Frédéric FRANCE
b87610adcc
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-30 19:34:35 +02:00
Frédéric FRANCE
258424416e
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-30 07:49:52 +02:00
Frédéric FRANCE
c7120e9e31
test 2019-09-29 20:36:18 +02:00
stickler-ci
21db14b22a Fixing style errors. 2019-09-29 18:21:26 +00:00
Frédéric FRANCE
0735bb5860
test 2019-09-29 20:21:05 +02:00
Frédéric FRANCE
1a12c93dc7
test 2019-09-29 20:06:30 +02:00
Frédéric FRANCE
1ef3a67644
test 2019-09-29 19:26:25 +02:00
Frédéric FRANCE
4bac865205
test 2019-09-29 18:40:36 +02:00
Frédéric FRANCE
cedad3dc26
fix? 
fix?

fix
 2019-09-29 18:23:31 +02:00
Frédéric FRANCE
05f3d86921
fix? 2019-09-29 11:48:53 +02:00
Frédéric FRANCE
6c8dc75c96
socialnetworks for thirdparties 2019-09-29 11:20:23 +02:00
Frédéric FRANCE
cea3669ffa
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-28 00:35:14 +02:00
Laurent Destailleur
6858dce344 Rename table for categorie of warehouses 2019-09-27 13:28:28 +02:00
Frédéric FRANCE
03086026b8
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-27 08:06:13 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Frédéric FRANCE
850b9fd52a
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-17 08:24:31 +02:00
Laurent Destailleur
23860b15ee Try a fix for #11852 2019-09-15 16:00:01 +02:00
Frédéric FRANCE
62922884fe
specimens 2019-09-12 18:12:28 +02:00
Frédéric FRANCE
9f3c54e5a5
definitions 2019-09-12 18:04:24 +02:00
Frédéric FRANCE
3fddef0c9e
add socialnetworks dictionary 2019-09-11 22:27:09 +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
98459363df
Merge pull request #11795 from jtraulle/fix-doxygen-examples 
Fix Wrongly catched examples by Doxygen
 2019-09-03 12:45:23 +02:00
Laurent Destailleur
8cff008156 Fix error reporting 2019-09-02 16:03:20 +02:00
Laurent Destailleur
7f6ea3855c Fix error report of LDAP 2019-09-02 16:01:51 +02:00
Jean Traullé
c32c7d48ba
Fix Wrongly catched examples by Doxygen 2019-08-30 17:14:59 +02:00
Laurent Destailleur
05c9e97fe4 The deprecated method get_OutstandingBill has been removed. You can use 
getOutstandingBills() instead.
 2019-08-29 00:45:02 +02:00
Laurent Destailleur
290766acaa Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-26 23:57:15 +02:00
Laurent Destailleur
513f224349 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-08-26 23:56:43 +02:00
Laurent Destailleur
c7f06fe50e Fix phpcs 2019-08-26 23:56:17 +02:00
Laurent Destailleur
999db7ed41 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/salaries/card.php
	htdocs/compta/sociales/class/chargesociales.class.php
	htdocs/takepos/invoice.php
 2019-08-26 16:49:25 +02:00
Laurent Destailleur
c93e6550ce Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/paiement.php
	htdocs/compta/sociales/class/chargesociales.class.php
 2019-08-26 16:43:24 +02:00
Laurent Destailleur
dcfbba9af5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/compta/sociales/class/chargesociales.class.php
 2019-08-26 16:41:06 +02:00
Laurent Destailleur
d245ca371e
Update societe.class.php 2019-08-09 23:45:06 +02:00
Frédéric FRANCE
372eddf0c6
Update societe.class.php 2019-08-07 13:49:14 +02:00
Maxime Kohlhaas
be6ad7b6a4 New : can define RUM date on third bank account 2019-07-28 17:10:37 +02:00
Laurent Destailleur
6fa4a99a1b
Merge pull request #11533 from OPEN-DSI/new-api-contacts-deletecategories 
FIX Delete a category to a contact in API
 2019-07-22 18:30:34 +02:00
Alexandre SPANGARO
2c74caff90 WIP 2019-07-22 06:56:55 +02:00
Laurent Destailleur
f368ef377b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/societe/class/societe.class.php
 2019-07-20 16:02:15 +02:00
Laurent Destailleur
73b5302905 Fix var not defined 2019-07-20 16:00:16 +02:00
Laurent Destailleur
6594b361b1 Removed useless code 2019-07-20 15:56:20 +02:00
Laurent Destailleur
fea12c3c59 Fix class not found error 2019-07-20 15:55:22 +02:00
Laurent Destailleur
2e68488231 Enhance scan using phpstan 2019-07-20 15:53:46 +02:00
Laurent Destailleur
a900055631 Fix class not found error 2019-07-20 15:53:21 +02:00
VESSILLER
b95395909c FIX Delete a category to a contact in API 2019-07-19 16:11:44 +02:00
Laurent Destailleur
adfbd62f8b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-14 00:44:35 +02:00
Laurent Destailleur
2a05164bb1 FIX Better PHP compatibility 2019-07-14 00:31:28 +02:00
VESSILLER
266ed86194 NEW Add a category to a contact in API 2019-07-08 12:37:24 +02:00
Laurent Destailleur
fa476b4994 Properties ->libelle_incoterms were renamed into ->label_incoterms 2019-06-25 13:00:02 +02:00
Laurent Destailleur
1daac232b0 Code comment 2019-06-24 14:31:58 +02:00
Laurent Destailleur
e12fde398a Fix phpcs 2019-06-23 19:50:55 +02:00
Laurent Destailleur
efa09301b1 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-22 20:19:14 +02:00
Laurent Destailleur
b202c7eaa0 Fix confusion between ->childs and ->childsoncascade 2019-06-22 20:17:40 +02:00
Laurent Destailleur
eb20df8e64 Fix debug save of state into setup 2019-06-22 14:47:46 +02:00
Laurent Destailleur
4721dc3d34 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-22 11:57:39 +02:00
Laurent Destailleur
9644b9c669
Merge pull request #10932 from tony13tv/patch-6 
[CHANGE] Make State available in .odt templates...
 2019-06-22 11:26:32 +02:00
Laurent Destailleur
0bc0f8ae94 Fix translation of country 2019-06-21 15:40:35 +02:00
Laurent Destailleur
e60020140d
Update societe.class.php 2019-06-20 04:11:10 +02:00
Laurent Destailleur
898d766489
Merge pull request #11354 from rycks/allowZeroAsAccountNumber 
Allow zero as account number
 2019-06-20 03:09:37 +02:00
Eric Seigne
80d4d8754d allow zero as accountancy code nomber (replace all empty tests by != '') 2019-06-17 18:28:11 +02:00
Laurent Destailleur
bde49e05e7 Fix doc 2019-06-17 18:23:38 +02:00
Laurent Destailleur
48b2cb83af Close #11152 by a manual merge to keep only required things 2019-06-16 17:08:23 +02:00
Laurent Destailleur
2218994958 FIX Duplicate encoding on error message 2019-05-29 09:51:45 +02:00
Laurent Destailleur
4a69541419 Several bug fixes using phpstan 2019-05-15 18:59:46 +02:00
ptibogxiv
23f4536a78
FIX : sync data thirdparty to member 2019-04-25 19:22:14 +02:00
Laurent Destailleur
d64e6a6a1b
Merge branch 'develop' into patch-6 2019-04-25 02:54:03 +02:00
Laurent Destailleur
99639ef429 FIX #11013 2019-04-24 11:25:14 +02:00
Laurent Destailleur
f5fb8363d8 FIX #11041 2019-04-24 10:26:57 +02:00
atm-quentin
6deba39c6a FIX credit note can be split 2019-04-12 10:16:13 +02:00
Laurent Destailleur
2b87c8b663
Merge pull request #10810 from mwelters/patch-1 
NEW improve Expensereport, Inverse Receiver
 2019-04-08 14:04:08 +02:00
Laurent Destailleur
54714bc755 Deprecated property ->fk_departement is now ->state_id everywhere. 2019-04-05 20:06:13 +02:00
Laurent Destailleur
fff9b7db9d Fix doxygen 2019-04-04 18:33:12 +02:00
Cristian Torres
64e91fa25b [CHANGE] Making State available in .odt templates... 
...making use of the same strategy when loading Country info from single attribute.
Previously attempted on PR #10463 which has been closed

This also relates to #7428
 2019-03-27 17:09:59 -06:00
Josep Lluís
3d1ebb8379
FIX filter by name_alias field on fetch 
In fetch, when filtering by name_alias field, is used a wrong name of field (nom_alias)
 2019-03-27 13:41:29 +01:00
markus
f942917f53 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into patch-1 2019-03-24 17:42:49 +01:00
Philippe GRAND
2ad649eaea add some comments 2019-03-21 15:18:05 +01:00
Philippe GRAND
e8721fdd07 add some comments 2019-03-21 15:14:09 +01:00
Laurent Destailleur
40c2ca4310 Fix label of status of third party record when using smartphone 2019-03-15 23:08:00 +01:00
Laurent Destailleur
5027a36dfb Fix missing transaction on add_commercial method. 2019-03-15 19:34:04 +01:00
Christophe Battarel
ae50a8b896 change add_commercial signature 2019-03-12 10:48:08 +01:00
markus
1e4ed531b4 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2019-03-08 11:47:08 +01:00
Frédéric FRANCE
f283782445
change visibility 2019-03-04 19:57:46 +01:00
markus
c905575d3e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2019-03-04 17:26:40 +01:00
Frédéric FRANCE
62501b11e8
add visibility 2019-03-02 00:14:22 +01:00
Laurent Destailleur
3bffa69f1d Remove deprecated code 2019-02-27 15:23:56 +01:00
Laurent Destailleur
6373e1db84
Merge branch 'develop' into 10.0_linkedin 2019-02-27 01:16:21 +01:00