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

4354 Commits

Author SHA1 Message Date
GregM
059548105c WIP dolGetButtonAction 2022-02-22 12:14:18 +01:00
GregM
b0473c475a wip dolGetButtonAction 2022-02-22 11:48:35 +01:00
GregM
69bb3aaad1 WIP dolGetButtonAction 2022-02-22 11:35:55 +01:00
GregM
b05a5d63b2 WIP dolGetButtonAction 2022-02-22 11:28:33 +01:00
GregM
b728ad871c WIP dolGetButtonAction 2022-02-22 10:06:05 +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
dee5d8f9e8 Standardize name of button 2022-02-18 13:45:28 +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
Alexandre SPANGARO
5a86f99890 FIX Disable customer type by default if type prospect/customer is disabled 2022-02-13 17:53:22 +01:00
Alexandre SPANGARO
a15353fa33 FIX Disable customer type by default if type prospect/customer is disabled 2022-02-13 13:42:40 +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
habot-it
e0ba321365 Add parent company in action==add of societe card.php 2022-02-01 13:54:25 +00:00
Laurent Destailleur
a182cee8b0 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-29 16:49:09 +01:00
Laurent Destailleur
87f05067ca Fix rounding price 2022-01-29 16:47:29 +01:00
Laurent Destailleur
23eda44ba7 Debug v15 2022-01-29 16:43:51 +01:00
Laurent Destailleur
16aa562a13 Debug v15 2022-01-29 16:42:15 +01:00
Sylvain Legrand
b65f849c5d New - Improve the reading of profIDs 2022-01-28 11:22:12 +01:00
Laurent Destailleur
5d176c75db
Merge pull request #19780 from aspangaro/16a7 
NEW Thirdparty - Add rules customer accountancy code is mandatory to validate invoice
 2022-01-25 15:00:47 +01:00
Philippe GRAND
fefbaa739a fix : bad path 2022-01-23 12:21:15 +01:00
Laurent Destailleur
9924333df8
Merge pull request #19883 from grandoc/new_branch_19_01_2022 
fix : bad path
 2022-01-23 12:20:40 +01:00
Laurent Destailleur
e0956c1765 Fix missing token, missing reposition, missing modulepart 2022-01-22 15:33:47 +01:00
Laurent Destailleur
14af64d143 NEW Can removed doc templates from setup page of thirdparty 2022-01-22 15:09:14 +01:00
Philippe GRAND
13329aab2e fix : bad path 2022-01-19 21:18:49 +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
13510b9929 Clean sortfield, sortorder 2022-01-13 11:17:25 +01:00
Laurent Destailleur
f51720879b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-01-13 11:05:57 +01:00
Laurent Destailleur
dc3670bc91 Clean search_status 2022-01-13 11:00:52 +01:00
Alexandre SPANGARO
960aaded8e NEW Thirdparty - Add rules customer accountancy code is mandatory to validate invoice 2022-01-09 21:08:06 +01:00
Laurent Destailleur
4ce77e62c6 Debug v15 2022-01-09 14:19:55 +01:00
Laurent Destailleur
eddc2a1a26 FIX #yogosha8272 2022-01-08 19:50:55 +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
809c8f993b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/modules/modCommande.class.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/core/modules/modPropale.class.php
	htdocs/filefunc.inc.php
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
 2021-12-30 19:03:46 +01:00
Laurent Destailleur
62a74ed428 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
	htdocs/societe/list.php
 2021-12-30 17:57:45 +01:00
Laurent Destailleur
9f82aa1570 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/modulebuilder/template/admin/setup.php
 2021-12-30 17:51:25 +01:00
lvessiller
f16166c47c FIX title for nature of third party in company list 2021-12-30 15:35:49 +01:00
atm-gregr
3feb3d5b76 double contactcategorie 2021-12-21 14:26:28 +01:00
Laurent Destailleur
0387b9922e FIX error message on sqlfilter in API 2021-12-20 20:49:32 +01:00
Laurent Destailleur
29a09e5cbc typo 2021-12-20 18:49:11 +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
f6f6537e25 css 2021-12-12 02:13:09 +01:00
Laurent Destailleur
d80f83caf4 Clean code 2021-12-09 17:19:31 +01:00
Laurent Destailleur
72dc560ce8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-12-08 18:27:28 +01:00
Laurent Destailleur
69cd7ae2ab Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/don/card.php
	htdocs/public/test/badges.php
	htdocs/public/test/test_exec.php
 2021-12-08 18:27:03 +01:00
Marc de Lima Lucio
bfc8bb85a3 FIX: thirparty ajax selector: no name or highlighting if at least ref and/or address displayed 2021-12-06 18:23:47 +01:00
lvessiller
efc0251a66 FIX can modify tag in thirdparty card if const THIRDPARTY_CAN_HAVE_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT_SUPPLIER enabled 2021-12-06 11:40:50 +01:00
Regis Houssin
202b123aaa FIX compatibility with multicompany 2021-12-02 15:10:29 +01:00
Laurent Destailleur
f8a55362f6 Typo 2021-12-01 14:46:48 +01:00
Laurent Destailleur
055cb5c0c9
Merge pull request #18526 from cfoellmann/PR/deprecated-html 
deprecated html attributes
 2021-11-30 14:27:12 +01:00
