Commit Graph

73615 Commits

Author SHA1 Message Date
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
John BOTELLA
15e1d3b456 Fix fetch test 2019-01-24 09:40:58 +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
Laurent Destailleur
e860d664d7 Fix substitution of __REF_CLIENT__ 2019-01-23 11:54:20 +01:00
jfefe
b3dfbaf38c FIX: wrong permission test for inventory creation 2019-01-23 02:45:46 +01:00
Laurent Destailleur
bb1e7ee0a1 Fix transifex 2019-01-22 19:54:47 +01:00
ptibogxiv
e5d1466ec5
Update card.php 2019-01-22 18:44:28 +01:00
Laurent Destailleur
c5686df035 Sync transifex 2019-01-22 18:16:08 +01:00
Laurent Destailleur
eefa57bf6b Sync transifex 2019-01-22 18:15:47 +01:00
Francis Appels
1d08ccef07 Fix sql error 2019-01-22 16:39:54 +01:00
Laurent Destailleur
ccbec3d29f Fix typo 2019-01-22 16:27:23 +01:00
Francis Appels
7ad48064be Add code to show in fourn price tooltip. 2019-01-22 16:18:25 +01:00
Laurent Destailleur
51bdf5f949 Fix trans 2019-01-22 16:06:20 +01:00
Francis Appels
946c017937 Fix and clean price log. Key should price id iso product id. 2019-01-22 15:59:47 +01:00
Laurent Destailleur
8104b7fa2d look and feel v10 2019-01-22 15:40:51 +01:00
Philippe GRAND
34b6f5705e update with html5 compliant code 2019-01-22 14:09:14 +01:00
Philippe GRAND
4668052f95 update with html5 compliant code 2019-01-22 14:04:33 +01:00
Philippe GRAND
4c281f4ff3 update with html5 compliant code 2019-01-22 13:56:14 +01:00