Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
112,767 Commits 35 Branches 179 Tags 1.7 GiB
e3a0220658
Commit Graph

6602 Commits

Author SHA1 Message Date
Laurent Destailleur
d9f7a3efd1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/product/inventory/inventory.php
 2022-07-22 17:38:24 +02:00
Laurent Destailleur
50af2747a2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-07-22 17:35:03 +02:00
lmarcouiller
bac8efd4c8 Fix : PHP 8.1 warnings 2022-07-22 17:32:18 +02:00
Laurent Destailleur
b4c8fbdec2 Fix remove "use Stripe\" 2022-07-21 11:09:42 +02:00
Laurent Destailleur
346a716ad4
Merge pull request #21530 from noec764/14.0_Fix_MissingTabHelp 
Fix: tabhelp must be present in every module. Related to  #21529
 2022-07-19 19:01:21 +02:00
Noé Courtier
2aae7525da Fix: tabhelp must be present in every module 2022-07-19 17:27:15 +02:00
Noé Courtier
276168ef6f Fix: tabhelp must be present in every module 2022-07-19 17:14:57 +02:00
Laurent Destailleur
9a92c7d9b0 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/class/extrafields.class.php
 2022-07-10 19:28:16 +02:00
Laurent Destailleur
3d226801ba Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-07-10 19:22:02 +02:00
Laurent Destailleur
52661e09c7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/modules/modResource.class.php
 2022-07-10 19:18:59 +02:00
Laurent Destailleur
09932000dd FIX online signature works partially on ODT templates. 2022-07-10 18:06:41 +02:00
Laurent Destailleur
c77632ced8 Fix export invoice and lines. Pb in field order. Missing thirdparty type 2022-07-10 01:40:39 +02:00
jpb
f10788e4c6 fix export resource type filter 2022-07-07 10:24:39 +02:00
Laurent Destailleur
6e153b9b75 Debug import FIX #yogosha11618 2022-06-30 22:55:58 +02:00
Laurent Destailleur
ef57cde3da Debug v16 (module_name missing in list, pb in searching duplicate cron) 2022-06-30 13:26:55 +02:00
Laurent Destailleur
770a160b8b Debug v16 2022-06-29 14:31:21 +02:00
Laurent Destailleur
b0e0ceb8f6 Fix phpunit 2022-06-28 14:59:15 +02:00
Laurent Destailleur
d2a9826795 Fix phpcs 2022-06-28 13:17:59 +02:00
Laurent Destailleur
34464ac92b Maxi debug of OAuth module. Solve tons of problems. 2022-06-27 22:35:58 +02:00
BB2A Anthony Berton
0951fabd55 FIX - php V8 product batch 2022-06-27 09:22:26 +02:00
Laurent Destailleur
b1ab8ba9b3
Merge branch 'develop' into patch-211 2022-06-23 11:41:09 +02:00
Laurent Destailleur
264f8ab4ce
Merge pull request #21342 from frederic34/useismodenabled 
Use getDolGlobalString
 2022-06-23 09:55:31 +02:00
Laurent Destailleur
8075a40bd9 FIX #21323 2022-06-22 18:12:36 +02:00
Laurent Destailleur
e698d20789
Merge branch 'develop' into develop#6 2022-06-22 12:09:58 +02:00
Frédéric France
889856d55f use getDolGlobalString 2022-06-21 23:39:31 +02:00
stickler-ci
5d1cae173e Fixing style errors. 2022-06-20 14:06:25 +00:00
BENKE Charlene
c4793e71c7
expedition setting php v8 warning 2022-06-20 15:55:52 +02:00
Laurent Destailleur
8ee30e067f Rename var 2022-06-20 02:23:37 +02:00
Laurent Destailleur
e97f021380 Fix #yogosha11295 2022-06-19 19:02:16 +02:00
Laurent Destailleur
233d712e39 NEW Support the Swiss QR-Code 2022-06-19 13:06:07 +02:00
Laurent Destailleur
3e34c2cab2 Doc 2022-06-18 21:20:50 +02:00
Laurent Destailleur
08a942dca8 # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
 2022-06-17 14:52:51 +02:00
