Commit Graph

80406 Commits

Author SHA1 Message Date
Laurent Destailleur
23d0d4635a Trans 2020-10-30 18:16:19 +01:00
Laurent Destailleur
4dbac98d8c
Merge pull request #15197 from aspangaro/14a2
NEW: Accountancy - Add a ledger for subaccount
2020-10-30 18:12:11 +01:00
Frédéric FRANCE
bdfc164130
Merge remote-tracking branch 'upstream/develop' into apiclean 2020-10-30 18:02:58 +01:00
Frédéric FRANCE
8190711342
doxygen 2020-10-30 18:01:01 +01:00
Laurent Destailleur
3cefb5f336
Update listbyaccount.php 2020-10-30 17:59:33 +01:00
Frédéric FRANCE
406cb5a2c9
Update api_boms.class.php 2020-10-30 17:49:16 +01:00
Frédéric FRANCE
28adc985b0
Update api_setup.class.php 2020-10-30 17:31:57 +01:00
Frédéric FRANCE
b431d99996
Update api_memberstypes.class.php 2020-10-30 16:10:23 +01:00
Frédéric FRANCE
782e062ec7
Update api_thirdparties.class.php 2020-10-30 15:24:29 +01:00
Frédéric FRANCE
a317d71413
Update api_users.class.php 2020-10-30 15:23:05 +01:00
Frédéric FRANCE
38c2fea849
Update api_members.class.php 2020-10-30 15:21:28 +01:00
Laurent Destailleur
d9ca9fe22d Fix clean of contract 2020-10-30 14:50:38 +01:00
Laurent Destailleur
2614a951cd
Merge pull request #15220 from frederic34/patch-6
doxygen
2020-10-30 14:35:38 +01:00
Laurent Destailleur
64b9afc509 Fix bad column name 2020-10-30 14:33:16 +01:00
Laurent Destailleur
e5c683ebb7 Comment 2020-10-30 14:29:41 +01:00
Laurent Destailleur
cb3e204281 Fix use of dolibarr_main_distrib 2020-10-30 13:06:55 +01:00
Laurent Destailleur
2668efa132 Fix missing global 2020-10-30 12:44:29 +01:00
ATM john
61cb99117a Add missing lang trans 2020-10-30 09:33:07 +01:00
Frédéric FRANCE
412077ab51
doxygen 2020-10-30 08:24:02 +01:00
Laurent Destailleur
d4daf8b9ce Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/security2.lib.php
2020-10-30 05:59:45 +01:00
Laurent Destailleur
5504e3b236 Fix phpcs 2020-10-30 05:58:40 +01:00
Laurent Destailleur
a24071492e Start fix for php8 compatibility 2020-10-30 05:56:07 +01:00
Laurent Destailleur
b3333da5c1 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/security2.lib.php
	htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
	htdocs/main.inc.php
2020-10-30 04:39:41 +01:00
Laurent Destailleur
1a02504792 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/core/class/hookmanager.class.php
	htdocs/core/lib/security2.lib.php
2020-10-30 04:26:09 +01:00
Laurent Destailleur
f51b02026c Fix regression 2020-10-30 04:24:06 +01:00
Laurent Destailleur
840ca73464 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/core/class/hookmanager.class.php
	htdocs/main.inc.php
	htdocs/theme/eldy/info-box.inc.php
	htdocs/theme/eldy/style.css.php
2020-10-30 04:21:07 +01:00
Laurent Destailleur
f5a156ee06 Fix regression 2020-10-30 04:17:02 +01:00
Laurent Destailleur
1b5bcaccc6 Fix remove warnings 2020-10-30 04:13:31 +01:00
Laurent Destailleur
ec0c8e0c79 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/core/lib/security2.lib.php
	htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
	htdocs/core/tpl/advtarget.tpl.php
