Commit Graph

96756 Commits

Author SHA1 Message Date
Laurent Destailleur
10a6774ede
Merge pull request #16534 from atm-lena/develop_FIX_OrderBy_UserThirdParty_BankEntries
Bank Entries : Error order by user/thirdparty
2021-03-04 17:08:12 +01:00
Laurent Destailleur
b92bfb007f
Merge pull request #16520 from FHenry/dev_EventOrganisation
new: working on conference or booth object and event type #FoundationFunding
2021-03-04 17:06:57 +01:00
Laurent Destailleur
7d20df8054
Merge pull request #16177 from atm-gauthier/NEW/add_real_payments_on_salaries
NEW Salary payment request and Salary payment are 2 different steps in workflow on Salary payment recording
2021-03-04 16:53:54 +01:00
Laurent Destailleur
eda0b4dc37
Merge pull request #16531 from FHenry/12.0
avoid warning into modulebuilder
2021-03-04 16:52:47 +01:00
Laurent Destailleur
8189106627
Merge pull request #16532 from Hystepik/develop#1
Close #16523 : New column Contact assigned
2021-03-04 16:52:20 +01:00
Laurent Destailleur
87da30d2d9
Update tasks.php 2021-03-04 16:50:39 +01:00
Laurent Destailleur
beb8dbcc01
Update project.lib.php 2021-03-04 16:48:25 +01:00
Laurent Destailleur
672a07fdac
Merge pull request #16535 from atm-greg/Fix_attach_files_when_models_are_available
Fix : if mailmodels exist in database attached files are always cleared
2021-03-04 16:45:00 +01:00
Gauthier PC portable 024
4fe292c76d FIX : getNomUrl() user in title and travis feedbacks 2021-03-04 16:29:32 +01:00
Laurent Destailleur
afd751777c
Merge pull request #16536 from Hystepik/develop#2
Fix #16525 : new button manufacturing order
2021-03-04 16:13:01 +01:00
Laurent Destailleur
87c1e85017
Update mo_production.php 2021-03-04 16:10:50 +01:00
Laurent Destailleur
dcff298c5f FIX #16533 2021-03-04 15:57:03 +01:00
Christophe Battarel
83350cde8f remove hidden constant MAIN_ADVANCE_NUMLOT 2021-03-04 15:40:23 +01:00
Christophe Battarel
53cf042a57 adapt tobatch import/export 2021-03-04 15:35:53 +01:00
Laurent Destailleur
98eb0fc969 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-03-04 15:34:44 +01:00
Laurent Destailleur
ffa0e6c391 FIX Timezone management for datetime on list of events 2021-03-04 15:34:29 +01:00
Christophe Battarel
a4dcf603ed fix repair batch stock for batch=2 2021-03-04 15:33:06 +01:00
Christophe Battarel
faf7b1d659 adapt dispatch for serial numbers 2021-03-04 15:31:51 +01:00
Christophe Battarel
6a242edd8b check unicity of serial number 2021-03-04 15:29:47 +01:00
lmarcouiller
33f7f2c7d2 Fix #16525 : new button manufacturing order 2021-03-04 15:02:46 +01:00
atm-greg
c41b59b14c Fix : when we have got models in database attached files are cleared even if we did not have selected a model 2021-03-04 14:23:08 +01:00
Juanjo Menent
a04a4806e0 Fix: lost selecteds items in ticket creation 2021-03-04 11:50:46 +01:00
atm-lena
cd1c1c54d4 Merge branch 'FIX_BankEntries_OrderByUserSoc' of github.com:atm-lena/dolibarr into develop_FIX_OrderBy_UserThirdParty_BankEntries 2021-03-04 11:50:08 +01:00
atm-lena
0cce782a21 No orderby for user/thirdparty in bankentries list 2021-03-04 11:42:47 +01:00
stickler-ci
47dd477c61 Fixing style errors. 2021-03-04 09:36:17 +00:00
lmarcouiller
e94f703f5d Fix #16523 : return to backward compatibility 2021-03-04 10:33:18 +01:00
Laurent Destailleur
7bc2e1ffad FIX Timezone management for datetime with modulebuilder and extrafields 2021-03-04 10:31:31 +01:00
Florian HENRY
bf775855f6 avoid warning into modulebuilder 2021-03-04 10:28:41 +01:00
lmarcouiller
500f192a05 Fix #16523 : New column Contact assigned 2021-03-04 10:15:41 +01:00
Laurent Destailleur
5553bae3a1 FIX Timezone management for datetime with modulebuilder 2021-03-04 09:44:01 +01:00
Laurent Destailleur
33c4180781 FIX Timezone management for datetime with modulebuilder 2021-03-04 09:36:19 +01:00
Laurent Destailleur
a371647bca FIX picto on shipment to reset qty to 0. Some quantities were not reset. 2021-03-04 08:52:55 +01:00
Florian HENRY
6844c57413 fix sql 2021-03-04 07:53:32 +01:00
Florian HENRY
ecd1915c0a fix sql 2021-03-04 07:45:27 +01:00
Florian HENRY
c362a16df1 fix sql 2021-03-04 07:45:02 +01:00
Florian HENRY
89bd9c4e05 fix sql 2021-03-04 07:44:31 +01:00
Florian HENRY
879e8fe5f6 fix sql 2021-03-04 07:44:00 +01:00
Laurent Destailleur
31845e1dae Fix phpcs 2021-03-04 00:04:43 +01:00
Laurent Destailleur
6503c81f47 FIX #16530 2021-03-03 23:55:28 +01:00
Laurent Destailleur
30dd4ac6ec FIX #16530 2021-03-03 22:52:02 +01:00
Laurent Destailleur
aa1551bf1f FIX class not found when creating recuring invoice from invoice+discount 2021-03-03 22:46:25 +01:00
Florian HENRY
ec52ed445c fix ambigous 2021-03-03 22:18:42 +01:00
Florian HENRY
04c6d5dd8f fix sql 2021-03-03 22:16:35 +01:00
Florian HENRY
91b93ac7ce fix sql 2021-03-03 22:10:17 +01:00
Florian HENRY
9162574262 Merge branch 'dev_EventOrganisation' into dev_EventOrganisation_draft 2021-03-03 22:00:35 +01:00
Florian HENRY
de4a76a266 ongoung 2021-03-03 22:00:23 +01:00
Florian HENRY
9c256ab8a8 fix review 2021-03-03 21:40:37 +01:00
Florian HENRY
5233ad7424 revert wrong code in commonobject 2021-03-03 21:38:43 +01:00
Laurent Destailleur
71370bd558 Fix links in cheque receipt pages 2021-03-03 21:18:14 +01:00
Florian HENRY
4e2f929460 test 2021-03-03 21:11:04 +01:00