Commit Graph

72769 Commits

Author SHA1 Message Date
Philippe GRAND
b8ec33d29b fix translations 2019-01-27 17:28:18 +01:00
Philippe GRAND
95bbb46fdf fix translations 2019-01-27 12:20:24 +01:00
Philippe GRAND
a6c40dc867 fix translations 2019-01-27 11:37:57 +01:00
Laurent Destailleur
a9da6a2d51
Merge pull request #10410 from ptibogxiv/patch-107
NEW manage statut member type
2019-01-26 15:44:40 +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
Laurent Destailleur
cc574852d2 Fix phpcs 2019-01-26 15:20:36 +01:00
Pierre Ardoin
6fdbded588
Update functions.lib.php 2019-01-26 14:40:00 +01:00
Laurent Destailleur
e46fb303d0
Merge pull request #10386 from atm-florian/dev_newhiglightinvoice_onpayment
NEW show in blod invoice amount where we came from when making payment
2019-01-26 14:29:20 +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
Laurent Destailleur
ab262237b2
Merge pull request #10393 from fappels/10_add_product_dimensions
NEW Show product dimensions in product list tooltip.
2019-01-26 14:14:03 +01:00
Laurent Destailleur
f96d730943
Merge pull request #10391 from grandoc/new_branch_22_01_2019
update with html5 compliant code
2019-01-26 14:09:15 +01:00
Laurent Destailleur
60c9eccbc4
Merge pull request #10395 from fappels/10_work_on_supplier_price_history
Work on #10394 supplier price history
2019-01-26 14:08:15 +01:00
Laurent Destailleur
4a5d260db5
Update fournisseur.product.class.php 2019-01-26 14:07:37 +01:00
Laurent Destailleur
adb7ec7015
Merge pull request #10399 from grandoc/new_branch_23_01_2019
update with html5 compliant code
2019-01-26 14:02:26 +01:00
Laurent Destailleur
999f84458f
Merge pull request #10415 from grandoc/new_branch_25_01_2019
fix : The condition  == 3 is always false
2019-01-26 14:01:35 +01:00
Laurent Destailleur
d3decebd83
Merge pull request #10418 from grandoc/new_branch_26_01_2019
fix : bad type cast
2019-01-26 14:00:59 +01:00
Laurent Destailleur
f313791e57
Merge pull request #10400 from andreubisquerra/master
Bills and coins pad, or Num pad in TakePOS
2019-01-26 13:55:45 +01:00
Laurent Destailleur
6b4b03e6aa
Merge pull request #10405 from grandoc/new_branch_24_01_2019
update with html5 compliant code
2019-01-26 13:52:10 +01:00
Laurent Destailleur
a10203bfad
Merge pull request #10378 from rycks/exportJournaux
Export journaux
2019-01-26 13:51:41 +01:00
Philippe Grand
a1b90638d4
Update card.php
fix
2019-01-26 09:10:16 +01:00
Philippe GRAND
b1ea5af876 fix : bad type cast 2019-01-26 09:02:49 +01:00
Laurent Destailleur
61290013dd Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-26 01:46:41 +01:00
Laurent Destailleur
89420dde62 Fix translation 2019-01-26 01:44:28 +01:00
Laurent Destailleur
cfa850cd20 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-26 01:32:00 +01:00
Laurent Destailleur
3f75bb694c Fix phpcs 2019-01-26 01:31:22 +01:00
Laurent Destailleur
70c52e6417 Add field calling_duration in table llx_actioncomm 2019-01-26 01:17:41 +01:00
Philippe GRAND
133e6f3de0 useless code 2019-01-25 16:27:36 +01:00
Philippe GRAND
0d089f2fec fix : The condition == 3 is always false 2019-01-25 15:50:30 +01:00
Laurent Destailleur
e42fe4022a Uniformize lenght of small list 2019-01-25 15:22:36 +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
Laurent Destailleur
63e04823b2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-25 11:57:01 +01:00
Laurent Destailleur
63c66095e6 Work on file export 2019-01-25 11:56:50 +01:00
ptibogxiv
13ff5f9804
Fix travis & Blank line 2019-01-24 21:32:40 +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
Laurent Destailleur
a5daa25707 Move common code to get sell price into a method 2019-01-24 19:45:17 +01:00
ptibogxiv
a0142a73a5
Update type.php 2019-01-24 19:30:36 +01:00
ptibogxiv
2aa2cd331e
Update type.php 2019-01-24 19:26:36 +01:00
ptibogxiv
7197f43c3a
manage statut type 2019-01-24 19:23:01 +01:00
ptibogxiv
634810b8b3
NEW conditionnal add member button by statut 2019-01-24 18:40:41 +01:00
Laurent Destailleur
2c8557e2e0 Work on invoicing of time spent 2019-01-24 18:16:14 +01:00
Philippe GRAND
c1b0d3667a update with html5 compliant code 2019-01-24 16:47:19 +01:00
Philippe GRAND
0b353dc560 update with html5 compliant code 2019-01-24 16:43:28 +01:00
Philippe GRAND
7c086ba8ed update with html5 compliant code 2019-01-24 10:02:06 +01:00
Philippe GRAND
1599f165ee update with html5 compliant code 2019-01-24 09:57:39 +01:00
Laurent Destailleur
c95b915db3 Merge branch '9.0' of github.com:Dolibarr/dolibarr into 9.0 2019-01-24 07:07:31 +01:00
Laurent Destailleur
ecb16cf914 Trans 2019-01-24 07:07:26 +01:00
andreubisquerra
5b3559418f Bills and coins pad, or Num pad in TakePOS 2019-01-23 20:59:34 +01:00