lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
102,103 Commits 43 Branches 150 Tags 886 MiB
scrutinizer-patch-2
Commit Graph

4091 Commits

Author SHA1 Message Date
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
Florian HENRY
e18c010490 fix bug on list 2021-03-29 16:25:34 +02:00
Laurent Destailleur
3a4bb69c05 FIX #yogosha5749 2021-03-29 15:32:09 +02:00
Laurent Destailleur
ce1f8289a4 FIX #yogosha5746 2021-03-29 15:07:23 +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
50de0777e4 Look and feel v14 2021-03-27 12:45:57 +01:00
Laurent Destailleur
8b4870b8b2 Fix look and feel v14 2021-03-24 23:44:50 +01:00
Laurent Destailleur
d1fa46089f Removed not used page. 
Enhance the WAF
 2021-03-24 22:54:40 +01:00
Laurent Destailleur
a5034d44f7 $_POST war 2021-03-24 19:53:31 +01:00
Laurent Destailleur
28ca2990f0 CSS 2021-03-23 20:09:26 +01:00
Laurent Destailleur
f7ba0ee381 Fix set of parent company with ajax 2021-03-22 22:50:43 +01: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
Frédéric FRANCE
bae1770176
uniformise comments to remove nested comments 2021-03-20 10:00:24 +01:00
Laurent Destailleur
78aec3daae Removed option MAIN_EXTERNAL_USERS_CAN_SEE_SUBSIDIARY_COMPANIES. The 
implmentation did not make any test on subsidiaries. It has same effect
than being an internal user.
 2021-03-19 00:00:06 +01:00
Frédéric FRANCE
8423bd676c
fix php8 warning 2021-03-18 22:26:14 +01:00
Laurent Destailleur
31478d5ac0 Look and feel v14 2021-03-17 22:01:25 +01:00
UT from dolibit
6157fd4c79
Update card.php 
$help_url   add -> DE:Modul_Geschäftspartner
 2021-03-16 13:16:03 +01:00
Laurent Destailleur
ccedc0f7fb
Merge pull request #16713 from frederic34/patch-10 
fix php8 warning
 2021-03-16 10:31:37 +01:00
Laurent Destailleur
e00e6cfd9a
Merge pull request #16721 from aspangaro/14a25 
Translation "Generated documents"
 2021-03-16 10:25:31 +01:00
Alexandre SPANGARO
03481a0197 Uniformize translation 2021-03-16 04:22:43 +01:00
Alexandre SPANGARO
4fd24c6855 Translation "Generated documents" 2021-03-16 04:04:18 +01:00
Frédéric FRANCE
0b1e31e7a7
fix php8 warning 2021-03-15 20:58:35 +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
Frédéric FRANCE
18f5c4613e
fix copy/paste 2021-03-15 08:10:45 +01:00
Laurent Destailleur
bd838d0b8a Fix sql syntax error #yogosha5628 + 1 SQL injection 2021-03-14 18:07:53 +01:00
Laurent Destailleur
cc10106a21 Fix protection on int 2021-03-14 12:20:23 +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
stickler-ci
345fe648b3 Fixing style errors. 2021-03-11 15:37:27 +00:00
Laurent Destailleur
c596eb91a8
Merge branch 'develop' into abb120358 2021-03-11 16:35:21 +01:00
Bahfir Abbes
1359326337
Update card.php 2021-03-11 04:01:43 +01:00
Laurent Destailleur
5e68eee407 Fix filter 2021-03-09 16:47:38 +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
2f0c4038fb Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/comm/action/class/api_agendaevents.class.php
	htdocs/compta/sociales/card.php
	htdocs/societe/consumption.php
 2021-03-08 19:27:34 +01:00
Laurent Destailleur
24a0700426
Merge pull request #16573 from frederic34/box_index_societe 
can add box on thirparties index
 2021-03-08 16:25:46 +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
Frédéric FRANCE
92754760f4
can add box on thirparties index 2021-03-06 16:38:07 +01:00
Frédéric FRANCE
7543b63a6e
Fix #16544 2021-03-05 08:49:56 +01:00
Frédéric FRANCE
d13ed6bdfb
Update consumption.php 2021-03-05 08:44:29 +01:00
Laurent Destailleur
42329b10c9 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	build/generate_filelist_xml.php
	htdocs/comm/propal/card.php
	htdocs/commande/card.php
	htdocs/compta/facture/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/modulebuilder.lib.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
	htdocs/supplier_proposal/card.php
	htdocs/ticket/list.php
 2021-03-02 15:27:20 +01:00
