Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-16 14:31:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
87,683 Commits 36 Branches 190 Tags
bedfb7ac8da5ec9c0a6fcb51a3b6df514850dea3
Commit Graph

20699 Commits

Author SHA1 Message Date
ptibogxiv
3840d6c0a7 Fix entity in ordre box 2020-10-03 13:52:52 +02:00
Laurent Destailleur
88714cfb18 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-10-02 14:44:23 +02:00
Laurent Destailleur
cee28d0253 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-10-02 14:43:54 +02:00
Laurent Destailleur
cdc9d3dd1b Merge pull request #14480 from OPEN-DSI/v10-fix-objectline-edit-tpl-margins-rates 
FIX update margins rates on object line edit
 2020-10-02 14:43:13 +02:00
Florian HENRY
2f5a2d0e28 fix CSRF not provided 2020-10-01 17:42:04 +02:00
Laurent Destailleur
29414251f5 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/lib/files.lib.php
 2020-09-29 13:19:03 +02:00
Laurent Destailleur
43c167f0c8 Fix init var 2020-09-28 20:47:36 +02:00
lvessiller
1b5a0ce3bf FIX uses price2numjs 2020-09-28 17:04:20 +02:00
Laurent Destailleur
5c9ad3ec9b Update files.lib.php 2020-09-27 18:55:09 +02:00
Florian HENRY
5ff7e37696 review code 2020-09-27 18:05:19 +02:00
Florian HENRY
b6b2553501 Merge branch '11.0' into 11.0_fixmultidiroutput 2020-09-27 18:02:22 +02:00
Regis Houssin
d38c557fba FIX Can create user but not update user with activedirectory 2020-09-25 12:11:13 +02:00
Laurent Destailleur
438e884c01 Fix phpcs 2020-09-21 14:17:05 +02:00
Laurent Destailleur
3ca379c9e6 FIX Restore multiselect (selection of prospect level) 
Conflicts:
	htdocs/core/class/html.form.class.php
 2020-09-21 12:22:57 +02:00
Laurent Destailleur
f09aea90df Fix bad test 2020-09-18 14:51:04 +02:00
Laurent Destailleur
56a9f5c48b Fix 2020-09-18 14:49:20 +02:00
Laurent Destailleur
0b2aa2b01d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2020-09-18 14:48:40 +02:00
Laurent Destailleur
07556e061d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/contact/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/document.php
 2020-09-18 14:46:23 +02:00
Alexandre SPANGARO
bc457ebb66 Stickler 2020-09-16 21:22:59 +02:00
Alexandre SPANGARO
23c4cfe913 FIX Yogosha report 4425 (backport) 2020-09-16 20:55:28 +02:00
Laurent Destailleur
09558d0ce9 Fix MAIN_OPTIMIZEFORTEXTBROWSER 2020-09-16 13:15:57 +02:00
Laurent Destailleur
40acd8a386 Fix missing field canvas 2020-09-16 12:17:33 +02:00
Laurent Destailleur
c40ec37b60 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-09-14 02:13:43 +02:00
Laurent Destailleur
c3ba8f7843 Better translation 2020-09-14 02:13:27 +02:00
Laurent Destailleur
0d9d9498e2 Update commonobjectline.class.php 2020-09-14 00:13:12 +02:00
DEMAREST Maxime (Indelog)
1c523abbd8 Fix: getLabelOfUnit() for Product, CommonObjectline to print long label 
Also add $type = 'code' for return unit code in form 'unitXX' (where XX
is the code of unit).

for get return like unitXX where XX is the code of unit
 2020-09-13 07:44:30 +02:00
Laurent Destailleur
5ea3f09e17 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/class/translate.class.php
 2020-09-12 04:29:28 +02:00
Laurent Destailleur
709542e27d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-09-12 04:26:00 +02:00
Laurent Destailleur
990af9d5cf Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formmail.class.php
 2020-09-12 04:25:54 +02:00
Laurent Destailleur
ae857e7008 Merge pull request #14673 from atm-john/11.0_fix_loadlang_cron 
FIX Cron load lang
 2020-09-12 01:32:17 +02:00
Laurent Destailleur
0cccaa7271 FIX look and feel v12 2020-09-10 18:02:49 +02:00
John Botella
59d5391c2a Add force reload param to load method 2020-09-10 10:41:16 +02:00
Laurent Destailleur
5c34b26f39 FIX Look and feel v12: First tab must be name of object 2020-09-09 13:57:35 +02:00
John Botella
5a0622c906 FIX cron load lang 2020-09-08 16:14:14 +02:00
lvessiller
23accef5c2 FIX empty value is needed on filter list 2020-09-08 14:53:40 +02:00
lvessiller
86ce4315be FIX load default linked options for linked sellist extra fields 2020-09-07 15:19:58 +02:00
lvessiller
5dee3b5b2f FIX no empty value in required extrafield 2020-09-07 14:24:09 +02:00
Juanjo Menent
9bd5ed627f Fix travis issues 2020-09-04 09:55:02 +02:00
Juanjo Menent
bb92e64e43 FIX: #14474 Error when deleting 2020-09-03 12:43:38 +02:00
Florian Mortgat
134a47a93f FIX 10.0 - when the mime file name is different from the filesystem name, the attachment name should be the mime filename 2020-09-01 15:36:35 +02:00
Laurent Destailleur
ffb3d810de Complete fix for #14580 for v10 (backport of change of develop) 2020-08-31 16:21:59 +02:00
Laurent Destailleur
f8bd7946a5 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-08-29 05:13:20 +02:00
Laurent Destailleur
723a263cd3 Fix phpcs 2020-08-29 05:07:23 +02:00
FlorianMortgat
c25463a4ba + more parentheses around expression for readability 2020-08-28 21:07:11 +02:00
FlorianMortgat
173ad057f9 + parentheses around expression for readability 2020-08-28 20:46:35 +02:00
Florian Mortgat
7ddf85cd33 Merge branch '11.0' into 11.0_FIX_11858_do_not_allow_lines_to_overlap_infotot 2020-08-28 10:05:00 +02:00
Florian Mortgat
a5d1f1f68f FIX: expenses lines overlapping the frame for total amounts. 
If there is no room for this frame when printing the last expense line, this line should be on a new page.
 2020-08-28 10:02:43 +02:00
Laurent Destailleur
0944e8b156 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-08-23 19:25:13 +02:00
Laurent Destailleur
8115acbf82 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-08-23 19:25:05 +02:00
Laurent Destailleur
f819509442 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-08-23 19:22:27 +02:00