lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
87,993 Commits 43 Branches 150 Tags 886 MiB
91a50038ff
Commit Graph

20832 Commits

Author SHA1 Message Date
Laurent Destailleur
91a50038ff Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/fiche-stat.php
 2020-07-27 19:35:34 +02:00
Laurent Destailleur
8c06e3577d Fix several trouble with diret debit module and credit transfer module 2020-07-27 19:33:24 +02:00
Laurent Destailleur
6d8060bc50 FIX DO not erase variable $key and $label during output of extrafields 
Conflicts:
	htdocs/core/tpl/extrafields_view.tpl.php
 2020-07-27 14:22:55 +02:00
Laurent Destailleur
10484ba06e FIX DO not erase variable $key and $label during output of extrafields 2020-07-27 14:04:41 +02:00
Laurent Destailleur
714481f7e5 FIX Navigation in object fails to find the next ref in some cases 2020-07-26 21:08:31 +02:00
Laurent Destailleur
a2dd80bcc8 FIX Navigation in object fails to find the next ref in some cases 2020-07-26 21:07:39 +02:00
Laurent Destailleur
d945ef67e1 FIX Picto of HRM module 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2020-07-26 20:53:22 +02:00
Laurent Destailleur
5d7a9c9af4 FIX Picto of HRM module 2020-07-26 20:51:49 +02:00
Laurent Destailleur
b63a6bc72a NEW Can use dynamic code into the 'enabled' property of DAO fields 2020-07-26 20:45:54 +02:00
Laurent Destailleur
f847cad197 Fix perm 2020-07-26 20:02:29 +02:00
Laurent Destailleur
12bb44ed03 Fix recruitment 2020-07-26 19:57:42 +02:00
Laurent Destailleur
dd86c21382 FIX dolGetElementUrl and agenda page for external modules 2020-07-25 03:01:04 +02:00
Laurent Destailleur
573feed66f FIX locataxes lost on lines when cloning a vendor invoice 2020-07-25 02:59:49 +02:00
Laurent Destailleur
e3126ec999 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/tpl/card_presend.tpl.php
	htdocs/multicurrency/class/multicurrency.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-07-25 00:22:47 +02:00
Laurent Destailleur
1bd00ac775 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-07-25 00:17:36 +02:00
Laurent Destailleur
960416f9bf Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/comm/card.php
 2020-07-25 00:17:28 +02:00
Laurent Destailleur
3ed4773d7f Fix tab popup when there is 2 head tabs in same page 2020-07-24 18:31:14 +02:00
Laurent Destailleur
f68be08c67
Merge pull request #14198 from Gecka-Apps/12.0-printStdColumnContent-hook-improve 
Improve printStdColumnContent by passing the $pdf object
 2020-07-24 13:20:03 +02:00
Laurent Destailleur
fb1c226e56 Init var 2020-07-24 13:05:19 +02:00
Laurent Destailleur
943e7c988f
Update extrafields_list_print_fields.tpl.php 2020-07-24 12:55:12 +02:00
Laurent Destailleur
93fea8591c Fix phpcs 2020-07-24 12:17:02 +02:00
Laurent Destailleur
6e36fba4f3 NEW Development of module Recruitment 2020-07-24 11:54:57 +02:00
Laurent Destailleur
46fccf8eb1 FIX dolGetElementUrl and agenda page for external modules 2020-07-24 11:53:44 +02:00
stickler-ci
8273dbcd49 Fixing style errors. 2020-07-24 08:39:09 +00:00
Frans Bosman
94498b191b
Update card_presend.tpl.php 2020-07-24 10:37:19 +02:00
Laurent Destailleur
aefb1483e3 NEW Can change size of logo on PDF documents 2020-07-24 03:36:44 +02:00
Laurent Destailleur
fa29549976 Fix trans 2020-07-24 03:09:31 +02:00
Laurent Destailleur
895fe63d3b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-07-24 01:53:51 +02:00
Laurent Destailleur
34a9eee7a6 Minor fix in translation 2020-07-24 01:50:57 +02:00
Laurent Destailleur
431b207dab Fix to solve sql error on some databases 2020-07-24 01:02:07 +02:00
Laurent Destailleur
a46f4df147 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/user/clicktodial.php
 2020-07-24 00:15:56 +02:00
Laurent Destailleur
0890b15077 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-07-24 00:06:30 +02:00
Laurent Destailleur
c6c1830e70 FIX ClickToDial tab of users has disappeared 2020-07-24 00:06:18 +02:00
quentin
7bc683b234 FIX warning 2020-07-22 15:13:50 +02:00
Frans Bosman
e2592d9049
Update card_presend.tpl.php 
Add hidden options for specific sender email-adress for Invoices, Shipments and Order-confirmations
 2020-07-22 11:44:26 +02:00
Laurent Dinclaux
3cdabbaaff Explicitly pass the pdf object by reference in the printStdColumnContent hook call. 2020-07-19 21:53:06 +11:00
Laurent Destailleur
87cd4b11bd Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2020-07-19 02:24:38 +02:00
Laurent Destailleur
8d26329653 Merge branch '12.0' of https://github.com/dolibarr/dolibarr into develop 
Conflicts:
	htdocs/core/lib/price.lib.php
	htdocs/projet/activity/perday.php
 2020-07-19 02:24:26 +02:00
Laurent Destailleur
acdb61b640
Merge pull request #14227 from defrance/patch-154 
NEW : add class for ticket edition (pdf or odt)
 2020-07-19 02:11:13 +02:00
Laurent Destailleur
521c4679d9 FIX #14241 Mysql 8 compatibility 2020-07-19 01:52:30 +02:00
Laurent Destailleur
f26a64fb88 FIX If using a rounding step, localtax1+2 not included in total 2020-07-19 01:47:17 +02:00
Laurent Destailleur
52fd424812
Merge pull request #14226 from cfoellmann/thirdparty-leftmenu 
Thirdparty leftmenu
 2020-07-18 23:13:40 +02:00
Laurent Destailleur
15cdb3ed79 Merge branch '12.0' of https://github.com/dolibarr/dolibarr into 12.0 2020-07-18 23:00:09 +02:00
Laurent Destailleur
ac92a9fa40 Doc more complete 2020-07-18 22:59:47 +02:00
Laurent Destailleur
a252c87c82 Fix comment 2020-07-18 19:41:11 +02:00
Laurent Destailleur
cbc8187616
Merge pull request #14205 from Gecka-Apps/12.0-fix-extra-field-ordering 
Fix extrafields ordering on PDFs
 2020-07-18 19:30:34 +02:00
Laurent Destailleur
a8fbec8491
Merge pull request #14216 from grandoc/new_branch_11_07_2020 
Minimum version of PHP required by module
 2020-07-18 19:12:50 +02:00
Christian Foellmann
a4e9c478e7 fix the global DEFAULT_SEARCH_INTO_MODULE - current value will not push anything above the core modules 2020-07-13 18:14:57 +02:00
BENKE Charlene
a2cf473891
add class for ticket edition (pdf or odt) 2020-07-13 14:24:07 +02:00
Christian Foellmann
4674367099 remove old commented out code lines 2020-07-13 14:18:16 +02:00