Regis Houssin
|
d5b7184c8d
|
Fix: wrong test
|
2018-02-04 09:04:15 +01:00 |
|
Regis Houssin
|
a161ca37ff
|
Fix: use product_type instead special_code
|
2018-02-04 08:58:31 +01:00 |
|
Regis Houssin
|
2147bd23e6
|
Fix: remove lines with special code when convert to reduc
|
2018-02-02 10:22:47 +01:00 |
|
Laurent Destailleur
|
47d0b6583e
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2018-01-26 01:40:04 +01:00 |
|
Laurent Destailleur
|
c0e719e3d8
|
Fix package scripts
|
2018-01-26 01:39:42 +01:00 |
|
Laurent Destailleur
|
adb70e0456
|
Merge pull request #8086 from atm-ph/fix_5.0_align_payment_total
Fix each total isn't aligned on payment card
|
2018-01-24 11:14:43 +01:00 |
|
atm-ph
|
054d98a2ba
|
Fix each total isn't aligned on payment card
|
2018-01-22 17:09:17 +01:00 |
|
Laurent Destailleur
|
1420149b95
|
Merge pull request #8069 from atm-maxime/fix_contrat_validate
Fix validate contrat was not using force_number parameter
|
2018-01-20 12:33:50 +01:00 |
|
Maxime Kohlhaas
|
4c0dc21ca0
|
Fix validate contrat was not using force_number parameter
|
2018-01-18 14:07:32 +01:00 |
|
Laurent Destailleur
|
58589b8454
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2018-01-11 00:55:10 +01:00 |
|
Laurent Destailleur
|
387dd967e2
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2018-01-11 00:55:00 +01:00 |
|
Laurent Destailleur
|
5adeaf9d76
|
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
|
2018-01-11 00:54:30 +01:00 |
|
Laurent Destailleur
|
df22a311c2
|
Merge pull request #8030 from steschuser/5.0
FIX #8029 Unable to make leave request in holyday module
|
2018-01-11 00:32:45 +01:00 |
|
Laurent Destailleur
|
9253fed754
|
Revert "Code comment"
This reverts commit 8000777864.
|
2018-01-11 00:17:32 +01:00 |
|
Laurent Destailleur
|
8000777864
|
Code comment
|
2018-01-10 20:43:56 +01:00 |
|
sschwebel
|
7e8fda2d71
|
FIX #8029 Unable to make leave request in holyday module
wrong variable name in card.php
|
2018-01-05 12:09:45 +01:00 |
|
Laurent Destailleur
|
0db03cfbcc
|
Merge pull request #7957 from frederic34/patch-1
Update product.php
|
2017-12-16 01:08:30 +01:00 |
|
Frédéric FRANCE
|
ab558ee5fa
|
Update product.php
|
2017-12-14 09:49:55 +01:00 |
|
Laurent Destailleur
|
fd85088a6c
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-12-10 21:27:03 +01:00 |
|
Laurent Destailleur
|
1d9d8980a9
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-12-10 21:16:49 +01:00 |
|
Laurent Destailleur
|
3a181a5d28
|
Merge pull request #7936 from atm-maxime/5.0
Fix event late alert on third event list #7912
|
2017-12-10 20:58:32 +01:00 |
|
Laurent Destailleur
|
e4725f4248
|
FIX #7933
|
2017-12-10 20:55:51 +01:00 |
|
Maxime Kohlhaas
|
3db4d10fc0
|
Fix event late alert on third event list #7912
|
2017-12-10 08:12:49 +01:00 |
|
Laurent Destailleur
|
8a5c53550b
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-12-08 12:43:53 +01:00 |
|
Laurent Destailleur
|
049a038f56
|
Merge pull request #7925 from hregis/5.0_bug
Fix: wrong translation if multilang activated
|
2017-12-08 12:43:37 +01:00 |
|
Laurent Destailleur
|
e526162e8e
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-12-08 12:42:22 +01:00 |
|
Regis Houssin
|
1b16eb731d
|
Fix: missing load product translation file
|
2017-12-08 11:00:23 +01:00 |
|
Regis Houssin
|
1bdffa961f
|
Fix: wrong translation if multilang activated
|
2017-12-08 10:41:14 +01:00 |
|
Laurent Destailleur
|
6de3a40546
|
Merge pull request #7916 from atm-ph/fix_4.0_require_class
Fix include class WorkboardResponse
|
2017-12-08 10:40:26 +01:00 |
|
atm-ph
|
c90ece1188
|
Fix include class WorkboardResponse
|
2017-12-06 14:22:37 +01:00 |
|
Laurent Destailleur
|
29568287ef
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-12-02 14:13:44 +01:00 |
|
Laurent Destailleur
|
5fae19b4d6
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-12-02 14:13:29 +01:00 |
|
Laurent Destailleur
|
c7d0e917fb
|
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
|
2017-12-02 14:12:43 +01:00 |
|
Laurent Destailleur
|
9cafb08759
|
Merge pull request #7853 from atm-ph/fix_5.0_invoice_updateline_calcul_price_total
Fix product type is ignored and can generate a diffrent result with s…
|
2017-12-02 14:06:25 +01:00 |
|
Laurent Destailleur
|
5308acdcde
|
Merge pull request #7895 from atm-alexis/FIX_add_line_bad_price_and_ref
FIX add line bad price and ref
|
2017-12-01 16:03:21 +01:00 |
|
Alexis ALGOUD
|
b2effa7cc8
|
fix travis
|
2017-11-30 11:36:35 +01:00 |
|
root
|
b7f26ea788
|
FIX add line bad price and ref
|
2017-11-30 11:10:01 +01:00 |
|
Laurent Destailleur
|
d2135fd139
|
Merge pull request #7888 from atm-gauthier/5.0_fix_where_fk_status
FIX : test for filter fk_status
|
2017-11-29 15:32:51 +01:00 |
|
gauthier
|
f04af6c1b3
|
FIX : test for filter fk_status
|
2017-11-29 11:06:33 +01:00 |
|
atm-ph
|
5fef6478a5
|
Fix wrong calcul_price_total() update
|
2017-11-27 11:26:41 +01:00 |
|
atm-ph
|
219e58d0e4
|
Fix product type is ignored and can generate a diffrent result with situation invoice
|
2017-11-22 12:15:02 +01:00 |
|
Laurent Destailleur
|
356f36c5bf
|
Merge pull request #7851 from atm-gauthier/5.0_backport_feature
Fix: some problems with medias in multicompany (backport 6.0 commit 762b4eb876)
|
2017-11-22 11:58:09 +01:00 |
|
Regis Houssin
|
a9bfe0f48f
|
Fix: some problems with medias in multicompany (backport 6.0 commit 762b4eb876)
|
2017-11-22 10:12:51 +01:00 |
|
Laurent Destailleur
|
c3c14277e1
|
Merge
|
2017-11-17 14:15:07 +01:00 |
|
Laurent Destailleur
|
42b7d80567
|
FIX #7824
Conflicts:
htdocs/product/stock/replenishorders.php
|
2017-11-17 14:12:53 +01:00 |
|
Laurent Destailleur
|
fde33594a2
|
FIX #7824
|
2017-11-17 14:06:08 +01:00 |
|
Laurent Destailleur
|
7f28c9fff6
|
FIX #7824
Conflicts:
htdocs/product/stock/replenishorders.php
|
2017-11-17 14:01:21 +01:00 |
|
Laurent Destailleur
|
7d4b43f368
|
Merge pull request #7757 from atm-maxime/fix_search_product
Fix display of product/service list
|
2017-11-05 18:29:24 +01:00 |
|
Maxime Kohlhaas
|
13667e4850
|
Fix display of product/service list
|
2017-11-03 08:56:23 +01:00 |
|
Laurent Destailleur
|
141df52dd6
|
Merge pull request #7741 from frederic34/patch-1
swap llxfooter() and $db->close()
|
2017-11-02 09:53:06 +01:00 |
|