lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
95,981 Commits 43 Branches 150 Tags 886 MiB
dc5557e4f7
Commit Graph

84598 Commits

Author SHA1 Message Date
Laurent Destailleur
dfb791837c Debug split of payment salary into salary + payment 2021-03-04 21:43:01 +01:00
Laurent Destailleur
aee6d78928 Debug split of payment salary into salary + payment 2021-03-04 21:33:29 +01:00
Laurent Destailleur
d0ba10efe5 Fix phpcs 2021-03-04 19:48:50 +01:00
Laurent Destailleur
c55932090a Fix phpcs 2021-03-04 19:48:08 +01:00
Laurent Destailleur
c044b43b66 Fix phpcs 2021-03-04 19:20:16 +01:00
Laurent Destailleur
525d643915 Fix debug split of payment salary into salary + payment 2021-03-04 18:57:03 +01:00
Laurent Destailleur
fa03cde0a5 Better migration script 2021-03-04 18:23:29 +01:00
Laurent Destailleur
69f76d2f9d Fix migration to fill llx_salary table 2021-03-04 18:22:21 +01:00
Laurent Destailleur
036c4bc730 Fix phpcs 2021-03-04 18:01:41 +01:00
Laurent Destailleur
b5def91b46 Fix phpcs 2021-03-04 17:57:08 +01:00
Christophe Battarel
64036706ed fix for sticker 2021-03-04 17:52:05 +01:00
Christophe Battarel
c4ad4a33e4 fix for sticker 2021-03-04 17:49:28 +01:00
Christophe Battarel
1d2372b9ef fix for travis and sticker 2021-03-04 17:47:43 +01:00
Laurent Destailleur
59f205596e Fix phpcs 2021-03-04 17:46:34 +01:00
Laurent Destailleur
d56890de17 Fix phpcs 2021-03-04 17:24:58 +01:00
Laurent Destailleur
d5e0a8be56 Fix phpcs 2021-03-04 17:24:13 +01:00
Laurent Destailleur
6eafc3b774 Clean code 2021-03-04 17:23:12 +01:00
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
Gauthier PC portable 024
4fe292c76d FIX : getNomUrl() user in title and travis feedbacks 2021-03-04 16:29:32 +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
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
Florian HENRY
55e9a6596b test 2021-03-03 21:10:50 +01:00
Florian HENRY
1f2dc448d7 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2021-03-03 20:28:27 +01:00
Florian HENRY
c682309817 migration ok 2021-03-03 20:27:55 +01:00
x
ae60f452cc FIX : pencil to update employee field on card view 2021-03-03 16:36:21 +01:00
Florian HENRY
1434e58031 Merge branch 'dev_EventOrganisation' of github.com:FHenry/dolibarr into dev_EventOrganisation 2021-03-03 16:28:31 +01:00
Florian HENRY
1913564b38 fix travis 2021-03-03 16:28:14 +01:00
Florian HENRY
c909306f34 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-03 16:27:05 +01:00
Laurent Destailleur
43e58f70a1
Merge pull request #16528 from frederic34/patch-4 
remove unused code
 2021-03-03 15:10:58 +01:00
Laurent Destailleur
d22f929779
Merge pull request #16526 from frederic34/patch-3 
fix unknown constant and variable
 2021-03-03 15:10:38 +01:00