Hystepik
45439e055c
Merge branch 'develop' into develop#6 2022-06-17 11:05:12 +02:00
Laurent Destailleur
25ecbe3401 Debug v16 2022-06-15 03:26:27 +02:00
Laurent Destailleur
55383bb032
Merge pull request #21267 from fboitel/fboitel-dev-scrutinizer-011 
BUG FIX pays_code has become country_code on commonObject
 2022-06-14 20:55:21 +02:00
Laurent Destailleur
dd392143e1 Fix conf->projet conf->project 2022-06-14 17:53:17 +02:00
Faustin
8cce63fae3 BUG FIX pays_code has become country_code on commonObject 2022-06-14 13:59:56 +02:00
Laurent Destailleur
e0066e9d2d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-12 20:33:18 +02:00
Laurent Destailleur
89d135288b Doc 2022-06-12 20:33:10 +02:00
Laurent Destailleur
9aa48df111
Merge pull request #19566 from vincentjdc/customer-invoices-import 
Adds import for customer invoices and invoices lines
 2022-06-12 20:32:43 +02:00
Laurent Destailleur
c2fe5de852
Merge pull request #21195 from frederic34/useismodenabled 
use isModEnabled function
 2022-06-12 11:56:31 +02:00
Laurent Destailleur
3a1c8206f1
Merge pull request #21203 from fboitel/fix#21093 
FIX#21093
 2022-06-12 11:48:14 +02:00
Laurent Destailleur
a62b5a10fe Doygen 2022-06-11 22:01:10 +02:00
Frédéric France
3fdbce7a31 use isModEnabled function 2022-06-11 09:46:28 +02:00
Faustin
71ef074987 FIX#21093 2022-06-11 00:41:15 +02:00
Faustin
ef959ecddd FIX#21093 2022-06-11 00:18:38 +02:00
Frédéric FRANCE
38b18a68d7
Merge branch 'develop' into useismodenabled 2022-06-10 10:07:41 +02:00
Frédéric France
400afc937f use isModEnabled function 2022-06-09 22:16:48 +02:00
Laurent Destailleur
b5a1ded537
Merge branch 'develop' into 15_fix_reception_stock_move 2022-06-09 02:41:51 +02:00
Laurent Destailleur
604855bbc1 Debug v16 2022-06-09 02:05:20 +02:00
lmarcouiller
c257f32559 add of names in update 2022-06-08 13:35:32 +02:00
lmarcouiller
c368ff69df New : add of socialmedias in contact update 2022-06-08 12:36:55 +02:00
Laurent Destailleur
7ee4cccc84 FIX ODT tags for subobjects {object_subobject_yyy} was not working. 2022-06-07 19:59:33 +02:00
Laurent Destailleur
166082d3cb Debug v16 2022-06-03 12:53:55 +02:00
Laurent Destailleur
3d80cb9b66 Debug emailcollector 2022-06-03 12:29:47 +02:00
Laurent Destailleur
41ce28996c PHP 8.1 #21121 2022-06-03 11:10:08 +02:00
Laurent Destailleur
6f6d7d7f48 Fix ODT tags in BOM template 
Conflicts:
	htdocs/core/class/commonobjectline.class.php
 2022-06-02 20:18:11 +02:00
Laurent Destailleur
69a7b01f20 Fix ODT tags in BOM template 2022-06-02 20:15:49 +02:00
Laurent Destailleur
c88ee425ad
Merge pull request #21087 from Hystepik/develop#3 
New : update in import for socialnetworks
 2022-06-01 19:40:54 +02:00
Laurent Destailleur
3dcd9fcfe9
Merge pull request #21086 from Hystepik/develop#2 
Fix: import update on xlsx
 2022-06-01 19:40:08 +02:00
