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

1763 Commits

Author SHA1 Message Date
Regis Houssin
b70d3eb8eb FIX uniformize with element name "contact" 2022-03-18 12:05:59 +01:00
Thomas Negre
4d01969a4c Societe: add method to find parent companies 2022-03-17 16:05:35 +01:00
Laurent Destailleur
2f2a70c8b7 Clean code 2022-03-17 14:15:28 +01:00
Marc de Lima Lucio
4efcbe8799 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2022-03-08 15:23:52 +01:00
Marc de Lima Lucio
1993a8d7b1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2022-03-08 15:07:37 +01:00
Laurent Destailleur
dab0095224
Merge pull request #19990 from iouston/patch-3 
add attribute target on getNomurl()
 2022-03-07 17:12:19 +01:00
Laurent Destailleur
d38df4b8a0
Update societe.class.php 2022-03-07 17:11:32 +01:00
Laurent Destailleur
c2fb5d577c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/langs/en_US/banks.lang
	htdocs/projet/list.php
 2022-02-28 20:12:28 +01:00
Laurent Destailleur
ca236c556a FIX Blocking situation when a payment was deleted in bank. 
FIX Missing or bad permissions
 2022-02-28 19:45:53 +01:00
Laurent Destailleur
3b6f7bff66 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-18 16:32:51 +01:00
Laurent Destailleur
87a5defbd3 Comment 2022-02-18 15:11:54 +01:00
Laurent Destailleur
6b8312aab0 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-17 20:51:25 +01:00
Laurent Destailleur
d19aca7192 # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
 2022-02-17 20:50:03 +01:00
Frédéric FRANCE
a613553f37
Merge branch 'hookgetnomurl' into patch-1 2022-02-15 18:44:06 +01:00
iouston
1bc80df643
keep the default value for target in getnomurl to '' 2022-02-15 09:32:27 +01:00
atm-arnaud
455247565d FIX wrong user author 2022-02-11 11:40:45 +01:00
stickler-ci
7e6279e942 Fixing style errors. 2022-02-04 13:48:25 +00:00
iouston
0cc8e6873f
add attribute target on getNomurl() 2022-02-04 14:44:47 +01:00
Philippe GRAND
fefbaa739a fix : bad path 2022-01-23 12:21:15 +01:00
Laurent Destailleur
3aea037889 FIX Debug level 3 of accounting account was using wront field 2022-01-13 19:49:38 +01:00
Laurent Destailleur
6708d4a4d4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-06 11:15:40 +01:00
Laurent Destailleur
1e467c60f3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/compta/facture/list.php
	htdocs/product/stock/movement_list.php
 2022-01-06 11:15:28 +01:00
Laurent Destailleur
708f5e5cf1 FIX #19751 2022-01-06 10:54:19 +01:00
Laurent Destailleur
3689940c11
Merge pull request #19744 from javieralapps4up/develop 
FIX: Thirdparty fk_user_creat is not saved
 2022-01-06 10:40:47 +01:00
