Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-07 16:41:48 +01:00
Code Issues Packages Projects Releases Wiki Activity
98,917 Commits 39 Branches 191 Tags
3e345570666c97558c8a67a7e2faae6d950cde4f
Commit Graph

98917 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Laurent Destailleur
9ce23ac6b2 Merge pull request #17494 from atm-john/fix_not_enabled_email_template 
FIX saving template email
 2021-05-06 16:22:19 +02:00
Laurent Destailleur
5a927702c0 Merge pull request #17500 from fmarcet/develop 
NEW: Add import on BOM
 2021-05-06 16:21:09 +02:00
Laurent Destailleur
9e057332f0 Merge pull request #17486 from NextGestion/dolibarr_partnership 
Dolibarr partnership
 2021-05-06 16:11:13 +02:00
Laurent Destailleur
4c20aa6a60 Merge pull request #17485 from kastoras/add_pagination_to_get_products 
Close #17484 Add pagination to get products
 2021-05-06 16:05:06 +02:00
UT from dolibit
9cd78e6ecf Update modules_member.class.php 2021-05-06 16:00:49 +02:00
Laurent Destailleur
a0f85044fc Merge pull request #17510 from Hystepik/develo#2 
Fix #17501 : Undownloable attached file
 2021-05-06 16:00:20 +02:00
Laurent Destailleur
a4d93424dc Merge pull request #17498 from marc-dll/FIX_11.0_pgsql_where_boolean 
FIX: pgsql: prevent 'WHERE 1'
 2021-05-06 15:58:41 +02:00
Laurent Destailleur
21ce99338b Merge pull request #17504 from FHenry/13.0 
fix missing token
 2021-05-06 15:57:45 +02:00
Laurent Destailleur
04ac12b477 Merge pull request #17508 from dolibit-ut/patch-319 
Update llx_00_c_country.sql
 2021-05-06 15:57:17 +02:00
Laurent Destailleur
7bd6cdbf59 Merge pull request #17505 from FHenry/13_fix_webdavlink 
fix: allow webdavs link type
 2021-05-06 15:56:55 +02:00
Laurent Destailleur
6f4e151b91 Fix permissions 2021-05-06 11:25:46 +02:00
Laurent Destailleur
644079ff00 Fix sql 2021-05-06 11:18:35 +02:00
lmarcouiller
d55309c847 fix rename file 2021-05-06 09:46:54 +02:00
UT from dolibit
6b89b99dfd Update llx_00_c_country.sql 2021-05-05 23:07:52 +02:00
Laurent Destailleur
19f78b2e8f More compact gui 2021-05-05 19:13:40 +02:00
ATM john
63292255cc Fix search accented words in product description 2021-05-05 18:45:23 +02:00
Gauthier PC portable 024
9108651a7a FIX : if dom is added with ajax, selector need to keep working 2021-05-05 17:25:12 +02:00
Florian HENRY
adc8620506 fix: allow webdavs link type 2021-05-05 17:14:58 +02:00
Florian HENRY
e62c6be54c Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13.0 2021-05-05 17:06:03 +02:00
Florian HENRY
7857da4db7 fix missing token 2021-05-05 17:05:51 +02:00
lmarcouiller
020ad5aebe Add endofline in errors.lang 2021-05-05 16:49:51 +02:00
lmarcouiller
6589bab20a Merge branch 'develop' of github.com:Dolibarr/dolibarr into develo#2 2021-05-05 16:48:28 +02:00
lmarcouiller
ed59a8851f Fix #17501 : Undownloable attached file 2021-05-05 16:48:04 +02:00
Ferran Marcet
6f66efacb8 New: Add import on BOM 2021-05-05 13:47:43 +02:00
Marc de Lima Lucio
139ae3db00 FIX: pgsql: prevent 'WHERE 1' 2021-05-05 11:49:11 +02:00
lmarcouiller
209682e710 Fix #17361 : changes into mysql/tables of export_model 2021-05-05 11:30:13 +02:00
lmarcouiller
c1ac2ebc86 Merge branch '13.0' of github.com:Dolibarr/dolibarr into develop_v13#1 2021-05-05 10:45:24 +02:00