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

98946 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lmarcouiller
b41a87ff70 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-05-07 12:06:46 +02:00
Laurent Destailleur
b7686f4bab
Merge pull request #17524 from daraelmin/daraelmin-patch-newmemberform 
Fix public new member form use adh type amount
 2021-05-07 12:04:30 +02:00
Laurent Destailleur
30a0d89588
Merge pull request #17525 from Hystepik/develo#2 
Fix : Bug included in develop branch and 13.0
 2021-05-07 12:02:15 +02:00
Laurent Destailleur
44f81ef242
Merge pull request #17514 from frederic34/patch-3 
phpcs
 2021-05-07 12:01:47 +02:00
lmarcouiller
671633fe86 Fix : Bug included in develop branch and 13.0 2021-05-07 11:48:14 +02:00
Laurent Destailleur
cc79fc6eee Lang 2021-05-07 11:30:27 +02:00
lmarcouiller
f4291dc985 commit missing file 2021-05-07 09:20:18 +02:00
lmarcouiller
0f2ce8687d Fix #17475 : Update of previous fix 2021-05-07 09:19:44 +02:00
Laurent Destailleur
5dfa18758c CSS 2021-05-07 01:36:59 +02:00
daraelmin
6504f96188
Copyright 2021-05-07 00:43:01 +02:00
stickler-ci
949e797390 Fixing style errors. 2021-05-06 22:31:41 +00:00
daraelmin
912995a558
Create new.php 2021-05-07 00:28:03 +02:00
daraelmin
9af05f3c6e
Update new.php 2021-05-07 00:25:38 +02:00
daraelmin
2e2b6af98e
Update new.php 2021-05-07 00:23:46 +02:00
daraelmin
82bf9cd3e9
Fix public new member form use adh type amount 2021-05-07 00:13:49 +02:00
Laurent Destailleur
e791f9b863 Debug MRP feature 2021-05-06 21:34:59 +02:00
Laurent Destailleur
36d50c940a Clean code 2021-05-06 21:21:11 +02:00
Laurent Destailleur
589370496a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-06 21:15:32 +02:00
Laurent Destailleur
a7649a5bc2 Trans 2021-05-06 21:15:20 +02:00
Laurent Destailleur
f655cab5eb Clean code 2021-05-06 21:11:39 +02:00
Frédéric FRANCE
4ef53234f1
Update partnership.class.php 2021-05-06 20:39:36 +02:00
Frédéric FRANCE
7897469963
Update account.class.php 2021-05-06 20:34:45 +02:00
Frédéric FRANCE
7b8d4c2656
phpcs 2021-05-06 20:32:41 +02:00
Laurent Destailleur
48a1e5c75e
Merge pull request #17499 from bb2a/trigger_update_thirpartie 
Add events trigger update Thirparty and Contact
 2021-05-06 19:14:02 +02:00
Laurent Destailleur
457050f1c5 Add pen to edit dictionary 2021-05-06 18:45:20 +02:00
Laurent Destailleur
b8b6919cb0 Fix label of dictionaries 2021-05-06 18:41:27 +02:00
Laurent Destailleur
3e34557066 Clean code 2021-05-06 18:36:02 +02:00
Laurent Destailleur
6159321bed NEW Show picto of module into the list of dictionaries 2021-05-06 18:31:36 +02:00
Laurent Destailleur
6b825cbc3b Clean code 2021-05-06 18:06:19 +02:00
Laurent Destailleur
18d21244c3 Merge branch 'altairisfr-batch_status_dict' into develop 2021-05-06 17:30:01 +02:00
Laurent Destailleur
6019df2dfc Merge branch 'batch_status_dict' of 
https://github.com/altairisfr/dolibarr into altairisfr-batch_status_dict

# Conflicts:
#	htdocs/langs/fr_FR/productbatch.lang
 2021-05-06 17:29:41 +02:00
Laurent Destailleur
a22d3f8627
Merge pull request #17301 from andreubisquerra/master 
NEW More permission in TakePOS (Can edit added line, can modify once order sent to kitchen)
 2021-05-06 17:20:46 +02:00
Laurent Destailleur
d5c737ddb6
Update modTakePos.class.php 2021-05-06 17:19:28 +02:00
Laurent Destailleur
bd5e141d26 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/mails_templates.php
	htdocs/core/actions_linkedfiles.inc.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
	htdocs/societe/consumption.php
 2021-05-06 17:07:44 +02:00
Laurent Destailleur
3090c124f0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-06 16:59:06 +02:00
Laurent Destailleur
8410f4a9c9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/mails_templates.php
	htdocs/societe/consumption.php
	htdocs/user/class/user.class.php
 2021-05-06 16:57:49 +02:00
Laurent Destailleur
f6f4968af6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/societe/consumption.php
 2021-05-06 16:52:36 +02:00
Laurent Destailleur
0daab6a55a Code comment 2021-05-06 16:50:22 +02:00
Laurent Destailleur
a26d00428e
Merge pull request #17444 from Hystepik/develop_v13#1 
Fix #17361 : change of llx_export_model type to varchar(64)
 2021-05-06 16:48:46 +02:00
Laurent Destailleur
b7601cb662
Merge pull request #17496 from daraelmin/daraelmin-patch-4 
Fix amnt can be paid for member as membersubscription
 2021-05-06 16:47:41 +02:00
Laurent Destailleur
824a601014
Merge pull request #17507 from atm-john/11.0_fix_search_accent_in_description 
FIX : search accented words in product description (consumption page)
 2021-05-06 16:45:21 +02:00
Laurent Destailleur
98a4f603f2 Complete merge of thirdparty into API 2021-05-06 16:41:06 +02:00
Laurent Destailleur
0dbd68564c
Merge pull request #17493 from FHenry/13_fix_bank_url_merge_account 
FIX: merge thirparty also work for bank URL entry
 2021-05-06 16:39:13 +02:00
Laurent Destailleur
7386a223e8
Update account.class.php 2021-05-06 16:38:34 +02:00
Laurent Destailleur
7515de456f
Merge pull request #17495 from daraelmin/daraelmin-patch-2 
New 5 substitutions keys "online payment link" in mailing
 2021-05-06 16:36:10 +02:00
Laurent Destailleur
7a76dc4648
Merge pull request #17382 from DorianVabre/dev_EventOrganizer_payment 
new: working on conference or booth object and event type #FoundationFunding
 2021-05-06 16:31:30 +02:00
Laurent Destailleur
0867be4af5
Merge pull request #17513 from dolibit-ut/patch-320 
Update modules_member.class.php
 2021-05-06 16:27:45 +02:00
Laurent Destailleur
475ed369ed
Merge pull request #17490 from marc-dll/FIX_develop_expense_report_db_field 
FIX: expense report: column last_main_doc forgotten in v14 migration script
 2021-05-06 16:27:01 +02:00
lmarcouiller
7d649dd90e Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-05-06 16:26:30 +02:00
Laurent Destailleur
864c2a0bf7
Merge pull request #17506 from atm-gauthier/FIX_column_adding_management_in_dom_added_with_ajax_case 
FIX : if dom is added with ajax, selector needs to keep working
 2021-05-06 16:24:26 +02:00