Laurent Destailleur
e3fa24fab2
Merge pull request #18283 from atm-gauthier/NEW_stockstransfers 
NEW : Stocks transfers objects management
 2022-06-01 14:49:21 +02:00
Gauthier PC portable 024
2a3f0affaf FIX : try for travis 2022-06-01 14:13:24 +02:00
lmarcouiller
69e8c1abe4 New : update in import for socialnetworks 2022-06-01 11:44:07 +02:00
lmarcouiller
d345957b84 Fix: import update on xlsx 2022-06-01 11:36:47 +02:00
Laurent Destailleur
21e5189e18 Add phpunit for num2Alpha 2022-05-31 18:17:43 +02:00
Laurent Destailleur
a253938db9 Better error message 2022-05-31 18:08:53 +02:00
Laurent Destailleur
d6ecbe65b7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/langs/en_US/errors.lang
 2022-05-31 15:16:54 +02:00
Laurent Destailleur
c9eda09964 FIX ODT generation of BOM document 2022-05-31 14:30:47 +02:00
Gauthier PC portable 024
8b4054f8e9 FIX : missing phpcs:enable 2022-05-30 17:22:25 +02:00
Laurent Destailleur
0dda1d7e76
Merge pull request #20814 from atm-gauthier/NEW/develop_update_on_categorie_product_link_table 
New/develop update on categorie product link table
 2022-05-29 11:30:26 +02:00
Laurent Destailleur
480452e291 FIX missing filters 2022-05-29 10:35:49 +02:00
Laurent Destailleur
f6ad688ddd FIX module for emailing target selection must use a condition on module 2022-05-28 20:50:24 +02:00
Laurent Destailleur
271fb43bc6 FIX Import of fk_stcomm 2022-05-25 23:08:53 +02:00
lmarcouiller
b1481d8495 Fix : socialnetworks import in db 2022-05-25 16:05:02 +02:00
Laurent Destailleur
2cfb4c1fb9
Merge pull request #20990 from rycks/fix_modResource_depends_on_modResource 
fix #20989 : modResource depends on modResource
 2022-05-24 21:48:52 +02:00
Laurent Destailleur
259a292704 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-24 16:33:24 +02:00
Laurent Destailleur
34199cf0fb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/core/modules/modRecruitment.class.php
 2022-05-24 16:31:45 +02:00
Eric Seigne
bbebb9ef5a fix #20989 : modResource depends on modResource 2022-05-23 08:29:04 +02:00
Laurent Destailleur
3d5b322d98 Debug v16 2022-05-22 16:27:42 +02:00
Laurent Destailleur
324721ac1e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/core/tpl/list_print_total.tpl.php
	htdocs/fichinter/list.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2022-05-22 12:54:40 +02:00
Maxime Kohlhaas
266a4b2891 Fix scrutinizer 2022-05-22 00:36:53 +02:00
Maxime Kohlhaas
e5c38572d1 Fix no document available on job candidature 2022-05-22 00:23:16 +02:00
Maxime Kohlhaas
bf39a259ba Fix PDF watermark over PDF text 2022-05-22 00:05:03 +02:00
Laurent Destailleur
9fd6d4bb1e
Merge pull request #20874 from Hystepik/develop#3 
New : import fields in societe class
 2022-05-21 22:50:36 +02:00
Lucas Marcouiller
adfee839d7 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#3 2022-05-21 19:19:02 +02:00
Maxime Kohlhaas
6445dd3882
Merge branch 'develop' into NEW_stockstransfers 2022-05-21 16:06:59 +02:00
Laurent Destailleur
d38b9187f3
Merge branch 'develop' into dev_new_add_ref_clinet_intervention 2022-05-21 10:48:09 +02:00
Laurent Destailleur
980c9874ab
Merge pull request #20895 from ATM-Consulting/FIX_15.0_unable_to_add_several_cron_jobs_with_same_method_and_different_parameters 
FIX 15.0: modules cannot declare more than 1 cron job using the same method with different parameters
 2022-05-21 01:17:28 +02:00