2020-10-30 03:35:40 +01:00
Laurent Destailleur
263b679af4 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/core/tpl/advtarget.tpl.php
2020-10-30 03:31:04 +01:00
Laurent Destailleur
925669ee33 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-10-30 03:25:52 +01:00
Laurent Destailleur
f22017080d Fix for php8 2020-10-30 03:25:33 +01:00
Laurent Destailleur
d4db10a9e5
Merge pull request #15219 from frederic34/patch-8
phpcs
2020-10-30 02:55:12 +01:00
Frédéric FRANCE
0507e71586
phpcs 2020-10-29 18:44:15 +01:00
Frédéric FRANCE
9e70d7ca65
fix undefined variable 2020-10-29 18:37:52 +01:00
Laurent Destailleur
8c646cdf4f
Merge pull request #15207 from frederic34/patch-11
Mutualise code, introduce MAIN_ALL_TOWN_TO_UPPER
2020-10-29 17:49:16 +01:00
Laurent Destailleur
4071a3cfc2
Merge pull request #15205 from frederic34/patch-8
Update index.php
2020-10-29 17:46:51 +01:00
Laurent Destailleur
e79a061c19
Merge pull request #15204 from frederic34/patch-6
Update timeline.inc.php
2020-10-29 17:46:31 +01:00
Laurent Destailleur
f9713a5752
Merge pull request #15206 from frederic34/patch-10
The constant MissingIds was not found.
2020-10-29 17:46:16 +01:00
Laurent Destailleur
628b318613
Merge pull request #15211 from hregis/develop_bug2
FIX wrong check operator (create wrong $contextpage)
2020-10-29 17:45:56 +01:00
Laurent Destailleur
75cc5a210e
Merge pull request #15209 from frederic34/patch-13
doxygen
2020-10-29 17:45:36 +01:00
Laurent Destailleur
391224d221
Merge pull request #15214 from hregis/fix_date_not_recover_in_edit_mode
FIX extrafield date not recover in create/edit mode
2020-10-29 17:42:13 +01:00
Laurent Destailleur
45477aba0d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-29 13:10:50 +01:00
Laurent Destailleur
c187b41714 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-29 13:10:39 +01:00
Laurent Destailleur
ee4a827627 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/compta/bank/various_payment/card.php
	htdocs/compta/bank/various_payment/list.php
	htdocs/core/db/DoliDB.class.php
2020-10-29 13:10:10 +01:00
Laurent Destailleur
d7225327e7 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-10-29 11:13:29 +01:00
Laurent Destailleur
2a386b6fea Fix set subledger account 2020-10-29 11:13:18 +01:00
Laurent Destailleur
91cf5de54d Fix bad sort order 2020-10-29 11:06:18 +01:00
Regis Houssin
032813fa19 FIX extrafield date not recover in create/edit mode 2020-10-29 11:05:45 +01:00
Laurent Destailleur
980cb095da Fix sort order use last sortorder if several fields. 2020-10-29 11:05:43 +01:00
Laurent Destailleur
b1b7a7c725 Fix missing transaction 2020-10-29 10:40:50 +01:00
Laurent Destailleur
c3f0f3cc4a
Revert "FIX: various payments: bad data handling for subledger account + useless db commit/rollback" 2020-10-29 10:36:48 +01:00
Regis Houssin
1c7d293a93 FIX wrong check operator 2020-10-29 10:10:10 +01:00
Frédéric FRANCE
f5673fd08a
doxygen 2020-10-28 22:47:29 +01:00
Frédéric FRANCE
7ef2aaf8af
Update user.class.php 2020-10-28 20:57:36 +01:00
Frédéric FRANCE
fcb343e891
Update societe.class.php 2020-10-28 20:53:29 +01:00
Frédéric FRANCE
e546e56b22
Update contact.class.php 2020-10-28 20:50:33 +01:00
Frédéric FRANCE
79941a8dde
Update adherent.class.php 2020-10-28 19:10:54 +01:00
Frédéric FRANCE
4d716e74bd
Mutualise code, introduce MAIN_ALL_TOWN_TO_UPPER 2020-10-28 19:06:45 +01:00
Frédéric FRANCE
09b8d166dd
The constant MissingIds was not found.
The constant MissingIds was not found. Maybe you did not declare it correctly or list all dependencies?
2020-10-28 18:21:45 +01:00
Frédéric FRANCE
cd7cee061a
Update index.php 2020-10-28 17:56:26 +01:00
Frédéric FRANCE
20c00d0c43
Update timeline.inc.php 2020-10-28 17:54:45 +01:00
Scrutinizer Auto-Fixer
208740c9c4 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-28 16:49:52 +00:00
Laurent Destailleur
f760b20bde Fix double semi colon 2020-10-28 17:48:20 +01:00
Laurent Destailleur
8a58471aeb
Merge pull request #15191 from frederic34/patch-10
Fix print extrafield on pdf lines
2020-10-28 17:35:58 +01:00
Laurent Destailleur
d4459367ab
Merge pull request #15193 from frederic34/patch-13
Update delivery.class.php
2020-10-28 17:17:45 +01:00
Laurent Destailleur
4cf32824bf
Merge pull request #15187 from frederic34/patch-6
Make MAIN_ALL_TO_UPPER utf8 compliant
2020-10-28 17:17:18 +01:00
Laurent Destailleur
6a76946f99
Merge pull request #15189 from frederic34/patch-8
doxygen
2020-10-28 17:13:50 +01:00
Laurent Destailleur
6ed781c7c4
Merge pull request #15192 from frederic34/patch-11
Update fichinter.class.php
2020-10-28 17:11:02 +01:00
Laurent Destailleur
77dfda1a2d
Merge pull request #15194 from ptibogxiv/patch-391
FIX display variants card
2020-10-28 17:10:34 +01:00
Laurent Destailleur
e3f848238d
Merge pull request #15195 from frederic34/cachecompanylib
add cache
2020-10-28 17:09:27 +01:00
Laurent Destailleur
5f3596ef3e
Merge branch 'develop' into 20201027_phpcs 2020-10-28 17:08:15 +01:00
Florian Mortgat
a4af2e94a9 FIX 10.0 - make formConfirm an addreplace-type hook 2020-10-28 17:08:09 +01:00
Laurent Destailleur
393efed01f
Merge pull request #15196 from ppenelon/develop
New Handle proposals upload in documents API
2020-10-28 17:07:21 +01:00
Laurent Destailleur
9a85441c61 Fix phpcs 2020-10-28 17:06:30 +01:00
Laurent Destailleur
ef59b71cdf Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/product/class/product.class.php
	htdocs/product/stats/card.php
