Commit Graph

102564 Commits

Author SHA1 Message Date
Laurent Destailleur
6885568b7c
Merge pull request #20268 from FHenry/14_fix_date_behaviour_action_card
fix: #20267 #Evarisk same required field displayed on edit or new card
2022-03-17 02:31:16 +01:00
Laurent Destailleur
3346d64416
Merge pull request #20305 from fmarcet/14.0
Fix: Error whem generating supplier payment pdf
2022-03-16 22:46:53 +01:00
Laurent Destailleur
090b5c41bf
Merge pull request #20316 from atm-gauthier/14.0_fix_round_unitprice_with_MU
FIX : when we use ajax select product fourn price on supplier order for example, unitprice should be rounded with MU and not MT
2022-03-16 22:34:49 +01:00
Laurent Destailleur
e0106e1080
Merge pull request #20370 from FHenry/14_fix_default_values_project_card
fix: prededefault setup values for public field (visibility) works
2022-03-16 21:45:45 +01:00
Laurent Destailleur
d9907fe074
Merge pull request #20369 from aspangaro/14p34
FIX Reception - Error on trackid
2022-03-16 21:45:15 +01:00
Laurent Destailleur
4ad6425d76 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-03-16 21:27:34 +01:00
Laurent Destailleur
31167f5c0a
Merge pull request #20371 from marc-dll/13.0_FIX_holiday_month_report_ui
FIX: holiday monthly report: display inconsistencies
2022-03-16 21:22:31 +01:00
Laurent Destailleur
abbc2ca909
Merge pull request #20377 from aspangaro/14p31
FIX Update icon of module reception
2022-03-16 20:13:55 +01:00
Laurent Destailleur
14578820ef Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-03-16 20:10:52 +01:00
Laurent Destailleur
3c9ebfbe32 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	.travis.yml
	htdocs/adherents/card.php
2022-03-16 20:10:35 +01:00
Laurent Destailleur
3800f2c860 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-03-16 20:08:44 +01:00
Laurent Destailleur
800c490c12 Fix travis 2022-03-16 20:07:50 +01:00
Laurent Destailleur
319f21ef69 Fix regression 2022-03-16 16:23:27 +01:00
Laurent Destailleur
57ad3a789b
Merge pull request #20375 from atm-john/14.0_fix_crabe_multientity
FIX crabe multidir output
2022-03-16 16:04:29 +01:00
Alexandre SPANGARO
536bae97e8 FIX Update icon of module reception 2022-03-16 15:49:49 +01:00
Florian HENRY
a028e795f7 add missing colspan 2022-03-16 13:54:21 +01:00
Florian HENRY
1951443413 Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14_fix_date_behaviour_action_card 2022-03-16 13:48:33 +01:00
ATM john
4f395a836e fix crabe multidir output 2022-03-16 12:10:10 +01:00
Marc de Lima Lucio
8a8462bf57 FIX: holiday monthly report: html entity codes showing in description with WYSIWYG activated 2022-03-16 09:47:57 +01:00
Marc de Lima Lucio
9514062868 FIX: holiday monthly report: wrong 'Employee' and holiday type translations 2022-03-16 09:40:31 +01:00
Florian HENRY
cfa3f2f4a1 fix: prededefault setup values for public field (visibility) works 2022-03-16 09:36:52 +01:00
Alexandre SPANGARO
5a2ed9461f FIX Reception - Error on trackid 2022-03-16 08:58:01 +01:00
Laurent Destailleur
f13e7bb03d
Merge pull request #20341 from daraelmin/patch-8
Fix Warning in htdocs/adherents/card.php
2022-03-15 19:36:54 +01:00
Laurent Destailleur
d2d86ce53b
Merge pull request #20353 from Hystepik/develop_v13#1
Fix #20351 : top navbar no longer hiden in extarnal site
2022-03-15 19:23:24 +01:00
Laurent Destailleur
0899caf74d
Update lib_head.js.php 2022-03-15 19:23:17 +01:00
Laurent Destailleur
023dfab171
Merge pull request #20357 from FHenry/13_fix_incoterm
fix:incoterm bad sql request
2022-03-15 18:57:23 +01:00
Florian HENRY
92bfd6893d fix:incoterm bad sql request 2022-03-15 09:10:41 +01:00
lmarcouiller
22706b70e9 fix syntax error 2022-03-14 16:21:12 +01:00
lmarcouiller
1a20afe29b Fix #20351 : top navbar no longer hiden in extarnal site 2022-03-14 16:11:34 +01:00
daraelmin
45df52343b
Fix Warning in htdocs/adherents/card.php
Fix Warning: Creating default object from empty value in htdocs/adherents/card.php on line 1058
2022-03-13 14:42:38 +01:00
Laurent Destailleur
d71f117e81 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-03-11 15:33:56 +01:00
Laurent Destailleur
72099870c0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-03-10 15:55:14 +01:00
Laurent Destailleur
10bfb76ae9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-03-10 15:54:39 +01:00
Laurent Destailleur
d27c0b31fc Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2022-03-10 15:54:08 +01:00
Laurent Destailleur
a1534955a1 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2022-03-10 15:52:50 +01:00
Laurent Destailleur
79371f66b0 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2022-03-10 15:52:28 +01:00
Laurent Destailleur
4569cb82b2 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2022-03-10 15:52:04 +01:00
Laurent Destailleur
04d33f4594 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2022-03-10 15:51:42 +01:00
Laurent Destailleur
af6e95aa79 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/core/class/utils.class.php
2022-03-10 15:49:51 +01:00
Laurent Destailleur
5d942c9d1a Fix infinit logs 2022-03-10 15:46:00 +01:00
Laurent Destailleur
aa80be975e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/product/class/product.class.php
2022-03-10 14:10:18 +01:00
Laurent Destailleur
32a68995d6 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/product/class/product.class.php
2022-03-10 14:08:19 +01:00
Laurent Destailleur
f6cfe0557b FIX exclusion of other backup files into backup file
Conflicts:
	htdocs/admin/tools/export_files.php
2022-03-10 14:04:16 +01:00
Laurent Destailleur
cc57d3dbc1 Fix phpcs 2022-03-09 22:25:29 +01:00
Gauthier PC portable 024
f2aaa27d7b FIX : when we use ajax select product fourn price on supplier order for example, unitprice should be rounded with MU and not MT 2022-03-09 17:41:48 +01:00
Ferran Marcet
8e944b8b6d Fix: Error whem generating supplier payment pdf 2022-03-08 17:34:51 +01:00
Ferran Marcet
aa0c5cd22e Merge branch '14.0up' into 14.0
# Conflicts:
#	htdocs/core/modules/modAdherent.class.php
#	htdocs/core/modules/modBom.class.php
#	htdocs/core/modules/modCommande.class.php
#	htdocs/core/modules/modFournisseur.class.php
#	htdocs/core/modules/modProduct.class.php
#	htdocs/core/modules/modProjet.class.php
#	htdocs/core/modules/modPropale.class.php
#	htdocs/core/modules/modResource.class.php
#	htdocs/core/modules/modService.class.php
#	htdocs/core/modules/modSociete.class.php
#	htdocs/core/modules/modUser.class.php
2022-03-08 17:32:50 +01:00
Laurent Destailleur
c0088191f1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/product/admin/product.php
	htdocs/product/class/product.class.php
2022-03-07 15:19:51 +01:00
Laurent Destailleur
d13ae9f721 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
	htdocs/product/admin/product.php
	htdocs/product/class/product.class.php
2022-03-07 15:13:25 +01:00
Laurent Destailleur
40b2beff2d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-03-07 15:06:37 +01:00