Laurent Destailleur
|
0f3ae6dc39
|
Merge pull request #11215 from ATM-Marc/FIX_8.0_invoice_default_product_type
FIX: invoice class: bad SQL request if product type not set
|
2019-05-19 01:58:13 +02:00 |
|
Laurent Destailleur
|
2fd3eb8bdf
|
Update facture.class.php
|
2019-05-19 01:58:01 +02:00 |
|
Laurent Destailleur
|
684cbbdddb
|
Merge pull request #11212 from ATM-Marc/FIX_8.0_modulebuilder_foreignkey
FIX: modulebuilder: hardcoded llx_
|
2019-05-19 01:55:02 +02:00 |
|
ATM-Marc
|
83c38570e9
|
FIX: invoice class: bad SQL request if product type not set
|
2019-05-19 01:01:21 +02:00 |
|
ATM-Marc
|
9b805f742b
|
FIX: modulebuilder: hardcoded llx_
|
2019-05-18 20:09:00 +02:00 |
|
Laurent Destailleur
|
d4f356c8f6
|
Merge pull request #11200 from atm-maxime/fix_project_beluga
Fix project beluga order status
|
2019-05-18 02:16:50 +02:00 |
|
Maxime Kohlhaas
|
095fd2769a
|
Fix project beluga order status
|
2019-05-18 01:11:34 +02:00 |
|
Laurent Destailleur
|
590ee589c1
|
Merge pull request #11192 from atm-maxime/fix_usertab_hr
Fix : display hr tab on user if rights to read all
|
2019-05-18 00:48:06 +02:00 |
|
Maxime Kohlhaas
|
2a2f0557cf
|
Fix : display hr tab on user if rights to read all
|
2019-05-17 17:07:38 +02:00 |
|
Laurent Destailleur
|
e2408fb54d
|
Merge pull request #11170 from atm-greg/Fix_margin_calculation_on_display
fix useless calculation
|
2019-05-13 20:20:01 +02:00 |
|
atm-greg
|
644f247910
|
fix useless calculation
|
2019-05-13 12:02:46 +02:00 |
|
Laurent Destailleur
|
1626c9fb6e
|
Merge pull request #11145 from atm-gauthier/8.0_fix_filename_with_two_spaces
FIX : use dol_sanitizeFileName() function to remove double spaces in …
|
2019-05-13 12:01:05 +02:00 |
|
Laurent Destailleur
|
c67d79a4e2
|
Update files.lib.php
|
2019-05-13 12:00:13 +02:00 |
|
Juanjo Menent
|
072a455ca4
|
Prepare 8.0.6
|
2019-05-11 22:55:42 +02:00 |
|
Juanjo Menent
|
7041c3246e
|
Prepare 8.0.5
|
2019-05-11 22:35:56 +02:00 |
|
Juanjo Menent
|
40229c9d96
|
Merge pull request #11166 from simnandez/8.0
Merge branch '7.0' into 8.0
|
2019-05-11 18:06:20 +02:00 |
|
Juanjo Menent
|
f4ca6916cd
|
Merge remote-tracking branch 'upstream/7.0' into 8.0
# Conflicts:
# htdocs/contrat/services_list.php
# htdocs/expensereport/list.php
# htdocs/projet/list.php
|
2019-05-11 17:31:23 +02:00 |
|
Juanjo Menent
|
3a99ef7319
|
Fix: missing GETPOST params
|
2019-05-11 17:04:05 +02:00 |
|
Juanjo Menent
|
3ae2d71ea6
|
Fix: missing GETPOST params
|
2019-05-11 17:00:55 +02:00 |
|
Juanjo Menent
|
91ae365588
|
Fix: missing GETPOST params
|
2019-05-11 16:58:00 +02:00 |
|
Juanjo Menent
|
6206519456
|
Fix: missing GETPOST params
|
2019-05-11 16:54:56 +02:00 |
|
Juanjo Menent
|
2e6cb2afaa
|
Fix: missing GETPOST params
|
2019-05-11 16:53:16 +02:00 |
|
Juanjo Menent
|
dc9f8a349f
|
Fix: missing GETPOST params
|
2019-05-11 16:50:31 +02:00 |
|
Juanjo Menent
|
80ef97e215
|
FIX: #11025
|
2019-05-11 16:41:01 +02:00 |
|
Juanjo Menent
|
759427f6ac
|
FIX: #11025
|
2019-05-11 16:36:35 +02:00 |
|
Juanjo Menent
|
81bf7d07e3
|
Merge remote-tracking branch 'upstream/7.0' into 7.0
|
2019-05-11 16:32:02 +02:00 |
|
Juanjo Menent
|
72dd3705ed
|
Merge remote-tracking branch 'upstream/7.0' into 7.0
|
2019-05-10 09:13:33 +02:00 |
|
gauthier
|
f661b926fa
|
FIX : use dol_sanitizeFileName() function to remove double spaces in filenames, as well as done on document.php when we want to download pdf
Example : if you upload a file like "my file.pdf" (with 2 spaces), it's impossible to download it after. then we have to remove at least 1 space
|
2019-05-07 14:33:17 +02:00 |
|
Laurent Destailleur
|
6a5af0511d
|
Merge pull request #11105 from atm-greg/FIX_stock_movement_link_to_project
fix project link for stock correction
|
2019-05-03 11:27:17 +02:00 |
|
atm-greg
|
e0c3cf8360
|
fix project link for stock correction
|
2019-05-03 10:24:49 +02:00 |
|
Laurent Destailleur
|
45d618cd7a
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-05-02 14:37:54 +02:00 |
|
Laurent Destailleur
|
ae7ba162f2
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-05-02 14:37:46 +02:00 |
|
Laurent Destailleur
|
1a16dc1166
|
Merge pull request #11089 from frederic34/patch-5
Fix do not delete all discount when splitting (supplier)
|
2019-05-02 14:05:49 +02:00 |
|
Laurent Destailleur
|
50b1a54dca
|
FIX Update/delete currency on same languages
|
2019-05-01 14:06:30 +02:00 |
|
Frédéric FRANCE
|
d9a1c2b235
|
Fix do not delete all discount when splitting
|
2019-04-30 13:54:50 +02:00 |
|
Laurent Destailleur
|
a7530b7eff
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-04-27 13:28:36 +02:00 |
|
Laurent Destailleur
|
0532598ecf
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2019-04-27 13:28:05 +02:00 |
|
Laurent Destailleur
|
410a3801da
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2019-04-27 13:27:52 +02:00 |
|
Laurent Destailleur
|
5259547b96
|
Merge pull request #11069 from atm-gauthier/6.0_fix_select_prev_situ
Fix prev situation invoice selection (backport fix 8.0)
|
2019-04-25 18:59:48 +02:00 |
|
gauthier
|
31897f54ac
|
Fix prev situation invoice selection (backport fix 8.0)
|
2019-04-25 12:37:05 +02:00 |
|
Laurent Destailleur
|
50a4d54d8a
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-04-25 01:37:32 +02:00 |
|
Laurent Destailleur
|
07caf22647
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-04-25 01:37:25 +02:00 |
|
Laurent Destailleur
|
b62323939e
|
Merge pull request #11064 from atm-greg/FIX_create_supplier_invoice_button
FIX test to display create invoice button on supplier_order card
|
2019-04-24 21:07:15 +02:00 |
|
atm-greg
|
70017da95a
|
testing if customer invoice module is activated doesn't make sense on supplier commande card...
|
2019-04-24 14:59:54 +02:00 |
|
Laurent Destailleur
|
fb01f550f4
|
Merge pull request #11016 from ATM-Nicolas/fix_activity_perweek
FIX : Total per day in timespent per week
|
2019-04-24 10:21:08 +02:00 |
|
Laurent Destailleur
|
21b79d314a
|
Merge pull request #11059 from atm-greg/FIX_actioncomm_for_long_trigger_name
fix actioncomm module for long trigger names
|
2019-04-24 10:06:55 +02:00 |
|
atm-greg
|
6e425d1895
|
add origin of line in fourn orderstoinvoice.php
|
2019-04-24 08:56:06 +02:00 |
|
atm-greg
|
3231e54abd
|
fix actioncomm module for long trigger names
|
2019-04-23 16:19:58 +02:00 |
|
Laurent Destailleur
|
bf7fcce1b2
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-04-23 12:24:25 +02:00 |
|
Laurent Destailleur
|
11d737f23a
|
Merge pull request #11029 from ATM-Marc/FIX_7.0_sort_events
FIX: actioncomm: sort events by date after external calendars and hook (into 7.0)
|
2019-04-19 13:06:09 +02:00 |
|