2020-10-28 17:02:20 +01:00
Laurent Destailleur
f02a35d398 Fix bad array when year is not defined into graph stat of products 2020-10-28 16:47:00 +01:00
Laurent Destailleur
6363a6cd60 Fix sanitize 2020-10-28 14:11:46 +01:00
Laurent Destailleur
47dfe633f9 Fix filter on date on statistics of products 2020-10-28 13:19:35 +01:00
jpb
f0baa0f788 fix : input type number , getpost type , hook 2020-10-28 12:12:29 +01:00
Alexandre SPANGARO
86ee75363a NEW: Accountancy - Add a ledger for subaccount 2020-10-28 09:49:38 +01:00
Pierre Penelon
63c5c41a7b
ADD Handle proposals upload in documents API 2020-10-28 01:47:25 +01:00
Frédéric FRANCE
0d65ab0c96
add cache 2020-10-28 00:34:59 +01:00
ptibogxiv
6fd996381e
FIX display variant card 2020-10-27 23:07:05 +01:00
Frédéric FRANCE
a1af0f11c1
Update delivery.class.php 2020-10-27 23:01:28 +01:00
Frédéric FRANCE
bc7c1540cc
Update fichinter.class.php 2020-10-27 22:57:06 +01:00
Frédéric FRANCE
e8659469b9
Update expedition.class.php 2020-10-27 22:49:30 +01:00
Frédéric FRANCE
9ba22d2813
doxygen 2020-10-27 22:07:31 +01:00
Frédéric FRANCE
7a7a6f8018
fix phpcs 2020-10-27 21:28:26 +01:00
Frédéric FRANCE
19ff2ef19e
Update user.class.php 2020-10-27 20:52:37 +01:00
Frédéric FRANCE
0ff32c7074
Update societe.class.php 2020-10-27 20:50:11 +01:00
Frédéric FRANCE
5a01d91492
Update contact.class.php 2020-10-27 20:48:13 +01:00
Frédéric FRANCE
b9f593b73a
Update adherent.class.php 2020-10-27 20:46:32 +01:00
Frédéric FRANCE
991273bd10
Update functions.lib.php 2020-10-27 20:44:17 +01:00
Frédéric FRANCE
584373af55
Update user.class.php 2020-10-27 20:15:46 +01:00
Frédéric FRANCE
4f3b732ed5
Update societe.class.php 2020-10-27 20:14:42 +01:00
Frédéric FRANCE
0a024f285d
Update contact.class.php 2020-10-27 20:13:01 +01:00
Frédéric FRANCE
6d6b143011
Update adherent.class.php 2020-10-27 20:11:18 +01:00
Frédéric FRANCE
7d30a11a26
Update functions.lib.php 2020-10-27 20:06:49 +01:00
Laurent Destailleur
9595d56235
Merge pull request #15186 from fappels/13_fix_delete_product_ajax
Fix delete product using ajax
2020-10-27 20:03:00 +01:00
Laurent Destailleur
6e0ae82048 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-27 19:57:52 +01:00
Laurent Destailleur
33e56a2d7c Fix decimal qty for #14666 2020-10-27 19:56:36 +01:00
Scrutinizer Auto-Fixer
a2a9c51e50 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-27 18:46:07 +00:00
Francis Appels
828df6c134 Fix delete product using ajax 2020-10-27 19:45:12 +01:00
Laurent Destailleur
ec6c735d89 Clean code 2020-10-27 19:44:15 +01:00
Laurent Destailleur
ebdc1f7457 Fix scrutinizer 2020-10-27 19:34:52 +01:00
Laurent Destailleur
f7de9333bb Doxygen 2020-10-27 19:29:42 +01:00
Laurent Destailleur
f670f71df9 Fix scrutinizer 2020-10-27 19:14:03 +01:00
Laurent Destailleur
e10051800d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-27 19:06:58 +01:00
Laurent Destailleur
f54f67cae3 Fix sanitizing 2020-10-27 19:06:41 +01:00
Laurent Destailleur
7d291d075e
Merge pull request #15184 from frederic34/formcolor
formcolor parameter is deprecated
2020-10-27 19:03:29 +01:00
Laurent Destailleur
1b939ab8f4
Merge pull request #15183 from frederic34/dol_fiche_end
end of dol_fiche_end
2020-10-27 19:00:32 +01:00
Laurent Destailleur
358ac4cd36 Fix scrutinizer 2020-10-27 18:55:55 +01:00
Laurent Destailleur
e099507594 Fix regression 2020-10-27 18:53:03 +01:00
Frédéric FRANCE
900452a47d
formcolor parameter is deprecated 2020-10-27 18:46:42 +01:00
Laurent Destailleur
e10033143a Fix bad var 2020-10-27 18:40:44 +01:00
Laurent Destailleur
2559489920 Fix 2020-10-27 18:38:13 +01:00
Laurent Destailleur
50cf7704fe Log 2020-10-27 18:30:03 +01:00
Frédéric FRANCE
5a3780e062
end of dol_fiche_end 2020-10-27 18:19:31 +01:00
Laurent Destailleur
80d13e711c More secured getURLContent method. Add PHPUnit on getURLContent 2020-10-27 18:02:05 +01:00
Marc de Lima Lucio
a33d34a165 FIX: various payments: bad data handling for subledger account + useless db commit/rollback 2020-10-27 16:48:56 +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
jpb
26e3637e22 remove ['newtoken'] to newtoken() function 2020-10-27 09:58:32 +01:00
Frédéric FRANCE
6fc4b1b839
add small photo in box members 2020-10-27 08:17:12 +01:00
Frédéric FRANCE
da4f3fab14
dol_print_date called with a bad value 2020-10-27 08:10:19 +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
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
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
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
Laurent Destailleur
6926610e9e
Merge pull request #15158 from frederic34/patch-14
undefined variable
2020-10-26 19:21:57 +01:00
Laurent Destailleur
12289ceb9e
Merge pull request #15159 from Ahuahuachi/10.0
FIX #15111 Fix special characters output in PDF
2020-10-26 19:20:53 +01:00
Laurent Destailleur
244f74ddfe
Merge pull request #15162 from FHenry/develop
fix bad link index thirdparty
2020-10-26 19:12:23 +01:00
Laurent Destailleur
e57cd74f22
Merge pull request #15166 from atm-quentin/FIX_select2_extra_witdh_on_advtargetmailing
FIX table making extrafield input too small on advance target mailing
2020-10-26 19:11:37 +01:00
Laurent Destailleur
8051db9ad8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-26 19:09:16 +01:00
Laurent Destailleur
0abce469e9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-26 19:09:08 +01:00
Laurent Destailleur
f18a13b2d4 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/product/class/productcustomerprice.class.php
2020-10-26 19:08:11 +01:00
Laurent Destailleur
78a52eda96 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/main.inc.php
	htdocs/product/class/productcustomerprice.class.php