Laurent Destailleur
0670a00b83 Fix phpcs 2021-03-02 02:06:09 +01:00
Laurent Destailleur
fb0eda446e Fix bad break 2021-03-01 22:00:48 +01:00
Laurent Destailleur
f64f53e460 Reduce errors 2021-03-01 21:57:45 +01:00
Laurent Destailleur
5b771eb798 Fix merge of 2 record. 2021-03-01 21:56:14 +01:00
Laurent Destailleur
1cdea45707 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/adherents/subscription/list.php
	htdocs/societe/canvas/company/tpl/card_create.tpl.php
	htdocs/societe/canvas/individual/tpl/card_create.tpl.php
	htdocs/societe/card.php
 2021-03-01 17:46:36 +01:00
Laurent Destailleur
222012da37 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/class/paymentvarious.class.php
	htdocs/compta/bank/various_payment/card.php
	htdocs/don/card.php
	htdocs/langs/en_US/main.lang
	htdocs/public/payment/newpayment.php
	test/phpunit/DateLibTzFranceTest.php
 2021-03-01 15:48:30 +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
Laurent Destailleur
bcdfdae10c FIX #16480 2021-02-28 23:43:07 +01:00
Frédéric FRANCE
9e8aefbc75
Merge remote-tracking branch 'upstream/develop' into s_code_syntax 2021-02-28 17:49:17 +01:00
Laurent Destailleur
9cf4222d3a Look and feel v14 2021-02-27 17:15:40 +01:00
Laurent Destailleur
4c7d78ffaa Look and feel v14 2021-02-27 03:06:21 +01:00
Laurent Destailleur
0f9d9625ad Look and feel v14 2021-02-27 02:49:24 +01:00
Laurent Destailleur
34d00e5d5e Look and feel v14 2021-02-27 02:44:52 +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
Laurent Destailleur
2be6992916 Fix include_once into include for inc.php file. See comment in #16338 2021-02-19 16:10:19 +01:00
Laurent Destailleur
1aa418921a
Merge pull request #16331 from bb2a/UPPER_CONTACT_USER_ADH 
setUpperOrLowerCase
 2021-02-19 12:50:54 +01:00
Laurent Destailleur
19a55c45da Fix reposition 2021-02-17 15:34:09 +01:00
Laurent Destailleur
6ec63c24a8 Use reposition 2021-02-17 15:28:53 +01:00
Laurent Destailleur
e1af4f372e Hide setup line when not relevant 2021-02-17 15:27:27 +01:00
Anthony Berton
060bfde082 20200217 2021-02-17 15:26:56 +01:00
Laurent Destailleur
bfe71e8509 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-17 14:28:19 +01:00
Florian HENRY
81ff7843f4 fix: THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION really change select entrprise type 2021-02-16 18:57:25 +01:00
abb
d82c62c40d New:Constant MAIN_SHOW_SOCIETE2EXTERN to allow access to any thirdparty for external users 2021-02-12 23:53:45 +01:00
Laurent Destailleur
408aefd46c FIX vat value when code contains number 2021-02-10 01:10:31 +01:00
Laurent Destailleur
8041ef641a
Merge branch 'develop' into dev_typent_jax_workcorrectly 2021-02-08 15:29:36 +01:00
Laurent Destailleur
dbabd12745 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-07 20:16:56 +01:00
Laurent Destailleur
8bda726619 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/societe/notify/card.php
 2021-02-07 20:16:13 +01:00
Frédéric FRANCE
8d49ca9f0d
fix html 2021-02-07 18:49:46 +01:00
Laurent Destailleur
536ddd4832 Fix look and feel v13 2021-02-07 17:54:20 +01:00
Laurent Destailleur
a31c930522 Fix look and feel v13 2021-02-07 17:53:42 +01:00
Laurent Destailleur
03124870cd Responsive 2021-02-07 17:52:35 +01:00
Laurent Destailleur
36fbba2ac2 Make page to setup notification simpler 2021-02-07 17:40:14 +01:00
Laurent Destailleur
f62b4c15e8 Fix bad html 2021-02-07 17:32:54 +01:00
Laurent Destailleur
5712d255b3 Fix bad html 2021-02-07 17:31:40 +01:00
Laurent Destailleur
d4df62f1da Look and feel v14 2021-02-07 17:25:41 +01:00
Laurent Destailleur
4411497112 FIX #16156 2021-02-06 12:27:27 +01:00
Laurent Destailleur
fd3354142b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/categories/viewcat.php
 2021-02-06 01:17:05 +01:00
