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
8d019a2759
Merge pull request #10409 from atm-florian/9.0
...
fix broken link into contact tpl
2019-01-26 13:52:32 +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
Laurent Destailleur
7f13319d9a
Merge pull request #10402 from frederic34/patch-2
...
fix travis
2019-01-26 13:48:58 +01:00
Laurent Destailleur
6867a8a88a
Typo
2019-01-26 13:46:59 +01:00
Laurent Destailleur
43694f9384
FIX Compatibility with windows 10
2019-01-26 13:32:36 +01:00
Laurent Destailleur
97cc414b29
Update doliwamp
2019-01-26 12:35:02 +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
florian HENRY
822706000f
fix broken link into contact tpl
2019-01-24 18:01:40 +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
Frédéric FRANCE
4c70c05e20
fix travis
2019-01-23 23:35:57 +01:00
Alexandre SPANGARO
9ff848210f
NEW: Automatically binding for intra/export accountancy code
2019-01-23 22:14:13 +01:00
andreubisquerra
5b3559418f
Bills and coins pad, or Num pad in TakePOS
2019-01-23 20:59:34 +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
Philippe GRAND
7ff1555e58
update with html5 compliant code
2019-01-23 17:39:40 +01:00
Philippe GRAND
540e6d6f79
update with html5 compliant code
2019-01-23 17:34:30 +01:00
John BOTELLA
624d17c96a
Fix missing no trigger arg
2019-01-23 17:32:49 +01:00
Philippe GRAND
6625dac8d7
update with html5 compliant code
2019-01-23 17:28:02 +01:00
John BOTELLA
1c51716997
Fix missing trigger
2019-01-23 17:02:20 +01:00
Laurent Destailleur
278b3e0b08
Fix css
2019-01-23 15:30:54 +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
ad54a2b8af
Fix website edit of virtualhost
2019-01-23 15:06:28 +01:00
Laurent Destailleur
e33f102dc2
FIX Edit of virtualhost
2019-01-23 14:57:43 +01:00