2020-10-26 19:05:30 +01:00
Laurent Destailleur
50ede5224a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-10-26 19:02:47 +01:00
Laurent Destailleur
c58d3d0cf7 FIX #15163 2020-10-26 19:02:26 +01:00
Laurent Destailleur
5e2b0a98cc
Merge pull request #15170 from fappels/13_set_date_livraison
Re-add set_date_livraison as a deprecated function.
2020-10-26 18:57:17 +01:00
Laurent Destailleur
130591480a
Merge pull request #15171 from frederic34/cleantriggers
clean triggers
2020-10-26 18:54:54 +01:00
Laurent Destailleur
3e050eba8c
Merge pull request #15172 from fappels/13_fix_reception
Fix reception fetch_lines
2020-10-26 18:53:15 +01:00
Frédéric FRANCE
9c51d467b5
clean triggers 2020-10-26 18:49:38 +01:00
Frédéric FRANCE
360ea91be5
clean triggers 2020-10-26 18:46:03 +01:00
Francis Appels
b6142dded6 Remove phpcs disable enable from setDeliveryDate in delivery class 2020-10-26 18:40:24 +01:00
Frédéric FRANCE
66fbddb892
clean triggers 2020-10-26 18:35:27 +01:00
Frédéric FRANCE
3e686e167c
clean triggers 2020-10-26 18:31:45 +01:00
Laurent Destailleur
3ee618d736 FIX Clean orphan records in llx_ecm_files into repair script. 2020-10-26 18:31:12 +01:00
Francis Appels
1ba0e92c41 Fix reception fetch_lines 2020-10-26 18:30:32 +01:00
Francis Appels
93ab281d81 Fix tab indent 2020-10-26 18:21:47 +01:00
Laurent Destailleur
efce53abd1 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/boxes/box_services_contracts.php
	htdocs/expensereport/class/expensereport.class.php