javieralapps4up
00ee08f262
FIX: Thirdparty fk_user_creat is not saved 2022-01-05 10:47:59 +01:00
Laurent Destailleur
5b8d6e60e4 Debug v15 2022-01-05 10:43:05 +01:00
Laurent Destailleur
0387b9922e FIX error message on sqlfilter in API 2021-12-20 20:49:32 +01:00
Laurent Destailleur
41792dd269 Fix phpunit 2021-12-18 23:55:12 +01:00
Laurent Destailleur
48c879a91d Fix setDefault should work for all types 2021-12-18 14:56:19 +01:00
Laurent Destailleur
9a5f2634a4 Debug 2021-12-17 18:05:49 +01:00
Laurent Destailleur
7266c78162 Clean/Debug code for v15 2021-12-17 17:40:30 +01:00
Laurent Destailleur
d80f83caf4 Clean code 2021-12-09 17:19:31 +01:00
Laurent Destailleur
f8a55362f6 Typo 2021-12-01 14:46:48 +01:00
Frédéric FRANCE
124e7f9b88
enable societe.class.php in coding test 2021-11-24 23:07:06 +01:00
Frédéric FRANCE
dc3bfcfb87
can modify tooltip by reference 2021-11-22 19:57:26 +01:00
Laurent Destailleur
441af6b6fb Fix add rel="noopener noreferrer" 2021-11-22 02:35:55 +01:00
Marc de Lima Lucio
7e059c0a22 NEW: deposit payment terms: futureproof evolutions by storing field as a string 2021-10-28 16:53:28 +02:00
Marc de Lima Lucio
668088a63f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2021-10-28 15:54:18 +02:00
Laurent Destailleur
97d97af932 Clean: Remove fields for social networks (merged into "socialnetworks") 2021-10-27 16:39:34 +02:00
Scrutinizer Auto-Fixer
5567310e44 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2021-10-25 20:07:31 +00:00
Frédéric FRANCE
46c4f28478
fix multiple warnings 2021-10-22 22:15:59 +02:00
Laurent Destailleur
dd0809b528 Fix trans labels status 2021-10-16 19:37:57 +02:00
Marc de Lima Lucio
29768a1c6e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2021-10-13 11:33:04 +02:00
Alexandre SPANGARO
00eafcb6e7 NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account 2021-10-08 06:50:22 +02:00
Alexandre SPANGARO
c7fd9328cd NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account 2021-10-08 06:29:22 +02:00
Alexandre SPANGARO
adfae30112 NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account 2021-10-07 06:18:39 +02:00
Laurent Destailleur
950fccc186
Merge branch 'develop' into NEW_deposit_payment_terms 2021-10-04 19:06:42 +02:00
Laurent Destailleur
673a2982a5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/opensurvey/card.php
 2021-09-30 16:32:40 +02:00
Laurent Destailleur
3d4bb66853 Clean code 2021-09-30 15:59:47 +02:00
Laurent Destailleur
1d35d8fd2d CSS popup company 2021-09-29 16:42:52 +02:00
Marc de Lima Lucio
004b52f590 NEW: deposit payment terms: add field into CRUD methods 2021-09-29 12:05:38 +02:00
Laurent Destailleur
deb1965cd5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/compta/paiement/list.php
	htdocs/core/class/commonobject.class.php
	htdocs/mrp/mo_list.php
	htdocs/projet/tasks/task.php
	htdocs/public/payment/newpayment.php
 2021-09-20 17:15:12 +02:00
Laurent Destailleur
be2a95ca51 Add language as_IN 2021-09-20 13:01:53 +02:00
Laurent Destailleur
62b721a904 Add deletecontact as sentitive action 
Replace dol_buildpath with DOL_URL_ROOT
 2021-09-18 19:34:46 +02:00
Laurent Destailleur
8909702619 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/bom/class/bom.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/eventorganization.lang
	htdocs/product/class/productfournisseurprice.class.php
 2021-09-16 13:40:05 +02:00
Laurent Destailleur
3f7a75b0a3 FIX translation into email for member at membership validation. 2021-09-15 19:02:17 +02:00
Mazaud Thomas
2091f915b5
Fix the provided URL 
I made a typo in the URL.
 2021-09-09 16:38:45 +02:00
Mazaud Thomas
512aa92b7e
CLOSE|Close #18663 Make "L'Annuaire des Entreprises" the default provider for SIREN verification. 
Changing the default provider for SIREN verification by making the Government Owned "L'annuaire des Entreprises" the default one.
 2021-09-09 16:31:39 +02:00