Christian Foellmann
6608f5f0d8 update all script tags to be uniform. language="javascript" removed 
https://developer.mozilla.org/en-US/docs/web/html/element/script#attr-language
 2021-11-29 15:09:18 +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
Laurent Destailleur
48d7378282 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/comm/action/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/filefunc.inc.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/langs/ar_IQ/bills.lang
	htdocs/langs/ar_IQ/cashdesk.lang
	htdocs/langs/ar_IQ/modulebuilder.lang
	htdocs/langs/ar_IQ/partnership.lang
	htdocs/langs/ar_IQ/propal.lang
	htdocs/langs/ar_IQ/stocks.lang
	htdocs/langs/ar_IQ/ticket.lang
	htdocs/langs/en_AE/admin.lang
	htdocs/langs/en_US/receptions.lang
	htdocs/langs/en_ZA/admin.lang
	htdocs/product/stock/class/mouvementstock.class.php
	htdocs/reception/class/reception.class.php
 2021-11-19 23:14:39 +01:00
Laurent Destailleur
271f42e761 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/societe/list.php
 2021-11-19 10:06:35 +01:00
Laurent Destailleur
e7a4f04da4 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
 2021-11-18 21:41:12 +01:00
Laurent Destailleur
f525045c44
Merge pull request #19281 from aspangaro/15a29 
NEW Thirdparty - Add advanced right to add / edit payment information
 2021-11-18 20:32:55 +01:00
Alexandre SPANGARO
1107c6a208 Modify name of advance right 2021-11-16 04:32:09 +01:00
Alexandre SPANGARO
2ebdc6a430 Merge remote-tracking branch 'upstream/develop' into 15a29 2021-11-16 04:27:53 +01:00
Frédéric FRANCE
b072a02f66
fix warning 2021-11-16 00:19:13 +01:00
lvessiller
e365a14b5a FIX filter on region in company list 2021-11-15 14:41:16 +01:00
Laurent Destailleur
e113fe468f Clean code 2021-11-12 14:57:36 +01:00
Alexandre SPANGARO
1cd864e395 Merge remote-tracking branch 'upstream/develop' into 15a29 2021-11-06 05:06:21 +01:00
Laurent Destailleur
897b00faf0 Clean code 2021-11-05 14:23:19 +01:00
Alexandre SPANGARO
8992276e25 Hidden button without specific advancedright 2021-11-02 05:18:32 +01:00
Alexandre SPANGARO
b128fb5ad9 Add advanced right to add / update thirdparty payment information 2021-11-02 04:55:20 +01:00
Alexandre SPANGARO
dd7ee9e5f4 Merge remote-tracking branch 'upstream/develop' into 15a29 2021-11-02 04:52:50 +01:00
Alexandre SPANGARO
fb0002a38e Factorize user rights 2021-11-02 04:51:18 +01:00
Laurent Destailleur
d21278b0ef
Merge branch 'develop' into fix_php8 2021-10-31 17:54:32 +01:00
Laurent Destailleur
be6b1e29ad Add logs 2021-10-29 13:32:32 +02:00
Laurent Destailleur
72069dc208 Fix css 2021-10-29 11:35:09 +02: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
d1794d7948 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modAdherent.class.php
 2021-10-28 11:05:38 +02:00
Laurent Destailleur
97d97af932 Clean: Remove fields for social networks (merged into "socialnetworks") 2021-10-27 16:39:34 +02:00
Laurent Destailleur
637e8f44e6 Fix phpcs 2021-10-27 00:05:40 +02:00
Laurent Destailleur
19734c89d6 Fix css 2021-10-26 22:09:07 +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
Florian HENRY
52a4f4869d Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_php8 2021-10-25 16:54:30 +02:00
Laurent Destailleur
ad2e567571 Fix bug huntr.dev 2021-10-25 15:32:10 +02:00
Laurent Destailleur
15c80327b1 data-key for extrafielsds has prefix of element 2021-10-25 13:29:08 +02:00
Florian HENRY
b282673f61 fix php8 warning 2021-10-25 09:01:05 +02:00
Laurent Destailleur
6ad9eb8ef1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/class/api_products.class.php
	htdocs/recruitment/recruitmentcandidature_list.php
	htdocs/recruitment/recruitmentjobposition_list.php
 2021-10-24 00:02:15 +02:00
Laurent Destailleur
5078e3d863
Merge pull request #19161 from Dolibarr/scrutinizer-patch-3 
Scrutinizer Auto-Fixes
 2021-10-23 22:38:15 +02:00