Laurent Destailleur
305798906b
Merge pull request #20928 from Hystepik/develop#7 
Fix : bug import societe with null status
 2022-05-21 00:33:31 +02:00
Laurent Destailleur
fffd655442
Merge pull request #20933 from atm-maxime/fix_recruitment_missing_const 
Fix missing const in recruitment module
 2022-05-21 00:24:01 +02:00
Laurent Destailleur
d9dbfd063b Debug v16 2022-05-20 23:34:58 +02:00
Laurent Destailleur
ee6131612a Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
 2022-05-20 23:28:01 +02:00
Maxime Kohlhaas
bba6a917cb Fix missing const in recruitment module 2022-05-20 23:21:08 +02:00
Laurent Destailleur
420feba56f
Merge branch 'develop' into develop#6 2022-05-20 23:06:30 +02:00
Lucas Marcouiller
98af6f8606 Fix : import on societe with null status 2022-05-20 22:01:39 +02:00
Lucas Marcouiller
c887f48dee fix in social import 2022-05-20 21:12:55 +02:00
Laurent Destailleur
168d1d4334
Merge pull request #20890 from Hystepik/develop#1 
Fix : php 8.0 warnings
 2022-05-20 19:41:20 +02:00
Lucas Marcouiller
2b84dc39de fix error management 2022-05-20 17:03:36 +02:00
Florian HENRY
8af848c539 add Ref client in PDF and send to propal on create 2022-05-20 10:40:59 +02:00
Laurent Destailleur
4b996f79a9 Debug v16 2022-05-19 13:52:29 +02:00
Laurent Destailleur
d0db89faf9 debug 2022-05-19 12:02:04 +02:00
Laurent Destailleur
e5cda0b80e Debug v16 2022-05-19 11:55:14 +02:00
atm-florian
0bf588962b FIX 15.0: modules cannot declare more than 1 cron job using the same method with different parameters 2022-05-19 09:45:37 +02:00
Laurent Destailleur
5f9ef61d32 Debug v16 2022-05-19 09:36:47 +02:00
Laurent Destailleur
d38697d74b Missing data in resource module 2022-05-19 08:46:50 +02:00
Laurent Destailleur
6b88655213 Fix num_rows 2022-05-18 23:40:42 +02:00
Laurent Destailleur
8c14f42d60 phpcs 2022-05-18 13:09:17 +02:00
Laurent Destailleur
308e7a3d9b Fix scrutinizer 2022-05-18 12:40:44 +02:00
lmarcouiller
cf2c46b583 Fix : php 8.0 warnings 2022-05-18 12:31:09 +02:00
Laurent Destailleur
48cb30bd9b Fix scrutinizer 2022-05-18 11:34:54 +02:00
Laurent Destailleur
177e8c17fb Fix scrutinizer 2022-05-18 11:23:21 +02:00
Laurent Destailleur
ed2e1bda46 Clean code v16 2022-05-18 11:00:43 +02:00
lmarcouiller
7e4070faa5 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#3 2022-05-18 10:31:56 +02:00
lvessiller
978db41f37 FIX qty received label in Squille PDF model 2022-05-17 15:50:45 +02:00
Laurent Destailleur
4de50da0dd Repare code to forbidden var_dump() into code 2022-05-17 14:55:38 +02:00
lmarcouiller
23da46938a Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#3 2022-05-17 10:15:35 +02:00
Laurent Destailleur
37f7fed003 Maxi debug of export profiles for v16 2022-05-17 00:51:47 +02:00
lmarcouiller
1e406276c5 New : import fields in societe class 2022-05-13 15:04:30 +02:00
Laurent Destailleur
43e7da685b NEW Add more fields to detect duplicate for import of thirdparties 2022-05-12 02:19:31 +02:00
Laurent Destailleur
9ec23c7073 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-12 02:02:36 +02:00
Laurent Destailleur
a261b05866
Merge pull request #20825 from Easya-Solutions/fix-incoterms-dictionary-table-name 
FIX dictionary table name in incoterms for Debug v16
 2022-05-12 02:02:20 +02:00