Laurent Destailleur
4db234e036 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-09 02:29:10 +02:00
Laurent Destailleur
89ed156d7e Complete getOutstandingBills() 2021-09-09 02:18:50 +02:00
Laurent Destailleur
39dd1e2dd1 Code comment 2021-09-09 02:00:07 +02:00
Laurent Destailleur
3d72a21396 Clean code 2021-08-28 03:09:41 +02:00
Laurent Destailleur
46d993c9a6 Clean code 2021-08-27 22:42:04 +02:00
Laurent Destailleur
3b6559b1a6 Clean code by adding cast int. 2021-08-27 18:53:45 +02:00
Laurent Destailleur
2f225ee7e5 Clean code by adding cast int. 2021-08-27 16:33:03 +02:00
Laurent Destailleur
d4b5ee6c85 Fix cast into variable into sql request. 2021-08-23 17:41:11 +02:00
Laurent Destailleur
efda27000e Fix set of date of rum signature 2021-08-02 18:13:35 +02:00
Laurent Destailleur
ce27feda84 Debug v14 
Fix email collector (Creation of thirparty, set of extrafields)
 2021-07-16 00:12:58 +02:00
Laurent Destailleur
901a158238 Fix backward compatibility 2021-07-14 17:19:43 +02:00
Laurent Destailleur
abb1ad6bf0 Fix sql injection 2021-07-05 18:46:27 +02:00
Laurent Destailleur
d7fbddb8e1 Add rowid/ref in response 2021-06-28 16:45:29 +02:00
Frédéric FRANCE
f92cc8f5a3
fix warnings in propal list 2021-06-24 20:11:40 +02:00
Laurent Destailleur
5cc86d2319 Fix #yogosha6370 2021-06-14 13:51:09 +02:00
Laurent Destailleur
bbb751dc53
Merge pull request #17822 from frederic34/zapier_create_contacts 
add more capabilities for zapier
 2021-06-11 19:51:01 +02:00
Laurent Destailleur
756786f717 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/compta/facture/list.php
	htdocs/core/class/discount.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/fourn/facture/card.php
	htdocs/holiday/list.php
	htdocs/paybox/admin/paybox.php
	htdocs/paypal/admin/paypal.php
	htdocs/product/price.php
	htdocs/projet/activity/perday.php
	htdocs/projet/activity/permonth.php
	htdocs/projet/activity/perweek.php
	htdocs/stripe/admin/stripe.php
 2021-06-11 19:05:05 +02:00
Laurent Destailleur
1bf63c7862 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/core/lib/functions.lib.php
 2021-06-10 16:53:09 +02:00
Laurent Destailleur
24f8b6386e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2021-06-10 16:47:45 +02:00
Laurent Destailleur
b7ba9df6b4
Update societe.class.php 2021-06-10 12:59:04 +02:00
Laurent Destailleur
f3d54aada5 Clean code 2021-06-09 23:48:28 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Frédéric FRANCE
a0f0c86ae6
Merge remote-tracking branch 'upstream/develop' into zapier_create_contacts 2021-06-06 17:09:35 +02:00
ATM john
1aca7efce3 Fix childtablesoncascade doc 2021-06-06 13:15:03 +02:00
Laurent Destailleur
1e657b8621 Fix value of showoncombobox 2021-06-05 15:14:10 +02:00
Frédéric FRANCE
f6bc1c6414
add trigger contact 2021-06-05 09:37:38 +02:00
Laurent Destailleur
71b35ef0e5 Fix regression - can't reset parent company 2021-05-25 12:11:06 +02:00
Laurent Destailleur
857be16e12 Log 2021-05-25 12:03:38 +02:00
Laurent Destailleur
fedf7645b1 Fix regression, can't reset parent company. 2021-05-25 12:02:33 +02:00
Laurent Destailleur
625aab34d6 Fix phpcs 2021-05-20 15:30:33 +02:00
Laurent Destailleur
eb0f4d9765 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-20 15:26:26 +02:00
Laurent Destailleur
93501a1147 Fix phpcs 2021-05-20 15:25:56 +02:00
Laurent Destailleur
45bc686f7f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/product/price.php
 2021-05-20 15:05:30 +02:00
