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

83476 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Laurent Destailleur
18ec65b4af Fix: action on an ID must not include test on entity. 2020-05-19 22:06:17 +02:00
gauthier
f3582d891a FIX : We must only rename current bank receipt 2020-05-19 15:35:37 +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
Laurent Destailleur
2b8da85eea Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-05-14 16:20:15 +02:00
Laurent Destailleur
49cfc1afd8 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/install/upgrade2.php
 2020-05-14 16:20:04 +02:00
Laurent Destailleur
f5b9151f17
Merge pull request #13871 from FHenry/11.0 
fix template email on propal list
 2020-05-14 16:10:33 +02:00
Laurent Destailleur
136d002639
Merge pull request #13872 from simnandez/11.0 
FIX: Do not show stats panel if the user does not have permissions
 2020-05-14 16:09:37 +02:00
Laurent Destailleur
aae1b9f7fe
Merge pull request #13873 from ptibogxiv/patch-337 
Fix mailing entity
 2020-05-14 16:00:04 +02:00
Laurent Destailleur
b8265d3604
Merge pull request #13878 from atm-gauthier/10.0_fix_wrong_param 
FIX : wrong url param
 2020-05-14 15:59:37 +02:00
Laurent Destailleur
30c167c6f4
Merge pull request #13885 from atm-maxime/fix_top_menu_search 
Fix top menu search method must be GET
 2020-05-14 15:58:32 +02:00
Laurent Destailleur
cf039b26f9
Merge pull request #13887 from atm-florianm/FIX_9.0_fatal_during_migration_from_dolibarr_3.1_if_php7 
FIX 9.0 - fatal during migration from 3.1 using PHP 7
 2020-05-14 15:49:08 +02:00
Laurent Destailleur
928ed6eecc
Merge pull request #13889 from atm-john/11.0_fix_multicompany_shared_filter 
Fix multicompany supplier product price filter
 2020-05-14 15:44:45 +02:00
ATM john
9f6a5d4cc9 Fix multicompany supplier product price filter 2020-05-14 10:50:20 +02:00
Florian Mortgat
bd3504c473 FIX 9.0 - delete unused mandatory argument from migrate_clean_association: argument count mismatch causes a fatal error since php7 2020-05-13 10:26:44 +02:00
Maxime Kohlhaas
48183b396a Fix top menu search method must be GET 2020-05-13 08:54:42 +02:00
gauthier
fc2f2c6da7 FIX : wrong url param 2020-05-12 17:41:21 +02:00
Laurent Destailleur
0544434482 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-05-12 15:26:11 +02:00
Laurent Destailleur
b6afd86354 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-05-12 15:25:59 +02:00
Laurent Destailleur
4cf99585f8 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-05-12 15:24:15 +02:00
ptibogxiv
e1db0ef855
Update index.php 2020-05-12 10:57:51 +02:00