Laurent Destailleur
|
feaca165ad
|
Merge pull request #10809 from joanlouis/fix-extrafields-calls-from-cards-8
Fix extrafields calls from cards for Dolibarr 8 See #10803
|
2019-03-14 14:22:31 +01:00 |
|
Joan Louis
|
17647de4cc
|
Fix extrafields calls from cards for Dolibarr 8 See #10803
|
2019-03-12 11:24:54 +01:00 |
|
Laurent Destailleur
|
15cc21b89f
|
Merge pull request #10783 from aspangaro/8.0_EBP_export-TXT
FIX: Accountancy - Format EBP import
|
2019-03-11 17:52:34 +01:00 |
|
Alexandre SPANGARO
|
49f72b6a9a
|
Merge remote-tracking branch 'upstream/8.0' into 8.0_EBP_export-TXT
|
2019-03-09 05:50:16 +01:00 |
|
Laurent Destailleur
|
5596b2e9bf
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/fourn/class/fournisseur.facture.class.php
|
2019-03-09 00:02:56 +01:00 |
|
Laurent Destailleur
|
520387c03d
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/holiday/card.php
|
2019-03-09 00:01:29 +01:00 |
|
Laurent Destailleur
|
4022d5f529
|
FIX Can not create contract with numbering module without autogen rule
|
2019-03-08 23:58:04 +01:00 |
|
Laurent Destailleur
|
233bd4374a
|
Fix phpcs
|
2019-03-08 19:52:26 +01:00 |
|
Alexandre SPANGARO
|
d926657534
|
FIX: Accountancy - Format EBP import
Add doc
|
2019-03-08 10:57:14 +01:00 |
|
Laurent Destailleur
|
9a9fd15077
|
Fix doxygen
|
2019-03-07 14:10:33 +01:00 |
|
Laurent Destailleur
|
d2f1d0cc33
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/fourn/class/fournisseur.facture.class.php
|
2019-03-07 14:06:11 +01:00 |
|
Laurent Destailleur
|
e96f84a3d6
|
Merge pull request #10765 from altatof/sd8
FIX : supplier discount was not retrieved when choosing a product
|
2019-03-07 13:26:44 +01:00 |
|
Laurent Destailleur
|
0349f9bfaa
|
Update objectline_create.tpl.php
|
2019-03-07 13:26:25 +01:00 |
|
Laurent Destailleur
|
2ae3d75df4
|
Merge pull request #10752 from atm-gauthier/7.0_fix_fourninvoice_specialcode
FIX : we need to keep originline special_code
|
2019-03-07 12:29:00 +01:00 |
|
Laurent Destailleur
|
e3fb228a4d
|
Update fournisseur.facture.class.php
|
2019-03-07 12:28:19 +01:00 |
|
Christophe Battarel
|
96b8da0d62
|
fix supllier discount
|
2019-03-06 22:04:01 +01:00 |
|
gauthier
|
0ff2905180
|
FIX : we need to keep originline special_code
|
2019-03-06 12:10:24 +01:00 |
|
Laurent Destailleur
|
22bb62d900
|
Merge pull request #10737 from atm-gauthier/6.0_fix_wrong_redirect_link
FIX : wrong redirect link on holiday refuse
|
2019-03-05 18:43:57 +01:00 |
|
Laurent Destailleur
|
3db8218cba
|
Merge pull request #10745 from frederic34/patch-6
add session newtoken
|
2019-03-05 18:41:50 +01:00 |
|
Laurent Destailleur
|
98f5bb2ed3
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-03-05 15:55:08 +01:00 |
|
Frédéric FRANCE
|
1bbf6737ec
|
add session newtoken
|
2019-03-05 15:27:31 +01:00 |
|
Laurent Destailleur
|
54b9681257
|
More log to help debug
|
2019-03-04 20:15:31 +01:00 |
|
gauthier
|
dada8c8ff5
|
FIX : wrong redirect link on holiday refuse
|
2019-03-04 17:23:29 +01:00 |
|
Laurent Destailleur
|
acaf5cabef
|
Merge pull request #10332 from ATM-Nicolas/fix_check_picture_name
FIX : Check for old picture name if the new one was not found
|
2019-03-04 16:20:29 +01:00 |
|
Laurent Destailleur
|
76dd9e42d2
|
Merge pull request #10726 from frederic34/patch-3
Update DolibarrModules.class.php
|
2019-03-04 16:05:06 +01:00 |
|
Laurent Destailleur
|
526bd1d02e
|
Fix number format
|
2019-03-03 17:36:43 +01:00 |
|
Frédéric FRANCE
|
3037e4a157
|
Update DolibarrModules.class.php
|
2019-03-02 20:49:53 +01:00 |
|
Laurent Destailleur
|
aea5abd9a1
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-03-02 19:05:58 +01:00 |
|
Laurent Destailleur
|
8f8aaf1e8c
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-03-02 19:05:51 +01:00 |
|
Laurent Destailleur
|
a2eefab696
|
Merge pull request #10714 from ATM-Marc/FIX_7.0_export_actioncomm
FIX: actioncomm export: ORDER BY clause / event type filter
|
2019-03-02 18:44:34 +01:00 |
|
Laurent Destailleur
|
bc9218dee3
|
Merge pull request #10713 from atm-gauthier/8.0_fix_title_project
FIX : project_title for display of getNomUrl()
|
2019-03-02 18:36:42 +01:00 |
|
Marc de Lima Lucio
|
b96ac794e9
|
FIX: actioncomm export: ORDER BY clause is in wrong export property + event type filter does not work
|
2019-02-28 16:15:32 +01:00 |
|
gauthier
|
786c114026
|
FIX : project_title for display of getNomUrl()
|
2019-02-28 16:13:45 +01:00 |
|
Laurent Destailleur
|
c9d240cb73
|
Merge pull request #10671 from hregis/8.0_mc
FIX could not create several superadmin in transversal mode
|
2019-02-28 12:24:50 +01:00 |
|
Laurent Destailleur
|
855aaaffd8
|
Better fix for type of discount
|
2019-02-28 11:44:10 +01:00 |
|
Laurent Destailleur
|
92259810c1
|
Merge pull request #10712 from atm-florian/8.0
fix relative discount for prospect and supplier
|
2019-02-28 11:26:50 +01:00 |
|
Laurent Destailleur
|
74dec41496
|
Merge pull request #10705 from atm-gauthier/8.0_fix_best_error_msg
FIX : if empty error message, we just see "error" displayed
|
2019-02-28 11:25:13 +01:00 |
|
Laurent Destailleur
|
cefaeb583f
|
Update xinputfile.modules.php
|
2019-02-28 11:24:43 +01:00 |
|
Laurent Destailleur
|
85d46a5270
|
Update xinputfile.modules.php
|
2019-02-28 11:24:07 +01:00 |
|
florian HENRY
|
4ebf4780c2
|
fix relative discount for prospect and supplier
|
2019-02-28 09:09:06 +01:00 |
|
gauthier
|
1237a6d3e9
|
FIX : same thing here
|
2019-02-27 14:58:10 +01:00 |
|
gauthier
|
49e03b009f
|
FIX : if empty error message, we just see "error" displayed
|
2019-02-27 14:50:01 +01:00 |
|
Laurent Destailleur
|
86e2ffe323
|
Merge pull request #10390 from glu000/8.0
Fix #10278
|
2019-02-27 02:24:55 +01:00 |
|
Laurent Destailleur
|
238894a7e4
|
Merge pull request #10624 from frederic34/patch-2
selectMulticurrency avoid malformed empty value
|
2019-02-27 02:06:24 +01:00 |
|
Laurent Destailleur
|
a48e9fdba4
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-02-27 01:23:26 +01:00 |
|
Laurent Destailleur
|
c1fa48889e
|
Merge pull request #10677 from frederic34/patch-6
fix #10385
|
2019-02-24 20:46:04 +01:00 |
|
Laurent Destailleur
|
6fdd0191f4
|
Merge pull request #10676 from frederic34/patch-5
fix #10656
|
2019-02-24 20:45:13 +01:00 |
|
Laurent Destailleur
|
2f300ae63f
|
Standardize code with customer invoices
|
2019-02-24 20:26:54 +01:00 |
|
Laurent Destailleur
|
f41d504ba1
|
Merge pull request #10518 from atm-greg/8.0_FIX_bad_values_in_fourn_credit_note
FIX positive values IN supplier credit notes creating diff on addline rounding
|
2019-02-24 20:21:22 +01:00 |
|
Frédéric FRANCE
|
2ad91213b2
|
Update combinations.php
|
2019-02-24 12:09:57 +01:00 |
|