Laurent Destailleur
|
bd2c7092a4
|
Update user.class.php
|
2019-02-03 19:25:11 +01:00 |
|
Laurent Destailleur
|
62d677118d
|
Update adherent.class.php
|
2019-02-03 19:24:18 +01:00 |
|
gauthier
|
bfc7265cbc
|
FIX : better test on fetch
|
2019-01-31 11:53:10 +01:00 |
|
gauthier
|
0c4e5a6487
|
FIX : better test
|
2019-01-31 09:30:07 +01:00 |
|
gauthier
|
3477cf6bd3
|
FIX : must fetch member in current entity
|
2019-01-29 18:01:28 +01:00 |
|
Laurent Destailleur
|
c6755b3cf1
|
Fix formatting of number in quantity field
|
2019-01-29 15:59:41 +01:00 |
|
Laurent Destailleur
|
b726939d32
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-01-28 16:27:25 +01:00 |
|
Laurent Destailleur
|
9d1a02b0d7
|
Fix language
|
2019-01-28 16:25:37 +01:00 |
|
Laurent Destailleur
|
9dbf41d6b2
|
Fix lang format
|
2019-01-28 16:25:06 +01:00 |
|
Laurent Destailleur
|
4545c0f13a
|
Fix lang format of en_ZA
|
2019-01-28 16:25:01 +01:00 |
|
Laurent Destailleur
|
a78db45178
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-01-27 18:12:36 +01:00 |
|
Laurent Destailleur
|
3e78807cbc
|
Merge pull request #10424 from EuskalMoneta/7.0
FIX 'statut' is ignored when updating a user with the REST API.
|
2019-01-27 17:56:14 +01:00 |
|
Laurent Destailleur
|
d59097f65c
|
Fix upload of module file
|
2019-01-27 17:40:56 +01:00 |
|
Xebax
|
94d3f038eb
|
FIX 'statut' is ignored when updating a user with the REST API.
|
2019-01-27 13:20:33 +01:00 |
|
Laurent Destailleur
|
7785f3e3e2
|
Merge pull request #10397 from atm-gauthier/8.0_fix_discount_on_excess_with_creditnote_or_deposit
FIX : when we add a payment on an invoice which already has payments …
|
2019-01-26 14:24:06 +01:00 |
|
gauthier
|
84e1f92acd
|
FIX : when we add a payment on an invoice which already has payments with credit note or deposit amount, and then we get an excess received, discount amount must be $total_paiements + $total_creditnote_and_deposit - $object->total_ttc;
|
2019-01-23 15:16:51 +01:00 |
|
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 |
|