Laurent Destailleur
ca67917e80
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/core/modules/modFacture.class.php
2017-02-10 17:33:32 +01:00
Laurent Destailleur
a4f2325902
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-02-10 17:28:49 +01:00
Laurent Destailleur
a4d9f7dbbe
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-02-10 17:27:47 +01:00
Laurent Destailleur
d463511cff
Fix: no way to know type of invoice.
2017-02-10 17:24:47 +01:00
Laurent Destailleur
d461c0dfa4
Fix left align
2017-02-10 10:47:19 +01:00
Laurent Destailleur
66542b6367
Fix translation and link to direct debit payment
2017-02-10 10:43:54 +01:00
Laurent Destailleur
ad308e33cc
Fix scrutinizer warning
2017-02-09 18:29:04 +01:00
De Coninck Laurent
04d73668cc
fix correct url for expense report note in expense report list
2017-02-08 19:28:01 +01:00
Laurent Destailleur
366df59658
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-02-08 19:25:41 +01:00
Laurent Destailleur
e74927a54c
Merge pull request #6400 from atm-florian/4.0
...
FIX #6234
2017-02-08 19:22:46 +01:00
Laurent Destailleur
6db0e909d6
Fix pagination
2017-02-08 18:41:23 +01:00
florian HENRY
ab0783edcc
FIX #6234
2017-02-08 17:18:06 +01:00
Laurent Destailleur
e0850b29cd
Merge pull request #6399 from fappels/5.0
...
Qual reputation for price supplier
2017-02-08 16:42:20 +01:00
fappels
b1fe8e3f2b
fix merge
2017-02-08 13:45:42 +01:00
fappels
a84c6f9b45
Qual reputation for price supplier
...
Move available reputation constants from view-controller to class
2017-02-08 13:35:34 +01:00
Laurent Destailleur
104c8ae243
Merge pull request #6387 from aspangaro/5.0
...
Fix : Bank account ref not show in page accountancy admin journal. Complete informations for tooltip
2017-02-08 11:01:40 +01:00
Laurent Destailleur
882423f935
Merge pull request #6390 from fmarcet/3.9
...
Fix: Wrong vat calculation when split discounts
2017-02-08 11:01:08 +01:00
Laurent Destailleur
dc0856413c
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-02-08 10:57:02 +01:00
Paris Liakos
eb452397bd
Wrong trigger when setting supplier invoice back to draft
2017-02-08 10:56:28 +01:00
Laurent Destailleur
4c3255857c
Fix bad syntax into criteria to filter on date in export.
...
Fix missing type in export of invoices.
2017-02-08 10:45:20 +01:00
Laurent Destailleur
0a797cd12e
Fix us terms.
2017-02-07 20:08:15 +01:00
Laurent Destailleur
8e733ca2fe
Remove menu entry that is not reserved to admin users frmo admin area.
2017-02-07 19:58:49 +01:00
fmarcet
d5978a5092
Fix: Wrong vat calculation when split discounts
2017-02-07 14:02:27 +01:00
Laurent Destailleur
fbff32823a
Fix translation
2017-02-07 12:43:12 +01:00
Laurent Destailleur
c6e0a4cc87
Fix column label
2017-02-07 12:39:45 +01:00
Alexandre SPANGARO
ea7a2b1e2a
Fix : Bank account ref not show in accountancy journal. Complete informations for tooltip
2017-02-07 06:47:12 +01:00
Laurent Destailleur
df6983b3c5
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-02-07 02:13:54 +01:00
Laurent Destailleur
d56b5f30c8
FIX #6330
2017-02-07 01:34:21 +01:00
Laurent Destailleur
b0ee04c079
FIX #6379
2017-02-07 01:13:50 +01:00
Laurent Destailleur
2d77cb2da5
FIX #6379
2017-02-07 00:54:54 +01:00
Laurent Destailleur
afa68a1418
Fix label for late
2017-02-07 00:45:14 +01:00
Laurent Destailleur
6b528b2bea
Fix translation: Open -> opened (open is for "mind/spirit", opened is
...
the adjective for a status)
2017-02-06 21:34:05 +01:00
Laurent Destailleur
b447501d72
Merge pull request #6371 from atm-arnaud/4.0_fix_trad_project_filter
...
Fix project filter traduction
2017-02-06 20:25:45 +01:00
Laurent Destailleur
821978d54c
FIX #6363 More complete fix
2017-02-06 20:08:47 +01:00
Laurent Destailleur
bee507c76c
Merge pull request #6386 from laudeco/fix/expense_type_deactivate
...
[expense type deactivate] [#6363 ] Expense type deactivated but list
2017-02-06 20:06:54 +01:00
De Coninck Laurent
bbf34bfda8
[expense type deactivate] [ #6363 ] Expense type deactivated but list
...
When an expense type is disabled in dictionaries, it's always displayed and selectable in expense note module, when we create a new line in an expense note.
2017-02-06 18:57:56 +01:00
Laurent Destailleur
6cb3199824
Translation message
2017-02-06 12:03:20 +01:00
Laurent Destailleur
fea2b081f9
Fix: The long description feature will be available with 6.0. Large
...
content creates problem with tooltip.
2017-02-04 14:17:55 +01:00
Laurent Destailleur
517a20db35
Update screenshot
2017-02-03 16:59:35 +01:00
arnaud
480d099d81
Fix project filter traduction
2017-02-03 16:19:13 +01:00
Laurent Destailleur
5381eadc75
Fix translation
2017-02-03 15:33:44 +01:00
Laurent Destailleur
76280f8ae2
Fix #6365
2017-02-03 11:42:49 +01:00
Laurent Destailleur
d740bdbc73
Fix #6365
2017-02-03 11:38:09 +01:00
fappels
76bd5e009a
Merge remote-tracking branch 'refs/remotes/Dolibarr/5.0' into 5.0
2017-02-03 11:37:39 +01:00
Laurent Destailleur
d7060b0c4b
FIX #6360
2017-02-02 03:14:21 +01:00
Laurent Destailleur
b5ca8ebef9
FIX #6316
2017-02-02 03:07:40 +01:00
Laurent Destailleur
4d78e0d45c
FIX #6315
2017-02-02 02:53:32 +01:00
Laurent Destailleur
40737eac2e
FIX #6361
2017-02-02 02:49:04 +01:00
Laurent Destailleur
f6144b9ecb
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-02-02 02:24:57 +01:00
Laurent Destailleur
819edcf43a
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-02-02 02:24:03 +01:00