Laurent Destailleur
bee0849290 Fix when nothing found, we should show message nothing found 2021-02-06 00:42:53 +01:00
Laurent Destailleur
f0e1c02caa Look and feel v14 - Use placeholder on combolists 2021-02-06 00:05:24 +01:00
Laurent Destailleur
67df1e1b94 Use same visual picto everywhere for nature of thirdparty 2021-02-05 17:29:11 +01:00
Florian HENRY
ec41bf58e5 always ajax now 2021-02-04 09:48:17 +01:00
Florian HENRY
2d77787bba Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_typent_jax_workcorrectly 2021-02-04 09:06:36 +01:00
Florian HENRY
e9de415dc0 start 2021-02-04 08:35:17 +01:00
Laurent Destailleur
ffb972fe5e Look 2021-02-03 22:21: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
Laurent Destailleur
086b23f66c Fix responsive 2021-01-28 23:29:49 +01:00
Laurent Destailleur
4812dd2743 Fix responsive 2021-01-28 23:28:33 +01:00
Laurent Destailleur
83dc1e8cd0 Fix responsive 2021-01-28 23:27:29 +01:00
Laurent Destailleur
6544ba010e Fix responsive 2021-01-28 23:27:01 +01:00
Laurent Destailleur
98447c4c5f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-28 16:32:28 +01:00
Laurent Destailleur
f3c33be871 Fix css 2021-01-28 15:47:32 +01:00
Laurent Destailleur
3eebbc6426 NEW Add function showValueWithClipboardCPButton() to add a copy/paste 
button on a text.
 2021-01-28 12:44:45 +01:00
Laurent Destailleur
4fbf2fff6f
Merge pull request #16034 from Hystepik/develop#2 
Close #16027 New Feature copy Code Client
 2021-01-28 11:17:10 +01:00
Laurent Destailleur
b4be97ec15 Draft code 2021-01-25 18:59:04 +01:00
stickler-ci
15b6acd37f Fixing style errors. 2021-01-24 16:22:49 +00:00
ptibogxiv
6d0cf7bd01
NEW support sepa_debit in stripe paymentmethods list 
alternatives methods as sofort , ideal or giropay are saved as sepa_debit for futur use
 2021-01-24 17:18:21 +01:00
Laurent Destailleur
972fffba01
Merge pull request #15996 from bb2a/price_level_soc_list 
NEW Add column "Price level"in thirdparty list
 2021-01-24 16:10:40 +01:00
Laurent Destailleur
452aea1d8b Fix bad test 2021-01-23 17:59:56 +01:00
Laurent Destailleur
dd69aed27b Fix error test 2021-01-23 17:49:08 +01:00
Anthony Berton
e93e6be3fe Update list.php 2021-01-22 18:31:53 +01:00
Anthony Berton
4f9e294fc7 Update list.php 2021-01-22 18:10:48 +01:00
lmarcouiller
5a95cc16aa update clipboardcopypaste with jquery 2021-01-22 16:58:47 +01:00
lmarcouiller
64d08544b2 move of function showValueWithCopyPasteButton in function.lib.php 2021-01-22 09:09:46 +01:00
lmarcouiller
5e94cf09ef removing my tests 2 2021-01-21 17:18:51 +01:00
lmarcouiller
59d2d02151 removing my tests 2021-01-21 17:17:10 +01:00
stickler-ci
006fbb1858 Fixing style errors. 2021-01-21 16:16:14 +00:00
lmarcouiller
5e67e11eb3 update societe/card.php clipboard copy in fonction 2021-01-21 17:15:32 +01:00
Laurent Destailleur
ddc163e79e
Merge pull request #16025 from FHenry/dev_fix_createcontactmailmandatory 
fix bulk email mandatory only if contact creation is ask
 2021-01-21 14:07:13 +01:00
Laurent Destailleur
8eee4a79e7
Merge pull request #16032 from frederic34/patch-1 
fix colspan too small
 2021-01-21 13:34:41 +01:00
lmarcouiller
b2809e4ee2 add trans to copied to clipboard text 2021-01-21 09:54:26 +01:00
lmarcouiller
cd4225aee0 Fix #16027 New Feature copy Code Client 2021-01-21 09:45:09 +01:00
Frédéric FRANCE
01e41a8ddd
fix colspan too small 2021-01-20 22:40:40 +01:00
Frédéric FRANCE
1293eb66db
add more infos in link 2021-01-20 21:25:51 +01:00
Frédéric FRANCE
9e5f0a8cb9
add more infos in link 2021-01-20 18:45:44 +01:00
Florian HENRY
0aa2de230e Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_fix_createcontactmailmandatory 2021-01-19 17:52:40 +01:00
Florian HENRY
c28ce8d3b4 fix bulk email mandatory only if contact creation is needed 2021-01-19 17:52:27 +01:00
Laurent Destailleur
3926d102b9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-19 16:22:38 +01:00
Laurent Destailleur
113ef1a02b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/user/class/user.class.php
 2021-01-19 16:21:53 +01:00
