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

68935 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
a4017fa823 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-01-21 20:47:22 +01:00
Laurent Destailleur
6f553db93d Remove bad text 2019-01-21 20:47:07 +01:00
Laurent Destailleur
57c9104f1c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-01-21 02:43:18 +01:00
Laurent Destailleur
5ab6c41dfa Fix missing multicurrency fields in export 2019-01-21 02:43:08 +01:00
Laurent Destailleur
b868397902 Fix colspan 2019-01-21 02:27:13 +01:00
Laurent Destailleur
623bd6ef7a
Merge pull request #10377 from frederic34/patch-2 
get_codeclient return void
 2019-01-20 19:46:31 +01:00
Frédéric FRANCE
077b9f1996
get_codeclient return void 
1ac55b0800/htdocs/societe/class/societe.class.php (L2421-L2441)
 2019-01-20 15:23:48 +01:00
Laurent Destailleur
0e843c56d0 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-01-19 13:20:21 +01:00
Laurent Destailleur
1ac55b0800 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/security2.lib.php
 2019-01-19 13:19:58 +01:00
wdammak
aaa61254ac Update stats.class.php 
Fix div/0 warnings
 2019-01-19 11:36:09 +01:00
wdammak
191900d258 Update stats.class.php 
Fix div/0 warnings
 2019-01-19 11:35:16 +01:00
Laurent Destailleur
45ea1647d0
Merge pull request #10357 from hregis/8.0_mc 
FIX broken external authentication module feature and avoid warning
 2019-01-17 19:15:40 +01:00
Laurent Destailleur
c1c3eb61f8
Merge pull request #10356 from atm-gauthier/6.0_fix_dol_loginfunction 
FIX : if(!function_exists(dol_loginfunction))
 2019-01-17 19:14:46 +01:00
Laurent Destailleur
be9f63274f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-01-17 19:10:35 +01:00
Laurent Destailleur
cb59c97ef7
Merge pull request #10350 from a-schild/7.0 
Fix for issue #10333 branch 7.0
 2019-01-17 18:59:52 +01:00
Laurent Destailleur
55771bdb3d
Merge pull request #10349 from a-schild/8.0 
Fix for issue #10333 branch 8.0
 2019-01-17 18:59:36 +01:00
Regis Houssin
1d33b6ccbb FIX broken external authentication module feature and avoid warning 2019-01-17 16:01:32 +01:00
gauthier
d997309bcb FIX : if(!method_exists(dol_loginfunction)) 2019-01-17 14:49:30 +01:00
Laurent Destailleur
688311c761 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-01-16 16:45:38 +01:00
Laurent Destailleur
698222c769 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/adherents/subscription.php
 2019-01-16 16:45:30 +01:00
Laurent Destailleur
476527e71e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2019-01-16 16:34:46 +01:00
Laurent Destailleur
6becdc8af4 Fix missing substitution of ID 2019-01-16 16:34:36 +01:00
a-schild
7e3bfd332e Fix for issue #10333 
paymentterm.class.php invalid SQL in fetch
 2019-01-16 13:07:00 +01:00
a-schild
7df86cb630 Fix for issue #10333 
paymentterm.class.php invalid SQL in fetch
 2019-01-16 13:06:12 +01:00
Laurent Destailleur
346028c8d5
Merge pull request #10340 from atm-quentin/FIX_Credit_Note_Free_Line 
FIX credit note can have negative value
 2019-01-16 12:11:21 +01:00
atm-quentin
0d384eea00 FIX credit note can have negative value 2019-01-16 09:33:24 +01:00
Laurent Destailleur
f51b4288da
Merge pull request #10336 from hregis/8.0_bug 
FIX avoid php warning
 2019-01-15 17:59:09 +01:00
Laurent Destailleur
6dd905048c
Merge pull request #10334 from hregis/8.0_mc 
FIX problem with multicompany transverse mode
 2019-01-15 17:57:45 +01:00
Laurent Destailleur
adc4422323
Update card.php 2019-01-15 17:57:30 +01:00
Laurent Destailleur
05dc40b6b9
Merge pull request #10331 from frederic34/patch-2 
correct list of links
 2019-01-15 17:52:05 +01:00
Regis Houssin
41a38b3a0a FIX avoid php warning 
Signed-off-by: Regis Houssin <regis.houssin@inodbox.com>
 2019-01-15 15:44:45 +01:00
Regis Houssin
7c9d85d091 FIX problem with multicompany transverse mode 
Signed-off-by: Regis Houssin <regis.houssin@inodbox.com>
 2019-01-15 12:18:04 +01:00
Frédéric FRANCE
cf55b54cf5
correct list of links 2019-01-14 10:02:48 +01:00
Laurent Destailleur
1aa2b7a164 FIX SQL injection on rowid of dict.php 2019-01-10 03:26:34 +01:00
Laurent Destailleur
0d9367b09d
Merge pull request #10305 from tuxgasy/8.0_bill_orders 
Fix #10301 mass bill orders
 2019-01-08 16:50:48 +01:00
Laurent Destailleur
a1f5ede736
Update actions_massactions.inc.php 2019-01-08 16:50:27 +01:00
Laurent Destailleur
47448b77f0
Update actions_massactions.inc.php 2019-01-08 16:47:30 +01:00
TuxGasy
2c2f86736a Fix #10301 mass bill orders and replicate extrafields 2019-01-08 15:59:20 +01:00
Laurent Destailleur
1ee0d42408 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-01-08 14:08:22 +01:00
Laurent Destailleur
6ca163c68b
Merge pull request #10311 from ATM-Marc/FIX_7.0_hook_action_list 
FIX: action list: add printFieldListSelect and printFieldListWhere hooks
 2019-01-08 14:06:24 +01:00
Laurent Destailleur
9a6c3ac3df FIX Selection of email recipient with option MAIN_OPTIMIZEFORTEXTBROWSER 2019-01-08 14:05:07 +01:00
Marc de Lima Lucio
68802c659e FIX: action list: add printFieldListSelect and printFieldListWhere hooks 2019-01-08 11:41:58 +01:00
Laurent Destailleur
9d8b084115 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	ChangeLog
	htdocs/core/actions_sendmails.inc.php
	htdocs/filefunc.inc.php
 2019-01-08 01:48:54 +01:00
Laurent Destailleur
8e3df45cbf Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/holiday/define_holiday.php
 2019-01-08 01:46:03 +01:00
Laurent Destailleur
f85389ac29 Fix missing td column 2019-01-08 01:11:34 +01:00
Laurent Destailleur
41743056bf Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-01-08 01:09:21 +01:00
Laurent Destailleur
087a4400b0 FIX Default value on sales representative on third party creation 2019-01-08 01:05:42 +01:00
Laurent Destailleur
3d578cab28
Merge pull request #10308 from EuskalMoneta/7.0 
FIX Civility not saved when creating a member.
 2019-01-07 14:10:00 +01:00
Xebax
fbb1b344d1 Merge remote-tracking branch 'upstream/7.0' into 7.0 2019-01-06 13:44:13 +01:00
Xebax
2c496d2ac0 FIX Civility not saved when creating a member. 2019-01-06 13:42:41 +01:00