Laurent Destailleur
28487fac12
Create societe.class.php 2021-05-20 14:53:50 +02:00
stickler-ci
94ca682cbf Fixing style errors. 2021-05-20 12:51:53 +00:00
Laurent Destailleur
b64c307358
Update societe.class.php 2021-05-20 14:50:02 +02:00
Laurent Destailleur
890d0f8040
Update societe.class.php 2021-05-20 14:38:24 +02:00
stickler-ci
b5ac78d9a0 Fixing style errors. 2021-05-19 16:56:52 +00:00
Sylvain Legrand
8a9c21c642 Update societe.class.php 2021-05-19 18:47:07 +02:00
Laurent Destailleur
21896370a6
Merge pull request #17528 from bb2a/phone_head_document 
Add phone and address in popup Thirdparty info
 2021-05-17 10:16:49 +02:00
Laurent Destailleur
261414cb7f
Update societe.class.php 2021-05-17 10:16:33 +02:00
Laurent Destailleur
1093e66d26
Update societe.class.php 2021-05-17 10:14:14 +02:00
Anthony Berton
1d7765ce12 update phone and address in popup 2021-05-15 02:29:15 +02:00
Laurent Destailleur
866c9d012f Fix fetch for customer and vendor relative discount 2021-05-12 14:19:12 +02:00
Laurent Destailleur
49f7f85762 Fix example 2021-05-12 00:00:51 +02:00
Laurent Destailleur
1cf46f9ae9 cast int 2021-05-07 15:11:28 +02:00
Laurent Destailleur
98a4f603f2 Complete merge of thirdparty into API 2021-05-06 16:41:06 +02:00
Laurent Destailleur
f6305bf551 FIX Sql error 2021-05-04 15:46:38 +02:00
Laurent Destailleur
1c95e2b7c7 FIX #17453 2021-05-03 14:58:29 +02:00
Laurent Destailleur
5a1f2db024 Clean sql 2021-04-30 10:57:21 +02:00
Laurent Destailleur
655056ed31 Debug v14 2021-04-29 12:10:55 +02:00
Laurent Destailleur
2ea1098499 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-28 17:09:17 +02:00
Laurent Destailleur
a12b6394be Better error message 2021-04-28 16:41:37 +02:00
Alexandre SPANGARO
d27030df3f Merge remote-tracking branch 'upstream/develop' into 14a39 2021-04-20 04:43:14 +02:00
Laurent Destailleur
4c7547576b Fix label 2021-04-14 12:02:56 +02:00
Alexandre SPANGARO
2f31720896 Maxi debug of societe/product per entity 2021-04-14 04:45:17 +02:00
Alexandre SPANGARO
44133166de Merge remote-tracking branch 'upstream/develop' into 14a36 2021-04-12 21:35:03 +02:00
Laurent Destailleur
8a62d97b89 Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
Alexandre SPANGARO
b3744bce24 Work on split module fournisseur 2021-04-12 06:04:08 +02:00
Laurent Destailleur
667481acd5 Fix #yogosha5832 - Missin test on permission for /index routes on APIs 2021-04-08 19:05:28 +02:00
Laurent Destailleur
9c92dfd3e1 Function set_price_level() has been renamed into setPriceLevel() to 
follow camelcase rules
 2021-04-01 10:05:37 +02:00
Laurent Destailleur
be6bb3a756 FIX #yogosha5746 - next step (work in progress) 2021-03-30 19:12:07 +02:00
Laurent Destailleur
6e422d26f3 FIX #yogosha5746 - next step (wip) 2021-03-30 16:20:18 +02:00
Laurent Destailleur
fb84608586 Clean sql 2021-03-30 03:37:54 +02:00
Laurent Destailleur
de5df84207
Merge pull request #16990 from daraelmin/daraelmin-adh-create-soc 
Close #15830 Add setup option ADHERENT_DEFAULT_CREATE_THIRDPARTY
 2021-03-30 00:55:17 +02:00