stickler-ci
6cbc979520 Fixing style errors. 2021-03-03 13:52:21 +00:00
Gauthier PC portable 024
3643afd761 Merge branch 'NEW/12.0_new_payments_on_salaries' of github.com:ATM-Consulting/dolibarr into NEW/add_real_payments_on_salaries 2021-03-03 14:49:29 +01:00
Gauthier PC portable 024
ca8d2a671d FIX : conf ajax must be after main form 2021-03-03 14:47:30 +01:00
Gauthier PC portable 024
845b1c6c94 Merge branch 'NEW/12.0_new_payments_on_salaries' of github.com:ATM-Consulting/dolibarr into NEW/add_real_payments_on_salaries 2021-03-03 14:35:38 +01:00
x
049080991d FIX : label must be over user 2021-03-03 14:13:36 +01:00
Frédéric FRANCE
d05c0b749a
remove unused code 2021-03-03 13:11:10 +01:00
Frédéric FRANCE
2d9f00eb57
Update commonobject.class.php 2021-03-03 12:24:44 +01:00
Laurent Destailleur
da8b67da83 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-03-03 12:07:42 +01:00
Laurent Destailleur
5f8b52ffc9 Code comment 2021-03-03 12:05:43 +01:00
Laurent Destailleur
093eab188e Code comment 2021-03-03 12:02:57 +01:00
Frédéric FRANCE
a8bf47b9ce
fix unknown constant and variable 2021-03-03 12:02:48 +01:00
Laurent Destailleur
f11a85a3e3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/compta/facture/card.php
	htdocs/contrat/card.php
	htdocs/fichinter/card.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
	htdocs/supplier_proposal/card.php
 2021-03-03 11:37:34 +01:00
Laurent Destailleur
889a496661 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-03 11:31:55 +01:00
Laurent Destailleur
b5d1e36ece Fix include 2021-03-03 11:31:40 +01:00
Laurent Destailleur
6fcec3e99b
Merge pull request #16522 from FHenry/13.0 
fix: warning on install
 2021-03-02 23:58:26 +01:00
Laurent Destailleur
c2f0d9f42c
Update functions.lib.php 2021-03-02 23:57:37 +01:00
Laurent Destailleur
7abf572f2d
Merge pull request #16512 from Hystepik/develop#1 
Fix #16432 : Update of getCountriesinEEC
 2021-03-02 23:56:37 +01:00