Laurent Destailleur
14ef211ed5
Merge pull request #15997 from bb2a/warehouse_on_thirparty 
NEW Add Warehouse affect on Thirparty
 2021-01-19 12:38:33 +01:00
Florian HENRY
1eec6fbb8f Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13.0 2021-01-18 09:05:12 +01:00
Laurent Destailleur
4d42fa2a37 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formaccounting.class.php
 2021-01-17 11:34:19 +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
stickler-ci
af169ac700 Fixing style errors. 2021-01-16 22:49:15 +00:00
Anthony Berton
57f4ac2072 Update list.php 2021-01-16 23:41:06 +01:00
Laurent Destailleur
9426512eaf Fix for #15988 2021-01-16 17:21:52 +01:00
Laurent Destailleur
ba51e67477
Merge pull request #15981 from bb2a/phone_picto_on_liste 
Add picto phone and url on thirparty and contact list
 2021-01-16 17:00:33 +01:00
Laurent Destailleur
8cef8df33a Hide advanced feature with ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY 2021-01-15 17:35:16 +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
Florian HENRY
cd62c9ed6d Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13.0 2021-01-15 08:11:30 +01:00
Laurent Destailleur
ee7aacae54 More complete error message 2021-01-14 15:19:56 +01:00
Laurent Destailleur
aaddda9a6e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/bookkeeping/listbysubaccount.php
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/user/class/usergroup.class.php
 2021-01-14 14:13:08 +01:00
Anthony Berton
df5e6a2519 picto 2021-01-14 08:56:38 +01:00
Laurent Destailleur
b7402ecf3f
Merge branch 'develop' into NEW_product_customer_price_ref 2021-01-13 13:38:19 +01:00
Laurent Destailleur
015c5a028b Doxygen 2021-01-13 12:45:23 +01:00
Florian HENRY
b1a78c6c18 fix thirdparty list filter type_ent empty 2021-01-12 17:18:41 +01:00
Marc de Lima Lucio
82b0f18378 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_product_customer_price_ref 2021-01-12 15:10:15 +01:00
Florian HENRY
d856b0149d Merge branch '13_backport' into develop 2021-01-12 10:08:12 +01:00
Florian HENRY
2be924d5d8 fix js bulkemail 2021-01-12 10:01:32 +01:00
Florian HENRY
7f90c88d6a fix js syntax 2021-01-12 09:51:39 +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
stickler-ci
6410ca9921 Fixing style errors. 2021-01-07 16:46:46 +00: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
Florian HENRY
9b1b755cc2 Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13_8fablab 2021-01-07 17:24:53 +01:00
Florian HENRY
5c53a963e2 bulk email management 2021-01-07 17:23:02 +01:00
Laurent Destailleur
e53cb4b530 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-07 10:40:58 +01:00
Laurent Destailleur
3399ab2c5d Fix phpcs 2021-01-07 10:20:41 +01:00
Laurent Destailleur
cfc2ec63f3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-06 21:04:13 +01:00
Laurent Destailleur
4c00167687 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/societe/card.php
 2021-01-06 20:51:44 +01:00
Laurent Destailleur
8f1617884a
Merge pull request #15888 from atm-quentin/FIX/issue_15659 
FIX issue 15659 : Missing test if supplier conf is enabled
 2021-01-06 20:35:34 +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
quentin
7161ca9e70 FIX issue 15659 : Missing test if conf is enabled 2021-01-06 09:54:02 +01:00
Florian HENRY
27b0b0e8d5 add contacg tag on thirdparty and contact création 2021-01-06 09:11:04 +01:00
Marc de Lima Lucio
f03f5701f6 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_product_customer_price_ref 2021-01-05 16:01:31 +01:00
Alexandre SPANGARO
99949c4817 Merge remote-tracking branch 'upstream/develop' into 14a5 2021-01-03 11:46:20 +01:00
Regis Houssin
e36ae4ac90 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0 2021-01-02 13:14:30 +01:00
Laurent Destailleur
b88ee6eff4
Merge pull request #15815 from FHenry/dev_add_tag_on_massaction 
NEW: Add mass action add tag for product/service, user, thirdparty, warehouse, project, bank account, members
 2021-01-01 21:36:15 +01:00