daraelmin
c36c4937ea
Update societe.class.php 2021-03-30 00:31:37 +02:00
Laurent Destailleur
b702d2b534 Fix CSRF for more GET 2021-03-29 22:58:44 +02:00
stickler-ci
a01403c4de Fixing style errors. 2021-03-29 20:16:58 +00:00
daraelmin
57b15c1821 use dol_getIdFromCode for TE_PRIVATE 2021-03-29 22:15:28 +02:00
Laurent Destailleur
3a4bb69c05 FIX #yogosha5749 2021-03-29 15:32:09 +02:00
stickler-ci
b7045ef3a0 Fixing style errors. 2021-03-28 17:42:18 +00:00
daraelmin
1ae0e2a920 fix stafix style errorsle fix stale errorfix style errors 2021-03-28 19:38:20 +02:00
daraelmin
6fdff2c3ab autoaffect individual status for thirdparty 2021-03-28 19:19:40 +02:00
Laurent Destailleur
7b01133493 Fix escape 2021-03-22 13:41:43 +01:00
Laurent Destailleur
ca1715df96 Add some protection for SQL injection 2021-03-22 13:31:06 +01:00
Laurent Destailleur
15440917b1 Fix #ygosha5698 2021-03-22 11:30:18 +01:00
Frédéric FRANCE
4cb7c90184
fix stats 2021-03-20 11:38:53 +01:00
Laurent Destailleur
7d1e18f5ab
Merge pull request #16625 from FHenry/dev_EventOrganisation 
new: working on conference or booth object and event type #FoundationFunding
 2021-03-15 11:37:57 +01:00
Laurent Destailleur
12f50a76d7 Fix yogosha #5627 2021-03-14 11:48:39 +01:00
Florian HENRY
862926316a working on list 2021-03-11 19:09:42 +01:00
Laurent Destailleur
c3a047ee06 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/class/api_agendaevents.class.php
 2021-03-08 19:31:47 +01:00
Laurent Destailleur
3b9f38caa1
Update api_thirdparties.class.php 2021-03-08 16:22:26 +01:00
Laurent Destailleur
77b60d4d1c
Update api_thirdparties.class.php 2021-03-08 16:20:15 +01:00
Frédéric FRANCE
c2c1005345
Update api_thirdparties.class.php 2021-03-08 00:17:58 +01:00
ptibogxiv
4834f5fdf4
Fix get thirdparties by barcode or email 2021-03-07 17:32:43 +01:00
Laurent Destailleur
c5dac4854a
Merge pull request #16474 from bafbes/abb120370 
fix:fk_region links to region code field and not to the rowid's
 2021-03-01 14:16:14 +01:00
abb
c4a3a289a9 fix:fk_region links to region code field and not to the rowid 2021-02-26 23:39:52 +01:00
Frédéric FRANCE
ebfba19778
code syntax s... t.. dir 2021-02-26 21:17:52 +01:00
Laurent Destailleur
a296b86ee1
Update societe.class.php 2021-02-26 13:15:02 +01:00
Laurent Destailleur
ad63ac6bb0
Update societe.class.php 2021-02-26 13:08:24 +01:00
abb
e97468c138 new:Fetch region_code in societe fetch 2021-02-25 09:02:19 +01:00
Anthony Berton
060bfde082 20200217 2021-02-17 15:26:56 +01:00
Laurent Destailleur
67df1e1b94 Use same visual picto everywhere for nature of thirdparty 2021-02-05 17:29:11 +01:00
Laurent Destailleur
f301635681 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
 2021-02-03 21:02:32 +01:00
Laurent Destailleur
348fd0fcb5 FIX #16160 2021-02-03 19:36:10 +01:00
Frédéric FRANCE
9e5f0a8cb9
add more infos in link 2021-01-20 18:45:44 +01:00
stickler-ci
93b421238a Fixing style errors. 2021-01-17 01:26:09 +00:00
Anthony Berton
89ac5e8803 1 2021-01-17 02:09:21 +01:00
Laurent Destailleur
4c50f25c12 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-15 11:41:45 +01:00
Laurent Destailleur
ee7aacae54 More complete error message 2021-01-14 15:19:56 +01:00
Laurent Destailleur
cae9dc3acf
Merge pull request #15925 from FHenry/dev_add_tag_contact_thirdpartycontactcreateion 
NEW : Add contact tag and bulk email status on thirparty+contact create form
 2021-01-11 17:28:12 +01:00
