Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
98,974 Commits 36 Branches 189 Tags
0c8b74b54cd4817002697cb15e5475e74bc505d9
Commit Graph

6243 Commits

Author SHA1 Message Date
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
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
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
0daab6a55a Code comment 2021-05-06 16:50:22 +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
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
9e057332f0 Merge pull request #17486 from NextGestion/dolibarr_partnership 
Dolibarr partnership
 2021-05-06 16:11:13 +02:00
UT from dolibit
6b89b99dfd Update llx_00_c_country.sql 2021-05-05 23:07:52 +02:00
Anthony Berton
ed26e75c0b init 2021-05-05 11:54:16 +02:00
lmarcouiller
209682e710 Fix #17361 : changes into mysql/tables of export_model 2021-05-05 11:30:13 +02:00
Marc de Lima Lucio
ef6ebd4793 FIX: expense report: column last_main_doc forgotten in v14 migration script 2021-05-04 16:24:15 +02:00
NextGestion
6f85cab6c4 Merge https://github.com/Dolibarr/dolibarr into dolibarr_partnership 2021-05-04 10:55:19 +01:00
Laurent Destailleur
da08670a3d Update 13.0.0-14.0.0.sql 2021-05-04 00:24:32 +02:00
Laurent Destailleur
d6617f82ca Merge branch 'develop' into develop 2021-05-04 00:23:28 +02:00
Laurent Destailleur
03e8f2aee1 Fix for performance troubles 2021-05-03 18:49:37 +02:00
Laurent Destailleur
28b1d83ae9 Make some performance enhancements 2021-05-03 18:29:21 +02:00
Laurent Destailleur
ec544cb20e Merge pull request #17451 from daraelmin/daraelmin-new-amntbyadhtype 
NEW #17292 default subscription amount by adherent type
 2021-05-03 15:32:39 +02:00
Laurent Destailleur
cc0739d531 Merge pull request #17456 from dolibit-ut/patch-309 
Update llx_20_c_departements.sql
 2021-05-03 13:17:24 +02:00
Laurent Destailleur
a9da0ec93f Merge pull request #17432 from dolibit-ut/patch-307 
Update llx_00_c_country.sql
 2021-05-03 13:17:03 +02:00
UT from dolibit
5408671f8e Update llx_10_c_regions.sql 
Morocco - changed its regions in 2015 
insert at first only a comment

check how to change for migration of old user datasets
 2021-05-02 13:44:06 +02:00
UT from dolibit
9e2a987ee3 Update llx_20_c_departements.sql 
Morocco / Maroc Provinces (have to check before/after year 2015)
 2021-05-02 13:17:05 +02:00
daraelmin
8457fef1a2 Update llx_adherent_type.sql 2021-05-01 20:10:17 +02:00
daraelmin
5ff60c31e6 Update 13.0.0-14.0.0.sql 2021-05-01 20:08:32 +02:00
Laurent Destailleur
278d8c1317 Debug 2021-04-30 15:34:02 +02:00
lmarcouiller
ce677c4f27 Fix #17361 : change of llx_export_model type to varchar(64) 2021-04-30 14:50:18 +02:00
Laurent Destailleur
67fd5477c9 Merge pull request #17427 from Hystepik/develop#4 
New Module Knowledge Management
 2021-04-30 12:12:15 +02:00
Laurent Destailleur
baef062295 Merge pull request #17431 from dolibit-ut/patch-306 
Update llx_20_c_departements.sql
 2021-04-30 12:01:46 +02:00
UT from dolibit
5f7a3571cd Update llx_00_c_country.sql 
countries in english
 2021-04-29 16:08:27 +02:00
UT from dolibit
2c8ab51dac Update llx_20_c_departements.sql 
Portugal (remove '' at fk_region)
 2021-04-29 15:55:38 +02:00
UT from dolibit
54ab2e523d Update llx_10_c_regions.sql 
Hungary - sorting & regions in hungarian
 2021-04-29 15:40:45 +02:00
altairis-noe
38bba5dddc Merge branch 'develop' into batch_status_dict 2021-04-29 13:13:41 +02:00
altairis-noe
f7182d43fd add entity in c_productbatch_qcstatus key 2021-04-29 13:00:47 +02:00
altairis-noe
762f41ea86 llx_c_productbatch_qcstatus as dictionnary name 2021-04-29 12:49:15 +02:00
lmarcouiller
d4fb9c7c47 knowledgemanager finished 2021-04-29 10:49:56 +02:00
Dorian Vabre
cb21131259 Merge branch 'develop' into dev_EventOrganizer_payment 2021-04-29 10:31:43 +02:00
lmarcouiller
6da32015f4 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#4 2021-04-29 09:45:30 +02:00
Antonin MARCHAL
6dafb98707 Merge branch 'develop' of https://github.com/ibuiv/dolibarr into develop 2021-04-29 01:20:42 +02:00
Antonin MARCHAL
c89830b25b fix(sql) pmp added to create table both migration and install 2021-04-29 01:17:21 +02:00
Laurent Destailleur
b56b9aa707 Merge branch 'develop' into develop 2021-04-28 16:05:07 +02:00
antonin_tdj
0108826ee5 add column instead of just add 2021-04-28 16:03:40 +02:00
Laurent Destailleur
4ca4c5a0fc Merge pull request #17417 from dolibit-ut/patch-304 
Update llx_20_c_departements.sql
 2021-04-28 15:08:36 +02:00
Laurent Destailleur
4a3360b992 Merge pull request #17419 from atm-gauthier/develop_fixes_on_salaries_and_vat 
Develop fixes on salaries and vat
 2021-04-28 15:04:19 +02:00
lmarcouiller
97043ca665 New module KnowledgeManagement 2021-04-28 14:57:49 +02:00
Gauthier PC portable 024
01ddc13b2e FIX : on update current_timestamp for postgres 2021-04-28 13:06:19 +02:00
Gauthier PC portable 024
4af2f8871a FIX : on update current_timestamp 2021-04-28 12:27:07 +02:00
UT from dolibit
26a7c2613a Update llx_20_c_departements.sql 
Taiwan
Slovenia (need to check SI-Id)
Panama
 2021-04-28 10:03:02 +02:00
UT from dolibit
29cb154028 Update llx_10_c_regions.sql 
China
Taiwan

sorting completed
 2021-04-28 09:38:19 +02:00
altairis-noe
9fc67275fd llx_c_productbatch_status to migration and translatable strings 2021-04-27 15:55:51 +02:00
kamel
3a673c9210 Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_00007 2021-04-27 12:29:10 +02:00
Antonin MARCHAL
5fd0c1b810 fix(code)eldy's remarks 2021-04-27 09:55:35 +02:00