2020-10-26 18:17:23 +01:00
Laurent Destailleur
2c2142ddba Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-10-26 18:13:47 +01:00
Francis Appels
91496682fb Merge branch '13_set_date_livraison' of github.com:fappels/dolibarr into 13_set_date_livraison 2020-10-26 18:13:36 +01:00
Francis Appels
3ff6f6a04a Move phpcs enable to correct location @frederic34 2020-10-26 18:13:25 +01:00
Laurent Destailleur
adeddc70ca FIX Deletion of expensereport + other generated object not complete. 2020-10-26 18:10:58 +01:00
stickler-ci
d803c7f429 Fixing style errors. 2020-10-26 16:06:05 +00:00
Francis Appels
fa8e4a9bb0 No trigger for supplier proposal 2020-10-26 17:02:33 +01:00
Francis Appels
d6839ddca6 No trigger for expedition 2020-10-26 16:59:25 +01:00
Francis Appels
7fa7f0a390 Re-add set_date_livraison as a deprecated function.
Use correct naming convention for new method naming.
2020-10-26 16:50:52 +01:00
CHABANE HADJER
e7e8a91b13
Adding Payzen payment module hooks. 2020-10-26 16:38:11 +01:00
Marc de Lima Lucio
3f839c2a96 FIX: product customer prices: missing triggers in CRUD class 2020-10-26 16:11:21 +01:00
quentin
fd1f5bbe01 FIX table making extrafield too small advtagertmailing 2020-10-26 15:03:32 +01:00
quentin
5694a19c6a FIX table making extrafield input too small advtargetmailing 2020-10-26 14:51:13 +01:00