Regis Houssin
07dc29166e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0 2020-12-30 13:56:50 +01:00
Laurent Destailleur
279c7923ac
Merge pull request #15807 from OPEN-DSI/new-societe-fomrconfirm-hook 
NEW add form confirm hook on company card
 2020-12-30 13:10:40 +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
Regis Houssin
aec01a95fc FIX again and again 2020-12-29 17:48:52 +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
Laurent Destailleur
af41c06822 Fix warnings 2020-12-29 04:27:16 +01:00
Alexandre SPANGARO
87f38c251d Fix 2020-12-28 03:43:52 +01:00
Alexandre SPANGARO
ba377f8eac Fix 2020-12-28 03:30:55 +01:00
Alexandre SPANGARO
9eaeab1208 Merge remote-tracking branch 'upstream/develop' into 14a5 2020-12-28 03:30:41 +01:00
Florian HENRY
c7b4f20f6e merge 2020-12-24 15:00:26 +01:00
Florian HENRY
720539ff46 on goung 2020-12-23 23:52:43 +01:00
Florian HENRY
26d3ea2227 on going 2020-12-23 23:32:50 +01:00
Laurent Destailleur
d65dc85a10 FIX for php 8 2020-12-23 19:16:25 +01:00
Laurent Destailleur
8e839a34e2 FIX for php 8 2020-12-23 19:14:47 +01:00
lvessiller
1017fad754 NEW add form confirm hook on company card 2020-12-22 16:07:07 +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
Laurent Destailleur
1f9c597f26 Fix default fields in list 2020-12-16 15:57:52 +01:00
Laurent Destailleur
7005c17569 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/societe/card.php
 2020-12-16 00:32:18 +01:00
stickler-ci
9ca2e98a66 Fixing style errors. 2020-12-15 21:12:52 +00:00
Florian HENRY
b80bd8d1f8 FIX : dupliacete customer or supplier code must be error dipslayed with new code proposed 2020-12-15 22:03:15 +01:00
Florian HENRY
7a93c11ae0 FIX : dupliacete customer or supplier code must be error dipslayed with new code proposed 2020-12-15 22:01:33 +01:00
Alexandre SPANGARO
593f5bcb7a Merge remote-tracking branch 'upstream/develop' into 14a5 2020-12-15 06:50:22 +01:00
Stephane Lesage
5e4cc7fcfd companycard-directedit-typent 2020-12-14 10:14:31 +01:00
Laurent Destailleur
cfa194436f Debug v13 2020-12-11 00:55:21 +01:00
Laurent Destailleur
eedaca1476 Fix bad encoding of link 2020-12-10 00:43:51 +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
f06d920460 FIX #15583 2020-12-03 16:22:03 +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
1c4c1dc74b
Merge pull request #15594 from OPEN-DSI/new-societe-list-address 
NEW address column in company list
 2020-12-01 11:31:30 +01:00
lvessiller
20aa1e29f6 NEW address column in company list 2020-12-01 09:58:55 +01:00
UT from dolibit
7b02aa4c38
Update checkVatService.xml 
http -> https at
 <wsdlsoap:address location="https://ec.europa.eu/taxation_customs/vies/services/checkVatService"/>
 2020-12-01 09:28:24 +01:00
Scrutinizer Auto-Fixer
6df4954b20 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-12-01 01:41:19 +00:00
Laurent Destailleur
99e4aab46e CSS 2020-11-30 20:31:22 +01:00
Laurent Destailleur
958893228a Fix combo to add contact and status of contact on popup 2020-11-30 15:18:58 +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
Laurent Destailleur
df09fc0d0c
Merge pull request #15482 from ptibogxiv/patch-392 
Fix contact API
 2020-11-24 09:08:10 +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
Givriz
dca4cf5987 Feature : ajout de la class "button-cancel" 
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
 2020-11-23 15:12:52 +01:00
Laurent Destailleur
2f6f242d99 CSS 2020-11-23 12:29:38 +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
Givriz
c48129e279 Ajout de la class "button-save" 
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
 2020-11-19 20:23:38 +01:00
Laurent Destailleur
2cbb1c09d5 Add missing token 2020-11-18 13:18:47 +01:00
Laurent Destailleur
c5929a62b7 Fix token 2020-11-18 13:17:53 +01:00
kamel
709822635c Correction Stickler CI 2020-11-18 09:46:23 +01:00
kamel
73b35f334e NEW: Add new option for displaying Contact email (or phones if not defined) and town info list (select list or combobox) 
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 2020-11-18 09:41:42 +01:00
Laurent Destailleur
ad04646c05 Fix must use json_encode/decode instead of dol_json_encode/decode 2020-11-11 15:56:19 +01:00