Commit Graph

427 Commits

Author SHA1 Message Date
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
Frédéric FRANCE
ebfba19778
code syntax s... t.. dir 2021-02-26 21:17:52 +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
67df1e1b94 Use same visual picto everywhere for nature of thirdparty 2021-02-05 17:29:11 +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
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
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
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
1293eb66db
add more infos in link 2021-01-20 21:25:51 +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
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
Laurent Destailleur
9426512eaf Fix for #15988 2021-01-16 17:21:52 +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
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
Laurent Destailleur
015c5a028b Doxygen 2021-01-13 12:45:23 +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
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
Alexandre SPANGARO
99949c4817 Merge remote-tracking branch 'upstream/develop' into 14a5 2021-01-03 11:46:20 +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
Alexandre SPANGARO
a843d7fac3 Merge remote-tracking branch 'upstream/develop' into 14a5 2020-12-29 21:10:25 +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
lvessiller
1017fad754 NEW add form confirm hook on company card 2020-12-22 16:07:07 +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
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
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
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
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
47b3b30aaa Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/fourn/product/list.php
	htdocs/product/fournisseurs.php
	htdocs/societe/card.php
2020-11-10 11:10:35 +01:00
Laurent Destailleur
73df033000 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/core/boxes/box_birthdays.php
2020-11-10 11:05:53 +01:00
Got2be
2f11f4e104 FIX : disabled users must not be available in sales representative list on societe edit mode 2020-11-09 11:22:07 +01:00
atm-lena
047785b273 FIX - Don't display inactive users in birthday box and soc card 2020-11-06 11:58:36 +01:00
Laurent Destailleur
bd596965ef
Update card.php 2020-11-04 18:54:56 +01:00
Frédéric FRANCE
7d878d47fa
Update card.php 2020-11-04 09:50:36 +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
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
Frédéric FRANCE
5a3780e062
end of dol_fiche_end 2020-10-27 18:19:31 +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
Frédéric FRANCE
9a470fa42d
replace deprecated 2020-10-22 22:50:03 +02:00
Laurent Destailleur
4a3dc6ecb3 Fix syntax error 2020-10-16 17:40:19 +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
Aurélien
b6283c1a5d
Merge remote-tracking branch 'upstream/develop' into translateModLivraison2ModDelivery 2020-10-08 16:19:10 +02:00
Scrutinizer Auto-Fixer
1512521d91 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-07 13:01:28 +00: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
7b3a7c9921 Add token on all url with action=delete 2020-10-01 10:50:54 +02:00
Laurent Destailleur
68a6239322 Clean code 2020-09-26 04:25:14 +02:00
Laurent Destailleur
2137901b0b Fix sanitizing 2020-09-20 20:49:26 +02:00
Laurent Destailleur
b35db6b9dd Clean code managing canvas 2020-09-18 06:02:52 +02:00
Laurent Destailleur
c4b5f5a249 Maxi clean of code 2020-09-18 01:29:17 +02:00
Laurent Destailleur
b8fe2188a6 Standardize code around model_pdf 2020-09-10 01:49:09 +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