Laurent Destailleur
|
b81b6b651f
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2018-08-12 19:17:26 +02:00 |
|
Jan
|
ddbfaf0788
|
wrong position of counter reset
extrafields will work now ;) and not the first product gets the last extrafields values
|
2018-08-12 19:16:49 +02:00 |
|
Laurent Destailleur
|
b11d5c2f71
|
Merge pull request #9228 from atm-florian/8.0
fix : remove comment on commit
|
2018-08-12 19:13:07 +02:00 |
|
Laurent Destailleur
|
be7a764de7
|
Merge pull request #9202 from atm-florian/7.0
fix bad use of test_sql_and_script_inject return int not value tested
|
2018-08-12 18:24:54 +02:00 |
|
Laurent Destailleur
|
7f797668c9
|
Merge pull request #9186 from atm-florian/6.0
fix : odt project and task extrafields management
|
2018-08-12 18:15:02 +02:00 |
|
Laurent Destailleur
|
56d8935976
|
Merge pull request #9181 from ATM-Nicolas/fix_dolGetFirstLastname
FIX : Wrong position of firstname lastname
|
2018-08-12 18:11:36 +02:00 |
|
Laurent Destailleur
|
6954ab00f9
|
Update functions.lib.php
|
2018-08-12 18:11:27 +02:00 |
|
Laurent Destailleur
|
8d03d58d54
|
Merge pull request #9209 from ptibogxiv/patch-34
Fix 3D secure
|
2018-08-12 17:42:42 +02:00 |
|
Laurent Destailleur
|
9124d5c6a5
|
Merge pull request #9231 from atm-gauthier/7.0_fix_notice
FIX : global $mysoc missing (to avoid php notice on lines 279, 280 & 281
|
2018-08-12 17:36:39 +02:00 |
|
Laurent Destailleur
|
3d4d42462c
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2018-08-12 16:30:21 +02:00 |
|
Laurent Destailleur
|
12e21b4886
|
FIX update extrafields
|
2018-08-12 16:29:26 +02:00 |
|
gauthier
|
391230babc
|
FIX : global $mysoc missing (to avoid php notice on lines 279, 280 & 281)
|
2018-08-10 15:39:49 +02:00 |
|
ATM-Nicolas
|
d8d54d246c
|
FIX : Pagination on withdraw request list
|
2018-08-10 15:05:21 +02:00 |
|
Laurent Destailleur
|
39f4eae07e
|
Fix look and feel v8
|
2018-08-09 23:11:49 +02:00 |
|
Laurent Destailleur
|
1af9700a58
|
Fix responsive
|
2018-08-09 22:52:43 +02:00 |
|
Laurent Destailleur
|
2dbb6e258b
|
FIX Can filter on month in export of blockedlog
FIX Fingerprint correct in popup
|
2018-08-09 22:29:02 +02:00 |
|
florian HENRY
|
f0a32a2dea
|
fix : remove comment on commit
|
2018-08-09 20:41:15 +02:00 |
|
Laurent Destailleur
|
9b50bc2197
|
Fix css
|
2018-08-09 19:29:48 +02:00 |
|
florian HENRY
|
06189f8153
|
Merge branch '6.0' into 6.0_fhe
|
2018-08-09 18:31:59 +02:00 |
|
florian HENRY
|
9024ed9e61
|
Merge branch '7.0' into 7.0_fhe
|
2018-08-09 17:47:21 +02:00 |
|
Laurent Destailleur
|
8d54df4263
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
|
2018-08-08 17:31:23 +02:00 |
|
Laurent Destailleur
|
63898b205e
|
Clean ckeditor menu
|
2018-08-08 17:09:51 +02:00 |
|
Laurent Destailleur
|
d79778a67e
|
Fix reponsive
|
2018-08-08 17:00:16 +02:00 |
|
Laurent Destailleur
|
de1386c83c
|
Merge branch '7.0' of github.com:Dolibarr/dolibarr into 7.0
|
2018-08-08 16:49:09 +02:00 |
|
Juanjo Menent
|
e2499392a9
|
Merge pull request #9215 from fmarcet/7.0
Fix: Bad position when document have incoterms/notes
|
2018-08-08 11:10:47 +02:00 |
|
Juanjo Menent
|
b840152bcd
|
Merge pull request #9217 from ATM-Nicolas/fix_undefined_index_notnull
FIX : PHP warning, undefined index notnull
|
2018-08-08 11:10:17 +02:00 |
|
Juanjo Menent
|
9f09c97eb9
|
Merge pull request #9198 from OPEN-DSI/fix_cmd_list
FIX : Search on Ref project on order list
|
2018-08-08 10:56:57 +02:00 |
|
Ferran Marcet
|
5ce31f65a4
|
Fix: Bad position when document have incoterms/notes
|
2018-08-07 11:40:11 +02:00 |
|
ATM-Nicolas
|
5b15e688af
|
FIX : PHP warning, undefined index notnull
|
2018-08-07 09:38:18 +02:00 |
|
ptibogxiv
|
e84018ac15
|
Fix 3D secure
convett to dolibarr standard stripe payment metadata
|
2018-08-06 19:21:12 +02:00 |
|
florian HENRY
|
74d05da149
|
fix : display if error
|
2018-08-06 11:28:34 +02:00 |
|
florian HENRY
|
0d85eb52c5
|
Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0
|
2018-08-03 17:10:26 +02:00 |
|
florian HENRY
|
615ed11534
|
fix bad use of test_sql_and_script_inject return int not value tested
|
2018-08-03 17:09:58 +02:00 |
|
Philippe
|
61e1f0508d
|
FIX : Search on Ref project on order list
|
2018-08-03 11:08:09 +02:00 |
|
ATM-Nicolas
|
70adfb135d
|
FIX : Missing behavior
|
2018-08-03 09:51:29 +02:00 |
|
Laurent Destailleur
|
6010d9de4b
|
Merge pull request #9158 from atm-gauthier/7.0_missing_hook
FIX : missing hook to edit sql
|
2018-08-02 18:36:25 +02:00 |
|
Laurent Destailleur
|
51effef629
|
Reset pagination when current page too high
|
2018-08-02 18:22:08 +02:00 |
|
Laurent Destailleur
|
17ed19503c
|
Code comment
|
2018-08-02 17:51:04 +02:00 |
|
Laurent Destailleur
|
12fdbcce59
|
Fix trigger name
|
2018-08-02 17:49:05 +02:00 |
|
Laurent Destailleur
|
e85ec19018
|
Merge pull request #9093 from atm-gauthier/FIX_filters
FIX : page must always be 0 when we search
|
2018-08-02 17:48:35 +02:00 |
|
Laurent Destailleur
|
b5a0e14ffe
|
Merge pull request #9185 from atm-john/fix_situation_total_calcul
Important: fix situation line's total
|
2018-08-02 17:45:44 +02:00 |
|
Laurent Destailleur
|
d84bacad00
|
Merge pull request #9196 from ATM-Nicolas/fix_wrong_variable_and_trigger_name
FIX : Wrong variable and trigger name
|
2018-08-02 17:43:16 +02:00 |
|
ATM-Nicolas
|
f3090e4819
|
FIX : Wrong variable and trigger name
|
2018-08-02 16:05:54 +02:00 |
|
Juanjo Menent
|
5b3c6de06c
|
Merge pull request #9184 from atm-gauthier/7.0_fix_extrafieldkey
FIX : extrafieldkey
|
2018-08-02 11:24:19 +02:00 |
|
Juanjo Menent
|
1fbbaf2895
|
Merge pull request #9180 from atm-florian/7.0
FIX: keep context filter on contact list on change column displayed
|
2018-08-02 11:20:25 +02:00 |
|
Juanjo Menent
|
ce49230d71
|
Merge pull request #9177 from ATM-Nicolas/fix_preselect_project
FIX : Keep same project when creating shipping from order
|
2018-08-02 11:18:39 +02:00 |
|
Juanjo Menent
|
98dada47de
|
Merge pull request #9174 from tarrsalah/fix-soc-filter-on-supplier-invoices
FIX filter supplier invoice list by societe name.
|
2018-08-02 11:12:01 +02:00 |
|
Juanjo Menent
|
2cf51fbdf1
|
Merge pull request #9173 from frederic34/patch-22
fix #8820
|
2018-08-02 11:08:47 +02:00 |
|
Juanjo Menent
|
2206eb98d1
|
Merge pull request #9191 from Dolibarr/revert-9147-7.0_price
Revert "FIX multicompany compatibility !"
|
2018-08-02 10:46:20 +02:00 |
|
Juanjo Menent
|
99f29a9764
|
Revert "FIX multicompany compatibility !"
|
2018-08-02 10:45:15 +02:00 |
|