lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
97,047 Commits 43 Branches 150 Tags 886 MiB
70f00294e4
Commit Graph

97047 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
70f00294e4
Merge pull request #17014 from dolibit-ut/patch-185 
Update bom_note.php
 2021-03-29 23:44:53 +02:00
Laurent Destailleur
62cac7caa5
Merge pull request #17010 from dolibit-ut/patch-182 
Create index.html
 2021-03-29 23:44:39 +02:00
Laurent Destailleur
0d553008ad
Merge pull request #17012 from dolibit-ut/patch-183 
Update llx_20_c_departements.sql
 2021-03-29 23:44:23 +02:00
Laurent Destailleur
cdeaf858cf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-29 23:43:19 +02:00
Laurent Destailleur
757a186b3c Fix phpunit 2021-03-29 23:43:07 +02:00
Laurent Destailleur
46b33a4bbd
Merge pull request #16998 from dolibit-ut/patch-170 
Update card.php
 2021-03-29 23:40:48 +02:00
UT from dolibit
bd1f3d8b69
Update bom_note.php 
$help_url = 'EN:Module_BOM';
 2021-03-29 23:35:41 +02:00
Laurent Destailleur
3616d2ba44 FIX #yogosha5770 2021-03-29 23:24:52 +02:00
Laurent Destailleur
32bec56529 Using " for html is better 2021-03-29 23:14:42 +02:00
UT from dolibit
ed1107f095
Update llx_20_c_departements.sql 
Argentina
 2021-03-29 23:01:35 +02:00
Laurent Destailleur
e26abd222b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-29 22:58:57 +02:00
Laurent Destailleur
b702d2b534 Fix CSRF for more GET 2021-03-29 22:58:44 +02:00
Laurent Destailleur
6e331fd45f Fix CSRF for GET 2021-03-29 22:51:36 +02:00
UT from dolibit
81437473c2
Create index.html 2021-03-29 22:46:46 +02:00
Laurent Destailleur
ce5bea7b34 FIX #yogosha5751 2021-03-29 22:43:39 +02:00
Laurent Destailleur
41ec8893e4 Fix get mode 2021-03-29 22:05:04 +02:00
Laurent Destailleur
843e0a2c39 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/core/class/html.formother.class.php
	htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
	htdocs/projet/tasks/time.php
	htdocs/webservices/server_thirdparty.php
 2021-03-29 21:47:31 +02:00
Laurent Destailleur
2689bc938d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-03-29 21:40:01 +02:00
Laurent Destailleur
f4ae8af9ea Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/accountancy/bookkeeping/listbyaccount.php
	htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
 2021-03-29 21:39:53 +02:00
UT from dolibit
1453bf6daa
Update card.php 
add => DE:Modul_Spenden
 2021-03-29 21:38:59 +02:00
Laurent Destailleur
6057d8aabd Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/tpl/login.tpl.php
 2021-03-29 21:37:21 +02:00
Laurent Destailleur
eabe5ae616 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2021-03-29 21:35:54 +02:00
Laurent Destailleur
8c08b3945b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2021-03-29 21:35:46 +02:00
Laurent Destailleur
c4a8dca4ab FIX #yogosha5756 2021-03-29 21:35:19 +02:00
Laurent Destailleur
dc0922c8f0 Clean file not used 2021-03-29 21:33:01 +02:00
Laurent Destailleur
1d87f060dc Fix #yogosha5756 2021-03-29 21:30:26 +02:00
Laurent Destailleur
d93fbcd00b Fix sql error 2021-03-29 21:17:41 +02:00
Laurent Destailleur
0d5c613008 Complete fix 2021-03-29 21:10:21 +02:00
Laurent Destailleur
adf15e4e64 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-29 21:04:49 +02:00
Laurent Destailleur
ae0468e107 FIX #yogosha5765 2021-03-29 21:04:33 +02:00
Laurent Destailleur
5bbfe7ed19
Merge pull request #16930 from aspangaro/14a27 
NEW: Add a sub table to manage accountancy on product/company
 2021-03-29 20:11:02 +02:00
Laurent Destailleur
92e479955f
Merge pull request #16969 from dolibit-ut/patch-168 
Update llx_20_c_departements.sql
 2021-03-29 19:24:32 +02:00
Laurent Destailleur
9183c73846
Merge pull request #16968 from dolibit-ut/patch-167 
Update llx_10_c_regions.sql
 2021-03-29 19:23:58 +02:00
Laurent Destailleur
715490be0b
Merge pull request #16929 from aspangaro/14a28 
NEW: Add company info in dropdown login menu
 2021-03-29 19:02:12 +02:00
Laurent Destailleur
93627012cd
Merge pull request #16995 from atm-gauthier/fix_list_uniformization 
FIX : display debug if !$conf->banque->enabled
 2021-03-29 18:02:58 +02:00
Laurent Destailleur
f4b0723f30
Update list.php 2021-03-29 17:41:19 +02:00
Laurent Destailleur
b732a82c3d
Update list.php 2021-03-29 17:40:36 +02:00
Laurent Destailleur
a23a2a0119
Merge pull request #16988 from daraelmin/daraelmin-patch-excluded 
Fix #16899 New stuff related to excluded members forgotten during transfer to box graph
 2021-03-29 17:39:58 +02:00
Laurent Destailleur
64b925a5d8
Update index.php 2021-03-29 17:39:11 +02:00
Laurent Destailleur
cdc1ae6f59
Update adherent.class.php 2021-03-29 17:38:37 +02:00
stickler-ci
e1e3bcbf28 Fixing style errors. 2021-03-29 15:26:24 +00:00
Gauthier PC portable 024
139a1ba70d FIX : if $conf->banque->enabled 2021-03-29 17:22:19 +02:00
Laurent Destailleur
36dfcc0646
Merge pull request #16976 from atm-florianm/NEW_14.0_hooks_on_CA_by_product_report 
WIP: NEW 14.0 - SQL-altering hooks in the turnover by product report
 2021-03-29 17:18:17 +02:00
Laurent Destailleur
66ca619669
Merge pull request #16986 from asolslk/patch-6 
Update contact.php
 2021-03-29 17:13:52 +02:00
Laurent Destailleur
f985a7df3f
Merge pull request #16979 from atm-gauthier/fix_list_uniformization 
Fix list uniformization
 2021-03-29 17:09:22 +02:00
Laurent Destailleur
96363b3913
Merge pull request #16974 from ksar-ksar/develop 
FIX #16940
 2021-03-29 17:07:19 +02:00
Gauthier PC portable 024
28620fe8d8 Merge branch 'fix_list_uniformization' of github.com:atm-gauthier/dolibarr into fix_list_uniformization 2021-03-29 16:27:59 +02:00
Gauthier PC portable 024
53ae1f9d5b Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_list_uniformization 2021-03-29 16:27:44 +02:00
stickler-ci
caa56729b3 Fixing style errors. 2021-03-29 14:25:36 +00:00
Laurent Destailleur
6ad7b12f89
Merge pull request #16973 from ksar-ksar/patch-1 
FIX #16843
 2021-03-29 16:25:18 +02:00