Laurent Destailleur
f5cea6d312
Merge pull request #19154 from Hystepik/develop#3 
Fix :  fix php 8.0 warnings
 2021-10-23 22:37:50 +02:00
Scrutinizer Auto-Fixer
f7a41f1848 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2021-10-23 20:22:10 +00:00
Lucas Marcouiller
aec5e41656 Fix : fix php 8.0 warnings 2021-10-23 19:09:23 +02:00
Laurent Destailleur
8604f9b153 Clean DOM (remove ficheaddleft div) 2021-10-23 17:18:35 +02:00
Regis Houssin
452a8cfe18 FIX wrong position of error message 2021-10-23 10:27:24 +02:00
Frédéric FRANCE
9bd31d2b85
fix warnings 2021-10-23 07:13:08 +02:00
Florian HENRY
bb4eb2feea Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_php8 2021-10-22 23:38:44 +02:00
Frédéric FRANCE
46c4f28478
fix multiple warnings 2021-10-22 22:15:59 +02:00
Florian HENRY
87ac58efb6 fix php 8 2021-10-22 15:27:36 +02:00
Florian HENRY
5faf5e08b3 fix php8 warning 2021-10-22 15:09:34 +02:00
Florian HENRY
5d0f5439a0 fix php8 warning 2021-10-22 14:59:48 +02:00
Florian HENRY
b94d74f194 fix php8 warning 2021-10-22 14:58:09 +02:00
Laurent Destailleur
6c870bb3d1
Merge pull request #19059 from FHenry/fix_introduced_scrutinizer 
fix: scrutinizer
 2021-10-21 22:52:20 +02:00
Florian HENRY
df25880d55 fix scrutinzer 2021-10-21 19:18:01 +02:00
Florian HENRY
f68c3c17aa fix php warning 2021-10-21 15:50:04 +02:00
Laurent Destailleur
e43b33028c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
 2021-10-20 15:06:10 +02:00
Laurent Destailleur
ae1da43225
Update card.php 2021-10-20 11:30:38 +02:00
Laurent Destailleur
f59f605bcc
Update card.php 2021-10-20 11:29:34 +02:00
atm-florian
417daa4289 FIX 14.0 - civility field width inadequate due to select2 calculating the width while the field has no width (display: none) 2021-10-20 11:15:02 +02:00
Laurent Destailleur
0cae464bfa Debug v15 2021-10-19 16:47:43 +02:00
Laurent Destailleur
b0230ad42b Look and feel v15 2021-10-18 16:45:14 +02:00
Laurent Destailleur
f1d646bded Look and feel v15 2021-10-18 15:41:55 +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
Laurent Destailleur
e3045f24cd
Merge pull request #18923 from aspangaro/15a24 
NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account
 2021-10-11 15:20:27 +02:00
Florian HENRY
0d47797be7 fix sql 2021-10-08 13:14:08 +02:00
Florian HENRY
7ffa8a14ab fix: option COMPANY_SHOW_ADDRESS_SELECTLIST and SOCIETE_ADD_REF_IN_LIST work in ajaxcompanies 2021-10-08 13:10:44 +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
Vincent Dieltiens
2889af9fae Add SOCIETE_SHOW_VAT_IN_LIST option to let the possibility to display (and search) VAT number in list of 'societe' 2021-10-06 15:23:23 +02:00
Laurent Destailleur
ff56415c00
Merge pull request #18903 from aspangaro/15a21 
HTML5 - <font> tag is deprecated, replace by <span>
 2021-10-05 16:51:41 +02:00
Alexandre SPANGARO
1d2c8effd8 HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 10:20:35 +02:00
Laurent Destailleur
950fccc186
Merge branch 'develop' into NEW_deposit_payment_terms 2021-10-04 19:06:42 +02:00
Laurent Destailleur
b3cb56f2ef Clean css 2021-10-04 04:14:31 +02:00
Laurent Destailleur
d064ab2b17 Add more action to GET action to check 2021-10-02 12:58:15 +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
37603b451a Fix token in url 2021-09-27 12:24:01 +02:00
Laurent Destailleur
0176ab6057 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
 2021-09-27 11:40:47 +02:00
Laurent Destailleur
b77cadf39a Fix filter 2021-09-27 11:38:34 +02:00
Laurent Destailleur
9b825df158 Clean code 2021-09-27 11:36:40 +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
1d597e8a72 Fix add unset* action as sensible GET actions 2021-09-19 18:03:38 +02:00
Laurent Destailleur
5c8fb38426 Fix add del* action into list of sensitive actions 2021-09-19 14:41:46 +02:00
Laurent Destailleur
0749d01c5a Fix add action delete* as sensitive action 2021-09-18 22:04:41 +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
Laurent Destailleur
edb1f31a19 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/accountancy/expensereport/index.php
	htdocs/accountancy/supplier/index.php
 2021-09-10 20:55:52 +02:00