Commit Graph

68848 Commits

Author SHA1 Message Date
Laurent Destailleur
d8b2d1f8c2 Add example of test credit card 2018-03-04 12:11:28 +01:00
fappels
7262f89016 Merge remote-tracking branch 'refs/remotes/Dolibarr/7.0' into 7.0_fix_insert_expedition_line 2018-03-04 11:58:27 +01:00
Laurent Destailleur
9355c5a8d7 Fix scrutinizer 2018-03-04 11:31:57 +01:00
Laurent Destailleur
e574ec4bf1 Fix backward compatibility 2018-03-04 11:28:01 +01:00
Laurent Destailleur
82fd84fb48 Fix scrutinizer errors 2018-03-04 11:22:43 +01:00
Laurent Destailleur
6338328c90 Fix scrutinizer errors 2018-03-04 11:09:53 +01:00
Laurent Destailleur
5839cedb4c CSS 2018-03-04 10:47:35 +01:00
Alexandre SPANGARO
c0664474e4 Fix : Missing language file 2018-03-04 06:32:55 +01:00
Laurent Destailleur
7b9aee4af0 CSS 2018-03-04 01:21:56 +01:00
Laurent Destailleur
01b0336e9b Fix tooltip on delete button 2018-03-03 12:10:27 +01:00
Laurent Destailleur
44eb50c424 FIX Infinite loop on deletion of temp file when there is symbolic links 2018-03-03 11:57:10 +01:00
Laurent Destailleur
eac1b2efe9 FIX Infinite loop on deletion of temp file when there is symbolic links 2018-03-03 11:23:23 +01:00
Laurent Destailleur
f0c9cd3acc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-03 11:22:31 +01:00
Laurent Destailleur
d6b782e5ef FIX Infinite loop on deletion of temp file when there is symbolic links 2018-03-03 11:22:15 +01:00
Regis Houssin
0c52977027 Fix: avoid Warning: A non-numeric value encountered 2018-03-03 08:37:44 +01:00
Laurent Destailleur
fecdff8098 CSS 2018-03-03 03:17:45 +01:00
Regis Houssin
647331876b Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0_bug5 2018-03-02 19:02:08 +01:00
Regis Houssin
b69d2800ef Fix: check if file name already exists 2018-03-02 18:59:30 +01:00
Laurent Destailleur
b24259ed46
Merge pull request #8265 from hregis/7.0_bug5
Fix: missing hook during rename file action
2018-03-02 18:15:01 +01:00
Laurent Destailleur
57d6417095
Merge pull request #8264 from atm-alexis/FIX_migrate_script_product_photo
FIX migration script for product photo
2018-03-02 18:12:18 +01:00
Laurent Destailleur
af7f716f74
Merge pull request #8262 from all3kcis/patch-5
Use correct values of eatby and sellby on batchs expeditions
2018-03-02 18:11:36 +01:00
Laurent Destailleur
45418769b1
Update expeditionbatch.class.php 2018-03-02 18:11:03 +01:00
Regis Houssin
8e85198bd1 Fix: missing $upload_dir 2018-03-02 18:09:06 +01:00
Laurent Destailleur
7a53ef802b
Merge pull request #8258 from ruistrecht-alt/NEW_check_idprof1_for_country_PT
NEW check idprof1 for country pt
2018-03-02 18:03:12 +01:00
Laurent Destailleur
5258445c77
Merge pull request #8254 from dolibarr95/patch-40
Fix : wrong var name
2018-03-02 18:01:54 +01:00
Laurent Destailleur
0a5edb871b
Merge pull request #8253 from ruistrecht-alt/Fix_supress_count_warning_in_extrafields_view_tpl
FIX Suppress count warning in admin_extrafields_view.tpl
2018-03-02 18:00:52 +01:00
Laurent Destailleur
85dfc2cdf6
Merge pull request #8252 from ruistrecht-alt/Fix_missing_row_on_project_insert
Fix missing insert bill_time in project.class on create
2018-03-02 17:59:56 +01:00
Laurent Destailleur
4137e1cc76 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-02 17:56:30 +01:00
Laurent Destailleur
6bb91dd5d2 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-03-02 17:54:42 +01:00
Laurent Destailleur
aab0a33f40
Merge pull request #8251 from atm-gauthier/5.0_fix_last_situation
FIX : if we make a mistake with situation_percent, now we can correct…
2018-03-02 17:54:20 +01:00
Laurent Destailleur
ea5cd4db76
Merge pull request #8250 from ruistrecht-alt/Fix_bad_naming_resotre
FIX misspelled restore_lastsearch_values
2018-03-02 17:53:33 +01:00
Laurent Destailleur
8a11bd2118
Merge pull request #8249 from ATM-Nicolas/fix_order_line_multicurrency
FIX : Avoid empty value to fk_multicurrency attribute
2018-03-02 17:53:03 +01:00
Laurent Destailleur
d35c5282d4
Merge pull request #8245 from enstentechnologies/7.0
FIX Unknown column 'pl.amount_requested' in compta/prelevement/factures.php
2018-03-02 17:52:23 +01:00
Laurent Destailleur
7584fe62e3
Merge pull request #8244 from hregis/develop_bug
Fix: avoid warning during "upgrade2" process
2018-03-02 17:51:47 +01:00
Laurent Destailleur
48b578b9f2
Update commonobject.class.php 2018-03-02 17:51:21 +01:00
Laurent Destailleur
0270e21289
Merge pull request #8242 from hregis/develop_multicompany
Fix: use "multidir_output" instead "dir_output" (propal)
2018-03-02 17:49:25 +01:00
Laurent Destailleur
bf36f00897
Update html.formfile.class.php 2018-03-02 17:48:58 +01:00
Laurent Destailleur
1f67e115d7
Merge pull request #8239 from hregis/develop_bug2
Fix: syntax error
2018-03-02 17:45:31 +01:00
Laurent Destailleur
5d74d01f61
Merge pull request #8238 from guillaume-uH57J9/patch-1
install, don't use innodb engine for pgsql to fix #8237
2018-03-02 17:45:12 +01:00
Laurent Destailleur
75962f5ed1
Merge pull request #8234 from hregis/7.0_entity
Fix: multicompany transverse mode is managed by the module
2018-03-02 17:43:47 +01:00
Laurent Destailleur
ef402f4bcb
Merge pull request #8266 from atm-florian/7.0
fix pgSQL install
2018-03-02 17:42:41 +01:00
Laurent Destailleur
63eecb46a9 Fix missing hook init 2018-03-02 17:32:54 +01:00
florian HENRY
3490d3779b Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0 2018-03-02 17:31:39 +01:00
florian HENRY
473c16ede5 fix pgSQL install 2018-03-02 17:30:46 +01:00
Regis Houssin
bf4543a636 Fix: missing hook during rename file action 2018-03-02 17:05:52 +01:00
Marc de Lima Lucio
451d943927 NEW: supplier credit notes: factorized discount block (+ correct translations for supplier discounts) 2018-03-02 16:48:25 +01:00
Laurent Destailleur
b87db9d32d Fix missing ; 2018-03-02 16:38:56 +01:00
alexis Algoud
ce2fc28d80 FIX migration script for product photo 2018-03-02 16:12:58 +01:00
Laurent Destailleur
dfdb5b27b0 Fix include master 2018-03-02 14:46:00 +01:00
Laurent Destailleur
e073fa15f7 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-02 14:00:27 +01:00