Frédéric FRANCE
|
5a3780e062
|
end of dol_fiche_end
|
2020-10-27 18:19:31 +01:00 |
|
Laurent Destailleur
|
d750dc48a1
|
More secured getURLContent method. Add PHPUnit on getURLContent
|
2020-10-27 15:06:16 +01:00 |
|
Laurent Destailleur
|
7efbab88a8
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-10-27 12:49:30 +01:00 |
|
Laurent Destailleur
|
c6216eddd1
|
CSS
|
2020-10-27 12:49:14 +01:00 |
|
Laurent Destailleur
|
92f3137c3e
|
Merge pull request #15179 from frederic34/boxmembers
add small photo in box members
|
2020-10-27 11:55:32 +01:00 |
|
Laurent Destailleur
|
4adaf67d47
|
Hide setup we don't need if email are disabled globally
CSS
|
2020-10-27 11:40:30 +01:00 |
|
Laurent Destailleur
|
fe357e17e8
|
Fix for ja
|
2020-10-27 11:00:50 +01:00 |
|
Laurent Destailleur
|
56903d3677
|
Fix trans
|
2020-10-27 10:35:22 +01:00 |
|
Laurent Destailleur
|
16ac8a9d52
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-10-27 10:33:46 +01:00 |
|
Laurent Destailleur
|
8bcd704d9b
|
Disable notif as it is used as a frame
|
2020-10-27 10:32:25 +01:00 |
|
Laurent Destailleur
|
5943e784ec
|
Remove var_dump
|
2020-10-27 10:27:44 +01:00 |
|
Laurent Destailleur
|
00b49dba18
|
Fix label
|
2020-10-27 10:26:30 +01:00 |
|
Laurent Destailleur
|
ffc961599c
|
FIX error 500 on cash fence
|
2020-10-27 10:19:00 +01:00 |
|
Laurent Destailleur
|
19b82047f0
|
Fix sql
|
2020-10-27 10:00:35 +01:00 |
|
Frédéric FRANCE
|
6fc4b1b839
|
add small photo in box members
|
2020-10-27 08:17:12 +01:00 |
|
Laurent Destailleur
|
c81c3ec71a
|
Fix translation
|
2020-10-27 03:20:33 +01:00 |
|
Laurent Destailleur
|
e637b60b4b
|
Fix regression in language files
|
2020-10-27 03:04:53 +01:00 |
|
Laurent Destailleur
|
d2a2d74f7e
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/product.lib.php
htdocs/langs/am_ET/mrp.lang
htdocs/langs/ar_SA/mrp.lang
htdocs/langs/az_AZ/mrp.lang
htdocs/langs/bg_BG/mrp.lang
htdocs/langs/bn_BD/mrp.lang
htdocs/langs/bn_IN/mrp.lang
htdocs/langs/bs_BA/mrp.lang
htdocs/langs/ca_ES/mrp.lang
htdocs/langs/cs_CZ/mrp.lang
htdocs/langs/da_DK/mrp.lang
htdocs/langs/de_DE/mrp.lang
htdocs/langs/el_GR/mrp.lang
htdocs/langs/en_US/mrp.lang
htdocs/langs/es_ES/mrp.lang
htdocs/langs/et_EE/mrp.lang
htdocs/langs/eu_ES/mrp.lang
htdocs/langs/fa_IR/mrp.lang
htdocs/langs/fi_FI/mrp.lang
htdocs/langs/fr_FR/mrp.lang
htdocs/langs/gl_ES/mrp.lang
htdocs/langs/he_IL/mrp.lang
htdocs/langs/hi_IN/mrp.lang
htdocs/langs/hr_HR/mrp.lang
htdocs/langs/hu_HU/mrp.lang
htdocs/langs/id_ID/mrp.lang
htdocs/langs/is_IS/mrp.lang
htdocs/langs/it_IT/mrp.lang
htdocs/langs/ja_JP/mrp.lang
htdocs/langs/ka_GE/mrp.lang
htdocs/langs/km_KH/mrp.lang
htdocs/langs/kn_IN/mrp.lang
htdocs/langs/ko_KR/mrp.lang
htdocs/langs/lo_LA/mrp.lang
htdocs/langs/lt_LT/mrp.lang
htdocs/langs/lv_LV/mrp.lang
htdocs/langs/mk_MK/mrp.lang
htdocs/langs/mn_MN/mrp.lang
htdocs/langs/nb_NO/mrp.lang
htdocs/langs/ne_NP/mrp.lang
htdocs/langs/nl_NL/mrp.lang
htdocs/langs/pl_PL/mrp.lang
htdocs/langs/pt_PT/mrp.lang
htdocs/langs/ro_RO/mrp.lang
htdocs/langs/ru_RU/mrp.lang
htdocs/langs/sk_SK/mrp.lang
htdocs/langs/sl_SI/mrp.lang
htdocs/langs/sq_AL/mrp.lang
htdocs/langs/sr_RS/mrp.lang
htdocs/langs/sv_SE/mrp.lang
htdocs/langs/sw_SW/mrp.lang
htdocs/langs/th_TH/mrp.lang
htdocs/langs/tr_TR/mrp.lang
htdocs/langs/uk_UA/mrp.lang
htdocs/langs/uz_UZ/mrp.lang
htdocs/langs/vi_VN/mrp.lang
htdocs/langs/zh_CN/mrp.lang
htdocs/langs/zh_HK/mrp.lang
htdocs/langs/zh_TW/mrp.lang
htdocs/mrp/class/mo.class.php
htdocs/mrp/mo_agenda.php
htdocs/mrp/mo_card.php
htdocs/mrp/mo_document.php
htdocs/mrp/mo_movements.php
htdocs/mrp/mo_note.php
htdocs/mrp/mo_production.php
|
2020-10-27 02:55:22 +01:00 |
|
Laurent Destailleur
|
313273f462
|
Doc
|
2020-10-27 02:19:43 +01:00 |
|
Laurent Destailleur
|
3f0a9cfce9
|
Fix var not defined
|
2020-10-27 02:03:13 +01:00 |
|
Laurent Destailleur
|
bb64d1a67f
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-10-27 01:50:36 +01:00 |
|
Laurent Destailleur
|
32ff76178e
|
FIX #15168
|
2020-10-27 01:44:00 +01:00 |
|
Laurent Destailleur
|
77841b8889
|
Merge pull request #15155 from javierybar/develop
NEW Credit note in TakePOS
|
2020-10-27 01:26:10 +01:00 |
|
Laurent Destailleur
|
96ad9d27fa
|
Merge pull request #15174 from frederic34/patch-8
clean code interface_99_modZapier_ZapierTriggers.class.php
|
2020-10-27 01:25:43 +01:00 |
|
Laurent Destailleur
|
f801bc65c8
|
Merge pull request #15173 from frederic34/patch-6
Clean code interface_20_all_Logevents.class.php
|
2020-10-27 01:25:16 +01:00 |
|
Laurent Destailleur
|
1940d008a0
|
Merge pull request #15175 from frederic34/indexmembers
display last members like on list
|
2020-10-27 01:24:54 +01:00 |
|
Laurent Destailleur
|
624e116ecb
|
Merge pull request #15176 from frederic34/patch-10
add small photo in picto link
|
2020-10-27 01:23:57 +01:00 |
|
Laurent Destailleur
|
7806bdabb3
|
Merge pull request #15177 from Ahuahuachi/12.0-FIX-15161
FIX #15161 MO translation conflict
|
2020-10-27 01:23:26 +01:00 |
|
Alfredo Altamirano
|
214cd2c99b
|
Update references of MO translation string
|
2020-10-26 15:44:26 -06:00 |
|
Alfredo Altamirano
|
43fd659d2a
|
Rename translation string MO for ManufacturingOrder
|
2020-10-26 15:38:42 -06:00 |
|
Frédéric FRANCE
|
4a0dd3b4bc
|
add small photo in picto link
|
2020-10-26 22:05:40 +01:00 |
|
Frédéric FRANCE
|
d3c87dabab
|
display members
|
2020-10-26 21:51:17 +01:00 |
|
Frédéric FRANCE
|
42f5fd7d5f
|
display last members like on list
|
2020-10-26 21:38:16 +01:00 |
|
Frédéric FRANCE
|
0bdd6abca9
|
Update interface_99_modZapier_ZapierTriggers.class.php
|
2020-10-26 20:14:45 +01:00 |
|
Frédéric FRANCE
|
557a0caa91
|
Update interface_20_all_Logevents.class.php
|
2020-10-26 20:10:19 +01:00 |
|
Laurent Destailleur
|
c918acaadc
|
Doc
|
2020-10-26 19:37:30 +01:00 |
|
Laurent Destailleur
|
fc66e01be8
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-10-26 19:35:09 +01:00 |
|
Laurent Destailleur
|
a352c2d82a
|
Doc
|
2020-10-26 19:34:57 +01:00 |
|
Laurent Destailleur
|
3732c45702
|
Merge pull request #15169 from lyra/develop
NEW Add hooks to allow external payment modules
|
2020-10-26 19:34:23 +01:00 |
|
Laurent Destailleur
|
2340cb654d
|
Merge pull request #15149 from defrance/patch-160
Display application Title if filled on login page
|
2020-10-26 19:32:42 +01:00 |
|
Laurent Destailleur
|
680f4f9fee
|
Update login.tpl.php
|
2020-10-26 19:32:21 +01:00 |
|
Laurent Destailleur
|
07729ec431
|
Merge pull request #15150 from FHenry/dev_fix_migration_livraison_to_delivery
fix migration livraison to delivery
|
2020-10-26 19:28:59 +01:00 |
|
Laurent Destailleur
|
a8fccc67ba
|
Merge pull request #15148 from frederic34/patch-6
doxygen
|
2020-10-26 19:28:11 +01:00 |
|
Laurent Destailleur
|
c1cd25fb6b
|
Merge pull request #15151 from frederic34/patch-8
selectTypeContact return void
|
2020-10-26 19:27:52 +01:00 |
|
Laurent Destailleur
|
a079cbe353
|
Merge pull request #15152 from frederic34/patch-10
doxygen and clean code
|
2020-10-26 19:27:28 +01:00 |
|
Laurent Destailleur
|
5e19483c99
|
Update don.class.php
|
2020-10-26 19:26:55 +01:00 |
|
Laurent Destailleur
|
58a5585d0e
|
Merge pull request #15154 from frederic34/categories
clean code
|
2020-10-26 19:25:13 +01:00 |
|
Laurent Destailleur
|
b2f08e5762
|
Update categorie.class.php
|
2020-10-26 19:23:23 +01:00 |
|
Laurent Destailleur
|
87f65d2487
|
Merge pull request #15156 from frederic34/patch-11
set unknown variables
|
2020-10-26 19:22:43 +01:00 |
|
Laurent Destailleur
|
e39adbdcb5
|
Merge pull request #15157 from frederic34/patch-13
doxygen
|
2020-10-26 19:22:13 +01:00 |
|