Laurent Destailleur
8a3a59dfca
Merge pull request #15636 from aspangaro/14a5 
NEW: Accountancy - Introduce "Level3" - Define account directly in thirdparty
 2021-01-11 17:10:03 +01:00
Florian HENRY
8adfe54949 bulk email management 2021-01-07 17:33:57 +01:00
Florian HENRY
d388ac72f6 add contacg tag on thirdparty and contact création 2021-01-07 17:32:47 +01:00
Laurent Destailleur
b553dbb9d2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-06 20:23:07 +01:00
Laurent Destailleur
170814c718 Fix missing rollback 2021-01-06 20:21:22 +01:00
Laurent Destailleur
3d96c5a454 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/bom/tpl/objectline_create.tpl.php
	htdocs/bom/tpl/objectline_edit.tpl.php
	htdocs/bom/tpl/objectline_view.tpl.php
	htdocs/core/boxes/box_shipments.php
	htdocs/societe/class/societe.class.php
 2021-01-06 20:20:37 +01:00
Laurent Destailleur
4f2c6e2901
Merge pull request #15911 from atm-kevin/Fix_create_contact_from_thirdparty_from_member 
Fix #15829
 2021-01-06 19:33:25 +01:00
kevin
5164a96aa0 Fix #15829 2021-01-06 15:35:33 +01:00
Alexandre SPANGARO
99949c4817 Merge remote-tracking branch 'upstream/develop' into 14a5 2021-01-03 11:46:20 +01:00
Laurent Destailleur
17b68a30d7
Merge branch 'develop' into dev_add_tag_on_massaction 2020-12-30 13:10:02 +01:00
Alexandre SPANGARO
a843d7fac3 Merge remote-tracking branch 'upstream/develop' into 14a5 2020-12-29 21:10:25 +01:00
Laurent Destailleur
be2e3aa7a9
Merge pull request #15827 from fappels/13_php_warning_add_line 
FIX add line php warning when no customer relative discount history.
 2020-12-29 16:55:33 +01:00
Frédéric FRANCE
e4c3499cad remove warnings 
Conflicts:
	htdocs/societe/class/societe.class.php
 2020-12-29 16:48:29 +01:00
Francis Appels
4267828ee6 FIX add line php warning when no customer relative discount history. 2020-12-29 14:47:16 +01:00
Laurent Destailleur
f498657071 Fix warning 2020-12-29 04:44:48 +01:00
Laurent Destailleur
bf0a9fa137 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/societe/class/societe.class.php
 2020-12-29 04:32:13 +01:00
Laurent Destailleur
c3326a0963 FIX Creation of thirdparty when setup is empty 2020-12-29 04:30:37 +01:00
Alexandre SPANGARO
9eaeab1208 Merge remote-tracking branch 'upstream/develop' into 14a5 2020-12-28 03:30:41 +01:00
Florian HENRY
26d3ea2227 on going 2020-12-23 23:32:50 +01:00
Florian HENRY
4d32529e66 include 2020-12-21 15:25:15 +01:00
Florian HENRY
3deed4678c fix: reslter API need to have correct params as comment 2020-12-21 15:23:04 +01:00
Laurent Destailleur
361f13154b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/fourn/card.php
	htdocs/margin/tabs/thirdpartyMargins.php
	htdocs/societe/card.php
	htdocs/societe/note.php
	htdocs/societe/notify/card.php
	htdocs/societe/societecontact.php
	htdocs/ticket/list.php
 2020-12-20 14:31:54 +01:00
Laurent Destailleur
8c87050703 FIX Check of customer/vendor code fails in some cases 2020-12-20 13:54:02 +01:00
Stephane Lesage
5e4cc7fcfd companycard-directedit-typent 2020-12-14 10:14:31 +01:00
Alexandre SPANGARO
78dc1eaa83 Merge remote-tracking branch 'upstream/develop' into 14a5 2020-12-08 13:51:01 +01:00
Laurent Destailleur
390eda871a
Update societeaccount.class.php 2020-12-07 22:30:24 +01:00
Frédéric FRANCE
4e18f46f28
doxygen 2020-12-05 23:53:55 +01:00
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
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