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

106963 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pierre Ardoin
ec00c6fef2
line deleted when updated after rapproched 
Fix an issue that deletes line when we update data after its rappro.
 2022-05-09 09:49:07 +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
b4e1bac32d
Merge pull request #20783 from fappels/14_fix_error_handling 
Fix errors.lang merge conflict and fix reception error handling
 2022-05-08 19:12:11 +02:00
Laurent Destailleur
a65e9f33db
Merge pull request #20793 from atm-gauthier/fix_salaries_payments_and_stats 
FIX : in salary stats and payment list, we must check right perms as well as salary list
 2022-05-08 19:11:54 +02:00
Laurent Destailleur
cfe347de17
Merge pull request #20799 from FHenry/15.0_fix_invoice_stat 
fix: invoice stat
 2022-05-08 19:03:55 +02:00
Laurent Destailleur
65eb11efdf Fix sql migration 2022-05-08 17:39:53 +02:00
Florian HENRY
318e403013 fix: invoice stat 2022-05-06 16:15:52 +02:00
Laurent Destailleur
177f3f9ca4 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-05-06 12:43:56 +02:00
Laurent Destailleur
0426be5059 FIX Update of sale price (log not correctly updated) 
Conflicts:
	htdocs/product/class/product.class.php
	htdocs/product/price.php
 2022-05-06 12:42:45 +02:00
Laurent Destailleur
f222328ff8 FIX Update of sale price (log not correctly updated) 2022-05-06 12:37:18 +02:00
Laurent Destailleur
203c4e8082 Fix bad test 2022-05-06 11:48:15 +02:00
Gauthier PC portable 024
2256f8811d FIX : in salary stats and payment list, we must check right perms as well as salary list 2022-05-06 11:24:53 +02:00
Laurent Destailleur
f3a630fd30 Clean code 2022-05-06 05:21:26 +02:00
Laurent Destailleur
583343a171 Clean code 2022-05-06 05:08:54 +02:00
Francis Appels
10e13286d3 Add missing reception back to draft error handling 2022-05-05 11:08:17 +02:00
Francis Appels
29d1424413 fix merge conflict 
Add missing error translation key
 2022-05-05 11:07:39 +02:00
Laurent Destailleur
82ab41a7f3 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-05-04 20:37:13 +02:00
Laurent Destailleur
05e22fb8bc css 2022-05-04 20:36:59 +02:00
Laurent Destailleur
e3b777ad5b
Merge pull request #20649 from FHenry/15.0_fix_createtable_without_migration_script 
fix: CREATE TABLE llx_element_tag without migration script
 2022-05-04 17:15:53 +02:00
Laurent Destailleur
55e60bf628
Merge pull request #20768 from atm-john/15.0_fix_fatal_error_on_task_list 
FIX : fatal error for $db  usage in tpl
 2022-05-04 16:46:22 +02:00
Laurent Destailleur
763c86144e Fix add invoice to email 2022-05-04 15:51:24 +02:00
Laurent Destailleur
8f7e162406 Fix css 2022-05-04 15:27:23 +02:00
Laurent Destailleur
82f7f30f0a Clean code 2022-05-04 14:58:50 +02:00
Laurent Destailleur
ae282245fe FIX assign member cateogry to a member 2022-05-03 21:54:34 +02:00
Laurent Destailleur
c55da219d9 FIX sending email on payment of registration of event 2022-05-03 20:35:28 +02:00
John BOTELLA
7d3030aa8e Fix fatal error for usage in tpl 2022-05-03 12:31:30 +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
0cc3eec599 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-05-03 11:55:45 +02:00
Laurent Destailleur
36fdee3337 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-05-03 11:54:57 +02:00
Laurent Destailleur
a254412c61 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/debugbar/class/DataCollector/DolLogsCollector.php
 2022-05-03 11:54:28 +02:00
Laurent Destailleur
cc1a3080d0 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2022-05-03 11:53:23 +02:00
Laurent Destailleur
b5f887b3e4 Fix DEBUGBAR_USE_LOG_FILE 2022-05-03 11:52:32 +02:00
Laurent Destailleur
be4a6788bb Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-05-01 20:48:11 +02:00
Laurent Destailleur
6308b700d5 # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
 2022-05-01 20:47:54 +02:00
Laurent Destailleur
971714f8e3 phpcs 2022-05-01 20:46:23 +02:00
Laurent Destailleur
e811fbb75b
Merge pull request #20660 from hregis/fix_backport_and_ics_not_mandatory_with_bank_transfer 
FIX SEPA ICS is not mandatory for bank transfer
 2022-05-01 13:47:35 +02:00
Laurent Destailleur
6040bcfad2
Merge pull request #20734 from lainwir3d/inventory_dont_use_batch_qty_20733 
FIX #20733 Inventory: Do not use batch qty even if present if batch module is disabled.
 2022-05-01 12:25:01 +02:00
Laurent Destailleur
08461957b5 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-04-30 17:20:07 +02:00
Laurent Destailleur
819568bfbf Fix generation of specimen pdf for modulebuilder and recruitment module 2022-04-30 17:19:18 +02:00
Laurent Destailleur
e5aa4afabd
Merge pull request #20683 from hregis/fix_missing_getentity 
FIX compatibility with multicompany sharings
 2022-04-29 18:35:26 +02:00
Laurent Destailleur
2676aeb93f
Merge pull request #20681 from hregis/fix_missing_hook_parameter 
FIX missing hook parameter ($possiblelinks)
 2022-04-29 18:01:32 +02:00
Laurent Destailleur
93de425c47 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
 2022-04-29 17:32:28 +02:00
Laurent Destailleur
eb92b7a25f Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-04-29 17:27:29 +02:00
Laurent Destailleur
17a2aa8f1b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/modulebuilder/template/class/myobject.class.php
 2022-04-29 17:27:12 +02:00
BENKE Charlene
364799582a fix : allow cut&paste as real numeric value to excel 2022-04-29 17:24:55 +02:00
Laurent Destailleur
a6f48868f1
Merge pull request #20689 from atm-gauthier/FIX/trad_expense_tax_cat_label 
FIX : label tax cat trad
 2022-04-29 17:22:15 +02:00
Laurent Destailleur
7a440d8c73
Merge pull request #20713 from daraelmin/daraelmin-bookkeping-create-mode 
Fix #20712 - No more empty wrong line added in bookkeeping confirme_create
 2022-04-29 17:08:49 +02:00
Laurent Destailleur
e1aaeeef29 FIX #20140 #20301 2022-04-29 16:57:23 +02:00
matll42
ff35bf8d47 FIX #20476 migration postgresql 14.0.x to 15.0.x packaging type 2022-04-29 16:53:48 +02:00