Frédéric FRANCE
26dea99375
Update box_task.php
2019-01-28 00:07:38 +01:00
Frédéric FRANCE
764a928cd6
wip
2019-01-27 23:48:36 +01:00
Frédéric FRANCE
ff39491f15
wip
2019-01-27 23:31:37 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-27 23:23:38 +01:00
Laurent Destailleur
46bc078481
Fix phpcs
2019-01-27 23:10:10 +01:00
Laurent Destailleur
ecc30b8ffe
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
2019-01-27 18:27:58 +01:00
Laurent Destailleur
f30a3d59ba
Merge branch 'develop' into toomanylines
2019-01-27 17:59:13 +01:00
Laurent Destailleur
a268a13c89
Merge pull request #10423 from grandoc/new_branch_27_01_2019
...
fix translations
2019-01-27 17:55:05 +01:00
Laurent Destailleur
4f9f0fd7b5
Merge branch 'develop' into elseif
2019-01-27 17:54:06 +01:00
Philippe GRAND
b8ec33d29b
fix translations
2019-01-27 17:28:18 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing
2019-01-27 15:20:16 +01:00
Frédéric FRANCE
496fa9b0fb
PSR2.Files.EndFileNewline.TooMany
2019-01-27 14:10:35 +01:00
Philippe GRAND
95bbb46fdf
fix translations
2019-01-27 12:20:24 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
Philippe GRAND
a6c40dc867
fix translations
2019-01-27 11:37:57 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged
2019-01-27 10:49:34 +01:00
Frédéric FRANCE
46b6d16210
correct menu
2019-01-27 09:17:01 +01:00
Laurent Destailleur
462c1f9c1a
Merge pull request #10413 from mapiolca/patch-8
...
Add date_livraison substitution
2019-01-26 15:38:00 +01:00
Pierre Ardoin
6fdbded588
Update functions.lib.php
2019-01-26 14:40:00 +01:00
Laurent Destailleur
fd192f10c4
Merge pull request #10341 from hregis/8.0_bug
...
FIX security broken with Multicompany
2019-01-26 14:28:13 +01:00
Laurent Destailleur
b4400b95db
Merge pull request #10411 from BitKFu/develop
...
Added new calculation fields for the doc generator
2019-01-26 14:17:43 +01:00
Laurent Destailleur
c989b8d102
Update commondocgenerator.class.php
2019-01-26 14:17:01 +01:00
Pierre Ardoin
78f8607d41
Add date_livraison substitution
...
Complete the substitution for supplier orders.
2019-01-25 13:15:24 +01:00
Laurent Destailleur
59e993e834
Code comment
2019-01-25 12:03:07 +01:00
Gerhard Stephan
a78e406e76
Added new calculation fields for the doc generator
...
- object_total_up : Sum of all lines (subprice * qty)
- object_total_up_locale : Localized sum of all lines (subprice * qty)
- object_total_discount : Total discount in percent
- object_total_discount_locale : Localized total discount in percent
- line_total_up : Total sum of a line (subprice * qty)
- line_total_up_locale : Localized Total sum of a line (subprice * qty)
2019-01-24 21:08:13 +01:00
florian HENRY
822706000f
fix broken link into contact tpl
2019-01-24 18:01:40 +01:00
Laurent Destailleur
f9686c47af
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/fr_FR/members.lang
htdocs/langs/fr_FR/stocks.lang
htdocs/website/index.php
2019-01-23 19:22:42 +01:00
Laurent Destailleur
e33f102dc2
FIX Edit of virtualhost
2019-01-23 14:57:43 +01:00
Laurent Destailleur
e860d664d7
Fix substitution of __REF_CLIENT__
2019-01-23 11:54:20 +01:00
Laurent Destailleur
51bdf5f949
Fix trans
2019-01-22 16:06:20 +01:00
Laurent Destailleur
8104b7fa2d
look and feel v10
2019-01-22 15:40:51 +01:00
Laurent Destailleur
8fba387673
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-22 10:39:18 +01:00
Laurent Destailleur
3cca0df28e
Support getFormatedCustomerRef into contract list
2019-01-22 10:39:06 +01:00
Günter Lukas
1cf786acff
Fix #10278
...
Fix #10278
2019-01-22 00:09:36 +01:00
Laurent Destailleur
eba8a8f34d
Merge pull request #10376 from atm-maxime/fix_extrafields_computed
...
Compute value of computed extrafield on fetch, not on show
2019-01-21 23:41:06 +01:00
Laurent Destailleur
8284bd0577
Remove useless class
2019-01-21 18:12:25 +01:00
Laurent Destailleur
d38ed67a3c
Merge pull request #10383 from grandoc/new_branch_21_01_2019
...
update with html5 compliant code
2019-01-21 18:05:40 +01:00
Laurent Destailleur
42743027d4
Merge branch 'develop' into objectline_etc
2019-01-21 18:04:48 +01:00
torvista
62abf82297
remove dev comment
2019-01-21 16:32:02 +01:00
torvista
9b1cf648dc
more validation fixes
2019-01-21 16:19:31 +01:00
torvista
827c836e6e
Whne multicurrency in use, the Add button colspan is incorrect (6 instead of 5) since it is incrementing colspan in addition to a previous incrment in the title bar.
...
This corrects the table.
2019-01-21 16:18:39 +01:00
torvista
3cca072e26
correction of missing "
2019-01-21 16:16:21 +01:00
Laurent Destailleur
8950720fb5
NEW Add getFormatedCustomerRef and getFormatedSupplierRef methods
2019-01-21 15:22:35 +01:00
Maxime Kohlhaas
23438b1f48
Compute extrafields after having set all others
2019-01-21 14:40:33 +01:00
Maxime Kohlhaas
f50de03585
Merge branch 'develop' of github.com:atm-maxime/dolibarr into fix_extrafields_computed
2019-01-21 14:36:23 +01:00
Maxime Kohlhaas
6775e93762
Merge branch '8.0' of github.com:atm-maxime/dolibarr into fix_extrafields_computed
2019-01-21 14:33:49 +01:00
Maxime Kohlhaas
a2f5c72b54
Merge branch '8.0' of github.com:atm-maxime/dolibarr into fix_extrafields_computed
2019-01-21 14:33:25 +01:00
Laurent Destailleur
0cba7e1613
FIX Hide path into exported filename
2019-01-21 14:31:27 +01:00
Laurent Destailleur
0b199f4d28
FIX Hide path into exported filename
2019-01-21 14:31:03 +01:00
Laurent Destailleur
495b04a3c7
FIX Hide path into exported filename
2019-01-21 14:30:50 +01:00
