Laurent Destailleur
|
687afeaffe
|
FIX No project fields if module disabled
|
2016-02-02 15:09:01 +01:00 |
|
Laurent Destailleur
|
43d165f985
|
Merge remote-tracking branch 'origin/3.8' into 3.9
|
2016-02-02 13:02:10 +01:00 |
|
Laurent Destailleur
|
015f24e80a
|
Fix php unit to work both with old and new setup
|
2016-02-02 13:01:19 +01:00 |
|
Laurent Destailleur
|
f22373b70b
|
Fix bad management of option MAIN_HTML_TITLE
|
2016-02-01 01:19:37 +01:00 |
|
Laurent Destailleur
|
605c36de65
|
Merge remote-tracking branch 'origin/3.8' into 3.9
|
2016-01-31 21:27:46 +01:00 |
|
Laurent Destailleur
|
b93170b345
|
Merge remote-tracking branch 'origin/3.7' into 3.8
|
2016-01-31 21:27:20 +01:00 |
|
Laurent Destailleur
|
0076512d5b
|
Merge remote-tracking branch 'origin/3.6' into 3.7
|
2016-01-31 21:26:52 +01:00 |
|
Laurent Destailleur
|
1b23ede857
|
Merge remote-tracking branch 'origin/3.5' into 3.6
|
2016-01-31 21:26:28 +01:00 |
|
Laurent Destailleur
|
640adcc666
|
Missing translation
|
2016-01-31 21:23:30 +01:00 |
|
Laurent Destailleur
|
2d0c823ffe
|
Fix bad transaction level due to code of situation invoices
Conflicts:
htdocs/compta/facture/class/facture.class.php
|
2016-01-31 20:45:06 +01:00 |
|
Laurent Destailleur
|
7b15ac1179
|
Fix bad transaction level due to code of situation invoices
Conflicts:
htdocs/compta/facture/class/facture.class.php
|
2016-01-31 20:44:09 +01:00 |
|
Laurent Destailleur
|
d9e089256e
|
Fix path to copyrighted files
|
2016-01-31 16:16:46 +01:00 |
|
Laurent Destailleur
|
9a87d2bee5
|
Fix phpcs
|
2016-01-30 16:28:48 +01:00 |
|
Laurent Destailleur
|
5e9fd25a6e
|
Merge remote-tracking branch 'origin/3.8' into 3.9
|
2016-01-30 15:59:40 +01:00 |
|
Laurent Destailleur
|
dfd4d36bdf
|
Merge remote-tracking branch 'origin/3.7' into 3.8
|
2016-01-30 15:58:11 +01:00 |
|
Laurent Destailleur
|
c9661ee20e
|
Merge remote-tracking branch 'origin/3.6' into 3.7
|
2016-01-30 15:57:09 +01:00 |
|
Laurent Destailleur
|
129f5aad8e
|
Fix bad translation
|
2016-01-30 15:56:04 +01:00 |
|
mic9p
|
8faeac611a
|
Do not select siren but tva_intra from societe
VAT report by customer shows an empty field.
|
2016-01-30 15:35:28 +01:00 |
|
Laurent Destailleur
|
6e69e99227
|
FIX VAT Rate was not visible in log of old price list
|
2016-01-30 15:34:06 +01:00 |
|
Laurent Destailleur
|
5212303208
|
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
|
2016-01-30 15:29:52 +01:00 |
|
Laurent Destailleur
|
d21908755e
|
FIX Import/Export NPR VAT
|
2016-01-30 15:29:35 +01:00 |
|
Laurent Destailleur
|
cc7d105d88
|
Fix height in mapping impot step
|
2016-01-30 15:07:22 +01:00 |
|
Laurent Destailleur
|
c6a6889d79
|
Merge pull request #4389 from aspangaro/3.9-p6
Fix: Some problems presentation on accountancy module
|
2016-01-30 13:04:22 +01:00 |
|
Laurent Destailleur
|
09a24b8dd8
|
Merge pull request #4496 from frederic34/patch-9
Text not initialized
|
2016-01-30 12:24:40 +01:00 |
|
Laurent Destailleur
|
3591f51918
|
Merge pull request #4480 from hregis/3.8_bug
Fix: for avoid conflict with "global $m" in memory.lib.php
|
2016-01-30 12:22:47 +01:00 |
|
Laurent Destailleur
|
b27e31b3ae
|
Merge pull request #4483 from marcosgdf/bug-4440-3
Corrected typo of PR #4444
|
2016-01-30 12:20:50 +01:00 |
|
Laurent Destailleur
|
2e7d88dffb
|
Merge pull request #4499 from fmarcet/3.7
FIX: Contrat card don't consider user permissions to show active/unactive service button
|
2016-01-30 12:12:42 +01:00 |
|
Laurent Destailleur
|
c77fcfd291
|
Merge pull request #4503 from fmarcet/3.9
FIX: Not returning the correct multilevel price
|
2016-01-30 12:05:32 +01:00 |
|
Laurent Destailleur
|
f79b1d06cb
|
Merge pull request #4519 from FHenry/3.9
FIX : set column paid on expense report when expense is paid
|
2016-01-30 12:01:10 +01:00 |
|
Laurent Destailleur
|
e2d9989574
|
Merge pull request #4518 from FHenry/3.9_compta
3.9 compta
|
2016-01-30 12:00:20 +01:00 |
|
Laurent Destailleur
|
e574ebe34c
|
Merge pull request #4514 from hregis/3.8_bug2
Fix: missing field "label"
|
2016-01-30 11:57:28 +01:00 |
|
Laurent Destailleur
|
f5a4b9db31
|
Merge pull request #4520 from atm-ph/fix_3.8_show_all_shipping_by_socid
FIX filter by socid if from customer card
|
2016-01-30 11:56:40 +01:00 |
|
Laurent Destailleur
|
b162eb1bb0
|
Update translation for 3.9
|
2016-01-29 00:40:15 +01:00 |
|
bobby
|
72e8680f7c
|
FIX : set column paid on expense report when expense is paid
|
2016-01-28 13:57:40 +01:00 |
|
bobby
|
6aa6c067fb
|
fix travis
|
2016-01-28 13:24:38 +01:00 |
|
bobby
|
283412f489
|
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
|
2016-01-28 13:12:57 +01:00 |
|
Laurent Destailleur
|
cd58c93de6
|
FIX If option to hide automatic ECM is on, dont show menu.
|
2016-01-28 12:51:34 +01:00 |
|
Laurent Destailleur
|
2141a2f8a1
|
Fix css
|
2016-01-28 12:44:04 +01:00 |
|
phf
|
6eecf2f29a
|
FIX filter by socid if from customer card
|
2016-01-28 12:30:49 +01:00 |
|
Laurent Destailleur
|
83e8efa910
|
Fix picto private project was same than public project
|
2016-01-28 12:19:19 +01:00 |
|
Laurent Destailleur
|
99b2236260
|
FIX Selection of project must no show closed project
|
2016-01-28 12:19:13 +01:00 |
|
Laurent Destailleur
|
c09fa6e0dd
|
Fix empty keys are not allowed into select
|
2016-01-28 12:19:06 +01:00 |
|
Laurent Destailleur
|
c8d232e056
|
Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
htdocs/contrat/card.php
|
2016-01-28 12:18:25 +01:00 |
|
Regis Houssin
|
8a80e06580
|
Fix: missing field "label"
|
2016-01-28 11:42:00 +01:00 |
|
Laurent Destailleur
|
20e110a882
|
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
|
2016-01-27 18:48:06 +01:00 |
|
Laurent Destailleur
|
45656c18e8
|
Fix hover css
|
2016-01-27 18:47:52 +01:00 |
|
fmarcet
|
e3d8a9a8a4
|
FIX: Doesn't collect the value of the cost price correctly
|
2016-01-27 12:13:31 +01:00 |
|
fmarcet
|
eec8d30625
|
FIX: Not returning the correct multilevel price
|
2016-01-27 10:57:04 +01:00 |
|
Laurent Destailleur
|
fccecc902d
|
Merge branch '3.8' of github.com:Dolibarr/dolibarr into 3.8
|
2016-01-26 18:30:08 +01:00 |
|
Laurent Destailleur
|
e0683681ff
|
Merge
|
2016-01-26 18:28:47 +01:00 |
|