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

102092 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
3dbab22060 Prepare 14.0.4 2021-11-19 18:08:49 +01:00
Laurent Destailleur
35b1868693 FIX Missing trans 2021-11-19 14:01:31 +01:00
Laurent Destailleur
bb6440af9d FIX Better label for reception status 2021-11-19 13:46:30 +01:00
Laurent Destailleur
cdc160b9a9 FIX column alignement on valid confirm page of shipment 2021-11-19 11:12:53 +01:00
Laurent Destailleur
ec2067df7d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-11-19 10:06:46 +01:00
Laurent Destailleur
271f42e761 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/societe/list.php
 2021-11-19 10:06:35 +01:00
Laurent Destailleur
e7a4f04da4 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
 2021-11-18 21:41:12 +01:00
Laurent Destailleur
efb9d184e4
Merge pull request #19382 from OPEN-DSI/fix-societe-list-region-filter 
FIX filter on region in company list
 2021-11-18 20:29:36 +01:00
Laurent Destailleur
242eaa9394
Merge pull request #19387 from FHenry/14.0_fix_list_contact 
FIX : contact not in list (contact/list) if module mailing not active and contact has no email
 2021-11-18 20:28:43 +01:00
Laurent Destailleur
4caeddf7f8
Merge pull request #19388 from FHenry/14.0_fix_preselecttask_on_event_creation 
FIX: preselect task on create event from task
 2021-11-18 20:25:03 +01:00
Laurent Destailleur
44d4ab6f9c
Merge pull request #19384 from fmarcet/12.0 
Fix: Bad date conversion
 2021-11-18 20:10:50 +01:00
Laurent Destailleur
8f96383186
Update expedition.class.php 2021-11-18 20:10:04 +01:00
Ferran Marcet
db975bbcc2 Fix: The error not correctly collected on insertation line failure 2021-11-18 17:17:00 +01:00
Laurent Destailleur
e609622f2b Fix test on verifCond for value 0 2021-11-18 13:17:48 +01:00
Laurent Destailleur
0c9fb16a36 Fix trans 2021-11-18 09:55:36 +01:00
Laurent Destailleur
0294f3dc34 Missing trans 2021-11-18 09:54:48 +01:00
Laurent Destailleur
0e57f62d02 Prepare 14.0.3 2021-11-17 19:03:25 +01:00
Florian HENRY
bc64aba3a6 FIX: preselect task on create event from task 2021-11-16 13:43:08 +01:00
Florian HENRY
0692e01fea Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14.0_fix_list_contact 2021-11-16 13:31:58 +01:00
Florian HENRY
47da6793c5 FIX: contact not listed if module mainling not active and contact has no email 2021-11-16 13:31:51 +01:00
Laurent Destailleur
e2000473a5 Sync transifex 2021-11-16 10:44:56 +01:00
Laurent Destailleur
9eb66548a5 Sync transifex 2021-11-15 19:02:26 +01:00
Laurent Destailleur
878ee35e5d Sync transifex 2021-11-15 18:07:05 +01:00
Ferran Marcet
7af883abc1 Fix: Bad date conversion 2021-11-15 16:43:54 +01:00
lvessiller
e365a14b5a FIX filter on region in company list 2021-11-15 14:41:16 +01:00
Laurent Destailleur
9cbba5941f Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-11-15 13:56:32 +01:00
Laurent Destailleur
c995794e2d Fix kk_KZ language 2021-11-15 13:56:17 +01:00
Laurent Destailleur
12f0a36095
Merge pull request #19284 from henrynopo/patch-1 
Supplier Invoice Payment - Re-order the "Payment amount, original currency" to be together with the columns of original currency
 2021-11-15 11:46:00 +01:00
Laurent Destailleur
fc489380a1
Merge pull request #19345 from hregis/fix_lost_superadmin_grade_after_edit_user 
FIX lost superadmin grade after edit user card
 2021-11-15 11:06:52 +01:00
Laurent Destailleur
0743c656ac
Merge pull request #19359 from daraelmin/daraelmin-patch-3 
Fix date_select go away when sorting subscription
 2021-11-15 11:00:48 +01:00
Laurent Destailleur
4d962f165d
Merge pull request #19375 from daraelmin/daraelmin-patch-5 
Fix #19306 - Tracking url is clickable in reception card
 2021-11-15 10:42:29 +01:00
Laurent Destailleur
641803ce7c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-11-15 10:41:20 +01:00
Laurent Destailleur
9c493127d5 Fix sync 2021-11-15 10:41:05 +01:00
Laurent Destailleur
1f58c60b6e
Merge pull request #19377 from aspangaro/14p23 
FIX Ticket - Card - Wrong font awesome library
 2021-11-15 10:39:30 +01:00
Alexandre SPANGARO
2be7da1031 Double line 2021-11-14 04:18:13 +01:00
Alexandre SPANGARO
d6cb95b0f7 FIX Ticket - Card - Wrong font awesome library 2021-11-14 04:18:03 +01:00
daraelmin
f2407a3f94
Fix 19306 - Tracking url is clickable in reception card 2021-11-13 20:04:03 +01:00
Laurent Destailleur
ec78f21c26 Sync transifex 2021-11-13 15:17:06 +01:00
daraelmin
53b565ec1d
Fix date_select go away when sorting subscription 2021-11-11 20:06:21 +01:00
Laurent Destailleur
21c2dba922 Fix phpcs 2021-11-11 19:06:55 +01:00
Laurent Destailleur
f5a7275077 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/takepos/index.php
 2021-11-11 18:34:04 +01:00
Laurent Destailleur
a725ffefdd Fix sql error 2021-11-11 18:30:17 +01:00
Regis Houssin
5eff0e7a0c FIX only a superadmin can modify entity 2021-11-11 17:48:23 +01:00
Regis Houssin
564badc61b Merge remote-tracking branch 'origin/14.0' into fix_lost_superadmin_grade_after_edit_user 2021-11-11 17:23:55 +01:00
Laurent Destailleur
ddad00c8e4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/takepos/index.php
 2021-11-11 16:14:48 +01:00
Laurent Destailleur
f24c38db73 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/datapolicy/class/datapolicy.class.php
	htdocs/takepos/index.php
 2021-11-11 16:06:21 +01:00
Laurent Destailleur
e188855dca Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/datapolicy/class/datapolicy.class.php
 2021-11-11 16:01:37 +01:00
Laurent Destailleur
9aa5c94612 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2021-11-11 15:59:48 +01:00
Laurent Destailleur
ba724204a4 FIX Bad use of dol_concatdesc() 2021-11-11 15:50:32 +01:00
Laurent Destailleur
88d8f73614 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-11-11 15:36:00 +01:00