Laurent Destailleur
348b8d2ffe More phpunit tests 2021-03-02 23:55:41 +01:00
Florian HENRY
4e5849e50b remove debug 2021-03-02 23:13:05 +01:00
Laurent Destailleur
7eb3e324c7 FIX #16503 2021-03-02 23:09:55 +01:00
Florian HENRY
30c6e268a1 fix warning 2021-03-02 22:55:43 +01:00
Frédéric FRANCE
6c30eca11d
user home 2021-03-02 22:41:20 +01:00
Florian HENRY
81f54003f6 set migration auto increment 2021-03-02 22:35:47 +01:00
stickler-ci
95d7380317 Fixing style errors. 2021-03-02 21:34:19 +00:00
Florian HENRY
c2d8dde4b1 Merge branch 'develop' of github.com:FHenry/dolibarr into develop 2021-03-02 22:33:36 +01:00
Florian HENRY
88f8642048 Merge branch 'dev_EventOrganisation' of github.com:FHenry/dolibarr into dev_EventOrganisation 2021-03-02 22:32:27 +01:00
Florian HENRY
5dcbea4cc5 revome dev hack 2021-03-02 22:32:12 +01:00
Frédéric FRANCE
b0f735350f
new box replace 2021-03-02 22:31:55 +01:00
stickler-ci
e28f844d54 Fixing style errors. 2021-03-02 21:31:48 +00:00
Frédéric FRANCE
da038cf590
new box replace 2021-03-02 22:29:02 +01:00
Florian HENRY
e5e3abd685 class conference or booth or and table actioncomm ok 2021-03-02 22:23:54 +01:00
Frédéric FRANCE
22bc3b879b
new box replace 2021-03-02 22:21:34 +01:00
Frédéric FRANCE
d68de8617b
new box replace 2021-03-02 22:00:09 +01:00
Florian HENRY
6862c206aa merge from develop 2021-03-02 21:48:35 +01:00
Frédéric FRANCE
742c12f9d6
rename new boxes 2021-03-02 20:58:21 +01:00
Frédéric FRANCE
6cf8a46095
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-03-02 20:41:01 +01:00
Laurent Destailleur
40f0304182
Merge pull request #16516 from OPEN-DSI/fix-commonobject-select-list-dependancies 
FIX select list dependancies on common object (FIX #16510)
 2021-03-02 19:16:03 +01:00
Laurent Destailleur
1756d2833c
Merge pull request #16513 from AlexisLaurier/develop 
Avoid loss of data on RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED
 2021-03-02 19:15:22 +01:00
Frédéric FRANCE
bb2a505404
Update eventorganization.php 2021-03-02 18:26:04 +01:00
lvessiller
66ad8fbb24 FIX select list dependancies on common object (FIX #16510) 2021-03-02 17:21:55 +01:00
Frédéric FRANCE
15623ae852
fix 2021-03-02 16:39:04 +01:00
Frédéric FRANCE
5d78c3530b
test stickler 2021-03-02 16:34:04 +01:00
lmarcouiller
2eaa6ad6c6 Fix #16432 : Add cache use in function 2021-03-02 16:21:43 +01:00
Laurent Destailleur
c81d5ff4d0 Introduce a variable to cache some data. 2021-03-02 16:13:00 +01:00
Alexis LAURIER
516e7a3955 Merge branch 'develop' of https://github.com/AlexisLaurier/dolibarr into develop 2021-03-02 16:04:37 +01:00
Alexis LAURIER
e219972936 avoid lost of data for RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED 2021-03-02 16:04:26 +01:00
stickler-ci
b374a8a00b Fixing style errors. 2021-03-02 15:03:36 +00:00
lmarcouiller
fc86784cfc Fix #16432 : update with eldy advices 2021-03-02 16:03:14 +01:00
Laurent Destailleur
1876cd661a Remove UK from list of european countries 2021-03-02 16:00:10 +01:00
Laurent Destailleur
8fc89b9ef1
Merge pull request #16511 from FHenry/13.0 
fix #16510 (missing ($this->) in previous PR
 2021-03-02 15:49:13 +01:00
Laurent Destailleur
7f1d61f8a8 Fix phpcs 2021-03-02 15:34:43 +01:00
Florian HENRY
373d52a562 Merge remote-tracking branch 'origin/13.0' into 13.0 2021-03-02 15:33:38 +01:00
Laurent Destailleur
a5bcc47d0d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-02 15:29:54 +01:00
Laurent Destailleur
a82ad6a02c Fix phpcs 2021-03-02 15:29:27 +01:00
Laurent Destailleur
42329b10c9 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	build/generate_filelist_xml.php
	htdocs/comm/propal/card.php
	htdocs/commande/card.php
	htdocs/compta/facture/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/modulebuilder.lib.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
	htdocs/supplier_proposal/card.php
	htdocs/ticket/list.php
 2021-03-02 15:27:20 +01:00
lmarcouiller
c5ac79e34c Fix #16432 : Update of getCountriesinEEX 2021-03-02 15:24:55 +01:00
Florian HENRY
2c163b8163 fix #16510 2021-03-02 15:22:22 +01:00
Laurent Destailleur
495c61c231 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
 2021-03-02 15:12:41 +01:00
Laurent Destailleur
5fd341bbd3 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
 2021-03-02 15:11:18 +01:00
Laurent Destailleur
1f25f2bb7e Fix phpcs 2021-03-02 15:09:29 +01:00
Laurent Destailleur
5af8e49c86 Fix permission on generated sitemap file 2021-03-02 15:08:03 +01:00
Laurent Destailleur
f219c9454a
Merge pull request #16251 from Hystepik/develop#5 
Close #16218 : new button sitemap file
 2021-03-02 14:56:10 +01:00
Laurent Destailleur
13e1ccb795
Update index.php 2021-03-02 14:55:42 +01:00
Laurent Destailleur
cdfb9254b3
Merge pull request #16510 from FHenry/13.0_fix_missing_list_dependencies_for_modulebuilder_fields 
FIX : select list dependencies now work for ModuleBuilder sellist field
 2021-03-02 14:51:53 +01:00
Laurent Destailleur
3982a36a3e
Update commonobject.class.php 2021-03-02 14:47:35 +01:00
Laurent Destailleur
7144e80063
Merge pull request #16322 from FHenry/dev_new_conf_defaulteventstatus 
NEW: Conf for default actiomm status when created from card (and DefaultValues CRUD class)
 2021-03-02 14:45:05 +01:00
Laurent Destailleur
3a00952cd1
Update user.class.php 2021-03-02 14:44:31 +01:00
Florian HENRY
27c354567a FIX : select list dependencies now work for ModuleBuilder sellist field 2021-03-02 14:06:11 +01:00
Laurent Destailleur
acb7b30eb0
Merge pull request #16507 from frederic34/add_rule 
Add rule
 2021-03-02 12:52:03 +01:00
Laurent Destailleur
1132ed306c
Merge pull request #16506 from andreubisquerra/patch-1 
Avoid php errors if negative var in Receipt Module
 2021-03-02 12:50:57 +01:00
Laurent Destailleur
2d200a523d
Merge pull request #16505 from frederic34/fixmerge 
fix merge
 2021-03-02 12:42:12 +01:00
Frédéric FRANCE
e1ff1c736c fix typo 
Conflicts:
	htdocs/core/login/functions_openid.php
 2021-03-02 12:41:34 +01:00
Laurent Destailleur
25b2de4874 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-02 12:40:00 +01:00
Laurent Destailleur
ba04c94b2d
Merge pull request #16502 from frederic34/patch-3 
fix typo
 2021-03-02 12:39:26 +01:00
Laurent Destailleur
ef99b0f98c
Update modulebuilder.lib.php 2021-03-02 12:38:17 +01:00
stickler-ci
35cb48d649 Fixing style errors. 2021-03-02 11:37:46 +00:00
Laurent Destailleur
1d642f49f7
Update facture.class.php 2021-03-02 12:37:24 +01:00
Laurent Destailleur
a161edefb1 Look and feel v14 2021-03-02 12:33:55 +01:00
Florian HENRY
812d3279b3 Merge branch 'dev_new_conf_defaulteventstatus' of github.com:FHenry/dolibarr into dev_new_conf_defaulteventstatus 2021-03-02 11:06:52 +01:00
Florian HENRY
0f7144a391 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_conf_defaulteventstatus 2021-03-02 11:05:20 +01:00
Florian HENRY
0f51072222 Merge HEAD, branch 'develop' of github.com:Dolibarr/dolibarr into develop 2021-03-02 11:01:02 +01:00
Florian HENRY
17c8a32780 fix civility createion PK 2021-03-02 11:00:16 +01:00
Florian HENRY
593ae78761 avoid php wrning 2021-03-02 10:55:23 +01:00
atm-lena
2d2e76ee7f Affichage conf 2021-03-02 10:07:23 +01:00
Florian HENRY
d063533efb Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13.0 2021-03-02 09:46:05 +01:00
Florian HENRY
d7500b1609 fix php warning 2021-03-02 09:45:49 +01:00
Frédéric FRANCE
883faf6f43
Merge remote-tracking branch 'upstream/develop' into fixmerge 2021-03-02 08:13:33 +01:00
Laurent Destailleur
07aa533add Disable box not related to page 2021-03-02 03:08:29 +01:00
Laurent Destailleur
d6b81b21f1 fix phpcs 2021-03-02 03:03:41 +01:00
Laurent Destailleur
7f209f7cc7 Clean code 2021-03-02 02:55:24 +01:00
Laurent Destailleur
592dacd849 Fix phpcs 2021-03-02 02:45:39 +01:00
Laurent Destailleur
5d6ada77ca Fix test 2021-03-02 02:42:04 +01:00
Laurent Destailleur
0670a00b83 Fix phpcs 2021-03-02 02:06:09 +01:00
Laurent Destailleur
ebc3210308 FIX #16343 2021-03-02 01:58:36 +01:00
Laurent Destailleur
23e8401e61 FIX #16296 2021-03-02 01:22:23 +01:00
Laurent Destailleur
cffea1889f FIX #16325 2021-03-02 01:17:28 +01:00
Laurent Destailleur
f1f950e8b7 Close #16395 - Can filter on proposal source in list 2021-03-02 00:11:15 +01:00
Frédéric FRANCE
3b428004d8
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-03-02 00:09:44 +01:00
Frédéric FRANCE
c54a61bb67
fix 2021-03-01 23:54:03 +01:00
Frédéric FRANCE
284cdaf845
Merge remote-tracking branch 'upstream/develop' into patch-3 2021-03-01 23:43:47 +01:00
andreubisquerra
5bb7c521aa
Update dolreceiptprinter.class.php 2021-03-01 23:30:38 +01:00
andreubisquerra
15cc0f8775
Avoid php errors if negative var in Receipt Module 
Solved in develop branch with PR https://github.com/Dolibarr/dolibarr/pull/15994/files
After testing we introduce it in version 13
 2021-03-01 23:09:07 +01:00
Laurent Destailleur
b8bd5cd0ee FIX Protection to avoid #16504 2021-03-01 23:08:03 +01:00
Laurent Destailleur
fb0eda446e Fix bad break 2021-03-01 22:00:48 +01:00
Laurent Destailleur
f64f53e460 Reduce errors 2021-03-01 21:57:45 +01:00
Laurent Destailleur
5b771eb798 Fix merge of 2 record. 2021-03-01 21:56:14 +01:00
Frédéric FRANCE
13c9a96107
fix phpcs 2021-03-01 21:44:59 +01:00
Frédéric FRANCE
287b215ef0
use tabs 2021-03-01 21:40:22 +01:00
Frédéric FRANCE
f2cdbf6bb2
Merge remote-tracking branch 'upstream/develop' into add_rule 2021-03-01 21:22:34 +01:00
Frédéric FRANCE
b54d9751f5
Merge remote-tracking branch 'upstream/develop' into fixmerge 2021-03-01 21:19:39 +01:00
Laurent Destailleur
d4512c48cd Fix regression 2021-03-01 21:11:55 +01:00
Frédéric FRANCE
a5974bcf57
fix merge 2021-03-01 21:10:06 +01:00
stickler-ci
54d35fa59f Fixing style errors. 2021-03-01 20:00:32 +00:00
Florian HENRY
32ef55cd9e working default status/percent for event actioncomm 2021-03-01 20:58:02 +01:00
Frédéric FRANCE
a4e25359e7
add missing rule 2021-03-01 20:37:16 +01:00
Florian HENRY
f62386a6a5 set Default values as CURD classes 2021-03-01 20:36:42 +01:00
Florian HENRY
1b57d2a4a0 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_conf_defaulteventstatus 2021-03-01 19:57:54 +01:00
Florian HENRY
7d3bd131ab default envent status 2021-03-01 19:54:30 +01:00
Laurent Destailleur
6e61ae8e56 Fix responsive 2021-03-01 19:50:35 +01:00
Florian HENRY
0edae6e19a add class default values 2021-03-01 18:25:23 +01:00
Frédéric FRANCE
eb62750aab
fix typo 2021-03-01 18:06:03 +01:00
Laurent Destailleur
1cdea45707 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/adherents/subscription/list.php
	htdocs/societe/canvas/company/tpl/card_create.tpl.php
	htdocs/societe/canvas/individual/tpl/card_create.tpl.php
	htdocs/societe/card.php
 2021-03-01 17:46:36 +01:00
Florian HENRY
b5fd3e4984 on going 2021-03-01 17:06:03 +01:00
stickler-ci
d20ba5a665 Fixing style errors. 2021-03-01 15:38:15 +00:00
Gauthier PC portable 024
861b583668 FIX : handling $heightforinfotot when he's superior to a page height on Supplier Invoice 2021-03-01 16:34:42 +01:00
Juanjo Menent
96eb7a341a FIX: Bad project filter in ticket list 2021-03-01 16:14:38 +01:00
Laurent Destailleur
222012da37 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/class/paymentvarious.class.php
	htdocs/compta/bank/various_payment/card.php
	htdocs/don/card.php
	htdocs/langs/en_US/main.lang
	htdocs/public/payment/newpayment.php
	test/phpunit/DateLibTzFranceTest.php
 2021-03-01 15:48:30 +01:00
Florian HENRY
5ba9ffeb09 change comlumn name 2021-03-01 15:36:50 +01:00
Florian HENRY
036d1d5802 change comlumn name 2021-03-01 15:36:22 +01:00
Florian HENRY
e101ff0d6d change comlumn name 2021-03-01 15:34:02 +01:00
Laurent Destailleur
c5dac4854a
Merge pull request #16474 from bafbes/abb120370 
fix:fk_region links to region code field and not to the rowid's
 2021-03-01 14:16:14 +01:00
Laurent Destailleur
8a602ad143
Merge pull request #16493 from aspangaro/13p8 
FIX: Various payment - Missing fields for check transmitter & bank name
 2021-03-01 14:11:33 +01:00
Laurent Destailleur
b2cfc431bc
Merge pull request #16489 from aspangaro/13p7 
FIX: Total_ht not show in contract link element
 2021-03-01 14:07:29 +01:00
Laurent Destailleur
8bc3cf37ec
Merge pull request #16490 from frederic34/cron_code_syntax 
code syntax cron directory
 2021-03-01 14:03:39 +01:00
Laurent Destailleur
5cddd0465c Fix trans 2021-03-01 13:25:54 +01:00
Frédéric FRANCE
8c45137b37
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-03-01 12:55:45 +01:00
Laurent Destailleur
81f1bee10c Fix option DONATION_USE_THIRDPARTIES 2021-03-01 11:18:14 +01:00
Gauthier PC portable 024
6da28f5e44 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-03-01 11:12:03 +01:00
Laurent Destailleur
a68721c5b4 Fix missing translation 2021-03-01 10:58:06 +01:00
Laurent Destailleur
c80151717e Fix set of payment 2021-03-01 10:45:37 +01:00
Laurent Destailleur
0796bc45b1 Fix amount for some language on public payment page 2021-03-01 10:39:27 +01:00
lmarcouiller
b097e909a6 changes to fix pr with eldy advices 2021-03-01 09:52:34 +01:00
Hystepik
460bc2dbde
Merge branch 'develop' into develop#5 2021-03-01 09:03:38 +01:00
Alexandre SPANGARO
0abe576fdc FIX: Various payment - Missing fields for check transmitter & bank name 2021-03-01 04:49:06 +01:00
Alexandre SPANGARO
d0ccdfafb4 FIX stats supplier proposal 2021-03-01 04:12:53 +01:00
Alexandre SPANGARO
abc93446bb Fix list proposal 2021-03-01 04:12:15 +01:00
Alexandre SPANGARO
3b1a9cd668 FIX: Total_ht not show in contract link element 2021-03-01 03:18:14 +01:00
Alexandre SPANGARO
0d954cb1c7 FIX: Total_ht not show in contract link element 2021-03-01 03:09:36 +01:00
Frédéric FRANCE
ed3b637d7a
add new rule 2021-03-01 00:34:15 +01:00
Frédéric FRANCE
1b046f25cf
add new rule 2021-03-01 00:19:52 +01:00
Laurent Destailleur
77151bd560 Standardize tabs 2021-02-28 23:53:20 +01:00
Frédéric FRANCE
0a6f307716
code syntax cron directory 2021-02-28 23:47:30 +01:00
Laurent Destailleur
bcdfdae10c FIX #16480 2021-02-28 23:43:07 +01:00
Laurent Destailleur
f7933a6884
Merge pull request #16470 from frederic34/s_code_syntax 
code syntax s... t..  dir
 2021-02-28 23:37:25 +01:00
Laurent Destailleur
26c8ee170f
Merge pull request #16469 from frederic34/r_code_syntax 
code syntax r... dir
 2021-02-28 23:37:14 +01:00
Laurent Destailleur
490faec547 FIX Timezone problems 
Conflicts:
	htdocs/core/lib/date.lib.php
	test/phpunit/DateLibTest.php
 2021-02-28 22:50:21 +01:00
Laurent Destailleur
ae81ab0c7c FIX Timezone problems 2021-02-28 22:44:11 +01:00
Alexandre SPANGARO
de241eced3 FIX: Total_ht not show in contract link element 2021-02-28 22:22:20 +01:00
Laurent Destailleur
a6bc218280 Look and feel v14 2021-02-28 21:34:27 +01:00
Laurent Destailleur
5406de13ee css 2021-02-28 21:33:13 +01:00
Laurent Destailleur
0a0c7fdeb1 FIX hourglass and hide button to pay 2021-02-28 21:15:40 +01:00
Laurent Destailleur
79ed52c3d3 NEW Add last date of modification for website pages in list 2021-02-28 20:49:52 +01:00
Frédéric FRANCE
9e8aefbc75
Merge remote-tracking branch 'upstream/develop' into s_code_syntax 2021-02-28 17:49:17 +01:00
Frédéric FRANCE
ce9f09ae4e
Merge remote-tracking branch 'upstream/develop' into r_code_syntax 2021-02-28 17:41:39 +01:00
Frédéric FRANCE
709e2459e9
fix 2021-02-28 17:17:30 +01:00
Laurent Destailleur
87bc0f9c24 Fix align 2021-02-28 14:28:41 +01:00
Laurent Destailleur
6294ae61a8 Look and feel v14 2021-02-28 14:26:32 +01:00
Laurent Destailleur
886cbc61c8 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/core/boxes/box_factures_fourn.php
	htdocs/core/boxes/box_factures_fourn_imp.php
	htdocs/core/boxes/box_ficheinter.php
	htdocs/core/boxes/box_members.php
	htdocs/core/boxes/box_propales.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formmail.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/fourn/class/fournisseur.facture.class.php
 2021-02-28 13:37:45 +01:00
Laurent Destailleur
2a3b3753a8 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-28 13:27:38 +01:00
Laurent Destailleur
12ff29cc83
Merge pull request #16468 from frederic34/public_code_syntax 
code syntax public dir
 2021-02-28 13:26:44 +01:00
Laurent Destailleur
68aebaeade
Merge pull request #16479 from frederic34/update_CommandeFournisseur 
add update CommandeFournisseur for api use
 2021-02-28 13:26:28 +01:00
Laurent Destailleur
c7d02ef38a
Merge pull request #16471 from frederic34/eventorg_code_syntax 
code syntax eventorganization dir
 2021-02-28 13:25:44 +01:00
Laurent Destailleur
3a2d300a17
Merge pull request #16472 from frederic34/admin_code_syntax 
code syntax admin dir
 2021-02-28 13:25:31 +01:00
Laurent Destailleur
0bb304ec33
Merge pull request #16473 from frederic34/patch-3 
fix variable name
 2021-02-28 13:25:20 +01:00
Laurent Destailleur
dd64c00f8b
Merge pull request #16478 from frederic34/patch-5 
fix missing include
 2021-02-28 13:24:42 +01:00
Laurent Destailleur
1149de1aca FIX #16485 2021-02-28 13:15:24 +01:00
Laurent Destailleur
2ce76133f4 FIX #16487 2021-02-28 12:59:58 +01:00
Laurent Destailleur
3a19cbb062 FIX #16420 #16423 #16488 #16477 2021-02-28 12:47:24 +01:00