Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-08 17:02:34 +01:00
Code Issues Packages Projects Releases Wiki Activity
83,493 Commits 39 Branches 191 Tags
d491f2cf541a375ec0077893874d9b4087fb8dfb
Commit Graph

83493 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Mortgat
d491f2cf54 [pgsql] type of llx_adherent_type.subscription is VARCHAR(3) so quotes are mandatory 2020-05-27 18:27:10 +02:00
Laurent Destailleur
e2680fa29a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/class/html.form.class.php
 2020-05-27 14:39:19 +02:00
Laurent Destailleur
a207365bd2 FIX XSS using the renaming of .noexe files - reported by Nolan. 2020-05-27 13:12:18 +02:00
Laurent Destailleur
e02aa4e41b FIX Default bank account was not loaded for document generation. 2020-05-26 23:22:14 +02:00
Laurent Destailleur
2595f571c7 Fix exclude credit note when searching situation invoice to use for next 2020-05-25 00:21:09 +02:00
Laurent Destailleur
fe6453194e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-05-23 20:18:17 +02:00
Laurent Destailleur
45ddde6940 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
	htdocs/holiday/class/holiday.class.php
	htdocs/index.php
 2020-05-23 20:18:10 +02:00
Laurent Destailleur
4004aeb257 Merge pull request #13915 from atm-quentin/Fix_missing_getnomurl_warehouse_hook 
FIX missing GetNomURL Hook in warehouse class
 2020-05-23 14:57:28 +02:00
Laurent Destailleur
b7fbda8d08 Merge pull request #13924 from atm-lena/11.0_AddHook_Massstockmove 
Add Hook "Massstockmove"
 2020-05-23 14:25:12 +02:00
Laurent Destailleur
1e6cc80438 Merge pull request #13923 from atm-gauthier/11.0_rename_bank_releve 
FIX : We must only rename current bank receipt
 2020-05-23 14:24:51 +02:00
Laurent Destailleur
e29d2588cf Merge pull request #13931 from altatof/fixdispatch 
FIX missing rollbacks on trigger bad return
 2020-05-23 14:24:15 +02:00
Laurent Destailleur
475abbe24b Merge pull request #13944 from atm-maxime/fix_board_expensereport 
Fix board expensereport and holiday
 2020-05-23 14:20:28 +02:00
Maxime Kohlhaas
fb0f31c142 Fix board filters for expense report and holiday 2020-05-22 00:33:30 +02:00
Maxime Kohlhaas
6434f255c3 Fix load_state_board doesn't take parameters 2020-05-22 00:32:55 +02:00
Laurent Destailleur
9e3e8df60f Fix phpcs 2020-05-20 23:56:06 +02:00
Laurent Destailleur
650bddde0d Fix phpcs 2020-05-20 23:25:10 +02:00
Laurent Destailleur
6f52c62f2a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/install/mysql/migration/repair.sql
	htdocs/langs/en_US/bills.lang
 2020-05-20 19:53:28 +02:00
Laurent Destailleur
434341316b suggest some fix to debug situation invoices 2020-05-20 19:51:04 +02:00
altairis
55def0248c fix missing rollbacks 2020-05-20 14:37:35 +02:00
Laurent Destailleur
18ec65b4af Fix: action on an ID must not include test on entity. 2020-05-19 22:06:17 +02:00
atm-lena
bf9756b8c4 Add Hook "Massstockmove" 2020-05-19 16:05:13 +02:00
gauthier
f3582d891a FIX : We must only rename current bank receipt 2020-05-19 15:35:37 +02:00
atm-quentin
e39774a508 add more hook param 2020-05-19 10:05:26 +02:00
atm-quentin
f073b7023a FIX missing GetNomURL Hook in warehouse class 2020-05-19 09:52:33 +02:00
Laurent Destailleur
82a8c42441 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-05-18 15:54:47 +02:00
Laurent Destailleur
9336828710 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/paiement/card.php
	htdocs/expedition/class/expedition.class.php
 2020-05-18 15:54:39 +02:00
Laurent Destailleur
6d62e92e12 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-05-18 15:50:42 +02:00
Laurent Destailleur
45345440a4 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	scripts/cron/cron_run_jobs.php
 2020-05-18 15:50:36 +02:00
Laurent Destailleur
e29f4083e5 Merge pull request #13904 from atm-maxime/fix_merge_contactrole 
Fix third merge issue with contact roles
 2020-05-18 15:11:10 +02:00
Laurent Destailleur
40565cdf06 Merge pull request #13907 from ptibogxiv/patch-341 
FIX php error if multicompany disabled
 2020-05-18 15:07:55 +02:00
Laurent Destailleur
ca14f9a0fa Merge pull request #13901 from atm-maxime/fix_cron_globals 
Fix cron globals reload, missing mysoc and langs
 2020-05-18 15:02:00 +02:00
Laurent Destailleur
18a19dafe5 Update cron_run_jobs.php 2020-05-18 15:01:29 +02:00
Laurent Destailleur
3d385dd378 Merge pull request #13903 from atm-maxime/fix_actioncomm_fetch_entity 
Fix : entity was missing in actioncomm fetch
 2020-05-18 14:59:10 +02:00
Laurent Destailleur
2d1f151fb2 Merge pull request #13905 from atm-maxime/fix_expedition_fetch_entity 
Fix : entity was missing in expedition fetch
 2020-05-18 14:58:57 +02:00
ptibogxiv
a9d1519f96 FIX php error if multicompany disabled 2020-05-18 14:52:33 +02:00
Maxime Kohlhaas
3d9d5d0ad5 Fix : entity was missing in expedition fetch 2020-05-18 11:03:32 +02:00
Maxime Kohlhaas
baa502a224 Fix third merge issue with contact roles 2020-05-18 10:54:25 +02:00
Maxime Kohlhaas
cf96383bf9 Fix : entity was missing in actioncomm fetch 2020-05-18 10:44:55 +02:00
Maxime Kohlhaas
54af917afb Fix cron globals reload, missing mysoc and langs 2020-05-16 20:13:47 +02:00
Laurent Destailleur
8b79b7f074 Update changelog 2020-05-15 20:00:59 +02:00
Laurent Destailleur
762ca96203 FIX #13841 2020-05-15 18:28:15 +02:00
Laurent Destailleur
ddf3f8b244 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-05-15 14:09:36 +02:00
Laurent Destailleur
d430b2896e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-05-15 14:09:26 +02:00
Laurent Destailleur
987d3cf52e Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-05-15 14:04:58 +02:00
Laurent Destailleur
c7b1a43529 Merge pull request #13893 from ptibogxiv/patch-340 
Fix datapolicycron
 2020-05-15 14:04:16 +02:00
Laurent Destailleur
e327d609d7 Merge pull request #13891 from aspangaro/9.0p1 
FIX Site ec.europa.eu has moved to https://
 2020-05-15 14:01:28 +02:00
stickler-ci
e691045c3d Fixing style errors. 2020-05-14 23:20:39 +00:00
ptibogxiv
cb98ec4d23 Fix datapolicycron 2020-05-15 01:18:53 +02:00
Alexandre SPANGARO
3811586cd0 FIX Site ec.europa.eu has moved to https:// 2020-05-14 20:34:48 +02:00
Laurent Destailleur
92b245ae93 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/compta/facture/card.php
 2020-05-14 16:34:24 +02:00