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

94490 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
e503f73e95 Comment dead code 2021-06-15 22:28:39 +02:00
Laurent Destailleur
2a3b330e1e Fix newToken() 2021-06-15 22:10:59 +02:00
Laurent Destailleur
1aad151e19 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-06-15 22:08:50 +02:00
Laurent Destailleur
dea8c8d32f
Merge pull request #17938 from atm-kevin/FIX_13.0_Ticket_Card 
Fix : Fatal error on ticket presend
 2021-06-15 22:08:03 +02:00
stickler-ci
26cae49faf Fixing style errors. 2021-06-15 20:06:48 +00:00
Laurent Destailleur
5ddf12b29c Fix set language 2021-06-15 22:06:26 +02:00
Laurent Destailleur
78f41bf60e
Update card.php 2021-06-15 22:04:31 +02:00
kevin
9ff0efbcc2 FIX fatal error when adding message to a ticket 2021-06-15 12:04:24 +02:00
Laurent Destailleur
d154ec2344 FIX Collector to create lead was broken 2021-06-14 20:06:52 +02:00
Laurent Destailleur
a79afeaf02 Add info to allow debug of email collector 2021-06-14 19:58:12 +02:00
Laurent Destailleur
d6d419783e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	doc/install/README-DE
	doc/install/README-FR
 2021-06-14 15:26:41 +02:00
Laurent Destailleur
c8a41fab11 Doc 2021-06-14 15:24:50 +02:00
Laurent Destailleur
819aa108e9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-06-14 15:24:14 +02:00
Laurent Destailleur
1d9310055e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2021-06-14 15:19:11 +02:00
Laurent Destailleur
e81023c35a Update doc 2021-06-14 15:12:08 +02:00
Laurent Destailleur
4464aeb639 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-06-14 14:44:08 +02:00
Laurent Destailleur
6078267f86 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php
 2021-06-14 14:43:46 +02:00
Laurent Destailleur
dcca3011ee Clean code 2021-06-14 14:41:50 +02:00
Laurent Destailleur
e41a3a2f42
Merge pull request #17867 from OPEN-DSI/v11-fix-clone-invoice-with-acount-line 
FIX clone invoice with acount line
 2021-06-14 14:41:05 +02:00
Laurent Destailleur
d0b033548c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/bookmarks/bookmarks.lib.php
 2021-06-14 14:21:53 +02:00
Laurent Destailleur
5117be4b36
Merge pull request #17920 from atm-adrien/FIX/12.0_bookmarks_on_searchlist 
FIX : Allow to set bookmarks on list filtered by multiselect fields
 2021-06-14 14:18:28 +02:00
Adrien Raze
0f91c4cfa2 FIX : Allow to set bookmarks on list filtered by multiselect fields 2021-06-14 10:02:44 +02:00
Laurent Destailleur
dd1f49b4b0
Merge pull request #17794 from atm-quentin/FIX_jointure_cabyprod 
Fix jointure cabyprod
 2021-06-11 19:12:29 +02:00
Laurent Destailleur
663cf28eba Fix lost code during previous merge 2021-06-11 19:05:33 +02:00
Laurent Destailleur
cfbf051fca Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-06-11 18:47:09 +02:00
Laurent Destailleur
4fd9d36eb9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/product/price.php
 2021-06-11 18:46:51 +02:00
Laurent Destailleur
65f8405ca4 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-06-11 18:44:45 +02:00
Laurent Destailleur
6bf9a72dab Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-06-11 18:44:37 +02:00
Laurent Destailleur
06201fa9bb
Merge pull request #17848 from atm-greg/FIX_update_only_vat_on_multiprice 
verify vat change to update multiprice
 2021-06-11 18:22:40 +02:00
Laurent Destailleur
4e66e134bd
Update price.php 2021-06-11 18:21:00 +02:00
Laurent Destailleur
a057f17e56
Merge pull request #17878 from AlexisLaurier/fix/depositTranslationInInvoice 
remove useless check on invoice line content when generating pdf
 2021-06-11 18:13:58 +02:00
Laurent Destailleur
41d9324600
Merge pull request #17888 from marc-dll/11.0_FIX_activity_task_assignment 
FIX: project time spent by day/week: quote mismatch in SQL query to assign to check task assigment
 2021-06-11 18:12:57 +02:00
Laurent Destailleur
a8f11fec31
Update perweek.php 2021-06-11 18:12:39 +02:00
Laurent Destailleur
057d91698f
Update perday.php 2021-06-11 18:11:55 +02:00
Laurent Destailleur
794b10ec54
Merge pull request #17889 from marc-dll/12.0_FIX_activity_task_assignment 
FIX: project time spent by month: quote mismatch in SQL query to assign to check task assigment
 2021-06-11 18:11:19 +02:00
Laurent Destailleur
0315f45198
Update permonth.php 2021-06-11 18:10:57 +02:00
Laurent Destailleur
9dbfba07e7
Merge pull request #17882 from frederic34/patch-11 
fix warning
 2021-06-11 18:01:20 +02:00
Marc de Lima Lucio
3f72f9b544 FIX: project time spent by month: quote mismatch in SQL query to assign to check task assigment 2021-06-10 23:29:37 +02:00
Marc de Lima Lucio
96656ff148 FIX: project time spent by day/week: quote mismatch is SQL query to assign to check task assigment 2021-06-10 23:26:33 +02:00
Frédéric FRANCE
759472f5d1
fix warning 2021-06-10 20:58:56 +02:00
Alexis LAURIER
1a2434818d remove useless check on deposit line content when generating pdf 2021-06-10 18:00:49 +02:00
Laurent Destailleur
8065283f28 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-06-10 16:53:27 +02:00
Laurent Destailleur
1bf63c7862 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/core/lib/functions.lib.php
 2021-06-10 16:53:09 +02:00
Laurent Destailleur
c44a368213 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-06-10 16:47:53 +02:00
Laurent Destailleur
24f8b6386e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2021-06-10 16:47:45 +02:00
Laurent Destailleur
f3b6c8bf17
Merge pull request #17876 from AlexisLaurier/bugfix/supplierBankTransfertWrongCodeCheckMassAction 
bugfix/supplierBankTransfertWrongCodeCheckMassAction
 2021-06-10 16:44:32 +02:00
Alexis LAURIER
03cd88d145 bugfix/supplierBankTransfertWrongCodeCheckMassAction 2021-06-10 16:29:56 +02:00
Laurent Destailleur
1798707cce
Merge pull request #17703 from tuxgasy/Fix_new_honorific_title_label 
No try to translate label field in dictionary for new
 2021-06-10 15:38:55 +02:00
Laurent Destailleur
5d6735f364
Merge pull request #17826 from ptibogxiv/patch-428 
Fix date_start of last subscription
 2021-06-10 13:01:07 +02:00
Laurent Destailleur
92b20d3595
Merge pull request #17831 from atm-john/11.0_fix_doc_childtablesoncascade 
FIX : childtablesoncascade doc
 2021-06-10 12:59:19 +02:00