Laurent Destailleur
7f1e8384dc Clean code 2022-05-12 02:02:04 +02:00
lvessiller
aed0296ae2 FIX dictionary table name in incoterms for Debug v16 2022-05-11 11:08:53 +02:00
lvessiller
cdf9b89c0a FIX dictionary table for Debug v16 2022-05-11 10:51:43 +02:00
Laurent Destailleur
3a5fe5063d Debug v16 2022-05-10 16:19:00 +02:00
Laurent Destailleur
fea6771a7a Module Partnership is stable 2022-05-10 15:57:52 +02:00
stickler-ci
98f5edbfba Fixing style errors. 2022-05-10 10:47:18 +00:00
Gauthier PC portable 024
74ba2d551a Merge branch 'NEW/update_on_categorie_product_link_table' of github.com:atm-gauthier/dolibarr into NEW/develop_update_on_categorie_product_link_table 2022-05-10 12:36:49 +02:00
Gauthier PC portable 024
08a3ef5bbf NEW : method avoid being blocked when entry already exists for import in llx_categorie_product (use update keys) 2022-05-10 12:25:38 +02:00
Laurent Destailleur
86b4c97287
Merge branch 'develop' into develop#6 2022-05-10 11:43:27 +02:00
Laurent Destailleur
d0c95d87af Debug v16 2022-05-09 18:59:11 +02:00
Laurent Destailleur
779b75bf65 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
 2022-05-09 16:53:53 +02:00
Gauthier PC portable 024
60defe4108 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2022-05-09 13:29:46 +02:00
Gauthier PC portable 024
5daca35e79 FIX : new tables loading system 2022-05-09 12:33:39 +02:00
Laurent Destailleur
b3b6337c4c
Merge branch 'develop' into NEW_deposit_payment_terms 2022-05-08 23:09:06 +02:00
Laurent Destailleur
30597d7f89
Merge pull request #18163 from FHenry/dev_new_project_upgrade_external_user_perms_project 
NEW: Separate read-only and adding time on projects
 2022-05-08 19:50:46 +02:00
Laurent Destailleur
90c95bc638
Merge pull request #20610 from hregis/fix_missng_signature_library 
FIX missing signature library when ODT model is used
 2022-05-08 19:36:06 +02:00
Laurent Destailleur
f52a7a26f6 Debug v16 - Fix for postgresql - Fix for sql loading per module - php8 2022-05-08 15:18:34 +02:00
Gauthier PC portable 024
2c840e80fb Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2022-05-06 11:41:18 +02:00
Florian HENRY
9192596ec3 merge 2022-05-06 11:17:29 +02:00
Florian HENRY
a54c0fb247 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_project_upgrade_external_user_perms_project 2022-05-06 11:13:44 +02:00
Laurent Destailleur
f256207cd5 Save logs 2022-05-03 23:54:40 +02:00
Laurent Destailleur
51e9a7c251 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2022-05-03 13:05:51 +02:00
Laurent Destailleur
9f379dfcf4 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/core/modules/modCashDesk.class.php
	htdocs/debugbar/class/DataCollector/DolLogsCollector.php
	htdocs/langs/en_US/admin.lang
 2022-05-03 12:17:54 +02:00
Laurent Destailleur
affde55169 FIX deprecated module are not more viewed as external modules 
Trans debugbar
 2022-05-03 12:08:24 +02:00
Laurent Destailleur
6aa32e7c70 Retrograde intracommreport from experimental to dev 2022-05-02 20:21:58 +02:00
Hystepik
0be15e3c74
Merge branch 'develop' into develop#6 2022-05-02 15:16:15 +02:00
lmarcouiller
13e05b875d remove unused files 2022-05-02 15:07:41 +02:00
Laurent Destailleur
21e3a5d5ec Try to fix warnings 2022-05-01 21:04:16 +02:00
Laurent Destailleur
d7398f573c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-01 20:49:43 +02:00