lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
102,592 Commits 43 Branches 150 Tags 886 MiB
6abeb2804e
Commit Graph

102592 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
6abeb2804e Fix phpcs 2022-03-24 11:47:12 +01:00
Laurent Destailleur
32f2499c36 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/langs/en_US/projects.lang
	htdocs/langs/en_US/propal.lang
	htdocs/product/price.php
	htdocs/projet/card.php
	htdocs/reception/class/reception.class.php
 2022-03-23 17:04:31 +01:00
Laurent Destailleur
6167d8a02c
Merge pull request #20302 from marc-dll/13.0_FIX_product_price_update_error_management 
FIX: better error management at product selling price update
 2022-03-23 16:48:15 +01:00
Laurent Destailleur
d92ed35447
Merge pull request #20424 from marc-dll/13.0_FIX_propal_mass_action 
FIX: propal list mass action translations and error management
 2022-03-23 15:53:28 +01:00
Laurent Destailleur
b104047365
Merge pull request #20426 from marc-dll/14.0_FIX_propal_mass_actions 
FIX: propal list mass action translations and error management (v14 edition)
 2022-03-23 15:52:44 +01:00
Laurent Destailleur
c4e58ab4c0
Merge pull request #20428 from Easya-Solutions/13.0_fix-reception-pmp-with-discount-price 
FIX include discount price for PMP after a reception (Issue #20029)
 2022-03-23 15:51:22 +01:00
Laurent Destailleur
c44cfb0885
Merge pull request #20435 from marc-dll/13.0_FIX_medias_access_multicompany 
FIX: permit access to medias when logged in a different entity
 2022-03-23 15:37:20 +01:00
Marc de Lima Lucio
100c48372b FIX: permit access to medias when logged in a different entity 2022-03-22 17:13:48 +01:00
Marc de Lima Lucio
344c29ae15 FIX: trans 2022-03-22 11:35:37 +01:00
lvessiller
5914f2ac65 FIX include discount price for PMP after a reception (Issue #20029) 2022-03-22 11:17:27 +01:00
Marc de Lima Lucio
3aae8cc3bb FIX: propal list: bad error management for set not ssigned mass action 2022-03-22 10:54:04 +01:00
Marc de Lima Lucio
cf64fc288d FIX: propal list: missing not signed massaction translation keys for transifex 2022-03-22 10:49:03 +01:00
Marc de Lima Lucio
d4f55ae116 FIX: propal list: bad error management in mass actions 2022-03-22 10:11:10 +01:00
Marc de Lima Lucio
8ef55eae07 FIX: propal list: missing translation keys for transifex 2022-03-22 10:04:05 +01:00
Laurent Destailleur
62ca286ac9 Try a fix to solve backup that fails on large database 2022-03-18 12:07:00 +01:00
Laurent Destailleur
e46ee982ec FIX Option to manage packaging. FIX size/length/volume of reception 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/langs/en_US/products.lang
	htdocs/reception/card.php
	htdocs/reception/class/reception.class.php
 2022-03-17 19:00:19 +01:00
Laurent Destailleur
49e53abf53 Fix pdf on letter format 2022-03-17 15:01:15 +01:00
Laurent Destailleur
3fe9b6b57c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-03-17 11:49:06 +01:00
Laurent Destailleur
4aa93b363a FIX #20387 2022-03-17 11:24:23 +01:00
Laurent Destailleur
6617cbc531
Merge pull request #20256 from marc-dll/13.0_FIX_project_creation_role_not_found 
FIX: project creation prevented if PROJECTLEADER contact role renamed, de-activated or deleted
 2022-03-17 02:38:11 +01:00
Laurent Destailleur
c147acabe1
Update projects.lang 2022-03-17 02:37:46 +01:00
Laurent Destailleur
63b96e22b0
Update card.php 2022-03-17 02:37:30 +01:00
Laurent Destailleur
62f6686ad0
Merge pull request #20311 from Easya-Solutions/14.0_fix_error_propagation_and_triggers_position_on_delete_propal_line 
[FIX] errors propagation and trigger position on delete proposal line
 2022-03-17 02:35:30 +01:00
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